diff --git a/DLL/MySql/MySql.Data.chm b/DLL/MySql/MySql.Data.chm
deleted file mode 100644
index bd06f953ba..0000000000
Binary files a/DLL/MySql/MySql.Data.chm and /dev/null differ
diff --git a/DLL/MySql/mysql.data.dll b/DLL/MySql/mysql.data.dll
deleted file mode 100644
index 9abfb6b549..0000000000
Binary files a/DLL/MySql/mysql.data.dll and /dev/null differ
diff --git a/DLL/MySql/mysql.data.zip b/DLL/MySql/mysql.data.zip
deleted file mode 100644
index 57f21d6faf..0000000000
Binary files a/DLL/MySql/mysql.data.zip and /dev/null differ
diff --git a/DLL/Oracle/OraOps11w.dll b/DLL/Oracle/OraOps11w.dll
deleted file mode 100644
index 3003c6738f..0000000000
Binary files a/DLL/Oracle/OraOps11w.dll and /dev/null differ
diff --git a/DLL/Oracle/Oracle.DataAccess.dll b/DLL/Oracle/Oracle.DataAccess.dll
deleted file mode 100644
index 05d2075fdc..0000000000
Binary files a/DLL/Oracle/Oracle.DataAccess.dll and /dev/null differ
diff --git a/DLL/Oracle/Oracle.DataAccess.zip b/DLL/Oracle/Oracle.DataAccess.zip
deleted file mode 100644
index 1d84c0dc90..0000000000
Binary files a/DLL/Oracle/Oracle.DataAccess.zip and /dev/null differ
diff --git a/DLL/Oracle/Oracle.ManagedDataAccess.dll b/DLL/Oracle/Oracle.ManagedDataAccess.dll
deleted file mode 100644
index c228b7093f..0000000000
Binary files a/DLL/Oracle/Oracle.ManagedDataAccess.dll and /dev/null differ
diff --git a/DLL/Oracle/zh-CHS/Oracle.DataAccess.resources.dll b/DLL/Oracle/zh-CHS/Oracle.DataAccess.resources.dll
deleted file mode 100644
index 5f02c8d1ba..0000000000
Binary files a/DLL/Oracle/zh-CHS/Oracle.DataAccess.resources.dll and /dev/null differ
diff --git a/DLL/Readme.txt b/DLL/Readme.txt
deleted file mode 100644
index 01617bb9e4..0000000000
--- a/DLL/Readme.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-�����������Ŷ� NewLife
-http://nnhy.cnblogs.com
-QQȺ��1600800
\ No newline at end of file
diff --git a/DLL/index.htm b/DLL/index.htm
deleted file mode 100644
index 35ab5c996a..0000000000
--- a/DLL/index.htm
+++ /dev/null
@@ -1,54 +0,0 @@
-﻿<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="description" content="新生命团队,NewLife,魔方,Cube,XCode" />
-    <title>新生命团队X组件</title>
-    <link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon">
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body>
-    <div>
-        <h1>新生命团队X组件</h1>
-        <br>
-        <h2>工具类</h2>
-        <a href="http://x.newlifex.com/XCoder_v6.8_20160806154012.zip">XCoder_v6.8_20160806154012.zip</a><br>
-
-        <h2>数据库驱动</h2>
-        <a href="http://x.newlifex.com/System.Data.SQLite64Fx40.zip">System.Data.SQLite64Fx40.zip</a><br>
-        <a href="http://x.newlifex.com/System.Data.SQLiteFx40.zip">System.Data.SQLiteFx40.zip</a><br>
-        <a href="http://x.newlifex.com/System.Data.SQLite64.zip">System.Data.SQLite64.zip</a><br>
-        <a href="http://x.newlifex.com/System.Data.SQLite.zip">System.Data.SQLite.zip</a><br>
-        <br>
-        <a href="http://x.newlifex.com/mysql.data.zip">mysql.data.zip</a><br>
-        <br>
-        <a href="http://x.newlifex.com/Oracle.DataAccess64Fx40.zip">Oracle.DataAccess64Fx40.zip</a><br>
-        <a href="http://x.newlifex.com/Oracle.DataAccessFx40.zip">Oracle.DataAccessFx40.zip</a><br>
-        <a href="http://x.newlifex.com/Oracle.DataAccess64.zip">Oracle.DataAccess64.zip</a><br>
-        <a href="http://x.newlifex.com/Oracle.DataAccess.zip">Oracle.DataAccess.zip</a><br>
-        <br>
-        <a href="http://x.newlifex.com/System.Data.SqlServerCe64.zip">System.Data.SqlServerCe64.zip</a><br>
-        <a href="http://x.newlifex.com/System.Data.SqlServerCe.zip">System.Data.SqlServerCe.zip</a><br>
-        <br>
-        <a href="http://x.newlifex.com/Interop.ADOX.zip">Interop.ADOX.zip</a><br>
-        <br>
-        <a href="http://x.newlifex.com/Npgsql.zip">Npgsql.zip</a><br>
-
-        <h2>其它驱动</h2>
-        <a href="http://x.newlifex.com/OracleClient64.zip">OracleClient64.zip</a><br>
-        <a href="http://x.newlifex.com/OracleClient.zip">OracleClient.zip</a><br>
-        <br>
-        <a href="http://x.newlifex.com/ip.gz">ip.gz</a><br>
-        <br>
-        <a href="http://x.newlifex.com/PinYin_20150308123448.zip">PinYin_20150308123448.zip</a><br>
-        <br>
-        <a href="http://x.newlifex.com/Microsoft.Speech.zip">Microsoft.Speech.zip</a><br>
-        <a href="http://x.newlifex.com/SpeechRuntime.zip">SpeechRuntime.zip</a><br>
-
-        <h2>魔方资源</h2>
-        <a href="http://x.newlifex.com/Cube_Content_20160806155608.zip">Cube_Content_20160806155608.zip</a><br>
-    </div>
-</body>
-</html>
\ No newline at end of file
diff --git a/Doc b/Doc
deleted file mode 160000
index 17ccb49b51..0000000000
--- a/Doc
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 17ccb49b512980b880c162926eeed5ff677a57ac
diff --git a/MQ/CenterServer/CenterService.csproj b/MQ/CenterServer/CenterService.csproj
deleted file mode 100644
index fc25104737..0000000000
--- a/MQ/CenterServer/CenterService.csproj
+++ /dev/null
@@ -1,71 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{DB9423BC-4971-47C8-9A6B-BBEB741D0454}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>CenterService</RootNamespace>
-    <AssemblyName>CenterService</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationManifest>app.manifest</ApplicationManifest>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-    <None Include="app.manifest">
-      <SubType>Designer</SubType>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\NewLife.Core\NewLife.Core.csproj">
-      <Project>{5813c22e-eeb3-4dee-a45c-bb218041193a}</Project>
-      <Name>NewLife.Core</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/MQ/CenterServer/Program.cs b/MQ/CenterServer/Program.cs
deleted file mode 100644
index c23dfc77d6..0000000000
--- a/MQ/CenterServer/Program.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using NewLife.Log;
-using NewLife.Net;
-using NewLife.Queue.Broker;
-using NewLife.Queue.Center;
-using NewLife.Queue.Clients;
-using NewLife.Remoting;
-
-namespace CenterService
-{
-    class Program
-    {
-        private static BrokerService svr;
-        static void Main(string[] args)
-        {
-            XTrace.UseConsole();
-            XTrace.Debug = true;
-            svr = new BrokerService { ProducerServer = { Log = XTrace.Log } };
-            Test();
-            System.Threading.Thread.Sleep(1000);
-            Client();
-            Console.ReadLine();
-        }
-
-        static void Test()
-        {
-           svr.Start();
-        }
-
-        static async void Client()
-        {
-            var client = new ProducerClient {Log = XTrace.Log};
-            await client.RegisterProducer();
-        }
-    }
-}
diff --git a/MQ/CenterServer/Properties/AssemblyInfo.cs b/MQ/CenterServer/Properties/AssemblyInfo.cs
deleted file mode 100644
index 6c966baccc..0000000000
--- a/MQ/CenterServer/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-﻿using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// 有关程序集的一般信息由以下
-// 控制。更改这些特性值可修改
-// 与程序集关联的信息。
-[assembly: AssemblyTitle("CenterServer")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CenterServer")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-//将 ComVisible 设置为 false 将使此程序集中的类型
-//对 COM 组件不可见。  如果需要从 COM 访问此程序集中的类型，
-//请将此类型的 ComVisible 特性设置为 true。
-[assembly: ComVisible(false)]
-
-// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
-[assembly: Guid("db9423bc-4971-47c8-9a6b-bbeb741d0454")]
-
-// 程序集的版本信息由下列四个值组成: 
-//
-//      主版本
-//      次版本
-//      生成号
-//      修订号
-//
-//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
-// 方法是按如下所示使用“*”: :
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/MQ/CenterServer/app.manifest b/MQ/CenterServer/app.manifest
deleted file mode 100644
index b13936c8e6..0000000000
--- a/MQ/CenterServer/app.manifest
+++ /dev/null
@@ -1,75 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-    <security>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <!-- UAC 清单选项
-             如果想要更改 Windows 用户帐户控制级别，请使用
-             以下节点之一替换 requestedExecutionLevel 节点。n
-        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
-        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
-        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
-
-            指定 requestedExecutionLevel 元素将禁用文件和注册表虚拟化。
-            如果你的应用程序需要此虚拟化来实现向后兼容性，则删除此
-            元素。
-        -->
-        <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-
-  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-    <application>
-      <!-- 设计此应用程序与其一起工作且已针对此应用程序进行测试的
-           Windows 版本的列表。取消评论适当的元素，Windows 将
-           自动选择最兼容的环境。 -->
-
-      <!-- Windows Vista -->
-      <!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
-
-      <!-- Windows 7 -->
-      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
-
-      <!-- Windows 8 -->
-      <!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
-
-      <!-- Windows 8.1 -->
-      <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
-
-      <!-- Windows 10 -->
-      <!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->
-
-    </application>
-  </compatibility>
-
-  <!-- 指示该应用程序可以感知 DPI 且 Windows 在 DPI 较高时将不会对其进行
-       自动缩放。Windows Presentation Foundation (WPF)应用程序自动感知 DPI，无需
-       选择加入。选择加入此设置的 Windows 窗体应用程序(目标设定为 .NET Framework 4.6 )还应
-       在其 app.config 中将 "EnableWindowsFormsHighDpiAutoResizing" 设置设置为 "true"。-->
-  <!--
-  <application xmlns="urn:schemas-microsoft-com:asm.v3">
-    <windowsSettings>
-      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
-    </windowsSettings>
-  </application>
-  -->
-
-  <!-- 启用 Windows 公共控件和对话框的主题(Windows XP 和更高版本) -->
-  <!--
-  <dependency>
-    <dependentAssembly>
-      <assemblyIdentity
-          type="win32"
-          name="Microsoft.Windows.Common-Controls"
-          version="6.0.0.0"
-          processorArchitecture="*"
-          publicKeyToken="6595b64144ccf1df"
-          language="*"
-        />
-    </dependentAssembly>
-  </dependency>
-  -->
-
-</assembly>
diff --git a/MQ/NewLife.Queue/Broker/BatchMessageLogRecord.cs b/MQ/NewLife.Queue/Broker/BatchMessageLogRecord.cs
deleted file mode 100644
index 7ae524c759..0000000000
--- a/MQ/NewLife.Queue/Broker/BatchMessageLogRecord.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-
-namespace NewLife.Queue.Broker
-{
-    public class BatchMessageLogRecord
-    {
-        private readonly IEnumerable<MessageLogRecord> _records;
-        private readonly Action<BatchMessageLogRecord, object> _callback;
-        private readonly object _parameter;
-
-        public IEnumerable<MessageLogRecord> Records
-        {
-            get { return _records; }
-        }
-        public Action<BatchMessageLogRecord, object> Callback
-        {
-            get { return _callback; }
-        }
-
-        public BatchMessageLogRecord(IEnumerable<MessageLogRecord> records, Action<BatchMessageLogRecord, object> callback, object parameter)
-        {
-            _records = records;
-            _callback = callback;
-            _parameter = parameter;
-        }
-
-        public void OnPersisted()
-        {
-            if (_callback != null)
-            {
-                _callback(this, _parameter);
-            }
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Broker/BrokerService.cs b/MQ/NewLife.Queue/Broker/BrokerService.cs
deleted file mode 100644
index dcaa63683e..0000000000
--- a/MQ/NewLife.Queue/Broker/BrokerService.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-﻿using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using NewLife.Queue.Broker.Controllers;
-using NewLife.Remoting;
-
-namespace NewLife.Queue.Broker
-{
-    public class BrokerService: DisposeBase
-    {
-        #region 属性
-
-        public static BrokerService Instance { get; private set; }
-
-        /// <summary>接口服务器</summary>
-        public BrokerSetting Setting { get; private set; }
-
-
-        /// <summary>接口服务器</summary>
-        public ApiServer ProducerServer { get; private set; }
-        /// <summary>
-        /// 发布者集合
-        /// </summary>
-        private readonly ConcurrentDictionary<string /*connectionId*/, ProducerInfo> _producerInfoDict = new ConcurrentDictionary<string, ProducerInfo>();
-        #endregion
-
-        #region 构造
-        /// <summary>实例化</summary>
-        public BrokerService(int port = 2234)
-        {
-            Setting = new BrokerSetting();
-            ProducerServer = new ApiServer(port);
-            Instance = this;
-           
-        }
-
-        /// <summary>销毁</summary>
-        /// <param name="disposing"></param>
-        protected override void OnDispose(bool disposing)
-        {
-            base.OnDispose(disposing);
-
-            Stop();
-        }
-        #endregion
-
-        #region 主要方法
-        /// <summary>开始服务</summary>
-        public void Start()
-        {
-            if (ProducerServer.Active) return;
-
-            // 编码器
-            if (ProducerServer.Encoder == null) ProducerServer.Encoder = new JsonEncoder();
-
-            // 注册控制器
-            ProducerServer.Register<ProducerInfoController>();
-            //Server.Register<TopicController>();
-            //Server.Register<MessageController>();
-
-            // 建立引用
-            ProducerServer["Host"] = this;
-            ProducerServer["ProducerInfoDict"] = _producerInfoDict;
-
-            ProducerServer.Start();
-        }
-
-        /// <summary>停止服务</summary>
-        public void Stop() { ProducerServer.Stop("停止"); }
-        #endregion
-    }
-
-    internal class ProducerInfo
-    {
-        public string ProducerId;
-        public ClientHeartbeatInfo HeartbeatInfo;
-    }
-
-    public class ClientHeartbeatInfo
-    {
-        public IApiSession Session { get; private set; }
-        public DateTime LastHeartbeatTime { get; set; }
-
-        public ClientHeartbeatInfo(IApiSession session)
-        {
-            Session = session;
-        }
-
-        public bool IsTimeout(double timeoutMilliseconds)
-        {
-            return (DateTime.Now - LastHeartbeatTime).TotalMilliseconds >= timeoutMilliseconds;
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Broker/BrokerSetting.cs b/MQ/NewLife.Queue/Broker/BrokerSetting.cs
deleted file mode 100644
index 79ad15a959..0000000000
--- a/MQ/NewLife.Queue/Broker/BrokerSetting.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net;
-using NewLife.Queue.Protocols.Brokers;
-using NewLife.Queue.Storage;
-using NewLife.Queue.Storage.FileNamingStrategies;
-using NewLife.Queue.Utilities;
-
-namespace NewLife.Queue.Broker
-{
-    public class BrokerSetting
-    {
-        /// <summary>Broker基本配置信息
-        /// </summary>
-        public BrokerInfo BrokerInfo { get; set; }
-        /// <summary>NameServer地址列表
-        /// </summary>
-        public IEnumerable<IPEndPoint> NameServerList { get; set; }
-        /// <summary>消息到达时是否立即通知相关的PullRequest，默认为true；
-        /// <remarks>
-        /// 如果希望当前场景消息吞吐量不大且要求消息消费的实时性更高，可以考虑设置为true；设置为false时，最多在<see cref="CheckBlockingPullRequestMilliseconds"/>
-        /// 的时间后，PullRequest会被通知到有新消息；也就是说，设置为false时，消息最多延迟<see cref="CheckBlockingPullRequestMilliseconds"/>。
-        /// </remarks>
-        /// </summary>
-        public bool NotifyWhenMessageArrived { get; set; }
-        /// <summary>Broker定期向NameServer注册信息的时间间隔，默认为5秒钟；
-        /// </summary>
-        public int RegisterBrokerToNameServerInterval { get; set; }
-        /// <summary>删除符合删除条件的消息的定时间隔，默认为10秒钟；
-        /// </summary>
-        public int DeleteMessagesInterval { get; set; }
-        /// <summary>删除符合删除条件的队列中的消息索引的定时间隔；一定是消息先被删除后，该消息索引才会从队列中删除；默认为10秒钟；
-        /// </summary>
-        public int DeleteQueueMessagesInterval { get; set; }
-        /// <summary>表示删除消息文件时，是否需要忽略未消费过的消息，也就是说一满足删除策略条件，就直接删除，不关心这些消息是否还没消费过；默认值未True；
-        /// </summary>
-        public bool DeleteMessageIgnoreUnConsumed { get; set; }
-        /// <summary>持久化消息消费进度的间隔，默认为1s；
-        /// </summary>
-        public int PersistConsumeOffsetInterval { get; set; }
-        /// <summary>扫描PullRequest对应的队列是否有新消息的时间间隔，默认为1s；
-        /// </summary>
-        public int CheckBlockingPullRequestMilliseconds { get; set; }
-        /// <summary>判断生产者者不在线的超时时间，默认为10s；即如果一个生产者10s不发送心跳到Broker，则认为不在线；Broker自动会关闭该生产者的连接并从生产者列表中移除；
-        /// </summary>
-        public int ProducerExpiredTimeout { get; set; }
-        /// <summary>判断消费者心跳的超时时间，默认为10s；即如果一个消费者10s不发送心跳到Broker，则认为不在线；Broker自动会关闭该消费者的连接并从消费者列表中移除；
-        /// </summary>
-        public int ConsumerExpiredTimeout { get; set; }
-        /// <summary>当消费者的链接断开时，是否需要立即将消费者从消费者列表中移除；如果为True，则消费者链接断开时立即移除；否则，会等到消费者心跳的超时时间到达后才会移除该消费者。默认为True
-        /// </summary>
-        public bool RemoveConsumerWhenDisconnect { get; set; }
-        /// <summary>是否自动创建Topic，默认为true；线上环境建议设置为false，Topic应该总是由后台管理控制台来创建；
-        /// </summary>
-        public bool AutoCreateTopic { get; set; }
-        /// <summary>创建Topic时，默认创建的队列数，默认为4；
-        /// </summary>
-        public int TopicDefaultQueueCount { get; set; }
-        /// <summary>一个Topic下最多允许的队列数，默认为256；
-        /// </summary>
-        public int TopicMaxQueueCount { get; set; }
-        /// <summary>消息最大允许的字节数，默认为4MB；
-        /// </summary>
-        public int MessageMaxSize { get; set; }
-        /// <summary>消息写入缓冲队列限流阈值，默认为20000；
-        /// </summary>
-        public int MessageWriteQueueThreshold { get; set; }
-        /// <summary>批量消息写入缓冲队列限流阈值，默认为10000；
-        /// </summary>
-        public int BatchMessageWriteQueueThreshold { get; set; }
-        /// <summary>表示是否在内存模式下运行，内存模式下消息都不存储到文件，仅保存在内存；默认为False；
-        /// </summary>
-        public bool IsMessageStoreMemoryMode { get; set; }
-        /// <summary>EQueue存储文件的根目录
-        /// </summary>
-        public string FileStoreRootPath { get; private set; }
-        /// <summary>最新消息显示个数，默认为100个；
-        /// </summary>
-        public int LatestMessageShowCount { get; set; }
-
-        /// <summary>消息文件存储的相关配置，默认一个消息文件的大小为256MB
-        /// </summary>
-        public ChunkManagerConfig MessageChunkConfig { get; set; }
-        /// <summary>队列文件存储的相关配置，默认一个队列文件中存储100W个消息索引，每个消息索引8个字节
-        /// </summary>
-        public ChunkManagerConfig QueueChunkConfig { get; set; }
-
-        public BrokerSetting(bool isMessageStoreMemoryMode = false, string chunkFileStoreRootPath = @"c:\equeue-store", int messageChunkDataSize = 1024 * 1024 * 1024, int chunkFlushInterval = 100, int chunkCacheMaxPercent = 75, int chunkCacheMinPercent = 40, int maxLogRecordSize = 5 * 1024 * 1024, int chunkWriteBuffer = 128 * 1024, int chunkReadBuffer = 128 * 1024, bool syncFlush = false, FlushOption flushOption = FlushOption.FlushToOS, bool enableCache = true, int messageChunkLocalCacheSize = 300000, int queueChunkLocalCacheSize = 10000)
-        {
-            BrokerInfo = new BrokerInfo(
-                "DefaultBroker",
-                "DefaultGroup",
-                "DefaultCluster",
-                BrokerRole.Master,
-                new IPEndPoint(SocketUtils.GetLocalIPV4(), 5000).ToAddress(),
-                new IPEndPoint(SocketUtils.GetLocalIPV4(), 5001).ToAddress(),
-                new IPEndPoint(SocketUtils.GetLocalIPV4(), 5002).ToAddress());
-
-            NameServerList = new List<IPEndPoint>()
-            {
-                new IPEndPoint(SocketUtils.GetLocalIPV4(), 9493)
-            };
-
-            NotifyWhenMessageArrived = true;
-            RegisterBrokerToNameServerInterval = 1000 * 5;
-            DeleteMessagesInterval = 1000 * 10;
-            DeleteQueueMessagesInterval = 1000 * 10;
-            DeleteMessageIgnoreUnConsumed = true;
-            PersistConsumeOffsetInterval = 1000 * 1;
-            CheckBlockingPullRequestMilliseconds = 1000 * 1;
-            ProducerExpiredTimeout = 1000 * 10;
-            ConsumerExpiredTimeout = 1000 * 10;
-            RemoveConsumerWhenDisconnect = true;
-            AutoCreateTopic = true;
-            TopicDefaultQueueCount = 4;
-            TopicMaxQueueCount = 256;
-            MessageMaxSize = 1024 * 1024 * 4;
-            MessageWriteQueueThreshold = 2 * 10000;
-            BatchMessageWriteQueueThreshold = 1 * 10000;
-            IsMessageStoreMemoryMode = isMessageStoreMemoryMode;
-            FileStoreRootPath = chunkFileStoreRootPath;
-            LatestMessageShowCount = 100;
-            MessageChunkConfig = new ChunkManagerConfig(
-                Path.Combine(chunkFileStoreRootPath, @"message-chunks"),
-                new DefaultFileNamingStrategy("message-chunk-"),
-                messageChunkDataSize,
-                0,
-                0,
-                chunkFlushInterval,
-                enableCache,
-                syncFlush,
-                flushOption,
-                Environment.ProcessorCount * 8,
-                maxLogRecordSize,
-                chunkWriteBuffer,
-                chunkReadBuffer,
-                chunkCacheMaxPercent,
-                chunkCacheMinPercent,
-                1,
-                5,
-                messageChunkLocalCacheSize,
-                true);
-            QueueChunkConfig = new ChunkManagerConfig(
-                Path.Combine(chunkFileStoreRootPath, @"queue-chunks"),
-                new DefaultFileNamingStrategy("queue-chunk-"),
-                0,
-                12,
-                1000000,
-                chunkFlushInterval,
-                enableCache,
-                syncFlush,
-                flushOption,
-                Environment.ProcessorCount * 2,
-                12,
-                chunkWriteBuffer,
-                chunkReadBuffer,
-                chunkCacheMaxPercent,
-                chunkCacheMinPercent,
-                1,
-                5,
-                queueChunkLocalCacheSize,
-                false);
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Broker/BufferLogRecord.cs b/MQ/NewLife.Queue/Broker/BufferLogRecord.cs
deleted file mode 100644
index a478431970..0000000000
--- a/MQ/NewLife.Queue/Broker/BufferLogRecord.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-﻿using System;
-using System.IO;
-using NewLife.Queue.Storage;
-
-namespace NewLife.Queue.Broker
-{
-    public class BufferLogRecord : ILogRecord
-    {
-        public byte[] RecordBuffer { get; set; }
-
-        public void WriteTo(long logPosition, BinaryWriter writer)
-        {
-            writer.Write(RecordBuffer);
-        }
-
-        public void ReadFrom(byte[] recordBuffer)
-        {
-            RecordBuffer = new byte[4 + recordBuffer.Length];
-            Buffer.BlockCopy(BitConverter.GetBytes(recordBuffer.Length), 0, RecordBuffer, 0, 4);
-            Buffer.BlockCopy(recordBuffer, 0, RecordBuffer, 4, recordBuffer.Length);
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Broker/Controllers/ProducerInfoController.cs b/MQ/NewLife.Queue/Broker/Controllers/ProducerInfoController.cs
deleted file mode 100644
index dd5a4cb9ea..0000000000
--- a/MQ/NewLife.Queue/Broker/Controllers/ProducerInfoController.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-﻿using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using NewLife.Remoting;
-
-namespace NewLife.Queue.Broker.Controllers
-{
-    public class ProducerInfoController : IApi
-    {
-        public IApiSession Session { get; set; }
-
-        public bool RegisterProducer(string user,string pass)
-        {
-            var host = Session.GetService<ApiServer>();
-            var producerInfoDict = host["ProducerInfoDict"] as ConcurrentDictionary<string, ProducerInfo>;
-            if (producerInfoDict == null) return false;
-            producerInfoDict.AddOrUpdate(Session.Remote.EndPoint.ToAddress(), key =>
-            {
-                var producerInfo = new ProducerInfo
-                {
-                    ProducerId = Session.Remote.EndPoint.ToAddress(),
-                    HeartbeatInfo = new ClientHeartbeatInfo(Session) { LastHeartbeatTime = DateTime.Now }
-                };
-                host.Log.Info("Producer registered, producerId: {0}, connectionId: {1}", Session.Remote.EndPoint.ToAddress(), key);
-                return producerInfo;
-            }, (key, existingProducerInfo) =>
-            {
-                existingProducerInfo.HeartbeatInfo.LastHeartbeatTime = DateTime.Now;
-                return existingProducerInfo;
-            });
-            return true;
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Broker/DefaultMessageStore.cs b/MQ/NewLife.Queue/Broker/DefaultMessageStore.cs
deleted file mode 100644
index 1d0e289e98..0000000000
--- a/MQ/NewLife.Queue/Broker/DefaultMessageStore.cs
+++ /dev/null
@@ -1,205 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using NewLife.Log;
-using NewLife.Queue.Broker.DeleteMessageStrategies;
-using NewLife.Queue.Center.Controllers;
-using NewLife.Queue.Protocols;
-using NewLife.Queue.Scheduling;
-using NewLife.Queue.Storage;
-using NewLife.Queue.Utilities;
-
-namespace NewLife.Queue.Broker
-{
-    public class DefaultMessageStore : IMessageStore, IDisposable
-    {
-        private ChunkManager _chunkManager;
-        private ChunkWriter _chunkWriter;
-        private ChunkReader _chunkReader;
-        private readonly IDeleteMessageStrategy _deleteMessageStragegy;
-        private readonly IScheduleService _scheduleService;
-        private readonly ILog _logger;
-        private long _minConsumedMessagePosition = -1;
-        private BufferQueue<MessageLogRecord> _bufferQueue;
-        private BufferQueue<BatchMessageLogRecord> _batchMessageBufferQueue;
-        private readonly object _lockObj = new object();
-
-        public long MinMessagePosition
-        {
-            get
-            {
-                return _chunkManager.GetFirstChunk().ChunkHeader.ChunkDataStartPosition;
-            }
-        }
-        public long CurrentMessagePosition
-        {
-            get
-            {
-                return _chunkWriter.CurrentChunk.GlobalDataPosition;
-            }
-        }
-        public int ChunkCount
-        {
-            get { return _chunkManager.GetChunkCount(); }
-        }
-        public int MinChunkNum
-        {
-            get { return _chunkManager.GetFirstChunk().ChunkHeader.ChunkNumber; }
-        }
-        public int MaxChunkNum
-        {
-            get { return _chunkManager.GetLastChunk().ChunkHeader.ChunkNumber; }
-        }
-
-        public DefaultMessageStore(IDeleteMessageStrategy deleteMessageStragegy )
-        {
-            _deleteMessageStragegy = deleteMessageStragegy;
-            _scheduleService = QueueService.ScheduleService;
-            _logger = QueueService.Log;
-        }
-
-        public void Load()
-        {
-            _bufferQueue = new BufferQueue<MessageLogRecord>("MessageBufferQueue", BrokerService.Instance.Setting.MessageWriteQueueThreshold, PersistMessages);
-            _batchMessageBufferQueue = new BufferQueue<BatchMessageLogRecord>("BatchMessageBufferQueue", BrokerService.Instance.Setting.BatchMessageWriteQueueThreshold, BatchPersistMessages);
-            _chunkManager = new ChunkManager("MessageChunk", BrokerService.Instance.Setting.MessageChunkConfig, BrokerService.Instance.Setting.IsMessageStoreMemoryMode);
-            _chunkWriter = new ChunkWriter(_chunkManager);
-            _chunkReader = new ChunkReader(_chunkManager, _chunkWriter);
-
-            _chunkManager.Load(ReadMessage);
-        }
-        public void Start()
-        {
-            _chunkWriter.Open();
-            _scheduleService.StartTask("DeleteMessages", DeleteMessages, 5 * 1000, BrokerService.Instance.Setting.DeleteMessagesInterval);
-        }
-        public void Shutdown()
-        {
-            _scheduleService.StopTask("DeleteMessages");
-            _chunkWriter.Close();
-            _chunkManager.Close();
-        }
-        public void StoreMessageAsync(IQueue queue, Message message, Action<MessageLogRecord, object> callback, object parameter, string producerAddress)
-        {
-            lock (_lockObj)
-            {
-                var record = new MessageLogRecord(
-                    message.Topic,
-                    message.Code,
-                    message.Body,
-                    queue.QueueId,
-                    queue.NextOffset,
-                    message.CreatedTime,
-                    DateTime.Now,
-                    message.Tag,
-                    producerAddress ?? string.Empty,
-                    callback,
-                    parameter);
-                _bufferQueue.EnqueueMessage(record);
-                queue.IncrementNextOffset();
-            }
-        }
-        public void BatchStoreMessageAsync(IQueue queue, IEnumerable<Message> messages, Action<BatchMessageLogRecord, object> callback, object parameter, string producerAddress)
-        {
-            lock (_lockObj)
-            {
-                var recordList = new List<MessageLogRecord>();
-                foreach (var message in messages)
-                {
-                    var record = new MessageLogRecord(
-                        queue.Topic,
-                        message.Code,
-                        message.Body,
-                        queue.QueueId,
-                        queue.NextOffset,
-                        message.CreatedTime,
-                        DateTime.Now,
-                        message.Tag,
-                        producerAddress ?? string.Empty,
-                        null,
-                        null);
-                    recordList.Add(record);
-                    queue.IncrementNextOffset();
-                }
-                var batchRecord = new BatchMessageLogRecord(recordList, callback, parameter);
-                _batchMessageBufferQueue.EnqueueMessage(batchRecord);
-            }
-        }
-        public byte[] GetMessageBuffer(long position)
-        {
-            var record = _chunkReader.TryReadRecordBufferAt(position);
-            if (record != null)
-            {
-                return record.RecordBuffer;
-            }
-            return null;
-        }
-        public QueueMessage GetMessage(long position)
-        {
-            var buffer = GetMessageBuffer(position);
-            if (buffer != null)
-            {
-                var nextOffset = 0;
-                var messageLength = ByteUtil.DecodeInt(buffer, nextOffset, out nextOffset);
-                if (messageLength > 0)
-                {
-                    var message = new QueueMessage();
-                    var messageBytes = new byte[messageLength];
-                    Buffer.BlockCopy(buffer, nextOffset, messageBytes, 0, messageLength);
-                    message.ReadFrom(messageBytes);
-                    return message;
-                }
-            }
-            return null;
-        }
-        public bool IsMessagePositionExist(long position)
-        {
-            var chunk = _chunkManager.GetChunkFor(position);
-            return chunk != null;
-        }
-        public void UpdateMinConsumedMessagePosition(long minConsumedMessagePosition)
-        {
-            _minConsumedMessagePosition = minConsumedMessagePosition;
-        }
-
-        private void PersistMessages(MessageLogRecord record)
-        {
-            _chunkWriter.Write(record);
-            record.OnPersisted();
-        }
-        private void BatchPersistMessages(BatchMessageLogRecord batchRecord)
-        {
-            foreach (var record in batchRecord.Records)
-            {
-                _chunkWriter.Write(record);
-            }
-            batchRecord.OnPersisted();
-        }
-
-        private void DeleteMessages()
-        {
-            var chunks = _deleteMessageStragegy.GetAllowDeleteChunks(_chunkManager, _minConsumedMessagePosition);
-            foreach (var chunk in chunks)
-            {
-                if (_chunkManager.RemoveChunk(chunk))
-                {
-                    _logger.Info("Message chunk #{0} is deleted, chunkPositionScale: [{1}, {2}], minConsumedMessagePosition: {3}",
-                        chunk.ChunkHeader.ChunkNumber,
-                        chunk.ChunkHeader.ChunkDataStartPosition,
-                        chunk.ChunkHeader.ChunkDataEndPosition,
-                        _minConsumedMessagePosition);
-                }
-            }
-        }
-        private MessageLogRecord ReadMessage(byte[] recordBuffer)
-        {
-            var record = new MessageLogRecord();
-            record.ReadFrom(recordBuffer);
-            return record;
-        }
-
-        public void Dispose()
-        {
-            Shutdown();
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Broker/DeleteMessageStrategies/DeleteMessageByCountStrategy.cs b/MQ/NewLife.Queue/Broker/DeleteMessageStrategies/DeleteMessageByCountStrategy.cs
deleted file mode 100644
index 875eaca7f0..0000000000
--- a/MQ/NewLife.Queue/Broker/DeleteMessageStrategies/DeleteMessageByCountStrategy.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-﻿using System.Collections.Generic;
-using System.Linq;
-using NewLife.Queue.Center.Controllers;
-using NewLife.Queue.Storage;
-using NewLife.Queue.Utilities;
-
-namespace NewLife.Queue.Broker.DeleteMessageStrategies
-{
-    public class DeleteMessageByCountStrategy : IDeleteMessageStrategy
-    {
-        /// <summary>表示磁盘上可以保存的最多的Chunk文件的个数；
-        /// <remarks>
-        /// 比如设置为100，则磁盘上可以保存的最多的Chunk文件的个数为100，如果现在总的个数超过100，则最先产生的Chunk文件就会被删除。
-        /// 默认值为100，即如果每个Chunk文件的大小为256MB的话，则100 * 256 = 25GB，即磁盘总共会保存最多默认25GB的消息。
-        /// </remarks>
-        /// </summary>
-        public int MaxChunkCount { get; private set; }
-
-        public DeleteMessageByCountStrategy(int maxChunkCount = 100)
-        {
-            Ensure.Positive(maxChunkCount, "maxChunkCount");
-            MaxChunkCount = maxChunkCount;
-        }
-
-        public IEnumerable<Chunk> GetAllowDeleteChunks(ChunkManager chunkManager, long maxMessagePosition)
-        {
-            var chunks = new List<Chunk>();
-            var allCompletedChunks = chunkManager
-                .GetAllChunks()
-                .Where(x => x.IsCompleted && CheckMessageConsumeOffset(x, maxMessagePosition))
-                .OrderBy(x => x.ChunkHeader.ChunkNumber)
-                .ToList();
-
-            var exceedCount = allCompletedChunks.Count - MaxChunkCount;
-            if (exceedCount <= 0)
-            {
-                return chunks;
-            }
-
-            for (var i = 0; i < exceedCount; i++)
-            {
-                chunks.Add(allCompletedChunks[i]);
-            }
-
-            return chunks;
-        }
-
-        private bool CheckMessageConsumeOffset(Chunk currentChunk, long maxMessagePosition)
-        {
-            if (BrokerService.Instance.Setting.DeleteMessageIgnoreUnConsumed)
-            {
-                return true;
-            }
-            return currentChunk.ChunkHeader.ChunkDataEndPosition <= maxMessagePosition;
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Broker/DeleteMessageStrategies/DeleteMessageByTimeStrategy.cs b/MQ/NewLife.Queue/Broker/DeleteMessageStrategies/DeleteMessageByTimeStrategy.cs
deleted file mode 100644
index c0bc203c1e..0000000000
--- a/MQ/NewLife.Queue/Broker/DeleteMessageStrategies/DeleteMessageByTimeStrategy.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using NewLife.Queue.Center.Controllers;
-using NewLife.Queue.Storage;
-using NewLife.Queue.Utilities;
-
-namespace NewLife.Queue.Broker.DeleteMessageStrategies
-{
-    public class DeleteMessageByTimeStrategy : IDeleteMessageStrategy
-    {
-        /// <summary>表示消息可以保存的最大小时数；
-        /// <remarks>
-        /// 比如设置为24 * 7，则表示如果某个chunk里的所有消息都消费过了，且该chunk里的所有消息都是24 * 7小时之前存储的，则该chunk就可以被删除了。
-        /// 默认值为24 * 30，即保存一个月；用户可以根据自己服务器磁盘的大小决定消息可以保留多久。
-        /// </remarks>
-        /// </summary>
-        public int MaxStorageHours { get; private set; }
-
-        public DeleteMessageByTimeStrategy(int maxStorageHours = 24 * 30)
-        {
-            Ensure.Positive(maxStorageHours, "maxStorageHours");
-            MaxStorageHours = maxStorageHours;
-        }
-
-        public IEnumerable<Chunk> GetAllowDeleteChunks(ChunkManager chunkManager, long maxMessagePosition)
-        {
-            var chunks = new List<Chunk>();
-            var allCompletedChunks = chunkManager
-                .GetAllChunks()
-                .Where(x => x.IsCompleted && CheckMessageConsumeOffset(x, maxMessagePosition))
-                .OrderBy(x => x.ChunkHeader.ChunkNumber);
-
-            foreach (var chunk in allCompletedChunks)
-            {
-                var lastWriteTime = new FileInfo(chunk.FileName).LastWriteTime;
-                var storageHours = (DateTime.Now - lastWriteTime).TotalHours;
-                if (storageHours >= MaxStorageHours)
-                {
-                    chunks.Add(chunk);
-                }
-            }
-
-            return chunks;
-        }
-
-        private bool CheckMessageConsumeOffset(Chunk currentChunk, long maxMessagePosition)
-        {
-            if (BrokerService.Instance.Setting.DeleteMessageIgnoreUnConsumed)
-            {
-                return true;
-            }
-            return currentChunk.ChunkHeader.ChunkDataEndPosition <= maxMessagePosition;
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Broker/DeleteMessageStrategies/IDeleteMessageStrategy.cs b/MQ/NewLife.Queue/Broker/DeleteMessageStrategies/IDeleteMessageStrategy.cs
deleted file mode 100644
index b5b069d93b..0000000000
--- a/MQ/NewLife.Queue/Broker/DeleteMessageStrategies/IDeleteMessageStrategy.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-﻿using System.Collections.Generic;
-using NewLife.Queue.Storage;
-
-namespace NewLife.Queue.Broker.DeleteMessageStrategies
-{
-    public interface IDeleteMessageStrategy
-    {
-        IEnumerable<Chunk> GetAllowDeleteChunks(ChunkManager chunkManager, long maxMessagePosition);
-    }
-}
diff --git a/MQ/NewLife.Queue/Broker/Extensions.cs b/MQ/NewLife.Queue/Broker/Extensions.cs
deleted file mode 100644
index f22952c2ca..0000000000
--- a/MQ/NewLife.Queue/Broker/Extensions.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-﻿using NewLife.Queue.Storage;
-
-namespace NewLife.Queue.Broker
-{
-    public static class Extensions
-    {
-        public static BufferLogRecord TryReadRecordBufferAt(this ChunkReader chunkReader, long position)
-        {
-            return chunkReader.TryReadAt(position, recordBuffer =>
-            {
-                var record = new BufferLogRecord();
-                record.ReadFrom(recordBuffer);
-                return record;
-            });
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Broker/IMessageStore.cs b/MQ/NewLife.Queue/Broker/IMessageStore.cs
deleted file mode 100644
index 1f7f091582..0000000000
--- a/MQ/NewLife.Queue/Broker/IMessageStore.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using NewLife.Queue.Protocols;
-
-namespace NewLife.Queue.Broker
-{
-    public interface IMessageStore
-    {
-        /// <summary>
-        /// 
-        /// </summary>
-        long MinMessagePosition { get; }
-        /// <summary>
-        /// 
-        /// </summary>
-        long CurrentMessagePosition { get; }
-        /// <summary>
-        /// 
-        /// </summary>
-        int ChunkCount { get; }
-        /// <summary>
-        /// 
-        /// </summary>
-        int MinChunkNum { get; }
-        /// <summary>
-        /// 
-        /// </summary>
-        int MaxChunkNum { get; }
-        /// <summary>
-        /// 
-        /// </summary>
-        void Load();
-        /// <summary>
-        /// 
-        /// </summary>
-        void Start();
-        /// <summary>
-        /// 
-        /// </summary>
-        void Shutdown();
-
-        void StoreMessageAsync(IQueue queue, Message message, Action<MessageLogRecord, object> callback, object parameter, string producerAddress);
-        void BatchStoreMessageAsync(IQueue queue, IEnumerable<Message> messages, Action<BatchMessageLogRecord, object> callback, object parameter, string producerAddress);
-        byte[] GetMessageBuffer(long position);
-        QueueMessage GetMessage(long position);
-        bool IsMessagePositionExist(long position);
-        void UpdateMinConsumedMessagePosition(long minConsumedMessagePosition);
-    }
-}
diff --git a/MQ/NewLife.Queue/Broker/MessageLogRecord.cs b/MQ/NewLife.Queue/Broker/MessageLogRecord.cs
deleted file mode 100644
index 4956081bae..0000000000
--- a/MQ/NewLife.Queue/Broker/MessageLogRecord.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-﻿using System;
-using System.IO;
-using System.Text;
-using NewLife.Queue.Protocols;
-using NewLife.Queue.Storage;
-using NewLife.Queue.Utilities;
-
-namespace NewLife.Queue.Broker
-{
-    [Serializable]
-    public class MessageLogRecord : QueueMessage, ILogRecord
-    {
-        private static readonly byte[] EmptyBytes = new byte[0];
-        private readonly Action<MessageLogRecord, object> _callback;
-        private readonly object _parameter;
-
-        public MessageLogRecord() { }
-        public MessageLogRecord(
-            string topic,
-            int code,
-            byte[] body,
-            int queueId,
-            long queueOffset,
-            DateTime createdTime,
-            DateTime storedTime,
-            string tag, string producerAddress, Action<MessageLogRecord, object> callback, object parameter)
-            : base(null, topic, code, body, queueId, queueOffset, createdTime, storedTime, tag, producerAddress)
-        {
-            _callback = callback;
-            _parameter = parameter;
-        }
-
-        public void WriteTo(long logPosition, BinaryWriter writer)
-        {
-            LogPosition = logPosition;
-            MessageId = MessageIdUtil.CreateMessageId(logPosition);
-
-            //logPosition
-            writer.Write(LogPosition);
-
-            //messageId
-            var messageIdBytes = Encoding.UTF8.GetBytes(MessageId);
-            writer.Write(messageIdBytes.Length);
-            writer.Write(messageIdBytes);
-
-            //topic
-            var topicBytes = Encoding.UTF8.GetBytes(Topic);
-            writer.Write(topicBytes.Length);
-            writer.Write(topicBytes);
-
-            //tag
-            var tagBytes = EmptyBytes;
-            if (!string.IsNullOrEmpty(Tag))
-            {
-                tagBytes = Encoding.UTF8.GetBytes(Tag);
-            }
-            writer.Write(tagBytes.Length);
-            writer.Write(tagBytes);
-
-            //producerAddress
-            var producerAddressBytes = Encoding.UTF8.GetBytes(ProducerAddress);
-            writer.Write(producerAddressBytes.Length);
-            writer.Write(producerAddressBytes);
-
-            //code
-            writer.Write(Code);
-
-            //body
-            writer.Write(Body.Length);
-            writer.Write(Body);
-
-            //queueId
-            writer.Write(QueueId);
-
-            //queueOffset
-            writer.Write(QueueOffset);
-
-            //createdTime
-            writer.Write(CreatedTime.Ticks);
-
-            //storedTime
-            writer.Write(StoredTime.Ticks);
-        }
-        public void OnPersisted()
-        {
-            if (_callback != null)
-            {
-                _callback(this, _parameter);
-            }
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Broker/Queue.cs b/MQ/NewLife.Queue/Broker/Queue.cs
deleted file mode 100644
index 51c4cf68b7..0000000000
--- a/MQ/NewLife.Queue/Broker/Queue.cs
+++ /dev/null
@@ -1,219 +0,0 @@
-﻿using System;
-using System.IO;
-using System.Linq;
-using NewLife.Log;
-using NewLife.Model;
-using NewLife.Queue.Center.Controllers;
-using NewLife.Queue.Protocols.Brokers;
-using NewLife.Queue.Storage;
-using NewLife.Remoting;
-using NewLife.Serialization;
-
-namespace NewLife.Queue.Broker
-{
-    public interface IQueue
-    {
-        string Topic { get; }
-        int QueueId { get; }
-        long NextOffset { get; }
-        long IncrementNextOffset();
-    }
-    public class Queue : IQueue
-    {
-        private const string QueueSettingFileName = "queue.setting";
-        private readonly ChunkWriter _chunkWriter;
-        private readonly ChunkReader _chunkReader;
-        private readonly ChunkManager _chunkManager;
-        private readonly string _queueSettingFile;
-        private QueueSetting _setting;
-        private long _nextOffset = 0;
-        private ILog _logger= QueueService.Log;
-
-        public string Topic { get; private set; }
-        public int QueueId { get; private set; }
-        public long NextOffset { get { return _nextOffset; } }
-        public QueueSetting Setting { get { return _setting; } }
-        public QueueKey Key { get; private set; }
-
-        public Queue(string topic, int queueId)
-        {
-            Topic = topic;
-            QueueId = queueId;
-            Key = new QueueKey(topic, queueId);
-
-
-            _chunkManager = new ChunkManager("QueueChunk-" + Key.ToString(), BrokerService.Instance.Setting.QueueChunkConfig, BrokerService.Instance.Setting.IsMessageStoreMemoryMode, Topic + @"\" + QueueId);
-            _chunkWriter = new ChunkWriter(_chunkManager);
-            _chunkReader = new ChunkReader(_chunkManager, _chunkWriter);
-            _queueSettingFile = Path.Combine(_chunkManager.ChunkPath, QueueSettingFileName);
-
-        }
-
-        public void Load()
-        {
-            _setting = LoadQueueSetting();
-            if (_setting == null)
-            {
-                _setting = new QueueSetting();
-                SaveQueueSetting();
-            }
-            if (_setting.IsDeleted)
-            {
-                return;
-            }
-            _chunkManager.Load(ReadMessageIndex);
-            _chunkWriter.Open();
-
-            var lastChunk = _chunkManager.GetLastChunk();
-            var lastOffsetGlobalPosition = lastChunk.DataPosition + lastChunk.ChunkHeader.ChunkDataStartPosition;
-            if (lastOffsetGlobalPosition > 0)
-            {
-                _nextOffset = lastOffsetGlobalPosition / _chunkManager.Config.ChunkDataUnitSize;
-            }
-        }
-        public void Close()
-        {
-            _chunkWriter.Close();
-            _chunkManager.Close();
-        }
-        public void AddMessage(long messagePosition, string messageTag)
-        {
-            _chunkWriter.Write(new QueueLogRecord(messagePosition + 1, messageTag.Length));
-        }
-        public long GetMessagePosition(long queueOffset, out int tagCode, bool autoCache = true)
-        {
-            tagCode = 0;
-
-            var position = queueOffset * _chunkManager.Config.ChunkDataUnitSize;
-            var record = _chunkReader.TryReadAt(position, ReadMessageIndex, autoCache);
-            if (record == null)
-            {
-                return -1L;
-            }
-
-            tagCode = record.TagCode;
-            return record.MessageLogPosition - 1;
-        }
-        public void SetProducerVisible(bool visible)
-        {
-            _setting.ProducerVisible = visible;
-            SaveQueueSetting();
-        }
-        public void SetConsumerVisible(bool visible)
-        {
-            _setting.ConsumerVisible = visible;
-            SaveQueueSetting();
-        }
-        public void Delete()
-        {
-            _setting.IsDeleted = true;
-            SaveQueueSetting();
-
-            Close();
-
-            if (!_chunkManager.IsMemoryMode)
-            {
-                Directory.Delete(_chunkManager.ChunkPath, true);
-            }
-        }
-        public long IncrementNextOffset()
-        {
-            return _nextOffset++;
-        }
-        public long GetMinQueueOffset()
-        {
-            if (_nextOffset == 0L)
-            {
-                return -1L;
-            }
-            return _chunkManager.GetFirstChunk().ChunkHeader.ChunkDataStartPosition / _chunkManager.Config.ChunkDataUnitSize;
-        }
-        public void DeleteMessages(long minMessagePosition)
-        {
-            var chunks = _chunkManager.GetAllChunks().Where(x => x.IsCompleted).OrderBy(x => x.ChunkHeader.ChunkNumber);
-
-            foreach (var chunk in chunks)
-            {
-                var maxPosition = chunk.ChunkHeader.ChunkDataEndPosition - _chunkManager.Config.ChunkDataUnitSize;
-                var record = _chunkReader.TryReadAt(maxPosition, ReadMessageIndex, false);
-                if (record == null)
-                {
-                    continue;
-                }
-                var chunkLastMessagePosition = record.MessageLogPosition - 1;
-                if (chunkLastMessagePosition < minMessagePosition)
-                {
-                    if (_chunkManager.RemoveChunk(chunk))
-                    {
-                        _logger.Info("Queue (topic: {0}, queueId: {1}) chunk #{2} is deleted, chunkLastMessagePosition: {3}, messageStoreMinMessagePosition: {4}", Topic, QueueId, chunk.ChunkHeader.ChunkNumber, chunkLastMessagePosition, minMessagePosition);
-                    }
-                }
-            }
-        }
-
-        private QueueLogRecord ReadMessageIndex(byte[] recordBuffer)
-        {
-            var record = new QueueLogRecord();
-            record.ReadFrom(recordBuffer);
-            if (record.MessageLogPosition <= 0)
-            {
-                return null;
-            }
-            return record;
-        }
-        private QueueSetting LoadQueueSetting()
-        {
-            if (_chunkManager.IsMemoryMode)
-            {
-                return null;
-            }
-            if (!Directory.Exists(_chunkManager.ChunkPath))
-            {
-                Directory.CreateDirectory(_chunkManager.ChunkPath);
-            }
-            using (var stream = new FileStream(_queueSettingFile, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.ReadWrite))
-            {
-                using (var reader = new StreamReader(stream))
-                {
-                    var text = reader.ReadToEnd();
-                    if (!string.IsNullOrEmpty(text))
-                    {
-                        return new JsonEncoder().Convert<QueueSetting>(text);
-                    }
-                    return null;
-                }
-            }
-        }
-        private void SaveQueueSetting()
-        {
-            if (_chunkManager.IsMemoryMode)
-            {
-                return;
-            }
-            if (!Directory.Exists(_chunkManager.ChunkPath))
-            {
-                Directory.CreateDirectory(_chunkManager.ChunkPath);
-            }
-            using (var stream = new FileStream(_queueSettingFile, FileMode.Create, FileAccess.ReadWrite, FileShare.ReadWrite))
-            {
-                using (var writer = new StreamWriter(stream))
-                {
-                    writer.Write(new JsonEncoder().Encode(_setting));
-                }
-            }
-        }
-    }
-    public class QueueSetting
-    {
-        public bool ProducerVisible;
-        public bool ConsumerVisible;
-        public bool IsDeleted;
-
-        public QueueSetting()
-        {
-            ProducerVisible = true;
-            ConsumerVisible = true;
-            IsDeleted = false;
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Broker/QueueLogRecord.cs b/MQ/NewLife.Queue/Broker/QueueLogRecord.cs
deleted file mode 100644
index 7a5b81bb32..0000000000
--- a/MQ/NewLife.Queue/Broker/QueueLogRecord.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-﻿using System;
-using System.IO;
-using NewLife.Queue.Storage;
-
-namespace NewLife.Queue.Broker
-{
-    public class QueueLogRecord : ILogRecord
-    {
-        public long MessageLogPosition { get; private set; }
-        public int TagCode { get; private set; }
-
-        public QueueLogRecord() { }
-        public QueueLogRecord(long messageLogPosition, int tagCode)
-        {
-            MessageLogPosition = messageLogPosition;
-            TagCode = tagCode;
-        }
-        public void WriteTo(long logPosition, BinaryWriter writer)
-        {
-            writer.Write(MessageLogPosition);
-            writer.Write(TagCode);
-        }
-        public void ReadFrom(byte[] recordBuffer)
-        {
-            MessageLogPosition = BitConverter.ToInt64(recordBuffer, 0);
-            TagCode = BitConverter.ToInt32(recordBuffer, 8);
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Center/CenterServer.cs b/MQ/NewLife.Queue/Center/CenterServer.cs
deleted file mode 100644
index 73bb8c0e43..0000000000
--- a/MQ/NewLife.Queue/Center/CenterServer.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using NewLife.Log;
-using NewLife.Net;
-using NewLife.Queue.Center.Controllers;
-using NewLife.Remoting;
-
-namespace NewLife.Queue.Center
-{
-    /// <summary>
-    /// 中心服务器
-    /// </summary>
-    public class CenterServer : ApiServer
-    {
-        public readonly Setting CurrentCfg = Setting.Current;
-        public ClusterManager ClusterManager { get; }
-
-        public string Demo => "My Info";
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="port"></param>
-        public CenterServer(int port = 0)
-        {
-            if (port == 0) port = CurrentCfg.Port;
-            Encoder = new JsonEncoder();
-            if (CurrentCfg.Debug) Log = XTrace.Log;
-            Add(new NetUri(NetType.Unknown, "", port));
-            ClusterManager = new ClusterManager(this);
-            //// Register<BrokerController>();
-             Register<DemoController>();
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Center/ClusterManager.cs b/MQ/NewLife.Queue/Center/ClusterManager.cs
deleted file mode 100644
index 454c8a9b80..0000000000
--- a/MQ/NewLife.Queue/Center/ClusterManager.cs
+++ /dev/null
@@ -1,177 +0,0 @@
-﻿using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using NewLife.Queue.Protocols.Brokers;
-using NewLife.Queue.Protocols.CenterServers.Requests;
-using NewLife.Remoting;
-using NewLife.Serialization;
-using NewLife.Threading;
-using NewLife.Net;
-
-namespace NewLife.Queue.Center
-{
-    public class ClusterManager: IClusterManager
-    {
-        private readonly ConcurrentDictionary<string /*clusterName*/, Cluster> _clusterDict;
-        private readonly CenterServer _centerServer;
-        private readonly object _lockObj = new object();
-        private TimerX _time;
-        public ClusterManager(CenterServer centerServer)
-        {
-            _centerServer = centerServer;
-            _clusterDict = new ConcurrentDictionary<string, Cluster>();
-        }
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="apiSession"></param>
-        /// <param name="request"></param>
-        public void RegisterBroker(IApiSession apiSession, BrokerRegistrationRequest request)
-        {
-            lock (_lockObj)
-            {
-                var brokerInfo = request.BrokerInfo;
-                var cluster = _clusterDict.GetOrAdd(brokerInfo.ClusterName, x => new Cluster { ClusterName = x });
-                var brokerGroup = cluster.BrokerGroups.GetOrAdd(brokerInfo.GroupName, x => new BrokerGroup { GroupName = x });
-                Broker broker;
-                if (!brokerGroup.Brokers.TryGetValue(brokerInfo.BrokerName, out broker))
-                {
-                    var netSession = apiSession as INetSession;
-                    if (netSession != null)
-                    {
-                        var connectionId = netSession.Remote.EndPoint.ToAddress();
-                        broker = new Broker
-                        {
-                            BrokerInfo = request.BrokerInfo,
-                            TotalSendThroughput = request.TotalSendThroughput,
-                            TotalConsumeThroughput = request.TotalConsumeThroughput,
-                            TotalUnConsumedMessageCount = request.TotalUnConsumedMessageCount,
-                            TopicQueueInfoList = request.TopicQueueInfoList,
-                            TopicConsumeInfoList = request.TopicConsumeInfoList,
-                            ProducerList = request.ProducerList,
-                            ConsumerList = request.ConsumerList,
-                            ApiSession = apiSession,
-                            ConnectionId = connectionId,
-                            LastActiveTime = DateTime.Now,
-                            FirstRegisteredTime = DateTime.Now,
-                            Group = brokerGroup
-                        };
-                        if (brokerGroup.Brokers.TryAdd(brokerInfo.BrokerName, broker))
-                        {
-                            _centerServer.Log.Info("Registered new broker, brokerInfo: {0}", brokerInfo.ToJson());
-                        }
-                    }
-                    else
-                    {
-                        _centerServer.Log.Error("Registered broker Erro, brokerInfo: {0}", brokerInfo.ToJson());
-                    }
-                   
-                }
-                else
-                {
-                    broker.LastActiveTime = DateTime.Now;
-                    broker.TotalSendThroughput = request.TotalSendThroughput;
-                    broker.TotalConsumeThroughput = request.TotalConsumeThroughput;
-                    broker.TotalUnConsumedMessageCount = request.TotalUnConsumedMessageCount;
-
-                    if (!broker.BrokerInfo.IsEqualsWith(request.BrokerInfo))
-                    {
-                        _centerServer.Log.Info("Broker basicInfo changed, old: {0}, new: {1}", broker.BrokerInfo, request.BrokerInfo);
-                        broker.BrokerInfo = request.BrokerInfo;
- 
-                    }
-
-                    broker.TopicQueueInfoList = request.TopicQueueInfoList;
-                    broker.TopicConsumeInfoList = request.TopicConsumeInfoList;
-                    broker.ProducerList = request.ProducerList;
-                    broker.ConsumerList = request.ConsumerList;
-                }
-            }
-        }
-
-        public void Start()
-        {
-            lock (_lockObj)
-            {
-                _clusterDict.Clear();
-            }
-            _time = new TimerX(s => { ScanNotActiveBroker(); }, null, 1000, 1000);
-        }
-        public void Shutdown()
-        {
-            lock (_lockObj)
-            {
-                _clusterDict.Clear();
-            }
-            _time?.Dispose();
-        }
-
-        private void ScanNotActiveBroker()
-        {
-            lock (_lockObj)
-            {
-                foreach (var cluster in _clusterDict.Values)
-                {
-                    foreach (var brokerGroup in cluster.BrokerGroups.Values)
-                    {
-                        var notActiveBrokers = new List<Broker>();
-                        foreach (var broker in brokerGroup.Brokers.Values)
-                        {
-                            if (broker.IsTimeout(_centerServer.CurrentCfg.BrokerInactiveMaxMilliseconds))
-                            {
-                                notActiveBrokers.Add(broker);
-                            }
-                        }
-                        if (notActiveBrokers.Count > 0)
-                        {
-                            foreach (var broker in notActiveBrokers)
-                            {
-                                Broker removed;
-                                if (brokerGroup.Brokers.TryRemove(broker.BrokerInfo.BrokerName, out removed))
-                                {
-                                    //_logger.InfoFormat("Removed timeout broker, brokerInfo: {0}, lastActiveTime: {1}", _jsonSerializer.Serialize(removed.BrokerInfo), removed.LastActiveTime);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-    class Broker
-    {
-        public BrokerInfo BrokerInfo { get; set; }
-        public long TotalSendThroughput { get; set; }
-        public long TotalConsumeThroughput { get; set; }
-        public long TotalUnConsumedMessageCount { get; set; }
-        public IList<TopicQueueInfo> TopicQueueInfoList = new List<TopicQueueInfo>();
-        public IList<TopicConsumeInfo> TopicConsumeInfoList = new List<TopicConsumeInfo>();
-        public IList<string> ProducerList = new List<string>();
-        public IList<ConsumerInfo> ConsumerList = new List<ConsumerInfo>();
-        public string ConnectionId { get; set; }
-        public IApiSession ApiSession { get; set; }
-        public DateTime LastActiveTime { get; set; }
-        public BrokerGroup Group { get; set; }
-        public DateTime FirstRegisteredTime { get; set; }
-
-        public bool IsTimeout(double timeoutMilliseconds)
-        {
-            return (DateTime.Now - LastActiveTime).TotalMilliseconds >= timeoutMilliseconds;
-        }
-    }
-
-    class BrokerGroup
-    {
-        public string GroupName { get; set; }
-        public ConcurrentDictionary<string /*brokerName*/, Broker> Brokers = new ConcurrentDictionary<string, Broker>();
-    }
-    class Cluster
-    {
-        public string ClusterName { get; set; }
-        public ConcurrentDictionary<string /*groupName*/, BrokerGroup> BrokerGroups = new ConcurrentDictionary<string, BrokerGroup>();
-    }
-
-}
diff --git a/MQ/NewLife.Queue/Center/Controllers/BrokerController.cs b/MQ/NewLife.Queue/Center/Controllers/BrokerController.cs
deleted file mode 100644
index 595d8e2d23..0000000000
--- a/MQ/NewLife.Queue/Center/Controllers/BrokerController.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using NewLife.Net;
-using NewLife.Queue.Protocols;
-using NewLife.Queue.Protocols.CenterServers.Requests;
-using NewLife.Remoting;
-
-namespace NewLife.Queue.Center.Controllers
-{
-    public class BrokerController : IApi
-    {
-        public IApiSession Session { get; set; }
-
-
-        public RemotingResponse RegisterBroker(BrokerRegistrationRequest model)
-        {
-            var netsession = Session as INetSession;
-            if (netsession != null)
-            {
-                var server = netsession.Server as CenterServer;
-                server?.ClusterManager.RegisterBroker(Session,model);
-            }
-            return new RemotingResponse();
-        }
-    }
-
-    class DemoController : IApi
-    {
-        public IApiSession Session { get; set; }
-
-        public string Say(string msg)
-        {
-            var netsession = Session as INetSession;
-            if (netsession != null)
-            {
-                var server = netsession.Host;
-                return  msg;
-            }
-            return "不对" + msg;
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Center/IClusterManager.cs b/MQ/NewLife.Queue/Center/IClusterManager.cs
deleted file mode 100644
index 466f347334..0000000000
--- a/MQ/NewLife.Queue/Center/IClusterManager.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace NewLife.Queue.Center
-{
-    public interface IClusterManager
-    {
-
-    }
-}
diff --git a/MQ/NewLife.Queue/Center/Setting.cs b/MQ/NewLife.Queue/Center/Setting.cs
deleted file mode 100644
index 576159de52..0000000000
--- a/MQ/NewLife.Queue/Center/Setting.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-﻿using System.ComponentModel;
-using NewLife.Xml;
-
-namespace NewLife.Queue.Center
-{
-    /// <summary>
-    /// 控制中心配置
-    /// </summary>
-    [DisplayName("控制中心配置")]
-#if !__MOBILE__
-    [XmlConfigFile(@"Config\CenterServer.config", 15000)]
-#endif
-    public class Setting : XmlConfig<Setting>
-    {
-        /// <summary>调试</summary>
-        [Description("调试")]
-        public bool Debug { get; set; } = true;
-        /// <summary>网络端口</summary>
-        [Description("网络端口")]
-        public int Port { get; set; } = 3344;
-
-        /// <summary>Broker不活跃最大允许时间，如果一个Broker超过此时间未发送心跳，则认为此Broker挂掉了；默认超时时间为10s;</summary>
-        [Description("Broker不活跃最大允许时间，如果一个Broker超过此时间未发送心跳，则认为此Broker挂掉了；默认超时时间为10s;")]
-        public int BrokerInactiveMaxMilliseconds { get; set; } = 10*1000;
-    }
-}
diff --git a/MQ/NewLife.Queue/Clients/ProducerClient.cs b/MQ/NewLife.Queue/Clients/ProducerClient.cs
deleted file mode 100644
index 9356cdbb4d..0000000000
--- a/MQ/NewLife.Queue/Clients/ProducerClient.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using NewLife.Log;
-using NewLife.Net;
-using NewLife.Remoting;
-
-namespace NewLife.Queue.Clients
-{
-    public class ProducerClient : DisposeBase
-    {
-        #region 属性
-
-        /// <summary>名称</summary>
-        public string Name { get; set; } = "laoqiu";
-
-        /// <summary>远程地址</summary>
-        public NetUri Remote { get; set; }
-
-        /// <summary>网络客户端</summary>
-        public ApiClient Client { get; set; }
-
-        /// <summary>已登录</summary>
-        public bool Logined { get; private set; }
-        #endregion
-
-        #region 构造函数
-        /// <summary>实例化</summary>
-        public ProducerClient(int port=2234)
-        {
-            Remote = new NetUri(NetType.Tcp, NetHelper.MyIP(), port);
-
-            // 还未上消息格式，暂时用Udp替代Tcp，避免粘包问题
-            //Remote = new NetUri(ProtocolType.Udp, NetHelper.MyIP(), 2234);
-        }
-
-        /// <summary>销毁</summary>
-        /// <param name="disposing"></param>
-        protected override void OnDispose(Boolean disposing)
-        {
-            base.OnDispose(disposing);
-
-            Close();
-
-            Client.TryDispose();
-        }
-        #endregion
-
-        #region 登录验证
-        /// <summary>登录</summary>
-        /// <returns></returns>
-        public async Task<bool> RegisterProducer()
-        {
-            Open();
-
-            var rs = await Client.InvokeAsync<bool>("ProducerInfo/RegisterProducer", new { user = Name, pass = Name.MD5() });
-            Logined = rs;
-
-            return rs;
-        }
-        #endregion
-
-        #region 打开关闭
-        /// <summary>打开</summary>
-        public void Open()
-        {
-            var ac = Client;
-            if (ac != null && !ac.Disposed) return;
-            ac = new ApiClient(Remote)
-            {
-                Encoder = new JsonEncoder(),
-                Log = Log
-            };
-
-            var ss = ac.Client as IApiSession;
-            if (ss != null) ss["user"] = Name;
-
-            ac.Open();
-
-            Client = ac;
-
-            //// 异步登录
-            //if (!Name.IsNullOrEmpty()) Task.Run(Login);
-        }
-
-        /// <summary>关闭</summary>
-        public void Close()
-        {
-            Client.Close("关闭");
-        }
-        #endregion
-
-        #region 日志
-        /// <summary>日志</summary>
-        public ILog Log { get; set; } = Logger.Null;
-        #endregion
-    }
-}
diff --git a/MQ/NewLife.Queue/NewLife.Queue.csproj b/MQ/NewLife.Queue/NewLife.Queue.csproj
deleted file mode 100644
index 2192d0dfda..0000000000
--- a/MQ/NewLife.Queue/NewLife.Queue.csproj
+++ /dev/null
@@ -1,181 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{F850252F-4048-4A89-B4C4-19C9EE783F00}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>NewLife.Queue</RootNamespace>
-    <AssemblyName>NewLife.Queue</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.VisualBasic" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Broker\BatchMessageLogRecord.cs" />
-    <Compile Include="Broker\BrokerService.cs" />
-    <Compile Include="Broker\BrokerSetting.cs" />
-    <Compile Include="Broker\BufferLogRecord.cs" />
-    <Compile Include="Broker\Controllers\ProducerInfoController.cs" />
-    <Compile Include="Broker\DefaultMessageStore.cs" />
-    <Compile Include="Broker\DeleteMessageStrategies\DeleteMessageByCountStrategy.cs" />
-    <Compile Include="Broker\DeleteMessageStrategies\DeleteMessageByTimeStrategy.cs" />
-    <Compile Include="Broker\DeleteMessageStrategies\IDeleteMessageStrategy.cs" />
-    <Compile Include="Broker\Extensions.cs" />
-    <Compile Include="Broker\IMessageStore.cs" />
-    <Compile Include="Broker\MessageLogRecord.cs" />
-    <Compile Include="Broker\Queue.cs" />
-    <Compile Include="Broker\QueueLogRecord.cs" />
-    <Compile Include="Center\CenterServer.cs" />
-    <Compile Include="Center\ClusterManager.cs" />
-    <Compile Include="Center\Controllers\BrokerController.cs" />
-    <Compile Include="Center\IClusterManager.cs" />
-    <Compile Include="Center\Setting.cs" />
-    <Compile Include="Clients\ProducerClient.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Protocols\BatchMessageItemResult.cs" />
-    <Compile Include="Protocols\BatchMessageStoreResult.cs" />
-    <Compile Include="Protocols\Brokers\BrokerInfo.cs" />
-    <Compile Include="Protocols\Brokers\BrokerRequestCode.cs" />
-    <Compile Include="Protocols\Brokers\BrokerRole.cs" />
-    <Compile Include="Protocols\Brokers\BrokerStatisticInfo.cs" />
-    <Compile Include="Protocols\Brokers\ConsumerHeartbeatData.cs" />
-    <Compile Include="Protocols\Brokers\ConsumerInfo.cs" />
-    <Compile Include="Protocols\Brokers\QueueKey.cs" />
-    <Compile Include="Protocols\Brokers\Requests\AddQueueRequest.cs" />
-    <Compile Include="Protocols\Brokers\Requests\BatchSendMessageRequest.cs" />
-    <Compile Include="Protocols\Brokers\Requests\CreateTopicRequest.cs" />
-    <Compile Include="Protocols\Brokers\Requests\DeleteConsumerGroupRequest.cs" />
-    <Compile Include="Protocols\Brokers\Requests\DeleteQueueRequest.cs" />
-    <Compile Include="Protocols\Brokers\Requests\DeleteTopicRequest.cs" />
-    <Compile Include="Protocols\Brokers\Requests\GetConsumerIdsForTopicRequest.cs" />
-    <Compile Include="Protocols\Brokers\Requests\GetConsumerListRequest.cs" />
-    <Compile Include="Protocols\Brokers\Requests\GetMessageDetailRequest.cs" />
-    <Compile Include="Protocols\Brokers\Requests\GetTopicConsumeInfoRequest.cs" />
-    <Compile Include="Protocols\Brokers\Requests\GetTopicQueueInfoRequest.cs" />
-    <Compile Include="Protocols\Brokers\Requests\PullMessageRequest.cs" />
-    <Compile Include="Protocols\Brokers\Requests\SendMessageRequest.cs" />
-    <Compile Include="Protocols\Brokers\Requests\SetQueueConsumerVisibleRequest.cs" />
-    <Compile Include="Protocols\Brokers\Requests\SetQueueNextConsumeOffsetRequest.cs" />
-    <Compile Include="Protocols\Brokers\Requests\SetQueueProducerVisibleRequest.cs" />
-    <Compile Include="Protocols\Brokers\Requests\UpdateQueueOffsetRequest.cs" />
-    <Compile Include="Protocols\Brokers\TopicConsumeInfo.cs" />
-    <Compile Include="Protocols\Brokers\TopicQueueInfo.cs" />
-    <Compile Include="Protocols\ConsumeFromWhere.cs" />
-    <Compile Include="Protocols\Message.cs" />
-    <Compile Include="Protocols\MessageQueue.cs" />
-    <Compile Include="Protocols\MessageQueueEx.cs" />
-    <Compile Include="Protocols\MessageStoreResult.cs" />
-    <Compile Include="Protocols\CenterServers\BrokerConsumerListInfo.cs" />
-    <Compile Include="Protocols\CenterServers\BrokerProducerListInfo.cs" />
-    <Compile Include="Protocols\CenterServers\BrokerStatusInfo.cs" />
-    <Compile Include="Protocols\CenterServers\BrokerTopicConsumeInfo.cs" />
-    <Compile Include="Protocols\CenterServers\BrokerTopicQueueInfo.cs" />
-    <Compile Include="Protocols\CenterServers\ClientRole.cs" />
-    <Compile Include="Protocols\CenterServers\NameServerRequestCode.cs" />
-    <Compile Include="Protocols\CenterServers\Requests\AddQueueForClusterRequest.cs" />
-    <Compile Include="Protocols\CenterServers\Requests\BrokerRegistrationRequest.cs" />
-    <Compile Include="Protocols\CenterServers\Requests\BrokerUnRegistrationRequest.cs" />
-    <Compile Include="Protocols\CenterServers\Requests\CreateTopicForClusterRequest.cs" />
-    <Compile Include="Protocols\CenterServers\Requests\DeleteConsumerGroupForClusterRequest.cs" />
-    <Compile Include="Protocols\CenterServers\Requests\DeleteQueueForClusterRequest.cs" />
-    <Compile Include="Protocols\CenterServers\Requests\DeleteTopicForClusterRequest.cs" />
-    <Compile Include="Protocols\CenterServers\Requests\GetClusterBrokersRequest.cs" />
-    <Compile Include="Protocols\CenterServers\Requests\GetConsumerListRequest.cs" />
-    <Compile Include="Protocols\CenterServers\Requests\GetProducerListRequest.cs" />
-    <Compile Include="Protocols\CenterServers\Requests\GetTopicAccumulateInfoListRequest.cs" />
-    <Compile Include="Protocols\CenterServers\Requests\GetTopicConsumeInfoRequest.cs" />
-    <Compile Include="Protocols\CenterServers\Requests\GetTopicQueueInfoRequest.cs" />
-    <Compile Include="Protocols\CenterServers\Requests\GetTopicRouteInfoRequest.cs" />
-    <Compile Include="Protocols\CenterServers\Requests\SetQueueConsumerVisibleForClusterRequest.cs" />
-    <Compile Include="Protocols\CenterServers\Requests\SetQueueNextConsumeOffsetForClusterRequest.cs" />
-    <Compile Include="Protocols\CenterServers\Requests\SetQueueProducerVisibleForClusterRequest.cs" />
-    <Compile Include="Protocols\CenterServers\TopicAccumulateInfo.cs" />
-    <Compile Include="Protocols\CenterServers\TopicRouteInfo.cs" />
-    <Compile Include="Protocols\PullStatus.cs" />
-    <Compile Include="Protocols\QueueMessage.cs" />
-    <Compile Include="Protocols\RemotingResponse.cs" />
-    <Compile Include="Protocols\ResponseCode.cs" />
-    <Compile Include="QueueService.cs" />
-    <Compile Include="Scheduling\IScheduleService.cs" />
-    <Compile Include="Scheduling\LimitedConcurrencyLevelTaskScheduler.cs" />
-    <Compile Include="Scheduling\ScheduleService.cs" />
-    <Compile Include="Scheduling\Worker.cs" />
-    <Compile Include="Storage\Chunk.cs" />
-    <Compile Include="Storage\ChunkFooter.cs" />
-    <Compile Include="Storage\ChunkHeader.cs" />
-    <Compile Include="Storage\ChunkManager.cs" />
-    <Compile Include="Storage\ChunkManagerConfig.cs" />
-    <Compile Include="Storage\ChunkReader.cs" />
-    <Compile Include="Storage\ChunkUtil.cs" />
-    <Compile Include="Storage\ChunkWriter.cs" />
-    <Compile Include="Storage\Exceptions\ChunkBadDataException.cs" />
-    <Compile Include="Storage\Exceptions\ChunkCompleteException.cs" />
-    <Compile Include="Storage\Exceptions\ChunkCreateException.cs" />
-    <Compile Include="Storage\Exceptions\ChunkFileNotExistException.cs" />
-    <Compile Include="Storage\Exceptions\ChunkNotExistException.cs" />
-    <Compile Include="Storage\Exceptions\ChunkReadException.cs" />
-    <Compile Include="Storage\Exceptions\ChunkWriteException.cs" />
-    <Compile Include="Storage\FileNamingStrategies\DefaultFileNamingStrategy.cs" />
-    <Compile Include="Storage\FileNamingStrategies\IFileNamingStrategy.cs" />
-    <Compile Include="Storage\FlushOption.cs" />
-    <Compile Include="Storage\ILogRecord.cs" />
-    <Compile Include="Storage\IStream.cs" />
-    <Compile Include="Storage\ReaderWorkItem.cs" />
-    <Compile Include="Storage\RecordBufferReadResult.cs" />
-    <Compile Include="Storage\RecordWriteResult.cs" />
-    <Compile Include="Storage\WriterWorkItem.cs" />
-    <Compile Include="Utilities\BufferQueue.cs" />
-    <Compile Include="Utilities\ByteUtil.cs" />
-    <Compile Include="Utilities\Ensure.cs" />
-    <Compile Include="Utilities\Helper.cs" />
-    <Compile Include="Utilities\MessageIdUtil.cs" />
-    <Compile Include="Utilities\ObjectId.cs" />
-    <Compile Include="Utilities\SocketUtils.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\NewLife.Core\NewLife.Core.csproj">
-      <Project>{5813c22e-eeb3-4dee-a45c-bb218041193a}</Project>
-      <Name>NewLife.Core</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/MQ/NewLife.Queue/Properties/AssemblyInfo.cs b/MQ/NewLife.Queue/Properties/AssemblyInfo.cs
deleted file mode 100644
index 158550be65..0000000000
--- a/MQ/NewLife.Queue/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-﻿using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// 有关程序集的一般信息由以下
-// 控制。更改这些特性值可修改
-// 与程序集关联的信息。
-[assembly: AssemblyTitle("NewLife.Queue")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("NewLife.Queue")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-//将 ComVisible 设置为 false 将使此程序集中的类型
-//对 COM 组件不可见。  如果需要从 COM 访问此程序集中的类型，
-//请将此类型的 ComVisible 特性设置为 true。
-[assembly: ComVisible(false)]
-
-// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
-[assembly: Guid("f850252f-4048-4a89-b4c4-19c9ee783f00")]
-
-// 程序集的版本信息由下列四个值组成: 
-//
-//      主版本
-//      次版本
-//      生成号
-//      修订号
-//
-//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
-// 方法是按如下所示使用“*”: :
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/MQ/NewLife.Queue/Protocols/BatchMessageItemResult.cs b/MQ/NewLife.Queue/Protocols/BatchMessageItemResult.cs
deleted file mode 100644
index f3a3bcd35c..0000000000
--- a/MQ/NewLife.Queue/Protocols/BatchMessageItemResult.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Protocols
-{
-    [Serializable]
-    public class BatchMessageItemResult
-    {
-        public string MessageId { get; set; }
-        public int Code { get; set; }
-        public long QueueOffset { get; set; }
-        public DateTime CreatedTime { get; set; }
-        public DateTime StoredTime { get; set; }
-        public string Tag { get; set; }
-
-        public BatchMessageItemResult() { }
-        public BatchMessageItemResult(string messageId, int code, long queueOffset, DateTime createdTime, DateTime storedTime, string tag)
-        {
-            MessageId = messageId;
-            Code = code;
-            QueueOffset = queueOffset;
-            CreatedTime = createdTime;
-            StoredTime = storedTime;
-            Tag = tag;
-        }
-
-        public override string ToString()
-        {
-            return string.Format("[MessageId={0},Code={1},QueueOffset={2},CreatedTime={3},StoredTime={4},Tag={5}]", MessageId, Code, QueueOffset, CreatedTime, StoredTime, Tag);
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/BatchMessageStoreResult.cs b/MQ/NewLife.Queue/Protocols/BatchMessageStoreResult.cs
deleted file mode 100644
index f66ac728b4..0000000000
--- a/MQ/NewLife.Queue/Protocols/BatchMessageStoreResult.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-
-namespace NewLife.Queue.Protocols
-{
-    [Serializable]
-    public class BatchMessageStoreResult
-    {
-        public string Topic { get; private set; }
-        public int QueueId { get; private set; }
-        public IEnumerable<BatchMessageItemResult> MessageResults { get; private set; }
-
-        public BatchMessageStoreResult() { }
-        public BatchMessageStoreResult(string topic, int queueId, IEnumerable<BatchMessageItemResult> messageResults)
-        {
-            Topic = topic;
-            QueueId = queueId;
-            MessageResults = messageResults;
-        }
-
-        public override string ToString()
-        {
-            return string.Format("[Topic:{0}, QueueId:{1}, MessageResults:[{2}]]",
-                Topic,
-                QueueId,
-                string.Join(",", MessageResults));
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/Brokers/BrokerInfo.cs b/MQ/NewLife.Queue/Protocols/Brokers/BrokerInfo.cs
deleted file mode 100644
index d5f8612d77..0000000000
--- a/MQ/NewLife.Queue/Protocols/Brokers/BrokerInfo.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-﻿using System;
-using NewLife.Queue.Utilities;
-
-namespace NewLife.Queue.Protocols.Brokers
-{
-    [Serializable]
-    public class BrokerInfo
-    {
-        /// <summary>Broker的名字，默认为DefaultBroker
-        /// </summary>
-        public string BrokerName { get; set; }
-        /// <summary>Broker的分组名，当实现主备时，MasterBroker和它的所有的SlaveBroker的分组名相同；不同的MasterBroker的分组名要求不同；默认为DefaultGroup
-        /// </summary>
-        public string GroupName { get; set; }
-        /// <summary>Broker的集群名，一个集群下有可以有多个MasterBroker，每个MasterBroker可以有多个SlaveBroker；默认为DefaultCluster
-        /// </summary>
-        public string ClusterName { get; set; }
-        /// <summary>Broker的角色，目前有Master,Slave两种角色；默认为Master
-        /// </summary>
-        public int BrokerRole { get; set; }
-        /// <summary>供Producer连接的地址；默认IP为本地IP，端口为5000，格式为ip:port
-        /// </summary>
-        public string ProducerAddress { get; set; }
-        /// <summary>供Consumer连接的地址；默认IP为本地IP，端口为5001，格式为ip:port
-        /// </summary>
-        public string ConsumerAddress { get; set; }
-        /// <summary>Producer，Consumer对Broker发送的发消息和拉消息除外的其他内部请求，以及后台管理控制台发送的查询请求使用的地址；默认IP为本地IP，端口为5002，格式为ip:port
-        /// </summary>
-        public string AdminAddress { get; set; }
-
-        public BrokerInfo() { }
-        public BrokerInfo(string name, string groupName, string clusterName, BrokerRole role, string producerAddress, string consumerAddress, string adminAddress)
-        {
-            BrokerName = name;
-            GroupName = groupName;
-            ClusterName = clusterName;
-            BrokerRole = (int)role;
-            ProducerAddress = producerAddress;
-            ConsumerAddress = consumerAddress;
-            AdminAddress = adminAddress;
-        }
-
-        public void Valid()
-        {
-            Ensure.NotNullOrEmpty(BrokerName, "BrokerName");
-            Ensure.NotNullOrEmpty(GroupName, "GroupName");
-            Ensure.NotNullOrEmpty(ClusterName, "ClusterName");
-            Ensure.NotNull(ProducerAddress, "ProducerAddress");
-            Ensure.NotNull(ConsumerAddress, "ConsumerAddress");
-            Ensure.NotNull(AdminAddress, "AdminAddress");
-            if (BrokerRole != (int)Brokers.BrokerRole.Master && BrokerRole != (int)Brokers.BrokerRole.Slave)
-            {
-                throw new ArgumentException("Invalid broker role: " + BrokerRole);
-            }
-        }
-        public bool IsEqualsWith(BrokerInfo other)
-        {
-            if (other == null)
-            {
-                return false;
-            }
-
-            return BrokerName == other.BrokerName
-                && GroupName == other.GroupName
-                && ClusterName == other.ClusterName
-                && BrokerRole == other.BrokerRole
-                && ProducerAddress == other.ProducerAddress
-                && ConsumerAddress == other.ConsumerAddress
-                && AdminAddress == other.AdminAddress;
-        }
-
-        public override string ToString()
-        {
-            return string.Format("[BrokerName={0},GroupName={1},ClusterName={2},BrokerRole={3},ProducerAddress={4},ConsumerAddress={5},AdminAddress={6}]",
-                BrokerName,
-                GroupName,
-                ClusterName,
-                BrokerRole,
-                ProducerAddress,
-                ConsumerAddress,
-                AdminAddress);
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/Brokers/BrokerRequestCode.cs b/MQ/NewLife.Queue/Protocols/Brokers/BrokerRequestCode.cs
deleted file mode 100644
index e8055cd674..0000000000
--- a/MQ/NewLife.Queue/Protocols/Brokers/BrokerRequestCode.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-﻿namespace NewLife.Queue.Protocols.Brokers
-{
-    public enum BrokerRequestCode
-    {
-        SendMessage = 10,
-        PullMessage = 11,
-        BatchSendMessage = 12,
-        ProducerHeartbeat = 100,
-        ConsumerHeartbeat = 101,
-        GetConsumerIdsForTopic = 102,
-        UpdateQueueConsumeOffsetRequest = 103,
-        GetBrokerStatisticInfo = 1000,
-        GetTopicQueueInfo = 1001,
-        GetTopicConsumeInfo = 1002,
-        GetProducerList = 1003,
-        GetConsumerList = 1004,
-        CreateTopic = 1005,
-        DeleteTopic = 1006,
-        AddQueue = 1007,
-        DeleteQueue = 1008,
-        SetQueueProducerVisible = 1009,
-        SetQueueConsumerVisible = 1010,
-        SetQueueNextConsumeOffset = 1011,
-        DeleteConsumerGroup = 1012,
-        GetMessageDetail = 1013,
-        GetLastestMessages = 1014
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/Brokers/BrokerRole.cs b/MQ/NewLife.Queue/Protocols/Brokers/BrokerRole.cs
deleted file mode 100644
index e0481a7362..0000000000
--- a/MQ/NewLife.Queue/Protocols/Brokers/BrokerRole.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-﻿namespace NewLife.Queue.Protocols.Brokers
-{
-    public enum BrokerRole
-    {
-        Master = 0,
-        Slave = 1
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/Brokers/BrokerStatisticInfo.cs b/MQ/NewLife.Queue/Protocols/Brokers/BrokerStatisticInfo.cs
deleted file mode 100644
index a1be5973d3..0000000000
--- a/MQ/NewLife.Queue/Protocols/Brokers/BrokerStatisticInfo.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Protocols.Brokers
-{
-    [Serializable]
-    public class BrokerStatisticInfo
-    {
-        /// <summary>基本信息
-        /// </summary>
-        public BrokerInfo BrokerInfo { get; set; }
-        /// <summary>主题个数
-        /// </summary>
-        public int TopicCount { get; set; }
-        /// <summary>队列个数
-        /// </summary>
-        public int QueueCount { get; set; }
-        /// <summary>生产者个数
-        /// </summary>
-        public int ProducerCount { get; set; }
-        /// <summary>消费者组个数
-        /// </summary>
-        public int ConsumerGroupCount { get; set; }
-        /// <summary>消费者个数
-        /// </summary>
-        public int ConsumerCount { get; set; }
-        /// <summary>未消费消息总数
-        /// </summary>
-        public long TotalUnConsumedMessageCount { get; set; }
-        /// <summary>消息Chunk文件总数
-        /// </summary>
-        public int MessageChunkCount { get; set; }
-        /// <summary>消息最小Chunk
-        /// </summary>
-        public int MessageMinChunkNum { get; set; }
-        /// <summary>消息最大Chunk
-        /// </summary>
-        public int MessageMaxChunkNum { get; set; }
-        /// <summary>发送消息的总吞吐，每1s统计一次
-        /// </summary>
-        public long TotalSendThroughput { get; set; }
-        /// <summary>消费消息的总吞吐，每10s统计一次
-        /// </summary>
-        public long TotalConsumeThroughput { get; set; }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/Brokers/ConsumerHeartbeatData.cs b/MQ/NewLife.Queue/Protocols/Brokers/ConsumerHeartbeatData.cs
deleted file mode 100644
index bf505b379f..0000000000
--- a/MQ/NewLife.Queue/Protocols/Brokers/ConsumerHeartbeatData.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-
-namespace NewLife.Queue.Protocols.Brokers
-{
-    [Serializable]
-    public class ConsumerHeartbeatData
-    {
-        public string ConsumerId { get; private set; }
-        public string GroupName { get; private set; }
-        public IEnumerable<string> SubscriptionTopics { get; private set; }
-        public IEnumerable<MessageQueueEx> ConsumingQueues { get; private set; }
-
-        public ConsumerHeartbeatData(string consumerId, string groupName, IEnumerable<string> subscriptionTopics, IEnumerable<MessageQueueEx> consumingQueues)
-        {
-            ConsumerId = consumerId;
-            GroupName = groupName;
-            SubscriptionTopics = subscriptionTopics;
-            ConsumingQueues = consumingQueues;
-        }
-
-        public override string ToString()
-        {
-            return string.Format("[ConsumerId:{0}, GroupName:{1}, SubscriptionTopics:{2}, ConsumingQueues:{3}]", ConsumerId, GroupName, string.Join("|", SubscriptionTopics), string.Join("|", ConsumingQueues));
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/Brokers/ConsumerInfo.cs b/MQ/NewLife.Queue/Protocols/Brokers/ConsumerInfo.cs
deleted file mode 100644
index 73b300eaa6..0000000000
--- a/MQ/NewLife.Queue/Protocols/Brokers/ConsumerInfo.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Protocols.Brokers
-{
-    [Serializable]
-    public class ConsumerInfo
-    {
-        /// <summary>消费者的分组
-        /// </summary>
-        public string ConsumerGroup { get; set; }
-        /// <summary>消费者的ID
-        /// </summary>
-        public string ConsumerId { get; set; }
-        /// <summary>主题
-        /// </summary>
-        public string Topic { get; set; }
-        /// <summary>队列ID
-        /// </summary>
-        public int QueueId { get; set; }
-        /// <summary>队列当前位置
-        /// </summary>
-        public long QueueCurrentOffset { get; set; }
-        /// <summary>队列消费位置
-        /// </summary>
-        public long ConsumedOffset { get; set; }
-        /// <summary>未消费消息数，即消息堆积数
-        /// </summary>
-        public long QueueNotConsumeCount { get; set; }
-        /// <summary>客户端缓存的消息树
-        /// </summary>
-        public int ClientCachedMessageCount { get; set; }
-
-        /// <summary>计算队列未消费的消息数，即队列的消息堆积数
-        /// </summary>
-        /// <returns></returns>
-        public long CalculateQueueNotConsumeCount()
-        {
-            if (ConsumedOffset >= 0)
-            {
-                return QueueCurrentOffset - ConsumedOffset;
-            }
-            else if (QueueCurrentOffset >= 0)
-            {
-                return QueueCurrentOffset + 1;
-            }
-            return 0;
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/Brokers/QueueKey.cs b/MQ/NewLife.Queue/Protocols/Brokers/QueueKey.cs
deleted file mode 100644
index 51edd01079..0000000000
--- a/MQ/NewLife.Queue/Protocols/Brokers/QueueKey.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Protocols.Brokers
-{
-    [Serializable]
-    public class QueueKey : IComparable<QueueKey>, IComparable
-    {
-        public string Topic { get; set; }
-        public int QueueId { get; set; }
-
-        public QueueKey() { }
-        public QueueKey(string topic, int queueId)
-        {
-            Topic = topic;
-            QueueId = queueId;
-        }
-
-        public static bool operator ==(QueueKey left, QueueKey right)
-        {
-            return IsEqual(left, right);
-        }
-        public static bool operator !=(QueueKey left, QueueKey right)
-        {
-            return !IsEqual(left, right);
-        }
-        public override bool Equals(object obj)
-        {
-            if (obj == null || obj.GetType() != GetType())
-            {
-                return false;
-            }
-
-            var other = (QueueKey)obj;
-
-            return Topic == other.Topic && QueueId == other.QueueId;
-        }
-        public override int GetHashCode()
-        {
-            return (Topic + QueueId.ToString()).GetHashCode();
-        }
-        public override string ToString()
-        {
-            return string.Format("{0}@{1}", Topic, QueueId);
-        }
-
-        private static bool IsEqual(QueueKey left, QueueKey right)
-        {
-            if (ReferenceEquals(left, null) ^ ReferenceEquals(right, null))
-            {
-                return false;
-            }
-            return ReferenceEquals(left, null) || left.Equals(right);
-        }
-
-        public int CompareTo(QueueKey other)
-        {
-            return ToString().CompareTo(other.ToString());
-        }
-        public int CompareTo(object obj)
-        {
-            return ToString().CompareTo(obj.ToString());
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/Brokers/Requests/AddQueueRequest.cs b/MQ/NewLife.Queue/Protocols/Brokers/Requests/AddQueueRequest.cs
deleted file mode 100644
index be8e104d3d..0000000000
--- a/MQ/NewLife.Queue/Protocols/Brokers/Requests/AddQueueRequest.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Protocols.Brokers.Requests
-{
-    [Serializable]
-    public class AddQueueRequest
-    {
-        public string Topic { get; private set; }
-
-        public AddQueueRequest(string topic)
-        {
-            Topic = topic;
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/Brokers/Requests/BatchSendMessageRequest.cs b/MQ/NewLife.Queue/Protocols/Brokers/Requests/BatchSendMessageRequest.cs
deleted file mode 100644
index 6399c8b548..0000000000
--- a/MQ/NewLife.Queue/Protocols/Brokers/Requests/BatchSendMessageRequest.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-
-namespace NewLife.Queue.Protocols.Brokers.Requests
-{
-    [Serializable]
-    public class BatchSendMessageRequest
-    {
-        public int QueueId { get; set; }
-        public IEnumerable<Message> Messages { get; set; }
-        public string ProducerAddress { get; set; }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/Brokers/Requests/CreateTopicRequest.cs b/MQ/NewLife.Queue/Protocols/Brokers/Requests/CreateTopicRequest.cs
deleted file mode 100644
index cb20147050..0000000000
--- a/MQ/NewLife.Queue/Protocols/Brokers/Requests/CreateTopicRequest.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Protocols.Brokers.Requests
-{
-    [Serializable]
-    public class CreateTopicRequest
-    {
-        public string Topic { get; private set; }
-        public int? InitialQueueCount { get; private set; }
-
-        public CreateTopicRequest(string topic, int? initialQueueCount = null)
-        {
-            Topic = topic;
-            InitialQueueCount = initialQueueCount;
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/Brokers/Requests/DeleteConsumerGroupRequest.cs b/MQ/NewLife.Queue/Protocols/Brokers/Requests/DeleteConsumerGroupRequest.cs
deleted file mode 100644
index c59f1ee391..0000000000
--- a/MQ/NewLife.Queue/Protocols/Brokers/Requests/DeleteConsumerGroupRequest.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Protocols.Brokers.Requests
-{
-    [Serializable]
-    public class DeleteConsumerGroupRequest
-    {
-        public string GroupName { get; private set; }
-
-        public DeleteConsumerGroupRequest(string groupName)
-        {
-            GroupName = groupName;
-        }
-
-        public override string ToString()
-        {
-            return string.Format("[GroupName:{0}]", GroupName);
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/Brokers/Requests/DeleteQueueRequest.cs b/MQ/NewLife.Queue/Protocols/Brokers/Requests/DeleteQueueRequest.cs
deleted file mode 100644
index 968725dc5a..0000000000
--- a/MQ/NewLife.Queue/Protocols/Brokers/Requests/DeleteQueueRequest.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Protocols.Brokers.Requests
-{
-    [Serializable]
-    public class DeleteQueueRequest
-    {
-        public string Topic { get; private set; }
-        public int QueueId { get; private set; }
-
-        public DeleteQueueRequest(string topic, int queueId)
-        {
-            Topic = topic;
-            QueueId = queueId;
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/Brokers/Requests/DeleteTopicRequest.cs b/MQ/NewLife.Queue/Protocols/Brokers/Requests/DeleteTopicRequest.cs
deleted file mode 100644
index abdb7be693..0000000000
--- a/MQ/NewLife.Queue/Protocols/Brokers/Requests/DeleteTopicRequest.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Protocols.Brokers.Requests
-{
-    [Serializable]
-    public class DeleteTopicRequest
-    {
-        public string Topic { get; private set; }
-
-        public DeleteTopicRequest(string topic)
-        {
-            Topic = topic;
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/Brokers/Requests/GetConsumerIdsForTopicRequest.cs b/MQ/NewLife.Queue/Protocols/Brokers/Requests/GetConsumerIdsForTopicRequest.cs
deleted file mode 100644
index c2721399ee..0000000000
--- a/MQ/NewLife.Queue/Protocols/Brokers/Requests/GetConsumerIdsForTopicRequest.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Protocols.Brokers.Requests
-{
-    [Serializable]
-    public class GetConsumerIdsForTopicRequest
-    {
-        public string GroupName { get; private set; }
-        public string Topic { get; private set; }
-
-        public GetConsumerIdsForTopicRequest(string groupName, string topic)
-        {
-            GroupName = groupName;
-            Topic = topic;
-        }
-
-        public override string ToString()
-        {
-            return string.Format("[GroupName:{0}, Topic:{1}]", GroupName, Topic);
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/Brokers/Requests/GetConsumerListRequest.cs b/MQ/NewLife.Queue/Protocols/Brokers/Requests/GetConsumerListRequest.cs
deleted file mode 100644
index 154d475be0..0000000000
--- a/MQ/NewLife.Queue/Protocols/Brokers/Requests/GetConsumerListRequest.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Protocols.Brokers.Requests
-{
-    [Serializable]
-    public class GetConsumerListRequest
-    {
-        public string GroupName { get; private set; }
-        public string Topic { get; private set; }
-
-        public GetConsumerListRequest(string groupName, string topic)
-        {
-            GroupName = groupName;
-            Topic = topic;
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/Brokers/Requests/GetMessageDetailRequest.cs b/MQ/NewLife.Queue/Protocols/Brokers/Requests/GetMessageDetailRequest.cs
deleted file mode 100644
index d0e6b2ab42..0000000000
--- a/MQ/NewLife.Queue/Protocols/Brokers/Requests/GetMessageDetailRequest.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Protocols.Brokers.Requests
-{
-    [Serializable]
-    public class GetMessageDetailRequest
-    {
-        public string MessageId { get; private set; }
-
-        public GetMessageDetailRequest(string messageId)
-        {
-            MessageId = messageId;
-        }
-
-        public override string ToString()
-        {
-            return string.Format("[MessageId:{0}]", MessageId);
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/Brokers/Requests/GetTopicConsumeInfoRequest.cs b/MQ/NewLife.Queue/Protocols/Brokers/Requests/GetTopicConsumeInfoRequest.cs
deleted file mode 100644
index 80f4ded6c9..0000000000
--- a/MQ/NewLife.Queue/Protocols/Brokers/Requests/GetTopicConsumeInfoRequest.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Protocols.Brokers.Requests
-{
-    [Serializable]
-    public class GetTopicConsumeInfoRequest
-    {
-        public string GroupName { get; private set; }
-        public string Topic { get; private set; }
-
-        public GetTopicConsumeInfoRequest(string groupName, string topic)
-        {
-            GroupName = groupName;
-            Topic = topic;
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/Brokers/Requests/GetTopicQueueInfoRequest.cs b/MQ/NewLife.Queue/Protocols/Brokers/Requests/GetTopicQueueInfoRequest.cs
deleted file mode 100644
index 8d3e20245c..0000000000
--- a/MQ/NewLife.Queue/Protocols/Brokers/Requests/GetTopicQueueInfoRequest.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Protocols.Brokers.Requests
-{
-    [Serializable]
-    public class GetTopicQueueInfoRequest
-    {
-        public string Topic { get; private set; }
-
-        public GetTopicQueueInfoRequest(string topic)
-        {
-            Topic = topic;
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/Brokers/Requests/PullMessageRequest.cs b/MQ/NewLife.Queue/Protocols/Brokers/Requests/PullMessageRequest.cs
deleted file mode 100644
index d4af8d4249..0000000000
--- a/MQ/NewLife.Queue/Protocols/Brokers/Requests/PullMessageRequest.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-﻿using System;
-using System.IO;
-
-namespace NewLife.Queue.Protocols.Brokers.Requests
-{
-    [Serializable]
-    public class PullMessageRequest
-    {
-        public string ConsumerId { get; set; }
-        public string ConsumerGroup { get; set; }
-        public MessageQueue MessageQueue { get; set; }
-        public string Tags { get; set; }
-        public long QueueOffset { get; set; }
-        public int PullMessageBatchSize { get; set; }
-        public long SuspendPullRequestMilliseconds { get; set; }
-        public ConsumeFromWhere ConsumeFromWhere { get; set; }
-
-        public static void WriteToStream(PullMessageRequest request, Stream stream)
-        {
-            using (var writer = new BinaryWriter(stream))
-            {
-                writer.Write(request.ConsumerId);
-                writer.Write(request.ConsumerGroup);
-                writer.Write(request.MessageQueue.BrokerName);
-                writer.Write(request.MessageQueue.Topic);
-                writer.Write(request.MessageQueue.QueueId);
-                writer.Write(request.Tags);
-                writer.Write(request.QueueOffset);
-                writer.Write(request.PullMessageBatchSize);
-                writer.Write(request.SuspendPullRequestMilliseconds);
-                writer.Write((int)request.ConsumeFromWhere);
-            }
-        }
-        public static PullMessageRequest ReadFromStream(Stream stream)
-        {
-            using (var reader = new BinaryReader(stream))
-            {
-                var request = new PullMessageRequest();
-                request.ConsumerId = reader.ReadString();
-                request.ConsumerGroup = reader.ReadString();
-                request.MessageQueue = new MessageQueue(reader.ReadString(), reader.ReadString(), reader.ReadInt32());
-                request.Tags = reader.ReadString();
-                request.QueueOffset = reader.ReadInt64();
-                request.PullMessageBatchSize = reader.ReadInt32();
-                request.SuspendPullRequestMilliseconds = reader.ReadInt64();
-                request.ConsumeFromWhere = (ConsumeFromWhere)reader.ReadInt32();
-                return request;
-            }
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/Brokers/Requests/SendMessageRequest.cs b/MQ/NewLife.Queue/Protocols/Brokers/Requests/SendMessageRequest.cs
deleted file mode 100644
index 2d8fd6545d..0000000000
--- a/MQ/NewLife.Queue/Protocols/Brokers/Requests/SendMessageRequest.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Protocols.Brokers.Requests
-{
-    [Serializable]
-    public class SendMessageRequest
-    {
-        public int QueueId { get; set; }
-        public Message Message { get; set; }
-        public string ProducerAddress { get; set; }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/Brokers/Requests/SetQueueConsumerVisibleRequest.cs b/MQ/NewLife.Queue/Protocols/Brokers/Requests/SetQueueConsumerVisibleRequest.cs
deleted file mode 100644
index 1a12aaca76..0000000000
--- a/MQ/NewLife.Queue/Protocols/Brokers/Requests/SetQueueConsumerVisibleRequest.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Protocols.Brokers.Requests
-{
-    [Serializable]
-    public class SetQueueConsumerVisibleRequest
-    {
-        public string Topic { get; private set; }
-        public int QueueId { get; private set; }
-        public bool Visible { get; private set; }
-
-        public SetQueueConsumerVisibleRequest(string topic, int queueId, bool visible)
-        {
-            Topic = topic;
-            QueueId = queueId;
-            Visible = visible;
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/Brokers/Requests/SetQueueNextConsumeOffsetRequest.cs b/MQ/NewLife.Queue/Protocols/Brokers/Requests/SetQueueNextConsumeOffsetRequest.cs
deleted file mode 100644
index 8f2dcdec1d..0000000000
--- a/MQ/NewLife.Queue/Protocols/Brokers/Requests/SetQueueNextConsumeOffsetRequest.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Protocols.Brokers.Requests
-{
-    [Serializable]
-    public class SetQueueNextConsumeOffsetRequest
-    {
-        public string ConsumerGroup { get; private set; }
-        public string Topic { get; private set; }
-        public int QueueId { get; private set; }
-        public long NextOffset { get; private set; }
-
-        public SetQueueNextConsumeOffsetRequest(string consumerGroup, string topic, int queueId, long nextOffset)
-        {
-            ConsumerGroup = consumerGroup;
-            Topic = topic;
-            QueueId = queueId;
-            NextOffset = nextOffset;
-        }
-
-        public override string ToString()
-        {
-            return string.Format("[ConsumerGroup:{0}, Topic:{1}, QueueId:{2}, NextOffset:{3}]", ConsumerGroup, Topic, QueueId, NextOffset);
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/Brokers/Requests/SetQueueProducerVisibleRequest.cs b/MQ/NewLife.Queue/Protocols/Brokers/Requests/SetQueueProducerVisibleRequest.cs
deleted file mode 100644
index 097b0d46f5..0000000000
--- a/MQ/NewLife.Queue/Protocols/Brokers/Requests/SetQueueProducerVisibleRequest.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Protocols.Brokers.Requests
-{
-    [Serializable]
-    public class SetQueueProducerVisibleRequest
-    {
-        public string Topic { get; private set; }
-        public int QueueId { get; private set; }
-        public bool Visible { get; private set; }
-
-        public SetQueueProducerVisibleRequest(string topic, int queueId, bool visible)
-        {
-            Topic = topic;
-            QueueId = queueId;
-            Visible = visible;
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/Brokers/Requests/UpdateQueueOffsetRequest.cs b/MQ/NewLife.Queue/Protocols/Brokers/Requests/UpdateQueueOffsetRequest.cs
deleted file mode 100644
index 0febd686ae..0000000000
--- a/MQ/NewLife.Queue/Protocols/Brokers/Requests/UpdateQueueOffsetRequest.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Protocols.Brokers.Requests
-{
-    [Serializable]
-    public class UpdateQueueOffsetRequest
-    {
-        public string ConsumerGroup { get; set; }
-        public MessageQueue MessageQueue { get; set; }
-        public long QueueOffset { get; set; }
-
-        public UpdateQueueOffsetRequest(string consumerGroup, MessageQueue messageQueue, long queueOffset)
-        {
-            ConsumerGroup = consumerGroup;
-            MessageQueue = messageQueue;
-            QueueOffset = queueOffset;
-        }
-
-        public override string ToString()
-        {
-            return string.Format("[ConsumerGroup:{0}, MessageQueue:{1}, QueueOffset:{2}]", ConsumerGroup, MessageQueue, QueueOffset);
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/Brokers/TopicConsumeInfo.cs b/MQ/NewLife.Queue/Protocols/Brokers/TopicConsumeInfo.cs
deleted file mode 100644
index 442cf4dbfa..0000000000
--- a/MQ/NewLife.Queue/Protocols/Brokers/TopicConsumeInfo.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Protocols.Brokers
-{
-    [Serializable]
-    public class TopicConsumeInfo
-    {
-        /// <summary>消费者的分组
-        /// </summary>
-        public string ConsumerGroup { get; set; }
-        /// <summary>主题
-        /// </summary>
-        public string Topic { get; set; }
-        /// <summary>队列ID
-        /// </summary>
-        public int QueueId { get; set; }
-        /// <summary>队列当前位置
-        /// </summary>
-        public long QueueCurrentOffset { get; set; }
-        /// <summary>队列消费位置
-        /// </summary>
-        public long ConsumedOffset { get; set; }
-        /// <summary>客户端缓存的消息树
-        /// </summary>
-        public int ClientCachedMessageCount { get; set; }
-        /// <summary>未消费消息数，即消息堆积数
-        /// </summary>
-        public long QueueNotConsumeCount { get; set; }
-        /// <summary>在线消费者个数
-        /// </summary>
-        public int OnlineConsumerCount { get; set; }
-        /// <summary>消费消息的吞吐，每10s统计一次
-        /// </summary>
-        public long ConsumeThroughput { get; set; }
-
-        /// <summary>计算队列未消费的消息数，即队列的消息堆积数
-        /// </summary>
-        /// <returns></returns>
-        public long CalculateQueueNotConsumeCount()
-        {
-            if (ConsumedOffset >= 0)
-            {
-                return QueueCurrentOffset - ConsumedOffset;
-            }
-            else if (QueueCurrentOffset >= 0)
-            {
-                return QueueCurrentOffset + 1;
-            }
-            return 0;
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/Brokers/TopicQueueInfo.cs b/MQ/NewLife.Queue/Protocols/Brokers/TopicQueueInfo.cs
deleted file mode 100644
index 4a150d3a26..0000000000
--- a/MQ/NewLife.Queue/Protocols/Brokers/TopicQueueInfo.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Protocols.Brokers
-{
-    [Serializable]
-    public class TopicQueueInfo
-    {
-        /// <summary>主题
-        /// </summary>
-        public string Topic { get; set; }
-        /// <summary>队列ID
-        /// </summary>
-        public int QueueId { get; set; }
-        /// <summary>队列当前最大Offset
-        /// </summary>
-        public long QueueCurrentOffset { get; set; }
-        /// <summary>队列当前最小Offset
-        /// </summary>
-        public long QueueMinOffset { get; set; }
-        /// <summary>队列当前被所有消费者都消费了的最小Offset
-        /// </summary>
-        public long QueueMinConsumedOffset { get; set; }
-        /// <summary>队列当前未被消费的消息个数
-        /// </summary>
-        public long QueueNotConsumeCount { get; set; }
-        /// <summary>对生产者是否可见
-        /// </summary>
-        public bool ProducerVisible { get; set; }
-        /// <summary>对消费者是否可见
-        /// </summary>
-        public bool ConsumerVisible { get; set; }
-        /// <summary>发送消息的吞吐，每1s统计一次
-        /// </summary>
-        public long SendThroughput { get; set; }
-
-        /// <summary>计算队列未消费的消息数，即队列的消息堆积数
-        /// </summary>
-        /// <returns></returns>
-        public long CalculateQueueNotConsumeCount()
-        {
-            if (QueueMinConsumedOffset >= 0)
-            {
-                return QueueCurrentOffset - QueueMinConsumedOffset;
-            }
-            else if (QueueCurrentOffset >= 0 && QueueMinOffset >= 0)
-            {
-                return QueueCurrentOffset - QueueMinOffset + 1;
-            }
-            return 0;
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/CenterServers/BrokerConsumerListInfo.cs b/MQ/NewLife.Queue/Protocols/CenterServers/BrokerConsumerListInfo.cs
deleted file mode 100644
index 490674806c..0000000000
--- a/MQ/NewLife.Queue/Protocols/CenterServers/BrokerConsumerListInfo.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using NewLife.Queue.Protocols.Brokers;
-
-namespace NewLife.Queue.Protocols.CenterServers
-{
-    [Serializable]
-    public class BrokerConsumerListInfo
-    {
-        public BrokerInfo BrokerInfo { get; set; }
-        public IList<ConsumerInfo> ConsumerList { get; set; }
-
-        public BrokerConsumerListInfo()
-        {
-            ConsumerList = new List<ConsumerInfo>();
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/CenterServers/BrokerProducerListInfo.cs b/MQ/NewLife.Queue/Protocols/CenterServers/BrokerProducerListInfo.cs
deleted file mode 100644
index 90039e1f7b..0000000000
--- a/MQ/NewLife.Queue/Protocols/CenterServers/BrokerProducerListInfo.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using NewLife.Queue.Protocols.Brokers;
-
-namespace NewLife.Queue.Protocols.CenterServers
-{
-    [Serializable]
-    public class BrokerProducerListInfo
-    {
-        public BrokerInfo BrokerInfo { get; set; }
-        public IList<string> ProducerList { get; set; }
-
-        public BrokerProducerListInfo()
-        {
-            ProducerList = new List<string>();
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/CenterServers/BrokerStatusInfo.cs b/MQ/NewLife.Queue/Protocols/CenterServers/BrokerStatusInfo.cs
deleted file mode 100644
index cfc99e27b5..0000000000
--- a/MQ/NewLife.Queue/Protocols/CenterServers/BrokerStatusInfo.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-﻿using System;
-using NewLife.Queue.Protocols.Brokers;
-
-namespace NewLife.Queue.Protocols.CenterServers
-{
-    [Serializable]
-    public class BrokerStatusInfo
-    {
-        public BrokerInfo BrokerInfo { get; set; }
-        public long TotalSendThroughput { get; set; }
-        public long TotalConsumeThroughput { get; set; }
-        public long TotalUnConsumedMessageCount { get; set; }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/CenterServers/BrokerTopicConsumeInfo.cs b/MQ/NewLife.Queue/Protocols/CenterServers/BrokerTopicConsumeInfo.cs
deleted file mode 100644
index 3e4bd3798c..0000000000
--- a/MQ/NewLife.Queue/Protocols/CenterServers/BrokerTopicConsumeInfo.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using NewLife.Queue.Protocols.Brokers;
-
-namespace NewLife.Queue.Protocols.CenterServers
-{
-    [Serializable]
-    public class BrokerTopicConsumeInfo
-    {
-        public BrokerInfo BrokerInfo { get; set; }
-        public IList<TopicConsumeInfo> TopicConsumeInfoList { get; set; }
-
-        public BrokerTopicConsumeInfo()
-        {
-            TopicConsumeInfoList = new List<TopicConsumeInfo>();
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/CenterServers/BrokerTopicQueueInfo.cs b/MQ/NewLife.Queue/Protocols/CenterServers/BrokerTopicQueueInfo.cs
deleted file mode 100644
index 5fb22bd907..0000000000
--- a/MQ/NewLife.Queue/Protocols/CenterServers/BrokerTopicQueueInfo.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using NewLife.Queue.Protocols.Brokers;
-
-namespace NewLife.Queue.Protocols.CenterServers
-{
-    [Serializable]
-    public class BrokerTopicQueueInfo
-    {
-        public BrokerInfo BrokerInfo { get; set; }
-        public IList<TopicQueueInfo> TopicQueueInfoList { get; set; }
-
-        public BrokerTopicQueueInfo()
-        {
-            TopicQueueInfoList = new List<TopicQueueInfo>();
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/CenterServers/ClientRole.cs b/MQ/NewLife.Queue/Protocols/CenterServers/ClientRole.cs
deleted file mode 100644
index 6ffe007174..0000000000
--- a/MQ/NewLife.Queue/Protocols/CenterServers/ClientRole.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-﻿namespace NewLife.Queue.Protocols.CenterServers
-{
-    public enum ClientRole
-    {
-        Producer = 0,
-        Consumer = 1
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/CenterServers/NameServerRequestCode.cs b/MQ/NewLife.Queue/Protocols/CenterServers/NameServerRequestCode.cs
deleted file mode 100644
index 9fd3e58a36..0000000000
--- a/MQ/NewLife.Queue/Protocols/CenterServers/NameServerRequestCode.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-﻿namespace NewLife.Queue.Protocols.CenterServers
-{
-    public enum NameServerRequestCode
-    {
-        RegisterBroker = 10000,
-        UnregisterBroker = 10001,
-        GetAllClusters = 10002,
-        GetClusterBrokers = 10003,
-        GetClusterBrokerStatusInfoList = 10004,
-        GetTopicRouteInfo = 10005,
-        GetTopicQueueInfo = 10006,
-        GetTopicConsumeInfo = 10007,
-        GetProducerList = 10008,
-        GetConsumerList = 10009,
-        CreateTopic = 10010,
-        DeleteTopic = 10011,
-        AddQueue = 10012,
-        DeleteQueue = 10013,
-        SetQueueProducerVisible = 10014,
-        SetQueueConsumerVisible = 10015,
-        SetQueueNextConsumeOffset = 10016,
-        DeleteConsumerGroup = 10017,
-        GetTopicAccumulateInfoList = 10018
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/CenterServers/Requests/AddQueueForClusterRequest.cs b/MQ/NewLife.Queue/Protocols/CenterServers/Requests/AddQueueForClusterRequest.cs
deleted file mode 100644
index 9ecba1fff7..0000000000
--- a/MQ/NewLife.Queue/Protocols/CenterServers/Requests/AddQueueForClusterRequest.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Protocols.CenterServers.Requests
-{
-    [Serializable]
-    public class AddQueueForClusterRequest
-    {
-        public string ClusterName { get; set; }
-        public string Topic { get; set; }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/CenterServers/Requests/BrokerRegistrationRequest.cs b/MQ/NewLife.Queue/Protocols/CenterServers/Requests/BrokerRegistrationRequest.cs
deleted file mode 100644
index d28a6baadd..0000000000
--- a/MQ/NewLife.Queue/Protocols/CenterServers/Requests/BrokerRegistrationRequest.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using NewLife.Queue.Protocols.Brokers;
-
-namespace NewLife.Queue.Protocols.CenterServers.Requests
-{
-    [Serializable]
-    public class BrokerRegistrationRequest
-    {
-        public BrokerInfo BrokerInfo { get; set; }
-        public long TotalSendThroughput { get; set; }
-        public long TotalConsumeThroughput { get; set; }
-        public long TotalUnConsumedMessageCount { get; set; }
-        public IList<TopicQueueInfo> TopicQueueInfoList { get; set; }
-        public IList<TopicConsumeInfo> TopicConsumeInfoList { get; set; }
-        public IList<string> ProducerList { get; set; }
-        public IList<ConsumerInfo> ConsumerList { get; set; }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/CenterServers/Requests/BrokerUnRegistrationRequest.cs b/MQ/NewLife.Queue/Protocols/CenterServers/Requests/BrokerUnRegistrationRequest.cs
deleted file mode 100644
index b8bfe812ea..0000000000
--- a/MQ/NewLife.Queue/Protocols/CenterServers/Requests/BrokerUnRegistrationRequest.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-﻿using System;
-using NewLife.Queue.Protocols.Brokers;
-
-namespace NewLife.Queue.Protocols.CenterServers.Requests
-{
-    [Serializable]
-    public class BrokerUnRegistrationRequest
-    {
-        public BrokerInfo BrokerInfo { get; set; }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/CenterServers/Requests/CreateTopicForClusterRequest.cs b/MQ/NewLife.Queue/Protocols/CenterServers/Requests/CreateTopicForClusterRequest.cs
deleted file mode 100644
index e9bb999870..0000000000
--- a/MQ/NewLife.Queue/Protocols/CenterServers/Requests/CreateTopicForClusterRequest.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Protocols.CenterServers.Requests
-{
-    [Serializable]
-    public class CreateTopicForClusterRequest
-    {
-        public string ClusterName { get; set; }
-        public string Topic { get; set; }
-        public int? InitialQueueCount { get; set; }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/CenterServers/Requests/DeleteConsumerGroupForClusterRequest.cs b/MQ/NewLife.Queue/Protocols/CenterServers/Requests/DeleteConsumerGroupForClusterRequest.cs
deleted file mode 100644
index 3d33265950..0000000000
--- a/MQ/NewLife.Queue/Protocols/CenterServers/Requests/DeleteConsumerGroupForClusterRequest.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Protocols.CenterServers.Requests
-{
-    [Serializable]
-    public class DeleteConsumerGroupForClusterRequest
-    {
-        public string ClusterName { get; set; }
-        public string GroupName { get; set; }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/CenterServers/Requests/DeleteQueueForClusterRequest.cs b/MQ/NewLife.Queue/Protocols/CenterServers/Requests/DeleteQueueForClusterRequest.cs
deleted file mode 100644
index 6e3fe89c8d..0000000000
--- a/MQ/NewLife.Queue/Protocols/CenterServers/Requests/DeleteQueueForClusterRequest.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Protocols.CenterServers.Requests
-{
-    [Serializable]
-    public class DeleteQueueForClusterRequest
-    {
-        public string ClusterName { get; set; }
-        public string Topic { get; set; }
-        public int QueueId { get; set; }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/CenterServers/Requests/DeleteTopicForClusterRequest.cs b/MQ/NewLife.Queue/Protocols/CenterServers/Requests/DeleteTopicForClusterRequest.cs
deleted file mode 100644
index 04c86d86a0..0000000000
--- a/MQ/NewLife.Queue/Protocols/CenterServers/Requests/DeleteTopicForClusterRequest.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Protocols.CenterServers.Requests
-{
-    [Serializable]
-    public class DeleteTopicForClusterRequest
-    {
-        public string ClusterName { get; set; }
-        public string Topic { get; set; }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/CenterServers/Requests/GetClusterBrokersRequest.cs b/MQ/NewLife.Queue/Protocols/CenterServers/Requests/GetClusterBrokersRequest.cs
deleted file mode 100644
index 5bd815c446..0000000000
--- a/MQ/NewLife.Queue/Protocols/CenterServers/Requests/GetClusterBrokersRequest.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Protocols.CenterServers.Requests
-{
-    [Serializable]
-    public class GetClusterBrokersRequest
-    {
-        public string ClusterName { get; set; }
-        public string Topic { get; set; }
-        public bool OnlyFindMaster { get; set; }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/CenterServers/Requests/GetConsumerListRequest.cs b/MQ/NewLife.Queue/Protocols/CenterServers/Requests/GetConsumerListRequest.cs
deleted file mode 100644
index e9a494fe12..0000000000
--- a/MQ/NewLife.Queue/Protocols/CenterServers/Requests/GetConsumerListRequest.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Protocols.CenterServers.Requests
-{
-    [Serializable]
-    public class GetConsumerListRequest
-    {
-        public string ClusterName { get; set; }
-        public string ConsumerGroup { get; set; }
-        public string Topic { get; set; }
-        public bool OnlyFindMaster { get; set; }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/CenterServers/Requests/GetProducerListRequest.cs b/MQ/NewLife.Queue/Protocols/CenterServers/Requests/GetProducerListRequest.cs
deleted file mode 100644
index 8d9b0c1b99..0000000000
--- a/MQ/NewLife.Queue/Protocols/CenterServers/Requests/GetProducerListRequest.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Protocols.CenterServers.Requests
-{
-    [Serializable]
-    public class GetProducerListRequest
-    {
-        public string ClusterName { get; set; }
-        public bool OnlyFindMaster { get; set; }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/CenterServers/Requests/GetTopicAccumulateInfoListRequest.cs b/MQ/NewLife.Queue/Protocols/CenterServers/Requests/GetTopicAccumulateInfoListRequest.cs
deleted file mode 100644
index 013f5ca8aa..0000000000
--- a/MQ/NewLife.Queue/Protocols/CenterServers/Requests/GetTopicAccumulateInfoListRequest.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Protocols.CenterServers.Requests
-{
-    [Serializable]
-    public class GetTopicAccumulateInfoListRequest
-    {
-        public long AccumulateThreshold { get; set; }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/CenterServers/Requests/GetTopicConsumeInfoRequest.cs b/MQ/NewLife.Queue/Protocols/CenterServers/Requests/GetTopicConsumeInfoRequest.cs
deleted file mode 100644
index 7a48ea24e0..0000000000
--- a/MQ/NewLife.Queue/Protocols/CenterServers/Requests/GetTopicConsumeInfoRequest.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Protocols.CenterServers.Requests
-{
-    [Serializable]
-    public class GetTopicConsumeInfoRequest
-    {
-        public string ClusterName { get; set; }
-        public string ConsumerGroup { get; set; }
-        public string Topic { get; set; }
-        public bool OnlyFindMaster { get; set; }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/CenterServers/Requests/GetTopicQueueInfoRequest.cs b/MQ/NewLife.Queue/Protocols/CenterServers/Requests/GetTopicQueueInfoRequest.cs
deleted file mode 100644
index e25fa5b5b5..0000000000
--- a/MQ/NewLife.Queue/Protocols/CenterServers/Requests/GetTopicQueueInfoRequest.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Protocols.CenterServers.Requests
-{
-    [Serializable]
-    public class GetTopicQueueInfoRequest
-    {
-        public string ClusterName { get; set; }
-        public string Topic { get; set; }
-        public bool OnlyFindMaster { get; set; }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/CenterServers/Requests/GetTopicRouteInfoRequest.cs b/MQ/NewLife.Queue/Protocols/CenterServers/Requests/GetTopicRouteInfoRequest.cs
deleted file mode 100644
index 31938d61cc..0000000000
--- a/MQ/NewLife.Queue/Protocols/CenterServers/Requests/GetTopicRouteInfoRequest.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Protocols.CenterServers.Requests
-{
-    [Serializable]
-    public class GetTopicRouteInfoRequest
-    {
-        public ClientRole ClientRole { get; set; }
-        public string ClusterName { get; set; }
-        public string Topic { get; set; }
-        public bool OnlyFindMaster { get; set; }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/CenterServers/Requests/SetQueueConsumerVisibleForClusterRequest.cs b/MQ/NewLife.Queue/Protocols/CenterServers/Requests/SetQueueConsumerVisibleForClusterRequest.cs
deleted file mode 100644
index efc0c9e878..0000000000
--- a/MQ/NewLife.Queue/Protocols/CenterServers/Requests/SetQueueConsumerVisibleForClusterRequest.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Protocols.CenterServers.Requests
-{
-    [Serializable]
-    public class SetQueueConsumerVisibleForClusterRequest
-    {
-        public string ClusterName { get; set; }
-        public string Topic { get; set; }
-        public int QueueId { get; set; }
-        public bool Visible { get; set; }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/CenterServers/Requests/SetQueueNextConsumeOffsetForClusterRequest.cs b/MQ/NewLife.Queue/Protocols/CenterServers/Requests/SetQueueNextConsumeOffsetForClusterRequest.cs
deleted file mode 100644
index aa35ed40dd..0000000000
--- a/MQ/NewLife.Queue/Protocols/CenterServers/Requests/SetQueueNextConsumeOffsetForClusterRequest.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Protocols.CenterServers.Requests
-{
-    [Serializable]
-    public class SetQueueNextConsumeOffsetForClusterRequest
-    {
-        public string ClusterName { get; set; }
-        public string ConsumerGroup { get; set; }
-        public string Topic { get; set; }
-        public int QueueId { get; set; }
-        public long NextOffset { get; set; }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/CenterServers/Requests/SetQueueProducerVisibleForClusterRequest.cs b/MQ/NewLife.Queue/Protocols/CenterServers/Requests/SetQueueProducerVisibleForClusterRequest.cs
deleted file mode 100644
index 3ab4db0123..0000000000
--- a/MQ/NewLife.Queue/Protocols/CenterServers/Requests/SetQueueProducerVisibleForClusterRequest.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Protocols.CenterServers.Requests
-{
-    [Serializable]
-    public class SetQueueProducerVisibleForClusterRequest
-    {
-        public string ClusterName { get; set; }
-        public string Topic { get; set; }
-        public int QueueId { get; set; }
-        public bool Visible { get; set; }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/CenterServers/TopicAccumulateInfo.cs b/MQ/NewLife.Queue/Protocols/CenterServers/TopicAccumulateInfo.cs
deleted file mode 100644
index ff96e8fa4c..0000000000
--- a/MQ/NewLife.Queue/Protocols/CenterServers/TopicAccumulateInfo.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Protocols.CenterServers
-{
-    [Serializable]
-    public class TopicAccumulateInfo
-    {
-        public string Topic { get; set; }
-        public int QueueCount { get; set; }
-        public string ConsumerGroup { get; set; }
-        public long AccumulateCount { get; set; }
-        public int OnlineConsumerCount { get; set; }
-        public long ConsumeThroughput { get; set; }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/CenterServers/TopicRouteInfo.cs b/MQ/NewLife.Queue/Protocols/CenterServers/TopicRouteInfo.cs
deleted file mode 100644
index f5e46d6c0c..0000000000
--- a/MQ/NewLife.Queue/Protocols/CenterServers/TopicRouteInfo.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using NewLife.Queue.Protocols.Brokers;
-
-namespace NewLife.Queue.Protocols.CenterServers
-{
-    [Serializable]
-    public class TopicRouteInfo
-    {
-        public BrokerInfo BrokerInfo { get; set; }
-        public IList<int> QueueInfo { get; set; }
-
-        public TopicRouteInfo()
-        {
-            QueueInfo = new List<int>();
-        }
-
-        public override string ToString()
-        {
-            return string.Format("[BrokerInfo: {0}, QueueInfo: {1}]", BrokerInfo, string.Join("|", QueueInfo));
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/ConsumeFromWhere.cs b/MQ/NewLife.Queue/Protocols/ConsumeFromWhere.cs
deleted file mode 100644
index b480d79c38..0000000000
--- a/MQ/NewLife.Queue/Protocols/ConsumeFromWhere.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-﻿namespace NewLife.Queue.Protocols
-{
-    public enum ConsumeFromWhere
-    {
-        FirstOffset = 1,
-        LastOffset
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/Message.cs b/MQ/NewLife.Queue/Protocols/Message.cs
deleted file mode 100644
index 893e1573c9..0000000000
--- a/MQ/NewLife.Queue/Protocols/Message.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-﻿using System;
-using NewLife.Queue.Utilities;
-
-namespace NewLife.Queue.Protocols
-{
-    [Serializable]
-    public class Message
-    {
-        public string Topic { get; set; }
-        public string Tag { get; set; }
-        public int Code { get; set; }
-        public byte[] Body { get; set; }
-        public DateTime CreatedTime { get; set; }
-
-        public Message() { }
-        public Message(string topic, int code, byte[] body, string tag = null) : this(topic, code, body, DateTime.Now, tag) { }
-        public Message(string topic, int code, byte[] body, DateTime createdTime, string tag = null)
-        {
-            Ensure.NotNull(topic, "topic");
-            Ensure.Positive(code, "code");
-            Ensure.NotNull(body, "body");
-            Topic = topic;
-            Tag = tag;
-            Code = code;
-            Body = body;
-            CreatedTime = createdTime;
-        }
-
-        public override string ToString()
-        {
-            return string.Format("[Topic={0},Code={1},Tag={2},CreatedTime={3},BodyLength={4}]", Topic, Code, Tag, CreatedTime, Body.Length);
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/MessageQueue.cs b/MQ/NewLife.Queue/Protocols/MessageQueue.cs
deleted file mode 100644
index c281dbd04e..0000000000
--- a/MQ/NewLife.Queue/Protocols/MessageQueue.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Protocols
-{
-    [Serializable]
-    public class MessageQueue
-    {
-        public string BrokerName { get; private set; }
-        public string Topic { get; private set; }
-        public int QueueId { get; private set; }
-
-        public MessageQueue() { }
-        public MessageQueue(string brokerName, string topic, int queueId)
-        {
-            BrokerName = brokerName;
-            Topic = topic;
-            QueueId = queueId;
-        }
-
-        public override string ToString()
-        {
-            return string.Format("[BrokerName={0}, Topic={1}, QueueId={2}]", BrokerName, Topic, QueueId);
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/MessageQueueEx.cs b/MQ/NewLife.Queue/Protocols/MessageQueueEx.cs
deleted file mode 100644
index 0a83e4b0a5..0000000000
--- a/MQ/NewLife.Queue/Protocols/MessageQueueEx.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Protocols
-{
-    [Serializable]
-    public class MessageQueueEx : MessageQueue
-    {
-        public int ClientCachedMessageCount { get; set; }
-
-        public MessageQueueEx() : base() { }
-        public MessageQueueEx(string brokerName, string topic, int queueId) : base(brokerName, topic, queueId) { }
-
-        public override string ToString()
-        {
-            return string.Format("[BrokerName={0}, Topic={1}, QueueId={2}, ClientCachedMessageCount={3}]", BrokerName, Topic, QueueId, ClientCachedMessageCount);
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/MessageStoreResult.cs b/MQ/NewLife.Queue/Protocols/MessageStoreResult.cs
deleted file mode 100644
index e5425d5bd4..0000000000
--- a/MQ/NewLife.Queue/Protocols/MessageStoreResult.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Protocols
-{
-    [Serializable]
-    public class MessageStoreResult
-    {
-        public string MessageId { get; private set; }
-        public int Code { get; private set; }
-        public string Topic { get; private set; }
-        public string Tag { get; private set; }
-        public int QueueId { get; private set; }
-        public long QueueOffset { get; private set; }
-        public DateTime CreatedTime { get; private set; }
-        public DateTime StoredTime { get; private set; }
-
-        public MessageStoreResult() { }
-        public MessageStoreResult(string messageId, int code, string topic, int queueId, long queueOffset, DateTime createdTime, DateTime storedTime, string tag = null)
-        {
-            MessageId = messageId;
-            Code = code;
-            Topic = topic;
-            Tag = tag;
-            QueueId = queueId;
-            QueueOffset = queueOffset;
-            CreatedTime = createdTime;
-            StoredTime = storedTime;
-        }
-
-        public override string ToString()
-        {
-            return string.Format("[MessageId:{0}, Code:{1}, Topic:{2}, QueueId:{3}, QueueOffset:{4}, Tag:{5}, CreatedTime:{6}, StoredTime:{7}]",
-                MessageId,
-                Code,
-                Topic,
-                QueueId,
-                QueueOffset,
-                Tag,
-                CreatedTime,
-                StoredTime);
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/PullStatus.cs b/MQ/NewLife.Queue/Protocols/PullStatus.cs
deleted file mode 100644
index 8f1719cf09..0000000000
--- a/MQ/NewLife.Queue/Protocols/PullStatus.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-﻿namespace NewLife.Queue.Protocols
-{
-    public enum PullStatus : short
-    {
-        Found = 1,
-        NoNewMessage = 2,
-        NextOffsetReset = 3,
-        Ignored = 4,
-        QueueNotExist = 5,
-        BrokerIsCleaning = 6
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/QueueMessage.cs b/MQ/NewLife.Queue/Protocols/QueueMessage.cs
deleted file mode 100644
index d6ac34265d..0000000000
--- a/MQ/NewLife.Queue/Protocols/QueueMessage.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-﻿using System;
-using NewLife.Queue.Utilities;
-
-namespace NewLife.Queue.Protocols
-{
-    [Serializable]
-    public class QueueMessage : Message
-    {
-        public long LogPosition { get; set; }
-        public string MessageId { get; set; }
-        public int QueueId { get; set; }
-        public long QueueOffset { get; set; }
-        public DateTime StoredTime { get; set; }
-        public string BrokerName { get; set; }
-        public string ProducerAddress { get; set; }
-
-        public QueueMessage() { }
-        public QueueMessage(string messageId, string topic, int code, byte[] body, int queueId, long queueOffset, DateTime createdTime, DateTime storedTime, string tag, string producerAddress)
-            : base(topic, code, body, createdTime, tag)
-        {
-            MessageId = messageId;
-            QueueId = queueId;
-            QueueOffset = queueOffset;
-            StoredTime = storedTime;
-            ProducerAddress = producerAddress;
-        }
-
-        public virtual void ReadFrom(byte[] recordBuffer)
-        {
-            var srcOffset = 0;
-
-            LogPosition = ByteUtil.DecodeLong(recordBuffer, srcOffset, out srcOffset);
-            MessageId = ByteUtil.DecodeString(recordBuffer, srcOffset, out srcOffset);
-            Topic = ByteUtil.DecodeString(recordBuffer, srcOffset, out srcOffset);
-            Tag = ByteUtil.DecodeString(recordBuffer, srcOffset, out srcOffset);
-            ProducerAddress = ByteUtil.DecodeString(recordBuffer, srcOffset, out srcOffset);
-            Code = ByteUtil.DecodeInt(recordBuffer, srcOffset, out srcOffset);
-            Body = ByteUtil.DecodeBytes(recordBuffer, srcOffset, out srcOffset);
-            QueueId = ByteUtil.DecodeInt(recordBuffer, srcOffset, out srcOffset);
-            QueueOffset = ByteUtil.DecodeLong(recordBuffer, srcOffset, out srcOffset);
-            CreatedTime = ByteUtil.DecodeDateTime(recordBuffer, srcOffset, out srcOffset);
-            StoredTime = ByteUtil.DecodeDateTime(recordBuffer, srcOffset, out srcOffset);
-        }
-        public bool IsValid()
-        {
-            return !string.IsNullOrEmpty(MessageId);
-        }
-
-        public override string ToString()
-        {
-            return string.Format("[Topic={0},QueueId={1},QueueOffset={2},MessageId={3},LogPosition={4},Code={5},CreatedTime={6},StoredTime={7},BodyLength={8},Tag={9},ProducerAddress={10}]",
-                Topic,
-                QueueId,
-                QueueOffset,
-                MessageId,
-                LogPosition,
-                Code,
-                CreatedTime,
-                StoredTime,
-                Body.Length,
-                Tag,
-                ProducerAddress);
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/RemotingResponse.cs b/MQ/NewLife.Queue/Protocols/RemotingResponse.cs
deleted file mode 100644
index 4c77753e15..0000000000
--- a/MQ/NewLife.Queue/Protocols/RemotingResponse.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace NewLife.Queue.Protocols
-{
-    public class RemotingResponse
-    {
-        public short RequestType { get; set; }
-        public short RequestCode { get; set; }
-        public long RequestSequence { get; set; }
-        public DateTime RequestTime { get; set; }
-        public IDictionary<string, string> RequestHeader { get; set; }
-        public short ResponseCode { get; set; }
-        public byte[] ResponseBody { get; set; }
-        public DateTime ResponseTime { get; set; }
-        public IDictionary<string, string> ResponseHeader { get; set; }
-
-        public RemotingResponse() { }
-        public RemotingResponse(short requestType, short requestCode, long requestSequence, DateTime requestTime, short responseCode, byte[] responseBody, DateTime responseTime, IDictionary<string, string> requestHeader, IDictionary<string, string> responseHeader)
-        {
-            RequestType = requestType;
-            RequestCode = requestCode;
-            RequestSequence = requestSequence;
-            RequestTime = requestTime;
-            ResponseCode = responseCode;
-            ResponseBody = responseBody;
-            ResponseTime = responseTime;
-            RequestHeader = requestHeader;
-            ResponseHeader = responseHeader;
-        }
-
-        public override string ToString()
-        {
-            var responseBodyLength = 0;
-            if (ResponseBody != null)
-            {
-                responseBodyLength = ResponseBody.Length;
-            }
-            var requestTime = RequestTime.ToString("yyyy-MM-dd HH:mm:ss.fff");
-            var responseTime = ResponseTime.ToString("yyyy-MM-dd HH:mm:ss.fff");
-            var requestHeader = string.Empty;
-            if (RequestHeader != null && RequestHeader.Count > 0)
-            {
-                requestHeader = string.Join(",", RequestHeader.Select(x => string.Format("{0}:{1}", x.Key, x.Value)));
-            }
-            var responseHeader = string.Empty;
-            if (ResponseHeader != null && ResponseHeader.Count > 0)
-            {
-                responseHeader = string.Join(",", ResponseHeader.Select(x => string.Format("{0}:{1}", x.Key, x.Value)));
-            }
-
-            return string.Format("[RequestType:{0}, RequestCode:{1}, RequestSequence:{2}, RequestTime:{3}, RequestHeader: [{4}], ResponseCode:{5}, ResponseTime:{6}, ResponseBodyLength:{7}, ResponseHeader: [{8}]]",
-                RequestType, RequestCode, RequestSequence, requestTime, requestHeader, ResponseCode, responseTime, responseBodyLength, responseHeader);
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Protocols/ResponseCode.cs b/MQ/NewLife.Queue/Protocols/ResponseCode.cs
deleted file mode 100644
index 5eaf70dd5f..0000000000
--- a/MQ/NewLife.Queue/Protocols/ResponseCode.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-﻿namespace EQueue.Protocols
-{
-    public class ResponseCode
-    {
-        public const short Success = 100;
-        public const short Failed = -100;
-    }
-}
diff --git a/MQ/NewLife.Queue/QueueService.cs b/MQ/NewLife.Queue/QueueService.cs
deleted file mode 100644
index 7d7a75e5c9..0000000000
--- a/MQ/NewLife.Queue/QueueService.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using NewLife.Log;
-using NewLife.Model;
-using NewLife.Queue.Broker;
-using NewLife.Queue.Scheduling;
-using NewLife.Queue.Storage.FileNamingStrategies;
-
-namespace NewLife.Queue
-{
-    class QueueService
-    {
-        #region 当前静态服务容器
-        /// <summary>当前对象容器</summary>
-        public static IObjectContainer Container => ObjectContainer.Current;
-
-        #endregion
-
-        static QueueService()
-        {
-            var container = Container;
-            container.Register<ILog, ConsoleLog>()
-                .AutoRegister<IScheduleService, ScheduleService>()
-                .AutoRegister<IFileNamingStrategy, DefaultFileNamingStrategy>()
-                .AutoRegister<IMessageStore, DefaultFileNamingStrategy>();
-
-            
-        }
-
-
-        #region 使用
-        /// <summary>日志</summary>
-        /// <returns></returns>
-        public static ILog Log => Container.Resolve<ILog>();
-
-
-        /// <summary>计划服务</summary>
-        /// <returns></returns>
-        public static IScheduleService ScheduleService => Container.ResolveInstance<IScheduleService>();
-
-        #endregion
-    }
-}
diff --git a/MQ/NewLife.Queue/Scheduling/IScheduleService.cs b/MQ/NewLife.Queue/Scheduling/IScheduleService.cs
deleted file mode 100644
index 930551bf23..0000000000
--- a/MQ/NewLife.Queue/Scheduling/IScheduleService.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Scheduling
-{
-    public interface IScheduleService
-    {
-        void StartTask(string name, Action action, int dueTime, int period);
-        void StopTask(string name);
-    }
-}
diff --git a/MQ/NewLife.Queue/Scheduling/LimitedConcurrencyLevelTaskScheduler.cs b/MQ/NewLife.Queue/Scheduling/LimitedConcurrencyLevelTaskScheduler.cs
deleted file mode 100644
index a1dec55a79..0000000000
--- a/MQ/NewLife.Queue/Scheduling/LimitedConcurrencyLevelTaskScheduler.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace NewLife.Queue.Scheduling
-{
-    public class LimitedConcurrencyLevelTaskScheduler : TaskScheduler
-    {
-        /// <summary>Whether the current thread is processing work items.</summary>
-        [ThreadStatic]
-        private static bool _currentThreadIsProcessingItems;
-        /// <summary>The list of tasks to be executed.</summary>
-        private readonly LinkedList<Task> _tasks = new LinkedList<Task>(); // protected by lock(_tasks)
-        /// <summary>The maximum concurrency level allowed by this scheduler.</summary>
-        private readonly int _maxDegreeOfParallelism;
-        /// <summary>Whether the scheduler is currently processing work items.</summary>
-        private int _delegatesQueuedOrRunning = 0; // protected by lock(_tasks)
-
-        /// <summary>
-        /// Initializes an instance of the LimitedConcurrencyLevelTaskScheduler class with the
-        /// specified degree of parallelism.
-        /// </summary>
-        /// <param name="maxDegreeOfParallelism">The maximum degree of parallelism provided by this scheduler.</param>
-        public LimitedConcurrencyLevelTaskScheduler(int maxDegreeOfParallelism)
-        {
-            if (maxDegreeOfParallelism < 1) throw new ArgumentOutOfRangeException("maxDegreeOfParallelism");
-            _maxDegreeOfParallelism = maxDegreeOfParallelism;
-        }
-
-        /// <summary>Queues a task to the scheduler.</summary>
-        /// <param name="task">The task to be queued.</param>
-        protected sealed override void QueueTask(Task task)
-        {
-            // Add the task to the list of tasks to be processed.  If there aren't enough
-            // delegates currently queued or running to process tasks, schedule another.
-            lock (_tasks)
-            {
-                _tasks.AddLast(task);
-                if (_delegatesQueuedOrRunning < _maxDegreeOfParallelism)
-                {
-                    ++_delegatesQueuedOrRunning;
-                    NotifyThreadPoolOfPendingWork();
-                }
-            }
-        }
-
-        /// <summary>
-        /// Informs the ThreadPool that there's work to be executed for this scheduler.
-        /// </summary>
-        private void NotifyThreadPoolOfPendingWork()
-        {
-            ThreadPool.UnsafeQueueUserWorkItem(_ =>
-            {
-                // Note that the current thread is now processing work items.
-                // This is necessary to enable inlining of tasks into this thread.
-                _currentThreadIsProcessingItems = true;
-                try
-                {
-                    // Process all available items in the queue.
-                    while (true)
-                    {
-                        Task item;
-                        lock (_tasks)
-                        {
-                            // When there are no more items to be processed,
-                            // note that we're done processing, and get out.
-                            if (_tasks.Count == 0)
-                            {
-                                --_delegatesQueuedOrRunning;
-                                break;
-                            }
-
-                            // Get the next item from the queue
-                            item = _tasks.First.Value;
-                            _tasks.RemoveFirst();
-                        }
-
-                        // Execute the task we pulled out of the queue
-                        base.TryExecuteTask(item);
-                    }
-                }
-                // We're done processing items on the current thread
-                finally { _currentThreadIsProcessingItems = false; }
-            }, null);
-        }
-
-        /// <summary>Attempts to execute the specified task on the current thread.</summary>
-        /// <param name="task">The task to be executed.</param>
-        /// <param name="taskWasPreviouslyQueued"></param>
-        /// <returns>Whether the task could be executed on the current thread.</returns>
-        protected sealed override bool TryExecuteTaskInline(Task task, bool taskWasPreviouslyQueued)
-        {
-            // If this thread isn't already processing a task, we don't support inlining
-            if (!_currentThreadIsProcessingItems) return false;
-
-            // If the task was previously queued, remove it from the queue
-            if (taskWasPreviouslyQueued) TryDequeue(task);
-
-            // Try to run the task.
-            return base.TryExecuteTask(task);
-        }
-
-        /// <summary>Attempts to remove a previously scheduled task from the scheduler.</summary>
-        /// <param name="task">The task to be removed.</param>
-        /// <returns>Whether the task could be found and removed.</returns>
-        protected sealed override bool TryDequeue(Task task)
-        {
-            lock (_tasks) return _tasks.Remove(task);
-        }
-
-        /// <summary>Gets the maximum concurrency level supported by this scheduler.</summary>
-        public sealed override int MaximumConcurrencyLevel { get { return _maxDegreeOfParallelism; } }
-
-        /// <summary>Gets an enumerable of the tasks currently scheduled on this scheduler.</summary>
-        /// <returns>An enumerable of the tasks currently scheduled.</returns>
-        protected sealed override IEnumerable<Task> GetScheduledTasks()
-        {
-            bool lockTaken = false;
-            try
-            {
-                Monitor.TryEnter(_tasks, ref lockTaken);
-                if (lockTaken) return _tasks.ToArray();
-                else throw new NotSupportedException();
-            }
-            finally
-            {
-                if (lockTaken) Monitor.Exit(_tasks);
-            }
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Scheduling/ScheduleService.cs b/MQ/NewLife.Queue/Scheduling/ScheduleService.cs
deleted file mode 100644
index 21c23ba471..0000000000
--- a/MQ/NewLife.Queue/Scheduling/ScheduleService.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Threading;
-using NewLife.Log;
-
-namespace NewLife.Queue.Scheduling
-{
-    public class ScheduleService : IScheduleService
-    {
-        private readonly object _lockObject = new object();
-        private readonly Dictionary<string, TimerBasedTask> _taskDict = new Dictionary<string, TimerBasedTask>();
-        #region 日志
-        /// <summary>日志</summary>
-        public ILog Log { get; set; }
-        #endregion
-        public ScheduleService(ILog log)
-        {
-            Log = log ?? Logger.Null;
-        }
-
-        public void StartTask(string name, Action action, int dueTime, int period)
-        {
-            lock (_lockObject)
-            {
-                if (_taskDict.ContainsKey(name)) return;
-                var timer = new Timer(TaskCallback, name, Timeout.Infinite, Timeout.Infinite);
-                _taskDict.Add(name, new TimerBasedTask { Name = name, Action = action, Timer = timer, DueTime = dueTime, Period = period, Stopped = false });
-                timer.Change(dueTime, period);
-            }
-        }
-        public void StopTask(string name)
-        {
-            lock (_lockObject)
-            {
-                if (_taskDict.ContainsKey(name))
-                {
-                    var task = _taskDict[name];
-                    task.Stopped = true;
-                    task.Timer.Dispose();
-                    _taskDict.Remove(name);
-                }
-            }
-        }
-
-        private void TaskCallback(object obj)
-        {
-            var taskName = (string)obj;
-            TimerBasedTask task;
-
-            if (_taskDict.TryGetValue(taskName, out task))
-            {
-                try
-                {
-                    if (!task.Stopped)
-                    {
-                        task.Timer.Change(Timeout.Infinite, Timeout.Infinite);
-                        task.Action();
-                    }
-                }
-                catch (ObjectDisposedException) { }
-                catch (Exception ex)
-                {
-
-                    Log.Error(string.Format("Task has exception, name: {0}, due: {1}, period: {2}", task.Name, task.DueTime, task.Period), ex);
-
-                }
-                finally
-                {
-                    try
-                    {
-                        if (!task.Stopped)
-                        {
-                            task.Timer.Change(task.Period, task.Period);
-                        }
-                    }
-                    catch (ObjectDisposedException) { }
-                    catch (Exception ex)
-                    {
-                        Log.Error(string.Format("Timer change has exception, name: {0}, due: {1}, period: {2}", task.Name, task.DueTime, task.Period), ex);
-                    }
-                }
-            }
-        }
-
-        class TimerBasedTask
-        {
-            public string Name;
-            public Action Action;
-            public Timer Timer;
-            public int DueTime;
-            public int Period;
-            public bool Stopped;
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Scheduling/Worker.cs b/MQ/NewLife.Queue/Scheduling/Worker.cs
deleted file mode 100644
index 32f977d06a..0000000000
--- a/MQ/NewLife.Queue/Scheduling/Worker.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-﻿using System;
-using System.Threading;
-using NewLife.Log;
-using NewLife.Model;
-
-namespace NewLife.Queue.Scheduling
-{
-    /// <summary>Represent a background worker that will repeatedly execute a specific method.
-    /// </summary>
-    public class Worker
-    {
-        private readonly object _lockObject = new object();
-        private readonly string _actionName;
-        private readonly Action _action;
-        private readonly ILog _logger;
-        private Status _status;
-
-        /// <summary>Returns the action name of the current worker.
-        /// </summary>
-        public string ActionName
-        {
-            get { return _actionName; }
-        }
-
-        /// <summary>Initialize a new worker with the specified action.
-        /// </summary>
-        /// <param name="actionName">The action name.</param>
-        /// <param name="action">The action to run by the worker.</param>
-        public Worker(string actionName, Action action)
-        {
-            _actionName = actionName;
-            _action = action;
-            _status = Status.Initial;
-            _logger = ObjectContainer.Current.Resolve<ILog>();
-        }
-
-        /// <summary>Start the worker if it is not running.
-        /// </summary>
-        public Worker Start()
-        {
-            lock (_lockObject)
-            {
-                if (_status == Status.Running) return this;
-
-                _status = Status.Running;
-                new Thread(Loop)
-                {
-                    Name = string.Format("{0}.Worker", _actionName),
-                    IsBackground = true
-                }.Start(this);
-
-                return this;
-            }
-        }
-        /// <summary>Request to stop the worker.
-        /// </summary>
-        public Worker Stop()
-        {
-            lock (_lockObject)
-            {
-                if (_status == Status.StopRequested) return this;
-
-                _status = Status.StopRequested;
-
-                return this;
-            }
-        }
-
-        private void Loop(object data)
-        {
-            var worker = (Worker)data;
-
-            while (worker._status == Status.Running)
-            {
-                try
-                {
-                    _action();
-                }
-                catch (ThreadAbortException)
-                {
-                    _logger.Info("Worker thread caught ThreadAbortException, try to resetting, actionName:{0}", _actionName);
-                    Thread.ResetAbort();
-                    _logger.Info("Worker thread ThreadAbortException resetted, actionName:{0}", _actionName);
-                }
-                catch (Exception ex)
-                {
-                    _logger.Error(string.Format("Worker thread has exception, actionName:{0}", _actionName), ex);
-                }
-            }
-        }
-
-        enum Status
-        {
-            Initial,
-            Running,
-            StopRequested
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Storage/Chunk.cs b/MQ/NewLife.Queue/Storage/Chunk.cs
deleted file mode 100644
index ff7e43fc96..0000000000
--- a/MQ/NewLife.Queue/Storage/Chunk.cs
+++ /dev/null
@@ -1,1326 +0,0 @@
-﻿using System;
-using System.Collections.Concurrent;
-using System.Diagnostics;
-using System.IO;
-using System.Runtime.InteropServices;
-using System.Threading;
-using System.Threading.Tasks;
-using ECommon.Storage;
-using NewLife.Log;
-using NewLife.Queue.Storage.Exceptions;
-using NewLife.Queue.Utilities;
-
-
-namespace NewLife.Queue.Storage
-{
-    public unsafe class Chunk : IDisposable
-    {
-        #region Private Variables
-
-        private ChunkHeader _chunkHeader;
-        private ChunkFooter _chunkFooter;
-
-        private readonly string _filename;
-        private readonly ChunkManager _chunkManager;
-        private readonly ChunkManagerConfig _chunkConfig;
-        private readonly bool _isMemoryChunk;
-        private readonly ConcurrentQueue<ReaderWorkItem> _readerWorkItemQueue = new ConcurrentQueue<ReaderWorkItem>();
-
-        private readonly object _writeSyncObj = new object();
-        private readonly object _cacheSyncObj = new object();
-        private readonly object _freeMemoryObj = new object();
-
-        private int _dataPosition;
-        private bool _isCompleted;
-        private bool _isDestroying;
-        private bool _isMemoryFreed;
-        private int _cachingChunk;
-        private DateTime _lastActiveTime;
-        private bool _isReadersInitialized;
-        private int _flushedDataPosition;
-
-        private Chunk _memoryChunk;
-        private CacheItem[] _cacheItems;
-        private IntPtr _cachedData;
-        private int _cachedLength;
-
-        private WriterWorkItem _writerWorkItem;
-
-        #endregion
-
-        #region Public Properties
-
-        public string FileName { get { return _filename; } }
-        public ChunkHeader ChunkHeader { get { return _chunkHeader; } }
-        public ChunkFooter ChunkFooter { get { return _chunkFooter; } }
-        public ChunkManagerConfig Config { get { return _chunkConfig; } }
-        public bool IsCompleted { get { return _isCompleted; } }
-        public DateTime LastActiveTime
-        {
-            get
-            {
-                var lastActiveTimeOfMemoryChunk = DateTime.MinValue;
-                if (_memoryChunk != null)
-                {
-                    lastActiveTimeOfMemoryChunk = _memoryChunk.LastActiveTime;
-                }
-                return lastActiveTimeOfMemoryChunk >= _lastActiveTime ? lastActiveTimeOfMemoryChunk : _lastActiveTime;
-            }
-        }
-        public bool IsMemoryChunk { get { return _isMemoryChunk; } }
-        public bool HasCachedChunk { get { return _memoryChunk != null; } }
-        public int DataPosition { get { return _dataPosition; } }
-        public long GlobalDataPosition
-        {
-            get
-            {
-                return ChunkHeader.ChunkDataStartPosition + DataPosition;
-            }
-        }
-        public bool IsFixedDataSize()
-        {
-            return _chunkConfig.ChunkDataUnitSize > 0 && _chunkConfig.ChunkDataCount > 0;
-        }
-
-        #endregion
-
-        #region Constructors
-
-        private Chunk(string filename, ChunkManager chunkManager, ChunkManagerConfig chunkConfig, bool isMemoryChunk)
-        {
-            Ensure.NotNullOrEmpty(filename, "filename");
-            Ensure.NotNull(chunkManager, "chunkManager");
-            Ensure.NotNull(chunkConfig, "chunkConfig");
-
-            _filename = filename;
-            _chunkManager = chunkManager;
-            _chunkConfig = chunkConfig;
-            _isMemoryChunk = isMemoryChunk;
-            _lastActiveTime = DateTime.Now;
-        }
-        ~Chunk()
-        {
-            UnCacheFromMemory();
-        }
-
-        #endregion
-
-        #region Factory Methods
-
-        public static Chunk CreateNew(string filename, int chunkNumber, ChunkManager chunkManager, ChunkManagerConfig config, bool isMemoryChunk)
-        {
-            var chunk = new Chunk(filename, chunkManager, config, isMemoryChunk);
-
-            try
-            {
-                chunk.InitNew(chunkNumber);
-            }
-            catch (OutOfMemoryException)
-            {
-                chunk.Dispose();
-                throw;
-            }
-            catch (Exception ex)
-            {
-                QueueService.Log.Info(string.Format("Chunk {0} create failed.", chunk));
-                XTrace.WriteException(ex);
-                chunk.Dispose();
-                throw;
-            }
-
-            return chunk;
-        }
-        public static Chunk FromCompletedFile(string filename, ChunkManager chunkManager, ChunkManagerConfig config, bool isMemoryChunk)
-        {
-            var chunk = new Chunk(filename, chunkManager, config, isMemoryChunk);
-
-            try
-            {
-                chunk.InitCompleted();
-            }
-            catch (OutOfMemoryException)
-            {
-                chunk.Dispose();
-                throw;
-            }
-            catch (Exception ex)
-            {
-                QueueService.Log.Info(string.Format("Chunk {0} init from completed file failed.", chunk));
-                XTrace.WriteException(ex);
-                chunk.Dispose();
-                throw;
-            }
-
-            return chunk;
-        }
-        public static Chunk FromOngoingFile<T>(string filename, ChunkManager chunkManager, ChunkManagerConfig config, Func<byte[], T> readRecordFunc, bool isMemoryChunk) where T : ILogRecord
-        {
-            var chunk = new Chunk(filename, chunkManager, config, isMemoryChunk);
-
-            try
-            {
-                chunk.InitOngoing(readRecordFunc);
-            }
-            catch (OutOfMemoryException)
-            {
-                chunk.Dispose();
-                throw;
-            }
-            catch (Exception ex)
-            {
-                QueueService.Log.Info(string.Format("Chunk {0} init from ongoing file failed.", chunk));
-                XTrace.WriteException(ex);
-                chunk.Dispose();
-                throw;
-            }
-
-            return chunk;
-        }
-
-        #endregion
-
-        #region Init Methods
-
-        private void InitCompleted()
-        {
-            var fileInfo = new FileInfo(_filename);
-            if (!fileInfo.Exists)
-            {
-                throw new ChunkFileNotExistException(_filename);
-            }
-
-            _isCompleted = true;
-
-            using (var fileStream = new FileStream(_filename, FileMode.Open, FileAccess.Read, FileShare.ReadWrite, _chunkConfig.ChunkReadBuffer, FileOptions.None))
-            {
-                using (var reader = new BinaryReader(fileStream))
-                {
-                    _chunkHeader = ReadHeader(fileStream, reader);
-                    _chunkFooter = ReadFooter(fileStream, reader);
-
-                    CheckCompletedFileChunk();
-                }
-            }
-
-            _dataPosition = _chunkFooter.ChunkDataTotalSize;
-            _flushedDataPosition = _chunkFooter.ChunkDataTotalSize;
-
-            if (_isMemoryChunk)
-            {
-                LoadFileChunkToMemory();
-            }
-            else
-            {
-                SetFileAttributes();
-            }
-
-            InitializeReaderWorkItems();
-
-            _lastActiveTime = DateTime.Now;
-        }
-        private void InitNew(int chunkNumber)
-        {
-            var chunkDataSize = 0;
-            if (_chunkConfig.ChunkDataSize > 0)
-            {
-                chunkDataSize = _chunkConfig.ChunkDataSize;
-            }
-            else
-            {
-                chunkDataSize = _chunkConfig.ChunkDataUnitSize * _chunkConfig.ChunkDataCount;
-            }
-
-            _chunkHeader = new ChunkHeader(chunkNumber, chunkDataSize);
-
-            _isCompleted = false;
-
-            var fileSize = ChunkHeader.Size + _chunkHeader.ChunkDataTotalSize + ChunkFooter.Size;
-
-            var writeStream = default(Stream);
-            var tempFilename = string.Format("{0}.{1}.tmp", _filename, Guid.NewGuid());
-            var tempFileStream = default(FileStream);
-
-            try
-            {
-                if (_isMemoryChunk)
-                {
-                    _cachedLength = fileSize;
-                    _cachedData = Marshal.AllocHGlobal(_cachedLength);
-                    writeStream = new UnmanagedMemoryStream((byte*)_cachedData, _cachedLength, _cachedLength, FileAccess.ReadWrite);
-                    writeStream.Write(_chunkHeader.AsByteArray(), 0, ChunkHeader.Size);
-                }
-                else
-                {
-                    var fileInfo = new FileInfo(_filename);
-                    if (fileInfo.Exists)
-                    {
-                        File.SetAttributes(_filename, FileAttributes.Normal);
-                        File.Delete(_filename);
-                    }
-
-                    tempFileStream = new FileStream(tempFilename, FileMode.CreateNew, FileAccess.ReadWrite, FileShare.Read, _chunkConfig.ChunkWriteBuffer, FileOptions.None);
-                    tempFileStream.SetLength(fileSize);
-                    tempFileStream.Write(_chunkHeader.AsByteArray(), 0, ChunkHeader.Size);
-                    tempFileStream.Flush(true);
-                    tempFileStream.Close();
-
-                    File.Move(tempFilename, _filename);
-
-                    writeStream = new FileStream(_filename, FileMode.Open, FileAccess.ReadWrite, FileShare.Read, _chunkConfig.ChunkWriteBuffer, FileOptions.SequentialScan);
-                    SetFileAttributes();
-                }
-
-                writeStream.Position = ChunkHeader.Size;
-
-                _dataPosition = 0;
-                _flushedDataPosition = 0;
-                _writerWorkItem = new WriterWorkItem(new ChunkFileStream(writeStream, _chunkConfig.FlushOption));
-
-                InitializeReaderWorkItems();
-
-                if (!_isMemoryChunk)
-                {
-                    if (_chunkConfig.EnableCache)
-                    {
-                        var chunkSize = (ulong)GetChunkSize(_chunkHeader);
-                        if (ChunkUtil.IsMemoryEnoughToCacheChunk(chunkSize, (uint)_chunkConfig.ChunkCacheMaxPercent))
-                        {
-                            try
-                            {
-                                _memoryChunk = CreateNew(_filename, chunkNumber, _chunkManager, _chunkConfig, true);
-                            }
-                            catch (OutOfMemoryException)
-                            {
-                                _cacheItems = new CacheItem[_chunkConfig.ChunkLocalCacheSize];
-                            }
-                            catch (Exception ex)
-                            {
-                                Log.Error(string.Format("Failed to cache new chunk {0}", this), ex);
-                                _cacheItems = new CacheItem[_chunkConfig.ChunkLocalCacheSize];
-                            }
-                        }
-                        else
-                        {
-                            _cacheItems = new CacheItem[_chunkConfig.ChunkLocalCacheSize];
-                        }
-                    }
-                    else
-                    {
-                        _cacheItems = new CacheItem[_chunkConfig.ChunkLocalCacheSize];
-                    }
-                }
-            }
-            catch
-            {
-                if (!_isMemoryChunk)
-                {
-                    if (tempFileStream != null)
-                    {
-                        Helper.EatException(() => tempFileStream.Close());
-                    }
-                    if (File.Exists(tempFilename))
-                    {
-                        Helper.EatException(() =>
-                        {
-                            File.SetAttributes(tempFilename, FileAttributes.Normal);
-                            File.Delete(tempFilename);
-                        });
-                    }
-                }
-                throw;
-            }
-
-            _lastActiveTime = DateTime.Now;
-        }
-        private void InitOngoing<T>(Func<byte[], T> readRecordFunc) where T : ILogRecord
-        {
-            var fileInfo = new FileInfo(_filename);
-            if (!fileInfo.Exists)
-            {
-                throw new ChunkFileNotExistException(_filename);
-            }
-
-            _isCompleted = false;
-
-            if (!TryParsingDataPosition(readRecordFunc, out _chunkHeader, out _dataPosition))
-            {
-                throw new ChunkBadDataException(string.Format("Failed to parse chunk data, chunk file: {0}", _filename));
-            }
-
-            _flushedDataPosition = _dataPosition;
-
-            var writeStream = default(Stream);
-
-            if (_isMemoryChunk)
-            {
-                var fileSize = ChunkHeader.Size + _chunkHeader.ChunkDataTotalSize + ChunkFooter.Size;
-                _cachedLength = fileSize;
-                _cachedData = Marshal.AllocHGlobal(_cachedLength);
-                writeStream = new UnmanagedMemoryStream((byte*)_cachedData, _cachedLength, _cachedLength, FileAccess.ReadWrite);
-
-                writeStream.Write(_chunkHeader.AsByteArray(), 0, ChunkHeader.Size);
-
-                if (_dataPosition > 0)
-                {
-                    using (var fileStream = new FileStream(_filename, FileMode.Open, FileAccess.Read, FileShare.ReadWrite, 8192, FileOptions.SequentialScan))
-                    {
-                        fileStream.Seek(ChunkHeader.Size, SeekOrigin.Begin);
-                        var buffer = new byte[65536];
-                        int toReadBytes = _dataPosition;
-
-                        while (toReadBytes > 0)
-                        {
-                            int read = fileStream.Read(buffer, 0, Math.Min(toReadBytes, buffer.Length));
-                            if (read == 0)
-                            {
-                                break;
-                            }
-                            toReadBytes -= read;
-                            writeStream.Write(buffer, 0, read);
-                        }
-                    }
-                }
-
-                if (writeStream.Position != GetStreamPosition(_dataPosition))
-                {
-                    throw new InvalidOperationException(string.Format("UnmanagedMemoryStream position incorrect, expect: {0}, but: {1}", _dataPosition + ChunkHeader.Size, writeStream.Position));
-                }
-            }
-            else
-            {
-                writeStream = new FileStream(_filename, FileMode.Open, FileAccess.ReadWrite, FileShare.Read, _chunkConfig.ChunkWriteBuffer, FileOptions.SequentialScan);
-                writeStream.Position = GetStreamPosition(_dataPosition);
-                SetFileAttributes();
-            }
-
-            _writerWorkItem = new WriterWorkItem(new ChunkFileStream(writeStream, _chunkConfig.FlushOption));
-
-            InitializeReaderWorkItems();
-
-            if (!_isMemoryChunk)
-            {
-                if (_chunkConfig.EnableCache)
-                {
-                    var chunkSize = (ulong)GetChunkSize(_chunkHeader);
-                    if (ChunkUtil.IsMemoryEnoughToCacheChunk(chunkSize, (uint)_chunkConfig.ChunkCacheMaxPercent))
-                    {
-                        try
-                        {
-                            _memoryChunk = FromOngoingFile(_filename, _chunkManager, _chunkConfig, readRecordFunc, true);
-                        }
-                        catch (OutOfMemoryException)
-                        {
-                            _cacheItems = new CacheItem[_chunkConfig.ChunkLocalCacheSize];
-                        }
-                        catch (Exception ex)
-                        {
-                            Log.Error(string.Format("Failed to cache ongoing chunk {0}", this), ex);
-                            _cacheItems = new CacheItem[_chunkConfig.ChunkLocalCacheSize];
-                        }
-                    }
-                    else
-                    {
-                        _cacheItems = new CacheItem[_chunkConfig.ChunkLocalCacheSize];
-                    }
-                }
-                else
-                {
-                    _cacheItems = new CacheItem[_chunkConfig.ChunkLocalCacheSize];
-                }
-            }
-
-            _lastActiveTime = DateTime.Now;
-
-            if (!_isMemoryChunk)
-            {
-                Log.Info("Ongoing chunk {0} initialized, _dataPosition: {1}", this, _dataPosition);
-            }
-        }
-
-        #endregion
-
-        #region Public Methods
-
-        public bool TryCacheInMemory(bool shouldCacheNextChunk)
-        {
-            lock (_cacheSyncObj)
-            {
-                if (!_chunkConfig.EnableCache || _isMemoryChunk || !_isCompleted || _memoryChunk != null)
-                {
-                    _cachingChunk = 0;
-                    return false;
-                }
-
-                try
-                {
-                    var chunkSize = (ulong)GetChunkSize(_chunkHeader);
-                    if (!ChunkUtil.IsMemoryEnoughToCacheChunk(chunkSize, (uint)_chunkConfig.ChunkCacheMaxPercent))
-                    {
-                        return false;
-                    }
-                    _memoryChunk = FromCompletedFile(_filename, _chunkManager, _chunkConfig, true);
-                    if (shouldCacheNextChunk)
-                    {
-                        Task.Factory.StartNew(() => _chunkManager.TryCacheNextChunk(this));
-                    }
-                    return true;
-                }
-                catch (OutOfMemoryException) { return false; }
-                catch (Exception ex)
-                {
-                    Log.Error(string.Format("Failed to cache completed chunk {0}", this), ex);
-                    return false;
-                }
-                finally
-                {
-                    _cachingChunk = 0;
-                }
-            }
-        }
-        public bool UnCacheFromMemory()
-        {
-            lock (_cacheSyncObj)
-            {
-                if (!_chunkConfig.EnableCache || _isMemoryChunk || !_isCompleted || _memoryChunk == null)
-                {
-                    return false;
-                }
-
-                try
-                {
-                    var memoryChunk = _memoryChunk;
-                    _memoryChunk = null;
-                    memoryChunk.Dispose();
-                    return true;
-                }
-                catch (Exception ex)
-                {
-                    Log.Error(string.Format("Failed to uncache completed chunk {0}", this), ex);
-                    return false;
-                }
-            }
-        }
-        public T TryReadAt<T>(long dataPosition, Func<byte[], T> readRecordFunc, bool autoCache = true) where T : class, ILogRecord
-        {
-            if (_isDestroying)
-            {
-                throw new ChunkReadException(string.Format("Chunk {0} is being deleting.", this));
-            }
-
-            _lastActiveTime = DateTime.Now;
-
-            if (!_isMemoryChunk)
-            {
-                if (_cacheItems != null)
-                {
-                    var index = dataPosition % _chunkConfig.ChunkLocalCacheSize;
-                    var cacheItem = _cacheItems[index];
-                    if (cacheItem != null && cacheItem.RecordPosition == dataPosition)
-                    {
-                        var record = readRecordFunc(cacheItem.RecordBuffer);
-                        if (record == null)
-                        {
-                            throw new ChunkReadException(
-                                string.Format("Cannot read a record from data position {0}. Something is seriously wrong in chunk {1}.",
-                                              dataPosition, this));
-                        }
-                        if (_chunkConfig.EnableChunkStatistic)
-                        {
-                            _chunkManager.AddCachedReadCount(ChunkHeader.ChunkNumber);
-                        }
-                        return record;
-                    }
-                }
-                else if (_memoryChunk != null)
-                {
-                    var record = _memoryChunk.TryReadAt(dataPosition, readRecordFunc);
-                    if (record != null && _chunkConfig.EnableChunkStatistic)
-                    {
-                        _chunkManager.AddUnmanagedReadCount(ChunkHeader.ChunkNumber);
-                    }
-                    return record;
-                }
-            }
-
-            if (_chunkConfig.EnableCache && autoCache && !_isMemoryChunk && _isCompleted && Interlocked.CompareExchange(ref _cachingChunk, 1, 0) == 0)
-            {
-                Task.Factory.StartNew(() => TryCacheInMemory(true));
-            }
-
-            var readerWorkItem = GetReaderWorkItem();
-            try
-            {
-                var currentDataPosition = DataPosition;
-                if (dataPosition >= currentDataPosition)
-                {
-                    return null;
-                }
-
-                try
-                {
-                    var record = IsFixedDataSize() ?
-                        TryReadFixedSizeForwardInternal(readerWorkItem, dataPosition, readRecordFunc) :
-                        TryReadForwardInternal(readerWorkItem, dataPosition, readRecordFunc);
-                    if (!_isMemoryChunk && _chunkConfig.EnableChunkStatistic)
-                    {
-                        _chunkManager.AddFileReadCount(ChunkHeader.ChunkNumber);
-                    }
-                    return record;
-                }
-                catch
-                {
-                    if (!_isMemoryChunk && _writerWorkItem != null && _writerWorkItem.LastFlushedPosition < GetStreamPosition(_dataPosition))
-                    {
-                        return null;
-                    }
-                    else
-                    {
-                        throw;
-                    }
-                }
-            }
-            finally
-            {
-                ReturnReaderWorkItem(readerWorkItem);
-            }
-        }
-        public RecordWriteResult TryAppend(ILogRecord record)
-        {
-            if (_isCompleted)
-            {
-                throw new ChunkWriteException(this.ToString(), string.Format("Cannot write to a read-only chunk, isMemoryChunk: {0}, _dataPosition: {1}", _isMemoryChunk, _dataPosition));
-            }
-
-            _lastActiveTime = DateTime.Now;
-
-            var writerWorkItem = _writerWorkItem;
-            var bufferStream = writerWorkItem.BufferStream;
-            var bufferWriter = writerWorkItem.BufferWriter;
-            var recordBuffer = default(byte[]);
-
-            if (IsFixedDataSize())
-            {
-                if (writerWorkItem.WorkingStream.Position + _chunkConfig.ChunkDataUnitSize > ChunkHeader.Size + _chunkHeader.ChunkDataTotalSize)
-                {
-                    return RecordWriteResult.NotEnoughSpace();
-                }
-                bufferStream.Position = 0;
-                record.WriteTo(GlobalDataPosition, bufferWriter);
-                var recordLength = (int)bufferStream.Length;
-                if (recordLength != _chunkConfig.ChunkDataUnitSize)
-                {
-                    throw new ChunkWriteException(this.ToString(), string.Format("Invalid fixed data length, expected length {0}, but was {1}", _chunkConfig.ChunkDataUnitSize, recordLength));
-                }
-
-                if (_cacheItems != null)
-                {
-                    recordBuffer = new byte[recordLength];
-                    Buffer.BlockCopy(bufferStream.GetBuffer(), 0, recordBuffer, 0, recordLength);
-                }
-            }
-            else
-            {
-                bufferStream.SetLength(4);
-                bufferStream.Position = 4;
-                record.WriteTo(GlobalDataPosition, bufferWriter);
-                var recordLength = (int)bufferStream.Length - 4;
-                bufferWriter.Write(recordLength); // write record length suffix
-                bufferStream.Position = 0;
-                bufferWriter.Write(recordLength); // write record length prefix
-
-                if (recordLength > _chunkConfig.MaxLogRecordSize)
-                {
-                    throw new ChunkWriteException(this.ToString(),
-                        string.Format("Log record at data position {0} has too large length: {1} bytes, while limit is {2} bytes",
-                                      _dataPosition, recordLength, _chunkConfig.MaxLogRecordSize));
-                }
-
-                if (writerWorkItem.WorkingStream.Position + recordLength + 2 * sizeof(int) > ChunkHeader.Size + _chunkHeader.ChunkDataTotalSize)
-                {
-                    return RecordWriteResult.NotEnoughSpace();
-                }
-
-                if (_cacheItems != null)
-                {
-                    recordBuffer = new byte[recordLength];
-                    Buffer.BlockCopy(bufferStream.GetBuffer(), 4, recordBuffer, 0, recordLength);
-                }
-            }
-
-            var writtenPosition = _dataPosition;
-            var buffer = bufferStream.GetBuffer();
-
-            lock (_writeSyncObj)
-            {
-                writerWorkItem.AppendData(buffer, 0, (int)bufferStream.Length);
-            }
-
-            _dataPosition = (int)writerWorkItem.WorkingStream.Position - ChunkHeader.Size;
-
-            var position = ChunkHeader.ChunkDataStartPosition + writtenPosition;
-
-            if (_chunkConfig.EnableCache)
-            {
-                if (_memoryChunk != null)
-                {
-                    var result = _memoryChunk.TryAppend(record);
-                    if (!result.Success)
-                    {
-                        throw new ChunkWriteException(this.ToString(), "Append record to file chunk success, but append to memory chunk failed as memory space not enough, this should not be happened.");
-                    }
-                    else if (result.Position != position)
-                    {
-                        throw new ChunkWriteException(this.ToString(), string.Format("Append record to file chunk success, and append to memory chunk success, but the position is not equal, memory chunk write position: {0}, file chunk write position: {1}.", result.Position, position));
-                    }
-                }
-                else if (_cacheItems != null && recordBuffer != null)
-                {
-                    var index = writtenPosition % _chunkConfig.ChunkLocalCacheSize;
-                    _cacheItems[index] = new CacheItem { RecordPosition = writtenPosition, RecordBuffer = recordBuffer };
-                }
-            }
-            else if (_cacheItems != null && recordBuffer != null)
-            {
-                var index = writtenPosition % _chunkConfig.ChunkLocalCacheSize;
-                _cacheItems[index] = new CacheItem { RecordPosition = writtenPosition, RecordBuffer = recordBuffer };
-            }
-
-            if (!_isMemoryChunk && _chunkConfig.EnableChunkStatistic)
-            {
-                _chunkManager.AddWriteBytes(ChunkHeader.ChunkNumber, (int)bufferStream.Length);
-            }
-
-            return RecordWriteResult.Successful(position);
-        }
-        public void Flush()
-        {
-            if (_isMemoryChunk || _isCompleted) return;
-            if (_writerWorkItem != null)
-            {
-                Helper.EatException(() => _writerWorkItem.FlushToDisk());
-            }
-        }
-        public void Complete()
-        {
-            lock (_writeSyncObj)
-            {
-                if (_isCompleted) return;
-
-                _chunkFooter = WriteFooter();
-                if (!_isMemoryChunk)
-                {
-                    Flush();
-                }
-
-                _isCompleted = true;
-
-                if (_writerWorkItem != null)
-                {
-                    Helper.EatException(() => _writerWorkItem.Dispose());
-                    _writerWorkItem = null;
-                }
-
-                if (!_isMemoryChunk)
-                {
-                    if (_cacheItems != null)
-                    {
-                        _cacheItems = null;
-                    }
-
-                    SetFileAttributes();
-                    if (_memoryChunk != null)
-                    {
-                        _memoryChunk.Complete();
-                    }
-                }
-            }
-        }
-        public void Dispose()
-        {
-            Close();
-        }
-        public void Close()
-        {
-            lock (_writeSyncObj)
-            {
-                if (!_isCompleted)
-                {
-                    Flush();
-                }
-
-                if (_writerWorkItem != null)
-                {
-                    Helper.EatException(() => _writerWorkItem.Dispose());
-                    _writerWorkItem = null;
-                }
-
-                if (!_isMemoryChunk)
-                {
-                    if (_cacheItems != null)
-                    {
-                        _cacheItems = null;
-                    }
-                }
-                CloseAllReaderWorkItems();
-                FreeMemory();
-            }
-        }
-        public void Destroy()
-        {
-            if (_isMemoryChunk)
-            {
-                FreeMemory();
-                return;
-            }
-
-            //检查当前chunk是否已完成
-            if (!_isCompleted)
-            {
-                throw new InvalidOperationException(string.Format("Not allowed to delete a incompleted chunk {0}", this));
-            }
-
-            //首先设置删除标记
-            _isDestroying = true;
-
-            if (_cacheItems != null)
-            {
-                _cacheItems = null;
-            }
-
-            //释放缓存的内存
-            UnCacheFromMemory();
-
-            //关闭所有的ReaderWorkItem
-            CloseAllReaderWorkItems();
-
-            //删除Chunk文件
-            File.SetAttributes(_filename, FileAttributes.Normal);
-            File.Delete(_filename);
-        }
-
-        #endregion
-
-        #region Helper Methods
-
-        private void CheckCompletedFileChunk()
-        {
-            using (var fileStream = new FileStream(_filename, FileMode.Open, FileAccess.Read, FileShare.ReadWrite, _chunkConfig.ChunkReadBuffer, FileOptions.None))
-            {
-                //检查Chunk文件的实际大小是否正确
-                var chunkFileSize = ChunkHeader.Size + _chunkFooter.ChunkDataTotalSize + ChunkFooter.Size;
-                if (chunkFileSize != fileStream.Length)
-                {
-                    throw new ChunkBadDataException(
-                        string.Format("The size of chunk {0} should be equals with fileStream's length {1}, but instead it was {2}.",
-                                        this,
-                                        fileStream.Length,
-                                        chunkFileSize));
-                }
-
-                //如果Chunk中的数据是固定大小的，则还需要检查数据总数是否正确
-                if (IsFixedDataSize())
-                {
-                    if (_chunkFooter.ChunkDataTotalSize != _chunkHeader.ChunkDataTotalSize)
-                    {
-                        throw new ChunkBadDataException(
-                            string.Format("For fixed-size chunk, the total data size of chunk {0} should be {1}, but instead it was {2}.",
-                                            this,
-                                            _chunkHeader.ChunkDataTotalSize,
-                                            _chunkFooter.ChunkDataTotalSize));
-                    }
-                }
-            }
-        }
-        private void LoadFileChunkToMemory()
-        {
-            using (var fileStream = new FileStream(_filename, FileMode.Open, FileAccess.Read, FileShare.ReadWrite, 8192, FileOptions.None))
-            {
-                var cachedLength = (int)fileStream.Length;
-                var cachedData = Marshal.AllocHGlobal(cachedLength);
-
-                try
-                {
-                    using (var unmanagedStream = new UnmanagedMemoryStream((byte*)cachedData, cachedLength, cachedLength, FileAccess.ReadWrite))
-                    {
-                        fileStream.Seek(0, SeekOrigin.Begin);
-                        var buffer = new byte[65536];
-                        int toRead = cachedLength;
-                        while (toRead > 0)
-                        {
-                            int read = fileStream.Read(buffer, 0, Math.Min(toRead, buffer.Length));
-                            if (read == 0)
-                            {
-                                break;
-                            }
-                            toRead -= read;
-                            unmanagedStream.Write(buffer, 0, read);
-                        }
-                    }
-                }
-                catch
-                {
-                    Marshal.FreeHGlobal(cachedData);
-                    throw;
-                }
-
-                _cachedData = cachedData;
-                _cachedLength = cachedLength;
-            }
-        }
-        private void FreeMemory()
-        {
-            if (_isMemoryChunk && !_isMemoryFreed)
-            {
-                lock (_freeMemoryObj)
-                {
-                    var cachedData = Interlocked.Exchange(ref _cachedData, IntPtr.Zero);
-                    if (cachedData != IntPtr.Zero)
-                    {
-                        try
-                        {
-                            Marshal.FreeHGlobal(cachedData);
-                        }
-                        catch (Exception ex)
-                        {
-                            Log.Error(string.Format("Failed to free memory of chunk {0}", this), ex);
-                        }
-                    }
-                    _isMemoryFreed = true;
-                }
-            }
-        }
-
-        private void InitializeReaderWorkItems()
-        {
-            for (var i = 0; i < _chunkConfig.ChunkReaderCount; i++)
-            {
-                _readerWorkItemQueue.Enqueue(CreateReaderWorkItem());
-            }
-            _isReadersInitialized = true;
-        }
-        private void CloseAllReaderWorkItems()
-        {
-            if (!_isReadersInitialized) return;
-
-            var watch = Stopwatch.StartNew();
-            var closedCount = 0;
-
-            while (closedCount < _chunkConfig.ChunkReaderCount)
-            {
-                ReaderWorkItem readerWorkItem;
-                while (_readerWorkItemQueue.TryDequeue(out readerWorkItem))
-                {
-                    readerWorkItem.Reader.Close();
-                    closedCount++;
-                }
-
-                if (closedCount >= _chunkConfig.ChunkReaderCount)
-                {
-                    break;
-                }
-
-                Thread.Sleep(1000);
-
-                if (watch.ElapsedMilliseconds > 30 * 1000)
-                {
-                    Log.Error("Close chunk reader work items timeout, expect close count: {0}, real close count: {1}", _chunkConfig.ChunkReaderCount, closedCount);
-                    break;
-                }
-            }
-        }
-        private ReaderWorkItem CreateReaderWorkItem()
-        {
-            var stream = default(Stream);
-            if (_isMemoryChunk)
-            {
-                stream = new UnmanagedMemoryStream((byte*)_cachedData, _cachedLength);
-            }
-            else
-            {
-                stream = new FileStream(_filename, FileMode.Open, FileAccess.Read, FileShare.ReadWrite, _chunkConfig.ChunkReadBuffer, FileOptions.None);
-            }
-            return new ReaderWorkItem(stream, new BinaryReader(stream));
-        }
-        private ReaderWorkItem GetReaderWorkItem()
-        {
-            ReaderWorkItem readerWorkItem;
-            while (!_readerWorkItemQueue.TryDequeue(out readerWorkItem))
-            {
-                Thread.Sleep(1);
-            }
-            return readerWorkItem;
-        }
-        private void ReturnReaderWorkItem(ReaderWorkItem readerWorkItem)
-        {
-            _readerWorkItemQueue.Enqueue(readerWorkItem);
-        }
-
-        private ChunkFooter WriteFooter()
-        {
-            var currentTotalDataSize = DataPosition;
-
-            //如果是固定大小的数据，则检查总数据大小是否正确
-            if (IsFixedDataSize())
-            {
-                if (currentTotalDataSize != _chunkHeader.ChunkDataTotalSize)
-                {
-                    throw new ChunkCompleteException(string.Format("Cannot write the chunk footer as the current total data size is incorrect. chunk: {0}, expectTotalDataSize: {1}, currentTotalDataSize: {2}",
-                        this,
-                        _chunkHeader.ChunkDataTotalSize,
-                        currentTotalDataSize));
-                }
-            }
-
-            var workItem = _writerWorkItem;
-            var footer = new ChunkFooter(currentTotalDataSize);
-
-            workItem.AppendData(footer.AsByteArray(), 0, ChunkFooter.Size);
-
-            Flush(); // trying to prevent bug with resized file, but no data in it
-
-            var oldStreamLength = workItem.WorkingStream.Length;
-            var newStreamLength = ChunkHeader.Size + currentTotalDataSize + ChunkFooter.Size;
-
-            if (newStreamLength != oldStreamLength)
-            {
-                workItem.ResizeStream(newStreamLength);
-            }
-
-            return footer;
-        }
-        private ChunkHeader ReadHeader(FileStream stream, BinaryReader reader)
-        {
-            if (stream.Length < ChunkHeader.Size)
-            {
-                throw new Exception(string.Format("Chunk file '{0}' is too short to even read ChunkHeader, its size is {1} bytes.", _filename, stream.Length));
-            }
-            stream.Seek(0, SeekOrigin.Begin);
-            return ChunkHeader.FromStream(reader, stream);
-        }
-        private ChunkFooter ReadFooter(FileStream stream, BinaryReader reader)
-        {
-            if (stream.Length < ChunkFooter.Size)
-            {
-                throw new Exception(string.Format("Chunk file '{0}' is too short to even read ChunkFooter, its size is {1} bytes.", _filename, stream.Length));
-            }
-            stream.Seek(-ChunkFooter.Size, SeekOrigin.End);
-            return ChunkFooter.FromStream(reader, stream);
-        }
-        private int GetChunkSize(ChunkHeader chunkHeader)
-        {
-            return ChunkHeader.Size + chunkHeader.ChunkDataTotalSize + ChunkFooter.Size;
-        }
-
-        private T TryReadForwardInternal<T>(ReaderWorkItem readerWorkItem, long dataPosition, Func<byte[], T> readRecordFunc) where T : ILogRecord
-        {
-            lock (_freeMemoryObj)
-            {
-                if (_isMemoryFreed)
-                {
-                    return default(T);
-                }
-                var currentDataPosition = DataPosition;
-
-                if (dataPosition + 2 * sizeof(int) > currentDataPosition)
-                {
-                    throw new ChunkReadException(
-                        string.Format("No enough space even for length prefix and suffix, data position: {0}, max data position: {1}, chunk: {2}",
-                                      dataPosition, currentDataPosition, this));
-                }
-
-                readerWorkItem.Stream.Position = GetStreamPosition(dataPosition);
-
-                var length = readerWorkItem.Reader.ReadInt32();
-                if (length <= 0)
-                {
-                    throw new ChunkReadException(
-                        string.Format("Log record at data position {0} has non-positive length: {1} in chunk {2}",
-                                      dataPosition, length, this));
-                }
-                if (length > _chunkConfig.MaxLogRecordSize)
-                {
-                    throw new ChunkReadException(
-                        string.Format("Log record at data position {0} has too large length: {1} bytes, while limit is {2} bytes, in chunk {3}",
-                                      dataPosition, length, _chunkConfig.MaxLogRecordSize, this));
-                }
-                if (dataPosition + length + 2 * sizeof(int) > currentDataPosition)
-                {
-                    throw new ChunkReadException(
-                        string.Format("There is not enough space to read full record (length prefix: {0}), data position: {1}, max data position: {2}, chunk: {3}",
-                                      length, dataPosition, currentDataPosition, this));
-                }
-
-                var recordBuffer = readerWorkItem.Reader.ReadBytes(length);
-                var record = readRecordFunc(recordBuffer);
-                if (record == null)
-                {
-                    throw new ChunkReadException(
-                        string.Format("Cannot read a record from data position {0}. Something is seriously wrong in chunk {1}.",
-                                      dataPosition, this));
-                }
-
-                int suffixLength = readerWorkItem.Reader.ReadInt32();
-                if (suffixLength != length)
-                {
-                    throw new ChunkReadException(
-                        string.Format("Prefix/suffix length inconsistency: prefix length({0}) != suffix length ({1}), data position: {2}. Something is seriously wrong in chunk {3}.",
-                                      length, suffixLength, dataPosition, this));
-                }
-
-                return record;
-            }
-        }
-        private T TryReadFixedSizeForwardInternal<T>(ReaderWorkItem readerWorkItem, long dataPosition, Func<byte[], T> readRecordFunc) where T : ILogRecord
-        {
-            lock (_freeMemoryObj)
-            {
-                if (_isMemoryFreed)
-                {
-                    return default(T);
-                }
-                var currentDataPosition = DataPosition;
-
-                if (dataPosition + _chunkConfig.ChunkDataUnitSize > currentDataPosition)
-                {
-                    throw new ChunkReadException(
-                        string.Format("No enough space for fixed data record, data position: {0}, max data position: {1}, chunk: {2}",
-                                      dataPosition, currentDataPosition, this));
-                }
-
-                var startStreamPosition = GetStreamPosition(dataPosition);
-                readerWorkItem.Stream.Position = startStreamPosition;
-
-                var recordBuffer = readerWorkItem.Reader.ReadBytes(_chunkConfig.ChunkDataUnitSize);
-                var record = readRecordFunc(recordBuffer);
-                if (record == null)
-                {
-                    throw new ChunkReadException(
-                            string.Format("Read fixed record from data position: {0} failed, max data position: {1}. Something is seriously wrong in chunk {2}",
-                                          dataPosition, currentDataPosition, this));
-                }
-
-                var recordLength = readerWorkItem.Stream.Position - startStreamPosition;
-                if (recordLength != _chunkConfig.ChunkDataUnitSize)
-                {
-                    throw new ChunkReadException(
-                            string.Format("Invalid fixed record length, expected length {0}, but was {1}, dataPosition: {2}. Something is seriously wrong in chunk {3}",
-                                          _chunkConfig.ChunkDataUnitSize, recordLength, dataPosition, this));
-                }
-
-                return record;
-            }
-        }
-
-        private bool TryParsingDataPosition<T>(Func<byte[], T> readRecordFunc, out ChunkHeader chunkHeader, out int dataPosition) where T : ILogRecord
-        {
-            using (var fileStream = new FileStream(_filename, FileMode.Open, FileAccess.Read, FileShare.ReadWrite, _chunkConfig.ChunkReadBuffer, FileOptions.None))
-            {
-                using (var reader = new BinaryReader(fileStream))
-                {
-                    chunkHeader = ReadHeader(fileStream, reader);
-
-                    fileStream.Position = ChunkHeader.Size;
-
-                    var startStreamPosition = fileStream.Position;
-                    var maxStreamPosition = fileStream.Length - ChunkFooter.Size;
-                    var isFixedDataSize = IsFixedDataSize();
-
-                    while (fileStream.Position < maxStreamPosition)
-                    {
-                        var success = false;
-                        if (isFixedDataSize)
-                        {
-                            success = TryReadFixedSizeRecord(fileStream, reader, maxStreamPosition, readRecordFunc);
-                        }
-                        else
-                        {
-                            success = TryReadRecord(fileStream, reader, maxStreamPosition, readRecordFunc);
-                        }
-
-                        if (success)
-                        {
-                            startStreamPosition = fileStream.Position;
-                        }
-                        else
-                        {
-                            break;
-                        }
-                    }
-
-                    if (startStreamPosition != fileStream.Position)
-                    {
-                        fileStream.Position = startStreamPosition;
-                    }
-
-                    dataPosition = (int)fileStream.Position - ChunkHeader.Size;
-
-                    return true;
-                }
-            }
-        }
-        private bool TryReadRecord<T>(FileStream stream, BinaryReader reader, long maxStreamPosition, Func<byte[], T> readRecordFunc) where T : ILogRecord
-        {
-            try
-            {
-                var startStreamPosition = stream.Position;
-                if (startStreamPosition + 2 * sizeof(int) > maxStreamPosition)
-                {
-                    return false;
-                }
-
-                var length = reader.ReadInt32();
-                if (length <= 0 || length > _chunkConfig.MaxLogRecordSize)
-                {
-                    return false;
-                }
-                if (startStreamPosition + length + 2 * sizeof(int) > maxStreamPosition)
-                {
-                    return false;
-                }
-
-                var recordBuffer = reader.ReadBytes(length);
-                var record = readRecordFunc(recordBuffer);
-                if (record == null)
-                {
-                    return false;
-                }
-
-                int suffixLength = reader.ReadInt32();
-                if (suffixLength != length)
-                {
-                    return false;
-                }
-
-                return true;
-            }
-            catch
-            {
-                return false;
-            }
-        }
-        private bool TryReadFixedSizeRecord<T>(FileStream stream, BinaryReader reader, long maxStreamPosition, Func<byte[], T> readRecordFunc) where T : ILogRecord
-        {
-            try
-            {
-                var startStreamPosition = stream.Position;
-                if (startStreamPosition + _chunkConfig.ChunkDataUnitSize > maxStreamPosition)
-                {
-                    return false;
-                }
-
-                var recordBuffer = reader.ReadBytes(_chunkConfig.ChunkDataUnitSize);
-                var record = readRecordFunc(recordBuffer);
-                if (record == null)
-                {
-                    return false;
-                }
-
-                var recordLength = stream.Position - startStreamPosition;
-                if (recordLength != _chunkConfig.ChunkDataUnitSize)
-                {
-                    Log.Error("Invalid fixed data length, expected length {0}, but was {1}", _chunkConfig.ChunkDataUnitSize, recordLength);
-                    return false;
-                }
-
-                return true;
-            }
-            catch
-            {
-                return false;
-            }
-        }
-        private static long GetStreamPosition(long dataPosition)
-        {
-            return ChunkHeader.Size + dataPosition;
-        }
-
-        private void SetFileAttributes()
-        {
-            Helper.EatException(() => File.SetAttributes(_filename, FileAttributes.NotContentIndexed));
-        }
-
-        #endregion
-
-        #region 日志
-        /// <summary>日志</summary>
-        public ILog Log { get; set; } = Logger.Null;
-        #endregion
-
-        class CacheItem
-        {
-            public long RecordPosition;
-            public byte[] RecordBuffer;
-        }
-        class ChunkFileStream : IStream
-        {
-            public Stream Stream;
-            public FlushOption FlushOption;
-
-            public ChunkFileStream(Stream stream, FlushOption flushOption)
-            {
-                Stream = stream;
-                FlushOption = flushOption;
-            }
-
-            public long Length
-            {
-                get
-                {
-                    return Stream.Length;
-                }
-            }
-
-            public long Position
-            {
-                get
-                {
-                    return Stream.Position;
-                }
-
-                set
-                {
-                    Stream.Position = value;
-                }
-            }
-
-            public void Dispose()
-            {
-                Stream.Dispose();
-            }
-
-            public void Flush()
-            {
-                var fileStream = Stream as FileStream;
-                if (fileStream != null)
-                {
-                    if (FlushOption == FlushOption.FlushToDisk)
-                    {
-                        fileStream.Flush(true);
-                    }
-                    else
-                    {
-                        fileStream.Flush();
-                    }
-                }
-                else
-                {
-                    Stream.Flush();
-                }
-            }
-
-            public void SetLength(long value)
-            {
-                Stream.SetLength(value);
-            }
-
-            public void Write(byte[] buffer, int offset, int count)
-            {
-                Stream.Write(buffer, offset, count);
-            }
-        }
-        public override string ToString()
-        {
-            return string.Format("({0}-#{1})", _chunkManager.Name, _chunkHeader.ChunkNumber);
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Storage/ChunkFooter.cs b/MQ/NewLife.Queue/Storage/ChunkFooter.cs
deleted file mode 100644
index b03c63d235..0000000000
--- a/MQ/NewLife.Queue/Storage/ChunkFooter.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-﻿using System.IO;
-using NewLife.Queue.Utilities;
-
-namespace NewLife.Queue.Storage
-{
-    public class ChunkFooter
-    {
-        public const int Size = 128;
-        public readonly int ChunkDataTotalSize;
-
-        public ChunkFooter(int chunkDataTotalSize)
-        {
-            Ensure.Nonnegative(chunkDataTotalSize, "chunkDataTotalSize");
-            ChunkDataTotalSize = chunkDataTotalSize;
-        }
-
-        public byte[] AsByteArray()
-        {
-            var array = new byte[Size];
-            using (var stream = new MemoryStream(array))
-            {
-                using (var writer = new BinaryWriter(stream))
-                {
-                    writer.Write(ChunkDataTotalSize);
-                }
-            }
-            return array;
-        }
-
-        public static ChunkFooter FromStream(BinaryReader reader, Stream stream)
-        {
-            var chunkDataTotalSize = reader.ReadInt32();
-            return new ChunkFooter(chunkDataTotalSize);
-        }
-
-        public override string ToString()
-        {
-            return string.Format("[ChunkDataTotalSize:{0}]", ChunkDataTotalSize);
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Storage/ChunkHeader.cs b/MQ/NewLife.Queue/Storage/ChunkHeader.cs
deleted file mode 100644
index 9fbe954215..0000000000
--- a/MQ/NewLife.Queue/Storage/ChunkHeader.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-﻿using System;
-using System.IO;
-using NewLife.Queue.Utilities;
-
-namespace NewLife.Queue.Storage
-{
-    public class ChunkHeader
-    {
-        public const int Size = 128;
-        public readonly int ChunkNumber;
-        public readonly int ChunkDataTotalSize;
-        public readonly long ChunkDataStartPosition;
-        public readonly long ChunkDataEndPosition;
-
-        public ChunkHeader(int chunkNumber, int chunkDataTotalSize)
-        {
-            Ensure.Nonnegative(chunkNumber, "chunkNumber");
-            Ensure.Positive(chunkDataTotalSize, "chunkDataTotalSize");
-
-            ChunkNumber = chunkNumber;
-            ChunkDataTotalSize = chunkDataTotalSize;
-
-            ChunkDataStartPosition = ChunkNumber * (long)ChunkDataTotalSize;
-            ChunkDataEndPosition = (ChunkNumber + 1) * (long)ChunkDataTotalSize;
-        }
-
-        public byte[] AsByteArray()
-        {
-            var array = new byte[Size];
-            using (var stream = new MemoryStream(array))
-            {
-                using (var writer = new BinaryWriter(stream))
-                {
-                    writer.Write(ChunkNumber);
-                    writer.Write(ChunkDataTotalSize);
-                }
-            }
-            return array;
-        }
-        public static ChunkHeader FromStream(BinaryReader reader, Stream stream)
-        {
-            var chunkNumber = reader.ReadInt32();
-            var chunkDataTotalSize = reader.ReadInt32();
-            return new ChunkHeader(chunkNumber, chunkDataTotalSize);
-        }
-
-        public int GetLocalDataPosition(long globalDataPosition)
-        {
-            if (globalDataPosition < ChunkDataStartPosition || globalDataPosition > ChunkDataEndPosition)
-            {
-                throw new Exception(string.Format("globalDataPosition {0} is out of chunk data positions [{1}, {2}].", globalDataPosition, ChunkDataStartPosition, ChunkDataEndPosition));
-            }
-            return (int)(globalDataPosition - ChunkDataStartPosition);
-        }
-
-        public override string ToString()
-        {
-            return string.Format("[ChunkNumber:{0}, ChunkDataTotalSize:{1}, ChunkDataStartPosition:{2}, ChunkDataEndPosition:{3}]",
-                                 ChunkNumber,
-                                 ChunkDataTotalSize,
-                                 ChunkDataStartPosition,
-                                 ChunkDataEndPosition);
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Storage/ChunkManager.cs b/MQ/NewLife.Queue/Storage/ChunkManager.cs
deleted file mode 100644
index 71cafc5adc..0000000000
--- a/MQ/NewLife.Queue/Storage/ChunkManager.cs
+++ /dev/null
@@ -1,432 +0,0 @@
-﻿using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using ECommon.Storage;
-using NewLife.Queue.Utilities;
-using NewLife.Log;
-using NewLife.Model;
-using NewLife.Queue.Scheduling;
-
-namespace NewLife.Queue.Storage
-{
-    public class ChunkManager : IDisposable
-    {
-        private readonly object _lockObj = new object();
-        private readonly ChunkManagerConfig _config;
-        private readonly IDictionary<int, Chunk> _chunks;
-        private readonly string _chunkPath;
-        private readonly bool _isMemoryMode;
-        private int _nextChunkNumber;
-        private int _uncachingChunks;
-        private int _isCachingNextChunk;
-        private ConcurrentDictionary<int, BytesInfo> _bytesWriteDict;
-        private ConcurrentDictionary<int, CountInfo> _fileReadDict;
-        private ConcurrentDictionary<int, CountInfo> _unmanagedReadDict;
-        private ConcurrentDictionary<int, CountInfo> _cachedReadDict;
-
-        class BytesInfo
-        {
-            public long PreviousBytes;
-            public long CurrentBytes;
-
-            public long UpgradeBytes()
-            {
-                var incrementBytes = CurrentBytes - PreviousBytes;
-                PreviousBytes = CurrentBytes;
-                return incrementBytes;
-            }
-        }
-        class CountInfo
-        {
-            public long PreviousCount;
-            public long CurrentCount;
-
-            public long UpgradeCount()
-            {
-                var incrementCount = CurrentCount - PreviousCount;
-                PreviousCount = CurrentCount;
-                return incrementCount;
-            }
-        }
-
-        public string Name { get; private set; }
-        public ChunkManagerConfig Config { get { return _config; } }
-        public string ChunkPath { get { return _chunkPath; } }
-        public bool IsMemoryMode { get { return _isMemoryMode; } }
-
-        public ChunkManager(string name, ChunkManagerConfig config, bool isMemoryMode, string relativePath = null)
-        {
-            Ensure.NotNull(name, "name");
-            Ensure.NotNull(config, "config");
-
-            Name = name;
-            _config = config;
-            _isMemoryMode = isMemoryMode;
-            if (string.IsNullOrEmpty(relativePath))
-            {
-                _chunkPath = _config.BasePath;
-            }
-            else
-            {
-                _chunkPath = Path.Combine(_config.BasePath, relativePath);
-            }
-            if (!Directory.Exists(_chunkPath))
-            {
-                Directory.CreateDirectory(_chunkPath);
-            }
-            _chunks = new ConcurrentDictionary<int, Chunk>();
-            _bytesWriteDict = new ConcurrentDictionary<int, BytesInfo>();
-            _fileReadDict = new ConcurrentDictionary<int, CountInfo>();
-            _unmanagedReadDict = new ConcurrentDictionary<int, CountInfo>();
-            _cachedReadDict = new ConcurrentDictionary<int, CountInfo>();
-        }
-
-        public void Load<T>(Func<byte[], T> readRecordFunc) where T : ILogRecord
-        {
-            if (_isMemoryMode) return;
-
-            lock (_lockObj)
-            {
-                if (!Directory.Exists(_chunkPath))
-                {
-                    Directory.CreateDirectory(_chunkPath);
-                }
-
-                var tempFiles = _config.FileNamingStrategy.GetTempFiles(_chunkPath);
-                foreach (var file in tempFiles)
-                {
-                    File.SetAttributes(file, FileAttributes.Normal);
-                    File.Delete(file);
-                }
-
-                var files = _config.FileNamingStrategy.GetChunkFiles(_chunkPath);
-                if (files.Length > 0)
-                {
-                    var cachedChunkCount = 0;
-                    for (var i = files.Length - 2; i >= 0; i--)
-                    {
-                        var file = files[i];
-                        var chunk = Chunk.FromCompletedFile(file, this, _config, _isMemoryMode);
-                        if (_config.EnableCache && cachedChunkCount < _config.PreCacheChunkCount)
-                        {
-                            if (chunk.TryCacheInMemory(false))
-                            {
-                                cachedChunkCount++;
-                            }
-                        }
-                        AddChunk(chunk);
-                    }
-                    var lastFile = files[files.Length - 1];
-                    AddChunk(Chunk.FromOngoingFile(lastFile, this, _config, readRecordFunc, _isMemoryMode));
-                }
-
-                if (_config.EnableCache)
-                {
-                    QueueService.ScheduleService.StartTask("UncacheChunks", () => UncacheChunks(), 1000, 1000);
-                }
-            }
-        }
-        public int GetChunkCount()
-        {
-            return _chunks.Count;
-        }
-        public IList<Chunk> GetAllChunks()
-        {
-            return _chunks.Values.ToList();
-        }
-        public Chunk AddNewChunk()
-        {
-            lock (_lockObj)
-            {
-                var chunkNumber = _nextChunkNumber;
-                var chunkFileName = _config.FileNamingStrategy.GetFileNameFor(_chunkPath, chunkNumber);
-                var chunk = Chunk.CreateNew(chunkFileName, chunkNumber, this, _config, _isMemoryMode);
-
-                AddChunk(chunk);
-
-                return chunk;
-            }
-        }
-        public Chunk GetFirstChunk()
-        {
-            lock (_lockObj)
-            {
-                if (_chunks.Count == 0)
-                {
-                    AddNewChunk();
-                }
-                var minChunkNum = _chunks.Keys.Min();
-                return _chunks[minChunkNum];
-            }
-        }
-        public Chunk GetLastChunk()
-        {
-            lock (_lockObj)
-            {
-                if (_chunks.Count == 0)
-                {
-                    AddNewChunk();
-                }
-                return _chunks[_nextChunkNumber - 1];
-            }
-        }
-        public int GetChunkNum(long dataPosition)
-        {
-            return (int)(dataPosition / _config.GetChunkDataSize());
-        }
-        public Chunk GetChunkFor(long dataPosition)
-        {
-            var chunkNum = (int)(dataPosition / _config.GetChunkDataSize());
-            return GetChunk(chunkNum);
-        }
-        public Chunk GetChunk(int chunkNum)
-        {
-            if (_chunks.ContainsKey(chunkNum))
-            {
-                return _chunks[chunkNum];
-            }
-            return null;
-        }
-        public bool RemoveChunk(Chunk chunk)
-        {
-            lock (_lockObj)
-            {
-                if (_chunks.Remove(chunk.ChunkHeader.ChunkNumber))
-                {
-                    try
-                    {
-                        chunk.Destroy();
-                    }
-                    catch (Exception ex)
-                    {
-                        Log.Error(string.Format("Destroy chunk {0} has exception.", chunk), ex);
-                    }
-                    return true;
-                }
-                return false;
-            }
-        }
-        public void TryCacheNextChunk(Chunk currentChunk)
-        {
-            if (!_config.EnableCache) return;
-
-            if (Interlocked.CompareExchange(ref _isCachingNextChunk, 1, 0) == 0)
-            {
-                try
-                {
-                    var nextChunkNumber = currentChunk.ChunkHeader.ChunkNumber + 1;
-                    var nextChunk = GetChunk(nextChunkNumber);
-                    if (nextChunk != null && !nextChunk.IsMemoryChunk && nextChunk.IsCompleted && !nextChunk.HasCachedChunk)
-                    {
-                        Task.Factory.StartNew(() => nextChunk.TryCacheInMemory(false));
-                    }
-                }
-                finally
-                {
-                    Interlocked.Exchange(ref _isCachingNextChunk, 0);
-                }
-            }
-        }
-
-        public void Start()
-        {
-            if (_config.EnableChunkStatistic)
-            {
-                QueueService.ScheduleService.StartTask("LogChunkStatisticStatus", LogChunkStatisticStatus, 1000, 1000);
-            }
-        }
-        public void Shutdown()
-        {
-            if (_config.EnableChunkStatistic)
-            {
-                QueueService.ScheduleService.StopTask("LogChunkStatisticStatus");
-            }
-        }
-        public void AddWriteBytes(int chunkNum, int byteCount)
-        {
-            _bytesWriteDict.AddOrUpdate(chunkNum, GetDefaultBytesInfo, (chunkNumber, current) => UpdateBytesInfo(chunkNumber, current, byteCount));
-        }
-        public void AddFileReadCount(int chunkNum)
-        {
-            _fileReadDict.AddOrUpdate(chunkNum, GetDefaultCountInfo, UpdateCountInfo);
-        }
-        public void AddUnmanagedReadCount(int chunkNum)
-        {
-            _unmanagedReadDict.AddOrUpdate(chunkNum, GetDefaultCountInfo, UpdateCountInfo);
-        }
-        public void AddCachedReadCount(int chunkNum)
-        {
-            _cachedReadDict.AddOrUpdate(chunkNum, GetDefaultCountInfo, UpdateCountInfo);
-        }
-
-        public void Dispose()
-        {
-            Close();
-        }
-        public void Close()
-        {
-            lock (_lockObj)
-            {
-                QueueService.ScheduleService.StopTask("UncacheChunks");
-
-                foreach (var chunk in _chunks.Values)
-                {
-                    try
-                    {
-                        chunk.Close();
-                    }
-                    catch (Exception ex)
-                    {
-                        Log.Error(string.Format("Chunk {0} close failed.", chunk), ex);
-                    }
-                }
-            }
-        }
-
-        private void AddChunk(Chunk chunk)
-        {
-            _chunks.Add(chunk.ChunkHeader.ChunkNumber, chunk);
-            _nextChunkNumber = chunk.ChunkHeader.ChunkNumber + 1;
-        }
-        private int UncacheChunks(int maxUncacheCount = 10)
-        {
-            var uncachedCount = 0;
-
-            if (Interlocked.CompareExchange(ref _uncachingChunks, 1, 0) == 0)
-            {
-                try
-                {
-                    var usedMemoryPercent = ChunkUtil.GetUsedMemoryPercent();
-                    if (usedMemoryPercent <= (ulong)_config.ChunkCacheMinPercent)
-                    {
-                        return 0;
-                    }
-
-                    if (Log.Level == LogLevel.Info)
-                    {
-                        Log.Debug("Current memory usage {0}% exceed the chunkCacheMinPercent {1}%, try to uncache chunks.", usedMemoryPercent, _config.ChunkCacheMinPercent);
-                    }
-
-                    var chunks = _chunks.Values.Where(x => x.IsCompleted && !x.IsMemoryChunk && x.HasCachedChunk).OrderBy(x => x.LastActiveTime).ToList();
-
-                    foreach (var chunk in chunks)
-                    {
-                        if ((DateTime.Now - chunk.LastActiveTime).TotalSeconds >= _config.ChunkInactiveTimeMaxSeconds)
-                        {
-                            if (chunk.UnCacheFromMemory())
-                            {
-                                Thread.Sleep(100); //即便有内存释放了，由于通过API读取到的内存使用数可能不会立即更新，所以等待一定时间后检查内存是否足够
-                                uncachedCount++;
-                                if (uncachedCount >= maxUncacheCount || ChunkUtil.GetUsedMemoryPercent() <= (ulong)_config.ChunkCacheMinPercent)
-                                {
-                                    break;
-                                }
-                            }
-                        }
-                    }
-
-                    if (Log.Level== LogLevel.Info)
-                    {
-                        if (uncachedCount > 0)
-                        {
-                            Log.Debug("Uncached {0} chunks, current memory usage: {1}%", uncachedCount, ChunkUtil.GetUsedMemoryPercent());
-                        }
-                        else
-                        {
-                            Log.Debug("No chunks uncached.");
-                        }
-                    }
-                }
-                catch (Exception ex)
-                {
-                    Log.Error("Uncaching chunks has exception.", ex);
-                }
-                finally
-                {
-                    Interlocked.Exchange(ref _uncachingChunks, 0);
-                }
-            }
-
-            return uncachedCount;
-        }
-        private CountInfo GetDefaultCountInfo(int chunkNum)
-        {
-            return new CountInfo { CurrentCount = 1 };
-        }
-        private CountInfo UpdateCountInfo(int chunkNum, CountInfo countInfo)
-        {
-            Interlocked.Increment(ref countInfo.CurrentCount);
-            return countInfo;
-        }
-        private BytesInfo GetDefaultBytesInfo(int chunkNum)
-        {
-            return new BytesInfo();
-        }
-        private BytesInfo UpdateBytesInfo(int chunkNum, BytesInfo bytesInfo, int bytesAdd)
-        {
-            Interlocked.Add(ref bytesInfo.CurrentBytes, bytesAdd);
-            return bytesInfo;
-        }
-        private void LogChunkStatisticStatus()
-        {
-            if (Log.Level != LogLevel.Info) return;
-            var bytesWriteStatus = UpdateWriteStatus(_bytesWriteDict);
-            var unmanagedReadStatus = UpdateReadStatus(_unmanagedReadDict);
-            var fileReadStatus = UpdateReadStatus(_fileReadDict);
-            var cachedReadStatus = UpdateReadStatus(_cachedReadDict);
-            Log.Debug("{0}, maxChunk:#{1}, write:{2}, unmanagedCacheRead:{3}, localCacheRead:{4}, fileRead:{5}", Name, GetLastChunk().ChunkHeader.ChunkNumber, bytesWriteStatus, unmanagedReadStatus, cachedReadStatus, fileReadStatus);
-        }
-        private string UpdateWriteStatus(ConcurrentDictionary<int, BytesInfo> dict)
-        {
-            var list = new List<string>();
-            var toRemoveKeys = new List<int>();
-
-            foreach (var entry in dict)
-            {
-                var chunkNum = entry.Key;
-                var throughput = entry.Value.UpgradeBytes() / 1024;
-                if (throughput > 0)
-                {
-                    list.Add(string.Format("[chunk:#{0},bytes:{1}KB]", chunkNum, throughput));
-                }
-                else
-                {
-                    toRemoveKeys.Add(chunkNum);
-                }
-            }
-
-            foreach (var key in toRemoveKeys)
-            {
-                _bytesWriteDict.Remove(key);
-            }
-
-            return list.Count == 0 ? "[]" : string.Join(",", list);
-        }
-        private string UpdateReadStatus(ConcurrentDictionary<int, CountInfo> dict)
-        {
-            var list = new List<string>();
-
-            foreach (var entry in dict)
-            {
-                var chunkNum = entry.Key;
-                var throughput = entry.Value.UpgradeCount();
-                if (throughput > 0)
-                {
-                    list.Add(string.Format("[chunk:#{0},count:{1}]", chunkNum, throughput));
-                }
-            }
-
-            return list.Count == 0 ? "[]" : string.Join(",", list);
-        }
-
-
-        #region 日志
-        /// <summary>日志</summary>
-        public ILog Log { get; set; } = QueueService.Log;
-        #endregion
-    }
-}
diff --git a/MQ/NewLife.Queue/Storage/ChunkManagerConfig.cs b/MQ/NewLife.Queue/Storage/ChunkManagerConfig.cs
deleted file mode 100644
index 72e52b0d7a..0000000000
--- a/MQ/NewLife.Queue/Storage/ChunkManagerConfig.cs
+++ /dev/null
@@ -1,148 +0,0 @@
-﻿using System;
-using NewLife.Queue.Storage.FileNamingStrategies;
-using NewLife.Queue.Utilities;
-
-namespace NewLife.Queue.Storage
-{
-    public class ChunkManagerConfig
-    {
-        /// <summary>Chunk文件存储的根目录；
-        /// </summary>
-        public readonly string BasePath;
-        /// <summary>Chunk文件命名规则策略；
-        /// </summary>
-        public readonly IFileNamingStrategy FileNamingStrategy;
-        /// <summary>Chunk文件大小，字节为单位，适用于文件内记录大小不固定的场景，如果是固定大小，则设置为0；
-        /// </summary>
-        public readonly int ChunkDataSize;
-        /// <summary>Chunk文件单条数据大小，字节为单位，适用于每条数据固定大小的场景；
-        /// </summary>
-        public readonly int ChunkDataUnitSize;
-        /// <summary>Chunk文件总数据数，适用于每个数据固定大小的场景；
-        /// </summary>
-        public readonly int ChunkDataCount;
-        /// <summary>Chunk文件刷磁盘的间隔，毫秒为单位；
-        /// </summary>
-        public readonly int FlushChunkIntervalMilliseconds;
-        /// <summary>表示是否同步刷盘；
-        /// </summary>
-        public readonly bool SyncFlush;
-        /// <summary>刷盘方式，是直接将数据刷入磁盘还是先刷入OS；
-        /// </summary>
-        public FlushOption FlushOption;
-        /// <summary>表示是否缓存Chunk，缓存Chunk可以提高消费速度；
-        /// </summary>
-        public readonly bool EnableCache;
-        /// <summary>Chunk文件的BinaryReader的个数；
-        /// </summary>
-        public readonly int ChunkReaderCount;
-        /// <summary>Chunk文件允许最大的记录的大小，字节为单位；
-        /// </summary>
-        public readonly int MaxLogRecordSize;
-        /// <summary>Chunk写入时的缓冲大小，字节为单位；
-        /// </summary>
-        public readonly int ChunkWriteBuffer;
-        /// <summary>Chunk读取时的缓冲大小，字节为单位；
-        /// </summary>
-        public readonly int ChunkReadBuffer;
-        /// <summary>使用的总物理内存上限，如果超过上限，则不允许创建新的Chunk文件；
-        /// </summary>
-        public readonly int ChunkCacheMaxPercent;
-        /// <summary>Chunk文件使用内存的安全水位；低于这个水位，则不需要进行Chunk文件的非托管内存释放处理；高于这个水位，则开始进行Chunk文件的非托管内存释放处理；
-        /// </summary>
-        public readonly int ChunkCacheMinPercent;
-        /// <summary>应用启动时，需要预加载到非托管内存的Chunk文件数；
-        /// </summary>
-        public readonly int PreCacheChunkCount;
-        /// <summary>Chunk文件非活跃时间，单位为秒；
-        /// <remarks>
-        /// 在释放已完成的Chunk文件的非托管内存时，会根据这个非活跃时间来判断当前Chunk文件是否允许释放内存；
-        /// 如果某个已完成并已经有对应非托管内存的Chunk文件有超过这个时间都不活跃，则可以进行非托管内存的释放；
-        /// 是否活跃的依据是，只要该Chunk文件有发生读取或写入，就更新活跃时间；
-        /// 释放时，根据非活跃时间的长短作为顺序，总是先把非活跃时间最大的Chunk文件的非托管内存释放。
-        /// </remarks>
-        /// </summary>
-        public readonly int ChunkInactiveTimeMaxSeconds;
-        /// <summary>表示当Chunk文件无法分配非托管内存时，使用本地的环形数组进行缓存最新的记录。此属性指定本地环形数组的大小；
-        /// </summary>
-        public readonly int ChunkLocalCacheSize;
-        /// <summary>表示是否需要统计Chunk的写入和读取情况
-        /// </summary>
-        public readonly bool EnableChunkStatistic;
-
-        public ChunkManagerConfig(string basePath,
-                               IFileNamingStrategy fileNamingStrategy,
-                               int chunkDataSize,
-                               int chunkDataUnitSize,
-                               int chunkDataCount,
-                               int flushChunkIntervalMilliseconds,
-                               bool enableCache,
-                               bool syncFlush,
-                               FlushOption flushOption,
-                               int chunkReaderCount,
-                               int maxLogRecordSize,
-                               int chunkWriteBuffer,
-                               int chunkReadBuffer,
-                               int chunkCacheMaxPercent,
-                               int chunkCacheMinPercent,
-                               int preCacheChunkCount,
-                               int chunkInactiveTimeMaxSeconds,
-                               int chunkLocalCacheSize,
-                               bool enableChunkStatistic)
-        {
-            Ensure.NotNullOrEmpty(basePath, "basePath");
-            Ensure.NotNull(fileNamingStrategy, "fileNamingStrategy");
-            Ensure.Nonnegative(chunkDataSize, "chunkDataSize");
-            Ensure.Nonnegative(chunkDataUnitSize, "chunkDataUnitSize");
-            Ensure.Nonnegative(chunkDataCount, "chunkDataCount");
-            Ensure.Positive(flushChunkIntervalMilliseconds, "flushChunkIntervalMilliseconds");
-            Ensure.Positive(maxLogRecordSize, "maxLogRecordSize");
-            Ensure.Positive(chunkWriteBuffer, "chunkWriteBuffer");
-            Ensure.Positive(chunkReadBuffer, "chunkReadBuffer");
-            Ensure.Positive(chunkCacheMaxPercent, "chunkCacheMaxPercent");
-            Ensure.Positive(chunkCacheMinPercent, "chunkCacheMinPercent");
-            Ensure.Nonnegative(preCacheChunkCount, "preCacheChunkCount");
-            Ensure.Nonnegative(chunkInactiveTimeMaxSeconds, "chunkInactiveTimeMaxSeconds");
-            Ensure.Positive(chunkLocalCacheSize, "chunkLocalCacheSize");
-
-            if (chunkDataSize <= 0 && (chunkDataUnitSize <= 0 || chunkDataCount <= 0))
-            {
-                throw new ArgumentException(string.Format("Invalid chunk data size arugment. chunkDataSize: {0}, chunkDataUnitSize: {1}, chunkDataCount: {2}", chunkDataSize, chunkDataUnitSize, chunkDataCount));
-            }
-
-            BasePath = basePath;
-            FileNamingStrategy = fileNamingStrategy;
-            ChunkDataSize = chunkDataSize;
-            ChunkDataUnitSize = chunkDataUnitSize;
-            ChunkDataCount = chunkDataCount;
-            FlushChunkIntervalMilliseconds = flushChunkIntervalMilliseconds;
-            EnableCache = enableCache;
-            SyncFlush = syncFlush;
-            FlushOption = flushOption;
-            ChunkReaderCount = chunkReaderCount;
-            MaxLogRecordSize = maxLogRecordSize;
-            ChunkWriteBuffer = chunkWriteBuffer;
-            ChunkReadBuffer = chunkReadBuffer;
-            ChunkCacheMaxPercent = chunkCacheMaxPercent;
-            ChunkCacheMinPercent = chunkCacheMinPercent;
-            PreCacheChunkCount = preCacheChunkCount;
-            ChunkInactiveTimeMaxSeconds = chunkInactiveTimeMaxSeconds;
-            ChunkLocalCacheSize = chunkLocalCacheSize;
-            EnableChunkStatistic = enableChunkStatistic;
-
-            if (GetChunkDataSize() > 1024 * 1024 * 1024)
-            {
-                throw new ArgumentException("Chunk data size cannot bigger than 1G");
-            }
-        }
-
-        public int GetChunkDataSize()
-        {
-            if (ChunkDataSize > 0)
-            {
-                return ChunkDataSize;
-            }
-            return ChunkDataUnitSize * ChunkDataCount;
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Storage/ChunkReader.cs b/MQ/NewLife.Queue/Storage/ChunkReader.cs
deleted file mode 100644
index be4523dd04..0000000000
--- a/MQ/NewLife.Queue/Storage/ChunkReader.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-﻿using System;
-using ECommon.Storage;
-using NewLife.Queue.Storage.Exceptions;
-using NewLife.Queue.Utilities;
-
-namespace NewLife.Queue.Storage
-{
-    public class ChunkReader
-    {
-        private readonly ChunkManager _chunkManager;
-        private readonly ChunkWriter _chunkWriter;
-
-        public ChunkReader(ChunkManager chunkManager, ChunkWriter chunkWriter)
-        {
-            Ensure.NotNull(chunkManager, "chunkManager");
-            Ensure.NotNull(chunkWriter, "chunkWriter");
-
-            _chunkManager = chunkManager;
-            _chunkWriter = chunkWriter;
-        }
-
-        public T TryReadAt<T>(long position, Func<byte[], T> readRecordFunc, bool autoCache = true) where T : class, ILogRecord
-        {
-            var lastChunk = _chunkWriter.CurrentChunk;
-            var maxPosition = lastChunk.GlobalDataPosition;
-            if (position >= maxPosition)
-            {
-                return null;
-            }
-
-            var chunkNum = _chunkManager.GetChunkNum(position);
-            var chunk = _chunkManager.GetChunk(chunkNum);
-            if (chunk == null)
-            {
-                throw new ChunkNotExistException(position, chunkNum);
-            }
-
-            var localPosition = chunk.ChunkHeader.GetLocalDataPosition(position);
-            return chunk.TryReadAt(localPosition, readRecordFunc, autoCache);
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Storage/ChunkUtil.cs b/MQ/NewLife.Queue/Storage/ChunkUtil.cs
deleted file mode 100644
index b7920252a3..0000000000
--- a/MQ/NewLife.Queue/Storage/ChunkUtil.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-﻿using Microsoft.VisualBasic.Devices;
-
-namespace ECommon.Storage
-{
-    public class ChunkUtil
-    {
-        public struct ChunkApplyMemoryInfo
-        {
-            public ulong PhysicalMemoryMB;
-            public ulong UsedMemoryPercent;
-            public ulong UsedMemoryMB;
-            public ulong MaxAllowUseMemoryMB;
-            public ulong ChunkSizeMB;
-            public ulong AvailableMemoryMB;
-        }
-        public static bool IsMemoryEnoughToCacheChunk(ulong chunkSize, uint maxUseMemoryPercent, out ChunkApplyMemoryInfo applyMemoryInfo)
-        {
-            applyMemoryInfo = new ChunkApplyMemoryInfo();
-
-            uint bytesPerMB = 1024 * 1024;
-            var computerInfo = new ComputerInfo();
-            var usedMemory = computerInfo.TotalPhysicalMemory - computerInfo.AvailablePhysicalMemory;
-
-            applyMemoryInfo.PhysicalMemoryMB = computerInfo.TotalPhysicalMemory / bytesPerMB;
-            applyMemoryInfo.AvailableMemoryMB = computerInfo.AvailablePhysicalMemory / bytesPerMB;
-            applyMemoryInfo.UsedMemoryMB = usedMemory / bytesPerMB;
-            applyMemoryInfo.UsedMemoryPercent = applyMemoryInfo.UsedMemoryMB * 100 / applyMemoryInfo.PhysicalMemoryMB;
-            applyMemoryInfo.ChunkSizeMB = chunkSize / bytesPerMB;
-            applyMemoryInfo.MaxAllowUseMemoryMB = applyMemoryInfo.PhysicalMemoryMB * maxUseMemoryPercent / 100;
-            return applyMemoryInfo.UsedMemoryMB + applyMemoryInfo.ChunkSizeMB <= applyMemoryInfo.MaxAllowUseMemoryMB;
-        }
-        public static bool IsMemoryEnoughToCacheChunk(ulong chunkSize, uint maxUseMemoryPercent)
-        {
-            var computerInfo = new ComputerInfo();
-            var maxAllowUseMemory = computerInfo.TotalPhysicalMemory * maxUseMemoryPercent / 100;
-            var currentUsedMemory = computerInfo.TotalPhysicalMemory - computerInfo.AvailablePhysicalMemory;
-
-            return currentUsedMemory + chunkSize <= maxAllowUseMemory;
-        }
-        /// <summary>获取当前使用的物理内存百分比
-        /// </summary>
-        /// <returns></returns>
-        public static ulong GetUsedMemoryPercent()
-        {
-            var computerInfo = new ComputerInfo();
-            var usedPhysicalMemory = computerInfo.TotalPhysicalMemory - computerInfo.AvailablePhysicalMemory;
-            var usedMemoryPercent = usedPhysicalMemory * 100 / computerInfo.TotalPhysicalMemory;
-            return usedMemoryPercent;
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Storage/ChunkWriter.cs b/MQ/NewLife.Queue/Storage/ChunkWriter.cs
deleted file mode 100644
index f41b4ab071..0000000000
--- a/MQ/NewLife.Queue/Storage/ChunkWriter.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-﻿using System;
-using NewLife.Model;
-using NewLife.Queue.Scheduling;
-using NewLife.Queue.Storage.Exceptions;
-using NewLife.Queue.Utilities;
-
-namespace NewLife.Queue.Storage
-{
-    public class ChunkWriter
-    {
-        public Chunk CurrentChunk { get { return _currentChunk; } }
-
-        private readonly ChunkManager _chunkManager;
-        private readonly object _lockObj = new object();
-        private bool _isClosed = false;
-
-        private Chunk _currentChunk;
-
-        public ChunkWriter(ChunkManager chunkManager)
-        {
-            Ensure.NotNull(chunkManager, "chunkManager");
-
-            _chunkManager = chunkManager;
-           
-        }
-
-        public void Open()
-        {
-            _currentChunk = _chunkManager.GetLastChunk();
-
-            if (!_chunkManager.IsMemoryMode && !_chunkManager.Config.SyncFlush)
-            {
-                QueueService.ScheduleService.StartTask("FlushChunk", Flush, 1000, _chunkManager.Config.FlushChunkIntervalMilliseconds);
-            }
-
-            _isClosed = false;
-        }
-        public long Write(ILogRecord record)
-        {
-            lock (_lockObj)
-            {
-                if (_isClosed)
-                {
-                    return -1L;
-                }
-
-                //如果当前文件已经写完，则需要新建文件
-                if (_currentChunk.IsCompleted)
-                {
-                    _currentChunk = _chunkManager.AddNewChunk();
-                }
-
-                //先尝试写文件
-                var result = _currentChunk.TryAppend(record);
-
-                //如果当前文件已满
-                if (!result.Success)
-                {
-                    //结束当前文件
-                    _currentChunk.Complete();
-
-                    //新建新的文件
-                    _currentChunk = _chunkManager.AddNewChunk();
-
-                    //再尝试写入新的文件
-                    result = _currentChunk.TryAppend(record);
-
-                    //如果还是不成功，则报错
-                    if (!result.Success)
-                    {
-                        throw new ChunkWriteException(_currentChunk.ToString(), "Write record to chunk failed.");
-                    }
-                }
-
-                //如果需要同步刷盘，则立即同步刷盘
-                if (!_chunkManager.IsMemoryMode && _chunkManager.Config.SyncFlush)
-                {
-                    _currentChunk.Flush();
-                }
-
-                //返回数据写入位置
-                return result.Position;
-            }
-        }
-        public void Close()
-        {
-            lock (_lockObj)
-            {
-                if (!_chunkManager.IsMemoryMode && _currentChunk != null)
-                {
-                    _currentChunk.Flush();
-                }
-                if (!_chunkManager.IsMemoryMode && !_chunkManager.Config.SyncFlush)
-                {
-                    QueueService.ScheduleService.StopTask("FlushChunk");
-                }
-                _currentChunk = null;
-                _isClosed = true;
-            }
-        }
-        private void Flush()
-        {
-            lock (_lockObj)
-            {
-                if (_isClosed) return;
-                if (_currentChunk == null || _currentChunk.IsCompleted) return;
-
-                _currentChunk.Flush();
-            }
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Storage/Exceptions/ChunkBadDataException.cs b/MQ/NewLife.Queue/Storage/Exceptions/ChunkBadDataException.cs
deleted file mode 100644
index 537d1a9ced..0000000000
--- a/MQ/NewLife.Queue/Storage/Exceptions/ChunkBadDataException.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Storage.Exceptions
-{
-    public class ChunkBadDataException : Exception
-    {
-        public ChunkBadDataException(string message) : base(message)
-        {
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Storage/Exceptions/ChunkCompleteException.cs b/MQ/NewLife.Queue/Storage/Exceptions/ChunkCompleteException.cs
deleted file mode 100644
index a7cc1767b2..0000000000
--- a/MQ/NewLife.Queue/Storage/Exceptions/ChunkCompleteException.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Storage.Exceptions
-{
-    public class ChunkCompleteException : Exception
-    {
-        public ChunkCompleteException(string message) : base(message) { }
-    }
-}
diff --git a/MQ/NewLife.Queue/Storage/Exceptions/ChunkCreateException.cs b/MQ/NewLife.Queue/Storage/Exceptions/ChunkCreateException.cs
deleted file mode 100644
index fd09e1dfb2..0000000000
--- a/MQ/NewLife.Queue/Storage/Exceptions/ChunkCreateException.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Storage.Exceptions
-{
-    public class ChunkCreateException : Exception
-    {
-        public ChunkCreateException(string message) : base(message) { }
-    }
-}
diff --git a/MQ/NewLife.Queue/Storage/Exceptions/ChunkFileNotExistException.cs b/MQ/NewLife.Queue/Storage/Exceptions/ChunkFileNotExistException.cs
deleted file mode 100644
index bed1a17762..0000000000
--- a/MQ/NewLife.Queue/Storage/Exceptions/ChunkFileNotExistException.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Storage.Exceptions
-{
-    public class ChunkFileNotExistException : Exception
-    {
-        public ChunkFileNotExistException(string fileName) : base(string.Format("Chunk file '{0}' not exist.", fileName)) { }
-    }
-}
diff --git a/MQ/NewLife.Queue/Storage/Exceptions/ChunkNotExistException.cs b/MQ/NewLife.Queue/Storage/Exceptions/ChunkNotExistException.cs
deleted file mode 100644
index d869e1b7f8..0000000000
--- a/MQ/NewLife.Queue/Storage/Exceptions/ChunkNotExistException.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Storage.Exceptions
-{
-    public class ChunkNotExistException : Exception
-    {
-        public ChunkNotExistException(long position, int chunkNum) : base(string.Format("Chunk not exist, position: {0}, chunkNum: {1}", position, chunkNum)) { }
-    }
-}
diff --git a/MQ/NewLife.Queue/Storage/Exceptions/ChunkReadException.cs b/MQ/NewLife.Queue/Storage/Exceptions/ChunkReadException.cs
deleted file mode 100644
index 2ca56dd926..0000000000
--- a/MQ/NewLife.Queue/Storage/Exceptions/ChunkReadException.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Storage.Exceptions
-{
-    public class ChunkReadException : Exception
-    {
-        public ChunkReadException(string message) : base(message) { }
-    }
-}
diff --git a/MQ/NewLife.Queue/Storage/Exceptions/ChunkWriteException.cs b/MQ/NewLife.Queue/Storage/Exceptions/ChunkWriteException.cs
deleted file mode 100644
index 16f8bce1cb..0000000000
--- a/MQ/NewLife.Queue/Storage/Exceptions/ChunkWriteException.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Storage.Exceptions
-{
-    public class ChunkWriteException : Exception
-    {
-        public ChunkWriteException(string chunkName, string message) : base(string.Format("{0} write failed, message: {1}", chunkName, message)) { }
-    }
-}
diff --git a/MQ/NewLife.Queue/Storage/FileNamingStrategies/DefaultFileNamingStrategy.cs b/MQ/NewLife.Queue/Storage/FileNamingStrategies/DefaultFileNamingStrategy.cs
deleted file mode 100644
index bf8c1cc09f..0000000000
--- a/MQ/NewLife.Queue/Storage/FileNamingStrategies/DefaultFileNamingStrategy.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-﻿using System;
-using System.IO;
-using System.Linq;
-using System.Text.RegularExpressions;
-using NewLife.Queue.Utilities;
-
-namespace NewLife.Queue.Storage.FileNamingStrategies
-{
-    public class DefaultFileNamingStrategy : IFileNamingStrategy
-    {
-        private readonly string _prefix;
-        private readonly string _pattern;
-        private readonly string _format;
-        private readonly Regex _fileNamePattern;
-
-        public DefaultFileNamingStrategy(string prefix, string pattern = @"\d{6}", string format = "{0}{1:000000000}")
-        {
-            Ensure.NotNull(prefix, "prefix");
-            Ensure.NotNull(pattern, "pattern");
-            Ensure.NotNull(format, "format");
-
-            _prefix = prefix;
-            _pattern = pattern;
-            _format = format;
-
-            _fileNamePattern = new Regex("^" + _prefix + _pattern);
-        }
-
-        public string GetFileNameFor(string path, int index)
-        {
-            Ensure.Nonnegative(index, "index");
-
-            return Path.Combine(path, string.Format(_format, _prefix, index));
-        }
-        public string[] GetChunkFiles(string path)
-        {
-            var files = Directory
-                            .EnumerateFiles(path)
-                            .Where(x => _fileNamePattern.IsMatch(Path.GetFileName(x)))
-                            .OrderBy(x => x, StringComparer.CurrentCultureIgnoreCase)
-                            .ToArray();
-            return files;
-        }
-        public string[] GetTempFiles(string path)
-        {
-            var files = Directory
-                            .EnumerateFiles(path)
-                            .Where(x => _fileNamePattern.IsMatch(Path.GetFileName(x)) && x.EndsWith(".tmp"))
-                            .OrderBy(x => x, StringComparer.CurrentCultureIgnoreCase)
-                            .ToArray();
-            return files;
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Storage/FileNamingStrategies/IFileNamingStrategy.cs b/MQ/NewLife.Queue/Storage/FileNamingStrategies/IFileNamingStrategy.cs
deleted file mode 100644
index 8dc2bc3b61..0000000000
--- a/MQ/NewLife.Queue/Storage/FileNamingStrategies/IFileNamingStrategy.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-﻿namespace NewLife.Queue.Storage.FileNamingStrategies
-{
-    public interface IFileNamingStrategy
-    {
-        string GetFileNameFor(string path, int index);
-        string[] GetChunkFiles(string path);
-        string[] GetTempFiles(string path);
-    }
-}
diff --git a/MQ/NewLife.Queue/Storage/FlushOption.cs b/MQ/NewLife.Queue/Storage/FlushOption.cs
deleted file mode 100644
index 3fa718286b..0000000000
--- a/MQ/NewLife.Queue/Storage/FlushOption.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-﻿namespace NewLife.Queue.Storage
-{
-    public enum FlushOption
-    {
-        /// <summary>将数据刷到操作系统的缓存，性能较高
-        /// </summary>
-        FlushToOS,
-        /// <summary>将数据写到磁盘，性能最低
-        /// </summary>
-        FlushToDisk
-    }
-}
diff --git a/MQ/NewLife.Queue/Storage/ILogRecord.cs b/MQ/NewLife.Queue/Storage/ILogRecord.cs
deleted file mode 100644
index 7a8d4ec0e9..0000000000
--- a/MQ/NewLife.Queue/Storage/ILogRecord.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-﻿using System.IO;
-
-namespace NewLife.Queue.Storage
-{
-    public interface ILogRecord
-    {
-        void WriteTo(long logPosition, BinaryWriter writer);
-        void ReadFrom(byte[] recordBuffer);
-    }
-}
diff --git a/MQ/NewLife.Queue/Storage/IStream.cs b/MQ/NewLife.Queue/Storage/IStream.cs
deleted file mode 100644
index 5a67030f15..0000000000
--- a/MQ/NewLife.Queue/Storage/IStream.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-﻿namespace NewLife.Queue.Storage
-{
-    public interface IStream
-    {
-        long Length { get; }
-        long Position { get; set; }
-        void Write(byte[] buffer, int offset, int count);
-        void Flush();
-        void SetLength(long value);
-        void Dispose();
-    }
-}
diff --git a/MQ/NewLife.Queue/Storage/ReaderWorkItem.cs b/MQ/NewLife.Queue/Storage/ReaderWorkItem.cs
deleted file mode 100644
index a586ab34c5..0000000000
--- a/MQ/NewLife.Queue/Storage/ReaderWorkItem.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-﻿using System.IO;
-
-namespace NewLife.Queue.Storage
-{
-    internal class ReaderWorkItem
-    {
-        public readonly Stream Stream;
-        public readonly BinaryReader Reader;
-
-        public ReaderWorkItem(Stream stream, BinaryReader reader)
-        {
-            Stream = stream;
-            Reader = reader;
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Storage/RecordBufferReadResult.cs b/MQ/NewLife.Queue/Storage/RecordBufferReadResult.cs
deleted file mode 100644
index 211c8389cb..0000000000
--- a/MQ/NewLife.Queue/Storage/RecordBufferReadResult.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-﻿namespace NewLife.Queue.Storage
-{
-    public struct RecordBufferReadResult
-    {
-        public static readonly RecordBufferReadResult Failure = new RecordBufferReadResult(false, null);
-
-        public readonly bool Success;
-        public readonly byte[] RecordBuffer;
-
-        public RecordBufferReadResult(bool success, byte[] recordBuffer)
-        {
-            Success = success;
-            RecordBuffer = recordBuffer;
-        }
-
-        public override string ToString()
-        {
-            return string.Format("[Success:{0}, RecordBufferLength:{1}]", Success, RecordBuffer != null ? RecordBuffer.Length : 0);
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Storage/RecordWriteResult.cs b/MQ/NewLife.Queue/Storage/RecordWriteResult.cs
deleted file mode 100644
index 665ad174c0..0000000000
--- a/MQ/NewLife.Queue/Storage/RecordWriteResult.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-﻿namespace NewLife.Queue.Storage
-{
-    public struct RecordWriteResult
-    {
-        public readonly bool Success;
-        public readonly long Position;
-
-        private RecordWriteResult(bool success, long position)
-        {
-            Success = success;
-            Position = position;
-        }
-
-        public static RecordWriteResult NotEnoughSpace()
-        {
-            return new RecordWriteResult(false, -1);
-        }
-        public static RecordWriteResult Successful(long position)
-        {
-            return new RecordWriteResult(true, position);
-        }
-
-        public override string ToString()
-        {
-            return string.Format("[Success:{0}, Position:{1}]", Success, Position);
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Storage/WriterWorkItem.cs b/MQ/NewLife.Queue/Storage/WriterWorkItem.cs
deleted file mode 100644
index c301cc488c..0000000000
--- a/MQ/NewLife.Queue/Storage/WriterWorkItem.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-﻿using System.IO;
-
-namespace NewLife.Queue.Storage
-{
-    internal class WriterWorkItem
-    {
-        public readonly MemoryStream BufferStream;
-        public readonly BinaryWriter BufferWriter;
-        public readonly IStream WorkingStream;
-        public long LastFlushedPosition;
-
-        public WriterWorkItem(IStream stream)
-        {
-            WorkingStream = stream;
-            BufferStream = new MemoryStream(8192);
-            BufferWriter = new BinaryWriter(BufferStream);
-        }
-
-        public void AppendData(byte[] buf, int offset, int len)
-        {
-            WorkingStream.Write(buf, offset, len);
-        }
-        public void FlushToDisk()
-        {
-            WorkingStream.Flush();
-            LastFlushedPosition = WorkingStream.Position;
-        }
-        public void ResizeStream(long length)
-        {
-            WorkingStream.SetLength(length);
-        }
-        public void Dispose()
-        {
-            WorkingStream.Dispose();
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Utilities/BufferQueue.cs b/MQ/NewLife.Queue/Utilities/BufferQueue.cs
deleted file mode 100644
index 414426f9eb..0000000000
--- a/MQ/NewLife.Queue/Utilities/BufferQueue.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-﻿using System;
-using System.Collections.Concurrent;
-using System.Threading;
-using System.Threading.Tasks;
-using NewLife.Log;
-
-namespace NewLife.Queue.Utilities
-{
-    public class BufferQueue<TMessage>
-    {
-        private int _requestsWriteThreshold;
-        private ConcurrentQueue<TMessage> _inputQueue;
-        private ConcurrentQueue<TMessage> _processQueue;
-        private Action<TMessage> _handleMessageAction;
-        private readonly string _name;
-        private readonly ILog _logger;
-        private int _isProcesingMessage;
-
-        public BufferQueue(string name, int requestsWriteThreshold, Action<TMessage> handleMessageAction)
-        {
-            _name = name;
-            _requestsWriteThreshold = requestsWriteThreshold;
-            _handleMessageAction = handleMessageAction;
-            _inputQueue = new ConcurrentQueue<TMessage>();
-            _processQueue = new ConcurrentQueue<TMessage>();
-            _logger = QueueService.Log;
-        }
-
-        public void EnqueueMessage(TMessage message)
-        {
-            _inputQueue.Enqueue(message);
-            TryProcessMessages();
-
-            if (_inputQueue.Count >= _requestsWriteThreshold)
-            {
-                Thread.Sleep(1);
-            }
-        }
-
-        private void TryProcessMessages()
-        {
-            if (Interlocked.CompareExchange(ref _isProcesingMessage, 1, 0) == 0)
-            {
-                Task.Factory.StartNew(() =>
-                {
-                    try
-                    {
-                        if (_processQueue.Count == 0 && _inputQueue.Count > 0)
-                        {
-                            SwapInputQueue();
-                        }
-
-                        if (_processQueue.Count > 0)
-                        {
-                            var count = 0;
-                            TMessage message;
-                            while (_processQueue.TryDequeue(out message))
-                            {
-                                try
-                                {
-                                    _handleMessageAction(message);
-                                }
-                                catch (Exception ex)
-                                {
-                                    var errorMessage = _name + " process message has exception.";
-                                    if (_logger != null)
-                                    {
-                                        _logger.Error(errorMessage, ex);
-                                    }
-                                }
-                                finally
-                                {
-                                    count++;
-                                }
-                            }
-                            if (_logger.Level== LogLevel.Debug)
-                            {
-                                _logger.Debug("BufferQueue[name={0}], batch process {1} messages.", _name, count);
-                            }
-                        }
-                    }
-                    finally
-                    {
-                        Interlocked.Exchange(ref _isProcesingMessage, 0);
-                        if (_inputQueue.Count > 0)
-                        {
-                            TryProcessMessages();
-                        }
-                    }
-                });   
-            }   
-        }
-        private void SwapInputQueue()
-        {
-            var tmp = _inputQueue;
-            _inputQueue = _processQueue;
-            _processQueue = tmp;
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Utilities/ByteUtil.cs b/MQ/NewLife.Queue/Utilities/ByteUtil.cs
deleted file mode 100644
index 64a5ccdf6e..0000000000
--- a/MQ/NewLife.Queue/Utilities/ByteUtil.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace NewLife.Queue.Utilities
-{
-    public class ByteUtil
-    {
-        public static readonly byte[] ZeroLengthBytes = BitConverter.GetBytes(0);
-        public static readonly byte[] EmptyBytes = new byte[0];
-
-        public static void EncodeString(string data, out byte[] lengthBytes, out byte[] dataBytes)
-        {
-            if (data != null)
-            {
-                dataBytes = Encoding.UTF8.GetBytes(data);
-                lengthBytes = BitConverter.GetBytes(dataBytes.Length);
-            }
-            else
-            {
-                dataBytes = EmptyBytes;
-                lengthBytes = ZeroLengthBytes;
-            }
-        }
-        public static byte[] EncodeDateTime(DateTime data)
-        {
-            return BitConverter.GetBytes(data.Ticks);
-        }
-        public static string DecodeString(byte[] sourceBuffer, int startOffset, out int nextStartOffset)
-        {
-            return Encoding.UTF8.GetString(DecodeBytes(sourceBuffer, startOffset, out nextStartOffset));
-        }
-        public static short DecodeShort(byte[] sourceBuffer, int startOffset, out int nextStartOffset)
-        {
-            var shortBytes = new byte[2];
-            Buffer.BlockCopy(sourceBuffer, startOffset, shortBytes, 0, 2);
-            nextStartOffset = startOffset + 2;
-            return BitConverter.ToInt16(shortBytes, 0);
-        }
-        public static int DecodeInt(byte[] sourceBuffer, int startOffset, out int nextStartOffset)
-        {
-            var intBytes = new byte[4];
-            Buffer.BlockCopy(sourceBuffer, startOffset, intBytes, 0, 4);
-            nextStartOffset = startOffset + 4;
-            return BitConverter.ToInt32(intBytes, 0);
-        }
-        public static long DecodeLong(byte[] sourceBuffer, int startOffset, out int nextStartOffset)
-        {
-            var longBytes = new byte[8];
-            Buffer.BlockCopy(sourceBuffer, startOffset, longBytes, 0, 8);
-            nextStartOffset = startOffset + 8;
-            return BitConverter.ToInt64(longBytes, 0);
-        }
-        public static DateTime DecodeDateTime(byte[] sourceBuffer, int startOffset, out int nextStartOffset)
-        {
-            var longBytes = new byte[8];
-            Buffer.BlockCopy(sourceBuffer, startOffset, longBytes, 0, 8);
-            nextStartOffset = startOffset + 8;
-            return new DateTime(BitConverter.ToInt64(longBytes, 0));
-        }
-        public static byte[] DecodeBytes(byte[] sourceBuffer, int startOffset, out int nextStartOffset)
-        {
-            var lengthBytes = new byte[4];
-            Buffer.BlockCopy(sourceBuffer, startOffset, lengthBytes, 0, 4);
-            startOffset += 4;
-
-            var length = BitConverter.ToInt32(lengthBytes, 0);
-            var dataBytes = new byte[length];
-            Buffer.BlockCopy(sourceBuffer, startOffset, dataBytes, 0, length);
-            startOffset += length;
-
-            nextStartOffset = startOffset;
-
-            return dataBytes;
-        }
-        public static byte[] Combine(params byte[][] arrays)
-        {
-            byte[] destination = new byte[arrays.Sum(x => x.Length)];
-            int offset = 0;
-            foreach (byte[] data in arrays)
-            {
-                Buffer.BlockCopy(data, 0, destination, offset, data.Length);
-                offset += data.Length;
-            }
-            return destination;
-        }
-        public static byte[] Combine(IEnumerable<byte[]> arrays)
-        {
-            byte[] destination = new byte[arrays.Sum(x => x.Length)];
-            int offset = 0;
-            foreach (byte[] data in arrays)
-            {
-                Buffer.BlockCopy(data, 0, destination, offset, data.Length);
-                offset += data.Length;
-            }
-            return destination;
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Utilities/Ensure.cs b/MQ/NewLife.Queue/Utilities/Ensure.cs
deleted file mode 100644
index ae93bd7762..0000000000
--- a/MQ/NewLife.Queue/Utilities/Ensure.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Utilities
-{
-    public static class Ensure
-    {
-        public static void NotNull<T>(T argument, string argumentName) where T : class
-        {
-            if (argument == null)
-                throw new ArgumentNullException(argumentName + " should not be null.");
-        }
-
-        public static void NotNullOrEmpty(string argument, string argumentName)
-        {
-            if (string.IsNullOrEmpty(argument))
-                throw new ArgumentNullException(argument, argumentName + " should not be null or empty.");
-        }
-
-        public static void Positive(int number, string argumentName)
-        {
-            if (number <= 0)
-                throw new ArgumentOutOfRangeException(argumentName, argumentName + " should be positive.");
-        }
-
-        public static void Positive(long number, string argumentName)
-        {
-            if (number <= 0)
-                throw new ArgumentOutOfRangeException(argumentName, argumentName + " should be positive.");
-        }
-
-        public static void Nonnegative(long number, string argumentName)
-        {
-            if (number < 0)
-                throw new ArgumentOutOfRangeException(argumentName, argumentName + " should be non negative.");
-        }
-
-        public static void Nonnegative(int number, string argumentName)
-        {
-            if (number < 0)
-                throw new ArgumentOutOfRangeException(argumentName, argumentName + " should be non negative.");
-        }
-
-        public static void NotEmptyGuid(Guid guid, string argumentName)
-        {
-            if (Guid.Empty == guid)
-                throw new ArgumentException(argumentName, argumentName + " shoud be non-empty GUID.");
-        }
-
-        public static void Equal(int expected, int actual, string argumentName)
-        {
-            if (expected != actual)
-                throw new ArgumentException(string.Format("{0} expected value: {1}, actual value: {2}", argumentName, expected, actual));
-        }
-
-        public static void Equal(long expected, long actual, string argumentName)
-        {
-            if (expected != actual)
-                throw new ArgumentException(string.Format("{0} expected value: {1}, actual value: {2}", argumentName, expected, actual));
-        }
-
-        public static void Equal(bool expected, bool actual, string argumentName)
-        {
-            if (expected != actual)
-                throw new ArgumentException(string.Format("{0} expected value: {1}, actual value: {2}", argumentName, expected, actual));
-        }
-    }
-}
\ No newline at end of file
diff --git a/MQ/NewLife.Queue/Utilities/Helper.cs b/MQ/NewLife.Queue/Utilities/Helper.cs
deleted file mode 100644
index 68033fd312..0000000000
--- a/MQ/NewLife.Queue/Utilities/Helper.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-﻿using System;
-
-namespace NewLife.Queue.Utilities
-{
-    public static class Helper
-    {
-        public static void EatException(Action action)
-        {
-            try
-            {
-                action();
-            }
-            catch
-            {
-                // ignored
-            }
-        }
-        public static T EatException<T>(Func<T> action, T defaultValue = default(T))
-        {
-            try
-            {
-                return action();
-            }
-            catch (Exception)
-            {
-                return defaultValue;
-            }
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Utilities/MessageIdUtil.cs b/MQ/NewLife.Queue/Utilities/MessageIdUtil.cs
deleted file mode 100644
index 3c45471cf1..0000000000
--- a/MQ/NewLife.Queue/Utilities/MessageIdUtil.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-﻿using System;
-using System.Net;
-using NewLife.Queue.Broker;
-
-namespace NewLife.Queue.Utilities
-{
-    public class MessageIdUtil
-    {
-        private static byte[] _ipBytes;
-        private static byte[] _portBytes;
-
-        public static string CreateMessageId(long messagePosition)
-        {
-            if (_ipBytes == null)
-            {
-                _ipBytes = BrokerService.Instance.Setting.BrokerInfo.ProducerAddress.ToEndPoint().Address.GetAddressBytes();
-            }
-            if (_portBytes == null)
-            {
-                _portBytes = BitConverter.GetBytes(BrokerService.Instance.Setting.BrokerInfo.ProducerAddress.ToEndPoint().Port);
-            }
-            var positionBytes = BitConverter.GetBytes(messagePosition);
-            var messageIdBytes = ByteUtil.Combine(_ipBytes, _portBytes, positionBytes);
-
-            return ObjectId.ToHexString(messageIdBytes);
-        }
-        public static MessageIdInfo ParseMessageId(string messageId)
-        {
-            var messageIdBytes = ObjectId.ParseHexString(messageId);
-            var ipBytes = new byte[4];
-            var portBytes = new byte[4];
-            var messagePositionBytes = new byte[8];
-
-            Buffer.BlockCopy(messageIdBytes, 0, ipBytes, 0, 4);
-            Buffer.BlockCopy(messageIdBytes, 4, portBytes, 0, 4);
-            Buffer.BlockCopy(messageIdBytes, 8, messagePositionBytes, 0, 8);
-
-            var ip = BitConverter.ToInt32(ipBytes, 0);
-            var port = BitConverter.ToInt32(portBytes, 0);
-            var messagePosition = BitConverter.ToInt64(messagePositionBytes, 0);
-
-            return new MessageIdInfo
-            {
-                IP = new IPAddress(ip),
-                Port = port,
-                MessagePosition = messagePosition
-            };
-        }
-    }
-    public struct MessageIdInfo
-    {
-        public IPAddress IP;
-        public int Port;
-        public long MessagePosition;
-    }
-}
diff --git a/MQ/NewLife.Queue/Utilities/ObjectId.cs b/MQ/NewLife.Queue/Utilities/ObjectId.cs
deleted file mode 100644
index 6a27162415..0000000000
--- a/MQ/NewLife.Queue/Utilities/ObjectId.cs
+++ /dev/null
@@ -1,539 +0,0 @@
-﻿using System;
-using System.Diagnostics;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Security.Cryptography;
-using System.Text;
-using System.Threading;
-
-namespace NewLife.Queue.Utilities
-{
-    /// <summary>Represents an ObjectId
-    /// </summary>
-    [Serializable]
-    public struct ObjectId : IComparable<ObjectId>, IEquatable<ObjectId>
-    {
-        // private static fields
-        private static readonly DateTime __unixEpoch;
-        private static readonly long __dateTimeMaxValueMillisecondsSinceEpoch;
-        private static readonly long __dateTimeMinValueMillisecondsSinceEpoch;
-        private static ObjectId __emptyInstance = default(ObjectId);
-        private static int __staticMachine;
-        private static short __staticPid;
-        private static int __staticIncrement; // high byte will be masked out when generating new ObjectId
-        private static uint[] _lookup32 = Enumerable.Range(0, 256).Select(i =>
-        {
-            string s = i.ToString("x2");
-            return ((uint)s[0]) + ((uint)s[1] << 16);
-        }).ToArray();
-
-        // we're using 14 bytes instead of 12 to hold the ObjectId in memory but unlike a byte[] there is no additional object on the heap
-        // the extra two bytes are not visible to anyone outside of this class and they buy us considerable simplification
-        // an additional advantage of this representation is that it will serialize to JSON without any 64 bit overflow problems
-        private int _timestamp;
-        private int _machine;
-        private short _pid;
-        private int _increment;
-
-        // static constructor
-        static ObjectId()
-        {
-            __unixEpoch = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
-            __dateTimeMaxValueMillisecondsSinceEpoch = (DateTime.MaxValue - __unixEpoch).Ticks / 10000;
-            __dateTimeMinValueMillisecondsSinceEpoch = (DateTime.MinValue - __unixEpoch).Ticks / 10000;
-            __staticMachine = GetMachineHash();
-            __staticIncrement = (new Random()).Next();
-            __staticPid = (short)GetCurrentProcessId();
-        }
-
-        // constructors
-        /// <summary>
-        /// Initializes a new instance of the ObjectId class.
-        /// </summary>
-        /// <param name="bytes">The bytes.</param>
-        public ObjectId(byte[] bytes)
-        {
-            if (bytes == null)
-            {
-                throw new ArgumentNullException("bytes");
-            }
-            Unpack(bytes, out _timestamp, out _machine, out _pid, out _increment);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the ObjectId class.
-        /// </summary>
-        /// <param name="timestamp">The timestamp (expressed as a DateTime).</param>
-        /// <param name="machine">The machine hash.</param>
-        /// <param name="pid">The PID.</param>
-        /// <param name="increment">The increment.</param>
-        public ObjectId(DateTime timestamp, int machine, short pid, int increment)
-            : this(GetTimestampFromDateTime(timestamp), machine, pid, increment)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the ObjectId class.
-        /// </summary>
-        /// <param name="timestamp">The timestamp.</param>
-        /// <param name="machine">The machine hash.</param>
-        /// <param name="pid">The PID.</param>
-        /// <param name="increment">The increment.</param>
-        public ObjectId(int timestamp, int machine, short pid, int increment)
-        {
-            if ((machine & 0xff000000) != 0)
-            {
-                throw new ArgumentOutOfRangeException("machine", "The machine value must be between 0 and 16777215 (it must fit in 3 bytes).");
-            }
-            if ((increment & 0xff000000) != 0)
-            {
-                throw new ArgumentOutOfRangeException("increment", "The increment value must be between 0 and 16777215 (it must fit in 3 bytes).");
-            }
-
-            _timestamp = timestamp;
-            _machine = machine;
-            _pid = pid;
-            _increment = increment;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the ObjectId class.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        public ObjectId(string value)
-        {
-            if (value == null)
-            {
-                throw new ArgumentNullException("value");
-            }
-            Unpack(ParseHexString(value), out _timestamp, out _machine, out _pid, out _increment);
-        }
-
-        // public static properties
-        /// <summary>
-        /// Gets an instance of ObjectId where the value is empty.
-        /// </summary>
-        public static ObjectId Empty
-        {
-            get { return __emptyInstance; }
-        }
-
-        // public properties
-        /// <summary>
-        /// Gets the timestamp.
-        /// </summary>
-        public int Timestamp
-        {
-            get { return _timestamp; }
-        }
-
-        /// <summary>
-        /// Gets the machine.
-        /// </summary>
-        public int Machine
-        {
-            get { return _machine; }
-        }
-
-        /// <summary>
-        /// Gets the PID.
-        /// </summary>
-        public short Pid
-        {
-            get { return _pid; }
-        }
-
-        /// <summary>
-        /// Gets the increment.
-        /// </summary>
-        public int Increment
-        {
-            get { return _increment; }
-        }
-
-        /// <summary>
-        /// Gets the creation time (derived from the timestamp).
-        /// </summary>
-        public DateTime CreationTime
-        {
-            get { return __unixEpoch.AddSeconds(_timestamp); }
-        }
-
-        // public operators
-        /// <summary>
-        /// Compares two ObjectIds.
-        /// </summary>
-        /// <param name="lhs">The first ObjectId.</param>
-        /// <param name="rhs">The other ObjectId</param>
-        /// <returns>True if the first ObjectId is less than the second ObjectId.</returns>
-        public static bool operator <(ObjectId lhs, ObjectId rhs)
-        {
-            return lhs.CompareTo(rhs) < 0;
-        }
-
-        /// <summary>
-        /// Compares two ObjectIds.
-        /// </summary>
-        /// <param name="lhs">The first ObjectId.</param>
-        /// <param name="rhs">The other ObjectId</param>
-        /// <returns>True if the first ObjectId is less than or equal to the second ObjectId.</returns>
-        public static bool operator <=(ObjectId lhs, ObjectId rhs)
-        {
-            return lhs.CompareTo(rhs) <= 0;
-        }
-
-        /// <summary>
-        /// Compares two ObjectIds.
-        /// </summary>
-        /// <param name="lhs">The first ObjectId.</param>
-        /// <param name="rhs">The other ObjectId.</param>
-        /// <returns>True if the two ObjectIds are equal.</returns>
-        public static bool operator ==(ObjectId lhs, ObjectId rhs)
-        {
-            return lhs.Equals(rhs);
-        }
-
-        /// <summary>
-        /// Compares two ObjectIds.
-        /// </summary>
-        /// <param name="lhs">The first ObjectId.</param>
-        /// <param name="rhs">The other ObjectId.</param>
-        /// <returns>True if the two ObjectIds are not equal.</returns>
-        public static bool operator !=(ObjectId lhs, ObjectId rhs)
-        {
-            return !(lhs == rhs);
-        }
-
-        /// <summary>
-        /// Compares two ObjectIds.
-        /// </summary>
-        /// <param name="lhs">The first ObjectId.</param>
-        /// <param name="rhs">The other ObjectId</param>
-        /// <returns>True if the first ObjectId is greather than or equal to the second ObjectId.</returns>
-        public static bool operator >=(ObjectId lhs, ObjectId rhs)
-        {
-            return lhs.CompareTo(rhs) >= 0;
-        }
-
-        /// <summary>
-        /// Compares two ObjectIds.
-        /// </summary>
-        /// <param name="lhs">The first ObjectId.</param>
-        /// <param name="rhs">The other ObjectId</param>
-        /// <returns>True if the first ObjectId is greather than the second ObjectId.</returns>
-        public static bool operator >(ObjectId lhs, ObjectId rhs)
-        {
-            return lhs.CompareTo(rhs) > 0;
-        }
-
-        // public static methods
-        /// <summary>
-        /// Generates a new ObjectId with a unique value.
-        /// </summary>
-        /// <returns>An ObjectId.</returns>
-        public static ObjectId GenerateNewId()
-        {
-            return GenerateNewId(GetTimestampFromDateTime(DateTime.UtcNow));
-        }
-
-        /// <summary>
-        /// Generates a new ObjectId with a unique value (with the timestamp component based on a given DateTime).
-        /// </summary>
-        /// <param name="timestamp">The timestamp component (expressed as a DateTime).</param>
-        /// <returns>An ObjectId.</returns>
-        public static ObjectId GenerateNewId(DateTime timestamp)
-        {
-            return GenerateNewId(GetTimestampFromDateTime(timestamp));
-        }
-
-        /// <summary>
-        /// Generates a new ObjectId with a unique value (with the given timestamp).
-        /// </summary>
-        /// <param name="timestamp">The timestamp component.</param>
-        /// <returns>An ObjectId.</returns>
-        public static ObjectId GenerateNewId(int timestamp)
-        {
-            int increment = Interlocked.Increment(ref __staticIncrement) & 0x00ffffff; // only use low order 3 bytes
-            return new ObjectId(timestamp, __staticMachine, __staticPid, increment);
-        }
-
-        /// <summary>
-        /// Generates a new ObjectId string with a unique value.
-        /// </summary>
-        /// <returns>The string value of the new generated ObjectId.</returns>
-        public static string GenerateNewStringId()
-        {
-            return GenerateNewId().ToString();
-        }
-
-        /// <summary>
-        /// Packs the components of an ObjectId into a byte array.
-        /// </summary>
-        /// <param name="timestamp">The timestamp.</param>
-        /// <param name="machine">The machine hash.</param>
-        /// <param name="pid">The PID.</param>
-        /// <param name="increment">The increment.</param>
-        /// <returns>A byte array.</returns>
-        public static byte[] Pack(int timestamp, int machine, short pid, int increment)
-        {
-            if ((machine & 0xff000000) != 0)
-            {
-                throw new ArgumentOutOfRangeException("machine", "The machine value must be between 0 and 16777215 (it must fit in 3 bytes).");
-            }
-            if ((increment & 0xff000000) != 0)
-            {
-                throw new ArgumentOutOfRangeException("increment", "The increment value must be between 0 and 16777215 (it must fit in 3 bytes).");
-            }
-
-            byte[] bytes = new byte[12];
-            bytes[0] = (byte)(timestamp >> 24);
-            bytes[1] = (byte)(timestamp >> 16);
-            bytes[2] = (byte)(timestamp >> 8);
-            bytes[3] = (byte)(timestamp);
-            bytes[4] = (byte)(machine >> 16);
-            bytes[5] = (byte)(machine >> 8);
-            bytes[6] = (byte)(machine);
-            bytes[7] = (byte)(pid >> 8);
-            bytes[8] = (byte)(pid);
-            bytes[9] = (byte)(increment >> 16);
-            bytes[10] = (byte)(increment >> 8);
-            bytes[11] = (byte)(increment);
-            return bytes;
-        }
-
-        /// <summary>
-        /// Parses a string and creates a new ObjectId.
-        /// </summary>
-        /// <param name="s">The string value.</param>
-        /// <returns>A ObjectId.</returns>
-        public static ObjectId Parse(string s)
-        {
-            if (s == null)
-            {
-                throw new ArgumentNullException("s");
-            }
-            if (s.Length != 24)
-            {
-                throw new ArgumentOutOfRangeException("s", "ObjectId string value must be 24 characters.");
-            }
-            return new ObjectId(ParseHexString(s));
-        }
-
-        /// <summary>
-        /// Unpacks a byte array into the components of an ObjectId.
-        /// </summary>
-        /// <param name="bytes">A byte array.</param>
-        /// <param name="timestamp">The timestamp.</param>
-        /// <param name="machine">The machine hash.</param>
-        /// <param name="pid">The PID.</param>
-        /// <param name="increment">The increment.</param>
-        public static void Unpack(byte[] bytes, out int timestamp, out int machine, out short pid, out int increment)
-        {
-            if (bytes == null)
-            {
-                throw new ArgumentNullException("bytes");
-            }
-            if (bytes.Length != 12)
-            {
-                throw new ArgumentOutOfRangeException("bytes", "Byte array must be 12 bytes long.");
-            }
-            timestamp = (bytes[0] << 24) + (bytes[1] << 16) + (bytes[2] << 8) + bytes[3];
-            machine = (bytes[4] << 16) + (bytes[5] << 8) + bytes[6];
-            pid = (short)((bytes[7] << 8) + bytes[8]);
-            increment = (bytes[9] << 16) + (bytes[10] << 8) + bytes[11];
-        }
-
-        // private static methods
-        /// <summary>
-        /// Gets the current process id.  This method exists because of how CAS operates on the call stack, checking
-        /// for permissions before executing the method.  Hence, if we inlined this call, the calling method would not execute
-        /// before throwing an exception requiring the try/catch at an even higher level that we don't necessarily control.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        private static int GetCurrentProcessId()
-        {
-            return Process.GetCurrentProcess().Id;
-        }
-
-        private static int GetMachineHash()
-        {
-            var hostName = Environment.MachineName; // use instead of Dns.HostName so it will work offline
-            var md5 = MD5.Create();
-            var hash = md5.ComputeHash(Encoding.UTF8.GetBytes(hostName));
-            return (hash[0] << 16) + (hash[1] << 8) + hash[2]; // use first 3 bytes of hash
-        }
-
-        private static int GetTimestampFromDateTime(DateTime timestamp)
-        {
-            return (int)Math.Floor((ToUniversalTime(timestamp) - __unixEpoch).TotalSeconds);
-        }
-
-        // public methods
-        /// <summary>
-        /// Compares this ObjectId to another ObjectId.
-        /// </summary>
-        /// <param name="other">The other ObjectId.</param>
-        /// <returns>A 32-bit signed integer that indicates whether this ObjectId is less than, equal to, or greather than the other.</returns>
-        public int CompareTo(ObjectId other)
-        {
-            int r = _timestamp.CompareTo(other._timestamp);
-            if (r != 0) { return r; }
-            r = _machine.CompareTo(other._machine);
-            if (r != 0) { return r; }
-            r = _pid.CompareTo(other._pid);
-            if (r != 0) { return r; }
-            return _increment.CompareTo(other._increment);
-        }
-
-        /// <summary>
-        /// Compares this ObjectId to another ObjectId.
-        /// </summary>
-        /// <param name="rhs">The other ObjectId.</param>
-        /// <returns>True if the two ObjectIds are equal.</returns>
-        public bool Equals(ObjectId rhs)
-        {
-            return
-                _timestamp == rhs._timestamp &&
-                _machine == rhs._machine &&
-                _pid == rhs._pid &&
-                _increment == rhs._increment;
-        }
-
-        /// <summary>
-        /// Compares this ObjectId to another object.
-        /// </summary>
-        /// <param name="obj">The other object.</param>
-        /// <returns>True if the other object is an ObjectId and equal to this one.</returns>
-        public override bool Equals(object obj)
-        {
-            if (obj is ObjectId)
-            {
-                return Equals((ObjectId)obj);
-            }
-            else
-            {
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int hash = 17;
-            hash = 37 * hash + _timestamp.GetHashCode();
-            hash = 37 * hash + _machine.GetHashCode();
-            hash = 37 * hash + _pid.GetHashCode();
-            hash = 37 * hash + _increment.GetHashCode();
-            return hash;
-        }
-
-        /// <summary>
-        /// Converts the ObjectId to a byte array.
-        /// </summary>
-        /// <returns>A byte array.</returns>
-        public byte[] ToByteArray()
-        {
-            return Pack(_timestamp, _machine, _pid, _increment);
-        }
-
-        /// <summary>
-        /// Returns a string representation of the value.
-        /// </summary>
-        /// <returns>A string representation of the value.</returns>
-        public override string ToString()
-        {
-            return ToHexString(ToByteArray());
-        }
-
-        /// <summary>
-        /// Parses a hex string into its equivalent byte array.
-        /// </summary>
-        /// <param name="s">The hex string to parse.</param>
-        /// <returns>The byte equivalent of the hex string.</returns>
-        public static byte[] ParseHexString(string s)
-        {
-            if (s == null)
-            {
-                throw new ArgumentNullException("s");
-            }
-
-            if (s.Length % 2 == 1)
-            {
-                throw new Exception("The binary key cannot have an odd number of digits");
-            }
-
-            byte[] arr = new byte[s.Length >> 1];
-
-            for (int i = 0; i < s.Length >> 1; ++i)
-            {
-                arr[i] = (byte)((GetHexVal(s[i << 1]) << 4) + (GetHexVal(s[(i << 1) + 1])));
-            }
-
-            return arr;
-        }
-        /// <summary>
-        /// Converts a byte array to a hex string.
-        /// </summary>
-        /// <param name="bytes">The byte array.</param>
-        /// <returns>A hex string.</returns>
-        public static string ToHexString(byte[] bytes)
-        {
-            if (bytes == null)
-            {
-                throw new ArgumentNullException("bytes");
-            }
-            var result = new char[bytes.Length * 2];
-            for (int i = 0; i < bytes.Length; i++)
-            {
-                var val = _lookup32[bytes[i]];
-                result[2 * i] = (char)val;
-                result[2 * i + 1] = (char)(val >> 16);
-            }
-            return new string(result);
-        }
-        /// <summary>
-        /// Converts a DateTime to number of milliseconds since Unix epoch.
-        /// </summary>
-        /// <param name="dateTime">A DateTime.</param>
-        /// <returns>Number of seconds since Unix epoch.</returns>
-        public static long ToMillisecondsSinceEpoch(DateTime dateTime)
-        {
-            var utcDateTime = ToUniversalTime(dateTime);
-            return (utcDateTime - __unixEpoch).Ticks / 10000;
-        }
-        /// <summary>
-        /// Converts a DateTime to UTC (with special handling for MinValue and MaxValue).
-        /// </summary>
-        /// <param name="dateTime">A DateTime.</param>
-        /// <returns>The DateTime in UTC.</returns>
-        public static DateTime ToUniversalTime(DateTime dateTime)
-        {
-            if (dateTime == DateTime.MinValue)
-            {
-                return DateTime.SpecifyKind(DateTime.MinValue, DateTimeKind.Utc);
-            }
-            else if (dateTime == DateTime.MaxValue)
-            {
-                return DateTime.SpecifyKind(DateTime.MaxValue, DateTimeKind.Utc);
-            }
-            else
-            {
-                return dateTime.ToUniversalTime();
-            }
-        }
-
-        private static int GetHexVal(char hex)
-        {
-            int val = (int)hex;
-            //For uppercase A-F letters:
-            //return val - (val < 58 ? 48 : 55);
-            //For lowercase a-f letters:
-            //return val - (val < 58 ? 48 : 87);
-            //Or the two combined, but a bit slower:
-            return val - (val < 58 ? 48 : (val < 97 ? 55 : 87));
-        }
-    }
-}
diff --git a/MQ/NewLife.Queue/Utilities/SocketUtils.cs b/MQ/NewLife.Queue/Utilities/SocketUtils.cs
deleted file mode 100644
index 4a9879f60d..0000000000
--- a/MQ/NewLife.Queue/Utilities/SocketUtils.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-﻿using System.Linq;
-using System.Net;
-using System.Net.Sockets;
-
-namespace NewLife.Queue.Utilities
-{
-    public class SocketUtils
-    {
-        public static IPAddress GetLocalIPV4()
-        {
-            return Dns.GetHostEntry(Dns.GetHostName()).AddressList.First(x => x.AddressFamily == AddressFamily.InterNetwork);
-        }
-        public static Socket CreateSocket(int sendBufferSize, int receiveBufferSize)
-        {
-            var socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
-            socket.NoDelay = true;
-            socket.Blocking = false;
-            socket.SendBufferSize = sendBufferSize;
-            socket.ReceiveBufferSize = receiveBufferSize;
-            socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.DontLinger, true);
-            return socket;
-        }
-        public static void ShutdownSocket(Socket socket)
-        {
-            if (socket == null) return;
-
-            Helper.EatException(() => socket.Shutdown(SocketShutdown.Both));
-            Helper.EatException(() => socket.Close(10000));
-        }
-        public static void CloseSocket(Socket socket)
-        {
-            if (socket == null) return;
-
-            Helper.EatException(() => socket.Close(10000));
-        }
-    }
-}
diff --git a/NewLife.Cube.sln b/NewLife.Cube.sln
deleted file mode 100644
index 70548f4dcb..0000000000
--- a/NewLife.Cube.sln
+++ /dev/null
@@ -1,25 +0,0 @@
-﻿
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27703.2000
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NewLife.Cube", "NewLife.Cube\NewLife.Cube.csproj", "{7AC0E99B-CFD8-4B59-8838-503EAA30523F}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7AC0E99B-CFD8-4B59-8838-503EAA30523F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7AC0E99B-CFD8-4B59-8838-503EAA30523F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7AC0E99B-CFD8-4B59-8838-503EAA30523F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7AC0E99B-CFD8-4B59-8838-503EAA30523F}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {505C849C-4BB2-4F70-96AC-D71E86AF870D}
-	EndGlobalSection
-EndGlobal
diff --git a/NewLife.Cube/App_Start/BundleConfig.cs b/NewLife.Cube/App_Start/BundleConfig.cs
deleted file mode 100644
index 3a51d146b1..0000000000
--- a/NewLife.Cube/App_Start/BundleConfig.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-﻿using System.Web;
-using System.Web.Optimization;
-
-namespace NewLife.Cube
-{
-    /// <summary>绑定配置</summary>
-    public class BundleConfig
-    {
-        /// <summary>有关 Bundling 的详细信息，请访问 http://go.microsoft.com/fwlink/?LinkId=254725</summary>
-        /// <param name="bundles"></param>
-        public static void RegisterBundles(BundleCollection bundles)
-        {
-            bundles.Add(new ScriptBundle("~/bundles/jquery").Include(
-                        "~/Scripts/jquery-{version}.js"));
-
-            bundles.Add(new ScriptBundle("~/bundles/jqueryui").Include(
-                        "~/Scripts/jquery-ui-{version}.js"));
-
-            bundles.Add(new ScriptBundle("~/bundles/jqueryval").Include(
-                        "~/Scripts/jquery.unobtrusive*",
-                        "~/Scripts/jquery.validate*"));
-
-            // 使用要用于开发和学习的 Modernizr 的开发版本。然后，当你做好
-            // 生产准备时，请使用 http://modernizr.com 上的生成工具来仅选择所需的测试。
-            bundles.Add(new ScriptBundle("~/bundles/modernizr").Include(
-                        "~/Scripts/modernizr-*"));
-
-            bundles.Add(new StyleBundle("~/Content/css").Include("~/Content/site.css"));
-
-            bundles.Add(new StyleBundle("~/Content/themes/base/css").Include(
-                        "~/Content/themes/base/jquery.ui.core.css",
-                        "~/Content/themes/base/jquery.ui.resizable.css",
-                        "~/Content/themes/base/jquery.ui.selectable.css",
-                        "~/Content/themes/base/jquery.ui.accordion.css",
-                        "~/Content/themes/base/jquery.ui.autocomplete.css",
-                        "~/Content/themes/base/jquery.ui.button.css",
-                        "~/Content/themes/base/jquery.ui.dialog.css",
-                        "~/Content/themes/base/jquery.ui.slider.css",
-                        "~/Content/themes/base/jquery.ui.tabs.css",
-                        "~/Content/themes/base/jquery.ui.datepicker.css",
-                        "~/Content/themes/base/jquery.ui.progressbar.css",
-                        "~/Content/themes/base/jquery.ui.theme.css"));
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/App_Start/RouteConfig.cs b/NewLife.Cube/App_Start/RouteConfig.cs
deleted file mode 100644
index 4d8058d81e..0000000000
--- a/NewLife.Cube/App_Start/RouteConfig.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-﻿using System.Web.Mvc;
-using System.Web.Routing;
-using NewLife.Cube.Controllers;
-
-namespace NewLife.Cube
-{
-    /// <summary>路由配置</summary>
-    public class RouteConfig
-    {
-        /// <summary>注册路由</summary>
-        /// <param name="routes"></param>
-        public static void RegisterRoutes(RouteCollection routes)
-        {
-            routes.IgnoreRoute("{resource}.axd/{*pathInfo}");
-            routes.IgnoreRoute("Content/{*relpath}");
-            routes.IgnoreRoute("Scripts/{*relpath}");
-            routes.IgnoreRoute("Images/{*relpath}");
-
-            if (routes["Cube"] == null)
-            {
-                // 为魔方注册默认首页，启动魔方站点时能自动跳入后台，同时为Home预留默认过度视图页面
-                routes.MapRoute(
-                    name: "Cube",
-                    url: "{controller}/{action}/{id}",
-                    defaults: new { controller = "CubeHome", action = "Index", id = UrlParameter.Optional },
-                    namespaces: new[] { typeof(CubeHomeController).Namespace }
-                    );
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/App_Start/WebApiConfig.cs b/NewLife.Cube/App_Start/WebApiConfig.cs
deleted file mode 100644
index 27aabff855..0000000000
--- a/NewLife.Cube/App_Start/WebApiConfig.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web.Http;
-
-namespace NewLife.Cube
-{
-    /// <summary>WebApi配置</summary>
-    public static class WebApiConfig
-    {
-        /// <summary>注册</summary>
-        /// <param name="config"></param>
-        public static void Register(HttpConfiguration config)
-        {
-            config.MapHttpAttributeRoutes();
-
-            config.Routes.MapHttpRoute(
-                name: "DefaultApi",
-                routeTemplate: "api/{controller}/{id}",
-                defaults: new { id = RouteParameter.Optional }
-            );
-        }
-    }
-}
diff --git a/NewLife.Cube/Areas/Admin/AdminAreaRegistration.cs b/NewLife.Cube/Areas/Admin/AdminAreaRegistration.cs
deleted file mode 100644
index ccaf8e1019..0000000000
--- a/NewLife.Cube/Areas/Admin/AdminAreaRegistration.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-﻿using System.ComponentModel;
-using System.Web.Mvc;
-using NewLife.Log;
-using XCode.Membership;
-
-namespace NewLife.Cube.Admin
-{
-    /// <summary>权限管理区域注册</summary>
-    [DisplayName("系统管理")]
-    public class AdminAreaRegistration : AreaRegistrationBase
-    {
-        /// <summary>注册区域</summary>
-        /// <param name="context"></param>
-        public override void RegisterArea(AreaRegistrationContext context)
-        {
-            base.RegisterArea(context);
-
-            context.Routes.IgnoreRoute("bootstrap/{*relpath}");
-
-            // 自动检查并添加菜单
-            XTrace.WriteLine("初始化权限管理体系");
-            //var user = ManageProvider.User;
-            ManageProvider.Provider.GetService<IUser>();
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Controllers/CoreController.cs b/NewLife.Cube/Areas/Admin/Controllers/CoreController.cs
deleted file mode 100644
index 8914cc8bdb..0000000000
--- a/NewLife.Cube/Areas/Admin/Controllers/CoreController.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Reflection;
-using XCode;
-using XCode.Membership;
-
-namespace NewLife.Cube.Admin.Controllers
-{
-    /// <summary>设置控制器</summary>
-    [DisplayName("基本设置")]
-    public class CoreController : ConfigController<NewLife.Setting>
-    {
-        static CoreController()
-        {
-            MenuOrder = 39;
-        }
-
-        /// <summary>菜单不可见</summary>
-        /// <param name="menu"></param>
-        /// <returns></returns>
-        protected override IDictionary<MethodInfo, Int32> ScanActionMenu(IMenu menu)
-        {
-            if (menu.Visible)
-            {
-                menu.Visible = false;
-                (menu as IEntity).Save();
-            }
-
-            return base.ScanActionMenu(menu);
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Controllers/CubeController.cs b/NewLife.Cube/Areas/Admin/Controllers/CubeController.cs
deleted file mode 100644
index e0d09af799..0000000000
--- a/NewLife.Cube/Areas/Admin/Controllers/CubeController.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-﻿using System.ComponentModel;
-
-namespace NewLife.Cube.Admin.Controllers
-{
-    /// <summary>系统设置控制器</summary>
-    [DisplayName("魔方设置")]
-    public class CubeController : ConfigController<Setting>
-    {
-        static CubeController()
-        {
-            MenuOrder = 34;
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Controllers/DbController.cs b/NewLife.Cube/Areas/Admin/Controllers/DbController.cs
deleted file mode 100644
index 1cc73f0e2d..0000000000
--- a/NewLife.Cube/Areas/Admin/Controllers/DbController.cs
+++ /dev/null
@@ -1,161 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Configuration;
-using System.IO;
-using System.Threading.Tasks;
-using System.Web.Mvc;
-using NewLife.Web;
-using XCode.DataAccessLayer;
-using XCode.Membership;
-#if NET4
-using Task = System.Threading.Tasks.TaskEx;
-#endif
-
-namespace NewLife.Cube.Admin.Controllers
-{
-    /// <summary>数据库管理</summary>
-    [DisplayName("数据库")]
-    [EntityAuthorize(PermissionFlags.Detail)]
-    public class DbController : ControllerBaseX
-    {
-        /// <summary>菜单顺序。扫描是会反射读取</summary>
-        protected static Int32 MenuOrder { get; set; }
-
-        static DbController()
-        {
-            MenuOrder = 26;
-        }
-
-        /// <summary>数据库列表</summary>
-        /// <returns></returns>
-        [EntityAuthorize(PermissionFlags.Detail)]
-        public ActionResult Index()
-        {
-            var list = new List<DbItem>();
-            var dir = XCode.Setting.Current.BackupPath.AsDirectory();
-
-            // 读取配置文件
-            foreach (var item in DAL.ConnStrs.ToArray())
-            {
-                var di = new DbItem
-                {
-                    Name = item.Key,
-                    ConnStr = item.Value
-                };
-
-                var dal = DAL.Create(item.Key);
-                di.Type = dal.DbType;
-
-                var t = Task.Run(() =>
-                {
-                    try
-                    {
-                        return dal.Db.ServerVersion;
-                    }
-                    catch { return null; }
-                });
-                if (t.Wait(300)) di.Version = t.Result;
-
-                if (dir.Exists) di.Backups = dir.GetFiles("{0}_*".F(dal.ConnName), SearchOption.TopDirectoryOnly).Length;
-
-                list.Add(di);
-            }
-
-            return View("Index", list);
-        }
-
-        /// <summary>持久化连接</summary>
-        /// <param name="name"></param>
-        /// <returns></returns>
-        [EntityAuthorize(PermissionFlags.Update)]
-        public ActionResult SetStatic(String name)
-        {
-            // 读取配置文件
-            var css = ConfigurationManager.ConnectionStrings;
-            var conns = new HashSet<String>(StringComparer.OrdinalIgnoreCase);
-            foreach (ConnectionStringSettings set in css)
-            {
-                if (!conns.Contains(set.Name)) conns.Add(set.Name);
-            }
-
-            var msg = "";
-            if (!DAL.ConnStrs.ContainsKey(name))
-                msg = "找不到连接{0}".F(name);
-            else if (conns.Contains(name))
-                msg = "连接 {0} 已经存在于配置文件".F(name);
-            else
-            {
-                try
-                {
-                    var dal = DAL.Create(name);
-                    var set = new ConnectionStringSettings(name, dal.ConnStr);
-                    //css.Add(set);
-
-                    var config = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
-                    config.ConnectionStrings.ConnectionStrings.Add(set);
-                    config.Save();
-
-                    msg = "持久化连接 {0} 成功".F(name);
-                }
-                catch (Exception ex)
-                {
-                    msg = "持久化连接 {0} 失败 {1}".F(name, ex.Message);
-                }
-            }
-
-            Js.Alert(msg);
-
-            return Index();
-        }
-
-        /// <summary>备份数据库</summary>
-        /// <param name="name"></param>
-        /// <returns></returns>
-        [EntityAuthorize(PermissionFlags.Insert)]
-        public ActionResult Backup(String name)
-        {
-            var dal = DAL.Create(name);
-            var bak = dal.Db.CreateMetaData().SetSchema(DDLSchema.BackupDatabase, dal.ConnName, null, false);
-
-            WriteLog("备份", "备份数据库 {0} 到 {1}".F(name, bak));
-
-            return Index();
-        }
-
-        /// <summary>备份并压缩数据库</summary>
-        /// <param name="name"></param>
-        /// <returns></returns>
-        [EntityAuthorize(PermissionFlags.Insert)]
-        public ActionResult BackupAndCompress(String name)
-        {
-            var dal = DAL.Create(name);
-            var bak = dal.Db.CreateMetaData().SetSchema(DDLSchema.BackupDatabase, dal.ConnName, null, true);
-
-            WriteLog("备份", "备份数据库 {0} 并压缩到 {1}".F(name, bak));
-
-            return Index();
-        }
-
-        /// <summary>下载数据库备份</summary>
-        /// <param name="name"></param>
-        /// <returns></returns>
-        [EntityAuthorize(PermissionFlags.Detail)]
-        public ActionResult Download(String name)
-        {
-            var dal = DAL.Create(name);
-            var xml = DAL.Export(dal.Tables);
-
-            WriteLog("下载", "下载数据库架构 " + name);
-
-            return File(xml.GetBytes(), "application/xml", name + ".xml");
-        }
-
-        #region 日志
-        private static void WriteLog(String action, String remark)
-        {
-            LogProvider.Provider.WriteLog(typeof(DbController), action, remark);
-        }
-        #endregion
-    }
-}
diff --git a/NewLife.Cube/Areas/Admin/Controllers/FileController.cs b/NewLife.Cube/Areas/Admin/Controllers/FileController.cs
deleted file mode 100644
index f46538220a..0000000000
--- a/NewLife.Cube/Areas/Admin/Controllers/FileController.cs
+++ /dev/null
@@ -1,385 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.IO;
-using System.Linq;
-using System.Web;
-using System.Web.Mvc;
-using XCode.Membership;
-
-namespace NewLife.Cube.Admin.Controllers
-{
-    /// <summary>文件管理</summary>
-    [DisplayName("文件")]
-    [EntityAuthorize(PermissionFlags.Detail)]
-    public class FileController : ControllerBaseX
-    {
-        /// <summary>菜单顺序。扫描是会反射读取</summary>
-        protected static Int32 MenuOrder { get; set; }
-
-        static FileController()
-        {
-            MenuOrder = 28;
-        }
-
-        #region 基础
-        private String Root { get { return "../".GetFullPath(); } }
-
-        private FileInfo GetFile(String r)
-        {
-            if (r.IsNullOrEmpty()) return null;
-
-            // 默认根目录
-            var fi = Root.CombinePath(r).AsFile();
-            if (!fi.Exists) return null;
-
-            return fi;
-        }
-
-        private DirectoryInfo GetDirectory(String r)
-        {
-            if (r.IsNullOrEmpty()) return null;
-
-            // 默认根目录
-            var di = Root.CombinePath(r).AsDirectory();
-            if (!di.Exists) return null;
-
-            return di;
-        }
-
-        //private FileSystemInfo Get(String r)
-        //{
-        //    var fi = GetFile(r);
-        //    if (fi != null)
-        //        fi.Delete();
-        //    else
-        //    {
-        //        var di = GetDirectory(r);
-        //        if (di == null) throw new Exception("找不到文件或目录！");
-        //        di.Delete(true);
-        //    }
-        //}
-
-        private FileItem GetItme(String r)
-        {
-            var inf = GetFile(r) as FileSystemInfo ?? GetDirectory(r);
-            if (inf == null) return null;
-
-            var fi = new FileItem
-            {
-                Name = inf.Name,
-                FullName = GetFullName(inf.FullName),
-                Raw = inf.FullName,
-                Directory = inf is DirectoryInfo,
-                LastWrite = inf.LastWriteTime
-            };
-
-            if (inf is FileInfo)
-            {
-                var f = inf as FileInfo;
-                if (f.Length < 1024)
-                    fi.Size = "{0:n0}".F(f.Length);
-                else if (f.Length < 1024 * 1024)
-                    fi.Size = "{0:n2}K".F((Double)f.Length / 1024);
-                else if (f.Length < 1024 * 1024 * 1024)
-                    fi.Size = "{0:n2}M".F((Double)f.Length / 1024 / 1024);
-                else if (f.Length < 1024L * 1024 * 1024 * 1024)
-                    fi.Size = "{0:n2}G".F((Double)f.Length / 1024 / 1024 / 1024);
-            }
-
-            return fi;
-        }
-
-        private String GetFullName(String r)
-        {
-            return r.TrimStart(Root).TrimStart(Root.TrimEnd(Path.DirectorySeparatorChar + ""));
-        }
-        #endregion
-
-        #region 列表&删除
-        /// <summary>文件管理主视图</summary>
-        /// <returns></returns>
-        [EntityAuthorize(PermissionFlags.Detail)]
-        public ActionResult Index(String r, String sort)
-        {
-            var di = GetDirectory(r) ?? Root.AsDirectory();
-
-            // 检查目录越界
-            var root = Root.TrimEnd(Path.DirectorySeparatorChar);
-            if (!di.FullName.StartsWithIgnoreCase(root)) di = Root.AsDirectory();
-
-            // 计算当前路径
-            var fd = di.FullName;
-            if (fd.StartsWith(Root)) fd = fd.Substring(Root.Length);
-            ViewBag.Current = fd;
-
-            // 遍历所有子目录
-            var fis = di.GetFileSystemInfos();
-            var list = new List<FileItem>();
-            foreach (var item in fis)
-            {
-                if (item.Attributes.Has(FileAttributes.Hidden)) continue;
-
-                var fi = GetItme(item.FullName);
-
-                list.Add(fi);
-            }
-
-            // 排序，目录优先
-            switch (sort)
-            {
-                case "size":
-                    list = list.OrderByDescending(e => e.Size).ThenBy(e => e.Name).ToList();
-                    break;
-                case "lastwrite":
-                    list = list.OrderByDescending(e => e.LastWrite).ThenBy(e => e.Name).ToList();
-                    break;
-                case "name":
-                default:
-                    list = list.OrderByDescending(e => e.Directory).ThenBy(e => e.Name).ToList();
-                    break;
-            }
-            // 在开头插入上一级目录
-            if (!di.FullName.EqualIgnoreCase(Root, root))
-            {
-                list.Insert(0, new FileItem
-                {
-                    Name = "../",
-                    Directory = true,
-                    FullName = GetFullName(di.Parent.FullName)
-                });
-            }
-
-            // 剪切板
-            ViewBag.Clip = GetClip();
-
-            return View("Index", list);
-        }
-
-        /// <summary>删除</summary>
-        /// <param name="r"></param>
-        /// <returns></returns>
-        [EntityAuthorize(PermissionFlags.Delete)]
-        public ActionResult Delete(String r)
-        {
-            var p = "";
-
-            var fi = GetFile(r);
-            if (fi != null)
-            {
-                p = GetFullName(fi.Directory.FullName);
-                WriteLog("删除", fi.FullName);
-                fi.Delete();
-            }
-            else
-            {
-                var di = GetDirectory(r);
-                if (di == null) throw new Exception("找不到文件或目录！");
-
-                p = GetFullName(di.Parent.FullName);
-                WriteLog("删除", di.FullName);
-                di.Delete(true);
-            }
-
-            return RedirectToAction("Index", new { r = p });
-        }
-        #endregion
-
-        #region 压缩与解压缩
-        /// <summary>压缩文件</summary>
-        /// <param name="r"></param>
-        /// <returns></returns>
-        [EntityAuthorize(PermissionFlags.Insert)]
-        public ActionResult Compress(String r)
-        {
-            var p = "";
-
-            var fi = GetFile(r);
-            if (fi != null)
-            {
-                p = GetFullName(fi.Directory.FullName);
-                var dst = "{0}_{1:yyyyMMddHHmmss}.zip".F(fi.Name, DateTime.Now);
-                dst = fi.Directory.FullName.CombinePath(dst);
-                WriteLog("压缩", "{0} => {1}".F(fi.FullName, dst));
-                fi.Compress(dst);
-            }
-            else
-            {
-                var di = GetDirectory(r);
-                if (di == null) throw new Exception("找不到文件或目录！");
-
-                p = GetFullName(di.Parent.FullName);
-                var dst = "{0}_{1:yyyyMMddHHmmss}.zip".F(di.Name, DateTime.Now);
-                dst = di.Parent.FullName.CombinePath(dst);
-                WriteLog("压缩", "{0} => {1}".F(di.FullName, dst));
-                di.Compress(dst);
-            }
-
-            return RedirectToAction("Index", new { r = p });
-        }
-
-        /// <summary>解压缩</summary>
-        /// <param name="r"></param>
-        /// <returns></returns>
-        [EntityAuthorize(PermissionFlags.Update)]
-        public ActionResult Decompress(String r)
-        {
-            var fi = GetFile(r);
-            if (fi == null) throw new Exception("找不到文件！");
-
-            var p = GetFullName(fi.Directory.FullName);
-            WriteLog("解压缩", fi.FullName);
-            fi.Extract(fi.Directory.FullName, true);
-
-            return RedirectToAction("Index", new { r = p });
-        }
-        #endregion
-
-        #region 上传下载
-        /// <summary>上传文件</summary>
-        /// <param name="r"></param>
-        /// <param name="file"></param>
-        /// <returns></returns>
-        [EntityAuthorize(PermissionFlags.Insert)]
-        public ActionResult Upload(String r, HttpPostedFileBase file)
-        {
-            if (file != null)
-            {
-                var di = GetDirectory(r);
-                if (di == null) throw new Exception("找不到目录！");
-
-                var dest = di.FullName.CombinePath(file.FileName);
-                WriteLog("上传", dest);
-                file.SaveAs(dest);
-            }
-
-            return RedirectToAction("Index", new { r });
-        }
-
-        /// <summary>下载文件</summary>
-        /// <param name="r"></param>
-        /// <returns></returns>
-        [EntityAuthorize(PermissionFlags.Detail)]
-        public ActionResult Download(String r)
-        {
-            var fi = GetFile(r);
-            if (fi == null) throw new Exception("找不到文件！");
-
-            WriteLog("下载", fi.FullName);
-
-            return File(fi.FullName, "application/octet-stream", fi.Name);
-        }
-        #endregion
-
-        #region 复制粘贴
-        private const String CLIPKEY = "File_Clipboard";
-        private List<FileItem> GetClip()
-        {
-            var list = Session[CLIPKEY] as List<FileItem>;
-            if (list == null) Session[CLIPKEY] = list = new List<FileItem>();
-
-            return list;
-        }
-
-        /// <summary>复制文件到剪切板</summary>
-        /// <param name="r"></param>
-        /// <param name="f"></param>
-        /// <returns></returns>
-        [EntityAuthorize(PermissionFlags.Detail)]
-        public ActionResult Copy(String r, String f)
-        {
-            var fi = GetItme(f);
-            if (fi == null) throw new Exception("找不到文件或目录！");
-
-            var list = GetClip();
-            if (!list.Any(e => e.Raw == fi.Raw)) list.Add(fi);
-
-            //return RedirectToAction("Index", new { r });
-            return Index(r, null);
-        }
-
-        /// <summary>从剪切板移除</summary>
-        /// <param name="r"></param>
-        /// <param name="f"></param>
-        /// <returns></returns>
-        [EntityAuthorize(PermissionFlags.Detail)]
-        public ActionResult CancelCopy(String r, String f)
-        {
-            var fi = GetItme(f);
-            if (fi == null) throw new Exception("找不到文件或目录！");
-
-            var list = GetClip();
-            list.RemoveAll(e => e.Raw == fi.Raw);
-
-            //return RedirectToAction("Index", new { r });
-            return Index(r, null);
-        }
-
-        /// <summary>粘贴文件到当前目录</summary>
-        /// <param name="r"></param>
-        /// <returns></returns>
-        [EntityAuthorize(PermissionFlags.Insert)]
-        public ActionResult Paste(String r)
-        {
-            var di = GetDirectory(r) ?? Root.AsDirectory();
-            if (di == null) throw new Exception("找不到目录！");
-
-            var list = GetClip();
-            foreach (var item in list)
-            {
-                var dst = di.FullName.CombinePath(item.Name);
-                WriteLog("复制", "{0} => {1}".F(item.Raw, dst));
-                if (item.Directory)
-                    item.Raw.AsDirectory().CopyTo(dst);
-                else
-                    System.IO.File.Copy(item.Raw, dst, true);
-            }
-            list.Clear();
-
-            return Index(r, null);
-        }
-
-        /// <summary>移动文件到当前目录</summary>
-        /// <param name="r"></param>
-        /// <returns></returns>
-        [EntityAuthorize(PermissionFlags.Insert)]
-        public ActionResult Move(String r)
-        {
-            var di = GetDirectory(r) ?? Root.AsDirectory();
-            if (di == null) throw new Exception("找不到目录！");
-
-            var list = GetClip();
-            foreach (var item in list)
-            {
-                var dst = di.FullName.CombinePath(item.Name);
-                WriteLog("移动", "{0} => {1}".F(item.Raw, dst));
-                if (item.Directory)
-                    Directory.Move(item.Raw, dst);
-                else
-                    System.IO.File.Move(item.Raw, dst);
-            }
-            list.Clear();
-
-            return Index(r, null);
-        }
-
-        /// <summary>清空剪切板</summary>
-        /// <returns></returns>
-        [EntityAuthorize(PermissionFlags.Detail)]
-        public ActionResult ClearClipboard(String r)
-        {
-            var list = GetClip();
-            list.Clear();
-
-            return Index(r, null);
-        }
-        #endregion
-
-        #region 日志
-        private static void WriteLog(String action, String remark)
-        {
-            LogProvider.Provider.WriteLog(typeof(FileController), action, remark);
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Controllers/LogController.cs b/NewLife.Cube/Areas/Admin/Controllers/LogController.cs
deleted file mode 100644
index 35203f66f1..0000000000
--- a/NewLife.Cube/Areas/Admin/Controllers/LogController.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Web.Mvc;
-using NewLife.Common;
-using NewLife.Web;
-using XCode.Membership;
-using XLog = XCode.Membership.Log;
-
-namespace NewLife.Cube.Admin.Controllers
-{
-    /// <summary>日志控制器</summary>
-    [DisplayName("日志")]
-    [Description("系统内重要操作均记录日志，便于审计。任何人都不能删除、修改或伪造操作日志。")]
-    public class LogController : EntityController<XLog>
-    {
-        static LogController()
-        {
-            MenuOrder = 70;
-
-            // 日志列表需要显示详细信息，不需要显示用户编号
-            ListFields.AddField("Action", "Remark");
-            ListFields.RemoveField("CreateUserID");
-            FormFields.RemoveField("Remark");
-        }
-
-        /// <summary>搜索数据集</summary>
-        /// <param name="p"></param>
-        /// <returns></returns>
-        protected override IEnumerable<XLog> Search(Pager p)
-        {
-            return XLog.Search(p["Q"], p["userid"].ToInt(-1), p["category"], p["dtStart"].ToDateTime(), p["dtEnd"].ToDateTime(), p);
-        }
-
-        /// <summary>不允许添加修改日志</summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        [DisplayName()]
-        public override ActionResult Add(XLog entity)
-        {
-            //return base.Save(entity);
-            throw new Exception("不允许添加/修改日志");
-        }
-
-        /// <summary>不允许添加修改日志</summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        [DisplayName()]
-        public override ActionResult Edit(XLog entity)
-        {
-            //return base.Save(entity);
-            throw new Exception("不允许添加/修改日志");
-        }
-
-        /// <summary>不允许删除日志</summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        [DisplayName()]
-        public override ActionResult Delete(Int32 id)
-        {
-            //return base.Delete(id);
-            throw new Exception("不允许删除日志");
-        }
-
-        ///// <summary>不允许删除日志</summary>
-        ///// <param name="id"></param>
-        ///// <returns></returns>
-        //[DisplayName()]
-        //public override JsonResult DeleteAjax(Int32 id)
-        //{
-        //    var url = Request.UrlReferrer + "";
-
-        //    return Json(new { msg = "不允许删除日志！", code = -1, url = url }, JsonRequestBehavior.AllowGet);
-        //}
-
-        /// <summary>清空全表数据</summary>
-        /// <returns></returns>
-        [EntityAuthorize(PermissionFlags.Delete)]
-        [DisplayName("清空")]
-        public override ActionResult Clear()
-        {
-            if (!SysConfig.Current.Develop || !Setting.Current.Debug || ManageProvider.User?.Role?.Name != "管理员") throw new Exception("不允许删除日志");
-
-            return base.Clear();
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Controllers/MenuController.cs b/NewLife.Cube/Areas/Admin/Controllers/MenuController.cs
deleted file mode 100644
index 6b124fc828..0000000000
--- a/NewLife.Cube/Areas/Admin/Controllers/MenuController.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-﻿using System.ComponentModel;
-using XCode.Membership;
-
-namespace NewLife.Cube.Admin.Controllers
-{
-    /// <summary>菜单控制器</summary>
-    [DisplayName("菜单")]
-    [Description("系统操作菜单以及功能目录树。支持排序，不可见菜单仅用于功能权限限制。每个菜单的权限子项由系统自动生成，请不要人为修改")]
-    public class MenuController : EntityTreeController<Menu>
-    {
-        static MenuController()
-        {
-            MenuOrder = 80;
-
-            // 过滤要显示的字段
-            ListFields.RemoveField("Remark");
-            FormFields.RemoveField("Remark");
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Controllers/RoleController.cs b/NewLife.Cube/Areas/Admin/Controllers/RoleController.cs
deleted file mode 100644
index 50e74aafb0..0000000000
--- a/NewLife.Cube/Areas/Admin/Controllers/RoleController.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Web.Mvc;
-using NewLife.Web;
-using XCode;
-using XCode.Membership;
-
-namespace NewLife.Cube.Admin.Controllers
-{
-    /// <summary>角色控制器</summary>
-    [DisplayName("角色")]
-    [Description("系统基于角色授权，每个角色对不同的功能模块具备添删改查以及自定义权限等多种权限设定。")]
-    public class RoleController : EntityController<Role>
-    {
-        static RoleController()
-        {
-            MenuOrder = 90;
-
-            FormFields.RemoveField("Remark");
-        }
-
-        /// <summary>动作执行前</summary>
-        /// <param name="filterContext"></param>
-        protected override void OnActionExecuting(ActionExecutingContext filterContext)
-        {
-            ViewBag.HeaderTitle = "角色管理";
-            //ViewBag.HeaderContent = "系统基于角色授权，每个角色对不同的功能模块具备添删改查以及自定义权限等多种权限设定。";
-
-            var bs = this.Bootstrap();
-            bs.MaxColumn = 1;
-
-            base.OnActionExecuting(filterContext);
-        }
-
-        /// <summary>搜索数据集</summary>
-        /// <param name="p"></param>
-        /// <returns></returns>
-        protected override IEnumerable<Role> Search(Pager p)
-        {
-            var id = p["id"].ToInt(-1);
-            if (id > 0)
-            {
-                var list = new List<Role>();
-                var entity = Role.FindByID(id);
-                if (entity != null) list.Add(entity);
-                return list;
-            }
-
-            return Role.Search(p["dtStart"].ToDateTime(), p["dtEnd"].ToDateTime(), p["Q"], p);
-        }
-
-        /// <summary>保存</summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        public override ActionResult Edit(Role entity)
-        {
-            // 保存权限项
-            var menus = Menu.Root.AllChilds;
-            //var pfs = EnumHelper.GetDescriptions<PermissionFlags>().Where(e => e.Key > PermissionFlags.None);
-            var dels = new List<Int32>();
-            // 遍历所有权限资源
-            foreach (var item in menus)
-            {
-                // 是否授权该项
-                var has = GetBool("p" + item.ID);
-                if (!has)
-                    dels.Add(item.ID);
-                else
-                {
-                    // 遍历所有权限子项
-                    var any = false;
-                    foreach (var pf in item.Permissions)
-                    {
-                        var has2 = GetBool("pf" + item.ID + "_" + pf.Key);
-
-                        if (has2)
-                            entity.Set(item.ID, (PermissionFlags)pf.Key);
-                        else
-                            entity.Reset(item.ID, (PermissionFlags)pf.Key);
-                        any |= has2;
-                    }
-                    // 如果原来没有权限，这是首次授权，且右边没有勾选任何子项，则授权全部
-                    if (!any & !entity.Has(item.ID)) entity.Set(item.ID);
-                }
-            }
-            // 删除已经被放弃权限的项
-            foreach (var item in dels)
-            {
-                if (entity.Has(item)) entity.Permissions.Remove(item);
-            }
-
-            return base.Edit(entity);
-        }
-
-        /// <summary>打印</summary>
-        /// <returns></returns>
-        [DisplayName("打印")]
-        [EntityAuthorize((PermissionFlags)16)]
-        public ActionResult Print()
-        {
-            return View();
-        }
-
-        Boolean GetBool(String name)
-        {
-            var v = Request[name];
-            if (v.IsNullOrEmpty()) return false;
-
-            v = v.Split(",")[0];
-
-            if (!v.EqualIgnoreCase("true", "false")) throw new XException("非法布尔值Request[{0}]={1}", name, v);
-
-            return v.ToBoolean();
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Controllers/SysController.cs b/NewLife.Cube/Areas/Admin/Controllers/SysController.cs
deleted file mode 100644
index 9fd8dbf8be..0000000000
--- a/NewLife.Cube/Areas/Admin/Controllers/SysController.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Reflection;
-using NewLife.Common;
-using XCode;
-using XCode.Membership;
-
-namespace NewLife.Cube.Admin.Controllers
-{
-    /// <summary>系统设置控制器</summary>
-    [DisplayName("系统设置")]
-    public class SysController : ConfigController<SysConfig>
-    {
-        static SysController()
-        {
-            MenuOrder = 38;
-        }
-
-        /// <summary>菜单不可见</summary>
-        /// <param name="menu"></param>
-        /// <returns></returns>
-        protected override IDictionary<MethodInfo, Int32> ScanActionMenu(IMenu menu)
-        {
-            if (menu.Visible)
-            {
-                menu.Visible = false;
-                (menu as IEntity).Save();
-            }
-
-            return base.ScanActionMenu(menu);
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Controllers/UserConnectController.cs b/NewLife.Cube/Areas/Admin/Controllers/UserConnectController.cs
deleted file mode 100644
index e300e1e88c..0000000000
--- a/NewLife.Cube/Areas/Admin/Controllers/UserConnectController.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Reflection;
-using NewLife.Cube.Entity;
-using XCode;
-using XCode.Membership;
-
-namespace NewLife.Cube.Admin.Controllers
-{
-    /// <summary>用户链接控制器</summary>
-    [DisplayName("用户链接")]
-    [Description("第三方登录信息")]
-    public class UserConnectController : EntityController<UserConnect>
-    {
-        static UserConnectController()
-        {
-            MenuOrder = 40;
-
-            ListFields.RemoveField("AccessToken");
-            ListFields.RemoveField("RefreshToken");
-            ListFields.RemoveField("Avatar");
-        }
-
-        /// <summary>菜单不可见</summary>
-        /// <param name="menu"></param>
-        /// <returns></returns>
-        protected override IDictionary<MethodInfo, Int32> ScanActionMenu(IMenu menu)
-        {
-            if (menu.Visible)
-            {
-                menu.Visible = false;
-                (menu as IEntity).Save();
-            }
-
-            return base.ScanActionMenu(menu);
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Controllers/UserController.cs b/NewLife.Cube/Areas/Admin/Controllers/UserController.cs
deleted file mode 100644
index 6bddbe6152..0000000000
--- a/NewLife.Cube/Areas/Admin/Controllers/UserController.cs
+++ /dev/null
@@ -1,307 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Web.Mvc;
-using System.Web.Security;
-using NewLife.Cube.Entity;
-using NewLife.Web;
-using XCode;
-using XCode.Membership;
-
-namespace NewLife.Cube.Admin.Controllers
-{
-    /// <summary>用户控制器</summary>
-    [DisplayName("用户")]
-    [Description("系统基于角色授权，每个角色对不同的功能模块具备添删改查以及自定义权限等多种权限设定。")]
-    public class UserController : EntityController<UserX>
-    {
-        static UserController()
-        {
-            MenuOrder = 100;
-
-            ListFields.RemoveField("Phone");
-            ListFields.RemoveField("Code");
-            ListFields.RemoveField("StartTime");
-            ListFields.RemoveField("EndTime");
-            ListFields.RemoveField("RegisterTime");
-            ListFields.RemoveField("Question");
-            ListFields.RemoveField("Answer");
-        }
-
-        /// <summary>搜索数据集</summary>
-        /// <param name="p"></param>
-        /// <returns></returns>
-        protected override IEnumerable<UserX> Search(Pager p)
-        {
-            var id = p["id"].ToInt(-1);
-            if (id > 0)
-            {
-                var list = new List<UserX>();
-                var entity = UserX.FindByID(id);
-                if (entity != null) list.Add(entity);
-                return list;
-            }
-
-            return UserX.Search(p["Q"], p["RoleID"].ToInt(-1), null, p["dtStart"].ToDateTime(), p["dtEnd"].ToDateTime(), p);
-        }
-
-        /// <summary>表单页视图。</summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        protected override ActionResult FormView(UserX entity)
-        {
-            // 清空密码，不向浏览器输出
-            //entity.Password = null;
-            entity["Password"] = null;
-
-            return base.FormView(entity);
-        }
-
-        #region 登录注销
-        /// <summary>登录</summary>
-        /// <returns></returns>
-        [AllowAnonymous]
-        public ActionResult Login()
-        {
-            var returnUrl = Request["r"];
-            // 如果已登录，直接跳转
-            if (ManageProvider.User != null)
-            {
-                if (Url.IsLocalUrl(returnUrl))
-                    return Redirect(returnUrl);
-                else
-                    return RedirectToAction("Index", "Index", new { page = returnUrl });
-            }
-
-            // 如果禁用本地登录，且只有一个第三方登录，直接跳转，构成单点登录
-            if (!Setting.Current.AllowLogin)
-            {
-                var ms = OAuthConfig.Current.Items.Where(e => !e.AppID.IsNullOrEmpty()).ToList();
-                if (ms.Count == 0) throw new Exception("禁用了本地密码登录，且没有配置第三方登录");
-
-                // 只有一个，跳转
-                if (ms.Count == 1)
-                {
-                    //var url = $"~/Sso/Login?name={ms[0].Name}";
-                    //if (!returnUrl.IsNullOrEmpty()) url += "&r=" + HttpUtility.UrlEncode(returnUrl);
-
-                    //return Redirect(url);
-
-                    return RedirectToAction("Login", "Sso", new { area = "", name = ms[0].Name, r = returnUrl });
-                }
-            }
-
-            ViewBag.ReturnUrl = returnUrl;
-
-            return View();
-        }
-
-        /// <summary>登录</summary>
-        /// <param name="username"></param>
-        /// <param name="password"></param>
-        /// <param name="remember"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [AllowAnonymous]
-        public ActionResult Login(String username, String password, Boolean? remember)
-        {
-            var returnUrl = Request["r"];
-            try
-            {
-                var provider = ManageProvider.Provider;
-                if (ModelState.IsValid && provider.Login(username, password, remember ?? false) != null)
-                {
-                    FormsAuthentication.SetAuthCookie(username, remember ?? false);
-                    //FormsAuthentication.RedirectFromLoginPage(provider.Current + "", true);
-
-                    if (Url.IsLocalUrl(returnUrl)) return Redirect(returnUrl);
-
-                    // 不要嵌入自己
-                    if (returnUrl.EndsWithIgnoreCase("/Admin", "/Admin/User/Login")) returnUrl = null;
-
-                    return RedirectToAction("Index", "Index", new { page = returnUrl });
-                }
-
-                // 如果我们进行到这一步时某个地方出错，则重新显示表单
-                ModelState.AddModelError("username", "提供的用户名或密码不正确。");
-            }
-            catch (Exception ex)
-            {
-                ModelState.AddModelError("", ex.Message);
-            }
-
-            return View();
-        }
-
-        /// <summary>注销</summary>
-        /// <returns></returns>
-        [AllowAnonymous]
-        public ActionResult Logout()
-        {
-            var returnUrl = Request["r"];
-
-            // 如果是单点登录，则走单点登录注销
-            var name = Session["Cube_Sso"] + "";
-            if (!name.IsNullOrEmpty()) return RedirectToAction("Logout", "Sso", new { area = "", name, r = returnUrl });
-
-            ManageProvider.Provider.Logout();
-
-            if (!returnUrl.IsNullOrEmpty()) return Redirect(returnUrl);
-
-            return RedirectToAction(nameof(Login));
-        }
-        #endregion
-
-        /// <summary>用户资料</summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        [AllowAnonymous]
-        public ActionResult Info(Int32? id)
-        {
-            if (id == null || id.Value <= 0) throw new Exception("无效用户编号！");
-
-            var user = ManageProvider.User;
-            if (user == null) return RedirectToAction("Login");
-
-            if (id.Value != user.ID) throw new Exception("禁止修改非当前登录用户资料");
-
-            user = UserX.FindByKeyForEdit(id.Value);
-            if (user == null) throw new Exception("无效用户编号！");
-
-            //user.Password = null;
-            user["Password"] = null;
-
-            // 用于显示的列
-            if (ViewBag.Fields == null) ViewBag.Fields = GetFields(true);
-            ViewBag.Factory = UserX.Meta.Factory;
-
-            // 第三方绑定
-            var ucs = UserConnect.FindAllByUserID(user.ID);
-            ViewBag.Binds = ucs;
-
-            return View(user);
-        }
-
-        /// <summary>用户资料</summary>
-        /// <param name="user"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [AllowAnonymous]
-        public ActionResult Info(UserX user)
-        {
-            var cur = ManageProvider.User;
-            if (cur == null) return RedirectToAction("Login");
-
-            if (user.ID != cur.ID) throw new Exception("禁止修改非当前登录用户资料");
-
-            var entity = user as IEntity;
-            if (entity.Dirtys["RoleID"]) throw new Exception("禁止修改角色！");
-            if (entity.Dirtys["Enable"]) throw new Exception("禁止修改禁用！");
-
-            user.Update();
-
-            return Info(user.ID);
-        }
-
-        /// <summary>注册</summary>
-        /// <param name="email"></param>
-        /// <param name="username"></param>
-        /// <param name="password"></param>
-        /// <param name="password2"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [AllowAnonymous]
-        public ActionResult Register(String email, String username, String password, String password2)
-        {
-            var set = Setting.Current;
-            if (!set.AllowRegister) throw new Exception("禁止注册！");
-
-            try
-            {
-                if (String.IsNullOrEmpty(email)) throw new ArgumentNullException("email", "邮箱地址不能为空！");
-                if (String.IsNullOrEmpty(username)) throw new ArgumentNullException("username", "用户名不能为空！");
-                if (String.IsNullOrEmpty(password)) throw new ArgumentNullException("password", "密码不能为空！");
-                if (String.IsNullOrEmpty(password2)) throw new ArgumentNullException("password2", "重复密码不能为空！");
-                if (password != password2) throw new ArgumentOutOfRangeException("password2", "两次密码必须一致！");
-
-                var user = new UserX()
-                {
-                    Name = username,
-                    Password = password.MD5(),
-                    Mail = email,
-                    RoleID = set.DefaultRole,
-                    Enable = true
-                };
-                user.Register();
-
-                // 注册成功
-            }
-            catch (ArgumentException aex)
-            {
-                ModelState.AddModelError(aex.ParamName, aex.Message);
-            }
-
-            return View("Login");
-        }
-
-        /// <summary>清空密码</summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        [EntityAuthorize(PermissionFlags.Update)]
-        public ActionResult ClearPassword(Int32 id)
-        {
-            if (ManageProvider.User.RoleName != "管理员") throw new Exception("清除密码操作需要管理员权限，非法操作！");
-
-            // 前面表单可能已经清空密码
-            var user = UserX.FindByID(id);
-            //user.Password = "nopass";
-            user.Password = null;
-            user.SaveWithoutValid();
-
-            return RedirectToAction("Edit", new { id });
-        }
-
-        /// <summary>批量启用</summary>
-        /// <param name="keys"></param>
-        /// <returns></returns>
-        [EntityAuthorize(PermissionFlags.Update)]
-        public ActionResult EnableSelect(String keys)
-        {
-            return EnableOrDisableSelect();
-        }
-
-        /// <summary>批量禁用</summary>
-        /// <param name="keys"></param>
-        /// <returns></returns>
-        [EntityAuthorize(PermissionFlags.Update)]
-        public ActionResult DisableSelect(String keys)
-        {
-            return EnableOrDisableSelect(false);
-        }
-
-        private ActionResult EnableOrDisableSelect(Boolean isEnable = true)
-        {
-            var count = 0;
-            var ids = Request["keys"].SplitAsInt();
-            if (ids.Length > 0)
-            {
-                Parallel.ForEach(ids, id =>
-                {
-                    var user = UserX.FindByID(id);
-                    if (user != null && user.Enable != isEnable)
-                    {
-                        user.Enable = isEnable;
-                        user.Save();
-
-                        Interlocked.Increment(ref count);
-                    }
-                });
-            }
-
-            return JsonRefresh("共{1}[{0}]个用户".F(count, isEnable ? "启用" : "禁用"));
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Controllers/UserOnlineController.cs b/NewLife.Cube/Areas/Admin/Controllers/UserOnlineController.cs
deleted file mode 100644
index 3e26293c11..0000000000
--- a/NewLife.Cube/Areas/Admin/Controllers/UserOnlineController.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Reflection;
-using System.Web.Mvc;
-using XCode;
-using XCode.Membership;
-
-namespace NewLife.Cube.Admin.Controllers
-{
-    /// <summary>用户在线控制器</summary>
-    [DisplayName("用户在线")]
-    [Description("已登录系统的用户，操作情况。")]
-    public class UserOnlineController : EntityController<UserOnline>
-    {
-        static UserOnlineController()
-        {
-            MenuOrder = 60;
-        }
-
-        /// <summary>不允许添加修改日志</summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        [DisplayName()]
-        public override ActionResult Add(UserOnline entity)
-        {
-            //return base.Save(entity);
-            throw new Exception("不允许添加/修改记录");
-        }
-
-        /// <summary>菜单不可见</summary>
-        /// <param name="menu"></param>
-        /// <returns></returns>
-        protected override IDictionary<MethodInfo, Int32> ScanActionMenu(IMenu menu)
-        {
-            if (menu.Visible)
-            {
-                menu.Visible = false;
-                (menu as IEntity).Save();
-            }
-
-            return base.ScanActionMenu(menu);
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Controllers/UserTokenController.cs b/NewLife.Cube/Areas/Admin/Controllers/UserTokenController.cs
deleted file mode 100644
index 30b6f7222a..0000000000
--- a/NewLife.Cube/Areas/Admin/Controllers/UserTokenController.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Reflection;
-using NewLife.Cube.Entity;
-using NewLife.Web;
-using XCode;
-using XCode.Membership;
-
-namespace NewLife.Cube.Admin.Controllers
-{
-    /// <summary>用户令牌控制器</summary>
-    [DisplayName("用户令牌")]
-    [Description("授权其他人直接拥有指定用户的身份，支持有效期，支持数据接口")]
-    public class UserTokenController : EntityController<UserToken>
-    {
-        static UserTokenController()
-        {
-            MenuOrder = 40;
-
-            FormFields.RemoveField("UserID");
-        }
-
-        /// <summary>搜索数据集</summary>
-        /// <param name="p"></param>
-        /// <returns></returns>
-        protected override IEnumerable<UserToken> Search(Pager p)
-        {
-            var token = p["Q"];
-            var userid = p["UserID"].ToInt(-1);
-
-            // 强制当前用户
-            if (userid < 0)
-            {
-                var user = ManageProvider.User;
-                if (!user.Roles.Any(e => e.IsSystem)) userid = user.ID;
-            }
-
-            return UserToken.Search(token, userid, null, p["dtStart"].ToDateTime(), p["dtEnd"].ToDateTime(), p);
-        }
-
-        /// <summary>验证权限</summary>
-        /// <param name="entity">实体对象</param>
-        /// <param name="type">操作类型</param>
-        /// <param name="post">是否提交数据阶段</param>
-        /// <returns></returns>
-        protected override Boolean ValidPermission(UserToken entity, DataObjectMethodType type, Boolean post)
-        {
-            var user = ManageProvider.Provider?.Current;
-
-            // 系统角色拥有特权
-            if (user is UserX user2 && user2.Roles.Any(e => e.IsSystem)) return true;
-
-            // 特殊处理添加操作
-            if (type == DataObjectMethodType.Insert && entity.UserID <= 0)
-            {
-                entity.UserID = user.ID;
-            }
-
-            return entity.UserID == user.ID;
-        }
-
-        /// <summary>菜单不可见</summary>
-        /// <param name="menu"></param>
-        /// <returns></returns>
-        protected override IDictionary<MethodInfo, Int32> ScanActionMenu(IMenu menu)
-        {
-            if (menu.Visible)
-            {
-                menu.Visible = false;
-                (menu as IEntity).Save();
-            }
-
-            return base.ScanActionMenu(menu);
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Controllers/VisitStatController.cs b/NewLife.Cube/Areas/Admin/Controllers/VisitStatController.cs
deleted file mode 100644
index 964df58b33..0000000000
--- a/NewLife.Cube/Areas/Admin/Controllers/VisitStatController.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Reflection;
-using System.Web.Mvc;
-using NewLife.Common;
-using NewLife.Web;
-using XCode;
-using XCode.Membership;
-using XCode.Statistics;
-
-namespace NewLife.Cube.Admin.Controllers
-{
-    /// <summary>访问统计控制器</summary>
-    [DisplayName("访问统计")]
-    [Description("每个页面每天的访问统计信息")]
-    public class VisitStatController : EntityController<VisitStat>
-    {
-        static VisitStatController()
-        {
-            MenuOrder = 50;
-        }
-
-        /// <summary>搜索数据集</summary>
-        /// <param name="p"></param>
-        /// <returns></returns>
-        protected override IEnumerable<VisitStat> Search(Pager p)
-        {
-            var model = new VisitStatModel();
-            model.Fill(p.Params, StatLevels.Day);
-            model.Page = p["p"];
-
-            return VisitStat.Search(model, p["dtStart"].ToDateTime(), p["dtEnd"].ToDateTime(), p);
-        }
-
-        /// <summary>不允许添加修改</summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        [DisplayName()]
-        public override ActionResult Add(VisitStat entity)
-        {
-            //return base.Save(entity);
-            throw new Exception("不允许添加/修改");
-        }
-
-        /// <summary>不允许添加修改</summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        [DisplayName()]
-        public override ActionResult Edit(VisitStat entity)
-        {
-            //return base.Save(entity);
-            throw new Exception("不允许添加/修改");
-        }
-
-        /// <summary>不允许删除</summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        [DisplayName()]
-        public override ActionResult Delete(Int32 id)
-        {
-            //return base.Delete(id);
-            throw new Exception("不允许删除");
-        }
-
-        ///// <summary>不允许删除</summary>
-        ///// <param name="id"></param>
-        ///// <returns></returns>
-        //[DisplayName()]
-        //public override JsonResult DeleteAjax(Int32 id)
-        //{
-        //    var url = Request.UrlReferrer + "";
-
-        //    return Json(new { msg = "不允许删除！", code = -1, url = url }, JsonRequestBehavior.AllowGet);
-        //}
-
-        /// <summary>清空全表数据</summary>
-        /// <returns></returns>
-        [EntityAuthorize(PermissionFlags.Delete)]
-        [DisplayName("清空")]
-        public override ActionResult Clear()
-        {
-            if (!SysConfig.Current.Develop || !Setting.Current.Debug || ManageProvider.User?.Role?.Name != "管理员") throw new Exception("不允许删除");
-
-            return base.Clear();
-        }
-
-        /// <summary>菜单不可见</summary>
-        /// <param name="menu"></param>
-        /// <returns></returns>
-        protected override IDictionary<MethodInfo, Int32> ScanActionMenu(IMenu menu)
-        {
-            if (menu.Visible)
-            {
-                menu.Visible = false;
-                (menu as IEntity).Save();
-            }
-
-            return base.ScanActionMenu(menu);
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Controllers/XCodeController.cs b/NewLife.Cube/Areas/Admin/Controllers/XCodeController.cs
deleted file mode 100644
index e8bee608d4..0000000000
--- a/NewLife.Cube/Areas/Admin/Controllers/XCodeController.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Reflection;
-using XCode;
-using XCode.Membership;
-
-namespace NewLife.Cube.Admin.Controllers
-{
-    /// <summary>设置控制器</summary>
-    [DisplayName("数据中间件")]
-    public class XCodeController : ConfigController<XCode.Setting>
-    {
-        static XCodeController()
-        {
-            MenuOrder = 36;
-        }
-
-        /// <summary>菜单不可见</summary>
-        /// <param name="menu"></param>
-        /// <returns></returns>
-        protected override IDictionary<MethodInfo, Int32> ScanActionMenu(IMenu menu)
-        {
-            if (menu.Visible)
-            {
-                menu.Visible = false;
-                (menu as IEntity).Save();
-            }
-
-            return base.ScanActionMenu(menu);
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Index/IndexController.cs b/NewLife.Cube/Areas/Admin/Index/IndexController.cs
deleted file mode 100644
index 8719c0da4d..0000000000
--- a/NewLife.Cube/Areas/Admin/Index/IndexController.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-﻿using System;
-using System.Linq;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Reflection;
-using System.Web;
-using System.Web.Mvc;
-using NewLife.Common;
-using NewLife.Reflection;
-using XCode.Membership;
-using XCode;
-using System.Web.Hosting;
-using System.IO;
-
-namespace NewLife.Cube.Admin.Controllers
-{
-    /// <summary>首页</summary>
-    [DisplayName("首页")]
-    public class IndexController : ControllerBaseX
-    {
-        /// <summary>菜单顺序。扫描是会反射读取</summary>
-        protected static Int32 MenuOrder { get; set; }
-
-        static IndexController()
-        {
-            MenuOrder = 10;
-        }
-
-        /// <summary>首页</summary>
-        /// <returns></returns>
-        //[EntityAuthorize(PermissionFlags.Detail)]
-        [AllowAnonymous]
-        public ActionResult Index()
-        {
-            var user = ManageProvider.Provider.TryLogin();
-            if (user == null) return RedirectToAction("Login", "User", new { r = Request.Url.PathAndQuery });
-
-            ViewBag.User = ManageProvider.User;
-            ViewBag.Config = SysConfig.Current;
-
-            // 工作台页面
-            var startPage = Request["page"];
-            if (startPage.IsNullOrEmpty()) startPage = Setting.Current.StartPage;
-
-            ViewBag.Main = startPage;
-
-            return View();
-        }
-
-        /// <summary>服务器信息</summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        [DisplayName("服务器信息")]
-        [EntityAuthorize(PermissionFlags.Detail)]
-        public ActionResult Main(String id)
-        {
-            //if (id == "Restart")
-            //{
-            //    HttpRuntime.UnloadAppDomain();
-            //    id = null;
-            //}
-
-            ViewBag.Act = id;
-            //ViewBag.User = ManageProvider.User;
-            ViewBag.Config = SysConfig.Current;
-
-            var name = Request.ServerVariables["Server_SoftWare"];
-            if (String.IsNullOrEmpty(name)) name = Process.GetCurrentProcess().ProcessName;
-
-            // 检测集成管道，低版本.Net不支持，请使用者根据情况自行注释
-            try
-            {
-                if (HttpRuntime.UsingIntegratedPipeline) name += " [集成管道]";
-            }
-            catch { }
-
-            ViewBag.WebServerName = name;
-            ViewBag.MyAsms = AssemblyX.GetMyAssemblies().OrderBy(e => e.Name).OrderByDescending(e => e.Compile).ToArray();
-
-            var Asms = AssemblyX.GetAssemblies(null).ToArray();
-            Asms = Asms.OrderBy(e => e.Name).OrderByDescending(e => e.Compile).ToArray();
-            ViewBag.Asms = Asms;
-
-            //return View();
-            switch ((id + "").ToLower())
-            {
-                case "processmodules": return View("ProcessModules");
-                case "assembly": return View("Assembly");
-                case "session": return View("Session");
-                case "cache": return View("Cache");
-                case "servervar": return View("ServerVar");
-                default: return View();
-            }
-        }
-
-        /// <summary>重启</summary>
-        /// <returns></returns>
-        [DisplayName("重启")]
-        [EntityAuthorize((PermissionFlags)16)]
-        public ActionResult Restart()
-        {
-            //System.Web.HttpContext.Current.User = null;
-            //try
-            //{
-            //    Process.GetCurrentProcess().Kill();
-            //}
-            //catch { }
-            //try
-            {
-                //AppDomain.Unload(AppDomain.CurrentDomain);
-                //HttpContext.User = null;
-                //HttpRuntime.UnloadAppDomain();
-                //HostingEnvironment.InitiateShutdown();
-                //ApplicationManager.GetApplicationManager().ShutdownAll();
-                // 通过修改web.config时间来重启站点，稳定可靠
-                var wc = "web.config".GetFullPath();
-                System.IO.File.SetLastWriteTime(wc, DateTime.Now);
-            }
-            //catch { }
-
-            return RedirectToAction(nameof(Main));
-        }
-
-        /// <summary>菜单不可见</summary>
-        /// <param name="menu"></param>
-        /// <returns></returns>
-        protected override IDictionary<MethodInfo, Int32> ScanActionMenu(IMenu menu)
-        {
-            if (menu.Visible)
-            {
-                menu.Visible = false;
-                (menu as IEntity).Save();
-            }
-
-            return base.ScanActionMenu(menu);
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Models/DbItem.cs b/NewLife.Cube/Areas/Admin/Models/DbItem.cs
deleted file mode 100644
index 70f13a3458..0000000000
--- a/NewLife.Cube/Areas/Admin/Models/DbItem.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using XCode.DataAccessLayer;
-
-namespace NewLife.Cube.Admin
-{
-    /// <summary>数据项</summary>
-    public class DbItem
-    {
-        /// <summary>连接名</summary>
-        public String Name { get; set; }
-
-        /// <summary>数据库类型</summary>
-        public DatabaseType Type { get; set; }
-
-        /// <summary>连接字符串</summary>
-        public String ConnStr { get; set; }
-
-        /// <summary>数据驱动版本</summary>
-        public String Version { get; set; }
-
-        /// <summary>是否动态</summary>
-        public Boolean Dynamic { get; set; }
-
-        /// <summary>备份数</summary>
-        public Int32 Backups { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Models/FileItem.cs b/NewLife.Cube/Areas/Admin/Models/FileItem.cs
deleted file mode 100644
index 4a64c5688d..0000000000
--- a/NewLife.Cube/Areas/Admin/Models/FileItem.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using XCode.DataAccessLayer;
-
-namespace NewLife.Cube.Admin
-{
-    /// <summary>文件项</summary>
-    public class FileItem
-    {
-        /// <summary>连接名</summary>
-        public String Name { get; set; }
-
-        /// <summary>全路径</summary>
-        public String FullName { get; set; }
-
-        /// <summary>原始路径</summary>
-        public String Raw { get; set; }
-
-        /// <summary>是否目录</summary>
-        public Boolean Directory { get; set; }
-
-        /// <summary>大小字符串</summary>
-        public String Size { get; set; }
-
-        /// <summary>最后写入时间</summary>
-        public DateTime LastWrite { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Views/Db/Index.cshtml b/NewLife.Cube/Areas/Admin/Views/Db/Index.cshtml
deleted file mode 100644
index a838d772b0..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/Db/Index.cshtml
+++ /dev/null
@@ -1,67 +0,0 @@
-﻿@using NewLife.Common;
-@using NewLife.Cube.Admin;
-@using XCode.DataAccessLayer;
-@{
-    Layout = NewLife.Cube.Setting.Current.Layout;
-
-    //ViewBag.Title = "服务器信息";
-    var dbs = Model as IList<DbItem>;
-}
-<table class="table table-bordered table-hover table-striped table-condensed">
-    <thead>
-        <tr>
-            <th class="text-center">名称</th>
-            <th class="text-center">类型</th>
-            <th class="text-center">连接字符串</th>
-            <th class="text-center">版本</th>
-            <th class="text-center">备份</th>
-            <th class="text-center">备份并压缩</th>
-            <th class="text-center">下载表结构</th>
-        </tr>
-    </thead>
-    <tbody>
-        @foreach (var item in dbs)
-        {
-            var dal = DAL.Create(item.Name);
-            // 密码需要保密
-            var str = item.ConnStr;
-            if (!str.IsNullOrEmpty())
-            {
-                var ss = str.Split(";");
-                for (var i = 0; i < ss.Length; i++)
-                {
-                    if (ss[i].StartsWithIgnoreCase("password=", "pass=", "pwd="))
-                    {
-                        ss[i] = ss[i].Substring(null, "=") + "={保密}";
-                        str = ss.Join(";");
-                        break;
-                    }
-                }
-            }
-            var str2 = dal.Db.ConnectionString;
-            if (!str2.IsNullOrEmpty())
-            {
-                var ss = str2.Split(";");
-                for (var i = 0; i < ss.Length; i++)
-                {
-                    if (ss[i].StartsWithIgnoreCase("password=", "pass=", "pwd="))
-                    {
-                        ss[i] = ss[i].Substring(null, "=") + "={保密}";
-                        str2 = ss.Join(";");
-                        break;
-                    }
-                }
-            }
-
-            <tr>
-                <td>@item.Name</td>
-                <td>@item.Type</td>
-                <td style="max-width:600px;overflow:hidden;white-space: nowrap;text-overflow: ellipsis;" title="@str2">@str</td>
-                <td>@item.Version</td>
-                <td>@Html.ActionLink("备份", "Backup", new { Name = item.Name })，共 @item.Backups.ToString("n0")个</td>
-                <td>@Html.ActionLink("备份并压缩", "BackupAndCompress", new { Name = item.Name })</td>
-                <td class="text-center">@Html.ActionLink("下载", "Download", new { Name = item.Name })</td>
-            </tr>
-        }
-    </tbody>
-</table>
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Views/Db/Index.generated.cs b/NewLife.Cube/Areas/Admin/Views/Db/Index.generated.cs
deleted file mode 100644
index 0b1dc12a33..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/Db/Index.generated.cs
+++ /dev/null
@@ -1,258 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    
-    #line 1 "..\..\Areas\Admin\Views\Db\Index.cshtml"
-    using NewLife.Common;
-    
-    #line default
-    #line hidden
-    using NewLife.Cube;
-    
-    #line 2 "..\..\Areas\Admin\Views\Db\Index.cshtml"
-    using NewLife.Cube.Admin;
-    
-    #line default
-    #line hidden
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    
-    #line 3 "..\..\Areas\Admin\Views\Db\Index.cshtml"
-    using XCode.DataAccessLayer;
-    
-    #line default
-    #line hidden
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Admin/Views/Db/Index.cshtml")]
-    public partial class _Areas_Admin_Views_Db_Index_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Areas_Admin_Views_Db_Index_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 4 "..\..\Areas\Admin\Views\Db\Index.cshtml"
-  
-    Layout = NewLife.Cube.Setting.Current.Layout;
-
-    //ViewBag.Title = "服务器信息";
-    var dbs = Model as IList<DbItem>;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n<table");
-
-WriteLiteral(" class=\"table table-bordered table-hover table-striped table-condensed\"");
-
-WriteLiteral(">\r\n    <thead>\r\n        <tr>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">名称</th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">类型</th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">连接字符串</th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">版本</th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">备份</th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">备份并压缩</th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">下载表结构</th>\r\n        </tr>\r\n    </thead>\r\n    <tbody>\r\n");
-
-            
-            #line 23 "..\..\Areas\Admin\Views\Db\Index.cshtml"
-        
-            
-            #line default
-            #line hidden
-            
-            #line 23 "..\..\Areas\Admin\Views\Db\Index.cshtml"
-         foreach (var item in dbs)
-        {
-            var dal = DAL.Create(item.Name);
-            // 密码需要保密
-            var str = item.ConnStr;
-            if (!str.IsNullOrEmpty())
-            {
-                var ss = str.Split(";");
-                for (var i = 0; i < ss.Length; i++)
-                {
-                    if (ss[i].StartsWithIgnoreCase("password=", "pass=", "pwd="))
-                    {
-                        ss[i] = ss[i].Substring(null, "=") + "={保密}";
-                        str = ss.Join(";");
-                        break;
-                    }
-                }
-            }
-            var str2 = dal.Db.ConnectionString;
-            if (!str2.IsNullOrEmpty())
-            {
-                var ss = str2.Split(";");
-                for (var i = 0; i < ss.Length; i++)
-                {
-                    if (ss[i].StartsWithIgnoreCase("password=", "pass=", "pwd="))
-                    {
-                        ss[i] = ss[i].Substring(null, "=") + "={保密}";
-                        str2 = ss.Join(";");
-                        break;
-                    }
-                }
-            }
-
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            <tr>\r\n                <td>");
-
-            
-            #line 57 "..\..\Areas\Admin\Views\Db\Index.cshtml"
-               Write(item.Name);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td>");
-
-            
-            #line 58 "..\..\Areas\Admin\Views\Db\Index.cshtml"
-               Write(item.Type);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td");
-
-WriteLiteral(" style=\"max-width:600px;overflow:hidden;white-space: nowrap;text-overflow: ellips" +
-"is;\"");
-
-WriteAttribute("title", Tuple.Create(" title=\"", 2048), Tuple.Create("\"", 2061)
-            
-            #line 59 "..\..\Areas\Admin\Views\Db\Index.cshtml"
-                                , Tuple.Create(Tuple.Create("", 2056), Tuple.Create<System.Object, System.Int32>(str2
-            
-            #line default
-            #line hidden
-, 2056), false)
-);
-
-WriteLiteral(">");
-
-            
-            #line 59 "..\..\Areas\Admin\Views\Db\Index.cshtml"
-                                                                                                                  Write(str);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td>");
-
-            
-            #line 60 "..\..\Areas\Admin\Views\Db\Index.cshtml"
-               Write(item.Version);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td>");
-
-            
-            #line 61 "..\..\Areas\Admin\Views\Db\Index.cshtml"
-               Write(Html.ActionLink("备份", "Backup", new { Name = item.Name }));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("，共 ");
-
-            
-            #line 61 "..\..\Areas\Admin\Views\Db\Index.cshtml"
-                                                                            Write(item.Backups.ToString("n0"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("个</td>\r\n                <td>");
-
-            
-            #line 62 "..\..\Areas\Admin\Views\Db\Index.cshtml"
-               Write(Html.ActionLink("备份并压缩", "BackupAndCompress", new { Name = item.Name }));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">");
-
-            
-            #line 63 "..\..\Areas\Admin\Views\Db\Index.cshtml"
-                                   Write(Html.ActionLink("下载", "Download", new { Name = item.Name }));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n            </tr>\r\n");
-
-            
-            #line 65 "..\..\Areas\Admin\Views\Db\Index.cshtml"
-        }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("    </tbody>\r\n</table>");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Areas/Admin/Views/File/Index.cshtml b/NewLife.Cube/Areas/Admin/Views/File/Index.cshtml
deleted file mode 100644
index e00f8e3d4a..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/File/Index.cshtml
+++ /dev/null
@@ -1,111 +0,0 @@
-﻿@using System.Diagnostics;
-@using NewLife.Common;
-@using NewLife.Cube.Admin;
-@{
-    //ViewBag.Title = "服务器信息";
-    var fs = Model as List<FileItem>;
-    var r = ViewBag.Current as String;
-    var clips = ViewBag.Clip as ICollection<FileItem>;
-}
-<div class="form-inline">
-    <form action="~/Admin/File" id="tool" method="post">
-        <div class="input-group">
-            <span class="input-group-addon">
-                <i class="ace-icon fa fa-check"></i>
-            </span>
-            <input name="r" type="search" id="r" value="@r" class="form-control" placeholder="当前路径" />
-            <span class="input-group-btn">
-                <button type="submit" class="btn btn-primary btn-sm">
-                    <span class="glyphicon glyphicon-folder-open icon-on-right bigger-110"></span>
-                    打开
-                </button>
-            </span>
-        </div>
-        <div class="input-group">
-            <span class="input-group-addon">
-                <i class="glyphicon glyphicon-file"></i>
-            </span>
-            <input name="file" type="file" id="file" placeholder="上传文件" />
-            <span class="input-group-btn">
-                <button type="submit" class="btn btn-success btn-sm" onclick="$('#tool').attr('action', '/Admin/File/Upload');$('#tool').attr('enctype', 'multipart/form-data'); return true;">
-                    <span class="glyphicon glyphicon-plus icon-on-right bigger-110"></span>
-                    上传
-                </button>
-            </span>
-        </div>
-        @if (clips.Count > 0)
-        {
-            <div class="input-group">
-                <span class="input-group-addon">
-                    <i class="glyphicon glyphicon-floppy-disk" title="剪切板共有 @clips.Count 项">@clips.Count</i>
-                </span>
-                <span class="input-group-btn">
-                    <button type="button" class="btn btn-pink btn-sm" onclick="location.href = '/Admin/File/Paste?r=@r';">
-                        <span class="glyphicon glyphicon-floppy-save icon-on-right bigger-110"></span>
-                        粘贴
-                    </button>
-                </span>
-                <span class="input-group-btn">
-                    <button type="button" class="btn btn-gray btn-sm" onclick="location.href = '/Admin/File/Move?r=@r';">
-                        <span class="glyphicon glyphicon-floppy-save icon-on-right bigger-110"></span>
-                        移动
-                    </button>
-                </span>
-                <span class="input-group-btn">
-                    <button type="button" class="btn btn-yellow btn-sm" onclick="location.href = '/Admin/File/ClearClipboard?r=@r';">
-                        <span class="glyphicon glyphicon-retweet icon-on-right bigger-110"></span>
-                        清空
-                    </button>
-                </span>
-            </div>
-        }
-    </form>
-</div>
-<table class="table table-bordered table-hover table-striped table-condensed">
-    <thead>
-        <tr>
-            <th class="text-center"><a href="~/Admin/File?r=@r&sort=name">名称</a></th>
-            <th class="text-center"><a href="~/Admin/File?r=@r&sort=size">大小</a></th>
-            <th class="text-center"><a href="~/Admin/File?r=@r&sort=lastwrite">修改时间</a></th>
-            <th class="text-center">复制</th>
-            <th class="text-center">压缩</th>
-            <th class="text-center">删除</th>
-        </tr>
-    </thead>
-    <tbody>
-        @foreach (var item in fs)
-        {
-            <tr>
-                @if (item.Directory)
-                {
-                    <td>&nbsp;&nbsp;<a href="~/Admin/File?r=@item.FullName" title="进入目录">@item.Name</a></td>
-                }
-                else
-                {
-                    <td>&nbsp;&nbsp;<a href="~/Admin/File/Download?r=@item.FullName" title="下载文件">@item.Name</a></td>
-                }
-                <td class="text-right">@item.Size</td>
-                <td class="text-center">@item.LastWrite.ToFullString("")</td>
-                <td class="text-center">
-                    @if (!clips.Any(e => e.FullName == item.FullName))
-                    {
-                        <a href="~/Admin/File/Copy?r=@r&f=@item.FullName" title="复制到剪切板，然后去目标目录粘贴">复制</a>
-                    }
-                    else
-                    {
-                        <a href="~/Admin/File/CancelCopy?r=@r&f=@item.FullName" title="从剪切板移除">取消复制</a>
-                    }
-                </td>
-                @if (item.Name.EndsWithIgnoreCase(".zip"))
-                {
-                    <td class="text-center"><a href="~/Admin/File/Decompress?r=@item.FullName" title="解压缩到当前目录">解压缩</a></td>
-                }
-                else
-                {
-                    <td class="text-center"><a href="~/Admin/File/Compress?r=@item.FullName" title="压缩到当前目录，加上时间后缀">压缩</a></td>
-                }
-                <td class="text-center"><a href="~/Admin/File/Delete?r=@item.FullName" onclick="return confirm('确认删除？');">删除</a></td>
-            </tr>
-        }
-    </tbody>
-</table>
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Views/File/Index.generated.cs b/NewLife.Cube/Areas/Admin/Views/File/Index.generated.cs
deleted file mode 100644
index ea5d8c9e9a..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/File/Index.generated.cs
+++ /dev/null
@@ -1,722 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    
-    #line 1 "..\..\Areas\Admin\Views\File\Index.cshtml"
-    using System.Diagnostics;
-    
-    #line default
-    #line hidden
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    
-    #line 2 "..\..\Areas\Admin\Views\File\Index.cshtml"
-    using NewLife.Common;
-    
-    #line default
-    #line hidden
-    using NewLife.Cube;
-    
-    #line 3 "..\..\Areas\Admin\Views\File\Index.cshtml"
-    using NewLife.Cube.Admin;
-    
-    #line default
-    #line hidden
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Admin/Views/File/Index.cshtml")]
-    public partial class _Areas_Admin_Views_File_Index_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Areas_Admin_Views_File_Index_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 4 "..\..\Areas\Admin\Views\File\Index.cshtml"
-  
-    //ViewBag.Title = "服务器信息";
-    var fs = Model as List<FileItem>;
-    var r = ViewBag.Current as String;
-    var clips = ViewBag.Clip as ICollection<FileItem>;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n<div");
-
-WriteLiteral(" class=\"form-inline\"");
-
-WriteLiteral(">\r\n    <form");
-
-WriteAttribute("action", Tuple.Create(" action=\"", 290), Tuple.Create("\"", 311)
-, Tuple.Create(Tuple.Create("", 299), Tuple.Create<System.Object, System.Int32>(Href("~/Admin/File")
-, 299), false)
-);
-
-WriteLiteral(" id=\"tool\"");
-
-WriteLiteral(" method=\"post\"");
-
-WriteLiteral(">\r\n        <div");
-
-WriteLiteral(" class=\"input-group\"");
-
-WriteLiteral(">\r\n            <span");
-
-WriteLiteral(" class=\"input-group-addon\"");
-
-WriteLiteral(">\r\n                <i");
-
-WriteLiteral(" class=\"ace-icon fa fa-check\"");
-
-WriteLiteral("></i>\r\n            </span>\r\n            <input");
-
-WriteLiteral(" name=\"r\"");
-
-WriteLiteral(" type=\"search\"");
-
-WriteLiteral(" id=\"r\"");
-
-WriteAttribute("value", Tuple.Create(" value=\"", 543), Tuple.Create("\"", 553)
-            
-            #line 16 "..\..\Areas\Admin\Views\File\Index.cshtml"
-, Tuple.Create(Tuple.Create("", 551), Tuple.Create<System.Object, System.Int32>(r
-            
-            #line default
-            #line hidden
-, 551), false)
-);
-
-WriteLiteral(" class=\"form-control\"");
-
-WriteLiteral(" placeholder=\"当前路径\"");
-
-WriteLiteral(" />\r\n            <span");
-
-WriteLiteral(" class=\"input-group-btn\"");
-
-WriteLiteral(">\r\n                <button");
-
-WriteLiteral(" type=\"submit\"");
-
-WriteLiteral(" class=\"btn btn-primary btn-sm\"");
-
-WriteLiteral(">\r\n                    <span");
-
-WriteLiteral(" class=\"glyphicon glyphicon-folder-open icon-on-right bigger-110\"");
-
-WriteLiteral("></span>\r\n                    打开\r\n                </button>\r\n            </span>\r" +
-"\n        </div>\r\n        <div");
-
-WriteLiteral(" class=\"input-group\"");
-
-WriteLiteral(">\r\n            <span");
-
-WriteLiteral(" class=\"input-group-addon\"");
-
-WriteLiteral(">\r\n                <i");
-
-WriteLiteral(" class=\"glyphicon glyphicon-file\"");
-
-WriteLiteral("></i>\r\n            </span>\r\n            <input");
-
-WriteLiteral(" name=\"file\"");
-
-WriteLiteral(" type=\"file\"");
-
-WriteLiteral(" id=\"file\"");
-
-WriteLiteral(" placeholder=\"上传文件\"");
-
-WriteLiteral(" />\r\n            <span");
-
-WriteLiteral(" class=\"input-group-btn\"");
-
-WriteLiteral(">\r\n                <button");
-
-WriteLiteral(" type=\"submit\"");
-
-WriteLiteral(" class=\"btn btn-success btn-sm\"");
-
-WriteLiteral(" onclick=\"$(\'#tool\').attr(\'action\', \'/Admin/File/Upload\');$(\'#tool\').attr(\'enctyp" +
-"e\', \'multipart/form-data\'); return true;\"");
-
-WriteLiteral(">\r\n                    <span");
-
-WriteLiteral(" class=\"glyphicon glyphicon-plus icon-on-right bigger-110\"");
-
-WriteLiteral("></span>\r\n                    上传\r\n                </button>\r\n            </span>\r" +
-"\n        </div>\r\n");
-
-            
-            #line 36 "..\..\Areas\Admin\Views\File\Index.cshtml"
-        
-            
-            #line default
-            #line hidden
-            
-            #line 36 "..\..\Areas\Admin\Views\File\Index.cshtml"
-         if (clips.Count > 0)
-        {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            <div");
-
-WriteLiteral(" class=\"input-group\"");
-
-WriteLiteral(">\r\n                <span");
-
-WriteLiteral(" class=\"input-group-addon\"");
-
-WriteLiteral(">\r\n                    <i");
-
-WriteLiteral(" class=\"glyphicon glyphicon-floppy-disk\"");
-
-WriteAttribute("title", Tuple.Create(" title=\"", 1749), Tuple.Create("\"", 1777)
-, Tuple.Create(Tuple.Create("", 1757), Tuple.Create("剪切板共有", 1757), true)
-            
-            #line 40 "..\..\Areas\Admin\Views\File\Index.cshtml"
-, Tuple.Create(Tuple.Create(" ", 1762), Tuple.Create<System.Object, System.Int32>(clips.Count
-            
-            #line default
-            #line hidden
-, 1763), false)
-, Tuple.Create(Tuple.Create(" ", 1775), Tuple.Create("项", 1776), true)
-);
-
-WriteLiteral(">");
-
-            
-            #line 40 "..\..\Areas\Admin\Views\File\Index.cshtml"
-                                                                                       Write(clips.Count);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</i>\r\n                </span>\r\n                <span");
-
-WriteLiteral(" class=\"input-group-btn\"");
-
-WriteLiteral(">\r\n                    <button");
-
-WriteLiteral(" type=\"button\"");
-
-WriteLiteral(" class=\"btn btn-pink btn-sm\"");
-
-WriteAttribute("onclick", Tuple.Create(" onclick=\"", 1939), Tuple.Create("\"", 1990)
-, Tuple.Create(Tuple.Create("", 1949), Tuple.Create("location.href", 1949), true)
-, Tuple.Create(Tuple.Create(" ", 1962), Tuple.Create("=", 1963), true)
-, Tuple.Create(Tuple.Create(" ", 1964), Tuple.Create("\'/Admin/File/Paste?r=", 1965), true)
-            
-            #line 43 "..\..\Areas\Admin\Views\File\Index.cshtml"
-                                    , Tuple.Create(Tuple.Create("", 1986), Tuple.Create<System.Object, System.Int32>(r
-            
-            #line default
-            #line hidden
-, 1986), false)
-, Tuple.Create(Tuple.Create("", 1988), Tuple.Create("\';", 1988), true)
-);
-
-WriteLiteral(">\r\n                        <span");
-
-WriteLiteral(" class=\"glyphicon glyphicon-floppy-save icon-on-right bigger-110\"");
-
-WriteLiteral("></span>\r\n                        粘贴\r\n                    </button>\r\n            " +
-"    </span>\r\n                <span");
-
-WriteLiteral(" class=\"input-group-btn\"");
-
-WriteLiteral(">\r\n                    <button");
-
-WriteLiteral(" type=\"button\"");
-
-WriteLiteral(" class=\"btn btn-gray btn-sm\"");
-
-WriteAttribute("onclick", Tuple.Create(" onclick=\"", 2299), Tuple.Create("\"", 2349)
-, Tuple.Create(Tuple.Create("", 2309), Tuple.Create("location.href", 2309), true)
-, Tuple.Create(Tuple.Create(" ", 2322), Tuple.Create("=", 2323), true)
-, Tuple.Create(Tuple.Create(" ", 2324), Tuple.Create("\'/Admin/File/Move?r=", 2325), true)
-            
-            #line 49 "..\..\Areas\Admin\Views\File\Index.cshtml"
-                                   , Tuple.Create(Tuple.Create("", 2345), Tuple.Create<System.Object, System.Int32>(r
-            
-            #line default
-            #line hidden
-, 2345), false)
-, Tuple.Create(Tuple.Create("", 2347), Tuple.Create("\';", 2347), true)
-);
-
-WriteLiteral(">\r\n                        <span");
-
-WriteLiteral(" class=\"glyphicon glyphicon-floppy-save icon-on-right bigger-110\"");
-
-WriteLiteral("></span>\r\n                        移动\r\n                    </button>\r\n            " +
-"    </span>\r\n                <span");
-
-WriteLiteral(" class=\"input-group-btn\"");
-
-WriteLiteral(">\r\n                    <button");
-
-WriteLiteral(" type=\"button\"");
-
-WriteLiteral(" class=\"btn btn-yellow btn-sm\"");
-
-WriteAttribute("onclick", Tuple.Create(" onclick=\"", 2660), Tuple.Create("\"", 2720)
-, Tuple.Create(Tuple.Create("", 2670), Tuple.Create("location.href", 2670), true)
-, Tuple.Create(Tuple.Create(" ", 2683), Tuple.Create("=", 2684), true)
-, Tuple.Create(Tuple.Create(" ", 2685), Tuple.Create("\'/Admin/File/ClearClipboard?r=", 2686), true)
-            
-            #line 55 "..\..\Areas\Admin\Views\File\Index.cshtml"
-                                               , Tuple.Create(Tuple.Create("", 2716), Tuple.Create<System.Object, System.Int32>(r
-            
-            #line default
-            #line hidden
-, 2716), false)
-, Tuple.Create(Tuple.Create("", 2718), Tuple.Create("\';", 2718), true)
-);
-
-WriteLiteral(">\r\n                        <span");
-
-WriteLiteral(" class=\"glyphicon glyphicon-retweet icon-on-right bigger-110\"");
-
-WriteLiteral("></span>\r\n                        清空\r\n                    </button>\r\n            " +
-"    </span>\r\n            </div>\r\n");
-
-            
-            #line 61 "..\..\Areas\Admin\Views\File\Index.cshtml"
-        }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("    </form>\r\n</div>\r\n<table");
-
-WriteLiteral(" class=\"table table-bordered table-hover table-striped table-condensed\"");
-
-WriteLiteral(">\r\n    <thead>\r\n        <tr>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 3105), Tuple.Create("\"", 3139)
-, Tuple.Create(Tuple.Create("", 3112), Tuple.Create<System.Object, System.Int32>(Href("~/Admin/File?r=")
-, 3112), false)
-            
-            #line 67 "..\..\Areas\Admin\Views\File\Index.cshtml"
-, Tuple.Create(Tuple.Create("", 3127), Tuple.Create<System.Object, System.Int32>(r
-            
-            #line default
-            #line hidden
-, 3127), false)
-, Tuple.Create(Tuple.Create("", 3129), Tuple.Create("&sort=name", 3129), true)
-);
-
-WriteLiteral(">名称</a></th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 3192), Tuple.Create("\"", 3226)
-, Tuple.Create(Tuple.Create("", 3199), Tuple.Create<System.Object, System.Int32>(Href("~/Admin/File?r=")
-, 3199), false)
-            
-            #line 68 "..\..\Areas\Admin\Views\File\Index.cshtml"
-, Tuple.Create(Tuple.Create("", 3214), Tuple.Create<System.Object, System.Int32>(r
-            
-            #line default
-            #line hidden
-, 3214), false)
-, Tuple.Create(Tuple.Create("", 3216), Tuple.Create("&sort=size", 3216), true)
-);
-
-WriteLiteral(">大小</a></th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 3279), Tuple.Create("\"", 3318)
-, Tuple.Create(Tuple.Create("", 3286), Tuple.Create<System.Object, System.Int32>(Href("~/Admin/File?r=")
-, 3286), false)
-            
-            #line 69 "..\..\Areas\Admin\Views\File\Index.cshtml"
-, Tuple.Create(Tuple.Create("", 3301), Tuple.Create<System.Object, System.Int32>(r
-            
-            #line default
-            #line hidden
-, 3301), false)
-, Tuple.Create(Tuple.Create("", 3303), Tuple.Create("&sort=lastwrite", 3303), true)
-);
-
-WriteLiteral(">修改时间</a></th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">复制</th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">压缩</th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">删除</th>\r\n        </tr>\r\n    </thead>\r\n    <tbody>\r\n");
-
-            
-            #line 76 "..\..\Areas\Admin\Views\File\Index.cshtml"
-        
-            
-            #line default
-            #line hidden
-            
-            #line 76 "..\..\Areas\Admin\Views\File\Index.cshtml"
-         foreach (var item in fs)
-        {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            <tr>\r\n");
-
-            
-            #line 79 "..\..\Areas\Admin\Views\File\Index.cshtml"
-                
-            
-            #line default
-            #line hidden
-            
-            #line 79 "..\..\Areas\Admin\Views\File\Index.cshtml"
-                 if (item.Directory)
-                {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                    <td>&nbsp;&nbsp;<a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 3671), Tuple.Create("\"", 3707)
-, Tuple.Create(Tuple.Create("", 3678), Tuple.Create<System.Object, System.Int32>(Href("~/Admin/File?r=")
-, 3678), false)
-            
-            #line 81 "..\..\Areas\Admin\Views\File\Index.cshtml"
-, Tuple.Create(Tuple.Create("", 3693), Tuple.Create<System.Object, System.Int32>(item.FullName
-            
-            #line default
-            #line hidden
-, 3693), false)
-);
-
-WriteLiteral(" title=\"进入目录\"");
-
-WriteLiteral(">");
-
-            
-            #line 81 "..\..\Areas\Admin\Views\File\Index.cshtml"
-                                                                                    Write(item.Name);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</a></td>\r\n");
-
-            
-            #line 82 "..\..\Areas\Admin\Views\File\Index.cshtml"
-                }
-                else
-                {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                    <td>&nbsp;&nbsp;<a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 3841), Tuple.Create("\"", 3886)
-, Tuple.Create(Tuple.Create("", 3848), Tuple.Create<System.Object, System.Int32>(Href("~/Admin/File/Download?r=")
-, 3848), false)
-            
-            #line 85 "..\..\Areas\Admin\Views\File\Index.cshtml"
-, Tuple.Create(Tuple.Create("", 3872), Tuple.Create<System.Object, System.Int32>(item.FullName
-            
-            #line default
-            #line hidden
-, 3872), false)
-);
-
-WriteLiteral(" title=\"下载文件\"");
-
-WriteLiteral(">");
-
-            
-            #line 85 "..\..\Areas\Admin\Views\File\Index.cshtml"
-                                                                                             Write(item.Name);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</a></td>\r\n");
-
-            
-            #line 86 "..\..\Areas\Admin\Views\File\Index.cshtml"
-                }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <td");
-
-WriteLiteral(" class=\"text-right\"");
-
-WriteLiteral(">");
-
-            
-            #line 87 "..\..\Areas\Admin\Views\File\Index.cshtml"
-                                  Write(item.Size);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">");
-
-            
-            #line 88 "..\..\Areas\Admin\Views\File\Index.cshtml"
-                                   Write(item.LastWrite.ToFullString(""));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">\r\n");
-
-            
-            #line 90 "..\..\Areas\Admin\Views\File\Index.cshtml"
-                    
-            
-            #line default
-            #line hidden
-            
-            #line 90 "..\..\Areas\Admin\Views\File\Index.cshtml"
-                     if (!clips.Any(e => e.FullName == item.FullName))
-                    {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                        <a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 4239), Tuple.Create("\"", 4285)
-, Tuple.Create(Tuple.Create("", 4246), Tuple.Create<System.Object, System.Int32>(Href("~/Admin/File/Copy?r=")
-, 4246), false)
-            
-            #line 92 "..\..\Areas\Admin\Views\File\Index.cshtml"
-, Tuple.Create(Tuple.Create("", 4266), Tuple.Create<System.Object, System.Int32>(r
-            
-            #line default
-            #line hidden
-, 4266), false)
-, Tuple.Create(Tuple.Create("", 4268), Tuple.Create("&f=", 4268), true)
-            
-            #line 92 "..\..\Areas\Admin\Views\File\Index.cshtml"
-, Tuple.Create(Tuple.Create("", 4271), Tuple.Create<System.Object, System.Int32>(item.FullName
-            
-            #line default
-            #line hidden
-, 4271), false)
-);
-
-WriteLiteral(" title=\"复制到剪切板，然后去目标目录粘贴\"");
-
-WriteLiteral(">复制</a>\r\n");
-
-            
-            #line 93 "..\..\Areas\Admin\Views\File\Index.cshtml"
-                    }
-                    else
-                    {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                        <a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 4418), Tuple.Create("\"", 4470)
-, Tuple.Create(Tuple.Create("", 4425), Tuple.Create<System.Object, System.Int32>(Href("~/Admin/File/CancelCopy?r=")
-, 4425), false)
-            
-            #line 96 "..\..\Areas\Admin\Views\File\Index.cshtml"
-, Tuple.Create(Tuple.Create("", 4451), Tuple.Create<System.Object, System.Int32>(r
-            
-            #line default
-            #line hidden
-, 4451), false)
-, Tuple.Create(Tuple.Create("", 4453), Tuple.Create("&f=", 4453), true)
-            
-            #line 96 "..\..\Areas\Admin\Views\File\Index.cshtml"
-, Tuple.Create(Tuple.Create("", 4456), Tuple.Create<System.Object, System.Int32>(item.FullName
-            
-            #line default
-            #line hidden
-, 4456), false)
-);
-
-WriteLiteral(" title=\"从剪切板移除\"");
-
-WriteLiteral(">取消复制</a>\r\n");
-
-            
-            #line 97 "..\..\Areas\Admin\Views\File\Index.cshtml"
-                    }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                </td>\r\n");
-
-            
-            #line 99 "..\..\Areas\Admin\Views\File\Index.cshtml"
-                
-            
-            #line default
-            #line hidden
-            
-            #line 99 "..\..\Areas\Admin\Views\File\Index.cshtml"
-                 if (item.Name.EndsWithIgnoreCase(".zip"))
-                {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                    <td");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 4668), Tuple.Create("\"", 4715)
-, Tuple.Create(Tuple.Create("", 4675), Tuple.Create<System.Object, System.Int32>(Href("~/Admin/File/Decompress?r=")
-, 4675), false)
-            
-            #line 101 "..\..\Areas\Admin\Views\File\Index.cshtml"
-, Tuple.Create(Tuple.Create("", 4701), Tuple.Create<System.Object, System.Int32>(item.FullName
-            
-            #line default
-            #line hidden
-, 4701), false)
-);
-
-WriteLiteral(" title=\"解压缩到当前目录\"");
-
-WriteLiteral(">解压缩</a></td>\r\n");
-
-            
-            #line 102 "..\..\Areas\Admin\Views\File\Index.cshtml"
-                }
-                else
-                {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                    <td");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 4854), Tuple.Create("\"", 4899)
-, Tuple.Create(Tuple.Create("", 4861), Tuple.Create<System.Object, System.Int32>(Href("~/Admin/File/Compress?r=")
-, 4861), false)
-            
-            #line 105 "..\..\Areas\Admin\Views\File\Index.cshtml"
-, Tuple.Create(Tuple.Create("", 4885), Tuple.Create<System.Object, System.Int32>(item.FullName
-            
-            #line default
-            #line hidden
-, 4885), false)
-);
-
-WriteLiteral(" title=\"压缩到当前目录，加上时间后缀\"");
-
-WriteLiteral(">压缩</a></td>\r\n");
-
-            
-            #line 106 "..\..\Areas\Admin\Views\File\Index.cshtml"
-                }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <td");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 4998), Tuple.Create("\"", 5041)
-, Tuple.Create(Tuple.Create("", 5005), Tuple.Create<System.Object, System.Int32>(Href("~/Admin/File/Delete?r=")
-, 5005), false)
-            
-            #line 107 "..\..\Areas\Admin\Views\File\Index.cshtml"
-, Tuple.Create(Tuple.Create("", 5027), Tuple.Create<System.Object, System.Int32>(item.FullName
-            
-            #line default
-            #line hidden
-, 5027), false)
-);
-
-WriteLiteral(" onclick=\"return confirm(\'确认删除？\');\"");
-
-WriteLiteral(">删除</a></td>\r\n            </tr>\r\n");
-
-            
-            #line 109 "..\..\Areas\Admin\Views\File\Index.cshtml"
-        }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("    </tbody>\r\n</table>");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Areas/Admin/Views/Index/Assembly.cshtml b/NewLife.Cube/Areas/Admin/Views/Index/Assembly.cshtml
deleted file mode 100644
index e27902644b..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/Index/Assembly.cshtml
+++ /dev/null
@@ -1,57 +0,0 @@
-﻿@using System.Diagnostics;
-@using System.Collections;
-@using System.Reflection;
-@using System.Runtime.Versioning;
-@using NewLife.Common;
-@{
-    Layout = NewLife.Cube.Setting.Current.Layout;
-
-    ViewBag.Title = "程序集列表";
-
-    var asm = Assembly.GetExecutingAssembly();
-    var att = asm.GetCustomAttribute<TargetFrameworkAttribute>();
-    var ver = att.FrameworkDisplayName ?? att.FrameworkName;
-}
-
-<table class="table table-bordered table-hover table-striped table-condensed">
-    <tr>
-        <th colspan="6">
-            程序集列表(@AppDomain.CurrentDomain.FriendlyName )
-        </th>
-    </tr>
-    <tr>
-        <th>名称</th>
-        <th>标题</th>
-        <th>文件版本</th>
-        <th>内部版本</th>
-        <th>编译时间</th>
-        <th>路径</th>
-    </tr>
-    @foreach (AssemblyX item in ViewBag.Asms)
-    {
-        <tr>
-            <td>
-                @item.Name
-            </td>
-            <td>
-                @item.Title
-            </td>
-            <td>
-                @item.FileVersion
-            </td>
-            <td>@item.Version</td>
-            <td>@item.Compile.ToFullString()</td>
-            <td>
-                @{
-                    var location = String.Empty;
-                    try
-                    {
-                        location = item.Asm.Location;
-                    }
-                    catch { }
-                }
-                @location
-            </td>
-        </tr>
-                    }
-</table>
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Views/Index/Assembly.generated.cs b/NewLife.Cube/Areas/Admin/Views/Index/Assembly.generated.cs
deleted file mode 100644
index 7dec2cf97c..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/Index/Assembly.generated.cs
+++ /dev/null
@@ -1,221 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    
-    #line 2 "..\..\Areas\Admin\Views\Index\Assembly.cshtml"
-    using System.Collections;
-    
-    #line default
-    #line hidden
-    using System.Collections.Generic;
-    
-    #line 1 "..\..\Areas\Admin\Views\Index\Assembly.cshtml"
-    using System.Diagnostics;
-    
-    #line default
-    #line hidden
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    
-    #line 3 "..\..\Areas\Admin\Views\Index\Assembly.cshtml"
-    using System.Reflection;
-    
-    #line default
-    #line hidden
-    
-    #line 4 "..\..\Areas\Admin\Views\Index\Assembly.cshtml"
-    using System.Runtime.Versioning;
-    
-    #line default
-    #line hidden
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    
-    #line 5 "..\..\Areas\Admin\Views\Index\Assembly.cshtml"
-    using NewLife.Common;
-    
-    #line default
-    #line hidden
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Admin/Views/Index/Assembly.cshtml")]
-    public partial class _Areas_Admin_Views_Index_Assembly_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Areas_Admin_Views_Index_Assembly_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 6 "..\..\Areas\Admin\Views\Index\Assembly.cshtml"
-  
-    Layout = NewLife.Cube.Setting.Current.Layout;
-
-    ViewBag.Title = "程序集列表";
-
-    var asm = Assembly.GetExecutingAssembly();
-    var att = asm.GetCustomAttribute<TargetFrameworkAttribute>();
-    var ver = att.FrameworkDisplayName ?? att.FrameworkName;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n\r\n<table");
-
-WriteLiteral(" class=\"table table-bordered table-hover table-striped table-condensed\"");
-
-WriteLiteral(">\r\n    <tr>\r\n        <th");
-
-WriteLiteral(" colspan=\"6\"");
-
-WriteLiteral(">\r\n            程序集列表(");
-
-            
-            #line 19 "..\..\Areas\Admin\Views\Index\Assembly.cshtml"
-             Write(AppDomain.CurrentDomain.FriendlyName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral(" )\r\n        </th>\r\n    </tr>\r\n    <tr>\r\n        <th>名称</th>\r\n        <th>标题</th>\r" +
-"\n        <th>文件版本</th>\r\n        <th>内部版本</th>\r\n        <th>编译时间</th>\r\n        <t" +
-"h>路径</th>\r\n    </tr>\r\n");
-
-            
-            #line 30 "..\..\Areas\Admin\Views\Index\Assembly.cshtml"
-    
-            
-            #line default
-            #line hidden
-            
-            #line 30 "..\..\Areas\Admin\Views\Index\Assembly.cshtml"
-     foreach (AssemblyX item in ViewBag.Asms)
-    {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        <tr>\r\n            <td>\r\n");
-
-WriteLiteral("                ");
-
-            
-            #line 34 "..\..\Areas\Admin\Views\Index\Assembly.cshtml"
-           Write(item.Name);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n            </td>\r\n            <td>\r\n");
-
-WriteLiteral("                ");
-
-            
-            #line 37 "..\..\Areas\Admin\Views\Index\Assembly.cshtml"
-           Write(item.Title);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n            </td>\r\n            <td>\r\n");
-
-WriteLiteral("                ");
-
-            
-            #line 40 "..\..\Areas\Admin\Views\Index\Assembly.cshtml"
-           Write(item.FileVersion);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n            </td>\r\n            <td>");
-
-            
-            #line 42 "..\..\Areas\Admin\Views\Index\Assembly.cshtml"
-           Write(item.Version);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n            <td>");
-
-            
-            #line 43 "..\..\Areas\Admin\Views\Index\Assembly.cshtml"
-           Write(item.Compile.ToFullString());
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n            <td>\r\n");
-
-            
-            #line 45 "..\..\Areas\Admin\Views\Index\Assembly.cshtml"
-                
-            
-            #line default
-            #line hidden
-            
-            #line 45 "..\..\Areas\Admin\Views\Index\Assembly.cshtml"
-                  
-                    var location = String.Empty;
-                    try
-                    {
-                        location = item.Asm.Location;
-                    }
-                    catch { }
-                
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                ");
-
-            
-            #line 53 "..\..\Areas\Admin\Views\Index\Assembly.cshtml"
-           Write(location);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n            </td>\r\n        </tr>\r\n");
-
-            
-            #line 56 "..\..\Areas\Admin\Views\Index\Assembly.cshtml"
-                    }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</table>");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Areas/Admin/Views/Index/Cache.cshtml b/NewLife.Cube/Areas/Admin/Views/Index/Cache.cshtml
deleted file mode 100644
index ae65e3763c..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/Index/Cache.cshtml
+++ /dev/null
@@ -1,34 +0,0 @@
-﻿@using System.Diagnostics;
-@using System.Collections;
-@using System.Reflection;
-@using System.Runtime.Versioning;
-@using NewLife.Common;
-@{
-    Layout = NewLife.Cube.Setting.Current.Layout;
-
-    ViewBag.Title = "Cache列表";
-
-    var asm = Assembly.GetExecutingAssembly();
-    var att = asm.GetCustomAttribute<TargetFrameworkAttribute>();
-    var ver = att.FrameworkDisplayName ?? att.FrameworkName;
-}
-<table class="table table-bordered table-hover table-striped table-condensed">
-    <tr>
-        <th colspan="6">
-            Cache列表(@Cache.Count )
-        </th>
-    </tr>
-    <tr>
-        <th>名称</th>
-        <th>类型</th>
-        <th>数值</th>
-    </tr>
-    @foreach (DictionaryEntry item in Cache)
-        {
-        <tr>
-            <td>@item.Key</td>
-            <td>@item.Value.GetType().FullName</td>
-            <td>@item.Value</td>
-        </tr>
-        }
-</table>
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Views/Index/Cache.generated.cs b/NewLife.Cube/Areas/Admin/Views/Index/Cache.generated.cs
deleted file mode 100644
index 6addd48147..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/Index/Cache.generated.cs
+++ /dev/null
@@ -1,164 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    
-    #line 2 "..\..\Areas\Admin\Views\Index\Cache.cshtml"
-    using System.Collections;
-    
-    #line default
-    #line hidden
-    using System.Collections.Generic;
-    
-    #line 1 "..\..\Areas\Admin\Views\Index\Cache.cshtml"
-    using System.Diagnostics;
-    
-    #line default
-    #line hidden
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    
-    #line 3 "..\..\Areas\Admin\Views\Index\Cache.cshtml"
-    using System.Reflection;
-    
-    #line default
-    #line hidden
-    
-    #line 4 "..\..\Areas\Admin\Views\Index\Cache.cshtml"
-    using System.Runtime.Versioning;
-    
-    #line default
-    #line hidden
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    
-    #line 5 "..\..\Areas\Admin\Views\Index\Cache.cshtml"
-    using NewLife.Common;
-    
-    #line default
-    #line hidden
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Admin/Views/Index/Cache.cshtml")]
-    public partial class _Areas_Admin_Views_Index_Cache_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Areas_Admin_Views_Index_Cache_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 6 "..\..\Areas\Admin\Views\Index\Cache.cshtml"
-  
-    Layout = NewLife.Cube.Setting.Current.Layout;
-
-    ViewBag.Title = "Cache列表";
-
-    var asm = Assembly.GetExecutingAssembly();
-    var att = asm.GetCustomAttribute<TargetFrameworkAttribute>();
-    var ver = att.FrameworkDisplayName ?? att.FrameworkName;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n<table");
-
-WriteLiteral(" class=\"table table-bordered table-hover table-striped table-condensed\"");
-
-WriteLiteral(">\r\n    <tr>\r\n        <th");
-
-WriteLiteral(" colspan=\"6\"");
-
-WriteLiteral(">\r\n            Cache列表(");
-
-            
-            #line 18 "..\..\Areas\Admin\Views\Index\Cache.cshtml"
-               Write(Cache.Count);
-
-            
-            #line default
-            #line hidden
-WriteLiteral(" )\r\n        </th>\r\n    </tr>\r\n    <tr>\r\n        <th>名称</th>\r\n        <th>类型</th>\r" +
-"\n        <th>数值</th>\r\n    </tr>\r\n");
-
-            
-            #line 26 "..\..\Areas\Admin\Views\Index\Cache.cshtml"
-    
-            
-            #line default
-            #line hidden
-            
-            #line 26 "..\..\Areas\Admin\Views\Index\Cache.cshtml"
-     foreach (DictionaryEntry item in Cache)
-        {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        <tr>\r\n            <td>");
-
-            
-            #line 29 "..\..\Areas\Admin\Views\Index\Cache.cshtml"
-           Write(item.Key);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n            <td>");
-
-            
-            #line 30 "..\..\Areas\Admin\Views\Index\Cache.cshtml"
-           Write(item.Value.GetType().FullName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n            <td>");
-
-            
-            #line 31 "..\..\Areas\Admin\Views\Index\Cache.cshtml"
-           Write(item.Value);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n        </tr>\r\n");
-
-            
-            #line 33 "..\..\Areas\Admin\Views\Index\Cache.cshtml"
-        }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</table>");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Areas/Admin/Views/Index/Index.cshtml b/NewLife.Cube/Areas/Admin/Views/Index/Index.cshtml
deleted file mode 100644
index ab9ee523d0..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/Index/Index.cshtml
+++ /dev/null
@@ -1,161 +0,0 @@
-﻿@{
-    Layout = null;
-
-    var User = ViewBag.User;
-    var Config = ViewBag.Config;
-}
-<!DOCTYPE html>
-<html lang="zh-CN">
-<head>
-    <meta charset="utf-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <!-- 上述3个meta标签*必须*放在最前面，任何其他内容都*必须*跟随其后！ -->
-
-    <title>@ViewBag.Title - @Config.DisplayName</title>
-    <link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
-
-    <!-- bootstrap & fontawesome -->
-    <link rel="stylesheet" href="~/Content/bootstrap/css/bootstrap.min.css" />
-    <link rel="stylesheet" href="~/Content/bootstrap/css/font-awesome.min.css" />
-
-    <!-- page specific plugin styles -->
-    <!-- text fonts -->
-    <link rel="stylesheet" href="~/Content/ace/css/ace-fonts.min.css" />
-
-    <!-- ace styles -->
-    <link rel="stylesheet" href="~/Content/ace/css/ace.min.css" class="ace-main-stylesheet" id="main-ace-style" />
-    @*artdialog style*@
-    <link href="~/Content/artDialog/css/ui-dialog.css" rel="stylesheet" />
-
-    <!--[if lte IE 9]>
-        <link rel="stylesheet" href="~/Content/ace/css/ace-part2.min.css" class="ace-main-stylesheet" />
-    <![endif]-->
-    <!--[if lte IE 9]>
-        <link rel="stylesheet" href="~/Content/ace/css/ace-ie.min.css" />
-    <![endif]-->
-    <!-- inline styles related to this page -->
-    <!-- 自定义样式 -->
-    <link rel="stylesheet" href="~/Content/Cube.css" type="text/css" />
-    <!-- ace settings handler -->
-    <script src="~/Content/ace/js/ace-extra.min.js"></script>
-
-    <!-- HTML5shiv and Respond.js for IE8 to support HTML5 elements and media queries -->
-    <!--[if lte IE 8]>
-    <script src="~/Content/js/html5shiv.min.js"></script>
-    <script src="~/Content/js/respond.min.js"></script>
-    <![endif]-->
-    <!-- JQuery作为一等公民，页面内部随时可能使用 -->
-    <script src="~/Content/js/jquery-2.1.3.min.js"></script>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body class="skin-3 no-skin" style="overflow: hidden;">
-    @Html.Partial("_Navbar")
-    <div class="main-container" id="main-container">
-        <script type="text/javascript">
-            $(function () {
-                try { ace.settings.check('main-container', 'fixed') } catch (e) { }
-            });
-        </script>
-
-        <!-- #section:basics/sidebar -->
-        <div id="sidebar" class="sidebar responsive">
-            <script type="text/javascript">
-                $(function () {
-                    try { ace.settings.check('sidebar', 'fixed') } catch (e) { }
-                });
-            </script>
-
-            @Html.Partial("_Left")
-            <!-- #section:basics/sidebar.layout.minimize -->
-            <div class="sidebar-toggle sidebar-collapse" id="sidebar-collapse">
-                <i class="ace-icon fa fa-angle-double-left" data-icon1="ace-icon fa fa-angle-double-left" data-icon2="ace-icon fa fa-angle-double-right"></i>
-            </div>
-
-            <!-- /section:basics/sidebar.layout.minimize -->
-            <script type="text/javascript">
-                $(function () {
-                    try { ace.settings.check('sidebar', 'collapsed') } catch (e) { }
-                })
-            </script>
-        </div>
-
-        <!-- /section:basics/sidebar -->
-        <div class="main-content">
-            <div class="main-content-inner">
-                <!-- /section:basics/content.breadcrumbs -->
-                <div class="page-content" style="padding: 0px;">
-                    <iframe style="width: 100%; height: 100%; margin: 0; padding: 0; border: none;" id="main" name="main" src="@ViewBag.Main"></iframe>
-                </div>
-                <!-- /.page-content -->
-            </div>
-        </div>
-        <!-- /.main-content -->
-        <a href="#" id="btn-scroll-up" class="btn-scroll-up btn btn-sm btn-inverse">
-            <i class="ace-icon fa fa-angle-double-up icon-only bigger-110"></i>
-        </a>
-    </div>
-    <!-- /.main-container -->
-    <!-- basic scripts -->
-    <script src="~/Content/bootstrap/js/bootstrap.min.js"></script>
-    <script src="~/Content/js/jquery-ui.custom.min.js"></script>
-    <script src="~/Content/js/jquery.ui.touch-punch.min.js"></script>
-
-    <!-- ace scripts -->
-    <script src="~/Content/ace/js/ace-elements.min.js"></script>
-    <script src="~/Content/ace/js/ace.min.js"></script>
-    @*artDialog*@
-    <script src="~/Content/artDialog/dist/dialog-plus-min.js"></script>
-    <script src="~/Content/artDialog/dist/dialog.new.life.js"></script>
-
-    <script type="text/javascript">
-                $(function () {
-                    var $frmContent = $('#main');
-                    function fixFrmContentSize() {
-                        var offset = $frmContent.offset();
-                        var top = offset.top;
-                        var height = document.documentElement.clientHeight;
-                        $frmContent.height(height - top);
-                    }
-                    fixFrmContentSize();
-                    $(window).resize(fixFrmContentSize);
-
-                    //增加iframe被嵌套的检测2015-6-4 景裔增加
-                    if (window != top) {
-                        top.location.href = location.href;
-                    }
-
-                    //菜单active样式
-                    $(".nav-list").children("li").click(function () {
-                        var $this = $(this);
-                        $this.siblings("li").each(function () {
-                            var $item = $(this);
-                            if ($item.attr("class") == "open") {
-                                $item.removeClass("open");
-                                $item.children(".submenu").hide();
-                            }
-                        });
-                        $this.addClass('open');
-                    });
-
-                    $(".submenu li").click(function () {
-                        var $this = $(this);
-                        //兄弟节点去焦
-                        $this.siblings("li").removeClass("active");
-                        $this.addClass('active');
-                        //父节点获取焦点
-                        var $parent = $this.parent().parent();
-                        $parent.addClass("active");
-                        $parent.siblings("li").each(function () {
-                            var $item = $(this);
-                            $item.removeClass("open").removeClass("active");
-                            $item.children(".submenu").hide();
-                            if ($item.children(".submenu").length != 0) {
-                                $item.children(".submenu").children("li").removeClass("active");
-                            }
-                        });
-                    });
-                });
-
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Views/Index/Index.generated.cs b/NewLife.Cube/Areas/Admin/Views/Index/Index.generated.cs
deleted file mode 100644
index 34825c34a4..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/Index/Index.generated.cs
+++ /dev/null
@@ -1,408 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Admin/Views/Index/Index.cshtml")]
-    public partial class _Areas_Admin_Views_Index_Index_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Areas_Admin_Views_Index_Index_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 1 "..\..\Areas\Admin\Views\Index\Index.cshtml"
-  
-    Layout = null;
-
-    var User = ViewBag.User;
-    var Config = ViewBag.Config;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n<!DOCTYPE html>\r\n<html");
-
-WriteLiteral(" lang=\"zh-CN\"");
-
-WriteLiteral(">\r\n<head>\r\n    <meta");
-
-WriteLiteral(" charset=\"utf-8\"");
-
-WriteLiteral(" />\r\n    <meta");
-
-WriteLiteral(" http-equiv=\"X-UA-Compatible\"");
-
-WriteLiteral(" content=\"IE=edge\"");
-
-WriteLiteral(">\r\n    <meta");
-
-WriteLiteral(" name=\"viewport\"");
-
-WriteLiteral(" content=\"width=device-width, initial-scale=1\"");
-
-WriteLiteral(" />\r\n    <!-- 上述3个meta标签*必须*放在最前面，任何其他内容都*必须*跟随其后！ -->\r\n\r\n    <title>");
-
-            
-            #line 15 "..\..\Areas\Admin\Views\Index\Index.cshtml"
-      Write(ViewBag.Title);
-
-            
-            #line default
-            #line hidden
-WriteLiteral(" - ");
-
-            
-            #line 15 "..\..\Areas\Admin\Views\Index\Index.cshtml"
-                       Write(Config.DisplayName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</title>\r\n    <link");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 423), Tuple.Create("\"", 443)
-, Tuple.Create(Tuple.Create("", 430), Tuple.Create<System.Object, System.Int32>(Href("~/favicon.ico")
-, 430), false)
-);
-
-WriteLiteral(" rel=\"shortcut icon\"");
-
-WriteLiteral(" type=\"image/x-icon\"");
-
-WriteLiteral(" />\r\n\r\n    <!-- bootstrap & fontawesome -->\r\n    <link");
-
-WriteLiteral(" rel=\"stylesheet\"");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 555), Tuple.Create("\"", 603)
-, Tuple.Create(Tuple.Create("", 562), Tuple.Create<System.Object, System.Int32>(Href("~/Content/bootstrap/css/bootstrap.min.css")
-, 562), false)
-);
-
-WriteLiteral(" />\r\n    <link");
-
-WriteLiteral(" rel=\"stylesheet\"");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 635), Tuple.Create("\"", 686)
-, Tuple.Create(Tuple.Create("", 642), Tuple.Create<System.Object, System.Int32>(Href("~/Content/bootstrap/css/font-awesome.min.css")
-, 642), false)
-);
-
-WriteLiteral(" />\r\n\r\n    <!-- page specific plugin styles -->\r\n    <!-- text fonts -->\r\n    <li" +
-"nk");
-
-WriteLiteral(" rel=\"stylesheet\"");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 787), Tuple.Create("\"", 829)
-, Tuple.Create(Tuple.Create("", 794), Tuple.Create<System.Object, System.Int32>(Href("~/Content/ace/css/ace-fonts.min.css")
-, 794), false)
-);
-
-WriteLiteral(" />\r\n\r\n    <!-- ace styles -->\r\n    <link");
-
-WriteLiteral(" rel=\"stylesheet\"");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 888), Tuple.Create("\"", 924)
-, Tuple.Create(Tuple.Create("", 895), Tuple.Create<System.Object, System.Int32>(Href("~/Content/ace/css/ace.min.css")
-, 895), false)
-);
-
-WriteLiteral(" class=\"ace-main-stylesheet\"");
-
-WriteLiteral(" id=\"main-ace-style\"");
-
-WriteLiteral(" />\r\n    ");
-
-WriteLiteral("\r\n    <link");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1012), Tuple.Create("\"", 1056)
-, Tuple.Create(Tuple.Create("", 1019), Tuple.Create<System.Object, System.Int32>(Href("~/Content/artDialog/css/ui-dialog.css")
-, 1019), false)
-);
-
-WriteLiteral(" rel=\"stylesheet\"");
-
-WriteLiteral(@" />
-
-    <!--[if lte IE 9]>
-        <link rel=""stylesheet"" href=""~/Content/ace/css/ace-part2.min.css"" class=""ace-main-stylesheet"" />
-    <![endif]-->
-    <!--[if lte IE 9]>
-        <link rel=""stylesheet"" href=""~/Content/ace/css/ace-ie.min.css"" />
-    <![endif]-->
-    <!-- inline styles related to this page -->
-    <!-- 自定义样式 -->
-    <link");
-
-WriteLiteral(" rel=\"stylesheet\"");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1441), Tuple.Create("\"", 1466)
-, Tuple.Create(Tuple.Create("", 1448), Tuple.Create<System.Object, System.Int32>(Href("~/Content/Cube.css")
-, 1448), false)
-);
-
-WriteLiteral(" type=\"text/css\"");
-
-WriteLiteral(" />\r\n    <!-- ace settings handler -->\r\n    <script");
-
-WriteAttribute("src", Tuple.Create(" src=\"", 1534), Tuple.Create("\"", 1573)
-, Tuple.Create(Tuple.Create("", 1540), Tuple.Create<System.Object, System.Int32>(Href("~/Content/ace/js/ace-extra.min.js")
-, 1540), false)
-);
-
-WriteLiteral(@"></script>
-
-    <!-- HTML5shiv and Respond.js for IE8 to support HTML5 elements and media queries -->
-    <!--[if lte IE 8]>
-    <script src=""~/Content/js/html5shiv.min.js""></script>
-    <script src=""~/Content/js/respond.min.js""></script>
-    <![endif]-->
-    <!-- JQuery作为一等公民，页面内部随时可能使用 -->
-    <script");
-
-WriteAttribute("src", Tuple.Create(" src=\"", 1886), Tuple.Create("\"", 1924)
-, Tuple.Create(Tuple.Create("", 1892), Tuple.Create<System.Object, System.Int32>(Href("~/Content/js/jquery-2.1.3.min.js")
-, 1892), false)
-);
-
-WriteLiteral("></script>\r\n        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>\r\n<body");
-
-WriteLiteral(" class=\"skin-3 no-skin\"");
-
-WriteLiteral(" style=\"overflow: hidden;\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("    ");
-
-            
-            #line 52 "..\..\Areas\Admin\Views\Index\Index.cshtml"
-Write(Html.Partial("_Navbar"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n    <div");
-
-WriteLiteral(" class=\"main-container\"");
-
-WriteLiteral(" id=\"main-container\"");
-
-WriteLiteral(">\r\n        <script");
-
-WriteLiteral(" type=\"text/javascript\"");
-
-WriteLiteral(">\r\n            $(function () {\r\n                try { ace.settings.check(\'main-co" +
-"ntainer\', \'fixed\') } catch (e) { }\r\n            });\r\n        </script>\r\n\r\n      " +
-"  <!-- #section:basics/sidebar -->\r\n        <div");
-
-WriteLiteral(" id=\"sidebar\"");
-
-WriteLiteral(" class=\"sidebar responsive\"");
-
-WriteLiteral(">\r\n            <script");
-
-WriteLiteral(" type=\"text/javascript\"");
-
-WriteLiteral(">\r\n                $(function () {\r\n                    try { ace.settings.check(" +
-"\'sidebar\', \'fixed\') } catch (e) { }\r\n                });\r\n            </script>\r" +
-"\n\r\n");
-
-WriteLiteral("            ");
-
-            
-            #line 68 "..\..\Areas\Admin\Views\Index\Index.cshtml"
-       Write(Html.Partial("_Left"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n            <!-- #section:basics/sidebar.layout.minimize -->\r\n            <div");
-
-WriteLiteral(" class=\"sidebar-toggle sidebar-collapse\"");
-
-WriteLiteral(" id=\"sidebar-collapse\"");
-
-WriteLiteral(">\r\n                <i");
-
-WriteLiteral(" class=\"ace-icon fa fa-angle-double-left\"");
-
-WriteLiteral(" data-icon1=\"ace-icon fa fa-angle-double-left\"");
-
-WriteLiteral(" data-icon2=\"ace-icon fa fa-angle-double-right\"");
-
-WriteLiteral("></i>\r\n            </div>\r\n\r\n            <!-- /section:basics/sidebar.layout.mini" +
-"mize -->\r\n            <script");
-
-WriteLiteral(" type=\"text/javascript\"");
-
-WriteLiteral(">\r\n                $(function () {\r\n                    try { ace.settings.check(" +
-"\'sidebar\', \'collapsed\') } catch (e) { }\r\n                })\r\n            </scrip" +
-"t>\r\n        </div>\r\n\r\n        <!-- /section:basics/sidebar -->\r\n        <div");
-
-WriteLiteral(" class=\"main-content\"");
-
-WriteLiteral(">\r\n            <div");
-
-WriteLiteral(" class=\"main-content-inner\"");
-
-WriteLiteral(">\r\n                <!-- /section:basics/content.breadcrumbs -->\r\n                " +
-"<div");
-
-WriteLiteral(" class=\"page-content\"");
-
-WriteLiteral(" style=\"padding: 0px;\"");
-
-WriteLiteral(">\r\n                    <iframe");
-
-WriteLiteral(" style=\"width: 100%; height: 100%; margin: 0; padding: 0; border: none;\"");
-
-WriteLiteral(" id=\"main\"");
-
-WriteLiteral(" name=\"main\"");
-
-WriteAttribute("src", Tuple.Create(" src=\"", 3603), Tuple.Create("\"", 3622)
-            
-            #line 87 "..\..\Areas\Admin\Views\Index\Index.cshtml"
-                                               , Tuple.Create(Tuple.Create("", 3609), Tuple.Create<System.Object, System.Int32>(ViewBag.Main
-            
-            #line default
-            #line hidden
-, 3609), false)
-);
-
-WriteLiteral("></iframe>\r\n                </div>\r\n                <!-- /.page-content -->\r\n    " +
-"        </div>\r\n        </div>\r\n        <!-- /.main-content -->\r\n        <a");
-
-WriteLiteral(" href=\"#\"");
-
-WriteLiteral(" id=\"btn-scroll-up\"");
-
-WriteLiteral(" class=\"btn-scroll-up btn btn-sm btn-inverse\"");
-
-WriteLiteral(">\r\n            <i");
-
-WriteLiteral(" class=\"ace-icon fa fa-angle-double-up icon-only bigger-110\"");
-
-WriteLiteral("></i>\r\n        </a>\r\n    </div>\r\n    <!-- /.main-container -->\r\n    <!-- basic sc" +
-"ripts -->\r\n    <script");
-
-WriteAttribute("src", Tuple.Create(" src=\"", 4032), Tuple.Create("\"", 4077)
-, Tuple.Create(Tuple.Create("", 4038), Tuple.Create<System.Object, System.Int32>(Href("~/Content/bootstrap/js/bootstrap.min.js")
-, 4038), false)
-);
-
-WriteLiteral("></script>\r\n    <script");
-
-WriteAttribute("src", Tuple.Create(" src=\"", 4101), Tuple.Create("\"", 4143)
-, Tuple.Create(Tuple.Create("", 4107), Tuple.Create<System.Object, System.Int32>(Href("~/Content/js/jquery-ui.custom.min.js")
-, 4107), false)
-);
-
-WriteLiteral("></script>\r\n    <script");
-
-WriteAttribute("src", Tuple.Create(" src=\"", 4167), Tuple.Create("\"", 4214)
-, Tuple.Create(Tuple.Create("", 4173), Tuple.Create<System.Object, System.Int32>(Href("~/Content/js/jquery.ui.touch-punch.min.js")
-, 4173), false)
-);
-
-WriteLiteral("></script>\r\n\r\n    <!-- ace scripts -->\r\n    <script");
-
-WriteAttribute("src", Tuple.Create(" src=\"", 4266), Tuple.Create("\"", 4308)
-, Tuple.Create(Tuple.Create("", 4272), Tuple.Create<System.Object, System.Int32>(Href("~/Content/ace/js/ace-elements.min.js")
-, 4272), false)
-);
-
-WriteLiteral("></script>\r\n    <script");
-
-WriteAttribute("src", Tuple.Create(" src=\"", 4332), Tuple.Create("\"", 4365)
-, Tuple.Create(Tuple.Create("", 4338), Tuple.Create<System.Object, System.Int32>(Href("~/Content/ace/js/ace.min.js")
-, 4338), false)
-);
-
-WriteLiteral("></script>\r\n    ");
-
-WriteLiteral("\r\n    <script");
-
-WriteAttribute("src", Tuple.Create(" src=\"", 4408), Tuple.Create("\"", 4457)
-, Tuple.Create(Tuple.Create("", 4414), Tuple.Create<System.Object, System.Int32>(Href("~/Content/artDialog/dist/dialog-plus-min.js")
-, 4414), false)
-);
-
-WriteLiteral("></script>\r\n    <script");
-
-WriteAttribute("src", Tuple.Create(" src=\"", 4481), Tuple.Create("\"", 4530)
-, Tuple.Create(Tuple.Create("", 4487), Tuple.Create<System.Object, System.Int32>(Href("~/Content/artDialog/dist/dialog.new.life.js")
-, 4487), false)
-);
-
-WriteLiteral("></script>\r\n\r\n    <script");
-
-WriteLiteral(" type=\"text/javascript\"");
-
-WriteLiteral(">\r\n                $(function () {\r\n                    var $frmContent = $(\'#mai" +
-"n\');\r\n                    function fixFrmContentSize() {\r\n                      " +
-"  var offset = $frmContent.offset();\r\n                        var top = offset.t" +
-"op;\r\n                        var height = document.documentElement.clientHeight;" +
-"\r\n                        $frmContent.height(height - top);\r\n                   " +
-" }\r\n                    fixFrmContentSize();\r\n                    $(window).resi" +
-"ze(fixFrmContentSize);\r\n\r\n                    //增加iframe被嵌套的检测2015-6-4 景裔增加\r\n   " +
-"                 if (window != top) {\r\n                        top.location.href" +
-" = location.href;\r\n                    }\r\n\r\n                    //菜单active样式\r\n  " +
-"                  $(\".nav-list\").children(\"li\").click(function () {\r\n           " +
-"             var $this = $(this);\r\n                        $this.siblings(\"li\")." +
-"each(function () {\r\n                            var $item = $(this);\r\n          " +
-"                  if ($item.attr(\"class\") == \"open\") {\r\n                        " +
-"        $item.removeClass(\"open\");\r\n                                $item.childr" +
-"en(\".submenu\").hide();\r\n                            }\r\n                        }" +
-");\r\n                        $this.addClass(\'open\');\r\n                    });\r\n\r\n" +
-"                    $(\".submenu li\").click(function () {\r\n                      " +
-"  var $this = $(this);\r\n                        //兄弟节点去焦\r\n                      " +
-"  $this.siblings(\"li\").removeClass(\"active\");\r\n                        $this.add" +
-"Class(\'active\');\r\n                        //父节点获取焦点\r\n                        var" +
-" $parent = $this.parent().parent();\r\n                        $parent.addClass(\"a" +
-"ctive\");\r\n                        $parent.siblings(\"li\").each(function () {\r\n   " +
-"                         var $item = $(this);\r\n                            $item" +
-".removeClass(\"open\").removeClass(\"active\");\r\n                            $item.c" +
-"hildren(\".submenu\").hide();\r\n                            if ($item.children(\".su" +
-"bmenu\").length != 0) {\r\n                                $item.children(\".submenu" +
-"\").children(\"li\").removeClass(\"active\");\r\n                            }\r\n       " +
-"                 });\r\n                    });\r\n                });\r\n\r\n    </scri" +
-"pt>\r\n</body>\r\n</html>");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Areas/Admin/Views/Index/Main.cshtml b/NewLife.Cube/Areas/Admin/Views/Index/Main.cshtml
deleted file mode 100644
index dde7ce69fd..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/Index/Main.cshtml
+++ /dev/null
@@ -1,167 +0,0 @@
-﻿@using System.Diagnostics;
-@using System.Collections;
-@using System.Reflection;
-@using System.Runtime.Versioning;
-@using NewLife.Common;
-@using NewLife.Web;
-@{
-    Layout = NewLife.Cube.Setting.Current.Layout;
-
-    ViewBag.Title = "服务器信息";
-
-    var asm = Assembly.GetExecutingAssembly();
-    var att = asm.GetCustomAttribute<TargetFrameworkAttribute>();
-    var ver = att.FrameworkDisplayName ?? att.FrameworkName;
-    var req = HttpContext.Current.Request;
-}
-<table class="table table-bordered table-hover table-striped table-condensed">
-    <thead>
-        <tr>
-            <th colspan="4">
-                服务器信息
-            </th>
-        </tr>
-    </thead>
-    <tbody>
-        <tr>
-            <td class="name">
-                应用系统：
-            </td>
-            <td class="value">
-                @HttpRuntime.AppDomainAppVirtualPath&nbsp;
-                @if (this.Has((PermissionFlags)16))
-                {
-                    <a href="@Url.Action("Restart")" onclick="return confirm('仅重启ASP.Net应用程序域，而不是操作系统！\n确认重启？')">重启应用系统</a>
-                }
-                &nbsp;&nbsp;&nbsp;&nbsp;@req.GetRawUrl()
-            </td>
-            <td class="name">
-                目录：
-            </td>
-            <td class="value">
-                @HttpRuntime.AppDomainAppPath
-            </td>
-        </tr>
-        <tr>
-            <td class="name">
-                域名地址：
-            </td>
-            <td class="value">
-                <span title="SERVER_NAME">@Request.ServerVariables["SERVER_NAME"]</span>，
-                <span title="LOCAl_ADDR">@Request.ServerVariables["LOCAl_ADDR"]:@Request.ServerVariables["Server_Port"]</span>
-                &nbsp;<span title="REMOTE_HOST">[@Request.ServerVariables["REMOTE_HOST"]]</span>
-                <a href="@Url.Action("Main/ServerVar")" target="_blank" title="点击打开服务器变量列表">服务器变量列表</a>
-            </td>
-            <td class="name">
-                计算机用户：
-            </td>
-            <td class="value">
-                @Environment.UserName/@Environment.MachineName
-            </td>
-        </tr>
-        <tr>
-            <td class="name">
-                应用程序域：
-            </td>
-            <td class="value">
-                @AppDomain.CurrentDomain.FriendlyName
-                <a href="@Url.Action("Main/Assembly")" target="_blank" title="点击打开进程程序集列表">程序集列表</a>
-            </td>
-            <td class="name">
-                .Net 版本：
-            </td>
-            <td class="value">
-                @Environment.Version &nbsp;@ver
-            </td>
-        </tr>
-        <tr>
-            <td class="name">
-                操作系统：
-            </td>
-            <td class="value">
-                @Runtime.OSName
-            </td>
-            <td class="name">
-                Web服务器：
-            </td>
-            <td class="value">
-                @ViewBag.WebServerName
-            </td>
-        </tr>
-        <tr>
-            <td class="name">
-                处理器：
-            </td>
-            <td class="value">
-                @Environment.ProcessorCount
-                核心
-            </td>
-            <td class="name">
-                时间：
-            </td>
-            <td class="value" title="这里使用了服务器默认的时间格式！后面是开机时间。">
-                @DateTime.Now，开机@(new TimeSpan(0, 0, 0, 0, Environment.TickCount))
-            </td>
-        </tr>
-        <tr>
-            @{ var process = Process.GetCurrentProcess();}
-            <td class="name">
-                内存：
-            </td>
-            <td class="value">
-                物理内存：@(Runtime.AvailableMemory.ToString("n0"))M / @(Runtime.PhysicalMemory.ToString("n0"))M
-                工作集: @((process.WorkingSet64 / 1024 / 1024).ToString("n0"))M
-                提交: @((process.PrivateMemorySize64 / 1024 / 1024).ToString("n0"))M
-                GC: @((GC.GetTotalMemory(false) / 1024 / 1024).ToString("n0"))M
-                <a href="@Url.Action("Main/ProcessModules")" target="_blank" title="点击打开进程模块列表">模块列表</a>
-            </td>
-            <td class="name">
-                进程时间：
-            </td>
-            <td class="value">
-                @process.TotalProcessorTime.TotalSeconds.ToString("N2")秒 启动于 @process.StartTime.ToFullString()
-            </td>
-        </tr>
-        <tr>
-            <td class="name">
-                Session：
-            </td>
-            <td class="value">
-                @Session.Contents.Count 个，@Session.Timeout 分钟，SessionID：@Session.Contents.SessionID
-                <a href="@Url.Action("Main/Session")" target="_blank" title="点击打开Session列表">Session列表</a>
-            </td>
-            <td class="name">
-                Cache：
-            </td>
-            <td class="value">
-                @Cache.Count 个，可用：@((Cache.EffectivePrivateBytesLimit / 1024).ToString("n0"))KB
-                <a href="@Url.Action("Main/Cache")" target="_blank" title="点击打开Cache列表">Cache列表</a>
-            </td>
-        </tr>
-    </tbody>
-</table>
-<table class="table table-bordered table-hover table-striped table-condensed">
-    <thead>
-        <tr>
-            <th>名称</th>
-            <th>标题</th>
-            <th>文件版本</th>
-            <th>内部版本</th>
-            <th>编译时间</th>
-            <th>描述</th>
-        </tr>
-    </thead>
-    <tbody>
-        @foreach (AssemblyX item in ViewBag.MyAsms)
-        {
-            <tr>
-                <td>@item.Name</td>
-                <td>@item.Title</td>
-                <td>@item.FileVersion</td>
-                <td>@item.Version</td>
-                <td>@item.Compile.ToFullString()</td>
-                <td>@item.Description</td>
-            </tr>
-        }
-    </tbody>
-</table>
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Views/Index/Main.generated.cs b/NewLife.Cube/Areas/Admin/Views/Index/Main.generated.cs
deleted file mode 100644
index e3ef1244f6..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/Index/Main.generated.cs
+++ /dev/null
@@ -1,738 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    
-    #line 2 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-    using System.Collections;
-    
-    #line default
-    #line hidden
-    using System.Collections.Generic;
-    
-    #line 1 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-    using System.Diagnostics;
-    
-    #line default
-    #line hidden
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    
-    #line 3 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-    using System.Reflection;
-    
-    #line default
-    #line hidden
-    
-    #line 4 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-    using System.Runtime.Versioning;
-    
-    #line default
-    #line hidden
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    
-    #line 5 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-    using NewLife.Common;
-    
-    #line default
-    #line hidden
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    
-    #line 6 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-    using NewLife.Web;
-    
-    #line default
-    #line hidden
-    using XCode;
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Admin/Views/Index/Main.cshtml")]
-    public partial class _Areas_Admin_Views_Index_Main_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Areas_Admin_Views_Index_Main_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 7 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-  
-    Layout = NewLife.Cube.Setting.Current.Layout;
-
-    ViewBag.Title = "服务器信息";
-
-    var asm = Assembly.GetExecutingAssembly();
-    var att = asm.GetCustomAttribute<TargetFrameworkAttribute>();
-    var ver = att.FrameworkDisplayName ?? att.FrameworkName;
-    var req = HttpContext.Current.Request;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n<table");
-
-WriteLiteral(" class=\"table table-bordered table-hover table-striped table-condensed\"");
-
-WriteLiteral(">\r\n    <thead>\r\n        <tr>\r\n            <th");
-
-WriteLiteral(" colspan=\"4\"");
-
-WriteLiteral(">\r\n                服务器信息\r\n            </th>\r\n        </tr>\r\n    </thead>\r\n    <tb" +
-"ody>\r\n        <tr>\r\n            <td");
-
-WriteLiteral(" class=\"name\"");
-
-WriteLiteral(">\r\n                应用系统：\r\n            </td>\r\n            <td");
-
-WriteLiteral(" class=\"value\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("                ");
-
-            
-            #line 31 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-           Write(HttpRuntime.AppDomainAppVirtualPath);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("&nbsp;\r\n");
-
-            
-            #line 32 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-                
-            
-            #line default
-            #line hidden
-            
-            #line 32 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-                 if (this.Has((PermissionFlags)16))
-                {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                    <a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 970), Tuple.Create("\"", 999)
-            
-            #line 34 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-, Tuple.Create(Tuple.Create("", 977), Tuple.Create<System.Object, System.Int32>(Url.Action("Restart")
-            
-            #line default
-            #line hidden
-, 977), false)
-);
-
-WriteLiteral(" onclick=\"return confirm(\'仅重启ASP.Net应用程序域，而不是操作系统！\\n确认重启？\')\"");
-
-WriteLiteral(">重启应用系统</a>\r\n");
-
-            
-            #line 35 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-                }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                &nbsp;&nbsp;&nbsp;&nbsp;");
-
-            
-            #line 36 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-                                   Write(req.GetRawUrl());
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n            </td>\r\n            <td");
-
-WriteLiteral(" class=\"name\"");
-
-WriteLiteral(">\r\n                目录：\r\n            </td>\r\n            <td");
-
-WriteLiteral(" class=\"value\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("                ");
-
-            
-            #line 42 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-           Write(HttpRuntime.AppDomainAppPath);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n            <td");
-
-WriteLiteral(" class=\"name\"");
-
-WriteLiteral(">\r\n                域名地址：\r\n            </td>\r\n            <td");
-
-WriteLiteral(" class=\"value\"");
-
-WriteLiteral(">\r\n                <span");
-
-WriteLiteral(" title=\"SERVER_NAME\"");
-
-WriteLiteral(">");
-
-            
-            #line 50 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-                                     Write(Request.ServerVariables["SERVER_NAME"]);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</span>，\r\n                <span");
-
-WriteLiteral(" title=\"LOCAl_ADDR\"");
-
-WriteLiteral(">");
-
-            
-            #line 51 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-                                    Write(Request.ServerVariables["LOCAl_ADDR"]);
-
-            
-            #line default
-            #line hidden
-WriteLiteral(":");
-
-            
-            #line 51 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-                                                                           Write(Request.ServerVariables["Server_Port"]);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</span>\r\n                &nbsp;<span");
-
-WriteLiteral(" title=\"REMOTE_HOST\"");
-
-WriteLiteral(">[");
-
-            
-            #line 52 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-                                            Write(Request.ServerVariables["REMOTE_HOST"]);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("]</span>\r\n                <a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1807), Tuple.Create("\"", 1843)
-            
-            #line 53 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-, Tuple.Create(Tuple.Create("", 1814), Tuple.Create<System.Object, System.Int32>(Url.Action("Main/ServerVar")
-            
-            #line default
-            #line hidden
-, 1814), false)
-);
-
-WriteLiteral(" target=\"_blank\"");
-
-WriteLiteral(" title=\"点击打开服务器变量列表\"");
-
-WriteLiteral(">服务器变量列表</a>\r\n            </td>\r\n            <td");
-
-WriteLiteral(" class=\"name\"");
-
-WriteLiteral(">\r\n                计算机用户：\r\n            </td>\r\n            <td");
-
-WriteLiteral(" class=\"value\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("                ");
-
-            
-            #line 59 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-           Write(Environment.UserName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("/");
-
-            
-            #line 59 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-                                 Write(Environment.MachineName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n            <td");
-
-WriteLiteral(" class=\"name\"");
-
-WriteLiteral(">\r\n                应用程序域：\r\n            </td>\r\n            <td");
-
-WriteLiteral(" class=\"value\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("                ");
-
-            
-            #line 67 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-           Write(AppDomain.CurrentDomain.FriendlyName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n                <a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 2310), Tuple.Create("\"", 2345)
-            
-            #line 68 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-, Tuple.Create(Tuple.Create("", 2317), Tuple.Create<System.Object, System.Int32>(Url.Action("Main/Assembly")
-            
-            #line default
-            #line hidden
-, 2317), false)
-);
-
-WriteLiteral(" target=\"_blank\"");
-
-WriteLiteral(" title=\"点击打开进程程序集列表\"");
-
-WriteLiteral(">程序集列表</a>\r\n            </td>\r\n            <td");
-
-WriteLiteral(" class=\"name\"");
-
-WriteLiteral(">\r\n                .Net 版本：\r\n            </td>\r\n            <td");
-
-WriteLiteral(" class=\"value\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("                ");
-
-            
-            #line 74 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-           Write(Environment.Version);
-
-            
-            #line default
-            #line hidden
-WriteLiteral(" &nbsp;");
-
-            
-            #line 74 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-                                      Write(ver);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n            <td");
-
-WriteLiteral(" class=\"name\"");
-
-WriteLiteral(">\r\n                操作系统：\r\n            </td>\r\n            <td");
-
-WriteLiteral(" class=\"value\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("                ");
-
-            
-            #line 82 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-           Write(Runtime.OSName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n            </td>\r\n            <td");
-
-WriteLiteral(" class=\"name\"");
-
-WriteLiteral(">\r\n                Web服务器：\r\n            </td>\r\n            <td");
-
-WriteLiteral(" class=\"value\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("                ");
-
-            
-            #line 88 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-           Write(ViewBag.WebServerName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n            <td");
-
-WriteLiteral(" class=\"name\"");
-
-WriteLiteral(">\r\n                处理器：\r\n            </td>\r\n            <td");
-
-WriteLiteral(" class=\"value\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("                ");
-
-            
-            #line 96 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-           Write(Environment.ProcessorCount);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n                核心\r\n            </td>\r\n            <td");
-
-WriteLiteral(" class=\"name\"");
-
-WriteLiteral(">\r\n                时间：\r\n            </td>\r\n            <td");
-
-WriteLiteral(" class=\"value\"");
-
-WriteLiteral(" title=\"这里使用了服务器默认的时间格式！后面是开机时间。\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("                ");
-
-            
-            #line 103 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-           Write(DateTime.Now);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("，开机");
-
-            
-            #line 103 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-                            Write(new TimeSpan(0, 0, 0, 0, Environment.TickCount));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n");
-
-            
-            #line 107 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-            
-            
-            #line default
-            #line hidden
-            
-            #line 107 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-               var process = Process.GetCurrentProcess();
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n            <td");
-
-WriteLiteral(" class=\"name\"");
-
-WriteLiteral(">\r\n                内存：\r\n            </td>\r\n            <td");
-
-WriteLiteral(" class=\"value\"");
-
-WriteLiteral(">\r\n                物理内存：");
-
-            
-            #line 112 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-                 Write(Runtime.AvailableMemory.ToString("n0"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("M / ");
-
-            
-            #line 112 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-                                                              Write(Runtime.PhysicalMemory.ToString("n0"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("M\r\n                工作集: ");
-
-            
-            #line 113 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-                 Write((process.WorkingSet64 / 1024 / 1024).ToString("n0"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("M\r\n                提交: ");
-
-            
-            #line 114 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-                Write((process.PrivateMemorySize64 / 1024 / 1024).ToString("n0"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("M\r\n                GC: ");
-
-            
-            #line 115 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-                Write((GC.GetTotalMemory(false) / 1024 / 1024).ToString("n0"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("M\r\n                <a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 3959), Tuple.Create("\"", 4000)
-            
-            #line 116 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-, Tuple.Create(Tuple.Create("", 3966), Tuple.Create<System.Object, System.Int32>(Url.Action("Main/ProcessModules")
-            
-            #line default
-            #line hidden
-, 3966), false)
-);
-
-WriteLiteral(" target=\"_blank\"");
-
-WriteLiteral(" title=\"点击打开进程模块列表\"");
-
-WriteLiteral(">模块列表</a>\r\n            </td>\r\n            <td");
-
-WriteLiteral(" class=\"name\"");
-
-WriteLiteral(">\r\n                进程时间：\r\n            </td>\r\n            <td");
-
-WriteLiteral(" class=\"value\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("                ");
-
-            
-            #line 122 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-           Write(process.TotalProcessorTime.TotalSeconds.ToString("N2"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("秒 启动于 ");
-
-            
-            #line 122 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-                                                                        Write(process.StartTime.ToFullString());
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n            <td");
-
-WriteLiteral(" class=\"name\"");
-
-WriteLiteral(">\r\n                Session：\r\n            </td>\r\n            <td");
-
-WriteLiteral(" class=\"value\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("                ");
-
-            
-            #line 130 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-           Write(Session.Contents.Count);
-
-            
-            #line default
-            #line hidden
-WriteLiteral(" 个，");
-
-            
-            #line 130 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-                                     Write(Session.Timeout);
-
-            
-            #line default
-            #line hidden
-WriteLiteral(" 分钟，SessionID：");
-
-            
-            #line 130 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-                                                                   Write(Session.Contents.SessionID);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n                <a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 4558), Tuple.Create("\"", 4592)
-            
-            #line 131 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-, Tuple.Create(Tuple.Create("", 4565), Tuple.Create<System.Object, System.Int32>(Url.Action("Main/Session")
-            
-            #line default
-            #line hidden
-, 4565), false)
-);
-
-WriteLiteral(" target=\"_blank\"");
-
-WriteLiteral(" title=\"点击打开Session列表\"");
-
-WriteLiteral(">Session列表</a>\r\n            </td>\r\n            <td");
-
-WriteLiteral(" class=\"name\"");
-
-WriteLiteral(">\r\n                Cache：\r\n            </td>\r\n            <td");
-
-WriteLiteral(" class=\"value\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("                ");
-
-            
-            #line 137 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-           Write(Cache.Count);
-
-            
-            #line default
-            #line hidden
-WriteLiteral(" 个，可用：");
-
-            
-            #line 137 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-                              Write((Cache.EffectivePrivateBytesLimit / 1024).ToString("n0"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("KB\r\n                <a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 4887), Tuple.Create("\"", 4919)
-            
-            #line 138 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-, Tuple.Create(Tuple.Create("", 4894), Tuple.Create<System.Object, System.Int32>(Url.Action("Main/Cache")
-            
-            #line default
-            #line hidden
-, 4894), false)
-);
-
-WriteLiteral(" target=\"_blank\"");
-
-WriteLiteral(" title=\"点击打开Cache列表\"");
-
-WriteLiteral(">Cache列表</a>\r\n            </td>\r\n        </tr>\r\n    </tbody>\r\n</table>\r\n<table");
-
-WriteLiteral(" class=\"table table-bordered table-hover table-striped table-condensed\"");
-
-WriteLiteral(">\r\n    <thead>\r\n        <tr>\r\n            <th>名称</th>\r\n            <th>标题</th>\r\n " +
-"           <th>文件版本</th>\r\n            <th>内部版本</th>\r\n            <th>编译时间</th>\r\n" +
-"            <th>描述</th>\r\n        </tr>\r\n    </thead>\r\n    <tbody>\r\n");
-
-            
-            #line 155 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-        
-            
-            #line default
-            #line hidden
-            
-            #line 155 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-         foreach (AssemblyX item in ViewBag.MyAsms)
-        {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            <tr>\r\n                <td>");
-
-            
-            #line 158 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-               Write(item.Name);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td>");
-
-            
-            #line 159 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-               Write(item.Title);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td>");
-
-            
-            #line 160 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-               Write(item.FileVersion);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td>");
-
-            
-            #line 161 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-               Write(item.Version);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td>");
-
-            
-            #line 162 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-               Write(item.Compile.ToFullString());
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td>");
-
-            
-            #line 163 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-               Write(item.Description);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n            </tr>\r\n");
-
-            
-            #line 165 "..\..\Areas\Admin\Views\Index\Main.cshtml"
-        }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("    </tbody>\r\n</table>");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Areas/Admin/Views/Index/ProcessModules.cshtml b/NewLife.Cube/Areas/Admin/Views/Index/ProcessModules.cshtml
deleted file mode 100644
index bc0e45956d..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/Index/ProcessModules.cshtml
+++ /dev/null
@@ -1,88 +0,0 @@
-﻿@using System.Diagnostics;
-@using System.Collections;
-@using System.Reflection;
-@using System.Runtime.Versioning;
-@using NewLife.Common;
-@{
-    Layout = NewLife.Cube.Setting.Current.Layout;
-
-    ViewBag.Title = "进程模块";
-    var Act = ViewBag.Act;
-
-    var asm = Assembly.GetExecutingAssembly();
-    var att = asm.GetCustomAttribute<TargetFrameworkAttribute>();
-    var ver = att.FrameworkDisplayName ?? att.FrameworkName;
-
-    var isAll = String.Equals("All", Request["Mode"], StringComparison.OrdinalIgnoreCase);
-
-    var process = Process.GetCurrentProcess();
-    var list = new List<ProcessModule>();
-    foreach (ProcessModule item in process.Modules)
-    {
-        if (isAll || item.FileVersionInfo.CompanyName != "Microsoft Corporation") { list.Add(item); }
-    }
-}
-<table class="table table-bordered table-hover table-striped table-condensed">
-    <tr>
-        <th colspan="7">
-            进程模块(@process.ProcessName , PID=@process.Id )
-            @if (!isAll)
-                {
-                <text>（<a href="?Mode=All">完整</a>，仅用户）：</text>
-                }
-                else
-                {
-                <text>（完整，<a href="?Mode=OnlyUser">仅用户</a>）：</text>
-                }
-        </th>
-    </tr>
-    <tr>
-        <th>
-            模块名称
-        </th>
-        <th>
-            公司名称
-        </th>
-        <th>
-            产品名称
-        </th>
-        <th>
-            描述
-        </th>
-        <th>
-            版本
-        </th>
-        <th>
-            大小
-        </th>
-        <th>
-            路径
-        </th>
-    </tr>
-    @foreach (ProcessModule item in list)
-    {
-        <tr>
-            <td>
-                @item.ModuleName
-            </td>
-            <td>
-                @item.FileVersionInfo.CompanyName
-            </td>
-            <td>
-                @item.FileVersionInfo.ProductName
-            </td>
-            <td>
-                @item.FileVersionInfo.FileDescription
-            </td>
-            <td>
-                @item.FileVersionInfo.FileVersion
-            </td>
-            <td>
-                @item.ModuleMemorySize
-            </td>
-            <td>
-                @item.FileName
-            </td>
-        </tr>
-    }
-</table>
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Views/Index/ProcessModules.generated.cs b/NewLife.Cube/Areas/Admin/Views/Index/ProcessModules.generated.cs
deleted file mode 100644
index dea7345523..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/Index/ProcessModules.generated.cs
+++ /dev/null
@@ -1,309 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    
-    #line 2 "..\..\Areas\Admin\Views\Index\ProcessModules.cshtml"
-    using System.Collections;
-    
-    #line default
-    #line hidden
-    using System.Collections.Generic;
-    
-    #line 1 "..\..\Areas\Admin\Views\Index\ProcessModules.cshtml"
-    using System.Diagnostics;
-    
-    #line default
-    #line hidden
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    
-    #line 3 "..\..\Areas\Admin\Views\Index\ProcessModules.cshtml"
-    using System.Reflection;
-    
-    #line default
-    #line hidden
-    
-    #line 4 "..\..\Areas\Admin\Views\Index\ProcessModules.cshtml"
-    using System.Runtime.Versioning;
-    
-    #line default
-    #line hidden
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    
-    #line 5 "..\..\Areas\Admin\Views\Index\ProcessModules.cshtml"
-    using NewLife.Common;
-    
-    #line default
-    #line hidden
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Admin/Views/Index/ProcessModules.cshtml")]
-    public partial class _Areas_Admin_Views_Index_ProcessModules_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Areas_Admin_Views_Index_ProcessModules_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 6 "..\..\Areas\Admin\Views\Index\ProcessModules.cshtml"
-  
-    Layout = NewLife.Cube.Setting.Current.Layout;
-
-    ViewBag.Title = "进程模块";
-    var Act = ViewBag.Act;
-
-    var asm = Assembly.GetExecutingAssembly();
-    var att = asm.GetCustomAttribute<TargetFrameworkAttribute>();
-    var ver = att.FrameworkDisplayName ?? att.FrameworkName;
-
-    var isAll = String.Equals("All", Request["Mode"], StringComparison.OrdinalIgnoreCase);
-
-    var process = Process.GetCurrentProcess();
-    var list = new List<ProcessModule>();
-    foreach (ProcessModule item in process.Modules)
-    {
-        if (isAll || item.FileVersionInfo.CompanyName != "Microsoft Corporation") { list.Add(item); }
-    }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n<table");
-
-WriteLiteral(" class=\"table table-bordered table-hover table-striped table-condensed\"");
-
-WriteLiteral(">\r\n    <tr>\r\n        <th");
-
-WriteLiteral(" colspan=\"7\"");
-
-WriteLiteral(">\r\n            进程模块(");
-
-            
-            #line 28 "..\..\Areas\Admin\Views\Index\ProcessModules.cshtml"
-            Write(process.ProcessName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral(" , PID=");
-
-            
-            #line 28 "..\..\Areas\Admin\Views\Index\ProcessModules.cshtml"
-                                       Write(process.Id);
-
-            
-            #line default
-            #line hidden
-WriteLiteral(" )\r\n");
-
-            
-            #line 29 "..\..\Areas\Admin\Views\Index\ProcessModules.cshtml"
-            
-            
-            #line default
-            #line hidden
-            
-            #line 29 "..\..\Areas\Admin\Views\Index\ProcessModules.cshtml"
-             if (!isAll)
-                {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                ");
-
-WriteLiteral("（<a");
-
-WriteLiteral(" href=\"?Mode=All\"");
-
-WriteLiteral(">完整</a>，仅用户）：");
-
-WriteLiteral("\r\n");
-
-            
-            #line 32 "..\..\Areas\Admin\Views\Index\ProcessModules.cshtml"
-                }
-                else
-                {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                ");
-
-WriteLiteral("（完整，<a");
-
-WriteLiteral(" href=\"?Mode=OnlyUser\"");
-
-WriteLiteral(">仅用户</a>）：");
-
-WriteLiteral("\r\n");
-
-            
-            #line 36 "..\..\Areas\Admin\Views\Index\ProcessModules.cshtml"
-                }
-
-            
-            #line default
-            #line hidden
-WriteLiteral(@"        </th>
-    </tr>
-    <tr>
-        <th>
-            模块名称
-        </th>
-        <th>
-            公司名称
-        </th>
-        <th>
-            产品名称
-        </th>
-        <th>
-            描述
-        </th>
-        <th>
-            版本
-        </th>
-        <th>
-            大小
-        </th>
-        <th>
-            路径
-        </th>
-    </tr>
-");
-
-            
-            #line 62 "..\..\Areas\Admin\Views\Index\ProcessModules.cshtml"
-    
-            
-            #line default
-            #line hidden
-            
-            #line 62 "..\..\Areas\Admin\Views\Index\ProcessModules.cshtml"
-     foreach (ProcessModule item in list)
-    {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        <tr>\r\n            <td>\r\n");
-
-WriteLiteral("                ");
-
-            
-            #line 66 "..\..\Areas\Admin\Views\Index\ProcessModules.cshtml"
-           Write(item.ModuleName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n            </td>\r\n            <td>\r\n");
-
-WriteLiteral("                ");
-
-            
-            #line 69 "..\..\Areas\Admin\Views\Index\ProcessModules.cshtml"
-           Write(item.FileVersionInfo.CompanyName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n            </td>\r\n            <td>\r\n");
-
-WriteLiteral("                ");
-
-            
-            #line 72 "..\..\Areas\Admin\Views\Index\ProcessModules.cshtml"
-           Write(item.FileVersionInfo.ProductName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n            </td>\r\n            <td>\r\n");
-
-WriteLiteral("                ");
-
-            
-            #line 75 "..\..\Areas\Admin\Views\Index\ProcessModules.cshtml"
-           Write(item.FileVersionInfo.FileDescription);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n            </td>\r\n            <td>\r\n");
-
-WriteLiteral("                ");
-
-            
-            #line 78 "..\..\Areas\Admin\Views\Index\ProcessModules.cshtml"
-           Write(item.FileVersionInfo.FileVersion);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n            </td>\r\n            <td>\r\n");
-
-WriteLiteral("                ");
-
-            
-            #line 81 "..\..\Areas\Admin\Views\Index\ProcessModules.cshtml"
-           Write(item.ModuleMemorySize);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n            </td>\r\n            <td>\r\n");
-
-WriteLiteral("                ");
-
-            
-            #line 84 "..\..\Areas\Admin\Views\Index\ProcessModules.cshtml"
-           Write(item.FileName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n            </td>\r\n        </tr>\r\n");
-
-            
-            #line 87 "..\..\Areas\Admin\Views\Index\ProcessModules.cshtml"
-    }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</table>");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Areas/Admin/Views/Index/ServerVar.cshtml b/NewLife.Cube/Areas/Admin/Views/Index/ServerVar.cshtml
deleted file mode 100644
index 7f9efbf685..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/Index/ServerVar.cshtml
+++ /dev/null
@@ -1,58 +0,0 @@
-﻿@using System.Diagnostics;
-@using System.Collections;
-@using System.Reflection;
-@using System.Runtime.Versioning;
-@using NewLife.Common;
-@{
-    Layout = NewLife.Cube.Setting.Current.Layout;
-
-    ViewBag.Title = "服务器变量列表";
-    var Act = ViewBag.Act;
-
-    var asm = Assembly.GetExecutingAssembly();
-    var att = asm.GetCustomAttribute<TargetFrameworkAttribute>();
-    var ver = att.FrameworkDisplayName ?? att.FrameworkName;
-    var req = HttpContext.Current.Request;
-}
-<table class="table table-bordered table-hover table-striped table-condensed">
-    <tr>
-        <th colspan="6">
-            服务器变量列表
-        </th>
-    </tr>
-    <tr>
-        <th>名称</th>
-        <th>数值</th>
-    </tr>
-    @foreach (var key in Request.ServerVariables.AllKeys)
-    {
-        var v = Request.ServerVariables[key];
-        v = v.Replace("\r\n", "</br>");
-        if (key.EqualIgnoreCase("HTTP_COOKIE")) { v = v.Replace(";", "</br>"); }
-        <tr>
-            <td>@key</td>
-            <td>@Html.Raw(v)</td>
-        </tr>
-    }
-</table>
-<table class="table table-bordered table-hover table-striped table-condensed">
-    <tr>
-        <th colspan="6">
-            Request变量列表&nbsp;&nbsp;&nbsp;&nbsp;@req.GetType().FullName
-        </th>
-    </tr>
-    <tr>
-        <th>名称</th>
-        <th>数值</th>
-    </tr>
-    @foreach (var pi in req.GetType().GetProperties())
-    {
-        if (pi.GetIndexParameters().Length > 0 || (pi.PropertyType != typeof(String) && pi.PropertyType != typeof(Uri))) { continue; }
-        var v = req.GetValue(pi) + "";
-        v = v.Replace("\r\n", "</br>");
-        <tr>
-            <td>@pi.Name</td>
-            <td>@Html.Raw(v)</td>
-        </tr>
-    }
-</table>
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Views/Index/ServerVar.generated.cs b/NewLife.Cube/Areas/Admin/Views/Index/ServerVar.generated.cs
deleted file mode 100644
index f4d3708123..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/Index/ServerVar.generated.cs
+++ /dev/null
@@ -1,215 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    
-    #line 2 "..\..\Areas\Admin\Views\Index\ServerVar.cshtml"
-    using System.Collections;
-    
-    #line default
-    #line hidden
-    using System.Collections.Generic;
-    
-    #line 1 "..\..\Areas\Admin\Views\Index\ServerVar.cshtml"
-    using System.Diagnostics;
-    
-    #line default
-    #line hidden
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    
-    #line 3 "..\..\Areas\Admin\Views\Index\ServerVar.cshtml"
-    using System.Reflection;
-    
-    #line default
-    #line hidden
-    
-    #line 4 "..\..\Areas\Admin\Views\Index\ServerVar.cshtml"
-    using System.Runtime.Versioning;
-    
-    #line default
-    #line hidden
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    
-    #line 5 "..\..\Areas\Admin\Views\Index\ServerVar.cshtml"
-    using NewLife.Common;
-    
-    #line default
-    #line hidden
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Admin/Views/Index/ServerVar.cshtml")]
-    public partial class _Areas_Admin_Views_Index_ServerVar_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Areas_Admin_Views_Index_ServerVar_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 6 "..\..\Areas\Admin\Views\Index\ServerVar.cshtml"
-  
-    Layout = NewLife.Cube.Setting.Current.Layout;
-
-    ViewBag.Title = "服务器变量列表";
-    var Act = ViewBag.Act;
-
-    var asm = Assembly.GetExecutingAssembly();
-    var att = asm.GetCustomAttribute<TargetFrameworkAttribute>();
-    var ver = att.FrameworkDisplayName ?? att.FrameworkName;
-    var req = HttpContext.Current.Request;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n<table");
-
-WriteLiteral(" class=\"table table-bordered table-hover table-striped table-condensed\"");
-
-WriteLiteral(">\r\n    <tr>\r\n        <th");
-
-WriteLiteral(" colspan=\"6\"");
-
-WriteLiteral(">\r\n            服务器变量列表\r\n        </th>\r\n    </tr>\r\n    <tr>\r\n        <th>名称</th>\r\n" +
-"        <th>数值</th>\r\n    </tr>\r\n");
-
-            
-            #line 27 "..\..\Areas\Admin\Views\Index\ServerVar.cshtml"
-    
-            
-            #line default
-            #line hidden
-            
-            #line 27 "..\..\Areas\Admin\Views\Index\ServerVar.cshtml"
-     foreach (var key in Request.ServerVariables.AllKeys)
-    {
-        var v = Request.ServerVariables[key];
-        v = v.Replace("\r\n", "</br>");
-        if (key.EqualIgnoreCase("HTTP_COOKIE")) { v = v.Replace(";", "</br>"); }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        <tr>\r\n            <td>");
-
-            
-            #line 33 "..\..\Areas\Admin\Views\Index\ServerVar.cshtml"
-           Write(key);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n            <td>");
-
-            
-            #line 34 "..\..\Areas\Admin\Views\Index\ServerVar.cshtml"
-           Write(Html.Raw(v));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n        </tr>\r\n");
-
-            
-            #line 36 "..\..\Areas\Admin\Views\Index\ServerVar.cshtml"
-    }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</table>\r\n<table");
-
-WriteLiteral(" class=\"table table-bordered table-hover table-striped table-condensed\"");
-
-WriteLiteral(">\r\n    <tr>\r\n        <th");
-
-WriteLiteral(" colspan=\"6\"");
-
-WriteLiteral(">\r\n            Request变量列表&nbsp;&nbsp;&nbsp;&nbsp;");
-
-            
-            #line 41 "..\..\Areas\Admin\Views\Index\ServerVar.cshtml"
-                                          Write(req.GetType().FullName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n        </th>\r\n    </tr>\r\n    <tr>\r\n        <th>名称</th>\r\n        <th>数值</th>\r\n " +
-"   </tr>\r\n");
-
-            
-            #line 48 "..\..\Areas\Admin\Views\Index\ServerVar.cshtml"
-    
-            
-            #line default
-            #line hidden
-            
-            #line 48 "..\..\Areas\Admin\Views\Index\ServerVar.cshtml"
-     foreach (var pi in req.GetType().GetProperties())
-    {
-        if (pi.GetIndexParameters().Length > 0 || (pi.PropertyType != typeof(String) && pi.PropertyType != typeof(Uri))) { continue; }
-        var v = req.GetValue(pi) + "";
-        v = v.Replace("\r\n", "</br>");
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        <tr>\r\n            <td>");
-
-            
-            #line 54 "..\..\Areas\Admin\Views\Index\ServerVar.cshtml"
-           Write(pi.Name);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n            <td>");
-
-            
-            #line 55 "..\..\Areas\Admin\Views\Index\ServerVar.cshtml"
-           Write(Html.Raw(v));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n        </tr>\r\n");
-
-            
-            #line 57 "..\..\Areas\Admin\Views\Index\ServerVar.cshtml"
-    }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</table>");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Areas/Admin/Views/Index/Session.cshtml b/NewLife.Cube/Areas/Admin/Views/Index/Session.cshtml
deleted file mode 100644
index d7de1ba0eb..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/Index/Session.cshtml
+++ /dev/null
@@ -1,35 +0,0 @@
-﻿@using System.Diagnostics;
-@using System.Collections;
-@using System.Reflection;
-@using System.Runtime.Versioning;
-@using NewLife.Common;
-@{
-    Layout = NewLife.Cube.Setting.Current.Layout;
-
-    ViewBag.Title = "Session列表";
-    var Act = ViewBag.Act;
-
-    var asm = Assembly.GetExecutingAssembly();
-    var att = asm.GetCustomAttribute<TargetFrameworkAttribute>();
-    var ver = att.FrameworkDisplayName ?? att.FrameworkName;
-}
-<table class="table table-bordered table-hover table-striped table-condensed">
-    <tr>
-        <th colspan="6">
-            Session列表(@Session.Contents.Count )
-        </th>
-    </tr>
-    <tr>
-        <th>名称</th>
-        <th>类型</th>
-        <th>数值</th>
-    </tr>
-    @foreach (String item in Session.Keys)
-        {
-        <tr>
-            <td>@item</td>
-            <td>@Session[item].GetType().FullName</td>
-            <td>@Session[item]</td>
-        </tr>
-        }
-</table>
diff --git a/NewLife.Cube/Areas/Admin/Views/Index/Session.generated.cs b/NewLife.Cube/Areas/Admin/Views/Index/Session.generated.cs
deleted file mode 100644
index c0c59c6a39..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/Index/Session.generated.cs
+++ /dev/null
@@ -1,165 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    
-    #line 2 "..\..\Areas\Admin\Views\Index\Session.cshtml"
-    using System.Collections;
-    
-    #line default
-    #line hidden
-    using System.Collections.Generic;
-    
-    #line 1 "..\..\Areas\Admin\Views\Index\Session.cshtml"
-    using System.Diagnostics;
-    
-    #line default
-    #line hidden
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    
-    #line 3 "..\..\Areas\Admin\Views\Index\Session.cshtml"
-    using System.Reflection;
-    
-    #line default
-    #line hidden
-    
-    #line 4 "..\..\Areas\Admin\Views\Index\Session.cshtml"
-    using System.Runtime.Versioning;
-    
-    #line default
-    #line hidden
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    
-    #line 5 "..\..\Areas\Admin\Views\Index\Session.cshtml"
-    using NewLife.Common;
-    
-    #line default
-    #line hidden
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Admin/Views/Index/Session.cshtml")]
-    public partial class _Areas_Admin_Views_Index_Session_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Areas_Admin_Views_Index_Session_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 6 "..\..\Areas\Admin\Views\Index\Session.cshtml"
-  
-    Layout = NewLife.Cube.Setting.Current.Layout;
-
-    ViewBag.Title = "Session列表";
-    var Act = ViewBag.Act;
-
-    var asm = Assembly.GetExecutingAssembly();
-    var att = asm.GetCustomAttribute<TargetFrameworkAttribute>();
-    var ver = att.FrameworkDisplayName ?? att.FrameworkName;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n<table");
-
-WriteLiteral(" class=\"table table-bordered table-hover table-striped table-condensed\"");
-
-WriteLiteral(">\r\n    <tr>\r\n        <th");
-
-WriteLiteral(" colspan=\"6\"");
-
-WriteLiteral(">\r\n            Session列表(");
-
-            
-            #line 19 "..\..\Areas\Admin\Views\Index\Session.cshtml"
-                 Write(Session.Contents.Count);
-
-            
-            #line default
-            #line hidden
-WriteLiteral(" )\r\n        </th>\r\n    </tr>\r\n    <tr>\r\n        <th>名称</th>\r\n        <th>类型</th>\r" +
-"\n        <th>数值</th>\r\n    </tr>\r\n");
-
-            
-            #line 27 "..\..\Areas\Admin\Views\Index\Session.cshtml"
-    
-            
-            #line default
-            #line hidden
-            
-            #line 27 "..\..\Areas\Admin\Views\Index\Session.cshtml"
-     foreach (String item in Session.Keys)
-        {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        <tr>\r\n            <td>");
-
-            
-            #line 30 "..\..\Areas\Admin\Views\Index\Session.cshtml"
-           Write(item);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n            <td>");
-
-            
-            #line 31 "..\..\Areas\Admin\Views\Index\Session.cshtml"
-           Write(Session[item].GetType().FullName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n            <td>");
-
-            
-            #line 32 "..\..\Areas\Admin\Views\Index\Session.cshtml"
-           Write(Session[item]);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n        </tr>\r\n");
-
-            
-            #line 34 "..\..\Areas\Admin\Views\Index\Session.cshtml"
-        }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</table>\r\n");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Areas/Admin/Views/Index/_Left.cshtml b/NewLife.Cube/Areas/Admin/Views/Index/_Left.cshtml
deleted file mode 100644
index 82777cb39e..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/Index/_Left.cshtml
+++ /dev/null
@@ -1,52 +0,0 @@
-﻿@using NewLife.Model;
-@{
-    var user = ViewBag.User as IUser ?? User.Identity as IUser;
-
-    var fact = ObjectContainer.Current.Resolve<IMenuFactory>();
-
-    var Menus = fact.Root.Childs;
-    if (user != null && user.Role != null)
-    {
-        Menus = fact.GetMySubMenus(fact.Root.ID, user);
-    }
-
-    // 如果顶级只有一层，并且至少有三级目录，则提升一级
-    if (Menus.Count == 1 && Menus[0].Childs.All(m => m.Childs.Count > 0)) { Menus = Menus[0].Childs; }
-
-    String[] icos = new String[] { "fa-tachometer", "fa-desktop", "fa-list", "fa-pencil-square-o", "fa-list-alt", "fa-calendar", "fa-picture-o", "fa-tag", "fa-file-o" };
-    Int32 _idx = 0;
-}
-<ul class="nav nav-list">
-    @foreach (IMenu menu in Menus.Where(m => m.Visible))
-    {
-        var childs = fact.GetMySubMenus(menu.ID, user).Where(m => m.Visible);
-        if (_idx >= icos.Length) { _idx = 0; }
-        <li @Html.Raw(menu == Menus[0] ? "class=\"active open\"" : "")>
-            <a href="#" class="dropdown-toggle">
-                <i class="menu-icon fa @icos[_idx++]"></i>
-                <span class="menu-text">@menu.DisplayName</span>
-
-                <b class="arrow fa fa-angle-down"></b>
-            </a>
-            @if (childs.Any())
-            {
-                <b class="arrow"></b>
-
-                <ul @Html.Raw(menu == Menus[0] ? "class=\"submenu nav-show\" style=\"display:block;\"" : "class=\"submenu nav-hide\" style=\"display:none;\"")>
-                    @foreach (IMenu menu2 in childs)
-                    {
-                        @Html.Partial("_Left_Item", menu2);
-                    }
-                </ul>
-
-                @*<ul class="submenu">
-                        @foreach (IMenu menu2 in childs)
-                        {
-                            @Html.Partial("_Left_Item", menu2);
-                        }
-                    </ul>*@
-            }
-        </li>
-    }
-</ul>
-<!-- /.nav-list -->
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Views/Index/_Left.generated.cs b/NewLife.Cube/Areas/Admin/Views/Index/_Left.generated.cs
deleted file mode 100644
index 23b12ef24f..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/Index/_Left.generated.cs
+++ /dev/null
@@ -1,241 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    using NewLife.Cube;
-    
-    #line 1 "..\..\Areas\Admin\Views\Index\_Left.cshtml"
-    using NewLife.Model;
-    
-    #line default
-    #line hidden
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Admin/Views/Index/_Left.cshtml")]
-    public partial class _Areas_Admin_Views_Index__Left_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Areas_Admin_Views_Index__Left_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 2 "..\..\Areas\Admin\Views\Index\_Left.cshtml"
-  
-    var user = ViewBag.User as IUser ?? User.Identity as IUser;
-
-    var fact = ObjectContainer.Current.Resolve<IMenuFactory>();
-
-    var Menus = fact.Root.Childs;
-    if (user != null && user.Role != null)
-    {
-        Menus = fact.GetMySubMenus(fact.Root.ID, user);
-    }
-
-    // 如果顶级只有一层，并且至少有三级目录，则提升一级
-    if (Menus.Count == 1 && Menus[0].Childs.All(m => m.Childs.Count > 0)) { Menus = Menus[0].Childs; }
-
-    String[] icos = new String[] { "fa-tachometer", "fa-desktop", "fa-list", "fa-pencil-square-o", "fa-list-alt", "fa-calendar", "fa-picture-o", "fa-tag", "fa-file-o" };
-    Int32 _idx = 0;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n<ul");
-
-WriteLiteral(" class=\"nav nav-list\"");
-
-WriteLiteral(">\r\n");
-
-            
-            #line 20 "..\..\Areas\Admin\Views\Index\_Left.cshtml"
-    
-            
-            #line default
-            #line hidden
-            
-            #line 20 "..\..\Areas\Admin\Views\Index\_Left.cshtml"
-     foreach (IMenu menu in Menus.Where(m => m.Visible))
-    {
-        var childs = fact.GetMySubMenus(menu.ID, user).Where(m => m.Visible);
-        if (_idx >= icos.Length) { _idx = 0; }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        <li ");
-
-            
-            #line 24 "..\..\Areas\Admin\Views\Index\_Left.cshtml"
-       Write(Html.Raw(menu == Menus[0] ? "class=\"active open\"" : ""));
-
-            
-            #line default
-            #line hidden
-WriteLiteral(">\r\n            <a");
-
-WriteLiteral(" href=\"#\"");
-
-WriteLiteral(" class=\"dropdown-toggle\"");
-
-WriteLiteral(">\r\n                <i");
-
-WriteAttribute("class", Tuple.Create(" class=\"", 1007), Tuple.Create("\"", 1041)
-, Tuple.Create(Tuple.Create("", 1015), Tuple.Create("menu-icon", 1015), true)
-, Tuple.Create(Tuple.Create(" ", 1024), Tuple.Create("fa", 1025), true)
-            
-            #line 26 "..\..\Areas\Admin\Views\Index\_Left.cshtml"
-, Tuple.Create(Tuple.Create(" ", 1027), Tuple.Create<System.Object, System.Int32>(icos[_idx++]
-            
-            #line default
-            #line hidden
-, 1028), false)
-);
-
-WriteLiteral("></i>\r\n                <span");
-
-WriteLiteral(" class=\"menu-text\"");
-
-WriteLiteral(">");
-
-            
-            #line 27 "..\..\Areas\Admin\Views\Index\_Left.cshtml"
-                                   Write(menu.DisplayName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</span>\r\n\r\n                <b");
-
-WriteLiteral(" class=\"arrow fa fa-angle-down\"");
-
-WriteLiteral("></b>\r\n            </a>\r\n");
-
-            
-            #line 31 "..\..\Areas\Admin\Views\Index\_Left.cshtml"
-            
-            
-            #line default
-            #line hidden
-            
-            #line 31 "..\..\Areas\Admin\Views\Index\_Left.cshtml"
-             if (childs.Any())
-            {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <b");
-
-WriteLiteral(" class=\"arrow\"");
-
-WriteLiteral("></b>\r\n");
-
-            
-            #line 34 "..\..\Areas\Admin\Views\Index\_Left.cshtml"
-
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <ul ");
-
-            
-            #line 35 "..\..\Areas\Admin\Views\Index\_Left.cshtml"
-               Write(Html.Raw(menu == Menus[0] ? "class=\"submenu nav-show\" style=\"display:block;\"" : "class=\"submenu nav-hide\" style=\"display:none;\""));
-
-            
-            #line default
-            #line hidden
-WriteLiteral(">\r\n");
-
-            
-            #line 36 "..\..\Areas\Admin\Views\Index\_Left.cshtml"
-                    
-            
-            #line default
-            #line hidden
-            
-            #line 36 "..\..\Areas\Admin\Views\Index\_Left.cshtml"
-                     foreach (IMenu menu2 in childs)
-                    {
-                        
-            
-            #line default
-            #line hidden
-            
-            #line 38 "..\..\Areas\Admin\Views\Index\_Left.cshtml"
-                   Write(Html.Partial("_Left_Item", menu2));
-
-            
-            #line default
-            #line hidden
-            
-            #line 38 "..\..\Areas\Admin\Views\Index\_Left.cshtml"
-                                                          ;
-                    }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                </ul>\r\n");
-
-            
-            #line 41 "..\..\Areas\Admin\Views\Index\_Left.cshtml"
-
-                
-            
-            #line default
-            #line hidden
-            
-            #line 47 "..\..\Areas\Admin\Views\Index\_Left.cshtml"
-                           
-            }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        </li>\r\n");
-
-            
-            #line 50 "..\..\Areas\Admin\Views\Index\_Left.cshtml"
-    }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</ul>\r\n<!-- /.nav-list -->");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Areas/Admin/Views/Index/_Left_Item.cshtml b/NewLife.Cube/Areas/Admin/Views/Index/_Left_Item.cshtml
deleted file mode 100644
index db8c7b5b26..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/Index/_Left_Item.cshtml
+++ /dev/null
@@ -1,35 +0,0 @@
-﻿@using NewLife.Model;
-@using XCode.Membership;
-@{
-    var user = ViewBag.User as IUser ?? User.Identity as IUser;
-
-    var fact = ObjectContainer.Current.Resolve<IMenuFactory>();
-
-    var item = Model as IMenu;
-    var childs = fact.GetMySubMenus(item.ID, user).Where(m => m.Visible);
-    var url = item.Url.IsNullOrEmpty() ? "" : Url.Content(item.Url);
-}
-<li>
-    @if (childs.Any())
-    {
-        <a href="#" class="dropdown-toggle">
-            <i class="menu-icon fa fa-caret-right"></i>
-            @item.DisplayName
-        </a>
-    }
-    else
-    {
-        <a href="@url" target="main">
-            <i class="menu-icon fa fa-caret-right"></i>
-            @item.DisplayName
-        </a>
-
-        <b class="arrow"></b>
-        <ul class="submenu">
-            @foreach (var menu in childs)
-            {
-                @Html.Partial("_Left_Item", menu);
-            }
-        </ul>
-    }
-</li>
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Views/Index/_Left_Item.generated.cs b/NewLife.Cube/Areas/Admin/Views/Index/_Left_Item.generated.cs
deleted file mode 100644
index 34c4ea6bf6..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/Index/_Left_Item.generated.cs
+++ /dev/null
@@ -1,211 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    using NewLife.Cube;
-    
-    #line 1 "..\..\Areas\Admin\Views\Index\_Left_Item.cshtml"
-    using NewLife.Model;
-    
-    #line default
-    #line hidden
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    
-    #line 2 "..\..\Areas\Admin\Views\Index\_Left_Item.cshtml"
-    using XCode.Membership;
-    
-    #line default
-    #line hidden
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Admin/Views/Index/_Left_Item.cshtml")]
-    public partial class _Areas_Admin_Views_Index__Left_Item_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Areas_Admin_Views_Index__Left_Item_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 3 "..\..\Areas\Admin\Views\Index\_Left_Item.cshtml"
-  
-    var user = ViewBag.User as IUser ?? User.Identity as IUser;
-
-    var fact = ObjectContainer.Current.Resolve<IMenuFactory>();
-
-    var item = Model as IMenu;
-    var childs = fact.GetMySubMenus(item.ID, user).Where(m => m.Visible);
-    var url = item.Url.IsNullOrEmpty() ? "" : Url.Content(item.Url);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n<li>\r\n");
-
-            
-            #line 13 "..\..\Areas\Admin\Views\Index\_Left_Item.cshtml"
-    
-            
-            #line default
-            #line hidden
-            
-            #line 13 "..\..\Areas\Admin\Views\Index\_Left_Item.cshtml"
-     if (childs.Any())
-    {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        <a");
-
-WriteLiteral(" href=\"#\"");
-
-WriteLiteral(" class=\"dropdown-toggle\"");
-
-WriteLiteral(">\r\n            <i");
-
-WriteLiteral(" class=\"menu-icon fa fa-caret-right\"");
-
-WriteLiteral("></i>\r\n");
-
-WriteLiteral("            ");
-
-            
-            #line 17 "..\..\Areas\Admin\Views\Index\_Left_Item.cshtml"
-       Write(item.DisplayName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n        </a>\r\n");
-
-            
-            #line 19 "..\..\Areas\Admin\Views\Index\_Left_Item.cshtml"
-    }
-    else
-    {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        <a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 586), Tuple.Create("\"", 597)
-            
-            #line 22 "..\..\Areas\Admin\Views\Index\_Left_Item.cshtml"
-, Tuple.Create(Tuple.Create("", 593), Tuple.Create<System.Object, System.Int32>(url
-            
-            #line default
-            #line hidden
-, 593), false)
-);
-
-WriteLiteral(" target=\"main\"");
-
-WriteLiteral(">\r\n            <i");
-
-WriteLiteral(" class=\"menu-icon fa fa-caret-right\"");
-
-WriteLiteral("></i>\r\n");
-
-WriteLiteral("            ");
-
-            
-            #line 24 "..\..\Areas\Admin\Views\Index\_Left_Item.cshtml"
-       Write(item.DisplayName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n        </a>\r\n");
-
-            
-            #line 26 "..\..\Areas\Admin\Views\Index\_Left_Item.cshtml"
-
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        <b");
-
-WriteLiteral(" class=\"arrow\"");
-
-WriteLiteral("></b>\r\n");
-
-WriteLiteral("        <ul");
-
-WriteLiteral(" class=\"submenu\"");
-
-WriteLiteral(">\r\n");
-
-            
-            #line 29 "..\..\Areas\Admin\Views\Index\_Left_Item.cshtml"
-            
-            
-            #line default
-            #line hidden
-            
-            #line 29 "..\..\Areas\Admin\Views\Index\_Left_Item.cshtml"
-             foreach (var menu in childs)
-            {
-                
-            
-            #line default
-            #line hidden
-            
-            #line 31 "..\..\Areas\Admin\Views\Index\_Left_Item.cshtml"
-           Write(Html.Partial("_Left_Item", menu));
-
-            
-            #line default
-            #line hidden
-            
-            #line 31 "..\..\Areas\Admin\Views\Index\_Left_Item.cshtml"
-                                                 ;
-            }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        </ul>\r\n");
-
-            
-            #line 34 "..\..\Areas\Admin\Views\Index\_Left_Item.cshtml"
-    }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</li>");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Areas/Admin/Views/Index/_Navbar.cshtml b/NewLife.Cube/Areas/Admin/Views/Index/_Navbar.cshtml
deleted file mode 100644
index e11c54580c..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/Index/_Navbar.cshtml
+++ /dev/null
@@ -1,102 +0,0 @@
-﻿@using NewLife.Common;
-@using XCode.Membership;
-@{
-    var user = ViewBag.User as IUser ?? User.Identity as IUser;
-    var uid = 0;
-    var roleNames = "";
-    if (user != null)
-    {
-        uid = user.ID;
-        roleNames = user.Roles == null ? "" : user.Roles.Join();
-    }
-    var cfg = ViewBag.Config as SysConfig;
-    var name = cfg == null ? "" : cfg.DisplayName;
-}
-<!-- #section:basics/navbar.layout -->
-<div id="navbar" class="navbar navbar-default">
-    <script type="text/javascript">
-        try { ace.settings.check('navbar', 'fixed') } catch (e) { }
-    </script>
-
-    <div class="navbar-container" id="navbar-container">
-        <!-- #section:basics/sidebar.mobile.toggle -->
-        <button type="button" class="navbar-toggle menu-toggler pull-left" id="menu-toggler" data-target="#sidebar">
-            <span class="sr-only">Toggle sidebar</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-        </button>
-
-        <!-- /section:basics/sidebar.mobile.toggle -->
-        <div class="pull-left">
-            <!-- #section:basics/navbar.layout.brand -->
-            <a href="@ViewBag.Main" class="navbar-brand" target="main">
-                <small>
-                    @name
-                </small>
-            </a>
-        </div>
-
-        <!-- #section:basics/navbar.dropdown -->
-        <div class="navbar-buttons navbar-header pull-right" role="navigation">
-            <ul class="nav ace-nav">
-                <!-- #section:basics/navbar.user_menu -->
-                <li class="light-blue">
-                    <a data-toggle="dropdown" href="~/Admin/User/Info/@uid" class="dropdown-toggle" target="main">
-                        @if (user != null && !user.Avatar.IsNullOrEmpty())
-                        {
-                            <img class="nav-user-photo" src="@user.GetAvatarUrl()" alt="@user" />
-                        }
-                        <span class="user-info">
-                            @*<small>欢迎，</small>*@
-                            @user <br /> [@roleNames]
-                        </span>
-
-                        <i class="ace-icon fa fa-caret-down"></i>
-                    </a>
-
-                    <ul class="user-menu dropdown-menu-right dropdown-menu dropdown-yellow dropdown-caret dropdown-close">
-                        <li>
-                            <a href="~/" target="_blank">
-                                <i class="ace-icon fa fa-cog"></i>
-                                网站首页
-                            </a>
-                        </li>
-
-                        @*@if (user.Has("Admin/Sys", PermissionFlags.Detail))
-                            {
-                                <li>
-                                    <a href="~/Admin/Sys" target="main">
-                                        <i class="ace-icon fa fa-cog"></i>
-                                        设置
-                                    </a>
-                                </li>
-                            }*@
-
-                        <li>
-                            <a href="~/Admin/User/Info/@uid" target="main">
-                                <i class="ace-icon fa fa-user"></i>
-                                个人信息
-                            </a>
-                        </li>
-
-                        <li class="divider"></li>
-
-                        <li>
-                            <a href="~/Admin/User/Logout">
-                                <i class="ace-icon fa fa-power-off"></i>
-                                注销
-                            </a>
-                        </li>
-                    </ul>
-                </li>
-
-                <!-- /section:basics/navbar.user_menu -->
-            </ul>
-        </div>
-
-        <!-- /section:basics/navbar.dropdown -->
-    </div>
-    <!-- /.navbar-container -->
-</div>
-<!-- /section:basics/navbar.layout -->
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Views/Index/_Navbar.generated.cs b/NewLife.Cube/Areas/Admin/Views/Index/_Navbar.generated.cs
deleted file mode 100644
index 60a25b3a50..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/Index/_Navbar.generated.cs
+++ /dev/null
@@ -1,340 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    
-    #line 1 "..\..\Areas\Admin\Views\Index\_Navbar.cshtml"
-    using NewLife.Common;
-    
-    #line default
-    #line hidden
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    
-    #line 2 "..\..\Areas\Admin\Views\Index\_Navbar.cshtml"
-    using XCode.Membership;
-    
-    #line default
-    #line hidden
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Admin/Views/Index/_Navbar.cshtml")]
-    public partial class _Areas_Admin_Views_Index__Navbar_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Areas_Admin_Views_Index__Navbar_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 3 "..\..\Areas\Admin\Views\Index\_Navbar.cshtml"
-  
-    var user = ViewBag.User as IUser ?? User.Identity as IUser;
-    var uid = 0;
-    var roleNames = "";
-    if (user != null)
-    {
-        uid = user.ID;
-        roleNames = user.Roles == null ? "" : user.Roles.Join();
-    }
-    var cfg = ViewBag.Config as SysConfig;
-    var name = cfg == null ? "" : cfg.DisplayName;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n<!-- #section:basics/navbar.layout -->\r\n<div");
-
-WriteLiteral(" id=\"navbar\"");
-
-WriteLiteral(" class=\"navbar navbar-default\"");
-
-WriteLiteral(">\r\n    <script");
-
-WriteLiteral(" type=\"text/javascript\"");
-
-WriteLiteral(">\r\n        try { ace.settings.check(\'navbar\', \'fixed\') } catch (e) { }\r\n    </scr" +
-"ipt>\r\n\r\n    <div");
-
-WriteLiteral(" class=\"navbar-container\"");
-
-WriteLiteral(" id=\"navbar-container\"");
-
-WriteLiteral(">\r\n        <!-- #section:basics/sidebar.mobile.toggle -->\r\n        <button");
-
-WriteLiteral(" type=\"button\"");
-
-WriteLiteral(" class=\"navbar-toggle menu-toggler pull-left\"");
-
-WriteLiteral(" id=\"menu-toggler\"");
-
-WriteLiteral(" data-target=\"#sidebar\"");
-
-WriteLiteral(">\r\n            <span");
-
-WriteLiteral(" class=\"sr-only\"");
-
-WriteLiteral(">Toggle sidebar</span>\r\n            <span");
-
-WriteLiteral(" class=\"icon-bar\"");
-
-WriteLiteral("></span>\r\n            <span");
-
-WriteLiteral(" class=\"icon-bar\"");
-
-WriteLiteral("></span>\r\n            <span");
-
-WriteLiteral(" class=\"icon-bar\"");
-
-WriteLiteral("></span>\r\n        </button>\r\n\r\n        <!-- /section:basics/sidebar.mobile.toggle" +
-" -->\r\n        <div");
-
-WriteLiteral(" class=\"pull-left\"");
-
-WriteLiteral(">\r\n            <!-- #section:basics/navbar.layout.brand -->\r\n            <a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1203), Tuple.Create("\"", 1223)
-            
-            #line 33 "..\..\Areas\Admin\Views\Index\_Navbar.cshtml"
-, Tuple.Create(Tuple.Create("", 1210), Tuple.Create<System.Object, System.Int32>(ViewBag.Main
-            
-            #line default
-            #line hidden
-, 1210), false)
-);
-
-WriteLiteral(" class=\"navbar-brand\"");
-
-WriteLiteral(" target=\"main\"");
-
-WriteLiteral(">\r\n                <small>\r\n");
-
-WriteLiteral("                    ");
-
-            
-            #line 35 "..\..\Areas\Admin\Views\Index\_Navbar.cshtml"
-               Write(name);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n                </small>\r\n            </a>\r\n        </div>\r\n\r\n        <!-- #sec" +
-"tion:basics/navbar.dropdown -->\r\n        <div");
-
-WriteLiteral(" class=\"navbar-buttons navbar-header pull-right\"");
-
-WriteLiteral(" role=\"navigation\"");
-
-WriteLiteral(">\r\n            <ul");
-
-WriteLiteral(" class=\"nav ace-nav\"");
-
-WriteLiteral(">\r\n                <!-- #section:basics/navbar.user_menu -->\r\n                <li" +
-"");
-
-WriteLiteral(" class=\"light-blue\"");
-
-WriteLiteral(">\r\n                    <a");
-
-WriteLiteral(" data-toggle=\"dropdown\"");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1690), Tuple.Create("\"", 1719)
-, Tuple.Create(Tuple.Create("", 1697), Tuple.Create<System.Object, System.Int32>(Href("~/Admin/User/Info/")
-, 1697), false)
-            
-            #line 45 "..\..\Areas\Admin\Views\Index\_Navbar.cshtml"
-, Tuple.Create(Tuple.Create("", 1715), Tuple.Create<System.Object, System.Int32>(uid
-            
-            #line default
-            #line hidden
-, 1715), false)
-);
-
-WriteLiteral(" class=\"dropdown-toggle\"");
-
-WriteLiteral(" target=\"main\"");
-
-WriteLiteral(">\r\n");
-
-            
-            #line 46 "..\..\Areas\Admin\Views\Index\_Navbar.cshtml"
-                        
-            
-            #line default
-            #line hidden
-            
-            #line 46 "..\..\Areas\Admin\Views\Index\_Navbar.cshtml"
-                         if (user != null && !user.Avatar.IsNullOrEmpty())
-                        {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                            <img");
-
-WriteLiteral(" class=\"nav-user-photo\"");
-
-WriteAttribute("src", Tuple.Create(" src=\"", 1919), Tuple.Create("\"", 1945)
-            
-            #line 48 "..\..\Areas\Admin\Views\Index\_Navbar.cshtml"
-, Tuple.Create(Tuple.Create("", 1925), Tuple.Create<System.Object, System.Int32>(user.GetAvatarUrl()
-            
-            #line default
-            #line hidden
-, 1925), false)
-);
-
-WriteAttribute("alt", Tuple.Create(" alt=\"", 1946), Tuple.Create("\"", 1957)
-            
-            #line 48 "..\..\Areas\Admin\Views\Index\_Navbar.cshtml"
-        , Tuple.Create(Tuple.Create("", 1952), Tuple.Create<System.Object, System.Int32>(user
-            
-            #line default
-            #line hidden
-, 1952), false)
-);
-
-WriteLiteral(" />\r\n");
-
-            
-            #line 49 "..\..\Areas\Admin\Views\Index\_Navbar.cshtml"
-                        }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                        <span");
-
-WriteLiteral(" class=\"user-info\"");
-
-WriteLiteral(">\r\n                            ");
-
-WriteLiteral("\r\n");
-
-WriteLiteral("                            ");
-
-            
-            #line 52 "..\..\Areas\Admin\Views\Index\_Navbar.cshtml"
-                       Write(user);
-
-            
-            #line default
-            #line hidden
-WriteLiteral(" <br /> [");
-
-            
-            #line 52 "..\..\Areas\Admin\Views\Index\_Navbar.cshtml"
-                                     Write(roleNames);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("]\r\n                        </span>\r\n\r\n                        <i");
-
-WriteLiteral(" class=\"ace-icon fa fa-caret-down\"");
-
-WriteLiteral("></i>\r\n                    </a>\r\n\r\n                    <ul");
-
-WriteLiteral(" class=\"user-menu dropdown-menu-right dropdown-menu dropdown-yellow dropdown-care" +
-"t dropdown-close\"");
-
-WriteLiteral(">\r\n                        <li>\r\n                            <a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 2461), Tuple.Create("\"", 2470)
-, Tuple.Create(Tuple.Create("", 2468), Tuple.Create<System.Object, System.Int32>(Href("~/")
-, 2468), false)
-);
-
-WriteLiteral(" target=\"_blank\"");
-
-WriteLiteral(">\r\n                                <i");
-
-WriteLiteral(" class=\"ace-icon fa fa-cog\"");
-
-WriteLiteral("></i>\r\n                                网站首页\r\n                            </a>\r\n  " +
-"                      </li>\r\n\r\n                        ");
-
-WriteLiteral("\r\n\r\n                        <li>\r\n                            <a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 3181), Tuple.Create("\"", 3210)
-, Tuple.Create(Tuple.Create("", 3188), Tuple.Create<System.Object, System.Int32>(Href("~/Admin/User/Info/")
-, 3188), false)
-            
-            #line 77 "..\..\Areas\Admin\Views\Index\_Navbar.cshtml"
-, Tuple.Create(Tuple.Create("", 3206), Tuple.Create<System.Object, System.Int32>(uid
-            
-            #line default
-            #line hidden
-, 3206), false)
-);
-
-WriteLiteral(" target=\"main\"");
-
-WriteLiteral(">\r\n                                <i");
-
-WriteLiteral(" class=\"ace-icon fa fa-user\"");
-
-WriteLiteral("></i>\r\n                                个人信息\r\n                            </a>\r\n  " +
-"                      </li>\r\n\r\n                        <li");
-
-WriteLiteral(" class=\"divider\"");
-
-WriteLiteral("></li>\r\n\r\n                        <li>\r\n                            <a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 3515), Tuple.Create("\"", 3541)
-, Tuple.Create(Tuple.Create("", 3522), Tuple.Create<System.Object, System.Int32>(Href("~/Admin/User/Logout")
-, 3522), false)
-);
-
-WriteLiteral(">\r\n                                <i");
-
-WriteLiteral(" class=\"ace-icon fa fa-power-off\"");
-
-WriteLiteral(@"></i>
-                                注销
-                            </a>
-                        </li>
-                    </ul>
-                </li>
-
-                <!-- /section:basics/navbar.user_menu -->
-            </ul>
-        </div>
-
-        <!-- /section:basics/navbar.dropdown -->
-    </div>
-    <!-- /.navbar-container -->
-</div>
-<!-- /section:basics/navbar.layout -->");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Areas/Admin/Views/Log/_List_Data.cshtml b/NewLife.Cube/Areas/Admin/Views/Log/_List_Data.cshtml
deleted file mode 100644
index 635d5a1df7..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/Log/_List_Data.cshtml
+++ /dev/null
@@ -1,64 +0,0 @@
-﻿@model IList<XCode.Membership.Log>
-@using NewLife;
-@using NewLife.Web;
-@using XCode;
-@using XCode.Configuration;
-@using System.Web.Mvc;
-@using System.Web.Mvc.Ajax;
-@using System.Web.Mvc.Html;
-@using System.Web.Routing;
-@{
-    var fact = ViewBag.Factory as IEntityOperate;
-    var page = ViewBag.Page as Pager;
-    var fields = ViewBag.Fields as IList<FieldItem>;
-    var enableSelect = this.EnableSelect();
-}
-<table class="table table-bordered table-hover table-striped table-condensed">
-    <thead>
-        <tr>
-            @if (enableSelect)
-            {
-                <th class="text-center" style="width:10px;"><input type="checkbox" id="chkAll" title="全选" /></th>
-            }
-            <th class="text-center hidden-md hidden-sm hidden-xs"><a href="@Html.Raw(page.GetSortUrl("ID"))">编号</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("Category"))">类别</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("Action"))">操作</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("Remark"))">详细信息</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("LinkID"))">链接</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("UserName"))">用户名</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("CreateIP"))">IP地址</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("CreateAddress"))">物理地址</a></th>
-            <th class="text-center" style="min-width:134px;"><a href="@Html.Raw(page.GetSortUrl("CreateTime"))">时间</a></th>
-            @if (this.Has(PermissionFlags.Detail))
-            {
-                <th class="text-center" style="min-width:100px;">操作</th>
-            }
-        </tr>
-    </thead>
-    <tbody>
-        @foreach (var entity in Model)
-        {
-            <tr>
-                @if (enableSelect)
-                {
-                    <td class="text-center"><input type="checkbox" name="keys" value="@entity.ID" /></td>
-                }
-                <td class="text-center hidden-md hidden-sm hidden-xs">@entity.ID</td>
-                <td>@entity.Category</td>
-                <td>@entity.Action</td>
-                <td style="max-width:600px;overflow:hidden;white-space: nowrap;text-overflow: ellipsis;" title="@entity.Remark">@entity.Remark</td>
-                <td class="text-right">@entity.LinkID.ToString("n0")</td>
-                <td>@entity.UserName</td>
-                <td>@entity.CreateIP</td>
-                <td>@entity.CreateIP.IPToAddress()</td>
-                <td class="text-center" style="max-width:150px">@entity.CreateTime.ToFullString("")</td>
-                @if (this.Has(PermissionFlags.Detail))
-                {
-                    <td class="text-center" style="width: 90px;">
-                        @Html.Partial("_List_Data_Action", (Object)entity)
-                    </td>
-                }
-            </tr>
-        }
-    </tbody>
-</table>
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Views/Log/_List_Data.generated.cs b/NewLife.Cube/Areas/Admin/Views/Log/_List_Data.generated.cs
deleted file mode 100644
index 25e69f28e0..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/Log/_List_Data.generated.cs
+++ /dev/null
@@ -1,544 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    
-    #line 6 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-    using System.Web.Mvc;
-    
-    #line default
-    #line hidden
-    
-    #line 7 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-    using System.Web.Mvc.Ajax;
-    
-    #line default
-    #line hidden
-    
-    #line 8 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-    using System.Web.Mvc.Html;
-    
-    #line default
-    #line hidden
-    
-    #line 9 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-    using System.Web.Routing;
-    
-    #line default
-    #line hidden
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    
-    #line 2 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-    using NewLife;
-    
-    #line default
-    #line hidden
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    
-    #line 3 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-    using NewLife.Web;
-    
-    #line default
-    #line hidden
-    
-    #line 4 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-    using XCode;
-    
-    #line default
-    #line hidden
-    
-    #line 5 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-    using XCode.Configuration;
-    
-    #line default
-    #line hidden
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Admin/Views/Log/_List_Data.cshtml")]
-    public partial class _Areas_Admin_Views_Log__List_Data_cshtml : System.Web.Mvc.WebViewPage<IList<XCode.Membership.Log>>
-    {
-        public _Areas_Admin_Views_Log__List_Data_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 10 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-  
-    var fact = ViewBag.Factory as IEntityOperate;
-    var page = ViewBag.Page as Pager;
-    var fields = ViewBag.Fields as IList<FieldItem>;
-    var enableSelect = this.EnableSelect();
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n<table");
-
-WriteLiteral(" class=\"table table-bordered table-hover table-striped table-condensed\"");
-
-WriteLiteral(">\r\n    <thead>\r\n        <tr>\r\n");
-
-            
-            #line 19 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-            
-            
-            #line default
-            #line hidden
-            
-            #line 19 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-             if (enableSelect)
-            {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(" style=\"width:10px;\"");
-
-WriteLiteral("><input");
-
-WriteLiteral(" type=\"checkbox\"");
-
-WriteLiteral(" id=\"chkAll\"");
-
-WriteLiteral(" title=\"全选\"");
-
-WriteLiteral(" /></th>\r\n");
-
-            
-            #line 22 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-            }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            <th");
-
-WriteLiteral(" class=\"text-center hidden-md hidden-sm hidden-xs\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 776), Tuple.Create("\"", 815)
-            
-            #line 23 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 783), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("ID"))
-            
-            #line default
-            #line hidden
-, 783), false)
-);
-
-WriteLiteral(">编号</a></th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 868), Tuple.Create("\"", 913)
-            
-            #line 24 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 875), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("Category"))
-            
-            #line default
-            #line hidden
-, 875), false)
-);
-
-WriteLiteral(">类别</a></th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 966), Tuple.Create("\"", 1009)
-            
-            #line 25 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 973), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("Action"))
-            
-            #line default
-            #line hidden
-, 973), false)
-);
-
-WriteLiteral(">操作</a></th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1062), Tuple.Create("\"", 1105)
-            
-            #line 26 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1069), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("Remark"))
-            
-            #line default
-            #line hidden
-, 1069), false)
-);
-
-WriteLiteral(">详细信息</a></th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1160), Tuple.Create("\"", 1203)
-            
-            #line 27 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1167), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("LinkID"))
-            
-            #line default
-            #line hidden
-, 1167), false)
-);
-
-WriteLiteral(">链接</a></th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1256), Tuple.Create("\"", 1301)
-            
-            #line 28 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1263), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("UserName"))
-            
-            #line default
-            #line hidden
-, 1263), false)
-);
-
-WriteLiteral(">用户名</a></th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1355), Tuple.Create("\"", 1400)
-            
-            #line 29 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1362), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("CreateIP"))
-            
-            #line default
-            #line hidden
-, 1362), false)
-);
-
-WriteLiteral(">IP地址</a></th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1455), Tuple.Create("\"", 1505)
-            
-            #line 30 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1462), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("CreateAddress"))
-            
-            #line default
-            #line hidden
-, 1462), false)
-);
-
-WriteLiteral(">物理地址</a></th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(" style=\"min-width:134px;\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1585), Tuple.Create("\"", 1632)
-            
-            #line 31 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1592), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("CreateTime"))
-            
-            #line default
-            #line hidden
-, 1592), false)
-);
-
-WriteLiteral(">时间</a></th>\r\n");
-
-            
-            #line 32 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-            
-            
-            #line default
-            #line hidden
-            
-            #line 32 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-             if (this.Has(PermissionFlags.Detail))
-            {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(" style=\"min-width:100px;\"");
-
-WriteLiteral(">操作</th>\r\n");
-
-            
-            #line 35 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-            }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        </tr>\r\n    </thead>\r\n    <tbody>\r\n");
-
-            
-            #line 39 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-        
-            
-            #line default
-            #line hidden
-            
-            #line 39 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-         foreach (var entity in Model)
-        {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            <tr>\r\n");
-
-            
-            #line 42 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-                
-            
-            #line default
-            #line hidden
-            
-            #line 42 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-                 if (enableSelect)
-                {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                    <td");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><input");
-
-WriteLiteral(" type=\"checkbox\"");
-
-WriteLiteral(" name=\"keys\"");
-
-WriteAttribute("value", Tuple.Create(" value=\"", 2047), Tuple.Create("\"", 2065)
-            
-            #line 44 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-      , Tuple.Create(Tuple.Create("", 2055), Tuple.Create<System.Object, System.Int32>(entity.ID
-            
-            #line default
-            #line hidden
-, 2055), false)
-);
-
-WriteLiteral(" /></td>\r\n");
-
-            
-            #line 45 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-                }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <td");
-
-WriteLiteral(" class=\"text-center hidden-md hidden-sm hidden-xs\"");
-
-WriteLiteral(">");
-
-            
-            #line 46 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-                                                                 Write(entity.ID);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td>");
-
-            
-            #line 47 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-               Write(entity.Category);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td>");
-
-            
-            #line 48 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-               Write(entity.Action);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td");
-
-WriteLiteral(" style=\"max-width:600px;overflow:hidden;white-space: nowrap;text-overflow: ellips" +
-"is;\"");
-
-WriteAttribute("title", Tuple.Create(" title=\"", 2370), Tuple.Create("\"", 2392)
-            
-            #line 49 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-                                , Tuple.Create(Tuple.Create("", 2378), Tuple.Create<System.Object, System.Int32>(entity.Remark
-            
-            #line default
-            #line hidden
-, 2378), false)
-);
-
-WriteLiteral(">");
-
-            
-            #line 49 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-                                                                                                                           Write(entity.Remark);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td");
-
-WriteLiteral(" class=\"text-right\"");
-
-WriteLiteral(">");
-
-            
-            #line 50 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-                                  Write(entity.LinkID.ToString("n0"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td>");
-
-            
-            #line 51 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-               Write(entity.UserName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td>");
-
-            
-            #line 52 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-               Write(entity.CreateIP);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td>");
-
-            
-            #line 53 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-               Write(entity.CreateIP.IPToAddress());
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(" style=\"max-width:150px\"");
-
-WriteLiteral(">");
-
-            
-            #line 54 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-                                                           Write(entity.CreateTime.ToFullString(""));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n");
-
-            
-            #line 55 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-                
-            
-            #line default
-            #line hidden
-            
-            #line 55 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-                 if (this.Has(PermissionFlags.Detail))
-                {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                    <td");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(" style=\"width: 90px;\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("                        ");
-
-            
-            #line 58 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-                   Write(Html.Partial("_List_Data_Action", (Object)entity));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n                    </td>\r\n");
-
-            
-            #line 60 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-                }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            </tr>\r\n");
-
-            
-            #line 62 "..\..\Areas\Admin\Views\Log\_List_Data.cshtml"
-        }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("    </tbody>\r\n</table>");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Areas/Admin/Views/Log/_List_Search.cshtml b/NewLife.Cube/Areas/Admin/Views/Log/_List_Search.cshtml
deleted file mode 100644
index cadb257157..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/Log/_List_Search.cshtml
+++ /dev/null
@@ -1,10 +0,0 @@
-﻿<div class="form-group">
-    @Html.ActionLink("访问统计", "Index", "VisitStat", null, new { @class = "btn btn-success btn-sm" })
-    <label for="category" class="control-label">类别：</label>
-    @Html.ForDropDownList("category", Log.FindAllCategoryName(), Request["category"], "全部", true)
-</div>
-@*<div class="form-group">
-    <label for="userid" class="control-label">用户：</label>
-    @Html.ForDropDownList("userid", UserX.FindAllWithCache().Cast<IEntity>().ToList(), "全部", true)
-</div>*@
-@Html.Partial("_DateRange")
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Views/Log/_List_Search.generated.cs b/NewLife.Cube/Areas/Admin/Views/Log/_List_Search.generated.cs
deleted file mode 100644
index 38c6eb1a33..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/Log/_List_Search.generated.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Admin/Views/Log/_List_Search.cshtml")]
-    public partial class _Areas_Admin_Views_Log__List_Search_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Areas_Admin_Views_Log__List_Search_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-WriteLiteral("<div");
-
-WriteLiteral(" class=\"form-group\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("    ");
-
-            
-            #line 2 "..\..\Areas\Admin\Views\Log\_List_Search.cshtml"
-Write(Html.ActionLink("访问统计", "Index", "VisitStat", null, new { @class = "btn btn-success btn-sm" }));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n    <label");
-
-WriteLiteral(" for=\"category\"");
-
-WriteLiteral(" class=\"control-label\"");
-
-WriteLiteral(">类别：</label>\r\n");
-
-WriteLiteral("    ");
-
-            
-            #line 4 "..\..\Areas\Admin\Views\Log\_List_Search.cshtml"
-Write(Html.ForDropDownList("category", Log.FindAllCategoryName(), Request["category"], "全部", true));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n</div>\r\n");
-
-WriteLiteral("\r\n");
-
-            
-            #line 10 "..\..\Areas\Admin\Views\Log\_List_Search.cshtml"
-Write(Html.Partial("_DateRange"));
-
-            
-            #line default
-            #line hidden
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Areas/Admin/Views/Menu/_ListTree_Data.cshtml b/NewLife.Cube/Areas/Admin/Views/Menu/_ListTree_Data.cshtml
deleted file mode 100644
index a8aa487bc4..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/Menu/_ListTree_Data.cshtml
+++ /dev/null
@@ -1,89 +0,0 @@
-﻿@model IList<XCode.Membership.Menu>
-@using NewLife;
-@using NewLife.Web;
-@using XCode;
-@using XCode.Configuration;
-@using System.Web.Mvc;
-@using System.Web.Mvc.Ajax;
-@using System.Web.Mvc.Html;
-@using System.Web.Routing;
-@{
-    var fact = ViewBag.Factory as IEntityOperate;
-    var page = ViewBag.Page as Pager;
-    var fields = ViewBag.Fields as IList<FieldItem>;
-    var enableSelect = this.EnableSelect();
-    //var provider = ManageProvider.Provider;
-}
-<table class="table table-bordered table-hover table-striped table-condensed">
-    <thead>
-        <tr>
-            @if (enableSelect)
-            {
-                <th class="text-center" style="width:10px;"><input type="checkbox" id="chkAll" title="全选" /></th>
-            }
-            <th class="text-center hidden-md hidden-sm hidden-xs"><a href="@Html.Raw(page.GetSortUrl("ID"))">编号</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("TreeNodeName"))">节点名</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("DisplayName"))">显示名</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("Url"))">链接</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("Sort"))">排序</a></th>
-            @*<th class="text-center"><a href="@Html.Raw(page.GetSortUrl("Icon"))">图标</a></th>*@
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("Visible"))">可见</a></th>
-            <th class="text-center" title="必要。必要的菜单，必须至少有角色拥有这些权限，如果没有则自动授权给系统角色"><a href="@Html.Raw(page.GetSortUrl("Necessary"))">必要</a></th>
-            <th class="text-center" title="权限子项。逗号分隔，每个权限子项名值竖线分隔"><a href="@Html.Raw(page.GetSortUrl("Permission"))">权限子项</a></th>
-            @if (this.Has(PermissionFlags.Detail, PermissionFlags.Update, PermissionFlags.Delete))
-            {
-                <th class="text-center">升</th>
-                <th class="text-center">降</th>
-                <th class="text-center" style="min-width:100px;">操作</th>
-            }
-        </tr>
-    </thead>
-    <tbody>
-        @foreach (var entity in Model)
-        {
-            var p = entity.Parent as IEntityTree;
-            if (p == null)
-            {
-                p = fact.EntityType.GetValue("Root") as IEntityTree;
-            }
-            var id = entity.ID;
-            <tr>
-                @if (enableSelect)
-                {
-                    <td class="text-center"><input type="checkbox" name="keys" value="@entity.ID" /></td>
-                }
-                <td class="text-center hidden-md hidden-sm hidden-xs">@entity.ID</td>
-                <td>@entity.TreeNodeName</td>
-                <td>@entity.DisplayName</td>
-                <td>@entity.Url</td>
-                <td class="text-right">@entity.Sort.ToString("n0")</td>
-                @*<td>@entity.Icon</td>*@
-                <td class="text-center">
-                    <i class="glyphicon glyphicon-@(entity.Visible ? "ok" : "remove")" style="color: @(entity.Visible ? "green" : "red");"></i>
-                </td>
-                <td class="text-center">
-                    <i class="glyphicon glyphicon-@(entity.Necessary ? "ok" : "remove")" style="color: @(entity.Necessary ? "green" : "red");"></i>
-                </td>
-                <td>@entity.Permission</td>
-                @if (this.Has(PermissionFlags.Detail, PermissionFlags.Update, PermissionFlags.Delete))
-                {
-                    <td class="text-center">
-                        @if (p != null && p.Childs != null && p.Childs.Count > 0 && entity != p.Childs[0])
-                        {
-                            <a href="@Url.Action("Up", new { id })"><span class="glyphicon glyphicon-arrow-up" style="color: green;"></span></a>
-                        }
-                    </td>
-                    <td class="text-center">
-                        @if (p != null && entity != p.Childs[p.Childs.Count - 1])
-                        {
-                            <a href="@Url.Action("Down", new { id })"><span class="glyphicon glyphicon-arrow-down" style="color: red;"></span></a>
-                        }
-                    </td>
-                    <td class="text-center">
-                        @Html.Partial("_List_Data_Action", (Object)entity)
-                    </td>
-                }
-            </tr>
-        }
-    </tbody>
-</table>
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Views/Menu/_ListTree_Data.generated.cs b/NewLife.Cube/Areas/Admin/Views/Menu/_ListTree_Data.generated.cs
deleted file mode 100644
index 8f9f60678f..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/Menu/_ListTree_Data.generated.cs
+++ /dev/null
@@ -1,661 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    
-    #line 6 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-    using System.Web.Mvc;
-    
-    #line default
-    #line hidden
-    
-    #line 7 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-    using System.Web.Mvc.Ajax;
-    
-    #line default
-    #line hidden
-    
-    #line 8 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-    using System.Web.Mvc.Html;
-    
-    #line default
-    #line hidden
-    
-    #line 9 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-    using System.Web.Routing;
-    
-    #line default
-    #line hidden
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    
-    #line 2 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-    using NewLife;
-    
-    #line default
-    #line hidden
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    
-    #line 3 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-    using NewLife.Web;
-    
-    #line default
-    #line hidden
-    
-    #line 4 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-    using XCode;
-    
-    #line default
-    #line hidden
-    
-    #line 5 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-    using XCode.Configuration;
-    
-    #line default
-    #line hidden
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Admin/Views/Menu/_ListTree_Data.cshtml")]
-    public partial class _Areas_Admin_Views_Menu__ListTree_Data_cshtml : System.Web.Mvc.WebViewPage<IList<XCode.Membership.Menu>>
-    {
-        public _Areas_Admin_Views_Menu__ListTree_Data_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 10 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-  
-    var fact = ViewBag.Factory as IEntityOperate;
-    var page = ViewBag.Page as Pager;
-    var fields = ViewBag.Fields as IList<FieldItem>;
-    var enableSelect = this.EnableSelect();
-    //var provider = ManageProvider.Provider;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\n<table");
-
-WriteLiteral(" class=\"table table-bordered table-hover table-striped table-condensed\"");
-
-WriteLiteral(">\n    <thead>\n        <tr>\n");
-
-            
-            #line 20 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-            
-            
-            #line default
-            #line hidden
-            
-            #line 20 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-             if (enableSelect)
-            {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(" style=\"width:10px;\"");
-
-WriteLiteral("><input");
-
-WriteLiteral(" type=\"checkbox\"");
-
-WriteLiteral(" id=\"chkAll\"");
-
-WriteLiteral(" title=\"全选\"");
-
-WriteLiteral(" /></th>\n");
-
-            
-            #line 23 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-            }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            <th");
-
-WriteLiteral(" class=\"text-center hidden-md hidden-sm hidden-xs\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 801), Tuple.Create("\"", 840)
-            
-            #line 24 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 808), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("ID"))
-            
-            #line default
-            #line hidden
-, 808), false)
-);
-
-WriteLiteral(">编号</a></th>\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 892), Tuple.Create("\"", 941)
-            
-            #line 25 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 899), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("TreeNodeName"))
-            
-            #line default
-            #line hidden
-, 899), false)
-);
-
-WriteLiteral(">节点名</a></th>\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 994), Tuple.Create("\"", 1042)
-            
-            #line 26 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1001), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("DisplayName"))
-            
-            #line default
-            #line hidden
-, 1001), false)
-);
-
-WriteLiteral(">显示名</a></th>\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1095), Tuple.Create("\"", 1135)
-            
-            #line 27 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1102), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("Url"))
-            
-            #line default
-            #line hidden
-, 1102), false)
-);
-
-WriteLiteral(">链接</a></th>\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1187), Tuple.Create("\"", 1228)
-            
-            #line 28 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1194), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("Sort"))
-            
-            #line default
-            #line hidden
-, 1194), false)
-);
-
-WriteLiteral(">排序</a></th>\n            ");
-
-WriteLiteral("\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1377), Tuple.Create("\"", 1421)
-            
-            #line 30 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1384), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("Visible"))
-            
-            #line default
-            #line hidden
-, 1384), false)
-);
-
-WriteLiteral(">可见</a></th>\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(" title=\"必要。必要的菜单，必须至少有角色拥有这些权限，如果没有则自动授权给系统角色\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1519), Tuple.Create("\"", 1565)
-            
-            #line 31 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-           , Tuple.Create(Tuple.Create("", 1526), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("Necessary"))
-            
-            #line default
-            #line hidden
-, 1526), false)
-);
-
-WriteLiteral(">必要</a></th>\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(" title=\"权限子项。逗号分隔，每个权限子项名值竖线分隔\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1648), Tuple.Create("\"", 1695)
-            
-            #line 32 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1655), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("Permission"))
-            
-            #line default
-            #line hidden
-, 1655), false)
-);
-
-WriteLiteral(">权限子项</a></th>\n");
-
-            
-            #line 33 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-            
-            
-            #line default
-            #line hidden
-            
-            #line 33 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-             if (this.Has(PermissionFlags.Detail, PermissionFlags.Update, PermissionFlags.Delete))
-            {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">升</th>\n");
-
-WriteLiteral("                <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">降</th>\n");
-
-WriteLiteral("                <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(" style=\"min-width:100px;\"");
-
-WriteLiteral(">操作</th>\n");
-
-            
-            #line 38 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-            }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        </tr>\n    </thead>\n    <tbody>\n");
-
-            
-            #line 42 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-        
-            
-            #line default
-            #line hidden
-            
-            #line 42 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-         foreach (var entity in Model)
-        {
-            var p = entity.Parent as IEntityTree;
-            if (p == null)
-            {
-                p = fact.EntityType.GetValue("Root") as IEntityTree;
-            }
-            var id = entity.ID;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            <tr>\n");
-
-            
-            #line 51 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-                
-            
-            #line default
-            #line hidden
-            
-            #line 51 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-                 if (enableSelect)
-                {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                    <td");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><input");
-
-WriteLiteral(" type=\"checkbox\"");
-
-WriteLiteral(" name=\"keys\"");
-
-WriteAttribute("value", Tuple.Create(" value=\"", 2423), Tuple.Create("\"", 2441)
-            
-            #line 53 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-      , Tuple.Create(Tuple.Create("", 2431), Tuple.Create<System.Object, System.Int32>(entity.ID
-            
-            #line default
-            #line hidden
-, 2431), false)
-);
-
-WriteLiteral(" /></td>\n");
-
-            
-            #line 54 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-                }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <td");
-
-WriteLiteral(" class=\"text-center hidden-md hidden-sm hidden-xs\"");
-
-WriteLiteral(">");
-
-            
-            #line 55 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-                                                                 Write(entity.ID);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\n                <td>");
-
-            
-            #line 56 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-               Write(entity.TreeNodeName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\n                <td>");
-
-            
-            #line 57 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-               Write(entity.DisplayName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\n                <td>");
-
-            
-            #line 58 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-               Write(entity.Url);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\n                <td");
-
-WriteLiteral(" class=\"text-right\"");
-
-WriteLiteral(">");
-
-            
-            #line 59 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-                                  Write(entity.Sort.ToString("n0"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\n                ");
-
-WriteLiteral("\n                <td");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">\n                    <i");
-
-WriteAttribute("class", Tuple.Create(" class=\"", 2860), Tuple.Create("\"", 2923)
-, Tuple.Create(Tuple.Create("", 2868), Tuple.Create("glyphicon", 2868), true)
-, Tuple.Create(Tuple.Create(" ", 2877), Tuple.Create("glyphicon-", 2878), true)
-            
-            #line 62 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 2888), Tuple.Create<System.Object, System.Int32>(entity.Visible ? "ok" : "remove"
-            
-            #line default
-            #line hidden
-, 2888), false)
-);
-
-WriteAttribute("style", Tuple.Create(" style=\"", 2924), Tuple.Create("\"", 2975)
-, Tuple.Create(Tuple.Create("", 2932), Tuple.Create("color:", 2932), true)
-            
-            #line 62 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-                     , Tuple.Create(Tuple.Create(" ", 2938), Tuple.Create<System.Object, System.Int32>(entity.Visible ? "green" : "red"
-            
-            #line default
-            #line hidden
-, 2939), false)
-, Tuple.Create(Tuple.Create("", 2974), Tuple.Create(";", 2974), true)
-);
-
-WriteLiteral("></i>\n                </td>\n                <td");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">\n                    <i");
-
-WriteAttribute("class", Tuple.Create(" class=\"", 3067), Tuple.Create("\"", 3132)
-, Tuple.Create(Tuple.Create("", 3075), Tuple.Create("glyphicon", 3075), true)
-, Tuple.Create(Tuple.Create(" ", 3084), Tuple.Create("glyphicon-", 3085), true)
-            
-            #line 65 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 3095), Tuple.Create<System.Object, System.Int32>(entity.Necessary ? "ok" : "remove"
-            
-            #line default
-            #line hidden
-, 3095), false)
-);
-
-WriteAttribute("style", Tuple.Create(" style=\"", 3133), Tuple.Create("\"", 3186)
-, Tuple.Create(Tuple.Create("", 3141), Tuple.Create("color:", 3141), true)
-            
-            #line 65 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-                       , Tuple.Create(Tuple.Create(" ", 3147), Tuple.Create<System.Object, System.Int32>(entity.Necessary ? "green" : "red"
-            
-            #line default
-            #line hidden
-, 3148), false)
-, Tuple.Create(Tuple.Create("", 3185), Tuple.Create(";", 3185), true)
-);
-
-WriteLiteral("></i>\n                </td>\n                <td>");
-
-            
-            #line 67 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-               Write(entity.Permission);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\n");
-
-            
-            #line 68 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-                
-            
-            #line default
-            #line hidden
-            
-            #line 68 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-                 if (this.Has(PermissionFlags.Detail, PermissionFlags.Update, PermissionFlags.Delete))
-                {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                    <td");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">\n");
-
-            
-            #line 71 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-                        
-            
-            #line default
-            #line hidden
-            
-            #line 71 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-                         if (p != null && p.Childs != null && p.Childs.Count > 0 && entity != p.Childs[0])
-                        {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                            <a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 3564), Tuple.Create("\"", 3600)
-            
-            #line 73 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 3571), Tuple.Create<System.Object, System.Int32>(Url.Action("Up", new { id })
-            
-            #line default
-            #line hidden
-, 3571), false)
-);
-
-WriteLiteral("><span");
-
-WriteLiteral(" class=\"glyphicon glyphicon-arrow-up\"");
-
-WriteLiteral(" style=\"color: green;\"");
-
-WriteLiteral("></span></a>\n");
-
-            
-            #line 74 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-                        }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                    </td>\n");
-
-WriteLiteral("                    <td");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">\n");
-
-            
-            #line 77 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-                        
-            
-            #line default
-            #line hidden
-            
-            #line 77 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-                         if (p != null && entity != p.Childs[p.Childs.Count - 1])
-                        {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                            <a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 3914), Tuple.Create("\"", 3952)
-            
-            #line 79 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 3921), Tuple.Create<System.Object, System.Int32>(Url.Action("Down", new { id })
-            
-            #line default
-            #line hidden
-, 3921), false)
-);
-
-WriteLiteral("><span");
-
-WriteLiteral(" class=\"glyphicon glyphicon-arrow-down\"");
-
-WriteLiteral(" style=\"color: red;\"");
-
-WriteLiteral("></span></a>\n");
-
-            
-            #line 80 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-                        }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                    </td>\n");
-
-WriteLiteral("                    <td");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">\n");
-
-WriteLiteral("                        ");
-
-            
-            #line 83 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-                   Write(Html.Partial("_List_Data_Action", (Object)entity));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\n                    </td>\n");
-
-            
-            #line 85 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-                }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            </tr>\n");
-
-            
-            #line 87 "..\..\Areas\Admin\Views\Menu\_ListTree_Data.cshtml"
-        }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("    </tbody>\n</table>");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Areas/Admin/Views/Role/SetPermission.cshtml b/NewLife.Cube/Areas/Admin/Views/Role/SetPermission.cshtml
deleted file mode 100644
index 3160003cab..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/Role/SetPermission.cshtml
+++ /dev/null
@@ -1,47 +0,0 @@
-﻿@using System.Reflection
-@using XCode
-@using XCode.Configuration
-@{
-    Layout = null;
-
-    var role = Model.Role as Role;
-    var menus = Menu.Root.AllChilds;
-    //var pfs = EnumHelper.GetDescriptions<PermissionFlags>().Where(e => e.Key > PermissionFlags.None);
-}
-<div class="form-group col-md-12">
-    <label class="control-label col-md-2">授权</label>
-    <div class="input-group col-md-10">
-        <table class="table table-bordered table-hover table-striped table-condensed">
-            <thead>
-                <tr>
-                    <th>名称</th>
-                    <th>显示名</th>
-                    <th>授权</th>
-                    <th>操作权限</th>
-                </tr>
-            </thead>
-            <tbody>
-                @foreach (var entity in menus)
-                {
-                    <tr>
-                        <td>@entity.TreeNodeName</td>
-                        <td>@entity.DisplayName</td>
-                        <td>@Html.CheckBox("p" + entity.ID, role.Has(entity.ID))</td>
-                        <td>
-                            @if (entity.Childs.Count == 0)
-                            {
-                                foreach (var item in entity.Permissions.OrderBy(e => e.Key))
-                                {
-                                    var id = "pf" + entity.ID + "_" + ((Int32)item.Key);
-                                    @Html.CheckBox(id, role.Has(entity.ID, (PermissionFlags)item.Key))
-                                    @Html.Label(id, item.Value)
-                                    <text>&nbsp;</text>
-                                }
-                            }
-                        </td>
-                    </tr>
-                }
-            </tbody>
-        </table>
-    </div>
-</div>
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Views/Role/SetPermission.generated.cs b/NewLife.Cube/Areas/Admin/Views/Role/SetPermission.generated.cs
deleted file mode 100644
index b5aa17a348..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/Role/SetPermission.generated.cs
+++ /dev/null
@@ -1,211 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    
-    #line 1 "..\..\Areas\Admin\Views\Role\SetPermission.cshtml"
-    using System.Reflection;
-    
-    #line default
-    #line hidden
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    
-    #line 2 "..\..\Areas\Admin\Views\Role\SetPermission.cshtml"
-    using XCode;
-    
-    #line default
-    #line hidden
-    
-    #line 3 "..\..\Areas\Admin\Views\Role\SetPermission.cshtml"
-    using XCode.Configuration;
-    
-    #line default
-    #line hidden
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Admin/Views/Role/SetPermission.cshtml")]
-    public partial class _Areas_Admin_Views_Role_SetPermission_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Areas_Admin_Views_Role_SetPermission_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 4 "..\..\Areas\Admin\Views\Role\SetPermission.cshtml"
-  
-    Layout = null;
-
-    var role = Model.Role as Role;
-    var menus = Menu.Root.AllChilds;
-    //var pfs = EnumHelper.GetDescriptions<PermissionFlags>().Where(e => e.Key > PermissionFlags.None);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n<div");
-
-WriteLiteral(" class=\"form-group col-md-12\"");
-
-WriteLiteral(">\r\n    <label");
-
-WriteLiteral(" class=\"control-label col-md-2\"");
-
-WriteLiteral(">授权</label>\r\n    <div");
-
-WriteLiteral(" class=\"input-group col-md-10\"");
-
-WriteLiteral(">\r\n        <table");
-
-WriteLiteral(" class=\"table table-bordered table-hover table-striped table-condensed\"");
-
-WriteLiteral(">\r\n            <thead>\r\n                <tr>\r\n                    <th>名称</th>\r\n  " +
-"                  <th>显示名</th>\r\n                    <th>授权</th>\r\n               " +
-"     <th>操作权限</th>\r\n                </tr>\r\n            </thead>\r\n            <tb" +
-"ody>\r\n");
-
-            
-            #line 24 "..\..\Areas\Admin\Views\Role\SetPermission.cshtml"
-                
-            
-            #line default
-            #line hidden
-            
-            #line 24 "..\..\Areas\Admin\Views\Role\SetPermission.cshtml"
-                 foreach (var entity in menus)
-                {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                    <tr>\r\n                        <td>");
-
-            
-            #line 27 "..\..\Areas\Admin\Views\Role\SetPermission.cshtml"
-                       Write(entity.TreeNodeName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                        <td>");
-
-            
-            #line 28 "..\..\Areas\Admin\Views\Role\SetPermission.cshtml"
-                       Write(entity.DisplayName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                        <td>");
-
-            
-            #line 29 "..\..\Areas\Admin\Views\Role\SetPermission.cshtml"
-                       Write(Html.CheckBox("p" + entity.ID, role.Has(entity.ID)));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                        <td>\r\n");
-
-            
-            #line 31 "..\..\Areas\Admin\Views\Role\SetPermission.cshtml"
-                            
-            
-            #line default
-            #line hidden
-            
-            #line 31 "..\..\Areas\Admin\Views\Role\SetPermission.cshtml"
-                             if (entity.Childs.Count == 0)
-                            {
-                                foreach (var item in entity.Permissions.OrderBy(e => e.Key))
-                                {
-                                    var id = "pf" + entity.ID + "_" + ((Int32)item.Key);
-                                    
-            
-            #line default
-            #line hidden
-            
-            #line 36 "..\..\Areas\Admin\Views\Role\SetPermission.cshtml"
-                               Write(Html.CheckBox(id, role.Has(entity.ID, (PermissionFlags)item.Key)));
-
-            
-            #line default
-            #line hidden
-            
-            #line 36 "..\..\Areas\Admin\Views\Role\SetPermission.cshtml"
-                                                                                                      
-                                    
-            
-            #line default
-            #line hidden
-            
-            #line 37 "..\..\Areas\Admin\Views\Role\SetPermission.cshtml"
-                               Write(Html.Label(id, item.Value));
-
-            
-            #line default
-            #line hidden
-            
-            #line 37 "..\..\Areas\Admin\Views\Role\SetPermission.cshtml"
-                                                               
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                                    ");
-
-WriteLiteral("&nbsp;");
-
-WriteLiteral("\r\n");
-
-            
-            #line 39 "..\..\Areas\Admin\Views\Role\SetPermission.cshtml"
-                                }
-                            }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                        </td>\r\n                    </tr>\r\n");
-
-            
-            #line 43 "..\..\Areas\Admin\Views\Role\SetPermission.cshtml"
-                }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            </tbody>\r\n        </table>\r\n    </div>\r\n</div>");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Areas/Admin/Views/Role/_Form_Group.cshtml b/NewLife.Cube/Areas/Admin/Views/Role/_Form_Group.cshtml
deleted file mode 100644
index 58b147be97..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/Role/_Form_Group.cshtml
+++ /dev/null
@@ -1,25 +0,0 @@
-﻿@using NewLife;
-@using XCode;
-@using XCode.Configuration;
-@{
-    var pair = Model as Pair;
-    var entity = pair.First as IEntity;
-    var item = pair.Second as FieldItem;
-
-    var set = NewLife.Cube.Setting.Current;
-    var cls = set.FormGroupClass;
-    if (cls.IsNullOrEmpty()) { cls = "form-group col-xs-12 col-sm-6 col-lg-4"; }
-}
-@if (item.Name == "Permission")
-{
-    if (!entity.IsNullKey)
-    {
-        @Html.Partial("SetPermission", new { Role = entity })
-    }
-}
-else
-{
-    <div class="@cls">
-        @Html.Partial("_Form_Item", new Pair(entity, item))
-    </div>
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Views/Role/_Form_Group.generated.cs b/NewLife.Cube/Areas/Admin/Views/Role/_Form_Group.generated.cs
deleted file mode 100644
index 595c975e70..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/Role/_Form_Group.generated.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    
-    #line 1 "..\..\Areas\Admin\Views\Role\_Form_Group.cshtml"
-    using NewLife;
-    
-    #line default
-    #line hidden
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    
-    #line 2 "..\..\Areas\Admin\Views\Role\_Form_Group.cshtml"
-    using XCode;
-    
-    #line default
-    #line hidden
-    
-    #line 3 "..\..\Areas\Admin\Views\Role\_Form_Group.cshtml"
-    using XCode.Configuration;
-    
-    #line default
-    #line hidden
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Admin/Views/Role/_Form_Group.cshtml")]
-    public partial class _Areas_Admin_Views_Role__Form_Group_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Areas_Admin_Views_Role__Form_Group_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 4 "..\..\Areas\Admin\Views\Role\_Form_Group.cshtml"
-  
-    var pair = Model as Pair;
-    var entity = pair.First as IEntity;
-    var item = pair.Second as FieldItem;
-
-    var set = NewLife.Cube.Setting.Current;
-    var cls = set.FormGroupClass;
-    if (cls.IsNullOrEmpty()) { cls = "form-group col-xs-12 col-sm-6 col-lg-4"; }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-            
-            #line 13 "..\..\Areas\Admin\Views\Role\_Form_Group.cshtml"
- if (item.Name == "Permission")
-{
-    if (!entity.IsNullKey)
-    {
-        
-            
-            #line default
-            #line hidden
-            
-            #line 17 "..\..\Areas\Admin\Views\Role\_Form_Group.cshtml"
-   Write(Html.Partial("SetPermission", new { Role = entity }));
-
-            
-            #line default
-            #line hidden
-            
-            #line 17 "..\..\Areas\Admin\Views\Role\_Form_Group.cshtml"
-                                                             
-    }
-}
-else
-{
-
-            
-            #line default
-            #line hidden
-WriteLiteral("    <div");
-
-WriteAttribute("class", Tuple.Create(" class=\"", 507), Tuple.Create("\"", 519)
-            
-            #line 22 "..\..\Areas\Admin\Views\Role\_Form_Group.cshtml"
-, Tuple.Create(Tuple.Create("", 515), Tuple.Create<System.Object, System.Int32>(cls
-            
-            #line default
-            #line hidden
-, 515), false)
-);
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("        ");
-
-            
-            #line 23 "..\..\Areas\Admin\Views\Role\_Form_Group.cshtml"
-   Write(Html.Partial("_Form_Item", new Pair(entity, item)));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n    </div>\r\n");
-
-            
-            #line 25 "..\..\Areas\Admin\Views\Role\_Form_Group.cshtml"
-}
-            
-            #line default
-            #line hidden
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Areas/Admin/Views/Role/_List_Data.cshtml b/NewLife.Cube/Areas/Admin/Views/Role/_List_Data.cshtml
deleted file mode 100644
index 2cb0b2401e..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/Role/_List_Data.cshtml
+++ /dev/null
@@ -1,63 +0,0 @@
-﻿@model IList<XCode.Membership.Role>
-@using NewLife;
-@using NewLife.Web;
-@using XCode;
-@using XCode.Configuration;
-@using System.Web.Mvc;
-@using System.Web.Mvc.Ajax;
-@using System.Web.Mvc.Html;
-@using System.Web.Routing;
-@{
-    var fact = ViewBag.Factory as IEntityOperate;
-    var page = ViewBag.Page as Pager;
-    var fields = ViewBag.Fields as IList<FieldItem>;
-    var enableSelect = this.EnableSelect();
-    var provider = ManageProvider.Provider;
-}
-<table class="table table-bordered table-hover table-striped table-condensed">
-    <thead>
-        <tr>
-            @if (enableSelect)
-            {
-                <th class="text-center" style="width:10px;"><input type="checkbox" id="chkAll" title="全选" /></th>
-            }
-            <th class="text-center hidden-md hidden-sm hidden-xs"><a href="@Html.Raw(page.GetSortUrl("ID"))">编号</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("Name"))">名称</a></th>
-            <th class="text-center" title="系统。系统角色用于业务系统开发使用，禁止修改名称或删除"><a href="@Html.Raw(page.GetSortUrl("IsSystem"))">系统</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("Remark"))">说明</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("UpdateUserID"))">更新用户</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("UpdateIP"))">更新地址</a></th>
-            <th class="text-center" style="min-width:134px;"><a href="@Html.Raw(page.GetSortUrl("UpdateTime"))">更新时间</a></th>
-            @if (this.Has(PermissionFlags.Detail, PermissionFlags.Update, PermissionFlags.Delete))
-            {
-                <th class="text-center" style="min-width:100px;">操作</th>
-            }
-        </tr>
-    </thead>
-    <tbody>
-        @foreach (var entity in Model)
-        {
-            <tr>
-                @if (enableSelect)
-                {
-                    <td class="text-center"><input type="checkbox" name="keys" value="@entity.ID" /></td>
-                }
-                <td class="text-center hidden-md hidden-sm hidden-xs">@entity.ID</td>
-                <td>@entity.Name</td>
-                <td class="text-center">
-                    <i class="glyphicon glyphicon-@(entity.IsSystem ? "ok" : "remove")" style="color: @(entity.IsSystem ? "green" : "red");"></i>
-                </td>
-                <td>@entity.Remark</td>
-                <td class="text-right">@provider.FindByID(entity.UpdateUserID)</td>
-                <td title="@entity.UpdateIP.IPToAddress()">@entity.UpdateIP</td>
-                <td>@entity.UpdateTime.ToFullString("")</td>
-                @if (this.Has(PermissionFlags.Detail, PermissionFlags.Update, PermissionFlags.Delete))
-                {
-                    <td class="text-center">
-                        @Html.Partial("_List_Data_Action", (Object)entity)
-                    </td>
-                }
-            </tr>
-        }
-    </tbody>
-</table>
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Views/Role/_List_Data.generated.cs b/NewLife.Cube/Areas/Admin/Views/Role/_List_Data.generated.cs
deleted file mode 100644
index 01a26ab14e..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/Role/_List_Data.generated.cs
+++ /dev/null
@@ -1,507 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    
-    #line 6 "..\..\Areas\Admin\Views\Role\_List_Data.cshtml"
-    using System.Web.Mvc;
-    
-    #line default
-    #line hidden
-    
-    #line 7 "..\..\Areas\Admin\Views\Role\_List_Data.cshtml"
-    using System.Web.Mvc.Ajax;
-    
-    #line default
-    #line hidden
-    
-    #line 8 "..\..\Areas\Admin\Views\Role\_List_Data.cshtml"
-    using System.Web.Mvc.Html;
-    
-    #line default
-    #line hidden
-    
-    #line 9 "..\..\Areas\Admin\Views\Role\_List_Data.cshtml"
-    using System.Web.Routing;
-    
-    #line default
-    #line hidden
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    
-    #line 2 "..\..\Areas\Admin\Views\Role\_List_Data.cshtml"
-    using NewLife;
-    
-    #line default
-    #line hidden
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    
-    #line 3 "..\..\Areas\Admin\Views\Role\_List_Data.cshtml"
-    using NewLife.Web;
-    
-    #line default
-    #line hidden
-    
-    #line 4 "..\..\Areas\Admin\Views\Role\_List_Data.cshtml"
-    using XCode;
-    
-    #line default
-    #line hidden
-    
-    #line 5 "..\..\Areas\Admin\Views\Role\_List_Data.cshtml"
-    using XCode.Configuration;
-    
-    #line default
-    #line hidden
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Admin/Views/Role/_List_Data.cshtml")]
-    public partial class _Areas_Admin_Views_Role__List_Data_cshtml : System.Web.Mvc.WebViewPage<IList<XCode.Membership.Role>>
-    {
-        public _Areas_Admin_Views_Role__List_Data_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 10 "..\..\Areas\Admin\Views\Role\_List_Data.cshtml"
-  
-    var fact = ViewBag.Factory as IEntityOperate;
-    var page = ViewBag.Page as Pager;
-    var fields = ViewBag.Fields as IList<FieldItem>;
-    var enableSelect = this.EnableSelect();
-    var provider = ManageProvider.Provider;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\n<table");
-
-WriteLiteral(" class=\"table table-bordered table-hover table-striped table-condensed\"");
-
-WriteLiteral(">\n    <thead>\n        <tr>\n");
-
-            
-            #line 20 "..\..\Areas\Admin\Views\Role\_List_Data.cshtml"
-            
-            
-            #line default
-            #line hidden
-            
-            #line 20 "..\..\Areas\Admin\Views\Role\_List_Data.cshtml"
-             if (enableSelect)
-            {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(" style=\"width:10px;\"");
-
-WriteLiteral("><input");
-
-WriteLiteral(" type=\"checkbox\"");
-
-WriteLiteral(" id=\"chkAll\"");
-
-WriteLiteral(" title=\"全选\"");
-
-WriteLiteral(" /></th>\n");
-
-            
-            #line 23 "..\..\Areas\Admin\Views\Role\_List_Data.cshtml"
-            }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            <th");
-
-WriteLiteral(" class=\"text-center hidden-md hidden-sm hidden-xs\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 799), Tuple.Create("\"", 838)
-            
-            #line 24 "..\..\Areas\Admin\Views\Role\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 806), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("ID"))
-            
-            #line default
-            #line hidden
-, 806), false)
-);
-
-WriteLiteral(">编号</a></th>\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 890), Tuple.Create("\"", 931)
-            
-            #line 25 "..\..\Areas\Admin\Views\Role\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 897), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("Name"))
-            
-            #line default
-            #line hidden
-, 897), false)
-);
-
-WriteLiteral(">名称</a></th>\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(" title=\"系统。系统角色用于业务系统开发使用，禁止修改名称或删除\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1019), Tuple.Create("\"", 1064)
-            
-            #line 26 "..\..\Areas\Admin\Views\Role\_List_Data.cshtml"
- , Tuple.Create(Tuple.Create("", 1026), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("IsSystem"))
-            
-            #line default
-            #line hidden
-, 1026), false)
-);
-
-WriteLiteral(">系统</a></th>\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1116), Tuple.Create("\"", 1159)
-            
-            #line 27 "..\..\Areas\Admin\Views\Role\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1123), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("Remark"))
-            
-            #line default
-            #line hidden
-, 1123), false)
-);
-
-WriteLiteral(">说明</a></th>\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1211), Tuple.Create("\"", 1260)
-            
-            #line 28 "..\..\Areas\Admin\Views\Role\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1218), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("UpdateUserID"))
-            
-            #line default
-            #line hidden
-, 1218), false)
-);
-
-WriteLiteral(">更新用户</a></th>\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1314), Tuple.Create("\"", 1359)
-            
-            #line 29 "..\..\Areas\Admin\Views\Role\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1321), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("UpdateIP"))
-            
-            #line default
-            #line hidden
-, 1321), false)
-);
-
-WriteLiteral(">更新地址</a></th>\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(" style=\"min-width:134px;\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1438), Tuple.Create("\"", 1485)
-            
-            #line 30 "..\..\Areas\Admin\Views\Role\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1445), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("UpdateTime"))
-            
-            #line default
-            #line hidden
-, 1445), false)
-);
-
-WriteLiteral(">更新时间</a></th>\n");
-
-            
-            #line 31 "..\..\Areas\Admin\Views\Role\_List_Data.cshtml"
-            
-            
-            #line default
-            #line hidden
-            
-            #line 31 "..\..\Areas\Admin\Views\Role\_List_Data.cshtml"
-             if (this.Has(PermissionFlags.Detail, PermissionFlags.Update, PermissionFlags.Delete))
-            {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(" style=\"min-width:100px;\"");
-
-WriteLiteral(">操作</th>\n");
-
-            
-            #line 34 "..\..\Areas\Admin\Views\Role\_List_Data.cshtml"
-            }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        </tr>\n    </thead>\n    <tbody>\n");
-
-            
-            #line 38 "..\..\Areas\Admin\Views\Role\_List_Data.cshtml"
-        
-            
-            #line default
-            #line hidden
-            
-            #line 38 "..\..\Areas\Admin\Views\Role\_List_Data.cshtml"
-         foreach (var entity in Model)
-        {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            <tr>\n");
-
-            
-            #line 41 "..\..\Areas\Admin\Views\Role\_List_Data.cshtml"
-                
-            
-            #line default
-            #line hidden
-            
-            #line 41 "..\..\Areas\Admin\Views\Role\_List_Data.cshtml"
-                 if (enableSelect)
-                {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                    <td");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><input");
-
-WriteLiteral(" type=\"checkbox\"");
-
-WriteLiteral(" name=\"keys\"");
-
-WriteAttribute("value", Tuple.Create(" value=\"", 1913), Tuple.Create("\"", 1931)
-            
-            #line 43 "..\..\Areas\Admin\Views\Role\_List_Data.cshtml"
-      , Tuple.Create(Tuple.Create("", 1921), Tuple.Create<System.Object, System.Int32>(entity.ID
-            
-            #line default
-            #line hidden
-, 1921), false)
-);
-
-WriteLiteral(" /></td>\n");
-
-            
-            #line 44 "..\..\Areas\Admin\Views\Role\_List_Data.cshtml"
-                }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <td");
-
-WriteLiteral(" class=\"text-center hidden-md hidden-sm hidden-xs\"");
-
-WriteLiteral(">");
-
-            
-            #line 45 "..\..\Areas\Admin\Views\Role\_List_Data.cshtml"
-                                                                 Write(entity.ID);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\n                <td>");
-
-            
-            #line 46 "..\..\Areas\Admin\Views\Role\_List_Data.cshtml"
-               Write(entity.Name);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\n                <td");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">\n                    <i");
-
-WriteAttribute("class", Tuple.Create(" class=\"", 2146), Tuple.Create("\"", 2210)
-, Tuple.Create(Tuple.Create("", 2154), Tuple.Create("glyphicon", 2154), true)
-, Tuple.Create(Tuple.Create(" ", 2163), Tuple.Create("glyphicon-", 2164), true)
-            
-            #line 48 "..\..\Areas\Admin\Views\Role\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 2174), Tuple.Create<System.Object, System.Int32>(entity.IsSystem ? "ok" : "remove"
-            
-            #line default
-            #line hidden
-, 2174), false)
-);
-
-WriteAttribute("style", Tuple.Create(" style=\"", 2211), Tuple.Create("\"", 2263)
-, Tuple.Create(Tuple.Create("", 2219), Tuple.Create("color:", 2219), true)
-            
-            #line 48 "..\..\Areas\Admin\Views\Role\_List_Data.cshtml"
-                      , Tuple.Create(Tuple.Create(" ", 2225), Tuple.Create<System.Object, System.Int32>(entity.IsSystem ? "green" : "red"
-            
-            #line default
-            #line hidden
-, 2226), false)
-, Tuple.Create(Tuple.Create("", 2262), Tuple.Create(";", 2262), true)
-);
-
-WriteLiteral("></i>\n                </td>\n                <td>");
-
-            
-            #line 50 "..\..\Areas\Admin\Views\Role\_List_Data.cshtml"
-               Write(entity.Remark);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\n                <td");
-
-WriteLiteral(" class=\"text-right\"");
-
-WriteLiteral(">");
-
-            
-            #line 51 "..\..\Areas\Admin\Views\Role\_List_Data.cshtml"
-                                  Write(provider.FindByID(entity.UpdateUserID));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\n                <td");
-
-WriteAttribute("title", Tuple.Create(" title=\"", 2435), Tuple.Create("\"", 2473)
-            
-            #line 52 "..\..\Areas\Admin\Views\Role\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 2443), Tuple.Create<System.Object, System.Int32>(entity.UpdateIP.IPToAddress()
-            
-            #line default
-            #line hidden
-, 2443), false)
-);
-
-WriteLiteral(">");
-
-            
-            #line 52 "..\..\Areas\Admin\Views\Role\_List_Data.cshtml"
-                                                      Write(entity.UpdateIP);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\n                <td>");
-
-            
-            #line 53 "..\..\Areas\Admin\Views\Role\_List_Data.cshtml"
-               Write(entity.UpdateTime.ToFullString(""));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\n");
-
-            
-            #line 54 "..\..\Areas\Admin\Views\Role\_List_Data.cshtml"
-                
-            
-            #line default
-            #line hidden
-            
-            #line 54 "..\..\Areas\Admin\Views\Role\_List_Data.cshtml"
-                 if (this.Has(PermissionFlags.Detail, PermissionFlags.Update, PermissionFlags.Delete))
-                {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                    <td");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">\n");
-
-WriteLiteral("                        ");
-
-            
-            #line 57 "..\..\Areas\Admin\Views\Role\_List_Data.cshtml"
-                   Write(Html.Partial("_List_Data_Action", (Object)entity));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\n                    </td>\n");
-
-            
-            #line 59 "..\..\Areas\Admin\Views\Role\_List_Data.cshtml"
-                }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            </tr>\n");
-
-            
-            #line 61 "..\..\Areas\Admin\Views\Role\_List_Data.cshtml"
-        }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("    </tbody>\n</table>");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Areas/Admin/Views/Shared/_Object_Nav.cshtml b/NewLife.Cube/Areas/Admin/Views/Shared/_Object_Nav.cshtml
deleted file mode 100644
index 2f8fbe9736..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/Shared/_Object_Nav.cshtml
+++ /dev/null
@@ -1,9 +0,0 @@
-﻿@{
-    var Obj = Model as Object;
-}
-<div class="text-center col-md-12" style="margin-bottom: 10px">
-    @Html.ActionLink("基本设置", "Index", "Core", null, new { @class = "btn btn-success btn-sm" })
-    @Html.ActionLink("系统设置", "Index", "Sys", null, new { @class = "btn btn-success btn-sm" })
-    @Html.ActionLink("数据中间件", "Index", "XCode", null, new { @class = "btn btn-success btn-sm" })
-    @Html.ActionLink("魔方设置", "Index", "Cube", null, new { @class = "btn btn-success btn-sm" })
-</div>
diff --git a/NewLife.Cube/Areas/Admin/Views/Shared/_Object_Nav.generated.cs b/NewLife.Cube/Areas/Admin/Views/Shared/_Object_Nav.generated.cs
deleted file mode 100644
index 4721f03b3f..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/Shared/_Object_Nav.generated.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Admin/Views/Shared/_Object_Nav.cshtml")]
-    public partial class _Areas_Admin_Views_Shared__Object_Nav_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Areas_Admin_Views_Shared__Object_Nav_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 1 "..\..\Areas\Admin\Views\Shared\_Object_Nav.cshtml"
-  
-    var Obj = Model as Object;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n<div");
-
-WriteLiteral(" class=\"text-center col-md-12\"");
-
-WriteLiteral(" style=\"margin-bottom: 10px\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("    ");
-
-            
-            #line 5 "..\..\Areas\Admin\Views\Shared\_Object_Nav.cshtml"
-Write(Html.ActionLink("基本设置", "Index", "Core", null, new { @class = "btn btn-success btn-sm" }));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("    ");
-
-            
-            #line 6 "..\..\Areas\Admin\Views\Shared\_Object_Nav.cshtml"
-Write(Html.ActionLink("系统设置", "Index", "Sys", null, new { @class = "btn btn-success btn-sm" }));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("    ");
-
-            
-            #line 7 "..\..\Areas\Admin\Views\Shared\_Object_Nav.cshtml"
-Write(Html.ActionLink("数据中间件", "Index", "XCode", null, new { @class = "btn btn-success btn-sm" }));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("    ");
-
-            
-            #line 8 "..\..\Areas\Admin\Views\Shared\_Object_Nav.cshtml"
-Write(Html.ActionLink("魔方设置", "Index", "Cube", null, new { @class = "btn btn-success btn-sm" }));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n</div>\r\n");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Areas/Admin/Views/User/Info.cshtml b/NewLife.Cube/Areas/Admin/Views/User/Info.cshtml
deleted file mode 100644
index 041063b1f7..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/User/Info.cshtml
+++ /dev/null
@@ -1,138 +0,0 @@
-﻿@model XCode.Membership.IUser
-@using System.Linq
-@using System.Reflection
-@using XCode
-@using XCode.Configuration
-@using NewLife.Cube.Entity;
-@{
-    var fact = EntityFactory.CreateOperate(ViewData.ModelMetadata.ModelType);
-    var user = Model as IUser;
-
-    var ms = NewLife.Web.OAuthConfig.Current.Items.Where(e => !e.AppID.IsNullOrEmpty()).ToList();
-    var binds = ViewBag.Binds as IList<UserConnect>;
-}
-<div class="row">
-    <div class="col-md-12">
-        <div class="form-horizontal">
-            @if (ViewBag.StatusMessage != null)
-            {
-                <div class="alert alert-success alert-dismissible text-center" role="alert">
-                    <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    <strong>@ViewBag.StatusMessage</strong>
-                </div>
-            }
-            @using (Html.BeginForm("Info", null, new { id = Model[fact.Unique.Name] }))
-            {
-                @Html.ValidationSummary()
-                if (!user.Avatar.IsNullOrEmpty())
-                {
-                    <div class="form-group">
-                        <img src="@user.Avatar" />
-                    </div>
-                }
-                <div class="form-group">
-                    <label class="control-label col-md-2">名称</label>
-                    <div class="input-group col-md-6">
-                        <input value="@user.Name" class="col-xs-12 col-sm-8 col-md-6 col-lg-4" disabled="disabled" />
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label class="control-label col-md-2">密码</label>
-                    <div class="input-group col-md-6">
-                        @Html.ForEditor("Password")
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label class="control-label col-md-2">显示名</label>
-                    <div class="input-group col-md-6">
-                        @Html.ForEditor("DisplayName")
-                        @Html.ForDescription("DisplayName")
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label class="control-label col-md-2">性别</label>
-                    <div class="input-group col-md-6">
-                        @Html.ForEditor("Sex", user.Sex)
-                        @Html.ForDescription("Sex")
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label class="control-label col-md-2">邮件</label>
-                    <div class="input-group col-md-6">
-                        @Html.ForEditor("Mail")
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label class="control-label col-md-2">手机</label>
-                    <div class="input-group col-md-6">
-                        @Html.ForEditor("Mobile")
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label class="control-label col-md-2">代码</label>
-                    <div class="input-group col-md-6">
-                        @Html.ForEditor("Code")
-                        @Html.ForDescription("Code")
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label class="control-label col-md-2">角色</label>
-                    <div class="input-group col-md-2">
-                        @(user.Roles.Join(",", r => r + ""))
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label class="control-label col-md-2">登录次数</label>
-                    <div class="input-group col-md-2">
-                        @user.Logins
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label class="control-label col-md-2">最后登录</label>
-                    <div class="input-group col-md-2">
-                        @user.LastLogin.ToFullString("")
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label class="control-label col-md-2">最后登录IP</label>
-                    <div class="input-group col-md-6">
-                        @user.LastLoginIP
-                    </div>
-                </div>
-                if (ms.Count > 0)
-                {
-                    <div class="form-group">
-                        <label class="control-label col-md-2">第三方绑定</label>
-                        <div class="input-group col-md-6">
-                            <ul>
-                                @foreach (var mi in ms)
-                                {
-                                    var uc = binds.FirstOrDefault(e => e.Enable && e.Provider.EqualIgnoreCase(mi.Name));
-                                    if (uc != null)
-                                    {
-                                        <li>
-                                            <span>@mi.Name（已绑定）</span>
-                                            <a href="~/Sso/UnBind/@mi.Name" title="取消绑定 @mi.Name">取消绑定</a>
-                                        </li>
-                                    }
-                                    else
-                                    {
-                                        <li>
-                                            <span>@mi.Name（未绑定）</span>
-                                            <a href="~/Sso/Bind/@mi.Name" title="绑定 @mi.Name">去绑定</a>
-                                        </li>
-                                    }
-                                }
-                            </ul>
-                        </div>
-                    </div>
-                }
-                <div class="clearfix form-actions">
-                    <label class="control-label col-md-4"></label>
-                    <button type="submit" class="btn btn-success btn-sm"><i class="glyphicon glyphicon-save" )"></i><strong>保存</strong></button>
-                    <button type="button" class="btn btn-danger btn-sm" onclick="history.go(-1);"><i class="glyphicon glyphicon-remove"></i><strong>取消</strong></button>
-                </div>
-            }
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Views/User/Info.generated.cs b/NewLife.Cube/Areas/Admin/Views/User/Info.generated.cs
deleted file mode 100644
index 4555ee6e5b..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/User/Info.generated.cs
+++ /dev/null
@@ -1,699 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    
-    #line 2 "..\..\Areas\Admin\Views\User\Info.cshtml"
-    using System.Linq;
-    
-    #line default
-    #line hidden
-    using System.Net;
-    
-    #line 3 "..\..\Areas\Admin\Views\User\Info.cshtml"
-    using System.Reflection;
-    
-    #line default
-    #line hidden
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    using NewLife.Cube;
-    
-    #line 6 "..\..\Areas\Admin\Views\User\Info.cshtml"
-    using NewLife.Cube.Entity;
-    
-    #line default
-    #line hidden
-    using NewLife.Reflection;
-    using NewLife.Web;
-    
-    #line 4 "..\..\Areas\Admin\Views\User\Info.cshtml"
-    using XCode;
-    
-    #line default
-    #line hidden
-    
-    #line 5 "..\..\Areas\Admin\Views\User\Info.cshtml"
-    using XCode.Configuration;
-    
-    #line default
-    #line hidden
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Admin/Views/User/Info.cshtml")]
-    public partial class _Areas_Admin_Views_User_Info_cshtml : System.Web.Mvc.WebViewPage<XCode.Membership.IUser>
-    {
-        public _Areas_Admin_Views_User_Info_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 7 "..\..\Areas\Admin\Views\User\Info.cshtml"
-  
-    var fact = EntityFactory.CreateOperate(ViewData.ModelMetadata.ModelType);
-    var user = Model as IUser;
-
-    var ms = NewLife.Web.OAuthConfig.Current.Items.Where(e => !e.AppID.IsNullOrEmpty()).ToList();
-    var binds = ViewBag.Binds as IList<UserConnect>;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n<div");
-
-WriteLiteral(" class=\"row\"");
-
-WriteLiteral(">\r\n    <div");
-
-WriteLiteral(" class=\"col-md-12\"");
-
-WriteLiteral(">\r\n        <div");
-
-WriteLiteral(" class=\"form-horizontal\"");
-
-WriteLiteral(">\r\n");
-
-            
-            #line 17 "..\..\Areas\Admin\Views\User\Info.cshtml"
-            
-            
-            #line default
-            #line hidden
-            
-            #line 17 "..\..\Areas\Admin\Views\User\Info.cshtml"
-             if (ViewBag.StatusMessage != null)
-            {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <div");
-
-WriteLiteral(" class=\"alert alert-success alert-dismissible text-center\"");
-
-WriteLiteral(" role=\"alert\"");
-
-WriteLiteral(">\r\n                    <button");
-
-WriteLiteral(" type=\"button\"");
-
-WriteLiteral(" class=\"close\"");
-
-WriteLiteral(" data-dismiss=\"alert\"");
-
-WriteLiteral(" aria-label=\"Close\"");
-
-WriteLiteral("><span");
-
-WriteLiteral(" aria-hidden=\"true\"");
-
-WriteLiteral(">&times;</span></button>\r\n                    <strong>");
-
-            
-            #line 21 "..\..\Areas\Admin\Views\User\Info.cshtml"
-                       Write(ViewBag.StatusMessage);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</strong>\r\n                </div>\r\n");
-
-            
-            #line 23 "..\..\Areas\Admin\Views\User\Info.cshtml"
-            }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            ");
-
-            
-            #line 24 "..\..\Areas\Admin\Views\User\Info.cshtml"
-             using (Html.BeginForm("Info", null, new { id = Model[fact.Unique.Name] }))
-            {
-                
-            
-            #line default
-            #line hidden
-            
-            #line 26 "..\..\Areas\Admin\Views\User\Info.cshtml"
-           Write(Html.ValidationSummary());
-
-            
-            #line default
-            #line hidden
-            
-            #line 26 "..\..\Areas\Admin\Views\User\Info.cshtml"
-                                         
-                if (!user.Avatar.IsNullOrEmpty())
-                {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                    <div");
-
-WriteLiteral(" class=\"form-group\"");
-
-WriteLiteral(">\r\n                        <img");
-
-WriteAttribute("src", Tuple.Create(" src=\"", 1203), Tuple.Create("\"", 1221)
-            
-            #line 30 "..\..\Areas\Admin\Views\User\Info.cshtml"
-, Tuple.Create(Tuple.Create("", 1209), Tuple.Create<System.Object, System.Int32>(user.Avatar
-            
-            #line default
-            #line hidden
-, 1209), false)
-);
-
-WriteLiteral(" />\r\n                    </div>\r\n");
-
-            
-            #line 32 "..\..\Areas\Admin\Views\User\Info.cshtml"
-                }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <div");
-
-WriteLiteral(" class=\"form-group\"");
-
-WriteLiteral(">\r\n                    <label");
-
-WriteLiteral(" class=\"control-label col-md-2\"");
-
-WriteLiteral(">名称</label>\r\n                    <div");
-
-WriteLiteral(" class=\"input-group col-md-6\"");
-
-WriteLiteral(">\r\n                        <input");
-
-WriteAttribute("value", Tuple.Create(" value=\"", 1472), Tuple.Create("\"", 1490)
-            
-            #line 36 "..\..\Areas\Admin\Views\User\Info.cshtml"
-, Tuple.Create(Tuple.Create("", 1480), Tuple.Create<System.Object, System.Int32>(user.Name
-            
-            #line default
-            #line hidden
-, 1480), false)
-);
-
-WriteLiteral(" class=\"col-xs-12 col-sm-8 col-md-6 col-lg-4\"");
-
-WriteLiteral(" disabled=\"disabled\"");
-
-WriteLiteral(" />\r\n                    </div>\r\n                </div>\r\n");
-
-WriteLiteral("                <div");
-
-WriteLiteral(" class=\"form-group\"");
-
-WriteLiteral(">\r\n                    <label");
-
-WriteLiteral(" class=\"control-label col-md-2\"");
-
-WriteLiteral(">密码</label>\r\n                    <div");
-
-WriteLiteral(" class=\"input-group col-md-6\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("                        ");
-
-            
-            #line 42 "..\..\Areas\Admin\Views\User\Info.cshtml"
-                   Write(Html.ForEditor("Password"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n                    </div>\r\n                </div>\r\n");
-
-WriteLiteral("                <div");
-
-WriteLiteral(" class=\"form-group\"");
-
-WriteLiteral(">\r\n                    <label");
-
-WriteLiteral(" class=\"control-label col-md-2\"");
-
-WriteLiteral(">显示名</label>\r\n                    <div");
-
-WriteLiteral(" class=\"input-group col-md-6\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("                        ");
-
-            
-            #line 48 "..\..\Areas\Admin\Views\User\Info.cshtml"
-                   Write(Html.ForEditor("DisplayName"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                        ");
-
-            
-            #line 49 "..\..\Areas\Admin\Views\User\Info.cshtml"
-                   Write(Html.ForDescription("DisplayName"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n                    </div>\r\n                </div>\r\n");
-
-WriteLiteral("                <div");
-
-WriteLiteral(" class=\"form-group\"");
-
-WriteLiteral(">\r\n                    <label");
-
-WriteLiteral(" class=\"control-label col-md-2\"");
-
-WriteLiteral(">性别</label>\r\n                    <div");
-
-WriteLiteral(" class=\"input-group col-md-6\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("                        ");
-
-            
-            #line 55 "..\..\Areas\Admin\Views\User\Info.cshtml"
-                   Write(Html.ForEditor("Sex", user.Sex));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                        ");
-
-            
-            #line 56 "..\..\Areas\Admin\Views\User\Info.cshtml"
-                   Write(Html.ForDescription("Sex"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n                    </div>\r\n                </div>\r\n");
-
-WriteLiteral("                <div");
-
-WriteLiteral(" class=\"form-group\"");
-
-WriteLiteral(">\r\n                    <label");
-
-WriteLiteral(" class=\"control-label col-md-2\"");
-
-WriteLiteral(">邮件</label>\r\n                    <div");
-
-WriteLiteral(" class=\"input-group col-md-6\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("                        ");
-
-            
-            #line 62 "..\..\Areas\Admin\Views\User\Info.cshtml"
-                   Write(Html.ForEditor("Mail"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n                    </div>\r\n                </div>\r\n");
-
-WriteLiteral("                <div");
-
-WriteLiteral(" class=\"form-group\"");
-
-WriteLiteral(">\r\n                    <label");
-
-WriteLiteral(" class=\"control-label col-md-2\"");
-
-WriteLiteral(">手机</label>\r\n                    <div");
-
-WriteLiteral(" class=\"input-group col-md-6\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("                        ");
-
-            
-            #line 68 "..\..\Areas\Admin\Views\User\Info.cshtml"
-                   Write(Html.ForEditor("Mobile"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n                    </div>\r\n                </div>\r\n");
-
-WriteLiteral("                <div");
-
-WriteLiteral(" class=\"form-group\"");
-
-WriteLiteral(">\r\n                    <label");
-
-WriteLiteral(" class=\"control-label col-md-2\"");
-
-WriteLiteral(">代码</label>\r\n                    <div");
-
-WriteLiteral(" class=\"input-group col-md-6\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("                        ");
-
-            
-            #line 74 "..\..\Areas\Admin\Views\User\Info.cshtml"
-                   Write(Html.ForEditor("Code"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                        ");
-
-            
-            #line 75 "..\..\Areas\Admin\Views\User\Info.cshtml"
-                   Write(Html.ForDescription("Code"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n                    </div>\r\n                </div>\r\n");
-
-WriteLiteral("                <div");
-
-WriteLiteral(" class=\"form-group\"");
-
-WriteLiteral(">\r\n                    <label");
-
-WriteLiteral(" class=\"control-label col-md-2\"");
-
-WriteLiteral(">角色</label>\r\n                    <div");
-
-WriteLiteral(" class=\"input-group col-md-2\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("                        ");
-
-            
-            #line 81 "..\..\Areas\Admin\Views\User\Info.cshtml"
-                    Write(user.Roles.Join(",", r => r + ""));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n                    </div>\r\n                </div>\r\n");
-
-WriteLiteral("                <div");
-
-WriteLiteral(" class=\"form-group\"");
-
-WriteLiteral(">\r\n                    <label");
-
-WriteLiteral(" class=\"control-label col-md-2\"");
-
-WriteLiteral(">登录次数</label>\r\n                    <div");
-
-WriteLiteral(" class=\"input-group col-md-2\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("                        ");
-
-            
-            #line 87 "..\..\Areas\Admin\Views\User\Info.cshtml"
-                   Write(user.Logins);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n                    </div>\r\n                </div>\r\n");
-
-WriteLiteral("                <div");
-
-WriteLiteral(" class=\"form-group\"");
-
-WriteLiteral(">\r\n                    <label");
-
-WriteLiteral(" class=\"control-label col-md-2\"");
-
-WriteLiteral(">最后登录</label>\r\n                    <div");
-
-WriteLiteral(" class=\"input-group col-md-2\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("                        ");
-
-            
-            #line 93 "..\..\Areas\Admin\Views\User\Info.cshtml"
-                   Write(user.LastLogin.ToFullString(""));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n                    </div>\r\n                </div>\r\n");
-
-WriteLiteral("                <div");
-
-WriteLiteral(" class=\"form-group\"");
-
-WriteLiteral(">\r\n                    <label");
-
-WriteLiteral(" class=\"control-label col-md-2\"");
-
-WriteLiteral(">最后登录IP</label>\r\n                    <div");
-
-WriteLiteral(" class=\"input-group col-md-6\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("                        ");
-
-            
-            #line 99 "..\..\Areas\Admin\Views\User\Info.cshtml"
-                   Write(user.LastLoginIP);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n                    </div>\r\n                </div>\r\n");
-
-            
-            #line 102 "..\..\Areas\Admin\Views\User\Info.cshtml"
-                if (ms.Count > 0)
-                {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                    <div");
-
-WriteLiteral(" class=\"form-group\"");
-
-WriteLiteral(">\r\n                        <label");
-
-WriteLiteral(" class=\"control-label col-md-2\"");
-
-WriteLiteral(">第三方绑定</label>\r\n                        <div");
-
-WriteLiteral(" class=\"input-group col-md-6\"");
-
-WriteLiteral(">\r\n                            <ul>\r\n");
-
-            
-            #line 108 "..\..\Areas\Admin\Views\User\Info.cshtml"
-                                
-            
-            #line default
-            #line hidden
-            
-            #line 108 "..\..\Areas\Admin\Views\User\Info.cshtml"
-                                 foreach (var mi in ms)
-                                {
-                                    var uc = binds.FirstOrDefault(e => e.Enable && e.Provider.EqualIgnoreCase(mi.Name));
-                                    if (uc != null)
-                                    {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                                        <li>\r\n                                   " +
-"         <span>");
-
-            
-            #line 114 "..\..\Areas\Admin\Views\User\Info.cshtml"
-                                             Write(mi.Name);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("（已绑定）</span>\r\n                                            <a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 5248), Tuple.Create("\"", 5276)
-, Tuple.Create(Tuple.Create("", 5255), Tuple.Create<System.Object, System.Int32>(Href("~/Sso/UnBind/")
-, 5255), false)
-            
-            #line 115 "..\..\Areas\Admin\Views\User\Info.cshtml"
-, Tuple.Create(Tuple.Create("", 5268), Tuple.Create<System.Object, System.Int32>(mi.Name
-            
-            #line default
-            #line hidden
-, 5268), false)
-);
-
-WriteAttribute("title", Tuple.Create(" title=\"", 5277), Tuple.Create("\"", 5298)
-, Tuple.Create(Tuple.Create("", 5285), Tuple.Create("取消绑定", 5285), true)
-            
-            #line 115 "..\..\Areas\Admin\Views\User\Info.cshtml"
-       , Tuple.Create(Tuple.Create(" ", 5289), Tuple.Create<System.Object, System.Int32>(mi.Name
-            
-            #line default
-            #line hidden
-, 5290), false)
-);
-
-WriteLiteral(">取消绑定</a>\r\n                                        </li>\r\n");
-
-            
-            #line 117 "..\..\Areas\Admin\Views\User\Info.cshtml"
-                                    }
-                                    else
-                                    {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                                        <li>\r\n                                   " +
-"         <span>");
-
-            
-            #line 121 "..\..\Areas\Admin\Views\User\Info.cshtml"
-                                             Write(mi.Name);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("（未绑定）</span>\r\n                                            <a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 5641), Tuple.Create("\"", 5667)
-, Tuple.Create(Tuple.Create("", 5648), Tuple.Create<System.Object, System.Int32>(Href("~/Sso/Bind/")
-, 5648), false)
-            
-            #line 122 "..\..\Areas\Admin\Views\User\Info.cshtml"
-, Tuple.Create(Tuple.Create("", 5659), Tuple.Create<System.Object, System.Int32>(mi.Name
-            
-            #line default
-            #line hidden
-, 5659), false)
-);
-
-WriteAttribute("title", Tuple.Create(" title=\"", 5668), Tuple.Create("\"", 5687)
-, Tuple.Create(Tuple.Create("", 5676), Tuple.Create("绑定", 5676), true)
-            
-            #line 122 "..\..\Areas\Admin\Views\User\Info.cshtml"
-   , Tuple.Create(Tuple.Create(" ", 5678), Tuple.Create<System.Object, System.Int32>(mi.Name
-            
-            #line default
-            #line hidden
-, 5679), false)
-);
-
-WriteLiteral(">去绑定</a>\r\n                                        </li>\r\n");
-
-            
-            #line 124 "..\..\Areas\Admin\Views\User\Info.cshtml"
-                                    }
-                                }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                            </ul>\r\n                        </div>\r\n              " +
-"      </div>\r\n");
-
-            
-            #line 129 "..\..\Areas\Admin\Views\User\Info.cshtml"
-                }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <div");
-
-WriteLiteral(" class=\"clearfix form-actions\"");
-
-WriteLiteral(">\r\n                    <label");
-
-WriteLiteral(" class=\"control-label col-md-4\"");
-
-WriteLiteral("></label>\r\n                    <button");
-
-WriteLiteral(" type=\"submit\"");
-
-WriteLiteral(" class=\"btn btn-success btn-sm\"");
-
-WriteLiteral("><i");
-
-WriteLiteral(" class=\"glyphicon glyphicon-save\"");
-
-WriteLiteral(" )\"></i><strong>保存</strong></button>\r\n                    <button");
-
-WriteLiteral(" type=\"button\"");
-
-WriteLiteral(" class=\"btn btn-danger btn-sm\"");
-
-WriteLiteral(" onclick=\"history.go(-1);\"");
-
-WriteLiteral("><i");
-
-WriteLiteral(" class=\"glyphicon glyphicon-remove\"");
-
-WriteLiteral("></i><strong>取消</strong></button>\r\n                </div>\r\n");
-
-            
-            #line 135 "..\..\Areas\Admin\Views\User\Info.cshtml"
-            }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        </div>\r\n    </div>\r\n</div>");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Areas/Admin/Views/User/Login.cshtml b/NewLife.Cube/Areas/Admin/Views/User/Login.cshtml
deleted file mode 100644
index fff416ef1a..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/User/Login.cshtml
+++ /dev/null
@@ -1,249 +0,0 @@
-﻿@using NewLife.Common;
-@{
-    Layout = null;
-    ViewBag.Title = "登录";
-}
-<!DOCTYPE html>
-<html lang="zh-CN">
-<head>
-    <meta charset="utf-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <!-- 上述3个meta标签*必须*放在最前面，任何其他内容都*必须*跟随其后！ -->
-
-    <title>@ViewBag.Title - @SysConfig.Current.DisplayName</title>
-    <link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
-
-    <!-- 基本样式 -->
-    <link href="~/Content/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
-    <!-- 自定义样式-->
-    <link href="~/Content/Cube.css" rel="stylesheet" />
-    <!-- 仅用于过渡期兼容-->
-    <style>
-        .login-logo {
-            width: 130px;
-            font-size: 130px;
-            color: #4CA6FF;
-            margin-top: 50px;
-        }
-
-        .cube-login {
-            background: #fff;
-            padding-bottom: 40px;
-            border-radius: 15px;
-            text-align: center;
-        }
-
-            .cube-login .heading {
-                display: block;
-                font-size: 24px;
-                font-weight: 700;
-                padding: 5px 0;
-                margin-bottom: 20px;
-            }
-
-            .cube-login .form-group {
-                padding: 0 40px;
-                margin: 0 0 25px 0;
-                position: relative;
-                display: block;
-            }
-
-            .cube-login .form-control {
-                border-radius: 20px;
-                box-shadow: none;
-                padding: 0 20px 0 45px;
-                height: 40px;
-                transition: all 0.3s ease 0s;
-            }
-
-                .cube-login .form-control:focus {
-                    background: #e0e0e0;
-                    box-shadow: none;
-                    outline: 0 none;
-                }
-
-            .cube-login .form-group i {
-                position: absolute;
-                top: 12px;
-                left: 60px;
-                font-size: 17px;
-                color: #c8c8c8;
-                transition: all 0.5s ease 0s;
-            }
-
-            .cube-login .form-group a {
-                position: absolute;
-                top: 12px;
-                right: 0px;
-                font-size: 17px;
-                color: #c8c8c8;
-                transition: all 0.5s ease 0s;
-                color: #4CA6FF;
-            }
-
-            .cube-login .form-control:focus + i {
-                color: #00b4ef;
-            }
-
-            .cube-login .fa-question-circle {
-                display: inline-block;
-                position: absolute;
-                top: 12px;
-                right: 60px;
-                font-size: 20px;
-                color: #808080;
-                transition: all 0.5s ease 0s;
-            }
-
-                .cube-login .fa-question-circle:hover {
-                    color: #000;
-                }
-
-            .cube-login .main-checkbox {
-                float: left;
-                width: 20px;
-                height: 20px;
-                background: #11a3fc;
-                border-radius: 50%;
-                position: relative;
-                margin: 5px 0 0 5px;
-                border: 1px solid #11a3fc;
-            }
-
-                .cube-login .main-checkbox label {
-                    width: 20px;
-                    height: 20px;
-                    position: absolute;
-                    top: 0;
-                    left: 0;
-                    cursor: pointer;
-                }
-
-                    .cube-login .main-checkbox label:after {
-                        content: "";
-                        width: 10px;
-                        height: 5px;
-                        position: absolute;
-                        top: 5px;
-                        left: 4px;
-                        border: 3px solid #fff;
-                        border-top: none;
-                        border-right: none;
-                        background: transparent;
-                        opacity: 0;
-                        -webkit-transform: rotate(-45deg);
-                        transform: rotate(-45deg);
-                    }
-
-                .cube-login .main-checkbox input[type=checkbox] {
-                    visibility: hidden;
-                }
-
-                    .cube-login .main-checkbox input[type=checkbox]:checked + label:after {
-                        opacity: 1;
-                    }
-
-            .cube-login .text {
-                float: left;
-                margin-left: 7px;
-                line-height: 20px;
-                padding-top: 5px;
-                text-transform: capitalize;
-            }
-
-            .cube-login .btn {
-                float: right;
-                font-size: 14px;
-                color: #fff;
-                background: #00b4ef;
-                border-radius: 30px;
-                padding: 8px 50px;
-                border: none;
-                text-transform: capitalize;
-                transition: all 0.5s ease 0s;
-            }
-
-        .ui.divider {
-            margin: 1rem 0rem;
-            line-height: 1;
-            height: 0em;
-            font-weight: bold;
-            text-transform: uppercase;
-            letter-spacing: 0.05em;
-            color: rgba(0, 0, 0, 0.85);
-            -webkit-user-select: none;
-            -moz-user-select: none;
-            -ms-user-select: none;
-            user-select: none;
-            -webkit-tap-highlight-color: rgba(0, 0, 0, 0)
-        }
-
-        .ui.horizontal.divider {
-            display: table;
-            white-space: nowrap;
-            height: auto;
-            line-height: 1;
-            text-align: center
-        }
-
-            .ui.horizontal.divider:before,
-            .ui.horizontal.divider:after {
-                content: '';
-                display: table-cell;
-                position: relative;
-                top: 50%;
-                width: 50%;
-                background-repeat: no-repeat
-            }
-
-            .ui.horizontal.divider:before {
-                background-position: right 1em top 50%;
-            }
-
-            .ui.horizontal.divider:after {
-                background-position: left 1em top 50%
-            }
-
-        .ui.divider > .icon {
-            margin: 0rem;
-            font-size: 1rem;
-            height: 1em;
-            vertical-align: middle
-        }
-
-        .ui.divider {
-            font-size: 1rem
-        }
-
-        .ui.horizontal.divider:before,
-        .ui.horizontal.divider:after {
-            background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAABaAAAAACCAYAAACuTHuKAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyFpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDE0IDc5LjE1MTQ4MSwgMjAxMy8wMy8xMy0xMjowOToxNSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIChXaW5kb3dzKSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo1OThBRDY4OUNDMTYxMUU0OUE3NUVGOEJDMzMzMjE2NyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo1OThBRDY4QUNDMTYxMUU0OUE3NUVGOEJDMzMzMjE2NyI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjU5OEFENjg3Q0MxNjExRTQ5QTc1RUY4QkMzMzMyMTY3IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjU5OEFENjg4Q0MxNjExRTQ5QTc1RUY4QkMzMzMyMTY3Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+VU513gAAADVJREFUeNrs0DENACAQBDBIWLGBJQby/mUcJn5sJXQmOQMAAAAAAJqt+2prAAAAAACg2xdgANk6BEVuJgyMAAAAAElFTkSuQmCC");
-        }
-    </style>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body>
-    <!--布局容器-->
-    <div class="container">
-        <div class="row">
-            <div class="col-md-6 col-md-offset-3">
-                <div class="tab-content">
-                    @Html.Partial("_Login_Login")@*登录页*@
-                    @Html.Partial("_Login_Forgot")@*找回密码页*@
-                    @Html.Partial("_Login_Register")@*注册页*@
-                    @Html.Partial("_Login_Login3")@*第三方登录*@
-                </div>
-            </div>
-        </div>
-    </div>
-    <!-- JQuery作为一等公民，页面内部随时可能使用 -->
-    <script src="~/Content/js/jquery-2.1.3.min.js"></script>
-    <script src="~/Content/bootstrap/js/bootstrap.min.js"></script>
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!--[if lt IE 9]>
-      <script src="https://cdn.bootcss.com/html5shiv/3.7.3/html5shiv.min.js"></script>
-      <script src="https://cdn.bootcss.com/respond.js/1.4.2/respond.min.js"></script>
-    <![endif]-->
-
-</body>
-</html>
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Views/User/Login.generated.cs b/NewLife.Cube/Areas/Admin/Views/User/Login.generated.cs
deleted file mode 100644
index 44e4e4e46f..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/User/Login.generated.cs
+++ /dev/null
@@ -1,307 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    
-    #line 1 "..\..\Areas\Admin\Views\User\Login.cshtml"
-    using NewLife.Common;
-    
-    #line default
-    #line hidden
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Admin/Views/User/Login.cshtml")]
-    public partial class _Areas_Admin_Views_User_Login_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Areas_Admin_Views_User_Login_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 2 "..\..\Areas\Admin\Views\User\Login.cshtml"
-  
-    Layout = null;
-    ViewBag.Title = "登录";
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n<!DOCTYPE html>\r\n<html");
-
-WriteLiteral(" lang=\"zh-CN\"");
-
-WriteLiteral(">\r\n<head>\r\n    <meta");
-
-WriteLiteral(" charset=\"utf-8\"");
-
-WriteLiteral(" />\r\n    <meta");
-
-WriteLiteral(" http-equiv=\"X-UA-Compatible\"");
-
-WriteLiteral(" content=\"IE=edge\"");
-
-WriteLiteral(">\r\n    <meta");
-
-WriteLiteral(" name=\"viewport\"");
-
-WriteLiteral(" content=\"width=device-width, initial-scale=1\"");
-
-WriteLiteral(" />\r\n    <!-- 上述3个meta标签*必须*放在最前面，任何其他内容都*必须*跟随其后！ -->\r\n\r\n    <title>");
-
-            
-            #line 14 "..\..\Areas\Admin\Views\User\Login.cshtml"
-      Write(ViewBag.Title);
-
-            
-            #line default
-            #line hidden
-WriteLiteral(" - ");
-
-            
-            #line 14 "..\..\Areas\Admin\Views\User\Login.cshtml"
-                       Write(SysConfig.Current.DisplayName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</title>\r\n    <link");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 419), Tuple.Create("\"", 439)
-, Tuple.Create(Tuple.Create("", 426), Tuple.Create<System.Object, System.Int32>(Href("~/favicon.ico")
-, 426), false)
-);
-
-WriteLiteral(" rel=\"shortcut icon\"");
-
-WriteLiteral(" type=\"image/x-icon\"");
-
-WriteLiteral(" />\r\n\r\n    <!-- 基本样式 -->\r\n    <link");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 515), Tuple.Create("\"", 563)
-, Tuple.Create(Tuple.Create("", 522), Tuple.Create<System.Object, System.Int32>(Href("~/Content/bootstrap/css/bootstrap.min.css")
-, 522), false)
-);
-
-WriteLiteral(" rel=\"stylesheet\"");
-
-WriteLiteral(" />\r\n    <!-- 自定义样式-->\r\n    <link");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 614), Tuple.Create("\"", 639)
-, Tuple.Create(Tuple.Create("", 621), Tuple.Create<System.Object, System.Int32>(Href("~/Content/Cube.css")
-, 621), false)
-);
-
-WriteLiteral(" rel=\"stylesheet\"");
-
-WriteLiteral(" />\r\n    <!-- 仅用于过渡期兼容-->\r\n    <style>\r\n        .login-logo {\r\n            width:" +
-" 130px;\r\n            font-size: 130px;\r\n            color: #4CA6FF;\r\n           " +
-" margin-top: 50px;\r\n        }\r\n\r\n        .cube-login {\r\n            background: " +
-"#fff;\r\n            padding-bottom: 40px;\r\n            border-radius: 15px;\r\n    " +
-"        text-align: center;\r\n        }\r\n\r\n            .cube-login .heading {\r\n  " +
-"              display: block;\r\n                font-size: 24px;\r\n               " +
-" font-weight: 700;\r\n                padding: 5px 0;\r\n                margin-bott" +
-"om: 20px;\r\n            }\r\n\r\n            .cube-login .form-group {\r\n             " +
-"   padding: 0 40px;\r\n                margin: 0 0 25px 0;\r\n                positi" +
-"on: relative;\r\n                display: block;\r\n            }\r\n\r\n            .cu" +
-"be-login .form-control {\r\n                border-radius: 20px;\r\n                " +
-"box-shadow: none;\r\n                padding: 0 20px 0 45px;\r\n                heig" +
-"ht: 40px;\r\n                transition: all 0.3s ease 0s;\r\n            }\r\n\r\n     " +
-"           .cube-login .form-control:focus {\r\n                    background: #e" +
-"0e0e0;\r\n                    box-shadow: none;\r\n                    outline: 0 no" +
-"ne;\r\n                }\r\n\r\n            .cube-login .form-group i {\r\n             " +
-"   position: absolute;\r\n                top: 12px;\r\n                left: 60px;\r" +
-"\n                font-size: 17px;\r\n                color: #c8c8c8;\r\n            " +
-"    transition: all 0.5s ease 0s;\r\n            }\r\n\r\n            .cube-login .for" +
-"m-group a {\r\n                position: absolute;\r\n                top: 12px;\r\n  " +
-"              right: 0px;\r\n                font-size: 17px;\r\n                col" +
-"or: #c8c8c8;\r\n                transition: all 0.5s ease 0s;\r\n                col" +
-"or: #4CA6FF;\r\n            }\r\n\r\n            .cube-login .form-control:focus + i {" +
-"\r\n                color: #00b4ef;\r\n            }\r\n\r\n            .cube-login .fa-" +
-"question-circle {\r\n                display: inline-block;\r\n                posit" +
-"ion: absolute;\r\n                top: 12px;\r\n                right: 60px;\r\n      " +
-"          font-size: 20px;\r\n                color: #808080;\r\n                tra" +
-"nsition: all 0.5s ease 0s;\r\n            }\r\n\r\n                .cube-login .fa-que" +
-"stion-circle:hover {\r\n                    color: #000;\r\n                }\r\n\r\n   " +
-"         .cube-login .main-checkbox {\r\n                float: left;\r\n           " +
-"     width: 20px;\r\n                height: 20px;\r\n                background: #1" +
-"1a3fc;\r\n                border-radius: 50%;\r\n                position: relative;" +
-"\r\n                margin: 5px 0 0 5px;\r\n                border: 1px solid #11a3f" +
-"c;\r\n            }\r\n\r\n                .cube-login .main-checkbox label {\r\n       " +
-"             width: 20px;\r\n                    height: 20px;\r\n                  " +
-"  position: absolute;\r\n                    top: 0;\r\n                    left: 0;" +
-"\r\n                    cursor: pointer;\r\n                }\r\n\r\n                   " +
-" .cube-login .main-checkbox label:after {\r\n                        content: \"\";\r" +
-"\n                        width: 10px;\r\n                        height: 5px;\r\n   " +
-"                     position: absolute;\r\n                        top: 5px;\r\n   " +
-"                     left: 4px;\r\n                        border: 3px solid #fff;" +
-"\r\n                        border-top: none;\r\n                        border-righ" +
-"t: none;\r\n                        background: transparent;\r\n                    " +
-"    opacity: 0;\r\n                        -webkit-transform: rotate(-45deg);\r\n   " +
-"                     transform: rotate(-45deg);\r\n                    }\r\n\r\n      " +
-"          .cube-login .main-checkbox input[type=checkbox] {\r\n                   " +
-" visibility: hidden;\r\n                }\r\n\r\n                    .cube-login .main" +
-"-checkbox input[type=checkbox]:checked + label:after {\r\n                        " +
-"opacity: 1;\r\n                    }\r\n\r\n            .cube-login .text {\r\n         " +
-"       float: left;\r\n                margin-left: 7px;\r\n                line-hei" +
-"ght: 20px;\r\n                padding-top: 5px;\r\n                text-transform: c" +
-"apitalize;\r\n            }\r\n\r\n            .cube-login .btn {\r\n                flo" +
-"at: right;\r\n                font-size: 14px;\r\n                color: #fff;\r\n    " +
-"            background: #00b4ef;\r\n                border-radius: 30px;\r\n        " +
-"        padding: 8px 50px;\r\n                border: none;\r\n                text-" +
-"transform: capitalize;\r\n                transition: all 0.5s ease 0s;\r\n         " +
-"   }\r\n\r\n        .ui.divider {\r\n            margin: 1rem 0rem;\r\n            line-" +
-"height: 1;\r\n            height: 0em;\r\n            font-weight: bold;\r\n          " +
-"  text-transform: uppercase;\r\n            letter-spacing: 0.05em;\r\n            c" +
-"olor: rgba(0, 0, 0, 0.85);\r\n            -webkit-user-select: none;\r\n            " +
-"-moz-user-select: none;\r\n            -ms-user-select: none;\r\n            user-se" +
-"lect: none;\r\n            -webkit-tap-highlight-color: rgba(0, 0, 0, 0)\r\n        " +
-"}\r\n\r\n        .ui.horizontal.divider {\r\n            display: table;\r\n            " +
-"white-space: nowrap;\r\n            height: auto;\r\n            line-height: 1;\r\n  " +
-"          text-align: center\r\n        }\r\n\r\n            .ui.horizontal.divider:be" +
-"fore,\r\n            .ui.horizontal.divider:after {\r\n                content: \'\';\r" +
-"\n                display: table-cell;\r\n                position: relative;\r\n    " +
-"            top: 50%;\r\n                width: 50%;\r\n                background-r" +
-"epeat: no-repeat\r\n            }\r\n\r\n            .ui.horizontal.divider:before {\r\n" +
-"                background-position: right 1em top 50%;\r\n            }\r\n\r\n      " +
-"      .ui.horizontal.divider:after {\r\n                background-position: left " +
-"1em top 50%\r\n            }\r\n\r\n        .ui.divider > .icon {\r\n            margin:" +
-" 0rem;\r\n            font-size: 1rem;\r\n            height: 1em;\r\n            vert" +
-"ical-align: middle\r\n        }\r\n\r\n        .ui.divider {\r\n            font-size: 1" +
-"rem\r\n        }\r\n\r\n        .ui.horizontal.divider:before,\r\n        .ui.horizontal" +
-".divider:after {\r\n            background-image: url(\"data:image/png;base64,iVBOR" +
-"w0KGgoAAAANSUhEUgAABaAAAAACCAYAAACuTHuKAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlY" +
-"WR5ccllPAAAAyFpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZ" +
-"D0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6b" +
-"WV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDE0IDc5LjE1MTQ4MSwgMjAxMy8wMy8xM" +
-"y0xMjowOToxNSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xO" +
-"Tk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sb" +
-"nM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zL" +
-"mFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwL" +
-"zEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDI" +
-"ChXaW5kb3dzKSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo1OThBRDY4OUNDMTYxMUU0OUE3NUVGO" +
-"EJDMzMzMjE2NyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo1OThBRDY4QUNDMTYxMUU0OUE3NUVGO" +
-"EJDMzMzMjE2NyI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjU5O" +
-"EFENjg3Q0MxNjExRTQ5QTc1RUY4QkMzMzMyMTY3IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjU5O" +
-"EFENjg4Q0MxNjExRTQ5QTc1RUY4QkMzMzMyMTY3Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSR" +
-"EY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+VU513gAAADVJREFUeNrs0DENACAQBDBIW" +
-"LGBJQby/mUcJn5sJXQmOQMAAAAAAJqt+2prAAAAAACg2xdgANk6BEVuJgyMAAAAAElFTkSuQmCC\");\r\n" +
-"        }\r\n    </style>\r\n        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>\r\n<body>\r\n    <!--布局容器-->\r\n    <div");
-
-WriteLiteral(" class=\"container\"");
-
-WriteLiteral(">\r\n        <div");
-
-WriteLiteral(" class=\"row\"");
-
-WriteLiteral(">\r\n            <div");
-
-WriteLiteral(" class=\"col-md-6 col-md-offset-3\"");
-
-WriteLiteral(">\r\n                <div");
-
-WriteLiteral(" class=\"tab-content\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("                    ");
-
-            
-            #line 231 "..\..\Areas\Admin\Views\User\Login.cshtml"
-               Write(Html.Partial("_Login_Login"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                    ");
-
-            
-            #line 232 "..\..\Areas\Admin\Views\User\Login.cshtml"
-               Write(Html.Partial("_Login_Forgot"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                    ");
-
-            
-            #line 233 "..\..\Areas\Admin\Views\User\Login.cshtml"
-               Write(Html.Partial("_Login_Register"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                    ");
-
-            
-            #line 234 "..\..\Areas\Admin\Views\User\Login.cshtml"
-               Write(Html.Partial("_Login_Login3"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n                </div>\r\n            </div>\r\n        </div>\r\n    </div>\r\n    <!-" +
-"- JQuery作为一等公民，页面内部随时可能使用 -->\r\n    <script");
-
-WriteAttribute("src", Tuple.Create(" src=\"", 8590), Tuple.Create("\"", 8628)
-, Tuple.Create(Tuple.Create("", 8596), Tuple.Create<System.Object, System.Int32>(Href("~/Content/js/jquery-2.1.3.min.js")
-, 8596), false)
-);
-
-WriteLiteral("></script>\r\n    <script");
-
-WriteAttribute("src", Tuple.Create(" src=\"", 8652), Tuple.Create("\"", 8697)
-, Tuple.Create(Tuple.Create("", 8658), Tuple.Create<System.Object, System.Int32>(Href("~/Content/bootstrap/js/bootstrap.min.js")
-, 8658), false)
-);
-
-WriteLiteral(@"></script>
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!--[if lt IE 9]>
-      <script src=""https://cdn.bootcss.com/html5shiv/3.7.3/html5shiv.min.js""></script>
-      <script src=""https://cdn.bootcss.com/respond.js/1.4.2/respond.min.js""></script>
-    <![endif]-->
-
-</body>
-</html>");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Areas/Admin/Views/User/_Form_Action.cshtml b/NewLife.Cube/Areas/Admin/Views/User/_Form_Action.cshtml
deleted file mode 100644
index 79562f3303..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/User/_Form_Action.cshtml
+++ /dev/null
@@ -1,14 +0,0 @@
-﻿@using XCode.Membership;
-@{
-    var entity = Model as IEntity;
-    var isNew = entity.IsNullKey;
-}
-@if (this.Has(PermissionFlags.Insert, PermissionFlags.Update))
-{
-    <div class="clearfix form-actions col-sm-12 col-md-12">
-        <a href="~/Admin/User/ClearPassword/@entity["ID"]" class="col-xs-1 btn btn-success btn-sm" title="数据库为空密码时，任何密码均可登录">清空密码</a>
-        <label class="control-label col-xs-3 col-sm-4 col-md-4"></label>
-        <button type="submit" class="btn btn-success btn-sm"><i class="glyphicon glyphicon-@(isNew ? "plus" : "save")"></i><strong>@(isNew ? "新增" : "保存")</strong></button>
-        <button type="button" class="btn btn-danger btn-sm" onclick="history.go(-1);"><i class="glyphicon glyphicon-remove"></i><strong>取消</strong></button>
-    </div>
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Views/User/_Form_Action.generated.cs b/NewLife.Cube/Areas/Admin/Views/User/_Form_Action.generated.cs
deleted file mode 100644
index aa0789b628..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/User/_Form_Action.generated.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    
-    #line 1 "..\..\Areas\Admin\Views\User\_Form_Action.cshtml"
-    using XCode.Membership;
-    
-    #line default
-    #line hidden
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Admin/Views/User/_Form_Action.cshtml")]
-    public partial class _Areas_Admin_Views_User__Form_Action_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Areas_Admin_Views_User__Form_Action_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 2 "..\..\Areas\Admin\Views\User\_Form_Action.cshtml"
-  
-    var entity = Model as IEntity;
-    var isNew = entity.IsNullKey;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-            
-            #line 6 "..\..\Areas\Admin\Views\User\_Form_Action.cshtml"
- if (this.Has(PermissionFlags.Insert, PermissionFlags.Update))
-{
-
-            
-            #line default
-            #line hidden
-WriteLiteral("    <div");
-
-WriteLiteral(" class=\"clearfix form-actions col-sm-12 col-md-12\"");
-
-WriteLiteral(">\r\n        <a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 242), Tuple.Create("\"", 289)
-, Tuple.Create(Tuple.Create("", 249), Tuple.Create<System.Object, System.Int32>(Href("~/Admin/User/ClearPassword/")
-, 249), false)
-            
-            #line 9 "..\..\Areas\Admin\Views\User\_Form_Action.cshtml"
-, Tuple.Create(Tuple.Create("", 276), Tuple.Create<System.Object, System.Int32>(entity["ID"]
-            
-            #line default
-            #line hidden
-, 276), false)
-);
-
-WriteLiteral(" class=\"col-xs-1 btn btn-success btn-sm\"");
-
-WriteLiteral(" title=\"数据库为空密码时，任何密码均可登录\"");
-
-WriteLiteral(">清空密码</a>\r\n        <label");
-
-WriteLiteral(" class=\"control-label col-xs-3 col-sm-4 col-md-4\"");
-
-WriteLiteral("></label>\r\n        <button");
-
-WriteLiteral(" type=\"submit\"");
-
-WriteLiteral(" class=\"btn btn-success btn-sm\"");
-
-WriteLiteral("><i");
-
-WriteAttribute("class", Tuple.Create(" class=\"", 504), Tuple.Create("\"", 558)
-, Tuple.Create(Tuple.Create("", 512), Tuple.Create("glyphicon", 512), true)
-, Tuple.Create(Tuple.Create(" ", 521), Tuple.Create("glyphicon-", 522), true)
-            
-            #line 11 "..\..\Areas\Admin\Views\User\_Form_Action.cshtml"
-             , Tuple.Create(Tuple.Create("", 532), Tuple.Create<System.Object, System.Int32>(isNew ? "plus" : "save"
-            
-            #line default
-            #line hidden
-, 532), false)
-);
-
-WriteLiteral("></i><strong>");
-
-            
-            #line 11 "..\..\Areas\Admin\Views\User\_Form_Action.cshtml"
-                                                                                                                               Write(isNew ? "新增" : "保存");
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</strong></button>\r\n        <button");
-
-WriteLiteral(" type=\"button\"");
-
-WriteLiteral(" class=\"btn btn-danger btn-sm\"");
-
-WriteLiteral(" onclick=\"history.go(-1);\"");
-
-WriteLiteral("><i");
-
-WriteLiteral(" class=\"glyphicon glyphicon-remove\"");
-
-WriteLiteral("></i><strong>取消</strong></button>\r\n    </div>\r\n");
-
-            
-            #line 14 "..\..\Areas\Admin\Views\User\_Form_Action.cshtml"
-}
-            
-            #line default
-            #line hidden
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Areas/Admin/Views/User/_List_Data.cshtml b/NewLife.Cube/Areas/Admin/Views/User/_List_Data.cshtml
deleted file mode 100644
index 5c440f3f5d..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/User/_List_Data.cshtml
+++ /dev/null
@@ -1,79 +0,0 @@
-﻿@model IList<XCode.Membership.UserX>
-@using NewLife;
-@using NewLife.Web;
-@using XCode;
-@using XCode.Configuration;
-@using System.Web.Mvc;
-@using System.Web.Mvc.Ajax;
-@using System.Web.Mvc.Html;
-@using System.Web.Routing;
-@{
-    var fact = ViewBag.Factory as IEntityOperate;
-    var page = ViewBag.Page as Pager;
-    var fields = ViewBag.Fields as IList<FieldItem>;
-    var enableSelect = this.EnableSelect();
-    //var provider = ManageProvider.Provider;
-}
-<table class="table table-bordered table-hover table-striped table-condensed">
-    <thead>
-        <tr>
-            @if (enableSelect)
-            {
-                <th class="text-center" style="width:10px;"><input type="checkbox" id="chkAll" title="全选" /></th>
-            }
-            <th class="text-center hidden-md hidden-sm hidden-xs"><a href="@Html.Raw(page.GetSortUrl("ID"))">编号</a></th>
-            <th class="text-center" title="名称。登录用户名"><a href="@Html.Raw(page.GetSortUrl("Name"))">名称</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("DisplayName"))">昵称</a></th>
-            <th class="text-center" title="性别。未知、男、女"><a href="@Html.Raw(page.GetSortUrl("Sex"))">性别</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("Mail"))">邮件</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("Mobile"))">手机</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("RoleID"))">角色</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("Online"))">在线</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("Enable"))">启用</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("Logins"))">登录次数</a></th>
-            <th class="text-center" style="min-width:134px;"><a href="@Html.Raw(page.GetSortUrl("LastLogin"))">最后登录</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("LastLoginIP"))">最后IP</a></th>
-            <th class="text-center">日志</th>
-            <th class="text-center">令牌</th>
-            @if (this.Has(PermissionFlags.Detail, PermissionFlags.Update, PermissionFlags.Delete))
-            {
-                <th class="text-center" style="min-width:100px;">操作</th>
-            }
-        </tr>
-    </thead>
-    <tbody>
-        @foreach (var entity in Model)
-        {
-            <tr>
-                @if (enableSelect)
-                {
-                    <td class="text-center"><input type="checkbox" name="keys" value="@entity.ID" /></td>
-                }
-                <td class="text-center hidden-md hidden-sm hidden-xs">@entity.ID</td>
-                <td>@entity.Name</td>
-                <td>@entity.DisplayName</td>
-                <td class="text-center">@entity.Sex</td>
-                <td>@entity.Mail</td>
-                <td>@entity.Mobile</td>
-                <td><a href="Role?ID=@entity.RoleID">@entity.RoleName</a></td>
-                <td class="text-center">
-                    <i class="glyphicon glyphicon-@(entity.Online ? "ok" : "remove")" style="color: @(entity.Online ? "green" : "red");"></i>
-                </td>
-                <td class="text-center">
-                    <i class="glyphicon glyphicon-@(entity.Enable ? "ok" : "remove")" style="color: @(entity.Enable ? "green" : "red");"></i>
-                </td>
-                <td class="text-right">@entity.Logins.ToString("n0")</td>
-                <td>@entity.LastLogin.ToFullString("")</td>
-                <td title="@entity.LastLoginAddress">@entity.LastLoginIP</td>
-                <td>@Html.ActionLink("日志", "Index", "Log", new { UserID = entity.ID }, null)</td>
-                <td>@Html.ActionLink("令牌", "Index", "UserToken", new { UserID = entity.ID }, null)</td>
-                @if (this.Has(PermissionFlags.Detail, PermissionFlags.Update, PermissionFlags.Delete))
-                {
-                    <td class="text-center">
-                        @Html.Partial("_List_Data_Action", (Object)entity)
-                    </td>
-                }
-            </tr>
-        }
-    </tbody>
-</table>
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Views/User/_List_Data.generated.cs b/NewLife.Cube/Areas/Admin/Views/User/_List_Data.generated.cs
deleted file mode 100644
index ff3245ab38..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/User/_List_Data.generated.cs
+++ /dev/null
@@ -1,698 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    
-    #line 6 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-    using System.Web.Mvc;
-    
-    #line default
-    #line hidden
-    
-    #line 7 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-    using System.Web.Mvc.Ajax;
-    
-    #line default
-    #line hidden
-    
-    #line 8 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-    using System.Web.Mvc.Html;
-    
-    #line default
-    #line hidden
-    
-    #line 9 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-    using System.Web.Routing;
-    
-    #line default
-    #line hidden
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    
-    #line 2 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-    using NewLife;
-    
-    #line default
-    #line hidden
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    
-    #line 3 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-    using NewLife.Web;
-    
-    #line default
-    #line hidden
-    
-    #line 4 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-    using XCode;
-    
-    #line default
-    #line hidden
-    
-    #line 5 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-    using XCode.Configuration;
-    
-    #line default
-    #line hidden
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Admin/Views/User/_List_Data.cshtml")]
-    public partial class _Areas_Admin_Views_User__List_Data_cshtml : System.Web.Mvc.WebViewPage<IList<XCode.Membership.UserX>>
-    {
-        public _Areas_Admin_Views_User__List_Data_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 10 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-  
-    var fact = ViewBag.Factory as IEntityOperate;
-    var page = ViewBag.Page as Pager;
-    var fields = ViewBag.Fields as IList<FieldItem>;
-    var enableSelect = this.EnableSelect();
-    //var provider = ManageProvider.Provider;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n<table");
-
-WriteLiteral(" class=\"table table-bordered table-hover table-striped table-condensed\"");
-
-WriteLiteral(">\r\n    <thead>\r\n        <tr>\r\n");
-
-            
-            #line 20 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-            
-            
-            #line default
-            #line hidden
-            
-            #line 20 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-             if (enableSelect)
-            {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(" style=\"width:10px;\"");
-
-WriteLiteral("><input");
-
-WriteLiteral(" type=\"checkbox\"");
-
-WriteLiteral(" id=\"chkAll\"");
-
-WriteLiteral(" title=\"全选\"");
-
-WriteLiteral(" /></th>\r\n");
-
-            
-            #line 23 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-            }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            <th");
-
-WriteLiteral(" class=\"text-center hidden-md hidden-sm hidden-xs\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 825), Tuple.Create("\"", 864)
-            
-            #line 24 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 832), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("ID"))
-            
-            #line default
-            #line hidden
-, 832), false)
-);
-
-WriteLiteral(">编号</a></th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(" title=\"名称。登录用户名\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 934), Tuple.Create("\"", 975)
-            
-            #line 25 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 941), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("Name"))
-            
-            #line default
-            #line hidden
-, 941), false)
-);
-
-WriteLiteral(">名称</a></th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1028), Tuple.Create("\"", 1076)
-            
-            #line 26 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1035), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("DisplayName"))
-            
-            #line default
-            #line hidden
-, 1035), false)
-);
-
-WriteLiteral(">昵称</a></th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(" title=\"性别。未知、男、女\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1147), Tuple.Create("\"", 1187)
-            
-            #line 27 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1154), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("Sex"))
-            
-            #line default
-            #line hidden
-, 1154), false)
-);
-
-WriteLiteral(">性别</a></th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1240), Tuple.Create("\"", 1281)
-            
-            #line 28 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1247), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("Mail"))
-            
-            #line default
-            #line hidden
-, 1247), false)
-);
-
-WriteLiteral(">邮件</a></th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1334), Tuple.Create("\"", 1377)
-            
-            #line 29 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1341), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("Mobile"))
-            
-            #line default
-            #line hidden
-, 1341), false)
-);
-
-WriteLiteral(">手机</a></th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1430), Tuple.Create("\"", 1473)
-            
-            #line 30 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1437), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("RoleID"))
-            
-            #line default
-            #line hidden
-, 1437), false)
-);
-
-WriteLiteral(">角色</a></th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1526), Tuple.Create("\"", 1569)
-            
-            #line 31 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1533), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("Online"))
-            
-            #line default
-            #line hidden
-, 1533), false)
-);
-
-WriteLiteral(">在线</a></th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1622), Tuple.Create("\"", 1665)
-            
-            #line 32 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1629), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("Enable"))
-            
-            #line default
-            #line hidden
-, 1629), false)
-);
-
-WriteLiteral(">启用</a></th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1718), Tuple.Create("\"", 1761)
-            
-            #line 33 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1725), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("Logins"))
-            
-            #line default
-            #line hidden
-, 1725), false)
-);
-
-WriteLiteral(">登录次数</a></th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(" style=\"min-width:134px;\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1841), Tuple.Create("\"", 1887)
-            
-            #line 34 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1848), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("LastLogin"))
-            
-            #line default
-            #line hidden
-, 1848), false)
-);
-
-WriteLiteral(">最后登录</a></th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1942), Tuple.Create("\"", 1990)
-            
-            #line 35 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1949), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("LastLoginIP"))
-            
-            #line default
-            #line hidden
-, 1949), false)
-);
-
-WriteLiteral(">最后IP</a></th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">日志</th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">令牌</th>\r\n");
-
-            
-            #line 38 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-            
-            
-            #line default
-            #line hidden
-            
-            #line 38 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-             if (this.Has(PermissionFlags.Detail, PermissionFlags.Update, PermissionFlags.Delete))
-            {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(" style=\"min-width:100px;\"");
-
-WriteLiteral(">操作</th>\r\n");
-
-            
-            #line 41 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-            }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        </tr>\r\n    </thead>\r\n    <tbody>\r\n");
-
-            
-            #line 45 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-        
-            
-            #line default
-            #line hidden
-            
-            #line 45 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-         foreach (var entity in Model)
-        {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            <tr>\r\n");
-
-            
-            #line 48 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-                
-            
-            #line default
-            #line hidden
-            
-            #line 48 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-                 if (enableSelect)
-                {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                    <td");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><input");
-
-WriteLiteral(" type=\"checkbox\"");
-
-WriteLiteral(" name=\"keys\"");
-
-WriteAttribute("value", Tuple.Create(" value=\"", 2545), Tuple.Create("\"", 2563)
-            
-            #line 50 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-      , Tuple.Create(Tuple.Create("", 2553), Tuple.Create<System.Object, System.Int32>(entity.ID
-            
-            #line default
-            #line hidden
-, 2553), false)
-);
-
-WriteLiteral(" /></td>\r\n");
-
-            
-            #line 51 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-                }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <td");
-
-WriteLiteral(" class=\"text-center hidden-md hidden-sm hidden-xs\"");
-
-WriteLiteral(">");
-
-            
-            #line 52 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-                                                                 Write(entity.ID);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td>");
-
-            
-            #line 53 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-               Write(entity.Name);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td>");
-
-            
-            #line 54 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-               Write(entity.DisplayName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">");
-
-            
-            #line 55 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-                                   Write(entity.Sex);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td>");
-
-            
-            #line 56 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-               Write(entity.Mail);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td>");
-
-            
-            #line 57 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-               Write(entity.Mobile);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 2925), Tuple.Create("\"", 2954)
-, Tuple.Create(Tuple.Create("", 2932), Tuple.Create("Role?ID=", 2932), true)
-            
-            #line 58 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 2940), Tuple.Create<System.Object, System.Int32>(entity.RoleID
-            
-            #line default
-            #line hidden
-, 2940), false)
-);
-
-WriteLiteral(">");
-
-            
-            #line 58 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-                                                Write(entity.RoleName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</a></td>\r\n                <td");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">\r\n                    <i");
-
-WriteAttribute("class", Tuple.Create(" class=\"", 3047), Tuple.Create("\"", 3109)
-, Tuple.Create(Tuple.Create("", 3055), Tuple.Create("glyphicon", 3055), true)
-, Tuple.Create(Tuple.Create(" ", 3064), Tuple.Create("glyphicon-", 3065), true)
-            
-            #line 60 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 3075), Tuple.Create<System.Object, System.Int32>(entity.Online ? "ok" : "remove"
-            
-            #line default
-            #line hidden
-, 3075), false)
-);
-
-WriteAttribute("style", Tuple.Create(" style=\"", 3110), Tuple.Create("\"", 3160)
-, Tuple.Create(Tuple.Create("", 3118), Tuple.Create("color:", 3118), true)
-            
-            #line 60 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-                    , Tuple.Create(Tuple.Create(" ", 3124), Tuple.Create<System.Object, System.Int32>(entity.Online ? "green" : "red"
-            
-            #line default
-            #line hidden
-, 3125), false)
-, Tuple.Create(Tuple.Create("", 3159), Tuple.Create(";", 3159), true)
-);
-
-WriteLiteral("></i>\r\n                </td>\r\n                <td");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">\r\n                    <i");
-
-WriteAttribute("class", Tuple.Create(" class=\"", 3255), Tuple.Create("\"", 3317)
-, Tuple.Create(Tuple.Create("", 3263), Tuple.Create("glyphicon", 3263), true)
-, Tuple.Create(Tuple.Create(" ", 3272), Tuple.Create("glyphicon-", 3273), true)
-            
-            #line 63 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 3283), Tuple.Create<System.Object, System.Int32>(entity.Enable ? "ok" : "remove"
-            
-            #line default
-            #line hidden
-, 3283), false)
-);
-
-WriteAttribute("style", Tuple.Create(" style=\"", 3318), Tuple.Create("\"", 3368)
-, Tuple.Create(Tuple.Create("", 3326), Tuple.Create("color:", 3326), true)
-            
-            #line 63 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-                    , Tuple.Create(Tuple.Create(" ", 3332), Tuple.Create<System.Object, System.Int32>(entity.Enable ? "green" : "red"
-            
-            #line default
-            #line hidden
-, 3333), false)
-, Tuple.Create(Tuple.Create("", 3367), Tuple.Create(";", 3367), true)
-);
-
-WriteLiteral("></i>\r\n                </td>\r\n                <td");
-
-WriteLiteral(" class=\"text-right\"");
-
-WriteLiteral(">");
-
-            
-            #line 65 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-                                  Write(entity.Logins.ToString("n0"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td>");
-
-            
-            #line 66 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-               Write(entity.LastLogin.ToFullString(""));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td");
-
-WriteAttribute("title", Tuple.Create(" title=\"", 3554), Tuple.Create("\"", 3586)
-            
-            #line 67 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 3562), Tuple.Create<System.Object, System.Int32>(entity.LastLoginAddress
-            
-            #line default
-            #line hidden
-, 3562), false)
-);
-
-WriteLiteral(">");
-
-            
-            #line 67 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-                                                Write(entity.LastLoginIP);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td>");
-
-            
-            #line 68 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-               Write(Html.ActionLink("日志", "Index", "Log", new { UserID = entity.ID }, null));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td>");
-
-            
-            #line 69 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-               Write(Html.ActionLink("令牌", "Index", "UserToken", new { UserID = entity.ID }, null));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n");
-
-            
-            #line 70 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-                
-            
-            #line default
-            #line hidden
-            
-            #line 70 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-                 if (this.Has(PermissionFlags.Detail, PermissionFlags.Update, PermissionFlags.Delete))
-                {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                    <td");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("                        ");
-
-            
-            #line 73 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-                   Write(Html.Partial("_List_Data_Action", (Object)entity));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n                    </td>\r\n");
-
-            
-            #line 75 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-                }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            </tr>\r\n");
-
-            
-            #line 77 "..\..\Areas\Admin\Views\User\_List_Data.cshtml"
-        }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("    </tbody>\r\n</table>");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Areas/Admin/Views/User/_List_Search.cshtml b/NewLife.Cube/Areas/Admin/Views/User/_List_Search.cshtml
deleted file mode 100644
index 6279847546..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/User/_List_Search.cshtml
+++ /dev/null
@@ -1,14 +0,0 @@
-﻿@using NewLife;
-@using NewLife.Web;
-@using XCode;
-@{
-    var fact = ViewBag.Factory as IEntityOperate;
-    var page = ViewBag.Page as Pager;
-}
-<div class="form-group">
-    @Html.ActionLink("用户链接", "Index", "UserConnect", null, new { @class = "btn btn-success btn-sm" })
-    @Html.ActionLink("用户在线", "Index", "UserOnline", null, new { @class = "btn btn-success btn-sm" })
-    <label for="RoleID" class="control-label">角色：</label>
-    @Html.ForDropDownList("RoleID", Role.FindAllWithCache().Cast<IEntity>().ToList(), "全部", true)
-</div>
-@*@Html.Partial("_DateRange")*@
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Views/User/_List_Search.generated.cs b/NewLife.Cube/Areas/Admin/Views/User/_List_Search.generated.cs
deleted file mode 100644
index c4945e15da..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/User/_List_Search.generated.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    
-    #line 1 "..\..\Areas\Admin\Views\User\_List_Search.cshtml"
-    using NewLife;
-    
-    #line default
-    #line hidden
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    
-    #line 2 "..\..\Areas\Admin\Views\User\_List_Search.cshtml"
-    using NewLife.Web;
-    
-    #line default
-    #line hidden
-    
-    #line 3 "..\..\Areas\Admin\Views\User\_List_Search.cshtml"
-    using XCode;
-    
-    #line default
-    #line hidden
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Admin/Views/User/_List_Search.cshtml")]
-    public partial class _Areas_Admin_Views_User__List_Search_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Areas_Admin_Views_User__List_Search_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 4 "..\..\Areas\Admin\Views\User\_List_Search.cshtml"
-  
-    var fact = ViewBag.Factory as IEntityOperate;
-    var page = ViewBag.Page as Pager;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n<div");
-
-WriteLiteral(" class=\"form-group\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("    ");
-
-            
-            #line 9 "..\..\Areas\Admin\Views\User\_List_Search.cshtml"
-Write(Html.ActionLink("用户链接", "Index", "UserConnect", null, new { @class = "btn btn-success btn-sm" }));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("    ");
-
-            
-            #line 10 "..\..\Areas\Admin\Views\User\_List_Search.cshtml"
-Write(Html.ActionLink("用户在线", "Index", "UserOnline", null, new { @class = "btn btn-success btn-sm" }));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n    <label");
-
-WriteLiteral(" for=\"RoleID\"");
-
-WriteLiteral(" class=\"control-label\"");
-
-WriteLiteral(">角色：</label>\r\n");
-
-WriteLiteral("    ");
-
-            
-            #line 12 "..\..\Areas\Admin\Views\User\_List_Search.cshtml"
-Write(Html.ForDropDownList("RoleID", Role.FindAllWithCache().Cast<IEntity>().ToList(), "全部", true));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n</div>\r\n");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Areas/Admin/Views/User/_List_Toolbar_Batch.cshtml b/NewLife.Cube/Areas/Admin/Views/User/_List_Toolbar_Batch.cshtml
deleted file mode 100644
index 634fcb893d..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/User/_List_Toolbar_Batch.cshtml
+++ /dev/null
@@ -1,15 +0,0 @@
-﻿@using NewLife.Common;
-@{
-    var user = ViewBag.User as IUser ?? User.Identity as IUser;
-    var fact = ViewBag.Factory as IEntityOperate;
-    var enableSelect = this.EnableSelect();
-}
-@if (enableSelect)
-{
-    <button type="button" class="btn btn-purple btn-sm" data-action="action" data-url="@Url.Action("EnableSelect")" data-fields="keys" disabled>
-        批量启用
-    </button>
-    <button type="button" class="btn btn-purple btn-sm" data-action="action" data-url="@Url.Action("DisableSelect")" data-fields="keys" disabled>
-        批量禁用
-    </button>
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Views/User/_List_Toolbar_Batch.generated.cs b/NewLife.Cube/Areas/Admin/Views/User/_List_Toolbar_Batch.generated.cs
deleted file mode 100644
index 0c5cfb9657..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/User/_List_Toolbar_Batch.generated.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    
-    #line 1 "..\..\Areas\Admin\Views\User\_List_Toolbar_Batch.cshtml"
-    using NewLife.Common;
-    
-    #line default
-    #line hidden
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Admin/Views/User/_List_Toolbar_Batch.cshtml")]
-    public partial class _Areas_Admin_Views_User__List_Toolbar_Batch_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Areas_Admin_Views_User__List_Toolbar_Batch_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 2 "..\..\Areas\Admin\Views\User\_List_Toolbar_Batch.cshtml"
-  
-    var user = ViewBag.User as IUser ?? User.Identity as IUser;
-    var fact = ViewBag.Factory as IEntityOperate;
-    var enableSelect = this.EnableSelect();
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-            
-            #line 7 "..\..\Areas\Admin\Views\User\_List_Toolbar_Batch.cshtml"
- if (enableSelect)
-{
-
-            
-            #line default
-            #line hidden
-WriteLiteral("    <button");
-
-WriteLiteral(" type=\"button\"");
-
-WriteLiteral(" class=\"btn btn-purple btn-sm\"");
-
-WriteLiteral(" data-action=\"action\"");
-
-WriteLiteral(" data-url=\"");
-
-            
-            #line 9 "..\..\Areas\Admin\Views\User\_List_Toolbar_Batch.cshtml"
-                                                                                  Write(Url.Action("EnableSelect"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\"");
-
-WriteLiteral(" data-fields=\"keys\"");
-
-WriteLiteral(" disabled>\r\n        批量启用\r\n    </button>\r\n");
-
-WriteLiteral("    <button");
-
-WriteLiteral(" type=\"button\"");
-
-WriteLiteral(" class=\"btn btn-purple btn-sm\"");
-
-WriteLiteral(" data-action=\"action\"");
-
-WriteLiteral(" data-url=\"");
-
-            
-            #line 12 "..\..\Areas\Admin\Views\User\_List_Toolbar_Batch.cshtml"
-                                                                                  Write(Url.Action("DisableSelect"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\"");
-
-WriteLiteral(" data-fields=\"keys\"");
-
-WriteLiteral(" disabled>\r\n        批量禁用\r\n    </button>\r\n");
-
-            
-            #line 15 "..\..\Areas\Admin\Views\User\_List_Toolbar_Batch.cshtml"
-}
-            
-            #line default
-            #line hidden
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Areas/Admin/Views/User/_Login_Forgot.cshtml b/NewLife.Cube/Areas/Admin/Views/User/_Login_Forgot.cshtml
deleted file mode 100644
index ccd4bd9202..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/User/_Login_Forgot.cshtml
+++ /dev/null
@@ -1,30 +0,0 @@
-﻿<div class="tab-pane fade" id="Forgot">
-    <!-- Logo-->
-    <div class="row text-center">
-        <i class="glyphicon glyphicon-cloud login-logo center-block"></i>
-    </div>
-    <!-- 登录-->
-    @using (Html.BeginForm("ForgetPassword", "User", new { r = ViewBag.ReturnUrl }, FormMethod.Post, new { @class = "cube-login" }))
-    {
-        @Html.ValidationSummary()
-        <span class="heading text-primary">取回密码</span>
-        <div class="form-group">
-            <input type="email" class="form-control" id="email" name="email" placeholder="输入你的邮箱地址">
-            <i class="glyphicon glyphicon-user"></i>
-        </div>
-        <div class="form-group text-center">
-            <button type="submit" class="btn btn-default text-center">发送</button>
-        </div>
-
-    }
-        <div class="toolbar clearfix text-center">
-            <div class="row" style="padding-top:30px;">
-                <div class="toolbar center">
-                    <a href="#Login" data-toggle="tab">
-                        回到登录
-                        <i class="ace-icon fa fa-arrow-right"></i>
-                    </a>
-                </div>
-            </div>
-        </div>
-</div>
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Views/User/_Login_Forgot.generated.cs b/NewLife.Cube/Areas/Admin/Views/User/_Login_Forgot.generated.cs
deleted file mode 100644
index 74d0891e63..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/User/_Login_Forgot.generated.cs
+++ /dev/null
@@ -1,167 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Admin/Views/User/_Login_Forgot.cshtml")]
-    public partial class _Areas_Admin_Views_User__Login_Forgot_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Areas_Admin_Views_User__Login_Forgot_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-WriteLiteral("<div");
-
-WriteLiteral(" class=\"tab-pane fade\"");
-
-WriteLiteral(" id=\"Forgot\"");
-
-WriteLiteral(">\r\n    <!-- Logo-->\r\n    <div");
-
-WriteLiteral(" class=\"row text-center\"");
-
-WriteLiteral(">\r\n        <i");
-
-WriteLiteral(" class=\"glyphicon glyphicon-cloud login-logo center-block\"");
-
-WriteLiteral("></i>\r\n    </div>\r\n    <!-- 登录-->\r\n");
-
-            
-            #line 7 "..\..\Areas\Admin\Views\User\_Login_Forgot.cshtml"
-    
-            
-            #line default
-            #line hidden
-            
-            #line 7 "..\..\Areas\Admin\Views\User\_Login_Forgot.cshtml"
-     using (Html.BeginForm("ForgetPassword", "User", new { r = ViewBag.ReturnUrl }, FormMethod.Post, new { @class = "cube-login" }))
-    {
-        
-            
-            #line default
-            #line hidden
-            
-            #line 9 "..\..\Areas\Admin\Views\User\_Login_Forgot.cshtml"
-   Write(Html.ValidationSummary());
-
-            
-            #line default
-            #line hidden
-            
-            #line 9 "..\..\Areas\Admin\Views\User\_Login_Forgot.cshtml"
-                                 
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        <span");
-
-WriteLiteral(" class=\"heading text-primary\"");
-
-WriteLiteral(">取回密码</span>\r\n");
-
-WriteLiteral("        <div");
-
-WriteLiteral(" class=\"form-group\"");
-
-WriteLiteral(">\r\n            <input");
-
-WriteLiteral(" type=\"email\"");
-
-WriteLiteral(" class=\"form-control\"");
-
-WriteLiteral(" id=\"email\"");
-
-WriteLiteral(" name=\"email\"");
-
-WriteLiteral(" placeholder=\"输入你的邮箱地址\"");
-
-WriteLiteral(">\r\n            <i");
-
-WriteLiteral(" class=\"glyphicon glyphicon-user\"");
-
-WriteLiteral("></i>\r\n        </div>\r\n");
-
-WriteLiteral("        <div");
-
-WriteLiteral(" class=\"form-group text-center\"");
-
-WriteLiteral(">\r\n            <button");
-
-WriteLiteral(" type=\"submit\"");
-
-WriteLiteral(" class=\"btn btn-default text-center\"");
-
-WriteLiteral(">发送</button>\r\n        </div>\r\n");
-
-            
-            #line 18 "..\..\Areas\Admin\Views\User\_Login_Forgot.cshtml"
-
-    }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        <div");
-
-WriteLiteral(" class=\"toolbar clearfix text-center\"");
-
-WriteLiteral(">\r\n            <div");
-
-WriteLiteral(" class=\"row\"");
-
-WriteLiteral(" style=\"padding-top:30px;\"");
-
-WriteLiteral(">\r\n                <div");
-
-WriteLiteral(" class=\"toolbar center\"");
-
-WriteLiteral(">\r\n                    <a");
-
-WriteLiteral(" href=\"#Login\"");
-
-WriteLiteral(" data-toggle=\"tab\"");
-
-WriteLiteral(">\r\n                        回到登录\r\n                        <i");
-
-WriteLiteral(" class=\"ace-icon fa fa-arrow-right\"");
-
-WriteLiteral("></i>\r\n                    </a>\r\n                </div>\r\n            </div>\r\n    " +
-"    </div>\r\n</div>");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Areas/Admin/Views/User/_Login_Login.cshtml b/NewLife.Cube/Areas/Admin/Views/User/_Login_Login.cshtml
deleted file mode 100644
index fb15e0a3a1..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/User/_Login_Login.cshtml
+++ /dev/null
@@ -1,79 +0,0 @@
-﻿@using NewLife.Common
-@{
-    var set = NewLife.Cube.Setting.Current;
-}
-<div class="tab-pane fade in active" id="Login">
-    <!-- Logo-->
-    <div class="row text-center">
-        <i class="glyphicon glyphicon-cloud login-logo center-block" style="display: inline-block;"></i>
-        @*<span style="display: inline-block;vertical-align: 56px;margin-left: 10px;font-size: 24px;">@SysConfig.Current.DisplayName</span>*@
-    </div>
-    <!-- 登录-->
-    @using (Html.BeginForm("Login", "User", new { r = ViewBag.ReturnUrl }, FormMethod.Post, new { @class = "cube-login" }))
-    {
-        @Html.ValidationSummary()
-        <span class="heading text-primary">@SysConfig.Current.DisplayName 登录</span>
-        if (set.AllowLogin)
-        {
-            <div class="form-group">
-                <input type="text" class="form-control" id="username" name="username" placeholder="用户名 / 邮箱">
-                <i class="glyphicon glyphicon-user"></i>
-            </div>
-            <div class="form-group">
-                <input type="password" class="form-control" id="password" name="password" placeholder="密码">
-                <i class="glyphicon glyphicon-lock"></i>
-                @*<a href="#Forgot" data-toggle="tab" class="glyphicon glyphicon-question-sign"></a>*@
-            </div>
-            <div class="form-group">
-                <div class="main-checkbox">
-                    <input type="checkbox" value="true" id="remember" name="remember" />
-                    <label for="remember"></label>
-                </div>
-                <label class="text text-primary" for="remember">记住我</label>
-                @if (set.AllowRegister)
-                {
-                    @*<div class="toolbar clearfix text-center">
-                        <div class="row" style="padding:30px 60px 0 60px;">*@
-                    @*@if (true)
-                        {
-                            <a href="#Forgot" data-toggle="tab" style="float: left">
-                                <i class="glyphicon glyphicon-info-sign"></i>
-                                忘记密码？
-                            </a>
-                        }*@
-
-                    if (set.AllowRegister)
-                    {
-                        <div style="display: inline-block; margin-top: 5px; float: right;">
-                            @*<span style="margin-left: auto; margin-right: auto; margin-top: 5px;">没有账号？</span>*@
-                            <a href="#Register" data-toggle="tab" style="margin-left: auto; margin-right: auto;position: static; font-size: 15px; margin-top: 5px;">
-                                @*<i class="glyphicon glyphicon-menu-right"></i>*@
-                                <span>我要注册</span>
-                            </a>
-                        </div>
-                    }
-                    @*</div>
-                        </div>*@
-                }
-                <button type="submit" class="btn btn-default" style="margin: 5px 0 15px 0;width: 100%;">登录</button>
-            </div>
-
-            if (!set.LoginTip.IsNullOrEmpty())
-            {
-                <h4 class="header blue lighter bigger">
-                    <i class="ace-icon fa fa-coffee green"></i>
-
-                </h4>
-
-                <div class="space-6"></div>
-
-                <nav class="navbar navbar-fixed-top">
-                    <div class="alert alert-warning alert-dismissible text-center" role="alert" style="margin-bottom:0px;">
-                        <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                        @Html.Raw(set.LoginTip)
-                    </div>
-                </nav>
-            }
-        }
-    }
-</div>
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Views/User/_Login_Login.generated.cs b/NewLife.Cube/Areas/Admin/Views/User/_Login_Login.generated.cs
deleted file mode 100644
index b0c11ee05d..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/User/_Login_Login.generated.cs
+++ /dev/null
@@ -1,372 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    
-    #line 1 "..\..\Areas\Admin\Views\User\_Login_Login.cshtml"
-    using NewLife.Common;
-    
-    #line default
-    #line hidden
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Admin/Views/User/_Login_Login.cshtml")]
-    public partial class _Areas_Admin_Views_User__Login_Login_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Areas_Admin_Views_User__Login_Login_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 2 "..\..\Areas\Admin\Views\User\_Login_Login.cshtml"
-  
-    var set = NewLife.Cube.Setting.Current;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n<div");
-
-WriteLiteral(" class=\"tab-pane fade in active\"");
-
-WriteLiteral(" id=\"Login\"");
-
-WriteLiteral(">\r\n    <!-- Logo-->\r\n    <div");
-
-WriteLiteral(" class=\"row text-center\"");
-
-WriteLiteral(">\r\n        <i");
-
-WriteLiteral(" class=\"glyphicon glyphicon-cloud login-logo center-block\"");
-
-WriteLiteral(" style=\"display: inline-block;\"");
-
-WriteLiteral("></i>\r\n        ");
-
-WriteLiteral("\r\n    </div>\r\n    <!-- 登录-->\r\n");
-
-            
-            #line 12 "..\..\Areas\Admin\Views\User\_Login_Login.cshtml"
-    
-            
-            #line default
-            #line hidden
-            
-            #line 12 "..\..\Areas\Admin\Views\User\_Login_Login.cshtml"
-     using (Html.BeginForm("Login", "User", new { r = ViewBag.ReturnUrl }, FormMethod.Post, new { @class = "cube-login" }))
-    {
-        
-            
-            #line default
-            #line hidden
-            
-            #line 14 "..\..\Areas\Admin\Views\User\_Login_Login.cshtml"
-   Write(Html.ValidationSummary());
-
-            
-            #line default
-            #line hidden
-            
-            #line 14 "..\..\Areas\Admin\Views\User\_Login_Login.cshtml"
-                                 
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        <span");
-
-WriteLiteral(" class=\"heading text-primary\"");
-
-WriteLiteral(">");
-
-            
-            #line 15 "..\..\Areas\Admin\Views\User\_Login_Login.cshtml"
-                                      Write(SysConfig.Current.DisplayName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral(" 登录</span>\r\n");
-
-            
-            #line 16 "..\..\Areas\Admin\Views\User\_Login_Login.cshtml"
-        if (set.AllowLogin)
-        {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            <div");
-
-WriteLiteral(" class=\"form-group\"");
-
-WriteLiteral(">\r\n                <input");
-
-WriteLiteral(" type=\"text\"");
-
-WriteLiteral(" class=\"form-control\"");
-
-WriteLiteral(" id=\"username\"");
-
-WriteLiteral(" name=\"username\"");
-
-WriteLiteral(" placeholder=\"用户名 / 邮箱\"");
-
-WriteLiteral(">\r\n                <i");
-
-WriteLiteral(" class=\"glyphicon glyphicon-user\"");
-
-WriteLiteral("></i>\r\n            </div>\r\n");
-
-WriteLiteral("            <div");
-
-WriteLiteral(" class=\"form-group\"");
-
-WriteLiteral(">\r\n                <input");
-
-WriteLiteral(" type=\"password\"");
-
-WriteLiteral(" class=\"form-control\"");
-
-WriteLiteral(" id=\"password\"");
-
-WriteLiteral(" name=\"password\"");
-
-WriteLiteral(" placeholder=\"密码\"");
-
-WriteLiteral(">\r\n                <i");
-
-WriteLiteral(" class=\"glyphicon glyphicon-lock\"");
-
-WriteLiteral("></i>\r\n                ");
-
-WriteLiteral("\r\n            </div>\r\n");
-
-WriteLiteral("            <div");
-
-WriteLiteral(" class=\"form-group\"");
-
-WriteLiteral(">\r\n                <div");
-
-WriteLiteral(" class=\"main-checkbox\"");
-
-WriteLiteral(">\r\n                    <input");
-
-WriteLiteral(" type=\"checkbox\"");
-
-WriteLiteral(" value=\"true\"");
-
-WriteLiteral(" id=\"remember\"");
-
-WriteLiteral(" name=\"remember\"");
-
-WriteLiteral(" />\r\n                    <label");
-
-WriteLiteral(" for=\"remember\"");
-
-WriteLiteral("></label>\r\n                </div>\r\n                <label");
-
-WriteLiteral(" class=\"text text-primary\"");
-
-WriteLiteral(" for=\"remember\"");
-
-WriteLiteral(">记住我</label>\r\n");
-
-            
-            #line 33 "..\..\Areas\Admin\Views\User\_Login_Login.cshtml"
-                
-            
-            #line default
-            #line hidden
-            
-            #line 33 "..\..\Areas\Admin\Views\User\_Login_Login.cshtml"
-                 if (set.AllowRegister)
-                {
-                    
-            
-            #line default
-            #line hidden
-            
-            #line 36 "..\..\Areas\Admin\Views\User\_Login_Login.cshtml"
-                                                                             
-                    
-            
-            #line default
-            #line hidden
-            
-            #line 43 "..\..\Areas\Admin\Views\User\_Login_Login.cshtml"
-                           
-
-                    if (set.AllowRegister)
-                    {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                        <div");
-
-WriteLiteral(" style=\"display: inline-block; margin-top: 5px;\"");
-
-WriteLiteral(">\r\n                            ");
-
-WriteLiteral("\r\n                            <a");
-
-WriteLiteral(" href=\"#Register\"");
-
-WriteLiteral(" data-toggle=\"tab\"");
-
-WriteLiteral(" style=\"margin-left: auto; margin-right: auto;position: static; font-size: 15px; " +
-"margin-top: 5px;\"");
-
-WriteLiteral(">\r\n                                ");
-
-WriteLiteral("\r\n                                <span>我要注册</span>\r\n                            " +
-"</a>\r\n                        </div>\r\n");
-
-            
-            #line 54 "..\..\Areas\Admin\Views\User\_Login_Login.cshtml"
-                    }
-                    
-            
-            #line default
-            #line hidden
-            
-            #line 56 "..\..\Areas\Admin\Views\User\_Login_Login.cshtml"
-                                
-                }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <button");
-
-WriteLiteral(" type=\"submit\"");
-
-WriteLiteral(" class=\"btn btn-default\"");
-
-WriteLiteral(">登录</button>\r\n            </div>\r\n");
-
-            
-            #line 60 "..\..\Areas\Admin\Views\User\_Login_Login.cshtml"
-
-            if (!set.LoginTip.IsNullOrEmpty())
-            {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <h4");
-
-WriteLiteral(" class=\"header blue lighter bigger\"");
-
-WriteLiteral(">\r\n                    <i");
-
-WriteLiteral(" class=\"ace-icon fa fa-coffee green\"");
-
-WriteLiteral("></i>\r\n\r\n                </h4>\r\n");
-
-            
-            #line 67 "..\..\Areas\Admin\Views\User\_Login_Login.cshtml"
-
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <div");
-
-WriteLiteral(" class=\"space-6\"");
-
-WriteLiteral("></div>\r\n");
-
-            
-            #line 69 "..\..\Areas\Admin\Views\User\_Login_Login.cshtml"
-
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <nav");
-
-WriteLiteral(" class=\"navbar navbar-fixed-top\"");
-
-WriteLiteral(">\r\n                    <div");
-
-WriteLiteral(" class=\"alert alert-warning alert-dismissible text-center\"");
-
-WriteLiteral(" role=\"alert\"");
-
-WriteLiteral(" style=\"margin-bottom:0px;\"");
-
-WriteLiteral(">\r\n                        <button");
-
-WriteLiteral(" type=\"button\"");
-
-WriteLiteral(" class=\"close\"");
-
-WriteLiteral(" data-dismiss=\"alert\"");
-
-WriteLiteral(" aria-label=\"Close\"");
-
-WriteLiteral("><span");
-
-WriteLiteral(" aria-hidden=\"true\"");
-
-WriteLiteral(">&times;</span></button>\r\n");
-
-WriteLiteral("                        ");
-
-            
-            #line 73 "..\..\Areas\Admin\Views\User\_Login_Login.cshtml"
-                   Write(Html.Raw(set.LoginTip));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n                    </div>\r\n                </nav>\r\n");
-
-            
-            #line 76 "..\..\Areas\Admin\Views\User\_Login_Login.cshtml"
-            }
-        }
-    }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</div>");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Areas/Admin/Views/User/_Login_Login3.cshtml b/NewLife.Cube/Areas/Admin/Views/User/_Login_Login3.cshtml
deleted file mode 100644
index 5058958baa..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/User/_Login_Login3.cshtml
+++ /dev/null
@@ -1,58 +0,0 @@
-﻿@using NewLife.Cube.Web;
-@{
-    var set = NewLife.Cube.Setting.Current;
-    var returnUrl = ViewBag.ReturnUrl as String;
-    var ms = NewLife.Web.OAuthConfig.Current.Items.Where(e => !e.AppID.IsNullOrEmpty()).ToList();
-    var dic = "NewLife=新生命,Baidu=百度,Weixin=微信,Taobao=淘宝".SplitAsDictionary("=", ",");
-}
-@if (ms.Count > 0 && set.AutoRegister)
-{
-    <div class="text-center">
-        @*<div class="ui horizontal divider">
-            <span style="font-size: 22px;">
-                第三方登录
-            </span>
-        </div>*@
-        <div class="col-sm-12">
-            <p style="font-size: 22px; position: relative; display: inline-block;width: 100%">
-                <span style="height: 1px; position: absolute; background-color: #928f8f; width: 28%; top: 50%; left:65%;"></span>
-                第三方登录
-                <span style="height: 1px; position: absolute; background-color: #928f8f; width: 28%; top: 50%; right:65%;"></span>
-            </p>
-        </div>
-        <div class="row" style="padding: 0 0 0 0;">
-            <div class="form-group col-sm-12">
-                @foreach (var mi in ms)
-                {
-                    var nickName = "";
-                    if (!dic.TryGetValue(mi.Name, out nickName))
-                    {
-                        nickName = mi.Name;
-                    }
-
-                    var url = "Sso/Login?name=" + mi.Name;
-                    if (!returnUrl.IsNullOrEmpty())
-                    {
-                        url += "&r=" + HttpUtility.UrlEncode(returnUrl);
-                    }
-
-                    url = HttpRuntime.AppDomainAppVirtualPath + url;
-                    var ico = "/Content/images/logo/{0}.png".F(mi.Name);
-                    var ico2 = ico.TrimStart("/").GetFullPath();
-
-                    <a href="@url">
-                        @if (File.Exists(ico2))
-                        {
-                            <text><img src="@ico" title="@nickName" /></text>
-                        }
-                        else
-                        {
-                            <i class="glyphicon glyphicon-menu-right"></i>
-                            <text>@nickName</text>
-                        }
-                    </a>
-                }
-            </div>
-        </div>
-    </div>
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Views/User/_Login_Login3.generated.cs b/NewLife.Cube/Areas/Admin/Views/User/_Login_Login3.generated.cs
deleted file mode 100644
index c6f347e439..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/User/_Login_Login3.generated.cs
+++ /dev/null
@@ -1,225 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    using NewLife.Cube;
-    
-    #line 1 "..\..\Areas\Admin\Views\User\_Login_Login3.cshtml"
-    using NewLife.Cube.Web;
-    
-    #line default
-    #line hidden
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Admin/Views/User/_Login_Login3.cshtml")]
-    public partial class _Areas_Admin_Views_User__Login_Login3_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Areas_Admin_Views_User__Login_Login3_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 2 "..\..\Areas\Admin\Views\User\_Login_Login3.cshtml"
-  
-    var set = NewLife.Cube.Setting.Current;
-    var returnUrl = ViewBag.ReturnUrl as String;
-    var ms = NewLife.Web.OAuthConfig.Current.Items.Where(e => !e.AppID.IsNullOrEmpty()).ToList();
-    var dic = "NewLife=新生命,Baidu=百度,Weixin=微信,Taobao=淘宝".SplitAsDictionary("=", ",");
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-            
-            #line 8 "..\..\Areas\Admin\Views\User\_Login_Login3.cshtml"
- if (ms.Count > 0 && set.AutoRegister)
-{
-
-            
-            #line default
-            #line hidden
-WriteLiteral("    <div");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">\r\n        <div");
-
-WriteLiteral(" class=\"ui horizontal divider\"");
-
-WriteLiteral(">\r\n            <span");
-
-WriteLiteral(" style=\"font-size: 22px;\"");
-
-WriteLiteral(">\r\n                第三方登录\r\n            </span>\r\n        </div>\r\n        <div");
-
-WriteLiteral(" class=\"row\"");
-
-WriteLiteral(" style=\"padding:0px 0 0 0; display: inline-block;\"");
-
-WriteLiteral(">\r\n");
-
-            
-            #line 17 "..\..\Areas\Admin\Views\User\_Login_Login3.cshtml"
-            
-            
-            #line default
-            #line hidden
-            
-            #line 17 "..\..\Areas\Admin\Views\User\_Login_Login3.cshtml"
-             foreach (var mi in ms)
-            {
-                var nickName = "";
-                if (!dic.TryGetValue(mi.Name, out nickName)) { nickName = mi.Name; }
-
-                var url = "Sso/Login?name=" + mi.Name;
-                if (!returnUrl.IsNullOrEmpty()) { url += "&r=" + HttpUtility.UrlEncode(returnUrl); }
-
-                url = HttpRuntime.AppDomainAppVirtualPath + url;
-                var ico = "/Content/images/logo/{0}.png".F(mi.Name);
-                var ico2 = ico.TrimStart("/").GetFullPath();
-
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1169), Tuple.Create("\"", 1180)
-            
-            #line 29 "..\..\Areas\Admin\Views\User\_Login_Login3.cshtml"
-, Tuple.Create(Tuple.Create("", 1176), Tuple.Create<System.Object, System.Int32>(url
-            
-            #line default
-            #line hidden
-, 1176), false)
-);
-
-WriteLiteral(">\r\n");
-
-            
-            #line 30 "..\..\Areas\Admin\Views\User\_Login_Login3.cshtml"
-                    
-            
-            #line default
-            #line hidden
-            
-            #line 30 "..\..\Areas\Admin\Views\User\_Login_Login3.cshtml"
-                     if (File.Exists(ico2))
-                    {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                        ");
-
-WriteLiteral("<img");
-
-WriteAttribute("src", Tuple.Create(" src=\"", 1286), Tuple.Create("\"", 1296)
-            
-            #line 32 "..\..\Areas\Admin\Views\User\_Login_Login3.cshtml"
-, Tuple.Create(Tuple.Create("", 1292), Tuple.Create<System.Object, System.Int32>(ico
-            
-            #line default
-            #line hidden
-, 1292), false)
-);
-
-WriteAttribute("title", Tuple.Create(" title=\"", 1297), Tuple.Create("\"", 1314)
-            
-            #line 32 "..\..\Areas\Admin\Views\User\_Login_Login3.cshtml"
-, Tuple.Create(Tuple.Create("", 1305), Tuple.Create<System.Object, System.Int32>(nickName
-            
-            #line default
-            #line hidden
-, 1305), false)
-);
-
-WriteLiteral(" />");
-
-WriteLiteral("\r\n");
-
-            
-            #line 33 "..\..\Areas\Admin\Views\User\_Login_Login3.cshtml"
-                    }
-                    else
-                    {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                        <i");
-
-WriteLiteral(" class=\"glyphicon glyphicon-menu-right\"");
-
-WriteLiteral("></i>\r\n");
-
-WriteLiteral("                        ");
-
-            
-            #line 37 "..\..\Areas\Admin\Views\User\_Login_Login3.cshtml"
-                         Write(nickName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-            
-            #line 38 "..\..\Areas\Admin\Views\User\_Login_Login3.cshtml"
-                    }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                </a>\r\n");
-
-            
-            #line 40 "..\..\Areas\Admin\Views\User\_Login_Login3.cshtml"
-            }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        </div>\r\n    </div>\r\n");
-
-            
-            #line 43 "..\..\Areas\Admin\Views\User\_Login_Login3.cshtml"
-}
-            
-            #line default
-            #line hidden
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Areas/Admin/Views/User/_Login_Register.cshtml b/NewLife.Cube/Areas/Admin/Views/User/_Login_Register.cshtml
deleted file mode 100644
index 732da8805a..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/User/_Login_Register.cshtml
+++ /dev/null
@@ -1,54 +0,0 @@
-﻿@using NewLife.Common
-
-
-<div class="tab-pane fade" id="Register">
-    <!-- Logo-->
-    <div class="row text-center">
-        <i class="glyphicon glyphicon-cloud login-logo center-block" style="display: inline-block;"></i>
-        @*<span style="display: inline-block;vertical-align: 56px;margin-left: 10px;font-size: 24px;">@SysConfig.Current.DisplayName</span>*@
-    </div>
-    <!-- 登录-->
-    @using (Html.BeginForm("Register", "User", new { r = ViewBag.ReturnUrl }, FormMethod.Post, new { @class = "cube-login" }))
-    {
-        @Html.ValidationSummary()
-        <span class="heading text-primary">@SysConfig.Current.DisplayName 注册</span>
-        <div class="form-group">
-            <input type="email" class="form-control" id="email" name="email" placeholder="输入你的邮箱地址">
-            <i class="glyphicon glyphicon-email"></i>
-        </div>
-        <div class="form-group">
-            <input type="text" class="form-control" id="username" name="username" placeholder="用户名">
-            <i class="glyphicon glyphicon-user"></i>
-        </div>
-        <div class="form-group">
-            <input type="password" class="form-control" id="password" name="password" placeholder="密码">
-            <i class="glyphicon glyphicon-user"></i>
-        </div>
-        <div class="form-group">
-            <input type="password" class="form-control" id="password2" name="password2" placeholder="重复密码">
-            <i class="glyphicon glyphicon-user"></i>
-        </div>
-        <div class="form-group text-center">
-            <div style="display: inline-block; margin-top: 5px; float: left;">
-                @*<span style="margin-left: auto; margin-right: auto; margin-top: 5px;">已有账号？</span>*@
-                <a href="#Login" data-toggle="tab" style="margin-left: auto; margin-right: auto;position: static; font-size: 15px; margin-top: 5px;">
-                    @*<i class="ace-icon fa fa-arrow-right"></i>*@
-                    <span>回到登录</span>
-                </a>
-            </div>
-            <button type="submit" class="btn btn-default text-center">注册</button>
-        </div>
-
-    }
-    @*<div class="toolbar clearfix text-center">
-            <div class="row" style="padding:30px 60px 0 60px;">
-                <div class="toolbar center">
-                    <a href="#Login" data-toggle="tab" style="float: right">
-                        回到登录
-                        <i class="ace-icon fa fa-arrow-right"></i>
-                    </a>
-                    <span style="float: right">已有账号？</span>
-                </div>
-            </div>
-        </div>*@
-</div>
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Views/User/_Login_Register.generated.cs b/NewLife.Cube/Areas/Admin/Views/User/_Login_Register.generated.cs
deleted file mode 100644
index d9ffcebd8d..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/User/_Login_Register.generated.cs
+++ /dev/null
@@ -1,249 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    
-    #line 1 "..\..\Areas\Admin\Views\User\_Login_Register.cshtml"
-    using NewLife.Common;
-    
-    #line default
-    #line hidden
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Admin/Views/User/_Login_Register.cshtml")]
-    public partial class _Areas_Admin_Views_User__Login_Register_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Areas_Admin_Views_User__Login_Register_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-WriteLiteral("\r\n\r\n<div");
-
-WriteLiteral(" class=\"tab-pane fade\"");
-
-WriteLiteral(" id=\"Register\"");
-
-WriteLiteral(">\r\n    <!-- Logo-->\r\n    <div");
-
-WriteLiteral(" class=\"row text-center\"");
-
-WriteLiteral(">\r\n        <i");
-
-WriteLiteral(" class=\"glyphicon glyphicon-cloud login-logo center-block\"");
-
-WriteLiteral(" style=\"display: inline-block;\"");
-
-WriteLiteral("></i>\r\n        ");
-
-WriteLiteral("\r\n    </div>\r\n    <!-- 登录-->\r\n");
-
-            
-            #line 11 "..\..\Areas\Admin\Views\User\_Login_Register.cshtml"
-    
-            
-            #line default
-            #line hidden
-            
-            #line 11 "..\..\Areas\Admin\Views\User\_Login_Register.cshtml"
-     using (Html.BeginForm("Register", "User", new { r = ViewBag.ReturnUrl }, FormMethod.Post, new { @class = "cube-login" }))
-    {
-        
-            
-            #line default
-            #line hidden
-            
-            #line 13 "..\..\Areas\Admin\Views\User\_Login_Register.cshtml"
-   Write(Html.ValidationSummary());
-
-            
-            #line default
-            #line hidden
-            
-            #line 13 "..\..\Areas\Admin\Views\User\_Login_Register.cshtml"
-                                 
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        <span");
-
-WriteLiteral(" class=\"heading text-primary\"");
-
-WriteLiteral(">");
-
-            
-            #line 14 "..\..\Areas\Admin\Views\User\_Login_Register.cshtml"
-                                      Write(SysConfig.Current.DisplayName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral(" 注册</span>\r\n");
-
-WriteLiteral("        <div");
-
-WriteLiteral(" class=\"form-group\"");
-
-WriteLiteral(">\r\n            <input");
-
-WriteLiteral(" type=\"email\"");
-
-WriteLiteral(" class=\"form-control\"");
-
-WriteLiteral(" id=\"email\"");
-
-WriteLiteral(" name=\"email\"");
-
-WriteLiteral(" placeholder=\"输入你的邮箱地址\"");
-
-WriteLiteral(">\r\n            <i");
-
-WriteLiteral(" class=\"glyphicon glyphicon-email\"");
-
-WriteLiteral("></i>\r\n        </div>\r\n");
-
-WriteLiteral("        <div");
-
-WriteLiteral(" class=\"form-group\"");
-
-WriteLiteral(">\r\n            <input");
-
-WriteLiteral(" type=\"text\"");
-
-WriteLiteral(" class=\"form-control\"");
-
-WriteLiteral(" id=\"username\"");
-
-WriteLiteral(" name=\"username\"");
-
-WriteLiteral(" placeholder=\"用户名\"");
-
-WriteLiteral(">\r\n            <i");
-
-WriteLiteral(" class=\"glyphicon glyphicon-user\"");
-
-WriteLiteral("></i>\r\n        </div>\r\n");
-
-WriteLiteral("        <div");
-
-WriteLiteral(" class=\"form-group\"");
-
-WriteLiteral(">\r\n            <input");
-
-WriteLiteral(" type=\"password\"");
-
-WriteLiteral(" class=\"form-control\"");
-
-WriteLiteral(" id=\"password\"");
-
-WriteLiteral(" name=\"password\"");
-
-WriteLiteral(" placeholder=\"密码\"");
-
-WriteLiteral(">\r\n            <i");
-
-WriteLiteral(" class=\"glyphicon glyphicon-user\"");
-
-WriteLiteral("></i>\r\n        </div>\r\n");
-
-WriteLiteral("        <div");
-
-WriteLiteral(" class=\"form-group\"");
-
-WriteLiteral(">\r\n            <input");
-
-WriteLiteral(" type=\"password\"");
-
-WriteLiteral(" class=\"form-control\"");
-
-WriteLiteral(" id=\"password2\"");
-
-WriteLiteral(" name=\"password2\"");
-
-WriteLiteral(" placeholder=\"重复密码\"");
-
-WriteLiteral(">\r\n            <i");
-
-WriteLiteral(" class=\"glyphicon glyphicon-user\"");
-
-WriteLiteral("></i>\r\n        </div>\r\n");
-
-WriteLiteral("        <div");
-
-WriteLiteral(" class=\"form-group text-center\"");
-
-WriteLiteral(">\r\n            <div");
-
-WriteLiteral(" style=\"display: inline-block; margin-top: 5px;\"");
-
-WriteLiteral(">\r\n                <span");
-
-WriteLiteral(" style=\"margin-left: auto; margin-right: auto; margin-top: 5px;\"");
-
-WriteLiteral(">已有账号？</span>\r\n                <a");
-
-WriteLiteral(" href=\"#Login\"");
-
-WriteLiteral(" data-toggle=\"tab\"");
-
-WriteLiteral(" style=\"margin-left: auto; margin-right: auto;position: static; font-size: 15px; " +
-"margin-top: 5px;\"");
-
-WriteLiteral(">\r\n                    ");
-
-WriteLiteral("\r\n                    <span>回到登录</span>\r\n                </a>\r\n            </div>" +
-"\r\n            <button");
-
-WriteLiteral(" type=\"submit\"");
-
-WriteLiteral(" class=\"btn btn-default text-center\"");
-
-WriteLiteral(">注册</button>\r\n        </div>\r\n");
-
-            
-            #line 41 "..\..\Areas\Admin\Views\User\_Login_Register.cshtml"
-
-    }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("    ");
-
-WriteLiteral("\r\n</div>");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Areas/Admin/Views/UserOnline/_List_Data.cshtml b/NewLife.Cube/Areas/Admin/Views/UserOnline/_List_Data.cshtml
deleted file mode 100644
index f46fd2df15..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/UserOnline/_List_Data.cshtml
+++ /dev/null
@@ -1,64 +0,0 @@
-﻿@model IList<XCode.Membership.UserOnline>
-@using NewLife;
-@using NewLife.Web;
-@using XCode;
-@using XCode.Configuration;
-@using System.Web.Mvc;
-@using System.Web.Mvc.Ajax;
-@using System.Web.Mvc.Html;
-@using System.Web.Routing;
-@{
-    var fact = ViewBag.Factory as IEntityOperate;
-    var page = ViewBag.Page as Pager;
-    var fields = ViewBag.Fields as IList<FieldItem>;
-    var enableSelect = this.EnableSelect();
-}
-<table class="table table-bordered table-hover table-striped table-condensed">
-    <thead>
-        <tr>
-            @if (enableSelect)
-            {
-                <th class="text-center" style="width:10px;"><input type="checkbox" id="chkAll" title="全选" /></th>
-            }
-            <th class="text-center hidden-md hidden-sm hidden-xs"><a href="@Html.Raw(page.GetSortUrl("ID"))">编号</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("Name"))">名称</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("Times"))">次数</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("Status"))">状态</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("OnlineTime"))">在线时间</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("CreateIP"))">创建地址</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("CreateAddress"))">物理地址</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("CreateTime"))">创建时间</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("UpdateTime"))">修改时间</a></th>
-            @if (this.Has(PermissionFlags.Detail, PermissionFlags.Update, PermissionFlags.Delete))
-            {
-                <th class="text-center">操作</th>
-            }
-        </tr>
-    </thead>
-    <tbody>
-        @foreach (var entity in Model)
-        {
-            <tr>
-                @if (enableSelect)
-                {
-                    <td class="text-center"><input type="checkbox" name="keys" value="@entity.ID" /></td>
-                }
-                <td class="text-center hidden-md hidden-sm hidden-xs">@entity.ID</td>
-                <td>@entity.Name</td>
-                <td class="text-right">@entity.Times.ToString("n0")</td>
-                <td style="max-width:600px;overflow:hidden;white-space: nowrap;text-overflow: ellipsis;" title="@entity.Status">@entity.Status</td>
-                <td class="text-right">@entity.OnlineTime.ToString("n0")</td>
-                <td>@entity.CreateIP</td>
-                <td>@entity.CreateAddress</td>
-                <td>@entity.CreateTime.ToFullString("")</td>
-                <td>@entity.UpdateTime.ToFullString("")</td>
-                @if (this.Has(PermissionFlags.Detail, PermissionFlags.Update, PermissionFlags.Delete))
-                {
-                    <td class="text-center">
-                        @Html.Partial("_List_Data_Action", (Object)entity)
-                    </td>
-                }
-            </tr>
-        }
-    </tbody>
-</table>
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Views/UserOnline/_List_Data.generated.cs b/NewLife.Cube/Areas/Admin/Views/UserOnline/_List_Data.generated.cs
deleted file mode 100644
index 54dc89c98e..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/UserOnline/_List_Data.generated.cs
+++ /dev/null
@@ -1,536 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    
-    #line 6 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-    using System.Web.Mvc;
-    
-    #line default
-    #line hidden
-    
-    #line 7 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-    using System.Web.Mvc.Ajax;
-    
-    #line default
-    #line hidden
-    
-    #line 8 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-    using System.Web.Mvc.Html;
-    
-    #line default
-    #line hidden
-    
-    #line 9 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-    using System.Web.Routing;
-    
-    #line default
-    #line hidden
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    
-    #line 2 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-    using NewLife;
-    
-    #line default
-    #line hidden
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    
-    #line 3 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-    using NewLife.Web;
-    
-    #line default
-    #line hidden
-    
-    #line 4 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-    using XCode;
-    
-    #line default
-    #line hidden
-    
-    #line 5 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-    using XCode.Configuration;
-    
-    #line default
-    #line hidden
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Admin/Views/UserOnline/_List_Data.cshtml")]
-    public partial class _Areas_Admin_Views_UserOnline__List_Data_cshtml : System.Web.Mvc.WebViewPage<IList<XCode.Membership.UserOnline>>
-    {
-        public _Areas_Admin_Views_UserOnline__List_Data_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 10 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-  
-    var fact = ViewBag.Factory as IEntityOperate;
-    var page = ViewBag.Page as Pager;
-    var fields = ViewBag.Fields as IList<FieldItem>;
-    var enableSelect = this.EnableSelect();
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\n<table");
-
-WriteLiteral(" class=\"table table-bordered table-hover table-striped table-condensed\"");
-
-WriteLiteral(">\n    <thead>\n        <tr>\n");
-
-            
-            #line 19 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-            
-            
-            #line default
-            #line hidden
-            
-            #line 19 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-             if (enableSelect)
-            {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(" style=\"width:10px;\"");
-
-WriteLiteral("><input");
-
-WriteLiteral(" type=\"checkbox\"");
-
-WriteLiteral(" id=\"chkAll\"");
-
-WriteLiteral(" title=\"全选\"");
-
-WriteLiteral(" /></th>\n");
-
-            
-            #line 22 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-            }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            <th");
-
-WriteLiteral(" class=\"text-center hidden-md hidden-sm hidden-xs\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 761), Tuple.Create("\"", 800)
-            
-            #line 23 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 768), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("ID"))
-            
-            #line default
-            #line hidden
-, 768), false)
-);
-
-WriteLiteral(">编号</a></th>\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 852), Tuple.Create("\"", 893)
-            
-            #line 24 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 859), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("Name"))
-            
-            #line default
-            #line hidden
-, 859), false)
-);
-
-WriteLiteral(">名称</a></th>\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 945), Tuple.Create("\"", 987)
-            
-            #line 25 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 952), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("Times"))
-            
-            #line default
-            #line hidden
-, 952), false)
-);
-
-WriteLiteral(">次数</a></th>\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1039), Tuple.Create("\"", 1082)
-            
-            #line 26 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1046), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("Status"))
-            
-            #line default
-            #line hidden
-, 1046), false)
-);
-
-WriteLiteral(">状态</a></th>\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1134), Tuple.Create("\"", 1181)
-            
-            #line 27 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1141), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("OnlineTime"))
-            
-            #line default
-            #line hidden
-, 1141), false)
-);
-
-WriteLiteral(">在线时间</a></th>\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1235), Tuple.Create("\"", 1280)
-            
-            #line 28 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1242), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("CreateIP"))
-            
-            #line default
-            #line hidden
-, 1242), false)
-);
-
-WriteLiteral(">创建地址</a></th>\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1334), Tuple.Create("\"", 1384)
-            
-            #line 29 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1341), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("CreateAddress"))
-            
-            #line default
-            #line hidden
-, 1341), false)
-);
-
-WriteLiteral(">物理地址</a></th>\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1438), Tuple.Create("\"", 1485)
-            
-            #line 30 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1445), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("CreateTime"))
-            
-            #line default
-            #line hidden
-, 1445), false)
-);
-
-WriteLiteral(">创建时间</a></th>\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1539), Tuple.Create("\"", 1586)
-            
-            #line 31 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1546), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("UpdateTime"))
-            
-            #line default
-            #line hidden
-, 1546), false)
-);
-
-WriteLiteral(">修改时间</a></th>\n");
-
-            
-            #line 32 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-            
-            
-            #line default
-            #line hidden
-            
-            #line 32 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-             if (this.Has(PermissionFlags.Detail, PermissionFlags.Update, PermissionFlags.Delete))
-            {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">操作</th>\n");
-
-            
-            #line 35 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-            }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        </tr>\n    </thead>\n    <tbody>\n");
-
-            
-            #line 39 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-        
-            
-            #line default
-            #line hidden
-            
-            #line 39 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-         foreach (var entity in Model)
-        {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            <tr>\n");
-
-            
-            #line 42 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-                
-            
-            #line default
-            #line hidden
-            
-            #line 42 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-                 if (enableSelect)
-                {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                    <td");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><input");
-
-WriteLiteral(" type=\"checkbox\"");
-
-WriteLiteral(" name=\"keys\"");
-
-WriteAttribute("value", Tuple.Create(" value=\"", 1989), Tuple.Create("\"", 2007)
-            
-            #line 44 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-      , Tuple.Create(Tuple.Create("", 1997), Tuple.Create<System.Object, System.Int32>(entity.ID
-            
-            #line default
-            #line hidden
-, 1997), false)
-);
-
-WriteLiteral(" /></td>\n");
-
-            
-            #line 45 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-                }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <td");
-
-WriteLiteral(" class=\"text-center hidden-md hidden-sm hidden-xs\"");
-
-WriteLiteral(">");
-
-            
-            #line 46 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-                                                                 Write(entity.ID);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\n                <td>");
-
-            
-            #line 47 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-               Write(entity.Name);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\n                <td");
-
-WriteLiteral(" class=\"text-right\"");
-
-WriteLiteral(">");
-
-            
-            #line 48 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-                                  Write(entity.Times.ToString("n0"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\n                <td");
-
-WriteLiteral(" style=\"max-width:600px;overflow:hidden;white-space: nowrap;text-overflow: ellips" +
-"is;\"");
-
-WriteAttribute("title", Tuple.Create(" title=\"", 2336), Tuple.Create("\"", 2358)
-            
-            #line 49 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-                                , Tuple.Create(Tuple.Create("", 2344), Tuple.Create<System.Object, System.Int32>(entity.Status
-            
-            #line default
-            #line hidden
-, 2344), false)
-);
-
-WriteLiteral(">");
-
-            
-            #line 49 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-                                                                                                                           Write(entity.Status);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\n                <td");
-
-WriteLiteral(" class=\"text-right\"");
-
-WriteLiteral(">");
-
-            
-            #line 50 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-                                  Write(entity.OnlineTime.ToString("n0"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\n                <td>");
-
-            
-            #line 51 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-               Write(entity.CreateIP);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\n                <td>");
-
-            
-            #line 52 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-               Write(entity.CreateAddress);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\n                <td>");
-
-            
-            #line 53 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-               Write(entity.CreateTime.ToFullString(""));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\n                <td>");
-
-            
-            #line 54 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-               Write(entity.UpdateTime.ToFullString(""));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\n");
-
-            
-            #line 55 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-                
-            
-            #line default
-            #line hidden
-            
-            #line 55 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-                 if (this.Has(PermissionFlags.Detail, PermissionFlags.Update, PermissionFlags.Delete))
-                {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                    <td");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">\n");
-
-WriteLiteral("                        ");
-
-            
-            #line 58 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-                   Write(Html.Partial("_List_Data_Action", (Object)entity));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\n                    </td>\n");
-
-            
-            #line 60 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-                }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            </tr>\n");
-
-            
-            #line 62 "..\..\Areas\Admin\Views\UserOnline\_List_Data.cshtml"
-        }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("    </tbody>\n</table>");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Areas/Admin/Views/UserToken/_List_Data.cshtml b/NewLife.Cube/Areas/Admin/Views/UserToken/_List_Data.cshtml
deleted file mode 100644
index 863a369b66..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/UserToken/_List_Data.cshtml
+++ /dev/null
@@ -1,69 +0,0 @@
-﻿@model IList<NewLife.Cube.Entity.UserToken>
-@using NewLife;
-@using NewLife.Web;
-@using XCode;
-@using XCode.Configuration;
-@using System.Web.Mvc;
-@using System.Web.Mvc.Ajax;
-@using System.Web.Mvc.Html;
-@using System.Web.Routing;
-@{
-    var fact = ViewBag.Factory as IEntityOperate;
-    var page = ViewBag.Page as Pager;
-    var fields = ViewBag.Fields as IList<FieldItem>;
-    var enableSelect = this.EnableSelect();
-    var provider = ManageProvider.Provider;
-}
-<table class="table table-bordered table-hover table-striped table-condensed">
-    <thead>
-        <tr>
-            @if (enableSelect)
-            {
-                <th class="text-center" style="width:10px;"><input type="checkbox" id="chkAll" title="全选" /></th>
-            }
-            <th class="text-center hidden-md hidden-sm hidden-xs"><a href="@Html.Raw(page.GetSortUrl("ID"))">编号</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("Token"))">令牌</a></th>
-            <th class="text-center" title="地址。锁定该令牌只能访问该资源路径"><a href="@Html.Raw(page.GetSortUrl("Url"))">地址</a></th>
-            <th class="text-center" title="用户。本地用户"><a href="@Html.Raw(page.GetSortUrl("UserID"))">用户</a></th>
-            <th class="text-center" style="min-width:134px;"><a href="@Html.Raw(page.GetSortUrl("Expire"))">过期时间</a></th>
-            <th class="text-center" title="次数。该令牌使用次数"><a href="@Html.Raw(page.GetSortUrl("Times"))">次数</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("Enable"))">启用</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("UpdateUserID"))">更新用户</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("UpdateIP"))">更新地址</a></th>
-            <th class="text-center" style="min-width:134px;"><a href="@Html.Raw(page.GetSortUrl("UpdateTime"))">更新时间</a></th>
-            @if (this.Has(PermissionFlags.Detail, PermissionFlags.Update, PermissionFlags.Delete))
-            {
-                <th class="text-center" style="min-width:100px;">操作</th>
-            }
-        </tr>
-    </thead>
-    <tbody>
-        @foreach (var entity in Model)
-        {
-            <tr>
-                @if (enableSelect)
-                {
-                    <td class="text-center"><input type="checkbox" name="keys" value="@entity.ID" /></td>
-                }
-                <td class="text-center hidden-md hidden-sm hidden-xs">@entity.ID</td>
-                <td>@entity.Token</td>
-                <td>@entity.Url</td>
-                <td class="text-right">@entity.UserID.ToString("n0")</td>
-                <td>@entity.Expire.ToFullString("")</td>
-                <td class="text-right">@entity.Times.ToString("n0")</td>
-                <td class="text-center">
-                    <i class="glyphicon glyphicon-@(entity.Enable ? "ok" : "remove")" style="color: @(entity.Enable ? "green" : "red");"></i>
-                </td>
-                <td class="text-right">@provider.FindByID(entity.UpdateUserID)</td>
-                <td title="@entity.UpdateIP.IPToAddress()">@entity.UpdateIP</td>
-                <td>@entity.UpdateTime.ToFullString("")</td>
-                @if (this.Has(PermissionFlags.Detail, PermissionFlags.Update, PermissionFlags.Delete))
-                {
-                    <td class="text-center">
-                        @Html.Partial("_List_Data_Action", (Object)entity)
-                    </td>
-                }
-            </tr>
-        }
-    </tbody>
-</table>
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Views/UserToken/_List_Data.generated.cs b/NewLife.Cube/Areas/Admin/Views/UserToken/_List_Data.generated.cs
deleted file mode 100644
index 6c393fece1..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/UserToken/_List_Data.generated.cs
+++ /dev/null
@@ -1,596 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    
-    #line 6 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-    using System.Web.Mvc;
-    
-    #line default
-    #line hidden
-    
-    #line 7 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-    using System.Web.Mvc.Ajax;
-    
-    #line default
-    #line hidden
-    
-    #line 8 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-    using System.Web.Mvc.Html;
-    
-    #line default
-    #line hidden
-    
-    #line 9 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-    using System.Web.Routing;
-    
-    #line default
-    #line hidden
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    
-    #line 2 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-    using NewLife;
-    
-    #line default
-    #line hidden
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    
-    #line 3 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-    using NewLife.Web;
-    
-    #line default
-    #line hidden
-    
-    #line 4 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-    using XCode;
-    
-    #line default
-    #line hidden
-    
-    #line 5 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-    using XCode.Configuration;
-    
-    #line default
-    #line hidden
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Admin/Views/UserToken/_List_Data.cshtml")]
-    public partial class _Areas_Admin_Views_UserToken__List_Data_cshtml : System.Web.Mvc.WebViewPage<IList<NewLife.Cube.Entity.UserToken>>
-    {
-        public _Areas_Admin_Views_UserToken__List_Data_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 10 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-  
-    var fact = ViewBag.Factory as IEntityOperate;
-    var page = ViewBag.Page as Pager;
-    var fields = ViewBag.Fields as IList<FieldItem>;
-    var enableSelect = this.EnableSelect();
-    var provider = ManageProvider.Provider;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n<table");
-
-WriteLiteral(" class=\"table table-bordered table-hover table-striped table-condensed\"");
-
-WriteLiteral(">\r\n    <thead>\r\n        <tr>\r\n");
-
-            
-            #line 20 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-            
-            
-            #line default
-            #line hidden
-            
-            #line 20 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-             if (enableSelect)
-            {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(" style=\"width:10px;\"");
-
-WriteLiteral("><input");
-
-WriteLiteral(" type=\"checkbox\"");
-
-WriteLiteral(" id=\"chkAll\"");
-
-WriteLiteral(" title=\"全选\"");
-
-WriteLiteral(" /></th>\r\n");
-
-            
-            #line 23 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-            }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            <th");
-
-WriteLiteral(" class=\"text-center hidden-md hidden-sm hidden-xs\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 830), Tuple.Create("\"", 869)
-            
-            #line 24 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 837), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("ID"))
-            
-            #line default
-            #line hidden
-, 837), false)
-);
-
-WriteLiteral(">编号</a></th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 922), Tuple.Create("\"", 964)
-            
-            #line 25 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 929), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("Token"))
-            
-            #line default
-            #line hidden
-, 929), false)
-);
-
-WriteLiteral(">令牌</a></th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(" title=\"地址。锁定该令牌只能访问该资源路径\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1043), Tuple.Create("\"", 1083)
-            
-            #line 26 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1050), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("Url"))
-            
-            #line default
-            #line hidden
-, 1050), false)
-);
-
-WriteLiteral(">地址</a></th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(" title=\"用户。本地用户\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1152), Tuple.Create("\"", 1195)
-            
-            #line 27 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1159), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("UserID"))
-            
-            #line default
-            #line hidden
-, 1159), false)
-);
-
-WriteLiteral(">用户</a></th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(" style=\"min-width:134px;\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1273), Tuple.Create("\"", 1316)
-            
-            #line 28 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1280), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("Expire"))
-            
-            #line default
-            #line hidden
-, 1280), false)
-);
-
-WriteLiteral(">过期时间</a></th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(" title=\"次数。该令牌使用次数\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1390), Tuple.Create("\"", 1432)
-            
-            #line 29 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1397), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("Times"))
-            
-            #line default
-            #line hidden
-, 1397), false)
-);
-
-WriteLiteral(">次数</a></th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1485), Tuple.Create("\"", 1528)
-            
-            #line 30 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1492), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("Enable"))
-            
-            #line default
-            #line hidden
-, 1492), false)
-);
-
-WriteLiteral(">启用</a></th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1581), Tuple.Create("\"", 1630)
-            
-            #line 31 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1588), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("UpdateUserID"))
-            
-            #line default
-            #line hidden
-, 1588), false)
-);
-
-WriteLiteral(">更新用户</a></th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1685), Tuple.Create("\"", 1730)
-            
-            #line 32 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1692), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("UpdateIP"))
-            
-            #line default
-            #line hidden
-, 1692), false)
-);
-
-WriteLiteral(">更新地址</a></th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(" style=\"min-width:134px;\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1810), Tuple.Create("\"", 1857)
-            
-            #line 33 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1817), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("UpdateTime"))
-            
-            #line default
-            #line hidden
-, 1817), false)
-);
-
-WriteLiteral(">更新时间</a></th>\r\n");
-
-            
-            #line 34 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-            
-            
-            #line default
-            #line hidden
-            
-            #line 34 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-             if (this.Has(PermissionFlags.Detail, PermissionFlags.Update, PermissionFlags.Delete))
-            {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(" style=\"min-width:100px;\"");
-
-WriteLiteral(">操作</th>\r\n");
-
-            
-            #line 37 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-            }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        </tr>\r\n    </thead>\r\n    <tbody>\r\n");
-
-            
-            #line 41 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-        
-            
-            #line default
-            #line hidden
-            
-            #line 41 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-         foreach (var entity in Model)
-        {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            <tr>\r\n");
-
-            
-            #line 44 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-                
-            
-            #line default
-            #line hidden
-            
-            #line 44 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-                 if (enableSelect)
-                {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                    <td");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><input");
-
-WriteLiteral(" type=\"checkbox\"");
-
-WriteLiteral(" name=\"keys\"");
-
-WriteAttribute("value", Tuple.Create(" value=\"", 2322), Tuple.Create("\"", 2340)
-            
-            #line 46 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-      , Tuple.Create(Tuple.Create("", 2330), Tuple.Create<System.Object, System.Int32>(entity.ID
-            
-            #line default
-            #line hidden
-, 2330), false)
-);
-
-WriteLiteral(" /></td>\r\n");
-
-            
-            #line 47 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-                }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <td");
-
-WriteLiteral(" class=\"text-center hidden-md hidden-sm hidden-xs\"");
-
-WriteLiteral(">");
-
-            
-            #line 48 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-                                                                 Write(entity.ID);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td>");
-
-            
-            #line 49 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-               Write(entity.Token);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td>");
-
-            
-            #line 50 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-               Write(entity.Url);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td");
-
-WriteLiteral(" class=\"text-right\"");
-
-WriteLiteral(">");
-
-            
-            #line 51 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-                                  Write(entity.UserID.ToString("n0"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td>");
-
-            
-            #line 52 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-               Write(entity.Expire.ToFullString(""));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td");
-
-WriteLiteral(" class=\"text-right\"");
-
-WriteLiteral(">");
-
-            
-            #line 53 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-                                  Write(entity.Times.ToString("n0"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">\r\n                    <i");
-
-WriteAttribute("class", Tuple.Create(" class=\"", 2806), Tuple.Create("\"", 2868)
-, Tuple.Create(Tuple.Create("", 2814), Tuple.Create("glyphicon", 2814), true)
-, Tuple.Create(Tuple.Create(" ", 2823), Tuple.Create("glyphicon-", 2824), true)
-            
-            #line 55 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 2834), Tuple.Create<System.Object, System.Int32>(entity.Enable ? "ok" : "remove"
-            
-            #line default
-            #line hidden
-, 2834), false)
-);
-
-WriteAttribute("style", Tuple.Create(" style=\"", 2869), Tuple.Create("\"", 2919)
-, Tuple.Create(Tuple.Create("", 2877), Tuple.Create("color:", 2877), true)
-            
-            #line 55 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-                    , Tuple.Create(Tuple.Create(" ", 2883), Tuple.Create<System.Object, System.Int32>(entity.Enable ? "green" : "red"
-            
-            #line default
-            #line hidden
-, 2884), false)
-, Tuple.Create(Tuple.Create("", 2918), Tuple.Create(";", 2918), true)
-);
-
-WriteLiteral("></i>\r\n                </td>\r\n                <td");
-
-WriteLiteral(" class=\"text-right\"");
-
-WriteLiteral(">");
-
-            
-            #line 57 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-                                  Write(provider.FindByID(entity.UpdateUserID));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td");
-
-WriteAttribute("title", Tuple.Create(" title=\"", 3054), Tuple.Create("\"", 3092)
-            
-            #line 58 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 3062), Tuple.Create<System.Object, System.Int32>(entity.UpdateIP.IPToAddress()
-            
-            #line default
-            #line hidden
-, 3062), false)
-);
-
-WriteLiteral(">");
-
-            
-            #line 58 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-                                                      Write(entity.UpdateIP);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td>");
-
-            
-            #line 59 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-               Write(entity.UpdateTime.ToFullString(""));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n");
-
-            
-            #line 60 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-                
-            
-            #line default
-            #line hidden
-            
-            #line 60 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-                 if (this.Has(PermissionFlags.Detail, PermissionFlags.Update, PermissionFlags.Delete))
-                {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                    <td");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("                        ");
-
-            
-            #line 63 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-                   Write(Html.Partial("_List_Data_Action", (Object)entity));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n                    </td>\r\n");
-
-            
-            #line 65 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-                }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            </tr>\r\n");
-
-            
-            #line 67 "..\..\Areas\Admin\Views\UserToken\_List_Data.cshtml"
-        }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("    </tbody>\r\n</table>");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Areas/Admin/Views/VisitStat/_List_Data.cshtml b/NewLife.Cube/Areas/Admin/Views/VisitStat/_List_Data.cshtml
deleted file mode 100644
index 7b7346e35b..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/VisitStat/_List_Data.cshtml
+++ /dev/null
@@ -1,77 +0,0 @@
-﻿@model IList<XCode.Membership.VisitStat>
-@using NewLife;
-@using NewLife.Web;
-@using XCode;
-@using XCode.Configuration;
-@using System.Web.Mvc;
-@using System.Web.Mvc.Ajax;
-@using System.Web.Mvc.Html;
-@using System.Web.Routing;
-@{
-    var fact = ViewBag.Factory as IEntityOperate;
-    var page = ViewBag.Page as Pager;
-    var fields = ViewBag.Fields as IList<FieldItem>;
-    var enableSelect = this.EnableSelect();
-
-    var level = (XCode.Statistics.StatLevels)page["Level"].ToInt();
-}
-<table class="table table-bordered table-hover table-striped table-condensed">
-    <thead>
-        <tr>
-            @if (enableSelect)
-            {
-                <th class="text-center" style="width:10px;"><input type="checkbox" id="chkAll" title="全选" /></th>
-            }
-            <th class="text-center hidden-md hidden-sm hidden-xs"><a href="@Html.Raw(page.GetSortUrl("ID"))">编号</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("Time"))">时间</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("Page"))">页面</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("Title"))">标题</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("Times"))">次数</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("Users"))">用户</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("IPs"))">IP</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("Error"))">错误</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("Cost"))">平均耗时</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("MaxCost"))">最大耗时</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("CreateTime"))">创建时间</a></th>
-            <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("UpdateTime"))">更新时间</a></th>
-            @if (this.Has(PermissionFlags.Detail, PermissionFlags.Update, PermissionFlags.Delete))
-            {
-                <th class="text-center">操作</th>
-            }
-        </tr>
-    </thead>
-    <tbody>
-        @foreach (var entity in Model)
-        {
-            var st = new VisitStatModel
-            {
-                Level = level,
-                Time = entity.Time
-            };
-            <tr>
-                @if (enableSelect)
-                {
-                    <td class="text-center"><input type="checkbox" name="keys" value="@entity.ID" /></td>
-                }
-                <td class="text-center hidden-md hidden-sm hidden-xs">@entity.ID</td>
-                <td class="text-right">@st</td>
-                <td>@entity.Page</td>
-                <td>@entity.Title</td>
-                <td class="text-right">@entity.Times.ToString("n0")</td>
-                <td class="text-right">@entity.Users.ToString("n0")</td>
-                <td class="text-right">@entity.IPs.ToString("n0")</td>
-                <td class="text-right">@entity.Error.ToString("n0")</td>
-                <td class="text-right">@entity.Cost.ToString("n0") ms</td>
-                <td class="text-right">@entity.MaxCost.ToString("n0") ms</td>
-                <td>@entity.CreateTime.ToFullString("")</td>
-                <td>@entity.UpdateTime.ToFullString("")</td>
-                @if (this.Has(PermissionFlags.Detail, PermissionFlags.Update, PermissionFlags.Delete))
-                {
-                    <td class="text-center">
-                        @Html.Partial("_List_Data_Action", (Object)entity)
-                    </td>
-                }
-            </tr>
-        }
-    </tbody>
-</table>
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Views/VisitStat/_List_Data.generated.cs b/NewLife.Cube/Areas/Admin/Views/VisitStat/_List_Data.generated.cs
deleted file mode 100644
index bb26145699..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/VisitStat/_List_Data.generated.cs
+++ /dev/null
@@ -1,623 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    
-    #line 6 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-    using System.Web.Mvc;
-    
-    #line default
-    #line hidden
-    
-    #line 7 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-    using System.Web.Mvc.Ajax;
-    
-    #line default
-    #line hidden
-    
-    #line 8 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-    using System.Web.Mvc.Html;
-    
-    #line default
-    #line hidden
-    
-    #line 9 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-    using System.Web.Routing;
-    
-    #line default
-    #line hidden
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    
-    #line 2 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-    using NewLife;
-    
-    #line default
-    #line hidden
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    
-    #line 3 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-    using NewLife.Web;
-    
-    #line default
-    #line hidden
-    
-    #line 4 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-    using XCode;
-    
-    #line default
-    #line hidden
-    
-    #line 5 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-    using XCode.Configuration;
-    
-    #line default
-    #line hidden
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Admin/Views/VisitStat/_List_Data.cshtml")]
-    public partial class _Areas_Admin_Views_VisitStat__List_Data_cshtml : System.Web.Mvc.WebViewPage<IList<XCode.Membership.VisitStat>>
-    {
-        public _Areas_Admin_Views_VisitStat__List_Data_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 10 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-  
-    var fact = ViewBag.Factory as IEntityOperate;
-    var page = ViewBag.Page as Pager;
-    var fields = ViewBag.Fields as IList<FieldItem>;
-    var enableSelect = this.EnableSelect();
-
-    var level = (XCode.Statistics.StatLevels)page["Level"].ToInt();
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n<table");
-
-WriteLiteral(" class=\"table table-bordered table-hover table-striped table-condensed\"");
-
-WriteLiteral(">\r\n    <thead>\r\n        <tr>\r\n");
-
-            
-            #line 21 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-            
-            
-            #line default
-            #line hidden
-            
-            #line 21 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-             if (enableSelect)
-            {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(" style=\"width:10px;\"");
-
-WriteLiteral("><input");
-
-WriteLiteral(" type=\"checkbox\"");
-
-WriteLiteral(" id=\"chkAll\"");
-
-WriteLiteral(" title=\"全选\"");
-
-WriteLiteral(" /></th>\r\n");
-
-            
-            #line 24 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-            }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            <th");
-
-WriteLiteral(" class=\"text-center hidden-md hidden-sm hidden-xs\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 853), Tuple.Create("\"", 892)
-            
-            #line 25 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 860), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("ID"))
-            
-            #line default
-            #line hidden
-, 860), false)
-);
-
-WriteLiteral(">编号</a></th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 945), Tuple.Create("\"", 986)
-            
-            #line 26 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 952), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("Time"))
-            
-            #line default
-            #line hidden
-, 952), false)
-);
-
-WriteLiteral(">时间</a></th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1039), Tuple.Create("\"", 1080)
-            
-            #line 27 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1046), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("Page"))
-            
-            #line default
-            #line hidden
-, 1046), false)
-);
-
-WriteLiteral(">页面</a></th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1133), Tuple.Create("\"", 1175)
-            
-            #line 28 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1140), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("Title"))
-            
-            #line default
-            #line hidden
-, 1140), false)
-);
-
-WriteLiteral(">标题</a></th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1228), Tuple.Create("\"", 1270)
-            
-            #line 29 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1235), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("Times"))
-            
-            #line default
-            #line hidden
-, 1235), false)
-);
-
-WriteLiteral(">次数</a></th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1323), Tuple.Create("\"", 1365)
-            
-            #line 30 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1330), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("Users"))
-            
-            #line default
-            #line hidden
-, 1330), false)
-);
-
-WriteLiteral(">用户</a></th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1418), Tuple.Create("\"", 1458)
-            
-            #line 31 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1425), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("IPs"))
-            
-            #line default
-            #line hidden
-, 1425), false)
-);
-
-WriteLiteral(">IP</a></th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1511), Tuple.Create("\"", 1553)
-            
-            #line 32 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1518), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("Error"))
-            
-            #line default
-            #line hidden
-, 1518), false)
-);
-
-WriteLiteral(">错误</a></th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1606), Tuple.Create("\"", 1647)
-            
-            #line 33 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1613), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("Cost"))
-            
-            #line default
-            #line hidden
-, 1613), false)
-);
-
-WriteLiteral(">平均耗时</a></th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1702), Tuple.Create("\"", 1746)
-            
-            #line 34 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1709), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("MaxCost"))
-            
-            #line default
-            #line hidden
-, 1709), false)
-);
-
-WriteLiteral(">最大耗时</a></th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1801), Tuple.Create("\"", 1848)
-            
-            #line 35 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1808), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("CreateTime"))
-            
-            #line default
-            #line hidden
-, 1808), false)
-);
-
-WriteLiteral(">创建时间</a></th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1903), Tuple.Create("\"", 1950)
-            
-            #line 36 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1910), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("UpdateTime"))
-            
-            #line default
-            #line hidden
-, 1910), false)
-);
-
-WriteLiteral(">更新时间</a></th>\r\n");
-
-            
-            #line 37 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-            
-            
-            #line default
-            #line hidden
-            
-            #line 37 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-             if (this.Has(PermissionFlags.Detail, PermissionFlags.Update, PermissionFlags.Delete))
-            {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">操作</th>\r\n");
-
-            
-            #line 40 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-            }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        </tr>\r\n    </thead>\r\n    <tbody>\r\n");
-
-            
-            #line 44 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-        
-            
-            #line default
-            #line hidden
-            
-            #line 44 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-         foreach (var entity in Model)
-        {
-            var st = new VisitStatModel
-            {
-                Level = level,
-                Time = entity.Time
-            };
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            <tr>\r\n");
-
-            
-            #line 52 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-                
-            
-            #line default
-            #line hidden
-            
-            #line 52 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-                 if (enableSelect)
-                {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                    <td");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><input");
-
-WriteLiteral(" type=\"checkbox\"");
-
-WriteLiteral(" name=\"keys\"");
-
-WriteAttribute("value", Tuple.Create(" value=\"", 2506), Tuple.Create("\"", 2524)
-            
-            #line 54 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-      , Tuple.Create(Tuple.Create("", 2514), Tuple.Create<System.Object, System.Int32>(entity.ID
-            
-            #line default
-            #line hidden
-, 2514), false)
-);
-
-WriteLiteral(" /></td>\r\n");
-
-            
-            #line 55 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-                }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <td");
-
-WriteLiteral(" class=\"text-center hidden-md hidden-sm hidden-xs\"");
-
-WriteLiteral(">");
-
-            
-            #line 56 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-                                                                 Write(entity.ID);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td");
-
-WriteLiteral(" class=\"text-right\"");
-
-WriteLiteral(">");
-
-            
-            #line 57 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-                                  Write(st);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td>");
-
-            
-            #line 58 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-               Write(entity.Page);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td>");
-
-            
-            #line 59 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-               Write(entity.Title);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td");
-
-WriteLiteral(" class=\"text-right\"");
-
-WriteLiteral(">");
-
-            
-            #line 60 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-                                  Write(entity.Times.ToString("n0"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td");
-
-WriteLiteral(" class=\"text-right\"");
-
-WriteLiteral(">");
-
-            
-            #line 61 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-                                  Write(entity.Users.ToString("n0"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td");
-
-WriteLiteral(" class=\"text-right\"");
-
-WriteLiteral(">");
-
-            
-            #line 62 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-                                  Write(entity.IPs.ToString("n0"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td");
-
-WriteLiteral(" class=\"text-right\"");
-
-WriteLiteral(">");
-
-            
-            #line 63 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-                                  Write(entity.Error.ToString("n0"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td");
-
-WriteLiteral(" class=\"text-right\"");
-
-WriteLiteral(">");
-
-            
-            #line 64 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-                                  Write(entity.Cost.ToString("n0"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral(" ms</td>\r\n                <td");
-
-WriteLiteral(" class=\"text-right\"");
-
-WriteLiteral(">");
-
-            
-            #line 65 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-                                  Write(entity.MaxCost.ToString("n0"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral(" ms</td>\r\n                <td>");
-
-            
-            #line 66 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-               Write(entity.CreateTime.ToFullString(""));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n                <td>");
-
-            
-            #line 67 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-               Write(entity.UpdateTime.ToFullString(""));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n");
-
-            
-            #line 68 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-                
-            
-            #line default
-            #line hidden
-            
-            #line 68 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-                 if (this.Has(PermissionFlags.Detail, PermissionFlags.Update, PermissionFlags.Delete))
-                {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                    <td");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("                        ");
-
-            
-            #line 71 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-                   Write(Html.Partial("_List_Data_Action", (Object)entity));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n                    </td>\r\n");
-
-            
-            #line 73 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-                }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            </tr>\r\n");
-
-            
-            #line 75 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
-        }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("    </tbody>\r\n</table>");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Areas/Admin/Views/VisitStat/_List_Search.cshtml b/NewLife.Cube/Areas/Admin/Views/VisitStat/_List_Search.cshtml
deleted file mode 100644
index 2321992da6..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/VisitStat/_List_Search.cshtml
+++ /dev/null
@@ -1,8 +0,0 @@
-﻿@using XCode.Statistics;
-@{
-    var page = ViewBag.Page as Pager;
-}
-<div class="form-group">
-    @Html.ForDropDownList("p", VisitStat.FindAllPageName(), page["p"], "全部页面", true)
-</div>
-@Html.Partial("_StatLevel", new[] { StatLevels.All, StatLevels.Year, StatLevels.Month, StatLevels.Day })
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Views/VisitStat/_List_Search.generated.cs b/NewLife.Cube/Areas/Admin/Views/VisitStat/_List_Search.generated.cs
deleted file mode 100644
index a8ae05075c..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/VisitStat/_List_Search.generated.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    using XCode.Membership;
-    
-    #line 1 "..\..\Areas\Admin\Views\VisitStat\_List_Search.cshtml"
-    using XCode.Statistics;
-    
-    #line default
-    #line hidden
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Admin/Views/VisitStat/_List_Search.cshtml")]
-    public partial class _Areas_Admin_Views_VisitStat__List_Search_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Areas_Admin_Views_VisitStat__List_Search_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 2 "..\..\Areas\Admin\Views\VisitStat\_List_Search.cshtml"
-  
-    var page = ViewBag.Page as Pager;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n<div");
-
-WriteLiteral(" class=\"form-group\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("    ");
-
-            
-            #line 6 "..\..\Areas\Admin\Views\VisitStat\_List_Search.cshtml"
-Write(Html.ForDropDownList("p", VisitStat.FindAllPageName(), page["p"], "全部页面", true));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n</div>\r\n");
-
-            
-            #line 8 "..\..\Areas\Admin\Views\VisitStat\_List_Search.cshtml"
-Write(Html.Partial("_StatLevel", new[] { StatLevels.All, StatLevels.Year, StatLevels.Month, StatLevels.Day }));
-
-            
-            #line default
-            #line hidden
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Areas/Admin/Views/Web.config b/NewLife.Cube/Areas/Admin/Views/Web.config
deleted file mode 100644
index eb2711b479..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/Web.config
+++ /dev/null
@@ -1,48 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-
-<configuration>
-  <configSections>
-    <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-      <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
-      <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
-    </sectionGroup>
-  </configSections>
-
-  <system.web.webPages.razor>
-    <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-    <pages pageBaseType="System.Web.Mvc.WebViewPage">
-      <namespaces>
-        <add namespace="System.Web.Mvc" />
-        <add namespace="System.Web.Mvc.Ajax" />
-        <add namespace="System.Web.Mvc.Html" />
-        <add namespace="System.Web.Routing" />
-
-        <add namespace="NewLife" />
-        <add namespace="NewLife.Cube" />
-        <add namespace="NewLife.Reflection" />
-        <add namespace="NewLife.Web" />
-        <add namespace="XCode" />
-        <add namespace="XCode.Membership" />
-      </namespaces>
-    </pages>
-  </system.web.webPages.razor>
-
-  <appSettings>
-    <add key="webpages:Enabled" value="false" />
-  </appSettings>
-
-  <system.web>
-    <compilation>
-      <assemblies>
-        <add assembly="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      </assemblies>
-    </compilation>
-  </system.web>
-
-  <system.webServer>
-    <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler" />
-    </handlers>
-  </system.webServer>
-</configuration>
diff --git a/NewLife.Cube/Areas/Admin/Views/_ViewStart.cshtml b/NewLife.Cube/Areas/Admin/Views/_ViewStart.cshtml
deleted file mode 100644
index 92c37c15c6..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/_ViewStart.cshtml
+++ /dev/null
@@ -1,4 +0,0 @@
-﻿@{
-    // 这里可用于切换不同的模板
-    Layout = NewLife.Cube.Setting.Current.Layout;
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/Admin/Views/_ViewStart.generated.cs b/NewLife.Cube/Areas/Admin/Views/_ViewStart.generated.cs
deleted file mode 100644
index baef258901..0000000000
--- a/NewLife.Cube/Areas/Admin/Views/_ViewStart.generated.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Admin/Views/_ViewStart.cshtml")]
-    public partial class _Areas_Admin_Views__ViewStart_cshtml : System.Web.Mvc.ViewStartPage
-    {
-        public _Areas_Admin_Views__ViewStart_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 1 "..\..\Areas\Admin\Views\_ViewStart.cshtml"
-  
-    // 这里可用于切换不同的模板
-    Layout = NewLife.Cube.Setting.Current.Layout;
-
-            
-            #line default
-            #line hidden
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Areas/AdminMobile/AdminMobileAreaRegistration.cs b/NewLife.Cube/Areas/AdminMobile/AdminMobileAreaRegistration.cs
deleted file mode 100644
index b14c338cc6..0000000000
--- a/NewLife.Cube/Areas/AdminMobile/AdminMobileAreaRegistration.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-﻿using NewLife.Log;
-using System.ComponentModel;
-using System.Web.Mvc;
-using XCode.Membership;
-
-namespace NewLife.Cube.AdminMobile
-{
-    /// <summary>移动管理区域注册</summary>
-    [DisplayName("移动管理")]
-    public class AdminMobileAreaRegistration : AreaRegistrationBase
-    {
-        /// <summary>注册区域</summary>
-        /// <param name="context"></param>
-        public override void RegisterArea(AreaRegistrationContext context)
-        {
-            base.RegisterArea(context);
-
-            context.Routes.IgnoreRoute("bootstrap/{*relpath}");
-
-            // 自动检查并添加菜单
-            XTrace.WriteLine("初始化权限管理体系");
-            var user = ManageProvider.User;
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/AdminMobile/Controllers/IndexController.cs b/NewLife.Cube/Areas/AdminMobile/Controllers/IndexController.cs
deleted file mode 100644
index e0ba2d09ac..0000000000
--- a/NewLife.Cube/Areas/AdminMobile/Controllers/IndexController.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-﻿using NewLife.Common;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Web;
-using System.Web.Mvc;
-using XCode.Membership;
-
-namespace NewLife.Cube.AdminMobile.Controllers
-{
-    /// <summary>移动首页</summary>
-    [DisplayName("移动首页")]
-    public class IndexController : ControllerBaseX
-    {
-        /// <summary>首页</summary>
-        /// <returns></returns>
-        [EntityAuthorize(PermissionFlags.Detail)]
-        //[AllowAnonymous]
-        public ActionResult Index()
-        {
-            ViewBag.User = ManageProvider.User;
-            ViewBag.Config = SysConfig.Current;
-
-            // 工作台页面
-            var startPage = Request["page"];
-            if (startPage.IsNullOrEmpty()) startPage = Setting.Current.StartPage;
-
-            ViewBag.Main = startPage;
-
-            return View();
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/AdminMobile/Controllers/UserController.cs b/NewLife.Cube/Areas/AdminMobile/Controllers/UserController.cs
deleted file mode 100644
index c8fc23d3cc..0000000000
--- a/NewLife.Cube/Areas/AdminMobile/Controllers/UserController.cs
+++ /dev/null
@@ -1,241 +0,0 @@
-﻿using NewLife.Web;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Web.Mvc;
-using System.Web.Security;
-using XCode;
-using XCode.Membership;
-
-namespace NewLife.Cube.AdminMobile.Controllers
-{
-    /// <summary>用户控制器</summary>
-    [DisplayName("用户")]
-    [Description("系统基于角色授权，每个角色对不同的功能模块具备添删改查以及自定义权限等多种权限设定。")]
-    public class UserController : EntityController<UserX>
-    {
-        static UserController()
-        {
-            ListFields.RemoveField("Phone");
-            ListFields.RemoveField("Code");
-            ListFields.RemoveField("StartTime");
-            ListFields.RemoveField("EndTime");
-            ListFields.RemoveField("RegisterTime");
-            ListFields.RemoveField("Question");
-            ListFields.RemoveField("Answer");
-        }
-
-        /// <summary>搜索数据集</summary>
-        /// <param name="p"></param>
-        /// <returns></returns>
-        protected override IEnumerable<UserX> Search(Pager p)
-        {
-            return UserX.Search(p["Q"], p["RoleID"].ToInt(-1), null, p["dtStart"].ToDateTime(), p["dtEnd"].ToDateTime(), p);
-        }
-
-        /// <summary>表单页视图。</summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        protected override ActionResult FormView(UserX entity)
-        {
-            // 清空密码，不向浏览器输出
-            //entity.Password = null;
-            entity["Password"] = null;
-
-            return base.FormView(entity);
-        }
-
-        /// <summary>登录</summary>
-        /// <param name="returnUrl"></param>
-        /// <returns></returns>
-        [AllowAnonymous]
-        public ActionResult Login(String returnUrl)
-        {
-            // 如果已登录，直接跳转
-            //if (ManageProvider.User != null)
-            //{
-            //    if (Url.IsLocalUrl(returnUrl))
-            //        return Redirect(returnUrl);
-            //    else
-            //        return RedirectToAction("Index", "Index", new { page = returnUrl });
-            //}
-
-            ViewBag.ReturnUrl = returnUrl;
-
-            return View();
-        }
-
-        /// <summary>登录</summary>
-        /// <param name="username"></param>
-        /// <param name="password"></param>
-        /// <param name="remember"></param>
-        /// <param name="returnUrl"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [AllowAnonymous]
-        public ActionResult Login(String username, String password, Boolean? remember, String returnUrl)
-        {
-            try
-            {
-                var provider = ManageProvider.Provider;
-                if (ModelState.IsValid && provider.Login(username, password, remember ?? false) != null)
-                {
-                    FormsAuthentication.SetAuthCookie(username, remember ?? false);
-                    //FormsAuthentication.RedirectFromLoginPage(provider.Current + "", true);
-
-                    if (Url.IsLocalUrl(returnUrl))
-                        return Redirect(returnUrl);
-                    else
-                        return RedirectToAction("Index", "Index", new { page = returnUrl });
-                }
-
-                // 如果我们进行到这一步时某个地方出错，则重新显示表单
-                ModelState.AddModelError("username", "提供的用户名或密码不正确。");
-                ViewBag.js = WeuiJS.Alert("提供的用户名或密码不正确。");
-            }
-            catch (Exception ex)
-            {
-                ModelState.AddModelError("", ex.Message);
-                ViewBag.js = WeuiJS.Alert(ex.Message);
-            }
-
-            return View();
-        }
-
-        /// <summary>注销</summary>
-        /// <returns></returns>
-        [AllowAnonymous]
-        public ActionResult Logout()
-        {
-            ManageProvider.User.Logout();
-            //ManageProvider.User = null;
-
-            return RedirectToAction("Login");
-        }
-
-        /// <summary>用户资料</summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        [AllowAnonymous]
-        public ActionResult Info(Int32? id)
-        {
-            if (id == null || id.Value <= 0) throw new Exception("无效用户编号！");
-
-            var user = ManageProvider.User;
-            if (user == null) return RedirectToAction("Login");
-
-            if (id.Value != user.ID) throw new Exception("禁止修改非当前登录用户资料");
-
-            user = UserX.FindByKeyForEdit(id.Value);
-            if (user == null) throw new Exception("无效用户编号！");
-
-            //user.Password = null;
-            user["Password"] = null;
-
-            // 用于显示的列
-            if (ViewBag.Fields == null) ViewBag.Fields = GetFields(true);
-            ViewBag.Factory = UserX.Meta.Factory;
-
-            return View(user);
-        }
-
-        /// <summary>用户资料</summary>
-        /// <param name="user"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [AllowAnonymous]
-        public ActionResult Info(UserX user)
-        {
-            var cur = ManageProvider.User;
-            if (cur == null) return RedirectToAction("Login");
-
-            if (user.ID != cur.ID) throw new Exception("禁止修改非当前登录用户资料");
-
-            var entity = user as IEntity;
-            if (entity.Dirtys["RoleID"]) throw new Exception("禁止修改角色！");
-            if (entity.Dirtys["Enable"]) throw new Exception("禁止修改禁用！");
-
-            user.Update();
-
-            return View(user);
-        }
-
-        /// <summary>忘记密码</summary>
-        /// <param name="email"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [AllowAnonymous]
-        public ActionResult ForgetPassword(String email)
-        {
-            var set = Setting.Current;
-            if (!set.AllowForgot) throw new Exception("禁止取回密码！");
-
-            //throw new NotImplementedException("未实现！");
-            var user = UserX.FindByMail(email);
-            if (user == null)
-            {
-                //throw new Exception("未找到");
-                Js.Alert("未找到用户");
-            }
-
-            return View("Login");
-        }
-
-        /// <summary>注册</summary>
-        /// <param name="email"></param>
-        /// <param name="username"></param>
-        /// <param name="password"></param>
-        /// <param name="password2"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [AllowAnonymous]
-        public ActionResult Register(String email, String username, String password, String password2)
-        {
-            var set = Setting.Current;
-            if (!set.AllowRegister) throw new Exception("禁止注册！");
-
-            try
-            {
-                if (String.IsNullOrEmpty(email)) throw new ArgumentNullException("email", "邮箱地址不能为空！");
-                if (String.IsNullOrEmpty(username)) throw new ArgumentNullException("username", "用户名不能为空！");
-                if (String.IsNullOrEmpty(password)) throw new ArgumentNullException("password", "密码不能为空！");
-                if (String.IsNullOrEmpty(password2)) throw new ArgumentNullException("password2", "重复密码不能为空！");
-                if (password != password2) throw new ArgumentOutOfRangeException("password2", "两次密码必须一致！");
-
-                var user = new UserX()
-                {
-                    Name = username,
-                    Password = password.MD5(),
-                    Mail = email,
-                    RoleID = set.DefaultRole,
-                    Enable = true
-                };
-                user.Register();
-
-                // 注册成功
-            }
-            catch (ArgumentException aex)
-            {
-                ModelState.AddModelError(aex.ParamName, aex.Message);
-            }
-
-            return View("Login");
-        }
-
-        /// <summary>清空密码</summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        public ActionResult ClearPassword(Int32 id)
-        {
-            if (ManageProvider.User.RoleName != "管理员") throw new Exception("非法操作！");
-
-            // 前面表单可能已经清空密码
-            var user = UserX.FindByID(id);
-            //user.Password = "nopass";
-            user.Password = null;
-            user.SaveWithoutValid();
-
-            return RedirectToAction("Edit", new { id });
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/AdminMobile/Views/Index/Index.cshtml b/NewLife.Cube/Areas/AdminMobile/Views/Index/Index.cshtml
deleted file mode 100644
index bfcf137160..0000000000
--- a/NewLife.Cube/Areas/AdminMobile/Views/Index/Index.cshtml
+++ /dev/null
@@ -1,151 +0,0 @@
-﻿
-@{
-    Layout = null;
-}
-
-
-<!DOCTYPE html>
-
-<html>
-<head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <title></title>
-
-    <link href="/Content/jweui/lib/weui.min.css" rel="stylesheet" />
-    <link href="/Content/jweui/css/jquery-weui.min.css" rel="stylesheet" />
-    <link href="/Content/jweui/css/demos.css" rel="stylesheet" />
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body ontouchstart>
-    <div class="weui-tab">
-        <div class="weui-tab__bd">
-            <div id="tab1" class="weui-tab__bd-item weui-tab__bd-item--active">
-
-                <div class="weui-grids">
-                    <a href="" class="weui-grid js_grid">
-                        <div class="weui-grid__icon">
-                            <img src="/Content/jweui/images/icon_nav_button.png" alt="">
-                        </div>
-                        <p class="weui-grid__label">
-                            Button
-                        </p>
-                    </a>
-                    <a href="" class="weui-grid js_grid">
-                        <div class="weui-grid__icon">
-                            <img src="/Content/jweui/images/icon_nav_cell.png" alt="">
-                        </div>
-                        <p class="weui-grid__label">
-                            List
-                        </p>
-                    </a>
-                    <a href="" class="weui-grid js_grid">
-                        <div class="weui-grid__icon">
-                            <img src="/Content/jweui/images/icon_nav_cell.png" alt="">
-                        </div>
-                        <p class="weui-grid__label">
-                            Form
-                        </p>
-                    </a>
-                    <a href="" class="weui-grid js_grid">
-                        <div class="weui-grid__icon">
-                            <img src="/Content/jweui/images/icon_nav_cell.png" alt="">
-                        </div>
-                        <p class="weui-grid__label">
-                            Flex
-                        </p>
-                    </a>
-                    <a href="" class="weui-grid js_grid">
-                        <div class="weui-grid__icon">
-                            <img src="/Content/jweui/images/icon_nav_toast.png" alt="">
-                        </div>
-                        <p class="weui-grid__label">
-                            Toast
-                        </p>
-                    </a>
-                    <a href="" class="weui-grid js_grid">
-                        <div class="weui-grid__icon">
-                            <img src="/Content/jweui/images/icon_nav_dialog.png" alt="">
-                        </div>
-                        <p class="weui-grid__label">
-                            Dialog
-                        </p>
-                    </a>
-                    <a href="" class="weui-grid js_grid">
-                        <div class="weui-grid__icon">
-                            <img src="/Content/jweui/images/icon_nav_progress.png" alt="">
-                        </div>
-                        <p class="weui-grid__label">
-                            Progress
-                        </p>
-                    </a>
-                    <a href="" class="weui-grid js_grid">
-                        <div class="weui-grid__icon">
-                            <img src="/Content/jweui/images/icon_nav_msg.png" alt="">
-                        </div>
-                        <p class="weui-grid__label">
-                            Msg
-                        </p>
-                    </a>
-                    <a href="" class="weui-grid js_grid">
-                        <div class="weui-grid__icon">
-                            <img src="/Content/jweui/images/icon_nav_article.png" alt="">
-                        </div>
-                        <p class="weui-grid__label">
-                            Article
-                        </p>
-                    </a>
-                </div>
-            </div>
-            <div id="tab2" class="weui-tab__bd-item">
-                <h1>页面二</h1>
-            </div>
-            <div id="tab3" class="weui-tab__bd-item">
-                <h1>页面三</h1>
-            </div>
-            <div id="tab4" class="weui-tab__bd-item">
-                <h1>页面四</h1>
-            </div>
-        </div>
-
-        <div class="weui-tabbar">
-            <a href="#tab1" class="weui-tabbar__item weui-bar__item--on">
-                <span class="weui-badge" style="position: absolute;top: -.4em;right: 1em;">8</span>
-                <div class="weui-tabbar__icon">
-                    <img src="/Content/jweui/images/icon_nav_button.png" alt="">
-                </div>
-                <p class="weui-tabbar__label">微信</p>
-            </a>
-            <a href="#tab2" class="weui-tabbar__item">
-                <div class="weui-tabbar__icon">
-                    <img src="/Content/jweui/images/icon_nav_msg.png" alt="">
-                </div>
-                <p class="weui-tabbar__label">通讯录</p>
-            </a>
-            <a href="#tab3" class="weui-tabbar__item">
-                <div class="weui-tabbar__icon">
-                    <img src="/Content/jweui/images/icon_nav_article.png" alt="">
-                </div>
-                <p class="weui-tabbar__label">发现</p>
-            </a>
-            <a href="#tab4" class="weui-tabbar__item">
-                <div class="weui-tabbar__icon">
-                    <img src="/Content/jweui/images/icon_nav_cell.png" alt="">
-                </div>
-                <p class="weui-tabbar__label">我</p>
-            </a>
-        </div>
-    </div>
-
-    <script src="/Content/jweui/lib/jquery-2.1.4.js"></script>
-    <script src="/Content/jweui/lib/fastclick.js"></script>
-    <script src="/Content/jweui/js/jquery-weui.js"></script>
-    <script>
-        $(function () {
-            FastClick.attach(document.body);
-        });
-        @Html.Raw(ViewBag.js)
-    </script>
-
-</body>
-</html>
-
diff --git a/NewLife.Cube/Areas/AdminMobile/Views/Index/Index.generated.cs b/NewLife.Cube/Areas/AdminMobile/Views/Index/Index.generated.cs
deleted file mode 100644
index b915c59d6d..0000000000
--- a/NewLife.Cube/Areas/AdminMobile/Views/Index/Index.generated.cs
+++ /dev/null
@@ -1,428 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/AdminMobile/Views/Index/Index.cshtml")]
-    public partial class _Areas_AdminMobile_Views_Index_Index_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Areas_AdminMobile_Views_Index_Index_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-WriteLiteral("\r\n");
-
-            
-            #line 2 "..\..\Areas\AdminMobile\Views\Index\Index.cshtml"
-  
-    Layout = null;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n\r\n\r\n<!DOCTYPE html>\r\n\r\n<html>\r\n<head>\r\n    <meta");
-
-WriteLiteral(" charset=\"utf-8\"");
-
-WriteLiteral(">\r\n    <meta");
-
-WriteLiteral(" http-equiv=\"X-UA-Compatible\"");
-
-WriteLiteral(" content=\"IE=edge\"");
-
-WriteLiteral(">\r\n    <title></title>\r\n\r\n    <link");
-
-WriteLiteral(" href=\"/Content/jweui/lib/weui.min.css\"");
-
-WriteLiteral(" rel=\"stylesheet\"");
-
-WriteLiteral(" />\r\n    <link");
-
-WriteLiteral(" href=\"/Content/jweui/css/jquery-weui.min.css\"");
-
-WriteLiteral(" rel=\"stylesheet\"");
-
-WriteLiteral(" />\r\n    <link");
-
-WriteLiteral(" href=\"/Content/jweui/css/demos.css\"");
-
-WriteLiteral(" rel=\"stylesheet\"");
-
-WriteLiteral(" />\r\n        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>\r\n<body ontouchstart>\r\n    <div");
-
-WriteLiteral(" class=\"weui-tab\"");
-
-WriteLiteral(">\r\n        <div");
-
-WriteLiteral(" class=\"weui-tab__bd\"");
-
-WriteLiteral(">\r\n            <div");
-
-WriteLiteral(" id=\"tab1\"");
-
-WriteLiteral(" class=\"weui-tab__bd-item weui-tab__bd-item--active\"");
-
-WriteLiteral(">\r\n\r\n                <div");
-
-WriteLiteral(" class=\"weui-grids\"");
-
-WriteLiteral(">\r\n                    <a");
-
-WriteLiteral(" href=\"\"");
-
-WriteLiteral(" class=\"weui-grid js_grid\"");
-
-WriteLiteral(">\r\n                        <div");
-
-WriteLiteral(" class=\"weui-grid__icon\"");
-
-WriteLiteral(">\r\n                            <img");
-
-WriteLiteral(" src=\"/Content/jweui/images/icon_nav_button.png\"");
-
-WriteLiteral(" alt=\"\"");
-
-WriteLiteral(">\r\n                        </div>\r\n                        <p");
-
-WriteLiteral(" class=\"weui-grid__label\"");
-
-WriteLiteral(">\r\n                            Button\r\n                        </p>\r\n            " +
-"        </a>\r\n                    <a");
-
-WriteLiteral(" href=\"\"");
-
-WriteLiteral(" class=\"weui-grid js_grid\"");
-
-WriteLiteral(">\r\n                        <div");
-
-WriteLiteral(" class=\"weui-grid__icon\"");
-
-WriteLiteral(">\r\n                            <img");
-
-WriteLiteral(" src=\"/Content/jweui/images/icon_nav_cell.png\"");
-
-WriteLiteral(" alt=\"\"");
-
-WriteLiteral(">\r\n                        </div>\r\n                        <p");
-
-WriteLiteral(" class=\"weui-grid__label\"");
-
-WriteLiteral(">\r\n                            List\r\n                        </p>\r\n              " +
-"      </a>\r\n                    <a");
-
-WriteLiteral(" href=\"\"");
-
-WriteLiteral(" class=\"weui-grid js_grid\"");
-
-WriteLiteral(">\r\n                        <div");
-
-WriteLiteral(" class=\"weui-grid__icon\"");
-
-WriteLiteral(">\r\n                            <img");
-
-WriteLiteral(" src=\"/Content/jweui/images/icon_nav_cell.png\"");
-
-WriteLiteral(" alt=\"\"");
-
-WriteLiteral(">\r\n                        </div>\r\n                        <p");
-
-WriteLiteral(" class=\"weui-grid__label\"");
-
-WriteLiteral(">\r\n                            Form\r\n                        </p>\r\n              " +
-"      </a>\r\n                    <a");
-
-WriteLiteral(" href=\"\"");
-
-WriteLiteral(" class=\"weui-grid js_grid\"");
-
-WriteLiteral(">\r\n                        <div");
-
-WriteLiteral(" class=\"weui-grid__icon\"");
-
-WriteLiteral(">\r\n                            <img");
-
-WriteLiteral(" src=\"/Content/jweui/images/icon_nav_cell.png\"");
-
-WriteLiteral(" alt=\"\"");
-
-WriteLiteral(">\r\n                        </div>\r\n                        <p");
-
-WriteLiteral(" class=\"weui-grid__label\"");
-
-WriteLiteral(">\r\n                            Flex\r\n                        </p>\r\n              " +
-"      </a>\r\n                    <a");
-
-WriteLiteral(" href=\"\"");
-
-WriteLiteral(" class=\"weui-grid js_grid\"");
-
-WriteLiteral(">\r\n                        <div");
-
-WriteLiteral(" class=\"weui-grid__icon\"");
-
-WriteLiteral(">\r\n                            <img");
-
-WriteLiteral(" src=\"/Content/jweui/images/icon_nav_toast.png\"");
-
-WriteLiteral(" alt=\"\"");
-
-WriteLiteral(">\r\n                        </div>\r\n                        <p");
-
-WriteLiteral(" class=\"weui-grid__label\"");
-
-WriteLiteral(">\r\n                            Toast\r\n                        </p>\r\n             " +
-"       </a>\r\n                    <a");
-
-WriteLiteral(" href=\"\"");
-
-WriteLiteral(" class=\"weui-grid js_grid\"");
-
-WriteLiteral(">\r\n                        <div");
-
-WriteLiteral(" class=\"weui-grid__icon\"");
-
-WriteLiteral(">\r\n                            <img");
-
-WriteLiteral(" src=\"/Content/jweui/images/icon_nav_dialog.png\"");
-
-WriteLiteral(" alt=\"\"");
-
-WriteLiteral(">\r\n                        </div>\r\n                        <p");
-
-WriteLiteral(" class=\"weui-grid__label\"");
-
-WriteLiteral(">\r\n                            Dialog\r\n                        </p>\r\n            " +
-"        </a>\r\n                    <a");
-
-WriteLiteral(" href=\"\"");
-
-WriteLiteral(" class=\"weui-grid js_grid\"");
-
-WriteLiteral(">\r\n                        <div");
-
-WriteLiteral(" class=\"weui-grid__icon\"");
-
-WriteLiteral(">\r\n                            <img");
-
-WriteLiteral(" src=\"/Content/jweui/images/icon_nav_progress.png\"");
-
-WriteLiteral(" alt=\"\"");
-
-WriteLiteral(">\r\n                        </div>\r\n                        <p");
-
-WriteLiteral(" class=\"weui-grid__label\"");
-
-WriteLiteral(">\r\n                            Progress\r\n                        </p>\r\n          " +
-"          </a>\r\n                    <a");
-
-WriteLiteral(" href=\"\"");
-
-WriteLiteral(" class=\"weui-grid js_grid\"");
-
-WriteLiteral(">\r\n                        <div");
-
-WriteLiteral(" class=\"weui-grid__icon\"");
-
-WriteLiteral(">\r\n                            <img");
-
-WriteLiteral(" src=\"/Content/jweui/images/icon_nav_msg.png\"");
-
-WriteLiteral(" alt=\"\"");
-
-WriteLiteral(">\r\n                        </div>\r\n                        <p");
-
-WriteLiteral(" class=\"weui-grid__label\"");
-
-WriteLiteral(">\r\n                            Msg\r\n                        </p>\r\n               " +
-"     </a>\r\n                    <a");
-
-WriteLiteral(" href=\"\"");
-
-WriteLiteral(" class=\"weui-grid js_grid\"");
-
-WriteLiteral(">\r\n                        <div");
-
-WriteLiteral(" class=\"weui-grid__icon\"");
-
-WriteLiteral(">\r\n                            <img");
-
-WriteLiteral(" src=\"/Content/jweui/images/icon_nav_article.png\"");
-
-WriteLiteral(" alt=\"\"");
-
-WriteLiteral(">\r\n                        </div>\r\n                        <p");
-
-WriteLiteral(" class=\"weui-grid__label\"");
-
-WriteLiteral(">\r\n                            Article\r\n                        </p>\r\n           " +
-"         </a>\r\n                </div>\r\n            </div>\r\n            <div");
-
-WriteLiteral(" id=\"tab2\"");
-
-WriteLiteral(" class=\"weui-tab__bd-item\"");
-
-WriteLiteral(">\r\n                <h1>页面二</h1>\r\n            </div>\r\n            <div");
-
-WriteLiteral(" id=\"tab3\"");
-
-WriteLiteral(" class=\"weui-tab__bd-item\"");
-
-WriteLiteral(">\r\n                <h1>页面三</h1>\r\n            </div>\r\n            <div");
-
-WriteLiteral(" id=\"tab4\"");
-
-WriteLiteral(" class=\"weui-tab__bd-item\"");
-
-WriteLiteral(">\r\n                <h1>页面四</h1>\r\n            </div>\r\n        </div>\r\n\r\n        <d" +
-"iv");
-
-WriteLiteral(" class=\"weui-tabbar\"");
-
-WriteLiteral(">\r\n            <a");
-
-WriteLiteral(" href=\"#tab1\"");
-
-WriteLiteral(" class=\"weui-tabbar__item weui-bar__item--on\"");
-
-WriteLiteral(">\r\n                <span");
-
-WriteLiteral(" class=\"weui-badge\"");
-
-WriteLiteral(" style=\"position: absolute;top: -.4em;right: 1em;\"");
-
-WriteLiteral(">8</span>\r\n                <div");
-
-WriteLiteral(" class=\"weui-tabbar__icon\"");
-
-WriteLiteral(">\r\n                    <img");
-
-WriteLiteral(" src=\"/Content/jweui/images/icon_nav_button.png\"");
-
-WriteLiteral(" alt=\"\"");
-
-WriteLiteral(">\r\n                </div>\r\n                <p");
-
-WriteLiteral(" class=\"weui-tabbar__label\"");
-
-WriteLiteral(">微信</p>\r\n            </a>\r\n            <a");
-
-WriteLiteral(" href=\"#tab2\"");
-
-WriteLiteral(" class=\"weui-tabbar__item\"");
-
-WriteLiteral(">\r\n                <div");
-
-WriteLiteral(" class=\"weui-tabbar__icon\"");
-
-WriteLiteral(">\r\n                    <img");
-
-WriteLiteral(" src=\"/Content/jweui/images/icon_nav_msg.png\"");
-
-WriteLiteral(" alt=\"\"");
-
-WriteLiteral(">\r\n                </div>\r\n                <p");
-
-WriteLiteral(" class=\"weui-tabbar__label\"");
-
-WriteLiteral(">通讯录</p>\r\n            </a>\r\n            <a");
-
-WriteLiteral(" href=\"#tab3\"");
-
-WriteLiteral(" class=\"weui-tabbar__item\"");
-
-WriteLiteral(">\r\n                <div");
-
-WriteLiteral(" class=\"weui-tabbar__icon\"");
-
-WriteLiteral(">\r\n                    <img");
-
-WriteLiteral(" src=\"/Content/jweui/images/icon_nav_article.png\"");
-
-WriteLiteral(" alt=\"\"");
-
-WriteLiteral(">\r\n                </div>\r\n                <p");
-
-WriteLiteral(" class=\"weui-tabbar__label\"");
-
-WriteLiteral(">发现</p>\r\n            </a>\r\n            <a");
-
-WriteLiteral(" href=\"#tab4\"");
-
-WriteLiteral(" class=\"weui-tabbar__item\"");
-
-WriteLiteral(">\r\n                <div");
-
-WriteLiteral(" class=\"weui-tabbar__icon\"");
-
-WriteLiteral(">\r\n                    <img");
-
-WriteLiteral(" src=\"/Content/jweui/images/icon_nav_cell.png\"");
-
-WriteLiteral(" alt=\"\"");
-
-WriteLiteral(">\r\n                </div>\r\n                <p");
-
-WriteLiteral(" class=\"weui-tabbar__label\"");
-
-WriteLiteral(">我</p>\r\n            </a>\r\n        </div>\r\n    </div>\r\n\r\n    <script");
-
-WriteLiteral(" src=\"/Content/jweui/lib/jquery-2.1.4.js\"");
-
-WriteLiteral("></script>\r\n    <script");
-
-WriteLiteral(" src=\"/Content/jweui/lib/fastclick.js\"");
-
-WriteLiteral("></script>\r\n    <script");
-
-WriteLiteral(" src=\"/Content/jweui/js/jquery-weui.js\"");
-
-WriteLiteral("></script>\r\n    <script>\r\n        $(function () {\r\n            FastClick.attach(d" +
-"ocument.body);\r\n        });\r\n");
-
-WriteLiteral("        ");
-
-            
-            #line 146 "..\..\Areas\AdminMobile\Views\Index\Index.cshtml"
-   Write(Html.Raw(ViewBag.js));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n    </script>\r\n\r\n</body>\r\n</html>\r\n\r\n");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Areas/AdminMobile/Views/User/Login.cshtml b/NewLife.Cube/Areas/AdminMobile/Views/User/Login.cshtml
deleted file mode 100644
index cc6c12ba2e..0000000000
--- a/NewLife.Cube/Areas/AdminMobile/Views/User/Login.cshtml
+++ /dev/null
@@ -1,65 +0,0 @@
-﻿@{
-    Layout = null;
-}
-
-<!DOCTYPE html>
-
-<html>
-<head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <title></title>
-
-    <link href="/Content/jweui/lib/weui.min.css" rel="stylesheet" />
-    <link href="/Content/jweui/css/jquery-weui.min.css" rel="stylesheet" />
-    <link href="/Content/jweui/css/demos.css" rel="stylesheet" />
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body ontouchstart>
-    <header class='demos-header'>
-        <h1 class="demos-title">系统登录</h1>
-    </header>
-    @using (Html.BeginForm("Login", "User", new { ReturnUrl = ViewBag.ReturnUrl }))
-    {
-        <div class="weui-cells__title"></div>
-        <div class="weui-cells weui-cells_form">
-            <div class="weui-cell">
-                <div class="weui-cell__hd"><label class="weui-label">账号</label></div>
-                <div class="weui-cell__bd">
-                    <input class="weui-input" name="username" type="text" placeholder="请输入账号">
-                </div>
-            </div>
-            <div class="weui-cell">
-                <div class="weui-cell__hd">
-                    <label class="weui-label">密码</label>
-                </div>
-                <div class="weui-cell__bd">
-                    <input name="password" class="weui-input" type="password" placeholder="请输入密码">
-                </div>
-            </div>
-        </div>
-        <label for="weuiAgree" class="weui-agree">
-            <input id="weuiAgree" type="checkbox" checked class="weui-agree__checkbox">
-            <span class="weui-agree__text">
-                阅读并同意<a href="javascript:void(0);">《相关条款》</a>
-            </span>
-        </label>
-
-        <div class="weui-btn-area">
-            <button type="submit" class="weui-btn weui-btn_primary">
-                <i class="ace-icon fa fa-key"></i>
-                <span class="bigger-110">登录</span>
-            </button>
-        </div>
-    }
-    <script src="/Content/jweui/lib/jquery-2.1.4.js"></script>
-    <script src="/Content/jweui/lib/fastclick.js"></script>
-    <script src="/Content/jweui/js/jquery-weui.js"></script>
-    <script>
-        $(function () {
-            FastClick.attach(document.body);
-        });
-        @Html.Raw(ViewBag.js)
-    </script>
-
-</body>
-</html>
diff --git a/NewLife.Cube/Areas/AdminMobile/Views/User/Login.generated.cs b/NewLife.Cube/Areas/AdminMobile/Views/User/Login.generated.cs
deleted file mode 100644
index d9bcd28a85..0000000000
--- a/NewLife.Cube/Areas/AdminMobile/Views/User/Login.generated.cs
+++ /dev/null
@@ -1,258 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/AdminMobile/Views/User/Login.cshtml")]
-    public partial class _Areas_AdminMobile_Views_User_Login_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Areas_AdminMobile_Views_User_Login_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 1 "..\..\Areas\AdminMobile\Views\User\Login.cshtml"
-  
-    Layout = null;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n\r\n<!DOCTYPE html>\r\n\r\n<html>\r\n<head>\r\n    <meta");
-
-WriteLiteral(" charset=\"utf-8\"");
-
-WriteLiteral(">\r\n    <meta");
-
-WriteLiteral(" http-equiv=\"X-UA-Compatible\"");
-
-WriteLiteral(" content=\"IE=edge\"");
-
-WriteLiteral(">\r\n    <title></title>\r\n\r\n    <link");
-
-WriteLiteral(" href=\"/Content/jweui/lib/weui.min.css\"");
-
-WriteLiteral(" rel=\"stylesheet\"");
-
-WriteLiteral(" />\r\n    <link");
-
-WriteLiteral(" href=\"/Content/jweui/css/jquery-weui.min.css\"");
-
-WriteLiteral(" rel=\"stylesheet\"");
-
-WriteLiteral(" />\r\n    <link");
-
-WriteLiteral(" href=\"/Content/jweui/css/demos.css\"");
-
-WriteLiteral(" rel=\"stylesheet\"");
-
-WriteLiteral(" />\r\n        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>\r\n<body ontouchstart>\r\n    <header");
-
-WriteLiteral(" class=\'demos-header\'");
-
-WriteLiteral(">\r\n        <h1");
-
-WriteLiteral(" class=\"demos-title\"");
-
-WriteLiteral(">系统登录</h1>\r\n    </header>\r\n");
-
-            
-            #line 21 "..\..\Areas\AdminMobile\Views\User\Login.cshtml"
-    
-            
-            #line default
-            #line hidden
-            
-            #line 21 "..\..\Areas\AdminMobile\Views\User\Login.cshtml"
-     using (Html.BeginForm("Login", "User", new { ReturnUrl = ViewBag.ReturnUrl }))
-    {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        <div");
-
-WriteLiteral(" class=\"weui-cells__title\"");
-
-WriteLiteral("></div>\r\n");
-
-WriteLiteral("        <div");
-
-WriteLiteral(" class=\"weui-cells weui-cells_form\"");
-
-WriteLiteral(">\r\n            <div");
-
-WriteLiteral(" class=\"weui-cell\"");
-
-WriteLiteral(">\r\n                <div");
-
-WriteLiteral(" class=\"weui-cell__hd\"");
-
-WriteLiteral("><label");
-
-WriteLiteral(" class=\"weui-label\"");
-
-WriteLiteral(">账号</label></div>\r\n                <div");
-
-WriteLiteral(" class=\"weui-cell__bd\"");
-
-WriteLiteral(">\r\n                    <input");
-
-WriteLiteral(" class=\"weui-input\"");
-
-WriteLiteral(" name=\"username\"");
-
-WriteLiteral(" type=\"text\"");
-
-WriteLiteral(" placeholder=\"请输入账号\"");
-
-WriteLiteral(">\r\n                </div>\r\n            </div>\r\n            <div");
-
-WriteLiteral(" class=\"weui-cell\"");
-
-WriteLiteral(">\r\n                <div");
-
-WriteLiteral(" class=\"weui-cell__hd\"");
-
-WriteLiteral(">\r\n                    <label");
-
-WriteLiteral(" class=\"weui-label\"");
-
-WriteLiteral(">密码</label>\r\n                </div>\r\n                <div");
-
-WriteLiteral(" class=\"weui-cell__bd\"");
-
-WriteLiteral(">\r\n                    <input");
-
-WriteLiteral(" name=\"password\"");
-
-WriteLiteral(" class=\"weui-input\"");
-
-WriteLiteral(" type=\"password\"");
-
-WriteLiteral(" placeholder=\"请输入密码\"");
-
-WriteLiteral(">\r\n                </div>\r\n            </div>\r\n        </div>\r\n");
-
-WriteLiteral("        <label");
-
-WriteLiteral(" for=\"weuiAgree\"");
-
-WriteLiteral(" class=\"weui-agree\"");
-
-WriteLiteral(">\r\n            <input");
-
-WriteLiteral(" id=\"weuiAgree\"");
-
-WriteLiteral(" type=\"checkbox\"");
-
-WriteLiteral(" checked");
-
-WriteLiteral(" class=\"weui-agree__checkbox\"");
-
-WriteLiteral(">\r\n            <span");
-
-WriteLiteral(" class=\"weui-agree__text\"");
-
-WriteLiteral(">\r\n                阅读并同意<a");
-
-WriteLiteral(" href=\"javascript:void(0);\"");
-
-WriteLiteral(">《相关条款》</a>\r\n            </span>\r\n        </label>\r\n");
-
-            
-            #line 46 "..\..\Areas\AdminMobile\Views\User\Login.cshtml"
-
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        <div");
-
-WriteLiteral(" class=\"weui-btn-area\"");
-
-WriteLiteral(">\r\n            <button");
-
-WriteLiteral(" type=\"submit\"");
-
-WriteLiteral(" class=\"weui-btn weui-btn_primary\"");
-
-WriteLiteral(">\r\n                <i");
-
-WriteLiteral(" class=\"ace-icon fa fa-key\"");
-
-WriteLiteral("></i>\r\n                <span");
-
-WriteLiteral(" class=\"bigger-110\"");
-
-WriteLiteral(">登录</span>\r\n            </button>\r\n        </div>\r\n");
-
-            
-            #line 53 "..\..\Areas\AdminMobile\Views\User\Login.cshtml"
-    }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("    <script");
-
-WriteLiteral(" src=\"/Content/jweui/lib/jquery-2.1.4.js\"");
-
-WriteLiteral("></script>\r\n    <script");
-
-WriteLiteral(" src=\"/Content/jweui/lib/fastclick.js\"");
-
-WriteLiteral("></script>\r\n    <script");
-
-WriteLiteral(" src=\"/Content/jweui/js/jquery-weui.js\"");
-
-WriteLiteral("></script>\r\n    <script>\r\n        $(function () {\r\n            FastClick.attach(d" +
-"ocument.body);\r\n        });\r\n");
-
-WriteLiteral("        ");
-
-            
-            #line 61 "..\..\Areas\AdminMobile\Views\User\Login.cshtml"
-   Write(Html.Raw(ViewBag.js));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n    </script>\r\n\r\n</body>\r\n</html>\r\n");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Areas/AdminMobile/Views/web.Debug.config b/NewLife.Cube/Areas/AdminMobile/Views/web.Debug.config
deleted file mode 100644
index b9a9fde758..0000000000
--- a/NewLife.Cube/Areas/AdminMobile/Views/web.Debug.config
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- 有关使用 web.config 转换的详细信息，请访问 https://go.microsoft.com/fwlink/?LinkId=125889 -->
-
-<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <!--
-    在下例中，“SetAttributes”转换将更改 
-    “connectionString”的值，以仅在“Match”定位器 
-    找到值为“MyDB”的特性“name”时使用“ReleaseSQLServer”。
-    
-    <connectionStrings>
-      <add name="MyDB" 
-        connectionString="Data Source=ReleaseSQLServer;Initial Catalog=MyReleaseDB;Integrated Security=True" 
-        xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
-    </connectionStrings>
-  -->
-  <system.web>
-    <!--
-      
-      在下例中，“Replace”转换将替换 
-      web.config 文件的整个 <customErrors> 节。
-      请注意，由于 
-      在 <system.web> 节点下仅有一个 customErrors 节，因此不需要使用“xdt:Locator”特性。
-      
-      <customErrors defaultRedirect="GenericError.htm"
-        mode="RemoteOnly" xdt:Transform="Replace">
-        <error statusCode="500" redirect="InternalError.htm"/>
-      </customErrors>
-    -->
-  </system.web>
-</configuration>
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/AdminMobile/Views/web.Release.config b/NewLife.Cube/Areas/AdminMobile/Views/web.Release.config
deleted file mode 100644
index b9a9fde758..0000000000
--- a/NewLife.Cube/Areas/AdminMobile/Views/web.Release.config
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- 有关使用 web.config 转换的详细信息，请访问 https://go.microsoft.com/fwlink/?LinkId=125889 -->
-
-<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <!--
-    在下例中，“SetAttributes”转换将更改 
-    “connectionString”的值，以仅在“Match”定位器 
-    找到值为“MyDB”的特性“name”时使用“ReleaseSQLServer”。
-    
-    <connectionStrings>
-      <add name="MyDB" 
-        connectionString="Data Source=ReleaseSQLServer;Initial Catalog=MyReleaseDB;Integrated Security=True" 
-        xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
-    </connectionStrings>
-  -->
-  <system.web>
-    <!--
-      
-      在下例中，“Replace”转换将替换 
-      web.config 文件的整个 <customErrors> 节。
-      请注意，由于 
-      在 <system.web> 节点下仅有一个 customErrors 节，因此不需要使用“xdt:Locator”特性。
-      
-      <customErrors defaultRedirect="GenericError.htm"
-        mode="RemoteOnly" xdt:Transform="Replace">
-        <error statusCode="500" redirect="InternalError.htm"/>
-      </customErrors>
-    -->
-  </system.web>
-</configuration>
\ No newline at end of file
diff --git a/NewLife.Cube/Areas/AdminMobile/Views/web.config b/NewLife.Cube/Areas/AdminMobile/Views/web.config
deleted file mode 100644
index 7410bf3c85..0000000000
--- a/NewLife.Cube/Areas/AdminMobile/Views/web.config
+++ /dev/null
@@ -1,48 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-
-<configuration>
-  <configSections>
-    <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-      <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
-      <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
-    </sectionGroup>
-  </configSections>
-
-  <system.web.webPages.razor>
-    <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-    <pages pageBaseType="System.Web.Mvc.WebViewPage">
-      <namespaces>
-        <add namespace="System.Web.Mvc" />
-        <add namespace="System.Web.Mvc.Ajax" />
-        <add namespace="System.Web.Mvc.Html" />
-        <add namespace="System.Web.Routing" />
-
-        <add namespace="NewLife" />
-        <add namespace="NewLife.Cube" />
-        <add namespace="NewLife.Reflection" />
-        <add namespace="NewLife.Web" />
-        <add namespace="XCode" />
-        <add namespace="XCode.Membership" />
-      </namespaces>
-    </pages>
-  </system.web.webPages.razor>
-
-  <appSettings>
-    <add key="webpages:Enabled" value="false" />
-  </appSettings>
-
-  <system.web>
-    <compilation>
-      <assemblies>
-        <add assembly="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      </assemblies>
-    </compilation>
-  </system.web>
-
-  <system.webServer>
-    <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler" />
-    </handlers>
-  </system.webServer>
-</configuration>
diff --git a/NewLife.Cube/Common/AreaRegistrationBase.cs b/NewLife.Cube/Common/AreaRegistrationBase.cs
deleted file mode 100644
index 53d5bd9c5e..0000000000
--- a/NewLife.Cube/Common/AreaRegistrationBase.cs
+++ /dev/null
@@ -1,291 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Threading.Tasks;
-using System.Web.Mvc;
-using System.Web.WebPages;
-using NewLife.Cube.Precompiled;
-using NewLife.IO;
-using NewLife.Log;
-using NewLife.Reflection;
-using NewLife.Threading;
-using NewLife.Web;
-using XCode;
-using XCode.Membership;
-#if !NET4
-using TaskEx = System.Threading.Tasks.Task;
-#endif
-
-namespace NewLife.Cube
-{
-    /// <summary>区域注册基类</summary>
-    /// <remarks>
-    /// 提供以下功能：
-    /// 1，区域名称。从类名中截取。其中DisplayName特性作为菜单中文名。
-    /// 2，静态构造注册一次视图引擎、绑定提供者、过滤器
-    /// 3，注册区域默认路由
-    /// </remarks>
-    public abstract class AreaRegistrationBase : AreaRegistration
-    {
-        /// <summary>区域名称</summary>
-        public override String AreaName { get; }
-
-        /// <summary>预编译引擎集合。便于外部设置属性</summary>
-        public static PrecompiledViewAssembly[] PrecompiledEngines { get; private set; }
-
-        /// <summary>所有区域类型</summary>
-        public static Type[] Areas { get; private set; }
-
-        /// <summary>实例化区域注册</summary>
-        public AreaRegistrationBase()
-        {
-            AreaName = GetType().Name.TrimEnd("AreaRegistration");
-        }
-
-        static AreaRegistrationBase()
-        {
-            XTrace.WriteLine("{0} Start 初始化魔方 {0}", new String('=', 32));
-            Assembly.GetExecutingAssembly().WriteVersion();
-
-            // 遍历所有引用了AreaRegistrationBase的程序集
-            var list = new List<PrecompiledViewAssembly>();
-            foreach (var asm in FindAllArea())
-            {
-                XTrace.WriteLine("注册区域视图程序集：{0}", asm.FullName);
-
-                var pva = new PrecompiledViewAssembly(asm);
-                list.Add(pva);
-            }
-            PrecompiledEngines = list.ToArray();
-
-            var engine = new CompositePrecompiledMvcEngine(PrecompiledEngines);
-            XTrace.WriteLine("注册复合预编译引擎，共有视图程序集{0}个", list.Count);
-            //ViewEngines.Engines.Insert(0, engine);
-            // 预编译引擎滞后，让其它引擎先工作
-            ViewEngines.Engines.Add(engine);
-
-            // StartPage lookups are done by WebPages. 
-            VirtualPathFactoryManager.RegisterVirtualPathFactory(engine);
-
-            // 注册绑定提供者
-            EntityModelBinderProvider.Register();
-
-            // 注册过滤器
-            XTrace.WriteLine("注册过滤器：{0}", typeof(MvcHandleErrorAttribute).FullName);
-            XTrace.WriteLine("注册过滤器：{0}", typeof(EntityAuthorizeAttribute).FullName);
-            var filters = GlobalFilters.Filters;
-            filters.Add(new MvcHandleErrorAttribute());
-            filters.Add(new EntityAuthorizeAttribute() { IsGlobal = true });
-
-            // 从数据库或者资源文件加载模版页面的例子
-            //HostingEnvironment.RegisterVirtualPathProvider(new ViewPathProvider());
-
-            //var routes = RouteTable.Routes;
-            //routes.IgnoreRoute("{resource}.axd/{*pathInfo}");
-            //routes.MapMvcAttributeRoutes();
-
-            //routes.MapRoute(
-            //    name: "Virtual",
-            //    url: "{*viewName}",
-            //    defaults: new { controller = "Frontend", action = "Default" },
-            //    constraints: new { controller = "Frontend", action = "Default" }
-            //);
-
-            // 自动检查并下载魔方资源
-            Task.Factory.StartNew(CheckContent, TaskCreationOptions.LongRunning).LogException();
-
-            XTrace.WriteLine("{0} End   初始化魔方 {0}", new String('=', 32));
-        }
-
-        /// <summary>遍历所有引用了AreaRegistrationBase的程序集</summary>
-        /// <returns></returns>
-        static List<Assembly> FindAllArea()
-        {
-            var list = new List<Assembly>();
-            Areas = typeof(AreaRegistrationBase).GetAllSubclasses(false).ToArray();
-            foreach (var item in Areas)
-            {
-                var asm = item.Assembly;
-                if (!list.Contains(asm))
-                {
-                    list.Add(asm);
-                    //yield return asm;
-                }
-            }
-
-            // 为了能够实现模板覆盖，程序集相互引用需要排序，父程序集在前
-            list.Sort((x, y) =>
-            {
-                if (x == y) return 0;
-                if (x != null && y == null) return 1;
-                if (x == null && y != null) return -1;
-
-                //return x.GetReferencedAssemblies().Any(e => e.FullName == y.FullName) ? 1 : -1;
-                // 对程序集引用进行排序时，不能使用全名，当魔方更新而APP没有重新编译时，版本的不同将会导致全名不同，无法准确进行排序
-                var yname = y.GetName().Name;
-                return x.GetReferencedAssemblies().Any(e => e.Name == yname) ? 1 : -1;
-            });
-
-            return list;
-        }
-
-        static void CheckContent()
-        {
-            // 释放ico图标
-            var ico = "favicon.ico";
-            var ico2 = ico.GetFullPath();
-            if (!File.Exists(ico2))
-            {
-                // 延迟时间释放，给子系统覆盖的机会
-                TimerX.Delay(s =>
-                {
-                    if (!File.Exists(ico2)) Assembly.GetExecutingAssembly().ReleaseFile(ico, ico2);
-                }, 15000);
-            }
-
-            // 检查魔方样式
-            var js = "~/Content/Cube.js".GetFullPath();
-            var css = "~/Content/Cube.css".GetFullPath();
-            if (File.Exists(js) && File.Exists(css))
-            {
-                // 判断脚本时间
-                var dt = DateTime.MinValue;
-                var ss = File.ReadAllLines(js);
-                for (var i = 0; i < 5; i++)
-                {
-                    if (DateTime.TryParse(ss[i].TrimStart("//").Trim(), out dt)) break;
-                }
-                // 要求脚本最小更新时间
-                if (dt >= "2017-12-07 00:00:00".ToDateTime()) return;
-            }
-
-            var url = Setting.Current.PluginServer;
-            if (url.IsNullOrEmpty()) return;
-
-            var wc = new WebClientX(true, true)
-            {
-                Log = XTrace.Log
-            };
-            wc.DownloadLinkAndExtract(url, "Cube_Content", "~/Content".GetFullPath(), true);
-        }
-
-        /// <summary>注册区域</summary>
-        /// <param name="context"></param>
-        public override void RegisterArea(AreaRegistrationContext context)
-        {
-            var ns = GetType().Namespace + ".Controllers";
-            XTrace.WriteLine("开始注册权限管理区域[{0}]，控制器命名空间[{1}]", AreaName, ns);
-
-            // 注册本区域默认路由
-
-            // Json输出，需要配置web.config
-            //context.MapRoute(
-            //    AreaName + "_Data",
-            //    AreaName + "/{controller}.json/",
-            //    new { controller = "Index", action = "Index", id = UrlParameter.Optional, output = "json" },
-            //    new[] { ns }
-            //);
-            // Json输出，不需要配置web.config
-            //context.MapRoute(
-            //    AreaName + "_Json",
-            //    AreaName + "/{controller}Json/{action}/{id}",
-            //    new { controller = "Index", action = "Export", id = UrlParameter.Optional, output = "json" },
-            //    new[] { ns }
-            //);
-            //context.MapRoute(
-            //    AreaName + "_Detail",
-            //    AreaName + "/{controller}/{id}",
-            //    new { controller = "Index", action = "Detail" },
-            //    new[] { ns }
-            //);
-            //context.MapRoute(
-            //    AreaName + "_Detail_Json",
-            //    AreaName + "/{controller}/{id}/Json",
-            //    new { controller = "Index", action = "Detail", output = "json" },
-            //    new { id = @"\d+" },
-            //    new[] { ns }
-            //);
-            //context.MapRoute(
-            //    AreaName + "_Json",
-            //    AreaName + "/{controller}/Json",
-            //    new { controller = "Index", action = "Index", output = "json" },
-            //    new[] { ns }
-            //);
-            // 本区域默认配置
-            context.MapRoute(
-                AreaName,
-                AreaName + "/{controller}/{action}/{id}",
-                new { controller = "Index", action = "Index", id = UrlParameter.Optional },
-                new[] { ns }
-            );
-
-            // 所有已存在文件的请求都交给Mvc处理，比如Admin目录
-            //routes.RouteExistingFiles = true;
-
-            // 自动检查并添加菜单
-            TaskEx.Run(() =>
-            {
-                try
-                {
-                    ScanController();
-                }
-                catch (Exception ex)
-                {
-                    XTrace.WriteException(ex);
-                }
-            });
-        }
-
-        /// <summary>自动扫描控制器，并添加到菜单</summary>
-        /// <remarks>默认操作当前注册区域的下一级Controllers命名空间</remarks>
-        protected virtual void ScanController()
-        {
-#if DEBUG
-            XTrace.WriteLine("{0}.ScanController", GetType().Name.TrimEnd("AreaRegistration"));
-#endif
-            var mf = ManageProvider.Menu;
-            if (mf == null) return;
-
-            using (var tran = (mf as IEntityOperate).CreateTrans())
-            {
-                XTrace.WriteLine("初始化[{0}]的菜单体系", AreaName);
-                mf.ScanController(AreaName, GetType().Assembly, GetType().Namespace + ".Controllers");
-
-                // 更新区域名称为友好中文名
-                var menu = mf.Root.FindByPath(AreaName);
-                if (menu != null && menu.DisplayName.IsNullOrEmpty())
-                {
-                    var dis = GetType().GetDisplayName();
-                    var des = GetType().GetDescription();
-
-                    if (!dis.IsNullOrEmpty()) menu.DisplayName = dis;
-                    if (!des.IsNullOrEmpty()) menu.Remark = des;
-
-                    (menu as IEntity).Save();
-                }
-
-                tran.Commit();
-            }
-        }
-
-        private static ICollection<String> _areas;
-        /// <summary>判断控制器是否归属于魔方管辖</summary>
-        /// <param name="controller"></param>
-        /// <returns></returns>
-        public static Boolean Contains(IController controller)
-        {
-            // 判断控制器是否在管辖范围之内，不拦截其它控制器的异常信息
-            var ns = controller.GetType().Namespace;
-            if (!ns.EndsWith(".Controllers")) return false;
-
-            if (_areas == null) _areas = new HashSet<String>(Areas.Select(e => e.Namespace));
-
-            // 该控制器父级命名空间必须有对应的区域注册类，才会拦截其异常
-            ns = ns.TrimEnd(".Controllers");
-            //return Areas.Any(e => e.Namespace == ns);
-            return _areas.Contains(ns);
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Common/BootstrapJs.cs b/NewLife.Cube/Common/BootstrapJs.cs
deleted file mode 100644
index cc1071b452..0000000000
--- a/NewLife.Cube/Common/BootstrapJs.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-﻿using System;
-using NewLife.Web;
-
-namespace NewLife.Bootstrap
-{
-    /// <summary>Bootstrap脚本提供者</summary>
-    public class BootstrapJs : Js
-    {
-        /// <summary>重载Alert实现</summary>
-        /// <param name="message">消息内容</param>
-        /// <param name="title">标题</param>
-        /// <param name="msDelay">延迟指定毫秒数以后自动关闭，默认0表示不关闭</param>
-        /// <param name="kind">种类，info/success/error等</param>
-        /// <returns></returns>
-        protected override void OnAlert(String message, String title, Int32 msDelay, String kind)
-        {
-            if (!message.IsNullOrEmpty()) message = Encode(message);
-            if (!title.IsNullOrEmpty()) title = Encode(title);
-
-            var js = "";
-            if (msDelay > 0)
-                js = String.Format("(parent[\"tips\"] || window[\"tips\"] || (function(msg){{alert(msg);}}))(\"{0}\",true,{1},\"close\");", message, msDelay);
-            else
-                js = String.Format("(parent[\"infoDialog\"] || window[\"infoDialog\"] || (function(title,msg){{alert(msg);}}))(\"{0}\",\"{1}\",true);", title, message);
-
-            WriteScript(js, true);
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Common/ConfigController.cs b/NewLife.Cube/Common/ConfigController.cs
deleted file mode 100644
index 9d8a73ba7d..0000000000
--- a/NewLife.Cube/Common/ConfigController.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-﻿using System.Web.Mvc;
-using System.IO;
-using System;
-using NewLife.Xml;
-
-namespace NewLife.Cube
-{
-    /// <summary>设置控制器</summary>
-    public class ConfigController<TConfig> : ObjectController<TConfig> where TConfig : XmlConfig<TConfig>, new()
-    {
-        /// <summary>要展现和修改的对象</summary>
-        protected override TConfig Value
-        {
-            get
-            {
-                return XmlConfig<TConfig>.Current;
-            }
-            set
-            {
-                if (value != null)
-                {
-                    var cfg = XmlConfig<TConfig>.Current;
-                    value.ConfigFile = cfg.ConfigFile;
-                    value.Save();
-                }
-                XmlConfig<TConfig>.Current = value;
-            }
-        }
-
-        /// <summary>已重载</summary>
-        /// <param name="filterContext"></param>
-        protected override void OnActionExecuting(ActionExecutingContext filterContext)
-        {
-            var fi = XmlConfig<TConfig>._.ConfigFile;
-            if (fi.IsNullOrEmpty() || !fi.AsFile().Exists) throw new Exception("无法找到配置文件 {0}".F(fi));
-
-            var bs = this.Bootstrap();
-            bs.MaxColumn = 1;
-            bs.LabelWidth = 3;
-
-            base.OnActionExecuting(filterContext);
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Common/ControllerBaseX.cs b/NewLife.Cube/Common/ControllerBaseX.cs
deleted file mode 100644
index 853501f607..0000000000
--- a/NewLife.Cube/Common/ControllerBaseX.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Text;
-using System.Web.Mvc;
-using NewLife.Reflection;
-using NewLife.Serialization;
-using XCode.Membership;
-
-namespace NewLife.Cube
-{
-    /// <summary>控制器基类</summary>
-    public class ControllerBaseX : Controller
-    {
-        #region 权限菜单
-        /// <summary>获取可用于生成权限菜单的Action集合</summary>
-        /// <param name="menu">该控制器所在菜单</param>
-        /// <returns></returns>
-        protected virtual IDictionary<MethodInfo, Int32> ScanActionMenu(IMenu menu)
-        {
-            var dic = new Dictionary<MethodInfo, Int32>();
-
-            var type = GetType();
-
-            // 添加该类型下的所有Action
-            foreach (var method in type.GetMethods())
-            {
-                if (method.IsStatic || !method.IsPublic) continue;
-
-                if (!method.ReturnType.As<ActionResult>()) continue;
-
-                //if (method.GetCustomAttribute<HttpPostAttribute>() != null) continue;
-                if (method.GetCustomAttribute<AllowAnonymousAttribute>() != null) continue;
-
-                var att = method.GetCustomAttribute<EntityAuthorizeAttribute>();
-                if (att != null && att.Permission > PermissionFlags.None) dic.Add(method, (Int32)att.Permission);
-            }
-
-            return dic;
-        }
-        #endregion
-
-        #region Ajax处理
-        /// <summary>返回结果并跳转</summary>
-        /// <param name="data">结果。可以是错误文本、成功文本、其它结构化数据</param>
-        /// <param name="url">提示信息后跳转的目标地址，[refresh]表示刷新当前页</param>
-        /// <returns></returns>
-        protected virtual ActionResult JsonTips(Object data, String url = null)
-        {
-            return ControllerHelper.JsonTips(data, url);
-        }
-
-        /// <summary>返回结果并刷新</summary>
-        /// <param name="data">消息</param>
-        /// <returns></returns>
-        protected virtual ActionResult JsonRefresh(Object data)
-        {
-            return ControllerHelper.JsonRefresh(data);
-        }
-        #endregion
-
-        #region Json结果
-        /// <summary>返回Json数据</summary>
-        /// <param name="data">数据对象，作为data成员返回</param>
-        /// <param name="extend">与data并行的其它顶级成员</param>
-        /// <returns></returns>
-        protected virtual ActionResult JsonOK(Object data, Object extend = null)
-        {
-            var rs = new { result = true, data };
-            var json = "";
-
-            if (extend == null)
-                json = OnJsonSerialize(rs);
-            else
-            {
-                var dic = rs.ToDictionary();
-                dic.Merge(extend);
-                json = OnJsonSerialize(dic);
-            }
-
-            return Content(json, "application/json", Encoding.UTF8);
-        }
-
-        /// <summary>返回Json错误</summary>
-        /// <param name="data">数据对象或异常对象，作为data成员返回</param>
-        /// <param name="extend">与data并行的其它顶级成员</param>
-        /// <returns></returns>
-        protected virtual ActionResult JsonError(Object data, Object extend = null)
-        {
-            if (data is Exception ex) data = ex.GetTrue().Message;
-
-            var rs = new { result = false, data };
-            var json = "";
-
-            if (extend == null)
-                json = OnJsonSerialize(rs);
-            else
-            {
-                var dic = rs.ToDictionary();
-                dic.Merge(extend);
-                json = OnJsonSerialize(dic);
-            }
-
-            return Content(json, "application/json", Encoding.UTF8);
-        }
-
-        /// <summary>Json序列化。默认使用FastJson</summary>
-        /// <param name="data"></param>
-        /// <returns></returns>
-        protected virtual String OnJsonSerialize(Object data) => data.ToJson();
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Common/ControllerHelper.cs b/NewLife.Cube/Common/ControllerHelper.cs
deleted file mode 100644
index 66d977d3ea..0000000000
--- a/NewLife.Cube/Common/ControllerHelper.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-﻿using System;
-using System.Web.Mvc;
-using XCode.Membership;
-
-namespace NewLife.Cube
-{
-    /// <summary>控制器帮助类</summary>
-    public static class ControllerHelper
-    {
-        #region Json响应
-        /// <summary>返回结果并跳转</summary>
-        /// <param name="data">结果。可以是错误文本、成功文本、其它结构化数据</param>
-        /// <param name="url">提示信息后跳转的目标地址，[refresh]表示刷新当前页</param>
-        /// <returns></returns>
-        public static ActionResult JsonTips(Object data, String url = null)
-        {
-            var vr = new JsonResult
-            {
-                JsonRequestBehavior = JsonRequestBehavior.AllowGet
-            };
-            //vr.Data = data;
-            //vr.ContentType = contentType;
-            //vr.ContentEncoding = contentEncoding;
-
-            if (data is Exception ex)
-                vr.Data = new { result = false, data = ex.GetTrue()?.Message, url };
-            else
-                vr.Data = new { result = true, data, url };
-
-            return vr;
-        }
-
-        /// <summary>返回结果并刷新</summary>
-        /// <param name="data">消息</param>
-        /// <returns></returns>
-        public static ActionResult JsonRefresh(Object data) => JsonTips(data, "[refresh]");
-        #endregion
-
-        /// <summary>无权访问</summary>
-        /// <param name="filterContext"></param>
-        /// <param name="pm"></param>
-        /// <returns></returns>
-        public static ActionResult NoPermission(this AuthorizationContext filterContext, PermissionFlags pm)
-        {
-            var act = filterContext.ActionDescriptor;
-            var ctrl = act.ControllerDescriptor;
-
-            var res = "[{0}/{1}]".F(ctrl.ControllerName, act.ActionName);
-            var msg = "访问资源 {0} 需要 {1} 权限".F(res, pm.GetDescription());
-            LogProvider.Provider.WriteLog("访问", "拒绝", msg);
-
-            var ctx = filterContext.HttpContext;
-            var menu = ctx.Items["CurrentMenu"] as IMenu;
-
-            var vr = new ViewResult()
-            {
-                ViewName = "NoPermission"
-            };
-            vr.ViewBag.Context = filterContext;
-            vr.ViewBag.Resource = res;
-            vr.ViewBag.Permission = pm;
-            vr.ViewBag.Menu = menu;
-
-            return vr;
-        }
-
-        /// <summary>无权访问</summary>
-        /// <param name="controller"></param>
-        /// <param name="action"></param>
-        /// <param name="pm"></param>
-        /// <returns></returns>
-        public static ActionResult NoPermission(this Controller controller, String action, PermissionFlags pm)
-        {
-            var res = "[{0}/{1}]".F(controller.GetType().Name.TrimEnd("Controller"), action);
-            var msg = "访问资源 {0} 需要 {1} 权限".F(res, pm.GetDescription());
-            LogProvider.Provider.WriteLog("访问", "拒绝", msg);
-
-            var ctx = controller.HttpContext;
-            var menu = ctx.Items["CurrentMenu"] as IMenu;
-
-            var vr = new ViewResult()
-            {
-                ViewName = "NoPermission"
-            };
-            vr.ViewBag.Resource = res;
-            vr.ViewBag.Permission = pm;
-            vr.ViewBag.Menu = menu;
-
-            return vr;
-        }
-
-        /// <summary>无权访问</summary>
-        /// <param name="controller"></param>
-        /// <param name="ex"></param>
-        /// <returns></returns>
-        public static ActionResult NoPermission(this ControllerBase controller, NoPermissionException ex)
-        {
-            var ctx = controller.ControllerContext.HttpContext;
-            var res = ctx.Request.Url.AbsolutePath;
-            var pm = ex.Permission;
-            var msg = "无权访问数据[{0}]，没有该数据的 {1} 权限".F(res, pm.GetDescription());
-            LogProvider.Provider.WriteLog("访问", "拒绝", msg);
-
-            var menu = ctx.Items["CurrentMenu"] as IMenu;
-
-            var vr = new ViewResult()
-            {
-                ViewName = "NoPermission"
-            };
-            vr.ViewBag.Resource = res;
-            vr.ViewBag.Permission = pm;
-            vr.ViewBag.Menu = menu;
-
-            return vr;
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Common/CubeModule.cs b/NewLife.Cube/Common/CubeModule.cs
deleted file mode 100644
index ccc40e9d2c..0000000000
--- a/NewLife.Cube/Common/CubeModule.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-﻿using System.Web;
-
-namespace NewLife.Cube
-{
-    /// <summary>魔方处理模块</summary>
-    public class CubeModule : IHttpModule
-    {
-        #region IHttpModule Members
-        void IHttpModule.Dispose() { }
-
-        /// <summary>初始化模块，准备拦截请求。</summary>
-        /// <param name="context"></param>
-        void IHttpModule.Init(HttpApplication context)
-        {
-            context.BeginRequest += (s, e) => OnRequest();
-        }
-        #endregion
-
-        /// <summary>初始化模块，准备拦截请求。</summary>
-        void OnRequest()
-        {
-            var ctx = HttpContext.Current;
-            var req = ctx?.Request;
-            if (req != null && !req.IsSecureConnection)
-            {
-                var set = Setting.Current;
-                if (set.ForceSSL)
-                {
-                    var uri = req.Url;
-                    var url = $"https://{uri.Host}{uri.PathAndQuery}";
-
-                    ctx.Response.Redirect(url);
-                    //ctx.Response.RedirectPermanent(url);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Common/DbRunTimeModule.cs b/NewLife.Cube/Common/DbRunTimeModule.cs
deleted file mode 100644
index 9dd650e7a8..0000000000
--- a/NewLife.Cube/Common/DbRunTimeModule.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using NewLife.Common;
-using NewLife.Log;
-using XCode.DataAccessLayer;
-
-namespace NewLife.Cube
-{
-    /// <summary>页面查询执行时间模块</summary>
-    public class DbRunTimeModule : IHttpModule
-    {
-        #region IHttpModule Members
-        void IHttpModule.Dispose() { }
-
-        /// <summary>初始化模块，准备拦截请求。</summary>
-        /// <param name="context"></param>
-        void IHttpModule.Init(HttpApplication context)
-        {
-            if (!Enable) return;
-
-            context.BeginRequest += (s, e) => OnInit();
-            //context.PostReleaseRequestState += (s, e) => OnEnd();
-        }
-        #endregion
-
-        ///// <summary>上下文</summary>
-        //public static HttpContext Context { get { return HttpContext.Current; } }
-
-        /// <summary>执行时间字符串</summary>
-        public static String DbRunTimeFormat { get; set; } = "查询{0}次，执行{1}次，耗时{2:n0}毫秒";
-
-        const String _QueryTimes = "DAL.QueryTimes";
-        const String _ExecuteTimes = "DAL.ExecuteTimes";
-
-        /// <summary>初始化模块，准备拦截请求。</summary>
-        void OnInit()
-        {
-            var ctx = HttpContext.Current;
-            ctx.Items[_QueryTimes] = DAL.QueryTimes;
-            ctx.Items[_ExecuteTimes] = DAL.ExecuteTimes;
-
-            // 设计时收集执行的SQL语句
-            if (SysConfig.Current.Develop) ctx.Items["XCode_SQLList"] = new List<String>();
-        }
-
-        private static Boolean _tip;
-        /// <summary>获取执行时间和查询次数等信息</summary>
-        /// <returns></returns>
-        public static String GetInfo()
-        {
-            var ctx = HttpContext.Current;
-            var ts = DateTime.Now - ctx.Timestamp;
-
-            if (!ctx.Items.Contains(_QueryTimes) || !ctx.Items.Contains(_ExecuteTimes))
-            {
-                //throw new XException("设计错误！需要在web.config中配置{0}", typeof(DbRunTimeModule).FullName);
-                if (!_tip)
-                {
-                    _tip = true;
-                    XTrace.WriteLine("设计错误！需要在web.config中配置{0}", typeof(DbRunTimeModule).FullName);
-                }
-                return null;
-            }
-
-            var StartQueryTimes = (Int32)ctx.Items[_QueryTimes];
-            var StartExecuteTimes = (Int32)ctx.Items[_ExecuteTimes];
-
-            var inf = String.Format(DbRunTimeFormat, DAL.QueryTimes - StartQueryTimes, DAL.ExecuteTimes - StartExecuteTimes, ts.TotalMilliseconds);
-
-            // 设计时收集执行的SQL语句
-            if (SysConfig.Current.Develop)
-            {
-                var list = ctx.Items["XCode_SQLList"] as List<String>;
-                if (list != null && list.Count > 0) inf += "<br />" + list.Select(e => HttpUtility.HtmlEncode(e)).Join("<br />" + Environment.NewLine);
-            }
-
-            return inf;
-        }
-
-        private static Boolean? _Enable;
-        /// <summary>是否启用显示运行时间</summary>
-        public static Boolean Enable
-        {
-            get
-            {
-                if (_Enable == null) _Enable = Setting.Current.ShowRunTime;
-                return _Enable.Value;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Common/EntityAuthorizeAttribute.cs b/NewLife.Cube/Common/EntityAuthorizeAttribute.cs
deleted file mode 100644
index 4b3d3e0924..0000000000
--- a/NewLife.Cube/Common/EntityAuthorizeAttribute.cs
+++ /dev/null
@@ -1,218 +0,0 @@
-﻿using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Web;
-using System.Web.Mvc;
-using NewLife.Log;
-using NewLife.Reflection;
-using NewLife.Web;
-using XCode;
-using XCode.Membership;
-
-namespace NewLife.Cube
-{
-    /// <summary>实体授权特性</summary>
-    public class EntityAuthorizeAttribute : AuthorizeAttribute
-    {
-        #region 属性
-        /// <summary>授权项</summary>
-        public PermissionFlags Permission { get; }
-
-        /// <summary>是否全局特性</summary>
-        internal Boolean IsGlobal;
-        #endregion
-
-        #region 构造
-        /// <summary>实例化实体授权特性</summary>
-        public EntityAuthorizeAttribute() { }
-
-        /// <summary>实例化实体授权特性</summary>
-        /// <param name="permission"></param>
-        public EntityAuthorizeAttribute(PermissionFlags permission)
-        {
-            if (permission <= PermissionFlags.None) throw new ArgumentNullException(nameof(permission));
-
-            Permission = permission;
-        }
-        #endregion
-
-        #region 方法
-        /// <summary>授权发生时触发</summary>
-        /// <param name="filterContext"></param>
-        public override void OnAuthorization(AuthorizationContext filterContext)
-        {
-            /*
-             * 验证范围：
-             * 1，魔方区域下的所有控制器
-             * 2，所有带有EntityAuthorize特性的控制器或动作
-             */
-            var act = filterContext.ActionDescriptor;
-            var ctrl = act.ControllerDescriptor;
-
-            // 允许匿名访问时，直接跳过检查
-            if (act.IsDefined(typeof(AllowAnonymousAttribute), true) || ctrl.IsDefined(typeof(AllowAnonymousAttribute), true)) return;
-
-            // 如果控制器或者Action放有该特性，则跳过全局
-            var hasAtt = act.IsDefined(typeof(EntityAuthorizeAttribute), true) || ctrl.IsDefined(typeof(EntityAuthorizeAttribute), true);
-            if (IsGlobal && hasAtt) return;
-
-            // 只验证管辖范围
-            var create = false;
-            if (!AreaRegistrationBase.Contains(filterContext.Controller))
-            {
-                if (!hasAtt) return;
-                // 不属于魔方而又加了权限特性，需要创建菜单
-                create = true;
-            }
-
-            // 根据控制器定位资源菜单
-            var menu = GetMenu(filterContext, create);
-
-            // 如果已经处理过，就不处理了
-            if (filterContext.Result != null) return;
-
-            base.OnAuthorization(filterContext);
-        }
-
-        /// <summary>授权核心</summary>
-        /// <param name="httpContext"></param>
-        /// <returns></returns>
-        protected override Boolean AuthorizeCore(HttpContextBase httpContext)
-        {
-            var prv = ManageProvider.Provider;
-            var ctx = httpContext;
-
-            // 判断当前登录用户
-            var user = prv.TryLogin();
-            if (user == null) return false;
-
-            var menu = ctx.Items["CurrentMenu"] as IMenu;
-
-            // 判断权限
-            if (menu != null && user is IUser user2)
-            {
-                if (user2.Has(menu, Permission)) return true;
-            }
-
-            return false;
-        }
-
-        /// <summary>未认证请求</summary>
-        /// <param name="filterContext"></param>
-        protected override void HandleUnauthorizedRequest(AuthorizationContext filterContext)
-        {
-            // 来到这里，有可能没登录，有可能没权限
-            var prv = ManageProvider.Provider;
-            if (prv?.Current == null)
-            {
-                var retUrl = filterContext.HttpContext.Request.Url?.PathAndQuery;
-
-                var rurl = "~/Admin/User/Login".AppendReturn(retUrl);
-                filterContext.Result = new RedirectResult(rurl);
-            }
-            else
-            {
-                filterContext.Result = filterContext.NoPermission(Permission);
-            }
-        }
-
-        private IMenu GetMenu(AuthorizationContext filterContext, Boolean create)
-        {
-            var act = filterContext.ActionDescriptor;
-            var ctrl = act.ControllerDescriptor;
-            var type = ctrl.ControllerType;
-            var fullName = type.FullName + "." + act.ActionName;
-
-            var ctx = filterContext.HttpContext;
-            var mf = ManageProvider.Menu;
-            var menu = ctx.Items["CurrentMenu"] as IMenu;
-            if (menu == null)
-            {
-                menu = mf.FindByFullName(fullName) ?? mf.FindByFullName(type.FullName);
-
-                // 当前菜单
-                filterContext.Controller.ViewBag.Menu = menu;
-                // 兼容旧版本视图权限
-                ctx.Items["CurrentMenu"] = menu;
-            }
-
-            // 创建菜单
-            if (create)
-            {
-                if (CreateMenu(type)) menu = mf.FindByFullName(fullName);
-                //var name = type.Namespace.TrimEnd(".Controllers");
-                //var root = mf.FindByFullName(name);
-                //if (root == null)
-                //{
-                //    root = mf.Root.GetType().CreateInstance() as IMenu;
-                //    root.FullName = name;
-                //    root.Name = name;
-                //    (root as IEntity).Insert();
-                //}
-
-                //var node = mf.Root.GetType().CreateInstance() as IMenu;
-                //node.FullName = type.FullName + "." + act.ActionName;
-                //node.Name = type.Name;
-                //node.DisplayName = type.GetDisplayName();
-                //node.ParentID = root.ID;
-                //(node as IEntity).Insert();
-            }
-
-            if (menu == null) XTrace.WriteLine("设计错误！验证权限时无法找到[{0}/{1}]的菜单", type.FullName, act.ActionName);
-
-            return menu;
-        }
-
-        private static ConcurrentDictionary<String, Type> _ss = new ConcurrentDictionary<String, Type>();
-        private Boolean CreateMenu(Type type)
-        {
-            if (!_ss.TryAdd(type.Namespace, type)) return false;
-
-            var mf = ManageProvider.Menu;
-            var ms = mf.ScanController(type.Namespace.TrimEnd(".Controllers"), type.Assembly, type.Namespace);
-
-            var root = mf.FindByFullName(type.Namespace);
-            if (root != null)
-            {
-                root.Url = "~";
-                (root as IEntity).Save();
-            }
-
-            // 遍历菜单，设置权限项
-            foreach (var controller in ms)
-            {
-                if (controller.FullName.IsNullOrEmpty()) continue;
-
-                var ctype = type.Assembly.GetType(controller.FullName);
-                //ctype = controller.FullName.GetTypeEx(false);
-                if (ctype == null) continue;
-
-                // 添加该类型下的所有Action
-                var dic = new Dictionary<MethodInfo, Int32>();
-                foreach (var method in ctype.GetMethods())
-                {
-                    if (method.IsStatic || !method.IsPublic) continue;
-                    if (!method.ReturnType.As<ActionResult>()) continue;
-                    if (method.GetCustomAttribute<AllowAnonymousAttribute>() != null) continue;
-
-                    var att = method.GetCustomAttribute<EntityAuthorizeAttribute>();
-                    if (att != null && att.Permission > PermissionFlags.None)
-                    {
-                        var dn = method.GetDisplayName();
-                        var pmName = !dn.IsNullOrEmpty() ? dn : method.Name;
-                        if (att.Permission <= PermissionFlags.Delete) pmName = att.Permission.GetDescription();
-                        controller.Permissions[(Int32)att.Permission] = pmName;
-                    }
-                }
-
-                controller.Url = "~/" + ctype.Name.TrimEnd("Controller");
-
-                (controller as IEntity).Save();
-            }
-
-            return true;
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Common/EntityController.cs b/NewLife.Cube/Common/EntityController.cs
deleted file mode 100644
index 88d1e72441..0000000000
--- a/NewLife.Cube/Common/EntityController.cs
+++ /dev/null
@@ -1,827 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Web;
-using System.Web.Mvc;
-using NewLife.Common;
-using NewLife.Cube.Entity;
-using NewLife.Serialization;
-using NewLife.Web;
-using NewLife.Xml;
-using XCode;
-using XCode.Configuration;
-using XCode.Membership;
-
-namespace NewLife.Cube
-{
-    /// <summary>实体控制器基类</summary>
-    /// <typeparam name="TEntity"></typeparam>
-    //[EntityAuthorize]
-    public class EntityController<TEntity> : ControllerBaseX where TEntity : Entity<TEntity>, new()
-    {
-        #region 属性
-        /// <summary>实体工厂</summary>
-        public static IEntityOperate Factory => Entity<TEntity>.Meta.Factory;
-
-        private String CacheKey => $"CubeView_{typeof(TEntity).FullName}";
-        #endregion
-
-        #region 构造
-        static EntityController()
-        {
-            // 强行实例化一次，初始化实体对象
-            var entity = new TEntity();
-        }
-
-        /// <summary>构造函数</summary>
-        public EntityController()
-        {
-            var title = Entity<TEntity>.Meta.Table.DataTable.DisplayName + "管理";
-            ViewBag.Title = title;
-        }
-
-        /// <summary>动作执行前</summary>
-        /// <param name="filterContext"></param>
-        protected override void OnActionExecuting(ActionExecutingContext filterContext)
-        {
-            // Ajax请求不需要设置ViewBag
-            if (!Request.IsAjaxRequest())
-            {
-                // 默认加上实体工厂
-                ViewBag.Factory = Entity<TEntity>.Meta.Factory;
-
-                // 默认加上分页给前台
-                var ps = filterContext.ActionParameters.ToNullable();
-                var p = ps["p"] as Pager ?? new Pager();
-                ViewBag.Page = p;
-
-                // 用于显示的列
-                if (!ps.ContainsKey("entity")) ViewBag.Fields = GetFields(false);
-
-                if (ViewBag.HeaderTitle == null) ViewBag.HeaderTitle = Entity<TEntity>.Meta.Table.Description + "管理";
-
-                var txt = (String)ViewBag.HeaderContent;
-                if (txt.IsNullOrEmpty()) txt = (ViewBag.Menu as IMenu)?.Remark;
-                if (txt.IsNullOrEmpty()) txt = GetType().GetDescription();
-                if (txt.IsNullOrEmpty()) txt = Entity<TEntity>.Meta.Table.Description;
-                //if (txt.IsNullOrEmpty() && SysConfig.Current.Develop)
-                //    txt = "这里是页头内容，来自于菜单备注，或者给控制器增加Description特性";
-                ViewBag.HeaderContent = txt;
-            }
-
-            base.OnActionExecuting(filterContext);
-        }
-
-        /// <summary>执行后</summary>
-        /// <param name="filterContext"></param>
-        protected override void OnActionExecuted(ActionExecutedContext filterContext)
-        {
-            base.OnActionExecuted(filterContext);
-
-            var title = ViewBag.Title + "";
-            HttpContext.Items["Title"] = title;
-        }
-
-        /// <summary>触发异常时</summary>
-        /// <param name="filterContext"></param>
-        protected override void OnException(ExceptionContext filterContext)
-        {
-            if (!filterContext.ExceptionHandled)
-            {
-                var ex = filterContext.Exception;
-                // Json输出
-                if (IsJsonRequest)
-                {
-                    filterContext.Result = JsonError(ex);
-                    filterContext.ExceptionHandled = true;
-                }
-                //else if (ex is NoPermissionException nex)
-                //{
-                //    filterContext.Result = this.NoPermission(nex);
-                //    filterContext.ExceptionHandled = true;
-                //}
-            }
-
-            base.OnException(filterContext);
-        }
-        #endregion
-
-        #region 数据获取
-        /// <summary>搜索数据集</summary>
-        /// <param name="p"></param>
-        /// <returns></returns>
-        protected virtual IEnumerable<TEntity> Search(Pager p)
-        {
-            // 缓存数据，用于后续导出
-            Session[CacheKey] = p;
-
-            return Entity<TEntity>.Search(p["dtStart"].ToDateTime(), p["dtEnd"].ToDateTime(), p["Q"], p);
-        }
-
-        /// <summary>查找单行数据</summary>
-        /// <param name="key"></param>
-        /// <returns></returns>
-        protected virtual TEntity Find(Object key)
-        {
-            var fact = Factory;
-            if (fact.Unique == null)
-            {
-                var pks = fact.Table.PrimaryKeys;
-                if (pks.Length > 0)
-                {
-                    var exp = new WhereExpression();
-                    foreach (var item in pks)
-                    {
-                        exp &= item.Equal(Request[item.Name]);
-                    }
-
-                    return Entity<TEntity>.Find(exp);
-                }
-            }
-
-            return Entity<TEntity>.FindByKeyForEdit(key);
-        }
-
-        /// <summary>获取选中键</summary>
-        /// <returns></returns>
-        protected virtual String[] SelectKeys => Request["Keys"].Split(",");
-
-        /// <summary>导出当前页以后的数据</summary>
-        /// <returns></returns>
-        protected virtual IEnumerable<TEntity> ExportData()
-        {
-            // 跳过头部一些页数，导出当前页以及以后的数据
-            var p = new Pager(Session[CacheKey] as Pager);
-            p.StartRow = (p.PageIndex - 1) * p.PageSize;
-            p.PageSize = 100000;
-            // 不要查记录数
-            //p.TotalCount = -1;
-            p.RetrieveTotalCount = false;
-
-            return Search(p);
-        }
-        #endregion
-
-        #region 默认Action
-        /// <summary>数据列表首页</summary>
-        /// <returns></returns>
-        [EntityAuthorize(PermissionFlags.Detail)]
-        [DisplayName("{type}管理")]
-        public virtual ActionResult Index(Pager p = null)
-        {
-            if (p == null) p = new Pager();
-
-            ViewBag.Page = p;
-
-            // 缓存数据，用于后续导出
-            Session[CacheKey] = p;
-
-            return IndexView(p);
-        }
-
-        /// <summary>列表页视图。子控制器可重载，以传递更多信息给视图，比如修改要显示的列</summary>
-        /// <param name="p"></param>
-        /// <returns></returns>
-        protected virtual ActionResult IndexView(Pager p)
-        {
-            // 需要总记录数来分页
-            p.RetrieveTotalCount = true;
-
-            var list = Search(p);
-
-            // Json输出
-            if (IsJsonRequest) return JsonOK(list, new { pager = p });
-
-            return View("List", list);
-        }
-
-        /// <summary>表单，查看</summary>
-        /// <param name="id">主键。可能为空（表示添加），所以用字符串而不是整数</param>
-        /// <returns></returns>
-        [EntityAuthorize(PermissionFlags.Detail)]
-        [DisplayName("查看{type}")]
-        public virtual ActionResult Detail(String id)
-        {
-            var entity = Find(id);
-            if (entity.IsNullKey) throw new XException("要查看的数据[{0}]不存在！", id);
-
-            // 验证数据权限
-            Valid(entity, DataObjectMethodType.Select, false);
-
-            // Json输出
-            if (IsJsonRequest) return JsonOK(entity, new { id });
-
-            return FormView(entity);
-        }
-
-        /// <summary>删除</summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        [EntityAuthorize(PermissionFlags.Delete)]
-        [DisplayName("删除{type}")]
-        public virtual ActionResult Delete(Int32 id)
-        {
-            var url = Request.UrlReferrer + "";
-
-            var entity = Find(id);
-            Valid(entity, DataObjectMethodType.Delete, true);
-
-            OnDelete(entity);
-
-            if (Request.IsAjaxRequest())
-                return JsonRefresh("删除成功！");
-            else if (!url.IsNullOrEmpty())
-                return Redirect(url);
-            else
-                return RedirectToAction("Index");
-        }
-
-        /// <summary>表单，添加/修改</summary>
-        /// <returns></returns>
-        [EntityAuthorize(PermissionFlags.Insert)]
-        [DisplayName("添加{type}")]
-        public virtual ActionResult Add()
-        {
-            var entity = Factory.Create() as TEntity;
-
-            // 填充QueryString参数
-            var qs = Request.QueryString;
-            foreach (var item in Entity<TEntity>.Meta.Fields)
-            {
-                var v = qs[item.Name];
-                if (!v.IsNullOrEmpty()) entity[item.Name] = v;
-            }
-
-            // 验证数据权限
-            Valid(entity, DataObjectMethodType.Insert, false);
-
-            // 记下添加前的来源页，待会添加成功以后跳转
-            Session["Cube_Add_Referrer"] = Request.UrlReferrer.ToString();
-
-            return FormView(entity);
-        }
-
-        /// <summary>保存</summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        [EntityAuthorize(PermissionFlags.Insert)]
-        [HttpPost]
-        [ValidateInput(false)]
-        public virtual ActionResult Add(TEntity entity)
-        {
-            // 检测避免乱用Add/id
-            if (Factory.Unique.IsIdentity && entity[Factory.Unique.Name].ToInt() != 0) throw new Exception("我们约定添加数据时路由id部分默认没有数据，以免模型绑定器错误识别！");
-
-            if (!Valid(entity, DataObjectMethodType.Insert, true))
-            {
-                ViewBag.StatusMessage = "验证失败！";
-                return FormView(entity);
-            }
-
-            var rs = false;
-            var err = "";
-            try
-            {
-                OnInsert(entity);
-                rs = true;
-            }
-            catch (ArgumentException aex)
-            {
-                err = aex.Message;
-                ModelState.AddModelError(aex.ParamName, aex.Message);
-            }
-            catch (Exception ex)
-            {
-                err = ex.Message;
-                ModelState.AddModelError("", ex.Message);
-            }
-
-            if (!rs)
-            {
-                ViewBag.StatusMessage = "添加失败！" + err;
-                // 添加失败，ID清零，否则会显示保存按钮
-                entity[Entity<TEntity>.Meta.Unique.Name] = 0;
-                return FormView(entity);
-            }
-
-            ViewBag.StatusMessage = "添加成功！";
-
-            var url = Session["Cube_Add_Referrer"] + "";
-            if (!url.IsNullOrEmpty())
-                return Redirect(url);
-            else
-                // 新增完成跳到列表页，更新完成保持本页
-                return RedirectToAction("Index");
-        }
-
-        /// <summary>表单，添加/修改</summary>
-        /// <param name="id">主键。可能为空（表示添加），所以用字符串而不是整数</param>
-        /// <returns></returns>
-        [EntityAuthorize(PermissionFlags.Update)]
-        [DisplayName("更新{type}")]
-        public virtual ActionResult Edit(String id)
-        {
-            var entity = Find(id);
-            if (entity.IsNullKey) throw new XException("要编辑的数据[{0}]不存在！", id);
-
-            // 验证数据权限
-            Valid(entity, DataObjectMethodType.Update, false);
-
-            // Json输出
-            if (IsJsonRequest) return JsonOK(entity, new { id });
-
-            return FormView(entity);
-        }
-
-        /// <summary>保存</summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        [EntityAuthorize(PermissionFlags.Update)]
-        [HttpPost]
-        [ValidateInput(false)]
-        public virtual ActionResult Edit(TEntity entity)
-        {
-            if (!Valid(entity, DataObjectMethodType.Update, true))
-            {
-                ViewBag.StatusMessage = "验证失败！";
-                return FormView(entity);
-            }
-
-            var rs = 0;
-            var err = "";
-            try
-            {
-                rs = OnUpdate(entity);
-                if (rs <= 0) rs = 1;
-            }
-            catch (ArgumentException aex)
-            {
-                err = aex.Message;
-                ModelState.AddModelError(aex.ParamName, aex.Message);
-            }
-            catch (Exception ex)
-            {
-                err = ex.Message;
-                //ModelState.AddModelError("", ex.Message);
-                ModelState.AddModelError("", ex);
-            }
-
-            ViewBag.RowsAffected = rs;
-            if (rs <= 0)
-            {
-                ViewBag.StatusMessage = "保存失败！" + err;
-                return FormView(entity);
-            }
-            else
-            {
-                ViewBag.StatusMessage = "保存成功！";
-                // 更新完成保持本页
-                return FormView(entity);
-            }
-        }
-
-        /// <summary>表单页视图。子控制器可以重载，以传递更多信息给视图，比如修改要显示的列</summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        protected virtual ActionResult FormView(TEntity entity)
-        {
-            // 用于显示的列
-            ViewBag.Fields = GetFields(true);
-
-            // 呈现表单前，保存实体对象。提交时优先使用该对象而不是去数据库查找，避免脏写
-            EntityModelBinder.SetEntity(entity);
-
-            return View("Form", entity);
-        }
-        #endregion
-
-        #region 高级Action
-        /// <summary>数据接口</summary>
-        /// <param name="id">令牌</param>
-        /// <param name="p">分页</param>
-        /// <returns></returns>
-        [AllowAnonymous]
-        [DisplayName("数据接口")]
-        public virtual ActionResult Json(String id, Pager p)
-        {
-            if (id.IsNullOrEmpty()) id = Request["token"];
-            if (id.IsNullOrEmpty()) id = Request["key"];
-
-            try
-            {
-                var user = UserToken.Valid(id);
-
-                // 需要总记录数来分页
-                p.RetrieveTotalCount = true;
-
-                var list = Search(p);
-
-                // Json输出
-                return JsonOK(list, new { pager = p });
-            }
-            catch (Exception ex)
-            {
-                return JsonError(ex.GetTrue());
-            }
-        }
-
-        /// <summary>导出Xml</summary>
-        /// <returns></returns>
-        [EntityAuthorize(PermissionFlags.Detail)]
-        [DisplayName("导出")]
-        public virtual ActionResult ExportXml()
-        {
-            var obj = OnExportXml();
-            var xml = "";
-            if (obj is IEntity)
-                xml = (obj as IEntity).ToXml();
-            else if (obj is IList<TEntity>)
-                xml = (obj as IList<TEntity>).ToXml();
-            else
-                xml = obj.ToXml();
-
-            SetAttachment(null, ".xml");
-
-            return Content(xml, "text/xml", Encoding.UTF8);
-        }
-
-        /// <summary>要导出Xml的对象</summary>
-        /// <returns></returns>
-        protected virtual Object OnExportXml() => ExportData();
-
-        /// <summary>设置附件响应方式</summary>
-        /// <param name="name"></param>
-        /// <param name="ext"></param>
-        protected void SetAttachment(String name, String ext)
-        {
-            if (name.IsNullOrEmpty()) name = GetType().GetDisplayName();
-            if (name.IsNullOrEmpty()) name = Factory.EntityType.GetDisplayName();
-            if (name.IsNullOrEmpty()) name = GetType().Name.TrimEnd("Controller");
-            if (!ext.IsNullOrEmpty()) ext = ext.EnsureStart(".");
-            name += ext;
-            name = HttpUtility.UrlEncode(name, Encoding.UTF8);
-            Response.AddHeader("Content-Disposition", "Attachment;filename=" + name);
-        }
-
-        /// <summary>导入Xml</summary>
-        /// <returns></returns>
-        [EntityAuthorize(PermissionFlags.Insert)]
-        [DisplayName("导入")]
-        [HttpPost]
-        public virtual ActionResult ImportXml() => throw new NotImplementedException();
-
-        /// <summary>导出Json</summary>
-        /// <returns></returns>
-        [EntityAuthorize(PermissionFlags.Detail)]
-        [DisplayName("导出")]
-        public virtual ActionResult ExportJson()
-        {
-            //var list = Entity<TEntity>.FindAll();
-            //var json = list.ToJson(true);
-            //var json = new Json().Serialize(list);
-            var json = OnExportJson().ToJson(true);
-
-            SetAttachment(null, ".json");
-
-            //return Json(list, JsonRequestBehavior.AllowGet);
-
-            return Content(json, "application/json", Encoding.UTF8);
-        }
-
-        /// <summary>要导出Json的对象</summary>
-        /// <returns></returns>
-        protected virtual Object OnExportJson() => ExportData();
-
-        /// <summary>导入Json</summary>
-        /// <returns></returns>
-        [EntityAuthorize(PermissionFlags.Insert)]
-        [DisplayName("导入")]
-        [HttpPost]
-        public virtual ActionResult ImportJson() => throw new NotImplementedException();
-
-        /// <summary>导出Excel</summary>
-        /// <returns></returns>
-        [EntityAuthorize(PermissionFlags.Detail)]
-        [DisplayName("导出")]
-        public virtual ActionResult ExportExcel()
-        {
-            //throw new NotImplementedException();
-
-            // 准备需要输出的列
-            var list = new List<FieldItem>();
-            foreach (var fi in Factory.AllFields)
-            {
-                if (Type.GetTypeCode(fi.Type) == TypeCode.Object) continue;
-
-                list.Add(fi);
-            }
-
-            var html = OnExportExcel(list);
-            var name = GetType().GetDisplayName() ?? Factory.EntityType.GetDisplayName() ?? Factory.EntityType.Name;
-
-            ToExcel("application/ms-excel", "{0}_{1}.xls".F(name, DateTime.Now.ToString("yyyyMMddHHmmss")), html);
-
-            return null;
-        }
-
-        private void ToExcel(String FileType, String FileName, String ExcelContent)
-        {
-            var rs = Response;
-            rs.Charset = "UTF-8";
-            rs.ContentEncoding = Encoding.UTF8;
-            rs.AppendHeader("Content-Disposition", "attachment;filename=" + HttpUtility.UrlEncode(FileName, Encoding.UTF8).ToString());
-            rs.ContentType = FileType;
-            var tw = new System.IO.StringWriter();
-            rs.Output.Write(ExcelContent.ToString());
-            rs.Flush();
-            rs.End();
-        }
-
-        /// <summary>导出Excel，可重载修改要输出的结果集</summary>
-        /// <param name="fs"></param>
-        protected virtual String OnExportExcel(List<FieldItem> fs)
-        {
-            var list = ExportData();
-
-            return OnExportExcel(fs, list);
-        }
-
-        /// <summary>导出Excel，可重载修改要输出的列</summary>
-        /// <param name="fs"></param>
-        /// <param name="list"></param>
-        protected virtual String OnExportExcel(List<FieldItem> fs, IEnumerable<TEntity> list)
-        {
-            var sb = new StringBuilder();
-            //下面这句解决中文乱码
-            sb.Append("<meta http-equiv='content-type' content='application/ms-excel; charset=utf-8'/>");
-            //打印表头
-            sb.Append("<table border='1' width='100%'>");
-            // 列头
-            {
-                sb.Append("<tr>");
-                foreach (var fi in fs)
-                {
-                    var name = fi.DisplayName;
-                    if (name.IsNullOrEmpty()) name = fi.Description;
-                    if (name.IsNullOrEmpty()) name = fi.Name;
-                    sb.Append(String.Format("<td>{0}</td>", name));
-                }
-                sb.Append("</tr>");
-            }
-            // 内容
-            foreach (var item in list)
-            {
-                sb.Append("<tr>");
-                foreach (var fi in fs)
-                {
-                    sb.Append(String.Format("<td>{0}</td>", "{0}".F(item[fi.Name])));
-                }
-                sb.Append("</tr>");
-            }
-
-            //打印表尾
-            sb.Append("</table>");
-
-            return sb.ToString();
-        }
-        #endregion
-
-        #region 批量删除
-        /// <summary>删除选中</summary>
-        /// <returns></returns>
-        [EntityAuthorize(PermissionFlags.Delete)]
-        [DisplayName("删除选中")]
-        public virtual ActionResult DeleteSelect()
-        {
-            var count = 0;
-            var keys = SelectKeys;
-            if (keys != null && keys.Length > 0)
-            {
-                using (var tran = Entity<TEntity>.Meta.CreateTrans())
-                {
-                    foreach (var item in keys)
-                    {
-                        var entity = Entity<TEntity>.FindByKey(item);
-                        if (entity != null)
-                        {
-                            // 验证数据权限
-                            Valid(entity, DataObjectMethodType.Delete, true);
-
-                            entity.Delete();
-                            count++;
-                        }
-                    }
-                    tran.Commit();
-                }
-            }
-            return JsonRefresh("共删除{0}行数据".F(count));
-        }
-
-        /// <summary>删除全部</summary>
-        /// <returns></returns>
-        [EntityAuthorize(PermissionFlags.Delete)]
-        [DisplayName("删除全部")]
-        public virtual ActionResult DeleteAll()
-        {
-            var url = Request.UrlReferrer + "";
-
-            var count = 0;
-            var p = new Pager(Session[CacheKey] as Pager);
-            if (p != null)
-            {
-                p.PageIndex = 1;
-                p.PageSize = 100000;
-                // 不要查记录数
-                p.RetrieveTotalCount = false;
-
-                var list = Search(p).ToList();
-                count += list.Count;
-                //list.Delete();
-                using (var tran = Entity<TEntity>.Meta.CreateTrans())
-                {
-                    foreach (var entity in list)
-                    {
-                        // 验证数据权限
-                        Valid(entity, DataObjectMethodType.Delete, true);
-
-                        entity.Delete();
-                    }
-                    tran.Commit();
-                }
-            }
-
-            if (Request.IsAjaxRequest())
-                return JsonRefresh("共删除{0}行数据".F(count));
-            else if (!url.IsNullOrEmpty())
-                return Redirect(url);
-            else
-                return RedirectToAction("Index");
-        }
-
-        /// <summary>清空全表数据</summary>
-        /// <returns></returns>
-        [EntityAuthorize(PermissionFlags.Delete)]
-        [DisplayName("清空")]
-        public virtual ActionResult Clear()
-        {
-            var url = Request.UrlReferrer + "";
-
-            var count = Entity<TEntity>.Meta.Session.Truncate();
-
-            if (Request.IsAjaxRequest())
-                return JsonRefresh("共删除{0}行数据".F(count));
-            else if (!url.IsNullOrEmpty())
-                return Redirect(url);
-            else
-                return RedirectToAction("Index");
-        }
-        #endregion
-
-        #region 模版Action
-        /// <summary>生成列表</summary>
-        /// <returns></returns>
-        [EntityAuthorize(PermissionFlags.Delete)]
-        [DisplayName("生成列表")]
-        public ActionResult MakeList()
-        {
-            if (!SysConfig.Current.Develop) throw new InvalidOperationException("仅支持开发模式下使用！");
-
-            // 视图路径，Areas/区域/Views/控制器/_List_Data.cshtml
-            var vpath = "Areas/{0}/Views/{1}/_List_Data.cshtml".F(RouteData.DataTokens["area"], GetType().Name.TrimEnd("Controller"));
-
-            var rs = ViewHelper.MakeListView(typeof(TEntity), vpath, ListFields);
-
-            Js.Alert("生成列表模版 {0} 成功！".F(vpath));
-
-            return Index();
-        }
-
-        /// <summary>生成表单</summary>
-        /// <returns></returns>
-        [EntityAuthorize(PermissionFlags.Delete)]
-        [DisplayName("生成表单")]
-        public ActionResult MakeForm()
-        {
-            if (!SysConfig.Current.Develop) throw new InvalidOperationException("仅支持开发模式下使用！");
-
-            // 视图路径，Areas/区域/Views/控制器/_Form_Body.cshtml
-            var vpath = "Areas/{0}/Views/{1}/_Form_Body.cshtml".F(RouteData.DataTokens["area"], GetType().Name.TrimEnd("Controller"));
-
-            var rs = ViewHelper.MakeFormView(typeof(TEntity), vpath, FormFields);
-
-            Js.Alert("生成表单模版 {0} 成功！".F(vpath));
-
-            return Index();
-        }
-        #endregion
-
-        #region 实体操作重载
-        /// <summary>添加实体对象</summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        protected virtual Int32 OnInsert(TEntity entity) => entity.Insert();
-
-        /// <summary>更新实体对象</summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        protected virtual Int32 OnUpdate(TEntity entity) => entity.Update();
-
-        /// <summary>删除实体对象</summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        protected virtual Int32 OnDelete(TEntity entity) => entity.Delete();
-
-        /// <summary>验证实体对象</summary>
-        /// <param name="entity">实体对象</param>
-        /// <param name="type">操作类型</param>
-        /// <param name="post">是否提交数据阶段</param>
-        /// <returns></returns>
-        protected virtual Boolean Valid(TEntity entity, DataObjectMethodType type, Boolean post)
-        {
-            if (!ValidPermission(entity, type, post))
-            {
-                switch (type)
-                {
-                    case DataObjectMethodType.Select: throw new NoPermissionException(PermissionFlags.Detail, "无权查看数据");
-                    case DataObjectMethodType.Update: throw new NoPermissionException(PermissionFlags.Update, "无权更新数据");
-                    case DataObjectMethodType.Insert: throw new NoPermissionException(PermissionFlags.Insert, "无权新增数据");
-                    case DataObjectMethodType.Delete: throw new NoPermissionException(PermissionFlags.Delete, "无权删除数据");
-                }
-            }
-
-            return true;
-        }
-
-        /// <summary>验证实体对象</summary>
-        /// <param name="entity">实体对象</param>
-        /// <param name="type">操作类型</param>
-        /// <param name="post">是否提交数据阶段</param>
-        /// <returns></returns>
-        protected virtual Boolean ValidPermission(TEntity entity, DataObjectMethodType type, Boolean post) => true;
-        #endregion
-
-        #region 列表字段和表单字段
-        private static FieldCollection _ListFields;
-        /// <summary>列表字段过滤</summary>
-        protected static FieldCollection ListFields { get { return _ListFields ?? (_ListFields = new FieldCollection(Factory).SetRelation(false)); } set { _ListFields = value; } }
-
-        private static FieldCollection _FormFields;
-        /// <summary>表单字段过滤</summary>
-        protected static FieldCollection FormFields { get { return _FormFields ?? (_FormFields = new FieldCollection(Factory).SetRelation(true)); } set { _FormFields = value; } }
-
-        /// <summary>获取要显示的字段列表</summary>
-        /// <param name="isForm">是否是表单</param>
-        /// <returns></returns>
-        protected virtual IList<FieldItem> GetFields(Boolean isForm) => (isForm ? FormFields : ListFields) ?? Entity<TEntity>.Meta.Fields.ToList();
-        #endregion
-
-        #region 权限菜单
-        /// <summary>菜单顺序。扫描是会反射读取</summary>
-        protected static Int32 MenuOrder { get; set; }
-
-        /// <summary>自动从实体类拿到显示名</summary>
-        /// <param name="menu"></param>
-        /// <returns></returns>
-        protected override IDictionary<MethodInfo, Int32> ScanActionMenu(IMenu menu)
-        {
-            // 设置显示名
-            if (menu.DisplayName.IsNullOrEmpty())
-            {
-                menu.DisplayName = Entity<TEntity>.Meta.Table.DataTable.DisplayName;
-                menu.Visible = true;
-                //menu.Save();
-            }
-
-            var dic = base.ScanActionMenu(menu);
-
-            // 只写实体类过滤掉添删改权限
-            if (Factory.Table.DataTable.InsertOnly)
-            {
-                var arr = new[] { PermissionFlags.Insert, PermissionFlags.Update, PermissionFlags.Delete }.Select(e => (Int32)e).ToArray();
-                dic = dic.Where(e => !arr.Contains(e.Value)).ToDictionary(e => e.Key, e => e.Value);
-            }
-
-            return dic;
-        }
-        #endregion
-
-        #region 辅助
-        /// <summary>是否Json请求</summary>
-        protected virtual Boolean IsJsonRequest
-        {
-            get
-            {
-                if (Request.ContentType.EqualIgnoreCase("application/json")) return true;
-                if (Request.AcceptTypes.Any(e => e == "application/json")) return true;
-                if (Request["output"].EqualIgnoreCase("json")) return true;
-                if ((RouteData.Values["output"] + "").EqualIgnoreCase("json")) return true;
-
-                return false;
-            }
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Common/EntityModelBinder.cs b/NewLife.Cube/Common/EntityModelBinder.cs
deleted file mode 100644
index c0d4d664f8..0000000000
--- a/NewLife.Cube/Common/EntityModelBinder.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-﻿using System;
-using System.Linq;
-using System.Web;
-using System.Web.Mvc;
-using NewLife.Log;
-using NewLife.Reflection;
-using XCode;
-
-namespace NewLife.Cube
-{
-    /// <summary>实体模型绑定器。特殊处理XCode实体类</summary>
-    public class EntityModelBinder : DefaultModelBinder
-    {
-        /// <summary>创建模型。对于有Key的请求，使用FindByKeyForEdit方法先查出来数据，而不是直接反射实例化实体对象</summary>
-        /// <param name="controllerContext"></param>
-        /// <param name="bindingContext"></param>
-        /// <param name="modelType"></param>
-        /// <returns></returns>
-        protected override Object CreateModel(ControllerContext controllerContext, ModelBindingContext bindingContext, Type modelType)
-        {
-            if (modelType.As<IEntity>())
-            {
-                var fact = EntityFactory.CreateOperate(modelType);
-                if (fact != null)
-                {
-                    var rvs = controllerContext.RouteData.Values;
-                    var pks = fact.Table.PrimaryKeys;
-                    var uk = fact.Unique;
-
-                    IEntity entity = null;
-                    if (uk != null)
-                    {
-                        // 查询实体对象用于编辑
-                        if (rvs[uk.Name] != null) entity = GetEntity(fact.EntityType, rvs[uk.Name]) ?? fact.FindByKeyForEdit(rvs[uk.Name]);
-                        if (entity == null) entity = fact.Create();
-                    }
-                    else if (pks.Length > 0)
-                    {
-                        // 查询实体对象用于编辑
-                        var vs = pks.Select(e => rvs[e.Name]).ToArray();
-                        entity = GetEntity(fact.EntityType, vs);
-                        if (entity == null)
-                        {
-                            var req = controllerContext.HttpContext.Request;
-                            var exp = new WhereExpression();
-                            foreach (var item in pks)
-                            {
-                                exp &= item.Equal(req[item.Name].ChangeType(item.Type));
-                            }
-
-                            entity = fact.Find(exp);
-                        }
-                        if (entity == null) entity = fact.Create();
-                    }
-
-                    if (entity != null)
-                    {
-                        var fs = controllerContext.HttpContext.Request.Form;
-                        // 提前填充动态字段的扩展属性
-                        foreach (var item in fact.Fields)
-                        {
-                            if (item.IsDynamic && fs.AllKeys.Contains(item.Name)) entity.SetItem(item.Name, fs[item.Name]);
-                        }
-
-                        return entity;
-                    }
-
-                    return fact.Create();
-                }
-            }
-
-            return base.CreateModel(controllerContext, bindingContext, modelType);
-        }
-
-        private static String GetCacheKey(Type type, params Object[] keys)
-        {
-            return "CubeModel_{0}_{1}".F(type.FullName, keys.Join("_"));
-        }
-
-        /// <summary>呈现表单前，保存实体对象。提交时优先使用该对象而不是去数据库查找，避免脏写</summary>
-        /// <param name="entity"></param>
-        internal static void SetEntity(IEntity entity)
-        {
-            var ctx = HttpContext.Current;
-            var fact = EntityFactory.CreateOperate(entity.GetType());
-
-            var ckey = "";
-            var pks = fact.Table.PrimaryKeys;
-            var uk = fact.Unique;
-            if (uk != null)
-                ckey = GetCacheKey(entity.GetType(), entity[uk.Name]);
-            else if (pks.Length > 0)
-                ckey = GetCacheKey(entity.GetType(), pks.Select(e => entity[e.Name]).ToArray());
-
-            ctx.Session[ckey] = entity;
-        }
-
-        private static IEntity GetEntity(Type type, params Object[] keys)
-        {
-            var ctx = HttpContext.Current;
-            var ckey = GetCacheKey(type, keys);
-
-            return ctx.Session[ckey] as IEntity;
-        }
-    }
-
-    /// <summary>实体模型绑定器提供者，为所有XCode实体类提供实体模型绑定器</summary>
-    public class EntityModelBinderProvider : IModelBinderProvider
-    {
-        /// <summary>获取绑定器</summary>
-        /// <param name="modelType"></param>
-        /// <returns></returns>
-        public IModelBinder GetBinder(Type modelType)
-        {
-            if (modelType.As<IEntity>()) return new EntityModelBinder();
-
-            return null;
-        }
-
-        static EntityModelBinderProvider()
-        {
-            XTrace.WriteLine("注册实体模型绑定器：{0}", typeof(EntityModelBinderProvider).FullName);
-            ModelBinderProviders.BinderProviders.Add(new EntityModelBinderProvider());
-        }
-
-        /// <summary>注册到全局模型绑定器提供者集合</summary>
-        public static void Register()
-        {
-            // 引发静态构造，只执行一次
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Common/EntityTreeController.cs b/NewLife.Cube/Common/EntityTreeController.cs
deleted file mode 100644
index 1c19b3084c..0000000000
--- a/NewLife.Cube/Common/EntityTreeController.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-﻿using System;
-using System.ComponentModel;
-using System.Linq;
-using System.Reflection;
-using System.Web.Mvc;
-using NewLife.Reflection;
-using NewLife.Web;
-using XCode;
-using XCode.Membership;
-
-namespace NewLife.Cube
-{
-    /// <summary>实体树控制器基类</summary>
-    /// <typeparam name="TEntity"></typeparam>
-    public class EntityTreeController<TEntity> : EntityController<TEntity> where TEntity : EntityTree<TEntity>, new()
-    {
-        static EntityTreeController()
-        {
-            var type = typeof(TEntity);
-            var all = Entity<TEntity>.Meta.AllFields;
-            //var list = new List<FieldItem>();
-            var list = ListFields;
-            var set = type.GetValue("Setting") as IEntityTreeSetting;
-            var k = 0;
-            var names = new String[] { set.Key, "TreeNodeName" };
-            foreach (var item in names)
-            {
-                var fi = all.FirstOrDefault(e => e.Name.EqualIgnoreCase(item));
-                if (fi != null)
-                {
-                    if (list.Contains(fi)) list.Remove(fi);
-                    list.Insert(k++, fi);
-                }
-            }
-
-            foreach (var item in all)
-            {
-                if (set != null && item.Name.EqualIgnoreCase(set.Name, set.Parent))
-                {
-                    list.Remove(item);
-                    continue;
-                }
-
-                var pi = type.GetProperty(item.Name);
-                if (pi == null || pi.GetCustomAttribute<DisplayNameAttribute>() == null)
-                {
-                    list.Remove(item);
-                    continue;
-                }
-
-                //if (!list.Contains(item)) list.Insert(k++, item);
-            }
-
-            //ListFields.Clear();
-            //ListFields.AddRange(list);
-        }
-
-        /// <summary>列表页视图。子控制器可重载，以传递更多信息给视图，比如修改要显示的列</summary>
-        /// <param name="p"></param>
-        /// <returns></returns>
-        protected override ActionResult IndexView(Pager p)
-        {
-            // 一页显示全部菜单，取自缓存
-            p.PageSize = 10000;
-            ViewBag.Page = p;
-
-            var list = EntityTree<TEntity>.Root.AllChilds;
-
-            return View("ListTree", list);
-        }
-
-        ///// <summary>要导出Xml的对象</summary>
-        ///// <returns></returns>
-        //protected override Object OnExportXml()
-        //{
-        //    return EntityTree<TEntity>.Root.Childs;
-        //}
-
-        ///// <summary>要导出Json的对象</summary>
-        ///// <returns></returns>
-        //protected override Object OnExportJson()
-        //{
-        //    return EntityTree<TEntity>.Root.Childs;
-        //}
-
-        /// <summary>上升</summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        [DisplayName("上升")]
-        [EntityAuthorize(PermissionFlags.Update)]
-        public ActionResult Up(Int32 id)
-        {
-            var menu = FindByID(id);
-            menu.Up();
-
-            return RedirectToAction("Index");
-        }
-
-        /// <summary>下降</summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        [DisplayName("下降")]
-        [EntityAuthorize(PermissionFlags.Update)]
-        public ActionResult Down(Int32 id)
-        {
-            var menu = FindByID(id);
-            menu.Down();
-
-            return RedirectToAction("Index");
-        }
-
-        /// <summary>根据ID查找节点</summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        protected static TEntity FindByID(Int32 id)
-        {
-            var key = EntityTree<TEntity>.Meta.Unique.Name;
-            return EntityTree<TEntity>.Meta.Cache.Find(e => (Int32)e[key] == id);
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Common/FieldCollection.cs b/NewLife.Cube/Common/FieldCollection.cs
deleted file mode 100644
index 10bd3a321c..0000000000
--- a/NewLife.Cube/Common/FieldCollection.cs
+++ /dev/null
@@ -1,241 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using XCode;
-using XCode.Configuration;
-
-namespace NewLife.Cube
-{
-    /// <summary>字段集合</summary>
-    public class FieldCollection : List<FieldItem>
-    {
-        #region 属性
-        /// <summary>工厂</summary>
-        public IEntityOperate Factory { get; set; }
-        #endregion
-
-        #region 构造
-        /// <summary>使用工厂实例化一个字段集合</summary>
-        /// <param name="factory"></param>
-        public FieldCollection(IEntityOperate factory)
-        {
-            Factory = factory;
-            AddRange(Factory.Fields);
-        }
-        #endregion
-
-        #region 方法
-        /// <summary>设置扩展关系</summary>
-        /// <param name="isForm">是否表单使用</param>
-        /// <returns></returns>
-        public FieldCollection SetRelation(Boolean isForm)
-        {
-            var type = Factory.EntityType;
-            // 扩展属性
-            foreach (var pi in type.GetProperties())
-            {
-                ProcessRelation(pi, isForm);
-            }
-
-            if (!isForm)
-            {
-                // 长字段和密码字段不显示
-                NoPass();
-            }
-            else
-            {
-                RemoveCreateField();
-                RemoveUpdateField();
-                RemoveRemarkField();
-            }
-
-            // IP地址字段
-            ProcessIP();
-
-            return this;
-        }
-
-        void ProcessRelation(PropertyInfo pi, Boolean isForm)
-        {
-            // 处理带有Map特性的扩展属性
-            var map = pi.GetCustomAttribute<MapAttribute>();
-            if (map == null) return;
-
-            // 如果是本实体类关系，可以覆盖
-            //if (map.Provider == null)
-            //{
-            //    if (!isForm || pi.CanWrite) Replace(map.Name, pi.Name);
-            //}
-            //else
-            //{
-            //    if (isForm) Replace(map.Name, pi.Name);
-            //}
-            Replace(map.Name, pi.Name);
-
-            // 如果没有标注Map特性，那就算了吧
-            //var type = Factory.EntityType;
-            //var fact = EntityFactory.CreateOperate(map.Provider.EntityType);
-            //if (fact != null && fact.Master != null)
-            //{
-            //    // 找到扩展表主字段是否属于当前实体类扩展属性
-            //    // 首先用对象扩展属性名加上外部主字段名
-            //    var master = type.GetProperty(pi.Name + fact.Master.Name);
-            //    // 再用外部类名加上外部主字段名
-            //    if (master == null) master = type.GetProperty(map.Provider.EntityType.Name + fact.Master.Name);
-            //    // 再试试加上Name
-            //    if (master == null) master = type.GetProperty(pi.Name + "Name");
-            //    if (master != null)
-            //    {
-            //        if (!isForm)
-            //        {
-            //            // 去掉本地用于映射的字段（如果不是主键），替换为扩展属性
-            //            Replace(map.Column, master.Name);
-            //        }
-            //        else
-            //        {
-            //            // 加到后面
-            //            AddField(map.Column, master.Name);
-            //        }
-            //    }
-            //}
-        }
-
-        void NoPass()
-        {
-            for (var i = Count - 1; i >= 0; i--)
-            {
-                var fi = this[i];
-                if (fi.IsDataObjectField && fi.Type == typeof(String))
-                {
-                    if (fi.Length <= 0 || fi.Length > 200 ||
-                        fi.Name.EqualIgnoreCase("password", "pass"))
-                    {
-                        RemoveAt(i);
-                    }
-                }
-            }
-        }
-
-        void ProcessIP()
-        {
-            for (var i = Count - 1; i >= 0; i--)
-            {
-                if (this[i].Name.EndsWithIgnoreCase("IP", "Uri"))
-                {
-                    var name = this[i].Name.TrimEnd("IP", "Uri");
-                    name += "Address";
-                    var addr = Factory.AllFields.FirstOrDefault(e => e.Name.EqualIgnoreCase(name));
-                    // 加到后面
-                    if (addr != null) Insert(i + 1, addr);
-                }
-            }
-        }
-        #endregion
-
-        #region 添加删除替换
-        /// <summary>从AllFields中添加字段，可以是扩展属性</summary>
-        /// <param name="name"></param>
-        /// <returns></returns>
-        public FieldCollection AddField(String name)
-        {
-            var fi = Factory.AllFields.FirstOrDefault(e => e.Name.EqualIgnoreCase(name));
-            if (fi != null) Add(fi);
-
-            return this;
-        }
-
-        /// <summary>在指定字段之后添加扩展属性</summary>
-        /// <param name="oriName"></param>
-        /// <param name="newName"></param>
-        /// <returns></returns>
-        public FieldCollection AddField(String oriName, String newName)
-        {
-            for (var i = 0; i < Count; i++)
-            {
-                if (this[i].Name.EqualIgnoreCase(oriName))
-                {
-                    var fi = Factory.AllFields.FirstOrDefault(e => e.Name.EqualIgnoreCase(newName));
-                    if (fi != null) Insert(i + 1, fi);
-                    break;
-                }
-            }
-
-            return this;
-        }
-
-        /// <summary>删除字段</summary>
-        /// <param name="name"></param>
-        /// <returns></returns>
-        public FieldCollection RemoveField(String name)
-        {
-            RemoveAll(e => e.Name.EqualIgnoreCase(name) || e.ColumnName.EqualIgnoreCase(name));
-
-            return this;
-        }
-
-        /// <summary>操作字段列表，把旧项换成新项</summary>
-        /// <param name="oriName"></param>
-        /// <param name="newName"></param>
-        /// <returns></returns>
-        public FieldCollection Replace(String oriName, String newName)
-        {
-            var idx = FindIndex(e => e.Name.EqualIgnoreCase(oriName));
-            if (idx < 0) return this;
-
-            var fi = Factory.AllFields.FirstOrDefault(e => e.Name.EqualIgnoreCase(newName));
-            // 如果没有找到新项，则删除旧项
-            if (fi == null)
-            {
-                RemoveAt(idx);
-                return this;
-            }
-            // 如果本身就存在目标项，则删除旧项
-            if (Contains(fi))
-            {
-                RemoveAt(idx);
-                return this;
-            }
-
-            this[idx] = fi;
-
-            return this;
-        }
-        #endregion
-
-        #region 创建信息/更新信息
-        /// <summary>设置是否显示创建信息</summary>
-        /// <returns></returns>
-        public FieldCollection RemoveCreateField()
-        {
-            var rs = RemoveAll(e => e.Name.EqualIgnoreCase("CreateUserID"));
-            if (rs > 0) RemoveAll(e => e.Name.EqualIgnoreCase("CreateTime"));
-
-            RemoveAll(e => e.Name.EqualIgnoreCase("CreateIP"));
-
-            return this;
-        }
-
-        /// <summary>设置是否显示更新信息</summary>
-        /// <returns></returns>
-        public FieldCollection RemoveUpdateField()
-        {
-            var rs = RemoveAll(e => e.Name.EqualIgnoreCase("UpdateUserID"));
-            if (rs > 0) RemoveAll(e => e.Name.EqualIgnoreCase("UpdateTime"));
-
-            RemoveAll(e => e.Name.EqualIgnoreCase("UpdateIP"));
-
-            return this;
-        }
-
-        /// <summary>设置是否显示备注信息</summary>
-        /// <returns></returns>
-        public FieldCollection RemoveRemarkField()
-        {
-            RemoveAll(e => e.Name.EqualIgnoreCase("Remark", "Description"));
-
-            return this;
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Common/HtmlExtensions.cs b/NewLife.Cube/Common/HtmlExtensions.cs
deleted file mode 100644
index 7e8396e61a..0000000000
--- a/NewLife.Cube/Common/HtmlExtensions.cs
+++ /dev/null
@@ -1,582 +0,0 @@
-﻿using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Text;
-using System.Web.Mvc;
-using System.Web.Mvc.Html;
-using System.Web.Routing;
-using NewLife.Reflection;
-using NewLife.Web;
-using XCode;
-using XCode.Configuration;
-
-namespace NewLife.Cube
-{
-    /// <summary>Html扩展</summary>
-    public static class HtmlExtensions
-    {
-        /// <summary>输出编辑框</summary>
-        /// <param name="Html"></param>
-        /// <param name="name"></param>
-        /// <param name="value"></param>
-        /// <param name="type"></param>
-        /// <param name="format"></param>
-        /// <param name="htmlAttributes"></param>
-        /// <returns></returns>
-        public static MvcHtmlString ForEditor(this HtmlHelper Html, String name, Object value, Type type = null, String format = null, Object htmlAttributes = null)
-        {
-            if (type == null && value != null) type = value.GetType();
-            if (type == null) new XException("设计错误！ForEditor({0}, null, null)不能值和类型同时为空，否则会导致死循环", name);
-
-            switch (Type.GetTypeCode(type))
-            {
-                case TypeCode.Boolean:
-                    return Html.ForBoolean(name, value.ToBoolean());
-                case TypeCode.DateTime:
-                    return Html.ForDateTime(name, value.ToDateTime());
-                case TypeCode.Decimal:
-                    return Html.ForDecimal(name, Convert.ToDecimal(value));
-                case TypeCode.Single:
-                case TypeCode.Double:
-                    return Html.ForDouble(name, value.ToDouble());
-                case TypeCode.Byte:
-                case TypeCode.SByte:
-                case TypeCode.Int16:
-                case TypeCode.Int32:
-                case TypeCode.Int64:
-                case TypeCode.UInt16:
-                case TypeCode.UInt32:
-                case TypeCode.UInt64:
-                    if (type.IsEnum)
-                        return Html.ForEnum(name, value, format);
-                    else
-                        return Html.ForInt(name, Convert.ToInt64(value));
-                case TypeCode.String:
-                    return Html.ForString(name, value + "");
-                default:
-                    return Html.ForObject(name, value);
-            }
-        }
-
-        /// <summary>输出编辑框</summary>
-        /// <param name="Html"></param>
-        /// <param name="expression"></param>
-        /// <param name="htmlAttributes"></param>
-        /// <returns></returns>
-        public static MvcHtmlString ForEditor<TModel, TProperty>(this HtmlHelper<TModel> Html, Expression<Func<TModel, TProperty>> expression, Object htmlAttributes = null)
-        {
-            var meta = ModelMetadata.FromLambdaExpression(expression, Html.ViewData);
-            var name = meta.PropertyName;
-            var pi = typeof(TModel).GetProperty(name);
-
-            return Html.ForEditor(name, Html.ViewData.Model.GetValue(pi), pi.PropertyType, null, htmlAttributes);
-        }
-
-        /// <summary>输出编辑框</summary>
-        /// <param name="Html"></param>
-        /// <param name="field"></param>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        public static MvcHtmlString ForEditor(this HtmlHelper Html, FieldItem field, IEntity entity = null)
-        {
-            if (entity == null) entity = Html.ViewData.Model as IEntity;
-
-            // 优先处理映射。因为映射可能是字符串
-            {
-                var mhs = ForMap(Html, field, entity);
-                if (mhs != null) return mhs;
-            }
-
-            if (field.ReadOnly)
-            {
-                var label = "<label class=\"form-control\">{0}</label>".F(entity[field.Name]);
-                return new MvcHtmlString(label);
-            }
-
-            if (field.Type == typeof(String) && (field.Length <= 0 || field.Length > 300))
-            {
-                return Html.ForString(field.Name, (String)entity[field.Name], field.Length);
-            }
-
-            // 如果是实体树，并且当前是父级字段，则生产下拉
-            if (entity is IEntityTree)
-            {
-                var mhs = ForTreeEditor(Html, field, entity as IEntityTree);
-                if (mhs != null) return mhs;
-            }
-            //// 如果有表间关系，且是当前字段，则产生关联下拉
-            //if (field.Table.DataTable.Relations.Count > 0)
-            //{
-            //    var mhs = ForRelation(Html, field, entity);
-            //    if (mhs != null) return mhs;
-            //}
-
-            return Html.ForEditor(field.Name, entity[field.Name], field.Type);
-        }
-
-        private static MvcHtmlString ForTreeEditor(HtmlHelper Html, FieldItem field, IEntityTree entity)
-        {
-            var fact = EntityFactory.CreateOperate(entity.GetType());
-            var set = entity.GetType().GetValue("Setting") as IEntityTreeSetting;
-            if (set == null || set.Parent != field.Name) return null;
-
-            var root = entity.GetType().GetValue("Root") as IEntityTree;
-            // 找到完整菜单树，但是排除当前节点这个分支
-            var list = root.FindAllChildsExcept(entity as IEntityTree);
-            var data = new SelectList(list, set.Key, "TreeNodeText", entity[field.Name]);
-            return Html.DropDownList(field.Name, data, new { @class = "multiselect" });
-        }
-
-        private static MvcHtmlString ForMap(HtmlHelper Html, FieldItem field, IEntity entity)
-        {
-            var map = field.Map;
-            // 为该字段创建下拉菜单
-            if (map == null || map.Provider == null) return null;
-
-            // 如果映射目标列表项过多，不能使用下拉
-            var fact = EntityFactory.CreateOperate(map.Provider.EntityType);
-            if (fact != null && fact.Count > 30)
-            {
-                // 输出数字编辑框和标签
-                var label = "<label class=\"\">{0}</label>".F(entity[field.Name]);
-                if (field.OriField != null) field = field.OriField;
-                var mhs = Html.ForEditor(field.Name, entity[field.Name], field.Type);
-                return new MvcHtmlString(mhs.ToString() + label);
-            }
-
-            return Html.ForDropDownList(map.Name, map.Provider.GetDataSource(), entity[map.Name]);
-        }
-
-        //private static MvcHtmlString ForRelation(HtmlHelper Html, FieldItem field, IEntity entity)
-        //{
-        //    var dr = field.Table.DataTable.Relations.FirstOrDefault(e => e.Column.EqualIgnoreCase(field.Name));
-        //    // 为该字段创建下拉菜单
-        //    if (dr == null) return null;
-
-        //    var rt = EntityFactory.CreateOperate(dr.RelationTable);
-        //    var list = rt.FindAllWithCache();
-        //    var data = new SelectList(list, dr.RelationColumn, rt.Master.Name, entity[field.Name]);
-        //    return Html.DropDownList(field.Name, data, field.IsNullable ? "无" : null, new { @class = "multiselect" });
-        //}
-
-        /// <summary>输出编辑框</summary>
-        /// <param name="Html"></param>
-        /// <param name="name"></param>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        public static MvcHtmlString ForEditor(this HtmlHelper Html, String name, IEntity entity = null)
-        {
-            if (entity == null) entity = Html.ViewData.Model as IEntity;
-
-            var fact = EntityFactory.CreateOperate(entity.GetType());
-            var field = fact.Table.FindByName(name);
-
-            return Html.ForEditor(field, entity);
-        }
-
-        /// <summary>输出复杂对象</summary>
-        /// <param name="Html"></param>
-        /// <param name="name"></param>
-        /// <param name="value"></param>
-        /// <returns></returns>
-        public static MvcHtmlString ForObject(this HtmlHelper Html, String name, Object value)
-        {
-            if (value == null || Type.GetTypeCode(value.GetType()) != TypeCode.Object) return Html.ForEditor(name, value);
-
-            var pis = value.GetType().GetProperties(true);
-            pis = pis.Where(pi => pi.CanWrite).ToArray();
-
-            var sb = new StringBuilder();
-            var txt = Html.Label(name);
-            foreach (var pi in pis)
-            {
-                var pname = "{0}_{1}".F(name, pi.Name);
-
-                sb.AppendLine("<div class=\"form-group\">");
-                sb.AppendLine(Html.Label(pi.Name, pi.GetDisplayName(), new { @class = "control-label col-md-2" }).ToString());
-                sb.AppendLine("<div class=\"input-group col-md-8\">");
-                sb.AppendLine(Html.ForEditor(pi.Name, value.GetValue(pi), pi.PropertyType).ToString());
-
-                var des = pi.GetDescription();
-                if (!des.IsNullOrEmpty())
-                {
-                    sb.AppendFormat("<span>&nbsp;{0}</span>", des);
-                    sb.AppendLine();
-                }
-
-                sb.AppendLine("</div>");
-                sb.AppendLine("</div>");
-            }
-
-            return new MvcHtmlString(sb.ToString());
-        }
-
-        #region 基础属性
-        /// <summary>输出字符串</summary>
-        /// <param name="Html"></param>
-        /// <param name="name"></param>
-        /// <param name="value"></param>
-        /// <param name="length"></param>
-        /// <param name="htmlAttributes"></param>
-        /// <returns></returns>
-        public static MvcHtmlString ForString(this HtmlHelper Html, String name, String value, Int32 length = 0, Object htmlAttributes = null)
-        {
-            var atts = HtmlHelper.AnonymousObjectToHtmlAttributes(htmlAttributes);
-            //if (!atts.ContainsKey("class")) atts.Add("class", "col-xs-10 col-sm-5");
-            //if (!atts.ContainsKey("class")) atts.Add("class", "col-xs-12 col-sm-8 col-md-6 col-lg-4");
-            if (!atts.ContainsKey("class")) atts.Add("class", "form-control");
-
-            // 首先输出图标
-            var ico = "";
-
-            MvcHtmlString txt = null;
-            if (name.EqualIgnoreCase("Pass", "Password"))
-            {
-                txt = Html.Password(name, (String)value, atts);
-            }
-            else if (name.EqualIgnoreCase("Phone"))
-            {
-                ico = "<span class=\"input-group-addon\"><i class=\"glyphicon glyphicon-phone-alt\"></i></span>";
-                if (!atts.ContainsKey("type")) atts.Add("type", "tel");
-                txt = Html.TextBox(name, value, atts);
-            }
-            else if (name.EqualIgnoreCase("MobilePhone", "CellularPhone"))
-            {
-                ico = "<span class=\"input-group-addon\"><i class=\"glyphicon glyphicon-phone\"></i></span>";
-                if (!atts.ContainsKey("type")) atts.Add("type", "tel");
-                txt = Html.TextBox(name, value, atts);
-            }
-            else if (name.EqualIgnoreCase("email", "mail"))
-            {
-                ico = "<span class=\"input-group-addon\"><i class=\"glyphicon glyphicon-envelope\"></i></span>";
-                if (!atts.ContainsKey("type")) atts.Add("type", "email");
-                txt = Html.TextBox(name, value, atts);
-            }
-            else if (name.EndsWithIgnoreCase("url"))
-            {
-                ico = "<span class=\"input-group-addon\"><i class=\"glyphicon glyphicon-home\"></i></span>";
-                //if (!atts.ContainsKey("type")) atts.Add("type", "url");
-                txt = Html.TextBox(name, value, atts);
-            }
-            else if (length < 0 || length > 300)
-            {
-                txt = Html.TextArea(name, value, 3, 20, atts);
-            }
-            else
-            {
-                txt = Html.TextBox(name, value, atts);
-            }
-            var icog = "<div class=\"input-group\">{0}</div>";
-            var html = !String.IsNullOrWhiteSpace(ico) ? String.Format(icog, ico.ToString() + txt.ToString()) : txt.ToString();
-            return new MvcHtmlString(html);
-        }
-
-        /// <summary>输出整数</summary>
-        /// <param name="Html"></param>
-        /// <param name="name"></param>
-        /// <param name="value"></param>
-        /// <param name="format"></param>
-        /// <param name="htmlAttributes"></param>
-        /// <returns></returns>
-        public static MvcHtmlString ForInt(this HtmlHelper Html, String name, Int64 value, String format = null, Object htmlAttributes = null)
-        {
-            var atts = HtmlHelper.AnonymousObjectToHtmlAttributes(htmlAttributes);
-            if (!atts.ContainsKey("class")) atts.Add("class", "form-control");
-            if (!atts.ContainsKey("role")) atts.Add("role", "number");
-
-            return Html.TextBox(name, value, format, atts);
-        }
-
-        /// <summary>时间日期输出</summary>
-        /// <param name="Html"></param>
-        /// <param name="name"></param>
-        /// <param name="value"></param>
-        /// <param name="format"></param>
-        /// <param name="htmlAttributes"></param>
-        /// <returns></returns>
-        public static MvcHtmlString ForDateTime(this HtmlHelper Html, String name, DateTime value, String format = null, Object htmlAttributes = null)
-        {
-            //var fullHtmlFieldName = Html.ViewContext.ViewData.TemplateInfo.GetFullHtmlFieldName(name);
-            //if (String.IsNullOrEmpty(fullHtmlFieldName))
-            //    throw new ArgumentException("", "name");
-
-            var atts = HtmlHelper.AnonymousObjectToHtmlAttributes(htmlAttributes);
-            //if (!atts.ContainsKey("type")) atts.Add("type", "date");
-            if (!atts.ContainsKey("class")) atts.Add("class", "form-control date form_datetime");
-
-            var obj = value.ToFullString();
-            // 最小时间不显示
-            if (value <= DateTime.MinValue || value.Year <= 1900) obj = "";
-            //if (format.IsNullOrWhiteSpace()) format = "yyyy-MM-dd HH:mm:ss";
-
-            // 首先输出图标
-            var ico = Html.Raw("<span class=\"input-group-addon\"><i class=\"fa fa-calendar\"></i></span>");
-
-            var txt = Html.TextBox(name, obj, format, atts);
-            //var txt = BuildInput(InputType.Text, name, obj, atts);
-
-            return new MvcHtmlString(ico.ToString() + txt);
-        }
-
-        /// <summary>时间日期输出</summary>
-        /// <typeparam name="TModel"></typeparam>
-        /// <typeparam name="TProperty"></typeparam>
-        /// <param name="Html"></param>
-        /// <param name="expression"></param>
-        /// <param name="format"></param>
-        /// <param name="htmlAttributes"></param>
-        /// <returns></returns>
-        public static MvcHtmlString ForDateTime<TModel, TProperty>(this HtmlHelper<TModel> Html, Expression<Func<TModel, TProperty>> expression, String format = null, Object htmlAttributes = null)
-        {
-            var meta = ModelMetadata.FromLambdaExpression(expression, Html.ViewData);
-            var entity = Html.ViewData.Model as IEntity;
-            var value = (DateTime)entity[meta.PropertyName];
-
-            return Html.ForDateTime(meta.PropertyName, value, format, htmlAttributes);
-        }
-
-        /// <summary>输出布尔型</summary>
-        /// <param name="Html"></param>
-        /// <param name="name"></param>
-        /// <param name="value"></param>
-        /// <param name="htmlAttributes"></param>
-        /// <returns></returns>
-        public static MvcHtmlString ForBoolean(this HtmlHelper Html, String name, Boolean value, Object htmlAttributes = null)
-        {
-            var atts = HtmlHelper.AnonymousObjectToHtmlAttributes(htmlAttributes);
-            if (!atts.ContainsKey("class")) atts.Add("class", "chkSwitch");
-            // 因为得不到很好的样式支撑，暂时去掉CheckBox的Boostrap样式
-            //if (!atts.ContainsKey("class")) atts.Add("class", "form-control");
-            //var html="<div><label><input name=\"{0}\" value=\"{1}\" type=\"checkbox\" class=\"ace\"><span class=\"lbl\"> Latest news and announcements</span></label></div>";
-            return Html.CheckBox(name, value, atts);
-        }
-
-        /// <summary>输出货币类型</summary>
-        /// <param name="Html"></param>
-        /// <param name="name"></param>
-        /// <param name="value"></param>
-        /// <param name="format"></param>
-        /// <param name="htmlAttributes"></param>
-        /// <returns></returns>
-        public static MvcHtmlString ForDecimal(this HtmlHelper Html, String name, Decimal value, String format = null, Object htmlAttributes = null)
-        {
-            var atts = HtmlHelper.AnonymousObjectToHtmlAttributes(htmlAttributes);
-            if (!atts.ContainsKey("class")) atts.Add("class", "form-control");
-
-            // 首先输出图标
-            var ico = Html.Raw("<span class=\"input-group-addon\"><i class=\"glyphicon glyphicon-yen\"></i></span>");
-            var txt = Html.TextBox(name, value, format, atts);
-
-            return new MvcHtmlString(ico.ToString() + txt);
-        }
-
-        /// <summary>输出浮点数</summary>
-        /// <param name="Html"></param>
-        /// <param name="name"></param>
-        /// <param name="value"></param>
-        /// <param name="format"></param>
-        /// <param name="htmlAttributes"></param>
-        /// <returns></returns>
-        public static MvcHtmlString ForDouble(this HtmlHelper Html, String name, Double value, String format = null, Object htmlAttributes = null)
-        {
-            var atts = HtmlHelper.AnonymousObjectToHtmlAttributes(htmlAttributes);
-            if (!atts.ContainsKey("class")) atts.Add("class", "form-control");
-
-            var txt = Html.TextBox(name, value, format, atts);
-
-            return txt;
-        }
-        #endregion
-
-        #region 专有属性
-        /// <summary>输出描述</summary>
-        /// <param name="Html"></param>
-        /// <param name="field"></param>
-        /// <returns></returns>
-        public static MvcHtmlString ForDescription(this HtmlHelper Html, FieldItem field)
-        {
-            var des = field.Description.TrimStart(field.DisplayName).TrimStart(",", ".", "，", "。");
-            if (des.IsNullOrWhiteSpace()) return new MvcHtmlString(null);
-
-            if (field.Type == typeof(Boolean))
-                return Html.Label(field.Name, des);
-            else
-                return new MvcHtmlString("<span class=\"middle\">{0}</span>".F(des));
-        }
-
-        /// <summary>输出描述</summary>
-        /// <param name="Html"></param>
-        /// <param name="name"></param>
-        /// <returns></returns>
-        public static MvcHtmlString ForDescription(this HtmlHelper Html, String name)
-        {
-            var entity = Html.ViewData.Model as IEntity;
-
-            var fact = EntityFactory.CreateOperate(entity.GetType());
-            var field = fact.Table.FindByName(name);
-
-            return Html.ForDescription(field);
-        }
-
-        /// <summary>枚举</summary>
-        /// <param name="Html"></param>
-        /// <param name="name"></param>
-        /// <param name="value"></param>
-        /// <param name="label"></param>
-        /// <returns></returns>
-        public static MvcHtmlString ForEnum(this HtmlHelper Html, String name, Object value, String label = null)
-        {
-            var dic = System.EnumHelper.GetDescriptions(value.GetType());
-            var data = new SelectList(dic, "Key", "Value", value.ToInt());
-            // 由于 Html.DropDownList 获取默认值，会从 ViewData，ViewData.Model，中获取name的值
-            // 如果获取到了，则不会再看传入的selectlist的默认值，由于此处是枚举，所以通过 Html.ViewData.Eval(name) 会得到字符串值，所以导致绑定默认值失败
-            // 通过 Html.ViewData[name]=(Int32)value，可以让  Html.DropDownList 优先拿到手动设置的值，就不会再从 ViewData.Model 里面找
-            // 当然这里会有一个问题，如果外部同样设置ViewData[name]，则就会出现潜在的bug,所以把之前值保存到oldvalue
-            var oldvalue = Html.ViewData[name];
-            Html.ViewData[name] = value.ToInt();
-            var hmstr = Html.DropDownList(name, data, label, new { @class = "multiselect" });
-
-            //还原ViewData现场
-            if (oldvalue != null)
-                // 如果外部刚好设置这个值，则还原
-                Html.ViewData[name] = oldvalue;
-            else
-                // 输出html后，删除垃圾
-                Html.ViewData.Remove(name);
-            return hmstr;
-        }
-
-        /// <summary>枚举多选，支持默认全选或不选。需要部分选中可使用ForListBox</summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="Html"></param>
-        /// <param name="name"></param>
-        /// <param name="selectAll">是否全部选中。默认false</param>
-        /// <param name="autoPostback">自动回发</param>
-        /// <returns></returns>
-        public static MvcHtmlString ForEnum<T>(this HtmlHelper Html, String name, Boolean selectAll = false, Boolean autoPostback = false)
-        {
-            var dic = System.EnumHelper.GetDescriptions(typeof(T));
-
-            IEnumerable values = null;
-            var vs = WebHelper.Params[name].SplitAsInt();
-            if (vs != null && vs.Length > 0)
-                values = vs;
-            else if (selectAll)
-            {
-                var arr = Enum.GetValues(typeof(T)) as T[];
-                values = arr.Cast<Int32>().ToArray();
-            }
-
-            return Html.ForListBox(name, dic, values, autoPostback);
-        }
-        #endregion
-
-        #region 下拉列表
-        /// <summary>字典的下拉列表</summary>
-        /// <param name="Html"></param>
-        /// <param name="name"></param>
-        /// <param name="items"></param>
-        /// <param name="selectedValue"></param>
-        /// <param name="optionLabel">默认空项的文本。此参数可以为 null。</param>
-        /// <param name="autoPostback">自动回发</param>
-        /// <returns></returns>
-        public static MvcHtmlString ForDropDownList(this HtmlHelper Html, String name, IEnumerable items, Object selectedValue = null, String optionLabel = null, Boolean autoPostback = false)
-        {
-            SelectList data = null;
-            if (items is IDictionary)
-                data = new SelectList(items, "Key", "Value", selectedValue);
-            else
-                data = new SelectList(items, selectedValue);
-
-            var atts = new Dictionary<String, Object>();
-            if (Setting.Current.BootstrapSelect)
-                atts.Add("class", "multiselect");
-            else
-                atts.Add("class", "form-control");
-
-            // 处理自动回发
-            //if (autoPostback) atts.Add("onchange", "$(':submit').click();");
-            // 一个页面可能存在多个表单，比如搜索区和分页区
-            // Support By Dark Li(858587868) / 老牛(65485989)
-            if (autoPostback) atts.Add("onchange", "$(this).parents('form').submit();");
-
-            return Html.DropDownList(name, data, optionLabel, atts);
-        }
-
-        /// <summary>实体列表的下拉列表。单选，自动匹配当前模型的选中项</summary>
-        /// <param name="Html"></param>
-        /// <param name="name"></param>
-        /// <param name="list"></param>
-        /// <param name="optionLabel"></param>
-        /// <param name="autoPostback">自动回发</param>
-        /// <returns></returns>
-        public static MvcHtmlString ForDropDownList(this HtmlHelper Html, String name, IList<IEntity> list, String optionLabel = null, Boolean autoPostback = false)
-        {
-            var entity = Html.ViewData.Model as IEntity;
-            var selectedValue = entity == null ? WebHelper.Params[name] : entity[name];
-
-            var atts = new Dictionary<String, Object>();
-            if (Setting.Current.BootstrapSelect)
-                atts.Add("class", "multiselect");
-            else
-                atts.Add("class", "form-control");
-
-            // 处理自动回发
-            //if (autoPostback) atts.Add("onchange", "$(':submit').click();");
-            if (autoPostback) atts.Add("onchange", "$(this).parents('form').submit();");
-
-            var data = new SelectList(list.ToDictionary(), "Key", "Value", selectedValue);
-            return Html.DropDownList(name, data, optionLabel, atts);
-        }
-
-        /// <summary>字典的下拉列表</summary>
-        /// <param name="Html"></param>
-        /// <param name="name"></param>
-        /// <param name="dic"></param>
-        /// <param name="selectedValues"></param>
-        /// <param name="autoPostback">自动回发</param>
-        /// <returns></returns>
-        public static MvcHtmlString ForListBox(this HtmlHelper Html, String name, IDictionary dic, IEnumerable selectedValues, Boolean autoPostback = false)
-        {
-            var atts = new RouteValueDictionary();
-            if (Setting.Current.BootstrapSelect)
-                atts.Add("class", "multiselect");
-            else
-                atts.Add("class", "form-control");
-
-            atts.Add("multiple", "");
-            // 处理自动回发
-            if (autoPostback) atts.Add("onchange", "$(':submit').click();");
-
-            return Html.ListBox(name, new MultiSelectList(dic, "Key", "Value", selectedValues), atts);
-        }
-
-        /// <summary>实体列表的下拉列表。多选，自动匹配当前模型的选中项，支持数组类型或字符串类型（自动分割）的选中项</summary>
-        /// <param name="Html"></param>
-        /// <param name="name"></param>
-        /// <param name="list"></param>
-        /// <param name="autoPostback">自动回发</param>
-        /// <returns></returns>
-        public static MvcHtmlString ForListBox(this HtmlHelper Html, String name, IList<IEntity> list, Boolean autoPostback = false)
-        {
-            var entity = Html.ViewData.Model as IEntity;
-            var vs = entity == null ? WebHelper.Params[name] : entity[name];
-            // 如果是字符串，分割为整型数组，全局约定逗号分割
-            if (vs is String) vs = (vs as String).SplitAsInt();
-
-            var atts = new RouteValueDictionary();
-            if (Setting.Current.BootstrapSelect)
-                atts.Add("class", "multiselect");
-            else
-                atts.Add("class", "form-control");
-            atts.Add("multiple", "");
-            // 处理自动回发
-            if (autoPostback) atts.Add("onchange", "$(':submit').click();");
-
-            return Html.ListBox(name, new MultiSelectList(list.ToDictionary(), "Key", "Value", vs as IEnumerable), atts);
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Common/MembershipExtensions.cs b/NewLife.Cube/Common/MembershipExtensions.cs
deleted file mode 100644
index 6103a8da78..0000000000
--- a/NewLife.Cube/Common/MembershipExtensions.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-﻿using System;
-using System.Web.Mvc;
-using XCode.Membership;
-
-namespace NewLife.Cube
-{
-    /// <summary>用户扩展</summary>
-    public static class MembershipExtensions
-    {
-        /// <summary>用户只有拥有当前菜单的指定权限</summary>
-        /// <param name="user">指定用户</param>
-        /// <param name="flags">是否拥有多个权限中的任意一个，或的关系。如果需要表示与的关系，可以传入一个多权限位合并</param>
-        /// <returns></returns>
-        [Obsolete]
-        public static Boolean Has(this IUser user, params PermissionFlags[] flags)
-        {
-            if (user == null || user.Role == null) return false;
-
-            var menu = ManageProvider.Menu.Current;
-            if (menu == null) throw new Exception("无法定位当前权限菜单！");
-
-            // 如果没有指定权限子项，则指判断是否拥有资源
-            if (flags == null || flags.Length == 0) return user.Role.Has(menu.ID);
-
-            //return user.Role.Has(menu.ID, flag);
-            foreach (var item in flags)
-            {
-                // 菜单必须拥有这些权限位才行
-                if (menu.Permissions.ContainsKey((Int32)item))
-                {
-                    // 如果判断None，则直接返回
-                    if (item == PermissionFlags.None) return true;
-
-                    if (user.Role.Has(menu.ID, item)) return true;
-                }
-            }
-            return false;
-        }
-
-        /// <summary>用户只有拥有当前菜单的指定权限</summary>
-        /// <param name="user">指定用户</param>
-        /// <param name="respath"></param>
-        /// <param name="flags">是否拥有多个权限中的任意一个，或的关系。如果需要表示与的关系，可以传入一个多权限位合并</param>
-        /// <returns></returns>
-        [Obsolete]
-        public static Boolean Has(this IUser user, String respath, params PermissionFlags[] flags)
-        {
-            if (user == null || user.Role == null) return false;
-
-            var menu = ManageProvider.Menu.Root.FindByPath(respath);
-            if (menu == null) throw new XException("无法定位权限菜单{0}！", respath);
-
-            // 如果没有指定权限子项，则指判断是否拥有资源
-            if (flags == null || flags.Length == 0) return user.Role.Has(menu.ID);
-
-            foreach (var item in flags)
-            {
-                // 菜单必须拥有这些权限位才行
-                if (menu.Permissions.ContainsKey((Int32)item))
-                {
-                    // 如果判断None，则直接返回
-                    if (item == PermissionFlags.None) return true;
-
-                    if (user.Role.Has(menu.ID, item)) return true;
-                }
-            }
-            return false;
-        }
-
-        /// <summary>用户只有拥有当前菜单的指定权限</summary>
-        /// <param name="page">页面</param>
-        /// <param name="flags">是否拥有多个权限中的任意一个，或的关系。如果需要表示与的关系，可以传入一个多权限位合并</param>
-        /// <returns></returns>
-        public static Boolean Has(this WebViewPage page, params PermissionFlags[] flags)
-        {
-            // 没有用户时无权
-            var user = page.ViewBag.User as IUser ?? page.User.Identity as IUser;
-            if (user == null) return false;
-
-            // 没有菜单时不做权限控制
-            var menu = page.ViewBag.Menu as IMenu;
-            if (menu == null) return true;
-
-            return user.Has(menu, flags);
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Common/MvcHandleErrorAttribute.cs b/NewLife.Cube/Common/MvcHandleErrorAttribute.cs
deleted file mode 100644
index 07f97ceb8a..0000000000
--- a/NewLife.Cube/Common/MvcHandleErrorAttribute.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Web;
-using System.Web.Mvc;
-using NewLife.Log;
-
-namespace NewLife.Cube
-{
-    /// <summary>拦截错误的特性</summary>
-    public class MvcHandleErrorAttribute : HandleErrorAttribute
-    {
-        private static HashSet<String> NotFoundFiles = new HashSet<String>(StringComparer.OrdinalIgnoreCase);
-
-        /// <summary>拦截异常</summary>
-        /// <param name="ctx"></param>
-        public override void OnException(ExceptionContext ctx)
-        {
-            if (ctx.ExceptionHandled) return;
-
-            //XTrace.WriteException(ctx.Exception);
-            var ex = ctx.Exception?.GetTrue();
-            if (ex != null)
-            {
-                // 避免反复出现缺少文件
-                if (ex is HttpException hex && (UInt32)hex.ErrorCode == 0x80004005)
-                {
-                    var url = HttpContext.Current.Request.RawUrl + "";
-                    if (!NotFoundFiles.Contains(url))
-                        NotFoundFiles.Add(url);
-                    else
-                        ex = null;
-                }
-
-                // 拦截没有权限
-                if (ex is NoPermissionException nex)
-                {
-                    ctx.Result = ctx.Controller.NoPermission(nex);
-                    ctx.ExceptionHandled = true;
-                }
-
-                if (ex != null) XTrace.WriteException(ex);
-            }
-            if (ctx.ExceptionHandled) return;
-
-            // 判断控制器是否在管辖范围之内，不拦截其它控制器的异常信息
-            if (Setting.Current.CatchAllException || AreaRegistrationBase.Contains(ctx.Controller))
-            {
-                ctx.ExceptionHandled = true;
-
-                var ctrl = "";
-                var act = "";
-                if (ctx.RouteData.Values.ContainsKey("controller")) ctrl = ctx.RouteData.Values["controller"] + "";
-                if (ctx.RouteData.Values.ContainsKey("action")) act = ctx.RouteData.Values["action"] + "";
-
-                if (ctx.RequestContext.HttpContext.Request.IsAjaxRequest())
-                {
-                    if (act.IsNullOrEmpty()) act = "操作";
-                    ctx.Result = ControllerHelper.JsonTips("[{0}]失败！{1}".F(act, ex.Message));
-                }
-                else
-                {
-                    var vr = new ViewResult
-                    {
-                        ViewName = "CubeError"
-                    };
-                    vr.ViewBag.Context = ctx;
-
-                    var vd = vr.ViewData = ctx.Controller.ViewData;
-                    vd.Model = new HandleErrorInfo(ex, ctrl, act);
-
-                    ctx.Result = vr;
-                }
-            }
-
-            base.OnException(ctx);
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Common/NoPermissionException.cs b/NewLife.Cube/Common/NoPermissionException.cs
deleted file mode 100644
index 8fed1ad5e6..0000000000
--- a/NewLife.Cube/Common/NoPermissionException.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using XCode.Membership;
-
-namespace NewLife.Cube
-{
-    /// <summary>没有权限</summary>
-    public class NoPermissionException : Exception
-    {
-        /// <summary>权限</summary>
-        public PermissionFlags Permission { get; }
-
-        /// <summary>实例化</summary>
-        /// <param name="pm"></param>
-        /// <param name="message"></param>
-        public NoPermissionException(PermissionFlags pm, String message) : base(message) => Permission = pm;
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Common/ObjectController.cs b/NewLife.Cube/Common/ObjectController.cs
deleted file mode 100644
index 24d3bee40f..0000000000
--- a/NewLife.Cube/Common/ObjectController.cs
+++ /dev/null
@@ -1,148 +0,0 @@
-﻿using System;
-using System.ComponentModel;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Web.Mvc;
-using NewLife.Reflection;
-using XCode.Membership;
-
-namespace NewLife.Cube
-{
-    /// <summary>对象控制器</summary>
-    public abstract class ObjectController<TObject> : ControllerBaseX
-    {
-        /// <summary>要展现和修改的对象</summary>
-        protected abstract TObject Value { get; set; }
-
-        /// <summary>菜单顺序。扫描是会反射读取</summary>
-        protected static Int32 MenuOrder { get; set; }
-
-        /// <summary>动作执行前</summary>
-        /// <param name="filterContext"></param>
-        protected override void OnActionExecuting(ActionExecutingContext filterContext)
-        {
-            base.OnActionExecuting(filterContext);
-
-            // 显示名和描述
-            var name = GetType().GetDisplayName() ?? typeof(TObject).GetDisplayName() ?? typeof(TObject).Name;
-            var des = GetType().GetDescription() ?? typeof(TObject).GetDescription();
-
-            ViewBag.Title = name;
-            ViewBag.HeaderTitle = name;
-
-            var txt = "";
-            if (txt.IsNullOrEmpty()) txt = (ViewBag.Menu as IMenu)?.Remark;
-            if (txt.IsNullOrEmpty()) txt = des;
-            ViewBag.HeaderContent = txt;
-
-            if (Value != null) ViewBag.Properties = GetMembers(Value);
-        }
-
-        /// <summary>执行后</summary>
-        /// <param name="filterContext"></param>
-        protected override void OnActionExecuted(ActionExecutedContext filterContext)
-        {
-            base.OnActionExecuted(filterContext);
-
-            var title = ViewBag.Title + "";
-            HttpContext.Items["Title"] = title;
-        }
-
-        /// <summary>显示对象</summary>
-        /// <returns></returns>
-        [EntityAuthorize(PermissionFlags.Detail)]
-        public ActionResult Index()
-        {
-            return View("ObjectForm", Value);
-        }
-
-        /// <summary>保存对象</summary>
-        /// <param name="obj"></param>
-        /// <returns></returns>
-        //[HttpPost]
-        //[DisplayName("修改")]
-        [EntityAuthorize(PermissionFlags.Update)]
-        public ActionResult Update(TObject obj)
-        {
-            WriteLog(obj);
-
-            // 反射处理内部复杂成员
-            var keys = Request.Form.AllKeys;
-            foreach (var item in obj.GetType().GetProperties(true))
-            {
-                if (Type.GetTypeCode(item.PropertyType) == TypeCode.Object)
-                {
-                    var pv = obj.GetValue(item);
-                    foreach (var pi in item.PropertyType.GetProperties(true))
-                    {
-                        if (keys.Contains(pi.Name))
-                        {
-                            var v = (Object)Request.Form[pi.Name];
-                            if (pi.PropertyType == typeof(Boolean)) v = GetBool(pi.Name);
-
-                            pv.SetValue(pi, v);
-                        }
-                    }
-                }
-            }
-
-            Value = obj;
-
-            if (Request.IsAjaxRequest())
-                return Json(new { result = "success", content = "保存成功" });
-            else
-                return View("ObjectForm", obj);
-        }
-
-        Boolean GetBool(String name)
-        {
-            var v = Request[name];
-            if (v.IsNullOrEmpty()) return false;
-
-            v = v.Split(",")[0];
-
-            if (!v.EqualIgnoreCase("true", "false")) throw new XException("非法布尔值Request[{0}]={1}", name, v);
-
-            return v.ToBoolean();
-        }
-
-        /// <summary>写日志</summary>
-        /// <param name="obj"></param>
-        protected virtual void WriteLog(TObject obj)
-        {
-            // 构造修改日志
-            var sb = new StringBuilder();
-            var cfg = Value;
-            foreach (var pi in obj.GetType().GetProperties(true))
-            {
-                if (!pi.CanWrite) continue;
-
-                var v1 = obj.GetValue(pi);
-                var v2 = cfg.GetValue(pi);
-                if (!Equals(v1, v2) && (pi.PropertyType != typeof(String) || v1 + "" != v2 + ""))
-                {
-                    if (sb.Length > 0) sb.Append(", ");
-
-                    var name = pi.GetDisplayName();
-                    if (name.IsNullOrEmpty()) name = pi.Name;
-                    sb.AppendFormat("{0}:{1}=>{2}", name, v2, v1);
-                }
-            }
-            LogProvider.Provider.WriteLog(obj.GetType(), "修改", sb.ToString());
-        }
-
-        /// <summary>获取要显示编辑的成员</summary>
-        /// <param name="obj"></param>
-        /// <returns></returns>
-        protected virtual PropertyInfo[] GetMembers(Object obj)
-        {
-            var type = Value as Type;
-            if (type == null) type = obj.GetType();
-
-            var pis = type.GetProperties(true);
-            //pis = pis.Where(pi => pi.CanWrite && pi.GetIndexParameters().Length == 0 && pi.GetCustomAttribute<XmlIgnoreAttribute>() == null).ToArray();
-            return pis.ToArray();
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Common/RazorViewEngineX.cs b/NewLife.Cube/Common/RazorViewEngineX.cs
deleted file mode 100644
index 071f36969c..0000000000
--- a/NewLife.Cube/Common/RazorViewEngineX.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web.Mvc;
-using NewLife.Log;
-
-namespace NewLife.Cube
-{
-    /// <summary>自定义视图引擎。为了让系统优先查找当前区域目录</summary>
-    public class RazorViewEngineX : RazorViewEngine
-    {
-        /// <summary>实例化，修改Areas搜索逻辑</summary>
-        public RazorViewEngineX()
-        {
-            var list = new List<String>();
-            list.Add("~/{2}/Views/{1}/{0}.cshtml");
-            list.Add("~/{2}/Views/Shared/{0}.cshtml");
-            list.Add("~/Areas/{2}/Views/{1}/{0}.cshtml");
-            list.Add("~/Areas/{2}/Views/Shared/{0}.cshtml");
-
-            var arr = list.ToArray();
-            AreaViewLocationFormats = arr;
-            AreaMasterLocationFormats = arr;
-            AreaPartialViewLocationFormats = arr;
-        }
-
-        /// <summary>注册需要搜索的目录路径</summary>
-        /// <param name="engines"></param>
-        public static void Register(ViewEngineCollection engines)
-        {
-            // 如果没有注册，则注册
-            var ve = engines.FirstOrDefault(e => e is RazorViewEngineX) as RazorViewEngineX;
-            if (ve == null)
-            {
-                // 干掉旧引擎，使用新引擎
-                var ve2 = engines.FirstOrDefault(e => e is RazorViewEngine);
-                engines.Remove(ve2);
-
-                ve = new RazorViewEngineX();
-                engines.Insert(0, ve);
-
-                XTrace.WriteLine("注册视图引擎：{0}", ve.GetType().FullName);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Common/ViewHelper.cs b/NewLife.Cube/Common/ViewHelper.cs
deleted file mode 100644
index fce0742752..0000000000
--- a/NewLife.Cube/Common/ViewHelper.cs
+++ /dev/null
@@ -1,570 +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.Routing;
-using NewLife.Reflection;
-using NewLife.Web;
-using XCode;
-using XCode.Configuration;
-using XCode.Membership;
-
-namespace NewLife.Cube
-{
-    /// <summary>视图助手</summary>
-    public static class ViewHelper
-    {
-        /// <summary>创建页面设置的委托</summary>
-        public static Func<Bootstrap> CreateBootstrap = () => new Bootstrap();
-
-        /// <summary>获取页面设置</summary>
-        /// <param name="context"></param>
-        /// <returns></returns>
-        public static Bootstrap Bootstrap(this HttpContextBase context)
-        {
-            var bs = context.Items["Bootstrap"] as Bootstrap;
-            if (bs == null)
-            {
-                bs = CreateBootstrap();
-                context.Items["Bootstrap"] = bs;
-            }
-
-            return bs;
-        }
-
-        /// <summary>获取页面设置</summary>
-        /// <param name="page"></param>
-        /// <returns></returns>
-        public static Bootstrap Bootstrap(this WebViewPage page) => Bootstrap(page.Context);
-
-        /// <summary>获取页面设置</summary>
-        /// <param name="controller"></param>
-        /// <returns></returns>
-        public static Bootstrap Bootstrap(this Controller controller) => Bootstrap(controller.HttpContext);
-
-        /// <summary>获取路由Key</summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        public static RouteValueDictionary GetRouteKey(this IEntity entity)
-        {
-            var fact = EntityFactory.CreateOperate(entity.GetType());
-            var pks = fact.Table.PrimaryKeys;
-
-            var rv = new RouteValueDictionary();
-            if (fact.Unique != null)
-            {
-                rv["id"] = entity[fact.Unique.Name];
-            }
-            else if (pks.Length > 0)
-            {
-                foreach (var item in pks)
-                {
-                    rv[item.Name] = "{0}".F(entity[item.Name]);
-                }
-            }
-
-            return rv;
-        }
-
-        /// <summary>获取排序分页以外的参数</summary>
-        /// <returns></returns>
-        public static RouteValueDictionary GetRouteValue(this Pager page)
-        {
-            var dic = new RouteValueDictionary();
-            foreach (var item in page.Params)
-            {
-                if (!item.Key.EqualIgnoreCase(page._.Sort, page._.Desc, page._.PageIndex, page._.PageSize)) dic[item.Key] = item.Value;
-            }
-
-            return dic;
-        }
-
-        internal static Boolean MakeListView(Type entityType, String vpath, List<FieldItem> fields)
-        {
-            var tmp = @"@using NewLife;
-@using NewLife.Web;
-@using XCode;
-@using XCode.Configuration;
-@using System.Web.Mvc;
-@using System.Web.Mvc.Ajax;
-@using System.Web.Mvc.Html;
-@using System.Web.Routing;
-@{
-    var fact = ViewBag.Factory as IEntityOperate;
-    var page = ViewBag.Page as Pager;
-    var fields = ViewBag.Fields as IList<FieldItem>;
-    var enableSelect = this.EnableSelect();
-    //var provider = ManageProvider.Provider;
-}
-<table class=""table table-bordered table-hover table-striped table-condensed"">
-    <thead>
-        <tr>
-            @if (enableSelect)
-            {
-                <th class=""text-center"" style=""width:10px;""><input type=""checkbox"" id=""chkAll"" title=""全选"" /></th>
-            }
-            @foreach(var item in fields)
-            {
-                var sortUrl = item.OriField != null ? page.GetSortUrl(item.OriField.Name) : page.GetSortUrl(item.Name);
-                if (item.PrimaryKey)
-                {
-                    <th class=""text-center hidden-md hidden-sm hidden-xs""><a href=""@Html.Raw(sortUrl)"">@item.DisplayName</a></th>
-                }
-                else
-                {
-                    <th class=""text-center""><a href=""@Html.Raw(sortUrl)"">@item.DisplayName</a></th>
-                }
-            }
-            @if (this.Has(PermissionFlags.Detail, PermissionFlags.Update, PermissionFlags.Delete))
-            {
-                <th class=""text-center"" style=""min-width:100px;"">操作</th>
-            }
-        </tr>
-    </thead>
-    <tbody>
-        @foreach (var entity in Model)
-        {
-            <tr>
-                @if (enableSelect)
-                {
-                    <td class=""text-center""><input type=""checkbox"" name=""keys"" value=""@entity.ID"" /></td>
-                }
-                @foreach (var item in fields)
-                {
-                    @Html.Partial(""_List_Data_Item"", new Pair(entity, item))
-                }
-                @if (this.Has(PermissionFlags.Detail, PermissionFlags.Update, PermissionFlags.Delete))
-                {
-                    <td class=""text-center"">
-                        @Html.Partial(""_List_Data_Action"", (Object)entity)
-                    </td>
-                }
-            </tr>
-        }
-    </tbody>
-</table>";
-            var sb = new StringBuilder();
-            var fact = EntityFactory.CreateOperate(entityType);
-
-            sb.AppendFormat("@model IList<{0}>", entityType.FullName);
-            sb.AppendLine();
-
-            var str = tmp.Substring(null, "            @foreach");
-            // 如果有用户字段，则启用provider
-            if (fields.Any(f => f.Name.EqualIgnoreCase("CreateUserID", "UpdateUserID")))
-                str = str.Replace("//var provider", "var provider");
-            sb.Append(str);
-
-            var ident = new String(' ', 4 * 3);
-
-            foreach (var item in fields)
-            {
-                // 缩进
-                sb.Append(ident);
-
-                var name = item.OriField?.Name ?? item.Name;
-                var des = item.DisplayName ?? item.Name;
-
-                // 样式
-                if (item.PrimaryKey)
-                    sb.Append(@"<th class=""text-center hidden-md hidden-sm hidden-xs""");
-                else
-                    sb.Append(@"<th class=""text-center""");
-
-                // 固定宽度
-                if (item.Type == typeof(DateTime))
-                    sb.AppendFormat(@" style=""min-width:134px;""");
-
-                // 备注
-                if (!item.Description.IsNullOrEmpty() && item.Description != des) sb.AppendFormat(@" title=""{0}""", item.Description);
-
-                // 内容
-                sb.AppendFormat(@"><a href=""@Html.Raw(page.GetSortUrl(""{1}""))"">{0}</a></th>", des, name);
-
-                sb.AppendLine();
-            }
-
-            var ps = new Int32[2];
-            str = tmp.Substring("            @if (this.Has", "                @foreach (var item in fields)", 0, ps);
-            if (fact.Unique != null)
-                str = str.Replace("@entity.ID", "@entity." + fact.Unique.Name);
-            else
-                str = str.Replace("@entity.ID", "");
-
-            sb.Append("            @if (this.Has");
-            sb.Append(str);
-
-            ident = new String(' ', 4 * 4);
-            foreach (var item in fields)
-            {
-                // 缩进
-                sb.Append(ident);
-                //sb.AppendLine(@"@Html.Partial(""_List_Data_Item"", new Pair(entity, item))");
-                if (item.PrimaryKey)
-                    sb.AppendFormat(@"<td class=""text-center hidden-md hidden-sm hidden-xs"">@entity.{0}</td>", item.Name);
-                else
-                {
-                    switch (Type.GetTypeCode(item.Type))
-                    {
-                        case TypeCode.Boolean:
-                            sb.AppendLine(@"<td class=""text-center"">");
-                            sb.Append(ident);
-                            sb.AppendFormat(@"    <i class=""glyphicon glyphicon-@(entity.{0} ? ""ok"" : ""remove"")"" style=""color: @(entity.{0} ? ""green"" : ""red"");""></i>", item.Name);
-                            sb.AppendLine();
-                            sb.Append(ident);
-                            sb.Append(@"</td>");
-                            break;
-                        case TypeCode.DateTime:
-                            sb.AppendFormat(@"<td>@entity.{0}.ToFullString("""")</td>", item.Name);
-                            break;
-                        case TypeCode.Decimal:
-                            sb.AppendFormat(@"<td class=""text-right"">@entity.{0:n2}</td>", item.Name);
-                            break;
-                        case TypeCode.Single:
-                        case TypeCode.Double:
-                            sb.AppendFormat(@"<td class=""text-right"">@entity.{0:n2}</td>", item.Name);
-                            break;
-                        case TypeCode.Byte:
-                        case TypeCode.Int16:
-                        case TypeCode.Int32:
-                        case TypeCode.Int64:
-                        case TypeCode.UInt16:
-                        case TypeCode.UInt32:
-                        case TypeCode.UInt64:
-                            // 特殊处理枚举
-                            if (item.Type.IsEnum)
-                                sb.AppendFormat(@"<td class=""text-center"">@entity.{0}</td>", item.Name);
-                            else if (item.Name.EqualIgnoreCase("CreateUserID", "UpdateUserID"))
-                                BuildUser(item, sb);
-                            else
-                                sb.AppendFormat(@"<td class=""text-right"">@entity.{0}.ToString(""n0"")</td>", item.Name);
-                            break;
-                        case TypeCode.String:
-                            if (item.Map != null && item.Map.Provider != null)
-                            {
-                                var prv = item.Map.Provider;
-                                sb.AppendFormat(@"<td><a href=""{1}?{2}=@entity.{3}"">@entity.{0}</a></td>", item.Name, prv.EntityType.Name, prv.Key, item.OriField?.Name);
-                            }
-                            else if (item.Name.EqualIgnoreCase("CreateIP", "UpdateIP"))
-                                BuildIP(item, sb);
-                            else
-                                sb.AppendFormat(@"<td>@entity.{0}</td>", item.Name);
-                            break;
-                        default:
-                            sb.AppendFormat(@"<td>@entity.{0}</td>", item.Name);
-                            break;
-                    }
-                }
-                sb.AppendLine();
-            }
-
-            sb.Append("                @if");
-            sb.Append(tmp.Substring("                @if", null, ps[1]));
-
-            File.WriteAllText(vpath.GetFullPath().EnsureDirectory(true), sb.ToString(), Encoding.UTF8);
-
-            return true;
-        }
-
-        private static void BuildUser(FieldItem item, StringBuilder sb) => sb.AppendFormat(@"<td class=""text-right"">@provider.FindByID(entity.{0})</td>", item.Name);
-
-        private static void BuildIP(FieldItem item, StringBuilder sb) => sb.AppendFormat(@"<td title=""@entity.{0}.IPToAddress()"">@entity.{0}</td>", item.Name);
-
-        internal static Boolean MakeFormView(Type entityType, String vpath, List<FieldItem> fields)
-        {
-            var tmp = @"@using NewLife;
-@using XCode;
-@using XCode.Configuration;
-@{
-    var entity = Model;
-    var fields = ViewBag.Fields as IList<FieldItem>;
-    var isNew = (entity as IEntity).IsNullKey;
-}
-@foreach (var item in fields)
-{
-    if (!item.IsIdentity)
-    {
-        <div class=""@cls"">
-            @Html.Partial(""_Form_Item"", new Pair(entity, item))
-        </div>
-    }
-}
-@Html.Partial(""_Form_Footer"", entity)
-@if (this.Has(PermissionFlags.Insert, PermissionFlags.Update))
-{
-    <div class=""clearfix form-actions col-sm-12 col-md-12"">
-        <label class=""control-label col-xs-4 col-sm-5 col-md-5""></label>
-        <button type=""submit"" class=""btn btn-success btn-sm""><i class=""glyphicon glyphicon-@(isNew ? ""plus"" : ""save"")""></i><strong>@(isNew ? ""新增"" : ""保存"")</strong></button>
-        <button type=""button"" class=""btn btn-danger btn-sm"" onclick=""history.go(-1);""><i class=""glyphicon glyphicon-remove""></i><strong>取消</strong></button>
-    </div>
-}";
-
-            var sb = new StringBuilder();
-            var fact = EntityFactory.CreateOperate(entityType);
-
-            sb.AppendLine($"@model {entityType.FullName}");
-
-            var str = tmp.Substring(null, "@foreach");
-            sb.Append(str);
-
-            var set = Setting.Current;
-            var cls = set.FormGroupClass;
-            if (cls.IsNullOrEmpty()) cls = "form-group col-xs-12 col-sm-6 col-lg-4";
-
-            var ident = new String(' ', 4 * 1);
-            foreach (var item in fields)
-            {
-                if (item.IsIdentity) continue;
-
-                sb.AppendLine($"<div class=\"{cls}\">");
-                BuildFormItem(item, sb, fact);
-                sb.AppendLine("</div>");
-            }
-
-            var p = tmp.IndexOf(@"@Html.Partial(""_Form_Footer""");
-            sb.Append(tmp.Substring(p));
-
-            File.WriteAllText(vpath.GetFullPath().EnsureDirectory(true), sb.ToString(), Encoding.UTF8);
-
-            return true;
-        }
-
-        private static void BuildFormItem(FieldItem field, StringBuilder sb, IEntityOperate fact)
-        {
-            var des = field.Description.TrimStart(field.DisplayName).TrimStart(",", ".", "，", "。");
-
-            var err = 0;
-
-            var total = 12;
-            var label = 3;
-            var span = 4;
-            if (err == 0 && des.IsNullOrEmpty())
-            {
-                span = 0;
-            }
-            else if (field.Type == typeof(Boolean) || field.Type.IsEnum)
-            {
-                span += 1;
-            }
-            var input = total - label - span;
-            var ident = new String(' ', 4 * 1);
-
-            sb.AppendLine($"    <label class=\"control-label col-xs-{label} col-sm-{label}\">{field.DisplayName}</label>");
-            sb.AppendLine($"    <div class=\"input-group col-xs-{total - label} col-sm-{input}\">");
-
-            // 优先处理映射。因为映射可能是字符串
-            var map = field.Map;
-            if (map?.Provider != null)
-            {
-                var field2 = field?.OriField ?? field;
-                sb.AppendLine($"        @Html.ForDropDownList(\"{field2.Name}\", {fact.EntityType.Name}.Meta.AllFields.First(e=>e.Name==\"{field.Name}\").Map.Provider.GetDataSource(), @entity.{map.Name})");
-            }
-            else if (field.ReadOnly)
-                sb.AppendLine($"        <label class=\"form-control\">@entity.{field.Name}</label>");
-            else if (field.Type == typeof(String))
-                BuildStringItem(field, sb);
-            else if (fact.EntityType.As<IEntityTree>() && fact.EntityType.GetValue("Setting") is IEntityTreeSetting set && set?.Parent == field.Name)
-                sb.AppendLine($"        @Html.ForTreeEditor({fact.EntityType.Name}._.{field.Name}, entity)");
-            else
-            {
-                switch (field.Type.GetTypeCode())
-                {
-                    case TypeCode.Boolean:
-                        sb.AppendLine($"        @Html.CheckBox(\"{field.Name}\", @entity.{field.Name}, new {{ @class = \"chkSwitch\" }})");
-                        break;
-                    case TypeCode.DateTime:
-                        //sb.AppendLine($"        @Html.ForDateTime(\"{field.Name}\", @entity.{field.Name})");
-                        sb.AppendLine($"        <span class=\"input-group-addon\"><i class=\"fa fa-calendar\"></i></span>");
-                        sb.AppendLine($"        @Html.TextBox(\"{field.Name}\", @entity.{field.Name}.ToFullString(\"\"), new {{ @class = \"form-control date form_datetime\" }})");
-                        break;
-                    case TypeCode.Decimal:
-                        //sb.AppendLine($"        @Html.ForDecimal(\"{field.Name}\", @entity.{field.Name})");
-                        sb.AppendLine($"        <span class=\"input-group-addon\"><i class=\"fa fa-yen\"></i></span>");
-                        sb.AppendLine($"        @Html.TextBox(\"{field.Name}\", @entity.{field.Name}, new {{ @class = \"form-control\" }})");
-                        break;
-                    case TypeCode.Single:
-                    case TypeCode.Double:
-                        //sb.AppendLine($"        @Html.ForDouble(\"{field.Name}\", @entity.{field.Name})");
-                        sb.AppendLine($"        @Html.TextBox(\"{field.Name}\", @entity.{field.Name}, new {{ @class = \"form-control\" }})");
-                        break;
-                    case TypeCode.Byte:
-                    case TypeCode.SByte:
-                    case TypeCode.Int16:
-                    case TypeCode.Int32:
-                    case TypeCode.Int64:
-                    case TypeCode.UInt16:
-                    case TypeCode.UInt32:
-                    case TypeCode.UInt64:
-                        if (field.Type.IsEnum)
-                            sb.AppendLine($"        @Html.ForEnum(\"{field.Name}\", @entity.{field.Name})");
-                        else
-                            sb.AppendLine($"        @Html.TextBox(\"{field.Name}\", @entity.{field.Name}, new {{ @class = \"form-control\", role=\"number\" }})");
-                        break;
-                    case TypeCode.String:
-                        BuildStringItem(field, sb);
-                        break;
-                    default:
-                        sb.AppendLine($"        @Html.ForEditor({fact.EntityType.Name}._.{field.Name}, entity)");
-                        break;
-                }
-            }
-
-            sb.AppendLine(@"    </div>");
-
-            if (!des.IsNullOrEmpty()) sb.AppendLine($"    <span class=\"hidden-xs col-sm-{span}\"><span class=\"middle\">{des}</span></span>");
-        }
-
-        private static void BuildStringItem(FieldItem field, StringBuilder sb)
-        {
-            var cls = "form-control";
-            var type = "text";
-            var name = field.Name;
-
-            // 首先输出图标
-            var ico = "";
-
-            var txt = "";
-            if (name.EqualIgnoreCase("Pass", "Password"))
-            {
-                type = "password";
-            }
-            else if (name.EqualIgnoreCase("Phone", "Mobile"))
-            {
-                type = "tel";
-                ico = "phone";
-            }
-            else if (name.EqualIgnoreCase("email", "mail"))
-            {
-                type = "email";
-                ico = "envelope";
-            }
-            else if (name.EndsWithIgnoreCase("url"))
-            {
-                type = "url";
-                ico = "home";
-            }
-            else if (field.Length < 0 || field.Length > 300)
-            {
-                txt = $"<textarea class=\"{cls}\" cols=\"20\" id=\"{name}\" name=\"{name}\" rows=\"3\">@entity.{name}</textarea>";
-            }
-
-            if (txt.IsNullOrEmpty()) txt = $"<input class=\"{cls}\" id=\"{name}\" name=\"{name}\" type=\"{type}\" value=\"@entity.{name}\" />";
-
-            if (!ico.IsNullOrEmpty())
-            {
-                txt = $"<div class=\"input-group\"><span class=\"input-group-addon\"><i class=\"glyphicon glyphicon-{ico}\"></i></span>{txt}</div>";
-            }
-
-            sb.AppendLine($"        {txt}");
-        }
-
-        /// <summary>是否启用多选</summary>
-        /// <param name="page"></param>
-        /// <returns></returns>
-        public static Boolean EnableSelect(this WebViewPage page)
-        {
-            var fact = page.ViewBag.Factory as IEntityOperate;
-            var fk = fact?.Unique;
-            if (fk == null) return false;
-
-            if (page.ViewData.ContainsKey("EnableSelect")) return (Boolean)page.ViewData["EnableSelect"];
-
-            return page.Has(PermissionFlags.Update, PermissionFlags.Delete);
-
-            //var user = page.ViewBag.User as IUser ?? page.User.Identity as IUser;
-            //if (user == null) return false;
-
-            //var menu = page.ViewBag.Menu as IMenu;
-
-            //return user.Has(menu, PermissionFlags.Update, PermissionFlags.Delete);
-        }
-
-        /// <summary>获取头像地址</summary>
-        /// <param name="user"></param>
-        /// <returns></returns>
-        public static String GetAvatarUrl(this IUser user)
-        {
-            if (user == null || user.Avatar.IsNullOrEmpty()) return null;
-
-            var set = Setting.Current;
-            var av = set.AvatarPath.CombinePath(user.ID + "").GetFullPath();
-
-            if (File.Exists(av)) return "/Sso/Avatar/" + user.ID;
-
-            return user.Avatar;
-        }
-
-        private static Boolean? _IsDevelop;
-        /// <summary>当前是否开发环境。判断csproj文件</summary>
-        /// <returns></returns>
-        public static Boolean IsDevelop()
-        {
-            if (_IsDevelop != null) return _IsDevelop.Value;
-
-            var fis = ".".AsDirectory().GetFiles("*.csproj", SearchOption.TopDirectoryOnly);
-            _IsDevelop = fis != null && fis.Length > 0;
-
-            return _IsDevelop.Value;
-        }
-    }
-
-    /// <summary>Bootstrap页面控制。允许继承</summary>
-    public class Bootstrap
-    {
-        #region 属性
-        /// <summary>最大列数</summary>
-        public Int32 MaxColumn { get; set; } //= 2;
-
-        /// <summary>默认标签宽度</summary>
-        public Int32 LabelWidth { get; set; }// = 4;
-        #endregion
-
-        #region 当前项
-        ///// <summary>当前项</summary>
-        //public FieldItem Item { get; set; }
-
-        /// <summary>名称</summary>
-        public String Name { get; set; }
-
-        /// <summary>类型</summary>
-        public Type Type { get; set; }
-
-        /// <summary>长度</summary>
-        public Int32 Length { get; set; }
-
-        /// <summary>设置项</summary>
-        public void Set(FieldItem item)
-        {
-            Name = item.Name;
-            Type = item.Type;
-            Length = item.Length;
-        }
-        #endregion
-
-        #region 构造
-        /// <summary>实例化一个页面助手</summary>
-        public Bootstrap()
-        {
-            MaxColumn = 2;
-            LabelWidth = 4;
-        }
-        #endregion
-
-        #region 方法
-        /// <summary>获取分组宽度</summary>
-        /// <returns></returns>
-        public virtual Int32 GetGroupWidth()
-        {
-            if (MaxColumn > 1 && Type != null)
-            {
-                if (Type != typeof(String) || Length <= 100) return 12 / MaxColumn;
-            }
-
-            return 12;
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Common/WeuiJS.cs b/NewLife.Cube/Common/WeuiJS.cs
deleted file mode 100644
index 5e9f628a88..0000000000
--- a/NewLife.Cube/Common/WeuiJS.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-﻿using NewLife.Log;
-using NewLife.Model;
-using NewLife.Web;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.UI;
-
-namespace NewLife.Cube
-{
-    /// <summary>
-    ///提示
-    /// </summary>
-    public class WeuiJS : Js
-    {
-        static WeuiJS()
-        {
-            Current = ObjectContainer.Current.AutoRegister<IJs, WeuiJS>().Resolve<IJs>();
-
-            if (Current == null)
-                Current = new Js();
-            else if (XTrace.Debug && Current.GetType() != typeof(WeuiJS))
-                XTrace.WriteLine("Js提供者：{0}", Current.GetType());
-        }
-        
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="message"></param>
-        public static String Toast(String message)
-        {
-            return "$.toast(\"" + Encode(message) + "\");";
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="message"></param>
-        public static String Alert(String message)
-        {
-            return "$.alert(\"" + Encode(message) + "\");";
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Content/Cube.css b/NewLife.Cube/Content/Cube.css
deleted file mode 100644
index 1d845f1fb9..0000000000
--- a/NewLife.Cube/Content/Cube.css
+++ /dev/null
@@ -1,62 +0,0 @@
-﻿@media(max-width: 768px) {
-    body { padding-left: 0px; padding-right: 0px; }
-
-    .page-content { padding: 0px; }
-
-    .form-horizontal .control-label { float: left; }
-
-    .form-group { display: inline-block; margin-bottom: 2px; }
-
-    .form-inline .form-group { display: inline-block; margin-bottom: 0; vertical-align: middle; }
-
-    .form-inline .control-label { margin-bottom: 0; vertical-align: middle; }
-
-    /*.form-inline .input-group {
-        display: inline-block;
-        vertical-align: middle;
-    }
-
-    .form-inline .input-group-addon {
-        display: inline-table;
-        vertical-align: middle;
-        float: left;
-    }*/
-
-    .form-inline .input-group { display: inline-table; vertical-align: middle; }
-}
-
-.list-toolbar .btn-sm-force, .btn-toolbar .btn-sm-force { height: 33px; line-height: 0; vertical-align: middle; }
-
-.list-toolbar .pull-right { float: none; }
-
-/*.list-toolbar .clear-fix {
-    zoom: 1; 
-    overflow:hidden; 
-}*/
-
-/*.form-group {
-    height: 60px;
-}*/
-.input-group[class*=col-] { float: left; }
-
-.input-group > .btn-group > .btn { line-height: 20px; }
-
-/*************** cube-login 2017-09-03 新版本样式*****************/
-.login-logo { width: 130px; font-size: 130px; color: #4CA6FF;margin-top:50px; }
-.cube-login { background: #fff; padding-bottom: 40px; border-radius: 15px; text-align: center; }
-.cube-login .heading { display: block; font-size: 24px; font-weight: 700; padding: 5px 0; margin-bottom: 20px; }
-.cube-login .form-group { padding: 0 40px; margin: 0 0 25px 0; position: relative;display:block; }
-.cube-login .form-control { border-radius: 20px; box-shadow: none; padding: 0 20px 0 45px; height: 40px; transition: all 0.3s ease 0s; }
-.cube-login .form-control:focus { background: #e0e0e0; box-shadow: none; outline: 0 none; }
-.cube-login .form-group i { position: absolute; top: 12px; left: 60px; font-size: 17px; color: #c8c8c8; transition: all 0.5s ease 0s; }
-.cube-login .form-group a { position: absolute; top: 12px; right: 0px; font-size: 17px; color: #c8c8c8; transition: all 0.5s ease 0s; color: #4CA6FF; }
-.cube-login .form-control:focus + i { color: #00b4ef; }
-.cube-login .fa-question-circle { display: inline-block; position: absolute; top: 12px; right: 60px; font-size: 20px; color: #808080; transition: all 0.5s ease 0s; }
-.cube-login .fa-question-circle:hover { color: #000; }
-.cube-login .main-checkbox { float: left; width: 20px; height: 20px; background: #11a3fc; border-radius: 50%; position: relative; margin: 5px 0 0 5px; border: 1px solid #11a3fc; }
-.cube-login .main-checkbox label { width: 20px; height: 20px; position: absolute; top: 0; left: 0; cursor: pointer; }
-.cube-login .main-checkbox label:after { content: ""; width: 10px; height: 5px; position: absolute; top: 5px; left: 4px; border: 3px solid #fff; border-top: none; border-right: none; background: transparent; opacity: 0; -webkit-transform: rotate(-45deg); transform: rotate(-45deg); }
-.cube-login .main-checkbox input[type=checkbox] { visibility: hidden; }
-.cube-login .main-checkbox input[type=checkbox]:checked + label:after { opacity: 1; }
-.cube-login .text { float: left; margin-left: 7px; line-height: 20px; padding-top: 5px; text-transform: capitalize; }
-.cube-login .btn { float: right; font-size: 14px; color: #fff; background: #00b4ef; border-radius: 30px; padding: 8px 50px; border: none; text-transform: capitalize; transition: all 0.5s ease 0s; }
diff --git a/NewLife.Cube/Content/Cube.js b/NewLife.Cube/Content/Cube.js
deleted file mode 100644
index 788379beba..0000000000
--- a/NewLife.Cube/Content/Cube.js
+++ /dev/null
@@ -1,117 +0,0 @@
-﻿// 以下时间用于魔方判断是否需要更新脚本
-// 2017-12-07 00:00:00
-
-$(function () {
-
-    window.infoDialog = parent['infoDialog'] || function (title, msg) { alert(msg); };
-    window.confirmDialog = parent['confirmDialog'] || function (msg, func) { if (confirm(msg)) func(); };
-    window.tips = parent['tips'] || function (msg, modal, time, jumpUrl) { alert(msg); location.reload(); };
-
-    //根据data-action的值确定操作类型 action为请求后端执行业务操作，url为直接跳转指定url地址
-    //按钮请求action
-    $(document).on('click',
-        'button[data-action="action"], input[data-action="action"], a[data-action="action"]',
-        function (e) {
-            $this = $(this);
-            //动态设置标签参数
-            var url = $this.attr('href');
-            if (url && url.length > 0) {
-                $this.data('url', url);
-                $this.attr('href', 'javascript:void(0);');
-            }
-
-            var cf = $this.data('confirm');
-
-            if (cf && cf.length > 0) {
-                confirmDialog(cf, () => doClickAction($this));
-                return false;
-            }
-
-            doClickAction($this);
-            //阻止按钮本身的事件冒泡
-            return false;
-        });
-    //直接执行Url地址
-    $(document).on('click'
-        , 'button[data-action="url"],input[data-action="url"],a[data-action="url"]'
-        , function (data) {
-            $this = $(this);
-            var url = $this.attr('href');
-            if (url && url.length > 0) {
-                $this.data('url', url);
-            }
-            location = url;
-        });
-});
-
-function doClickAction($this) {
-    var fields = $this.data('fields');
-    //参数
-    var parameter = '';
-    if (fields && fields.length > 0) {
-        var fieldArr = fields.split(',');
-        for (var i = 0; i < fieldArr.length; i++) {
-            var detailArr = $('[name=' + fieldArr[i] + ']');
-            //不对name容器标签进行限制，直接进行序列化
-            //如果有特殊需求，可以再指定筛选器进行筛选
-            parameter += ((parameter.length > 0 ? '&' : '') + detailArr.serialize());
-        }
-    }
-
-    //method
-    var cmethod = $this.data('method');
-    var method = 'GET';
-    if (cmethod && cmethod.length > 0) {
-        method = cmethod;
-    }
-
-    //url
-    var curl = $this.data('url');
-    if (!curl || curl.length <= 0) {
-        if ($this[0].tagName == 'A') {
-            curl = $this.attr('href');
-        }
-    }
-    doAction(method, curl, parameter);
-}
-
-//ajax请求 methodName 指定GET与POST
-function doAction(methodName, actionUrl, actionParamter) {
-    if (!methodName || methodName.length <= 0 || !actionUrl || actionUrl.length <= 0) {
-        tips('请求参数异常，请保证请求的地址跟参数正确！', 0, 1000);
-        return;
-    }
-
-    $.ajax({
-        url: actionUrl,
-        type: methodName,
-        async: false,
-        dataType: 'json',
-        data: actionParamter,
-        error: function (ex) {
-            tips('请求异常！', 0, 1000);
-            //console.log(ex);
-        },
-        beforeSend: function () {
-            tips('正在操作中，请稍候...', 0, 2000);
-        },
-        success: function (s) {
-            //console.log(s);
-        },
-        complete: function (result) {
-            var rs = result.responseJSON;
-            if (rs.data && rs.data.length > 0) {
-                tips(rs.data, 0, 1000);
-            }
-            if (rs.url && rs.url.length > 0) {
-                if (rs.url == '[refresh]') {
-                    //刷新页面但不重新加载页面的所有静态资源
-                    location.reload(false);
-                } else {
-                    window.location.href = rs.url;
-                }
-            }
-        }
-    });
-}
-
diff --git a/NewLife.Cube/Content/DateTimePicker/bootstrap-datetimepicker.css b/NewLife.Cube/Content/DateTimePicker/bootstrap-datetimepicker.css
deleted file mode 100644
index 27412787bf..0000000000
--- a/NewLife.Cube/Content/DateTimePicker/bootstrap-datetimepicker.css
+++ /dev/null
@@ -1,418 +0,0 @@
-/*!
- * Datetimepicker for Bootstrap
- *
- * Copyright 2012 Stefan Petre
- * Improvements by Andrew Rowls
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- */
-.datetimepicker {
-	padding: 4px;
-	margin-top: 1px;
-	-webkit-border-radius: 4px;
-	-moz-border-radius: 4px;
-	border-radius: 4px;
-	direction: ltr;
-}
-
-.datetimepicker-inline {
-	width: 220px;
-}
-
-.datetimepicker.datetimepicker-rtl {
-	direction: rtl;
-}
-
-.datetimepicker.datetimepicker-rtl table tr td span {
-	float: right;
-}
-
-.datetimepicker-dropdown, .datetimepicker-dropdown-left {
-	top: 0;
-	left: 0;
-}
-
-[class*=" datetimepicker-dropdown"]:before {
-	content: '';
-	display: inline-block;
-	border-left: 7px solid transparent;
-	border-right: 7px solid transparent;
-	border-bottom: 7px solid #cccccc;
-	border-bottom-color: rgba(0, 0, 0, 0.2);
-	position: absolute;
-}
-
-[class*=" datetimepicker-dropdown"]:after {
-	content: '';
-	display: inline-block;
-	border-left: 6px solid transparent;
-	border-right: 6px solid transparent;
-	border-bottom: 6px solid #ffffff;
-	position: absolute;
-}
-
-[class*=" datetimepicker-dropdown-top"]:before {
-	content: '';
-	display: inline-block;
-	border-left: 7px solid transparent;
-	border-right: 7px solid transparent;
-	border-top: 7px solid #cccccc;
-	border-top-color: rgba(0, 0, 0, 0.2);
-	border-bottom: 0;
-}
-
-[class*=" datetimepicker-dropdown-top"]:after {
-	content: '';
-	display: inline-block;
-	border-left: 6px solid transparent;
-	border-right: 6px solid transparent;
-	border-top: 6px solid #ffffff;
-	border-bottom: 0;
-}
-
-.datetimepicker-dropdown-bottom-left:before {
-	top: -7px;
-	right: 6px;
-}
-
-.datetimepicker-dropdown-bottom-left:after {
-	top: -6px;
-	right: 7px;
-}
-
-.datetimepicker-dropdown-bottom-right:before {
-	top: -7px;
-	left: 6px;
-}
-
-.datetimepicker-dropdown-bottom-right:after {
-	top: -6px;
-	left: 7px;
-}
-
-.datetimepicker-dropdown-top-left:before {
-	bottom: -7px;
-	right: 6px;
-}
-
-.datetimepicker-dropdown-top-left:after {
-	bottom: -6px;
-	right: 7px;
-}
-
-.datetimepicker-dropdown-top-right:before {
-	bottom: -7px;
-	left: 6px;
-}
-
-.datetimepicker-dropdown-top-right:after {
-	bottom: -6px;
-	left: 7px;
-}
-
-.datetimepicker > div {
-	display: none;
-}
-
-.datetimepicker.minutes div.datetimepicker-minutes {
-	display: block;
-}
-
-.datetimepicker.hours div.datetimepicker-hours {
-	display: block;
-}
-
-.datetimepicker.days div.datetimepicker-days {
-	display: block;
-}
-
-.datetimepicker.months div.datetimepicker-months {
-	display: block;
-}
-
-.datetimepicker.years div.datetimepicker-years {
-	display: block;
-}
-
-.datetimepicker table {
-	margin: 0;
-}
-
-.datetimepicker  td,
-.datetimepicker th {
-	text-align: center;
-	width: 20px;
-	height: 20px;
-	-webkit-border-radius: 4px;
-	-moz-border-radius: 4px;
-	border-radius: 4px;
-	border: none;
-}
-
-.table-striped .datetimepicker table tr td,
-.table-striped .datetimepicker table tr th {
-	background-color: transparent;
-}
-
-.datetimepicker table tr td.minute:hover {
-	background: #eeeeee;
-	cursor: pointer;
-}
-
-.datetimepicker table tr td.hour:hover {
-	background: #eeeeee;
-	cursor: pointer;
-}
-
-.datetimepicker table tr td.day:hover {
-	background: #eeeeee;
-	cursor: pointer;
-}
-
-.datetimepicker table tr td.old,
-.datetimepicker table tr td.new {
-	color: #999999;
-}
-
-.datetimepicker table tr td.disabled,
-.datetimepicker table tr td.disabled:hover {
-	background: none;
-	color: #999999;
-	cursor: default;
-}
-
-.datetimepicker table tr td.today,
-.datetimepicker table tr td.today:hover,
-.datetimepicker table tr td.today.disabled,
-.datetimepicker table tr td.today.disabled:hover {
-	background-color: #fde19a;
-	background-image: -moz-linear-gradient(top, #fdd49a, #fdf59a);
-	background-image: -ms-linear-gradient(top, #fdd49a, #fdf59a);
-	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fdd49a), to(#fdf59a));
-	background-image: -webkit-linear-gradient(top, #fdd49a, #fdf59a);
-	background-image: -o-linear-gradient(top, #fdd49a, #fdf59a);
-	background-image: linear-gradient(top, #fdd49a, #fdf59a);
-	background-repeat: repeat-x;
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fdd49a', endColorstr='#fdf59a', GradientType=0);
-	border-color: #fdf59a #fdf59a #fbed50;
-	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(enabled=false);
-}
-
-.datetimepicker table tr td.today:hover,
-.datetimepicker table tr td.today:hover:hover,
-.datetimepicker table tr td.today.disabled:hover,
-.datetimepicker table tr td.today.disabled:hover:hover,
-.datetimepicker table tr td.today:active,
-.datetimepicker table tr td.today:hover:active,
-.datetimepicker table tr td.today.disabled:active,
-.datetimepicker table tr td.today.disabled:hover:active,
-.datetimepicker table tr td.today.active,
-.datetimepicker table tr td.today:hover.active,
-.datetimepicker table tr td.today.disabled.active,
-.datetimepicker table tr td.today.disabled:hover.active,
-.datetimepicker table tr td.today.disabled,
-.datetimepicker table tr td.today:hover.disabled,
-.datetimepicker table tr td.today.disabled.disabled,
-.datetimepicker table tr td.today.disabled:hover.disabled,
-.datetimepicker table tr td.today[disabled],
-.datetimepicker table tr td.today:hover[disabled],
-.datetimepicker table tr td.today.disabled[disabled],
-.datetimepicker table tr td.today.disabled:hover[disabled] {
-	background-color: #fdf59a;
-}
-
-.datetimepicker table tr td.today:active,
-.datetimepicker table tr td.today:hover:active,
-.datetimepicker table tr td.today.disabled:active,
-.datetimepicker table tr td.today.disabled:hover:active,
-.datetimepicker table tr td.today.active,
-.datetimepicker table tr td.today:hover.active,
-.datetimepicker table tr td.today.disabled.active,
-.datetimepicker table tr td.today.disabled:hover.active {
-	background-color: #fbf069;
-}
-
-.datetimepicker table tr td.active,
-.datetimepicker table tr td.active:hover,
-.datetimepicker table tr td.active.disabled,
-.datetimepicker table tr td.active.disabled:hover {
-	background-color: #006dcc;
-	background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
-	background-image: -ms-linear-gradient(top, #0088cc, #0044cc);
-	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
-	background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
-	background-image: -o-linear-gradient(top, #0088cc, #0044cc);
-	background-image: linear-gradient(top, #0088cc, #0044cc);
-	background-repeat: repeat-x;
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);
-	border-color: #0044cc #0044cc #002a80;
-	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(enabled=false);
-	color: #ffffff;
-	text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-}
-
-.datetimepicker table tr td.active:hover,
-.datetimepicker table tr td.active:hover:hover,
-.datetimepicker table tr td.active.disabled:hover,
-.datetimepicker table tr td.active.disabled:hover:hover,
-.datetimepicker table tr td.active:active,
-.datetimepicker table tr td.active:hover:active,
-.datetimepicker table tr td.active.disabled:active,
-.datetimepicker table tr td.active.disabled:hover:active,
-.datetimepicker table tr td.active.active,
-.datetimepicker table tr td.active:hover.active,
-.datetimepicker table tr td.active.disabled.active,
-.datetimepicker table tr td.active.disabled:hover.active,
-.datetimepicker table tr td.active.disabled,
-.datetimepicker table tr td.active:hover.disabled,
-.datetimepicker table tr td.active.disabled.disabled,
-.datetimepicker table tr td.active.disabled:hover.disabled,
-.datetimepicker table tr td.active[disabled],
-.datetimepicker table tr td.active:hover[disabled],
-.datetimepicker table tr td.active.disabled[disabled],
-.datetimepicker table tr td.active.disabled:hover[disabled] {
-	background-color: #0044cc;
-}
-
-.datetimepicker table tr td.active:active,
-.datetimepicker table tr td.active:hover:active,
-.datetimepicker table tr td.active.disabled:active,
-.datetimepicker table tr td.active.disabled:hover:active,
-.datetimepicker table tr td.active.active,
-.datetimepicker table tr td.active:hover.active,
-.datetimepicker table tr td.active.disabled.active,
-.datetimepicker table tr td.active.disabled:hover.active {
-	background-color: #003399;
-}
-
-.datetimepicker table tr td span {
-	display: block;
-	width: 23%;
-	height: 54px;
-	line-height: 54px;
-	float: left;
-	margin: 1%;
-	cursor: pointer;
-	-webkit-border-radius: 4px;
-	-moz-border-radius: 4px;
-	border-radius: 4px;
-}
-
-.datetimepicker .datetimepicker-hours span {
-	height: 26px;
-	line-height: 26px;
-}
-
-.datetimepicker .datetimepicker-hours table tr td span.hour_am,
-.datetimepicker .datetimepicker-hours table tr td span.hour_pm {
-	width: 14.6%;
-}
-
-.datetimepicker .datetimepicker-hours fieldset legend,
-.datetimepicker .datetimepicker-minutes fieldset legend {
-	margin-bottom: inherit;
-	line-height: 30px;
-}
-
-.datetimepicker .datetimepicker-minutes span {
-	height: 26px;
-	line-height: 26px;
-}
-
-.datetimepicker table tr td span:hover {
-	background: #eeeeee;
-}
-
-.datetimepicker table tr td span.disabled,
-.datetimepicker table tr td span.disabled:hover {
-	background: none;
-	color: #999999;
-	cursor: default;
-}
-
-.datetimepicker table tr td span.active,
-.datetimepicker table tr td span.active:hover,
-.datetimepicker table tr td span.active.disabled,
-.datetimepicker table tr td span.active.disabled:hover {
-	background-color: #006dcc;
-	background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
-	background-image: -ms-linear-gradient(top, #0088cc, #0044cc);
-	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
-	background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
-	background-image: -o-linear-gradient(top, #0088cc, #0044cc);
-	background-image: linear-gradient(top, #0088cc, #0044cc);
-	background-repeat: repeat-x;
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);
-	border-color: #0044cc #0044cc #002a80;
-	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(enabled=false);
-	color: #ffffff;
-	text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-}
-
-.datetimepicker table tr td span.active:hover,
-.datetimepicker table tr td span.active:hover:hover,
-.datetimepicker table tr td span.active.disabled:hover,
-.datetimepicker table tr td span.active.disabled:hover:hover,
-.datetimepicker table tr td span.active:active,
-.datetimepicker table tr td span.active:hover:active,
-.datetimepicker table tr td span.active.disabled:active,
-.datetimepicker table tr td span.active.disabled:hover:active,
-.datetimepicker table tr td span.active.active,
-.datetimepicker table tr td span.active:hover.active,
-.datetimepicker table tr td span.active.disabled.active,
-.datetimepicker table tr td span.active.disabled:hover.active,
-.datetimepicker table tr td span.active.disabled,
-.datetimepicker table tr td span.active:hover.disabled,
-.datetimepicker table tr td span.active.disabled.disabled,
-.datetimepicker table tr td span.active.disabled:hover.disabled,
-.datetimepicker table tr td span.active[disabled],
-.datetimepicker table tr td span.active:hover[disabled],
-.datetimepicker table tr td span.active.disabled[disabled],
-.datetimepicker table tr td span.active.disabled:hover[disabled] {
-	background-color: #0044cc;
-}
-
-.datetimepicker table tr td span.active:active,
-.datetimepicker table tr td span.active:hover:active,
-.datetimepicker table tr td span.active.disabled:active,
-.datetimepicker table tr td span.active.disabled:hover:active,
-.datetimepicker table tr td span.active.active,
-.datetimepicker table tr td span.active:hover.active,
-.datetimepicker table tr td span.active.disabled.active,
-.datetimepicker table tr td span.active.disabled:hover.active {
-	background-color: #003399;
-}
-
-.datetimepicker table tr td span.old {
-	color: #999999;
-}
-
-.datetimepicker th.switch {
-	width: 145px;
-}
-
-.datetimepicker th span.glyphicon {
-	pointer-events: none;
-}
-
-.datetimepicker thead tr:first-child th,
-.datetimepicker tfoot tr:first-child th {
-	cursor: pointer;
-}
-
-.datetimepicker thead tr:first-child th:hover,
-.datetimepicker tfoot tr:first-child th:hover {
-	background: #eeeeee;
-}
-
-.input-append.date .add-on i,
-.input-prepend.date .add-on i,
-.input-group.date .input-group-addon span {
-	cursor: pointer;
-	width: 14px;
-	height: 14px;
-}
diff --git a/NewLife.Cube/Content/DateTimePicker/bootstrap-datetimepicker.js b/NewLife.Cube/Content/DateTimePicker/bootstrap-datetimepicker.js
deleted file mode 100644
index b7c76e9be5..0000000000
--- a/NewLife.Cube/Content/DateTimePicker/bootstrap-datetimepicker.js
+++ /dev/null
@@ -1,1793 +0,0 @@
-﻿/* =========================================================
- * bootstrap-datetimepicker.js
- * =========================================================
- * Copyright 2012 Stefan Petre
- * Improvements by Andrew Rowls
- * Improvements by Sébastien Malot
- * Improvements by Yun Lai
- * Improvements by Kenneth Henderick
- * Project URL : http://www.malot.fr/bootstrap-datetimepicker
- *
- * 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.
- * ========================================================= */
-
-/*
- * Improvement by CuGBabyBeaR @ 2013-09-12
- *
- * Make it work in bootstrap v3
- */
-
-!function ($) {
-
-	function UTCDate() {
-		return new Date(Date.UTC.apply(Date, arguments));
-	}
-
-	function UTCToday() {
-		var today = new Date();
-		return UTCDate(today.getUTCFullYear(), today.getUTCMonth(), today.getUTCDate(), today.getUTCHours(), today.getUTCMinutes(), today.getUTCSeconds(), 0);
-	}
-
-	// Picker object
-
-	var Datetimepicker = function (element, options) {
-		var that = this;
-
-		this.element = $(element);
-
-		// add container for single page application
-		// when page switch the datetimepicker div will be removed also.
-		this.container = options.container || 'body';
-
-		this.language = options.language || this.element.data('date-language') || "en";
-		this.language = this.language in dates ? this.language : "en";
-		this.isRTL = dates[this.language].rtl || false;
-		this.formatType = options.formatType || this.element.data('format-type') || 'standard';
-		this.format = DPGlobal.parseFormat(options.format || this.element.data('date-format') || dates[this.language].format || DPGlobal.getDefaultFormat(this.formatType, 'input'), this.formatType);
-		this.isInline = false;
-		this.isVisible = false;
-		this.isInput = this.element.is('input');
-		this.fontAwesome = options.fontAwesome || this.element.data('font-awesome') || false;
-
-		this.bootcssVer = options.bootcssVer || (this.isInput ? (this.element.is('.form-control') ? 3 : 2) : ( this.bootcssVer = this.element.is('.input-group') ? 3 : 2 ));
-
-		this.component = this.element.is('.date') ? ( this.bootcssVer == 3 ? this.element.find('.input-group-addon .glyphicon-th, .input-group-addon .glyphicon-time, .input-group-addon .glyphicon-calendar, .input-group-addon .glyphicon-calendar, .input-group-addon .fa-calendar, .input-group-addon .fa-clock-o').parent() : this.element.find('.add-on .icon-th, .add-on .icon-time, .add-on .icon-calendar .fa-calendar .fa-clock-o').parent()) : false;
-		this.componentReset = this.element.is('.date') ? ( this.bootcssVer == 3 ? this.element.find(".input-group-addon .glyphicon-remove, .input-group-addon .fa-times").parent():this.element.find(".add-on .icon-remove, .add-on .fa-times").parent()) : false;
-		this.hasInput = this.component && this.element.find('input').length;
-		if (this.component && this.component.length === 0) {
-			this.component = false;
-		}
-		this.linkField = options.linkField || this.element.data('link-field') || false;
-		this.linkFormat = DPGlobal.parseFormat(options.linkFormat || this.element.data('link-format') || DPGlobal.getDefaultFormat(this.formatType, 'link'), this.formatType);
-		this.minuteStep = options.minuteStep || this.element.data('minute-step') || 5;
-		this.pickerPosition = options.pickerPosition || this.element.data('picker-position') || 'bottom-right';
-		this.showMeridian = options.showMeridian || this.element.data('show-meridian') || false;
-		this.initialDate = options.initialDate || new Date();
-		this.zIndex = options.zIndex || this.element.data('z-index') || undefined;
-
-		this.icons = {
-			leftArrow: this.fontAwesome ? 'fa-arrow-left' : (this.bootcssVer === 3 ? 'glyphicon-arrow-left' : 'icon-arrow-left'),
-			rightArrow: this.fontAwesome ? 'fa-arrow-right' : (this.bootcssVer === 3 ? 'glyphicon-arrow-right' : 'icon-arrow-right')
-		};
-		this.icontype = this.fontAwesome ? 'fa' : 'glyphicon';
-
-		this._attachEvents();
-
-		this.formatViewType = "datetime";
-		if ('formatViewType' in options) {
-			this.formatViewType = options.formatViewType;
-		} else if ('formatViewType' in this.element.data()) {
-			this.formatViewType = this.element.data('formatViewType');
-		}
-
-		this.minView = 0;
-		if ('minView' in options) {
-			this.minView = options.minView;
-		} else if ('minView' in this.element.data()) {
-			this.minView = this.element.data('min-view');
-		}
-		this.minView = DPGlobal.convertViewMode(this.minView);
-
-		this.maxView = DPGlobal.modes.length - 1;
-		if ('maxView' in options) {
-			this.maxView = options.maxView;
-		} else if ('maxView' in this.element.data()) {
-			this.maxView = this.element.data('max-view');
-		}
-		this.maxView = DPGlobal.convertViewMode(this.maxView);
-
-		this.wheelViewModeNavigation = false;
-		if ('wheelViewModeNavigation' in options) {
-			this.wheelViewModeNavigation = options.wheelViewModeNavigation;
-		} else if ('wheelViewModeNavigation' in this.element.data()) {
-			this.wheelViewModeNavigation = this.element.data('view-mode-wheel-navigation');
-		}
-
-		this.wheelViewModeNavigationInverseDirection = false;
-
-		if ('wheelViewModeNavigationInverseDirection' in options) {
-			this.wheelViewModeNavigationInverseDirection = options.wheelViewModeNavigationInverseDirection;
-		} else if ('wheelViewModeNavigationInverseDirection' in this.element.data()) {
-			this.wheelViewModeNavigationInverseDirection = this.element.data('view-mode-wheel-navigation-inverse-dir');
-		}
-
-		this.wheelViewModeNavigationDelay = 100;
-		if ('wheelViewModeNavigationDelay' in options) {
-			this.wheelViewModeNavigationDelay = options.wheelViewModeNavigationDelay;
-		} else if ('wheelViewModeNavigationDelay' in this.element.data()) {
-			this.wheelViewModeNavigationDelay = this.element.data('view-mode-wheel-navigation-delay');
-		}
-
-		this.startViewMode = 2;
-		if ('startView' in options) {
-			this.startViewMode = options.startView;
-		} else if ('startView' in this.element.data()) {
-			this.startViewMode = this.element.data('start-view');
-		}
-		this.startViewMode = DPGlobal.convertViewMode(this.startViewMode);
-		this.viewMode = this.startViewMode;
-
-		this.viewSelect = this.minView;
-		if ('viewSelect' in options) {
-			this.viewSelect = options.viewSelect;
-		} else if ('viewSelect' in this.element.data()) {
-			this.viewSelect = this.element.data('view-select');
-		}
-		this.viewSelect = DPGlobal.convertViewMode(this.viewSelect);
-
-		this.forceParse = true;
-		if ('forceParse' in options) {
-			this.forceParse = options.forceParse;
-		} else if ('dateForceParse' in this.element.data()) {
-			this.forceParse = this.element.data('date-force-parse');
-		}
-		var template = this.bootcssVer === 3 ? DPGlobal.templateV3 : DPGlobal.template;
-		while (template.indexOf('{iconType}') !== -1) {
-			template = template.replace('{iconType}', this.icontype);
-		}
-		while (template.indexOf('{leftArrow}') !== -1) {
-			template = template.replace('{leftArrow}', this.icons.leftArrow);
-		}
-		while (template.indexOf('{rightArrow}') !== -1) {
-			template = template.replace('{rightArrow}', this.icons.rightArrow);
-		}
-		this.picker = $(template)
-			.appendTo(this.isInline ? this.element : this.container) // 'body')
-			.on({
-				click:     $.proxy(this.click, this),
-				mousedown: $.proxy(this.mousedown, this)
-			});
-
-		if (this.wheelViewModeNavigation) {
-			if ($.fn.mousewheel) {
-				this.picker.on({mousewheel: $.proxy(this.mousewheel, this)});
-			} else {
-				console.log("Mouse Wheel event is not supported. Please include the jQuery Mouse Wheel plugin before enabling this option");
-			}
-		}
-
-		if (this.isInline) {
-			this.picker.addClass('datetimepicker-inline');
-		} else {
-			this.picker.addClass('datetimepicker-dropdown-' + this.pickerPosition + ' dropdown-menu');
-		}
-		if (this.isRTL) {
-			this.picker.addClass('datetimepicker-rtl');
-			var selector = this.bootcssVer === 3 ? '.prev span, .next span' : '.prev i, .next i';
-			this.picker.find(selector).toggleClass(this.icons.leftArrow + ' ' + this.icons.rightArrow);
-		}
-		$(document).on('mousedown', function (e) {
-			// Clicked outside the datetimepicker, hide it
-			if ($(e.target).closest('.datetimepicker').length === 0) {
-				that.hide();
-			}
-		});
-
-		this.autoclose = false;
-		if ('autoclose' in options) {
-			this.autoclose = options.autoclose;
-		} else if ('dateAutoclose' in this.element.data()) {
-			this.autoclose = this.element.data('date-autoclose');
-		}
-
-		this.keyboardNavigation = true;
-		if ('keyboardNavigation' in options) {
-			this.keyboardNavigation = options.keyboardNavigation;
-		} else if ('dateKeyboardNavigation' in this.element.data()) {
-			this.keyboardNavigation = this.element.data('date-keyboard-navigation');
-		}
-
-		this.todayBtn = (options.todayBtn || this.element.data('date-today-btn') || false);
-		this.todayHighlight = (options.todayHighlight || this.element.data('date-today-highlight') || false);
-
-		this.weekStart = ((options.weekStart || this.element.data('date-weekstart') || dates[this.language].weekStart || 0) % 7);
-		this.weekEnd = ((this.weekStart + 6) % 7);
-		this.startDate = -Infinity;
-		this.endDate = Infinity;
-		this.daysOfWeekDisabled = [];
-		this.setStartDate(options.startDate || this.element.data('date-startdate'));
-		this.setEndDate(options.endDate || this.element.data('date-enddate'));
-		this.setDaysOfWeekDisabled(options.daysOfWeekDisabled || this.element.data('date-days-of-week-disabled'));
-		this.setMinutesDisabled(options.minutesDisabled || this.element.data('date-minute-disabled'));
-		this.setHoursDisabled(options.hoursDisabled || this.element.data('date-hour-disabled'));
-		this.fillDow();
-		this.fillMonths();
-		this.update();
-		this.showMode();
-
-		if (this.isInline) {
-			this.show();
-		}
-	};
-
-	Datetimepicker.prototype = {
-		constructor: Datetimepicker,
-
-		_events:       [],
-		_attachEvents: function () {
-			this._detachEvents();
-			if (this.isInput) { // single input
-				this._events = [
-					[this.element, {
-						focus:   $.proxy(this.show, this),
-						keyup:   $.proxy(this.update, this),
-						keydown: $.proxy(this.keydown, this)
-					}]
-				];
-			}
-			else if (this.component && this.hasInput) { // component: input + button
-				this._events = [
-					// For components that are not readonly, allow keyboard nav
-					[this.element.find('input'), {
-						focus:   $.proxy(this.show, this),
-						keyup:   $.proxy(this.update, this),
-						keydown: $.proxy(this.keydown, this)
-					}],
-					[this.component, {
-						click: $.proxy(this.show, this)
-					}]
-				];
-				if (this.componentReset) {
-					this._events.push([
-						this.componentReset,
-						{click: $.proxy(this.reset, this)}
-					]);
-				}
-			}
-			else if (this.element.is('div')) {  // inline datetimepicker
-				this.isInline = true;
-			}
-			else {
-				this._events = [
-					[this.element, {
-						click: $.proxy(this.show, this)
-					}]
-				];
-			}
-			for (var i = 0, el, ev; i < this._events.length; i++) {
-				el = this._events[i][0];
-				ev = this._events[i][1];
-				el.on(ev);
-			}
-		},
-
-		_detachEvents: function () {
-			for (var i = 0, el, ev; i < this._events.length; i++) {
-				el = this._events[i][0];
-				ev = this._events[i][1];
-				el.off(ev);
-			}
-			this._events = [];
-		},
-
-		show: function (e) {
-			this.picker.show();
-			this.height = this.component ? this.component.outerHeight() : this.element.outerHeight();
-			if (this.forceParse) {
-				this.update();
-			}
-			this.place();
-			$(window).on('resize', $.proxy(this.place, this));
-			if (e) {
-				e.stopPropagation();
-				e.preventDefault();
-			}
-			this.isVisible = true;
-			this.element.trigger({
-				type: 'show',
-				date: this.date
-			});
-		},
-
-		hide: function (e) {
-			if (!this.isVisible) return;
-			if (this.isInline) return;
-			this.picker.hide();
-			$(window).off('resize', this.place);
-			this.viewMode = this.startViewMode;
-			this.showMode();
-			if (!this.isInput) {
-				$(document).off('mousedown', this.hide);
-			}
-
-			if (
-				this.forceParse &&
-					(
-						this.isInput && this.element.val() ||
-							this.hasInput && this.element.find('input').val()
-						)
-				)
-				this.setValue();
-			this.isVisible = false;
-			this.element.trigger({
-				type: 'hide',
-				date: this.date
-			});
-		},
-
-		remove: function () {
-			this._detachEvents();
-			this.picker.remove();
-			delete this.picker;
-			delete this.element.data().datetimepicker;
-		},
-
-		getDate: function () {
-			var d = this.getUTCDate();
-			return new Date(d.getTime() + (d.getTimezoneOffset() * 60000));
-		},
-
-		getUTCDate: function () {
-			return this.date;
-		},
-
-		setDate: function (d) {
-			this.setUTCDate(new Date(d.getTime() - (d.getTimezoneOffset() * 60000)));
-		},
-
-		setUTCDate: function (d) {
-			if (d >= this.startDate && d <= this.endDate) {
-				this.date = d;
-				this.setValue();
-				this.viewDate = this.date;
-				this.fill();
-			} else {
-				this.element.trigger({
-					type:      'outOfRange',
-					date:      d,
-					startDate: this.startDate,
-					endDate:   this.endDate
-				});
-			}
-		},
-
-		setFormat: function (format) {
-			this.format = DPGlobal.parseFormat(format, this.formatType);
-			var element;
-			if (this.isInput) {
-				element = this.element;
-			} else if (this.component) {
-				element = this.element.find('input');
-			}
-			if (element && element.val()) {
-				this.setValue();
-			}
-		},
-
-		setValue: function () {
-			var formatted = this.getFormattedDate();
-			if (!this.isInput) {
-				if (this.component) {
-					this.element.find('input').val(formatted);
-				}
-				this.element.data('date', formatted);
-			} else {
-				this.element.val(formatted);
-			}
-			if (this.linkField) {
-				$('#' + this.linkField).val(this.getFormattedDate(this.linkFormat));
-			}
-		},
-
-		getFormattedDate: function (format) {
-			if (format == undefined) format = this.format;
-			return DPGlobal.formatDate(this.date, format, this.language, this.formatType);
-		},
-
-		setStartDate: function (startDate) {
-			this.startDate = startDate || -Infinity;
-			if (this.startDate !== -Infinity) {
-				this.startDate = DPGlobal.parseDate(this.startDate, this.format, this.language, this.formatType);
-			}
-			this.update();
-			this.updateNavArrows();
-		},
-
-		setEndDate: function (endDate) {
-			this.endDate = endDate || Infinity;
-			if (this.endDate !== Infinity) {
-				this.endDate = DPGlobal.parseDate(this.endDate, this.format, this.language, this.formatType);
-			}
-			this.update();
-			this.updateNavArrows();
-		},
-
-		setDaysOfWeekDisabled: function (daysOfWeekDisabled) {
-			this.daysOfWeekDisabled = daysOfWeekDisabled || [];
-			if (!$.isArray(this.daysOfWeekDisabled)) {
-				this.daysOfWeekDisabled = this.daysOfWeekDisabled.split(/,\s*/);
-			}
-			this.daysOfWeekDisabled = $.map(this.daysOfWeekDisabled, function (d) {
-				return parseInt(d, 10);
-			});
-			this.update();
-			this.updateNavArrows();
-		},
-
-		setMinutesDisabled: function (minutesDisabled) {
-			this.minutesDisabled = minutesDisabled || [];
-			if (!$.isArray(this.minutesDisabled)) {
-				this.minutesDisabled = this.minutesDisabled.split(/,\s*/);
-			}
-			this.minutesDisabled = $.map(this.minutesDisabled, function (d) {
-				return parseInt(d, 10);
-			});
-			this.update();
-			this.updateNavArrows();
-		},
-
-		setHoursDisabled: function (hoursDisabled) {
-			this.hoursDisabled = hoursDisabled || [];
-			if (!$.isArray(this.hoursDisabled)) {
-				this.hoursDisabled = this.hoursDisabled.split(/,\s*/);
-			}
-			this.hoursDisabled = $.map(this.hoursDisabled, function (d) {
-				return parseInt(d, 10);
-			});
-			this.update();
-			this.updateNavArrows();
-		},
-
-		place: function () {
-			if (this.isInline) return;
-
-			if (!this.zIndex) {
-				var index_highest = 0;
-				$('div').each(function () {
-					var index_current = parseInt($(this).css("zIndex"), 10);
-					if (index_current > index_highest) {
-						index_highest = index_current;
-					}
-				});
-				this.zIndex = index_highest + 10;
-			}
-
-			var offset, top, left, containerOffset;
-			if (this.container instanceof $) {
-				containerOffset = this.container.offset();
-			} else {
-				containerOffset = $(this.container).offset();
-			}
-
-			if (this.component) {
-				offset = this.component.offset();
-				left = offset.left;
-				if (this.pickerPosition == 'bottom-left' || this.pickerPosition == 'top-left') {
-					left += this.component.outerWidth() - this.picker.outerWidth();
-				}
-			} else {
-				offset = this.element.offset();
-				left = offset.left;
-			}
-
-			if(left+220 > document.body.clientWidth){
-            			left = document.body.clientWidth-220;
-          		}
-
-			if (this.pickerPosition == 'top-left' || this.pickerPosition == 'top-right') {
-				top = offset.top - this.picker.outerHeight();
-			} else {
-				top = offset.top + this.height;
-			}
-
-			top = top - containerOffset.top;
-			left = left - containerOffset.left;
-
-			if(this.container != 'body') top = top + document.body.scrollTop
-
-			this.picker.css({
-				top:    top,
-				left:   left,
-				zIndex: this.zIndex
-			});
-		},
-
-		update: function () {
-			var date, fromArgs = false;
-			if (arguments && arguments.length && (typeof arguments[0] === 'string' || arguments[0] instanceof Date)) {
-				date = arguments[0];
-				fromArgs = true;
-			} else {
-				date = (this.isInput ? this.element.val() : this.element.find('input').val()) || this.element.data('date') || this.initialDate;
-				if (typeof date == 'string' || date instanceof String) {
-				  date = date.replace(/^\s+|\s+$/g,'');
-				}
-			}
-
-			if (!date) {
-				date = new Date();
-				fromArgs = false;
-			}
-
-			this.date = DPGlobal.parseDate(date, this.format, this.language, this.formatType);
-
-			if (fromArgs) this.setValue();
-
-			if (this.date < this.startDate) {
-				this.viewDate = new Date(this.startDate);
-			} else if (this.date > this.endDate) {
-				this.viewDate = new Date(this.endDate);
-			} else {
-				this.viewDate = new Date(this.date);
-			}
-			this.fill();
-		},
-
-		fillDow: function () {
-			var dowCnt = this.weekStart,
-				html = '<tr>';
-			while (dowCnt < this.weekStart + 7) {
-				html += '<th class="dow">' + dates[this.language].daysMin[(dowCnt++) % 7] + '</th>';
-			}
-			html += '</tr>';
-			this.picker.find('.datetimepicker-days thead').append(html);
-		},
-
-		fillMonths: function () {
-			var html = '',
-				i = 0;
-			while (i < 12) {
-				html += '<span class="month">' + dates[this.language].monthsShort[i++] + '</span>';
-			}
-			this.picker.find('.datetimepicker-months td').html(html);
-		},
-
-		fill: function () {
-			if (this.date == null || this.viewDate == null) {
-				return;
-			}
-			var d = new Date(this.viewDate),
-				year = d.getUTCFullYear(),
-				month = d.getUTCMonth(),
-				dayMonth = d.getUTCDate(),
-				hours = d.getUTCHours(),
-				minutes = d.getUTCMinutes(),
-				startYear = this.startDate !== -Infinity ? this.startDate.getUTCFullYear() : -Infinity,
-				startMonth = this.startDate !== -Infinity ? this.startDate.getUTCMonth() + 1 : -Infinity,
-				endYear = this.endDate !== Infinity ? this.endDate.getUTCFullYear() : Infinity,
-				endMonth = this.endDate !== Infinity ? this.endDate.getUTCMonth() + 1 : Infinity,
-				currentDate = (new UTCDate(this.date.getUTCFullYear(), this.date.getUTCMonth(), this.date.getUTCDate())).valueOf(),
-				today = new Date();
-			this.picker.find('.datetimepicker-days thead th:eq(1)')
-				.text(dates[this.language].months[month] + ' ' + year);
-			if (this.formatViewType == "time") {
-				var formatted = this.getFormattedDate();
-				this.picker.find('.datetimepicker-hours thead th:eq(1)').text(formatted);
-				this.picker.find('.datetimepicker-minutes thead th:eq(1)').text(formatted);
-			} else {
-				this.picker.find('.datetimepicker-hours thead th:eq(1)')
-					.text(dayMonth + ' ' + dates[this.language].months[month] + ' ' + year);
-				this.picker.find('.datetimepicker-minutes thead th:eq(1)')
-					.text(dayMonth + ' ' + dates[this.language].months[month] + ' ' + year);
-			}
-			this.picker.find('tfoot th.today')
-				.text(dates[this.language].today)
-				.toggle(this.todayBtn !== false);
-			this.updateNavArrows();
-			this.fillMonths();
-			/*var prevMonth = UTCDate(year, month, 0,0,0,0,0);
-			 prevMonth.setUTCDate(prevMonth.getDate() - (prevMonth.getUTCDay() - this.weekStart + 7)%7);*/
-			var prevMonth = UTCDate(year, month - 1, 28, 0, 0, 0, 0),
-				day = DPGlobal.getDaysInMonth(prevMonth.getUTCFullYear(), prevMonth.getUTCMonth());
-			prevMonth.setUTCDate(day);
-			prevMonth.setUTCDate(day - (prevMonth.getUTCDay() - this.weekStart + 7) % 7);
-			var nextMonth = new Date(prevMonth);
-			nextMonth.setUTCDate(nextMonth.getUTCDate() + 42);
-			nextMonth = nextMonth.valueOf();
-			var html = [];
-			var clsName;
-			while (prevMonth.valueOf() < nextMonth) {
-				if (prevMonth.getUTCDay() == this.weekStart) {
-					html.push('<tr>');
-				}
-				clsName = '';
-				if (prevMonth.getUTCFullYear() < year || (prevMonth.getUTCFullYear() == year && prevMonth.getUTCMonth() < month)) {
-					clsName += ' old';
-				} else if (prevMonth.getUTCFullYear() > year || (prevMonth.getUTCFullYear() == year && prevMonth.getUTCMonth() > month)) {
-					clsName += ' new';
-				}
-				// Compare internal UTC date with local today, not UTC today
-				if (this.todayHighlight &&
-					prevMonth.getUTCFullYear() == today.getFullYear() &&
-					prevMonth.getUTCMonth() == today.getMonth() &&
-					prevMonth.getUTCDate() == today.getDate()) {
-					clsName += ' today';
-				}
-				if (prevMonth.valueOf() == currentDate) {
-					clsName += ' active';
-				}
-				if ((prevMonth.valueOf() + 86400000) <= this.startDate || prevMonth.valueOf() > this.endDate ||
-					$.inArray(prevMonth.getUTCDay(), this.daysOfWeekDisabled) !== -1) {
-					clsName += ' disabled';
-				}
-				html.push('<td class="day' + clsName + '">' + prevMonth.getUTCDate() + '</td>');
-				if (prevMonth.getUTCDay() == this.weekEnd) {
-					html.push('</tr>');
-				}
-				prevMonth.setUTCDate(prevMonth.getUTCDate() + 1);
-			}
-			this.picker.find('.datetimepicker-days tbody').empty().append(html.join(''));
-
-			html = [];
-			var txt = '', meridian = '', meridianOld = '';
-			var hoursDisabled = this.hoursDisabled || [];
-			for (var i = 0; i < 24; i++) {
-				if (hoursDisabled.indexOf(i) !== -1) continue;
-				var actual = UTCDate(year, month, dayMonth, i);
-				clsName = '';
-				// We want the previous hour for the startDate
-				if ((actual.valueOf() + 3600000) <= this.startDate || actual.valueOf() > this.endDate) {
-					clsName += ' disabled';
-				} else if (hours == i) {
-					clsName += ' active';
-				}
-				if (this.showMeridian && dates[this.language].meridiem.length == 2) {
-					meridian = (i < 12 ? dates[this.language].meridiem[0] : dates[this.language].meridiem[1]);
-					if (meridian != meridianOld) {
-						if (meridianOld != '') {
-							html.push('</fieldset>');
-						}
-						html.push('<fieldset class="hour"><legend>' + meridian.toUpperCase() + '</legend>');
-					}
-					meridianOld = meridian;
-					txt = (i % 12 ? i % 12 : 12);
-					html.push('<span class="hour' + clsName + ' hour_' + (i < 12 ? 'am' : 'pm') + '">' + txt + '</span>');
-					if (i == 23) {
-						html.push('</fieldset>');
-					}
-				} else {
-					txt = i + ':00';
-					html.push('<span class="hour' + clsName + '">' + txt + '</span>');
-				}
-			}
-			this.picker.find('.datetimepicker-hours td').html(html.join(''));
-
-			html = [];
-			txt = '', meridian = '', meridianOld = '';
-			var minutesDisabled = this.minutesDisabled || [];
-			for (var i = 0; i < 60; i += this.minuteStep) {
-				if (minutesDisabled.indexOf(i) !== -1) continue;
-				var actual = UTCDate(year, month, dayMonth, hours, i, 0);
-				clsName = '';
-				if (actual.valueOf() < this.startDate || actual.valueOf() > this.endDate) {
-					clsName += ' disabled';
-				} else if (Math.floor(minutes / this.minuteStep) == Math.floor(i / this.minuteStep)) {
-					clsName += ' active';
-				}
-				if (this.showMeridian && dates[this.language].meridiem.length == 2) {
-					meridian = (hours < 12 ? dates[this.language].meridiem[0] : dates[this.language].meridiem[1]);
-					if (meridian != meridianOld) {
-						if (meridianOld != '') {
-							html.push('</fieldset>');
-						}
-						html.push('<fieldset class="minute"><legend>' + meridian.toUpperCase() + '</legend>');
-					}
-					meridianOld = meridian;
-					txt = (hours % 12 ? hours % 12 : 12);
-					//html.push('<span class="minute'+clsName+' minute_'+(hours<12?'am':'pm')+'">'+txt+'</span>');
-					html.push('<span class="minute' + clsName + '">' + txt + ':' + (i < 10 ? '0' + i : i) + '</span>');
-					if (i == 59) {
-						html.push('</fieldset>');
-					}
-				} else {
-					txt = i + ':00';
-					//html.push('<span class="hour'+clsName+'">'+txt+'</span>');
-					html.push('<span class="minute' + clsName + '">' + hours + ':' + (i < 10 ? '0' + i : i) + '</span>');
-				}
-			}
-			this.picker.find('.datetimepicker-minutes td').html(html.join(''));
-
-			var currentYear = this.date.getUTCFullYear();
-			var months = this.picker.find('.datetimepicker-months')
-				.find('th:eq(1)')
-				.text(year)
-				.end()
-				.find('span').removeClass('active');
-			if (currentYear == year) {
-				// getUTCMonths() returns 0 based, and we need to select the next one
-				months.eq(this.date.getUTCMonth() + 2).addClass('active');
-			}
-			if (year < startYear || year > endYear) {
-				months.addClass('disabled');
-			}
-			if (year == startYear) {
-				months.slice(0, startMonth + 1).addClass('disabled');
-			}
-			if (year == endYear) {
-				months.slice(endMonth).addClass('disabled');
-			}
-
-			html = '';
-			year = parseInt(year / 10, 10) * 10;
-			var yearCont = this.picker.find('.datetimepicker-years')
-				.find('th:eq(1)')
-				.text(year + '-' + (year + 9))
-				.end()
-				.find('td');
-			year -= 1;
-			for (var i = -1; i < 11; i++) {
-				html += '<span class="year' + (i == -1 || i == 10 ? ' old' : '') + (currentYear == year ? ' active' : '') + (year < startYear || year > endYear ? ' disabled' : '') + '">' + year + '</span>';
-				year += 1;
-			}
-			yearCont.html(html);
-			this.place();
-		},
-
-		updateNavArrows: function () {
-			var d = new Date(this.viewDate),
-				year = d.getUTCFullYear(),
-				month = d.getUTCMonth(),
-				day = d.getUTCDate(),
-				hour = d.getUTCHours();
-			switch (this.viewMode) {
-				case 0:
-					if (this.startDate !== -Infinity && year <= this.startDate.getUTCFullYear()
-						&& month <= this.startDate.getUTCMonth()
-						&& day <= this.startDate.getUTCDate()
-						&& hour <= this.startDate.getUTCHours()) {
-						this.picker.find('.prev').css({visibility: 'hidden'});
-					} else {
-						this.picker.find('.prev').css({visibility: 'visible'});
-					}
-					if (this.endDate !== Infinity && year >= this.endDate.getUTCFullYear()
-						&& month >= this.endDate.getUTCMonth()
-						&& day >= this.endDate.getUTCDate()
-						&& hour >= this.endDate.getUTCHours()) {
-						this.picker.find('.next').css({visibility: 'hidden'});
-					} else {
-						this.picker.find('.next').css({visibility: 'visible'});
-					}
-					break;
-				case 1:
-					if (this.startDate !== -Infinity && year <= this.startDate.getUTCFullYear()
-						&& month <= this.startDate.getUTCMonth()
-						&& day <= this.startDate.getUTCDate()) {
-						this.picker.find('.prev').css({visibility: 'hidden'});
-					} else {
-						this.picker.find('.prev').css({visibility: 'visible'});
-					}
-					if (this.endDate !== Infinity && year >= this.endDate.getUTCFullYear()
-						&& month >= this.endDate.getUTCMonth()
-						&& day >= this.endDate.getUTCDate()) {
-						this.picker.find('.next').css({visibility: 'hidden'});
-					} else {
-						this.picker.find('.next').css({visibility: 'visible'});
-					}
-					break;
-				case 2:
-					if (this.startDate !== -Infinity && year <= this.startDate.getUTCFullYear()
-						&& month <= this.startDate.getUTCMonth()) {
-						this.picker.find('.prev').css({visibility: 'hidden'});
-					} else {
-						this.picker.find('.prev').css({visibility: 'visible'});
-					}
-					if (this.endDate !== Infinity && year >= this.endDate.getUTCFullYear()
-						&& month >= this.endDate.getUTCMonth()) {
-						this.picker.find('.next').css({visibility: 'hidden'});
-					} else {
-						this.picker.find('.next').css({visibility: 'visible'});
-					}
-					break;
-				case 3:
-				case 4:
-					if (this.startDate !== -Infinity && year <= this.startDate.getUTCFullYear()) {
-						this.picker.find('.prev').css({visibility: 'hidden'});
-					} else {
-						this.picker.find('.prev').css({visibility: 'visible'});
-					}
-					if (this.endDate !== Infinity && year >= this.endDate.getUTCFullYear()) {
-						this.picker.find('.next').css({visibility: 'hidden'});
-					} else {
-						this.picker.find('.next').css({visibility: 'visible'});
-					}
-					break;
-			}
-		},
-
-		mousewheel: function (e) {
-
-			e.preventDefault();
-			e.stopPropagation();
-
-			if (this.wheelPause) {
-				return;
-			}
-
-			this.wheelPause = true;
-
-			var originalEvent = e.originalEvent;
-
-			var delta = originalEvent.wheelDelta;
-
-			var mode = delta > 0 ? 1 : (delta === 0) ? 0 : -1;
-
-			if (this.wheelViewModeNavigationInverseDirection) {
-				mode = -mode;
-			}
-
-			this.showMode(mode);
-
-			setTimeout($.proxy(function () {
-
-				this.wheelPause = false
-
-			}, this), this.wheelViewModeNavigationDelay);
-
-		},
-
-		click: function (e) {
-			e.stopPropagation();
-			e.preventDefault();
-			var target = $(e.target).closest('span, td, th, legend');
-			if (target.is('.' + this.icontype)) {
-				target = $(target).parent().closest('span, td, th, legend');
-			}
-			if (target.length == 1) {
-				if (target.is('.disabled')) {
-					this.element.trigger({
-						type:      'outOfRange',
-						date:      this.viewDate,
-						startDate: this.startDate,
-						endDate:   this.endDate
-					});
-					return;
-				}
-				switch (target[0].nodeName.toLowerCase()) {
-					case 'th':
-						switch (target[0].className) {
-							case 'switch':
-								this.showMode(1);
-								break;
-							case 'prev':
-							case 'next':
-								var dir = DPGlobal.modes[this.viewMode].navStep * (target[0].className == 'prev' ? -1 : 1);
-								switch (this.viewMode) {
-									case 0:
-										this.viewDate = this.moveHour(this.viewDate, dir);
-										break;
-									case 1:
-										this.viewDate = this.moveDate(this.viewDate, dir);
-										break;
-									case 2:
-										this.viewDate = this.moveMonth(this.viewDate, dir);
-										break;
-									case 3:
-									case 4:
-										this.viewDate = this.moveYear(this.viewDate, dir);
-										break;
-								}
-								this.fill();
-								this.element.trigger({
-									type:      target[0].className + ':' + this.convertViewModeText(this.viewMode),
-									date:      this.viewDate,
-									startDate: this.startDate,
-									endDate:   this.endDate
-								});
-								break;
-							case 'today':
-								var date = new Date();
-								date = UTCDate(date.getFullYear(), date.getMonth(), date.getDate(), date.getHours(), date.getMinutes(), date.getSeconds(), 0);
-
-								// Respect startDate and endDate.
-								if (date < this.startDate) date = this.startDate;
-								else if (date > this.endDate) date = this.endDate;
-
-								this.viewMode = this.startViewMode;
-								this.showMode(0);
-								this._setDate(date);
-								this.fill();
-								if (this.autoclose) {
-									this.hide();
-								}
-								break;
-						}
-						break;
-					case 'span':
-						if (!target.is('.disabled')) {
-							var year = this.viewDate.getUTCFullYear(),
-								month = this.viewDate.getUTCMonth(),
-								day = this.viewDate.getUTCDate(),
-								hours = this.viewDate.getUTCHours(),
-								minutes = this.viewDate.getUTCMinutes(),
-								seconds = this.viewDate.getUTCSeconds();
-
-							if (target.is('.month')) {
-								this.viewDate.setUTCDate(1);
-								month = target.parent().find('span').index(target);
-								day = this.viewDate.getUTCDate();
-								this.viewDate.setUTCMonth(month);
-								this.element.trigger({
-									type: 'changeMonth',
-									date: this.viewDate
-								});
-								if (this.viewSelect >= 3) {
-									this._setDate(UTCDate(year, month, day, hours, minutes, seconds, 0));
-								}
-							} else if (target.is('.year')) {
-								this.viewDate.setUTCDate(1);
-								year = parseInt(target.text(), 10) || 0;
-								this.viewDate.setUTCFullYear(year);
-								this.element.trigger({
-									type: 'changeYear',
-									date: this.viewDate
-								});
-								if (this.viewSelect >= 4) {
-									this._setDate(UTCDate(year, month, day, hours, minutes, seconds, 0));
-								}
-							} else if (target.is('.hour')) {
-								hours = parseInt(target.text(), 10) || 0;
-								if (target.hasClass('hour_am') || target.hasClass('hour_pm')) {
-									if (hours == 12 && target.hasClass('hour_am')) {
-										hours = 0;
-									} else if (hours != 12 && target.hasClass('hour_pm')) {
-										hours += 12;
-									}
-								}
-								this.viewDate.setUTCHours(hours);
-								this.element.trigger({
-									type: 'changeHour',
-									date: this.viewDate
-								});
-								if (this.viewSelect >= 1) {
-									this._setDate(UTCDate(year, month, day, hours, minutes, seconds, 0));
-								}
-							} else if (target.is('.minute')) {
-								minutes = parseInt(target.text().substr(target.text().indexOf(':') + 1), 10) || 0;
-								this.viewDate.setUTCMinutes(minutes);
-								this.element.trigger({
-									type: 'changeMinute',
-									date: this.viewDate
-								});
-								if (this.viewSelect >= 0) {
-									this._setDate(UTCDate(year, month, day, hours, minutes, seconds, 0));
-								}
-							}
-							if (this.viewMode != 0) {
-								var oldViewMode = this.viewMode;
-								this.showMode(-1);
-								this.fill();
-								if (oldViewMode == this.viewMode && this.autoclose) {
-									this.hide();
-								}
-							} else {
-								this.fill();
-								if (this.autoclose) {
-									this.hide();
-								}
-							}
-						}
-						break;
-					case 'td':
-						if (target.is('.day') && !target.is('.disabled')) {
-							var day = parseInt(target.text(), 10) || 1;
-							var year = this.viewDate.getUTCFullYear(),
-								month = this.viewDate.getUTCMonth(),
-								hours = this.viewDate.getUTCHours(),
-								minutes = this.viewDate.getUTCMinutes(),
-								seconds = this.viewDate.getUTCSeconds();
-							if (target.is('.old')) {
-								if (month === 0) {
-									month = 11;
-									year -= 1;
-								} else {
-									month -= 1;
-								}
-							} else if (target.is('.new')) {
-								if (month == 11) {
-									month = 0;
-									year += 1;
-								} else {
-									month += 1;
-								}
-							}
-							this.viewDate.setUTCFullYear(year);
-							this.viewDate.setUTCMonth(month, day);
-							this.element.trigger({
-								type: 'changeDay',
-								date: this.viewDate
-							});
-							if (this.viewSelect >= 2) {
-								this._setDate(UTCDate(year, month, day, hours, minutes, seconds, 0));
-							}
-						}
-						var oldViewMode = this.viewMode;
-						this.showMode(-1);
-						this.fill();
-						if (oldViewMode == this.viewMode && this.autoclose) {
-							this.hide();
-						}
-						break;
-				}
-			}
-		},
-
-		_setDate: function (date, which) {
-			if (!which || which == 'date')
-				this.date = date;
-			if (!which || which == 'view')
-				this.viewDate = date;
-			this.fill();
-			this.setValue();
-			var element;
-			if (this.isInput) {
-				element = this.element;
-			} else if (this.component) {
-				element = this.element.find('input');
-			}
-			if (element) {
-				element.change();
-				if (this.autoclose && (!which || which == 'date')) {
-					//this.hide();
-				}
-			}
-			this.element.trigger({
-				type: 'changeDate',
-				date: this.date
-			});
-		},
-
-		moveMinute: function (date, dir) {
-			if (!dir) return date;
-			var new_date = new Date(date.valueOf());
-			//dir = dir > 0 ? 1 : -1;
-			new_date.setUTCMinutes(new_date.getUTCMinutes() + (dir * this.minuteStep));
-			return new_date;
-		},
-
-		moveHour: function (date, dir) {
-			if (!dir) return date;
-			var new_date = new Date(date.valueOf());
-			//dir = dir > 0 ? 1 : -1;
-			new_date.setUTCHours(new_date.getUTCHours() + dir);
-			return new_date;
-		},
-
-		moveDate: function (date, dir) {
-			if (!dir) return date;
-			var new_date = new Date(date.valueOf());
-			//dir = dir > 0 ? 1 : -1;
-			new_date.setUTCDate(new_date.getUTCDate() + dir);
-			return new_date;
-		},
-
-		moveMonth: function (date, dir) {
-			if (!dir) return date;
-			var new_date = new Date(date.valueOf()),
-				day = new_date.getUTCDate(),
-				month = new_date.getUTCMonth(),
-				mag = Math.abs(dir),
-				new_month, test;
-			dir = dir > 0 ? 1 : -1;
-			if (mag == 1) {
-				test = dir == -1
-					// If going back one month, make sure month is not current month
-					// (eg, Mar 31 -> Feb 31 == Feb 28, not Mar 02)
-					? function () {
-					return new_date.getUTCMonth() == month;
-				}
-					// If going forward one month, make sure month is as expected
-					// (eg, Jan 31 -> Feb 31 == Feb 28, not Mar 02)
-					: function () {
-					return new_date.getUTCMonth() != new_month;
-				};
-				new_month = month + dir;
-				new_date.setUTCMonth(new_month);
-				// Dec -> Jan (12) or Jan -> Dec (-1) -- limit expected date to 0-11
-				if (new_month < 0 || new_month > 11)
-					new_month = (new_month + 12) % 12;
-			} else {
-				// For magnitudes >1, move one month at a time...
-				for (var i = 0; i < mag; i++)
-					// ...which might decrease the day (eg, Jan 31 to Feb 28, etc)...
-					new_date = this.moveMonth(new_date, dir);
-				// ...then reset the day, keeping it in the new month
-				new_month = new_date.getUTCMonth();
-				new_date.setUTCDate(day);
-				test = function () {
-					return new_month != new_date.getUTCMonth();
-				};
-			}
-			// Common date-resetting loop -- if date is beyond end of month, make it
-			// end of month
-			while (test()) {
-				new_date.setUTCDate(--day);
-				new_date.setUTCMonth(new_month);
-			}
-			return new_date;
-		},
-
-		moveYear: function (date, dir) {
-			return this.moveMonth(date, dir * 12);
-		},
-
-		dateWithinRange: function (date) {
-			return date >= this.startDate && date <= this.endDate;
-		},
-
-		keydown: function (e) {
-			if (this.picker.is(':not(:visible)')) {
-				if (e.keyCode == 27) // allow escape to hide and re-show picker
-					this.show();
-				return;
-			}
-			var dateChanged = false,
-				dir, day, month,
-				newDate, newViewDate;
-			switch (e.keyCode) {
-				case 27: // escape
-					this.hide();
-					e.preventDefault();
-					break;
-				case 37: // left
-				case 39: // right
-					if (!this.keyboardNavigation) break;
-					dir = e.keyCode == 37 ? -1 : 1;
-					viewMode = this.viewMode;
-					if (e.ctrlKey) {
-						viewMode += 2;
-					} else if (e.shiftKey) {
-						viewMode += 1;
-					}
-					if (viewMode == 4) {
-						newDate = this.moveYear(this.date, dir);
-						newViewDate = this.moveYear(this.viewDate, dir);
-					} else if (viewMode == 3) {
-						newDate = this.moveMonth(this.date, dir);
-						newViewDate = this.moveMonth(this.viewDate, dir);
-					} else if (viewMode == 2) {
-						newDate = this.moveDate(this.date, dir);
-						newViewDate = this.moveDate(this.viewDate, dir);
-					} else if (viewMode == 1) {
-						newDate = this.moveHour(this.date, dir);
-						newViewDate = this.moveHour(this.viewDate, dir);
-					} else if (viewMode == 0) {
-						newDate = this.moveMinute(this.date, dir);
-						newViewDate = this.moveMinute(this.viewDate, dir);
-					}
-					if (this.dateWithinRange(newDate)) {
-						this.date = newDate;
-						this.viewDate = newViewDate;
-						this.setValue();
-						this.update();
-						e.preventDefault();
-						dateChanged = true;
-					}
-					break;
-				case 38: // up
-				case 40: // down
-					if (!this.keyboardNavigation) break;
-					dir = e.keyCode == 38 ? -1 : 1;
-					viewMode = this.viewMode;
-					if (e.ctrlKey) {
-						viewMode += 2;
-					} else if (e.shiftKey) {
-						viewMode += 1;
-					}
-					if (viewMode == 4) {
-						newDate = this.moveYear(this.date, dir);
-						newViewDate = this.moveYear(this.viewDate, dir);
-					} else if (viewMode == 3) {
-						newDate = this.moveMonth(this.date, dir);
-						newViewDate = this.moveMonth(this.viewDate, dir);
-					} else if (viewMode == 2) {
-						newDate = this.moveDate(this.date, dir * 7);
-						newViewDate = this.moveDate(this.viewDate, dir * 7);
-					} else if (viewMode == 1) {
-						if (this.showMeridian) {
-							newDate = this.moveHour(this.date, dir * 6);
-							newViewDate = this.moveHour(this.viewDate, dir * 6);
-						} else {
-							newDate = this.moveHour(this.date, dir * 4);
-							newViewDate = this.moveHour(this.viewDate, dir * 4);
-						}
-					} else if (viewMode == 0) {
-						newDate = this.moveMinute(this.date, dir * 4);
-						newViewDate = this.moveMinute(this.viewDate, dir * 4);
-					}
-					if (this.dateWithinRange(newDate)) {
-						this.date = newDate;
-						this.viewDate = newViewDate;
-						this.setValue();
-						this.update();
-						e.preventDefault();
-						dateChanged = true;
-					}
-					break;
-				case 13: // enter
-					if (this.viewMode != 0) {
-						var oldViewMode = this.viewMode;
-						this.showMode(-1);
-						this.fill();
-						if (oldViewMode == this.viewMode && this.autoclose) {
-							this.hide();
-						}
-					} else {
-						this.fill();
-						if (this.autoclose) {
-							this.hide();
-						}
-					}
-					e.preventDefault();
-					break;
-				case 9: // tab
-					this.hide();
-					break;
-			}
-			if (dateChanged) {
-				var element;
-				if (this.isInput) {
-					element = this.element;
-				} else if (this.component) {
-					element = this.element.find('input');
-				}
-				if (element) {
-					element.change();
-				}
-				this.element.trigger({
-					type: 'changeDate',
-					date: this.date
-				});
-			}
-		},
-
-		showMode: function (dir) {
-			if (dir) {
-				var newViewMode = Math.max(0, Math.min(DPGlobal.modes.length - 1, this.viewMode + dir));
-				if (newViewMode >= this.minView && newViewMode <= this.maxView) {
-					this.element.trigger({
-						type:        'changeMode',
-						date:        this.viewDate,
-						oldViewMode: this.viewMode,
-						newViewMode: newViewMode
-					});
-
-					this.viewMode = newViewMode;
-				}
-			}
-			/*
-			 vitalets: fixing bug of very special conditions:
-			 jquery 1.7.1 + webkit + show inline datetimepicker in bootstrap popover.
-			 Method show() does not set display css correctly and datetimepicker is not shown.
-			 Changed to .css('display', 'block') solve the problem.
-			 See https://github.com/vitalets/x-editable/issues/37
-
-			 In jquery 1.7.2+ everything works fine.
-			 */
-			//this.picker.find('>div').hide().filter('.datetimepicker-'+DPGlobal.modes[this.viewMode].clsName).show();
-			this.picker.find('>div').hide().filter('.datetimepicker-' + DPGlobal.modes[this.viewMode].clsName).css('display', 'block');
-			this.updateNavArrows();
-		},
-
-		reset: function (e) {
-			this._setDate(null, 'date');
-		},
-
-		convertViewModeText:  function (viewMode) {
-			switch (viewMode) {
-				case 4:
-					return 'decade';
-				case 3:
-					return 'year';
-				case 2:
-					return 'month';
-				case 1:
-					return 'day';
-				case 0:
-					return 'hour';
-			}
-		}
-	};
-
-	var old = $.fn.datetimepicker;
-	$.fn.datetimepicker = function (option) {
-		var args = Array.apply(null, arguments);
-		args.shift();
-		var internal_return;
-		this.each(function () {
-			var $this = $(this),
-				data = $this.data('datetimepicker'),
-				options = typeof option == 'object' && option;
-			if (!data) {
-				$this.data('datetimepicker', (data = new Datetimepicker(this, $.extend({}, $.fn.datetimepicker.defaults, options))));
-			}
-			if (typeof option == 'string' && typeof data[option] == 'function') {
-				internal_return = data[option].apply(data, args);
-				if (internal_return !== undefined) {
-					return false;
-				}
-			}
-		});
-		if (internal_return !== undefined)
-			return internal_return;
-		else
-			return this;
-	};
-
-	$.fn.datetimepicker.defaults = {
-	};
-	$.fn.datetimepicker.Constructor = Datetimepicker;
-	var dates = $.fn.datetimepicker.dates = {
-		en: {
-			days:        ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"],
-			daysShort:   ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"],
-			daysMin:     ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"],
-			months:      ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"],
-			monthsShort: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
-			meridiem:    ["am", "pm"],
-			suffix:      ["st", "nd", "rd", "th"],
-			today:       "Today"
-		}
-	};
-
-	var DPGlobal = {
-		modes:            [
-			{
-				clsName: 'minutes',
-				navFnc:  'Hours',
-				navStep: 1
-			},
-			{
-				clsName: 'hours',
-				navFnc:  'Date',
-				navStep: 1
-			},
-			{
-				clsName: 'days',
-				navFnc:  'Month',
-				navStep: 1
-			},
-			{
-				clsName: 'months',
-				navFnc:  'FullYear',
-				navStep: 1
-			},
-			{
-				clsName: 'years',
-				navFnc:  'FullYear',
-				navStep: 10
-			}
-		],
-		isLeapYear:       function (year) {
-			return (((year % 4 === 0) && (year % 100 !== 0)) || (year % 400 === 0))
-		},
-		getDaysInMonth:   function (year, month) {
-			return [31, (DPGlobal.isLeapYear(year) ? 29 : 28), 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][month]
-		},
-		getDefaultFormat: function (type, field) {
-			if (type == "standard") {
-				if (field == 'input')
-					return 'yyyy-mm-dd hh:ii';
-				else
-					return 'yyyy-mm-dd hh:ii:ss';
-			} else if (type == "php") {
-				if (field == 'input')
-					return 'Y-m-d H:i';
-				else
-					return 'Y-m-d H:i:s';
-			} else {
-				throw new Error("Invalid format type.");
-			}
-		},
-		validParts:       function (type) {
-			if (type == "standard") {
-				return /hh?|HH?|p|P|ii?|ss?|dd?|DD?|mm?|MM?|yy(?:yy)?/g;
-			} else if (type == "php") {
-				return /[dDjlNwzFmMnStyYaABgGhHis]/g;
-			} else {
-				throw new Error("Invalid format type.");
-			}
-		},
-		nonpunctuation:   /[^ -\/:-@\[-`{-~\t\n\rTZ]+/g,
-		parseFormat:      function (format, type) {
-			// IE treats \0 as a string end in inputs (truncating the value),
-			// so it's a bad format delimiter, anyway
-			var separators = format.replace(this.validParts(type), '\0').split('\0'),
-				parts = format.match(this.validParts(type));
-			if (!separators || !separators.length || !parts || parts.length == 0) {
-				throw new Error("Invalid date format.");
-			}
-			return {separators: separators, parts: parts};
-		},
-		parseDate:        function (date, format, language, type) {
-			if (date instanceof Date) {
-				var dateUTC = new Date(date.valueOf() - date.getTimezoneOffset() * 60000);
-				dateUTC.setMilliseconds(0);
-				return dateUTC;
-			}
-			if (/^\d{4}\-\d{1,2}\-\d{1,2}$/.test(date)) {
-				format = this.parseFormat('yyyy-mm-dd', type);
-			}
-			if (/^\d{4}\-\d{1,2}\-\d{1,2}[T ]\d{1,2}\:\d{1,2}$/.test(date)) {
-				format = this.parseFormat('yyyy-mm-dd hh:ii', type);
-			}
-			if (/^\d{4}\-\d{1,2}\-\d{1,2}[T ]\d{1,2}\:\d{1,2}\:\d{1,2}[Z]{0,1}$/.test(date)) {
-				format = this.parseFormat('yyyy-mm-dd hh:ii:ss', type);
-			}
-			if (/^[-+]\d+[dmwy]([\s,]+[-+]\d+[dmwy])*$/.test(date)) {
-				var part_re = /([-+]\d+)([dmwy])/,
-					parts = date.match(/([-+]\d+)([dmwy])/g),
-					part, dir;
-				date = new Date();
-				for (var i = 0; i < parts.length; i++) {
-					part = part_re.exec(parts[i]);
-					dir = parseInt(part[1]);
-					switch (part[2]) {
-						case 'd':
-							date.setUTCDate(date.getUTCDate() + dir);
-							break;
-						case 'm':
-							date = Datetimepicker.prototype.moveMonth.call(Datetimepicker.prototype, date, dir);
-							break;
-						case 'w':
-							date.setUTCDate(date.getUTCDate() + dir * 7);
-							break;
-						case 'y':
-							date = Datetimepicker.prototype.moveYear.call(Datetimepicker.prototype, date, dir);
-							break;
-					}
-				}
-				return UTCDate(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate(), date.getUTCHours(), date.getUTCMinutes(), date.getUTCSeconds(), 0);
-			}
-			var parts = date && date.toString().match(this.nonpunctuation) || [],
-				date = new Date(0, 0, 0, 0, 0, 0, 0),
-				parsed = {},
-				setters_order = ['hh', 'h', 'ii', 'i', 'ss', 's', 'yyyy', 'yy', 'M', 'MM', 'm', 'mm', 'D', 'DD', 'd', 'dd', 'H', 'HH', 'p', 'P'],
-				setters_map = {
-					hh:   function (d, v) {
-						return d.setUTCHours(v);
-					},
-					h:    function (d, v) {
-						return d.setUTCHours(v);
-					},
-					HH:   function (d, v) {
-						return d.setUTCHours(v == 12 ? 0 : v);
-					},
-					H:    function (d, v) {
-						return d.setUTCHours(v == 12 ? 0 : v);
-					},
-					ii:   function (d, v) {
-						return d.setUTCMinutes(v);
-					},
-					i:    function (d, v) {
-						return d.setUTCMinutes(v);
-					},
-					ss:   function (d, v) {
-						return d.setUTCSeconds(v);
-					},
-					s:    function (d, v) {
-						return d.setUTCSeconds(v);
-					},
-					yyyy: function (d, v) {
-						return d.setUTCFullYear(v);
-					},
-					yy:   function (d, v) {
-						return d.setUTCFullYear(2000 + v);
-					},
-					m:    function (d, v) {
-						v -= 1;
-						while (v < 0) v += 12;
-						v %= 12;
-						d.setUTCMonth(v);
-						while (d.getUTCMonth() != v)
-							if (isNaN(d.getUTCMonth()))
-								return d;
-							else
-								d.setUTCDate(d.getUTCDate() - 1);
-						return d;
-					},
-					d:    function (d, v) {
-						return d.setUTCDate(v);
-					},
-					p:    function (d, v) {
-						return d.setUTCHours(v == 1 ? d.getUTCHours() + 12 : d.getUTCHours());
-					}
-				},
-				val, filtered, part;
-			setters_map['M'] = setters_map['MM'] = setters_map['mm'] = setters_map['m'];
-			setters_map['dd'] = setters_map['d'];
-			setters_map['P'] = setters_map['p'];
-			date = UTCDate(date.getFullYear(), date.getMonth(), date.getDate(), date.getHours(), date.getMinutes(), date.getSeconds());
-			if (parts.length == format.parts.length) {
-				for (var i = 0, cnt = format.parts.length; i < cnt; i++) {
-					val = parseInt(parts[i], 10);
-					part = format.parts[i];
-					if (isNaN(val)) {
-						switch (part) {
-							case 'MM':
-								filtered = $(dates[language].months).filter(function () {
-									var m = this.slice(0, parts[i].length),
-										p = parts[i].slice(0, m.length);
-									return m == p;
-								});
-								val = $.inArray(filtered[0], dates[language].months) + 1;
-								break;
-							case 'M':
-								filtered = $(dates[language].monthsShort).filter(function () {
-									var m = this.slice(0, parts[i].length),
-										p = parts[i].slice(0, m.length);
-									return m.toLowerCase() == p.toLowerCase();
-								});
-								val = $.inArray(filtered[0], dates[language].monthsShort) + 1;
-								break;
-							case 'p':
-							case 'P':
-								val = $.inArray(parts[i].toLowerCase(), dates[language].meridiem);
-								break;
-						}
-					}
-					parsed[part] = val;
-				}
-				for (var i = 0, s; i < setters_order.length; i++) {
-					s = setters_order[i];
-					if (s in parsed && !isNaN(parsed[s]))
-						setters_map[s](date, parsed[s])
-				}
-			}
-			return date;
-		},
-		formatDate:       function (date, format, language, type) {
-			if (date == null) {
-				return '';
-			}
-			var val;
-			if (type == 'standard') {
-				val = {
-					// year
-					yy:   date.getUTCFullYear().toString().substring(2),
-					yyyy: date.getUTCFullYear(),
-					// month
-					m:    date.getUTCMonth() + 1,
-					M:    dates[language].monthsShort[date.getUTCMonth()],
-					MM:   dates[language].months[date.getUTCMonth()],
-					// day
-					d:    date.getUTCDate(),
-					D:    dates[language].daysShort[date.getUTCDay()],
-					DD:   dates[language].days[date.getUTCDay()],
-					p:    (dates[language].meridiem.length == 2 ? dates[language].meridiem[date.getUTCHours() < 12 ? 0 : 1] : ''),
-					// hour
-					h:    date.getUTCHours(),
-					// minute
-					i:    date.getUTCMinutes(),
-					// second
-					s:    date.getUTCSeconds()
-				};
-
-				if (dates[language].meridiem.length == 2) {
-					val.H = (val.h % 12 == 0 ? 12 : val.h % 12);
-				}
-				else {
-					val.H = val.h;
-				}
-				val.HH = (val.H < 10 ? '0' : '') + val.H;
-				val.P = val.p.toUpperCase();
-				val.hh = (val.h < 10 ? '0' : '') + val.h;
-				val.ii = (val.i < 10 ? '0' : '') + val.i;
-				val.ss = (val.s < 10 ? '0' : '') + val.s;
-				val.dd = (val.d < 10 ? '0' : '') + val.d;
-				val.mm = (val.m < 10 ? '0' : '') + val.m;
-			} else if (type == 'php') {
-				// php format
-				val = {
-					// year
-					y: date.getUTCFullYear().toString().substring(2),
-					Y: date.getUTCFullYear(),
-					// month
-					F: dates[language].months[date.getUTCMonth()],
-					M: dates[language].monthsShort[date.getUTCMonth()],
-					n: date.getUTCMonth() + 1,
-					t: DPGlobal.getDaysInMonth(date.getUTCFullYear(), date.getUTCMonth()),
-					// day
-					j: date.getUTCDate(),
-					l: dates[language].days[date.getUTCDay()],
-					D: dates[language].daysShort[date.getUTCDay()],
-					w: date.getUTCDay(), // 0 -> 6
-					N: (date.getUTCDay() == 0 ? 7 : date.getUTCDay()),       // 1 -> 7
-					S: (date.getUTCDate() % 10 <= dates[language].suffix.length ? dates[language].suffix[date.getUTCDate() % 10 - 1] : ''),
-					// hour
-					a: (dates[language].meridiem.length == 2 ? dates[language].meridiem[date.getUTCHours() < 12 ? 0 : 1] : ''),
-					g: (date.getUTCHours() % 12 == 0 ? 12 : date.getUTCHours() % 12),
-					G: date.getUTCHours(),
-					// minute
-					i: date.getUTCMinutes(),
-					// second
-					s: date.getUTCSeconds()
-				};
-				val.m = (val.n < 10 ? '0' : '') + val.n;
-				val.d = (val.j < 10 ? '0' : '') + val.j;
-				val.A = val.a.toString().toUpperCase();
-				val.h = (val.g < 10 ? '0' : '') + val.g;
-				val.H = (val.G < 10 ? '0' : '') + val.G;
-				val.i = (val.i < 10 ? '0' : '') + val.i;
-				val.s = (val.s < 10 ? '0' : '') + val.s;
-			} else {
-				throw new Error("Invalid format type.");
-			}
-			var date = [],
-				seps = $.extend([], format.separators);
-			for (var i = 0, cnt = format.parts.length; i < cnt; i++) {
-				if (seps.length) {
-					date.push(seps.shift());
-				}
-				date.push(val[format.parts[i]]);
-			}
-			if (seps.length) {
-				date.push(seps.shift());
-			}
-			return date.join('');
-		},
-		convertViewMode:  function (viewMode) {
-			switch (viewMode) {
-				case 4:
-				case 'decade':
-					viewMode = 4;
-					break;
-				case 3:
-				case 'year':
-					viewMode = 3;
-					break;
-				case 2:
-				case 'month':
-					viewMode = 2;
-					break;
-				case 1:
-				case 'day':
-					viewMode = 1;
-					break;
-				case 0:
-				case 'hour':
-					viewMode = 0;
-					break;
-			}
-
-			return viewMode;
-		},
-		headTemplate:     '<thead>' +
-							  '<tr>' +
-							  '<th class="prev"><i class="{leftArrow}"/></th>' +
-							  '<th colspan="5" class="switch"></th>' +
-							  '<th class="next"><i class="{rightArrow}"/></th>' +
-							  '</tr>' +
-			'</thead>',
-		headTemplateV3:   '<thead>' +
-							  '<tr>' +
-							  '<th class="prev"><span class="{iconType} {leftArrow}"></span> </th>' +
-							  '<th colspan="5" class="switch"></th>' +
-							  '<th class="next"><span class="{iconType} {rightArrow}"></span> </th>' +
-							  '</tr>' +
-			'</thead>',
-		contTemplate:     '<tbody><tr><td colspan="7"></td></tr></tbody>',
-		footTemplate:     '<tfoot><tr><th colspan="7" class="today"></th></tr></tfoot>'
-	};
-	DPGlobal.template = '<div class="datetimepicker">' +
-		'<div class="datetimepicker-minutes">' +
-		'<table class=" table-condensed">' +
-		DPGlobal.headTemplate +
-		DPGlobal.contTemplate +
-		DPGlobal.footTemplate +
-		'</table>' +
-		'</div>' +
-		'<div class="datetimepicker-hours">' +
-		'<table class=" table-condensed">' +
-		DPGlobal.headTemplate +
-		DPGlobal.contTemplate +
-		DPGlobal.footTemplate +
-		'</table>' +
-		'</div>' +
-		'<div class="datetimepicker-days">' +
-		'<table class=" table-condensed">' +
-		DPGlobal.headTemplate +
-		'<tbody></tbody>' +
-		DPGlobal.footTemplate +
-		'</table>' +
-		'</div>' +
-		'<div class="datetimepicker-months">' +
-		'<table class="table-condensed">' +
-		DPGlobal.headTemplate +
-		DPGlobal.contTemplate +
-		DPGlobal.footTemplate +
-		'</table>' +
-		'</div>' +
-		'<div class="datetimepicker-years">' +
-		'<table class="table-condensed">' +
-		DPGlobal.headTemplate +
-		DPGlobal.contTemplate +
-		DPGlobal.footTemplate +
-		'</table>' +
-		'</div>' +
-		'</div>';
-	DPGlobal.templateV3 = '<div class="datetimepicker">' +
-		'<div class="datetimepicker-minutes">' +
-		'<table class=" table-condensed">' +
-		DPGlobal.headTemplateV3 +
-		DPGlobal.contTemplate +
-		DPGlobal.footTemplate +
-		'</table>' +
-		'</div>' +
-		'<div class="datetimepicker-hours">' +
-		'<table class=" table-condensed">' +
-		DPGlobal.headTemplateV3 +
-		DPGlobal.contTemplate +
-		DPGlobal.footTemplate +
-		'</table>' +
-		'</div>' +
-		'<div class="datetimepicker-days">' +
-		'<table class=" table-condensed">' +
-		DPGlobal.headTemplateV3 +
-		'<tbody></tbody>' +
-		DPGlobal.footTemplate +
-		'</table>' +
-		'</div>' +
-		'<div class="datetimepicker-months">' +
-		'<table class="table-condensed">' +
-		DPGlobal.headTemplateV3 +
-		DPGlobal.contTemplate +
-		DPGlobal.footTemplate +
-		'</table>' +
-		'</div>' +
-		'<div class="datetimepicker-years">' +
-		'<table class="table-condensed">' +
-		DPGlobal.headTemplateV3 +
-		DPGlobal.contTemplate +
-		DPGlobal.footTemplate +
-		'</table>' +
-		'</div>' +
-		'</div>';
-	$.fn.datetimepicker.DPGlobal = DPGlobal;
-
-	/* DATETIMEPICKER NO CONFLICT
-	 * =================== */
-
-	$.fn.datetimepicker.noConflict = function () {
-		$.fn.datetimepicker = old;
-		return this;
-	};
-
-	/* DATETIMEPICKER DATA-API
-	 * ================== */
-
-	$(document).on(
-		'focus.datetimepicker.data-api click.datetimepicker.data-api',
-		'[data-provide="datetimepicker"]',
-		function (e) {
-			var $this = $(this);
-			if ($this.data('datetimepicker')) return;
-			e.preventDefault();
-			// component click requires us to explicitly show it
-			$this.datetimepicker('show');
-		}
-	);
-	$(function () {
-		$('[data-provide="datetimepicker-inline"]').datetimepicker();
-	});
-
-}(window.jQuery);
diff --git a/NewLife.Cube/Content/DateTimePicker/bootstrap-datetimepicker.min.css b/NewLife.Cube/Content/DateTimePicker/bootstrap-datetimepicker.min.css
deleted file mode 100644
index 2cdb4b96f3..0000000000
--- a/NewLife.Cube/Content/DateTimePicker/bootstrap-datetimepicker.min.css
+++ /dev/null
@@ -1,9 +0,0 @@
-/*!
- * Datetimepicker for Bootstrap
- *
- * Copyright 2012 Stefan Petre
- * Improvements by Andrew Rowls
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- */.datetimepicker{padding:4px;margin-top:1px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;direction:ltr}.datetimepicker-inline{width:220px}.datetimepicker.datetimepicker-rtl{direction:rtl}.datetimepicker.datetimepicker-rtl table tr td span{float:right}.datetimepicker-dropdown,.datetimepicker-dropdown-left{top:0;left:0}[class*=" datetimepicker-dropdown"]:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0,0,0,0.2);position:absolute}[class*=" datetimepicker-dropdown"]:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #fff;position:absolute}[class*=" datetimepicker-dropdown-top"]:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-top:7px solid #ccc;border-top-color:rgba(0,0,0,0.2);border-bottom:0}[class*=" datetimepicker-dropdown-top"]:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-top:6px solid #fff;border-bottom:0}.datetimepicker-dropdown-bottom-left:before{top:-7px;right:6px}.datetimepicker-dropdown-bottom-left:after{top:-6px;right:7px}.datetimepicker-dropdown-bottom-right:before{top:-7px;left:6px}.datetimepicker-dropdown-bottom-right:after{top:-6px;left:7px}.datetimepicker-dropdown-top-left:before{bottom:-7px;right:6px}.datetimepicker-dropdown-top-left:after{bottom:-6px;right:7px}.datetimepicker-dropdown-top-right:before{bottom:-7px;left:6px}.datetimepicker-dropdown-top-right:after{bottom:-6px;left:7px}.datetimepicker>div{display:none}.datetimepicker.minutes div.datetimepicker-minutes{display:block}.datetimepicker.hours div.datetimepicker-hours{display:block}.datetimepicker.days div.datetimepicker-days{display:block}.datetimepicker.months div.datetimepicker-months{display:block}.datetimepicker.years div.datetimepicker-years{display:block}.datetimepicker table{margin:0}.datetimepicker td,.datetimepicker th{text-align:center;width:20px;height:20px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;border:0}.table-striped .datetimepicker table tr td,.table-striped .datetimepicker table tr th{background-color:transparent}.datetimepicker table tr td.minute:hover{background:#eee;cursor:pointer}.datetimepicker table tr td.hour:hover{background:#eee;cursor:pointer}.datetimepicker table tr td.day:hover{background:#eee;cursor:pointer}.datetimepicker table tr td.old,.datetimepicker table tr td.new{color:#999}.datetimepicker table tr td.disabled,.datetimepicker table tr td.disabled:hover{background:0;color:#999;cursor:default}.datetimepicker table tr td.today,.datetimepicker table tr td.today:hover,.datetimepicker table tr td.today.disabled,.datetimepicker table tr td.today.disabled:hover{background-color:#fde19a;background-image:-moz-linear-gradient(top,#fdd49a,#fdf59a);background-image:-ms-linear-gradient(top,#fdd49a,#fdf59a);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fdd49a),to(#fdf59a));background-image:-webkit-linear-gradient(top,#fdd49a,#fdf59a);background-image:-o-linear-gradient(top,#fdd49a,#fdf59a);background-image:linear-gradient(top,#fdd49a,#fdf59a);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fdd49a',endColorstr='#fdf59a',GradientType=0);border-color:#fdf59a #fdf59a #fbed50;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(enabled=false)}.datetimepicker table tr td.today:hover,.datetimepicker table tr td.today:hover:hover,.datetimepicker table tr td.today.disabled:hover,.datetimepicker table tr td.today.disabled:hover:hover,.datetimepicker table tr td.today:active,.datetimepicker table tr td.today:hover:active,.datetimepicker table tr td.today.disabled:active,.datetimepicker table tr td.today.disabled:hover:active,.datetimepicker table tr td.today.active,.datetimepicker table tr td.today:hover.active,.datetimepicker table tr td.today.disabled.active,.datetimepicker table tr td.today.disabled:hover.active,.datetimepicker table tr td.today.disabled,.datetimepicker table tr td.today:hover.disabled,.datetimepicker table tr td.today.disabled.disabled,.datetimepicker table tr td.today.disabled:hover.disabled,.datetimepicker table tr td.today[disabled],.datetimepicker table tr td.today:hover[disabled],.datetimepicker table tr td.today.disabled[disabled],.datetimepicker table tr td.today.disabled:hover[disabled]{background-color:#fdf59a}.datetimepicker table tr td.today:active,.datetimepicker table tr td.today:hover:active,.datetimepicker table tr td.today.disabled:active,.datetimepicker table tr td.today.disabled:hover:active,.datetimepicker table tr td.today.active,.datetimepicker table tr td.today:hover.active,.datetimepicker table tr td.today.disabled.active,.datetimepicker table tr td.today.disabled:hover.active{background-color:#fbf069}.datetimepicker table tr td.active,.datetimepicker table tr td.active:hover,.datetimepicker table tr td.active.disabled,.datetimepicker table tr td.active.disabled:hover{background-color:#006dcc;background-image:-moz-linear-gradient(top,#08c,#04c);background-image:-ms-linear-gradient(top,#08c,#04c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(top,#08c,#04c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc',endColorstr='#0044cc',GradientType=0);border-color:#04c #04c #002a80;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(enabled=false);color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.datetimepicker table tr td.active:hover,.datetimepicker table tr td.active:hover:hover,.datetimepicker table tr td.active.disabled:hover,.datetimepicker table tr td.active.disabled:hover:hover,.datetimepicker table tr td.active:active,.datetimepicker table tr td.active:hover:active,.datetimepicker table tr td.active.disabled:active,.datetimepicker table tr td.active.disabled:hover:active,.datetimepicker table tr td.active.active,.datetimepicker table tr td.active:hover.active,.datetimepicker table tr td.active.disabled.active,.datetimepicker table tr td.active.disabled:hover.active,.datetimepicker table tr td.active.disabled,.datetimepicker table tr td.active:hover.disabled,.datetimepicker table tr td.active.disabled.disabled,.datetimepicker table tr td.active.disabled:hover.disabled,.datetimepicker table tr td.active[disabled],.datetimepicker table tr td.active:hover[disabled],.datetimepicker table tr td.active.disabled[disabled],.datetimepicker table tr td.active.disabled:hover[disabled]{background-color:#04c}.datetimepicker table tr td.active:active,.datetimepicker table tr td.active:hover:active,.datetimepicker table tr td.active.disabled:active,.datetimepicker table tr td.active.disabled:hover:active,.datetimepicker table tr td.active.active,.datetimepicker table tr td.active:hover.active,.datetimepicker table tr td.active.disabled.active,.datetimepicker table tr td.active.disabled:hover.active{background-color:#039}.datetimepicker table tr td span{display:block;width:23%;height:54px;line-height:54px;float:left;margin:1%;cursor:pointer;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.datetimepicker .datetimepicker-hours span{height:26px;line-height:26px}.datetimepicker .datetimepicker-hours table tr td span.hour_am,.datetimepicker .datetimepicker-hours table tr td span.hour_pm{width:14.6%}.datetimepicker .datetimepicker-hours fieldset legend,.datetimepicker .datetimepicker-minutes fieldset legend{margin-bottom:inherit;line-height:30px}.datetimepicker .datetimepicker-minutes span{height:26px;line-height:26px}.datetimepicker table tr td span:hover{background:#eee}.datetimepicker table tr td span.disabled,.datetimepicker table tr td span.disabled:hover{background:0;color:#999;cursor:default}.datetimepicker table tr td span.active,.datetimepicker table tr td span.active:hover,.datetimepicker table tr td span.active.disabled,.datetimepicker table tr td span.active.disabled:hover{background-color:#006dcc;background-image:-moz-linear-gradient(top,#08c,#04c);background-image:-ms-linear-gradient(top,#08c,#04c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(top,#08c,#04c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc',endColorstr='#0044cc',GradientType=0);border-color:#04c #04c #002a80;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(enabled=false);color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.datetimepicker table tr td span.active:hover,.datetimepicker table tr td span.active:hover:hover,.datetimepicker table tr td span.active.disabled:hover,.datetimepicker table tr td span.active.disabled:hover:hover,.datetimepicker table tr td span.active:active,.datetimepicker table tr td span.active:hover:active,.datetimepicker table tr td span.active.disabled:active,.datetimepicker table tr td span.active.disabled:hover:active,.datetimepicker table tr td span.active.active,.datetimepicker table tr td span.active:hover.active,.datetimepicker table tr td span.active.disabled.active,.datetimepicker table tr td span.active.disabled:hover.active,.datetimepicker table tr td span.active.disabled,.datetimepicker table tr td span.active:hover.disabled,.datetimepicker table tr td span.active.disabled.disabled,.datetimepicker table tr td span.active.disabled:hover.disabled,.datetimepicker table tr td span.active[disabled],.datetimepicker table tr td span.active:hover[disabled],.datetimepicker table tr td span.active.disabled[disabled],.datetimepicker table tr td span.active.disabled:hover[disabled]{background-color:#04c}.datetimepicker table tr td span.active:active,.datetimepicker table tr td span.active:hover:active,.datetimepicker table tr td span.active.disabled:active,.datetimepicker table tr td span.active.disabled:hover:active,.datetimepicker table tr td span.active.active,.datetimepicker table tr td span.active:hover.active,.datetimepicker table tr td span.active.disabled.active,.datetimepicker table tr td span.active.disabled:hover.active{background-color:#039}.datetimepicker table tr td span.old{color:#999}.datetimepicker th.switch{width:145px}.datetimepicker th span.glyphicon{pointer-events:none}.datetimepicker thead tr:first-child th,.datetimepicker tfoot tr:first-child th{cursor:pointer}.datetimepicker thead tr:first-child th:hover,.datetimepicker tfoot tr:first-child th:hover{background:#eee}.input-append.date .add-on i,.input-prepend.date .add-on i,.input-group.date .input-group-addon span{cursor:pointer;width:14px;height:14px}
\ No newline at end of file
diff --git a/NewLife.Cube/Content/DateTimePicker/bootstrap-datetimepicker.min.js b/NewLife.Cube/Content/DateTimePicker/bootstrap-datetimepicker.min.js
deleted file mode 100644
index 4b4a17cc82..0000000000
--- a/NewLife.Cube/Content/DateTimePicker/bootstrap-datetimepicker.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(d){function g(){return new Date(Date.UTC.apply(Date,arguments))}function b(){var h=new Date();return g(h.getUTCFullYear(),h.getUTCMonth(),h.getUTCDate(),h.getUTCHours(),h.getUTCMinutes(),h.getUTCSeconds(),0)}var f=function(j,i){var l=this;this.element=d(j);this.container=i.container||"body";this.language=i.language||this.element.data("date-language")||"en";this.language=this.language in e?this.language:"en";this.isRTL=e[this.language].rtl||false;this.formatType=i.formatType||this.element.data("format-type")||"standard";this.format=c.parseFormat(i.format||this.element.data("date-format")||e[this.language].format||c.getDefaultFormat(this.formatType,"input"),this.formatType);this.isInline=false;this.isVisible=false;this.isInput=this.element.is("input");this.fontAwesome=i.fontAwesome||this.element.data("font-awesome")||false;this.bootcssVer=i.bootcssVer||(this.isInput?(this.element.is(".form-control")?3:2):(this.bootcssVer=this.element.is(".input-group")?3:2));this.component=this.element.is(".date")?(this.bootcssVer==3?this.element.find(".input-group-addon .glyphicon-th, .input-group-addon .glyphicon-time, .input-group-addon .glyphicon-calendar, .input-group-addon .glyphicon-calendar, .input-group-addon .fa-calendar, .input-group-addon .fa-clock-o").parent():this.element.find(".add-on .icon-th, .add-on .icon-time, .add-on .icon-calendar .fa-calendar .fa-clock-o").parent()):false;this.componentReset=this.element.is(".date")?(this.bootcssVer==3?this.element.find(".input-group-addon .glyphicon-remove, .input-group-addon .fa-times").parent():this.element.find(".add-on .icon-remove, .add-on .fa-times").parent()):false;this.hasInput=this.component&&this.element.find("input").length;if(this.component&&this.component.length===0){this.component=false}this.linkField=i.linkField||this.element.data("link-field")||false;this.linkFormat=c.parseFormat(i.linkFormat||this.element.data("link-format")||c.getDefaultFormat(this.formatType,"link"),this.formatType);this.minuteStep=i.minuteStep||this.element.data("minute-step")||5;this.pickerPosition=i.pickerPosition||this.element.data("picker-position")||"bottom-right";this.showMeridian=i.showMeridian||this.element.data("show-meridian")||false;this.initialDate=i.initialDate||new Date();this.zIndex=i.zIndex||this.element.data("z-index")||undefined;this.icons={leftArrow:this.fontAwesome?"fa-arrow-left":(this.bootcssVer===3?"glyphicon-arrow-left":"icon-arrow-left"),rightArrow:this.fontAwesome?"fa-arrow-right":(this.bootcssVer===3?"glyphicon-arrow-right":"icon-arrow-right")};this.icontype=this.fontAwesome?"fa":"glyphicon";this._attachEvents();this.formatViewType="datetime";if("formatViewType" in i){this.formatViewType=i.formatViewType}else{if("formatViewType" in this.element.data()){this.formatViewType=this.element.data("formatViewType")}}this.minView=0;if("minView" in i){this.minView=i.minView}else{if("minView" in this.element.data()){this.minView=this.element.data("min-view")}}this.minView=c.convertViewMode(this.minView);this.maxView=c.modes.length-1;if("maxView" in i){this.maxView=i.maxView}else{if("maxView" in this.element.data()){this.maxView=this.element.data("max-view")}}this.maxView=c.convertViewMode(this.maxView);this.wheelViewModeNavigation=false;if("wheelViewModeNavigation" in i){this.wheelViewModeNavigation=i.wheelViewModeNavigation}else{if("wheelViewModeNavigation" in this.element.data()){this.wheelViewModeNavigation=this.element.data("view-mode-wheel-navigation")}}this.wheelViewModeNavigationInverseDirection=false;if("wheelViewModeNavigationInverseDirection" in i){this.wheelViewModeNavigationInverseDirection=i.wheelViewModeNavigationInverseDirection}else{if("wheelViewModeNavigationInverseDirection" in this.element.data()){this.wheelViewModeNavigationInverseDirection=this.element.data("view-mode-wheel-navigation-inverse-dir")}}this.wheelViewModeNavigationDelay=100;if("wheelViewModeNavigationDelay" in i){this.wheelViewModeNavigationDelay=i.wheelViewModeNavigationDelay}else{if("wheelViewModeNavigationDelay" in this.element.data()){this.wheelViewModeNavigationDelay=this.element.data("view-mode-wheel-navigation-delay")}}this.startViewMode=2;if("startView" in i){this.startViewMode=i.startView}else{if("startView" in this.element.data()){this.startViewMode=this.element.data("start-view")}}this.startViewMode=c.convertViewMode(this.startViewMode);this.viewMode=this.startViewMode;this.viewSelect=this.minView;if("viewSelect" in i){this.viewSelect=i.viewSelect}else{if("viewSelect" in this.element.data()){this.viewSelect=this.element.data("view-select")}}this.viewSelect=c.convertViewMode(this.viewSelect);this.forceParse=true;if("forceParse" in i){this.forceParse=i.forceParse}else{if("dateForceParse" in this.element.data()){this.forceParse=this.element.data("date-force-parse")}}var k=this.bootcssVer===3?c.templateV3:c.template;while(k.indexOf("{iconType}")!==-1){k=k.replace("{iconType}",this.icontype)}while(k.indexOf("{leftArrow}")!==-1){k=k.replace("{leftArrow}",this.icons.leftArrow)}while(k.indexOf("{rightArrow}")!==-1){k=k.replace("{rightArrow}",this.icons.rightArrow)}this.picker=d(k).appendTo(this.isInline?this.element:this.container).on({click:d.proxy(this.click,this),mousedown:d.proxy(this.mousedown,this)});if(this.wheelViewModeNavigation){if(d.fn.mousewheel){this.picker.on({mousewheel:d.proxy(this.mousewheel,this)})}else{console.log("Mouse Wheel event is not supported. Please include the jQuery Mouse Wheel plugin before enabling this option")}}if(this.isInline){this.picker.addClass("datetimepicker-inline")}else{this.picker.addClass("datetimepicker-dropdown-"+this.pickerPosition+" dropdown-menu")}if(this.isRTL){this.picker.addClass("datetimepicker-rtl");var h=this.bootcssVer===3?".prev span, .next span":".prev i, .next i";this.picker.find(h).toggleClass(this.icons.leftArrow+" "+this.icons.rightArrow)}d(document).on("mousedown",function(m){if(d(m.target).closest(".datetimepicker").length===0){l.hide()}});this.autoclose=false;if("autoclose" in i){this.autoclose=i.autoclose}else{if("dateAutoclose" in this.element.data()){this.autoclose=this.element.data("date-autoclose")}}this.keyboardNavigation=true;if("keyboardNavigation" in i){this.keyboardNavigation=i.keyboardNavigation}else{if("dateKeyboardNavigation" in this.element.data()){this.keyboardNavigation=this.element.data("date-keyboard-navigation")}}this.todayBtn=(i.todayBtn||this.element.data("date-today-btn")||false);this.todayHighlight=(i.todayHighlight||this.element.data("date-today-highlight")||false);this.weekStart=((i.weekStart||this.element.data("date-weekstart")||e[this.language].weekStart||0)%7);this.weekEnd=((this.weekStart+6)%7);this.startDate=-Infinity;this.endDate=Infinity;this.daysOfWeekDisabled=[];this.setStartDate(i.startDate||this.element.data("date-startdate"));this.setEndDate(i.endDate||this.element.data("date-enddate"));this.setDaysOfWeekDisabled(i.daysOfWeekDisabled||this.element.data("date-days-of-week-disabled"));this.setMinutesDisabled(i.minutesDisabled||this.element.data("date-minute-disabled"));this.setHoursDisabled(i.hoursDisabled||this.element.data("date-hour-disabled"));this.fillDow();this.fillMonths();this.update();this.showMode();if(this.isInline){this.show()}};f.prototype={constructor:f,_events:[],_attachEvents:function(){this._detachEvents();if(this.isInput){this._events=[[this.element,{focus:d.proxy(this.show,this),keyup:d.proxy(this.update,this),keydown:d.proxy(this.keydown,this)}]]}else{if(this.component&&this.hasInput){this._events=[[this.element.find("input"),{focus:d.proxy(this.show,this),keyup:d.proxy(this.update,this),keydown:d.proxy(this.keydown,this)}],[this.component,{click:d.proxy(this.show,this)}]];if(this.componentReset){this._events.push([this.componentReset,{click:d.proxy(this.reset,this)}])}}else{if(this.element.is("div")){this.isInline=true}else{this._events=[[this.element,{click:d.proxy(this.show,this)}]]}}}for(var h=0,j,k;h<this._events.length;h++){j=this._events[h][0];k=this._events[h][1];j.on(k)}},_detachEvents:function(){for(var h=0,j,k;h<this._events.length;h++){j=this._events[h][0];k=this._events[h][1];j.off(k)}this._events=[]},show:function(h){this.picker.show();this.height=this.component?this.component.outerHeight():this.element.outerHeight();if(this.forceParse){this.update()}this.place();d(window).on("resize",d.proxy(this.place,this));if(h){h.stopPropagation();h.preventDefault()}this.isVisible=true;this.element.trigger({type:"show",date:this.date})},hide:function(h){if(!this.isVisible){return}if(this.isInline){return}this.picker.hide();d(window).off("resize",this.place);this.viewMode=this.startViewMode;this.showMode();if(!this.isInput){d(document).off("mousedown",this.hide)}if(this.forceParse&&(this.isInput&&this.element.val()||this.hasInput&&this.element.find("input").val())){this.setValue()}this.isVisible=false;this.element.trigger({type:"hide",date:this.date})},remove:function(){this._detachEvents();this.picker.remove();delete this.picker;delete this.element.data().datetimepicker},getDate:function(){var h=this.getUTCDate();return new Date(h.getTime()+(h.getTimezoneOffset()*60000))},getUTCDate:function(){return this.date},setDate:function(h){this.setUTCDate(new Date(h.getTime()-(h.getTimezoneOffset()*60000)))},setUTCDate:function(h){if(h>=this.startDate&&h<=this.endDate){this.date=h;this.setValue();this.viewDate=this.date;this.fill()}else{this.element.trigger({type:"outOfRange",date:h,startDate:this.startDate,endDate:this.endDate})}},setFormat:function(i){this.format=c.parseFormat(i,this.formatType);var h;if(this.isInput){h=this.element}else{if(this.component){h=this.element.find("input")}}if(h&&h.val()){this.setValue()}},setValue:function(){var h=this.getFormattedDate();if(!this.isInput){if(this.component){this.element.find("input").val(h)}this.element.data("date",h)}else{this.element.val(h)}if(this.linkField){d("#"+this.linkField).val(this.getFormattedDate(this.linkFormat))}},getFormattedDate:function(h){if(h==undefined){h=this.format}return c.formatDate(this.date,h,this.language,this.formatType)},setStartDate:function(h){this.startDate=h||-Infinity;if(this.startDate!==-Infinity){this.startDate=c.parseDate(this.startDate,this.format,this.language,this.formatType)}this.update();this.updateNavArrows()},setEndDate:function(h){this.endDate=h||Infinity;if(this.endDate!==Infinity){this.endDate=c.parseDate(this.endDate,this.format,this.language,this.formatType)}this.update();this.updateNavArrows()},setDaysOfWeekDisabled:function(h){this.daysOfWeekDisabled=h||[];if(!d.isArray(this.daysOfWeekDisabled)){this.daysOfWeekDisabled=this.daysOfWeekDisabled.split(/,\s*/)}this.daysOfWeekDisabled=d.map(this.daysOfWeekDisabled,function(i){return parseInt(i,10)});this.update();this.updateNavArrows()},setMinutesDisabled:function(h){this.minutesDisabled=h||[];if(!d.isArray(this.minutesDisabled)){this.minutesDisabled=this.minutesDisabled.split(/,\s*/)}this.minutesDisabled=d.map(this.minutesDisabled,function(i){return parseInt(i,10)});this.update();this.updateNavArrows()},setHoursDisabled:function(h){this.hoursDisabled=h||[];if(!d.isArray(this.hoursDisabled)){this.hoursDisabled=this.hoursDisabled.split(/,\s*/)}this.hoursDisabled=d.map(this.hoursDisabled,function(i){return parseInt(i,10)});this.update();this.updateNavArrows()},place:function(){if(this.isInline){return}if(!this.zIndex){var h=0;d("div").each(function(){var m=parseInt(d(this).css("zIndex"),10);if(m>h){h=m}});this.zIndex=h+10}var l,k,j,i;if(this.container instanceof d){i=this.container.offset()}else{i=d(this.container).offset()}if(this.component){l=this.component.offset();j=l.left;if(this.pickerPosition=="bottom-left"||this.pickerPosition=="top-left"){j+=this.component.outerWidth()-this.picker.outerWidth()}}else{l=this.element.offset();j=l.left}if(j+220>document.body.clientWidth){j=document.body.clientWidth-220}if(this.pickerPosition=="top-left"||this.pickerPosition=="top-right"){k=l.top-this.picker.outerHeight()}else{k=l.top+this.height}k=k-i.top;j=j-i.left;if(this.container!="body"){k=k+document.body.scrollTop}this.picker.css({top:k,left:j,zIndex:this.zIndex})},update:function(){var h,i=false;if(arguments&&arguments.length&&(typeof arguments[0]==="string"||arguments[0] instanceof Date)){h=arguments[0];i=true}else{h=(this.isInput?this.element.val():this.element.find("input").val())||this.element.data("date")||this.initialDate;if(typeof h=="string"||h instanceof String){h=h.replace(/^\s+|\s+$/g,"")}}if(!h){h=new Date();i=false}this.date=c.parseDate(h,this.format,this.language,this.formatType);if(i){this.setValue()}if(this.date<this.startDate){this.viewDate=new Date(this.startDate)}else{if(this.date>this.endDate){this.viewDate=new Date(this.endDate)}else{this.viewDate=new Date(this.date)}}this.fill()},fillDow:function(){var h=this.weekStart,i="<tr>";while(h<this.weekStart+7){i+='<th class="dow">'+e[this.language].daysMin[(h++)%7]+"</th>"}i+="</tr>";this.picker.find(".datetimepicker-days thead").append(i)},fillMonths:function(){var j="",h=0;while(h<12){j+='<span class="month">'+e[this.language].monthsShort[h++]+"</span>"}this.picker.find(".datetimepicker-months td").html(j)},fill:function(){if(this.date==null||this.viewDate==null){return}var F=new Date(this.viewDate),s=F.getUTCFullYear(),G=F.getUTCMonth(),m=F.getUTCDate(),B=F.getUTCHours(),w=F.getUTCMinutes(),x=this.startDate!==-Infinity?this.startDate.getUTCFullYear():-Infinity,C=this.startDate!==-Infinity?this.startDate.getUTCMonth()+1:-Infinity,o=this.endDate!==Infinity?this.endDate.getUTCFullYear():Infinity,y=this.endDate!==Infinity?this.endDate.getUTCMonth()+1:Infinity,p=(new g(this.date.getUTCFullYear(),this.date.getUTCMonth(),this.date.getUTCDate())).valueOf(),E=new Date();this.picker.find(".datetimepicker-days thead th:eq(1)").text(e[this.language].months[G]+" "+s);if(this.formatViewType=="time"){var j=this.getFormattedDate();this.picker.find(".datetimepicker-hours thead th:eq(1)").text(j);this.picker.find(".datetimepicker-minutes thead th:eq(1)").text(j)}else{this.picker.find(".datetimepicker-hours thead th:eq(1)").text(m+" "+e[this.language].months[G]+" "+s);this.picker.find(".datetimepicker-minutes thead th:eq(1)").text(m+" "+e[this.language].months[G]+" "+s)}this.picker.find("tfoot th.today").text(e[this.language].today).toggle(this.todayBtn!==false);this.updateNavArrows();this.fillMonths();var I=g(s,G-1,28,0,0,0,0),A=c.getDaysInMonth(I.getUTCFullYear(),I.getUTCMonth());I.setUTCDate(A);I.setUTCDate(A-(I.getUTCDay()-this.weekStart+7)%7);var h=new Date(I);h.setUTCDate(h.getUTCDate()+42);h=h.valueOf();var q=[];var t;while(I.valueOf()<h){if(I.getUTCDay()==this.weekStart){q.push("<tr>")}t="";if(I.getUTCFullYear()<s||(I.getUTCFullYear()==s&&I.getUTCMonth()<G)){t+=" old"}else{if(I.getUTCFullYear()>s||(I.getUTCFullYear()==s&&I.getUTCMonth()>G)){t+=" new"}}if(this.todayHighlight&&I.getUTCFullYear()==E.getFullYear()&&I.getUTCMonth()==E.getMonth()&&I.getUTCDate()==E.getDate()){t+=" today"}if(I.valueOf()==p){t+=" active"}if((I.valueOf()+86400000)<=this.startDate||I.valueOf()>this.endDate||d.inArray(I.getUTCDay(),this.daysOfWeekDisabled)!==-1){t+=" disabled"}q.push('<td class="day'+t+'">'+I.getUTCDate()+"</td>");if(I.getUTCDay()==this.weekEnd){q.push("</tr>")}I.setUTCDate(I.getUTCDate()+1)}this.picker.find(".datetimepicker-days tbody").empty().append(q.join(""));q=[];var u="",D="",r="";var k=this.hoursDisabled||[];for(var z=0;z<24;z++){if(k.indexOf(z)!==-1){continue}var v=g(s,G,m,z);t="";if((v.valueOf()+3600000)<=this.startDate||v.valueOf()>this.endDate){t+=" disabled"}else{if(B==z){t+=" active"}}if(this.showMeridian&&e[this.language].meridiem.length==2){D=(z<12?e[this.language].meridiem[0]:e[this.language].meridiem[1]);if(D!=r){if(r!=""){q.push("</fieldset>")}q.push('<fieldset class="hour"><legend>'+D.toUpperCase()+"</legend>")}r=D;u=(z%12?z%12:12);q.push('<span class="hour'+t+" hour_"+(z<12?"am":"pm")+'">'+u+"</span>");if(z==23){q.push("</fieldset>")}}else{u=z+":00";q.push('<span class="hour'+t+'">'+u+"</span>")}}this.picker.find(".datetimepicker-hours td").html(q.join(""));q=[];u="",D="",r="";var l=this.minutesDisabled||[];for(var z=0;z<60;z+=this.minuteStep){if(l.indexOf(z)!==-1){continue}var v=g(s,G,m,B,z,0);t="";if(v.valueOf()<this.startDate||v.valueOf()>this.endDate){t+=" disabled"}else{if(Math.floor(w/this.minuteStep)==Math.floor(z/this.minuteStep)){t+=" active"}}if(this.showMeridian&&e[this.language].meridiem.length==2){D=(B<12?e[this.language].meridiem[0]:e[this.language].meridiem[1]);if(D!=r){if(r!=""){q.push("</fieldset>")}q.push('<fieldset class="minute"><legend>'+D.toUpperCase()+"</legend>")}r=D;u=(B%12?B%12:12);q.push('<span class="minute'+t+'">'+u+":"+(z<10?"0"+z:z)+"</span>");if(z==59){q.push("</fieldset>")}}else{u=z+":00";q.push('<span class="minute'+t+'">'+B+":"+(z<10?"0"+z:z)+"</span>")}}this.picker.find(".datetimepicker-minutes td").html(q.join(""));var J=this.date.getUTCFullYear();var n=this.picker.find(".datetimepicker-months").find("th:eq(1)").text(s).end().find("span").removeClass("active");if(J==s){n.eq(this.date.getUTCMonth()+2).addClass("active")}if(s<x||s>o){n.addClass("disabled")}if(s==x){n.slice(0,C+1).addClass("disabled")}if(s==o){n.slice(y).addClass("disabled")}q="";s=parseInt(s/10,10)*10;var H=this.picker.find(".datetimepicker-years").find("th:eq(1)").text(s+"-"+(s+9)).end().find("td");s-=1;for(var z=-1;z<11;z++){q+='<span class="year'+(z==-1||z==10?" old":"")+(J==s?" active":"")+(s<x||s>o?" disabled":"")+'">'+s+"</span>";s+=1}H.html(q);this.place()},updateNavArrows:function(){var l=new Date(this.viewDate),j=l.getUTCFullYear(),k=l.getUTCMonth(),i=l.getUTCDate(),h=l.getUTCHours();switch(this.viewMode){case 0:if(this.startDate!==-Infinity&&j<=this.startDate.getUTCFullYear()&&k<=this.startDate.getUTCMonth()&&i<=this.startDate.getUTCDate()&&h<=this.startDate.getUTCHours()){this.picker.find(".prev").css({visibility:"hidden"})}else{this.picker.find(".prev").css({visibility:"visible"})}if(this.endDate!==Infinity&&j>=this.endDate.getUTCFullYear()&&k>=this.endDate.getUTCMonth()&&i>=this.endDate.getUTCDate()&&h>=this.endDate.getUTCHours()){this.picker.find(".next").css({visibility:"hidden"})}else{this.picker.find(".next").css({visibility:"visible"})}break;case 1:if(this.startDate!==-Infinity&&j<=this.startDate.getUTCFullYear()&&k<=this.startDate.getUTCMonth()&&i<=this.startDate.getUTCDate()){this.picker.find(".prev").css({visibility:"hidden"})}else{this.picker.find(".prev").css({visibility:"visible"})}if(this.endDate!==Infinity&&j>=this.endDate.getUTCFullYear()&&k>=this.endDate.getUTCMonth()&&i>=this.endDate.getUTCDate()){this.picker.find(".next").css({visibility:"hidden"})}else{this.picker.find(".next").css({visibility:"visible"})}break;case 2:if(this.startDate!==-Infinity&&j<=this.startDate.getUTCFullYear()&&k<=this.startDate.getUTCMonth()){this.picker.find(".prev").css({visibility:"hidden"})}else{this.picker.find(".prev").css({visibility:"visible"})}if(this.endDate!==Infinity&&j>=this.endDate.getUTCFullYear()&&k>=this.endDate.getUTCMonth()){this.picker.find(".next").css({visibility:"hidden"})}else{this.picker.find(".next").css({visibility:"visible"})}break;case 3:case 4:if(this.startDate!==-Infinity&&j<=this.startDate.getUTCFullYear()){this.picker.find(".prev").css({visibility:"hidden"})}else{this.picker.find(".prev").css({visibility:"visible"})}if(this.endDate!==Infinity&&j>=this.endDate.getUTCFullYear()){this.picker.find(".next").css({visibility:"hidden"})}else{this.picker.find(".next").css({visibility:"visible"})}break}},mousewheel:function(i){i.preventDefault();i.stopPropagation();if(this.wheelPause){return}this.wheelPause=true;var h=i.originalEvent;var k=h.wheelDelta;var j=k>0?1:(k===0)?0:-1;if(this.wheelViewModeNavigationInverseDirection){j=-j}this.showMode(j);setTimeout(d.proxy(function(){this.wheelPause=false},this),this.wheelViewModeNavigationDelay)},click:function(l){l.stopPropagation();l.preventDefault();var m=d(l.target).closest("span, td, th, legend");if(m.is("."+this.icontype)){m=d(m).parent().closest("span, td, th, legend")}if(m.length==1){if(m.is(".disabled")){this.element.trigger({type:"outOfRange",date:this.viewDate,startDate:this.startDate,endDate:this.endDate});return}switch(m[0].nodeName.toLowerCase()){case"th":switch(m[0].className){case"switch":this.showMode(1);break;case"prev":case"next":var h=c.modes[this.viewMode].navStep*(m[0].className=="prev"?-1:1);switch(this.viewMode){case 0:this.viewDate=this.moveHour(this.viewDate,h);break;case 1:this.viewDate=this.moveDate(this.viewDate,h);break;case 2:this.viewDate=this.moveMonth(this.viewDate,h);break;case 3:case 4:this.viewDate=this.moveYear(this.viewDate,h);break}this.fill();this.element.trigger({type:m[0].className+":"+this.convertViewModeText(this.viewMode),date:this.viewDate,startDate:this.startDate,endDate:this.endDate});break;case"today":var i=new Date();i=g(i.getFullYear(),i.getMonth(),i.getDate(),i.getHours(),i.getMinutes(),i.getSeconds(),0);if(i<this.startDate){i=this.startDate}else{if(i>this.endDate){i=this.endDate}}this.viewMode=this.startViewMode;this.showMode(0);this._setDate(i);this.fill();if(this.autoclose){this.hide()}break}break;case"span":if(!m.is(".disabled")){var o=this.viewDate.getUTCFullYear(),n=this.viewDate.getUTCMonth(),p=this.viewDate.getUTCDate(),q=this.viewDate.getUTCHours(),j=this.viewDate.getUTCMinutes(),r=this.viewDate.getUTCSeconds();if(m.is(".month")){this.viewDate.setUTCDate(1);n=m.parent().find("span").index(m);p=this.viewDate.getUTCDate();this.viewDate.setUTCMonth(n);this.element.trigger({type:"changeMonth",date:this.viewDate});if(this.viewSelect>=3){this._setDate(g(o,n,p,q,j,r,0))}}else{if(m.is(".year")){this.viewDate.setUTCDate(1);o=parseInt(m.text(),10)||0;this.viewDate.setUTCFullYear(o);this.element.trigger({type:"changeYear",date:this.viewDate});if(this.viewSelect>=4){this._setDate(g(o,n,p,q,j,r,0))}}else{if(m.is(".hour")){q=parseInt(m.text(),10)||0;if(m.hasClass("hour_am")||m.hasClass("hour_pm")){if(q==12&&m.hasClass("hour_am")){q=0}else{if(q!=12&&m.hasClass("hour_pm")){q+=12}}}this.viewDate.setUTCHours(q);this.element.trigger({type:"changeHour",date:this.viewDate});if(this.viewSelect>=1){this._setDate(g(o,n,p,q,j,r,0))}}else{if(m.is(".minute")){j=parseInt(m.text().substr(m.text().indexOf(":")+1),10)||0;this.viewDate.setUTCMinutes(j);this.element.trigger({type:"changeMinute",date:this.viewDate});if(this.viewSelect>=0){this._setDate(g(o,n,p,q,j,r,0))}}}}}if(this.viewMode!=0){var k=this.viewMode;this.showMode(-1);this.fill();if(k==this.viewMode&&this.autoclose){this.hide()}}else{this.fill();if(this.autoclose){this.hide()}}}break;case"td":if(m.is(".day")&&!m.is(".disabled")){var p=parseInt(m.text(),10)||1;var o=this.viewDate.getUTCFullYear(),n=this.viewDate.getUTCMonth(),q=this.viewDate.getUTCHours(),j=this.viewDate.getUTCMinutes(),r=this.viewDate.getUTCSeconds();if(m.is(".old")){if(n===0){n=11;o-=1}else{n-=1}}else{if(m.is(".new")){if(n==11){n=0;o+=1}else{n+=1}}}this.viewDate.setUTCFullYear(o);this.viewDate.setUTCMonth(n,p);this.element.trigger({type:"changeDay",date:this.viewDate});if(this.viewSelect>=2){this._setDate(g(o,n,p,q,j,r,0))}}var k=this.viewMode;this.showMode(-1);this.fill();if(k==this.viewMode&&this.autoclose){this.hide()}break}}},_setDate:function(h,j){if(!j||j=="date"){this.date=h}if(!j||j=="view"){this.viewDate=h}this.fill();this.setValue();var i;if(this.isInput){i=this.element}else{if(this.component){i=this.element.find("input")}}if(i){i.change();if(this.autoclose&&(!j||j=="date")){}}this.element.trigger({type:"changeDate",date:this.date})},moveMinute:function(i,h){if(!h){return i}var j=new Date(i.valueOf());j.setUTCMinutes(j.getUTCMinutes()+(h*this.minuteStep));return j},moveHour:function(i,h){if(!h){return i}var j=new Date(i.valueOf());j.setUTCHours(j.getUTCHours()+h);return j},moveDate:function(i,h){if(!h){return i}var j=new Date(i.valueOf());j.setUTCDate(j.getUTCDate()+h);return j},moveMonth:function(h,j){if(!j){return h}var m=new Date(h.valueOf()),q=m.getUTCDate(),n=m.getUTCMonth(),l=Math.abs(j),p,o;j=j>0?1:-1;if(l==1){o=j==-1?function(){return m.getUTCMonth()==n}:function(){return m.getUTCMonth()!=p};p=n+j;m.setUTCMonth(p);if(p<0||p>11){p=(p+12)%12}}else{for(var k=0;k<l;k++){m=this.moveMonth(m,j)}p=m.getUTCMonth();m.setUTCDate(q);o=function(){return p!=m.getUTCMonth()}}while(o()){m.setUTCDate(--q);m.setUTCMonth(p)}return m},moveYear:function(i,h){return this.moveMonth(i,h*12)},dateWithinRange:function(h){return h>=this.startDate&&h<=this.endDate},keydown:function(l){if(this.picker.is(":not(:visible)")){if(l.keyCode==27){this.show()}return}var n=false,i,o,m,p,h;switch(l.keyCode){case 27:this.hide();l.preventDefault();break;case 37:case 39:if(!this.keyboardNavigation){break}i=l.keyCode==37?-1:1;viewMode=this.viewMode;if(l.ctrlKey){viewMode+=2}else{if(l.shiftKey){viewMode+=1}}if(viewMode==4){p=this.moveYear(this.date,i);h=this.moveYear(this.viewDate,i)}else{if(viewMode==3){p=this.moveMonth(this.date,i);h=this.moveMonth(this.viewDate,i)}else{if(viewMode==2){p=this.moveDate(this.date,i);h=this.moveDate(this.viewDate,i)}else{if(viewMode==1){p=this.moveHour(this.date,i);h=this.moveHour(this.viewDate,i)}else{if(viewMode==0){p=this.moveMinute(this.date,i);h=this.moveMinute(this.viewDate,i)}}}}}if(this.dateWithinRange(p)){this.date=p;this.viewDate=h;this.setValue();this.update();l.preventDefault();n=true}break;case 38:case 40:if(!this.keyboardNavigation){break}i=l.keyCode==38?-1:1;viewMode=this.viewMode;if(l.ctrlKey){viewMode+=2}else{if(l.shiftKey){viewMode+=1}}if(viewMode==4){p=this.moveYear(this.date,i);h=this.moveYear(this.viewDate,i)}else{if(viewMode==3){p=this.moveMonth(this.date,i);h=this.moveMonth(this.viewDate,i)}else{if(viewMode==2){p=this.moveDate(this.date,i*7);h=this.moveDate(this.viewDate,i*7)}else{if(viewMode==1){if(this.showMeridian){p=this.moveHour(this.date,i*6);h=this.moveHour(this.viewDate,i*6)}else{p=this.moveHour(this.date,i*4);h=this.moveHour(this.viewDate,i*4)}}else{if(viewMode==0){p=this.moveMinute(this.date,i*4);h=this.moveMinute(this.viewDate,i*4)}}}}}if(this.dateWithinRange(p)){this.date=p;this.viewDate=h;this.setValue();this.update();l.preventDefault();n=true}break;case 13:if(this.viewMode!=0){var k=this.viewMode;this.showMode(-1);this.fill();if(k==this.viewMode&&this.autoclose){this.hide()}}else{this.fill();if(this.autoclose){this.hide()}}l.preventDefault();break;case 9:this.hide();break}if(n){var j;if(this.isInput){j=this.element}else{if(this.component){j=this.element.find("input")}}if(j){j.change()}this.element.trigger({type:"changeDate",date:this.date})}},showMode:function(h){if(h){var i=Math.max(0,Math.min(c.modes.length-1,this.viewMode+h));if(i>=this.minView&&i<=this.maxView){this.element.trigger({type:"changeMode",date:this.viewDate,oldViewMode:this.viewMode,newViewMode:i});this.viewMode=i}}this.picker.find(">div").hide().filter(".datetimepicker-"+c.modes[this.viewMode].clsName).css("display","block");this.updateNavArrows()},reset:function(h){this._setDate(null,"date")},convertViewModeText:function(h){switch(h){case 4:return"decade";case 3:return"year";case 2:return"month";case 1:return"day";case 0:return"hour"}}};var a=d.fn.datetimepicker;d.fn.datetimepicker=function(j){var h=Array.apply(null,arguments);h.shift();var i;this.each(function(){var m=d(this),l=m.data("datetimepicker"),k=typeof j=="object"&&j;if(!l){m.data("datetimepicker",(l=new f(this,d.extend({},d.fn.datetimepicker.defaults,k))))}if(typeof j=="string"&&typeof l[j]=="function"){i=l[j].apply(l,h);if(i!==undefined){return false}}});if(i!==undefined){return i}else{return this}};d.fn.datetimepicker.defaults={};d.fn.datetimepicker.Constructor=f;var e=d.fn.datetimepicker.dates={en:{days:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday","Sunday"],daysShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat","Sun"],daysMin:["Su","Mo","Tu","We","Th","Fr","Sa","Su"],months:["January","February","March","April","May","June","July","August","September","October","November","December"],monthsShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],meridiem:["am","pm"],suffix:["st","nd","rd","th"],today:"Today"}};var c={modes:[{clsName:"minutes",navFnc:"Hours",navStep:1},{clsName:"hours",navFnc:"Date",navStep:1},{clsName:"days",navFnc:"Month",navStep:1},{clsName:"months",navFnc:"FullYear",navStep:1},{clsName:"years",navFnc:"FullYear",navStep:10}],isLeapYear:function(h){return(((h%4===0)&&(h%100!==0))||(h%400===0))},getDaysInMonth:function(h,i){return[31,(c.isLeapYear(h)?29:28),31,30,31,30,31,31,30,31,30,31][i]},getDefaultFormat:function(h,i){if(h=="standard"){if(i=="input"){return"yyyy-mm-dd hh:ii"}else{return"yyyy-mm-dd hh:ii:ss"}}else{if(h=="php"){if(i=="input"){return"Y-m-d H:i"}else{return"Y-m-d H:i:s"}}else{throw new Error("Invalid format type.")}}},validParts:function(h){if(h=="standard"){return/hh?|HH?|p|P|ii?|ss?|dd?|DD?|mm?|MM?|yy(?:yy)?/g}else{if(h=="php"){return/[dDjlNwzFmMnStyYaABgGhHis]/g}else{throw new Error("Invalid format type.")}}},nonpunctuation:/[^ -\/:-@\[-`{-~\t\n\rTZ]+/g,parseFormat:function(k,i){var h=k.replace(this.validParts(i),"\0").split("\0"),j=k.match(this.validParts(i));if(!h||!h.length||!j||j.length==0){throw new Error("Invalid date format.")}return{separators:h,parts:j}},parseDate:function(m,v,p,t){if(m instanceof Date){var x=new Date(m.valueOf()-m.getTimezoneOffset()*60000);x.setMilliseconds(0);return x}if(/^\d{4}\-\d{1,2}\-\d{1,2}$/.test(m)){v=this.parseFormat("yyyy-mm-dd",t)}if(/^\d{4}\-\d{1,2}\-\d{1,2}[T ]\d{1,2}\:\d{1,2}$/.test(m)){v=this.parseFormat("yyyy-mm-dd hh:ii",t)}if(/^\d{4}\-\d{1,2}\-\d{1,2}[T ]\d{1,2}\:\d{1,2}\:\d{1,2}[Z]{0,1}$/.test(m)){v=this.parseFormat("yyyy-mm-dd hh:ii:ss",t)}if(/^[-+]\d+[dmwy]([\s,]+[-+]\d+[dmwy])*$/.test(m)){var y=/([-+]\d+)([dmwy])/,n=m.match(/([-+]\d+)([dmwy])/g),h,l;m=new Date();for(var o=0;o<n.length;o++){h=y.exec(n[o]);l=parseInt(h[1]);switch(h[2]){case"d":m.setUTCDate(m.getUTCDate()+l);break;case"m":m=f.prototype.moveMonth.call(f.prototype,m,l);break;case"w":m.setUTCDate(m.getUTCDate()+l*7);break;case"y":m=f.prototype.moveYear.call(f.prototype,m,l);break}}return g(m.getUTCFullYear(),m.getUTCMonth(),m.getUTCDate(),m.getUTCHours(),m.getUTCMinutes(),m.getUTCSeconds(),0)}var n=m&&m.toString().match(this.nonpunctuation)||[],m=new Date(0,0,0,0,0,0,0),r={},u=["hh","h","ii","i","ss","s","yyyy","yy","M","MM","m","mm","D","DD","d","dd","H","HH","p","P"],w={hh:function(s,i){return s.setUTCHours(i)},h:function(s,i){return s.setUTCHours(i)},HH:function(s,i){return s.setUTCHours(i==12?0:i)},H:function(s,i){return s.setUTCHours(i==12?0:i)},ii:function(s,i){return s.setUTCMinutes(i)},i:function(s,i){return s.setUTCMinutes(i)},ss:function(s,i){return s.setUTCSeconds(i)},s:function(s,i){return s.setUTCSeconds(i)},yyyy:function(s,i){return s.setUTCFullYear(i)},yy:function(s,i){return s.setUTCFullYear(2000+i)},m:function(s,i){i-=1;while(i<0){i+=12}i%=12;s.setUTCMonth(i);while(s.getUTCMonth()!=i){if(isNaN(s.getUTCMonth())){return s}else{s.setUTCDate(s.getUTCDate()-1)}}return s},d:function(s,i){return s.setUTCDate(i)},p:function(s,i){return s.setUTCHours(i==1?s.getUTCHours()+12:s.getUTCHours())}},k,q,h;w.M=w.MM=w.mm=w.m;w.dd=w.d;w.P=w.p;m=g(m.getFullYear(),m.getMonth(),m.getDate(),m.getHours(),m.getMinutes(),m.getSeconds());if(n.length==v.parts.length){for(var o=0,j=v.parts.length;o<j;o++){k=parseInt(n[o],10);h=v.parts[o];if(isNaN(k)){switch(h){case"MM":q=d(e[p].months).filter(function(){var i=this.slice(0,n[o].length),s=n[o].slice(0,i.length);return i==s});k=d.inArray(q[0],e[p].months)+1;break;case"M":q=d(e[p].monthsShort).filter(function(){var i=this.slice(0,n[o].length),s=n[o].slice(0,i.length);return i.toLowerCase()==s.toLowerCase()});k=d.inArray(q[0],e[p].monthsShort)+1;break;case"p":case"P":k=d.inArray(n[o].toLowerCase(),e[p].meridiem);break}}r[h]=k}for(var o=0,z;o<u.length;o++){z=u[o];if(z in r&&!isNaN(r[z])){w[z](m,r[z])}}}return m},formatDate:function(h,n,p,l){if(h==null){return""}var o;if(l=="standard"){o={yy:h.getUTCFullYear().toString().substring(2),yyyy:h.getUTCFullYear(),m:h.getUTCMonth()+1,M:e[p].monthsShort[h.getUTCMonth()],MM:e[p].months[h.getUTCMonth()],d:h.getUTCDate(),D:e[p].daysShort[h.getUTCDay()],DD:e[p].days[h.getUTCDay()],p:(e[p].meridiem.length==2?e[p].meridiem[h.getUTCHours()<12?0:1]:""),h:h.getUTCHours(),i:h.getUTCMinutes(),s:h.getUTCSeconds()};if(e[p].meridiem.length==2){o.H=(o.h%12==0?12:o.h%12)}else{o.H=o.h}o.HH=(o.H<10?"0":"")+o.H;o.P=o.p.toUpperCase();o.hh=(o.h<10?"0":"")+o.h;o.ii=(o.i<10?"0":"")+o.i;o.ss=(o.s<10?"0":"")+o.s;o.dd=(o.d<10?"0":"")+o.d;o.mm=(o.m<10?"0":"")+o.m}else{if(l=="php"){o={y:h.getUTCFullYear().toString().substring(2),Y:h.getUTCFullYear(),F:e[p].months[h.getUTCMonth()],M:e[p].monthsShort[h.getUTCMonth()],n:h.getUTCMonth()+1,t:c.getDaysInMonth(h.getUTCFullYear(),h.getUTCMonth()),j:h.getUTCDate(),l:e[p].days[h.getUTCDay()],D:e[p].daysShort[h.getUTCDay()],w:h.getUTCDay(),N:(h.getUTCDay()==0?7:h.getUTCDay()),S:(h.getUTCDate()%10<=e[p].suffix.length?e[p].suffix[h.getUTCDate()%10-1]:""),a:(e[p].meridiem.length==2?e[p].meridiem[h.getUTCHours()<12?0:1]:""),g:(h.getUTCHours()%12==0?12:h.getUTCHours()%12),G:h.getUTCHours(),i:h.getUTCMinutes(),s:h.getUTCSeconds()};o.m=(o.n<10?"0":"")+o.n;o.d=(o.j<10?"0":"")+o.j;o.A=o.a.toString().toUpperCase();o.h=(o.g<10?"0":"")+o.g;o.H=(o.G<10?"0":"")+o.G;o.i=(o.i<10?"0":"")+o.i;o.s=(o.s<10?"0":"")+o.s}else{throw new Error("Invalid format type.")}}var h=[],m=d.extend([],n.separators);for(var k=0,j=n.parts.length;k<j;k++){if(m.length){h.push(m.shift())}h.push(o[n.parts[k]])}if(m.length){h.push(m.shift())}return h.join("")},convertViewMode:function(h){switch(h){case 4:case"decade":h=4;break;case 3:case"year":h=3;break;case 2:case"month":h=2;break;case 1:case"day":h=1;break;case 0:case"hour":h=0;break}return h},headTemplate:'<thead><tr><th class="prev"><i class="{leftArrow}"/></th><th colspan="5" class="switch"></th><th class="next"><i class="{rightArrow}"/></th></tr></thead>',headTemplateV3:'<thead><tr><th class="prev"><span class="{iconType} {leftArrow}"></span> </th><th colspan="5" class="switch"></th><th class="next"><span class="{iconType} {rightArrow}"></span> </th></tr></thead>',contTemplate:'<tbody><tr><td colspan="7"></td></tr></tbody>',footTemplate:'<tfoot><tr><th colspan="7" class="today"></th></tr></tfoot>'};c.template='<div class="datetimepicker"><div class="datetimepicker-minutes"><table class=" table-condensed">'+c.headTemplate+c.contTemplate+c.footTemplate+'</table></div><div class="datetimepicker-hours"><table class=" table-condensed">'+c.headTemplate+c.contTemplate+c.footTemplate+'</table></div><div class="datetimepicker-days"><table class=" table-condensed">'+c.headTemplate+"<tbody></tbody>"+c.footTemplate+'</table></div><div class="datetimepicker-months"><table class="table-condensed">'+c.headTemplate+c.contTemplate+c.footTemplate+'</table></div><div class="datetimepicker-years"><table class="table-condensed">'+c.headTemplate+c.contTemplate+c.footTemplate+"</table></div></div>";c.templateV3='<div class="datetimepicker"><div class="datetimepicker-minutes"><table class=" table-condensed">'+c.headTemplateV3+c.contTemplate+c.footTemplate+'</table></div><div class="datetimepicker-hours"><table class=" table-condensed">'+c.headTemplateV3+c.contTemplate+c.footTemplate+'</table></div><div class="datetimepicker-days"><table class=" table-condensed">'+c.headTemplateV3+"<tbody></tbody>"+c.footTemplate+'</table></div><div class="datetimepicker-months"><table class="table-condensed">'+c.headTemplateV3+c.contTemplate+c.footTemplate+'</table></div><div class="datetimepicker-years"><table class="table-condensed">'+c.headTemplateV3+c.contTemplate+c.footTemplate+"</table></div></div>";d.fn.datetimepicker.DPGlobal=c;d.fn.datetimepicker.noConflict=function(){d.fn.datetimepicker=a;return this};d(document).on("focus.datetimepicker.data-api click.datetimepicker.data-api",'[data-provide="datetimepicker"]',function(i){var h=d(this);if(h.data("datetimepicker")){return}i.preventDefault();h.datetimepicker("show")});d(function(){d('[data-provide="datetimepicker-inline"]').datetimepicker()})}(window.jQuery);
\ No newline at end of file
diff --git a/NewLife.Cube/Content/DateTimePicker/locales/bootstrap-datetimepicker.es.js b/NewLife.Cube/Content/DateTimePicker/locales/bootstrap-datetimepicker.es.js
deleted file mode 100644
index 8a768794ba..0000000000
--- a/NewLife.Cube/Content/DateTimePicker/locales/bootstrap-datetimepicker.es.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Spanish translation for bootstrap-datetimepicker
- * Bruno Bonamin <bruno.bonamin@gmail.com>
- */
-;(function($){
-	$.fn.datetimepicker.dates['es'] = {
-		days: ["Domingo", "Lunes", "Martes", "Miércoles", "Jueves", "Viernes", "Sábado", "Domingo"],
-		daysShort: ["Dom", "Lun", "Mar", "Mié", "Jue", "Vie", "Sáb", "Dom"],
-		daysMin: ["Do", "Lu", "Ma", "Mi", "Ju", "Vi", "Sa", "Do"],
-		months: ["Enero", "Febrero", "Marzo", "Abril", "Mayo", "Junio", "Julio", "Agosto", "Septiembre", "Octubre", "Noviembre", "Diciembre"],
-		monthsShort: ["Ene", "Feb", "Mar", "Abr", "May", "Jun", "Jul", "Ago", "Sep", "Oct", "Nov", "Dic"],
-		today: "Hoy",
-		suffix: [],
-		meridiem: []
-	};
-}(jQuery));
diff --git a/NewLife.Cube/Content/DateTimePicker/locales/bootstrap-datetimepicker.zh-CN.js b/NewLife.Cube/Content/DateTimePicker/locales/bootstrap-datetimepicker.zh-CN.js
deleted file mode 100644
index 418fb30710..0000000000
--- a/NewLife.Cube/Content/DateTimePicker/locales/bootstrap-datetimepicker.zh-CN.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Simplified Chinese translation for bootstrap-datetimepicker
- * Yuan Cheung <advanimal@gmail.com>
- */
-;(function($){
-	$.fn.datetimepicker.dates['zh-CN'] = {
-			days: ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六", "星期日"],
-			daysShort: ["周日", "周一", "周二", "周三", "周四", "周五", "周六", "周日"],
-			daysMin:  ["日", "一", "二", "三", "四", "五", "六", "日"],
-			months: ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"],
-			monthsShort: ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"],
-			today: "今天",
-			suffix: [],
-			meridiem: ["上午", "下午"]
-	};
-}(jQuery));
diff --git a/NewLife.Cube/Content/DateTimePicker/locales/bootstrap-datetimepicker.zh-TW.js b/NewLife.Cube/Content/DateTimePicker/locales/bootstrap-datetimepicker.zh-TW.js
deleted file mode 100644
index 6d1ed20f8b..0000000000
--- a/NewLife.Cube/Content/DateTimePicker/locales/bootstrap-datetimepicker.zh-TW.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Traditional Chinese translation for bootstrap-datetimepicker
- * Rung-Sheng Jang <daniel@i-trend.co.cc>
- */
-;(function($){
-	$.fn.datetimepicker.dates['zh-TW'] = {
-	days: ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六", "星期日"],
-	  daysShort: ["周日", "周一", "周二", "周三", "周四", "周五", "周六", "周日"],
-		daysMin:  ["日", "一", "二", "三", "四", "五", "六", "日"],
-		months: ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"],
-		monthsShort: ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"],
-		today: "今天",
-    suffix: [],
-		meridiem: ["上午", "下午"]
-	};
-}(jQuery));
diff --git a/NewLife.Cube/Content/ace/css/ace-fonts.min.css b/NewLife.Cube/Content/ace/css/ace-fonts.min.css
deleted file mode 100644
index 3d578dd144..0000000000
--- a/NewLife.Cube/Content/ace/css/ace-fonts.min.css
+++ /dev/null
@@ -1 +0,0 @@
-@font-face{font-family:'Open Sans';font-style:normal;font-weight:300;src:local('Open Sans Light'),local('OpenSans-Light'),url(../fonts/OpenSans-300.woff) format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:local('Open Sans'),local('OpenSans'),url(../fonts/OpenSans-400.woff) format('woff')}
\ No newline at end of file
diff --git a/NewLife.Cube/Content/ace/css/ace-ie.min.css b/NewLife.Cube/Content/ace/css/ace-ie.min.css
deleted file mode 100644
index dab349c029..0000000000
--- a/NewLife.Cube/Content/ace/css/ace-ie.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.navbar .navbar-inner,.navbar .btn-navbar{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)!important}.dropdown-menu li>a,.dropdown-submenu>a{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)!important}.btn{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)!important}.progress,.progress .bar{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)!important}#cboxLoadingGraphic>.ace-icon,#cboxLoadingGraphic>.fa,#cboxLoadingGraphic>.glyphicon{display:inline-block;background:#FFF url(images/loading.gif) no-repeat center}#cboxLoadingGraphic>.ace-icon:before,#cboxLoadingGraphic>.fa:before,#cboxLoadingGraphic>.glyphicon:before{display:none}.widget-box-overlay>.loading-icon{display:inline-block;width:24px;height:24px;background:transparent url(images/loading.gif) no-repeat center}.widget-box-overlay>.loading-icon:before{display:none}@media (max-width:991px){.sidebar.responsive{display:none}.sidebar.responsive.display{display:block}}.profile-user-info{width:98%}.wysiwyg-toolbar .dropdown-menu{min-width:260px}.modal.modal-contained{position:absolute!important}.rtl .sidebar .nav-list li.active>a:before,.rtl .sidebar .nav-list li.active>a:after{direction:ltr;text-align:left}.rtl .sidebar .nav-list li>.arrow{direction:ltr;text-align:left}@media \0screen{html{position:absolute;width:100%}body{background-color:#E9E9E9}.sidebar-fixed:before{left:0}.sidebar .nav-list>li:before{z-index:4444;left:-3px}.nav-list>li>.submenu li.open>a>.menu-icon{display:inline-block}.ace-nav>li.white-opaque{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#CCFFFFFF', endColorstr='#CCFFFFFF', GradientType=0)}.ace-nav>li.dark-opaque{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#33000000', endColorstr='#33000000', GradientType=0)}.ace-nav>li.transparent>a:hover,.ace-nav>li.transparent>a:focus,.ace-nav>li.open.transparent>a{background-color:transparent!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#19000000', endColorstr='#19000000', GradientType=0)}.ace-nav>li.light-10>a{background-color:transparent!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#19FFFFFF', endColorstr='#19FFFFFF', GradientType=0)}.ace-nav>li.light-10>a:hover,.ace-nav>li.light-10>a:focus,.ace-nav>li.open.light-10>a{background-color:transparent!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#CCFFFFFF', endColorstr='#CCFFFFFF', GradientType=0)!important}.ace-nav>li.dark-10>a{background-color:transparent!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#19000000', endColorstr='#19000000', GradientType=0)}.ace-nav>li.dark-10>a:hover,.ace-nav>li.dark-10>a:focus,.ace-nav>li.open.dark-10>a{background-color:transparent!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#33000000', endColorstr='#33000000', GradientType=0)}.navbar .navbar-nav>li>a:hover,.navbar .navbar-nav>li>a:focus,.navbar .navbar-nav>li.open>a{background-color:transparent!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#19000000', endColorstr='#19000000', GradientType=0)!important}.infobox-dark>.badge{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#33FFFFFF', endColorstr='#33FFFFFF', GradientType=0)!important}.widget-box-overlay{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#55000000', endColorstr='#55000000', GradientType=0)!important}.widget-toolbar-light{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#D8FFFFFF', endColorstr='#D8FFFFFF', GradientType=0)!important}input[type=checkbox].ace,input[type=radio].ace,label input[type=checkbox].ace,label input[type=radio].ace,input[type=checkbox].ace.ace-switch,input[type=radio].ace.ace-switch,label input[type=checkbox].ace.ace-switch,label input[type=radio].ace.ace-switch{position:static!important;width:auto!important;height:auto!important;z-index:auto!important}input[type=checkbox].ace+.lbl,input[type=radio].ace+.lbl,input[type=checkbox].ace~.lbl,input[type=radio].ace~.lbl{min-height:auto!important;min-width:auto!important;width:auto!important;height:auto!important;position:static!important}input[type=checkbox].ace.ace-switch{width:auto!important}input[type=checkbox].ace.ace-switch+.lbl,input[type=checkbox].ace.ace-switch~.lbl{margin:0!important;min-height:auto!important}.checkbox label input.ace[type=checkbox]+.lbl,.radio label input.ace[type=radio]+.lbl,.checkbox label input.ace[type=checkbox]~.lbl,.radio label input.ace[type=radio]~.lbl{margin-left:auto}[class*=input-]{max-width:none!important}.wizard-steps li:first-child:before{max-width:100%;left:0}.login-layout .widget-box{display:none;visibility:visible;position:static}.login-layout .widget-box.visible{display:block}.pricing-box-small:hover{left:-1px;top:-3px}.ace-thumbnails>li>a>img{width:auto!important}.ace-thumbnails>li>:first-child>.text{display:none}.ace-thumbnails>li:hover>:first-child>.text{display:block}.ace-thumbnails>li>.tools{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#8C000000', endColorstr='#8C000000', GradientType=0)!important}.ace-thumbnails>li>:first-child>.text{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#8C000000', endColorstr='#8C000000', GradientType=0)!important}.btn.btn-app.btn-light{border:1px solid #D9D9D9}.btn.btn-app.btn-yellow{border:1px solid #FEE188}.widget-box-overlay{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#55000000', endColorstr='#55000000', GradientType=0)!important}.ace-file-overlay{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#7F000000', endColorstr='#7F000000', GradientType=0)!important}.ace-file-overlay>.ace-icon,.ace-file-overlay>.fa,.ace-file-overlay>.glyphicon{display:inline-block;width:32px;height:32px;background:transparent url(images/loading.gif) no-repeat center}.ace-file-overlay>.ace-icon:before,.ace-file-overlay>.fa:before,.ace-file-overlay>.glyphicon:before{display:none}.grid3{width:31%}.grid4{width:23%}.itemdiv.dialogdiv>.body:before{display:none}.fc-event-hori,.fc-event-vert{border-width:0!important}[class*=tab-color-] .nav-tabs>li>a>.ace-icon:first-child,[class*=tab-color-] .nav-tabs>li>a>.fa:first-child{color:#666!important}.dropdown-preview>.dropdown-menu{*width:180px}.ui-datepicker,.ui-autocomplete,.ui-menu{border:1px solid #CCC}.ui-widget-overlay{filter:alpha(opacity=100)!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#44000000', endColorstr='#44000000', GradientType=0)!important}.message-content{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#CCFFFFFF', endColorstr='#CCFFFFFF', GradientType=0)!important}.gritter-item-wrapper{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#EA323232', endColorstr='#EA323232', GradientType=0)!important}.gritter-item-wrapper.gritter-info{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#EA315185', endColorstr='#EA315185', GradientType=0)!important}.gritter-item-wrapper.gritter-error{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#EA992812', endColorstr='#EA992812', GradientType=0)!important}.gritter-item-wrapper.gritter-success{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#EA59834B', endColorstr='#EA59834B', GradientType=0)!important}.gritter-item-wrapper.gritter-warning{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#EABE701F', endColorstr='#EABE701F', GradientType=0)!important}.gritter-item-wrapper.gritter-light{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#F2F5F5F5', endColorstr='#F2F5F5F5', GradientType=0)!important}.gritter-info.gritter-light{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#F2E8F2FF', endColorstr='#F2E8F2FF', GradientType=0)!important}.gritter-error.gritter-light{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#F2FFEBEB', endColorstr='#F2FFEBEB', GradientType=0)!important}.gritter-success.gritter-light{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#F2EFFAE3', endColorstr='#F2EFFAE3', GradientType=0)!important}.gritter-warning.gritter-light{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#F2FCF8E3', endColorstr='#F2FCF8E3', GradientType=0)!important}.widget-header .wysiwyg-toolbar .btn-group>.btn,.widget-body .md-header .btn{background:transparent none!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#40FFFFFF', endColorstr='#40FFFFFF', GradientType=0)!important}.widget-header .wysiwyg-toolbar .btn-group>.btn.active,.widget-body .md-header .btn-inverse{background:transparent none!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#40000000', endColorstr='#40000000', GradientType=0)!important}.widget-body .md-header .btn,.widget-body .md-header .btn-inverse{display:none}.scroller-bar,.scroller-active .scroller-bar{display:none}.scroller-active:hover .scroller-bar,.scroller-active .scroller-bar.active,.scroller-active .scroller-bar:active,.nav-wrap:hover+.scroller-active .scroller-bar{display:block}.ace-settings-box{display:none}.ace-settings-box.open{display:block}[data-toggle=buttons]>.btn>input[type=radio],[data-toggle=buttons]>.btn>input[type=checkbox]{display:none}.aside.aside-hidden.aside-vc .modal-dialog{width:0}.aside.aside-hidden.aside-hz .modal-dialog{height:0}.btn-group>.btn-app:first-child{margin-right:24px}.btn-group>.btn-app.dropdown-toggle:first-child{margin-right:auto}.sidebar .submenu.sub-scroll{overflow-y:auto}}
\ No newline at end of file
diff --git a/NewLife.Cube/Content/ace/css/ace-part2.min.css b/NewLife.Cube/Content/ace/css/ace-part2.min.css
deleted file mode 100644
index f6441347e4..0000000000
--- a/NewLife.Cube/Content/ace/css/ace-part2.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.timeline-style2 .timeline-info{width:100px}.timeline-style2 .timeline-indicator{font-size:0;height:12px;line-height:12px;width:12px;border-width:1px!important;background-color:#FFF!important;position:absolute;left:85px;top:3px;opacity:1;border-radius:100%;display:inline-block;padding:0}.timeline-style2 .timeline-date{display:inline-block;width:72px;text-align:right;margin-right:25px;color:#777}.timeline-style2 .timeline-item .widget-box{margin-left:112px}.timeline-style2 .timeline-label{width:75px;text-align:center;margin-left:0;margin-bottom:10px;text-align:right;color:#666;font-size:14px}.timeline-time{text-align:center;position:static}.dataTables_length select{width:70px;height:25px;padding:2px 3px}.dataTables_length label{font-weight:400}.dataTables_filter{text-align:right}.dataTables_filter input[type=text],.dataTables_filter input[type=search]{width:125px;height:18px;line-height:18px;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;padding:4px 6px}.dataTables_filter label{font-weight:400}.dataTables_info{font-size:14px}.dataTables_paginate{text-align:right}.dataTables_paginate .pagination{margin:0 12px}.dataTables_wrapper label{display:inline-block;font-size:13px}.dataTables_wrapper input[type=text],.dataTables_wrapper input[type=search],.dataTables_wrapper select{margin-bottom:0!important;margin:0 4px}.dataTables_wrapper .row{margin:0!important}.dataTables_wrapper .row:first-child{padding-top:12px;padding-bottom:12px;background-color:#EFF3F8}.dataTables_wrapper .row:first-child+.dataTable{border-top:1px solid #ddd;border-bottom:1px solid #ddd}.dataTables_wrapper .row:last-child{border-bottom:1px solid #e0e0e0;padding-top:12px;padding-bottom:12px;background-color:#EFF3F8}.dataTables_wrapper .dataTables_scroll+.row{border-top:1px solid #e0e0e0}.dataTable{margin-bottom:0}.dataTable>thead>tr>th[class*=sort]{cursor:pointer}.dataTable>thead>tr>th[class*=sort]:after{float:right;display:inline;content:"\f0dc";font-family:FontAwesome;font-size:13px;font-weight:400;color:#555}.dataTable>thead>tr>th[class*=sort]:hover{color:#547ea8}.dataTable>thead>tr>th[class*=sorting_]{color:#307ecc}.dataTable>thead>tr>th.sorting_desc,.dataTable>thead>tr>th.sorting_asc{background-image:-webkit-linear-gradient(top,#eff3f8 0,#e3e7ed 100%);background-image:-o-linear-gradient(top,#eff3f8 0,#e3e7ed 100%);background-image:linear-gradient(to bottom,#eff3f8 0,#e3e7ed 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffeff3f8', endColorstr='#ffe3e7ed', GradientType=0)}.dataTable>thead>tr>th.sorting_desc:after{content:"\f0dd";top:-6px;color:#307ecc}.dataTable>thead>tr>th.sorting_asc:after{content:"\f0de";top:4px;color:#307ecc}.dataTable>thead>tr>th.sorting_disabled{cursor:inherit}.dataTable>thead>tr>th.sorting_disabled:after{display:none}.dataTables_scrollHead+.dataTables_scrollBody>.dataTable>thead>tr>th:after{display:none}.dataTables_scrollHeadInner{width:auto!important}.dataTables_scrollHeadInner>.dataTable>thead>tr>th{border-bottom-width:0!important}.dataTables_borderWrap .dataTables_scrollBody,.dataTables_borderWrap .dataTables_scrollHead{border:1px solid #ddd!important;border-width:0 1px!important}.dataTables_borderWrap .dataTables_scrollBody .table-bordered,.dataTables_borderWrap .dataTables_scrollHead .table-bordered{border-left-width:0;border-right-width:0}.dataTables_borderWrap .dataTables_scrollBody .table-bordered>thead>tr>th:first-child,.dataTables_borderWrap .dataTables_scrollHead .table-bordered>thead>tr>th:first-child,.dataTables_borderWrap .dataTables_scrollBody .table-bordered>tbody>tr>td:first-child,.dataTables_borderWrap .dataTables_scrollHead .table-bordered>tbody>tr>td:first-child{border-left-width:0}.dataTables_borderWrap .dataTables_scrollBody .table-bordered>thead>tr>th:last-child,.dataTables_borderWrap .dataTables_scrollHead .table-bordered>thead>tr>th:last-child,.dataTables_borderWrap .dataTables_scrollBody .table-bordered>tbody>tr>td:last-child,.dataTables_borderWrap .dataTables_scrollHead .table-bordered>tbody>tr>td:last-child{border-right-width:0}table.dataTable{clear:both;max-width:none!important}table.dataTable th:active{outline:0}div.dataTables_scrollHead table{margin-bottom:0!important;border-bottom-left-radius:0;border-bottom-right-radius:0}div.dataTables_scrollHead table thead tr:last-child th:first-child,div.dataTables_scrollHead table thead tr:last-child td:first-child{border-bottom-left-radius:0!important;border-bottom-right-radius:0!important}div.dataTables_scrollBody table{border-top:none;margin-top:0!important;margin-bottom:0!important}div.dataTables_scrollBody tbody tr:first-child th,div.dataTables_scrollBody tbody tr:first-child td{border-top:none}div.dataTables_scrollFoot table{margin-top:0!important;border-top:none}.DTTT_Print .main-content{margin-left:0!important;margin-right:0!important}.DTTT_Print .navbar-fixed-top+.main-container{padding-top:0}.tableTools-container{margin-bottom:8px}.tableTools-alert.gritter-item-wrapper{padding:12px 11px 8px;z-index:1999}ul.ColVis_collection{z-index:2002}ul.ColVis_collection>li>a{padding:0}ul.ColVis_collection>li>a:focus{outline:0}ul.ColVis_collection>li.ColVis_Special{border-top:1px solid #DDD}ul.ColVis_collection>li.ColVis_Special>a{padding:6px 11px 7px;text-align:center}ul.ColVis_collection label{margin:auto;padding:6px 11px 7px;display:block;cursor:pointer}div.ColVis_catcher{position:absolute;z-index:1101}div.ColVis_collectionBackground{position:fixed;top:0;left:0;height:100%;width:100%;background-color:#000;z-index:1100}.fc-toolbar h2{font-size:22px;color:#65A0CE}.fc-unthemed th,.fc-unthemed td,.fc-unthemed hr,.fc-unthemed thead,.fc-unthemed tbody,.fc-unthemed .fc-row,.fc-unthemed .fc-popover{border-color:#BCD4E5}.fc-unthemed .fc-today{background:#FFC}.fc-event{border-width:0;color:#fff;padding:1px 1px 2px 2px;border-radius:0}.fc-event:not([class*=label-]){background-color:#abbac3}.fc-event.label-yellow{color:#963}.fc-event.label-light{color:#888}.label-yellow .fc-event{color:#963}.label-light .fc-event{color:#888}[class*=label-]>.fc-event,[class*=label-]>.fc-event>.fc-event-skin.fc-event-head{background-color:inherit}.fc-event.ui-draggable-dragging{cursor:move}.fc-event.fc-event-vert,.fc-event-vert>.fc-event{padding:0 0 1px}.fc-day-number{color:#2E6589;opacity:1;filter:alpha(opacity=100)}.fc-widget-header,.fc .fc-axis{background:#ECF2F7;color:#8090A0}.fc-event-hori,.fc-event-vert{border-radius:0!important;border-color:transparent}.fc-event-vert .fc-event-content{padding-left:1px;padding-right:1px}.fc-event-vert .fc-event-time{padding:0}.fc-state-default{border:none}.fc-state-default,.fc-state-default .fc-button-inner{border:none;background-color:#abbac3;color:#FFF;background-image:none;box-shadow:none;text-shadow:none;border-radius:0!important;margin-left:2px}.fc-state-default .fc-button-effect{display:none}.fc-state-disabled,.fc-state-disabled .fc-button-inner{opacity:.75;filter:alpha(opacity=75);color:#DDD}.fc-state-active,.fc-state-active .fc-button-inner{border-color:#4F99C6;background-color:#6FB3E0}.fc-state-hover,.fc-state-hover .fc-button-inner{background-color:#8B9AA3}.fc .fc-button-group>*{margin:0 1px 0 0}.external-event{margin:6px 0;padding:0;cursor:default;display:block;font-size:13px;line-height:28px;color:#fff}.external-event:not([class*=label-]){background-color:#abbac3}.external-event:hover{opacity:1;filter:alpha(opacity=100)}.external-event.ui-draggable-dragging{cursor:move}.external-event.label-yellow{color:#963}.external-event.label-light{color:#888}.external-event>.ace-icon:first-child{display:inline-block;height:32px;width:32px;text-align:center;line-height:30px;margin-right:5px;font-size:15px;border-right:1px solid #FFF}@media only screen and (max-width:480px){.fc-header td{display:block;width:auto;text-align:left}}.chosen-container+.help-inline{vertical-align:middle}.chosen-container,[class*=chosen-container]{vertical-align:middle}.chosen-container>.chosen-single,[class*=chosen-container]>.chosen-single{line-height:28px;height:32px;box-shadow:none;background:#FAFAFA}.chosen-choices{box-shadow:none!important}.chosen-container-single .chosen-single abbr{background:0 0}.chosen-container-single .chosen-single abbr:after{content:"\f00d";display:inline-block;color:#888;font-family:FontAwesome;font-size:13px;position:absolute;right:0;top:-7px}.chosen-container-single .chosen-single abbr:hover:after{color:#464646}.chosen-container-single.chosen-disabled .chosen-single abbr:hover:after{color:#464646}.chosen-single div b{background:none!important}.chosen-single div b:before{content:"\f0d7";display:inline-block;color:#888;font-family:FontAwesome;font-size:12px;position:relative;top:-1px;left:1px}.chosen-container-active.chosen-with-drop .chosen-single div b:before{content:"\f0d8"}.chosen-container-single .chosen-search{position:relative}.chosen-container-single .chosen-search input[type=text]{background:0 0;border-radius:0;line-height:28px;height:28px}.chosen-container-single .chosen-search:after{content:"\f002";display:inline-block;color:#888;font-family:FontAwesome;font-size:14px;position:absolute;top:8px;right:12px}.chosen-container-multi .chosen-choices li.search-field input[type=text]{height:25px}.chosen-container-multi .chosen-choices li.search-choice{line-height:16px;padding-bottom:4px}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close{background:0 0}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:before{content:"\f00d";display:inline-block;color:#888;font-family:FontAwesome;font-size:13px;position:absolute;right:2px;top:-1px}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:hover{text-decoration:none}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:hover:before{color:#464646}.chosen-container-multi .chosen-choices li.search-choice-focus .search-choice-close:before{color:#464646}.chosen-container .chosen-results-scroll-down span,.chosen-container .chosen-results-scroll-up span{background:0 0}.chosen-container .chosen-results-scroll-down span:before,.chosen-container .chosen-results-scroll-up span:before{content:"\f0d7";display:inline-block;color:#888;font-family:FontAwesome;font-size:12px;position:relative;top:-1px;left:1px}.chosen-container .chosen-results-scroll-up span:before{content:"\f0d8"}.chosen-container-active .chosen-single-with-drop div b:before{content:"\f0d8"}.chosen-rtl .chosen-search input[type=text]{background:0 0}.chosen-rtl .chosen-search:after{content:"";display:none}.chosen-rtl .chosen-search:before{content:"\f002";display:inline-block;color:#888;font-family:FontAwesome;font-size:14px;position:absolute;top:9px;left:12px}.chosen-container-single .chosen-single{border-radius:0}.chosen-container .chosen-results li.highlighted{background:#316AC5;color:#FFF}.chosen-container-single .chosen-drop{border-radius:0;border-bottom:3px solid #4492C9;border-color:#4492C9}.chosen-single.chosen-single-with-drop,.chosen-container-active .chosen-single{border-color:#4492C9}.form-group.has-error .chosen-single{border-color:#f2a696!important}.form-group.has-info .chosen-single{border-color:#72aec2!important}.form-group.has-warning .chosen-single{border-color:#e3c94c!important}.form-group.has-success .chosen-single{border-color:#9cc573!important}.chosen-container-active.chosen-with-drop .chosen-single{border-color:#4492C9}.chosen-container .chosen-drop{display:none}.chosen-container.chosen-with-drop .chosen-drop{left:auto;right:auto;display:block}@media only screen and (-webkit-min-device-pixel-ratio:2),only screen and (min-resolution:144dpi){.chosen-rtl .chosen-search input[type=text],.chosen-container-single .chosen-single abbr,.chosen-container-single .chosen-single div b,.chosen-container-single .chosen-search input[type=text],.chosen-container-multi .chosen-choices li.search-choice .search-choice-close,.chosen-container .chosen-results-scroll-down span,.chosen-container .chosen-results-scroll-up span{background-image:none!important;background-repeat:no-repeat!important;background-size:auto!important}}.tag-input-style+.chosen-container-multi .chosen-choices li.search-choice{background-image:none;background-color:#91b8d0;color:#FFF;display:inline-block;font-size:13px;font-weight:400;margin-bottom:3px;margin-right:3px;padding:6px 22px 7px 9px;position:relative;text-shadow:1px 1px 1px rgba(0,0,0,.15);transition:all .2s ease 0s;vertical-align:baseline;white-space:nowrap;border:none;-webkit-box-shadow:none;box-shadow:none;border-radius:0}.tag-input-style+.chosen-container-multi .chosen-choices li.search-choice .search-choice-close{position:absolute;top:0;bottom:0;right:0;width:18px;height:auto;line-height:25px;text-align:center}.tag-input-style+.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:before{color:#FFF;position:static;font-size:11px}.tag-input-style+.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:hover{background-color:rgba(0,0,0,.2)}.tag-input-style+.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:hover:before{color:#FFF}.tag-input-style+.chosen-container-multi.chosen-rtl .chosen-choices li.search-choice{padding:6px 9px 7px 22px;margin-left:0;margin-right:3px!important}.tag-input-style+.chosen-container-multi.chosen-rtl .chosen-choices li.search-choice .search-choice-close{right:auto;left:0}.select2-container .select2-choice{border-radius:0;height:32px;line-height:28px}.select2-container.select2-drop-above .select2-choice{border-radius:0}.select2-container[class*=input-]{max-width:none}.select2-container.input-mini{min-width:100px}.select2-container .select2-choice abbr,.select2-search-choice-close{background:0 0}.select2-container .select2-choice abbr:before,.select2-search-choice-close:before{font-family:FontAwesome;font-size:12px;display:inline;content:"\f00d";color:#888;position:relative;top:-1px}.select2-container .select2-choice abbr:hover:before,.select2-search-choice-close:hover:before{color:#555}.select2-container .select2-choice abbr:before{top:-7px}.select2-search-choice-close:hover{text-decoration:none!important}.select2-drop{border-radius:0;border:1px solid #4492C9;border-width:0 1px 3px}.select2-drop.select2-drop-above{border-radius:0}.select2-container .select2-choice{background:#FAFAFA none}.select2-container-active .select2-choice,.select2-container-active .select2-choices,.select2-dropdown-open.select2-drop-above .select2-choice,.select2-dropdown-open.select2-drop-above .select2-choices,.select2-container-multi.select2-container-active .select2-choices{border-color:#4492C9}.select2-results .select2-highlighted{background:#316AC5}.select2-container .select2-choice .select2-arrow{border-radius:0;background:transparent none;border:none}.select2-container .select2-choice .select2-arrow b{background:0 0}.select2-container .select2-choice .select2-arrow b:before{font-family:FontAwesome;font-size:12px;display:inline;content:"\f0d7";color:#888;position:relative;left:5px}.select2-dropdown-open .select2-choice .select2-arrow b:before{content:"\f0d8"}.select2-search .select2-input{background:#fff none;margin-top:4px}.select2-search:after{font-family:FontAwesome;font-size:14px;display:inline;content:"\f002";color:#777;position:relative;top:0;left:-20px;z-index:0}.select2-dropdown-open.select2-drop-above .select2-choice,.select2-dropdown-open.select2-drop-above .select2-choices{background-image:none;background-color:#F6F6F6}.select2-container-multi .select2-choices .select2-search-field input{border:none!important;-webkit-box-shadow:none!important;box-shadow:none!important;background:none!important;font-size:14px}.select2-container-multi .select2-choices .select2-search-choice{line-height:16px;padding-bottom:4px}.select2-container-active .select2-choice,.select2-container-active .select2-choices,.select2-container-multi.select2-container-active .select2-choices,.select2-dropdown-open.select2-drop-above .select2-choice,.select2-dropdown-open.select2-drop-above .select2-choices{-webkit-box-shadow:none;box-shadow:none}.select2-search input.select2-active{background-color:#FFF;position:relative;z-index:1}@media only screen and (-webkit-min-device-pixel-ratio:1.5),only screen and (min-resolution:144dpi){.select2-search input,.select2-search-choice-close,.select2-container .select2-choice abbr,.select2-container .select2-choice div b{background-image:none!important;background-size:auto!important}.select2-search input{background-position:auto!important}}.select2-container-active.select2-dropdown-open .select2-choice{background-image:-webkit-linear-gradient(top,#eee 0,#fff 100%);background-image:-o-linear-gradient(top,#eee 0,#fff 100%);background-image:linear-gradient(to bottom,#eee 0,#fff 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffeeeeee', endColorstr='#ffffffff', GradientType=0)}.select2-container-active.select2-drop-above .select2-choice{background-image:-webkit-linear-gradient(top,#fff 0,#eee 100%);background-image:-o-linear-gradient(top,#fff 0,#eee 100%);background-image:linear-gradient(to bottom,#fff 0,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0)}.form-group.has-error .select2-choice,.form-group.has-error .select2-choices{border-color:#f2a696!important}.form-group.has-info .select2-choice,.form-group.has-info .select2-choices{border-color:#72aec2!important}.form-group.has-warning .select2-choice,.form-group.has-warning .select2-choices{border-color:#e3c94c!important}.form-group.has-success .select2-choice,.form-group.has-success .select2-choices{border-color:#9cc573!important}@media only screen and (-webkit-min-device-pixel-ratio:1.5),only screen and (min-resolution:144dpi){.select2-search input,.select2-search-choice-close,.select2-container .select2-choice abbr,.select2-container .select2-choice .select2-arrow b{background-image:none!important;background-repeat:no-repeat!important;background-size:auto!important}.select2-search input{background-position:auto!important}}.select2-container-multi.tag-input-style .select2-choices .select2-search-choice{background-image:none;background-color:#91b8d0;color:#FFF;display:inline-block;font-size:13px;font-weight:400;margin-bottom:3px;margin-right:0;padding:6px 22px 7px 9px;position:relative;text-shadow:1px 1px 1px rgba(0,0,0,.15);transition:all .2s ease 0s;vertical-align:baseline;white-space:nowrap;border:none;-webkit-box-shadow:none;box-shadow:none;border-radius:0}.select2-container-multi.tag-input-style .select2-choices .select2-search-choice .select2-search-choice-close{position:absolute;top:0;bottom:0;right:0;left:auto;width:18px;height:auto;line-height:25px;text-align:center}.select2-container-multi.tag-input-style .select2-choices .select2-search-choice .select2-search-choice-close:before{color:#FFF;position:static;font-size:11px}.select2-container-multi.tag-input-style .select2-choices .select2-search-choice .select2-search-choice-close:hover{background-color:rgba(0,0,0,.2)}.select2-container-multi.tag-input-style .select2-choices .select2-search-choice .select2-search-choice-close:hover:before{color:#FFF}#colorbox:focus,#colorbox:active{outline:0}#cboxTopLeft,#cboxTopCenter,#cboxTopRight,#cboxMiddleLeft,#cboxMiddleRight,#cboxBottomLeft,#cboxBottomCenter,#cboxBottomRight{background:none!important;opacity:0}#cboxContent{border:12px solid #000;background-color:#FFF;padding:7px}#cboxOverlay{background:rgba(0,0,0,.95);background:#000}#cboxCurrent{left:64px;margin-bottom:4px;font-size:14px}#cboxTitle{margin-bottom:4px;font-size:14px;color:#777}#cboxNext,#cboxPrevious,#cboxClose{background:0 0;text-indent:0;width:26px;height:26px;line-height:22px;padding:0 4px;text-align:center;border:2px solid #999;border-radius:16px;color:#666;font-size:12px;margin-left:5px;margin-bottom:5px}#cboxNext:hover,#cboxPrevious:hover{color:#333;border-color:#666}#cboxContent{overflow:visible}#cboxClose{background-color:#000;border:2px solid #FFF;border-radius:32px;color:#FFF;font-size:21px;height:28px;width:28px;padding-bottom:2px;margin-left:0;right:-14px;top:-14px}#cboxLoadingOverlay{background:none!important}#cboxLoadingGraphic{background:#FFF none!important;text-align:center}#cboxLoadingGraphic>.ace-icon{display:inline-block;background-color:#FFF;border-radius:8px;width:32px;height:32px;position:relative;top:48%;text-align:center;vertical-align:middle;font-size:24px;color:#FE7E3E}.ace-spinner{display:inline-block}.ace-spinner .spinbox-buttons.btn-group-vertical{min-width:18px}.ace-spinner .spinbox-buttons.btn-group-vertical>.btn{font-size:10px;padding:0;width:22px;height:16px;line-height:8px;margin-left:0}.ace-spinner .spinbox-buttons.btn-group-vertical>.btn:first-child{margin-top:0}.ace-spinner .spinbox-buttons.btn-group-vertical>.btn>.ace-icon{margin:0;padding:0}.ace-spinner .spinbox-buttons.btn-group-vertical>.btn+.btn{margin-top:2px}.ace-spinner .spinbox-buttons.btn-group-vertical>.btn-xs{height:14px;line-height:7px}.ace-spinner .spinbox-buttons.btn-group-vertical>.btn-lg{height:22px;line-height:10px;width:22px}.ace-spinner .spinbox-buttons>button.btn.spinbox-up:active{top:-1px}.ace-spinner:not(.touch-spinner) .spinbox-buttons>.btn>.ace-icon{margin-top:-1px}.ace-spinner.touch-spinner .spinbox-buttons{margin:0;font-size:0}.ace-spinner.touch-spinner .spinbox-buttons .btn-sm{width:32px}.ace-spinner.touch-spinner .spinbox-buttons .btn-xs{width:24px}.ace-spinner.touch-spinner .spinbox-buttons .btn-lg{width:40px}.ace-spinner.touch-spinner .spinbox-buttons>.btn{margin:0 1px!important}.ace-spinner.touch-spinner .spinbox-buttons>.btn-xs{padding-top:3px;padding-bottom:3px}.ace-spinner.touch-spinner .spinbox-buttons>.btn>.ace-icon{vertical-align:middle;display:inline-block}.steps{list-style:none;display:table;width:100%;padding:0;margin:0;position:relative}.steps li{display:table-cell;text-align:center;width:1%}.steps li .step{border:5px solid #ced1d6;color:#546474;font-size:15px;border-radius:100%;background-color:#FFF;position:relative;z-index:2;display:inline-block;width:40px;height:40px;line-height:30px;text-align:center}.steps li:before{display:block;content:"";width:100%;height:1px;font-size:0;overflow:hidden;border-top:4px solid #CED1D6;position:relative;top:21px;z-index:1}.steps li.last-child:before{max-width:50%;width:50%}.steps li:last-child:before{max-width:50%;width:50%}.steps li:first-child:before{max-width:51%;left:50%}.steps li.active:before,.steps li.complete:before,.steps li.active .step,.steps li.complete .step{border-color:#5293c4}.steps li.complete .step{cursor:default;color:#FFF;-webkit-transition:transform ease .1s;-o-transition:transform ease .1s;transition:transform ease .1s}.steps li.complete .step:before{display:block;position:absolute;top:0;left:0;bottom:0;right:0;line-height:30px;text-align:center;border-radius:100%;content:"\f00c";background-color:#FFF;z-index:3;font-family:FontAwesome;font-size:17px;color:#87ba21}.steps li.complete:hover .step{-moz-transform:scale(1.1);-webkit-transform:scale(1.1);-o-transform:scale(1.1);-ms-transform:scale(1.1);transform:scale(1.1);border-color:#80afd4}.steps li.complete:hover:before{border-color:#80afd4}.steps li .title{display:block;margin-top:4px;max-width:100%;color:#949ea7;font-size:14px;z-index:104;text-align:center;table-layout:fixed;word-wrap:break-word}.steps li.complete .title,.steps li.active .title{color:#2b3d53}.step-content{position:relative}.step-content .step-pane{display:none;min-height:200px;padding:4px 8px 12px}.step-content .step-pane.active{display:block}.wizard-actions{text-align:right}@media only screen and (max-width:767px){.steps li .step{width:30px;height:30px;line-height:24px;border-width:3px}.steps li:before,.steps li:after{border-width:3px}.steps li.complete .step:before{line-height:24px;font-size:13px}.steps li:before{top:16px}.step-content .step-pane{padding:4px 4px 6px;min-height:150px}}.tree{margin:auto;padding:0 0 0 9px;overflow-x:hidden;overflow-y:auto;position:relative}.tree:before{display:inline-block;content:"";position:absolute;top:-20px;bottom:16px;left:0;z-index:1;border:1px dotted #67b2dd;border-width:0 0 0 1px}.tree .tree-branch-name,.tree .tree-item-name{cursor:pointer}.tree .tree-branch{width:auto;min-height:20px;cursor:pointer}.tree .tree-branch .tree-branch-header{position:relative;height:20px;line-height:20px}.tree .tree-branch .tree-branch-header:hover{background-color:#F0F7FC}.tree .tree-branch .tree-branch-header .tree-branch-name,.tree .tree-item .tree-item-name{display:inline;z-index:2}.tree .tree-branch .tree-branch-header>.tree-branch-name>.ace-icon:first-child,.tree .tree-item>.tree-item-name>.ace-icon:first-child{display:inline-block;position:relative;z-index:2;top:-1px}.tree .tree-branch>.tree-branch-header>.tree-branch-name>.tree-label{margin-left:2px}.tree .tree-branch>.tree-branch-header>.tree-branch-name>.ace-icon:first-child{margin:-2px 0 0 -2px}.tree .tree-branch:last-child:after{display:inline-block;content:"";position:absolute;z-index:1;top:15px;bottom:0;left:-15px;border-left:1px solid #FFF}.tree .tree-branch .tree-branch-children{margin:0 0 0 23px;padding:0;position:relative}.tree .tree-branch .tree-branch-children:before{display:inline-block;content:"";position:absolute;z-index:1;top:-14px;bottom:16px;left:-14px;border:1px dotted #67b2dd;border-width:0 0 0 1px}.tree .tree-item{position:relative;height:20px;line-height:20px;cursor:pointer}.tree .tree-item:hover{background-color:#F0F7FC}.tree .tree-item>.tree-item-name>.ace-icon:first-child{margin-right:3px}.tree .tree-item>.tree-item-name>.tree-label>.ace-icon:first-child{margin-left:3px;margin-right:3px}.tree .tree-item>.ace-icon:first-child{margin-top:-1px}.tree .tree-branch,.tree .tree-item{position:relative;list-style:none}.tree .tree-branch:before,.tree .tree-item:before{display:inline-block;content:"";position:absolute;top:14px;left:-13px;width:18px;height:0;border-top:1px dotted #67b2dd;z-index:1}.tree .tree-selected{background-color:rgba(98,168,209,.1);color:#6398B0}.tree .tree-selected:hover{background-color:rgba(98,168,209,.1)}.tree .tree-item,.tree .tree-branch{border:1px solid #FFF}.tree .tree-branch .tree-branch-header{border-radius:0}.tree .tree-item,.tree .tree-branch .tree-branch-header{margin:0;padding:5px;color:#4D6878;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.tree .tree-item>.tree-item-name>.ace-icon:first-child{color:#F9E8CE;width:13px;height:13px;line-height:13px;font-size:11px;text-align:center;border-radius:3px;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;background-color:#FAFAFA;border:1px solid #CCC;box-shadow:0 1px 2px rgba(0,0,0,.05)}.tree .tree-selected>.tree-item-name>.ace-icon:first-child{background-color:#F9A021;border-color:#F9A021;color:#FFF}.tree .tree-plus.ace-icon:first-child,.tree .tree-minus.ace-icon:first-child{display:inline-block;font-style:normal;border:1px solid #DDD;vertical-align:middle;height:11px;width:11px;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;text-align:center;border:1px solid #8BAEBF;line-height:10px;background-color:#FFF;position:relative;z-index:2}.tree .tree-plus.ace-icon:first-child:before,.tree .tree-minus.ace-icon:first-child:before{content:"";display:block;width:7px;height:0;border-top:1px solid #4D6878;position:absolute;top:5px;left:2px}.tree .tree-plus.ace-icon:first-child:after{content:"";display:block;height:7px;width:0;border-left:1px solid #4D6878;position:absolute;top:2px;left:5px}.tree .tree-unselectable .tree-item>.tree-item-name>.tree-label>.ace-icon:first-child{color:#5084A0;width:13px;height:13px;line-height:13px;font-size:10px;text-align:center;border-radius:0;background-color:transparent;border:none;box-shadow:none}.tree .ace-icon[class*="-down"]{transform:rotate(-45deg)}.tree .ace-icon[class*="-download"]{transform:none}.tree .fa-spin{height:auto}.tree .tree-loading{margin-left:36px}.tree img{display:inline;veritcal-align:middle}.gritter-item-wrapper{background-image:none!important;box-shadow:0 2px 10px rgba(50,50,50,.5);background:rgba(50,50,50,.92)}.gritter-item-wrapper.gritter-info{background:rgba(49,81,133,.92)}.gritter-item-wrapper.gritter-error{background:rgba(153,40,18,.92)}.gritter-item-wrapper.gritter-success{background:rgba(89,131,75,.92)}.gritter-item-wrapper.gritter-warning{background:rgba(190,112,31,.92)}.gritter-item-wrapper.gritter-light{background:rgba(245,245,245,.95);border:1px solid #BBB}.gritter-item-wrapper.gritter-light.gritter-info{background:rgba(232,242,255,.95)}.gritter-item-wrapper.gritter-light.gritter-info .gritter-item{color:#4A577D}.gritter-item-wrapper.gritter-light.gritter-error{background:rgba(255,235,235,.95)}.gritter-item-wrapper.gritter-light.gritter-error .gritter-item{color:#894A38}.gritter-item-wrapper.gritter-light.gritter-success{background:rgba(239,250,227,.95)}.gritter-item-wrapper.gritter-light.gritter-success .gritter-item{color:#416131}.gritter-item-wrapper.gritter-light.gritter-warning{background:rgba(252,248,227,.95)}.gritter-item-wrapper.gritter-light.gritter-warning .gritter-item{color:#946446}.gritter-item p{line-height:1.8}.gritter-top,.gritter-bottom,.gritter-item{background-image:none}.gritter-close{left:auto;right:3px;background-image:none;width:18px;height:18px;line-height:17px;text-align:center;border:2px solid transparent;border-radius:16px;color:#E17B67}.gritter-close:before{font-family:FontAwesome;font-size:16px;content:"\f00d"}.gritter-info .gritter-close{color:orange}.gritter-error .gritter-close,.gritter-success .gritter-close,.gritter-warning .gritter-close{color:#FFEA07}.gritter-close:hover{color:#FFF!important}.gritter-title{text-shadow:none}.gritter-light .gritter-item,.gritter-light .gritter-bottom,.gritter-light .gritter-top,.gritter-light .gritter-close{background-image:none;color:#444}.gritter-light .gritter-title{text-shadow:none}.gritter-light .gritter-close:hover{color:#8A3104!important}.gritter-center{position:fixed;left:33%;right:33%;top:33%}@media only screen and (max-width:767px){.gritter-center{left:16%;right:16%;top:30%}}@media only screen and (max-width:480px){.gritter-center{left:30px;right:30px}}@media only screen and (max-width:320px){.gritter-center{left:10px;right:10px}}.wysiwyg-editor{max-height:250px;height:250px;background-color:#F7F8FA;border-collapse:separate;border:1px solid #BBC0CA;padding:4px;box-sizing:content-box;overflow-y:scroll;overflow-x:hidden;outline:0}.wysiwyg-editor:focus{background-color:#FFF}.wysiwyg-toolbar{line-height:33px;margin:0!important;position:relative}.wysiwyg-toolbar .dropdown-menu{text-align:left}.wysiwyg-toolbar .btn-group{float:none!important;font-size:0}.wysiwyg-toolbar .btn-group>.btn{float:none;padding-left:0;padding-right:0;text-align:center;margin-left:1px}.wysiwyg-toolbar .btn-group>.btn>.ace-icon:first-child{font-size:14px;width:25px;max-width:25px;display:inline-block;border-width:1px!important}.wysiwyg-toolbar .btn-group>.btn.dropdown-toggle>.ace-icon:last-child{margin-right:4px}.wysiwyg-style1 .btn-group>.btn,.wysiwyg-style2 .btn-group>.btn,.wysiwyg-style1 .btn-group>.inline>.btn,.wysiwyg-style2 .btn-group>.inline>.btn{margin:0!important;background:#FFF!important;border-width:0!important;color:#ADB3BE!important;text-shadow:none!important}.wysiwyg-style1 .btn-group>.btn.active,.wysiwyg-style2 .btn-group>.btn.active,.wysiwyg-style1 .btn-group>.inline>.btn.active,.wysiwyg-style2 .btn-group>.inline>.btn.active{color:#5B80CE!important}.wysiwyg-style1 .btn-group>.btn.active:after,.wysiwyg-style2 .btn-group>.btn.active:after,.wysiwyg-style1 .btn-group>.inline>.btn.active:after,.wysiwyg-style2 .btn-group>.inline>.btn.active:after{display:none}.wysiwyg-style1 .btn-group,.wysiwyg-style2 .btn-group{position:relative}.wysiwyg-style1 .btn-group:after,.wysiwyg-style2 .btn-group:after{display:block;content:"";position:absolute;left:-2px;top:6px;bottom:6px;width:0;max-width:0;border-left:1px solid #E1E6EA}.wysiwyg-style1 .btn-group:first-child:after,.wysiwyg-style2 .btn-group:first-child:after{display:none}.wysiwyg-style2{background-color:#E5E5E5}.wysiwyg-style2+.wysiwyg-editor{border-color:#DDD;background-color:#FFF;border-top:none}.wysiwyg-style2 .btn-group>.btn,.wysiwyg-style2 .btn-group>.inline>.btn{margin:0 1px 0 0!important;background:#FFF!important;border:none!important;color:#8D939E!important;text-shadow:none!important}.wysiwyg-style2 .btn-group>.btn.active,.wysiwyg-style2 .btn-group>.inline>.btn.active{color:#FFF!important;background:#6AAEDF!important}.wysiwyg-style2 .btn-group:after{display:none}.wysiwyg-toolbar .btn-colorpicker{width:24px;height:24px;position:relative;background:#87B87F;background:-moz-linear-gradient(top,#cf3e73 10%,#fff 20%,#2283c5 30%,#fff 40%,#87b87f 50%,#fff 60%,#ffb752 70%,#fff 80%,#d15b47 90%,#fff 100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(10%,#cf3e73),color-stop(20%,#fff),color-stop(30%,#2283c5),color-stop(40%,#fff),color-stop(50%,#87b87f),color-stop(60%,#fff),color-stop(70%,#ffb752),color-stop(80%,#fff),color-stop(90%,#d15b47),color-stop(100%,#fff));background:-webkit-linear-gradient(top,#cf3e73 10%,#fff 20%,#2283c5 30%,#fff 40%,#87b87f 50%,#fff 60%,#ffb752 70%,#fff 80%,#d15b47 90%,#fff 100%);background:-o-linear-gradient(top,#cf3e73 10%,#fff 20%,#2283c5 30%,#fff 40%,#87b87f 50%,#fff 60%,#ffb752 70%,#fff 80%,#d15b47 90%,#fff 100%);background:-ms-linear-gradient(top,#cf3e73 10%,#fff 20%,#2283c5 30%,#fff 40%,#87b87f 50%,#fff 60%,#ffb752 70%,#fff 80%,#d15b47 90%,#fff 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#CF3E73', endColorstr='#FFB752', GradientType=0);background:linear-gradient(top,#cf3e73 10%,#fff 20%,#2283c5 30%,#fff 40%,#87b87f 50%,#fff 60%,#ffb752 70%,#fff 80%,#d15b47 90%,#fff 100%)}.wysiwyg-toolbar .dropdown-colorpicker>.dropdown-menu{top:auto}.wysiwyg-toolbar input[type=file]{position:fixed;z-index:-10;opacity:0;max-width:0;max-height:0;display:block}.wysiwyg-toolbar .wysiwyg-choose-file{display:inline-block;width:auto;margin:4px auto 0;padding-left:5px;padding-right:5px}.wysiwyg-toolbar .dropdown-menu input[type=text]{margin-left:8px;margin-bottom:0}.wysiwyg-toolbar .dropdown-menu input[type=text].form-control{min-width:150px}.wysiwyg-toolbar .dropdown-menu .btn{margin-right:8px;margin-left:8px}.wysiwyg-style1 .btn-colorpicker{width:20px;height:20px;margin-left:4px}@media screen and (-webkit-min-device-pixel-ratio:0){.wysiwyg-editor img{display:inline!important}.wysiwyg-editor .ui-wrapper{border:1px dotted #D00;overflow:visible!important;display:inline-block!important;vertical-align:middle}.wysiwyg-editor .ui-wrapper:after{content:"";display:block;position:absolute;right:-3px;bottom:-3px;width:7px;height:7px;border:1px solid #D00;background-color:#FFF;z-index:1}}.widget-header .wysiwyg-toolbar{background-color:transparent}.widget-header .wysiwyg-toolbar .btn-group>.btn,.widget-header .wysiwyg-toolbar .btn-group>.inline>.btn{border-color:transparent;background:rgba(255,255,255,.25)!important;color:#FFF!important;min-width:32px;border-width:1px!important;border-radius:4px!important;padding:2px 1px 4px}.widget-header .wysiwyg-toolbar .btn-group>.btn.active,.widget-header .wysiwyg-toolbar .btn-group>.inline>.btn.active{background:rgba(0,0,0,.25)!important}.widget-body .wysiwyg-editor{border-width:0}.wysiwyg-speech-input{width:20px!important;color:transparent!important;background:transparent none!important;border-width:0!important;-moz-transform:scale(2,2);-webkit-transform:scale(2,2);-o-transform:scale(2,2);-ms-transform:scale(2,2);transform:scale(2,2);-webkit-box-shadow:none!important;box-shadow:none!important;position:absolute;right:0;top:-10px;cursor:pointer}.wysiwyg-speech-input:focus{-webkit-box-shadow:none!important;box-shadow:none!important}.widget-body .md-header{margin-top:-30px;margin-left:9px}.widget-body .md-header .btn{border-color:transparent;background:rgba(255,255,255,.25)!important;color:#FFF!important;text-align:center;min-width:32px;border-width:1px!important;border-radius:4px!important;padding:2px 4px 4px}.widget-body .md-header .btn>.ace-icon{font-size:14px;width:25px;max-width:25px;display:inline-block}.widget-body .md-header .btn-inverse{background:rgba(0,0,0,.25)!important;padding-right:5px;margin-left:4px}.md-fullscreen-controls{display:none}.widget-body .md-preview{padding:8px;min-height:200px}.widget-body .md-input{border:none!important;box-shadow:none!important;display:block;margin-bottom:0;background-color:rgba(48,126,204,.07);padding:8px;width:100%}.widget-body .md-input:focus{background-color:#FFF;box-shadow:none!important}.editable-container .popover-title{color:#438EB9}.editable-click{border-bottom:1px dashed #BBB;cursor:pointer;font-weight:400}img.editable-click{border:1px dotted #BBB}.editable-click:hover{border-color:#08C;color:#08C}img.editable-click:hover{opacity:.75;filter:alpha(opacity=75)}.editable-buttons,.editable-input{display:inline-block}.editable-buttons{margin-left:1px}.editable-buttons .btn{padding:0;width:28px;line-height:24px;border-width:3px;font-size:12px;margin:0 1px 0 0}.editable-buttons .btn>.ace-icon{margin:0}.editable-clear-x{cursor:pointer;color:#888;background:0 0}.editable-clear-x:hover{color:#D15B47}.editable-clear-x:before{display:inline-block;content:"\f057";font-family:FontAwesome;font-size:15px;position:absolute;margin-top:-9px;width:16px;height:30px;line-height:30px;text-align:center}.editable-input .ace-spinner{margin-right:8px}.editable-input .ace-spinner .spinner-input{width:100%}.editable-inline .editable-slider{margin-top:10px;margin-right:4px}.editable-popup .editable-slider{display:block;margin-bottom:16px;margin-top:4px}.editable-slider input[type=text]{display:none}.editable-slider input[type=range]{outline:0!important}.editable-input .ace-file-input{display:block}.editable-image .ace-file-multiple .ace-file-container.selected{border-color:transparent}.editable-image+.editable-buttons,.editable-wysiwyg+.editable-buttons{display:block;text-align:center;margin-top:8px}.editable-wysiwyg{width:95%}.editable-wysiwyg .wysiwyg-editor{height:auto;overflow-y:hidden}.editableform .input-append.dropdown-menu{display:none}.editableform .open .input-append.dropdown-menu{display:block}.editable-container .editableform{margin-bottom:10px}.editable-inline .editableform{margin-bottom:0}.editableform .control-group{display:block}.editableform-loading{background:0 0}.editableform-loading .ace-icon,.editableform-loading .progress{position:relative;top:35%}.input-group.date .input-group-addon{cursor:pointer}.datepicker td,.daterangepicker td,.datepicker th,.daterangepicker th{border-radius:0!important;font-size:13px}.datepicker td.active,.daterangepicker td.active,.datepicker td.active:hover,.daterangepicker td.active:hover{background:#2283c5!important}.datepicker td.active.disabled,.daterangepicker td.active.disabled,.datepicker td.active.disabled:hover,.daterangepicker td.active.disabled:hover{background:#8b9aa3!important}.datepicker td,.datepicker th{min-width:32px}.datepicker-dropdown.datepicker-orient-bottom:after,.datepicker-dropdown.datepicker-orient-bottom:before{top:auto}.daterangepicker .calendar-date{border-radius:0}.datepicker-months .month,.datepicker-years .year{border-radius:0!important}.datepicker-months .month.active,.datepicker-years .year.active,.datepicker-months .month.active:hover,.datepicker-years .year.active:hover,.datepicker-months .month.active:focus,.datepicker-years .year.active:focus,.datepicker-months .month.active:active,.datepicker-years .year.active:active{background-image:none!important;background-color:#2283c5!important}.bootstrap-timepicker-widget table td input{width:32px}.well .datepicker table tr td.day:hover{background-color:#7d8893;color:#FFF}.bootstrap-timepicker-widget table td a:hover{border-radius:0}.daterangepicker.opensleft:before,.daterangepicker.opensright:before{-moz-border-bottom-colors:rgba(0,0,0,.2)}.daterangepicker.opensleft:after,.daterangepicker.opensright:after{-moz-border-bottom-colors:#fff}.datepicker-dropdown:before{-moz-border-bottom-colors:rgba(0,0,0,.2)}.datepicker-dropdown:after{-moz-border-bottom-colors:#fff}.datepicker-dropdown.datepicker-orient-bottom:before{-moz-border-top-colors:#999}.datepicker-dropdown.datepicker-orient-bottom:after{-moz-border-top-colors:#FFF}.bootstrap-timepicker-widget.dropdown-menu:before{-moz-border-bottom-colors:rgba(0,0,0,.2)}.bootstrap-timepicker-widget.dropdown-menu:after{-moz-border-bottom-colors:#FFF}.bootstrap-timepicker-widget.timepicker-orient-bottom:before{-moz-border-top-colors:#999}.bootstrap-timepicker-widget.timepicker-orient-bottom:after{-moz-border-top-colors:#FFF}.bootstrap-datetimepicker-widget [class=btn]{border-width:0!important;background-color:transparent!important;color:#7399b8!important;text-shadow:none!important}.bootstrap-datetimepicker-widget [class=btn]:hover{color:#1B6AAA!important}.bootstrap-datetimepicker-widget .btn.btn-primary{border-width:3px!important}.bootstrap-datetimepicker-widget .picker-switch{margin-bottom:2px}.bootstrap-datetimepicker-widget .picker-switch .btn{width:90%!important;background-color:#EEE!important;color:#478fca!important;font-size:16px}.bootstrap-datetimepicker-widget .picker-switch .btn:hover{background-color:#e3edf5!important}.bootstrap-datetimepicker-widget td span{border-radius:0}.bootstrap-datetimepicker-widget .timepicker-hour,.bootstrap-datetimepicker-widget .timepicker-minute,.bootstrap-datetimepicker-widget .timepicker-second{color:#555!important}.ui-slider{background-color:#D5D5D5}.ui-slider-horizontal{height:9px}.ui-slider-vertical{width:9px}.ui-slider .ui-slider-handle{border-radius:0;width:1.45em;height:1.45em;background-color:#F8F8F8;border:1px solid}.ui-slider .ui-slider-handle:before,.ui-slider .ui-slider-handle:after{display:block;content:"";position:absolute;top:4px;left:5px;width:4px;height:8px;border:1px solid;border-width:0 1px;border-color:inherit}.ui-slider .ui-slider-handle:after{left:8px;border-width:0 1px 0 0}.ui-slider .ui-slider-handle:hover{background-color:#FFF}.ui-slider .ui-slider-handle:hover,.ui-slider .ui-slider-handle:focus,.ui-slider .ui-slider-handle:active{outline:0;-webkit-box-shadow:1px 1px 1px 0 rgba(0,0,0,.3);box-shadow:1px 1px 1px 0 rgba(0,0,0,.3)}.ui-slider-horizontal .ui-slider-handle{margin-left:-.725em;top:-.4em}.ui-slider-vertical .ui-slider-handle{left:-.35em;margin-bottom:-.65em}.ui-slider-small.ui-slider-horizontal{height:5px}.ui-slider-small.ui-slider-vertical{width:5px}.ui-slider-small .ui-slider-handle{border-radius:100%;width:17px;height:17px;margin-bottom:-.45em;left:-.35em}.ui-slider-small .ui-slider-handle:before,.ui-slider-small .ui-slider-handle:after{height:7px;left:5px;width:3px}.ui-slider-small .ui-slider-handle:after{left:7px}.ui-slider-simple .ui-slider-handle:after,.ui-slider-simple .ui-slider-handle:before{display:none}.ui-slider-range{background-color:#4aa4ce}.ui-slider-handle{outline:0!important;border-color:#4aa4ce!important}.ui-state-disabled.ui-slider{background-color:#E5E5E5}.ui-state-disabled .ui-slider-range{background-color:#8daebe}.ui-state-disabled .ui-slider-handle{-webkit-box-shadow:none!important;box-shadow:none!important;border-color:#8daebe!important}.ui-slider-green .ui-slider-range{background-color:#8bbc67}.ui-slider-green .ui-slider-handle{border-color:#8bbc67!important}.ui-slider-green.ui-state-disabled .ui-slider-range{background-color:#aab0a6}.ui-slider-green.ui-state-disabled .ui-slider-handle{border-color:#aab0a6!important}.ui-slider-red .ui-slider-range{background-color:#d36e6e}.ui-slider-red .ui-slider-handle{border-color:#d36e6e!important}.ui-slider-red.ui-state-disabled .ui-slider-range{background-color:#c8acac}.ui-slider-red.ui-state-disabled .ui-slider-handle{border-color:#c8acac!important}.ui-slider-purple .ui-slider-range{background-color:#ac68ba}.ui-slider-purple .ui-slider-handle{border-color:#ac68ba!important}.ui-slider-purple.ui-state-disabled .ui-slider-range{background-color:#ada7ae}.ui-slider-purple.ui-state-disabled .ui-slider-handle{border-color:#ada7ae!important}.ui-slider-orange .ui-slider-range{background-color:#efad62}.ui-slider-orange .ui-slider-handle{border-color:#efad62!important}.ui-slider-orange.ui-state-disabled .ui-slider-range{background-color:#e0c4a4}.ui-slider-orange.ui-state-disabled .ui-slider-handle{border-color:#e0c4a4!important}.ui-slider-dark .ui-slider-range{background-color:#606060}.ui-slider-dark .ui-slider-handle{border-color:#606060!important}.ui-slider-dark.ui-state-disabled .ui-slider-range{background-color:#7a7a7a}.ui-slider-dark.ui-state-disabled .ui-slider-handle{border-color:#7a7a7a!important}.ui-slider-pink .ui-slider-range{background-color:#d6487e}.ui-slider-pink .ui-slider-handle{border-color:#d6487e!important}.ui-slider-pink.ui-state-disabled .ui-slider-range{background-color:#c38ea2}.ui-slider-pink.ui-state-disabled .ui-slider-handle{border-color:#c38ea2!important}.ui-datepicker{background-color:#FFF;border:1px solid rgba(0,0,0,.2);-webkit-box-shadow:0 2px 4px rgba(0,0,0,.2);box-shadow:0 2px 4px rgba(0,0,0,.2)}.ui-datepicker .ui-datepicker-prev,.ui-datepicker .ui-datepicker-next{height:26px;min-width:32px;max-width:32px;text-align:center;cursor:pointer;color:transparent;line-height:26px;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.ui-datepicker .ui-datepicker-prev .ui-icon,.ui-datepicker .ui-datepicker-next .ui-icon{color:transparent;visibility:hidden}.ui-datepicker .ui-datepicker-prev:hover,.ui-datepicker .ui-datepicker-next:hover{background-color:#EEE;text-decoration:none}.ui-datepicker .ui-datepicker-prev:before,.ui-datepicker .ui-datepicker-next:before{display:inline;font-family:FontAwesome;font-size:14px;content:"\f060";color:#393939}.ui-datepicker .ui-datepicker-prev-hover,.ui-datepicker .ui-datepicker-next-hover{top:2px}.ui-datepicker .ui-datepicker-next:before{content:"\f061"}.ui-datepicker .ui-datepicker-prev-hover{left:2px}.ui-datepicker .ui-datepicker-next-hover{right:2px}.ui-datepicker td{padding:0}.ui-datepicker td>a,.ui-datepicker td>span{display:inline-block;height:22px;min-width:24px;max-width:24px;text-align:center;color:#393939;font-size:13px;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.ui-datepicker td>a:hover{background-color:#EEE}.ui-datepicker td>a.ui-state-highlight{background-color:#D5E5EF}.ui-datepicker td>a.ui-state-active{background-color:#2283c5;color:#FFF}.ui-datepicker td>a.ui-priority-secondary{color:#888}.ui-datepicker td>span{color:#999}.ui-datepicker td .ui-datepicker-title select{height:24px;line-height:24px;padding:2px 3px}.ui-datepicker td .ui-datepicker-buttonpane{background-color:#DDD;height:1px}.ui-widget-overlay{background:rgba(0,0,0,.25);opacity:1!important;filter:alpha(opacity=100)!important;z-index:1039!important}.ui-dialog,.ui-jqdialog{z-index:1040!important;background-color:#FFF;padding:0;border:1px solid #DDD;-webkit-box-shadow:0 2px 4px rgba(0,0,0,.2);box-shadow:0 2px 4px rgba(0,0,0,.2)}.ui-dialog .ui-dialog-titlebar,.ui-jqdialog .ui-dialog-titlebar,.ui-dialog .ui-jqdialog-titlebar,.ui-jqdialog .ui-jqdialog-titlebar{background-color:#F1F1F1;font-size:16px;color:#669fc7;padding:0}.ui-dialog .ui-dialog-title,.ui-jqdialog .ui-dialog-title,.ui-dialog .ui-jqdialog-title,.ui-jqdialog .ui-jqdialog-title{float:none!important;width:auto}.ui-dialog .widget-header,.ui-jqdialog .widget-header{margin:0;border-width:0 0 1px 0}.ui-dialog .ui-dialog-buttonpane,.ui-jqdialog .ui-dialog-buttonpane,.ui-dialog .ui-jqdialog-buttonpane,.ui-jqdialog .ui-jqdialog-buttonpane{background-color:#eff3f8;border-top:1px solid #e4e9ee}.ui-dialog .ui-dialog-buttonpane button,.ui-jqdialog .ui-dialog-buttonpane button,.ui-dialog .ui-jqdialog-buttonpane button,.ui-jqdialog .ui-jqdialog-buttonpane button{font-size:14px}.ui-dialog .ui-dialog-titlebar-close,.ui-jqdialog .ui-dialog-titlebar-close,.ui-dialog .ui-jqdialog-titlebar-close,.ui-jqdialog .ui-jqdialog-titlebar-close{border:none;background:0 0;opacity:.4;color:#d15b47;padding:0;top:50%;right:8px!important;text-align:center}.ui-dialog .ui-dialog-titlebar-close:before,.ui-jqdialog .ui-dialog-titlebar-close:before,.ui-dialog .ui-jqdialog-titlebar-close:before,.ui-jqdialog .ui-jqdialog-titlebar-close:before{content:"\f00d";display:inline;font-family:FontAwesome;font-size:16px}.ui-dialog .ui-dialog-titlebar-close:hover,.ui-jqdialog .ui-dialog-titlebar-close:hover,.ui-dialog .ui-jqdialog-titlebar-close:hover,.ui-jqdialog .ui-jqdialog-titlebar-close:hover{opacity:1;text-decoration:none;padding:0}.ui-dialog .ui-dialog-titlebar-close .ui-button-text,.ui-jqdialog .ui-dialog-titlebar-close .ui-button-text,.ui-dialog .ui-jqdialog-titlebar-close .ui-button-text,.ui-jqdialog .ui-jqdialog-titlebar-close .ui-button-text{text-indent:0;visibility:hidden}.ui-dialog .widget-header .ui-dialog-titlebar-close,.ui-jqdialog .widget-header .ui-dialog-titlebar-close,.ui-dialog .widget-header .ui-jqdialog-titlebar-close,.ui-jqdialog .widget-header .ui-jqdialog-titlebar-close{right:10px!important}.ui-accordion .ui-accordion-header{color:#478fca;font-weight:400;background-color:#F9F9F9;border:1px solid #cdd8e3;padding:8px 8px 9px 24px}.ui-accordion .ui-accordion-header:hover{color:#6ea6cc;background-color:#f1f8fd}.ui-accordion .ui-accordion-header.ui-state-active{color:#4c8fbd;background-color:#eef4f9;position:relative;font-weight:700}.ui-accordion .ui-accordion-header .ui-accordion-header-icon{text-indent:0;margin-top:0;position:absolute;left:10px;top:7px}.ui-accordion .ui-accordion-header .ui-accordion-header-icon:before{display:inline;font-family:FontAwesome;font-size:15px;content:"\f0da"}.ui-accordion .ui-accordion-header.ui-state-active .ui-accordion-header-icon:before{content:"\f0d7";font-weight:400}.ui-accordion .ui-accordion-content{border:1px solid #cdd8e3;border-top-width:0;padding:11px 16px}.ui-tabs .ui-tabs-nav{padding:0;border-bottom:1px solid #C5D0DC}.ui-tabs .ui-tabs-nav li.ui-state-default>a{background-color:#F9F9F9;border:1px solid #C5D0DC;border-bottom-width:0;color:#999;line-height:16px;margin-right:-1px;z-index:11;padding:8px 12px;position:relative;top:2px}.ui-tabs .ui-tabs-nav li>a:focus{outline:0}.ui-tabs .ui-tabs-nav li.ui-tabs-active>a{background-color:#FFF;border:1px solid;border-color:#4C8FBD #C5D0DC transparent;border-top-width:2px;-webkit-box-shadow:0 -2px 3px 0 rgba(0,0,0,.15);box-shadow:0 -2px 3px 0 rgba(0,0,0,.15);color:#576373;position:relative;top:1px}.ui-tabs .ui-tabs-panel{border:1px solid #C5D0DC;border-top-width:0;margin:0;left:auto;right:auto;top:auto;bottom:auto}.ui-menu{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;width:150px;-webkit-box-shadow:0 2px 4px rgba(0,0,0,.2);box-shadow:0 2px 4px rgba(0,0,0,.2);background-color:#FFF;border:1px solid rgba(0,0,0,.2);padding:3px}.ui-menu .ui-state-focus,.ui-menu .ui-state-active{margin:auto}.ui-menu .ui-menu-item{padding:5px 10px 6px;color:#444;cursor:pointer;display:block;-webkit-box-sizing:inherit;-moz-box-sizing:inherit;box-sizing:inherit}.ui-menu .ui-menu-item .ui-menu-icon{float:right;position:relative;left:auto;right:4px;bottom:auto;text-indent:0}.ui-menu .ui-menu-item .ui-menu-icon:before{content:"\f105";font-family:FontAwesome;font-size:14px;display:inline}.ui-menu .ui-menu-item:hover,.ui-menu .ui-state-focus,.ui-menu .ui-state-active,.ui-menu .ui-menu-item:hover>.ui-menu-icon,.ui-menu .ui-state-focus>.ui-menu-icon,.ui-menu .ui-state-active>.ui-menu-icon{text-decoration:none;background-color:#4f99c6;color:#FFF;margin:auto;font-weight:400}.ui-menu .ui-menu-item:hover .ui-menu-icon,.ui-menu .ui-state-focus .ui-menu-icon,.ui-menu .ui-state-active .ui-menu-icon,.ui-menu .ui-menu-item:hover>.ui-menu-icon .ui-menu-icon,.ui-menu .ui-state-focus>.ui-menu-icon .ui-menu-icon,.ui-menu .ui-state-active>.ui-menu-icon .ui-menu-icon{color:#FFF}.ui-menu .ui-state-disabled,.ui-menu .ui-state-disabled .ui-menu-icon{color:#999;cursor:default}.ui-menu .ui-state-disabled:hover,.ui-menu .ui-state-disabled.ui-state-focus,.ui-menu .ui-state-disabled.ui-state-active,.ui-menu .ui-state-disabled:hover .ui-menu-icon,.ui-menu .ui-state-disabled.ui-state-focus .ui-menu-icon,.ui-menu .ui-state-disabled.ui-state-active .ui-menu-icon{background-color:#FFF;color:#999}.ui-autocomplete{background-color:#FFF;border:1px solid rgba(0,0,0,.2);-webkit-box-shadow:0 2px 4px rgba(0,0,0,.2);box-shadow:0 2px 4px rgba(0,0,0,.2)}.ui-autocomplete-category{padding:6px;position:relative;background-color:#eef4f9;color:#478fca;font-weight:bolder;border:1px solid #DAE6ED;border-width:1px 0}.ui-spinner-button{border-width:0!important;font-size:10px;height:16px;line-height:16px;width:18px;color:#FFF!important;text-shadow:0 -1px 0 rgba(0,0,0,.25)!important;display:inline-block;position:absolute;text-align:center;padding:0}.ui-spinner-button>.ace-icon{width:18px;display:inline-block}.ui-spinner-up{top:0;right:5px}.ui-spinner-down{bottom:3px;right:5px}.ui-spinner-input{margin-top:0;padding:5px;max-width:100px;font-size:14px}.ui-tooltip{background-color:#444;color:#FFF}.ui-progressbar{background-color:#f5f5f5;height:22px}.ui-progressbar .ui-progressbar-value{margin:0}.ui-progressbar .ui-progressbar-value[class=progress-bar]{background-color:#2a91d8}.ui-selectmenu-button{border:1px solid #aaa}.ui-selectmenu-button[aria-expanded=true]{border-color:#4492C9}.ui-selectmenu-button span.ui-icon{text-indent:0;margin-top:-10px}.ui-selectmenu-button .ui-icon:before{content:"\f0d7";display:inline-block;color:#888;font-family:FontAwesome;font-size:14px}.ui-jqgrid .ui-jqgrid-view,.ui-jqgrid .ui-paging-info,.ui-jqgrid .ui-pg-table,.ui-jqgrid .ui-pg-selbox{font-size:13px}.ui-jqgrid .ui-jqgrid-title{float:left;margin:8px}.ui-jqgrid .ui-jqgrid-title-rtl{float:right;margin:8px}.ui-jqgrid-view>.ui-jqgrid-titlebar{height:40px;line-height:24px;color:#FFF;background:#307ecc;padding:0;font-size:15px}.ui-jqgrid tr.jqgrow.ui-row-rtl td:last-child{border-right:none;border-left:1px solid #E1E1E1}.ui-jqgrid .ui-jqgrid-hdiv{background-color:#eff3f8;border:1px solid #D3D3D3;border-width:1px 0 0 1px;line-height:15px;font-weight:700;color:#777;text-shadow:none}.ui-jqgrid .ui-jqgrid-htable thead{background-color:#eff3f8}.ui-jqgrid .ui-jqgrid-htable th span.ui-jqgrid-resize{height:45px!important}.ui-jqgrid .ui-jqgrid-htable th div{padding-top:12px;padding-bottom:12px}.ui-jqgrid-hdiv .ui-jqgrid-htable{border-top:none}.ui-jqgrid-hdiv .ui-jqgrid-htable{border-top:1px solid #E1E1E1}.ui-jqgrid-titlebar{position:relative;top:1px;z-index:1}.ui-jqgrid tr.jqgrow,.ui-jqgrid tr.ui-row-ltr,.ui-jqgrid tr.ui-row-rtl{border:none}.ui-jqgrid tr.ui-row-ltr td,.ui-jqgrid tr.ui-row-rtl td{border-bottom:1px solid #E1E1E1;padding:6px 4px;border-color:#E1E1E1}.ui-jqgrid tr.ui-state-highlight.ui-row-ltr td{border-right-color:#C7D3A9}.ui-jqgrid tr.ui-state-highlight.ui-row-rtl td{border-left-color:#C7D3A9}.ui-jqgrid-btable .ui-widget-content.ui-priority-secondary{background-image:none;background-color:#F9F9F9;opacity:1}.ui-jqgrid-btable .ui-widget-content.ui-state-hover{background-image:none;background-color:#EFF4F7;opacity:1}.ui-jqgrid-btable .ui-widget-content.ui-state-highlight{background-color:#E4EFC9}.ui-jqgrid .ui-jqgrid-pager{line-height:15px;height:55px;padding-top:3px!important;padding-bottom:5px!important;background-color:#eff3f8!important;border-bottom:1px solid #E1E1E1!important;border-top:1px solid #E1E1E1!important}.ui-jqgrid .ui-pg-input{font-size:inherit;width:24px;height:20px;line-height:16px;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;text-align:center;padding-top:1px;padding-bottom:1px}.ui-jqgrid .ui-pg-selbox{display:block;height:24px;width:60px;margin:0;padding:1px;line-height:normal}.ui-jqgrid .ui-jqgrid-htable th div{overflow:visible}.ui-jqgrid .ui-pager-control{height:50px;position:relative;padding-left:9px;padding-right:9px}.ui-jqgrid .ui-jqgrid-toppager{height:auto!important;background-color:#eff3f8;border-bottom:1px solid #E1E1E1!important}.ui-jqgrid .jqgrow .editable{max-width:90%;max-width:calc(92%)!important}.ui-pg-table .navtable .ui-corner-all{border-radius:0}.ui-jqgrid .ui-pg-button:hover{padding:1px}.ui-jqgrid .ui-pg-button .ui-separator{margin-left:4px;margin-right:4px;border-color:#C9D4DB}.ui-jqgrid .ui-jqgrid-btable{border-left:1px solid #E1E1E1}.ui-jqgrid .ui-jqgrid-bdiv{border-top:1px solid #E1E1E1}.ui-jqgrid .loading{position:absolute;top:45%;left:45%;width:auto;height:auto;z-index:101;padding:6px;margin:5px;text-align:center;font-weight:700;font-size:12px;background-color:#FFF;border:2px solid #8EB8D1;color:#E2B018}.ui-jqgrid .ui-search-toolbar{border-top:1px solid #E1E1E1}.ui-jqgrid .ui-jqgrid-labels{border-bottom:none;background:#F2F2F2;background-image:-webkit-linear-gradient(top,#f8f8f8 0,#ececec 100%);background-image:-o-linear-gradient(top,#f8f8f8 0,#ececec 100%);background-image:linear-gradient(to bottom,#f8f8f8 0,#ececec 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff8f8f8', endColorstr='#ffececec', GradientType=0);padding:0!important;border-left:1px solid #E1E1E1!important}.ui-jqgrid .ui-jqgrid-labels th{border-right:1px solid #E1E1E1!important;text-align:left!important}.ui-jqgrid-labels th[id*="_cb"]:first-child>div{padding-top:0;text-align:center!important}.ui-jqgrid-sortable{padding-left:4px;font-size:13px;color:#777;font-weight:700}.ui-jqgrid-sortable:hover{color:#547ea8}th[aria-selected=true]{background-image:-webkit-linear-gradient(top,#eff3f8 0,#e3e7ed 100%);background-image:-o-linear-gradient(top,#eff3f8 0,#e3e7ed 100%);background-image:linear-gradient(to bottom,#eff3f8 0,#e3e7ed 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffeff3f8', endColorstr='#ffe3e7ed', GradientType=0)}th[aria-selected=true] .ui-jqgrid-sortable{color:#307ecc}.ui-jqgrid .ui-icon{text-indent:0;color:#307ecc;float:none;right:2px}.rtl .ui-jqgrid .ui-icon{right:auto;left:2px}.ui-jqgrid .ui-icon.ui-state-disabled{color:#BBB}.ui-jqgrid .ui-icon.ui-state-disabled:hover{padding:0}.ui-grid-ico-sort:before{display:inline;content:"\f0d7";font-family:FontAwesome;font-size:12px}.ui-icon-asc:before{content:"\f0d8"}.ui-pg-table>tbody>tr>.ui-pg-button>.ui-icon{display:inline-block;padding:0;width:24px;height:24px;line-height:22px;text-align:center;position:static;float:none;margin:0 2px!important;color:gray;border:1px solid #CCC;background-color:#FFF;border-radius:100%}.ui-pg-table>tbody>tr>.ui-pg-button>.ui-icon:hover{color:#699AB5;border-color:#699AB5}.ui-pg-table>tbody>tr>.ui-pg-button>.ui-icon:before{width:20px;text-align:center;display:inline-block}.ui-pg-table>tbody>tr>.ui-pg-button.ui-state-disabled .ui-icon{color:#B0B0B0;background-color:#F7F7F7;border-color:#DDD;-moz-transform:scale(0.9);-webkit-transform:scale(0.9);-o-transform:scale(0.9);-ms-transform:scale(0.9);transform:scale(0.9)}.ui-jqgrid-btable input,.ui-jqgrid-btable textarea,.ui-jqgrid-btable select{padding:2px;width:auto;max-width:100%;margin-bottom:0}.ui-jqgrid-btable select{padding:1px;height:25px;line-height:25px}.ui-pg-div .ui-icon{display:inline-block;width:18px;float:none;position:static;text-align:center;opacity:.85;-webkit-transition:all .12s;-o-transition:all .12s;transition:all .12s;margin:0 1px;vertical-align:middle;cursor:pointer;font-size:17px}.ui-pg-div .ui-icon:hover{-moz-transform:scale(1.2);-webkit-transform:scale(1.2);-o-transform:scale(1.2);-ms-transform:scale(1.2);transform:scale(1.2);opacity:1;position:static;margin:0 1px}.ui-pg-div .ui-icon:before{font-family:FontAwesome;display:inline}.ui-jqgrid .ui-icon-pencil{color:#478FCA}.ui-jqgrid .ui-icon-pencil:before{content:"\f040"}.ui-jqgrid .ui-icon-trash{color:#DD5A43}.ui-jqgrid .ui-icon-trash:before{content:"\f014"}.ui-jqgrid .ui-icon-disk{color:#69AA46}.ui-jqgrid .ui-icon-disk:before{content:"\f00c"}.ui-jqgrid .ui-icon-cancel{color:#DD5A43}.ui-jqgrid .ui-icon-cancel:before{content:"\f00d"}.ui-jqdialog-content,.ui-jqdialog .ui-jqdialog-content{font-size:13px;padding:4px 0 0}.ui-jqdialog-content .formdata,.ui-jqdialog .ui-jqdialog-content .formdata{font-size:13px;padding:6px 12px}.ui-jqdialog-content .form-view-data,.ui-jqdialog .ui-jqdialog-content .form-view-data{vertical-align:middle;font-size:13px}.ui-jqdialog-content[id*=alertcnt_],.ui-jqdialog .ui-jqdialog-content[id*=alertcnt_]{padding:8px 11px}.ui-jqdialog-content .CaptionTD{font-size:12px;text-align:right;color:#666}.ui-jqdialog-content .FormData{border-bottom:1px dotted #E8E8E8}.ui-jqdialog-content .FormData:last-child{border-bottom:none}.ui-jqdialog-content .FormData>td{padding-top:6px;padding-bottom:6px}.ui-jqdialog-content input.FormElement{width:auto}.ui-jqdialog-content select.FormElement{padding:1px;height:25px;line-height:25px;width:auto}.ui-jqdialog-content td.EditButton{padding:8px}.EditTable{background-color:#eff3f8;border-top:1px solid #D6E1EA!important;padding:8px}.EditTable tr:first-child{display:none}.EditTable .navButton .fm-button{float:none!important;width:auto!important;margin:1px 1px 2px!important;background-color:transparent;border-radius:100%}.EditTable .navButton .fm-button:hover{background-color:transparent}.EditTable .navButton .fm-button:focus{outline:0}.EditTable .navButton .fm-button .ace-icon{display:inline-block;color:#999;border:1px solid #AAA;width:26px;height:26px;line-height:26px;text-align:center;border-radius:100%;background-color:#FFF}.EditTable .navButton .fm-button:hover .ace-icon{color:#699AB5;border-color:#699AB5}.EditTable .navButton .fm-button.ui-state-disabled .ace-icon,.EditTable .navButton .fm-button.ui-state-disabled:hover .ace-icon{color:#BBB;border-color:#CCC;-moz-transform:scale(0.88);-webkit-transform:scale(0.88);-o-transform:scale(0.88);-ms-transform:scale(0.88);transform:scale(0.88)}.FormGrid .EditTable{background-color:#FFF;border-top:none!important;padding:0}.FormGrid .EditTable tr:first-child{display:none}.ui-jqgrid .ui-jqgrid-view input,.ui-jqgrid .ui-jqgrid-view select,.ui-jqgrid .ui-jqgrid-view textarea,.ui-jqgrid .ui-jqgrid-view button{font-size:13px}.ui-jqdialog-content .searchFilter select{padding:1px;height:26px;line-height:26px;width:auto;max-width:95%;margin-bottom:0}.ui-jqdialog-content .searchFilter .input-elm{margin-bottom:0;height:18px;line-height:18px;width:95%!important;padding-left:1px;padding-right:1px;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.ui-jqdialog-content .searchFilter table{margin-left:4px}.ui-jqdialog-content .searchFilter tr td{padding:5px 0}.ui-jqdialog-content .searchFilter .add-group,.ui-jqdialog-content .searchFilter .add-rule,.ui-jqdialog-content .searchFilter .delete-group{margin-left:4px!important;font-size:15px!important}.ui-jqdialog-content .searchFilter .delete-rule{border:none;background-color:#FFF;color:#D15B47;font-size:20px;width:22px;line-height:10px;padding:0;text-shadow:none!important;display:inline-block;-webkit-transition:all .1s;-o-transition:all .1s;transition:all .1s;opacity:.85}.ui-jqdialog-content .searchFilter .delete-rule:hover{-moz-transform:scale(1.1);-webkit-transform:scale(1.1);-o-transform:scale(1.1);-ms-transform:scale(1.1);transform:scale(1.1);color:#B74635;opacity:1}.ui-jqdialog-content .searchFilter .queryresult{margin-bottom:11px}.ui-jqdialog-content .searchFilter .queryresult td.query{padding:6px 11px;border:1px solid #E1E1E1;background-color:#EEE}.ui-jqdialog-content .searchFilter .queryresult td.query:empty{display:none}.ui-state-error{background-color:#f2dede;border:1px solid #ebccd1;color:#a94442;margin:4px 4px 8px;padding:6px 10px;text-shadow:0 1px 0 rgba(255,255,255,.5);font-size:13px}.ui-jqdialog .ui-widget-header{background-image:-webkit-linear-gradient(top,#fff 0,#eee 100%);background-image:-o-linear-gradient(top,#fff 0,#eee 100%);background-image:linear-gradient(to bottom,#fff 0,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0);border-image:none;border-bottom:1px solid solid;color:#669FC7;min-height:38px;position:relative}.ui-jqdialog .ui-widget-header .ui-jqdialog-title{line-height:38px;margin:0;padding:0;padding-left:12px;text-align:left}.widget-header .ui-jqdialog-title{padding-left:0!important;padding-right:0!important}.ui-jqdialog .ui-widget-header .widget-header{border-bottom:none}.ui-jqdialog .ui-jqdialog-titlebar{border-bottom:1px solid #DDD!important}.fm-button{margin:0 4px}.fm-button:not(.btn){background-color:#abbac3;border-radius:0;box-shadow:none;color:#FFF;cursor:pointer;display:inline-block;font-size:13px;line-height:28px;padding:0 12px 1px;margin:0 8px;position:relative;text-shadow:0 -1px 0 rgba(0,0,0,.25);-webkit-transition:all .15s;-o-transition:all .15s;transition:all .15s;vertical-align:middle}.fm-button.ui-state-default:hover{background-color:#8b9aa3}.ui-jqgrid .ui-jqgrid-htable .ui-search-toolbar th{height:30px;padding-top:2px;white-space:normal}.ui-jqgrid .ui-jqgrid-htable .ui-search-toolbar th div{padding-top:0;padding-bottom:0;height:30px;line-height:26px}.ui-jqgrid .ui-jqgrid-titlebar-close{top:10%;height:auto;padding:0;margin:2px 8px 0 0;text-align:center;border-radius:4px}.ui-jqgrid .ui-jqgrid-titlebar-close:hover{background-color:rgba(255,255,255,.2)}.ui-jqgrid .ui-jqgrid-titlebar-close .ui-icon:before{display:inline-block;font-family:FontAwesome;content:"\f077";color:#FFF}.ui-jqgrid .ui-jqgrid-titlebar-close .ui-icon-circle-triangle-s:before{content:"\f078"}.ui-jqgrid .tree-wrap-ltr{margin:0 4px;float:none;display:inline}.ui-jqgrid .tree-wrap-rtl{margin:2px 4px 0}.ui-jqgrid .ui-subgrid{border-bottom:1px solid #E1E1E1;background-color:#F6FAFF}.ui-jqgrid .ui-subgrid .ui-jqgrid-btable{background-color:#FFF}.ui-jqgrid .ui-subgrid .ui-jqgrid .ui-jqgrid-hdiv{background-color:transparent;margin-top:4px}.ui-jqgrid .ui-subgrid .ui-jqgrid .ui-jqgrid-hdiv .ui-jqgrid-htable .ui-jqgrid-labels{border-bottom:1px solid #E1E1E1;background:#F1F1F1}.ui-jqgrid .ui-subgrid .ui-jqgrid .ui-jqgrid-hdiv .ui-jqgrid-htable th[aria-selected=true]{background:#E5E9EF}.ui-jqgrid .ui-subgrid .ui-jqgrid .ui-jqgrid-hdiv .ui-jqgrid-htable th .ui-jqgrid-sortable{font-size:12px}.ui-jqgrid .ui-subgrid .ui-jqgrid .ui-jqgrid-hdiv .ui-jqgrid-htable th div{padding-top:8px;padding-bottom:8px}.ui-jqgrid .ui-subgrid .ui-jqgrid .ui-jqgrid-hdiv .ui-jqgrid-htable th span.ui-jqgrid-resize{height:36px!important}.ui-jqgrid .ui-subgrid .ui-jqgrid .ui-jqgrid-bdiv{height:auto!important;max-height:150px;margin-bottom:4px;border-top-width:0;border-bottom:1px solid #E1E1E1}.ui-jqgrid .ui-sgcollapsed>a:hover{text-decoration:none}@media only screen and (max-width:767px){.ui-jqgrid .ui-jqgrid-pager{height:90px}.ui-jqgrid .ui-jqgrid-pager>.ui-pager-control{height:85px;padding-top:9px}.ui-jqgrid .ui-jqgrid-pager>.ui-pager-control>.ui-pg-table>tbody>tr>td{vertical-align:top}.ui-jqgrid .ui-jqgrid-pager>.ui-pager-control>.ui-pg-table>tbody>tr>td#grid-pager_center{width:0!important;position:static}.ui-jqgrid .ui-jqgrid-pager>.ui-pager-control>.ui-pg-table>tbody>tr>td#grid-pager_center>.ui-pg-table{margin:36px auto 0;position:absolute;right:0;left:0;text-align:center}}@media only screen and (max-width:767px) and (-webkit-min-device-pixel-ratio:0){.ui-jqgrid .ui-jqgrid-pager>.ui-pager-control>.ui-pg-table>tbody>tr>td#grid-pager_center>.ui-pg-table{width:300px}}.dd{position:relative;display:block;margin:0;padding:0;max-width:600px;list-style:none;line-height:20px}.dd-list{display:block;position:relative;margin:0;padding:0;list-style:none}.dd-list .dd-list{padding-left:30px}.dd-collapsed .dd-list{display:none}.dd-item,.dd-empty,.dd-placeholder{display:block;position:relative;margin:0;padding:0;min-height:20px;line-height:20px}.dd-handle,.dd2-content{display:block;min-height:38px;margin:5px 0;padding:8px 12px;background:#F8FAFF;border:1px solid #DAE2EA;color:#7C9EB2;text-decoration:none;font-weight:700;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.dd-handle:hover,.dd2-content:hover{color:#438EB9;background:#F4F6F7;border-color:#DCE2E8}.dd-handle[class*=btn-],.dd2-content[class*=btn-]{color:#FFF;border:none;padding:9px 12px}.dd-handle[class*=btn-]:hover,.dd2-content[class*=btn-]:hover{opacity:.85;color:#FFF}.dd2-handle+.dd2-content,.dd2-handle+.dd2-content[class*=btn-]{padding-left:44px}.dd-handle[class*=btn-]:hover,.dd2-content[class*=btn-] .dd2-handle[class*=btn-]:hover+.dd2-content[class*=btn-]{color:#FFF}.dd-item>button:hover~.dd-handle,.dd-item>button:hover~.dd2-content{color:#438EB9;background:#F4F6F7;border-color:#DCE2E8}.dd-item>button:hover~.dd-handle[class*=btn-],.dd-item>button:hover~.dd2-content[class*=btn-]{opacity:.85;color:#FFF}.dd2-handle:hover~.dd2-content{color:#438EB9;background:#F4F6F7;border-color:#DCE2E8}.dd2-handle:hover~.dd2-content[class*=btn-]{opacity:.85;color:#FFF}.dd2-item.dd-item>button{margin-left:34px}.dd-item>button{display:block;position:relative;z-index:1;cursor:pointer;float:left;width:25px;height:20px;margin:5px 1px 5px 5px;padding:0;text-indent:100%;white-space:nowrap;overflow:hidden;border:0;background:0 0;font-size:12px;line-height:1;text-align:center;font-weight:700;top:4px;left:1px;color:#707070}.dd-item>button:before{font-family:FontAwesome;content:'\f067';display:block;position:absolute;width:100%;text-align:center;text-indent:0;font-weight:400;font-size:14px}.dd-item>button[data-action=collapse]:before{content:'\f068'}.dd-item>button:hover{color:#707070}.dd-item.dd-colored>button,.dd-item.dd-colored>button:hover{color:#EEE}.dd-placeholder,.dd-empty{margin:5px 0;padding:0;min-height:30px;background:#F0F9FF;border:2px dashed #BED2DB;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.dd-empty{border-color:#AAA;border-style:solid;background-color:#e5e5e5}.dd-dragel{position:absolute;pointer-events:none;z-index:999;opacity:.8}.dd-dragel>li>.dd-handle{color:#4B92BE;background:#F1F5FA;border-color:#D6E1EA;border-left:2px solid #777;position:relative}.dd-dragel>li>.dd-handle[class*=btn-]{color:#FFF}.dd-dragel>.dd-item>.dd-handle{margin-top:0}.dd-list>li[class*=item-]{border-width:0;padding:0}.dd-list>li[class*=item-]>.dd-handle{border-left:2px solid;border-left-color:inherit}.dd-list>li>.dd-handle .sticker{position:absolute;right:0;top:0}.dd2-handle,.dd-dragel>li>.dd2-handle{left:0;top:0;width:36px;margin:0;border-width:1px 1px 0 0;text-align:center;padding:0!important;line-height:38px;height:38px;background:#EBEDF2;border:1px solid #DEE4EA;cursor:pointer;overflow:hidden;position:absolute;z-index:1}.dd2-handle:hover,.dd-dragel>li>.dd2-handle{background:#E3E8ED}.dd2-content[class*=btn-]{text-shadow:none!important}.dd2-handle[class*=btn-]{text-shadow:none!important;background:rgba(0,0,0,.1)!important;border-right:1px solid #EEE}.dd2-handle[class*=btn-]:hover{background:rgba(0,0,0,.08)!important}.dd-dragel .dd2-handle[class*=btn-]{border-color:transparent;border-right-color:#EEE}.dd2-handle.btn-yellow{text-shadow:none!important;background:rgba(0,0,0,.05)!important;border-right:1px solid #FFF}.dd2-handle.btn-yellow:hover{background:rgba(0,0,0,.08)!important}.dd-dragel .dd2-handle.btn-yellow{border-color:transparent;border-right-color:#FFF}.dd-item>.dd2-handle .drag-icon{display:none}.dd-dragel>.dd-item>.dd2-handle .drag-icon{display:inline}.dd-dragel>.dd-item>.dd2-handle .normal-icon{display:none}.dropzone{border-radius:0;border:1px solid rgba(0,0,0,.06)}.dropzone .dz-default.dz-message{background-image:none;font-size:24px;text-align:center;line-height:32px;left:0;width:100%;margin-left:auto}.dropzone .dz-default.dz-message span{display:inline;color:#555}.dropzone .dz-default.dz-message span .upload-icon{opacity:.7;filter:alpha(opacity=70);margin-top:8px;cursor:pointer}.dropzone .dz-default.dz-message span .upload-icon:hover{opacity:1;filter:alpha(opacity=100)}.dropzone .dz-preview .dz-error-mark,.dropzone-previews .dz-preview .dz-error-mark,.dropzone .dz-preview .dz-success-mark,.dropzone-previews .dz-preview .dz-success-mark{background-image:none;background-color:rgba(255,255,255,.8);border-radius:100%;text-align:center;line-height:35px}.dropzone .dz-preview .dz-error-mark:before,.dropzone-previews .dz-preview .dz-error-mark:before{font-family:FontAwesome;font-size:30px;color:#DB6262;content:"\f00d"}.dropzone .dz-preview .dz-success-mark:before,.dropzone-previews .dz-preview .dz-success-mark:before{font-family:FontAwesome;font-size:30px;color:#6DA552;content:"\f00c"}.dropzone a.dz-remove,.dropzone-previews a.dz-remove{border:none;border-radius:0;color:#FFF;background:#D15B47;cursor:pointer}.dropzone a.dz-remove:hover,.dropzone-previews a.dz-remove:hover{color:#FFF;background:#B74635}.dropzone .progress,.dropzone-previews .progress{margin-bottom:0}.dropzone .dz-preview.dz-success .progress,.dropzone-previews .dz-preview.dz-success .progress,.dropzone .dz-preview.dz-error .progress,.dropzone-previews .dz-preview.dz-error .progress{display:none}input.typeahead,input.tt-query,input.tt-hint{min-width:175px;font-size:16px;line-height:24px;border:1px solid #CCC;border-radius:0;outline:0}input.tt-hint,.form-group input.tt-hint{background-color:#FFF!important;color:#B0B0B0!important}.tt-dropdown-menu{text-align:left;position:absolute;left:0!important;right:0!important;min-width:175px;margin-top:2px;padding:8px 0;background-color:#FFF;border:1px solid #D0D0D0;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 2px 4px rgba(0,0,0,.2);box-shadow:0 2px 4px rgba(0,0,0,.2)}.tt-suggestion{padding:3px 12px 4px;font-size:16px;line-height:24px}.tt-suggestion.tt-cursor{color:#FFF;background-color:#4F99C6;cursor:pointer}.tt-suggestion p{margin:0}input.typeahead.scrollable~.tt-dropdown-menu{max-height:200px;overflow-y:auto}.btn-group>.btn.moveall:first-child,.btn-group>.btn.remove:first-child{margin:0}.btn-group>.btn.moveall:first-child+.btn.move,.btn-group>.btn.remove:first-child+.btn.removeall{margin:0}.bootstrap-duallistbox-container .info{font-size:12px}.bootstrap-duallistbox-container .clear1,.bootstrap-duallistbox-container .clear2{font-size:12px}.multiselect-container>li>a{padding:0}.multiselect-container>li>a>label{padding:7px 10px 7px 20px}.cancel-on-png,.cancel-off-png,.star-on-png,.star-off-png,.star-half-png{font-size:2em}.cancel-on-png,.cancel-off-png,.star-on-png,.star-off-png,.star-half-png{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;font-family:FontAwesome;font-style:normal;font-variant:normal;font-weight:400;line-height:1;speak:none;text-transform:none;color:#777}.cancel-on-png{color:#dd5a43}.cancel-on-png:before{content:"\f057"}.cancel-off-png{color:#e08374}.cancel-off-png:before{content:"\f05c"}.star-on-png{color:#feb902}.star-on-png:before{content:"\f005"}.star-off-png{color:#777}.star-off-png:before{content:"\f006"}.star-half-png{color:#feb902}.star-half-png:before{content:"\f123"}.icon-animated-bell{display:inline-block;-moz-animation:ringing 2s 5 ease 1s;-webkit-animation:ringing 2s 5 ease 1s;-o-animation:ringing 2s 5 ease 1s;-ms-animation:ringing 2s 5 ease 1s;animation:ringing 2s 5 ease 1s;-moz-transform-origin:50% 0;-webkit-transform-origin:50% 0;-o-transform-origin:50% 0;-ms-transform-origin:50% 0;transform-origin:50% 0}@-moz-keyframes ringing{0%{-moz-transform:rotate(-15deg)}2%{-moz-transform:rotate(15deg)}4%{-moz-transform:rotate(-18deg)}6%{-moz-transform:rotate(18deg)}8%{-moz-transform:rotate(-22deg)}10%{-moz-transform:rotate(22deg)}12%{-moz-transform:rotate(-18deg)}14%{-moz-transform:rotate(18deg)}16%{-moz-transform:rotate(-12deg)}18%{-moz-transform:rotate(12deg)}20%{-moz-transform:rotate(0deg)}}@-webkit-keyframes ringing{0%{-webkit-transform:rotate(-15deg)}2%{-webkit-transform:rotate(15deg)}4%{-webkit-transform:rotate(-18deg)}6%{-webkit-transform:rotate(18deg)}8%{-webkit-transform:rotate(-22deg)}10%{-webkit-transform:rotate(22deg)}12%{-webkit-transform:rotate(-18deg)}14%{-webkit-transform:rotate(18deg)}16%{-webkit-transform:rotate(-12deg)}18%{-webkit-transform:rotate(12deg)}20%{-webkit-transform:rotate(0deg)}}@-ms-keyframes ringing{0%{-ms-transform:rotate(-15deg)}2%{-ms-transform:rotate(15deg)}4%{-ms-transform:rotate(-18deg)}6%{-ms-transform:rotate(18deg)}8%{-ms-transform:rotate(-22deg)}10%{-ms-transform:rotate(22deg)}12%{-ms-transform:rotate(-18deg)}14%{-ms-transform:rotate(18deg)}16%{-ms-transform:rotate(-12deg)}18%{-ms-transform:rotate(12deg)}20%{-ms-transform:rotate(0deg)}}@keyframes ringing{0%{transform:rotate(-15deg)}2%{transform:rotate(15deg)}4%{transform:rotate(-18deg)}6%{transform:rotate(18deg)}8%{transform:rotate(-22deg)}10%{transform:rotate(22deg)}12%{transform:rotate(-18deg)}14%{transform:rotate(18deg)}16%{transform:rotate(-12deg)}18%{transform:rotate(12deg)}20%{transform:rotate(0deg)}}.icon-animated-vertical{display:inline-block;-moz-animation:vertical 2s 5 ease 2s;-webkit-animation:vertical 2s 5 ease 2s;-o-animation:vertical 2s 5 ease 2s;-ms-animation:vertical 2s 5 ease 2s;animation:vertical 2s 5 ease 2s}@-moz-keyframes vertical{0%{-moz-transform:translate(0,-3px)}4%{-moz-transform:translate(0,3px)}8%{-moz-transform:translate(0,-3px)}12%{-moz-transform:translate(0,3px)}16%{-moz-transform:translate(0,-3px)}20%{-moz-transform:translate(0,3px)}22%{-moz-transform:translate(0,0)}}@-webkit-keyframes vertical{0%{-webkit-transform:translate(0,-3px)}4%{-webkit-transform:translate(0,3px)}8%{-webkit-transform:translate(0,-3px)}12%{-webkit-transform:translate(0,3px)}16%{-webkit-transform:translate(0,-3px)}20%{-webkit-transform:translate(0,3px)}22%{-webkit-transform:translate(0,0)}}@-ms-keyframes vertical{0%{-ms-transform:translate(0,-3px)}4%{-ms-transform:translate(0,3px)}8%{-ms-transform:translate(0,-3px)}12%{-ms-transform:translate(0,3px)}16%{-ms-transform:translate(0,-3px)}20%{-ms-transform:translate(0,3px)}22%{-ms-transform:translate(0,0)}}@keyframes vertical{0%{transform:translate(0,-3px)}4%{transform:translate(0,3px)}8%{transform:translate(0,-3px)}12%{transform:translate(0,3px)}16%{transform:translate(0,-3px)}20%{transform:translate(0,3px)}22%{transform:translate(0,0)}}.icon-animated-hand-pointer{display:inline-block;-moz-animation:hand-pointer 2s 4 ease 2s;-webkit-animation:hand-pointer 2s 4 ease 2s;-o-animation:hand-pointer 2s 4 ease 2s;-ms-animation:hand-pointer 2s 4 ease 2s;animation:hand-pointer 2s 4 ease 2s}@-moz-keyframes hand-pointer{0%{-moz-transform:translate(0,0)}6%{-moz-transform:translate(5px,0)}12%{-moz-transform:translate(0,0)}18%{-moz-transform:translate(5px,0)}24%{-moz-transform:translate(0,0)}30%{-moz-transform:translate(5px,0)}36%{-moz-transform:translate(0,0)}}.icon-animated-wrench{display:inline-block;-moz-animation:wrenching 2.5s 4 ease;-webkit-animation:wrenching 2.5s 4 ease;-o-animation:wrenching 2.5s 4 ease;-ms-animation:wrenching 2.5s 4 ease;animation:wrenching 2.5s 4 ease;-moz-transform-origin:90% 35%;-webkit-transform-origin:90% 35%;-o-transform-origin:90% 35%;-ms-transform-origin:90% 35%;transform-origin:90% 35%}@-moz-keyframes wrenching{0%{-moz-transform:rotate(-12deg)}8%{-moz-transform:rotate(12deg)}10%{-moz-transform:rotate(24deg)}18%{-moz-transform:rotate(-24deg)}20%{-moz-transform:rotate(-24deg)}28%{-moz-transform:rotate(24deg)}30%{-moz-transform:rotate(24deg)}38%{-moz-transform:rotate(-24deg)}40%{-moz-transform:rotate(-24deg)}48%{-moz-transform:rotate(24deg)}50%{-moz-transform:rotate(24deg)}58%{-moz-transform:rotate(-24deg)}60%{-moz-transform:rotate(-24deg)}68%{-moz-transform:rotate(24deg)}75%{-moz-transform:rotate(0deg)}}@-webkit-keyframes wrenching{0%{-webkit-transform:rotate(-12deg)}8%{-webkit-transform:rotate(12deg)}10%{-webkit-transform:rotate(24deg)}18%{-webkit-transform:rotate(-24deg)}20%{-webkit-transform:rotate(-24deg)}28%{-webkit-transform:rotate(24deg)}30%{-webkit-transform:rotate(24deg)}38%{-webkit-transform:rotate(-24deg)}40%{-webkit-transform:rotate(-24deg)}48%{-webkit-transform:rotate(24deg)}50%{-webkit-transform:rotate(24deg)}58%{-webkit-transform:rotate(-24deg)}60%{-webkit-transform:rotate(-24deg)}68%{-webkit-transform:rotate(24deg)}75%{-webkit-transform:rotate(0deg)}}@-o-keyframes wrenching{0%{-o-transform:rotate(-12deg)}8%{-o-transform:rotate(12deg)}10%{-o-transform:rotate(24deg)}18%{-o-transform:rotate(-24deg)}20%{-o-transform:rotate(-24deg)}28%{-o-transform:rotate(24deg)}30%{-o-transform:rotate(24deg)}38%{-o-transform:rotate(-24deg)}40%{-o-transform:rotate(-24deg)}48%{-o-transform:rotate(24deg)}50%{-o-transform:rotate(24deg)}58%{-o-transform:rotate(-24deg)}60%{-o-transform:rotate(-24deg)}68%{-o-transform:rotate(24deg)}75%{-o-transform:rotate(0deg)}}@-ms-keyframes wrenching{0%{-ms-transform:rotate(-12deg)}8%{-ms-transform:rotate(12deg)}10%{-ms-transform:rotate(24deg)}18%{-ms-transform:rotate(-24deg)}20%{-ms-transform:rotate(-24deg)}28%{-ms-transform:rotate(24deg)}30%{-ms-transform:rotate(24deg)}38%{-ms-transform:rotate(-24deg)}40%{-ms-transform:rotate(-24deg)}48%{-ms-transform:rotate(24deg)}50%{-ms-transform:rotate(24deg)}58%{-ms-transform:rotate(-24deg)}60%{-ms-transform:rotate(-24deg)}68%{-ms-transform:rotate(24deg)}75%{-ms-transform:rotate(0deg)}}@keyframes wrenching{0%{transform:rotate(-12deg)}8%{transform:rotate(12deg)}10%{transform:rotate(24deg)}18%{transform:rotate(-24deg)}20%{transform:rotate(-24deg)}28%{transform:rotate(24deg)}30%{transform:rotate(24deg)}38%{transform:rotate(-24deg)}40%{transform:rotate(-24deg)}48%{transform:rotate(24deg)}50%{transform:rotate(24deg)}58%{transform:rotate(-24deg)}60%{transform:rotate(-24deg)}68%{transform:rotate(24deg)}75%{transform:rotate(0deg)}}@-moz-keyframes blinking{0%{opacity:1}40%{opacity:0}80%{opacity:1}}@-webkit-keyframes blinking{0%{opacity:1}40%{opacity:0}80%{opacity:1}}@-ms-keyframes blinking{0%{opacity:1}40%{opacity:0}80%{opacity:1}}@keyframes blinking{0%{opacity:1}40%{opacity:0}80%{opacity:1}}@-moz-keyframes pulsating{0%{-moz-transform:scale(1)}5%{-moz-transform:scale(0.75)}10%{-moz-transform:scale(1)}15%{-moz-transform:scale(1.25)}20%{-moz-transform:scale(1)}25%{-moz-transform:scale(0.75)}30%{-moz-transform:scale(1)}35%{-moz-transform:scale(1.25)}40%{-moz-transform:scale(1)}}@-webkit-keyframes pulsating{0%{-webkit-transform:scale(1)}5%{-webkit-transform:scale(0.75)}10%{-webkit-transform:scale(1)}15%{-webkit-transform:scale(1.25)}20%{-webkit-transform:scale(1)}25%{-webkit-transform:scale(0.75)}30%{-webkit-transform:scale(1)}35%{-webkit-transform:scale(1.25)}40%{-webkit-transform:scale(1)}}@-ms-keyframes pulsating{0%{-ms-transform:scale(1)}5%{-ms-transform:scale(0.75)}10%{-ms-transform:scale(1)}15%{-ms-transform:scale(1.25)}20%{-ms-transform:scale(1)}25%{-ms-transform:scale(0.75)}30%{-ms-transform:scale(1)}35%{-ms-transform:scale(1.25)}40%{-ms-transform:scale(1)}}@keyframes pulsating{0%{transform:scale(1)}5%{transform:scale(0.75)}10%{transform:scale(1)}15%{transform:scale(1.25)}20%{transform:scale(1)}25%{transform:scale(0.75)}30%{transform:scale(1)}35%{transform:scale(1.25)}40%{transform:scale(1)}}.btn-scroll-up{border-width:0;position:fixed;right:2px;z-index:99;-webkit-transition-duration:.3s;transition-duration:.3s;opacity:0;filter:alpha(opacity=0);bottom:-24px;visibility:hidden}.btn-scroll-up.display{opacity:.7;filter:alpha(opacity=70);bottom:2px;visibility:visible}.btn-scroll-up:hover{opacity:1;filter:alpha(opacity=100)}.btn-scroll-up:focus{outline:0}@media (min-width:768px){.main-container.container>.btn-scroll-up{right:auto;margin-left:714px}}@media (min-width:992px){.main-container.container>.btn-scroll-up{right:auto;margin-left:934px}}@media (min-width:1200px){.main-container.container>.btn-scroll-up{right:auto;margin-left:1134px}}.ace-settings-container{position:absolute;right:0;top:auto;z-index:12}.btn.btn-app.ace-settings-btn{float:left;display:block;text-align:center;border-radius:6px 0 0 6px;opacity:.55;vertical-align:top;margin:0}.btn.btn-app.ace-settings-btn:hover,.btn.btn-app.ace-settings-btn.open{opacity:1}.btn.btn-app.ace-settings-btn.btn-xs{width:42px}.ace-settings-box{display:block;float:left;max-width:0;max-height:0;overflow:hidden;padding:0;-moz-transform:translate(0,0);-webkit-transform:translate(0,0);-o-transform:translate(0,0);-ms-transform:translate(0,0);transform:translate(0,0);background-color:#FFF;border:0 solid #ffb34b;-webkit-transition:max-width .25s linear 0s,max-height 0s linear .25s,padding 0s linear .25s,border-width 0s linear .25s;-o-transition:max-width .25s linear 0s,max-height 0s linear .25s,padding 0s linear .25s,border-width 0s linear .25s;transition:max-width .25s linear 0s,max-height 0s linear .25s,padding 0s linear .25s,border-width 0s linear .25s}.ace-settings-box.open{max-width:320px;max-height:1000px;padding:0 14px;border-width:2px;-webkit-transition-delay:0s;-moz-transition-delay:0s;-o-transition-delay:0s;transition-delay:0s}.ace-settings-box.open .ace-settings-item{z-index:auto;min-width:140px}.ace-settings-box .ace-settings-item{margin:6px 0;color:#444;max-height:24px;position:relative;z-index:-1;white-space:nowrap}.ace-settings-box .ace-settings-item>label.lbl{font-size:13px}@media (max-width:480px){.ace-settings-container{text-align:right}.ace-settings-box{float:none!important;text-align:left}.btn.ace-settings-btn{float:none!important;display:inline-block}}@media (max-width:320px){.ace-settings-box>.clearfix>.pull-left,.ace-settings-box>.clearfix>.pull-right{float:none!important}}.grid2,.grid3,.grid4{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;display:block;margin:0 1%;padding:0 2%;float:left;border-left:1px solid #E3E3E3}.grid2:first-child,.grid3:first-child,.grid4:first-child{border-left:none}.grid2{width:48%}.grid3{width:31.33%}.grid4{width:23%;padding:0 1%}.draggable-placeholder{border:2px dashed #D9D9D9!important;background-color:#F7F7F7!important}.easyPieChart,.easy-pie-chart{position:relative;text-align:center}.easyPieChart canvas,.easy-pie-chart canvas{position:absolute;top:0;left:0}.knob-container{direction:ltr;text-align:left}.tags{display:inline-block;padding:4px 6px;color:#777;vertical-align:middle;background-color:#FFF;border:1px solid #d5d5d5;width:206px}.tags:hover{border-color:#b5b5b5}.tags-hover,.tags-hover:hover{border-color:#f59942;outline:0}.tags[class*=span]{float:none;margin-left:0}.tags input[type=text],.tags input[type=text]:focus{border:none;display:inline;outline:0;margin:0;padding:0;line-height:18px;-webkit-box-shadow:none;box-shadow:none;width:100%}.tags .tag{display:inline-block;position:relative;font-size:13px;font-weight:400;vertical-align:baseline;white-space:nowrap;background-color:#91b8d0;color:#FFF;text-shadow:1px 1px 1px rgba(0,0,0,.15);padding:4px 22px 5px 9px;margin-bottom:3px;margin-right:3px;-webkit-transition:all .2s;-o-transition:all .2s;transition:all .2s}.tags .tag:empty{display:none}.tags .tag-important{background-color:#d15b47}.tags .tag-warning{background-color:#ffb752}.tags .tag-success{background-color:#87b87f}.tags .tag-info{background-color:#6fb3e0}.tags .tag-inverse{background-color:#555}.tags .tag .close{font-size:15px;line-height:20px;opacity:1;filter:alpha(opacity=100);color:#FFF;text-shadow:none;float:none;position:absolute;right:0;top:0;bottom:0;width:18px;text-align:center}.tags .tag .close:hover{background-color:rgba(0,0,0,.2)}.page-content>.row .col-xs-12,.page-content>.row .col-sm-12,.page-content>.row .col-md-12,.page-content>.row .col-lg-12{float:left;max-width:100%}.col-xs-reset{width:auto;padding-left:0;padding-right:0;float:none!important}@media (min-width:768px){.col-sm-reset{width:auto;padding-left:0;padding-right:0;float:none!important}}@media (min-width:992px){.col-md-reset{width:auto;padding-left:0;padding-right:0;float:none!important}}@media (min-width:1200px){.col-lg-reset{width:auto;padding-left:0;padding-right:0;float:none!important}}.jqstooltip,.legendColorBox div{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.legendLabel{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;height:22px;padding-left:2px;font-size:10px}@media only screen and (max-width:991px){body{overflow-x:hidden}}.navbar-fixed-top+.main-container{padding-top:45px}@media (max-width:479px){.navbar-fixed-top+.main-container{padding-top:90px}.navbar-fixed-top.navbar-collapse+.main-container{padding-top:45px}}@media only screen and (max-width:360px){.grid2,.grid3,.grid4{float:none;display:block;width:96%;border-left-width:0;position:relative;margin-bottom:11px;border-bottom:1px solid #E3E3E3;padding-bottom:4px}.grid2>[class*=pull-],.grid3>[class*=pull-],.grid4>[class*=pull-]{float:none!important;display:inline-block;position:absolute;right:11px;top:0;margin-top:0}.grid2:last-child,.grid3:last-child,.grid4:last-child{border-bottom-width:0}}@media only screen and (max-width:480px){.hidden-480{display:none!important}}@media only screen and (max-width:320px){.hidden-320{display:none!important}}.no-skin .navbar .navbar-toggle{background-color:#75B3D7}.no-skin .navbar .navbar-toggle:focus{background-color:#75B3D7;border-color:transparent}.no-skin .navbar .navbar-toggle:hover{background-color:#61a8d1;border-color:rgba(255,255,255,.1)}.no-skin .navbar .navbar-toggle.display,.no-skin .navbar .navbar-toggle[data-toggle=collapse]:not(.collapsed){background-color:#4d9dcc;box-shadow:inset 1px 1px 2px 0 rgba(0,0,0,.25);border-color:rgba(255,255,255,.35)}.no-skin .sidebar{background-color:#f2f2f2;border-style:solid;border-color:#ccc;border-width:0 1px 0 0}.no-skin .nav-list .open>a,.no-skin .nav-list .open>a:hover,.no-skin .nav-list .open>a:focus{background-color:#fafafa}.no-skin .nav-list>li{border-color:#e5e5e5}.no-skin .nav-list>li>a{background-color:#f8f8f8;color:#585858}.no-skin .nav-list>li>a:focus{background-color:#f8f8f8;color:#1963aa}.no-skin .nav-list>li:hover>a{background-color:#fff;color:#266cad}.no-skin .nav-list>li.open>a{background-color:#fafafa;color:#1963aa}.no-skin .nav-list>li.active>a{font-weight:700;color:#2b7dbc}.no-skin .nav-list>li.active>a,.no-skin .nav-list>li.active>a:hover,.no-skin .nav-list>li.active>a:focus{background-color:#fff}.no-skin .nav-list>li .submenu{background-color:#fff;border-color:#e5e5e5}.no-skin .nav-list>li .submenu>li>a{border-top-color:#e4e4e4;background-color:#fff;color:#616161}.no-skin .nav-list>li .submenu>li>a:hover{color:#4b88b7;background-color:#f1f5f9}.no-skin .nav-list>li .submenu>li.active>a{color:#2b7dbc}.no-skin .nav-list>li .submenu>li.active>a>.menu-icon{color:#c86139}.no-skin .nav-list>li .submenu>li.active.open>a>.menu-icon{color:inherit}@media only screen and (min-width:992px){.no-skin .nav-list>li .submenu>li.active.hover>a.dropdown-toggle>.menu-icon{color:inherit}}.no-skin .nav-list>li .submenu>li.active:not(.open)>a{background-color:#f5f7fa}.no-skin .nav-list>li .submenu>li.active:not(.open)>a:hover{background-color:#f1f5f9}.no-skin .nav-list>li>.submenu .open>a,.no-skin .nav-list>li>.submenu .open>a:hover,.no-skin .nav-list>li>.submenu .open>a:focus{border-color:#e4e4e4}.no-skin .nav-list>li>.submenu li>.submenu>li a{color:#757575}.no-skin .nav-list>li>.submenu li>.submenu>li a:hover{color:#4b88b7;background-color:#f1f5f9}.no-skin .nav-list>li>.submenu li.open>a{color:#4b88b7}.no-skin .nav-list>li>.submenu li>.submenu li.open>a,.no-skin .nav-list>li>.submenu li>.submenu li.active>a{color:#4b88b7}.no-skin .nav-list>li>.submenu:before,.no-skin .nav-list>li>.submenu>li:before{border-color:#9dbdd6}.no-skin .nav-list>li.active>.submenu:before,.no-skin .nav-list>li.active>.submenu>li:before{border-color:#8eb3d0}.no-skin .sidebar-toggle{background-color:#f3f3f3;border-color:#e0e0e0}.no-skin .sidebar-toggle>.ace-icon{border-color:#bbb;color:#aaa;background-color:#fff}.no-skin .sidebar-shortcuts{background-color:#fafafa}.no-skin .sidebar-fixed .sidebar-shortcuts{border-color:#ddd}.no-skin .sidebar-shortcuts-mini{background-color:#fff}.no-skin .nav-list li>.arrow:before{border-right-color:#B8B8B8;-moz-border-right-colors:#B8B8B8;border-width:10px 10px 10px 0;left:-11px}.no-skin .nav-list li>.arrow:after{border-right-color:#fff;-moz-border-right-colors:#fff;border-width:10px 10px 10px 0;left:-10px}.no-skin .nav-list>li.pull_up>.arrow:after{border-right-color:#fff!important;-moz-border-right-colors:#fff!important;border-width:10px 10px 10px 0!important;left:-10px!important}.no-skin .nav-list>li.pull_up>.arrow:before{border-width:10px 10px 10px 0!important;left:-11px!important}.no-skin .nav-list li.active>a:after{border-right-color:#2b7dbc;-moz-border-right-colors:#2b7dbc}.no-skin .nav-list>li.active:after{display:block;content:"";position:absolute;right:-2px;top:-1px;bottom:0;z-index:1;border:2px solid;border-width:0 2px 0 0;border-color:#2b7dbc}.no-skin .sidebar-scroll .nav-list>li.active:after{right:0}@media only screen and (max-width:991px){.no-skin .sidebar.responsive .nav-list>li.active.open>a:after,.no-skin .sidebar.responsive-max .nav-list>li.active.open>a:after{display:block}.no-skin .sidebar.responsive .nav-list li li.active>a:after,.no-skin .sidebar.responsive-max .nav-list li li.active>a:after{display:none}.no-skin .sidebar.responsive .nav-list>li.active:after,.no-skin .sidebar.responsive-max .nav-list>li.active:after{height:41px}}.no-skin .sidebar.menu-min .nav-list>li>a>.menu-text{background-color:#f5f5f5;-webkit-box-shadow:2px 1px 2px 0 rgba(0,0,0,.1);box-shadow:2px 1px 2px 0 rgba(0,0,0,.1);border-color:#ccc}.no-skin .sidebar.menu-min .nav-list>li>a.dropdown-toggle>.menu-text{-webkit-box-shadow:2px 2px 2px 0 rgba(0,0,0,.1);box-shadow:2px 2px 2px 0 rgba(0,0,0,.1)}.no-skin .sidebar.menu-min .nav-list>li.active>.submenu{border-left-color:#83b6d1}.no-skin .sidebar.menu-min .nav-list>li>.submenu{background-color:#fff;border:1px solid #ccc;border-top-color:#e6e6e6;-webkit-box-shadow:2px 2px 2px 0 rgba(0,0,0,.1);box-shadow:2px 2px 2px 0 rgba(0,0,0,.1)}.no-skin .sidebar.menu-min .nav-list>li>.arrow:after{border-right-color:#f5f5f5;-moz-border-right-colors:#f5f5f5;border-width:8px 8px 8px 0;left:-8px}.no-skin .sidebar.menu-min .nav-list>li>.arrow:before{border-width:8px 8px 8px 0;left:-9px}.no-skin .sidebar.menu-min .nav-list>li.active>.arrow:before{border-right-color:#5a9ec2;-moz-border-right-colors:#5a9ec2}.no-skin .sidebar.menu-min .nav-list>li.active>a>.menu-text{border-left-color:#83b6d1}.no-skin .sidebar.menu-min .sidebar-shortcuts-large{background-color:#fff;-webkit-box-shadow:2px 1px 2px 0 rgba(0,0,0,.1);box-shadow:2px 1px 2px 0 rgba(0,0,0,.1);border-color:#ccc}.no-skin .sidebar.menu-min .sidebar-toggle>.ace-icon{border-color:#b1b1b1}@media (max-width:991px){.no-skin .sidebar.responsive-min .nav-list>li>a>.menu-text{background-color:#f5f5f5;-webkit-box-shadow:2px 1px 2px 0 rgba(0,0,0,.1);box-shadow:2px 1px 2px 0 rgba(0,0,0,.1);border-color:#ccc}.no-skin .sidebar.responsive-min .nav-list>li>a.dropdown-toggle>.menu-text{-webkit-box-shadow:2px 2px 2px 0 rgba(0,0,0,.1);box-shadow:2px 2px 2px 0 rgba(0,0,0,.1)}.no-skin .sidebar.responsive-min .nav-list>li.active>.submenu{border-left-color:#83b6d1}.no-skin .sidebar.responsive-min .nav-list>li>.submenu{background-color:#fff;border:1px solid #ccc;border-top-color:#e6e6e6;-webkit-box-shadow:2px 2px 2px 0 rgba(0,0,0,.1);box-shadow:2px 2px 2px 0 rgba(0,0,0,.1)}.no-skin .sidebar.responsive-min .nav-list>li>.arrow:after{border-right-color:#f5f5f5;-moz-border-right-colors:#f5f5f5;border-width:8px 8px 8px 0;left:-8px}.no-skin .sidebar.responsive-min .nav-list>li>.arrow:before{border-width:8px 8px 8px 0;left:-9px}.no-skin .sidebar.responsive-min .nav-list>li.active>.arrow:before{border-right-color:#5a9ec2;-moz-border-right-colors:#5a9ec2}.no-skin .sidebar.responsive-min .nav-list>li.active>a>.menu-text{border-left-color:#83b6d1}.no-skin .sidebar.responsive-min .sidebar-shortcuts-large{background-color:#fff;-webkit-box-shadow:2px 1px 2px 0 rgba(0,0,0,.1);box-shadow:2px 1px 2px 0 rgba(0,0,0,.1);border-color:#ccc}.no-skin .sidebar.responsive-min .sidebar-toggle>.ace-icon{border-color:#b1b1b1}}@media only screen and (min-width:992px){.no-skin .nav-list li.hover>.submenu{-webkit-box-shadow:2px 1px 2px 0 rgba(0,0,0,.1);box-shadow:2px 1px 2px 0 rgba(0,0,0,.1);border-color:#ccc}.no-skin .nav-list li.hover>.submenu>li.active>a{background-color:#f5f5f5}.no-skin .nav-list li.hover>.submenu>li:hover>a{background-color:#eef3f7;color:#2e7db4}}@media only screen and (min-width:992px) and (max-width:991px){.no-skin .sidebar.navbar-collapse .nav-list li li.hover.active.open>a{background-color:#fff}.no-skin .sidebar.navbar-collapse .nav-list li li.hover:hover>a{background-color:#fff}.no-skin .sidebar.navbar-collapse .nav-list li li.hover>a:hover,.no-skin .sidebar.navbar-collapse .nav-list li li.hover.open>a:hover,.no-skin .sidebar.navbar-collapse .nav-list li li.hover.open.active>a:hover{background-color:#f1f5f9}.no-skin .sidebar.navbar-collapse .nav-list>li .submenu>li.active.hover>a.dropdown-toggle>.menu-icon{color:#c86139}.no-skin .sidebar.navbar-collapse .nav-list>li .submenu>li.active.open.hover>a.dropdown-toggle>.menu-icon{color:inherit}}@media only screen and (min-width:992px){.no-skin .sidebar.navbar-collapse .nav-list>li.open.hover:not(:hover):not(:focus):not(.active)>a{color:#585858}.no-skin .sidebar.navbar-collapse .nav-list>li.open.hover:not(:hover):not(:focus):not(.active)>a>.arrow{color:inherit}.no-skin .sidebar.navbar-collapse .nav-list>li.open.hover:hover>a{background-color:#fff}.no-skin .sidebar.navbar-collapse .nav-list>li>.submenu li.open.hover:not(:hover):not(:focus):not(.active)>a{color:#616161}.no-skin .sidebar.navbar-collapse .nav-list>li>.submenu li.open.hover:not(:hover):not(:focus):not(.active)>a>.arrow{color:inherit}}@media only screen and (min-width:992px) and (max-width:991px){.no-skin .sidebar.navbar-collapse .nav-list li.hover>.submenu{border-top-color:#e5e5e5;background-color:#fff}.no-skin .nav-list li.hover>.submenu>li.active:not(.open)>a{background-color:#f5f7fa}.no-skin .nav-list li.hover>.submenu>li.active:not(.open)>a:hover{background-color:#f1f5f9}}@media only screen and (min-width:992px){.no-skin .sidebar.h-sidebar{background-color:#f8f8f8}.no-skin .sidebar.h-sidebar:before{background-color:#e4e4e4;-webkit-box-shadow:0 -1px 1px 0 rgba(0,0,0,.05) inset;box-shadow:0 -1px 1px 0 rgba(0,0,0,.05) inset}.no-skin .sidebar.h-sidebar .nav-list>li:hover,.no-skin .sidebar.h-sidebar .nav-list>li:hover+li{border-left-color:#cedde5}.no-skin .sidebar.h-sidebar .nav-list>li:last-child:hover{border-right-color:#cedde5}.no-skin .sidebar.h-sidebar .nav-list>li.active,.no-skin .sidebar.h-sidebar .nav-list>li.active+li,.no-skin .sidebar.h-sidebar .nav-list>li:hover+li.active{border-left-color:#79b0ce}.no-skin .sidebar.h-sidebar .nav-list>li.active:last-child{border-right-color:#79b0ce}.no-skin .sidebar.h-sidebar .nav-list>li.active:before{background-color:#2b7dbc}.no-skin .sidebar.h-sidebar .nav-list>li.active>a:after{border-width:0 0 2px 0;border-color:transparent;border-bottom-color:#FFF;left:0;right:0;top:auto;bottom:-2px}.no-skin .sidebar.h-sidebar .sidebar-shortcuts-large{background-color:#FFF;border-color:#ccc;-webkit-box-shadow:2px 1px 2px 0 rgba(0,0,0,.1);box-shadow:2px 1px 2px 0 rgba(0,0,0,.1)}.no-skin .sidebar.h-sidebar .sidebar-shortcuts-large:after{border-bottom-color:#FFF;-moz-border-bottom-colors:#FFF}.no-skin .sidebar.h-sidebar .nav-list>li.hover>.submenu{border-color:#ccc}.no-skin .sidebar.h-sidebar.menu-min .nav-list>li.hover>.submenu{border-top-color:#e6e6e6}.no-skin .sidebar.h-sidebar .nav-list>li.hover>.arrow:after{border-color:transparent;-moz-border-right-colors:none;-moz-border-top-colors:none;-moz-border-left-colors:none;border-bottom-color:#FFF;-moz-border-bottom-colors:#FFF}.no-skin .sidebar.h-sidebar .nav-list>li.hover>.arrow:before{border-color:transparent;-moz-border-right-colors:none;-moz-border-top-colors:none;-moz-border-left-colors:none;-moz-border-bottom-colors:#B8B8B8;border-bottom-color:#B8B8B8}.no-skin .sidebar.h-sidebar.menu-min .nav-list>li.hover>.arrow:after{-moz-border-bottom-colors:#F5F5F5;border-bottom-color:#F5F5F5}.no-skin .sidebar.h-sidebar.menu-min .nav-list>li.active>a>.menu-text{border-left-color:#ccc}}@media only screen and (max-width:991px){.no-skin .sidebar{border-width:0 1px 1px 0;border-top-color:#d6d6d6}.no-skin .menu-toggler+.sidebar.responsive{border-top-width:1px}.no-skin .sidebar.responsive-min{border-width:0 1px 0 0}.no-skin .sidebar.navbar-collapse{border-width:0;border-bottom-width:1px!important;border-bottom-color:#ccc;-webkit-box-shadow:0 2px 2px rgba(0,0,0,.1)!important;box-shadow:0 2px 2px rgba(0,0,0,.1)!important}.no-skin .sidebar.navbar-collapse.menu-min .nav-list>li>.submenu{background-color:#fff}}.no-skin .sidebar-scroll .sidebar-shortcuts{border-bottom-color:#ddd}.no-skin .sidebar-scroll .sidebar-toggle{border-top-color:#ddd}.no-skin .main-container .menu-toggler{background-color:#444}.no-skin .main-container .menu-toggler:before{border-top-color:#87b87f;border-bottom-color:#6fb3e0}.no-skin .main-container .menu-toggler:after{border-top-color:#ffa24d;border-bottom-color:#d15b47}.no-skin .main-container .menu-toggler>.toggler-text{border-top-color:#444;-moz-border-top-colors:#444}.no-skin .nav-list>li.disabled:before{display:none!important}.no-skin .nav-list>li.disabled>a{background-color:#ebebeb!important;color:#656565!important}.no-skin .nav-list li .submenu>li.disabled>a,.no-skin .nav-list li.disabled .submenu>li>a{background-color:#f2f2f2!important;color:#7a7a7a!important;cursor:not-allowed!important}.no-skin .nav-list li .submenu>li.disabled>a>.menu-icon,.no-skin .nav-list li.disabled .submenu>li>a>.menu-icon{display:none}.nav-list li.highlight li.active>a:after,.nav-list li li.highlight.active>a:after,.nav-list li.highlight li.active>a:before,.nav-list li li.highlight.active>a:before{display:none}.nav-list>li.highlight.active>a:after,.nav-list>li.highlight.active>a:before{display:block}.no-skin .nav-list>li.highlight:hover,.no-skin .nav-list>li.highlight.active{border-color:#c8d8e2}.no-skin .nav-list>li.highlight:hover+li,.no-skin .nav-list>li.highlight.active+li{border-top-color:#c8d8e2}.no-skin .nav-list>li.highlight:hover>a,.no-skin .nav-list>li.highlight.active>a{background-color:#FFF}.no-skin .nav-list>li.highlight.active:after{display:none}.no-skin .nav-list>li.highlight.active:before{display:block;background-color:#4f90c2}.no-skin .nav-list>li.highlight.active>a{background-color:#f2f6f9!important}.no-skin .nav-list>li.highlight.active>a:before,.no-skin .nav-list>li.highlight.active>a:after{display:block;content:"";position:absolute;top:-1px;right:-10px;bottom:auto;z-index:1;border-style:solid;border-width:20px 0 21px 10px;border-color:transparent}.no-skin .nav-list>li.highlight.active>a:before{border-left-color:#a0bccd;-moz-border-left-colors:#a0bccd;right:-11px}.no-skin .nav-list>li.highlight.active>a:after{border-left-color:#f2f6f9;-moz-border-left-colors:#f2f6f9}.no-skin .nav-list li li.highlight.active>a{background-color:#f2f6f9}.no-skin .nav-list li li.highlight.active.open>a{background-color:#FFF}.no-skin .nav-list li li.highlight.active.open>a:hover{background-color:#f1f5f9}@media (min-width:992px){.no-skin .sidebar.h-sidebar .nav-list>li.highlight.active>a:after{display:block;content:"";position:absolute;left:0;top:auto;right:auto;bottom:-2px;left:50%;margin-left:-7px;border-color:transparent;-moz-border-right-colors:none;-moz-border-left-colors:none;-moz-border-top-colors:none;border-width:8px 7px;border-bottom-color:#FFF;-moz-border-bottom-colors:#FFF}.no-skin .sidebar.h-sidebar .nav-list>li.highlight.active>a:before{content:"";position:absolute;display:block;left:0;top:auto;right:auto;bottom:-1px;left:50%;margin-left:-7px;border-width:8px;border-color:transparent;-moz-border-right-colors:none;-moz-border-left-colors:none;-moz-border-top-colors:none;border-bottom-color:#74add7;-moz-border-bottom-colors:#74add7}.no-skin .sidebar.h-sidebar .nav-list>li.highlight.active:hover>a:after,.no-skin .sidebar.h-sidebar .nav-list>li.highlight.active.hover-show>a:after,.no-skin .sidebar.h-sidebar .nav-list>li.highlight.active:hover>a:before,.no-skin .sidebar.h-sidebar .nav-list>li.highlight.active.hover-show>a:before{display:none}}@media (min-width:992px){.sidebar.compact .nav-list li.highlight.active>a:after,.sidebar.compact .nav-list li.highlight.active>a:before{display:none}.sidebar.compact.menu-min .nav-list li.highlight.active>a:after,.sidebar.compact.menu-min .nav-list li.highlight.active>a:before{display:block}}@media (min-width:992px){.sidebar.h-sidebar .nav-list li.highlight.active>a:after,.sidebar.h-sidebar .nav-list li.highlight.active>a:before{display:block;border-width:8px!important;-moz-border-left-colors:none!important;-moz-border-right-colors:none!important;border-left-color:transparent!important;border-right-color:transparent!important}.sidebar.h-sidebar .nav-list>li.highlight.active:hover>a:after,.sidebar.h-sidebar .nav-list>li.highlight.active:hover>a:before{display:none!important}}.sidebar-scroll .nav-list>li.active.highlight>a:after,.sidebar-scroll .nav-list>li.active.highlight>a:before{display:none!important}.onpage-help-backdrop{position:absolute;z-index:99990;top:0;bottom:0;left:0;right:0;background-color:#000;filter:alpha(opacity=5);background-color:rgba(0,0,0,.05)}.onpage-help-section{display:block;position:absolute;z-index:100000;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#4DFFFFFF', endColorstr='#4DFFFFFF', GradientType=0);background-color:rgba(255,255,255,.3);border:1px dashed #8BBCD3;border-radius:4px;transition:background-color .2s,border-color .2s;-webkit-transition:background-color .2s,border-color .2s;text-align:center;vertical-align:middle;outline:0!important}.onpage-help-section>.ie-hover-fix{display:block;position:absolute;top:0;bottom:0;left:0;right:0;background-color:#FFF;filter:alpha(opacity=1)}.onpage-help-section:focus,.onpage-help-section:active{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#33C9D8EA', endColorstr='#33C9D8EA', GradientType=0);background-color:rgba(201,216,234,.2);border-color:#77ACC4}.onpage-help-section:hover{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#66C9D8EA', endColorstr='#66C9D8EA', GradientType=0);background-color:rgba(201,216,234,.4);border-color:#77ACC4;border-style:solid}.onpage-help-section>.help-icon-1{font-size:18px;display:inline-block;position:absolute;z-index:1;top:50%;left:50%;transform:translate(-50%,-50%);-webkit-transform:translate(-50%,-50%);opacity:0;filter:alpha(opacity=0);color:#FFF;text-shadow:0 0 2px #000;background-color:#85B8DB;border:2px solid #FFF;border-radius:100%;box-shadow:0 0 2px 1px rgba(0,0,0,.4);width:48px;height:48px;line-height:46px;transition:opacity .2s;-webkit-transition:opacity .2s}.onpage-help-section:focus>.help-icon-1,.onpage-help-section:active>.help-icon-1{opacity:.5}.onpage-help-section:hover>.help-icon-1{opacity:1;filter:alpha(opacity=100)}.onpage-help-section.help-section-small>.help-icon-1{font-size:18px;width:28px;height:28px;line-height:26px;border-radius:12px}.onpage-help-section.help-section-smaller>.help-icon-1{font-size:14px;width:20px;height:20px;line-height:17px;border-radius:8px}.onpage-help-section>.help-icon-2{position:absolute;z-index:2;left:-4px;top:-4px;width:18px;height:18px;line-height:16px;display:block;font-size:16px;color:orange;background-color:#FFF;border:1px solid orange;border-radius:4px;opacity:1;transition:all .2s;-webkit-transition:all .2s}.onpage-help-section:hover>.help-icon-2{color:#59A34E;border-color:#59A34E;transform:scale(1.25);-webkit-transform:scale(1.25)}.onpage-help-modal{z-index:100010}.onpage-help-modal+.modal-backdrop{z-index:100009}.onpage-help-modal-buttons button{border-radius:100%;border-width:2px!important}.onpage-help-modal-buttons button:focus{outline:0!important}.onpage-help-modal-buttons button.disabled{transform:scale(0.9);-webkit-transform:scale(0.9)}.onpage-help-content{max-width:800px;margin:0 auto}.code-modal.onpage-help-modal .modal-dialog{margin-top:6px;margin-bottom:6px}.code-modal.onpage-help-modal .modal-header{padding-top:6px;padding-bottom:6px}.code-modal.onpage-help-modal .modal-body{padding:10px 12px}.onpage-help-modal pre{border-width:0;box-shadow:none;border-radius:0;margin-top:8px}.onpage-help-modal .modal-title code{font-size:13px}.onpage-help-modal .modal-body{font-size:14px}@media print{.navbar{display:none!important}.sidebar{display:none!important}.main-content{margin-left:0!important;margin-right:0!important}.main-content .nav-search{display:none!important}.main-content .breadcrumbs{float:right;border-width:0!important}.main-content .breadcrumbs .breadcrumb>li+li:before{content:"/"}.main-content .breadcrumbs .breadcrumb .home-icon{display:none}.ace-settings-container{display:none!important}.footer{width:100%;height:auto;position:relative}.footer .footer-inner,.footer .footer-inner .footer-content{width:100%}.btn-scroll-up{display:none!important}.btn,.btn.btn-app{background:transparent none!important;border-width:1px!important;border-radius:0!important;color:#555!important}.label{border:1px solid #666!important}.label[class*=arrowed]:before,.label[class*=arrowed]:after{display:none!important}}
\ No newline at end of file
diff --git a/NewLife.Cube/Content/ace/css/ace-skins.min.css b/NewLife.Cube/Content/ace/css/ace-skins.min.css
deleted file mode 100644
index 43b85978d2..0000000000
--- a/NewLife.Cube/Content/ace/css/ace-skins.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.skin-1{background-color:#4a4f56}.skin-1 .navbar{background:#2c6aa0}.skin-1 .sidebar{background-color:#222a2d;border-right-width:0}.skin-1 .nav-list>li{border-color:#3f4e54}.skin-1 .nav-list>li>a{background-color:#222a2d;color:#bac2c8}.skin-1 .nav-list>li:hover>a{background-color:#414b51;color:#e1eaf1}.skin-1 .nav-list>li.open>a,.skin-1 .nav-list>li.open:hover>a{color:#85c0ec;background-color:#222a2d}.skin-1 .nav-list>li.active>a,.skin-1 .nav-list>li.active:hover>a{background-color:#141a1b;color:#7bb7e5}.skin-1 .nav-list>li:hover:before{background-color:#629cc9}.skin-1 .nav-list>li.active:before{display:block;background-color:#4d96c6}.skin-1 .nav-list li.active>a:after{border-right-color:#FFF;-moz-border-right-colors:#FFF;border-width:11px 7px;top:8px;right:0}.skin-1 .nav-list>li.active>.submenu li.active>a:after{top:5px}.skin-1 .nav-list>li .submenu{background-color:#333d3f}.skin-1 .nav-list>li.active .submenu{background-color:#181e20}.skin-1 .nav-list>li .submenu>li>a{border-top-style:solid;border-top-color:#454d4e;background-color:#333d3f}.skin-1 .nav-list>li .submenu>li>a:hover{background-color:#2d3638}.skin-1 .nav-list>li.active .submenu>li>a{border-top-color:#222526;background-color:#181e20}.skin-1 .nav-list>li.active .submenu>li>a:hover{background-color:#14191a}.skin-1 .nav-list>li>.submenu{border-top-color:#505a5b}.skin-1 .nav-list>li.active>.submenu{border-top-color:#2f3e44}.skin-1 .nav-list>li>.submenu>li>a{color:#d9dfe6}.skin-1 .nav-list>li>.submenu>li:hover>a{color:#8ab4de}.skin-1 .nav-list>li>.submenu>li.active>a{color:#7bb7e5;background-color:#161b1d}.skin-1 .nav-list>li>.submenu:before,.skin-1 .nav-list>li>.submenu>li:before{border-color:#646c70}.skin-1 .nav-list>li.active>.submenu:before,.skin-1 .nav-list>li.active>.submenu>li:before{border-color:#3f4e54}.skin-1 .nav-list>li .submenu li>.submenu li>a{color:#d9dfe6}.skin-1 .nav-list>li .submenu li>.submenu li:hover>a{color:#8ab4de}.skin-1 .nav-list>li .submenu li.open>a,.skin-1 .nav-list>li .submenu li>.submenu>li.open>a{color:#85c0ec}.skin-1 .nav-list>li .submenu li>.submenu li.active>a{color:#61a8dd}.skin-1 .nav-list>li .submenu li>.submenu li.active:hover>a{color:#85c0ec}.skin-1 .sidebar .nav-list>li.active.highlight,.skin-1 .sidebar .nav-list>li.active.highlight+li{border-color:#506b7f}.skin-1 .sidebar .nav-list>li.active.highlight+li:last-child{border-bottom-color:#3f4e54}.skin-1 .sidebar .nav-list>li.active.highlight>a:after{border-right-color:transparent;-moz-border-right-colors:none;border-left-color:#141a1b;-moz-border-left-colors:#141a1b;border-width:20px 0 20px 10px;z-index:1;top:0;right:-10px}.skin-1 .sidebar .nav-list>li.active.highlight>a:before{border-left-color:#506b7f;-moz-border-left-colors:#506b7f;border-style:solid;border-color:transparent;border-width:20px 0 20px 10px;content:"";position:absolute;right:-11px;top:0;z-index:1}.skin-1 .sidebar-shortcuts,.skin-1 .sidebar-shortcuts-mini{background-color:#222a2d;border-color:#3f4e54}.skin-1 .sidebar>.nav-search{background-color:#222a2d;border-color:#3f4e54}.skin-1 .sidebar-toggle{background-color:#181e21;border-color:#3f4e54}.skin-1 .sidebar-toggle>.ace-icon{background-color:#222a2d;color:#aaa;border-color:#aaa}.skin-1 .breadcrumbs{border-width:0;background-color:#f0f0f0}@media (min-width:992px){.skin-1 .breadcrumbs.breadcrumbs-fixed{border-bottom-width:1px}}@media only screen and (max-width:991px){.skin-1 .sidebar.responsive{border-width:0;-webkit-box-shadow:none;box-shadow:none}.skin-1 .sidebar.responsive .nav-list li.active>a:after{display:none}.skin-1 .sidebar.responsive .nav-list>li.active.highlight>a:after{display:block}}.skin-1 .sidebar.menu-min .nav-list>li.open>a{background-color:#222a2d;color:#bac2c8}.skin-1 .sidebar.menu-min .nav-list>li.active>a:after{border-width:9px 6px;top:10px}.skin-1 .sidebar.menu-min .nav-list>li.active.highlight>a:after{border-width:20px 0 20px 10px;top:0}.skin-1 .sidebar.menu-min .nav-list>li.active:hover>a:after{border-right-color:#242a2b}.skin-1 .sidebar.menu-min .nav-list>li.active>a,.skin-1 .sidebar.menu-min .nav-list>li.active>a:hover{background-color:#141a1b;color:#7bb7e5}.skin-1 .sidebar.menu-min .nav-list>li:hover>a{color:#e1eaf1}.skin-1 .sidebar.menu-min .nav-list>li>a>.menu-text{background-color:#414b51}.skin-1 .sidebar.menu-min .nav-list>li.active>a>.menu-text{background-color:#242a2b;border:0 solid #3b4547;border-width:1px 1px 0;border-left-color:#305675}.skin-1 .sidebar.menu-min .nav-list>li.active>a:not(.dropdown-toggle)>.menu-text{border-width:1px;border-top-color:#4a5c63;border-bottom-color:#4a5c63;border-right-color:#4a5c63}.skin-1 .sidebar.menu-min .nav-list>li.active:hover>a,.skin-1 .sidebar.menu-min .nav-list>li.active>a>.menu-text{color:#7bb7e5}.skin-1 .sidebar.menu-min .nav-list>li.open.active>a{background-color:#141a1b}.skin-1 .sidebar.menu-min .nav-list>li>a>.menu-text,.skin-1 .sidebar.menu-min .nav-list>li>.submenu{border-width:0;border-left:1px solid #181d1f;-webkit-box-shadow:none;box-shadow:none}.skin-1 .sidebar.menu-min .nav-list>li>.submenu{border-top:1px solid #3f4e54}.skin-1 .sidebar.menu-min .nav-list>li>.submenu:after{display:none}.skin-1 .sidebar.menu-min .nav-list>li>.submenu{background-color:#333d3f;border-top-color:#5a606a;border-top-width:1px!important}.skin-1 .sidebar.menu-min .nav-list>li.active>.submenu{background-color:#181e20;border-top-color:#3b4547;border-left-color:#305675}.skin-1 .sidebar.menu-min .nav-list>li>.arrow:after{border-right-color:#414b51;-moz-border-right-colors:#414b51}.skin-1 .sidebar.menu-min .nav-list>li>.arrow:before{border-right-color:#111415;-moz-border-right-colors:#242a2b}.skin-1 .sidebar.menu-min .nav-list>li.active>.arrow:after{border-right-color:#242a2b;-moz-border-right-colors:#242a2b}.skin-1 .sidebar.menu-min .nav-list>li.active>.arrow:before{border-right-color:#50a0dd;-moz-border-right-colors:#50a0dd}.skin-1 .sidebar.menu-min .sidebar-shortcuts-large{background-color:#222a2d;-webkit-box-shadow:none;box-shadow:none;border:1px solid #4a5c63;border-width:0 1px 1px 0;top:0}@media (max-width:991px){.skin-1 .sidebar.responsive-min .nav-list>li.open>a{background-color:#222a2d;color:#bac2c8}.skin-1 .sidebar.responsive-min .nav-list>li.active>a:after{border-width:9px 6px;top:10px}.skin-1 .sidebar.responsive-min .nav-list>li.active.highlight>a:after{border-width:20px 0 20px 10px;top:0}.skin-1 .sidebar.responsive-min .nav-list>li.active:hover>a:after{border-right-color:#242a2b}.skin-1 .sidebar.responsive-min .nav-list>li.active>a,.skin-1 .sidebar.responsive-min .nav-list>li.active>a:hover{background-color:#141a1b;color:#7bb7e5}.skin-1 .sidebar.responsive-min .nav-list>li:hover>a{color:#e1eaf1}.skin-1 .sidebar.responsive-min .nav-list>li>a>.menu-text{background-color:#414b51}.skin-1 .sidebar.responsive-min .nav-list>li.active>a>.menu-text{background-color:#242a2b;border:0 solid #3b4547;border-width:1px 1px 0;border-left-color:#305675}.skin-1 .sidebar.responsive-min .nav-list>li.active>a:not(.dropdown-toggle)>.menu-text{border-width:1px;border-top-color:#4a5c63;border-bottom-color:#4a5c63;border-right-color:#4a5c63}.skin-1 .sidebar.responsive-min .nav-list>li.active:hover>a,.skin-1 .sidebar.responsive-min .nav-list>li.active>a>.menu-text{color:#7bb7e5}.skin-1 .sidebar.responsive-min .nav-list>li.open.active>a{background-color:#141a1b}.skin-1 .sidebar.responsive-min .nav-list>li>a>.menu-text,.skin-1 .sidebar.responsive-min .nav-list>li>.submenu{border-width:0;border-left:1px solid #181d1f;-webkit-box-shadow:none;box-shadow:none}.skin-1 .sidebar.responsive-min .nav-list>li>.submenu{border-top:1px solid #3f4e54}.skin-1 .sidebar.responsive-min .nav-list>li>.submenu:after{display:none}.skin-1 .sidebar.responsive-min .nav-list>li>.submenu{background-color:#333d3f;border-top-color:#5a606a;border-top-width:1px!important}.skin-1 .sidebar.responsive-min .nav-list>li.active>.submenu{background-color:#181e20;border-top-color:#3b4547;border-left-color:#305675}.skin-1 .sidebar.responsive-min .nav-list>li>.arrow:after{border-right-color:#414b51;-moz-border-right-colors:#414b51}.skin-1 .sidebar.responsive-min .nav-list>li>.arrow:before{border-right-color:#111415;-moz-border-right-colors:#242a2b}.skin-1 .sidebar.responsive-min .nav-list>li.active>.arrow:after{border-right-color:#242a2b;-moz-border-right-colors:#242a2b}.skin-1 .sidebar.responsive-min .nav-list>li.active>.arrow:before{border-right-color:#50a0dd;-moz-border-right-colors:#50a0dd}.skin-1 .sidebar.responsive-min .sidebar-shortcuts-large{background-color:#222a2d;-webkit-box-shadow:none;box-shadow:none;border:1px solid #4a5c63;border-width:0 1px 1px 0;top:0}.skin-1 .sidebar.responsive-min .nav-list>li.active>a:after{display:block}.skin-1 .sidebar.responsive-max .nav-list li.active>a:after{display:none}.skin-1 .sidebar.responsive-max .nav-list>li.highlight.active>a:after{display:block}}@media only screen and (min-width:992px){.skin-1 .nav-list li.hover>.submenu{padding-left:0;padding-bottom:2px;padding-right:0;border-color:#232828}.skin-1 .nav-list li.hover>.submenu>li>a{border-top-width:1px;margin-bottom:0;margin-top:0}.skin-1 .nav-list li.hover>.submenu>li:first-child>a{border-top-width:0}.skin-1 .nav-list>li>.submenu li.hover>.submenu{padding:3px 2px}.skin-1 .nav-list>li.active>.submenu li.hover>.submenu{border-left-color:#475561}.skin-1 .nav-list li.hover.active>.submenu,.skin-1 .nav-list li.active>.submenu li.hover.active>.submenu{border-left-color:#305675}.skin-1 .nav-list>li.active>.submenu li.hover>.submenu{background-color:#171e1f}}@media only screen and (min-width:992px){.skin-1 .sidebar.navbar-collapse .nav-list>li.open.hover:not(:hover):not(:focus):not(.active)>a{color:#bac2c8}.skin-1 .sidebar.navbar-collapse .nav-list>li.open.hover:hover>a{color:#e1eaf1;background-color:#414b51}.skin-1 .sidebar.navbar-collapse .nav-list>li.active.hover:hover>a{color:#7bb7e5;background-color:#141a1b}.skin-1 .sidebar.navbar-collapse .nav-list>li>.submenu li.open.hover:not(:hover):not(:focus):not(.active)>a{color:#d9dfe6}}@media only screen and (min-width:992px) and (max-width:991px){.skin-1 .sidebar.navbar-collapse .nav-list li.hover>.submenu{padding-bottom:0}.skin-1 .sidebar.navbar-collapse .nav-list li.hover>.submenu{border-top-color:#505a5b}.skin-1 .sidebar.navbar-collapse .nav-list li.hover.active>.submenu{border-top-color:#2f3e44}.skin-1 .sidebar.navbar-collapse .nav-list li.hover.active>.submenu,.skin-1 .sidebar.navbar-collapse .nav-list>li>.submenu li.hover>.submenu,.skin-1 .sidebar.navbar-collapse .nav-list li.active>.submenu li.hover.active>.submenu{border-left-width:0}.skin-1 .sidebar.navbar-collapse .nav-list>li>.submenu li.hover>.submenu{padding:0}.skin-1 .sidebar.navbar-collapse .nav-list li li.hover>.submenu>li:first-child>a{border-top-width:1px}}.skin-1 .sidebar.navbar-collapse .nav-list>li .submenu>li.hover:hover>a{background-color:#2d3638}.skin-1 .sidebar.navbar-collapse .nav-list>li.active .submenu>li.hover:hover>a{background-color:#14191a}@media only screen and (min-width:992px){.skin-1 .sidebar:not(.navbar-collapse) .nav-list>li .submenu>li.hover:hover>a{background-color:#2d3638}.skin-1 .sidebar:not(.navbar-collapse) .nav-list>li.active .submenu>li.hover:hover>a{background-color:#14191a}}.skin-1 .nav-list li>.arrow:after{border-right-color:#353c3d;-moz-border-right-colors:#353c3d}.skin-1 .nav-list li>.arrow:before{border-right-color:#1d2122;-moz-border-right-colors:#1d2122}.skin-1 .nav-list>li.active>.arrow:after{border-right-color:#171e1f;-moz-border-right-colors:#171e1f}.skin-1 .nav-list>li.active>.arrow:before{border-right-color:#50a0dd;-moz-border-right-colors:#50a0dd}.skin-1 .nav-list>li.active>.submenu li.hover>.arrow:before{border-right-color:#4f6e86;-moz-border-right-colors:#8fb6d5}.skin-1 .nav-list>li.active>.submenu li.hover.active>.arrow:before{border-right-color:#305675;-moz-border-right-colors:#2290e9}.skin-1 .nav-list>li.active>.submenu li.hover>.arrow:after{border-right-color:#171e1f;-moz-border-right-colors:#171e1f}.skin-1 .nav-list li.pull_up>.arrow:after{border-right-color:#353c3d!important;-moz-border-right-colors:#353c3d!important}.skin-1 .nav-list li.pull_up>.arrow:before{border-right-color:#1d2122!important;-moz-border-right-colors:#1d2122!important}.skin-1 .nav-list li.pull_up.active>.arrow:after{border-right-color:#171e1f!important;-moz-border-right-colors:#171e1f!important}.skin-1 .nav-list li.pull_up.active>.arrow:before{border-right-color:#50a0dd!important;-moz-border-right-colors:#50a0dd!important}.skin-1 .main-container .menu-toggler{background-color:#444}.skin-1 .main-container .menu-toggler:before{border-top-color:#87b87f;border-bottom-color:#6fb3e0}.skin-1 .main-container .menu-toggler:after{border-top-color:#ffa24d;border-bottom-color:#d15b47}.skin-1 .main-container .menu-toggler>.toggler-text{border-top-color:#444;-moz-border-top-colors:#444}.skin-1.display{background-color:#5d82a2}.skin-1.display:before{border-top-color:#b5d3b0;border-bottom-color:#aed4ee}.skin-1.display:after{border-top-color:#ffca9a;border-bottom-color:#e09284}.skin-1.display>.toggler-text{border-top-color:#5d82a2;-moz-border-top-colors:#5d82a2}.skin-1 .navbar .navbar-toggle{background-color:#4D9DCC}.skin-1 .navbar .navbar-toggle:focus{background-color:#4D9DCC;border-color:transparent}.skin-1 .navbar .navbar-toggle:hover{background-color:#3992c6;border-color:rgba(255,255,255,.1)}.skin-1 .navbar .navbar-toggle.display,.skin-1 .navbar .navbar-toggle[data-toggle=collapse]:not(.collapsed){background-color:#3384b3;box-shadow:inset 1px 1px 2px 0 rgba(0,0,0,.25);border-color:rgba(255,255,255,.35)}@media only screen and (min-width:768px){.skin-1 .container.main-container:before{box-shadow:0 0 0 1px rgba(255,255,255,.1)}}@media only screen and (min-width:992px){.skin-1 .sidebar.h-sidebar:before{background-color:#38424a;border-bottom-color:#4a5c63}.skin-1 .sidebar.h-sidebar .nav-list{border-bottom-width:0}.skin-1 .sidebar.h-sidebar .nav-list>li.active:before{display:block}.skin-1 .sidebar.h-sidebar .nav-list>li.hover.active>a:after{-moz-border-left-colors:none;-moz-border-right-colors:none;-moz-border-bottom-colors:#FFF;border-color:transparent transparent #FFF;border-width:8px;top:auto;bottom:0;right:auto;left:50%;margin-left:-8px;content:"";display:block}.skin-1 .sidebar.h-sidebar .nav-list>li.hover.active:hover>a:after,.skin-1 .sidebar.h-sidebar .nav-list>li.hover.active.hover-show>a:after{display:none}.skin-1 .sidebar.h-sidebar+.main-content .breadcrumbs{border-color:#E8E8E8}.skin-1 .sidebar.h-sidebar .nav-list>li{border-color:#3f4e54}.skin-1 .sidebar.h-sidebar .nav-list>li:hover,.skin-1 .sidebar.h-sidebar .nav-list>li:hover+li{border-left-color:#506575}.skin-1 .sidebar.h-sidebar .nav-list>li:last-child:hover{border-right-color:#506575}.skin-1 .sidebar.h-sidebar .nav-list>li.active,.skin-1 .sidebar.h-sidebar .nav-list>li.active+li,.skin-1 .sidebar.h-sidebar .nav-list>li:hover+li.active{border-left-color:#55738a}.skin-1 .sidebar.h-sidebar .nav-list>li.active:last-child{border-right-color:#55738a}.skin-1 .sidebar.h-sidebar .nav-list>li.hover>.submenu{border-top-color:#232828}.skin-1 .sidebar.h-sidebar .nav-list>li.hover.active>.submenu{border-top-color:#305675;border-left-color:#232828}.skin-1 .sidebar.h-sidebar .sidebar-shortcuts-large{background-color:#222a2d;border:1px solid #232828;border-top-color:#305675;top:100%}.skin-1 .sidebar.h-sidebar .nav-list>li>.arrow:after{border-right-color:transparent;-moz-border-right-colors:none;border-bottom-color:#353c3d;-moz-border-bottom-colors:#353c3d}.skin-1 .sidebar.h-sidebar .nav-list>li>.arrow:before{-moz-border-right-colors:none;border-right-color:transparent;border-bottom-color:#191c1c;-moz-border-bottom-colors:#222727}.skin-1 .sidebar.h-sidebar .nav-list>li.active>.arrow:before,.skin-1 .sidebar.h-sidebar .sidebar-shortcuts-large:before{border-right-color:transparent;-moz-border-right-colors:none;border-bottom-color:#50a0dd;-moz-border-bottom-colors:#216ca6}.skin-1 .sidebar.h-sidebar .nav-list>li.active>.arrow:after,.skin-1 .sidebar.h-sidebar .sidebar-shortcuts-large:after{border-right-color:transparent;-moz-border-right-colors:none;border-bottom-color:#171e1f;-moz-border-bottom-colors:#171e1f}.skin-1 .sidebar.h-sidebar .sidebar-shortcuts-large:after{border-bottom-color:#222a2d;-moz-border-bottom-colors:#222a2d}.skin-1 .sidebar.h-sidebar .nav-list>li.highlight.active>a:before{display:none}.skin-1 .sidebar.h-sidebar.menu-min .nav-list>li>a>.menu-text{border-width:1px 0 0;border-top-color:#181d1f}.skin-1 .sidebar.h-sidebar.menu-min .nav-list>li.active>a>.menu-text{border-top-color:#305675}.skin-1 .sidebar.h-sidebar.menu-min .nav-list>li.active>.submenu{border-top-color:#3b4547}.skin-1 .sidebar.h-sidebar.menu-min .nav-list>li>.arrow:after{border-bottom-color:#414b51;-moz-border-bottom-colors:#414b51}.skin-1 .sidebar.h-sidebar.menu-min .nav-list>li>.arrow:before{border-bottom-color:#111415;-moz-border-bottom-colors:#242a2b}.skin-1 .sidebar.h-sidebar.menu-min .nav-list>li.active>.arrow:after{border-bottom-color:#242a2b;-moz-border-bottom-colors:#242a2b}.skin-1 .sidebar.h-sidebar.menu-min .nav-list>li.active>.arrow:before{border-bottom-color:#50a0dd;-moz-border-bottom-colors:#50a0dd}.skin-1 .h-sidebar.sidebar-fixed+.main-content{padding-top:86px}.skin-1 .h-sidebar.sidebar-fixed.no-gap+.main-content{padding-top:72px}.skin-1 .h-sidebar.sidebar-fixed.menu-min+.main-content{padding-top:61px}.skin-1 .h-sidebar.sidebar-fixed.menu-min.no-gap+.main-content{padding-top:47px}.skin-1 .main-content .h-sidebar.sidebar .nav-list{border-left:1px solid #4a5c63}}.skin-1 .sidebar-scroll .sidebar-shortcuts{border-bottom-color:#4a5c63}.skin-1 .sidebar-scroll .sidebar-toggle{border-top-color:#4a5c63}.skin-1 .scrollout .scroll-track{background-color:transparent}.skin-1 .scrollout .scroll-bar{background-color:#CCC;background-color:rgba(0,0,0,.2)}@media only screen and (min-width:768px) and (max-width:991px){.skin-1 .navbar.navbar-collapse{background-color:transparent}.skin-1 .navbar.navbar-collapse:before,.skin-1 .navbar.navbar-collapse .navbar-container{background:#2c6aa0}}.skin-1 .nav-list>li.disabled:before{display:none!important}.skin-1 .nav-list>li.disabled>a{background-color:#333!important;color:#AAA!important}.skin-1 .nav-list li .submenu>li.disabled>a,.skin-1 .nav-list li.disabled .submenu>li>a{background-color:#444!important;color:#A0A0A0!important;cursor:not-allowed!important}.skin-1 .nav-list li .submenu>li.disabled>a>.menu-icon,.skin-1 .nav-list li.disabled .submenu>li>a>.menu-icon{display:none}.skin-1 .nav-list>li.disabled .submenu>li>a{border-top-color:#505050}.skin-2{background-color:#5c5c5c}.skin-2 .navbar{background:#c6487e}.skin-2 .sidebar{background-color:#505050;border-right-width:0}.skin-2 .nav-list>li{border-color:#484848}.skin-2 .nav-list>li:first-child{border-top-color:#5a5a5a}.skin-2 .nav-list>li:last-child{border-bottom-color:#626262}.skin-2 .nav-list>li>a{background-color:#393939;color:#e6e6e6}.skin-2 .nav-list>li>a>.menu-text,.skin-2 .nav-list>li>a>.arrow{color:#e6e6e6}.skin-2 .nav-list>li:hover>a,.skin-2 .nav-list>li.hover-show>a{background-color:#bd5289}.skin-2 .nav-list>li:hover>a>.menu-text,.skin-2 .nav-list>li.hover-show>a>.menu-text{font-weight:700;color:#fff;color:rgba(0,0,0,.6)}.skin-2 .nav-list>li:hover>a>.menu-icon,.skin-2 .nav-list>li.hover-show>a>.menu-icon,.skin-2 .nav-list>li:hover>a>.arrow,.skin-2 .nav-list>li.hover-show>a>.arrow{color:#fff}.skin-2 .nav-list>li.open>a{background-color:#bd5289}.skin-2 .nav-list>li.open>a>.menu-text{font-weight:700;color:rgba(0,0,0,.6)}.skin-2 .nav-list>li.open>a>.menu-icon,.skin-2 .nav-list>li.open>a>.arrow{color:#fff}.skin-2 .nav-list>li.active>a{background-color:#242424;color:#fff}.skin-2 .nav-list>li.active>a>.menu-icon{color:inherit}.skin-2 .nav-list>li.active>a>.menu-text,.skin-2 .nav-list>li.active>a>.arrow{color:#fff}.skin-2 .nav-list>li.active:hover>a,.skin-2 .nav-list>li.active:not(.highlight):hover>a,.skin-2 .nav-list>li.active.hover-show>a,.skin-2 .nav-list>li.active:not(.highlight).hover-show>a,.skin-2 .nav-list>li.active.open>a,.skin-2 .nav-list>li.active.open:not(.highlight)>a{background-color:#242424}.skin-2 .nav-list>li.active.highlight>a{background-color:#bd5289}.skin-2 .nav-list>li.active.highlight>a>.menu-icon{color:#fff}.skin-2 .nav-list li.active>a:after{border-right-color:#FFF;-moz-border-right-colors:#FFF;border-width:11px 7px;top:8px;right:0}.skin-2 .nav-list>li.active>.submenu li.active>a:after{top:6px}.skin-2 .nav-list>li:before{top:0;height:39px}.skin-2 .nav-list>li.active:before{display:block;background-color:#ce7da7}.skin-2 .nav-list>li.active.highlight:before,.skin-2 .nav-list>li:before{background-color:#dea8c4}.skin-2 .nav-list>li>.submenu{border-top-width:0;background-color:#45303b}.skin-2 .nav-list>li>.submenu>li,.skin-2 .nav-list>li>.submenu>li>.submenu,.skin-2 .nav-list>li>.submenu>li>.submenu>li,.skin-2 .nav-list>li>.submenu>li>.submenu>li .submenu,.skin-2 .nav-list>li>.submenu>li>.submenu>li .submenu li{background-color:inherit}.skin-2 .nav-list>li .submenu>li>a{border-top:1px solid;border-top-color:#555;border-top-color:rgba(255,255,255,.08);background-color:transparent}.skin-2 .nav-list>li .submenu>li>a:hover{background-color:rgba(0,0,0,.1);color:#FFF}.skin-2 .nav-list>li .submenu>li>a:hover>.menu-icon{background-color:transparent}.skin-2 .nav-list>li.active .submenu>li>a:hover{background-color:rgba(0,0,0,.1)}.skin-2 .nav-list>li>.submenu>li>a{color:#eee}.skin-2 .nav-list>li>.submenu>li:first-child>a{border-top-width:0}.skin-2 .nav-list>li>.submenu>li.active>a{background-color:rgba(0,0,0,.05);font-weight:700}.skin-2 .nav-list>li>.submenu>li.active>a>.menu-icon{color:inherit;background-color:transparent}.skin-2 .nav-list li .submenu li>a{color:#eee;font-size:13px}.skin-2 .nav-list>li>.submenu:before,.skin-2 .nav-list>li>.submenu>li:before{display:none}.skin-2 .nav-list>li .submenu>li>a{padding-left:32px}.skin-2 .nav-list>li .submenu>li>a>.menu-icon{left:12px}@media only screen and (min-width:992px){.skin-2 .nav-list>li .submenu>li.hover>a{padding-left:26px}.skin-2 .nav-list>li .submenu>li.hover>a>.menu-icon{left:6px}}.skin-2 .nav-list>li>.submenu li>.submenu>li>a{margin-left:0;padding-left:37px;padding-top:8px;padding-bottom:10px;border-top-width:0}.skin-2 .nav-list>li>.submenu li>.submenu>li>.submenu>li>a{margin-left:0;padding-left:51px}@media only screen and (min-width:992px){.skin-2 .nav-list>li>.submenu li>.submenu>li.hover>a{border-top-width:1px;padding-bottom:9px}.skin-2 .nav-list>li>.submenu li>.submenu>li.hover:first-child>a{border-top-width:0}}.skin-2 .nav-list>li>.submenu li:hover>a,.skin-2 .nav-list>li>.submenu li.hover-show>a,.skin-2 .nav-list>li>.submenu li.active>a,.skin-2 .nav-list>li>.submenu li.open>a{color:#da81af}.skin-2 .nav-list>li>.submenu li>a>.ace-icon{background-color:transparent}.skin-2 .nav-list>li:hover:not(.active)>a .badge,.skin-2 .nav-list>li.hover-show:not(.active)>a .badge,.skin-2 .nav-list>li.open:not(.active)>a .badge,.skin-2 .nav-list>li.active.highlight .badge,.skin-2 .nav-list>li:hover:not(.active)>a .label,.skin-2 .nav-list>li.hover-show:not(.active)>a .label,.skin-2 .nav-list>li.open:not(.active)>a .label,.skin-2 .nav-list>li.active.highlight .label{background-color:rgba(0,0,0,.5)!important}.skin-2 .nav-list>li:hover:not(.active)>a .badge.badge-transparent,.skin-2 .nav-list>li.hover-show:not(.active)>a .badge.badge-transparent,.skin-2 .nav-list>li.open:not(.active)>a .badge.badge-transparent,.skin-2 .nav-list>li.active.highlight .badge.badge-transparent,.skin-2 .nav-list>li:hover:not(.active)>a .label.label-transparent,.skin-2 .nav-list>li.hover-show:not(.active)>a .label.label-transparent,.skin-2 .nav-list>li.open:not(.active)>a .label.label-transparent,.skin-2 .nav-list>li.active.highlight .label.label-transparent{color:rgba(255,255,255,.8)!important;background-color:transparent!important}.skin-2 .nav-list>li:hover:not(.active)>a .badge.badge-transparent .ace-icon,.skin-2 .nav-list>li.hover-show:not(.active)>a .badge.badge-transparent .ace-icon,.skin-2 .nav-list>li.open:not(.active)>a .badge.badge-transparent .ace-icon,.skin-2 .nav-list>li.active.highlight .badge.badge-transparent .ace-icon,.skin-2 .nav-list>li:hover:not(.active)>a .label.label-transparent .ace-icon,.skin-2 .nav-list>li.hover-show:not(.active)>a .label.label-transparent .ace-icon,.skin-2 .nav-list>li.open:not(.active)>a .label.label-transparent .ace-icon,.skin-2 .nav-list>li.active.highlight .label.label-transparent .ace-icon{color:rgba(255,255,255,.8)!important}.skin-2 .nav-list li>.arrow:after{border-right-color:#45303b;-moz-border-right-colors:#45303b}.skin-2 .nav-list li>.arrow:before{border-right-color:#191919;-moz-border-right-colors:#191919}.skin-2 .nav-list>li.pull_up>.arrow:after{border-right-color:#45303b!important;-moz-border-right-colors:#45303b!important}.skin-2 .nav-list>li.pull_up>.arrow:before{border-right-color:#191919!important;-moz-border-right-colors:#191919!important}.skin-2 .nav-list>li.active.highlight>a:after{border-right-color:transparent;-moz-border-right-colors:none;border-left-color:#bd5289;-moz-border-left-colors:#bd5289;border-width:20px 0 20px 10px;z-index:1;top:0;right:-10px;display:block}.skin-2 .nav-list>li:nth-child(1)>a{color:#00be67}.skin-2 .nav-list>li:nth-child(1):hover>a,.skin-2 .nav-list>li:nth-child(1).hover-show>a,.skin-2 .nav-list>li.open:nth-child(1)>a{background-color:#18a665}.skin-2 .nav-list>li:nth-child(1)>.submenu{background-color:#2a4137}.skin-2 .nav-list>li:nth-child(1)>.arrow:after,.skin-2 .nav-list>li:nth-child(1) li>.arrow:after{border-right-color:#2a4137;-moz-border-right-colors:#2a4137}.skin-2 .nav-list>li.pull_up:nth-child(1)>.arrow:after{border-right-color:#2a4137!important;-moz-border-right-colors:#2a4137!important}.skin-2 .nav-list>li:nth-child(1)>.submenu li:hover>a,.skin-2 .nav-list>li:nth-child(1)>.submenu li.hover-show>a,.skin-2 .nav-list>li:nth-child(1)>.submenu li.active>a,.skin-2 .nav-list>li:nth-child(1)>.submenu li.open>a{color:#1eed8e}.skin-2 .nav-list>li.active:nth-child(1):before{background-color:#ce7da7;background-color:#52bc8c}.skin-2 .nav-list>li.active.highlight:nth-child(1):before,.skin-2 .nav-list>li:nth-child(1):before{background-color:#8bd3b2}.skin-2 .nav-list>li:nth-child(2)>a{color:#5ed02b}.skin-2 .nav-list>li:nth-child(2):hover>a,.skin-2 .nav-list>li:nth-child(2).hover-show>a,.skin-2 .nav-list>li.open:nth-child(2)>a{background-color:#6ab14a}.skin-2 .nav-list>li:nth-child(2)>.submenu{background-color:#36432f}.skin-2 .nav-list>li:nth-child(2)>.arrow:after,.skin-2 .nav-list>li:nth-child(2) li>.arrow:after{border-right-color:#36432f;-moz-border-right-colors:#36432f}.skin-2 .nav-list>li.pull_up:nth-child(2)>.arrow:after{border-right-color:#36432f!important;-moz-border-right-colors:#36432f!important}.skin-2 .nav-list>li:nth-child(2)>.submenu li:hover>a,.skin-2 .nav-list>li:nth-child(2)>.submenu li.hover-show>a,.skin-2 .nav-list>li:nth-child(2)>.submenu li.active>a,.skin-2 .nav-list>li:nth-child(2)>.submenu li.open>a{color:#92d275}.skin-2 .nav-list>li.active:nth-child(2):before{background-color:#ce7da7;background-color:#8fc478}.skin-2 .nav-list>li.active.highlight:nth-child(2):before,.skin-2 .nav-list>li:nth-child(2):before{background-color:#b4d8a5}.skin-2 .nav-list>li:nth-child(3)>a{color:#a7d700}.skin-2 .nav-list>li:nth-child(3):hover>a,.skin-2 .nav-list>li:nth-child(3).hover-show>a,.skin-2 .nav-list>li.open:nth-child(3)>a{background-color:#98bc1b}.skin-2 .nav-list>li:nth-child(3)>.submenu{background-color:#3e442a}.skin-2 .nav-list>li:nth-child(3)>.arrow:after,.skin-2 .nav-list>li:nth-child(3) li>.arrow:after{border-right-color:#3e442a;-moz-border-right-colors:#3e442a}.skin-2 .nav-list>li.pull_up:nth-child(3)>.arrow:after{border-right-color:#3e442a!important;-moz-border-right-colors:#3e442a!important}.skin-2 .nav-list>li:nth-child(3)>.submenu li:hover>a,.skin-2 .nav-list>li:nth-child(3)>.submenu li.hover-show>a,.skin-2 .nav-list>li:nth-child(3)>.submenu li.active>a,.skin-2 .nav-list>li:nth-child(3)>.submenu li.open>a{color:#c5ef35}.skin-2 .nav-list>li.active:nth-child(3):before{background-color:#ce7da7;background-color:#b2cd54}.skin-2 .nav-list>li.active.highlight:nth-child(3):before,.skin-2 .nav-list>li:nth-child(3):before{background-color:#ccde8d}.skin-2 .nav-list>li:nth-child(4)>a{color:#cee100}.skin-2 .nav-list>li:nth-child(4):hover>a,.skin-2 .nav-list>li:nth-child(4).hover-show>a,.skin-2 .nav-list>li.open:nth-child(4)>a{background-color:#b7c51c}.skin-2 .nav-list>li:nth-child(4)>.submenu{background-color:#43452a}.skin-2 .nav-list>li:nth-child(4)>.arrow:after,.skin-2 .nav-list>li:nth-child(4) li>.arrow:after{border-right-color:#43452a;-moz-border-right-colors:#43452a}.skin-2 .nav-list>li.pull_up:nth-child(4)>.arrow:after{border-right-color:#43452a!important;-moz-border-right-colors:#43452a!important}.skin-2 .nav-list>li:nth-child(4)>.submenu li:hover>a,.skin-2 .nav-list>li:nth-child(4)>.submenu li.hover-show>a,.skin-2 .nav-list>li:nth-child(4)>.submenu li.active>a,.skin-2 .nav-list>li:nth-child(4)>.submenu li.open>a{color:#e0ef3e}.skin-2 .nav-list>li.active:nth-child(4):before{background-color:#ce7da7;background-color:#c9d355}.skin-2 .nav-list>li.active.highlight:nth-child(4):before,.skin-2 .nav-list>li:nth-child(4):before{background-color:#dbe28e}.skin-2 .nav-list>li:nth-child(5)>a{color:#f8c600}.skin-2 .nav-list>li:nth-child(5):hover>a,.skin-2 .nav-list>li:nth-child(5).hover-show>a,.skin-2 .nav-list>li.open:nth-child(5)>a{background-color:#d9b41f}.skin-2 .nav-list>li:nth-child(5)>.submenu{background-color:#48422a}.skin-2 .nav-list>li:nth-child(5)>.arrow:after,.skin-2 .nav-list>li:nth-child(5) li>.arrow:after{border-right-color:#48422a;-moz-border-right-colors:#48422a}.skin-2 .nav-list>li.pull_up:nth-child(5)>.arrow:after{border-right-color:#48422a!important;-moz-border-right-colors:#48422a!important}.skin-2 .nav-list>li:nth-child(5)>.submenu li:hover>a,.skin-2 .nav-list>li:nth-child(5)>.submenu li.hover-show>a,.skin-2 .nav-list>li:nth-child(5)>.submenu li.active>a,.skin-2 .nav-list>li:nth-child(5)>.submenu li.open>a{color:#f1d153}.skin-2 .nav-list>li.active:nth-child(5):before{background-color:#ce7da7;background-color:#e3c657}.skin-2 .nav-list>li.active.highlight:nth-child(5):before,.skin-2 .nav-list>li:nth-child(5):before{background-color:#ecd98f}.skin-2 .nav-list>li:nth-child(6)>a{color:#ffab00}.skin-2 .nav-list>li:nth-child(6):hover>a,.skin-2 .nav-list>li:nth-child(6).hover-show>a,.skin-2 .nav-list>li.open:nth-child(6)>a{background-color:#dfa020}.skin-2 .nav-list>li:nth-child(6)>.submenu{background-color:#493f2a}.skin-2 .nav-list>li:nth-child(6)>.arrow:after,.skin-2 .nav-list>li:nth-child(6) li>.arrow:after{border-right-color:#493f2a;-moz-border-right-colors:#493f2a}.skin-2 .nav-list>li.pull_up:nth-child(6)>.arrow:after{border-right-color:#493f2a!important;-moz-border-right-colors:#493f2a!important}.skin-2 .nav-list>li:nth-child(6)>.submenu li:hover>a,.skin-2 .nav-list>li:nth-child(6)>.submenu li.hover-show>a,.skin-2 .nav-list>li:nth-child(6)>.submenu li.active>a,.skin-2 .nav-list>li:nth-child(6)>.submenu li.open>a{color:#f2c05a}.skin-2 .nav-list>li.active:nth-child(6):before{background-color:#ce7da7;background-color:#e7b858}.skin-2 .nav-list>li.active.highlight:nth-child(6):before,.skin-2 .nav-list>li:nth-child(6):before{background-color:#efd08f}.skin-2 .nav-list>li:nth-child(7)>a{color:#ff6e00}.skin-2 .nav-list>li:nth-child(7):hover>a,.skin-2 .nav-list>li:nth-child(7).hover-show>a,.skin-2 .nav-list>li.open:nth-child(7)>a{background-color:#df7220}.skin-2 .nav-list>li:nth-child(7)>.submenu{background-color:#49372a}.skin-2 .nav-list>li:nth-child(7)>.arrow:after,.skin-2 .nav-list>li:nth-child(7) li>.arrow:after{border-right-color:#49372a;-moz-border-right-colors:#49372a}.skin-2 .nav-list>li.pull_up:nth-child(7)>.arrow:after{border-right-color:#49372a!important;-moz-border-right-colors:#49372a!important}.skin-2 .nav-list>li:nth-child(7)>.submenu li:hover>a,.skin-2 .nav-list>li:nth-child(7)>.submenu li.hover-show>a,.skin-2 .nav-list>li:nth-child(7)>.submenu li.active>a,.skin-2 .nav-list>li:nth-child(7)>.submenu li.open>a{color:#f29b5a}.skin-2 .nav-list>li.active:nth-child(7):before{background-color:#ce7da7;background-color:#e79658}.skin-2 .nav-list>li.active.highlight:nth-child(7):before,.skin-2 .nav-list>li:nth-child(7):before{background-color:#efb98f}.skin-2 .nav-list>li:nth-child(8)>a{color:#f21c30}.skin-2 .nav-list>li:nth-child(8):hover>a,.skin-2 .nav-list>li:nth-child(8).hover-show>a,.skin-2 .nav-list>li.open:nth-child(8)>a{background-color:#d43a48}.skin-2 .nav-list>li:nth-child(8)>.submenu{background-color:#472e30}.skin-2 .nav-list>li:nth-child(8)>.arrow:after,.skin-2 .nav-list>li:nth-child(8) li>.arrow:after{border-right-color:#472e30;-moz-border-right-colors:#472e30}.skin-2 .nav-list>li.pull_up:nth-child(8)>.arrow:after{border-right-color:#472e30!important;-moz-border-right-colors:#472e30!important}.skin-2 .nav-list>li:nth-child(8)>.submenu li:hover>a,.skin-2 .nav-list>li:nth-child(8)>.submenu li.hover-show>a,.skin-2 .nav-list>li:nth-child(8)>.submenu li.active>a,.skin-2 .nav-list>li:nth-child(8)>.submenu li.open>a{color:#ea717c}.skin-2 .nav-list>li.active:nth-child(8):before{background-color:#ce7da7;background-color:#df6b76}.skin-2 .nav-list>li.active.highlight:nth-child(8):before,.skin-2 .nav-list>li:nth-child(8):before{background-color:#ea9da4}.skin-2 .nav-list>li:nth-child(9)>a{color:#db348a}.skin-2 .nav-list>li:nth-child(9):hover>a,.skin-2 .nav-list>li:nth-child(9).hover-show>a,.skin-2 .nav-list>li.open:nth-child(9)>a{background-color:#bd5289}.skin-2 .nav-list>li:nth-child(9)>.submenu{background-color:#45303b}.skin-2 .nav-list>li:nth-child(9)>.arrow:after,.skin-2 .nav-list>li:nth-child(9) li>.arrow:after{border-right-color:#45303b;-moz-border-right-colors:#45303b}.skin-2 .nav-list>li.pull_up:nth-child(9)>.arrow:after{border-right-color:#45303b!important;-moz-border-right-colors:#45303b!important}.skin-2 .nav-list>li:nth-child(9)>.submenu li:hover>a,.skin-2 .nav-list>li:nth-child(9)>.submenu li.hover-show>a,.skin-2 .nav-list>li:nth-child(9)>.submenu li.active>a,.skin-2 .nav-list>li:nth-child(9)>.submenu li.open>a{color:#da81af}.skin-2 .nav-list>li.active:nth-child(9):before{background-color:#ce7da7}.skin-2 .nav-list>li.active.highlight:nth-child(9):before,.skin-2 .nav-list>li:nth-child(9):before{background-color:#dea8c4}.skin-2 .nav-list>li:nth-child(10)>a{color:#c55ee7}.skin-2 .nav-list>li:nth-child(10):hover>a,.skin-2 .nav-list>li:nth-child(10).hover-show>a,.skin-2 .nav-list>li.open:nth-child(10)>a{background-color:#b975d0}.skin-2 .nav-list>li:nth-child(10)>.submenu{background-color:#423646}.skin-2 .nav-list>li:nth-child(10)>.arrow:after,.skin-2 .nav-list>li:nth-child(10) li>.arrow:after{border-right-color:#423646;-moz-border-right-colors:#423646}.skin-2 .nav-list>li.pull_up:nth-child(10)>.arrow:after{border-right-color:#423646!important;-moz-border-right-colors:#423646!important}.skin-2 .nav-list>li:nth-child(10)>.submenu li:hover>a,.skin-2 .nav-list>li:nth-child(10)>.submenu li.hover-show>a,.skin-2 .nav-list>li:nth-child(10)>.submenu li.active>a,.skin-2 .nav-list>li:nth-child(10)>.submenu li.open>a{color:#d9a9e9}.skin-2 .nav-list>li.active:nth-child(10):before{background-color:#ce7da7;background-color:#cb98dc}.skin-2 .nav-list>li.active.highlight:nth-child(10):before,.skin-2 .nav-list>li:nth-child(10):before{background-color:#dcbae7}.skin-2 .nav-list>li:nth-child(11)>a{color:#218bee}.skin-2 .nav-list>li:nth-child(11):hover>a,.skin-2 .nav-list>li:nth-child(11).hover-show>a,.skin-2 .nav-list>li.open:nth-child(11)>a{background-color:#3f8ad0}.skin-2 .nav-list>li:nth-child(11)>.submenu{background-color:#2e3b47}.skin-2 .nav-list>li:nth-child(11)>.arrow:after,.skin-2 .nav-list>li:nth-child(11) li>.arrow:after{border-right-color:#2e3b47;-moz-border-right-colors:#2e3b47}.skin-2 .nav-list>li.pull_up:nth-child(11)>.arrow:after{border-right-color:#2e3b47!important;-moz-border-right-colors:#2e3b47!important}.skin-2 .nav-list>li:nth-child(11)>.submenu li:hover>a,.skin-2 .nav-list>li:nth-child(11)>.submenu li.hover-show>a,.skin-2 .nav-list>li:nth-child(11)>.submenu li.active>a,.skin-2 .nav-list>li:nth-child(11)>.submenu li.open>a{color:#74b0e7}.skin-2 .nav-list>li.active:nth-child(11):before{background-color:#ce7da7;background-color:#6fa7dc}.skin-2 .nav-list>li.active.highlight:nth-child(11):before,.skin-2 .nav-list>li:nth-child(11):before{background-color:#9fc4e8}.skin-2 .nav-list>li:nth-child(12)>a{color:#2ecee7}.skin-2 .nav-list>li:nth-child(12):hover>a,.skin-2 .nav-list>li:nth-child(12).hover-show>a,.skin-2 .nav-list>li.open:nth-child(12)>a{background-color:#4bb9ca}.skin-2 .nav-list>li:nth-child(12)>.submenu{background-color:#304346}.skin-2 .nav-list>li:nth-child(12)>.arrow:after,.skin-2 .nav-list>li:nth-child(12) li>.arrow:after{border-right-color:#304346;-moz-border-right-colors:#304346}.skin-2 .nav-list>li.pull_up:nth-child(12)>.arrow:after{border-right-color:#304346!important;-moz-border-right-colors:#304346!important}.skin-2 .nav-list>li:nth-child(12)>.submenu li:hover>a,.skin-2 .nav-list>li:nth-child(12)>.submenu li.hover-show>a,.skin-2 .nav-list>li:nth-child(12)>.submenu li.active>a,.skin-2 .nav-list>li:nth-child(12)>.submenu li.open>a{color:#7ed6e3}.skin-2 .nav-list>li.active:nth-child(12):before{background-color:#ce7da7;background-color:#78cad7}.skin-2 .nav-list>li.active.highlight:nth-child(12):before,.skin-2 .nav-list>li:nth-child(12):before{background-color:#a5dce4}@media only screen and (min-width:992px){.skin-2 .sidebar.h-sidebar .nav-list>li.hover:nth-child(1)>a{color:#00be67}.skin-2 .sidebar.h-sidebar .nav-list>li.hover:nth-child(1)>.arrow:after{border-bottom-color:#2a4137;-moz-border-bottom-colors:#2a4137}.skin-2 .sidebar.h-sidebar .nav-list>li.hover:nth-child(2)>a{color:#5ed02b}.skin-2 .sidebar.h-sidebar .nav-list>li.hover:nth-child(2)>.arrow:after{border-bottom-color:#36432f;-moz-border-bottom-colors:#36432f}.skin-2 .sidebar.h-sidebar .nav-list>li.hover:nth-child(3)>a{color:#a7d700}.skin-2 .sidebar.h-sidebar .nav-list>li.hover:nth-child(3)>.arrow:after{border-bottom-color:#3e442a;-moz-border-bottom-colors:#3e442a}.skin-2 .sidebar.h-sidebar .nav-list>li.hover:nth-child(4)>a{color:#cee100}.skin-2 .sidebar.h-sidebar .nav-list>li.hover:nth-child(4)>.arrow:after{border-bottom-color:#43452a;-moz-border-bottom-colors:#43452a}.skin-2 .sidebar.h-sidebar .nav-list>li.hover:nth-child(5)>a{color:#f8c600}.skin-2 .sidebar.h-sidebar .nav-list>li.hover:nth-child(5)>.arrow:after{border-bottom-color:#48422a;-moz-border-bottom-colors:#48422a}.skin-2 .sidebar.h-sidebar .nav-list>li.hover:nth-child(6)>a{color:#ffab00}.skin-2 .sidebar.h-sidebar .nav-list>li.hover:nth-child(6)>.arrow:after{border-bottom-color:#493f2a;-moz-border-bottom-colors:#493f2a}.skin-2 .sidebar.h-sidebar .nav-list>li.hover:nth-child(7)>a{color:#ff6e00}.skin-2 .sidebar.h-sidebar .nav-list>li.hover:nth-child(7)>.arrow:after{border-bottom-color:#49372a;-moz-border-bottom-colors:#49372a}.skin-2 .sidebar.h-sidebar .nav-list>li.hover:nth-child(8)>a{color:#f21c30}.skin-2 .sidebar.h-sidebar .nav-list>li.hover:nth-child(8)>.arrow:after{border-bottom-color:#472e30;-moz-border-bottom-colors:#472e30}.skin-2 .sidebar.h-sidebar .nav-list>li.hover:nth-child(9)>a{color:#db348a}.skin-2 .sidebar.h-sidebar .nav-list>li.hover:nth-child(9)>.arrow:after{border-bottom-color:#45303b;-moz-border-bottom-colors:#45303b}.skin-2 .sidebar.h-sidebar .nav-list>li.hover:nth-child(10)>a{color:#c55ee7}.skin-2 .sidebar.h-sidebar .nav-list>li.hover:nth-child(10)>.arrow:after{border-bottom-color:#423646;-moz-border-bottom-colors:#423646}.skin-2 .sidebar.h-sidebar .nav-list>li.hover:nth-child(11)>a{color:#218bee}.skin-2 .sidebar.h-sidebar .nav-list>li.hover:nth-child(11)>.arrow:after{border-bottom-color:#2e3b47;-moz-border-bottom-colors:#2e3b47}.skin-2 .sidebar.h-sidebar .nav-list>li.hover:nth-child(12)>a{color:#2ecee7}.skin-2 .sidebar.h-sidebar .nav-list>li.hover:nth-child(12)>.arrow:after{border-bottom-color:#304346;-moz-border-bottom-colors:#304346}}.skin-2 .nav-list>li.highlight.active:nth-child(1)>a{background-color:#18a665}.skin-2 .nav-list>li.active.highlight:nth-child(1)>a:after{border-left-color:#18a665;-moz-border-left-colors:#18a665}.skin-2 .nav-list>li.highlight.active:nth-child(2)>a{background-color:#6ab14a}.skin-2 .nav-list>li.active.highlight:nth-child(2)>a:after{border-left-color:#6ab14a;-moz-border-left-colors:#6ab14a}.skin-2 .nav-list>li.highlight.active:nth-child(3)>a{background-color:#98bc1b}.skin-2 .nav-list>li.active.highlight:nth-child(3)>a:after{border-left-color:#98bc1b;-moz-border-left-colors:#98bc1b}.skin-2 .nav-list>li.highlight.active:nth-child(4)>a{background-color:#b7c51c}.skin-2 .nav-list>li.active.highlight:nth-child(4)>a:after{border-left-color:#b7c51c;-moz-border-left-colors:#b7c51c}.skin-2 .nav-list>li.highlight.active:nth-child(5)>a{background-color:#d9b41f}.skin-2 .nav-list>li.active.highlight:nth-child(5)>a:after{border-left-color:#d9b41f;-moz-border-left-colors:#d9b41f}.skin-2 .nav-list>li.highlight.active:nth-child(6)>a{background-color:#dfa020}.skin-2 .nav-list>li.active.highlight:nth-child(6)>a:after{border-left-color:#dfa020;-moz-border-left-colors:#dfa020}.skin-2 .nav-list>li.highlight.active:nth-child(7)>a{background-color:#df7220}.skin-2 .nav-list>li.active.highlight:nth-child(7)>a:after{border-left-color:#df7220;-moz-border-left-colors:#df7220}.skin-2 .nav-list>li.highlight.active:nth-child(8)>a{background-color:#d43a48}.skin-2 .nav-list>li.active.highlight:nth-child(8)>a:after{border-left-color:#d43a48;-moz-border-left-colors:#d43a48}.skin-2 .nav-list>li.highlight.active:nth-child(9)>a{background-color:#bd5289}.skin-2 .nav-list>li.active.highlight:nth-child(9)>a:after{border-left-color:#bd5289;-moz-border-left-colors:#bd5289}.skin-2 .nav-list>li.highlight.active:nth-child(10)>a{background-color:#b975d0}.skin-2 .nav-list>li.active.highlight:nth-child(10)>a:after{border-left-color:#b975d0;-moz-border-left-colors:#b975d0}.skin-2 .nav-list>li.highlight.active:nth-child(11)>a{background-color:#3f8ad0}.skin-2 .nav-list>li.active.highlight:nth-child(11)>a:after{border-left-color:#3f8ad0;-moz-border-left-colors:#3f8ad0}.skin-2 .nav-list>li.highlight.active:nth-child(12)>a{background-color:#4bb9ca}.skin-2 .nav-list>li.active.highlight:nth-child(12)>a:after{border-left-color:#4bb9ca;-moz-border-left-colors:#4bb9ca}.skin-2 .sidebar-shortcuts .btn{background-color:#555!important;border-radius:32px;border-width:2px}.skin-2 .sidebar-shortcuts .btn:hover{background-color:#222!important}.skin-2 .sidebar-shortcuts .btn:focus{outline:0}.skin-2 .sidebar-shortcuts-mini .btn{border-radius:32px;border-width:2px;opacity:1;padding:6px}.skin-2 .sidebar-shortcuts,.skin-2 .sidebar-shortcuts-mini{background-color:#393939}.skin-2 .sidebar>.nav-search{background-color:#393939}.skin-2 .sidebar-toggle{background-color:#2f2f2f;border-color:#767676}.skin-2 .sidebar-toggle:before{border-color:inherit}.skin-2 .sidebar-toggle>.ace-icon{background-color:#333;border-color:#aaa;color:#aaa}.skin-2 .breadcrumbs{border-width:0;background-color:#e7f2f8;border-radius:4px;margin:8px 8px 0}@media only screen and (max-width:991px){.skin-2 .breadcrumbs{margin:5px 5px 0}.skin-2 .menu-toggler+.sidebar.responsive+.main-content .breadcrumbs{margin:0;border-radius:0}}@media (min-width:992px){.skin-2 .breadcrumbs.breadcrumbs-fixed+.page-content{padding-top:57px}}@media (min-width:992px) and (max-width:991px){.skin-2 .breadcrumbs.breadcrumbs-fixed+.page-content{padding-top:54px}.skin-2 .menu-toggler+.sidebar.reponsive+.main-content .breadcrumbs.breadcrumbs-fixed+.page-content{padding-top:49px}}@media (min-width:992px) and (max-width:991px){.skin-2 .container.main-container .sidebar.compact+.main-content .breadcrumbs-fixed{width:734px}}@media (min-width:992px) and (max-width:991px){.skin-2 .container.main-container .breadcrumbs-fixed{width:734px}.skin-2 .container.main-container .sidebar.menu-min+.main-content .breadcrumbs-fixed{width:734px}.skin-2 .container.main-container .sidebar.responsive-min+.main-content .breadcrumbs-fixed{width:691px}}@media (min-width:992px){.skin-2 .container.main-container .sidebar.compact+.main-content .breadcrumbs-fixed{width:843px}}@media (min-width:992px){.skin-2 .container.main-container .breadcrumbs-fixed{width:964px}.skin-2 .container.main-container .sidebar+.main-content .breadcrumbs-fixed{width:758px}.skin-2 .container.main-container .sidebar.menu-min+.main-content .breadcrumbs-fixed{width:905px}}@media (min-width:1200px){.skin-2 .container.main-container .sidebar.compact+.main-content .breadcrumbs-fixed{width:1043px}}@media (min-width:1200px){.skin-2 .container.main-container .breadcrumbs-fixed{width:1148px}.skin-2 .container.main-container .sidebar+.main-content .breadcrumbs-fixed{width:958px}.skin-2 .container.main-container .sidebar.menu-min+.main-content .breadcrumbs-fixed{width:1105px}}@media (min-width:768px){.skin-2 .container.main-container .sidebar.h-sidebar+.main-content .breadcrumbs-fixed{width:auto}}@media only screen and (max-width:991px){.skin-2 .sidebar{border-width:0;-webkit-box-shadow:none;box-shadow:none}.skin-2 .nav-list li.active>a:after{display:none}}.skin-2 .sidebar.menu-min .nav-list>li.open>a{color:#e6e6e6}.skin-2 .sidebar.menu-min .nav-list>li.active>a{color:#fff}.skin-2 .sidebar.menu-min .nav-list>li.active>a:after{border-width:9px 6px;top:10px}.skin-2 .sidebar.menu-min .nav-list>li.active.highlight>a:after{border-width:20px 0 20px 10px;top:0}.skin-2 .sidebar.menu-min .nav-list>li>a>.menu-text{background-color:inherit;font-weight:700;color:rgba(0,0,0,.6);border-width:0 0 0 1px;border-style:solid;border-color:#333;border-color:rgba(0,0,0,.4);-webkit-box-shadow:none;box-shadow:none;margin-left:1px}.skin-2 .sidebar.menu-min .nav-list>li.active>a>.menu-text{background-color:inherit;color:#FFF}.skin-2 .sidebar.menu-min .nav-list>li>.submenu{border-style:solid;border-width:1px 0 0 1px;border-color:#444;border-color:rgba(0,0,0,.3);-webkit-box-shadow:none;box-shadow:none;margin-left:1px}.skin-2 .sidebar.menu-min .nav-list>li>.submenu:after{display:none}.skin-2 .sidebar.menu-min .nav-list>li.active>.submenu{border-top-color:rgba(0,0,0,.5)}.skin-2 .sidebar.menu-min .sidebar-shortcuts-large{background-color:#393939;-webkit-box-shadow:none;box-shadow:none;border:1px solid #555;border-width:0 1px 1px 0;top:0;border-color:#666}.skin-2 .sidebar.menu-min .nav-list>li>.arrow:after,.skin-2 .sidebar.menu-min .nav-list>li.active.highlight>.arrow:after{border-right-color:#bd5289;-moz-border-right-colors:#bd5289}.skin-2 .sidebar.menu-min .nav-list>li>.arrow:before,.skin-2 .sidebar.menu-min .nav-list>li.active.highlight>.arrow:before{border-right-color:#333;border-right-color:rgba(0,0,0,.7);-moz-border-right-colors:rgba(0,0,0,.7)}.skin-2 .sidebar.menu-min .nav-list>li.active:not(.highlight)>a:not(.dropdown-toggle)>.menu-text{border-width:1px;border-top-color:#555;border-bottom-color:#555;border-right-color:#555}.skin-2 .sidebar.menu-min .nav-list>li>a>.menu-text,.skin-2 .sidebar.menu-min .nav-list>li.active.highlight>a>.menu-text{border-left-color:#333;border-left-color:rgba(0,0,0,.5)}.skin-2 .sidebar.menu-min .nav-list>li.pull_up>a>.menu-text,.skin-2 .sidebar.menu-min .nav-list>li.pull_up.active.highlight>a>.menu-text{border-left-color:#222;border-left-color:rgba(0,0,0,.7)}.skin-2 .sidebar.menu-min .nav-list>li.pull_up.active:not(.highlight)>a>.menu-text{border-left-color:#666}.skin-2 .sidebar.menu-min .nav-list>li:nth-child(1)>.arrow:after,.skin-2 .sidebar.menu-min .nav-list>li.active.highlight:nth-child(1)>.arrow:after{border-right-color:#18a665;-moz-border-right-colors:#18a665}.skin-2 .sidebar.menu-min .nav-list>li:nth-child(2)>.arrow:after,.skin-2 .sidebar.menu-min .nav-list>li.active.highlight:nth-child(2)>.arrow:after{border-right-color:#6ab14a;-moz-border-right-colors:#6ab14a}.skin-2 .sidebar.menu-min .nav-list>li:nth-child(3)>.arrow:after,.skin-2 .sidebar.menu-min .nav-list>li.active.highlight:nth-child(3)>.arrow:after{border-right-color:#98bc1b;-moz-border-right-colors:#98bc1b}.skin-2 .sidebar.menu-min .nav-list>li:nth-child(4)>.arrow:after,.skin-2 .sidebar.menu-min .nav-list>li.active.highlight:nth-child(4)>.arrow:after{border-right-color:#b7c51c;-moz-border-right-colors:#b7c51c}.skin-2 .sidebar.menu-min .nav-list>li:nth-child(5)>.arrow:after,.skin-2 .sidebar.menu-min .nav-list>li.active.highlight:nth-child(5)>.arrow:after{border-right-color:#d9b41f;-moz-border-right-colors:#d9b41f}.skin-2 .sidebar.menu-min .nav-list>li:nth-child(6)>.arrow:after,.skin-2 .sidebar.menu-min .nav-list>li.active.highlight:nth-child(6)>.arrow:after{border-right-color:#dfa020;-moz-border-right-colors:#dfa020}.skin-2 .sidebar.menu-min .nav-list>li:nth-child(7)>.arrow:after,.skin-2 .sidebar.menu-min .nav-list>li.active.highlight:nth-child(7)>.arrow:after{border-right-color:#df7220;-moz-border-right-colors:#df7220}.skin-2 .sidebar.menu-min .nav-list>li:nth-child(8)>.arrow:after,.skin-2 .sidebar.menu-min .nav-list>li.active.highlight:nth-child(8)>.arrow:after{border-right-color:#d43a48;-moz-border-right-colors:#d43a48}.skin-2 .sidebar.menu-min .nav-list>li:nth-child(9)>.arrow:after,.skin-2 .sidebar.menu-min .nav-list>li.active.highlight:nth-child(9)>.arrow:after{border-right-color:#bd5289;-moz-border-right-colors:#bd5289}.skin-2 .sidebar.menu-min .nav-list>li:nth-child(10)>.arrow:after,.skin-2 .sidebar.menu-min .nav-list>li.active.highlight:nth-child(10)>.arrow:after{border-right-color:#b975d0;-moz-border-right-colors:#b975d0}.skin-2 .sidebar.menu-min .nav-list>li:nth-child(11)>.arrow:after,.skin-2 .sidebar.menu-min .nav-list>li.active.highlight:nth-child(11)>.arrow:after{border-right-color:#3f8ad0;-moz-border-right-colors:#3f8ad0}.skin-2 .sidebar.menu-min .nav-list>li:nth-child(12)>.arrow:after,.skin-2 .sidebar.menu-min .nav-list>li.active.highlight:nth-child(12)>.arrow:after{border-right-color:#4bb9ca;-moz-border-right-colors:#4bb9ca}.skin-2 .sidebar.menu-min .nav-list>li.active>a>.menu-text{border-left-color:#777}.skin-2 .sidebar.menu-min .nav-list>li.active>.arrow:after{border-right-color:#242424;-moz-border-right-colors:#242424}.skin-2 .sidebar.menu-min .nav-list>li.active>.arrow:before{border-right-color:#888;-moz-border-right-colors:#FFF}@media (max-width:991px){.skin-2 .sidebar.responsive .nav-list>li.active>a:after{display:none}.skin-2 .sidebar.responsive .nav-list>li.active.highlight>a:after{display:block}}@media (max-width:991px){.skin-2 .sidebar.responsive-min .nav-list>li.open>a{color:#e6e6e6}.skin-2 .sidebar.responsive-min .nav-list>li.active>a{color:#fff}.skin-2 .sidebar.responsive-min .nav-list>li.active>a:after{border-width:9px 6px;top:10px}.skin-2 .sidebar.responsive-min .nav-list>li.active.highlight>a:after{border-width:20px 0 20px 10px;top:0}.skin-2 .sidebar.responsive-min .nav-list>li>a>.menu-text{background-color:inherit;font-weight:700;color:rgba(0,0,0,.6);border-width:0 0 0 1px;border-style:solid;border-color:#333;border-color:rgba(0,0,0,.4);-webkit-box-shadow:none;box-shadow:none;margin-left:1px}.skin-2 .sidebar.responsive-min .nav-list>li.active>a>.menu-text{background-color:inherit;color:#FFF}.skin-2 .sidebar.responsive-min .nav-list>li>.submenu{border-style:solid;border-width:1px 0 0 1px;border-color:#444;border-color:rgba(0,0,0,.3);-webkit-box-shadow:none;box-shadow:none;margin-left:1px}.skin-2 .sidebar.responsive-min .nav-list>li>.submenu:after{display:none}.skin-2 .sidebar.responsive-min .nav-list>li.active>.submenu{border-top-color:rgba(0,0,0,.5)}.skin-2 .sidebar.responsive-min .sidebar-shortcuts-large{background-color:#393939;-webkit-box-shadow:none;box-shadow:none;border:1px solid #555;border-width:0 1px 1px 0;top:0;border-color:#666}.skin-2 .sidebar.responsive-min .nav-list>li>.arrow:after,.skin-2 .sidebar.responsive-min .nav-list>li.active.highlight>.arrow:after{border-right-color:#bd5289;-moz-border-right-colors:#bd5289}.skin-2 .sidebar.responsive-min .nav-list>li>.arrow:before,.skin-2 .sidebar.responsive-min .nav-list>li.active.highlight>.arrow:before{border-right-color:#333;border-right-color:rgba(0,0,0,.7);-moz-border-right-colors:rgba(0,0,0,.7)}.skin-2 .sidebar.responsive-min .nav-list>li.active:not(.highlight)>a:not(.dropdown-toggle)>.menu-text{border-width:1px;border-top-color:#555;border-bottom-color:#555;border-right-color:#555}.skin-2 .sidebar.responsive-min .nav-list>li>a>.menu-text,.skin-2 .sidebar.responsive-min .nav-list>li.active.highlight>a>.menu-text{border-left-color:#333;border-left-color:rgba(0,0,0,.5)}.skin-2 .sidebar.responsive-min .nav-list>li.pull_up>a>.menu-text,.skin-2 .sidebar.responsive-min .nav-list>li.pull_up.active.highlight>a>.menu-text{border-left-color:#222;border-left-color:rgba(0,0,0,.7)}.skin-2 .sidebar.responsive-min .nav-list>li.pull_up.active:not(.highlight)>a>.menu-text{border-left-color:#666}.skin-2 .sidebar.responsive-min .nav-list>li:nth-child(1)>.arrow:after,.skin-2 .sidebar.responsive-min .nav-list>li.active.highlight:nth-child(1)>.arrow:after{border-right-color:#18a665;-moz-border-right-colors:#18a665}.skin-2 .sidebar.responsive-min .nav-list>li:nth-child(2)>.arrow:after,.skin-2 .sidebar.responsive-min .nav-list>li.active.highlight:nth-child(2)>.arrow:after{border-right-color:#6ab14a;-moz-border-right-colors:#6ab14a}.skin-2 .sidebar.responsive-min .nav-list>li:nth-child(3)>.arrow:after,.skin-2 .sidebar.responsive-min .nav-list>li.active.highlight:nth-child(3)>.arrow:after{border-right-color:#98bc1b;-moz-border-right-colors:#98bc1b}.skin-2 .sidebar.responsive-min .nav-list>li:nth-child(4)>.arrow:after,.skin-2 .sidebar.responsive-min .nav-list>li.active.highlight:nth-child(4)>.arrow:after{border-right-color:#b7c51c;-moz-border-right-colors:#b7c51c}.skin-2 .sidebar.responsive-min .nav-list>li:nth-child(5)>.arrow:after,.skin-2 .sidebar.responsive-min .nav-list>li.active.highlight:nth-child(5)>.arrow:after{border-right-color:#d9b41f;-moz-border-right-colors:#d9b41f}.skin-2 .sidebar.responsive-min .nav-list>li:nth-child(6)>.arrow:after,.skin-2 .sidebar.responsive-min .nav-list>li.active.highlight:nth-child(6)>.arrow:after{border-right-color:#dfa020;-moz-border-right-colors:#dfa020}.skin-2 .sidebar.responsive-min .nav-list>li:nth-child(7)>.arrow:after,.skin-2 .sidebar.responsive-min .nav-list>li.active.highlight:nth-child(7)>.arrow:after{border-right-color:#df7220;-moz-border-right-colors:#df7220}.skin-2 .sidebar.responsive-min .nav-list>li:nth-child(8)>.arrow:after,.skin-2 .sidebar.responsive-min .nav-list>li.active.highlight:nth-child(8)>.arrow:after{border-right-color:#d43a48;-moz-border-right-colors:#d43a48}.skin-2 .sidebar.responsive-min .nav-list>li:nth-child(9)>.arrow:after,.skin-2 .sidebar.responsive-min .nav-list>li.active.highlight:nth-child(9)>.arrow:after{border-right-color:#bd5289;-moz-border-right-colors:#bd5289}.skin-2 .sidebar.responsive-min .nav-list>li:nth-child(10)>.arrow:after,.skin-2 .sidebar.responsive-min .nav-list>li.active.highlight:nth-child(10)>.arrow:after{border-right-color:#b975d0;-moz-border-right-colors:#b975d0}.skin-2 .sidebar.responsive-min .nav-list>li:nth-child(11)>.arrow:after,.skin-2 .sidebar.responsive-min .nav-list>li.active.highlight:nth-child(11)>.arrow:after{border-right-color:#3f8ad0;-moz-border-right-colors:#3f8ad0}.skin-2 .sidebar.responsive-min .nav-list>li:nth-child(12)>.arrow:after,.skin-2 .sidebar.responsive-min .nav-list>li.active.highlight:nth-child(12)>.arrow:after{border-right-color:#4bb9ca;-moz-border-right-colors:#4bb9ca}.skin-2 .sidebar.responsive-min .nav-list>li.active>a>.menu-text{border-left-color:#777}.skin-2 .sidebar.responsive-min .nav-list>li.active>.arrow:after{border-right-color:#242424;-moz-border-right-colors:#242424}.skin-2 .sidebar.responsive-min .nav-list>li.active>.arrow:before{border-right-color:#888;-moz-border-right-colors:#FFF}.skin-2 .sidebar.responsive-min .nav-list>li.active>a:after{display:block}}@media only screen and (min-width:992px){.skin-2 .nav-list li.hover>.submenu{padding-left:0;padding-right:0;border:1px solid;border-color:rgba(0,0,0,.4)}.skin-2 .nav-list li.hover>.submenu>li>a{margin-bottom:0;margin-top:0}.skin-2 .nav-list li.hover>.submenu>li:first-child>a{border-top-width:0}.skin-2 .nav-list li .submenu>li.hover.active>a{background-color:rgba(0,0,0,.05)}.skin-2 .nav-list>li>.submenu li.hover>.submenu{padding:2px}.skin-2 .nav-list>li>.submenu li>.submenu>li.hover>a{border-top-color:#222;border-top-color:rgba(255,255,255,.08)}.skin-2 .nav-list>li.active.hover:hover>a.dropdown-toggle:after,.skin-2 .nav-list>li.active.hover.hover-show>a.dropdown-toggle:after,.skin-2 .menu-min .nav-list>li.active:hover>a:after,.skin-2 .menu-min .nav-list>li.active.hover-show>a:after{display:none}}@media only screen and (min-width:992px){.skin-2 .sidebar.navbar-collapse .nav-list>li.open.hover:not(:hover):not(:focus):not(.active)>a{background-color:#393939;font-weight:400}.skin-2 .sidebar.navbar-collapse .nav-list>li.open.hover:not(:hover):not(:focus):not(.active)>a>.menu-icon,.skin-2 .sidebar.navbar-collapse .nav-list>li.open.hover:not(:hover):not(:focus):not(.active)>a>.menu-text,.skin-2 .sidebar.navbar-collapse .nav-list>li.open.hover:not(:hover):not(:focus):not(.active)>a>.arrow{color:inherit}.skin-2 .sidebar.navbar-collapse .nav-list>li>.submenu li.open.hover:not(:hover):not(:focus):not(.active)>a{color:#eee}.skin-2 .sidebar.navbar-collapse .nav-list>li>.submenu>li.open.hover:not(:hover):not(:focus):not(.active)>a>.menu-icon{display:none}}@media only screen and (min-width:992px){.skin-2 .sidebar:not(.navbar-collapse) .nav-list>li .submenu>li.hover:hover>a,.skin-2 .sidebar:not(.navbar-collapse) .nav-list>li .submenu>li.hover.hover-show>a{background-color:rgba(0,0,0,.1)}.skin-2 .sidebar:not(.navbar-collapse) .nav-list>li.active .submenu>li.hover:hover>a,.skin-2 .sidebar:not(.navbar-collapse) .nav-list>li.active .submenu>li.hover.hover-show>a{background-color:rgba(0,0,0,.1)}}@media only screen and (max-width:991px){.skin-2 .sidebar.navbar-collapse .nav-list>li>.submenu:before,.skin-2 .sidebar.navbar-collapse .nav-list>li>.submenu>li:before,.skin-2 .sidebar.navbar-collapse .nav-list>li>.submenu>li>.submenu:before{display:none}.skin-2 .sidebar.navbar-collapse .nav-list>li:before{height:41px!important;top:0}.skin-2 .sidebar.navbar-collapse .nav-list>li>.submenu li>.submenu>li>a{margin-left:0;padding-left:42px}.skin-2 .sidebar.navbar-collapse .nav-list>li>.submenu li>.submenu>li>.submenu>li>a{margin-left:0;padding-left:58px}.skin-2 .sidebar.navbar-collapse .nav-list>li>a>.menu-text,.skin-2 .sidebar.navbar-collapse .nav-list>li.active.highlight>a>.menu-text{border-width:0}}@media only screen and (min-width:992px) and (max-width:991px){.skin-2 .sidebar.navbar-collapse .nav-list>li.hover>.submenu{padding-bottom:0}.skin-2 .sidebar.navbar-collapse .nav-list li.hover>.submenu{border-width:0}.skin-2 .sidebar.navbar-collapse .nav-list li li.hover:hover>a,.skin-2 .sidebar.navbar-collapse .nav-list li li.hover.hover-show>a{background-color:transparent}.skin-2 .sidebar.navbar-collapse .nav-list li li.hover>a:hover{background-color:rgba(0,0,0,.1)}.skin-2 .sidebar.navbar-collapse .nav-list>li>.submenu>li.active.hover:hover>a,.skin-2 .sidebar.navbar-collapse .nav-list>li>.submenu>li.active.hover.hover-show>a{background-color:rgba(0,0,0,.05)}.skin-2 .sidebar.navbar-collapse .nav-list>li>.submenu>li.active.hover>a:hover{background-color:rgba(0,0,0,.1)}.skin-2 .sidebar.navbar-collapse .nav-list>li>.submenu li.hover>.submenu{border-left-width:0t;padding:0}.skin-2 .sidebar.navbar-collapse .nav-list>li>.submenu li.hover>.submenu>li>a{margin-left:0!important;padding-left:37px!important}.skin-2 .sidebar.navbar-collapse .nav-list>li>.submenu li>.submenu>li>.submenu>li>a{margin-left:0!important;padding-left:51px!important}.skin-2 .sidebar.navbar-collapse .nav-list li.hover>.submenu li>a{padding-left:32px!important}.skin-2 .sidebar.navbar-collapse .nav-list li.hover>.submenu li>a>.menu-icon{background-color:transparent}.skin-2 .sidebar.navbar-collapse .nav-list li.hover>.submenu>li.active>a{background-color:transparent;font-weight:400}.skin-2 .sidebar.navbar-collapse .nav-list>li.hover>.submenu>li.active>a{background-color:rgba(0,0,0,.05);font-weight:700}.skin-2 .sidebar.navbar-collapse .nav-list li.hover>.submenu>li.active>a:hover{background-color:rgba(0,0,0,.1)}.skin-2 .sidebar.navbar-collapse .nav-list>li>.submenu li>.submenu>li.hover>a{border-top-width:0}.skin-2 .sidebar.navbar-collapse .nav-list>li .submenu>li.hover>a>.menu-icon{left:12px}.skin-2 .sidebar.navbar-collapse .nav-list>li .submenu>li.hover:hover>a,.skin-2 .sidebar.navbar-collapse .nav-list>li .submenu>li.hover.hover-show>a{background-color:rgba(0,0,0,.1)}.skin-2 .sidebar.navbar-collapse .nav-list>li.active .submenu>li.hover:hover>a,.skin-2 .sidebar.navbar-collapse .nav-list>li.active .submenu>li.hover.hover-show>a{background-color:rgba(0,0,0,.1)}.skin-2 .sidebar.navbar-collapse.menu-min .nav-list li.hover>.submenu li>a{padding-left:32px}}@media only screen and (max-width:991px){.skin-2 .sidebar.navbar-collapse.menu-min .sidebar-shortcuts-large{border-width:0}.skin-2 .sidebar.navbar-collapse.menu-min .nav-list>li>a>.menu-text{font-weight:400;color:#e6e6e6;margin-left:0}.skin-2 .sidebar.navbar-collapse.menu-min .nav-list>li:hover>a>.menu-text{font-weight:700;color:rgba(0,0,0,.6)}.skin-2 .sidebar.navbar-collapse.menu-min .nav-list>li.active>a>.menu-text{font-weight:700;color:#fff}.skin-2 .sidebar.navbar-collapse.menu-min .nav-list>li>.submenu{margin-left:0;border-top-width:0}.skin-2 .sidebar.navbar-collapse.menu-min .nav-list>li>.submenu li>a>.menu-icon{left:12px}}@media (min-width:992px){.skin-2 .sidebar.compact .nav-list>li:before{height:auto;bottom:0}}.skin-2 .main-container .menu-toggler{background-color:#d685b0}.skin-2 .main-container .menu-toggler:before{border-top-color:#FFF;border-bottom-color:#FFF}.skin-2 .main-container .menu-toggler:after{border-top-color:#FFF;border-bottom-color:#FFF}.skin-2 .main-container .menu-toggler>.toggler-text{border-top-color:#d685b0;-moz-border-top-colors:#d685b0}.skin-2 .navbar .navbar-toggle{background-color:#DB78A1}.skin-2 .navbar .navbar-toggle:focus{background-color:#DB78A1;border-color:transparent}.skin-2 .navbar .navbar-toggle:hover{background-color:#d76896;border-color:rgba(255,255,255,.1)}.skin-2 .navbar .navbar-toggle.display,.skin-2 .navbar .navbar-toggle[data-toggle=collapse]:not(.collapsed){background-color:#d2588b;box-shadow:inset 1px 1px 2px 0 rgba(0,0,0,.25);border-color:rgba(255,255,255,.35)}@media only screen and (min-width:768px){.skin-2 .container.main-container:before{box-shadow:0 0 0 1px rgba(255,255,255,.1)}}@media only screen and (min-width:992px){.skin-2 .sidebar.h-sidebar{background-color:#393939}.skin-2 .sidebar.h-sidebar:before{background-color:#767676;border-bottom-color:#7b7b7b}.skin-2 .sidebar.h-sidebar .nav-list{border-bottom-width:0}.skin-2 .sidebar.h-sidebar .nav-list>li>a>.menu-text{color:#e6e6e6;font-weight:400}.skin-2 .sidebar.h-sidebar .nav-list>li:hover>a>.menu-text,.skin-2 .sidebar.h-sidebar .nav-list>li.hover-show>a>.menu-text{color:#fff;font-weight:400}.skin-2 .sidebar.h-sidebar .nav-list>li.active>a>.menu-text{font-weight:700;color:#fff}.skin-2 .sidebar.h-sidebar .nav-list>li:before{left:0;right:0}.skin-2 .sidebar.h-sidebar .nav-list>li.hover>.submenu{margin-left:-1px;border-width:1px;border-top-color:rgba(0,0,0,.4)}.skin-2 .sidebar.h-sidebar .nav-list>li .submenu>li.hover>a{padding-left:22px}.skin-2 .sidebar.h-sidebar .nav-list>li .submenu>li.hover>a>.menu-icon{left:4px}.skin-2 .sidebar.h-sidebar.compact .nav-list>li.active:before{height:2px;bottom:auto}.skin-2 .sidebar.h-sidebar .nav-list>li.highlight.active>a:after{display:none}.skin-2 .sidebar.h-sidebar .nav-list>li.hover.active>a:after{display:block;-moz-border-left-colors:none;-moz-border-right-colors:none;-moz-border-bottom-colors:#FFF;border-color:transparent transparent #FFF;border-width:8px;top:auto;bottom:0;right:auto;left:50%;margin-left:-8px}.skin-2 .sidebar.h-sidebar .nav-list>li.hover.active:hover>a:after,.skin-2 .sidebar.h-sidebar .nav-list>li.hover.active.hover-show>a:after{display:none}.skin-2 .sidebar.h-sidebar .sidebar-shortcuts-large{background-color:#505050;border-width:1px 0 0!important;border-top:1px solid #777;top:100%}.skin-2 .sidebar.h-sidebar .sidebar-shortcuts-mini{padding-top:2px}.skin-2 .sidebar.h-sidebar .sidebar-shortcuts-mini>.btn{padding:7px}.skin-2 .sidebar.h-sidebar .nav-list>li.active.highlight>.arrow:after{border-right-color:transparent;border-bottom-color:#bd5289}.skin-2 .sidebar.h-sidebar .nav-list>li.active.highlight>.arrow:before{border-right-color:transparent;-moz-border-right-colors:none;border-bottom-color:#191919;-moz-border-bottom-colors:#191919}.skin-2 .sidebar.h-sidebar .nav-list>li.hover>.arrow:after{border-right-color:transparent;-moz-border-right-colors:none;border-bottom-color:#45303b;-moz-border-bottom-colors:#45303b}.skin-2 .sidebar.h-sidebar .nav-list>li.hover>.arrow:before{-moz-border-right-colors:none;border-right-color:transparent;border-bottom-color:#191919;-moz-border-bottom-colors:#191919}.skin-2 .sidebar.h-sidebar .sidebar-shortcuts-large:after{border-bottom-color:#505050}.skin-2 .sidebar.h-sidebar .sidebar-shortcuts-large:before{border-bottom-color:#999;-moz-border-bottom-colors:#999}.skin-2 .sidebar.h-sidebar.menu-min .sidebar-shortcuts-mini{padding-top:3px}.skin-2 .sidebar.h-sidebar.menu-min .sidebar-shortcuts-mini>.btn{padding:6px}.skin-2 .sidebar.h-sidebar.menu-min .nav-list>li>a>.menu-text{border-width:1px 0 0 0;border-top-color:rgba(0,0,0,.5)}.skin-2 .sidebar.h-sidebar.menu-min .nav-list>li>.arrow:before,.skin-2 .sidebar.h-sidebar.menu-min .nav-list>li.active.highlight>.arrow:before{-moz-border-bottom-colors:rgba(0,0,0,.7);border-bottom-color:rgba(0,0,0,.7)}.skin-2 .sidebar.h-sidebar.menu-min .nav-list>li:nth-child(1)>.arrow:after,.skin-2 .sidebar.h-sidebar.menu-min .nav-list>li.active.highlight:nth-child(1)>.arrow:after{border-bottom-color:#18a665;-moz-border-bottom-colors:#18a665}.skin-2 .sidebar.h-sidebar.menu-min .nav-list>li:nth-child(2)>.arrow:after,.skin-2 .sidebar.h-sidebar.menu-min .nav-list>li.active.highlight:nth-child(2)>.arrow:after{border-bottom-color:#6ab14a;-moz-border-bottom-colors:#6ab14a}.skin-2 .sidebar.h-sidebar.menu-min .nav-list>li:nth-child(3)>.arrow:after,.skin-2 .sidebar.h-sidebar.menu-min .nav-list>li.active.highlight:nth-child(3)>.arrow:after{border-bottom-color:#98bc1b;-moz-border-bottom-colors:#98bc1b}.skin-2 .sidebar.h-sidebar.menu-min .nav-list>li:nth-child(4)>.arrow:after,.skin-2 .sidebar.h-sidebar.menu-min .nav-list>li.active.highlight:nth-child(4)>.arrow:after{border-bottom-color:#b7c51c;-moz-border-bottom-colors:#b7c51c}.skin-2 .sidebar.h-sidebar.menu-min .nav-list>li:nth-child(5)>.arrow:after,.skin-2 .sidebar.h-sidebar.menu-min .nav-list>li.active.highlight:nth-child(5)>.arrow:after{border-bottom-color:#d9b41f;-moz-border-bottom-colors:#d9b41f}.skin-2 .sidebar.h-sidebar.menu-min .nav-list>li:nth-child(6)>.arrow:after,.skin-2 .sidebar.h-sidebar.menu-min .nav-list>li.active.highlight:nth-child(6)>.arrow:after{border-bottom-color:#dfa020;-moz-border-bottom-colors:#dfa020}.skin-2 .sidebar.h-sidebar.menu-min .nav-list>li:nth-child(7)>.arrow:after,.skin-2 .sidebar.h-sidebar.menu-min .nav-list>li.active.highlight:nth-child(7)>.arrow:after{border-bottom-color:#df7220;-moz-border-bottom-colors:#df7220}.skin-2 .sidebar.h-sidebar.menu-min .nav-list>li:nth-child(8)>.arrow:after,.skin-2 .sidebar.h-sidebar.menu-min .nav-list>li.active.highlight:nth-child(8)>.arrow:after{border-bottom-color:#d43a48;-moz-border-bottom-colors:#d43a48}.skin-2 .sidebar.h-sidebar.menu-min .nav-list>li:nth-child(9)>.arrow:after,.skin-2 .sidebar.h-sidebar.menu-min .nav-list>li.active.highlight:nth-child(9)>.arrow:after{border-bottom-color:#bd5289;-moz-border-bottom-colors:#bd5289}.skin-2 .sidebar.h-sidebar.menu-min .nav-list>li:nth-child(10)>.arrow:after,.skin-2 .sidebar.h-sidebar.menu-min .nav-list>li.active.highlight:nth-child(10)>.arrow:after{border-bottom-color:#b975d0;-moz-border-bottom-colors:#b975d0}.skin-2 .sidebar.h-sidebar.menu-min .nav-list>li:nth-child(11)>.arrow:after,.skin-2 .sidebar.h-sidebar.menu-min .nav-list>li.active.highlight:nth-child(11)>.arrow:after{border-bottom-color:#3f8ad0;-moz-border-bottom-colors:#3f8ad0}.skin-2 .sidebar.h-sidebar.menu-min .nav-list>li:nth-child(12)>.arrow:after,.skin-2 .sidebar.h-sidebar.menu-min .nav-list>li.active.highlight:nth-child(12)>.arrow:after{border-bottom-color:#4bb9ca;-moz-border-bottom-colors:#4bb9ca}.skin-2 .sidebar.h-sidebar.menu-min .nav-list>li.active>.arrow:after{border-bottom-color:#242424;-moz-border-bottom-colors:#242424}.skin-2 .sidebar.h-sidebar.menu-min .nav-list>li.active>.arrow:before{border-bottom-color:#888;-moz-border-bottom-colors:#FFF}.skin-2 .sidebar.h-sidebar.menu-min .nav-list>li>a>.menu-text,.skin-2 .sidebar.h-sidebar.menu-min .nav-list>li.active.highlight>a>.menu-text{border-top-color:#333;border-top-color:rgba(0,0,0,.5)}.skin-2 .sidebar.h-sidebar.menu-min .nav-list>li.active>a>.menu-text{border-top-color:#777}.skin-2 .sidebar.h-sidebar+.main-content .breadcrumbs{border-color:#d5e7f1;top:2px}.skin-2 .h-sidebar.sidebar-fixed+.main-content{padding-top:86px}.skin-2 .h-sidebar.sidebar-fixed.no-gap+.main-content{padding-top:72px}.skin-2 .h-sidebar.sidebar-fixed.menu-min+.main-content{padding-top:61px}.skin-2 .h-sidebar.sidebar-fixed.menu-min.no-gap+.main-content{padding-top:47px}.skin-2 .main-content .h-sidebar.sidebar .nav-list{border-left:1px solid #575757}}.skin-2 .sidebar-scroll .sidebar-shortcuts{border-bottom-color:#555}.skin-2 .sidebar-scroll .sidebar-toggle{border-top-color:#555}.skin-2 .scrollout .scroll-track{background-color:transparent}.skin-2 .scrollout .scroll-bar{background-color:#CCC;background-color:rgba(0,0,0,.2)}@media only screen and (min-width:768px) and (max-width:991px){.skin-2 .navbar.navbar-collapse{background-color:transparent}.skin-2 .navbar.navbar-collapse:before,.skin-2 .navbar.navbar-collapse .navbar-container{background:#c6487e}}.skin-2 .nav-list>li.disabled:before{display:none!important}.skin-2 .nav-list>li.disabled>a,.skin-2 .nav-list>li>a.disabled{background-color:#555!important;color:#CCC!important}.skin-2 .nav-list>li.disabled>a>.menu-text,.skin-2 .nav-list>li>a.disabled>.menu-text{color:#CCC!important}.skin-2 .nav-list>li.disabled>a .label,.skin-2 .nav-list>li>a.disabled .label,.skin-2 .nav-list>li.disabled>a .badge,.skin-2 .nav-list>li>a.disabled .badge{background-color:rgba(0,0,0,.5)!important}.skin-2 .nav-list>li.active.highlight.disabled>a:after,.skin-2 .nav-list>li.active.highlight>a.disabled:after{-moz-border-left-colors:#555!important;border-left-color:#555!important}.skin-2 .nav-list li .submenu>li.disabled>a,.skin-2 .nav-list li .submenu>li>a.disabled,.skin-2 .nav-list li.disabled .submenu>li>a,.skin-2 .nav-list li>a.disabled+.submenu>li>a{background-color:#666!important;color:#DDD!important;cursor:not-allowed!important}.skin-2 .nav-list li .submenu>li.disabled>a>.menu-icon,.skin-2 .nav-list li .submenu>li>a.disabled>.menu-icon,.skin-2 .nav-list li.disabled .submenu>li>a>.menu-icon,.skin-2 .nav-list li>a.disabled+.submenu>li>a>.menu-icon{display:none}.skin-3{background-color:#bbb}.skin-3 .main-container:before{background:#FFF;background:-moz-linear-gradient(top,#eef5fa 0,#fff 8%) 0 4px;background:-webkit-gradient(linear,0 0,0 100%,from(#eef5fa),color-stop(4%,#fff)) 0 4px;background:-webkit-linear-gradient(top,#eef5fa 0,#fff 8%) 0 4px;background:-o-linear-gradient(top,#eef5fa 0,#fff 8%) 0 4px;background:-ms-linear-gradient(top,#eef5fa 0,#fff 8%) 0 4px;background:linear-gradient(top,#eef5fa 0,#fff 8%) 0 4px;-moz-background-size:100% 26px;-webkit-background-size:100% 26px;-o-background-size:100% 26px;-ms-background-size:100% 26px;background-size:100% 26px}@media (min-width:768px){.skin-3 .main-container.container:before{-webkit-box-shadow:0 0 0 1px rgba(50,100,200,.1);box-shadow:0 0 0 1px rgba(50,100,200,.1)}}.skin-3 .navbar{background:#404040}.skin-3 .sidebar{background-color:#dbdbdb;border-style:solid;border-width:0 1px 0 0;border-color:#a4c6dd}.skin-3 .nav-list>li{border-color:#f2f2f2}.skin-3 .nav-list>li>a{background-color:#e3e3e3;color:#5a5a5a}.skin-3 .nav-list>li>a>.arrow{color:inherit}.skin-3 .nav-list>li>a:focus{background-color:#e8e8e8;color:#5a5a5a}.skin-3 .nav-list>li:hover{border-color:#95bad2!important}.skin-3 .nav-list>li:hover+li{border-top-color:#95bad2!important}.skin-3 .nav-list>li.open{border-color:#95bad2!important}.skin-3 .nav-list>li.open+li{border-top-color:#95bad2!important}.skin-3 .nav-list>li.active{border-color:#a4c6dd!important}.skin-3 .nav-list>li.active+li{border-color:#a4c6dd!important}.skin-3 .nav-list>li.active+li:last-child{border-bottom-color:#f2f2f2!important}.skin-3 .nav-list>li.active+li:last-child:hover{border-bottom-color:#95bad2!important}.skin-3 .nav-list>li:hover>a{background-color:#fff;color:#337dbb}.skin-3 .nav-list>li.open>a,.skin-3 .nav-list>li.open:hover>a{color:#337dbb;background-color:#f8f8f8}.skin-3 .nav-list>li.open>a>.arrow{color:inherit}.skin-3 .nav-list>li.active>a,.skin-3 .nav-list>li.active.highlight>a{background-color:#f3faff!important;color:#4d96cb!important}.skin-3 .nav-list>li:hover:before,.skin-3 .nav-list>li.open:before{display:block;background-color:#4f8ab4!important}.skin-3 .nav-list>li.active:before{display:block;background-color:#4D96CB!important}.skin-3 .page-content{background-color:transparent}.skin-3 .infobox-container .infobox:not(.infobox-dark){border-style:solid;background-color:transparent}.skin-3 .nav-list>li.active:after{display:none}.skin-3 .nav-list li.active>a:after{border-right-color:#FFF;-moz-border-right-colors:#FFF;border-width:12px 8px;top:7px;right:-1px}.skin-3 .nav-list li.active>a:before{display:block;content:"";position:absolute;background-color:transparent;border-style:solid;border-color:transparent;border-right-color:#91bad6;-moz-border-right-colors:#91bad6;right:0;border-width:12px 8px;top:7px}.skin-3 .nav-list>li.active>.submenu li.active>a:before,.skin-3 .nav-list>li.active>.submenu li.active>a:after{top:4px}.skin-3 .nav-list li.active.open>a:before{display:none}.skin-3 .nav-list li.highlight.active.open>a:before{display:block}.skin-3 .nav-list li.active:not(.open) li.active>a:before{display:none!important}.skin-3 .nav-list>li.highlight.active>a:after{border-left-color:#f3faff;-moz-border-left-colors:#f3faff}.skin-3 .nav-list>li.highlight.active>a:before{border-left-color:#91bad6;-moz-border-left-colors:#91bad6}.skin-3 .nav-list li>.arrow:before{border-right-color:#7fafcf;-moz-border-right-colors:#7fafcf}.skin-3 .nav-list>li .submenu>li.active:not(.open)>a{background-color:#f5f7fa}.skin-3 .nav-list>li .submenu>li.active:not(.open)>a:hover{background-color:#f1f5f9}@media only screen and (max-width:991px){.skin-3 .sidebar.responsive .nav-list>li.active.open>a:after{display:none}}@media only screen and (min-width:992px){.skin-3 .nav-list li.hover>.submenu{border-color:#99bfd9}}@media only screen and (min-width:992px){.skin-3 .nav-list li.hover.active>a:before{display:block}.skin-3 .nav-list li.hover .submenu>li.active>a:before{display:none}}.skin-3 .sidebar.menu-min .nav-list>li>a>.menu-text{background-color:#f1f5f9;border-color:#A4C6DD}.skin-3 .sidebar.menu-min .nav-list>li.active>a>.menu-text{background-color:#EDF3F7}.skin-3 .sidebar.menu-min .nav-list>li>.submenu{border-color:#A4C6DD;border-top-color:#C9DAE5}.skin-3 .sidebar.menu-min .nav-list>li.active>.arrow:before{border-right-color:#709FBF;-moz-border-right-colors:#709FBF}.skin-3 .sidebar.menu-min .nav-list>li>.arrow:after{border-right-color:#EDF3F7;-moz-border-right-colors:#EDF3F7}.skin-3 .sidebar.menu-min .nav-list li.active>a:after,.skin-3 .sidebar.menu-min .nav-list li.active>a:before{display:none}.skin-3 .sidebar.menu-min .nav-list>li.active>a:after,.skin-3 .sidebar.menu-min .nav-list>li.active>a:before{display:block;border-width:9px 7px;top:10px}.skin-3 .sidebar.menu-min .nav-list>li.active.highlight>a:after,.skin-3 .sidebar.menu-min .nav-list>li.active.highlight>a:before{border-width:20px 0 21px 10px;top:-1px}.skin-3 .sidebar.menu-min .nav-list>li.active:hover>a:after,.skin-3 .sidebar.menu-min .nav-list>li.active.hover-show>a:after,.skin-3 .sidebar.menu-min .nav-list>li.active:hover>a:before,.skin-3 .sidebar.menu-min .nav-list>li.active.hover-show>a:before{display:none}.skin-3 .sidebar.menu-min .sidebar-shortcuts-large{background-color:#F5F5F5}@media only screen and (max-width:991px){.skin-3 .sidebar.menu-min.responsive .nav-list>li.active>a:after,.skin-3 .sidebar.menu-min.responsive .nav-list>li.active>a:before{display:none}}@media only screen and (max-width:991px){.skin-3 .sidebar.responsive{border-bottom-width:1px!important}.skin-3 .sidebar.responsive .nav-list>li.active.open>a:after{display:none}.skin-3 .sidebar.responsive .nav-list>li.active.highlight>a:after,.skin-3 .sidebar.responsive .nav-list>li.active.highlight>a:before{display:block}.skin-3 .sidebar.navbar-collapse{border-bottom-color:#A4C6DD}.skin-3 .nav-list li.active>a:after,.skin-3 .nav-list li.active>a:before{display:none}.skin-3 .sidebar.responsive-min .nav-list>li>a>.menu-text{background-color:#f1f5f9;border-color:#A4C6DD}.skin-3 .sidebar.responsive-min .nav-list>li.active>a>.menu-text{background-color:#EDF3F7}.skin-3 .sidebar.responsive-min .nav-list>li>.submenu{border-color:#A4C6DD;border-top-color:#C9DAE5}.skin-3 .sidebar.responsive-min .nav-list>li.active>.arrow:before{border-right-color:#709FBF;-moz-border-right-colors:#709FBF}.skin-3 .sidebar.responsive-min .nav-list>li>.arrow:after{border-right-color:#EDF3F7;-moz-border-right-colors:#EDF3F7}.skin-3 .sidebar.responsive-min .nav-list li.active>a:after,.skin-3 .sidebar.responsive-min .nav-list li.active>a:before{display:none}.skin-3 .sidebar.responsive-min .nav-list>li.active>a:after,.skin-3 .sidebar.responsive-min .nav-list>li.active>a:before{display:block;border-width:9px 7px;top:10px}.skin-3 .sidebar.responsive-min .nav-list>li.active.highlight>a:after,.skin-3 .sidebar.responsive-min .nav-list>li.active.highlight>a:before{border-width:20px 0 21px 10px;top:-1px}.skin-3 .sidebar.responsive-min .nav-list>li.active:hover>a:after,.skin-3 .sidebar.responsive-min .nav-list>li.active.hover-show>a:after,.skin-3 .sidebar.responsive-min .nav-list>li.active:hover>a:before,.skin-3 .sidebar.responsive-min .nav-list>li.active.hover-show>a:before{display:none}.skin-3 .sidebar.responsive-min .sidebar-shortcuts-large{background-color:#F5F5F5}.skin-3 .sidebar.responsive-max{border-width:0 1px 1px 0}.skin-3 .sidebar.responsive-max .nav-list li.hover.active>a:before{display:none}.skin-3 .sidebar.responsive-max .nav-list>li.active.open>a:after{display:none}.skin-3 .sidebar.responsive-max .nav-list>li.active.highlight>a:after,.skin-3 .sidebar.responsive-max .nav-list>li.active.highlight>a:before{display:block}.skin-3 .sidebar.navbar-collapse .sidebar-shortcuts-large{background-color:transparent}}.skin-3 .sidebar-shortcuts,.skin-3 .sidebar-shortcuts-mini{background-color:#dbdbdb}.skin-3 .sidebar-shortcuts-large>.btn:focus{outline:0}.skin-3 .sidebar>.nav-search{background-color:#dbdbdb}.skin-3 .sidebar-toggle{background-color:#d0d0d0;border-color:#f2f2f2}.skin-3 .sidebar-toggle:before{border-color:#f2f2f2}.skin-3 .sidebar-toggle>.ace-icon{background-color:#fff;background-color:#FFF;border-color:#999;color:#999}.skin-3 .sidebar-scroll .nav-wrap-up+.sidebar-toggle:after{display:block;content:"";position:absolute;top:0;bottom:0;right:-1px;border-right:1px solid #a4c6dd}@media only screen and (max-width:991px){.skin-3 .sidebar.navbar-collapse .nav-list>li:before{height:43px!important}.skin-3 .sidebar.navbar-collapse .sidebar-shortcuts{padding:0 0 3px!important}}@media only screen and (min-width:992px){.skin-3 .nav-list>li.active.hover:hover>a.dropdown-toggle:after,.skin-3 .nav-list>li.active.hover.hover-show>a.dropdown-toggle:after,.skin-3 .nav-list>li.active.hover:hover>a.dropdown-toggle:before,.skin-3 .nav-list>li.active.hover.hover-show>a.dropdown-toggle:before{display:none}}.skin-3 .main-container .menu-toggler{background-color:#62A8D1;color:#FFF}.skin-3 .main-container .menu-toggler:before,.skin-3 .main-container .menu-toggler:after{border-color:#FFF}.skin-3 .main-container .menu-toggler>.toggler-text{border-top-color:#62A8D1;-moz-border-top-colors:#62A8D1}.skin-3 .main-container .menu-toggler>.toggler-text:after{color:#FFF}.skin-3 .navbar .navbar-toggle{border-color:rgba(255,255,255,.15);transition:background-color .1s ease 0s;background-color:#648CAE}.skin-3 .navbar .navbar-toggle:focus{background-color:#648CAE;border-color:rgba(255,255,255,.15)}.skin-3 .navbar .navbar-toggle:hover{background-color:#5782a7;border-color:rgba(255,255,255,.15)}.skin-3 .navbar .navbar-toggle.display,.skin-3 .navbar .navbar-toggle[data-toggle=collapse]:not(.collapsed){background-color:#507899;border-color:rgba(255,255,255,.3)}.skin-3 .breadcrumbs{border-width:0;background-color:#e7f2f8;border-radius:4px;margin:8px 8px 0}@media only screen and (max-width:991px){.skin-3 .breadcrumbs{margin:5px 5px 0}.skin-3 .menu-toggler+.sidebar.responsive+.main-content .breadcrumbs{margin:0;border-radius:0}}@media (min-width:992px){.skin-3 .breadcrumbs.breadcrumbs-fixed+.page-content{padding-top:57px}}@media (min-width:992px) and (max-width:991px){.skin-3 .breadcrumbs.breadcrumbs-fixed+.page-content{padding-top:54px}.skin-3 .menu-toggler+.sidebar.reponsive+.main-content .breadcrumbs.breadcrumbs-fixed+.page-content{padding-top:49px}}@media (min-width:992px) and (max-width:991px){.skin-3 .container.main-container .sidebar.compact+.main-content .breadcrumbs-fixed{width:734px}}@media (min-width:992px) and (max-width:991px){.skin-3 .container.main-container .breadcrumbs-fixed{width:734px}.skin-3 .container.main-container .sidebar.menu-min+.main-content .breadcrumbs-fixed{width:734px}.skin-3 .container.main-container .sidebar.responsive-min+.main-content .breadcrumbs-fixed{width:691px}}@media (min-width:992px){.skin-3 .container.main-container .sidebar.compact+.main-content .breadcrumbs-fixed{width:843px}}@media (min-width:992px){.skin-3 .container.main-container .breadcrumbs-fixed{width:964px}.skin-3 .container.main-container .sidebar+.main-content .breadcrumbs-fixed{width:758px}.skin-3 .container.main-container .sidebar.menu-min+.main-content .breadcrumbs-fixed{width:905px}}@media (min-width:1200px){.skin-3 .container.main-container .sidebar.compact+.main-content .breadcrumbs-fixed{width:1043px}}@media (min-width:1200px){.skin-3 .container.main-container .breadcrumbs-fixed{width:1148px}.skin-3 .container.main-container .sidebar+.main-content .breadcrumbs-fixed{width:958px}.skin-3 .container.main-container .sidebar.menu-min+.main-content .breadcrumbs-fixed{width:1105px}}@media only screen and (max-width:991px){.skin-3 .nav-list li.active>a:before,.skin-3 .nav-list li.active>a:after{display:none}}.skin-3 .sidebar-shortcuts-large>.btn{line-height:26px;border-width:1px}.skin-3 .sidebar-shortcuts-mini{padding-top:3px;padding-bottom:3px;padding-left:1px}.skin-3 .sidebar-shortcuts-mini>.btn{border-width:1px;opacity:1;padding:7px;margin:1px 1px 0 0}@media only screen and (min-width:992px){.skin-3 .sidebar.h-sidebar{background-color:#e3e3e3}.skin-3 .sidebar.h-sidebar:before{background-color:#CBD0D6;border-bottom-width:0}.skin-3 .sidebar.h-sidebar .sidebar-shortcuts-mini>.btn{padding:8px}.skin-3 .sidebar.h-sidebar .sidebar-shortcuts-large{background-color:#FFF;line-height:36px}.skin-3 .sidebar.h-sidebar+.main-content .breadcrumbs{border-color:#d5e7f1;top:2px}.skin-3 .sidebar.h-sidebar .nav-list>li.hover>.submenu{border-color:#A4C6DD}.skin-3 .sidebar.h-sidebar .nav-list>li{border-color:#f2f2f2}.skin-3 .sidebar.h-sidebar .nav-list>li:hover,.skin-3 .sidebar.h-sidebar .nav-list>li:hover+li{border-left-color:#95bad2}.skin-3 .sidebar.h-sidebar .nav-list>li:last-child:hover{border-right-color:#95bad2}.skin-3 .sidebar.h-sidebar .nav-list>li.active,.skin-3 .sidebar.h-sidebar .nav-list>li.active+li,.skin-3 .sidebar.h-sidebar .nav-list>li:hover+li.active{border-left-color:#a4c6dd}.skin-3 .sidebar.h-sidebar .nav-list>li.active:last-child{border-right-color:#a4c6dd}.skin-3 .sidebar.h-sidebar .nav-list>li.active>a:after{left:0;top:auto;right:auto;bottom:-2px;left:50%;margin-left:-7px;border-color:transparent;-moz-border-right-colors:none;border-width:8px 7px!important;border-bottom-color:#FFF;-moz-border-bottom-colors:#FFF}.skin-3 .sidebar.h-sidebar .nav-list>li.active>a:before{display:block;left:0;top:auto;right:auto;bottom:-1px;left:50%;margin-left:-8px!important;border-width:8px!important;border-color:transparent;-moz-border-right-colors:none;border-bottom-color:#74add7;-moz-border-bottom-colors:#74add7}.skin-3 .sidebar.h-sidebar .nav-list>li.hover>.arrow:before{-moz-border-right-colors:none;border-right-color:transparent;border-bottom-color:#7fafcf;-moz-border-bottom-colors:#7fafcf}.skin-3 .sidebar.h-sidebar.menu-min .sidebar-shortcuts{max-width:52px;padding-left:2px;padding-right:2px}.skin-3 .sidebar.h-sidebar.menu-min .sidebar-shortcuts-mini>.btn{padding:7px}.skin-3 .sidebar.h-sidebar.menu-min .nav-list>li.hover>.submenu{border-top-color:#C9DAE5}.skin-3 .sidebar.h-sidebar.menu-min .nav-list>li.active>a>.menu-text{border-left-color:#A4C6DD}.skin-3 .sidebar.h-sidebar.menu-min .nav-list>li>.arrow:after{-moz-border-bottom-colors:#EDF3F7;border-bottom-color:#EDF3F7}}.skin-3 .sidebar-scroll .sidebar-shortcuts{border-bottom-color:1px solid #99B6C9}.skin-3 .sidebar-scroll .sidebar-toggle{border-top-color:#99B6C9}@media only screen and (min-width:768px) and (max-width:991px){.skin-3 .navbar.navbar-collapse{background-color:transparent}.skin-3 .navbar.navbar-collapse:before,.skin-3 .navbar.navbar-collapse .navbar-container{background:#404040}}.skin-3 .nav-list>li.disabled:before{display:none!important}
\ No newline at end of file
diff --git a/NewLife.Cube/Content/ace/css/ace.min.css b/NewLife.Cube/Content/ace/css/ace.min.css
deleted file mode 100644
index d2c4b59fe8..0000000000
--- a/NewLife.Cube/Content/ace/css/ace.min.css
+++ /dev/null
@@ -1 +0,0 @@
-html{min-height:100%;position:relative}body{background-color:#e4e6e9;min-height:100%;padding-bottom:0;font-family:'Open Sans';font-size:13px;color:#393939;line-height:1.5}.main-container:before{display:block;content:"";position:absolute;z-index:-2;width:100%;max-width:inherit;bottom:0;top:0;background-color:#FFF}.main-container.container,.rtl .main-container.container{padding-left:0;padding-right:0}.main-container.container:before{-webkit-box-shadow:0 0 0 1px rgba(0,0,0,.1);box-shadow:0 0 0 1px rgba(0,0,0,.1);width:inherit}@media (max-width:767px){.main-container.container:before{-webkit-box-shadow:none;box-shadow:none;width:100%}}.main-content{margin-left:0;min-height:100%;padding:0}.main-content:before,.main-content:after{content:" ";display:table}.main-content:after{clear:both}.sidebar+.main-content{margin-left:190px}.page-content{background-color:#fff;position:relative;margin:0;padding:8px 20px 24px}.page-header{margin:0 0 12px;border-bottom:1px dotted #e2e2e2;padding-bottom:16px;padding-top:7px}.page-header h1{padding:0;margin:0 8px;font-size:24px;font-weight:lighter;color:#2679b5}.page-header h1 small{margin:0 6px;font-size:14px;font-weight:400;color:#8089a0}.ajax-loading-overlay{position:absolute;z-index:1999;left:0;right:0;top:0;bottom:0;background-color:rgba(255,255,255,.5);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80FFFFFF', endColorstr='#80FFFFFF', GradientType=0)}.ajax-loading-overlay>.ajax-loading-icon{position:relative;left:8px;top:8px}.ajax-loading-overlay.content-loaded{background-color:rgba(255,255,255,.4);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#66FFFFFF', endColorstr='#66FFFFFF', GradientType=0)}.ajax-loading-overlay.almost-loaded{background-color:rgba(255,255,255,.3);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#4CFFFFFF', endColorstr='#4CFFFFFF', GradientType=0)}.ajax-loading-overlay.ajax-overlay-body{position:fixed;z-index:2999}.ajax-loading-overlay.ajax-overlay-body>.ajax-loading-icon{left:8px;top:8px}.ace-icon{text-align:center}a:focus,a:active{text-decoration:none}h1{font-size:32px;font-weight:400;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif}h1.smaller{font-size:31px}h1.bigger{font-size:33px}h1.block{margin-bottom:16px}h2{font-size:26px;font-weight:400;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif}h2.smaller{font-size:25px}h2.bigger{font-size:27px}h2.block{margin-bottom:16px}h3{font-size:22px;font-weight:400;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif}h3.smaller{font-size:21px}h3.bigger{font-size:23px}h3.block{margin-bottom:16px}h4{font-size:18px;font-weight:400;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif}h4.smaller{font-size:17px}h4.bigger{font-size:19px}h4.block{margin-bottom:16px}h5{font-size:15px;font-weight:400;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif}h5.smaller{font-size:14px}h5.bigger{font-size:16px}h5.block{margin-bottom:16px}h6{font-size:13px;font-weight:400;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif}h6.smaller{font-size:12px}h6.bigger{font-size:14px}h6.block{margin-bottom:16px}ul,ol{margin-top:0;margin-bottom:10px;margin-right:0;margin-left:25px;padding:0}ul.margin-5,ol.margin-5{margin-left:5px}ul.margin-10,ol.margin-10{margin-left:10px}ul.margin-15,ol.margin-15{margin-left:15px}ul.margin-20,ol.margin-20{margin-left:20px}li>ul,li>ol{margin-left:18px}.list-unstyled,.list-inline{margin-left:0}.list-unstyled>li>.ace-icon:first-child,.list-inline>li>.ace-icon:first-child{width:18px;text-align:center}.spaced>li{margin-top:9px;margin-bottom:9px}.spaced2>li{margin-top:15px;margin-bottom:15px}li.divider{margin-top:3px;margin-bottom:3px;height:0;font-size:0}.spaced>li.divider{margin-top:5px;margin-bottom:5px}.spaced2>li.divider{margin-top:8px;margin-bottom:8px}li.divider:before{content:"";display:inline-block}blockquote,blockquote.pull-right,.blockquote-reverse{border-color:#e5eaf1}pre.prettyprint{white-space:pre-wrap}.well{border-radius:0}.well h1,.well h2,.well h3,.well h4,.well h5,.well h6{margin-top:0}.well h1,.well h2,.well h3{line-height:36px}.alert{font-size:14px;border-radius:0}.alert .close{font-size:16px}.alert-block p+p{margin-top:10px}.pagination>li>span,.pager>li>span{border-width:1px;border-radius:0!important}.pagination>li>a,.pager>li>a{border-width:1px;border-color:#d4dfe3;border-radius:0!important;color:#2283c5;background-color:#fafafa;margin:0 -1px 0 0;position:relative;z-index:auto}.pagination>li>a:hover,.pager>li>a:hover{color:#1c6ca2;background-color:#eaeff2;border-color:#c1d1d7;z-index:1}.pagination>li>a:focus,.pager>li>a:focus{background-color:#eaeef2}.pagination>li.disabled>a,.pager>li.disabled>a,.pagination>li.disabled>a:hover,.pager>li.disabled>a:hover{background-color:#f9f9f9;border-color:#d9d9d9;z-index:auto}.pagination>li.active>a,.pagination>li.active>a:hover{background-color:#6faed9;border-color:#6faed9;color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,.25);z-index:2}.list-group{margin-left:auto}.list-group-item{border-radius:0!important}.lighter{font-weight:lighter}.bolder{font-weight:bolder}.inline{display:inline-block!important}.block{display:block!important}.center,.align-center{text-align:center!important}.align-left{text-align:left!important}.align-right{text-align:right!important}.middle{vertical-align:middle}.align-middle{vertical-align:middle!important}.align-top{vertical-align:top!important}.align-bottom{vertical-align:bottom!important}.position-relative,.pos-rel{position:relative}.position-absolute,.pos-abs{position:absolute}.no-float{float:none!important}.line-height-normal{line-height:normal!important}.line-height-0{line-height:0!important}.line-height-1{line-height:1!important}.line-height-125{line-height:1.25!important}.line-height-150{line-height:1.5!important}.dark{color:#333!important}.white{color:#fff!important}.red{color:#dd5a43!important}.red2{color:#e08374!important}.light-red{color:#f77!important}.blue{color:#478fca!important}.light-blue{color:#93cbf9!important}.green{color:#69aa46!important}.light-green{color:#b0d877!important}.orange{color:#ff892a!important}.orange2{color:#feb902!important}.light-orange{color:#fcac6f!important}.purple{color:#a069c3!important}.pink{color:#c6699f!important}.pink2{color:#d6487e!important}.brown{color:brown!important}.grey{color:#777!important}.light-grey{color:#bbb!important}.bigger-110{font-size:110%!important}.bigger-120{font-size:120%!important}.bigger-130{font-size:130%!important}.bigger-140{font-size:140%!important}.bigger-150{font-size:150%!important}.bigger-160{font-size:160%!important}.bigger-170{font-size:170%!important}.bigger-180{font-size:180%!important}.bigger-190{font-size:190%!important}.bigger-200{font-size:200%!important}.bigger-210{font-size:210%!important}.bigger-220{font-size:220%!important}.bigger-230{font-size:230%!important}.bigger-240{font-size:240%!important}.bigger-250{font-size:250%!important}.bigger-260{font-size:260%!important}.bigger-270{font-size:270%!important}.bigger-280{font-size:280%!important}.bigger-290{font-size:290%!important}.bigger-300{font-size:300%!important}.bigger-115{font-size:115%!important}.bigger-125{font-size:125%!important}.bigger-175{font-size:175%!important}.bigger-225{font-size:225%!important}.bigger-275{font-size:275%!important}.smaller-90{font-size:90%!important}.smaller-80{font-size:80%!important}.smaller-70{font-size:70%!important}.smaller-60{font-size:60%!important}.smaller-50{font-size:50%!important}.smaller-40{font-size:40%!important}.smaller-30{font-size:30%!important}.smaller-20{font-size:20%!important}.smaller-75{font-size:75%!important}.width-20{width:20%!important}.width-25{width:25%!important}.width-30{width:30%!important}.width-35{width:35%!important}.width-40{width:40%!important}.width-45{width:45%!important}.width-50{width:50%!important}.width-55{width:55%!important}.width-60{width:60%!important}.width-65{width:65%!important}.width-70{width:70%!important}.width-75{width:75%!important}.width-80{width:80%!important}.width-85{width:85%!important}.width-90{width:90%!important}.width-95{width:95%!important}.width-100{width:100%!important}.width-75{width:75%!important}.width-25{width:25%!important}.width-auto{width:auto!important}.height-auto{height:auto!important}.no-padding{padding:0!important}.no-padding-bottom{padding-bottom:0!important}.no-padding-top{padding-top:0!important}.no-padding-left{padding-left:0!important}.no-padding-right{padding-right:0!important}.no-margin{margin:0!important}.no-margin-bottom{margin-bottom:0!important}.no-margin-top{margin-top:0!important}.no-margin-left{margin-left:0!important}.no-margin-right{margin-right:0!important}.no-border{border-width:0}.no-border-bottom{border-bottom-width:0}.no-border-top{border-top-width:0}.no-border-left{border-left-width:0}.no-border-right{border-right-width:0}.overflow-hidden{overflow:hidden!important}.overflow-scroll{overflow-x:hidden!important;overflow-y:scroll!important}.no-radius{border-radius:0!important}.no-text-shadow{text-shadow:none!important}.hr{display:block;height:0;overflow:hidden;font-size:0;border-width:1px 0 0 0;border-top:1px solid #E3E3E3;margin:12px 0;border-top-color:rgba(0,0,0,.11)}.hr-double{height:3px;border-top:1px solid #E3E3E3;border-bottom:1px solid #E3E3E3;border-top-color:rgba(0,0,0,.11);border-bottom-color:rgba(0,0,0,.11)}.hr.dotted,.hr-dotted{border-style:dotted}.hr-32,.hr32{margin:32px 0}.hr-30,.hr30{margin:30px 0}.hr-28,.hr28{margin:28px 0}.hr-26,.hr26{margin:26px 0}.hr-24,.hr24{margin:24px 0}.hr-22,.hr22{margin:22px 0}.hr-20,.hr20{margin:20px 0}.hr-18,.hr18{margin:18px 0}.hr-16,.hr16{margin:16px 0}.hr-14,.hr14{margin:14px 0}.hr-12,.hr12{margin:12px 0}.hr-10,.hr10{margin:10px 0}.hr-8,.hr8{margin:8px 0}.hr-6,.hr6{margin:6px 0}.hr-4,.hr4{margin:4px 0}.hr-2,.hr2{margin:2px 0}.space{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0}[class*=vspace-]{display:none}.space-32{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:32px 0 31px}[class*=vspace-32]{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:32px 0 31px 0}.space-30{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:30px 0 29px}[class*=vspace-30]{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:30px 0 29px 0}.space-28{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:28px 0 27px}[class*=vspace-28]{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:28px 0 27px 0}.space-26{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:26px 0 25px}[class*=vspace-26]{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:26px 0 25px 0}.space-24{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:24px 0 23px}[class*=vspace-24]{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:24px 0 23px 0}.space-22{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:22px 0 21px}[class*=vspace-22]{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:22px 0 21px 0}.space-20{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:20px 0 19px}[class*=vspace-20]{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:20px 0 19px 0}.space-18{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:18px 0 17px}[class*=vspace-18]{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:18px 0 17px 0}.space-16{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:16px 0 15px}[class*=vspace-16]{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:16px 0 15px 0}.space-14{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:14px 0 13px}[class*=vspace-14]{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:14px 0 13px 0}.space-12{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:12px 0 11px}[class*=vspace-12]{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:12px 0 11px 0}.space-10{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:10px 0 9px}[class*=vspace-10]{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:10px 0 9px 0}.space-8{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:8px 0 7px}[class*=vspace-8]{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:8px 0 7px 0}.space-6{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:6px 0 5px}[class*=vspace-6]{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:6px 0 5px 0}.space-4{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:4px 0 3px}[class*=vspace-4]{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:4px 0 3px 0}.space-2{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:2px 0 1px}[class*=vspace-2]{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:2px 0 1px 0}.space-0,[class*=vspace-0]{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:0}@media only screen and (max-width:479px){[class*=vspace-][class*="-xs"]{display:block}}@media only screen and (max-width:767px){[class*=vspace-][class*="-sm"]{display:block}}@media only screen and (max-width:991px){[class*=vspace-][class*="-md"]{display:block}}@media only screen and (max-width:1199px){[class*=vspace-][class*="-lg"]{display:block}}.header{line-height:28px;margin-bottom:16px;margin-top:18px;padding-bottom:4px;border-bottom:1px solid #CCC}.header.blue{border-bottom-color:#d5e3ef}.header.green{border-bottom-color:#cce2c1}.header.purple{border-bottom-color:#e0d1ea}.header.orange{border-bottom-color:#fdd0ac}.header.orange2{border-bottom-color:#fbd36b}.header.red{border-bottom-color:#f3cdc6}.header.grey{border-bottom-color:#c3c3c3}.header.pink{border-bottom-color:#f2e0eb}.header.pink2{border-bottom-color:#e69eb9}.header.light-blue{border-bottom-color:#dceefc}.header.light-red{border-bottom-color:#fec5c5}.header.light-green{border-bottom-color:#d2e7b5}.header.brown{border-bottom-color:#df9393}.header>.ace-icon{margin-right:2px}.action-buttons a{margin:0 3px;display:inline-block;opacity:.85;-webkit-transition:all .1s;-o-transition:all .1s;transition:all .1s}.action-buttons a:hover{text-decoration:none;opacity:1;-moz-transform:scale(1.2);-webkit-transform:scale(1.2);-o-transform:scale(1.2);-ms-transform:scale(1.2);transform:scale(1.2)}.navbar{margin:0;padding-left:0;padding-right:0;border-width:0;border-radius:0;-webkit-box-shadow:none;box-shadow:none;min-height:45px;background:#438eb9}.navbar .navbar-text,.navbar .navbar-link{color:#fff}.navbar .navbar-brand{color:#fff;font-size:24px;text-shadow:none;padding-top:10px;padding-bottom:10px;height:auto}.navbar .navbar-brand:hover,.navbar .navbar-brand:focus{color:#fff}@media only screen and (min-width:992px){.navbar-container{padding-left:10px;padding-right:10px}}.navbar-container.container{padding-left:0;padding-right:0}.ace-nav{height:100%;margin:0!important}.ace-nav>li{line-height:45px;height:45px;border-left:1px solid #E1E1E1;padding:0;position:relative;float:left}.ace-nav>li:first-child{border-left-width:0}.ace-nav>li>a{background-color:#2e6589;color:#FFF;display:block;line-height:inherit;text-align:center;height:100%;width:auto;min-width:50px;padding:0 8px;position:relative}.ace-nav>li>a>.ace-icon{display:inline-block;font-size:16px;color:#FFF;text-align:center;width:20px}.ace-nav>li>a>.badge{position:relative;top:-4px;left:2px;padding-right:5px;padding-left:5px}.ace-nav>li>a:hover,.ace-nav>li>a:focus,.ace-nav>li.open>a{background-color:#2c5976;color:#FFF}.ace-nav>li.blue>a{background-color:#2e6589}.ace-nav>li.blue>a:hover,.ace-nav>li.blue>a:focus,.ace-nav>li.open.blue>a{background-color:#2c5976}.ace-nav>li.grey>a{background-color:#555}.ace-nav>li.grey>a:hover,.ace-nav>li.grey>a:focus,.ace-nav>li.open.grey>a{background-color:#4b4b4b}.ace-nav>li.purple>a{background-color:#892e65}.ace-nav>li.purple>a:hover,.ace-nav>li.purple>a:focus,.ace-nav>li.open.purple>a{background-color:#762c59}.ace-nav>li.green>a{background-color:#2e8965}.ace-nav>li.green>a:hover,.ace-nav>li.green>a:focus,.ace-nav>li.open.green>a{background-color:#2c7659}.ace-nav>li.light-blue>a{background-color:#62a8d1}.ace-nav>li.light-blue>a:hover,.ace-nav>li.light-blue>a:focus,.ace-nav>li.open.light-blue>a{background-color:#579ec8}.ace-nav>li.light-blue2>a{background-color:#42a8e1}.ace-nav>li.light-blue2>a:hover,.ace-nav>li.light-blue2>a:focus,.ace-nav>li.open.light-blue2>a{background-color:#359fd9}.ace-nav>li.red>a{background-color:#b74635}.ace-nav>li.red>a:hover,.ace-nav>li.red>a:focus,.ace-nav>li.open.red>a{background-color:#a34335}.ace-nav>li.light-green>a{background-color:#9abc32}.ace-nav>li.light-green>a:hover,.ace-nav>li.light-green>a:focus,.ace-nav>li.open.light-green>a{background-color:#8ba832}.ace-nav>li.light-purple>a{background-color:#cb6fd7}.ace-nav>li.light-purple>a:hover,.ace-nav>li.light-purple>a:focus,.ace-nav>li.open.light-purple>a{background-color:#c263ce}.ace-nav>li.light-orange>a{background-color:#f79263}.ace-nav>li.light-orange>a:hover,.ace-nav>li.light-orange>a:focus,.ace-nav>li.open.light-orange>a{background-color:#f28653}.ace-nav>li.light-pink>a{background-color:#f4dae5}.ace-nav>li.light-pink>a:hover,.ace-nav>li.light-pink>a:focus,.ace-nav>li.open.light-pink>a{background-color:#eeccda}.ace-nav>li.dark>a{background-color:#404040}.ace-nav>li.dark>a:hover,.ace-nav>li.dark>a:focus,.ace-nav>li.open.dark>a{background-color:#363636}.ace-nav>li.white-opaque>a{background-color:rgba(255,255,255,.8)}.ace-nav>li.white-opaque>a:hover,.ace-nav>li.white-opaque>a:focus,.ace-nav>li.open.white-opaque>a{background-color:rgba(245,245,245,.8)}.ace-nav>li.dark-opaque>a{background-color:rgba(0,0,0,.2)}.ace-nav>li.dark-opaque>a:hover,.ace-nav>li.dark-opaque>a:focus,.ace-nav>li.open.dark-opaque>a{background-color:rgba(0,0,0,.2)}.ace-nav>li.transparent>a{background-color:transparent}.ace-nav>li.transparent>a:hover,.ace-nav>li.transparent>a:focus,.ace-nav>li.open.transparent>a{background-color:rgba(0,0,0,.1)}.ace-nav>li.light-10>a{background-color:rgba(255,255,255,.1)}.ace-nav>li.light-10>a:hover,.ace-nav>li.light-10>a:focus,.ace-nav>li.open.light-10>a{background-color:rgba(255,255,255,.2)}.ace-nav>li.dark-10>a{background-color:rgba(0,0,0,.1)}.ace-nav>li.dark-10>a:hover,.ace-nav>li.dark-10>a:focus,.ace-nav>li.open.dark-10>a{background-color:rgba(0,0,0,.2)}.ace-nav>li.margin-4{margin-left:4px}.ace-nav>li.margin-3{margin-left:3px}.ace-nav>li.margin-2{margin-left:2px}.ace-nav>li.margin-1{margin-left:1px}.ace-nav>li.no-border{border-width:0!important}.ace-nav>li .dropdown-menu{z-index:1031}.ace-nav .nav-user-photo{margin:-4px 8px 0 0;border-radius:100%;border:2px solid #FFF;max-width:40px}.ace-nav li.dropdown-footer a .ace-icon{display:inline-block;width:1.25em;text-align:center}@media only screen and (max-height:540px){.ace-nav>li>.dropdown-menu{position:fixed;margin-top:auto;z-index:1042}.ace-nav>li>.dropdown-menu:before,.ace-nav>li>.dropdown-menu:after{display:none}.ace-nav .user-menu>li>a{padding-top:6px;padding-bottom:6px}.ace-nav>li.open:before{background-color:#000;opacity:.5;border-width:0;position:fixed;left:0;right:0;top:0;bottom:0;content:"";display:block;height:2000px;width:auto;z-index:1041}}@media only screen and (max-width:767px){.ace-nav>li:nth-last-child(4)>.dropdown-menu.dropdown-menu-right{right:-100px}.ace-nav>li:nth-last-child(4)>.dropdown-menu.dropdown-menu-right:before,.ace-nav>li:nth-last-child(4)>.dropdown-menu.dropdown-menu-right:after{right:120px}.ace-nav>li:nth-last-child(3)>.dropdown-menu.dropdown-menu-right{right:-80px}.ace-nav>li:nth-last-child(3)>.dropdown-menu.dropdown-menu-right:before,.ace-nav>li:nth-last-child(3)>.dropdown-menu.dropdown-menu-right:after{right:100px}.user-menu.dropdown-close.dropdown-menu-right{right:0!important}}@media only screen and (min-width:480px) and (max-width:767px){.navbar.navbar-collapse .ace-nav>li:nth-last-child(2):nth-child(1)>.dropdown-menu.dropdown-menu-right,.navbar.navbar-collapse .ace-nav>li:nth-last-child(2):nth-child(2)>.dropdown-menu.dropdown-menu-right{left:auto;right:-60px}.navbar.navbar-collapse .ace-nav>li:nth-last-child(2):nth-child(1)>.dropdown-menu.dropdown-menu-right:before,.navbar.navbar-collapse .ace-nav>li:nth-last-child(2):nth-child(2)>.dropdown-menu.dropdown-menu-right:before,.navbar.navbar-collapse .ace-nav>li:nth-last-child(2):nth-child(1)>.dropdown-menu.dropdown-menu-right:after,.navbar.navbar-collapse .ace-nav>li:nth-last-child(2):nth-child(2)>.dropdown-menu.dropdown-menu-right:after{right:80px;left:auto}}@media only screen and (max-width:480px){.ace-nav>li:nth-last-child(4)>.dropdown-menu.dropdown-menu-right{right:-120px}.ace-nav>li:nth-last-child(4)>.dropdown-menu.dropdown-menu-right:before,.ace-nav>li:nth-last-child(4)>.dropdown-menu.dropdown-menu-right:after{right:140px}.ace-nav>li:nth-last-child(3)>.dropdown-menu.dropdown-menu-right{right:-90px}.ace-nav>li:nth-last-child(3)>.dropdown-menu.dropdown-menu-right:before,.ace-nav>li:nth-last-child(3)>.dropdown-menu.dropdown-menu-right:after{right:110px}.ace-nav>li:nth-last-child(2)>.dropdown-menu.dropdown-menu-right{right:-50px}.ace-nav>li:nth-last-child(2)>.dropdown-menu.dropdown-menu-right:before,.ace-nav>li:nth-last-child(2)>.dropdown-menu.dropdown-menu-right:after{right:70px}}@media only screen and (max-width:479px){.ace-nav>li:nth-last-child(4)>.dropdown-menu.dropdown-menu-right{left:-10px;right:auto}.ace-nav>li:nth-last-child(4)>.dropdown-menu.dropdown-menu-right:before,.ace-nav>li:nth-last-child(4)>.dropdown-menu.dropdown-menu-right:after{right:auto;left:30px}.ace-nav>li:nth-last-child(3)>.dropdown-menu.dropdown-menu-right{left:-50px;right:auto}.ace-nav>li:nth-last-child(3)>.dropdown-menu.dropdown-menu-right:before,.ace-nav>li:nth-last-child(3)>.dropdown-menu.dropdown-menu-right:after{left:75px;right:auto}.ace-nav>li:nth-last-child(2)>.dropdown-menu.dropdown-menu-right{left:-70px;right:auto}.ace-nav>li:nth-last-child(2)>.dropdown-menu.dropdown-menu-right:before,.ace-nav>li:nth-last-child(2)>.dropdown-menu.dropdown-menu-right:after{left:90px;right:auto}}@media only screen and (max-width:319px){.ace-nav>li:nth-last-child(2)>.dropdown-menu.dropdown-menu-right{left:-110px;right:auto}.ace-nav>li:nth-last-child(2)>.dropdown-menu.dropdown-menu-right:before,.ace-nav>li:nth-last-child(2)>.dropdown-menu.dropdown-menu-right:after{left:130px;right:auto}.ace-nav>li:nth-child(2):nth-last-child(2)>.dropdown-menu.dropdown-menu-right{left:-85px;right:auto}.ace-nav>li:nth-child(2):nth-last-child(2)>.dropdown-menu.dropdown-menu-right:before,.ace-nav>li:nth-child(2):nth-last-child(2)>.dropdown-menu.dropdown-menu-right:after{left:105px;right:auto}.ace-nav>li:nth-child(1):nth-last-child(3)>.dropdown-menu.dropdown-menu-right{left:-35px;right:auto}.ace-nav>li:nth-child(1):nth-last-child(3)>.dropdown-menu.dropdown-menu-right:before,.ace-nav>li:nth-child(1):nth-last-child(3)>.dropdown-menu.dropdown-menu-right:after{left:55px;right:auto}.ace-nav>li:nth-child(1):nth-last-child(2)>.dropdown-menu.dropdown-menu-right{left:-60px;right:auto}.ace-nav>li:nth-child(1):nth-last-child(2)>.dropdown-menu.dropdown-menu-right:before,.ace-nav>li:nth-child(1):nth-last-child(2)>.dropdown-menu.dropdown-menu-right:after{left:75px;right:auto}}@media only screen and (max-width:479px){.navbar:not(.navbar-collapse) .navbar-header{float:none!important;display:block}.navbar:not(.navbar-collapse) .ace-nav{display:block;float:none!important;text-align:center;background-color:rgba(0,0,0,.15);border:1px solid rgba(0,0,0,.1);border-width:1px 0 0;letter-spacing:-3px}.navbar:not(.navbar-collapse) .ace-nav>li{display:inline-block;float:none!important;text-align:left;letter-spacing:normal}.navbar:not(.navbar-collapse) .ace-nav>li:first-child{border-left:1px solid rgba(255,255,255,.4)}.navbar:not(.navbar-collapse) .ace-nav>li:last-child{border-right:1px solid rgba(255,255,255,.4)}}@media only screen and (max-width:319px){.ace-nav>li>a{padding:0 5px!important}}.user-menu>li>a{padding:4px 12px}.user-menu>li>a>.ace-icon{margin-right:6px;font-size:120%}.user-info{max-width:100px;display:inline-block;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;text-align:left;vertical-align:top;line-height:15px;position:relative;top:6px}.user-info small{display:block}@media (min-width:480px) and (max-width:540px),(max-width:360px){.navbar:not(.navbar-collapse) .navbar-buttons .user-menu{padding-top:42px!important}.navbar:not(.navbar-collapse) .navbar-buttons .nav-user-photo{margin-right:0}.navbar:not(.navbar-collapse) .navbar-buttons .user-info{position:absolute;margin-top:40px;margin-left:1px;right:2px;z-index:1032;color:#777;font-size:14px;width:156px;max-width:156px;padding-left:8px;padding-right:8px;height:32px;line-height:26px!important;display:none;border-bottom:1px solid #E5E5E5;text-align:center;vertical-align:none;line-height:normal;cursor:text}.navbar:not(.navbar-collapse) .navbar-buttons .user-info>small{display:inline;opacity:1}li.open .user-info{display:inline-block!important}}@media (max-width:360px){.navbar.navbar-collapse .navbar-buttons .user-menu{padding-top:42px!important}.navbar.navbar-collapse .navbar-buttons .nav-user-photo{margin-right:0}.navbar.navbar-collapse .navbar-buttons .user-info{position:absolute;margin-top:40px;margin-left:1px;right:2px;z-index:1032;color:#777;font-size:14px;width:156px;max-width:156px;padding-left:8px;padding-right:8px;height:32px;line-height:26px!important;display:none;border-bottom:1px solid #E5E5E5;text-align:center;vertical-align:none;line-height:normal;cursor:text}.navbar.navbar-collapse .navbar-buttons .user-info>small{display:inline;opacity:1}li.open .user-info{display:inline-block!important;right:2px}}@media (min-width:992px){.user-min .user-menu{padding-top:42px!important}.user-min .nav-user-photo{margin-right:0}.user-min .user-info{position:absolute;margin-top:40px;margin-left:1px;right:2px;z-index:1032;color:#777;font-size:14px;width:156px;max-width:156px;padding-left:8px;padding-right:8px;height:32px;line-height:26px!important;display:none;border-bottom:1px solid #E5E5E5;text-align:center;vertical-align:none;line-height:normal;cursor:text}.user-min .user-info>small{display:inline;opacity:1}.user-min .user-info{right:-3px}.user-min.open .user-info{display:inline-block!important}}@media (max-height:540px) and (min-width:480px) and (max-width:540px),(max-height:540px) and (max-width:360px){.navbar:not(.navbar-collapse) .navbar-buttons .user-info{position:fixed;right:auto;margin-top:auto;max-width:none}}@media (max-height:540px) and (max-width:360px){.navbar.navbar-collapse .navbar-buttons .user-info{position:fixed;right:auto;margin-top:auto;max-width:none}}@media (max-height:540px) and (min-width:992px){.user-min .user-info{position:fixed;right:auto;margin-top:auto;max-width:none}}@media only screen and (max-width:991px){.navbar.navbar-collapse{max-height:none}.navbar .navbar-header,.navbar .navbar-collapse{margin-left:0!important;margin-right:0!important}.navbar.navbar-collapse .navbar-header{float:none!important;min-height:45px}.navbar.navbar-collapse .navbar-buttons{min-height:0;padding-left:0;padding-right:0;border:1px solid rgba(255,255,255,.4);border-width:1px 0 0;width:100%}.navbar.navbar-collapse .navbar-buttons.in{overflow:visible!important}.navbar.navbar-collapse .navbar-buttons>.ace-nav{display:block;float:none!important;text-align:center;background-color:transparent!important;border-width:0;letter-spacing:-3px}.navbar.navbar-collapse .navbar-buttons>.ace-nav>li{display:inline-block;float:none!important;text-align:left;letter-spacing:normal}.navbar.navbar-collapse .navbar-buttons>.ace-nav>li:first-child{border-left:1px solid rgba(255,255,255,.4)}.navbar.navbar-collapse .navbar-buttons>.ace-nav>li:last-child{border-right:1px solid rgba(255,255,255,.4)}}.container>.navbar-buttons,.container-fluid>.navbar-buttons{padding-right:0!important}@media only screen and (max-height:400px){.navbar-fixed-top .navbar-collapse{max-height:280px}}@media only screen and (max-height:360px){.navbar-fixed-top .navbar-collapse{max-height:240px}}@media only screen and (max-height:320px){.navbar-fixed-top .navbar-collapse{max-height:200px}}@media only screen and (max-height:280px){.navbar-fixed-top .navbar-collapse{max-height:160px}}@media only screen and (max-height:240px){.navbar-fixed-top .navbar-collapse{max-height:120px}}.navbar .navbar-nav>li{border:1px solid rgba(0,0,0,.2);border-width:0 1px 0 0}.navbar .navbar-nav>li:first-child{border-width:0 1px 0 1px}.navbar .navbar-nav>li>a{padding-top:12px;padding-bottom:11px;height:45px;background-color:transparent;font-size:13px;color:#fff;text-shadow:0 1px 0 rgba(0,0,0,.25)}.navbar .navbar-nav>li>a:hover,.navbar .navbar-nav>li>a:focus,.navbar .navbar-nav>li.open>a{background-color:rgba(0,0,0,.1)!important;color:#fff!important}.navbar .navbar-nav>li>.dropdown-menu>li>a{line-height:2}.navbar-nav .dropdown-menu>li>a>.ace-icon{display:inline-block;width:20px}.navbar-nav>li>.dropdown-menu{z-index:1033}@media only screen and (max-width:991px){.navbar.navbar-collapse .navbar-menu{float:none!important;clear:both}.navbar.navbar-collapse .navbar-menu .dropdown-menu:after,.navbar.navbar-collapse .navbar-menu .dropdown-menu:before{display:none!important}.navbar .navbar-nav{margin:0 -6px}.navbar .navbar-nav>li,.navbar .navbar-nav>li:first-child{border-width:1px 0 0}.navbar .navbar-nav .dropdown-menu{float:none;position:relative;background-color:transparent;box-shadow:none;border-width:0}.navbar .navbar-nav .dropdown-menu>li>a{color:#FFF!important}.navbar .navbar-nav .dropdown-menu>li>a:hover{background-color:rgba(0,0,0,.07)!important}.navbar .navbar-nav .dropdown-menu>li>a>.ace-icon{color:#FFF!important}.navbar .navbar-nav .dropdown-hover>.dropdown-menu{left:32px!important;right:auto!important;top:auto!important;width:80%!important;width:calc(100% - 32px)}}.navbar-form.form-search{margin-top:9px;margin-bottom:0}.navbar-form.form-search .form-group{margin-bottom:0}.navbar-form.form-search input[type=text]{width:100px}.navbar-form input[type=text]{font-size:13px;line-height:1.4;padding-top:4px;padding-bottom:4px;border-width:0}@media only screen and (max-width:991px){.navbar-form .form-group{display:inline-block;width:50%;margin-bottom:0;vertical-align:middle}.navbar-form.form-search input[type=text]{width:100%}.navbar-nav+.navbar-form{margin-top:0}.navbar .navbar-collapse,.navbar .navbar-form{border-color:rgba(255,255,255,.4)}.navbar .navbar-nav>li:first-child{border-top-width:0}}@media only screen and (max-width:480px){.navbar-form .form-group{width:80%}}.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse,.navbar-fixed-bottom .navbar-collapse{padding-left:12px;padding-right:12px}@media only screen and (min-width:768px) and (max-width:991px){.navbar.navbar-collapse{background-color:transparent}.navbar.navbar-collapse:before{background:#438eb9;content:"";display:block;position:absolute;min-height:inherit;left:0;right:0;top:0;z-index:-1;border-radius:inherit}.navbar.navbar-collapse .navbar-container{background-color:#438eb9}}.navbar .navbar-toggle{border:1px solid transparent;width:40px;height:35px;line-height:0;padding:0 0 1px;text-align:center}.navbar .navbar-toggle.pull-right{margin:5px 6px 4px 0}.navbar .navbar-toggle.pull-left{margin:5px 0 4px 6px}.navbar .navbar-toggle:active{top:1px}.navbar .navbar-toggle.navbar-toggle-img{width:auto;height:auto;overflow:hidden;padding:0;border-width:0}.navbar .navbar-toggle.navbar-toggle-img>img{border-radius:inherit;max-height:35px;border-width:0}.navbar .navbar-toggle .icon-bar{background-color:#FFF;border-radius:0;width:24px;margin-left:7px}.sidebar{width:190px;float:left;position:static;padding-left:0;padding-right:0}.sidebar:before{content:"";display:block;width:inherit;position:absolute;top:0;bottom:0;z-index:-1;background-color:inherit;border-style:inherit;border-color:inherit;border-width:inherit}.nav-list{margin:0;padding:0;list-style:none}.nav-list>li,.nav-list>li>a,.nav-list .nav-header{margin:0}.nav-list li>a:focus{outline:0}.nav-list>li{display:block;position:relative;float:none;padding:0;border-style:solid;border-width:1px 0 0}.nav-list>li:last-child{border-bottom-width:1px}.nav-list>li.active>a{font-weight:700}.nav-list>li>a{display:block;height:39px;line-height:17px;padding-left:7px;text-shadow:none!important;font-size:13px;text-decoration:none}.nav-list>li>a>.menu-icon{display:inline-block;min-width:30px;margin-right:2px;vertical-align:sub;text-align:center;font-size:18px;font-weight:400}.nav-list>li:before{display:none;content:"";position:absolute;top:-1px;left:0;z-index:1;height:41px;width:3px;max-width:3px;overflow:hidden;background-color:#629cc9}@media only screen and (min-width:992px){.main-container.container .sidebar:not(.h-sidebar) .nav-list>li:before{left:-2px}}.main-container.container .sidebar.sidebar-fixed:not(.h-sidebar) .nav-list>li:before{left:0}.nav-list>li:hover:before{display:block}.nav-list>li a>.arrow{display:block;width:14px!important;height:14px;line-height:14px;text-shadow:none;font-size:18px;position:absolute;right:10px;top:12px;padding:0;text-align:center}.nav-list>li.separator{height:3px;background-color:transparent;position:static;margin:1px 0;-webkit-box-shadow:none;box-shadow:none}.nav-list>li.active .submenu{display:block}.nav-list>li .submenu{display:none;list-style:none;margin:0;padding:0;line-height:1.5;position:relative}.nav-list>li .submenu>li{margin-left:0;position:relative}.nav-list>li .submenu>li>a{display:block;position:relative;padding:7px 0 9px 37px;margin:0;border-top-width:1px;border-top-style:dotted}.nav-list>li .submenu>li>a:hover{text-decoration:none}.nav-list>li .submenu>li a>.menu-icon{display:none;font-size:12px;font-weight:400;width:18px;height:auto;line-height:12px;text-align:center;position:absolute;left:10px;top:11px;z-index:1;background-color:inherit}.nav-list>li .submenu>li.active>a>.menu-icon,.nav-list>li .submenu>li:hover>a>.menu-icon{display:inline-block}.nav-list>li>.submenu{border-top:1px solid}.nav-list>li>.submenu>li:before{content:"";display:block;width:7px;position:absolute;z-index:1;left:20px;top:17px;border:1px dotted;border-width:1px 0 0}.nav-list>li>.submenu:before{content:"";display:block;position:absolute;z-index:1;left:18px;top:0;bottom:0;border:1px dotted;border-width:0 0 0 1px}.nav-list li:hover>a>.arrow,.nav-list li.active>a>.arrow,.nav-list li.open>a>.arrow{color:inherit}.nav-list li.open>.submenu{display:block}no_such_element:-o-prefocus,.nav-list>li>a>.menu-icon{vertical-align:middle}.nav-list>li>.submenu li>.submenu{display:none}.nav-list>li>.submenu li.active>.submenu{display:block}.nav-list>li>.submenu a>.arrow{right:10px;top:10px;font-size:16px}.nav-list>li>.submenu>li:first-child>a{border-top-width:0}.nav-list>li>.submenu li>.submenu>li{line-height:18px}.nav-list>li>.submenu li>.submenu>li:before{display:none}.nav-list>li>.submenu li>.submenu>li>a{margin-left:20px;padding-left:22px}.nav-list>li>.submenu li>.submenu>li>.submenu>li>a{margin-left:20px;padding-left:38px}.nav-list>li>.submenu li>.submenu>li a>.menu-icon{display:inline-block;width:auto;position:static;background-color:transparent;margin-right:4px;color:inherit}.nav-list>li>.submenu li>.submenu>li a .menu-icon,.nav-list>li>.submenu li>.submenu>li a .arrow{color:inherit}.nav-list>li>.submenu li.open:not(.hover)>a>.menu-icon{display:inline-block}.nav-list a .badge,.nav-list a .label{position:absolute;top:9px;right:10px;opacity:.88;font-size:12px;padding-left:6px;padding-right:6px}.nav-list a .badge .ace-icon,.nav-list a .label .ace-icon{vertical-align:middle;margin:0}.nav-list a.dropdown-toggle .badge,.nav-list a.dropdown-toggle .label{right:26px}.nav-list li:hover>a .badge,.nav-list li:hover>a .label{opacity:1}.nav-list .submenu .submenu a .badge,.nav-list .submenu .submenu a .label{top:6px}.sidebar.sidebar-fixed{position:fixed;top:auto;float:none!important;z-index:1027}.sidebar.sidebar-fixed:before{height:5000px;top:auto;bottom:auto}body.mob-safari .sidebar.sidebar-fixed{top:45px}@media (max-width:479px){body.mob-safari .navbar-fixed-top:not(.navbar-collapse)+.main-container .sidebar-fixed{top:90px}}@media (max-width:991px){body.mob-safari .navbar-fixed-top+.main-container .sidebar.responsive{top:45px}}@media (max-width:479px){body.mob-safari .navbar-fixed-top+.main-container .sidebar.responsive{top:90px}}@media only screen and (max-width:991px){.responsive.sidebar-fixed{left:auto;margin-left:auto}.navbar-fixed-top+.main-container>.responsive{position:fixed;left:auto;margin-left:auto}.navbar-fixed-top+.main-container>.menu-toggler+.responsive{position:absolute;left:190px;margin-left:-190px}.navbar-fixed-top+.main-container>.menu-toggler+.responsive.sidebar-fixed{position:fixed;left:auto;margin-left:auto}}@media only screen and (max-width:991px){.sidebar.responsive.sidebar-fixed{position:fixed;left:auto;margin-left:auto}.main-container .menu-toggler.fixed{position:fixed;left:auto;z-index:1026}.sidebar.sidebar-fixed.responsive-max{position:fixed;left:auto;margin-left:auto}}.sidebar .sidebar-toggle{border-style:solid;border-width:0 0 1px;text-align:center;padding:3px 0;position:relative}.sidebar .sidebar-toggle>.ace-icon{padding:0 5px;line-height:18px;cursor:pointer;font-size:14px;border-radius:100%;border:1px solid;position:relative}.sidebar .sidebar-toggle:before{content:"";display:block;height:0;border-top:1px solid;border-color:inherit;position:absolute;left:15px;right:15px;top:13px}.sidebar .sidebar-shortcuts{text-align:center;min-height:40px;margin-bottom:0;overflow:hidden;position:relative;border:0 solid}.sidebar .sidebar-shortcuts:empty{display:none}.sidebar .sidebar-shortcuts-large{line-height:37px}.sidebar .sidebar-shortcuts-large>.btn{text-align:center;width:41px;line-height:24px;padding:0;border-width:4px}.sidebar .sidebar-shortcuts-large>.btn>.ace-icon{margin:0}.sidebar .sidebar-shortcuts-mini{display:none;font-size:0;width:42px;padding-top:2px;padding-bottom:2px}.sidebar .sidebar-shortcuts-mini>.btn{border-width:0;font-size:0;line-height:0;padding:8px;margin:1px;border-radius:0;opacity:.85;filter:alpha(opacity=85)}@media screen and (-webkit-min-device-pixel-ratio:0){.sidebar ::safari-only,.sidebar .sidebar-shortcuts-mini>.btn{margin:0}}.nav-list li.active>a:after{display:block;content:"";position:absolute;right:0;top:4px;border:8px solid transparent;border-width:14px 10px}.nav-list li.open>a:after{display:none}.nav-list li.active.no-active-child>a:after{display:block}.nav-list>li li.active>a:after{top:2px;border-width:14px 8px}.nav-list li.active:not(.open) li.active>a:after{display:none!important}@media (min-width:992px){.sidebar.compact,.sidebar.compact.navbar-collapse{width:105px}.sidebar.compact .sidebar-shortcuts{max-height:40px}.sidebar.compact .nav-list>li:before{height:auto;bottom:-1px}.sidebar.compact .nav-list>li>a{height:auto;line-height:16px;padding:2px 0 8px;text-align:center}.sidebar.compact .nav-list>li>a>.menu-icon{display:block;margin:0;vertical-align:inherit;line-height:32px;height:32px;font-size:20px}.sidebar.compact .nav-list>li>a>.arrow{display:none}.sidebar.compact .nav-list a .badge,.sidebar.compact .nav-list a .label{right:12px}.sidebar.compact .nav-list>li.active>.submenu,.sidebar.compact .nav-list>li.open>.submenu{display:none}.sidebar.compact+.main-content{margin-left:105px}}@media (min-width:992px) and (max-width:991px){.sidebar.compact+.main-content{margin-left:0}.sidebar.navbar-collapse.compact .nav-list>li>a{text-align:left;height:39px;line-height:37px;padding:0 16px 0 7px}.sidebar.navbar-collapse.compact .nav-list>li>a>.menu-icon{display:inline-block;vertical-align:sub;height:auto;line-height:inherit;margin:0 2px 0 0;font-size:18px}.sidebar.navbar-collapse.compact .nav-list>li>a>.menu-text{display:inline}.sidebar.navbar-collapse.compact .nav-list>li>a>.arrow{display:inline}.sidebar.navbar-collapse.compact+.main-content{margin-left:0}}@media only screen and (min-width:992px){.nav-list li.hover>.submenu{position:absolute;left:100%;margin-left:-2px;top:-10px;bottom:auto;z-index:1026;width:190px;border:1px solid;display:none!important}.nav-list li.hover:hover>.submenu,.nav-list li.hover.hover-show>.submenu{display:block!important}.nav-list li.hover>.submenu:before,.nav-list li.hover>.submenu>li:before{display:none}.nav-list li.hover.active>a:after{display:block}.nav-list li.hover.active:hover>a.dropdown-toggle:after,.nav-list li.hover.active.hover-show>a.dropdown-toggle:after{display:none}.nav-list li.hover .submenu>li.active>a:after{display:none!important}.nav-list li.hover>.submenu.bottom{top:auto;bottom:-10px}.nav-list li.hover>.submenu.bottom:before,.nav-list li.hover>.submenu.bottom:after{top:auto;bottom:18px}.nav-list li.hover>.submenu{padding:0 2px}.nav-list li.hover>.submenu>li>a{margin-top:2px;margin-bottom:2px;padding-left:18px;border-top-width:0}.nav-list>li.hover>.submenu>li.active>a{font-weight:700}.nav-list>li>.submenu li.hover>.submenu>li>a{padding-left:12px!important;margin-left:auto!important}.nav-list>li>.submenu li.hover>.submenu>li>a>.menu-icon{margin-right:2px}.nav-list>li .submenu>li.hover>a{padding-left:22px}.nav-list>li .submenu>li.hover>a>.menu-icon{left:4px}}@media (min-width:992px) and (max-width:991px){.sidebar.navbar-collapse .nav-list li.hover>.submenu{position:relative;left:auto;top:auto;z-index:auto;margin:auto;padding:0;width:auto;-webkit-box-shadow:none;box-shadow:none;border-width:0}.sidebar.navbar-collapse .nav-list li.hover>.submenu>li:before,.sidebar.navbar-collapse .nav-list li.hover>.submenu:before{display:block}.sidebar.navbar-collapse .nav-list li.hover>.submenu li>a{padding-left:37px}.sidebar.navbar-collapse .nav-list>li.hover>.submenu{border-top-width:1px}.sidebar.navbar-collapse .nav-list li.hover>.submenu>li>a>.menu-icon{background-color:inherit;margin-right:auto;width:18px;position:absolute}.sidebar.navbar-collapse .nav-list>li .submenu>li.hover>a>.menu-icon{left:10px}.sidebar.navbar-collapse .nav-list li.hover>.submenu>li.active>a{font-weight:400}.sidebar.navbar-collapse .nav-list li.hover>.submenu>li:hover>a>.menu-icon,.sidebar.navbar-collapse .nav-list li.hover>.submenu>li.hover-show>a>.menu-icon,.sidebar.navbar-collapse .nav-list li.hover>.submenu>li.active>a>.menu-icon{display:inline-block}.sidebar.navbar-collapse .nav-list>li>.submenu li.hover>.submenu{padding-left:0;padding-right:0}.sidebar.navbar-collapse .nav-list>li>.submenu li.hover>.submenu>li>a{padding-left:22px!important;margin-left:20px!important}.sidebar.navbar-collapse .nav-list>li>.submenu li.hover>.submenu>li>a>.menu-icon{display:inline-block;width:auto;position:static;background-color:transparent;margin-right:4px}.sidebar.navbar-collapse .nav-list>li>.submenu li>.submenu>li.hover>.submenu>li>a{margin-left:20px!important;padding-left:38px!important}.sidebar.navbar-collapse .nav-list li.hover>.submenu>li>a{border-top-width:1px;margin-top:0;margin-bottom:0}.sidebar.navbar-collapse .nav-list>li.hover>.submenu>li:first-child>a{border-top-width:0}.sidebar.navbar-collapse .nav-list li.hover>.submenu,.sidebar.navbar-collapse .nav-list li.hover:hover>.submenu,.sidebar.navbar-collapse .nav-list li.hover.hover-show>.submenu,.sidebar.navbar-collapse .nav-list li.hover>.arrow{display:none!important}.sidebar.navbar-collapse .nav-list li.hover.active>.submenu{display:block!important}.sidebar.navbar-collapse .nav-list li.hover>.submenu.nav-hide{display:none!important}.sidebar.navbar-collapse .nav-list li.hover>.submenu.nav-show{display:block!important}}@media (min-width:992px) and (max-width:991px){.sidebar.navbar-collapse.compact .nav-list>li.hover.active>a:after{display:none}}.nav-list li>.arrow{display:none;position:absolute;top:8px;right:1px;z-index:1027}.nav-list li>.arrow:before,.nav-list li>.arrow:after{border:1px solid transparent;display:block;height:0;width:0;position:absolute;left:-20px;top:0;right:auto;bottom:auto;content:"";border-width:10px}.nav-list li>.arrow:before{z-index:1;left:-21px}.nav-list li>.arrow:after{z-index:2}.nav-list li:hover>a+.arrow,.nav-list li.hover-show>a+.arrow{display:none}@media only screen and (min-width:992px){.nav-list li.hover:hover>a.dropdown-toggle+.arrow,.nav-list li.hover.hover-show>a.dropdown-toggle+.arrow{display:block}}.sidebar.menu-min,.sidebar.menu-min.compact,.sidebar.menu-min.navbar-collapse{width:43px}.sidebar.menu-min+.main-content{margin-left:43px}.sidebar.menu-min .nav-list a .badge,.sidebar.menu-min .nav-list a .label{position:relative;top:-1px;right:auto;left:4px}.sidebar.menu-min .nav-list .submenu .submenu a .badge,.sidebar.menu-min .nav-list .submenu .submenu a .label{top:0}.sidebar.menu-min .nav-list>li>a{position:relative;height:39px;line-height:37px;padding:0}.sidebar.menu-min .nav-list>li>a>.menu-icon{font-size:18px;height:auto;line-height:inherit;display:inline-block;vertical-align:sub;margin-right:0;width:44px}.sidebar.menu-min .nav-list>li>a>.menu-text{display:none;text-align:left;position:absolute;top:-1px;left:42px;z-index:1025;width:176px;height:41px;line-height:38px;padding-left:12px;border:1px solid}.sidebar.menu-min .nav-list>li>a.dropdown-toggle>.menu-text{top:-1px;border-width:1px 1px 0}.sidebar.menu-min .nav-list>li>a .arrow{display:none}.sidebar.menu-min .nav-list>li:hover>a>.menu-text,.sidebar.menu-min .nav-list>li.hover-show>a>.menu-text{display:block}.sidebar.menu-min .nav-list>li.active>a:after{border-width:10px 6px;top:8px}.sidebar.menu-min .nav-list>li.active.open>a:after{display:block}.sidebar.menu-min .nav-list>li.active.open li.active>a:after{display:none}.sidebar.menu-min .nav-list>li>.submenu{position:absolute;z-index:1026;left:42px;top:-1px;margin-top:40px;padding-bottom:2px;width:176px;display:none!important}.sidebar.menu-min .nav-list>li>.submenu:before{display:none}.sidebar.menu-min .nav-list>li>.submenu:after{content:"";display:block;height:1px;width:1px;position:absolute;right:-1px;top:-1px;border-right:1px solid;border-right-color:inherit}.sidebar.menu-min .nav-list>li>.submenu li:before{display:none}.sidebar.menu-min .nav-list>li>.submenu li>a{margin-left:0;padding-left:22px}.sidebar.menu-min .nav-list>li>.submenu li>a>.menu-icon{left:4px}.sidebar.menu-min .nav-list>li.hover>.submenu{padding-bottom:0}.sidebar.menu-min .nav-list>li.open>.submenu{display:none}.sidebar.menu-min .nav-list>li:hover>.submenu,.sidebar.menu-min .nav-list>li.hover-show>.submenu{display:block!important}.sidebar.menu-min .nav-list>li>.arrow{top:10px}.sidebar.menu-min .nav-list>li>.arrow:after,.sidebar.menu-min .nav-list>li>.arrow:before{border-width:8px;left:-16px}.sidebar.menu-min .nav-list>li>.arrow:before{left:-17px}.sidebar.menu-min .nav-list li>.arrow{right:-1px}.sidebar.menu-min .nav-list>li:hover>.arrow,.sidebar.menu-min .nav-list>li.hover-show>.arrow{display:block}.sidebar.menu-min .nav-list>li.pull_up>.arrow{z-index:1027}.sidebar.menu-min .nav-list>li.pull_up>.arrow:after,.sidebar.menu-min .nav-list>li.pull_up>.arrow:before{border-width:10px;left:-20px}.sidebar.menu-min .nav-list>li.pull_up>.arrow:before{left:-21px}.sidebar.menu-min .sidebar-shortcuts{position:relative;overflow:visible;z-index:1}.sidebar.menu-min .sidebar-shortcuts-mini{display:block}.sidebar.menu-min .sidebar-shortcuts-large{display:none;position:absolute;top:0;left:42px;width:182px;padding:0 2px 3px;border:1px solid;border-top-width:0}.sidebar.menu-min .sidebar-shortcuts:hover .sidebar-shortcuts-large,.sidebar.menu-min .sidebar-shortcuts.hover-show .sidebar-shortcuts-large{display:block}.sidebar.menu-min .sidebar-toggle:before{left:5px;right:5px}.sidebar.menu-min .sidebar-toggle>.ace-icon{font-size:13px;padding:0 4px;line-height:15px;border-width:1px}.sidebar.menu-min .nav-list>li>.submenu li>.submenu>li>a{margin-left:2px;padding-left:30px}.sidebar.menu-min .nav-list>li>.submenu li>.submenu>li>.submenu>li>a{margin-left:2px;padding-left:45px}.sidebar.menu-min .nav-list>li>.submenu li.active>a:after{display:none}.sidebar.menu-min .nav-list li.active.open>.submenu>li.active>a:after{display:none}.sidebar.menu-min .nav-list>li.active:hover>a:after,.sidebar.menu-min .nav-list>li.active.hover-show>a:after,.sidebar.menu-min .nav-list>li.active.open:hover>a:after{display:none}.sidebar.menu-min .nav-list>li.active:hover:after{display:none}@media (min-width:992px){.sidebar.menu-min .nav-list li.hover>.submenu{margin-left:0}.sidebar.menu-min .nav-list>li>.submenu li.hover>.submenu>li>a,.sidebar.menu-min .nav-list>li>.submenu li>.submenu>li.hover>.submenu>li>a{margin-left:0!important}}@media (min-width:992px){.sidebar.menu-min.compact .nav-list>li>a{height:39px;line-height:37px;padding:0 16px 0 7px;position:relative}.sidebar.menu-min.compact .nav-list>li>a>.menu-icon{font-size:18px;height:auto;line-height:inherit;display:inline-block;vertical-align:sub;width:auto}}@media only screen and (min-width:992px){.navbar.h-navbar{-webkit-box-shadow:0 2px 4px 0 rgba(0,0,0,.25);box-shadow:0 2px 4px 0 rgba(0,0,0,.25)}.sidebar.h-sidebar{position:relative;float:none!important;width:auto;margin-top:17px;border-width:0!important;box-shadow:none}.sidebar.h-sidebar.menu-min,.sidebar.h-sidebar.compact{width:auto}.sidebar.h-sidebar.sidebar-fixed{position:fixed}.sidebar.h-sidebar.no-gap{margin-top:auto}.sidebar.h-sidebar.no-gap .nav-list{padding-top:3px}.sidebar.h-sidebar:before{display:block;position:absolute;z-index:-1;left:0!important;right:0!important;top:-17px;bottom:auto;height:17px;width:auto;border-width:0;border-bottom:1px solid;border-bottom-color:inherit}.sidebar.h-sidebar.lower-highlight .nav-list>li:before{top:0}.main-content .sidebar.h-sidebar .nav-list>li:before{top:0}.sidebar.h-sidebar .nav-list{border-width:0;border-bottom:2px solid #79b0ce}.sidebar.h-sidebar .nav-list>li{float:left;border-width:0 0 0 1px;margin-left:0}.sidebar.h-sidebar .nav-list>li:last-child{border-right-width:1px}.sidebar.h-sidebar .nav-list>li:before{left:-1px;right:-1px;bottom:auto;top:-2px;max-width:none;width:auto;height:2px;border-width:0}.sidebar.h-sidebar .nav-list>li.active:before{display:block}.sidebar.h-sidebar .nav-list>li.active:after{display:none}.sidebar.h-sidebar .nav-list>li:first-child{border-left-width:0;margin-left:0}.sidebar.h-sidebar .sidebar-shortcuts+.nav-list>li:first-child{border-left-width:1px;margin-left:-1px}.sidebar.h-sidebar .nav-list>li>a{line-height:22px;height:auto;padding:10px 14px}.sidebar.h-sidebar .nav-list>li>a>.menu-icon{display:block;margin:1px 0 4px;line-height:inherit;width:auto}.sidebar.h-sidebar .nav-list>li>a>.arrow{display:none}.sidebar.h-sidebar .nav-list>li.hover.pull_right{float:none!important}.sidebar.h-sidebar .nav-list>li.hover>.submenu{top:100%;left:1px;margin-top:auto;margin-left:-2px;width:190px;z-index:1026}.sidebar.h-sidebar .nav-list>li.hover.pull_right>.submenu{left:auto;right:1px}.sidebar.h-sidebar .nav-list>li.hover>.arrow{right:auto;top:auto;left:24px;bottom:7px}.sidebar.h-sidebar .nav-list>li.hover.pull_right>.arrow{left:auto;right:24px}.sidebar.h-sidebar .nav-list>li.hover>.arrow:before,.sidebar.h-sidebar .nav-list>li.hover>.arrow:after{border-width:0 8px 8px!important}.sidebar.h-sidebar .nav-list>li.hover>.arrow:after{border-color:transparent;border-left-color:transparent!important;border-right-color:transparent!important;-moz-border-right-colors:none!important;-moz-border-left-colors:none!important;-moz-border-top-colors:none;-moz-border-bottom-colors:none;left:-10px!important;right:auto!important}.sidebar.h-sidebar .nav-list>li.hover>.arrow:before{border-color:transparent;border-left-color:transparent!important;border-right-color:transparent!important;-moz-border-right-colors:none!important;-moz-border-left-colors:none!important;-moz-border-top-colors:none;-moz-border-bottom-colors:none;right:auto!important;left:-10px!important;top:-1px!important}.sidebar.h-sidebar .nav-list>li.hover:hover>a~.arrow,.sidebar.h-sidebar .nav-list>li.hover.hover-show>a~.arrow{display:none}.sidebar.h-sidebar .nav-list>li.hover:hover>a.dropdown-toggle~.arrow,.sidebar.h-sidebar .nav-list>li.hover.hover-show>a.dropdown-toggle~.arrow{display:block}.sidebar.h-sidebar .nav-list>li.hover-flip>.submenu{left:auto;right:1px;margin-left:auto;margin-right:-2px}.sidebar.h-sidebar .nav-list>li.hover-flip>.arrow{left:auto;right:24px}.sidebar.h-sidebar .nav-list li li.hover-flip>.submenu{left:auto;right:100%;margin-left:auto;margin-right:-2px}.sidebar.h-sidebar .nav-list li li.hover-flip>.arrow{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);-moz-transform:scale(-1,1);-webkit-transform:scale(-1,1);-o-transform:scale(-1,1);-ms-transform:scale(-1,1);transform:scale(-1,1);left:0;right:auto}.sidebar.h-sidebar .sidebar-shortcuts-large:before,.sidebar.h-sidebar .sidebar-shortcuts-large:after{display:block;content:"";position:absolute;left:50%;margin-left:-8px;border:1px solid transparent;border-width:0 8px 8px}.sidebar.h-sidebar .sidebar-shortcuts-large:after{border-right-color:transparent;-moz-border-right-colors:none;top:-8px}.sidebar.h-sidebar .sidebar-shortcuts-large:before{-moz-border-bottom-colors:#CCC;border-bottom-color:#CCC;top:-9px}.sidebar.h-sidebar .sidebar-toggle{position:absolute;top:12px;right:6px;background-color:transparent;border-width:0}.sidebar.h-sidebar .sidebar-shortcuts{float:left;display:block;overflow:visible;position:relative;margin:0;padding:12px 8px 9px;max-height:none!important;background-color:transparent}.sidebar.h-sidebar .sidebar-shortcuts:hover .sidebar-shortcuts-large,.sidebar.h-sidebar .sidebar-shortcuts.hover-show .sidebar-shortcuts-large{display:block}.sidebar.h-sidebar .sidebar-shortcuts-large{display:none;width:52px;height:auto;position:absolute;z-index:1025;top:100%;margin-top:-5px;left:10px;padding:3px 2px;border:1px solid}.sidebar.h-sidebar .sidebar-shortcuts-mini{width:auto;max-width:52px;display:block;background-color:transparent;padding-top:3px;padding-bottom:5px}.sidebar.h-sidebar .sidebar-shortcuts-mini>.btn{padding:9px}.sidebar.h-sidebar .nav-list a .badge,.sidebar.h-sidebar .nav-list a .label{position:absolute;top:11px;right:auto!important;left:50%;margin-left:10px}.sidebar.h-sidebar+.main-content{margin-left:0}.sidebar.h-sidebar+.main-content .breadcrumbs{margin:6px 9px;border:1px solid;border-color:#E5E5E5}.h-sidebar.sidebar-fixed{top:auto;width:100%;left:0;right:0}.h-sidebar.sidebar-fixed:before{z-index:auto}.h-sidebar.sidebar-fixed,.h-sidebar.sidebar-fixed .nav-list{border-right-width:0;border-left-width:0}.h-sidebar.sidebar-fixed .sidebar-shortcuts{border-width:0}.h-sidebar.sidebar-fixed+.main-content{padding-top:88px}.h-sidebar.sidebar-fixed.no-gap+.main-content{padding-top:74px}.h-sidebar.sidebar-fixed.menu-min+.main-content{padding-top:63px}.h-sidebar.sidebar-fixed.menu-min.no-gap+.main-content{padding-top:49px}}@media only screen and (min-width:992px) and (max-width:991px){.sidebar.h-sidebar+.main-content .breadcrumbs{margin:0;border-width:0 0 1px}}.main-container.container .h-sidebar.sidebar-fixed{left:0;right:0;width:auto}@media (min-width:768px){.main-container.container .h-sidebar.sidebar-fixed{left:auto!important;right:auto!important;width:744px}}@media (min-width:992px){.main-container.container .h-sidebar.sidebar-fixed{width:964px}}@media (min-width:1200px){.main-container.container .h-sidebar.sidebar-fixed{width:1164px}}@media (min-width:992px){.sidebar.h-sidebar.menu-min .nav.nav-list>li>a,.sidebar.h-sidebar.menu-min.compact .nav.nav-list>li>a{padding:9px 12px}.sidebar.h-sidebar.menu-min .nav-list>li>a>.menu-text{left:-1px;top:100%;width:190px}.sidebar.h-sidebar.menu-min .nav-list>li>a>.menu-icon{margin:2px 0}.sidebar.h-sidebar.menu-min .nav-list>li.hover>.submenu{top:100%;margin-top:41px}.sidebar.h-sidebar.menu-min .nav-list>li.hover:hover>a~.arrow,.sidebar.h-sidebar.menu-min .nav-list>li.hover.hover-show>a~.arrow{display:block}.sidebar.h-sidebar.menu-min .sidebar-toggle{top:6px}.sidebar.h-sidebar.menu-min .sidebar-shortcuts{padding:0}.sidebar.h-sidebar.menu-min .sidebar-shortcuts-mini{padding-bottom:4px;padding-top:4px}.sidebar.h-sidebar.menu-min .sidebar-shortcuts-mini>.btn{padding:8px}.sidebar.h-sidebar.menu-min .sidebar-shortcuts-large{left:1px;margin-top:4px}.sidebar.h-sidebar.compact .nav-list>li>a>.menu-icon{font-size:18px;height:auto}.sidebar.h-sidebar.compact.menu-min .nav-list>li>a{height:auto;line-height:22px}}.main-container .menu-toggler{display:none}@media only screen and (max-width:991px){.sidebar.responsive:before{display:none}.sidebar.responsive{-webkit-box-shadow:2px 1px 2px 0 rgba(0,0,0,.15);box-shadow:2px 1px 2px 0 rgba(0,0,0,.15);z-index:1027;overflow:hidden;max-height:0;-moz-transform:translateX(-200px);-webkit-transform:translateX(-200px);-o-transform:translateX(-200px);-ms-transform:translateX(-200px);transform:translateX(-200px);-webkit-transition:-webkit-transform .2s linear 0s,max-height 0s linear .2s;-moz-transition:-moz-transform .2s linear 0s,max-height 0s linear .2s;-o-transition:-o-transform .2s linear 0s,max-height 0s linear .2s;transition:transform .2s linear 0s,max-height 0s linear .2s;position:relative;bottom:auto;left:190px;margin-left:-190px}}@media (min-width:992px) and (max-width:991px){.sidebar.responsive.compact{-moz-transform:translateX(-115px);-webkit-transform:translateX(-115px);-o-transform:translateX(-115px);-ms-transform:translateX(-115px);transform:translateX(-115px)}.sidebar.responsive.compact.push_away.display+.main-content{-moz-transform:translateX(105px);-webkit-transform:translateX(105px);-o-transform:translateX(105px);-ms-transform:translateX(105px);transform:translateX(105px)}.navbar.navbar-fixed-top+.main-container .sidebar.responsive.compact.push_away.display~.footer .footer-inner{-moz-transform:translateX(105px);-webkit-transform:translateX(105px);-o-transform:translateX(105px);-ms-transform:translateX(105px);transform:translateX(105px)}}@media only screen and (max-width:991px){.sidebar.responsive.menu-min{-moz-transform:translateX(-53px);-webkit-transform:translateX(-53px);-o-transform:translateX(-53px);-ms-transform:translateX(-53px);transform:translateX(-53px)}.sidebar.responsive.display{-moz-transform:none!important;-webkit-transform:none!important;-o-transform:none!important;-ms-transform:none!important;transform:none!important;overflow:visible;max-height:2000px;-webkit-transition-delay:0s;-moz-transition-delay:0s;-o-transition-delay:0s;transition-delay:0s}.sidebar.responsive.push_away{-webkit-box-shadow:none!important;box-shadow:none!important}.sidebar.responsive.push_away:before{display:block!important}.sidebar.responsive.push_away+.main-content{-webkit-transition:-webkit-transform .2s linear 0s;-moz-transition:-moz-transform .2s linear 0s;-o-transition:-o-transform .2s linear 0s;transition:transform .2s linear 0s}.sidebar.responsive.push_away.display+.main-content{-moz-transform:translateX(190px);-webkit-transform:translateX(190px);-o-transform:translateX(190px);-ms-transform:translateX(190px);transform:translateX(190px)}.sidebar.responsive.push_away.display.menu-min+.main-content{-moz-transform:translateX(43px);-webkit-transform:translateX(43px);-o-transform:translateX(43px);-ms-transform:translateX(43px);transform:translateX(43px)}.navbar.navbar-fixed-top+.main-container .sidebar.responsive.push_away:before{height:5000px}.navbar.navbar-fixed-top+.main-container .sidebar.responsive.push_away~.footer .footer-inner{-webkit-transition:-webkit-transform .2s linear 0s;-moz-transition:-moz-transform .2s linear 0s;-o-transition:-o-transform .2s linear 0s;transition:transform .2s linear 0s}.navbar.navbar-fixed-top+.main-container .sidebar.responsive.push_away.display~.footer .footer-inner{-moz-transform:translateX(190px);-webkit-transform:translateX(190px);-o-transform:translateX(190px);-ms-transform:translateX(190px);transform:translateX(190px)}.navbar.navbar-fixed-top+.main-container .sidebar.responsive.push_away.display.menu-min~.footer .footer-inner{-moz-transform:translateX(43px);-webkit-transform:translateX(43px);-o-transform:translateX(43px);-ms-transform:translateX(43px);transform:translateX(43px)}.sidebar.responsive+.main-content{margin-left:0!important;margin-right:0!important}}@media only screen and (min-width:768px) and (max-width:991px){.main-container.container .sidebar.responsive{-webkit-transition:none;-moz-transition:none;-o-transition:none;transition:none;display:none}.main-container.container .sidebar.responsive:before{display:none!important}.main-container.container .sidebar.responsive.display{display:block}.main-container.container .sidebar.responsive.push_away+.main-content,.main-container.container .sidebar.responsive.push_away~.footer .footer-inner{-webkit-transition:none!important;-moz-transition:none!important;-o-transition:none!important;transition:none!important;-moz-transform:none!important;-webkit-transform:none!important;-o-transform:none!important;-ms-transform:none!important;transform:none!important}}@media only screen and (max-width:991px){.responsive.sidebar-fixed{position:fixed}.main-container .menu-toggler.fixed{position:fixed;left:auto;z-index:1026;-moz-backface-visibility:hidden}}@media only screen and (max-width:991px){.menu-toggler+.sidebar.responsive{margin-top:40px}.main-container .menu-toggler{display:block;position:absolute;z-index:1026;width:52px;height:32px;margin-right:2px;line-height:normal;padding-left:33px;padding-top:7px;padding-bottom:1px;font-size:13px;font-weight:700;text-transform:uppercase;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.main-container .menu-toggler:hover{text-decoration:none}.main-container .menu-toggler:focus{outline:0}.main-container .menu-toggler:before{border-top:1px solid #87b87f;border-bottom:1px solid #6fb3e0;height:2px;width:24px;content:"";position:absolute;z-index:1;top:13px;left:4px;-webkit-transition:all .1s ease;-o-transition:all .1s ease;transition:all .1s ease;-o-transition:none;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.main-container .menu-toggler:after{border-top:1px solid #ffa24d;border-bottom:1px solid #d15b47;content:"";height:2px;width:24px;position:absolute;top:19px;left:4px;-webkit-transition:all .1s ease;-o-transition:all .1s ease;transition:all .1s ease;-o-transition:none;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.main-container .menu-toggler.display:before{height:4px;top:8px;border-width:2px}.main-container .menu-toggler.display:after{height:4px;top:20px;border-width:2px}.main-container .menu-toggler>.toggler-text{display:block;position:absolute;bottom:-9px;left:0;border:1px solid transparent;border-width:9px 42px 0;border-top-color:#444;-moz-border-top-colors:#444}.main-container .menu-toggler>.toggler-text:after{display:block;content:"MENU";color:#fff;position:absolute;left:-8px;top:-41px}.menu-toggler+.responsive.sidebar-scroll .nav-wrap{overflow:hidden}}@media only screen and (max-width:320px){.main-container .menu-toggler{width:0}.main-container .menu-toggler>.toggler-text{border-width:7px 16px;bottom:-14px}.main-container .menu-toggler>.toggler-text:after{font-size:9px;font-weight:400;color:#FFF;position:absolute;left:-13px;top:-42px}.main-container .menu-toggler:before,.main-container .menu-toggler:after{margin-top:8px}.main-container .menu-toggler.display:before,.main-container .menu-toggler.display:after{height:2px;border-width:1px}.main-container .menu-toggler.display:before{top:13px}.main-container .menu-toggler.display:after{top:19px}}.sidebar-toggle.sidebar-expand{display:none}@media (max-width:991px){.menu-toggler.invisible{position:fixed;z-index:-999;visibility:hidden;opacity:0;width:1px;height:1px}.sidebar.responsive-min,.sidebar.responsive-min.compact,.sidebar.responsive-min.navbar-collapse{width:43px}.sidebar.responsive-min+.main-content{margin-left:43px}.sidebar.responsive-min .nav-list a .badge,.sidebar.responsive-min .nav-list a .label{position:relative;top:-1px;right:auto;left:4px}.sidebar.responsive-min .nav-list .submenu .submenu a .badge,.sidebar.responsive-min .nav-list .submenu .submenu a .label{top:0}.sidebar.responsive-min .nav-list>li>a{position:relative;height:39px;line-height:37px;padding:0}.sidebar.responsive-min .nav-list>li>a>.menu-icon{font-size:18px;height:auto;line-height:inherit;display:inline-block;vertical-align:sub;margin-right:0;width:44px}.sidebar.responsive-min .nav-list>li>a>.menu-text{display:none;text-align:left;position:absolute;top:-1px;left:42px;z-index:1025;width:176px;height:41px;line-height:38px;padding-left:12px;border:1px solid}.sidebar.responsive-min .nav-list>li>a.dropdown-toggle>.menu-text{top:-1px;border-width:1px 1px 0}.sidebar.responsive-min .nav-list>li>a .arrow{display:none}.sidebar.responsive-min .nav-list>li:hover>a>.menu-text,.sidebar.responsive-min .nav-list>li.hover-show>a>.menu-text{display:block}.sidebar.responsive-min .nav-list>li.active>a:after{border-width:10px 6px;top:8px}.sidebar.responsive-min .nav-list>li.active.open>a:after{display:block}.sidebar.responsive-min .nav-list>li.active.open li.active>a:after{display:none}.sidebar.responsive-min .nav-list>li>.submenu{position:absolute;z-index:1026;left:42px;top:-1px;margin-top:40px;padding-bottom:2px;width:176px;display:none!important}.sidebar.responsive-min .nav-list>li>.submenu:before{display:none}.sidebar.responsive-min .nav-list>li>.submenu:after{content:"";display:block;height:1px;width:1px;position:absolute;right:-1px;top:-1px;border-right:1px solid;border-right-color:inherit}.sidebar.responsive-min .nav-list>li>.submenu li:before{display:none}.sidebar.responsive-min .nav-list>li>.submenu li>a{margin-left:0;padding-left:22px}.sidebar.responsive-min .nav-list>li>.submenu li>a>.menu-icon{left:4px}.sidebar.responsive-min .nav-list>li.hover>.submenu{padding-bottom:0}.sidebar.responsive-min .nav-list>li.open>.submenu{display:none}.sidebar.responsive-min .nav-list>li:hover>.submenu,.sidebar.responsive-min .nav-list>li.hover-show>.submenu{display:block!important}.sidebar.responsive-min .nav-list>li>.arrow{top:10px}.sidebar.responsive-min .nav-list>li>.arrow:after,.sidebar.responsive-min .nav-list>li>.arrow:before{border-width:8px;left:-16px}.sidebar.responsive-min .nav-list>li>.arrow:before{left:-17px}.sidebar.responsive-min .nav-list li>.arrow{right:-1px}.sidebar.responsive-min .nav-list>li:hover>.arrow,.sidebar.responsive-min .nav-list>li.hover-show>.arrow{display:block}.sidebar.responsive-min .nav-list>li.pull_up>.arrow{z-index:1027}.sidebar.responsive-min .nav-list>li.pull_up>.arrow:after,.sidebar.responsive-min .nav-list>li.pull_up>.arrow:before{border-width:10px;left:-20px}.sidebar.responsive-min .nav-list>li.pull_up>.arrow:before{left:-21px}.sidebar.responsive-min .sidebar-shortcuts{position:relative;overflow:visible;z-index:1}.sidebar.responsive-min .sidebar-shortcuts-mini{display:block}.sidebar.responsive-min .sidebar-shortcuts-large{display:none;position:absolute;top:0;left:42px;width:182px;padding:0 2px 3px;border:1px solid;border-top-width:0}.sidebar.responsive-min .sidebar-shortcuts:hover .sidebar-shortcuts-large,.sidebar.responsive-min .sidebar-shortcuts.hover-show .sidebar-shortcuts-large{display:block}.sidebar.responsive-min .sidebar-toggle:before{left:5px;right:5px}.sidebar.responsive-min .sidebar-toggle>.ace-icon{font-size:13px;padding:0 4px;line-height:15px;border-width:1px}.sidebar.responsive-min .nav-list>li>.submenu li>.submenu>li>a{margin-left:2px;padding-left:30px}.sidebar.responsive-min .nav-list>li>.submenu li>.submenu>li>.submenu>li>a{margin-left:2px;padding-left:45px}.sidebar.responsive-min .nav-list>li>.submenu li.active>a:after{display:none}.sidebar.responsive-min .nav-list li.active.open>.submenu>li.active>a:after{display:none}.sidebar.responsive-min .nav-list>li.active:hover>a:after,.sidebar.responsive-min .nav-list>li.active.hover-show>a:after,.sidebar.responsive-min .nav-list>li.active.open:hover>a:after{display:none}.sidebar.responsive-min .nav-list>li.active:hover:after{display:none}.sidebar.responsive-min:before{display:block}.sidebar.responsive-min .sidebar-toggle.sidebar-collapse{display:none}.sidebar.responsive-min .sidebar-toggle.sidebar-expand{display:block}.sidebar.responsive-min+.main-content{margin-left:43px!important}.rtl .sidebar.responsive-min+.main-content{margin-left:auto!important;margin-right:43px!important}.sidebar.responsive-min+.main-content .breadcrumb{margin-left:12px}.sidebar.responsive-max{display:block;position:relative;left:190px;margin-left:-190px;z-index:1027;-webkit-box-shadow:2px 1px 2px 0 rgba(0,0,0,.15);box-shadow:2px 1px 2px 0 rgba(0,0,0,.15)}.sidebar.responsive-max:before{display:none}.sidebar.responsive-max .sidebar-toggle.sidebar-collapse{display:none}.sidebar.responsive-max .sidebar-toggle.sidebar-expand{display:block;z-index:1}.sidebar.responsive-max+.main-content{margin-left:43px!important}.sidebar.responsive-max+.main-content .breadcrumb{margin-left:12px}}@media only screen and (min-width:992px){.sidebar.navbar-collapse{max-height:none}}@media only screen and (max-width:991px){.sidebar.navbar-collapse{position:relative;float:none!important;margin-top:auto!important;z-index:1;width:100%!important;max-height:340px;margin-left:0;margin-right:0}.sidebar.navbar-collapse:before{display:none}.sidebar.navbar-collapse .nav-list>li:last-child{border-bottom-width:0}.sidebar.navbar-collapse .nav-list>li>a{padding-top:10px!important;padding-bottom:10px!important;line-height:20px;height:41px}.sidebar.navbar-collapse .nav-list>li:before{height:43px}.sidebar.navbar-collapse .nav-list>li.active:after{display:none}.sidebar.navbar-collapse li>.arrow{display:none!important}.sidebar.navbar-collapse .nav-list li>.submenu{border-left-width:0}.sidebar.navbar-collapse .sidebar-toggle{display:none}.sidebar.navbar-collapse .sidebar-shortcuts{padding:3px 0 6px;max-height:none;border-bottom-width:0}.sidebar.navbar-collapse+.main-content{margin-left:0!important;margin-right:0!important}.sidebar.navbar-collapse+.main-content .breadcrumb{margin-left:12px}.sidebar.navbar-collapse .nav-wrap+.ace-scroll{display:none}.sidebar.navbar-collapse.menu-min .nav-list>li>.submenu{position:relative;left:auto;top:auto;width:auto;z-index:auto;margin-top:auto;padding-top:0;padding-bottom:0;border-width:1px 0 0 0!important;-webkit-box-shadow:none!important;box-shadow:none!important}.sidebar.navbar-collapse.menu-min .nav-list>li>.submenu:before{display:block}.sidebar.navbar-collapse.menu-min .nav-list>li>.submenu>li:before{display:block}.sidebar.navbar-collapse.menu-min .nav-list>li>.submenu li>a>.menu-icon{left:10px}.sidebar.navbar-collapse.menu-min .nav-list>li>.submenu:after{display:none}.sidebar.navbar-collapse.menu-min .nav-list>li>.submenu li>a{padding:7px 0 9px 37px}.sidebar.navbar-collapse.menu-min .nav-list>li>.submenu li>.submenu>li>a{margin-left:20px;padding-left:22px}.sidebar.navbar-collapse.menu-min .nav-list>li>.submenu li>.submenu>li>.submenu>li>a{margin-left:20px;padding-left:38px}.sidebar.navbar-collapse.menu-min .nav-list>li>a:hover:before{width:3px}.sidebar.navbar-collapse.menu-min .nav-list>li>a{text-align:left;padding-left:7px}.sidebar.navbar-collapse.menu-min .nav-list>li>a>.menu-icon{display:inline-block;width:auto;margin-right:2px}.sidebar.navbar-collapse.menu-min .nav-list>li>a>.menu-text{position:relative;display:inline;line-height:normal;padding-left:0;height:auto;top:auto;left:auto;z-index:auto;width:auto;border-width:0!important;background-color:transparent!important;-webkit-box-shadow:none!important;box-shadow:none!important}.sidebar.navbar-collapse.menu-min .nav-list a>.arrow{display:block}.sidebar.navbar-collapse.menu-min .nav-list>li:hover>.submenu{display:none!important}.sidebar.navbar-collapse.menu-min .nav-list>li.active>.submenu{display:block!important}.sidebar.navbar-collapse.menu-min .nav-list>li>.submenu.nav-show{display:block!important}.sidebar.navbar-collapse.menu-min .nav-list>li>.submenu.nav-hide{display:none!important}.sidebar.navbar-collapse.menu-min .sidebar-shortcuts-large{display:block;position:static;-webkit-box-shadow:none!important;box-shadow:none!important;border-width:0!important;background-color:transparent!important;width:auto;padding:0}.sidebar.navbar-collapse.menu-min .sidebar-shortcuts-mini{display:none}.sidebar.navbar-collapse .nav-list a .badge,.sidebar.navbar-collapse .nav-list a .label{position:relative;top:-1px;right:auto;left:4px}.sidebar.navbar-collapse .nav-list>li.active:after,.sidebar.navbar-collapse .nav-list li.active>a:before,.sidebar.navbar-collapse .nav-list li.active>a:after{display:none!important}.sidebar.navbar-collapse .nav-list>li.highlight.active>a:before,.sidebar.navbar-collapse .nav-list>li.highlight.active>a:after{display:none!important}}@media (max-width:991px) and (max-height:400px){.sidebar.navbar-collapse{max-height:300px}}@media (max-width:991px) and (max-height:350px){.sidebar.navbar-collapse{max-height:250px}}@media (max-width:991px) and (max-height:300px){.sidebar.navbar-collapse{max-height:200px}}@media (max-width:991px) and (max-height:250px){.sidebar.navbar-collapse{max-height:150px}}@media (min-width:992px) and (max-width:991px){.sidebar.navbar-collapse .nav-list>li>.submenu li.hover>.submenu>li>a,.sidebar.navbar-collapse .nav-list>li>.submenu li>.submenu>li.hover>.submenu>li>a{margin-left:20px!important}}@media (max-width:991px){.navbar-fixed-top+.main-container .sidebar.navbar-collapse{position:fixed;z-index:1027}}@media (min-width:768px) and (max-width:991px){.navbar-fixed-top+.main-container.container .sidebar.navbar-collapse{width:744px!important}}.main-content-inner{float:left;width:100%}.main-content .sidebar:before{top:150px}@media only screen and (min-width:992px){body.mob-safari .sidebar.h-sidebar+.main-content .sidebar.sidebar-fixed:not(.h-sidebar){top:131px}body.mob-safari .sidebar.h-sidebar.no-gap+.main-content .sidebar.sidebar-fixed:not(.h-sidebar){top:114px}body.mob-safari .sidebar.h-sidebar.menu-min+.main-content .sidebar.sidebar-fixed:not(.h-sidebar){top:106px}body.mob-safari .sidebar.h-sidebar.menu-min.no-gap+.main-content .sidebar.sidebar-fixed:not(.h-sidebar){top:89px}}@media only screen and (min-width:992px){.h-navbar.navbar-fixed-top+.main-container .sidebar:not(.h-sidebar):before{top:150px}.h-navbar.navbar-fixed-top+.main-container .sidebar:not(.h-sidebar) .nav-list{padding-top:3px}.h-navbar.navbar-fixed-top+.main-container .sidebar:not(.h-sidebar) .sidebar-shortcuts~.nav-list,.h-navbar.navbar-fixed-top+.main-container .sidebar:not(.h-sidebar) .sidebar-shortcuts~.nav-wrap-up .nav-list{padding-top:0}.h-navbar.navbar-fixed-top+.main-container .sidebar:not(.h-sidebar) .sidebar-shortcuts{padding-top:3px;min-height:43px}.h-navbar.navbar-fixed-top+.main-container .sidebar:not(.h-sidebar).menu-min .sidebar-shortcuts-large{line-height:40px}.h-navbar.navbar-fixed-top+.main-container .main-content .sidebar:not(.h-sidebar) .nav-list{padding-top:0}.h-navbar.navbar-fixed-top+.main-container .main-content .sidebar.sidebar-fixed{z-index:1026}.main-content .h-sidebar{padding-top:1px;margin-top:0}.main-content .h-sidebar:before{display:none}.main-content .h-sidebar+.page-content{margin-left:auto}.main-content .h-sidebar.sidebar-fixed{left:190px}.main-content .h-sidebar.sidebar-fixed+.page-content{margin-top:74px}.main-content .h-sidebar.sidebar-fixed.menu-min+.page-content{margin-top:49px}.main-content .h-sidebar.menu-min .nav-list>li>a{padding:8px 12px 7px}.sidebar.compact+.main-content .h-sidebar.sidebar-fixed{left:105px}.sidebar.menu-min+.main-content .h-sidebar.sidebar-fixed{left:43px}.navbar.navbar-fixed-top+.main-container .main-content .h-sidebar.sidebar-fixed{padding-top:3px}}.container.main-container .sidebar+.main-content .h-sidebar.sidebar-fixed{left:auto;right:auto}@media (min-width:992px){.container.main-container .sidebar.compact+.main-content .h-sidebar.sidebar-fixed{width:639px}}@media (min-width:992px){.container.main-container .main-content .h-sidebar.sidebar-fixed{width:744px}.container.main-container .sidebar+.main-content .h-sidebar.sidebar-fixed{width:554px}.container.main-container .sidebar.menu-min+.main-content .h-sidebar.sidebar-fixed{width:701px}}@media (min-width:992px){.container.main-container .sidebar.compact+.main-content .h-sidebar.sidebar-fixed{width:859px}}@media (min-width:992px){.container.main-container .main-content .h-sidebar.sidebar-fixed{width:964px}.container.main-container .sidebar+.main-content .h-sidebar.sidebar-fixed{width:774px}.container.main-container .sidebar.menu-min+.main-content .h-sidebar.sidebar-fixed{width:921px}}@media (min-width:1200px){.container.main-container .sidebar.compact+.main-content .h-sidebar.sidebar-fixed{width:1059px}}@media (min-width:1200px){.container.main-container .main-content .h-sidebar.sidebar-fixed{width:1164px}.container.main-container .sidebar+.main-content .h-sidebar.sidebar-fixed{width:974px}.container.main-container .sidebar.menu-min+.main-content .h-sidebar.sidebar-fixed{width:1121px}}@media only screen and (max-width:991px){.main-container .main-content .sidebar.sidebar-fixed{z-index:1026}.navbar-fixed-top+.main-container .main-content .sidebar{position:fixed;z-index:1026}}.sidebar-scroll .sidebar-shortcuts{min-height:41px;border-bottom:1px solid}.sidebar-scroll .sidebar-toggle{border-top:1px solid}.sidebar-scroll .nav-list>li:first-child{border-top-width:0}.sidebar-scroll .nav-list>li:last-child{border-bottom-width:0}.sidebar-scroll .nav-wrap .sidebar-shortcuts{min-height:40px;border-bottom-width:0}.sidebar-scroll .nav-wrap .sidebar-shortcuts+.nav-list>li:first-child,.sidebar-scroll .nav-wrap .sidebar-shortcuts+.nav-wrap-up .nav-list>li:first-child{border-top-width:1px}.sidebar-scroll .nav-wrap-t .sidebar-toggle{border-top-width:0}.sidebar-scroll .nav-wrap-t .nav-list>li:last-child{border-bottom-width:1px}.sidebar .nav-wrap+.ace-scroll{position:absolute;right:0;top:0;z-index:1}.sidebar .nav-wrap+.scrollout{right:-8px}.sidebar .submenu.sub-scroll{overflow-y:scroll;overflow-x:hidden;-webkit-overflow-scrolling:touch}.ace-scroll{overflow:hidden}.scroll-content{position:static;overflow:hidden}.scroll-disabled.ace-scroll,.scroll-disabled.ace-scroll .scroll-content{overflow:visible}.scroll-track{position:absolute;top:auto;bottom:auto;right:0;height:auto;background-color:#E7E7E7;z-index:99;width:0;opacity:0}.scroll-bar{position:absolute;top:0;left:0;width:inherit;background-color:#ACE;background:#bbd4e5}.scroll-track.scroll-hz{top:auto;left:auto;right:auto;bottom:0;height:8px;width:auto}.scroll-hz .scroll-bar{height:inherit;width:auto}.scroll-track.scroll-active{-webkit-transition:width .25s ease .75s,opacity .25s ease .75s;-o-transition:width .25s ease .75s,opacity .25s ease .75s;transition:width .25s ease .75s,opacity .25s ease .75s}.ace-scroll:hover .scroll-active,.scroll-active.scroll-track:hover,.scroll-active.scroll-track.scroll-hover,.scroll-active.scroll-track.active,.scroll-active.scroll-track:active{width:8px;opacity:1;-webkit-transition-duration:.15s;transition-duration:.15s;-webkit-transition-delay:0s;transition-delay:0s}.scroll-track.active>.scroll-bar{transition-property:none!important;transition-duration:0s!important}.scroll-track.scroll-margin{margin-left:-1px}.scroll-track.scroll-left{right:auto;left:0}.scroll-track.scroll-left.scroll-margin{margin-left:1px}.scroll-track.scroll-top{bottom:auto;top:0}.scroll-track.scroll-top.scroll-margin{top:1px}.scroll-dark .scroll-bar{background-color:transparent;background-color:rgba(0,0,0,.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#40000000', endColorstr='#40000000', GradientType=0)}.scroll-track.scroll-dark{background-color:transparent;background-color:rgba(0,0,0,.15);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#26000000', endColorstr='#26000000', GradientType=0)}.scroll-light .scroll-bar{background-color:transparent;background-color:rgba(0,0,0,.14);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#24000000', endColorstr='#24000000', GradientType=0)}.scroll-track.scroll-light{background-color:transparent;background-color:rgba(0,0,0,.07);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#12000000', endColorstr='#12000000', GradientType=0)}.scroll-white .scroll-bar{background-color:transparent;background-color:rgba(255,255,255,.33);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#55FFFFFF', endColorstr='#55FFFFFF', GradientType=0)}.scroll-track.scroll-white{background-color:transparent;background-color:rgba(255,255,255,.2);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#33FFFFFF', endColorstr='#33FFFFFF', GradientType=0)}.no-track.scroll-track{background-color:transparent;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.scroll-track.scroll-visible{opacity:1;width:8px}.scroll-hz.scroll-visible{height:8px;width:auto}.scroll-thin.scroll-track:hover,.scroll-thin.scroll-track.scroll-hover,.scroll-thin.scroll-track:active,.scroll-thin.scroll-track.active,.scroll-thin.scroll-track.scroll-visible{width:6px}.ace-scroll:hover .scroll-thin.scroll-track{width:6px}.scroll-thin.scroll-hz:hover,.scroll-thin.scroll-hz.scroll-hover,.scroll-thin.scroll-hz:active,.scroll-thin.scroll-hz.active,.scroll-thin.scroll-hz.scroll-visible{width:auto;height:6px}.ace-scroll:hover .scroll-thin.scroll-hz{width:auto;height:6px}.scroll-chrome.scroll-active .scroll-bar{background-color:transparent;width:11px}.scroll-chrome.scroll-active .scroll-bar:before{display:block;content:"";position:absolute;top:1px;bottom:3px;left:1px;right:1px;background-color:#D9D9D9;border:1px solid #BBB;border-radius:1px}.scroll-chrome.scroll-active .scroll-track{width:12px;background-color:#F2F2F2;border:1px solid;border-width:1px 0 1px 1px;border-color:#E6E6E6 transparent #E6E6E6 #DBDBDB}.scroll-chrome.scroll-active .scroll-track:hover .scroll-bar:before{background-color:silver;border-color:#A6A6A6}.scroll-chrome.scroll-active .scroll-track.active .scroll-bar:before{background-color:#A9A9A9;border-color:#8B8B8B}.scroll-active.scroll-track.idle-hide{opacity:0;filter:alpha(opacity=0);width:8px}.scroll-active.scroll-track.idle-hide.not-idle{width:8px;opacity:1;filter:alpha(opacity=100)}.scroll-active.scroll-thin.scroll-track.idle-hide{width:6px}.scroll-active.scroll-chrome .scroll-track.idle-hide{width:12px}.nav-wrap+.scroll-active .scroll-track{width:8px}.nav-scroll.scroll-active .scroll-track{width:8px;right:0}.nav-wrap:hover+.scroll-active .scroll-track,.nav-scroll.scroll-active:hover .scroll-track{width:8px;opacity:1;-webkit-transition-duration:.15s;transition-duration:.15s;-webkit-transition-delay:0s;transition-delay:0s}.nav-scroll.scroll-active:hover .scroll-track{width:8px}.nav-scroll.ace-scroll,.nav-scroll.ace-scroll .scroll-content{overflow:hidden}.nav-scroll.ace-scroll.scroll-disabled,.nav-scroll.ace-scroll.scroll-disabled .scroll-content{overflow:visible}.scroll-track.scroll-detached{position:absolute;z-index:1029;bottom:auto;right:auto}.modal-content{border-radius:0;-webkit-box-shadow:none;box-shadow:none}.modal-footer{padding-top:12px;padding-bottom:14px;border-top-color:#e4e9ee;-webkit-box-shadow:none;box-shadow:none;background-color:#eff3f8}.modal-header .close{font-size:32px}.modal.aside-dark .modal-content{background-color:rgba(0,0,0,.85);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#D8000000', endColorstr='#D8000000', GradientType=0)}.modal.aside{z-index:999;position:absolute}.navbar-fixed-top~.modal.aside-vc{z-index:1025}.modal.aside-fixed.aside-hz,.navbar-fixed-top~.modal.aside-hz,.navbar-fixed-bottom~.modal.aside-hz{position:fixed;z-index:1039}.modal.aside-fixed.aside-vc{position:fixed}.modal.aside.in{z-index:1040;position:fixed}.aside.aside-contained{position:fixed}.modal.aside-vc{margin:auto;width:0;left:auto;right:auto;top:0;bottom:0;display:block!important;overflow:visible}.modal.in.aside-vc{width:100%}.modal.aside-vc .modal-dialog{margin:inherit;overflow:inherit;width:250px;max-width:66%;height:inherit;position:inherit;right:inherit;top:inherit;bottom:inherit;left:inherit;opacity:1;transition:transform .3s ease-out 0s;-webkit-transition:-webkit-transform .3s ease-out 0s}@media only screen and (max-width:319px){.modal.aside-vc .modal-dialog{max-width:none;width:200px}.aside-contained.aside-vc .modal-dialog{width:180px}}@media only screen and (max-width:240px){.modal.aside-vc .modal-dialog{max-width:none;width:160px}.aside-contained.aside-vc .modal-dialog{width:140px}}.modal.aside-vc .modal-content{height:100%;overflow:hidden}.modal.in.aside-vc .modal-dialog{transform:none;-webkit-transform:none;height:auto}.modal.aside-vc .aside-trigger{position:absolute;top:155px;right:auto;left:auto;bottom:auto;margin-top:-1px;width:37px;outline:0}.modal.aside-vc .aside-trigger.ace-settings-btn{width:42px}.modal.in.aside-vc .aside-trigger{z-index:-1}.aside.modal.in .modal-backdrop.in+.modal-dialog .aside-trigger{z-index:auto}@media only screen and (max-height:240px){.modal.aside-vc .aside-trigger{top:130px}}.modal.aside-vc.navbar-offset .modal-dialog{top:45px}.modal.aside-vc.navbar-offset .modal-dialog .aside-trigger{top:110px}@media (max-width:479px){.navbar:not(.navbar-collapse)~.modal.aside-vc.navbar-offset .modal-dialog{top:90px}}.modal.aside-right{right:0}.modal.aside-right .modal-content{border-width:0 0 0 1px;box-shadow:-2px 1px 2px 0 rgba(0,0,0,.15)}.modal.aside-right .aside-trigger{right:100%}.modal.aside-right .modal-dialog{transform:translateX(100%);-webkit-transform:translateX(100%)}.modal.aside-left{left:0}.modal.aside-left .modal-content{border-width:0 1px 0 0;box-shadow:2px -1px 2px 0 rgba(0,0,0,.15)}.modal.aside-left .aside-trigger{left:100%}.modal.aside-right .aside-trigger.btn.ace-settings-btn{border-radius:6px 0 0 6px}.modal.aside-left .aside-trigger.btn.ace-settings-btn{border-radius:0 6px 6px 0}.modal.aside-left .modal-dialog{transform:translateX(-100%);-webkit-transform:translateX(-100%)}.modal.aside-hz{margin:auto;height:0;left:0;right:0;top:auto;bottom:auto;display:block!important;overflow:visible}.modal.in.aside-hz{height:100%}.modal.aside-hz .modal-dialog{margin:inherit;height:auto;overflow:inherit;max-height:50%;width:inherit;position:inherit;right:inherit;top:inherit;bottom:inherit;left:inherit;opacity:1;transition:transform .3s ease-out 0s;-webkit-transition:-webkit-transform .3s ease-out 0s}@media only screen and (max-height:320px){.modal.aside-hz .modal-dialog{max-height:66%}}.modal.aside-hz .modal-content{width:100%;overflow:hidden}.modal.in.aside-hz .modal-dialog{transform:none;-webkit-transform:none;height:auto}.modal.aside-hz .aside-trigger{position:absolute;top:auto;right:auto;bottom:auto;margin-top:-1px;z-index:auto;outline:0;margin-left:-15px;left:50%}.modal.aside-hz .aside-trigger.ace-settings-btn{margin-left:-20px}.modal.in.aside-hz .aside-trigger{z-index:-1}.modal.aside-top{top:0}.modal.aside-top .modal-dialog{transform:translateY(-100%);-webkit-transform:translateY(-100%)}.modal.aside-top .modal-content{border-width:0;box-shadow:1px 2px 2px 0 rgba(0,0,0,.15)}.modal.aside-bottom{bottom:0}.modal.aside-bottom .modal-dialog{transform:translateY(100%);-webkit-transform:translateY(100%)}.modal.aside-bottom .modal-content{border-width:0;box-shadow:-1px 2px 2px 0 rgba(0,0,0,.15)}.modal.aside-bottom .aside-trigger{bottom:100%;margin-top:auto;margin-bottom:-1px}.modal.aside-top .aside-trigger.ace-settings-btn{border-radius:0 0 6px 6px!important}.modal.aside-bottom .aside-trigger.ace-settings-btn{border-radius:6px 6px 0 0!important}.aside.aside-hidden .modal-content{display:none}@media only screen and (min-width:768px){.container.main-container~.modal.aside-vc .modal-dialog{transition:none;-webkit-transition:none}.container.main-container~.modal.aside-vc:not(.in) .modal-content{display:none}}.aside-vc.in.no-backdrop{width:auto}.aside-hz.in.no-backdrop{height:auto}.modal.aside .modal-backdrop{position:fixed;bottom:0;height:auto!important}.modal.aside-hz .aside-trigger.align-left{left:15px;margin-left:auto;text-align:center}.modal.aside-hz .aside-trigger.align-right{text-align:center;left:auto;margin-left:auto;right:15px}.modal.transition-off .modal-dialog{transition:none;-webkit-transition:none}.breadcrumbs{position:relative;z-index:auto;border-bottom:1px solid #e5e5e5;background-color:#f5f5f5;min-height:41px;line-height:40px;padding:0 12px 0 0}.breadcrumb{background-color:transparent;display:inline-block;line-height:20px;margin:6px 22px 0 12px;padding:0;font-size:13px;color:#333;border-radius:0}.breadcrumb>li,.breadcrumb>li.active{color:#555;padding:0 3px 0 3px}.breadcrumb>li>a{display:inline-block;color:#4c8fbd}.breadcrumb>li+li:before{font-family:FontAwesome;font-size:14px;content:"\f105";color:#b2b6bf;padding:0;margin:0 8px 0 0;position:relative;top:1px}.breadcrumb .home-icon{font-size:20px;margin-left:2px;margin-right:2px;vertical-align:top}@media only screen and (max-width:480px){.breadcrumb>li>a{padding:0 1px}}@media only screen and (max-width:991px){.menu-toggler+.sidebar.responsive+.main-content .breadcrumb{margin-left:90px}}@media only screen and (max-width:320px){.breadcrumb{margin-left:8px}.menu-toggler+.sidebar.responsive+.main-content .breadcrumb{margin-left:36px}}@media (min-width:992px){.breadcrumbs-fixed{position:fixed;right:0;left:0;top:auto;z-index:1024}.breadcrumbs-fixed+.page-content{padding-top:49px}.sidebar+.main-content .breadcrumbs-fixed{left:190px}body.mob-safari .breadcrumbs-fixed{top:45px}}@media (min-width:992px){.sidebar.compact+.main-content .breadcrumbs-fixed{left:105px}}@media (min-width:992px){.sidebar.menu-min+.main-content .breadcrumbs-fixed{left:43px}}@media (min-width:992px) and (max-width:991px){.breadcrumbs-fixed,.sidebar.menu-min+.main-content .breadcrumbs-fixed{left:0}.sidebar.responsive-min+.main-content .breadcrumbs-fixed,.sidebar.responsive-max+.main-content .breadcrumbs-fixed{left:43px}}@media (min-width:992px){.container.main-container .breadcrumbs-fixed{left:auto;right:auto;width:744px}.container.main-container .sidebar+.main-content .breadcrumbs-fixed{left:auto;right:auto;width:554px}.container.main-container .sidebar.compact+.main-content .breadcrumbs-fixed{width:639px}.container.main-container .sidebar.menu-min+.main-content .breadcrumbs-fixed{left:auto;right:auto;width:701px}}@media (min-width:992px){.container.main-container .sidebar.compact+.main-content .breadcrumbs-fixed{width:859px}}@media (min-width:992px){.container.main-container .breadcrumbs-fixed{width:964px}.container.main-container .sidebar+.main-content .breadcrumbs-fixed{width:774px}.container.main-container .sidebar.menu-min+.main-content .breadcrumbs-fixed{width:921px}}@media (min-width:1200px){.container.main-container .sidebar.compact+.main-content .breadcrumbs-fixed{width:1059px}}@media (min-width:1200px){.container.main-container .breadcrumbs-fixed{width:1164px}.container.main-container .sidebar+.main-content .breadcrumbs-fixed{width:974px}.container.main-container .sidebar.menu-min+.main-content .breadcrumbs-fixed{width:1121px}}@media (min-width:992px) and (max-width:991px){.container.main-container .sidebar.compact+.main-content .breadcrumbs-fixed{width:744px}}@media (min-width:992px) and (max-width:991px){.container.main-container .breadcrumbs-fixed,.container.main-container .sidebar.menu-min+.main-content .breadcrumbs-fixed{width:744px}.container.main-container .sidebar.responsive-min+.main-content .breadcrumbs-fixed,.container.main-container .sidebar.responsive-max+.main-content .breadcrumbs-fixed{left:auto;right:auto;width:701px}}@media (min-width:992px){.h-sidebar+.main-content .breadcrumbs.breadcrumbs-fixed{position:relative;top:auto;left:auto;z-index:auto;width:auto}.h-sidebar+.main-content .page-content{padding-top:12px}}.nav-search{position:absolute;right:22px;line-height:24px}.breadcrumbs .nav-search{top:6px}.nav-search .form-search{margin-bottom:0}.nav-search .nav-search-input{border:1px solid #6fb3e0;width:152px;height:28px!important;padding-top:2px;padding-bottom:2px;border-radius:4px!important;font-size:13px;line-height:1.3;color:#666!important;z-index:11;-webkit-transition:width ease .15s;-o-transition:width ease .15s;transition:width ease .15s}.nav-search .nav-search-input+.dropdown-menu{min-width:0;left:0;right:0}.nav-search .nav-search-input:focus,.nav-search .nav-search-input:hover{border-color:#6fb3e0}.nav-search .nav-search-icon{color:#6fb3e0!important;font-size:14px!important;line-height:24px!important;background-color:transparent}.nav-search.minimized .nav-search-input{width:0;opacity:0;filter:alpha(opacity=0);max-width:0}.nav-search.minimized:hover .nav-search-input,.nav-search.minimized .nav-search-btn:active+.nav-search-input,.nav-search.minimized .nav-search-input:focus,.nav-search.minimized .nav-search-input:hover,.nav-search.minimized .nav-search-input:active{opacity:1;filter:alpha(opacity=100);width:152px;max-width:152px}.nav-search.minimized .nav-search-icon{border:1px solid;border-radius:100%;background-color:#FFF;padding:0 5px!important}.nav-search.minimized:hover .nav-search-icon,.nav-search.minimized .nav-search-input:focus~.nav-search-icon,.nav-search.minimized .nav-search-input:hover~.nav-search-icon,.nav-search.minimized .nav-search-input:active~.nav-search-icon{border:none;border-radius:0;padding:0 3px!important}.nav-search-icon{border:none;border-radius:0;padding:0 3px!important}.sidebar>.nav-search{position:static;background-color:#FAFAFA;border-bottom:1px solid #DDD;text-align:center;height:35px;padding-top:6px}.sidebar>.nav-search .nav-search-input{width:162px!important;border-radius:0!important;max-width:162px!important;opacity:1!important;filter:alpha(opacity=100)!important}.sidebar>.nav-search .nav-search-input+.dropdown-menu{text-align:left}.sidebar.menu-min .nav-search .form-search{position:absolute;left:5px;z-index:14}.sidebar.menu-min .nav-search .nav-search-input{width:0!important;max-width:0!important;opacity:0!important;filter:alpha(opacity=0)!important}.sidebar.menu-min .nav-search .nav-search-input:hover,.sidebar.menu-min .nav-search .nav-search-input:focus,.sidebar.menu-min .nav-search .nav-search-input:active{width:162px!important;max-width:162px!important;opacity:1!important;filter:alpha(opacity=100)!important}.sidebar.menu-min .nav-search .nav-search-input:hover~#nav-search-icon,.sidebar.menu-min .nav-search .nav-search-input:focus~#nav-search-icon,.sidebar.menu-min .nav-search .nav-search-input:active~#nav-search-icon{border:none;border-radius:0;padding:0 3px!important}.sidebar.menu-min .nav-search:hover .nav-search-input{width:162px!important;max-width:162px!important;opacity:1!important;filter:alpha(opacity=100)!important}.sidebar.menu-min .nav-search:hover .nav-search-input~.nav-search-icon{border:none;border-radius:0;padding:0 3px!important}.sidebar.menu-min .nav-search .nav-search-icon{border:1px solid;border-radius:32px;background-color:#FFF;padding:0 5px!important}@media (max-width:991px){.sidebar.responsive-min .nav-search .form-search{position:absolute;left:5px;z-index:14}.sidebar.responsive-min .nav-search .nav-search-input{width:0!important;max-width:0!important;opacity:0!important;filter:alpha(opacity=0)!important}.sidebar.responsive-min .nav-search .nav-search-input:hover,.sidebar.responsive-min .nav-search .nav-search-input:focus,.sidebar.responsive-min .nav-search .nav-search-input:active{width:162px!important;max-width:162px!important;opacity:1!important;filter:alpha(opacity=100)!important}.sidebar.responsive-min .nav-search .nav-search-input:hover~#nav-search-icon,.sidebar.responsive-min .nav-search .nav-search-input:focus~#nav-search-icon,.sidebar.responsive-min .nav-search .nav-search-input:active~#nav-search-icon{border:none;border-radius:0;padding:0 3px!important}.sidebar.responsive-min .nav-search:hover .nav-search-input{width:162px!important;max-width:162px!important;opacity:1!important;filter:alpha(opacity=100)!important}.sidebar.responsive-min .nav-search:hover .nav-search-input~.nav-search-icon{border:none;border-radius:0;padding:0 3px!important}.sidebar.responsive-min .nav-search .nav-search-icon{border:1px solid;border-radius:32px;background-color:#FFF;padding:0 5px!important}}@media only screen and (max-width:991px){.nav-search{right:10px}.nav-search .nav-search-input{width:105px}.nav-search:hover .nav-search-input,.nav-search .nav-search-btn:active+.nav-search-input,.nav-search .nav-search-input:focus,.nav-search .nav-search-input:hover,.nav-search .nav-search-input:active{width:145px}}@media only screen and (max-width:767px){.nav-search .nav-search-input{width:0;opacity:0;filter:alpha(opacity=0);max-width:0}.nav-search:hover .nav-search-input,.nav-search .nav-search-btn:active+.nav-search-input,.nav-search .nav-search-input:focus,.nav-search .nav-search-input:hover,.nav-search .nav-search-input:active{opacity:1;filter:alpha(opacity=100);width:152px;max-width:152px}.nav-search .nav-search-icon{border:1px solid;border-radius:100%;background-color:#FFF;padding:0 5px!important}.nav-search:hover .nav-search-icon,.nav-search .nav-search-input:focus~.nav-search-icon,.nav-search .nav-search-input:hover~.nav-search-icon,.nav-search .nav-search-input:active~.nav-search-icon{border:none;border-radius:0;padding:0 3px!important}}.footer{padding-top:75px;height:0;width:0}.footer .footer-inner{text-align:center;position:absolute;z-index:auto;left:0;right:0;bottom:0}.sidebar~.footer .footer-inner{left:190px}@media (min-width:992px){.sidebar.compact~.footer .footer-inner{left:105px}}.sidebar.menu-min~.footer .footer-inner{left:43px}@media (min-width:992px){.sidebar.h-sidebar~.footer .footer-inner{left:0}}@media (max-width:991px){.footer .footer-inner,.sidebar~.footer .footer-inner,.sidebar.compact~.footer .footer-inner,.sidebar.menu-min~.footer .footer-inner{left:0}.sidebar.responsive-min~.footer .footer-inner{left:43px}}@media (min-width:768px) and (max-width:991px){.container.main-container .footer .footer-inner{left:auto!important;right:auto!important;margin-left:auto;width:744px}}@media (min-width:992px){.container.main-container .footer .footer-inner{left:auto!important;right:auto!important;width:964px}}@media (min-width:1200px){.container.main-container .footer .footer-inner{width:1164px}}@media (min-width:768px) and (max-width:991px){.container.main-container .sidebar~.footer .footer-inner{left:auto!important;right:auto!important;margin-left:auto;width:744px}}@media (min-width:992px){.container.main-container .sidebar~.footer .footer-inner{left:auto!important;right:auto!important;margin-left:190px;width:774px}}@media (min-width:1200px){.container.main-container .sidebar~.footer .footer-inner{margin-left:190px;width:974px}}@media (min-width:992px){.container.main-container .sidebar.compact~.footer .footer-inner{margin-left:105px;width:859px}}@media (min-width:1200px){.container.main-container .sidebar.compact~.footer .footer-inner{margin-left:105px;width:1059px}}@media (min-width:992px){.container.main-container .sidebar.menu-min~.footer .footer-inner{margin-left:43px;width:921px}}@media (min-width:1200px){.container.main-container .sidebar.menu-min~.footer .footer-inner{margin-left:43px;width:1121px}}@media (min-width:992px){.container.main-container .sidebar.h-sidebar~.footer .footer-inner{margin-left:0;width:964px}}@media (min-width:992px){.container.main-container .sidebar.h-sidebar~.footer .footer-inner{margin-left:0;width:964px}}@media (min-width:1200px){.container.main-container .sidebar.h-sidebar~.footer .footer-inner{margin-left:0;width:1164px}}@media (min-width:768px) and (max-width:991px){.container.main-container .sidebar.responsive-min~.footer .footer-inner{margin-left:43px;width:701px}}.footer .footer-inner .footer-content{position:absolute;left:12px;right:12px;bottom:4px;padding:8px;line-height:36px;border-top:3px double #E5E5E5}.footer.footer-fixed .footer-inner{position:fixed;z-index:999;bottom:0}.footer.footer-fixed .footer-inner .footer-content{left:2px;right:2px;bottom:2px;border:1px solid #DDD;background-color:#F2F2F2}.footer.footer-fixed+.btn-scroll-up{z-index:999}.btn{display:inline-block;color:#FFF!important;text-shadow:0 -1px 0 rgba(0,0,0,.25);background-image:none!important;border:5px solid #FFF;border-radius:0;box-shadow:none!important;-webkit-transition:background-color .15s,border-color .15s,opacity .15s;-o-transition:background-color .15s,border-color .15s,opacity .15s;transition:background-color .15s,border-color .15s,opacity .15s;cursor:pointer;vertical-align:middle;margin:0;position:relative}.btn.active,.open>.btn.active.dropdown-toggle{box-shadow:none}.btn-lg,.btn-group-lg>.btn{border-width:5px;line-height:1.4;padding:5px 16px 6px}.btn-xlg,.btn-group-xlg>.btn{border-width:5px;line-height:1.35;padding:7px 16px;font-size:18px}.btn-sm,.btn-group-sm>.btn{border-width:4px;font-size:13px;padding:4px 9px;line-height:1.38}.btn-xs,.btn-group-xs>.btn{padding-top:3px;padding-bottom:3px;border-width:3px}.btn-mini,.btn-group-mini>.btn{padding:1px 5px;border-width:3px;font-size:12px;line-height:1.5}.btn-minier,.btn-group-minier>.btn{padding:0 4px;line-height:18px;border-width:2px;font-size:12px}button.btn:active{top:1px}.btn,.btn-default,.btn:focus,.btn-default:focus{background-color:#abbac3!important;border-color:#abbac3}.btn:hover,.btn-default:hover,.btn:active,.btn-default:active,.open>.btn.dropdown-toggle,.open>.btn-default.dropdown-toggle{background-color:#8b9aa3!important;border-color:#abbac3}.btn.no-border:hover,.btn-default.no-border:hover,.btn.no-border:active,.btn-default.no-border:active{border-color:#8b9aa3}.btn.no-hover:hover,.btn-default.no-hover:hover,.btn.no-hover:active,.btn-default.no-hover:active{background-color:#abbac3!important}.btn.active,.btn-default.active{background-color:#9baab3!important;border-color:#8799a4}.btn.no-border.active,.btn-default.no-border.active{background-color:#92a3ac!important;border-color:#92a3ac}.btn.disabled,.btn-default.disabled,.btn[disabled],.btn-default[disabled],fieldset[disabled] .btn,fieldset[disabled] .btn-default,.btn.disabled:hover,.btn-default.disabled:hover,.btn[disabled]:hover,.btn-default[disabled]:hover,fieldset[disabled] .btn:hover,fieldset[disabled] .btn-default:hover,.btn.disabled:focus,.btn-default.disabled:focus,.btn[disabled]:focus,.btn-default[disabled]:focus,fieldset[disabled] .btn:focus,fieldset[disabled] .btn-default:focus,.btn.disabled:active,.btn-default.disabled:active,.btn[disabled]:active,.btn-default[disabled]:active,fieldset[disabled] .btn:active,fieldset[disabled] .btn-default:active,.btn.disabled.active,.btn-default.disabled.active,.btn[disabled].active,.btn-default[disabled].active,fieldset[disabled] .btn.active,fieldset[disabled] .btn-default.active{background-color:#abbac3!important;border-color:#abbac3}.btn-primary,.btn-primary:focus{background-color:#428bca!important;border-color:#428bca}.btn-primary:hover,.btn-primary:active,.open>.btn-primary.dropdown-toggle{background-color:#1b6aaa!important;border-color:#428bca}.btn-primary.no-border:hover,.btn-primary.no-border:active{border-color:#1b6aaa}.btn-primary.no-hover:hover,.btn-primary.no-hover:active{background-color:#428bca!important}.btn-primary.active{background-color:#2f7bba!important;border-color:#27689d}.btn-primary.no-border.active{background-color:#2b72ae!important;border-color:#2b72ae}.btn-primary.disabled,.btn-primary[disabled],fieldset[disabled] .btn-primary,.btn-primary.disabled:hover,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary:hover,.btn-primary.disabled:focus,.btn-primary[disabled]:focus,fieldset[disabled] .btn-primary:focus,.btn-primary.disabled:active,.btn-primary[disabled]:active,fieldset[disabled] .btn-primary:active,.btn-primary.disabled.active,.btn-primary[disabled].active,fieldset[disabled] .btn-primary.active{background-color:#428bca!important;border-color:#428bca}.btn-info,.btn-info:focus{background-color:#6fb3e0!important;border-color:#6fb3e0}.btn-info:hover,.btn-info:active,.open>.btn-info.dropdown-toggle{background-color:#4f99c6!important;border-color:#6fb3e0}.btn-info.no-border:hover,.btn-info.no-border:active{border-color:#4f99c6}.btn-info.no-hover:hover,.btn-info.no-hover:active{background-color:#6fb3e0!important}.btn-info.active{background-color:#5fa6d3!important;border-color:#4396cb}.btn-info.no-border.active{background-color:#539fd0!important;border-color:#539fd0}.btn-info.disabled,.btn-info[disabled],fieldset[disabled] .btn-info,.btn-info.disabled:hover,.btn-info[disabled]:hover,fieldset[disabled] .btn-info:hover,.btn-info.disabled:focus,.btn-info[disabled]:focus,fieldset[disabled] .btn-info:focus,.btn-info.disabled:active,.btn-info[disabled]:active,fieldset[disabled] .btn-info:active,.btn-info.disabled.active,.btn-info[disabled].active,fieldset[disabled] .btn-info.active{background-color:#6fb3e0!important;border-color:#6fb3e0}.btn-info2,.btn-info2:focus{background-color:#95c6e5!important;border-color:#95c6e5}.btn-info2:hover,.btn-info2:active,.open>.btn-info2.dropdown-toggle{background-color:#67a6ce!important;border-color:#95c6e5}.btn-info2.no-border:hover,.btn-info2.no-border:active{border-color:#67a6ce}.btn-info2.no-hover:hover,.btn-info2.no-hover:active{background-color:#95c6e5!important}.btn-info2.active{background-color:#7eb6da!important;border-color:#62a6d1}.btn-info2.no-border.active{background-color:#72afd6!important;border-color:#72afd6}.btn-info2.disabled,.btn-info2[disabled],fieldset[disabled] .btn-info2,.btn-info2.disabled:hover,.btn-info2[disabled]:hover,fieldset[disabled] .btn-info2:hover,.btn-info2.disabled:focus,.btn-info2[disabled]:focus,fieldset[disabled] .btn-info2:focus,.btn-info2.disabled:active,.btn-info2[disabled]:active,fieldset[disabled] .btn-info2:active,.btn-info2.disabled.active,.btn-info2[disabled].active,fieldset[disabled] .btn-info2.active{background-color:#95c6e5!important;border-color:#95c6e5}.btn-success,.btn-success:focus{background-color:#87b87f!important;border-color:#87b87f}.btn-success:hover,.btn-success:active,.open>.btn-success.dropdown-toggle{background-color:#629b58!important;border-color:#87b87f}.btn-success.no-border:hover,.btn-success.no-border:active{border-color:#629b58}.btn-success.no-hover:hover,.btn-success.no-hover:active{background-color:#87b87f!important}.btn-success.active{background-color:#75aa6c!important;border-color:#629959}.btn-success.no-border.active{background-color:#6ba462!important;border-color:#6ba462}.btn-success.disabled,.btn-success[disabled],fieldset[disabled] .btn-success,.btn-success.disabled:hover,.btn-success[disabled]:hover,fieldset[disabled] .btn-success:hover,.btn-success.disabled:focus,.btn-success[disabled]:focus,fieldset[disabled] .btn-success:focus,.btn-success.disabled:active,.btn-success[disabled]:active,fieldset[disabled] .btn-success:active,.btn-success.disabled.active,.btn-success[disabled].active,fieldset[disabled] .btn-success.active{background-color:#87b87f!important;border-color:#87b87f}.btn-warning,.btn-warning:focus{background-color:#ffb752!important;border-color:#ffb752}.btn-warning:hover,.btn-warning:active,.open>.btn-warning.dropdown-toggle{background-color:#e59729!important;border-color:#ffb752}.btn-warning.no-border:hover,.btn-warning.no-border:active{border-color:#e59729}.btn-warning.no-hover:hover,.btn-warning.no-hover:active{background-color:#ffb752!important}.btn-warning.active{background-color:#f2a73e!important;border-color:#f0981c}.btn-warning.no-border.active{background-color:#f1a02f!important;border-color:#f1a02f}.btn-warning.disabled,.btn-warning[disabled],fieldset[disabled] .btn-warning,.btn-warning.disabled:hover,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning:hover,.btn-warning.disabled:focus,.btn-warning[disabled]:focus,fieldset[disabled] .btn-warning:focus,.btn-warning.disabled:active,.btn-warning[disabled]:active,fieldset[disabled] .btn-warning:active,.btn-warning.disabled.active,.btn-warning[disabled].active,fieldset[disabled] .btn-warning.active{background-color:#ffb752!important;border-color:#ffb752}.btn-danger,.btn-danger:focus{background-color:#d15b47!important;border-color:#d15b47}.btn-danger:hover,.btn-danger:active,.open>.btn-danger.dropdown-toggle{background-color:#b74635!important;border-color:#d15b47}.btn-danger.no-border:hover,.btn-danger.no-border:active{border-color:#b74635}.btn-danger.no-hover:hover,.btn-danger.no-hover:active{background-color:#d15b47!important}.btn-danger.active{background-color:#c4513e!important;border-color:#aa4434}.btn-danger.no-border.active{background-color:#ba4b39!important;border-color:#ba4b39}.btn-danger.disabled,.btn-danger[disabled],fieldset[disabled] .btn-danger,.btn-danger.disabled:hover,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger:hover,.btn-danger.disabled:focus,.btn-danger[disabled]:focus,fieldset[disabled] .btn-danger:focus,.btn-danger.disabled:active,.btn-danger[disabled]:active,fieldset[disabled] .btn-danger:active,.btn-danger.disabled.active,.btn-danger[disabled].active,fieldset[disabled] .btn-danger.active{background-color:#d15b47!important;border-color:#d15b47}.btn-inverse,.btn-inverse:focus{background-color:#555!important;border-color:#555}.btn-inverse:hover,.btn-inverse:active,.open>.btn-inverse.dropdown-toggle{background-color:#303030!important;border-color:#555}.btn-inverse.no-border:hover,.btn-inverse.no-border:active{border-color:#303030}.btn-inverse.no-hover:hover,.btn-inverse.no-hover:active{background-color:#555!important}.btn-inverse.active{background-color:#434343!important;border-color:#313131}.btn-inverse.no-border.active{background-color:#3b3b3b!important;border-color:#3b3b3b}.btn-inverse.disabled,.btn-inverse[disabled],fieldset[disabled] .btn-inverse,.btn-inverse.disabled:hover,.btn-inverse[disabled]:hover,fieldset[disabled] .btn-inverse:hover,.btn-inverse.disabled:focus,.btn-inverse[disabled]:focus,fieldset[disabled] .btn-inverse:focus,.btn-inverse.disabled:active,.btn-inverse[disabled]:active,fieldset[disabled] .btn-inverse:active,.btn-inverse.disabled.active,.btn-inverse[disabled].active,fieldset[disabled] .btn-inverse.active{background-color:#555!important;border-color:#555}.btn-pink,.btn-pink:focus{background-color:#d6487e!important;border-color:#d6487e}.btn-pink:hover,.btn-pink:active,.open>.btn-pink.dropdown-toggle{background-color:#b73766!important;border-color:#d6487e}.btn-pink.no-border:hover,.btn-pink.no-border:active{border-color:#b73766}.btn-pink.no-hover:hover,.btn-pink.no-hover:active{background-color:#d6487e!important}.btn-pink.active{background-color:#c74072!important;border-color:#af3462}.btn-pink.no-border.active{background-color:#be386a!important;border-color:#be386a}.btn-pink.disabled,.btn-pink[disabled],fieldset[disabled] .btn-pink,.btn-pink.disabled:hover,.btn-pink[disabled]:hover,fieldset[disabled] .btn-pink:hover,.btn-pink.disabled:focus,.btn-pink[disabled]:focus,fieldset[disabled] .btn-pink:focus,.btn-pink.disabled:active,.btn-pink[disabled]:active,fieldset[disabled] .btn-pink:active,.btn-pink.disabled.active,.btn-pink[disabled].active,fieldset[disabled] .btn-pink.active{background-color:#d6487e!important;border-color:#d6487e}.btn-purple,.btn-purple:focus{background-color:#9585bf!important;border-color:#9585bf}.btn-purple:hover,.btn-purple:active,.open>.btn-purple.dropdown-toggle{background-color:#7461aa!important;border-color:#9585bf}.btn-purple.no-border:hover,.btn-purple.no-border:active{border-color:#7461aa}.btn-purple.no-hover:hover,.btn-purple.no-hover:active{background-color:#9585bf!important}.btn-purple.active{background-color:#8573b5!important;border-color:#705ca8}.btn-purple.no-border.active{background-color:#7c69af!important;border-color:#7c69af}.btn-purple.disabled,.btn-purple[disabled],fieldset[disabled] .btn-purple,.btn-purple.disabled:hover,.btn-purple[disabled]:hover,fieldset[disabled] .btn-purple:hover,.btn-purple.disabled:focus,.btn-purple[disabled]:focus,fieldset[disabled] .btn-purple:focus,.btn-purple.disabled:active,.btn-purple[disabled]:active,fieldset[disabled] .btn-purple:active,.btn-purple.disabled.active,.btn-purple[disabled].active,fieldset[disabled] .btn-purple.active{background-color:#9585bf!important;border-color:#9585bf}.btn-grey,.btn-grey:focus{background-color:#a0a0a0!important;border-color:#a0a0a0}.btn-grey:hover,.btn-grey:active,.open>.btn-grey.dropdown-toggle{background-color:#888!important;border-color:#a0a0a0}.btn-grey.no-border:hover,.btn-grey.no-border:active{border-color:#888}.btn-grey.no-hover:hover,.btn-grey.no-hover:active{background-color:#a0a0a0!important}.btn-grey.active{background-color:#949494!important;border-color:#828282}.btn-grey.no-border.active{background-color:#8c8c8c!important;border-color:#8c8c8c}.btn-grey.disabled,.btn-grey[disabled],fieldset[disabled] .btn-grey,.btn-grey.disabled:hover,.btn-grey[disabled]:hover,fieldset[disabled] .btn-grey:hover,.btn-grey.disabled:focus,.btn-grey[disabled]:focus,fieldset[disabled] .btn-grey:focus,.btn-grey.disabled:active,.btn-grey[disabled]:active,fieldset[disabled] .btn-grey:active,.btn-grey.disabled.active,.btn-grey[disabled].active,fieldset[disabled] .btn-grey.active{background-color:#a0a0a0!important;border-color:#a0a0a0}.btn-yellow{color:#963!important;text-shadow:0 -1px 0 rgba(255,255,255,.4)!important}.btn-yellow,.btn-yellow:focus{background-color:#fee188!important;border-color:#fee188}.btn-yellow:hover,.btn-yellow:active,.open>.btn-yellow.dropdown-toggle{background-color:#f7d05b!important;border-color:#fee188}.btn-yellow.no-border:hover,.btn-yellow.no-border:active{border-color:#f7d05b}.btn-yellow.no-hover:hover,.btn-yellow.no-hover:active{background-color:#fee188!important}.btn-yellow.active{background-color:#fbd972!important;border-color:#f9cf4f}.btn-yellow.no-border.active{background-color:#fad463!important;border-color:#fad463}.btn-yellow.disabled,.btn-yellow[disabled],fieldset[disabled] .btn-yellow,.btn-yellow.disabled:hover,.btn-yellow[disabled]:hover,fieldset[disabled] .btn-yellow:hover,.btn-yellow.disabled:focus,.btn-yellow[disabled]:focus,fieldset[disabled] .btn-yellow:focus,.btn-yellow.disabled:active,.btn-yellow[disabled]:active,fieldset[disabled] .btn-yellow:active,.btn-yellow.disabled.active,.btn-yellow[disabled].active,fieldset[disabled] .btn-yellow.active{background-color:#fee188!important;border-color:#fee188}.btn-yellow:hover,.btn-yellow:focus,.btn-yellow.focus,.open>.btn-yellow.dropdown-toggle,.btn-yellow.active,.open>.btn-yellow.active.dropdown-toggle{color:#963}.btn-light{color:#888!important;text-shadow:0 -1px 0 rgba(250,250,250,.25)!important}.btn-light,.btn-light:focus{background-color:#e7e7e7!important;border-color:#e7e7e7}.btn-light:hover,.btn-light:active,.open>.btn-light.dropdown-toggle{background-color:#d9d9d9!important;border-color:#e7e7e7}.btn-light.no-border:hover,.btn-light.no-border:active{border-color:#d9d9d9}.btn-light.no-hover:hover,.btn-light.no-hover:active{background-color:#e7e7e7!important}.btn-light.active{background-color:#e0e0e0!important;border-color:#cecece}.btn-light.no-border.active{background-color:#d8d8d8!important;border-color:#d8d8d8}.btn-light.disabled,.btn-light[disabled],fieldset[disabled] .btn-light,.btn-light.disabled:hover,.btn-light[disabled]:hover,fieldset[disabled] .btn-light:hover,.btn-light.disabled:focus,.btn-light[disabled]:focus,fieldset[disabled] .btn-light:focus,.btn-light.disabled:active,.btn-light[disabled]:active,fieldset[disabled] .btn-light:active,.btn-light.disabled.active,.btn-light[disabled].active,fieldset[disabled] .btn-light.active{background-color:#e7e7e7!important;border-color:#e7e7e7}.btn-light:hover,.btn-light:focus,.btn-light.focus,.open>.btn-light.dropdown-toggle,.btn-light.active,.open>.btn-light.active.dropdown-toggle{color:#888}.btn-light.btn-xs:after,.btn-light.btn-mini:after{left:-2px;right:-2px;top:-2px;bottom:-2px}.btn-light.btn-sm:after{left:-4px;right:-4px;top:-4px;bottom:-4px}.btn-light .btn-lg:after{left:-6px;right:-6px;top:-6px;bottom:-6px}.btn.btn-white{text-shadow:none!important;background-color:#FFF!important}.btn.btn-white.no-hover:hover,.btn.btn-white.no-hover:active{background-color:#FFF!important}.btn.btn-white:focus,.btn.btn-white.active{box-shadow:inset 1px 1px 2px 0 rgba(0,0,0,.1)!important}.btn.btn-white:focus.btn-bold,.btn.btn-white.active.btn-bold{box-shadow:inset 1px 1px 3px 0 rgba(0,0,0,.15)!important}.btn.btn-white.active:after{display:none}.btn.btn-white{border-color:#ccc;color:#444!important}.btn.btn-white:hover,.btn.btn-white:focus,.btn.btn-white.active,.btn.btn-white:active,.open>.btn.btn-white.dropdown-toggle,.open>.btn.btn-white.active.dropdown-toggle{background-color:#ebebeb!important;border-color:#ccc;color:#3a3434!important}.btn.btn-white:hover.no-border,.btn.btn-white:focus.no-border,.btn.btn-white.active.no-border,.btn.btn-white:active.no-border,.open>.btn.btn-white.dropdown-toggle.no-border,.open>.btn.btn-white.active.dropdown-toggle.no-border{border-color:#ccc}.btn.btn-white.disabled,.btn.btn-white[disabled],fieldset[disabled] .btn.btn-white,.btn.btn-white.disabled:hover,.btn.btn-white[disabled]:hover,fieldset[disabled] .btn.btn-white:hover,.btn.btn-white.disabled:focus,.btn.btn-white[disabled]:focus,fieldset[disabled] .btn.btn-white:focus,.btn.btn-white.disabled:active,.btn.btn-white[disabled]:active,fieldset[disabled] .btn.btn-white:active,.btn.btn-white.disabled.active,.btn.btn-white[disabled].active,fieldset[disabled] .btn.btn-white.active{border-color:#ccc}.btn-white.btn-default{border-color:#abbac3;color:#80909a!important}.btn-white.btn-default:hover,.btn-white.btn-default:focus,.btn-white.btn-default.active,.btn-white.btn-default:active,.open>.btn-white.btn-default.dropdown-toggle,.open>.btn-white.btn-default.active.dropdown-toggle{background-color:#eff2f4!important;border-color:#abbac3;color:#6b8595!important}.btn-white.btn-default:hover.no-border,.btn-white.btn-default:focus.no-border,.btn-white.btn-default.active.no-border,.btn-white.btn-default:active.no-border,.open>.btn-white.btn-default.dropdown-toggle.no-border,.open>.btn-white.btn-default.active.dropdown-toggle.no-border{border-color:#abbac3}.btn-white.btn-default.disabled,.btn-white.btn-default[disabled],fieldset[disabled] .btn-white.btn-default,.btn-white.btn-default.disabled:hover,.btn-white.btn-default[disabled]:hover,fieldset[disabled] .btn-white.btn-default:hover,.btn-white.btn-default.disabled:focus,.btn-white.btn-default[disabled]:focus,fieldset[disabled] .btn-white.btn-default:focus,.btn-white.btn-default.disabled:active,.btn-white.btn-default[disabled]:active,fieldset[disabled] .btn-white.btn-default:active,.btn-white.btn-default.disabled.active,.btn-white.btn-default[disabled].active,fieldset[disabled] .btn-white.btn-default.active{border-color:#abbac3}.btn-white.btn-primary{border-color:#8aafce;color:#6688a6!important}.btn-white.btn-primary:hover,.btn-white.btn-primary:focus,.btn-white.btn-primary.active,.btn-white.btn-primary:active,.open>.btn-white.btn-primary.dropdown-toggle,.open>.btn-white.btn-primary.active.dropdown-toggle{background-color:#eaf2f8!important;border-color:#8aafce;color:#537c9f!important}.btn-white.btn-primary:hover.no-border,.btn-white.btn-primary:focus.no-border,.btn-white.btn-primary.active.no-border,.btn-white.btn-primary:active.no-border,.open>.btn-white.btn-primary.dropdown-toggle.no-border,.open>.btn-white.btn-primary.active.dropdown-toggle.no-border{border-color:#8aafce}.btn-white.btn-primary.disabled,.btn-white.btn-primary[disabled],fieldset[disabled] .btn-white.btn-primary,.btn-white.btn-primary.disabled:hover,.btn-white.btn-primary[disabled]:hover,fieldset[disabled] .btn-white.btn-primary:hover,.btn-white.btn-primary.disabled:focus,.btn-white.btn-primary[disabled]:focus,fieldset[disabled] .btn-white.btn-primary:focus,.btn-white.btn-primary.disabled:active,.btn-white.btn-primary[disabled]:active,fieldset[disabled] .btn-white.btn-primary:active,.btn-white.btn-primary.disabled.active,.btn-white.btn-primary[disabled].active,fieldset[disabled] .btn-white.btn-primary.active{border-color:#8aafce}.btn-white.btn-success{border-color:#a7c9a1;color:#81a87b!important}.btn-white.btn-success:hover,.btn-white.btn-success:focus,.btn-white.btn-success.active,.btn-white.btn-success:active,.open>.btn-white.btn-success.dropdown-toggle,.open>.btn-white.btn-success.active.dropdown-toggle{background-color:#edf4eb!important;border-color:#a7c9a1;color:#6ea465!important}.btn-white.btn-success:hover.no-border,.btn-white.btn-success:focus.no-border,.btn-white.btn-success.active.no-border,.btn-white.btn-success:active.no-border,.open>.btn-white.btn-success.dropdown-toggle.no-border,.open>.btn-white.btn-success.active.dropdown-toggle.no-border{border-color:#a7c9a1}.btn-white.btn-success.disabled,.btn-white.btn-success[disabled],fieldset[disabled] .btn-white.btn-success,.btn-white.btn-success.disabled:hover,.btn-white.btn-success[disabled]:hover,fieldset[disabled] .btn-white.btn-success:hover,.btn-white.btn-success.disabled:focus,.btn-white.btn-success[disabled]:focus,fieldset[disabled] .btn-white.btn-success:focus,.btn-white.btn-success.disabled:active,.btn-white.btn-success[disabled]:active,fieldset[disabled] .btn-white.btn-success:active,.btn-white.btn-success.disabled.active,.btn-white.btn-success[disabled].active,fieldset[disabled] .btn-white.btn-success.active{border-color:#a7c9a1}.btn-white.btn-danger{border-color:#d7a59d;color:#b7837a!important}.btn-white.btn-danger:hover,.btn-white.btn-danger:focus,.btn-white.btn-danger.active,.btn-white.btn-danger:active,.open>.btn-white.btn-danger.dropdown-toggle,.open>.btn-white.btn-danger.active.dropdown-toggle{background-color:#fbf4f3!important;border-color:#d7a59d;color:#b46f64!important}.btn-white.btn-danger:hover.no-border,.btn-white.btn-danger:focus.no-border,.btn-white.btn-danger.active.no-border,.btn-white.btn-danger:active.no-border,.open>.btn-white.btn-danger.dropdown-toggle.no-border,.open>.btn-white.btn-danger.active.dropdown-toggle.no-border{border-color:#d7a59d}.btn-white.btn-danger.disabled,.btn-white.btn-danger[disabled],fieldset[disabled] .btn-white.btn-danger,.btn-white.btn-danger.disabled:hover,.btn-white.btn-danger[disabled]:hover,fieldset[disabled] .btn-white.btn-danger:hover,.btn-white.btn-danger.disabled:focus,.btn-white.btn-danger[disabled]:focus,fieldset[disabled] .btn-white.btn-danger:focus,.btn-white.btn-danger.disabled:active,.btn-white.btn-danger[disabled]:active,fieldset[disabled] .btn-white.btn-danger:active,.btn-white.btn-danger.disabled.active,.btn-white.btn-danger[disabled].active,fieldset[disabled] .btn-white.btn-danger.active{border-color:#d7a59d}.btn-white.btn-warning{border-color:#e7b979;color:#daa458!important}.btn-white.btn-warning:hover,.btn-white.btn-warning:focus,.btn-white.btn-warning.active,.btn-white.btn-warning:active,.open>.btn-white.btn-warning.dropdown-toggle,.open>.btn-white.btn-warning.active.dropdown-toggle{background-color:#fef7ec!important;border-color:#e7b979;color:#db9a3d!important}.btn-white.btn-warning:hover.no-border,.btn-white.btn-warning:focus.no-border,.btn-white.btn-warning.active.no-border,.btn-white.btn-warning:active.no-border,.open>.btn-white.btn-warning.dropdown-toggle.no-border,.open>.btn-white.btn-warning.active.dropdown-toggle.no-border{border-color:#e7b979}.btn-white.btn-warning.disabled,.btn-white.btn-warning[disabled],fieldset[disabled] .btn-white.btn-warning,.btn-white.btn-warning.disabled:hover,.btn-white.btn-warning[disabled]:hover,fieldset[disabled] .btn-white.btn-warning:hover,.btn-white.btn-warning.disabled:focus,.btn-white.btn-warning[disabled]:focus,fieldset[disabled] .btn-white.btn-warning:focus,.btn-white.btn-warning.disabled:active,.btn-white.btn-warning[disabled]:active,fieldset[disabled] .btn-white.btn-warning:active,.btn-white.btn-warning.disabled.active,.btn-white.btn-warning[disabled].active,fieldset[disabled] .btn-white.btn-warning.active{border-color:#e7b979}.btn-white.btn-info{border-color:#8fbcd9;color:#70a0c1!important}.btn-white.btn-info:hover,.btn-white.btn-info:focus,.btn-white.btn-info.active,.btn-white.btn-info:active,.open>.btn-white.btn-info.dropdown-toggle,.open>.btn-white.btn-info.active.dropdown-toggle{background-color:#eef5fa!important;border-color:#8fbcd9;color:#5896bf!important}.btn-white.btn-info:hover.no-border,.btn-white.btn-info:focus.no-border,.btn-white.btn-info.active.no-border,.btn-white.btn-info:active.no-border,.open>.btn-white.btn-info.dropdown-toggle.no-border,.open>.btn-white.btn-info.active.dropdown-toggle.no-border{border-color:#8fbcd9}.btn-white.btn-info.disabled,.btn-white.btn-info[disabled],fieldset[disabled] .btn-white.btn-info,.btn-white.btn-info.disabled:hover,.btn-white.btn-info[disabled]:hover,fieldset[disabled] .btn-white.btn-info:hover,.btn-white.btn-info.disabled:focus,.btn-white.btn-info[disabled]:focus,fieldset[disabled] .btn-white.btn-info:focus,.btn-white.btn-info.disabled:active,.btn-white.btn-info[disabled]:active,fieldset[disabled] .btn-white.btn-info:active,.btn-white.btn-info.disabled.active,.btn-white.btn-info[disabled].active,fieldset[disabled] .btn-white.btn-info.active{border-color:#8fbcd9}.btn-white.btn-inverse{border-color:#959595;color:#555!important}.btn-white.btn-inverse:hover,.btn-white.btn-inverse:focus,.btn-white.btn-inverse.active,.btn-white.btn-inverse:active,.open>.btn-white.btn-inverse.dropdown-toggle,.open>.btn-white.btn-inverse.active.dropdown-toggle{background-color:#e4e4e4!important;border-color:#959595;color:#4c4545!important}.btn-white.btn-inverse:hover.no-border,.btn-white.btn-inverse:focus.no-border,.btn-white.btn-inverse.active.no-border,.btn-white.btn-inverse:active.no-border,.open>.btn-white.btn-inverse.dropdown-toggle.no-border,.open>.btn-white.btn-inverse.active.dropdown-toggle.no-border{border-color:#959595}.btn-white.btn-inverse.disabled,.btn-white.btn-inverse[disabled],fieldset[disabled] .btn-white.btn-inverse,.btn-white.btn-inverse.disabled:hover,.btn-white.btn-inverse[disabled]:hover,fieldset[disabled] .btn-white.btn-inverse:hover,.btn-white.btn-inverse.disabled:focus,.btn-white.btn-inverse[disabled]:focus,fieldset[disabled] .btn-white.btn-inverse:focus,.btn-white.btn-inverse.disabled:active,.btn-white.btn-inverse[disabled]:active,fieldset[disabled] .btn-white.btn-inverse:active,.btn-white.btn-inverse.disabled.active,.btn-white.btn-inverse[disabled].active,fieldset[disabled] .btn-white.btn-inverse.active{border-color:#959595}.btn-white.btn-pink{border-color:#d299ae;color:#af6f87!important}.btn-white.btn-pink:hover,.btn-white.btn-pink:focus,.btn-white.btn-pink.active,.btn-white.btn-pink:active,.open>.btn-white.btn-pink.dropdown-toggle,.open>.btn-white.btn-pink.active.dropdown-toggle{background-color:#fbeff4!important;border-color:#d299ae;color:#ac5978!important}.btn-white.btn-pink:hover.no-border,.btn-white.btn-pink:focus.no-border,.btn-white.btn-pink.active.no-border,.btn-white.btn-pink:active.no-border,.open>.btn-white.btn-pink.dropdown-toggle.no-border,.open>.btn-white.btn-pink.active.dropdown-toggle.no-border{border-color:#d299ae}.btn-white.btn-pink.disabled,.btn-white.btn-pink[disabled],fieldset[disabled] .btn-white.btn-pink,.btn-white.btn-pink.disabled:hover,.btn-white.btn-pink[disabled]:hover,fieldset[disabled] .btn-white.btn-pink:hover,.btn-white.btn-pink.disabled:focus,.btn-white.btn-pink[disabled]:focus,fieldset[disabled] .btn-white.btn-pink:focus,.btn-white.btn-pink.disabled:active,.btn-white.btn-pink[disabled]:active,fieldset[disabled] .btn-white.btn-pink:active,.btn-white.btn-pink.disabled.active,.btn-white.btn-pink[disabled].active,fieldset[disabled] .btn-white.btn-pink.active{border-color:#d299ae}.btn-white.btn-purple{border-color:#b7b1c6;color:#7d6fa2!important}.btn-white.btn-purple:hover,.btn-white.btn-purple:focus,.btn-white.btn-purple.active,.btn-white.btn-purple:active,.open>.btn-white.btn-purple.dropdown-toggle,.open>.btn-white.btn-purple.active.dropdown-toggle{background-color:#efedf5!important;border-color:#b7b1c6;color:#6d5b9c!important}.btn-white.btn-purple:hover.no-border,.btn-white.btn-purple:focus.no-border,.btn-white.btn-purple.active.no-border,.btn-white.btn-purple:active.no-border,.open>.btn-white.btn-purple.dropdown-toggle.no-border,.open>.btn-white.btn-purple.active.dropdown-toggle.no-border{border-color:#b7b1c6}.btn-white.btn-purple.disabled,.btn-white.btn-purple[disabled],fieldset[disabled] .btn-white.btn-purple,.btn-white.btn-purple.disabled:hover,.btn-white.btn-purple[disabled]:hover,fieldset[disabled] .btn-white.btn-purple:hover,.btn-white.btn-purple.disabled:focus,.btn-white.btn-purple[disabled]:focus,fieldset[disabled] .btn-white.btn-purple:focus,.btn-white.btn-purple.disabled:active,.btn-white.btn-purple[disabled]:active,fieldset[disabled] .btn-white.btn-purple:active,.btn-white.btn-purple.disabled.active,.btn-white.btn-purple[disabled].active,fieldset[disabled] .btn-white.btn-purple.active{border-color:#b7b1c6}.btn-white.btn-yellow{border-color:#ecd181;color:#d3a61a!important}.btn-white.btn-yellow:hover,.btn-white.btn-yellow:focus,.btn-white.btn-yellow.active,.btn-white.btn-yellow:active,.open>.btn-white.btn-yellow.dropdown-toggle,.open>.btn-white.btn-yellow.active.dropdown-toggle{background-color:#fdf7e4!important;border-color:#ecd181;color:#c29712!important}.btn-white.btn-yellow:hover.no-border,.btn-white.btn-yellow:focus.no-border,.btn-white.btn-yellow.active.no-border,.btn-white.btn-yellow:active.no-border,.open>.btn-white.btn-yellow.dropdown-toggle.no-border,.open>.btn-white.btn-yellow.active.dropdown-toggle.no-border{border-color:#ecd181}.btn-white.btn-yellow.disabled,.btn-white.btn-yellow[disabled],fieldset[disabled] .btn-white.btn-yellow,.btn-white.btn-yellow.disabled:hover,.btn-white.btn-yellow[disabled]:hover,fieldset[disabled] .btn-white.btn-yellow:hover,.btn-white.btn-yellow.disabled:focus,.btn-white.btn-yellow[disabled]:focus,fieldset[disabled] .btn-white.btn-yellow:focus,.btn-white.btn-yellow.disabled:active,.btn-white.btn-yellow[disabled]:active,fieldset[disabled] .btn-white.btn-yellow:active,.btn-white.btn-yellow.disabled.active,.btn-white.btn-yellow[disabled].active,fieldset[disabled] .btn-white.btn-yellow.active{border-color:#ecd181}.btn-white.btn-grey{border-color:#c6c6c6;color:#8c8c8c!important}.btn-white.btn-grey:hover,.btn-white.btn-grey:focus,.btn-white.btn-grey.active,.btn-white.btn-grey:active,.open>.btn-white.btn-grey.dropdown-toggle,.open>.btn-white.btn-grey.active.dropdown-toggle{background-color:#ededed!important;border-color:#c6c6c6;color:#857979!important}.btn-white.btn-grey:hover.no-border,.btn-white.btn-grey:focus.no-border,.btn-white.btn-grey.active.no-border,.btn-white.btn-grey:active.no-border,.open>.btn-white.btn-grey.dropdown-toggle.no-border,.open>.btn-white.btn-grey.active.dropdown-toggle.no-border{border-color:#c6c6c6}.btn-white.btn-grey.disabled,.btn-white.btn-grey[disabled],fieldset[disabled] .btn-white.btn-grey,.btn-white.btn-grey.disabled:hover,.btn-white.btn-grey[disabled]:hover,fieldset[disabled] .btn-white.btn-grey:hover,.btn-white.btn-grey.disabled:focus,.btn-white.btn-grey[disabled]:focus,fieldset[disabled] .btn-white.btn-grey:focus,.btn-white.btn-grey.disabled:active,.btn-white.btn-grey[disabled]:active,fieldset[disabled] .btn-white.btn-grey:active,.btn-white.btn-grey.disabled.active,.btn-white.btn-grey[disabled].active,fieldset[disabled] .btn-white.btn-grey.active{border-color:#c6c6c6}.btn.disabled.active,.btn[disabled].active,.btn.disabled:focus,.btn[disabled]:focus,.btn.disabled:active,.btn[disabled]:active{outline:0}.btn.disabled:active,.btn[disabled]:active{top:0;left:0}.btn.active:after{display:inline-block;content:"";position:absolute;border-bottom:1px solid #efe5b5;left:-4px;right:-4px;bottom:-4px}.btn.active.btn-sm:after{left:-3px;right:-3px;bottom:-3px}.btn.active.btn-lg:after{left:-5px;right:-5px;bottom:-5px}.btn.active.btn-xs:after,.btn.active.btn-mini:after,.btn.active.btn-minier:after{left:-1px;right:-1px;bottom:-2px}.btn.active.btn-minier:after{bottom:-1px}.btn.active.btn-yellow:after{border-bottom-color:#c96338}.btn.active.btn-light{color:#515151}.btn.active.btn-light:after{border-bottom-color:#B5B5B5}.btn>.ace-icon{margin-right:4px}.btn>.ace-icon.icon-on-right{margin-right:0;margin-left:4px}.btn>.icon-only.ace-icon{margin:0!important;text-align:center;padding:0}.btn-lg>.ace-icon{margin-right:6px}.btn-lg>.ace-icon.icon-on-right{margin-right:0;margin-left:6px}.btn-sm>.ace-icon{margin-right:3px}.btn-sm>.ace-icon.icon-on-right{margin-right:0;margin-left:3px}.btn-xs>.ace-icon,.btn-mini>.ace-icon,.btn-minier>.ace-icon{margin-right:2px}.btn-xs>.ace-icon.icon-on-right,.btn-mini>.ace-icon.icon-on-right,.btn-minier>.ace-icon.icon-on-right{margin-right:0;margin-left:2px}.btn.btn-link{border-width:0!important;background:transparent none!important;color:#08c!important;text-shadow:none!important;padding:4px 12px!important;line-height:20px!important}.btn.btn-link:hover{background:none!important;text-shadow:none!important}.btn.btn-link.active{background:none!important;text-decoration:underline;color:#009ceb!important}.btn.btn-link.active:after{display:none}.btn.btn-link.disabled,.btn.btn-link[disabled]{background:transparent none!important;opacity:.65;filter:alpha(opacity=65);text-decoration:none!important}.btn.btn-no-border{border-width:0!important}.btn-group:first-child{margin-left:0}.btn-group>.btn,.btn-group>.btn+.btn{margin:0 1px 0 0}.btn-group>.btn:first-child{margin:0 1px 0 0}.btn-group>.btn>.caret{margin-top:15px;margin-left:1px;border-width:5px;border-top-color:#FFF}.btn-group>.btn.btn-sm>.caret{margin-top:10px;border-width:4px}.btn-group>.btn.btn-lg>.caret{margin-top:18px;border-width:6px}.btn-group>.btn.btn-xs>.caret,.btn-group>.btn.btn-mini>.caret{margin-top:9px;border-width:4px}.btn-group>.btn.btn-minier>.caret{margin-top:7px;border-width:3px}.btn-group>.btn+.btn.dropdown-toggle{padding-right:3px;padding-left:3px}.btn-group>.btn+.btn-lg.dropdown-toggle{padding-right:4px;padding-left:4px}.btn-group .dropdown-toggle{border-radius:0}.btn-group>.btn,.btn-group+.btn{margin:0 1px 0 0;border-width:3px}.btn-group>.btn.active:after,.btn-group+.btn.active:after{left:-2px;right:-2px;bottom:-2px;border-bottom-width:1px}.btn-group>.btn-lg,.btn-group+.btn-lg{border-width:4px}.btn-group>.btn-lg.active:after,.btn-group+.btn-lg.active:after{left:-3px;right:-3px;bottom:-3px;border-bottom-width:1px}.btn-group>.btn-sm,.btn-group+.btn-sm{border-width:2px}.btn-group>.btn-sm.active:after,.btn-group+.btn-sm.active:after{left:-1px;right:-1px;bottom:-1px;border-bottom-width:1px}.btn-group>.btn-xs,.btn-group+.btn-xs,.btn-group>.btn-mini,.btn-group+.btn-mini{border-width:1px}.btn-group>.btn-xs.active:after,.btn-group+.btn-xs.active:after,.btn-group>.btn-mini.active:after,.btn-group+.btn-mini.active:after{left:0;right:0;bottom:0;border-bottom-width:1px}.btn-group>.btn-minier,.btn-group+.btn-minier{border-width:1px}.btn-group>.btn-minier.active:after,.btn-group+.btn-minier.active:after{left:0;right:0;bottom:0;border-bottom-width:1px}.btn-group-vertical>.btn:last-child:not(:first-child){border-radius:0}.btn-group-vertical>.btn,.btn-group-vertical>.btn+.btn{margin:1px 0 0}.btn-group-vertical>.btn:first-child{margin-top:0}.btn-group.btn-overlap>.btn{margin-right:-1px}.btn-group.btn-corner>.btn:first-child{border-bottom-left-radius:8px;border-top-left-radius:8px}.btn-group.btn-corner>.btn:last-child{border-bottom-right-radius:8px;border-top-right-radius:8px}.btn-group.btn-corner>.btn.btn-sm:first-child{border-bottom-left-radius:6px;border-top-left-radius:6px}.btn-group.btn-corner>.btn.btn-sm:last-child{border-bottom-right-radius:6px;border-top-right-radius:6px}.btn-group.btn-corner>.btn.btn-xs:first-child,.btn-group.btn-corner>.btn.btn-mini:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.btn-group.btn-corner>.btn.btn-xs:last-child,.btn-group.btn-corner>.btn.btn-mini:last-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.btn.btn-white{border-width:1px}.btn.btn-bold{border-bottom-width:2px}.btn.btn-round{border-bottom-width:2px;border-radius:4px!important}.btn.btn-app{display:inline-block;width:100px;font-size:18px;font-weight:400;color:#FFF;text-align:center;text-shadow:0 -1px -1px rgba(0,0,0,.2)!important;border:none;border-radius:12px;padding:12px 0 8px;margin:2px;line-height:1.7;position:relative}.btn-app,.btn-app.btn-default,.btn-app.no-hover:hover,.btn-app.btn-default.no-hover:hover,.btn-app.disabled:hover,.btn-app.btn-default.disabled:hover{background:#b4c2cc!important;background-image:-webkit-linear-gradient(top,#bcc9d5 0,#abbac3 100%)!important;background-image:-o-linear-gradient(top,#bcc9d5 0,#abbac3 100%)!important;background-image:linear-gradient(to bottom,#bcc9d5 0,#abbac3 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffbcc9d5', endColorstr='#ffabbac3', GradientType=0)!important}.btn-app:hover,.btn-app.btn-default:hover{background:#9baebc!important;background-image:-webkit-linear-gradient(top,#a3b5c5 0,#93a6b2 100%)!important;background-image:-o-linear-gradient(top,#a3b5c5 0,#93a6b2 100%)!important;background-image:linear-gradient(to bottom,#a3b5c5 0,#93a6b2 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffa3b5c5', endColorstr='#ff93a6b2', GradientType=0)!important}.btn-app.btn-primary,.btn-app.btn-primary.no-hover:hover,.btn-app.btn-primary.disabled:hover{background:#2a8bcb!important;background-image:-webkit-linear-gradient(top,#3b98d6 0,#197ec1 100%)!important;background-image:-o-linear-gradient(top,#3b98d6 0,#197ec1 100%)!important;background-image:linear-gradient(to bottom,#3b98d6 0,#197ec1 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3b98d6', endColorstr='#ff197ec1', GradientType=0)!important}.btn-app.btn-primary:hover{background:#1d6fa6!important;background-image:-webkit-linear-gradient(top,#267eb8 0,#136194 100%)!important;background-image:-o-linear-gradient(top,#267eb8 0,#136194 100%)!important;background-image:linear-gradient(to bottom,#267eb8 0,#136194 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff267eb8', endColorstr='#ff136194', GradientType=0)!important}.btn-app.btn-info,.btn-app.btn-info.no-hover:hover,.btn-app.btn-info.disabled:hover{background:#68adde!important;background-image:-webkit-linear-gradient(top,#75b5e6 0,#5ba4d5 100%)!important;background-image:-o-linear-gradient(top,#75b5e6 0,#5ba4d5 100%)!important;background-image:linear-gradient(to bottom,#75b5e6 0,#5ba4d5 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff75b5e6', endColorstr='#ff5ba4d5', GradientType=0)!important}.btn-app.btn-info:hover{background:#3f96d4!important;background-image:-webkit-linear-gradient(top,#4a9ede 0,#348dc9 100%)!important;background-image:-o-linear-gradient(top,#4a9ede 0,#348dc9 100%)!important;background-image:linear-gradient(to bottom,#4a9ede 0,#348dc9 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff4a9ede', endColorstr='#ff348dc9', GradientType=0)!important}.btn-app.btn-success,.btn-app.btn-success.no-hover:hover,.btn-app.btn-success.disabled:hover{background:#85b558!important;background-image:-webkit-linear-gradient(top,#8ebf60 0,#7daa50 100%)!important;background-image:-o-linear-gradient(top,#8ebf60 0,#7daa50 100%)!important;background-image:linear-gradient(to bottom,#8ebf60 0,#7daa50 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff8ebf60', endColorstr='#ff7daa50', GradientType=0)!important}.btn-app.btn-success:hover{background:#6c9842!important;background-image:-webkit-linear-gradient(top,#74a844 0,#648740 100%)!important;background-image:-o-linear-gradient(top,#74a844 0,#648740 100%)!important;background-image:linear-gradient(to bottom,#74a844 0,#648740 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff74a844', endColorstr='#ff648740', GradientType=0)!important}.btn-app.btn-danger,.btn-app.btn-danger.no-hover:hover,.btn-app.btn-danger.disabled:hover{background:#d3413b!important;background-image:-webkit-linear-gradient(top,#d55b52 0,#d12723 100%)!important;background-image:-o-linear-gradient(top,#d55b52 0,#d12723 100%)!important;background-image:linear-gradient(to bottom,#d55b52 0,#d12723 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd55b52', endColorstr='#ffd12723', GradientType=0)!important}.btn-app.btn-danger:hover{background:#b52c26!important;background-image:-webkit-linear-gradient(top,#c43a30 0,#a51f1c 100%)!important;background-image:-o-linear-gradient(top,#c43a30 0,#a51f1c 100%)!important;background-image:linear-gradient(to bottom,#c43a30 0,#a51f1c 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffc43a30', endColorstr='#ffa51f1c', GradientType=0)!important}.btn-app.btn-warning,.btn-app.btn-warning.no-hover:hover,.btn-app.btn-warning.disabled:hover{background:#ffb44b!important;background-image:-webkit-linear-gradient(top,#ffbf66 0,#ffa830 100%)!important;background-image:-o-linear-gradient(top,#ffbf66 0,#ffa830 100%)!important;background-image:linear-gradient(to bottom,#ffbf66 0,#ffa830 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffbf66', endColorstr='#ffffa830', GradientType=0)!important}.btn-app.btn-warning:hover{background:#fe9e19!important;background-image:-webkit-linear-gradient(top,#fa3 0,#fc9200 100%)!important;background-image:-o-linear-gradient(top,#fa3 0,#fc9200 100%)!important;background-image:linear-gradient(to bottom,#fa3 0,#fc9200 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffaa33', endColorstr='#fffc9200', GradientType=0)!important}.btn-app.btn-purple,.btn-app.btn-purple.no-hover:hover,.btn-app.btn-purple.disabled:hover{background:#9889c1!important;background-image:-webkit-linear-gradient(top,#a696ce 0,#8a7cb4 100%)!important;background-image:-o-linear-gradient(top,#a696ce 0,#8a7cb4 100%)!important;background-image:linear-gradient(to bottom,#a696ce 0,#8a7cb4 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffa696ce', endColorstr='#ff8a7cb4', GradientType=0)!important}.btn-app.btn-purple:hover{background:#7b68af!important;background-image:-webkit-linear-gradient(top,#8973be 0,#6d5ca1 100%)!important;background-image:-o-linear-gradient(top,#8973be 0,#6d5ca1 100%)!important;background-image:linear-gradient(to bottom,#8973be 0,#6d5ca1 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff8973be', endColorstr='#ff6d5ca1', GradientType=0)!important}.btn-app.btn-pink,.btn-app.btn-pink.no-hover:hover,.btn-app.btn-pink.disabled:hover{background:#d54c7e!important;background-image:-webkit-linear-gradient(top,#db5e8c 0,#ce3970 100%)!important;background-image:-o-linear-gradient(top,#db5e8c 0,#ce3970 100%)!important;background-image:linear-gradient(to bottom,#db5e8c 0,#ce3970 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdb5e8c', endColorstr='#ffce3970', GradientType=0)!important}.btn-app.btn-pink:hover{background:#be2f64!important;background-image:-webkit-linear-gradient(top,#d2346e 0,#aa2a59 100%)!important;background-image:-o-linear-gradient(top,#d2346e 0,#aa2a59 100%)!important;background-image:linear-gradient(to bottom,#d2346e 0,#aa2a59 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd2346e', endColorstr='#ffaa2a59', GradientType=0)!important}.btn-app.btn-inverse,.btn-app.btn-inverse.no-hover:hover,.btn-app.btn-inverse.disabled:hover{background:#444!important;background-image:-webkit-linear-gradient(top,#555 0,#333 100%)!important;background-image:-o-linear-gradient(top,#555 0,#333 100%)!important;background-image:linear-gradient(to bottom,#555 0,#333 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff555555', endColorstr='#ff333333', GradientType=0)!important}.btn-app.btn-inverse:hover{background:#2b2b2b!important;background-image:-webkit-linear-gradient(top,#3b3b3b 0,#1a1a1a 100%)!important;background-image:-o-linear-gradient(top,#3b3b3b 0,#1a1a1a 100%)!important;background-image:linear-gradient(to bottom,#3b3b3b 0,#1a1a1a 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3b3b3b', endColorstr='#ff1a1a1a', GradientType=0)!important}.btn-app.btn-grey,.btn-app.btn-grey.no-hover:hover,.btn-app.btn-grey.disabled:hover{background:#797979!important;background-image:-webkit-linear-gradient(top,#898989 0,#696969 100%)!important;background-image:-o-linear-gradient(top,#898989 0,#696969 100%)!important;background-image:linear-gradient(to bottom,#898989 0,#696969 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff898989', endColorstr='#ff696969', GradientType=0)!important}.btn-app.btn-grey:hover{background:#6c6c6c!important;background-image:-webkit-linear-gradient(top,#7c7c7c 0,#5c5c5c 100%)!important;background-image:-o-linear-gradient(top,#7c7c7c 0,#5c5c5c 100%)!important;background-image:linear-gradient(to bottom,#7c7c7c 0,#5c5c5c 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff7c7c7c', endColorstr='#ff5c5c5c', GradientType=0)!important}.btn.btn-app.btn-light{color:#5a5a5a!important;text-shadow:0 1px 1px #EEE!important}.btn.btn-app.btn-light,.btn.btn-app.btn-light.no-hover:hover,.btn.btn-app.btn-light.disabled:hover{background:#ededed!important;background-image:-webkit-linear-gradient(top,#f4f4f4 0,#e6e6e6 100%)!important;background-image:-o-linear-gradient(top,#f4f4f4 0,#e6e6e6 100%)!important;background-image:linear-gradient(to bottom,#f4f4f4 0,#e6e6e6 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff4f4f4', endColorstr='#ffe6e6e6', GradientType=0)!important}.btn.btn-app.btn-light:hover{background:#e0e0e0!important;background-image:-webkit-linear-gradient(top,#e7e7e7 0,#d9d9d9 100%)!important;background-image:-o-linear-gradient(top,#e7e7e7 0,#d9d9d9 100%)!important;background-image:linear-gradient(to bottom,#e7e7e7 0,#d9d9d9 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe7e7e7', endColorstr='#ffd9d9d9', GradientType=0)!important}.btn.btn-app.btn-yellow{color:#963!important;text-shadow:0 -1px 0 rgba(255,255,255,.4)!important}.btn.btn-app.btn-yellow,.btn.btn-app.btn-yellow.no-hover:hover,.btn.btn-app.btn-yellow.disabled:hover{background:#fee088!important;background-image:-webkit-linear-gradient(top,#ffe8a5 0,#fcd76a 100%)!important;background-image:-o-linear-gradient(top,#ffe8a5 0,#fcd76a 100%)!important;background-image:linear-gradient(to bottom,#ffe8a5 0,#fcd76a 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffe8a5', endColorstr='#fffcd76a', GradientType=0)!important}.btn.btn-app.btn-yellow:hover{background:#fdd96e!important;background-image:-webkit-linear-gradient(top,#ffe18b 0,#fbd051 100%)!important;background-image:-o-linear-gradient(top,#ffe18b 0,#fbd051 100%)!important;background-image:linear-gradient(to bottom,#ffe18b 0,#fbd051 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffe18b', endColorstr='#fffbd051', GradientType=0)!important}.btn.btn-app>.ace-icon{opacity:.88}.btn.btn-app:hover>.ace-icon{opacity:1}.btn.btn-app.btn-sm{width:80px;font-size:16px;border-radius:10px;line-height:1.5}.btn.btn-app.btn-xs{width:64px;font-size:15px;border-radius:8px;padding-bottom:7px;padding-top:8px;line-height:1.45}.btn.btn-app>.ace-icon{display:block;font-size:42px;margin:0 0 4px;line-height:36px;min-width:0;padding:0}.btn.btn-app.btn-sm>.ace-icon{display:block;font-size:32px;line-height:30px;margin:0 0 3px}.btn.btn-app.btn-xs>.ace-icon{display:block;font-size:24px;line-height:24px;margin:0}.btn.btn-app.no-radius{border-radius:0}.btn.btn-app.radius-4{border-radius:4px}.btn.btn-app>.badge,.btn.btn-app>.label{position:absolute!important;top:-2px;right:-2px;padding:1px 3px;text-align:center;font-size:12px;color:#FFF}.btn.btn-app>.badge.badge-left,.btn.btn-app>.label.badge-left,.btn.btn-app>.badge.label-left,.btn.btn-app>.label.label-left{right:auto;left:-2px}.btn.btn-app>.badge-yellow,.btn.btn-app>.label-yellow{color:#963}.btn.btn-app>.badge-light,.btn.btn-app>.label-light{color:#888}.btn.btn-app>.label{padding:1px 6px 3px;font-size:13px}.btn.btn-app.radius-4>.badge,.btn.btn-app.no-radius>.badge{border-radius:3px}.btn.btn-app.radius-4>.badge.no-radius,.btn.btn-app.no-radius>.badge.no-radius{border-radius:0}.btn.btn-app.active{color:#fff}.btn.btn-app.active:after{display:none}.btn.btn-app.active.btn-yellow{color:#963;border-color:#fee188}.btn.btn-app.active.btn-light{color:#515151}.btn-group>.btn-app:first-child:not(:last-child):not(.dropdown-toggle){margin-right:24px}.btn-group>.btn-app+.btn-app.dropdown-toggle{position:absolute;width:auto;height:100%;padding-left:6px;padding-right:6px;margin-left:-23px;border-bottom-left-radius:0;border-top-left-radius:0;right:0}.btn.btn-app.btn-light,.btn.btn-app.btn-yellow{-webkit-box-shadow:0 0 0 1px rgba(0,0,0,.08) inset!important;box-shadow:0 0 0 1px rgba(0,0,0,.08) inset!important}.label{border-radius:0;text-shadow:none;font-weight:400;color:#fff;display:inline-block;background-color:#abbac3}.label[class*=col-][class*=arrow]{min-height:0}@media screen and (-webkit-min-device-pixel-ratio:0){::safari-only,.label:empty{display:inline-block}::safari-only,.badge:empty{display:inline-block}}.badge{text-shadow:none;font-size:12px;padding-top:1px;padding-bottom:3px;font-weight:400;line-height:15px;background-color:#abbac3}.badge.no-radius{border-radius:0}.badge.radius-1{border-radius:1px}.badge.radius-2{border-radius:2px}.badge.radius-3{border-radius:3px}.badge.radius-4{border-radius:4px}.badge.radius-5{border-radius:5px}.badge.radius-6{border-radius:6px}.label.label-transparent,.label-transparent,.badge.badge-transparent,.badge-transparent{background-color:transparent}.label-grey,.label.label-grey,.badge.badge-grey,.badge-grey{background-color:#a0a0a0}.label-info,.label.label-info,.badge.badge-info,.badge-info{background-color:#3a87ad}.label-primary,.label.label-primary,.badge.badge-primary,.badge-primary{background-color:#428bca}.label-success,.label.label-success,.badge.badge-success,.badge-success{background-color:#82af6f}.label-danger,.label.label-danger,.badge.badge-danger,.badge-danger{background-color:#d15b47}.label-important,.label.label-important,.badge.badge-important,.badge-important{background-color:#d15b47}.label-inverse,.label.label-inverse,.badge.badge-inverse,.badge-inverse{background-color:#333}.label-warning,.label.label-warning,.badge.badge-warning,.badge-warning{background-color:#f89406}.label-pink,.label.label-pink,.badge.badge-pink,.badge-pink{background-color:#d6487e}.label-purple,.label.label-purple,.badge.badge-purple,.badge-purple{background-color:#9585bf}.label-yellow,.label.label-yellow,.badge.badge-yellow,.badge-yellow{background-color:#fee188}.label-light,.label.label-light,.badge.badge-light,.badge-light{background-color:#e7e7e7}.badge-yellow,.label-yellow{color:#963;border-color:#fee188}.badge-light,.label-light{color:#888}.label.arrowed,.label.arrowed-in{position:relative;z-index:1}.label.arrowed:before,.label.arrowed-in:before{display:inline-block;content:"";position:absolute;top:0;z-index:-1;border:1px solid transparent;border-right-color:#abbac3;-moz-border-right-colors:#abbac3}.label.arrowed-in:before{border-color:#abbac3;border-left-color:transparent;-moz-border-left-colors:none}.label.arrowed-right,.label.arrowed-in-right{position:relative;z-index:1}.label.arrowed-right:after,.label.arrowed-in-right:after{display:inline-block;content:"";position:absolute;top:0;z-index:-1;border:1px solid transparent;border-left-color:#abbac3;-moz-border-left-colors:#abbac3}.label.arrowed-in-right:after{border-color:#abbac3;border-right-color:transparent;-moz-border-right-colors:none}.label-info.arrowed:before{border-right-color:#3a87ad;-moz-border-right-colors:#3a87ad}.label-info.arrowed-in:before{border-color:#3a87ad #3a87ad #3a87ad transparent;-moz-border-right-colors:#3a87ad}.label-info.arrowed-right:after{border-left-color:#3a87ad;-moz-border-left-colors:#3a87ad}.label-info.arrowed-in-right:after{border-color:#3a87ad transparent #3a87ad #3a87ad;-moz-border-left-colors:#3a87ad}.label-primary.arrowed:before{border-right-color:#428bca;-moz-border-right-colors:#428bca}.label-primary.arrowed-in:before{border-color:#428bca #428bca #428bca transparent;-moz-border-right-colors:#428bca}.label-primary.arrowed-right:after{border-left-color:#428bca;-moz-border-left-colors:#428bca}.label-primary.arrowed-in-right:after{border-color:#428bca transparent #428bca #428bca;-moz-border-left-colors:#428bca}.label-success.arrowed:before{border-right-color:#82af6f;-moz-border-right-colors:#82af6f}.label-success.arrowed-in:before{border-color:#82af6f #82af6f #82af6f transparent;-moz-border-right-colors:#82af6f}.label-success.arrowed-right:after{border-left-color:#82af6f;-moz-border-left-colors:#82af6f}.label-success.arrowed-in-right:after{border-color:#82af6f transparent #82af6f #82af6f;-moz-border-left-colors:#82af6f}.label-warning.arrowed:before{border-right-color:#f89406;-moz-border-right-colors:#f89406}.label-warning.arrowed-in:before{border-color:#f89406 #f89406 #f89406 transparent;-moz-border-right-colors:#f89406}.label-warning.arrowed-right:after{border-left-color:#f89406;-moz-border-left-colors:#f89406}.label-warning.arrowed-in-right:after{border-color:#f89406 transparent #f89406 #f89406;-moz-border-left-colors:#f89406}.label-important.arrowed:before{border-right-color:#d15b47;-moz-border-right-colors:#d15b47}.label-important.arrowed-in:before{border-color:#d15b47 #d15b47 #d15b47 transparent;-moz-border-right-colors:#d15b47}.label-important.arrowed-right:after{border-left-color:#d15b47;-moz-border-left-colors:#d15b47}.label-important.arrowed-in-right:after{border-color:#d15b47 transparent #d15b47 #d15b47;-moz-border-left-colors:#d15b47}.label-danger.arrowed:before{border-right-color:#d15b47;-moz-border-right-colors:#d15b47}.label-danger.arrowed-in:before{border-color:#d15b47 #d15b47 #d15b47 transparent;-moz-border-right-colors:#d15b47}.label-danger.arrowed-right:after{border-left-color:#d15b47;-moz-border-left-colors:#d15b47}.label-danger.arrowed-in-right:after{border-color:#d15b47 transparent #d15b47 #d15b47;-moz-border-left-colors:#d15b47}.label-inverse.arrowed:before{border-right-color:#333;-moz-border-right-colors:#333}.label-inverse.arrowed-in:before{border-color:#333 #333 #333 transparent;-moz-border-right-colors:#333}.label-inverse.arrowed-right:after{border-left-color:#333;-moz-border-left-colors:#333}.label-inverse.arrowed-in-right:after{border-color:#333 transparent #333 #333;-moz-border-left-colors:#333}.label-pink.arrowed:before{border-right-color:#d6487e;-moz-border-right-colors:#d6487e}.label-pink.arrowed-in:before{border-color:#d6487e #d6487e #d6487e transparent;-moz-border-right-colors:#d6487e}.label-pink.arrowed-right:after{border-left-color:#d6487e;-moz-border-left-colors:#d6487e}.label-pink.arrowed-in-right:after{border-color:#d6487e transparent #d6487e #d6487e;-moz-border-left-colors:#d6487e}.label-purple.arrowed:before{border-right-color:#9585bf;-moz-border-right-colors:#9585bf}.label-purple.arrowed-in:before{border-color:#9585bf #9585bf #9585bf transparent;-moz-border-right-colors:#9585bf}.label-purple.arrowed-right:after{border-left-color:#9585bf;-moz-border-left-colors:#9585bf}.label-purple.arrowed-in-right:after{border-color:#9585bf transparent #9585bf #9585bf;-moz-border-left-colors:#9585bf}.label-yellow.arrowed:before{border-right-color:#fee188;-moz-border-right-colors:#fee188}.label-yellow.arrowed-in:before{border-color:#fee188 #fee188 #fee188 transparent;-moz-border-right-colors:#fee188}.label-yellow.arrowed-right:after{border-left-color:#fee188;-moz-border-left-colors:#fee188}.label-yellow.arrowed-in-right:after{border-color:#fee188 transparent #fee188 #fee188;-moz-border-left-colors:#fee188}.label-light.arrowed:before{border-right-color:#e7e7e7;-moz-border-right-colors:#e7e7e7}.label-light.arrowed-in:before{border-color:#e7e7e7 #e7e7e7 #e7e7e7 transparent;-moz-border-right-colors:#e7e7e7}.label-light.arrowed-right:after{border-left-color:#e7e7e7;-moz-border-left-colors:#e7e7e7}.label-light.arrowed-in-right:after{border-color:#e7e7e7 transparent #e7e7e7 #e7e7e7;-moz-border-left-colors:#e7e7e7}.label-grey.arrowed:before{border-right-color:#a0a0a0;-moz-border-right-colors:#a0a0a0}.label-grey.arrowed-in:before{border-color:#a0a0a0 #a0a0a0 #a0a0a0 transparent;-moz-border-right-colors:#a0a0a0}.label-grey.arrowed-right:after{border-left-color:#a0a0a0;-moz-border-left-colors:#a0a0a0}.label-grey.arrowed-in-right:after{border-color:#a0a0a0 transparent #a0a0a0 #a0a0a0;-moz-border-left-colors:#a0a0a0}.label{font-size:12px;line-height:1.15;height:20px}.label.arrowed{margin-left:5px}.label.arrowed:before{left:-10px;border-width:10px 5px}.label.arrowed-in{margin-left:5px}.label.arrowed-in:before{left:-5px;border-width:10px 5px}.label.arrowed-right{margin-right:5px}.label.arrowed-right:after{right:-10px;border-width:10px 5px}.label.arrowed-in-right{margin-right:5px}.label.arrowed-in-right:after{right:-5px;border-width:10px 5px}.label-lg{padding:.3em .6em .4em;font-size:13px;line-height:1.1;height:24px}.label-lg.arrowed{margin-left:6px}.label-lg.arrowed:before{left:-12px;border-width:12px 6px}.label-lg.arrowed-in{margin-left:6px}.label-lg.arrowed-in:before{left:-6px;border-width:12px 6px}.label-lg.arrowed-right{margin-right:6px}.label-lg.arrowed-right:after{right:-12px;border-width:12px 6px}.label-lg.arrowed-in-right{margin-right:6px}.label-lg.arrowed-in-right:after{right:-6px;border-width:12px 6px}.label-xlg{padding:.3em .7em .4em;font-size:14px;line-height:1.3;height:28px}.label-xlg.arrowed{margin-left:7px}.label-xlg.arrowed:before{left:-14px;border-width:14px 7px}.label-xlg.arrowed-in{margin-left:7px}.label-xlg.arrowed-in:before{left:-7px;border-width:14px 7px}.label-xlg.arrowed-right{margin-right:7px}.label-xlg.arrowed-right:after{right:-14px;border-width:14px 7px}.label-xlg.arrowed-in-right{margin-right:7px}.label-xlg.arrowed-in-right:after{right:-7px;border-width:14px 7px}.label-sm{padding:.2em .4em .3em;font-size:11px;line-height:1;height:18px}.label-sm.arrowed{margin-left:4px}.label-sm.arrowed:before{left:-8px;border-width:9px 4px}.label-sm.arrowed-in{margin-left:4px}.label-sm.arrowed-in:before{left:-4px;border-width:9px 4px}.label-sm.arrowed-right{margin-right:4px}.label-sm.arrowed-right:after{right:-8px;border-width:9px 4px}.label-sm.arrowed-in-right{margin-right:4px}.label-sm.arrowed-in-right:after{right:-4px;border-width:9px 4px}.label>span,.label>.ace-icon{line-height:1;vertical-align:bottom}.label.label-white{color:#879da9;border:1px solid #abbac3;background-color:#f2f5f6;border-right-width:1px;border-left-width:2px}.label-white.label-success{color:#7b9e6c;border-color:#9fbf92;background-color:#edf3ea}.label-white.label-warning{color:#d9993e;border-color:#e4ae62;background-color:#fef6eb}.label-white.label-primary{color:#6688a6;border-color:#8aafce;background-color:#eaf2f8}.label-white.label-danger{color:#bd7f75;border-color:#d28679;background-color:#fcf4f2}.label-white.label-info{color:#4e7a8f;border-color:#7aa1b4;background-color:#eaf3f7}.label-white.label-inverse{color:#404040;border-color:#737373;background-color:#ededed}.label-white.label-pink{color:#af6f87;border-color:#d299ae;background-color:#fbeff4}.label-white.label-purple{color:#7d6fa2;border-color:#b7b1c6;background-color:#efedf5}.label-white.label-yellow{color:#cfa114;border-color:#ecd181;background-color:#fdf7e4}.label-white.label-grey{color:#878787;border-color:#cecece;background-color:#ededed}@media screen and (-webkit-min-device-pixel-ratio:1.08) and (-webkit-max-device-pixel-ratio:1.15),screen and (min--moz-device-pixel-ratio:1.08) and (max--moz-device-pixel-ratio:1.15){.label:not(.label-lg):not(.label-xlg):not(.label-sm).arrowed:before{border-width:10.5px 6px;left:-11px}.label:not(.label-lg):not(.label-xlg):not(.label-sm).arrowed-right:after{border-width:10.5px 6px;right:-11px}.label:not(.label-lg):not(.label-xlg):not(.label-sm).arrowed-in:before{border-width:10.5px 5px 10px;left:-6px}.label:not(.label-lg):not(.label-xlg):not(.label-sm).arrowed-in-right:after{border-width:10.5px 5px 10px;right:-6px}}@media screen and (-webkit-min-device-pixel-ratio:1.3) and (-webkit-max-device-pixel-ratio:1.4),screen and (min--moz-device-pixel-ratio:1.3) and (max--moz-device-pixel-ratio:1.4){.label:not(.label-lg):not(.label-xlg):not(.label-sm).arrowed:before{border-width:10px 6px 10px;left:-12px}.label:not(.label-lg):not(.label-xlg):not(.label-sm).arrowed-right:after{border-width:10px 6px 10px;right:-12px}.label:not(.label-lg):not(.label-xlg):not(.label-sm).arrowed-in:before{border-width:10px 5px 10px;left:-6px}.label:not(.label-lg):not(.label-xlg):not(.label-sm).arrowed-in-right:after{border-width:10px 5px 10px;right:-6px}}@media screen and (-webkit-min-device-pixel-ratio:1.5) and (-webkit-max-device-pixel-ratio:1.6),screen and (min--moz-device-pixel-ratio:1.5) and (max--moz-device-pixel-ratio:1.6){.label:not(.label-lg):not(.label-xlg):not(.label-sm).arrowed:before{border-width:10px 6px;left:-12px}.label:not(.label-lg):not(.label-xlg):not(.label-sm).arrowed-right:after{border-width:10px 6px;right:-12px}}@media screen and (-webkit-min-device-pixel-ratio:1.7) and (-webkit-max-device-pixel-ratio:1.8),screen and (min--moz-device-pixel-ratio:1.7) and (max--moz-device-pixel-ratio:1.8){.label:not(.label-lg):not(.label-xlg):not(.label-sm).arrowed:before{border-width:10px 6px;left:-11.5px}.label:not(.label-lg):not(.label-xlg):not(.label-sm).arrowed-right:after{border-width:10px 6px;right:-11.5px}.label:not(.label-lg):not(.label-xlg):not(.label-sm).arrowed-in:before{border-width:10px 5px;left:-6px}.label:not(.label-lg):not(.label-xlg):not(.label-sm).arrowed-in-right:after{border-width:10px 5px;right:-6px}}@media screen and (-webkit-min-device-pixel-ratio:.8) and (-webkit-max-device-pixel-ratio:.9),screen and (min--moz-device-pixel-ratio:.8) and (max--moz-device-pixel-ratio:.9){.label:not(.label-lg):not(.label-xlg):not(.label-sm).arrowed:before{border-width:11px 6px;left:-11.5px}.label:not(.label-lg):not(.label-xlg):not(.label-sm).arrowed-right:after{border-width:11px 6px;right:-11.5px}.label:not(.label-lg):not(.label-xlg):not(.label-sm).arrowed-in:before{border-width:11px 5px;left:-6px}.label:not(.label-lg):not(.label-xlg):not(.label-sm).arrowed-in-right:after{border-width:11px 5px;right:-6px}}@media screen and (-webkit-min-device-pixel-ratio:1.08) and (-webkit-max-device-pixel-ratio:1.15),screen and (min--moz-device-pixel-ratio:1.08) and (max--moz-device-pixel-ratio:1.15){.label-lg.arrowed:before{left:-11px}.label-lg.arrowed-right:after{right:-11px}}@media screen and (-webkit-min-device-pixel-ratio:1.7) and (-webkit-max-device-pixel-ratio:1.8),screen and (min--moz-device-pixel-ratio:1.7) and (max--moz-device-pixel-ratio:1.8){.label-lg.arrowed:before{left:-11.5px}.label-lg.arrowed-right:after{right:-11.5px}.label-lg.arrowed-in:before{border-width:12.5px 6px 12px;left:-6px}.label-lg.arrowed-in-right:after{border-width:12.5px 6px 12px;right:-6px}}@media screen and (-webkit-min-device-pixel-ratio:1.08) and (-webkit-max-device-pixel-ratio:1.15),screen and (min--moz-device-pixel-ratio:1.08) and (max--moz-device-pixel-ratio:1.15){.label-xlg.arrowed:before{left:-13px}.label-xlg.arrowed-right:after{right:-13px}.label-xlg.arrowed-in:before{border-width:14px 7px 14.5px}.label-xlg.arrowed-in-right:after{border-width:14px 7px 14.5px}}@media screen and (-webkit-min-device-pixel-ratio:1.2) and (-webkit-max-device-pixel-ratio:1.3),screen and (min--moz-device-pixel-ratio:1.2) and (max--moz-device-pixel-ratio:1.3){.label-xlg.arrowed:before{border-width:14.5px 7px;left:-13.5px}.label-xlg.arrowed-right:after{border-width:14.5px 7px;right:-13.5px}.label-xlg.arrowed-in:before{border-width:14.5px 7px 14.5px}.label-xlg.arrowed-in-right:after{border-width:14.5px 7px 14.5px}}@media screen and (-webkit-min-device-pixel-ratio:1.3) and (-webkit-max-device-pixel-ratio:1.4),screen and (-webkit-min-device-pixel-ratio:1.5) and (-webkit-max-device-pixel-ratio:1.6),screen and (min--moz-device-pixel-ratio:1.3) and (max--moz-device-pixel-ratio:1.4),screen and (min--moz-device-pixel-ratio:1.5) and (max--moz-device-pixel-ratio:1.6){.label-xlg.arrowed:before{border-width:14.5px 7.5px;left:-14.5px}.label-xlg.arrowed-right:after{border-width:14.5px 7.5px;right:-14.5px}.label-xlg.arrowed-in:before{border-width:14.5px 7px}.label-xlg.arrowed-in-right:after{border-width:14.5px 7px}}@media screen and (-webkit-min-device-pixel-ratio:1.08) and (-webkit-max-device-pixel-ratio:1.15),screen and (min--moz-device-pixel-ratio:1.08) and (max--moz-device-pixel-ratio:1.15){.label-sm.arrowed:before{border-width:9px 5px;left:-9px}.label-sm.arrowed-right:after{border-width:9px 5px;right:-9px}.label-sm.arrowed-in:before{border-width:10px 4px}.label-sm.arrowed-in-right:after{border-width:10px 4px}}@media screen and (-webkit-min-device-pixel-ratio:1.2) and (-webkit-max-device-pixel-ratio:1.3),screen and (min--moz-device-pixel-ratio:1.2) and (max--moz-device-pixel-ratio:1.3){.label-sm.arrowed:before{border-width:9.5px 5px;left:-10px}.label-sm.arrowed-right:after{border-width:9.5px 5px;right:-10px}.label-sm.arrowed-in:before{border-width:9.5px 4px}.label-sm.arrowed-in-right:after{border-width:9.5px 4px}}.icon-white,.nav-pills>.active>a>.ace-icon,.nav-list>.active>a>.ace-icon,.navbar-inverse .nav>.active>a>.ace-icon,.dropdown-menu>li>a:hover>.ace-icon,.dropdown-menu>li>a:focus>.ace-icon,.dropdown-menu>.active>a>.ace-icon,.dropdown-submenu:hover>a>.ace-icon,.dropdown-submenu:focus>a>.ace-icon{background-image:none}.dropdown-menu{border-radius:0!important;-webkit-box-shadow:0 2px 4px rgba(0,0,0,.2);box-shadow:0 2px 4px rgba(0,0,0,.2)}.dropdown-menu>li>a{font-size:13px;padding-left:11px;padding-right:11px;padding-bottom:4px;margin-bottom:1px;margin-top:1px}.dropdown-menu.dropdown-only-icon{min-width:50px}.dropdown-menu.dropdown-only-icon>li{margin:0 4px}.dropdown-menu.dropdown-only-icon>li>a .ace-icon{width:18px;display:inline-block;text-align:center}.dropdown-menu.dropdown-only-icon>li>a .icon-2x{width:36px}.dropdown-menu>li:hover>a,.dropdown-menu>li>a:focus,.dropdown-menu>li>a:active,.dropdown-menu>li.active>a,.dropdown-menu>li.active:hover>a{background:#4f99c6;color:#fff}.dropdown-default>li:hover>a,.dropdown-default>li>a:focus,.dropdown-default>li>a:active,.dropdown-default>li.active>a,.dropdown-default>li.active:hover>a{background:#abbac3;color:#fff}.dropdown-info>li:hover>a,.dropdown-info>li>a:focus,.dropdown-info>li>a:active,.dropdown-info>li.active>a,.dropdown-info>li.active:hover>a{background:#6fb3e0;color:#fff}.dropdown-primary>li:hover>a,.dropdown-primary>li>a:focus,.dropdown-primary>li>a:active,.dropdown-primary>li.active>a,.dropdown-primary>li.active:hover>a{background:#428bca;color:#fff}.dropdown-success>li:hover>a,.dropdown-success>li>a:focus,.dropdown-success>li>a:active,.dropdown-success>li.active>a,.dropdown-success>li.active:hover>a{background:#87b87f;color:#fff}.dropdown-warning>li:hover>a,.dropdown-warning>li>a:focus,.dropdown-warning>li>a:active,.dropdown-warning>li.active>a,.dropdown-warning>li.active:hover>a{background:#ffa24d;color:#fff}.dropdown-danger>li:hover>a,.dropdown-danger>li>a:focus,.dropdown-danger>li>a:active,.dropdown-danger>li.active>a,.dropdown-danger>li.active:hover>a{background:#d15b47;color:#fff}.dropdown-inverse>li:hover>a,.dropdown-inverse>li>a:focus,.dropdown-inverse>li>a:active,.dropdown-inverse>li.active>a,.dropdown-inverse>li.active:hover>a{background:#555;color:#fff}.dropdown-purple>li:hover>a,.dropdown-purple>li>a:focus,.dropdown-purple>li>a:active,.dropdown-purple>li.active>a,.dropdown-purple>li.active:hover>a{background:#9585bf;color:#fff}.dropdown-pink>li:hover>a,.dropdown-pink>li>a:focus,.dropdown-pink>li>a:active,.dropdown-pink>li.active>a,.dropdown-pink>li.active:hover>a{background:#d6487e;color:#fff}.dropdown-grey>li:hover>a,.dropdown-grey>li>a:focus,.dropdown-grey>li>a:active,.dropdown-grey>li.active>a,.dropdown-grey>li.active:hover>a{background:#a0a0a0;color:#fff}.dropdown-light>li:hover>a,.dropdown-light>li>a:focus,.dropdown-light>li>a:active,.dropdown-light>li.active>a,.dropdown-light>li.active:hover>a{background:#e7e7e7;color:#333}.dropdown-lighter>li:hover>a,.dropdown-lighter>li>a:focus,.dropdown-lighter>li>a:active,.dropdown-lighter>li.active>a,.dropdown-lighter>li.active:hover>a{background:#efefef;color:#444}.dropdown-lightest>li:hover>a,.dropdown-lightest>li>a:focus,.dropdown-lightest>li>a:active,.dropdown-lightest>li.active>a,.dropdown-lightest>li.active:hover>a{background:#f3f3f3;color:#444}.dropdown-yellow>li:hover>a,.dropdown-yellow>li>a:focus,.dropdown-yellow>li>a:active,.dropdown-yellow>li.active>a,.dropdown-yellow>li.active:hover>a{background:#fee188;color:#444}.dropdown-yellow2>li:hover>a,.dropdown-yellow2>li>a:focus,.dropdown-yellow2>li>a:active,.dropdown-yellow2>li.active>a,.dropdown-yellow2>li.active:hover>a{background:#f9e8b3;color:#444}.dropdown-light-blue>li:hover>a,.dropdown-light-blue>li>a:focus,.dropdown-light-blue>li>a:active,.dropdown-light-blue>li.active>a,.dropdown-light-blue>li.active:hover>a{background:#ecf3f9;color:#456}.dropdown-menu.dropdown-close{top:92%;left:-5px}.dropdown-menu.dropdown-close.dropdown-menu-right{left:auto;right:-5px}.dropdown-menu.dropdown-closer{top:80%;left:-10px}.dropdown-menu.dropdown-closer.dropdown-menu-right{right:-10px;left:auto}.dropup>.dropdown-menu,.navbar-fixed-bottom .dropdown>.dropdown-menu{top:auto!important;bottom:100%}.dropup>.dropdown-menu.dropdown-close,.navbar-fixed-bottom .dropdown>.dropdown-menu.dropdown-close{bottom:92%}.dropup>.dropdown-menu.dropdown-closer,.navbar-fixed-bottom .dropdown>.dropdown-menu.dropdown-closer{bottom:80%}.dropdown-submenu>.dropdown-menu{border-radius:0}.dropdown-submenu>a:after{margin-right:-5px}.dropdown-50{min-width:50px}.dropdown-75{min-width:75px}.dropdown-100{min-width:100px}.dropdown-125{min-width:125px}.dropdown-150{min-width:150px}.dropdown-hover{position:relative}.dropdown-hover:before{display:block;content:"";position:absolute;top:-2px;bottom:-2px;left:-2px;right:-2px;background-color:transparent}.dropdown-hover:hover>.dropdown-menu{display:block}.dropdown-menu>.dropdown-hover>.dropdown-menu{top:-5px;left:99%;right:auto}.dropdown-menu>.dropdown-hover>.dropdown-menu.dropdown-menu-right{left:auto;right:99%}.dropup .dropdown-menu>.dropdown-hover>.dropdown-menu,.dropdown-menu>.dropdown-hover.dropup>.dropdown-menu{top:auto;bottom:-5px}.dropdown-menu.dropdown-caret:before{border-bottom:7px solid rgba(0,0,0,.2);-moz-border-bottom-colors:rgba(0,0,0,.2);border-left:7px solid transparent;border-right:7px solid transparent;content:"";display:inline-block;left:9px;position:absolute;top:-7px}.dropdown-menu.dropdown-caret:after{border-bottom:6px solid #FFF;-moz-border-bottom-colors:#FFF;border-left:6px solid transparent;border-right:6px solid transparent;content:"";display:inline-block;left:10px;position:absolute;top:-6px}.dropdown-menu.dropdown-menu-right.dropdown-caret:before,.dropdown-menu.dropdown-caret-right.dropdown-caret:before{left:auto;right:9px}.dropdown-menu.dropdown-menu-right.dropdown-caret:after,.dropdown-menu.dropdown-caret-right.dropdown-caret:after{left:auto;right:10px}.dropup>.dropdown-menu.dropdown-caret:before,.navbar-fixed-bottom .dropdown>.dropdown-menu.dropdown-caret:before{border-bottom-width:0;border-top:7px solid rgba(0,0,0,.2);-moz-border-top-colors:rgba(0,0,0,.2);bottom:-7px;top:auto}.dropup>.dropdown-menu.dropdown-caret:after,.navbar-fixed-bottom .dropdown>.dropdown-menu.dropdown-caret:after{border-bottom-width:0;border-top:6px solid #FFF;-moz-border-top-colors:#FFF;bottom:-6px;top:auto}.dropdown-colorpicker>.dropdown-menu{padding:4px;min-width:130px;max-width:130px;top:80%;left:-7px}.dropdown-colorpicker>.dropdown-menu.dropdown-menu-right{right:-7px;left:auto}.dropdown-colorpicker>.dropdown-menu>li{display:block;float:left;width:20px;height:20px;margin:2px}.dropdown-colorpicker>.dropdown-menu>li>.colorpick-btn{display:block;width:20px;height:20px;margin:0;padding:0;border-radius:0;position:relative;-webkit-transition:all ease .1s;-o-transition:all ease .1s;transition:all ease .1s}.dropdown-colorpicker>.dropdown-menu>li>.colorpick-btn:hover{text-decoration:none;opacity:.8;filter:alpha(opacity=80);-webkit-transform:scale(1.08,1.08);-ms-transform:scale(1.08,1.08);-o-transform:scale(1.08,1.08);transform:scale(1.08,1.08)}.dropdown-colorpicker>.dropdown-menu>li>.colorpick-btn.selected:after{content:"\f00c";display:inline-block;font-family:FontAwesome;font-size:11px;color:#FFF;position:absolute;left:0;right:0;text-align:center;line-height:20px}.btn-colorpicker{display:inline-block;width:20px;height:20px;background-color:#DDD;vertical-align:middle;border-radius:0}.dropdown-navbar{padding:0;width:240px;-webkit-box-shadow:0 2px 4px rgba(30,30,100,.25);box-shadow:0 2px 4px rgba(30,30,100,.25);border-color:#bcd4e5}.dropdown-navbar>li{padding:0 8px;background-color:#FFF}.dropdown-navbar>li.dropdown-header{text-shadow:none;padding-top:0;padding-bottom:0;line-height:34px;font-size:13px;font-weight:700;text-transform:none;border-bottom:1px solid}.dropdown-navbar>li>.ace-icon,.dropdown-navbar>li>a>.ace-icon{margin-right:5px!important;color:#555;font-size:14px}.dropdown-navbar>li>a{padding:10px 2px;margin:0;border-top:1px solid;font-size:12px;line-height:16px;color:#555!important;background-color:transparent!important;white-space:normal}.dropdown-navbar>li>a .progress{margin-bottom:0;margin-top:4px}.dropdown-navbar>li>a .badge{line-height:16px;padding-right:4px;padding-left:4px;font-size:12px}.dropdown-navbar>li:first-child>a,.dropdown-navbar>li.dropdown-header+li>a{border-top-width:0}.dropdown-navbar>li.dropdown-footer>a{color:#4F99C6!important;text-align:center;font-size:13px}.dropdown-navbar>li.dropdown-footer>a:hover{background-color:#FFF;text-decoration:underline}.dropdown-navbar>li.dropdown-footer>a:hover>.ace-icon{text-decoration:none}.dropdown-navbar>li:hover{background-color:#f4f9fc}.dropdown-navbar>li.dropdown-header{background-color:#ecf2f7;color:#8090a0;border-bottom-color:#bcd4e5}.dropdown-navbar>li.dropdown-header>.ace-icon{color:#8090a0}.dropdown-navbar>li>a{border-top-color:#e4ecf3}.dropdown-navbar.navbar-pink{border-color:#e5bcd4}.dropdown-navbar.navbar-pink>li:hover{background-color:#fcf4f9}.dropdown-navbar.navbar-pink>li.dropdown-header{background-color:#f7ecf2;color:#b471a0;border-bottom-color:#e5bcd4}.dropdown-navbar.navbar-pink>li.dropdown-header>.ace-icon{color:#c06090}.dropdown-navbar.navbar-pink>li>a{border-top-color:#f3e4ec}.dropdown-navbar.navbar-grey{border-color:#e5e5e5}.dropdown-navbar.navbar-grey>li:hover{background-color:#f8f8f8}.dropdown-navbar.navbar-grey>li.dropdown-header{background-color:#f2f2f2;color:#3a87ad;border-bottom-color:#e5e5e5}.dropdown-navbar.navbar-grey>li.dropdown-header>.ace-icon{color:#3a87ad}.dropdown-navbar.navbar-grey>li>a{border-top-color:#eee}.dropdown-navbar.navbar-green{border-color:#b4d5ac}.dropdown-navbar.navbar-green>li:hover{background-color:#f4f9ef}.dropdown-navbar.navbar-green>li.dropdown-header{background-color:#ebf7e4;color:#8a6;border-bottom-color:#b4d5ac}.dropdown-navbar.navbar-green>li.dropdown-header>.ace-icon{color:#90c060}.dropdown-navbar.navbar-green>li>a{border-top-color:#ecf3e4}.dropdown-navbar [class*=btn].ace-icon{display:inline-block;margin:0 5px 0 0;width:24px;text-align:center;padding-left:0;padding-right:0}.dropdown-navbar .msg-photo{max-width:42px;float:left;margin-top:2px}.dropdown-navbar .msg-body{display:block;line-height:20px;white-space:normal;vertical-align:middle;margin-left:50px}.dropdown-navbar .msg-title{display:inline-block;line-height:14px}.dropdown-navbar .msg-time{display:block;font-size:11px;color:#777}.dropdown-navbar .msg-time>.ace-icon{font-size:14px;color:#555}.dropdown-navbar>.dropdown-content{padding:0}.dropdown-navbar>.dropdown-content .dropdown-navbar{list-style:none;margin:0;padding:0!important;-webkit-box-shadow:none;box-shadow:none;width:auto;display:block;float:none;border-width:0;position:static;z-index:auto}.dropdown-navbar .nav-tabs{border-width:0;box-shadow:none;background-color:#F9F9F9!important;top:auto;width:100%}.dropdown-navbar .nav-tabs>li{display:table-cell;width:1%;float:none!important}.dropdown-navbar .nav-tabs>li>a{margin:0 0 0 1px!important;text-align:center;box-shadow:none!important;background-color:#F9F9F9!important;border-width:0!important;border-bottom:2px solid #BECAD1!important}.dropdown-navbar .nav-tabs>li>a:before{display:block;content:"";position:absolute;left:-1px;top:3px;bottom:3px;width:1px;background-color:#BECAD1}.dropdown-navbar .nav-tabs>li:first-child>a{margin-left:0!important}.dropdown-navbar .nav-tabs>li:first-child>a:before{display:none}.dropdown-navbar .nav-tabs>li.active>a{border-bottom:2px solid #79B0CE!important;color:#5085AF!important;background-color:#ECF2F7!important}.dropdown-navbar .tab-content{padding:0!important;border-color:#FFF!important}.dropdown-navbar .tab-content .dropdown-menu{display:block;position:static;margin:0!important;padding-top:2px;border-color:#FFF!important;box-shadow:none!important;width:100%}.dropdown-navbar.navbar-pink .nav-tabs>li.active>a{border-bottom:2px solid #E5BCD4!important;color:#C06090!important;background-color:#F7ECF2!important}.dropdown-navbar.navbar-pink .nav-tabs>li:not(.active)>a:hover{color:#BA7396}.dropdown-navbar.navbar-pink .nav-tabs>li>a:before{background-color:#CEBBCB}.dropdown-navbar.navbar-pink .nav-tabs>li>a{border-bottom-color:#CEBBCD!important}.form-line{margin-bottom:24px;padding-bottom:12px;border-bottom:1px solid #EEE}.form-actions{display:block;background-color:#F5F5F5;border-top:1px solid #E5E5E5;margin-bottom:20px;margin-top:20px;padding:19px 20px 20px}.help-button{display:inline-block;height:22px;width:22px;line-height:22px;text-align:center;padding:0;background-color:#65bcda;color:#FFF;font-size:12px;font-weight:700;cursor:default;margin-left:4px;border-radius:100%;border-color:#FFF;border:2px solid #FFF;-webkit-box-shadow:0 1px 0 1px rgba(0,0,0,.2);box-shadow:0 1px 0 1px rgba(0,0,0,.2)}.help-button:hover{background-color:#65bcda;text-shadow:none}label{font-weight:400;font-size:14px}.form-group>label[class*=col-]{margin-bottom:4px}td>label,th>label{margin-bottom:0;line-height:inherit;vertical-align:middle}label.inline{margin-bottom:3px}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]{border-radius:0!important;color:#858585;background-color:#fff;border:1px solid #d5d5d5;padding:5px 4px 6px;font-size:14px;font-family:inherit;-webkit-box-shadow:none!important;box-shadow:none!important;-webkit-transition-duration:.1s;transition-duration:.1s}textarea:hover,input[type=text]:hover,input[type=password]:hover,input[type=datetime]:hover,input[type=datetime-local]:hover,input[type=date]:hover,input[type=month]:hover,input[type=time]:hover,input[type=week]:hover,input[type=number]:hover,input[type=email]:hover,input[type=url]:hover,input[type=search]:hover,input[type=tel]:hover,input[type=color]:hover{border-color:#b5b5b5}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{-webkit-box-shadow:none;box-shadow:none;color:#696969;border-color:#f59942;background-color:#fff;outline:0}input::-webkit-input-placeholder,.form-control::-webkit-input-placeholder{color:silver}input:-moz-placeholder,.form-control:-moz-placeholder{color:silver;opacity:1}input::-moz-placeholder,.form-control::-moz-placeholder{color:silver;opacity:1}input:-ms-input-placeholder,.form-control:-ms-input-placeholder{color:silver}.form-control,select{border-radius:0;-webkit-box-shadow:none!important;box-shadow:none!important;color:#858585;background-color:#fff;border:1px solid #d5d5d5}.form-control:focus,select:focus{color:#696969;border-color:#f59942;background-color:#fff;outline:0}textarea.form-control{padding:5px 9px}select{padding:3px 4px;height:30px}select.form-control{padding:4px 6px}select[multiple],select.form-control[multiple]{height:auto}select.input-sm{border-radius:0;padding:2px 3px}select.input-lg{border-radius:0;padding:6px 8px}input.block{display:block;margin-bottom:9px}textarea.autosize-transition{-webkit-transition-duration:"height 0.2s";transition-duration:"height 0.2s"}.limiterBox{border:1px solid #222;border-top:none;background-color:#333;padding:3px 6px;font-size:13px;color:#FFF;margin-top:6px}.limiterBox:after{display:none}.limiterBox:before{display:block;content:"";position:absolute;width:0;height:0;top:-8px;left:50%;margin-left:-5px;border-color:transparent;border-style:solid;border-bottom-color:#333;-moz-border-bottom-colors:#333;border-width:0 8px 8px}select option,select.form-control option{padding:3px 4px 5px}select option:active,select.form-control option:active,select option:hover,select.form-control option:hover,select option:focus,select.form-control option:focus{background-color:#eee;color:#444}select option.no-option,select.form-control option.no-option{padding:1px 0}input[disabled]{color:#848484!important;background-color:#eee!important}input[disabled]:hover{border-color:#d5d5d5!important}input[readonly]{color:#939192;background:#f5f5f5!important;cursor:default}input[readonly]:hover{border-color:#c3c3c3}input[readonly]:focus{-webkit-box-shadow:none;box-shadow:none;border-color:#aaa;background-color:#f9f9f9}.help-inline{font-size:13px!important}.input-icon{position:relative}span.input-icon{display:inline-block}.input-icon>input{padding-left:24px;padding-right:6px}.input-icon.input-icon-right>input{padding-left:6px;padding-right:24px}.input-icon>.ace-icon{padding:0 3px;z-index:2;position:absolute;top:1px;bottom:1px;left:3px;line-height:30px;display:inline-block;color:#909090;font-size:16px}.input-icon.input-icon-right>.ace-icon{left:auto;right:3px}.input-icon>input:focus+.ace-icon{color:#579}.input-icon~.help-inline{padding-left:8px}.form-search .radio [type=radio]+label,.form-inline .radio [type=radio]+label,.form-search .checkbox [type=checkbox]+label,.form-inline .checkbox [type=checkbox]+label{float:left;margin-left:-20px}.form-search .form-search .radio [type=radio]+label,.form-search .form-inline .radio [type=radio]+label,.form-search .form-search .checkbox [type=checkbox]+label,.form-search .form-inline .checkbox [type=checkbox]+label,.form-inline .form-search .radio [type=radio]+label,.form-inline .form-inline .radio [type=radio]+label,.form-inline .form-search .checkbox [type=checkbox]+label,.form-inline .form-inline .checkbox [type=checkbox]+label{margin-left:0;margin-right:3px}.form-search .input-append .search-query:focus,.form-search .input-prepend .search-query:focus{-webkit-box-shadow:none;box-shadow:none}.input-append input,.input-prepend input,.input-append select,.input-prepend select,.input-append .uneditable-input,.input-prepend .uneditable-input{border-radius:0}.input-mini{width:60px;max-width:100%}.input-small{width:90px;max-width:100%}.input-medium,.input-md{width:150px;max-width:100%}.input-large{width:210px;max-width:100%}.input-xlarge{width:270px;max-width:100%}.input-xxlarge{width:530px;max-width:100%}input.input-lg{font-size:18px}input[type=checkbox].ace,input[type=radio].ace{opacity:0;position:absolute;z-index:1;width:18px;height:18px;cursor:pointer}label input[type=checkbox].ace,label input[type=radio].ace{z-index:-100!important;width:1px!important;height:1px!important;clip:rect(1px,1px,1px,1px);position:absolute}input[type=checkbox].ace:checked,input[type=radio].ace:checked,input[type=checkbox].ace:focus,input[type=radio].ace:focus{outline:0!important}input[type=checkbox].ace+.lbl,input[type=radio].ace+.lbl{position:relative;display:inline-block;margin:0;line-height:20px;min-height:18px;min-width:18px;font-weight:400;cursor:pointer}input[type=checkbox].ace+.lbl::before,input[type=radio].ace+.lbl::before{cursor:pointer;font-family:fontAwesome;font-weight:400;font-size:12px;color:#32a3ce;content:"\a0";background-color:#FAFAFA;border:1px solid #c8c8c8;box-shadow:0 1px 2px rgba(0,0,0,.05);border-radius:0;display:inline-block;text-align:center;height:16px;line-height:14px;min-width:16px;margin-right:1px;position:relative;top:-1px}input[type=checkbox].ace:checked+.lbl::before,input[type=radio].ace:checked+.lbl::before{display:inline-block;content:'\f00c';background-color:#F5F8FC;border-color:#adb8c0;box-shadow:0 1px 2px rgba(0,0,0,.05),inset 0 -15px 10px -12px rgba(0,0,0,.05),inset 15px 10px -12px rgba(255,255,255,.1)}input[type=checkbox].ace:hover+.lbl::before,input[type=radio].ace:hover+.lbl::before,input[type=checkbox].ace+.lbl:hover::before,input[type=radio].ace+.lbl:hover::before{border-color:#ff893c}input[type=checkbox].ace:active+.lbl::before,input[type=radio].ace:active+.lbl::before,input[type=checkbox].ace:checked:active+.lbl::before,input[type=radio].ace:checked:active+.lbl::before{box-shadow:0 1px 2px rgba(0,0,0,.05),inset 0 1px 3px rgba(0,0,0,.1)}input[type=checkbox].ace.ace-checkbox-2+.lbl::before,input[type=radio].ace.ace-checkbox-2+.lbl::before{box-shadow:none}input[type=checkbox].ace.ace-checkbox-2:checked+.lbl::before,input[type=radio].ace.ace-checkbox-2:checked+.lbl::before{background-color:#f9a021;border-color:#f9a021;color:#FFF}input[type=checkbox].ace:disabled+.lbl::before,input[type=radio].ace:disabled+.lbl::before,input[type=checkbox].ace[disabled]+.lbl::before,input[type=radio].ace[disabled]+.lbl::before,input[type=checkbox].ace.disabled+.lbl::before,input[type=radio].ace.disabled+.lbl::before{background-color:#DDD!important;border-color:#CCC!important;box-shadow:none!important;color:#BBB}.checkbox label input[type=checkbox].ace+.lbl,.radio label input[type=radio].ace+.lbl{margin-left:-10px}input[type=radio].ace+.lbl::before{border-radius:100%;font-size:10px;font-family:FontAwesome;text-shadow:0 0 1px #32a3ce;line-height:15px;height:17px;min-width:17px}input[type=radio].ace:checked+.lbl::before{content:"\f111"}input[type=checkbox].ace.input-lg+.lbl::before{border-radius:4px;font-size:16px;height:24px;line-height:21px;min-width:24px;top:auto}input[type=radio].ace.input-lg+.lbl::before{font-size:14px;height:24px;line-height:22px;min-width:24px;top:auto}input[type=checkbox].ace.ace-switch{width:55px;height:25px}input[type=checkbox].ace.ace-switch+.lbl{margin:0 4px;min-height:24px}input[type=checkbox].ace.ace-switch+.lbl::before{font-family:'Open Sans';content:"ON\a0\a0\a0\a0\a0\a0\a0\a0\a0OFF";color:#999;text-shadow:0 0 0 #999;font-weight:400;font-size:11px;line-height:17px;height:20px;overflow:hidden;border-radius:12px;background-color:#F5F5F5;-webkit-box-shadow:inset 0 1px 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 1px 0 rgba(0,0,0,.15);border:1px solid #CCC;text-align:left;float:left;padding:0;width:52px;text-indent:-21px;margin-right:0;-webkit-transition:text-indent .3s ease;-o-transition:text-indent .3s ease;transition:text-indent .3s ease;top:auto}input[type=checkbox].ace.ace-switch+.lbl::after{font-family:'Open Sans';content:'III';font-size:12px;font-weight:400;letter-spacing:0;color:#AAA;text-shadow:none;background-color:#FFF;border-radius:100%;width:22px;height:22px;line-height:22px;text-align:center;position:absolute;top:-2px;left:-3px;-webkit-box-shadow:0 1px 1px 1px rgba(0,0,0,.3);box-shadow:0 1px 1px 1px rgba(0,0,0,.3);-webkit-transition:left .3s ease;-o-transition:left .3s ease;transition:left .3s ease}input[type=checkbox].ace.ace-switch:checked+.lbl::before{text-indent:8px;color:#FFF;text-shadow:0 0 0 #FFF;background-color:#8ab2c9;border-color:#6a8ca8}input[type=checkbox].ace.ace-switch:checked+.lbl::after{left:34px;background-color:#FFF;color:#98A0A5}input[type=checkbox].ace.ace-switch.ace-switch-2+.lbl::before{content:"YES\a0\a0\a0\a0\a0\a0\a0\a0\a0NO"}input[type=checkbox].ace.ace-switch.ace-switch-3+.lbl::after{font-family:FontAwesome;font-size:13px;line-height:22px;content:"\f00d";top:-1px;text-shadow:none;padding:0;text-align:center;color:#BBB;letter-spacing:0}input[type=checkbox].ace.ace-switch.ace-switch-3:checked+.lbl::after{content:"\f00c";color:#8AB2C9;text-shadow:none}input[type=checkbox].ace.ace-switch.ace-switch-4,input[type=checkbox].ace.ace-switch.ace-switch-5{width:60px}input[type=checkbox].ace.ace-switch.ace-switch-4+.lbl::before,input[type=checkbox].ace.ace-switch.ace-switch-5+.lbl::before{content:"ON\a0\a0\a0\a0\a0\a0\a0\a0\a0\a0\a0OFF";font-size:12px;line-height:21px;height:24px;overflow:hidden;border-radius:12px;background-color:#8b9aa3;border:1px solid #8b9aa3;color:#FFF;width:56px;text-indent:-25px;text-shadow:0 0 0 #FFF;display:inline-block;position:relative;box-shadow:none;-webkit-transition:all .3s ease;-o-transition:all .3s ease;transition:all .3s ease}input[type=checkbox].ace.ace-switch.ace-switch-4+.lbl::after,input[type=checkbox].ace.ace-switch.ace-switch-5+.lbl::after{content:'III';font-size:11px;position:absolute;top:2px;left:2px;letter-spacing:0;width:20px;height:20px;line-height:19px;text-shadow:none!important;color:#939393;background-color:#FFF;-webkit-transition:all .3s ease;-o-transition:all .3s ease;transition:all .3s ease}input[type=checkbox].ace.ace-switch.ace-switch-4:checked+.lbl::before,input[type=checkbox].ace.ace-switch.ace-switch-5:checked+.lbl::before{text-indent:9px;background-color:#468fcc;border-color:#468FCC}input[type=checkbox].ace.ace-switch.ace-switch-4:checked+.lbl::after,input[type=checkbox].ace.ace-switch.ace-switch-5:checked+.lbl::after{left:34px;background-color:#FFF;color:#848484}input[type=checkbox].ace.ace-switch.ace-switch-5+.lbl::before{content:"YES\a0\a0\a0\a0\a0\a0\a0\a0\a0\a0\a0NO"}input[type=checkbox].ace.ace-switch.ace-switch-5:checked+.lbl::before{text-indent:8px}input[type=checkbox].ace.ace-switch.ace-switch-6+.lbl{position:relative}input[type=checkbox].ace.ace-switch.ace-switch-6+.lbl::before{font-family:FontAwesome;content:"\f00d";text-shadow:0 -1px 0 rgba(0,0,0,.25);box-shadow:none;border-width:0;font-weight:lighter;font-size:16px;border-radius:12px;display:inline-block;background-color:#888;color:#F2F2F2;width:52px;height:22px;line-height:21px;text-indent:32px;-webkit-transition:background .1s ease;-o-transition:background .1s ease;transition:background .1s ease}input[type=checkbox].ace.ace-switch.ace-switch-6+.lbl::after{content:'';text-shadow:0 -1px 0 rgba(0,0,0,.25);position:absolute;top:2px;left:3px;border-radius:12px;box-shadow:0 -1px 0 rgba(0,0,0,.25);width:18px;height:18px;text-align:center;background-color:#F2F2F2;border:4px solid #F2F2F2;-webkit-transition:left .2s ease;-o-transition:left .2s ease;transition:left .2s ease}input[type=checkbox].ace.ace-switch.ace-switch-6:checked+.lbl::before{content:"\f00c";text-indent:6px;color:#FFF;border-color:#b7d3e5;background-color:#ff893c}input[type=checkbox].ace.ace-switch.ace-switch-6:checked+.lbl::after{left:32px;background-color:#FFF;border:4px solid #FFF;text-shadow:0 -1px 0 rgba(0,200,0,.25)}input[type=checkbox].ace.ace-switch.ace-switch-7{width:75px}input[type=checkbox].ace.ace-switch.ace-switch-7+.lbl{position:relative}input[type=checkbox].ace.ace-switch.ace-switch-7+.lbl::before{content:"OFF\a0\a0\a0\a0\a0\a0\a0\a0\a0\a0\a0\a0\a0\a0ON";font-weight:bolder;font-size:13px;line-height:20px;background-color:#FFF;border:2px solid #AAA;border-radius:0;box-shadow:none;color:#AAA;width:74px;height:26px;line-height:22px;overflow:hidden;text-indent:5px;display:inline-block;position:relative;-webkit-transition:all .2s ease;-o-transition:all .2s ease;transition:all .2s ease}input[type=checkbox].ace.ace-switch.ace-switch-7+.lbl::after{content:'\f00d';font-family:FontAwesome;font-size:16px;position:absolute;top:3px;left:39px;width:32px;height:20px;line-height:18px;text-align:center;padding:0;text-indent:0;background-color:#AAA;color:#FFF;border-radius:0;box-shadow:none;-webkit-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}input[type=checkbox].ace.ace-switch.ace-switch-7:checked+.lbl::before{color:#468fcc;background-color:#FFF;text-indent:-28px;border-color:#6fb3e0}input[type=checkbox].ace.ace-switch.ace-switch-7:checked+.lbl::after{left:3px;content:'\f00c';background-color:#468fcc;color:#FFF}input[type=checkbox].ace.ace-switch+.lbl[data-lbl]::before{content:attr(data-lbl)}input[type=checkbox].ace.ace-switch.btn-empty+.lbl::after{content:""}input[type=checkbox].ace.ace-switch.btn-rotate+.lbl::after{content:"\2261";line-height:20px;font-size:17px}input[type=checkbox].ace.ace-switch-4.btn-rotate+.lbl::after,input[type=checkbox].ace.ace-switch-5.btn-rotate+.lbl::after{line-height:17px}input[type=checkbox].ace.ace-switch.btn-flat+.lbl::before,input[type=checkbox].ace.ace-switch.btn-flat+.lbl::after{border-radius:0!important}input[type=checkbox].ace.ace-switch.ace-switch-4+.lbl::before,input[type=checkbox].ace.ace-switch.ace-switch-5+.lbl::before{text-indent:-24px}input[type=checkbox].ace.ace-switch.ace-switch-4:checked+.lbl::before,input[type=checkbox].ace.ace-switch.ace-switch-5:checked+.lbl::before{text-indent:7px}input.ace+.lbl.padding-16::before{margin-right:16px}input.ace+.lbl.padding-14::before{margin-right:14px}input.ace+.lbl.padding-12::before{margin-right:12px}input.ace+.lbl.padding-10::before{margin-right:10px}input.ace+.lbl.padding-8::before{margin-right:8px}input.ace+.lbl.padding-6::before{margin-right:6px}input.ace+.lbl.padding-4::before{margin-right:4px}input.ace+.lbl.padding-2::before{margin-right:2px}input.ace+.lbl.padding-0::before{margin-right:0}.ace-file-input{display:block;font-size:inherit;position:relative;height:30px}.ace-file-input input[type=file]{position:absolute;z-index:-999;width:1px;height:1px;overflow:hidden;opacity:0;filter:alpha(opacity=0)}.ace-file-input input[type=file]:focus{outline:0}.ace-file-input .ace-file-container{display:block;position:absolute;top:0;left:0;right:0;height:30px;background-color:#fff;border:1px solid #d5d5d5;cursor:pointer;-webkit-box-shadow:none;box-shadow:none;-webkit-transition:all .15s;-o-transition:all .15s;transition:all .15s}.ace-file-input .ace-file-container:hover{-webkit-box-shadow:none;box-shadow:none;border-color:#f59942}.ace-file-input .ace-file-container:before{display:inline-block;content:attr(data-title);position:absolute;right:0;top:0;bottom:0;line-height:24px;text-align:center;padding:0 8px;background-color:#6fb3e0;color:#FFF;font-size:11px;font-weight:700;border:2px solid #FFF;border-left-width:4px;-webkit-transition:all .3s;-o-transition:all .3s;transition:all .3s}.ace-file-input .ace-file-container .ace-file-name{display:inline-block;height:28px;max-width:80%;white-space:nowrap;overflow:hidden;line-height:28px;color:#888;font-size:13px;vertical-align:top;position:static;padding-left:30px}.ace-file-input .ace-file-container .ace-file-name:after{display:inline-block;content:attr(data-title)}.ace-file-input .ace-file-container.selected{right:16px}.ace-file-input .ace-file-container.selected .ace-file-name{color:#666}.ace-file-input .ace-file-container .ace-icon{display:inline-block;position:absolute;left:0;top:0;bottom:0;line-height:24px;width:26px;text-align:center;font-family:FontAwesome;font-size:13px;border:2px solid #FFF;color:#FFF;-webkit-transition:all .1s;-o-transition:all .1s;transition:all .1s;background-color:#d1d1d1}.ace-file-input .ace-file-container.selected .ace-file-name .ace-icon{background-color:#efad62}.ace-file-input .ace-file-container.selected .ace-file-name .file-image{background-color:#bd7a9d}.ace-file-input .ace-file-container.selected .ace-file-name .file-video{background-color:#87b87f}.ace-file-input .ace-file-container.selected .ace-file-name .file-audio{background-color:#8b7ac9}.ace-file-input .ace-file-container.selected .ace-file-name .file-archive{background-color:#efad62}.ace-file-input .ace-file-container.hide-placeholder:before{display:none}.ace-file-input a:hover{text-decoration:none}.ace-file-input .remove{position:absolute;right:-8px;top:6px;display:none;width:17px;text-align:center;height:17px;line-height:15px;font-size:11px;font-weight:400;background-color:#fb7142;border-radius:100%;color:#FFF;text-decoration:none}.ace-file-input .ace-file-container.selected+.remove{display:inline-block}@media screen and (-webkit-min-device-pixel-ratio:0){.ace-file-input input[type=file]{position:absolute;width:0;height:0}}.ace-file-input input[type=file].disabled+.ace-file-container,.ace-file-input input[type=file][disabled]+.ace-file-container,.ace-file-input input[type=file][readonly]+.ace-file-container{cursor:not-allowed;background-color:#EEE}.ace-file-input input[type=file].disabled+.ace-file-container:hover,.ace-file-input input[type=file][disabled]+.ace-file-container:hover,.ace-file-input input[type=file][readonly]+.ace-file-container:hover{-webkit-box-shadow:none;box-shadow:none;border-color:#E3E3E3}.ace-file-input input[type=file].disabled+.ace-file-container:before,.ace-file-input input[type=file][disabled]+.ace-file-container:before,.ace-file-input input[type=file][readonly]+.ace-file-container:before{border-color:#EEE;background-color:#A1AAAF}.ace-file-input input[type=file][readonly]+.ace-file-container{cursor:default}.ace-file-input .ace-file-overlay{position:absolute;top:-2px;bottom:-2px;left:-2px;right:-10px;z-index:99;background-color:rgba(0,0,0,.5)}.ace-file-input .ace-file-overlay>.overlay-content{display:inline-block;position:relative;top:10%;left:0;right:0;text-align:center}.ace-file-multiple{height:auto}.ace-file-multiple .ace-file-container{position:relative;height:auto;border:1px dashed #aaa;border-radius:4px;text-align:center}.ace-file-multiple .ace-file-container:before{display:inline-block;content:attr(data-title);position:relative;right:0;left:0;margin:12px;line-height:22px;background-color:#FFF;color:#CCC;font-size:18px;font-weight:700;border-width:0}.ace-file-multiple .ace-file-container.selected .ace-file-name .ace-icon{display:inline-block;position:absolute;left:0;top:0;bottom:0;line-height:24px;width:26px;text-align:center;font-family:FontAwesome;font-size:13px;border:2px solid #FFF;color:#FFF;-webkit-transition:all .1s;-o-transition:all .1s;transition:all .1s}.ace-file-multiple .ace-file-container .ace-file-name{position:relative;display:block;padding:0;height:auto;width:auto;max-width:100%;margin:0 4px;border-bottom:1px solid #DDD;text-align:left}.ace-file-multiple .ace-file-container .ace-file-name:first-child{margin-top:1px}.ace-file-multiple .ace-file-container .ace-file-name:last-child{border-bottom-width:0;margin-bottom:1px}.ace-file-multiple .ace-file-container .ace-file-name img{padding:2px;border:1px solid #D7D7D7;background-color:#FFF;background-repeat:no-repeat;background-position:center;margin:4px 8px 4px 1px}.ace-file-multiple .ace-file-container .ace-file-name:after{display:none}.ace-file-multiple .ace-file-container.selected .ace-file-name:after{display:inline-block;white-space:pre}.ace-file-multiple .ace-file-container .ace-file-name img+.ace-icon,.ace-file-multiple .ace-file-container.selected .ace-file-name img+.ace-icon{display:none}.ace-file-multiple .remove{right:-11px;top:-11px;border:3px solid #BBB;border-radius:32px;background-color:#FFF;color:red;width:23px;height:23px;line-height:15px}.ace-file-multiple .ace-file-container.selected+.remove:hover{border-color:#f4c0b1}.ace-file-multiple .ace-file-overlay{position:absolute;top:-12px;bottom:-6px;left:-12px;right:-12px}.ace-file-multiple .ace-file-overlay>.overlay-content{top:20%}.ace-file-multiple .ace-file-container .ace-file-name .ace-icon{position:relative;display:block;text-align:center;height:auto;line-height:64px;width:auto;font-size:64px;color:#D5D5D5;margin:4px 0;background-color:transparent}.ace-file-multiple .ace-file-container.selected:after{display:none}.ace-file-multiple .ace-file-container.selected .ace-file-name .ace-icon{position:relative;margin-right:4px;margin-left:2px;line-height:24px}.ace-file-multiple .ace-file-container .ace-file-name.large{text-align:center;border-bottom:1px solid #222;margin:0 1px 3px}.ace-file-multiple .ace-file-container .ace-file-name.large:last-child{margin:0 1px}.ace-file-multiple .ace-file-container .ace-file-name.large:after{position:absolute;top:auto;bottom:0;left:0;right:0;padding:0 4px;background-color:#555;color:#FFF;opacity:.8;filter:alpha(opacity=80)}.ace-file-multiple .ace-file-container .ace-file-name.large img{border-width:0;margin:0!important;padding:0}.ace-file-multiple input[type=file].disabled+.ace-file-container:hover,.ace-file-multiple input[type=file][disabled]+.ace-file-container:hover,.ace-file-multiple input[type=file][readonly]+.ace-file-container:hover{border-color:#AAA}.ace-file-multiple input[type=file].disabled+.ace-file-container:before,.ace-file-multiple input[type=file][disabled]+.ace-file-container:before,.ace-file-multiple input[type=file][readonly]+.ace-file-container:before{background-color:transparent}.ace-file-multiple input[type=file].disabled+.ace-file-container .ace-icon,.ace-file-multiple input[type=file][disabled]+.ace-file-container .ace-icon,.ace-file-multiple input[type=file][readonly]+.ace-file-container .ace-icon{border-color:#EEE}.input-group .input-group-addon{border-radius:0!important}.form-group.has-success .input-group .input-group-addon{border-color:#9cc573}.form-group.has-error .input-group .input-group-addon{border-color:#f2a696}.form-group.has-warning .input-group .input-group-addon{border-color:#e3c94c}.form-group.has-info .input-group .input-group-addon{border-color:#72aec2}.input-group>.btn{line-height:20px;padding:0 6px;border-radius:0!important}.input-group>.btn.btn-sm{line-height:22px}.input-group>.btn+.btn{margin-left:1px}.input-group>.btn-group>.btn{line-height:23px}.input-group>.btn-group>.btn.btn-sm{line-height:26px}.input-group>.btn>.caret,.input-group>.btn-group>.btn>.caret,.input-group>.btn.btn-sm>.caret,.input-group>.btn-group>.btn.btn-sm>.caret{margin-top:10px}.input-group.input-group-compact{width:1px}.form-group select,.form-group textarea,.form-group input[type=text],.form-group input[type=password],.form-group input[type=datetime],.form-group input[type=datetime-local],.form-group input[type=date],.form-group input[type=month],.form-group input[type=time],.form-group input[type=week],.form-group input[type=number],.form-group input[type=email],.form-group input[type=url],.form-group input[type=search],.form-group input[type=tel],.form-group input[type=color]{background:#FFF}.form-group.has-success input,.form-group.has-success select,.form-group.has-success textarea{border-color:#9cc573;color:#8bad4c;-webkit-box-shadow:none;box-shadow:none}.form-group.has-success input:focus,.form-group.has-success select:focus,.form-group.has-success textarea:focus{-webkit-box-shadow:0 0 0 2px rgba(130,188,58,.3);box-shadow:0 0 0 2px rgba(130,188,58,.3);color:#6f8a3c;border-color:#779c52;background-color:#f4f9f0}.form-group.has-success input:focus+.ace-icon,.form-group.has-success select:focus+.ace-icon,.form-group.has-success textarea:focus+.ace-icon{color:#8bad4c}.form-group.has-success .ace-icon{color:#8bad4c}.form-group.has-success .btn .ace-icon{color:inherit}.form-group.has-success .control-label,.form-group.has-success .help-block,.form-group.has-success .help-inline{color:#7ba065}.form-group.has-info input,.form-group.has-info select,.form-group.has-info textarea{border-color:#72aec2;color:#4b89aa;-webkit-box-shadow:none;box-shadow:none}.form-group.has-info input:focus,.form-group.has-info select:focus,.form-group.has-info textarea:focus{-webkit-box-shadow:0 0 0 2px rgba(58,120,188,.3);box-shadow:0 0 0 2px rgba(58,120,188,.3);color:#3b6c87;border-color:#488ea5;background-color:#f1f7f9}.form-group.has-info input:focus+.ace-icon,.form-group.has-info select:focus+.ace-icon,.form-group.has-info textarea:focus+.ace-icon{color:#4b89aa}.form-group.has-info .ace-icon{color:#4b89aa}.form-group.has-info .btn .ace-icon{color:inherit}.form-group.has-info .control-label,.form-group.has-info .help-block,.form-group.has-info .help-inline{color:#657ba0}.form-group.has-error input,.form-group.has-error select,.form-group.has-error textarea{border-color:#f2a696;color:#d68273;-webkit-box-shadow:none;box-shadow:none}.form-group.has-error input:focus,.form-group.has-error select:focus,.form-group.has-error textarea:focus{-webkit-box-shadow:0 0 0 2px rgba(219,137,120,.3);box-shadow:0 0 0 2px rgba(219,137,120,.3);color:#ca5f4c;border-color:#d77b68;background-color:#fef9f8}.form-group.has-error input:focus+.ace-icon,.form-group.has-error select:focus+.ace-icon,.form-group.has-error textarea:focus+.ace-icon{color:#d68273}.form-group.has-error .ace-icon{color:#d68273}.form-group.has-error .btn .ace-icon{color:inherit}.form-group.has-error .control-label,.form-group.has-error .help-block,.form-group.has-error .help-inline{color:#d16e6c}.form-group.has-warning input,.form-group.has-warning select,.form-group.has-warning textarea{border-color:#e3c94c;color:#d3bd50;-webkit-box-shadow:none;box-shadow:none}.form-group.has-warning input:focus,.form-group.has-warning select:focus,.form-group.has-warning textarea:focus{-webkit-box-shadow:0 0 0 2px rgba(216,188,65,.3);box-shadow:0 0 0 2px rgba(216,188,65,.3);color:#c0a830;border-color:#d5b630;background-color:#fdfbf3}.form-group.has-warning input:focus+.ace-icon,.form-group.has-warning select:focus+.ace-icon,.form-group.has-warning textarea:focus+.ace-icon{color:#d3bd50}.form-group.has-warning .ace-icon{color:#d3bd50}.form-group.has-warning .btn .ace-icon{color:inherit}.form-group.has-warning .control-label,.form-group.has-warning .help-block,.form-group.has-warning .help-inline{color:#d19d59}.form-group input[disabled],.form-group input:disabled{color:#848484!important;background-color:#eee!important}@media only screen and (max-width:767px){.help-inline,.input-icon+.help-inline{padding-left:0;display:block!important}}.tab-content{border:1px solid #c5d0dc;padding:16px 12px;position:relative}.tab-content.no-padding{padding:0}.tab-content.no-border{border:none;padding:12px}.tab-content.padding-32{padding:32px 24px}.tab-content.no-border.padding-32{padding:32px}.tab-content.padding-30{padding:30px 23px}.tab-content.no-border.padding-30{padding:30px}.tab-content.padding-28{padding:28px 21px}.tab-content.no-border.padding-28{padding:28px}.tab-content.padding-26{padding:26px 20px}.tab-content.no-border.padding-26{padding:26px}.tab-content.padding-24{padding:24px 18px}.tab-content.no-border.padding-24{padding:24px}.tab-content.padding-22{padding:22px 17px}.tab-content.no-border.padding-22{padding:22px}.tab-content.padding-20{padding:20px 15px}.tab-content.no-border.padding-20{padding:20px}.tab-content.padding-18{padding:18px 14px}.tab-content.no-border.padding-18{padding:18px}.tab-content.padding-16{padding:16px 12px}.tab-content.no-border.padding-16{padding:16px}.tab-content.padding-14{padding:14px 11px}.tab-content.no-border.padding-14{padding:14px}.tab-content.padding-12{padding:12px 9px}.tab-content.no-border.padding-12{padding:12px}.tab-content.padding-10{padding:10px 8px}.tab-content.no-border.padding-10{padding:10px}.tab-content.padding-8{padding:8px 6px}.tab-content.no-border.padding-8{padding:8px}.tab-content.padding-6{padding:6px 5px}.tab-content.no-border.padding-6{padding:6px}.tab-content.padding-4{padding:4px 3px}.tab-content.no-border.padding-4{padding:4px}.tab-content.padding-2{padding:2px 2px}.tab-content.no-border.padding-2{padding:2px}.tab-content.padding-0{padding:0 0}.tab-content.no-border.padding-0{padding:0}.nav.nav-tabs.padding-32{padding-left:32px}.tabs-right>.nav.nav-tabs.padding-32,.tabs-left>.nav.nav-tabs.padding-32{padding-left:0;padding-top:32px}.nav.nav-tabs.padding-30{padding-left:30px}.tabs-right>.nav.nav-tabs.padding-30,.tabs-left>.nav.nav-tabs.padding-30{padding-left:0;padding-top:30px}.nav.nav-tabs.padding-28{padding-left:28px}.tabs-right>.nav.nav-tabs.padding-28,.tabs-left>.nav.nav-tabs.padding-28{padding-left:0;padding-top:28px}.nav.nav-tabs.padding-26{padding-left:26px}.tabs-right>.nav.nav-tabs.padding-26,.tabs-left>.nav.nav-tabs.padding-26{padding-left:0;padding-top:26px}.nav.nav-tabs.padding-24{padding-left:24px}.tabs-right>.nav.nav-tabs.padding-24,.tabs-left>.nav.nav-tabs.padding-24{padding-left:0;padding-top:24px}.nav.nav-tabs.padding-22{padding-left:22px}.tabs-right>.nav.nav-tabs.padding-22,.tabs-left>.nav.nav-tabs.padding-22{padding-left:0;padding-top:22px}.nav.nav-tabs.padding-20{padding-left:20px}.tabs-right>.nav.nav-tabs.padding-20,.tabs-left>.nav.nav-tabs.padding-20{padding-left:0;padding-top:20px}.nav.nav-tabs.padding-18{padding-left:18px}.tabs-right>.nav.nav-tabs.padding-18,.tabs-left>.nav.nav-tabs.padding-18{padding-left:0;padding-top:18px}.nav.nav-tabs.padding-16{padding-left:16px}.tabs-right>.nav.nav-tabs.padding-16,.tabs-left>.nav.nav-tabs.padding-16{padding-left:0;padding-top:16px}.nav.nav-tabs.padding-14{padding-left:14px}.tabs-right>.nav.nav-tabs.padding-14,.tabs-left>.nav.nav-tabs.padding-14{padding-left:0;padding-top:14px}.nav.nav-tabs.padding-12{padding-left:12px}.tabs-right>.nav.nav-tabs.padding-12,.tabs-left>.nav.nav-tabs.padding-12{padding-left:0;padding-top:12px}.nav.nav-tabs.padding-10{padding-left:10px}.tabs-right>.nav.nav-tabs.padding-10,.tabs-left>.nav.nav-tabs.padding-10{padding-left:0;padding-top:10px}.nav.nav-tabs.padding-8{padding-left:8px}.tabs-right>.nav.nav-tabs.padding-8,.tabs-left>.nav.nav-tabs.padding-8{padding-left:0;padding-top:8px}.nav.nav-tabs.padding-6{padding-left:6px}.tabs-right>.nav.nav-tabs.padding-6,.tabs-left>.nav.nav-tabs.padding-6{padding-left:0;padding-top:6px}.nav.nav-tabs.padding-4{padding-left:4px}.tabs-right>.nav.nav-tabs.padding-4,.tabs-left>.nav.nav-tabs.padding-4{padding-left:0;padding-top:4px}.nav.nav-tabs.padding-2{padding-left:2px}.tabs-right>.nav.nav-tabs.padding-2,.tabs-left>.nav.nav-tabs.padding-2{padding-left:0;padding-top:2px}.nav-tabs{border-color:#C5D0DC;margin-bottom:0!important;margin-left:0;position:relative;top:1px}.nav-tabs>li>a{padding:7px 12px 8px}.nav-tabs>li>a,.nav-tabs>li>a:focus{border-radius:0!important;border-color:#c5d0dc;background-color:#F9F9F9;color:#999;margin-right:-1px;line-height:18px;position:relative}.nav-tabs>li>a:hover{background-color:#FFF;color:#4c8fbd;border-color:#c5d0dc}.nav-tabs>li>a:active,.nav-tabs>li>a:focus{outline:0!important}.nav-tabs>li:first-child>a{margin-left:0}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{color:#576373;border-color:#c5d0dc;border-top:2px solid #4c8fbd;border-bottom-color:transparent;background-color:#FFF;z-index:1;line-height:18px;margin-top:-1px;box-shadow:0 -2px 3px 0 rgba(0,0,0,.15)}.tabs-below>.nav-tabs{top:auto;margin-bottom:0;margin-top:-1px;border-color:#c5d0dc;border-bottom-width:0}.tabs-below>.nav-tabs>li>a,.tabs-below>.nav-tabs>li>a:hover,.tabs-below>.nav-tabs>li>a:focus{border-color:#c5d0dc}.tabs-below>.nav-tabs>li.active>a,.tabs-below>.nav-tabs>li.active>a:hover,.tabs-below>.nav-tabs>li.active>a:focus{border-color:#c5d0dc;border-top-width:1px;border-bottom:2px solid #4c8fbd;border-top-color:transparent;margin-top:0;box-shadow:0 2px 3px 0 rgba(0,0,0,.15)}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{min-width:60px}.tabs-left>.nav-tabs{top:auto;margin-bottom:0;border-color:#c5d0dc;float:left}.tabs-left>.nav-tabs>li{float:none!important}.tabs-left>.nav-tabs>li>a,.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#c5d0dc;margin:0 -1px 0 0}.tabs-left>.nav-tabs>li.active>a,.tabs-left>.nav-tabs>li.active>a:focus,.tabs-left>.nav-tabs>li.active>a:hover{border-color:#c5d0dc;border-top-width:1px;border-left:2px solid #4c8fbd;border-right-color:transparent;margin:0 -1px 0 -1px;-webkit-box-shadow:-2px 0 3px 0 rgba(0,0,0,.15)!important;box-shadow:-2px 0 3px 0 rgba(0,0,0,.15)!important}.tabs-right>.nav-tabs{top:auto;margin-bottom:0;border-color:#c5d0dc;float:right}.tabs-right>.nav-tabs>li{float:none!important}.tabs-right>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#c5d0dc;margin:0 -1px}.tabs-right>.nav-tabs>li.active>a,.tabs-right>.nav-tabs>li.active>a:focus,.tabs-right>.nav-tabs>li.active>a:hover{border-color:#c5d0dc;border-top-width:1px;border-right:2px solid #4c8fbd;border-left-color:transparent;margin:0 -2px 0 -1px;-webkit-box-shadow:2px 0 3px 0 rgba(0,0,0,.15);box-shadow:2px 0 3px 0 rgba(0,0,0,.15)}.nav-tabs>li>a>.badge{padding:1px 5px;line-height:15px;opacity:.75}.nav-tabs>li>a>.ace-icon{opacity:.75}.nav-tabs>li.active>a>.badge,.nav-tabs>li.active>a>.ace-icon{opacity:1}.nav-tabs li .ace-icon{width:1.25em;display:inline-block;text-align:center}.nav-tabs>li.open .dropdown-toggle{background-color:#4F99C6;border-color:#4F99C6;color:#FFF}.nav-tabs>li.open .dropdown-toggle>.ace-icon{color:#FFF!important}.tabs-left .tab-content,.tabs-right .tab-content{overflow:auto}.nav-pills .open .dropdown-toggle,.nav>li.dropdown.open.active>a:hover,.nav>li.dropdown.open.active>a:focus{background-color:#4F99C6;border-color:#4F99C6;color:#FFF}.nav-pills .open .dropdown-toggle>.ace-icon,.nav>li.dropdown.open.active>a:hover>.ace-icon,.nav>li.dropdown.open.active>a:focus>.ace-icon{color:#FFF!important}.nav-tabs>li:not(.active):not(.open)>a:not(:hover)>.ace-icon:first-child.disabled{color:#909090!important}.nav-tabs.tab-size-bigger>li>a{padding-left:14px;padding-right:14px}.nav-tabs.tab-size-bigger>li>a>.ace-icon:first-child{display:block;margin-bottom:6px;width:auto}.nav-tabs.tab-space-1>li>a{margin-right:1px}.nav-tabs.tab-space-2>li>a{margin-right:2px}.nav-tabs.tab-space-3>li>a{margin-right:3px}.nav-tabs.tab-space-4>li>a{margin-right:4px}.nav-tabs[class*=tab-color-]>li>a,.nav-tabs[class*=tab-color-]>li>a:focus,.nav-tabs[class*=tab-color-]>li>a:hover{color:#FFF;border-color:transparent;margin-right:3px}.nav-tabs[class*=tab-color-]>li>a>.badge{border-radius:2px}.nav-tabs[class*=tab-color-]>li:not(.active)>a:hover{opacity:.85;border-color:rgba(0,0,0,.15);border-bottom-color:transparent}.nav-tabs[class*=tab-color-]>li:not(.active)>a>.ace-icon:first-child{color:#FFF!important}.nav-tabs[class*=tab-color-]>li:not(.active)>a>.badge{color:rgba(0,0,0,.4)!important;background-color:#FFF!important;border-radius:2px}.nav-tabs.tab-color-blue>li>a,.nav-tabs.tab-color-blue>li>a:focus{background-color:#7db4d8}.nav-tabs[class*=tab-color-]>li.active>a,.nav-tabs[class*=tab-color-]>li.active>a:focus,.nav-tabs[class*=tab-color-]>li.active>a:hover{background-color:#FFF;color:#4f80a0;-webkit-box-shadow:none!important;box-shadow:none!important}.nav-tabs.tab-color-blue>li.active>a,.nav-tabs.tab-color-blue>li.active>a:focus,.nav-tabs.tab-color-blue>li.active>a:hover{color:#4c718a;border-color:#7db4d8 #7db4d8 transparent}.tabs-below .nav-tabs.tab-color-blue>li.active>a{border-color:transparent #7db4d8 #7db4d8}.nav-tabs.tab-color-blue{border-bottom-color:#C5D0DC}.nav-tabs.background-blue{padding-top:6px;background-color:#EFF3F8;border:1px solid #C5D0DC}.tabs-below .nav-tabs.background-blue{padding-top:0;padding-bottom:6px}.tabs-below .nav-tabs.tab-color-blue{border-top:none;border-bottom-color:#C5D0DC}.accordion-style1.panel-group .panel{border-radius:0;border-color:#cdd8e3;background-color:#FFF;box-shadow:none}.accordion-style1.panel-group .panel:last-child{border-bottom-width:1px}.accordion-style1.panel-group .panel .collapse{background-color:#FFF}.accordion-style1.panel-group .panel+.panel{margin-top:2px}.accordion-style1.panel-group .panel-heading+.panel-collapse .panel-body{border-top-color:#cdd8e3!important}.accordion-style1.panel-group .panel-heading{padding:0}.accordion-style1.panel-group .panel-heading .accordion-toggle{color:#4c8fbd;background-color:#eef4f9;position:relative;font-weight:700;font-size:13px;line-height:1;padding:10px;display:block}.accordion-style1.panel-group .panel-heading .accordion-toggle.collapsed{color:#478fca;font-weight:400;background-color:#F9F9F9}.accordion-style1.panel-group .panel-heading .accordion-toggle:hover{color:#6ea6cc;background-color:#f1f8fd;text-decoration:none}.accordion-style1.panel-group .panel-heading .accordion-toggle:focus,.accordion-style1.panel-group .panel-heading .accordion-toggle:active{outline:0;text-decoration:none}.accordion-style1.panel-group .panel-heading .accordion-toggle>.ace-icon:first-child{width:16px}.accordion-style1.panel-group .panel-heading .accordion-toggle:hover>.ace-icon:first-child{text-decoration:none}.accordion-style1.panel-group .panel-body,.accordion-style1.panel-group .collapse.in>.panel-body{border-top:1px solid #cdd8e3}.accordion-style1.panel-group.no-padding{padding:0}.accordion-style2.panel-group .panel{border-width:0}.accordion-style2.panel-group .panel:last-child{border-bottom-width:0}.accordion-style2.panel-group .panel+.panel{margin-top:4px}.accordion-style2.panel-group .panel .panel-body{border-top:none}.accordion-style2.panel-group .panel-heading .accordion-toggle{background-color:#EDF3F7;border:2px solid #6EAED1;border-width:0 0 0 2px}.accordion-style2.panel-group .panel-heading .accordion-toggle:hover{text-decoration:none}.accordion-style2.panel-group .panel-heading .accordion-toggle.collapsed{background-color:#F3F3F3;color:#606060;border-width:0 0 0 1px;border-color:#D9D9D9}.accordion-style2.panel-group .panel-heading .accordion-toggle.collapsed:hover{background-color:#F6F6F6;color:#438EB9;text-decoration:none}.accordion-style2.panel-group .panel-body,.accordion-style2.panel-group .collapse.in>.panel-body{border-top:none}.accordion-style2.panel-group .accordion-style2.panel-group .panel{border-bottom:1px dotted #D9D9D9}.accordion-style2.panel-group .accordion-style2.panel-group .panel:last-child{border-bottom:none}.accordion-style2.panel-group .accordion-style2.panel-group .panel .panel-heading,.accordion-style2.panel-group .accordion-style2.panel-group .panel .panel-heading .accordion-toggle{background-color:transparent;border-width:0;font-size:13px;padding-top:6px;padding-bottom:8px}.accordion-style2.panel-group .accordion-style2.panel-group .panel .panel-heading{padding-top:0;padding-bottom:0}th,td,.table-bordered{border-radius:0!important}.table>thead>tr{color:#707070;font-weight:400;background:#F2F2F2;background-image:-webkit-linear-gradient(top,#f8f8f8 0,#ececec 100%);background-image:-o-linear-gradient(top,#f8f8f8 0,#ececec 100%);background-image:linear-gradient(to bottom,#f8f8f8 0,#ececec 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff8f8f8', endColorstr='#ffececec', GradientType=0)}.table>thead>tr>th{border-color:#ddd;font-weight:700}.table>thead>tr>th .ace-icon:first-child{margin-right:2px}.table>thead>tr>th:first-child{border-left-color:#F1F1F1}.table>thead>tr>th:last-child{border-right-color:#F1F1F1}.table.table-bordered>thead>tr>th{vertical-align:middle}.table.table-bordered>thead>tr>th:first-child{border-left-color:#ddd}th.center,td.center{text-align:center}th .lbl,td .lbl{margin-bottom:0}th .lbl:only-child,td .lbl:only-child{vertical-align:top}.table-header{background-color:#307ecc;color:#FFF;font-size:14px;line-height:38px;padding-left:12px;margin-bottom:1px}.table-header .close{margin-right:8px;margin-top:0;opacity:.45;filter:alpha(opacity=45)}.table-header .close:hover{opacity:.75;filter:alpha(opacity=75)}.widget-box{padding:0;-webkit-box-shadow:none;box-shadow:none;margin:3px 0;border:1px solid #CCC}@media only screen and (max-width:767px){.widget-box{margin-top:7px;margin-bottom:7px}}.widget-header{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;position:relative;min-height:38px;background:#f7f7f7;background-image:-webkit-linear-gradient(top,#fff 0,#eee 100%);background-image:-o-linear-gradient(top,#fff 0,#eee 100%);background-image:linear-gradient(to bottom,#fff 0,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0);color:#669fc7;border-bottom:1px solid #DDD;padding-left:12px}.widget-header:before,.widget-header:after{content:"";display:table;line-height:0}.widget-header:after{clear:right}.widget-box.collapsed>.widget-header{border-bottom-width:0}.collapsed.fullscreen>.widget-header{border-bottom-width:1px}.collapsed>.widget-body{display:none}.widget-header-flat{background:#F7F7F7;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.widget-header-large{min-height:49px;padding-left:18px}.widget-header-small{min-height:31px;padding-left:10px}.widget-header>.widget-title{line-height:36px;padding:0;margin:0;display:inline}.widget-header>.widget-title>.ace-icon{margin-right:5px;font-weight:400;display:inline-block}.widget-header-large>.widget-title{line-height:48px}.widget-header-small>.widget-title{line-height:30px}.widget-toolbar{display:inline-block;padding:0 10px;line-height:37px;float:right;position:relative}.widget-header-large>.widget-toolbar{line-height:48px}.widget-header-small>.widget-toolbar{line-height:29px}.widget-toolbar.no-padding{padding:0}.widget-toolbar.padding-5{padding:0 5px}.widget-toolbar:before{display:inline-block;content:"";position:absolute;top:3px;bottom:3px;left:-1px;border:1px solid #D9D9D9;border-width:0 1px 0 0}.widget-header-large>.widget-toolbar:before{top:6px;bottom:6px}[class*=widget-color-]>.widget-header>.widget-toolbar:before{border-color:#EEE}.widget-color-orange>.widget-header>.widget-toolbar:before{border-color:#FEA}.widget-color-dark>.widget-header>.widget-toolbar:before{border-color:#222;box-shadow:-1px 0 0 rgba(255,255,255,.2),inset 1px 0 0 rgba(255,255,255,.1)}.widget-toolbar.no-border:before{display:none}.widget-toolbar label{display:inline-block;vertical-align:middle;margin-bottom:0}.widget-toolbar>a,.widget-toolbar>.widget-menu>a{font-size:14px;margin:0 1px;display:inline-block;padding:0;line-height:24px}.widget-toolbar>a:hover,.widget-toolbar>.widget-menu>a:hover{text-decoration:none}.widget-header-large>.widget-toolbar>a,.widget-header-large>.widget-toolbar>.widget-menu>a{font-size:15px;margin:0 1px}.widget-toolbar>.btn{line-height:27px;margin-top:-2px}.widget-toolbar>.btn.smaller{line-height:26px}.widget-toolbar>.btn.bigger{line-height:28px}.widget-toolbar>.btn-sm{line-height:24px}.widget-toolbar>.btn-sm.smaller{line-height:23px}.widget-toolbar>.btn-sm.bigger{line-height:25px}.widget-toolbar>.btn-xs{line-height:22px}.widget-toolbar>.btn-xs.smaller{line-height:21px}.widget-toolbar>.btn-xs.bigger{line-height:23px}.widget-toolbar>.btn-minier{line-height:18px}.widget-toolbar>.btn-minier.smaller{line-height:17px}.widget-toolbar>.btn-minier.bigger{line-height:19px}.widget-toolbar>.btn-lg{line-height:36px}.widget-toolbar>.btn-lg.smaller{line-height:34px}.widget-toolbar>.btn-lg.bigger{line-height:38px}.widget-toolbar-dark{background:#444}.widget-toolbar-light{background:rgba(255,255,255,.85)}.widget-toolbar>.widget-menu{display:inline-block;position:relative}.widget-toolbar>a[data-action],.widget-toolbar>.widget-menu>a[data-action]{-webkit-transition:transform .1s;-o-transition:transform .1s;transition:transform .1s}.widget-toolbar>a[data-action]>.ace-icon,.widget-toolbar>.widget-menu>a[data-action]>.ace-icon{margin-right:0}.widget-toolbar>a[data-action]:focus,.widget-toolbar>.widget-menu>a[data-action]:focus{text-decoration:none;outline:0}.widget-toolbar>a[data-action]:hover,.widget-toolbar>.widget-menu>a[data-action]:hover{-moz-transform:scale(1.2);-webkit-transform:scale(1.2);-o-transform:scale(1.2);-ms-transform:scale(1.2);transform:scale(1.2)}.widget-body{background-color:#FFF}.widget-main{padding:12px}.widget-main.padding-32{padding:32px}.widget-main.padding-30{padding:30px}.widget-main.padding-28{padding:28px}.widget-main.padding-26{padding:26px}.widget-main.padding-24{padding:24px}.widget-main.padding-22{padding:22px}.widget-main.padding-20{padding:20px}.widget-main.padding-18{padding:18px}.widget-main.padding-16{padding:16px}.widget-main.padding-14{padding:14px}.widget-main.padding-12{padding:12px}.widget-main.padding-10{padding:10px}.widget-main.padding-8{padding:8px}.widget-main.padding-6{padding:6px}.widget-main.padding-4{padding:4px}.widget-main.padding-2{padding:2px}.widget-main.padding-0{padding:0}.widget-main.no-padding{padding:0}.widget-toolbar .progress{vertical-align:middle;display:inline-block;margin:0}.widget-toolbar>.dropdown,.widget-toolbar>.dropup{display:inline-block}.widget-box>.widget-header>.widget-toolbar>[data-action=settings],.widget-color-dark>.widget-header>.widget-toolbar>[data-action=settings],.widget-box>.widget-header>.widget-toolbar>.widget-menu>[data-action=settings],.widget-color-dark>.widget-header>.widget-toolbar>.widget-menu>[data-action=settings]{color:#99CADB}.widget-box>.widget-header>.widget-toolbar>[data-action=reload],.widget-color-dark>.widget-header>.widget-toolbar>[data-action=reload],.widget-box>.widget-header>.widget-toolbar>.widget-menu>[data-action=reload],.widget-color-dark>.widget-header>.widget-toolbar>.widget-menu>[data-action=reload]{color:#ACD392}.widget-box>.widget-header>.widget-toolbar>[data-action=collapse],.widget-color-dark>.widget-header>.widget-toolbar>[data-action=collapse],.widget-box>.widget-header>.widget-toolbar>.widget-menu>[data-action=collapse],.widget-color-dark>.widget-header>.widget-toolbar>.widget-menu>[data-action=collapse]{color:#AAA}.widget-box>.widget-header>.widget-toolbar>[data-action=close],.widget-color-dark>.widget-header>.widget-toolbar>[data-action=close],.widget-box>.widget-header>.widget-toolbar>.widget-menu>[data-action=close],.widget-color-dark>.widget-header>.widget-toolbar>.widget-menu>[data-action=close]{color:#E09E96}.widget-box[class*=widget-color-]>.widget-header{color:#FFF;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.widget-color-blue{border-color:#307ecc}.widget-color-blue>.widget-header{background:#307ecc;border-color:#307ecc}.widget-color-blue2{border-color:#5090c1}.widget-color-blue2>.widget-header{background:#5090c1;border-color:#5090c1}.widget-color-blue3{border-color:#6379aa}.widget-color-blue3>.widget-header{background:#6379aa;border-color:#6379aa}.widget-color-green{border-color:#82af6f}.widget-color-green>.widget-header{background:#82af6f;border-color:#82af6f}.widget-color-green2{border-color:#2e8965}.widget-color-green2>.widget-header{background:#2e8965;border-color:#2e8965}.widget-color-green3{border-color:#4ebc30}.widget-color-green3>.widget-header{background:#4ebc30;border-color:#4ebc30}.widget-color-red{border-color:#e2755f}.widget-color-red>.widget-header{background:#e2755f;border-color:#e2755f}.widget-color-red2{border-color:#e04141}.widget-color-red2>.widget-header{background:#e04141;border-color:#e04141}.widget-color-red3{border-color:#d15b47}.widget-color-red3>.widget-header{background:#d15b47;border-color:#d15b47}.widget-color-purple{border-color:#7e6eb0}.widget-color-purple>.widget-header{background:#7e6eb0;border-color:#7e6eb0}.widget-color-pink{border-color:#ce6f9e}.widget-color-pink>.widget-header{background:#ce6f9e;border-color:#ce6f9e}.widget-color-orange{border-color:#e8b10d}.widget-color-orange>.widget-header{color:#855d10!important;border-color:#e8b10d;background:#ffc657}.widget-color-dark{border-color:#5a5a5a}.widget-color-dark>.widget-header{border-color:#666;background:#404040}.widget-color-grey{border-color:#9e9e9e}.widget-color-grey>.widget-header{border-color:#aaa;background:#848484}.widget-box.transparent{border-width:0}.widget-box.transparent>.widget-header{background:0 0;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);border-width:0;border-bottom:1px solid #DCE8F1;color:#4383B4;padding-left:3px}.widget-box.transparent>.widget-header-large{padding-left:5px}.widget-box.transparent>.widget-header-small{padding-left:1px}.widget-box.transparent>.widget-body{border-width:0;background-color:transparent}[class*=widget-color-]>.widget-header>.widget-toolbar>[data-action],[class*=widget-color-]>.widget-header>.widget-toolbar>.widget-menu>[data-action]{text-shadow:0 1px 1px rgba(0,0,0,.2)}[class*=widget-color-]>.widget-header>.widget-toolbar>[data-action=settings],[class*=widget-color-]>.widget-header>.widget-toolbar>.widget-menu>[data-action=settings]{color:#D3E4ED}[class*=widget-color-]>.widget-header>.widget-toolbar>[data-action=reload],[class*=widget-color-]>.widget-header>.widget-toolbar>.widget-menu>[data-action=reload]{color:#DEEAD3}[class*=widget-color-]>.widget-header>.widget-toolbar>[data-action=collapse],[class*=widget-color-]>.widget-header>.widget-toolbar>.widget-menu>[data-action=collapse]{color:#E2E2E2}[class*=widget-color-]>.widget-header>.widget-toolbar>[data-action=close],[class*=widget-color-]>.widget-header>.widget-toolbar>.widget-menu>[data-action=close]{color:#FFD9D5}.widget-color-orange>.widget-header>.widget-toolbar>[data-action],.widget-color-orange>.widget-header>.widget-toolbar>.widget-menu>[data-action]{text-shadow:none}.widget-color-orange>.widget-header>.widget-toolbar>[data-action=settings],.widget-color-orange>.widget-header>.widget-toolbar>.widget-menu>[data-action=settings]{color:#559AAB}.widget-color-orange>.widget-header>.widget-toolbar>[data-action=reload],.widget-color-orange>.widget-header>.widget-toolbar>.widget-menu>[data-action=reload]{color:#7CA362}.widget-color-orange>.widget-header>.widget-toolbar>[data-action=collapse],.widget-color-orange>.widget-header>.widget-toolbar>.widget-menu>[data-action=collapse]{color:#777}.widget-color-orange>.widget-header>.widget-toolbar>[data-action=close],.widget-color-orange>.widget-header>.widget-toolbar>.widget-menu>[data-action=close]{color:#A05656}.widget-box.light-border[class*=widget-color-]:not(.fullscreen){border-width:0}.widget-box.light-border[class*=widget-color-]:not(.fullscreen)>.widget-header{border:1px solid;border-color:inherit}.widget-box.light-border[class*=widget-color-]:not(.fullscreen)>.widget-body{border:1px solid;border-color:#D6D6D6;border-width:0 1px 1px}.widget-box.no-border{border-width:0}.widget-box.fullscreen{position:fixed;margin:0;top:0;bottom:0;left:0;right:0;background-color:#FFF;border-width:3px;z-index:1040!important}.widget-box.fullscreen:not([class*=widget-color-]){border-color:#AAA}.widget-body .table{border-top:1px solid #E5E5E5}.widget-body .table thead:first-child tr{background:#FFF}[class*=widget-color-]>.widget-body .table thead:first-child tr{background:#f2f2f2;background-image:-webkit-linear-gradient(top,#f8f8f8 0,#ececec 100%);background-image:-o-linear-gradient(top,#f8f8f8 0,#ececec 100%);background-image:linear-gradient(to bottom,#f8f8f8 0,#ececec 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff8f8f8', endColorstr='#ffececec', GradientType=0)}.widget-body .table.table-bordered thead:first-child>tr{border-top-width:0}.widget-main.no-padding .table{margin-bottom:0;border-width:0}.widget-main.no-padding .table-bordered th:first-child,.widget-main.no-padding .table-bordered td:first-child{border-left-width:0}.transparent>.widget-body .widget-main .table-bordered>thead>tr>th:last-child,.widget-main.no-padding .table-bordered>thead>tr>th:last-child,.transparent>.widget-body .widget-main .table-bordered>tbody>tr>td:last-child,.widget-main.no-padding .table-bordered>tbody>tr>td:last-child,.transparent>.widget-body .widget-main .table-bordered>tfoot>tr>td:last-child,.widget-main.no-padding .table-bordered>tfoot>tr>td:last-child{border-right-width:0!important}.transparent>.widget-body .widget-main .table-bordered>tbody>tr:last-child>td,.widget-main.no-padding .table-bordered>tbody>tr:last-child>td{border-bottom-width:0!important}.table-bordered>thead.thin-border-bottom>tr>th,.table-bordered>thead.thin-border-bottom>tr>td{border-bottom-width:1px}.widget-body .alert:last-child{margin-bottom:0}.widget-main .tab-content{border-width:0}.widget-toolbar>.nav-tabs{border-bottom-width:0;margin-bottom:0;top:auto;margin-top:3px!important}.widget-toolbar>.nav-tabs>li{margin-bottom:auto}.widget-toolbar>.nav-tabs>li>a{box-shadow:none;position:relative;top:1px;margin-top:1px}.widget-toolbar>.nav-tabs>li:not(.active)>a{border-color:transparent;background-color:transparent}.widget-toolbar>.nav-tabs>li:not(.active)>a:hover{background-color:transparent}.widget-toolbar>.nav-tabs>li.active>a{background-color:#FFF;border-bottom-color:transparent;box-shadow:none;margin-top:auto}.widget-header-small>.widget-toolbar>.nav-tabs>li>a{line-height:16px;padding-top:6px;padding-bottom:6px}.widget-header-small>.widget-toolbar>.nav-tabs>li.active>a{border-top-width:2px}.widget-header-large>.widget-toolbar>.nav-tabs>li>a{line-height:22px;padding-top:9px;padding-bottom:9px;margin-top:4px}.widget-header-large>.widget-toolbar>.nav-tabs>li.active>a{margin-top:3px}[class*=widget-color-]>.widget-header>.widget-toolbar>.nav-tabs>li>a{border-color:transparent;background-color:transparent;color:#FFF;margin-right:1px}[class*=widget-color-]>.widget-header>.widget-toolbar>.nav-tabs>li>a:hover{background-color:#FFF;color:#555;border-top-color:#FFF}[class*=widget-color-]>.widget-header>.widget-toolbar>.nav-tabs>li.active>a{background-color:#FFF;color:#555;border-top-width:1px;margin-top:0}.widget-toolbar>.nav-tabs .widget-color-orange>.widget-header>li>a{color:#855D10}.transparent>.widget-header>.widget-toolbar>.nav-tabs>li>a{color:#555;background-color:transparent;border-right:1px solid transparent;border-left:1px solid transparent}.transparent>.widget-header>.widget-toolbar>.nav-tabs>li.active>a{border-top-color:#4C8FBD;border-right:1px solid #C5D0DC;border-left:1px solid #C5D0DC;background-color:#FFF;box-shadow:none}.widget-toolbox{background-color:#EEE}.widget-toolbox:first-child{padding:2px;border-bottom:1px solid #CCC}.widget-toolbox:last-child{padding:2px;border-top:1px solid #CCC}.transparent>.widget-body>.widget-toolbox:last-child{border:none;border-top:1px solid #CCC}.widget-toolbox>.btn-toolbar{margin:0!important;padding:0}.widget-toolbox.center{text-align:center}.widget-toolbox.toolbox-vertical{border-bottom-width:0;border-right:1px solid #D9D9D9;display:table-cell;padding:6px 4px;vertical-align:top;width:1px}.widget-toolbox.toolbox-vertical+.widget-main{display:table-cell;vertical-align:top}.widget-toolbox.padding-16{padding:16px}.widget-toolbox.padding-14{padding:14px}.widget-toolbox.padding-12{padding:12px}.widget-toolbox.padding-10{padding:10px}.widget-toolbox.padding-8{padding:8px}.widget-toolbox.padding-6{padding:6px}.widget-toolbox.padding-4{padding:4px}.widget-toolbox.padding-2{padding:2px}.widget-toolbox.padding-0{padding:0}.widget-box-overlay{position:absolute;top:-1px;bottom:-1px;right:-1px;left:-1px;z-index:999;text-align:center;min-height:100%;background-color:rgba(0,0,0,.3)}.widget-box-overlay>.loading-icon{position:relative;top:20%;left:0;right:0;text-align:center}.widget-box.collapsed .widget-box-overlay>.loading-icon{top:10%}.widget-box-overlay>.loading-icon.icon-spin{-moz-animation-duration:1.2s;-webkit-animation-duration:1.2s;-o-animation-duration:1.2s;-ms-animation-duration:1.2s;animation-duration:1.2s}.widget-main>form{margin-bottom:0}.widget-main>form .input-append,.widget-main>form .input-prepend{margin-bottom:0}.widget-main.no-padding>form>fieldset,.widget-main.padding-0>form>fieldset{padding:16px}.widget-main.no-padding>form>fieldset+.form-actions,.widget-main.padding-0>form>fieldset+.form-actions{padding:10px 0 12px}.widget-main.no-padding>form>.form-actions,.widget-main.padding-0>form>.form-actions{margin:0;padding:10px 12px 12px}.widget-placeholder{border:2px dashed #D9D9D9}.tooltip.in{opacity:1;filter:alpha(opacity=100)}.tooltip-inner{background-color:#333;color:#FFF;font-size:12px;text-shadow:1px 1px 0 rgba(42,45,50,.5);border-radius:0;padding:5px 9px}.tooltip.top .tooltip-arrow{border-bottom-width:0;border-top-color:#333;-moz-border-top-colors:#333}.tooltip.right .tooltip-arrow{border-left-width:0;border-right-color:#333;-moz-border-right-colors:#333}.tooltip.left .tooltip-arrow{border-right-width:0;border-left-color:#333;-moz-border-left-colors:#333}.tooltip.bottom .tooltip-arrow{border-top-width:0;border-bottom-color:#333;-moz-border-bottom-colors:#333}.tooltip-error+.tooltip>.tooltip-inner,.tooltip.tooltip-error>.tooltip-inner{background-color:#c94d32;text-shadow:1px 1px 0 rgba(100,60,20,.3)}.tooltip-error+.tooltip.top .tooltip-arrow,.tooltip.tooltip-error.top .tooltip-arrow{border-top-color:#c94d32;-moz-border-top-colors:#c94d32}.tooltip-error+.tooltip.right .tooltip-arrow,.tooltip.tooltip-error.right .tooltip-arrow{border-right-color:#c94d32;-moz-border-right-colors:#c94d32}.tooltip-error+.tooltip.left .tooltip-arrow,.tooltip.tooltip-error.left .tooltip-arrow{border-left-color:#c94d32;-moz-border-left-colors:#c94d32}.tooltip-error+.tooltip.bottom .tooltip-arrow,.tooltip.tooltip-error.bottom .tooltip-arrow{border-bottom-color:#c94d32;-moz-border-bottom-colors:#c94d32}.tooltip-success+.tooltip>.tooltip-inner,.tooltip.tooltip-success>.tooltip-inner{background-color:#629b58;text-shadow:1px 1px 0 rgba(60,100,20,.3)}.tooltip-success+.tooltip.top .tooltip-arrow,.tooltip.tooltip-success.top .tooltip-arrow{border-top-color:#629b58;-moz-border-top-colors:#629b58}.tooltip-success+.tooltip.right .tooltip-arrow,.tooltip.tooltip-success.right .tooltip-arrow{border-right-color:#629b58;-moz-border-right-colors:#629b58}.tooltip-success+.tooltip.left .tooltip-arrow,.tooltip.tooltip-success.left .tooltip-arrow{border-left-color:#629b58;-moz-border-left-colors:#629b58}.tooltip-success+.tooltip.bottom .tooltip-arrow,.tooltip.tooltip-success.bottom .tooltip-arrow{border-bottom-color:#629b58;-moz-border-bottom-colors:#629b58}.tooltip-warning+.tooltip>.tooltip-inner,.tooltip.tooltip-warning>.tooltip-inner{background-color:#ed9421;text-shadow:1px 1px 0 rgba(100,90,10,.3)}.tooltip-warning+.tooltip.top .tooltip-arrow,.tooltip.tooltip-warning.top .tooltip-arrow{border-top-color:#ed9421;-moz-border-top-colors:#ed9421}.tooltip-warning+.tooltip.right .tooltip-arrow,.tooltip.tooltip-warning.right .tooltip-arrow{border-right-color:#ed9421;-moz-border-right-colors:#ed9421}.tooltip-warning+.tooltip.left .tooltip-arrow,.tooltip.tooltip-warning.left .tooltip-arrow{border-left-color:#ed9421;-moz-border-left-colors:#ed9421}.tooltip-warning+.tooltip.bottom .tooltip-arrow,.tooltip.tooltip-warning.bottom .tooltip-arrow{border-bottom-color:#ed9421;-moz-border-bottom-colors:#ed9421}.tooltip-info+.tooltip>.tooltip-inner,.tooltip.tooltip-info>.tooltip-inner{background-color:#4b89aa;text-shadow:1px 1px 0 rgba(40,50,100,.3)}.tooltip-info+.tooltip.top .tooltip-arrow,.tooltip.tooltip-info.top .tooltip-arrow{border-top-color:#4b89aa;-moz-border-top-colors:#4b89aa}.tooltip-info+.tooltip.right .tooltip-arrow,.tooltip.tooltip-info.right .tooltip-arrow{border-right-color:#4b89aa;-moz-border-right-colors:#4b89aa}.tooltip-info+.tooltip.left .tooltip-arrow,.tooltip.tooltip-info.left .tooltip-arrow{border-left-color:#4b89aa;-moz-border-left-colors:#4b89aa}.tooltip-info+.tooltip.bottom .tooltip-arrow,.tooltip.tooltip-info.bottom .tooltip-arrow{border-bottom-color:#4b89aa;-moz-border-bottom-colors:#4b89aa}.popover{border-radius:0;padding:0;border-color:#ccc;border-width:1px;-webkit-box-shadow:0 0 4px 2px rgba(0,0,0,.2);box-shadow:0 0 4px 2px rgba(0,0,0,.2);color:#4D6883}.popover-title{border-radius:0;background-color:#eff3f8;color:#555;border-bottom:1px solid #dde6f0;text-shadow:1px 1px 1px rgba(220,220,220,.2)}.popover.bottom>.arrow:after{top:1px;margin-left:-10px;border-bottom-color:#eff3f8;-moz-border-bottom-colors:#eff3f8;border-top-width:0}.popover.left>.arrow:after{-moz-border-left-colors:#FFF}.popover.right>.arrow:after{-moz-border-right-colors:#FFF}.popover.top>.arrow:after{-moz-border-top-colors:#FFF}.popover-error+.popover,.popover.popover-error{border-color:#f7f0ef}.popover-error+.popover .popover-title,.popover.popover-error .popover-title{background-color:#f7f0ef;border-bottom-color:#efe0de;color:#b75445;text-shadow:none}.popover-error+.popover.top .arrow:after,.popover.popover-error.top .arrow:after{border-top-color:#f7f0ef;-moz-border-top-colors:#f7f0ef}.popover-error+.popover.bottom .arrow:after,.popover.popover-error.bottom .arrow:after{border-bottom-color:#f7f0ef;-moz-border-bottom-colors:#f7f0ef}.popover-error+.popover.right .arrow:after,.popover.popover-error.right .arrow:after{border-right-color:#f7f0ef;-moz-border-right-colors:#f7f0ef}.popover-error+.popover.left .arrow:after,.popover.popover-error.left .arrow:after{border-left-color:#f7f0ef;-moz-border-left-colors:#f7f0ef}.popover-warning+.popover,.popover.popover-warning{border-color:#f4eee3}.popover-warning+.popover .popover-title,.popover.popover-warning .popover-title{background-color:#f4eee3;border-bottom-color:#ede3d1;color:#d67e31;text-shadow:none}.popover-warning+.popover.top .arrow:after,.popover.popover-warning.top .arrow:after{border-top-color:#f4eee3;-moz-border-top-colors:#f4eee3}.popover-warning+.popover.bottom .arrow:after,.popover.popover-warning.bottom .arrow:after{border-bottom-color:#f4eee3;-moz-border-bottom-colors:#f4eee3}.popover-warning+.popover.right .arrow:after,.popover.popover-warning.right .arrow:after{border-right-color:#f4eee3;-moz-border-right-colors:#f4eee3}.popover-warning+.popover.left .arrow:after,.popover.popover-warning.left .arrow:after{border-left-color:#f4eee3;-moz-border-left-colors:#f4eee3}.popover-success+.popover,.popover.popover-success{border-color:#e8f2e3}.popover-success+.popover .popover-title,.popover.popover-success .popover-title{background-color:#e8f2e3;border-bottom-color:#daead2;color:#629b58;text-shadow:none}.popover-success+.popover.top .arrow:after,.popover.popover-success.top .arrow:after{border-top-color:#e8f2e3;-moz-border-top-colors:#e8f2e3}.popover-success+.popover.bottom .arrow:after,.popover.popover-success.bottom .arrow:after{border-bottom-color:#e8f2e3;-moz-border-bottom-colors:#e8f2e3}.popover-success+.popover.right .arrow:after,.popover.popover-success.right .arrow:after{border-right-color:#e8f2e3;-moz-border-right-colors:#e8f2e3}.popover-success+.popover.left .arrow:after,.popover.popover-success.left .arrow:after{border-left-color:#e8f2e3;-moz-border-left-colors:#e8f2e3}.popover-info+.popover,.popover.popover-info{border-color:#e5edf8}.popover-info+.popover .popover-title,.popover.popover-info .popover-title{background-color:#e5edf8;border-bottom-color:#d1dff3;color:#3f79b6;text-shadow:none}.popover-info+.popover.top .arrow:after,.popover.popover-info.top .arrow:after{border-top-color:#e5edf8;-moz-border-top-colors:#e5edf8}.popover-info+.popover.bottom .arrow:after,.popover.popover-info.bottom .arrow:after{border-bottom-color:#e5edf8;-moz-border-bottom-colors:#e5edf8}.popover-info+.popover.right .arrow:after,.popover.popover-info.right .arrow:after{border-right-color:#e5edf8;-moz-border-right-colors:#e5edf8}.popover-info+.popover.left .arrow:after,.popover.popover-info.left .arrow:after{border-left-color:#e5edf8;-moz-border-left-colors:#e5edf8}.popover-notitle+.popover .popover-title,.popover.popover-notitle .popover-title{display:none}.popover-notitle+.popover.top .arrow:after,.popover.popover-notitle.top .arrow:after{border-top-color:#FFF;-moz-border-top-colors:#FFF}.popover-notitle+.popover.bottom .arrow:after,.popover.popover-notitle.bottom .arrow:after{border-bottom-color:#FFF;-moz-border-bottom-colors:#FFF}.popover-notitle+.popover.left .arrow:after,.popover.popover-notitle.left .arrow:after{border-left-color:#FFF;-moz-border-left-colors:#FFF}.popover-notitle+.popover.right .arrow:after,.popover.popover-notitle.right .arrow:after{border-right-color:#FFF;-moz-border-right-colors:#FFF}.progress{border-radius:0;-webkit-box-shadow:none;box-shadow:none;background:#e9e9e9;height:18px}.progress .progress-bar{-webkit-box-shadow:none;box-shadow:none;line-height:18px}.progress[data-percent]:after{display:inline-block;content:attr(data-percent);color:#FFF;position:absolute;left:0;right:0;top:0;bottom:0;line-height:16px;text-align:center;font-size:12px}.progress.progress-yellow[data-percent]:after{color:#963}.progress.progress-small{height:12px}.progress.progress-small .progress-bar{line-height:10px;font-size:11px}.progress.progress-small[data-percent]:after{line-height:10px;font-size:11px}.progress.progress-mini{height:9px}.progress.progress-mini .progress-bar{line-height:8px;font-size:11px}.progress.progress-mini[data-percent]:after{line-height:8px;font-size:11px}.progress-bar{background-color:#2a91d8}.progress-striped .progress-bar{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#ca5952}.progress-striped .progress-bar-danger{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-success{background-color:#59a84b}.progress-striped .progress-bar-success{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f2bb46}.progress-striped .progress-bar-warning{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-pink{background-color:#d6487e}.progress-striped .progress-bar-pink{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-purple{background-color:#9585bf}.progress-striped .progress-bar-purple{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-yellow{background-color:#ffd259}.progress-striped .progress-bar-yellow{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-inverse{background-color:#404040}.progress-striped .progress-bar-inverse{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-grey{background-color:#8a8a8a}.progress-striped .progress-bar-grey{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.infobox-container{text-align:center;font-size:0}.infobox{display:inline-block;width:210px;height:66px;color:#555;background-color:#FFF;box-shadow:none;border-radius:0;margin:-1px 0 0 -1px;padding:8px 3px 6px 9px;border:1px dotted;border-color:#D8D8D8!important;vertical-align:middle;text-align:left;position:relative}.infobox>.infobox-icon{display:inline-block;vertical-align:top;width:44px}.infobox>.infobox-icon>.ace-icon{display:inline-block;height:42px;margin:0;padding:1px 1px 0 2px;background-color:transparent;border-width:0;text-align:center;position:relative;border-radius:100%;-webkit-box-shadow:1px 1px 0 rgba(0,0,0,.2);box-shadow:1px 1px 0 rgba(0,0,0,.2)}.infobox>.infobox-icon>.ace-icon:before{font-size:24px;display:block;padding:6px 0 7px;width:40px;text-align:center;border-radius:100%;color:#FFF;color:rgba(255,255,255,.9);background-color:transparent;background-color:rgba(255,255,255,.2);text-shadow:1px 1px 1px rgba(0,0,0,.14)}.infobox .infobox-content{color:#555;max-width:140px}.infobox .infobox-content:first-child{font-weight:700}.infobox>.infobox-data{display:inline-block;border-width:0;border-top-width:0;font-size:13px;text-align:left;line-height:21px;min-width:130px;padding-left:8px;position:relative;top:0}.infobox>.infobox-data>.infobox-data-number{display:block;font-size:22px;margin:2px 0 4px;position:relative;text-shadow:1px 1px 0 rgba(0,0,0,.15)}.infobox>.infobox-data>.infobox-text{display:block;font-size:16px;margin:2px 0 4px;position:relative;text-shadow:none}.infobox.no-border{border-width:0!important}@media only screen and (max-width:479px){.infobox{min-width:95%;margin-top:2px;margin-bottom:2px}}.infobox-purple{color:#6f3cc4;border-color:#6f3cc4}.infobox-purple>.infobox-icon>.ace-icon{background-color:#6f3cc4}.infobox-purple.infobox-dark{background-color:#6f3cc4;border-color:#6f3cc4}.infobox-purple2{color:#5f47b0;border-color:#5f47b0}.infobox-purple2>.infobox-icon>.ace-icon{background-color:#5f47b0}.infobox-purple2.infobox-dark{background-color:#5f47b0;border-color:#5f47b0}.infobox-pink{color:#cb6fd7;border-color:#cb6fd7}.infobox-pink>.infobox-icon>.ace-icon{background-color:#cb6fd7}.infobox-pink.infobox-dark{background-color:#cb6fd7;border-color:#cb6fd7}.infobox-blue{color:#6fb3e0;border-color:#6fb3e0}.infobox-blue>.infobox-icon>.ace-icon{background-color:#6fb3e0}.infobox-blue.infobox-dark{background-color:#6fb3e0;border-color:#6fb3e0}.infobox-blue2{color:#3983c2;border-color:#3983c2}.infobox-blue2>.infobox-icon>.ace-icon{background-color:#3983c2}.infobox-blue2.infobox-dark{background-color:#3983c2;border-color:#3983c2}.infobox-blue3{color:#1144eb;border-color:#1144eb}.infobox-blue3>.infobox-icon>.ace-icon{background-color:#1144eb}.infobox-blue3.infobox-dark{background-color:#1144eb;border-color:#1144eb}.infobox-red{color:#d53f40;border-color:#d53f40}.infobox-red>.infobox-icon>.ace-icon{background-color:#d53f40}.infobox-red.infobox-dark{background-color:#d53f40;border-color:#d53f40}.infobox-brown{color:#c67a3e;border-color:#c67a3e}.infobox-brown>.infobox-icon>.ace-icon{background-color:#c67a3e}.infobox-brown.infobox-dark{background-color:#c67a3e;border-color:#c67a3e}.infobox-wood{color:#7b3f25;border-color:#7b3f25}.infobox-wood>.infobox-icon>.ace-icon{background-color:#7b3f25}.infobox-wood.infobox-dark{background-color:#7b3f25;border-color:#7b3f25}.infobox-light-brown{color:#cebea5;border-color:#cebea5}.infobox-light-brown>.infobox-icon>.ace-icon{background-color:#cebea5}.infobox-light-brown.infobox-dark{background-color:#cebea5;border-color:#cebea5}.infobox-orange{color:#e8b110;border-color:#e8b110}.infobox-orange>.infobox-icon>.ace-icon{background-color:#e8b110}.infobox-orange.infobox-dark{background-color:#e8b110;border-color:#e8b110}.infobox-orange2{color:#f79263;border-color:#f79263}.infobox-orange2>.infobox-icon>.ace-icon{background-color:#f79263}.infobox-orange2.infobox-dark{background-color:#f79263;border-color:#f79263}.infobox-green{color:#9abc32;border-color:#9abc32}.infobox-green>.infobox-icon>.ace-icon{background-color:#9abc32}.infobox-green.infobox-dark{background-color:#9abc32;border-color:#9abc32}.infobox-green2{color:#0490a6;border-color:#0490a6}.infobox-green2>.infobox-icon>.ace-icon{background-color:#0490a6}.infobox-green2.infobox-dark{background-color:#0490a6;border-color:#0490a6}.infobox-grey{color:#999;border-color:#999}.infobox-grey>.infobox-icon>.ace-icon{background-color:#999}.infobox-grey.infobox-dark{background-color:#999;border-color:#999}.infobox-black{color:#393939;border-color:#393939}.infobox-black>.infobox-icon>.ace-icon{background-color:#393939}.infobox-black.infobox-dark{background-color:#393939;border-color:#393939}.infobox-dark{margin:1px 1px 0 0;border-color:transparent!important;border-width:0;color:#FFF;padding:4px}.infobox-dark>.infobox-icon>.ace-icon,.infobox-dark>.infobox-icon>.ace-icon:before{background-color:transparent;box-shadow:none!important;text-shadow:none;border-radius:0;font-size:30px}.infobox-dark>.infobox-icon>.ace-icon:before{opacity:1;filter:alpha(opacity=100)}.infobox-dark .infobox-content{color:#FFF}.infobox>.infobox-progress{padding-top:0;display:inline-block;vertical-align:top;width:44px}.infobox>.infobox-chart{padding-top:0;display:inline-block;vertical-align:text-bottom;width:44px;text-align:center}.infobox>.infobox-chart>.sparkline{font-size:24px}.infobox>.infobox-chart canvas{vertical-align:middle!important}.infobox>.stat{display:inline-block;position:absolute;right:20px;top:11px;text-shadow:none;color:#ABBAC3;font-size:13px;font-weight:700;padding-right:18px;padding-top:3px}.infobox>.stat:before{display:inline-block;content:"";width:8px;height:11px;background-color:#ABBAC3;position:absolute;right:4px;top:7px}.infobox>.stat:after{display:inline-block;content:"";position:absolute;right:1px;top:-8px;border:12px solid transparent;border-width:8px 7px;border-bottom-color:#ABBAC3}.infobox>.stat.stat-success{color:#77C646}.infobox>.stat.stat-success:before{background-color:#77C646}.infobox>.stat.stat-success:after{border-bottom-color:#77C646}.infobox>.stat.stat-important{color:#E4564F}.infobox>.stat.stat-important:before{background-color:#E4564F;top:3px}.infobox>.stat.stat-important:after{border-top-color:#E4564F;border-bottom-color:transparent;bottom:-6px;top:auto}.infobox.infobox-dark>.stat{color:#FFF}.infobox.infobox-dark>.stat:before{background-color:#E1E5E8}.infobox.infobox-dark>.stat:after{border-bottom-color:#E1E5E8}.infobox.infobox-dark>.stat.stat-success{color:#FFF}.infobox.infobox-dark>.stat.stat-success:before{background-color:#D0E29E}.infobox.infobox-dark>.stat.stat-success:after{border-bottom-color:#D0E29E}.infobox.infobox-dark>.stat.stat-important{color:#FFF}.infobox.infobox-dark>.stat.stat-important:before{background-color:#FF8482;top:3px}.infobox.infobox-dark>.stat.stat-important:after{border-top-color:#FF8482;border-bottom-color:transparent;bottom:-6px;top:auto}.infobox>.badge{position:absolute;right:20px;top:11px;border-radius:0;text-shadow:none;color:#FFF;font-size:11px;font-weight:700;line-height:15px;height:16px;padding:0 1px}.infobox.infobox-dark>.badge{color:#FFF;background-color:rgba(255,255,255,.2)!important;border:1px solid #F1F1F1;top:2px;right:2px}.infobox.infobox-dark>.badge.badge-success>.ace-icon{color:#C6E9A1}.infobox.infobox-dark>.badge.badge-important>.ace-icon{color:#ECB792}.infobox.infobox-dark>.badge.badge-warning>.ace-icon{color:#ECB792}.infobox-small{width:135px;height:52px;text-align:left;padding-bottom:5px}.infobox-small>.infobox-icon,.infobox-small>.infobox-chart,.infobox-small>.infobox-progress{display:inline-block;width:40px;max-width:40px;height:42px;line-height:38px;vertical-align:middle}.infobox-small>.infobox-data{display:inline-block;text-align:left;vertical-align:middle;max-width:72px;min-width:0}.infobox-small>.infobox-chart>.sparkline{font-size:14px;margin-left:2px}.percentage{font-size:14px;font-weight:700;display:inline-block;vertical-align:top}.infobox-small .percentage{font-size:13px;font-weight:400;margin-top:2px;margin-left:2px}.pricing-box:not(:first-child){padding-left:7px}.pricing-box:not(:last-child){padding-right:7px}.pricing-box .price{font-size:22px;line-height:20px;height:28px;text-align:center;color:#555}.pricing-box .price small{font-size:22px}.pricing-box .btn{font-size:16px}.pricing-box .widget-header{text-align:center;padding-left:0}@media only screen and (max-width:480px){.pricing-box{margin:0;margin-bottom:16px;padding-left:0!important;padding-right:0!important;margin-left:-1px}.pricing-box:nth-child(odd){padding-left:12px!important}.pricing-box:nth-child(even){padding-right:12px!important}}@media only screen and (max-width:479px){.pricing-box{margin:0;margin-bottom:16px;width:100%;padding-left:12px!important;padding-right:12px!important}}.pricing-table-header{padding-top:0;margin-top:0;text-align:left}.pricing-table-header>li{padding:7px 0 7px 11px;font-size:13px}.pricing-table{margin-top:0}.pricing-table>li{text-align:center;padding:7px 0;font-size:13px}.list-striped>li:nth-child(odd){background-color:#FFF}.list-striped>li:nth-child(even){background-color:#F2F3EB}.list-striped.pricing-table-header>li:nth-child(even){background-color:#EEE}.pricing-box-small{box-shadow:none;margin-left:-2px;background-color:#FFF;position:relative;z-index:10}.pricing-box-small .price{line-height:20px;height:28px;text-align:center}.pricing-box-small .price .label:before,.pricing-box-small .price .label:after{margin-top:-2px;opacity:.9;filter:alpha(opacity=90)}.pricing-box-small:hover{box-shadow:0 0 4px 2px rgba(0,0,0,.15);z-index:11;-webkit-transform:scale(1.04);-ms-transform:scale(1.04);-o-transform:scale(1.04);transform:scale(1.04)}.pricing-box-small:hover .price>.label{-webkit-transform:scale(0.96);-ms-transform:scale(0.96);-o-transform:scale(0.96);transform:scale(0.96)}.pricing-span{margin:0;width:19%;max-width:150px!important;min-width:110px!important;float:left!important}.pricing-span-header{padding-right:0}@media only screen and (min-width:480px){.pricing-span-body{padding-left:0;padding-right:0}}@media only screen and (max-width:480px){.pricing-span-header,.pricing-span-body{width:100%;padding-right:12px}}.login-container{width:375px;margin:0 auto}.login-layout{background-color:#1D2024}.login-layout .main-container:before{display:none}.login-layout .main-content{margin-left:0!important;margin-right:0!important;min-height:100%;padding-left:15px;padding-right:15px}.login-layout label{margin-bottom:11px}.login-layout .widget-box{visibility:hidden;position:fixed;z-index:-5;border-bottom:none;box-shadow:none;padding:6px;background-color:#394557;-moz-transform:scale(0,1) translate(-150px);-webkit-transform:scale(0,1) translate(-150px);-o-transform:scale(0,1) translate(-150px);-ms-transform:scale(0,1) translate(-150px);transform:scale(0,1) translate(-150px)}.login-layout .widget-box.visible{visibility:visible;position:relative;z-index:auto;-moz-transform:scale(1,1) translate(0);-webkit-transform:scale(1,1) translate(0);-o-transform:scale(1,1) translate(0);-ms-transform:scale(1,1) translate(0);transform:scale(1,1) translate(0);transition:transform .3s ease;-moz-transition:-moz-transform .3s ease;-webkit-transition:-webkit-transform .3s ease;-o-transition:-o-transform .2s ease}.login-layout .widget-box .widget-main{padding:16px 36px 36px;background:#F7F7F7}.login-layout .widget-box .widget-main form{margin:0}.login-layout .widget-box .widget-body .toolbar>div>a{font-size:15px;font-weight:400;text-shadow:1px 0 1px rgba(0,0,0,.25)}.login-box .forgot-password-link{color:#FE9}.login-box .user-signup-link{color:#CF7}.login-box .toolbar{background:#5090C1;border-top:2px solid #597597}.login-box .toolbar>div{width:50%;display:inline-block;padding:9px 0 11px}.login-box .toolbar>div:first-child{float:left;text-align:left}.login-box .toolbar>div:first-child>a{margin-left:11px}.login-box .toolbar>div:first-child+div{float:right;text-align:right}.login-box .toolbar>div:first-child+div>a{margin-right:11px}.forgot-box .toolbar{background:#C16050;border-top:2px solid #976559;padding:9px 18px}.signup-box .toolbar{background:#76B774;border-top:2px solid #759759;padding:9px 18px}.forgot-box .back-to-login-link,.signup-box .back-to-login-link{color:#FE9;font-size:14px;font-weight:700;text-shadow:1px 0 1px rgba(0,0,0,.25)}.login-layout .login-box .widget-main{padding-bottom:16px}.social-or-login{margin-top:4px;text-align:center;position:relative;z-index:1}.social-or-login :first-child{display:inline-block;background:#F7F7F7;padding:0 8px;color:#5090C1;font-size:13px}.social-or-login:before{content:"";display:block;position:absolute;z-index:-1;top:50%;left:0;right:0;border-top:1px dotted #A6C4DB}.social-login a{border-radius:100%;width:42px;height:42px;line-height:46px;padding:0;margin:0 1px;border-width:0}.social-login a>.ace-icon{font-size:24px;margin:0}@media only screen and (max-width:540px){.login-layout .widget-box .widget-main{padding:16px}.login-container{width:98%}.login-layout .widget-box{padding:0}.login-layout .main-content{padding-left:6px;padding-right:6px}.login-box .toolbar>div{width:auto}}.light-login{background:#dfe0e2 url(images/pattern.jpg) repeat}.light-login .widget-box{padding:1px 1px 0;-webkit-box-shadow:0 0 2px 1px rgba(0,0,0,.12);box-shadow:0 0 2px 1px rgba(0,0,0,.12);border-bottom:1px solid rgba(50,50,50,.33)}.light-login .widget-box .toolbar{border-top-width:1px}.light-login .widget-box.login-box{background-color:#BCC6CF;background-color:rgba(100,110,120,.4)}.light-login .widget-box.signup-box{background-color:#C1CEC4;background-color:rgba(110,120,100,.4)}.light-login .widget-box.forgot-box{background-color:#D2C5C5;background-color:rgba(120,110,100,.4)}.blur-login{background:#394557 url(images/meteorshower2.jpg) repeat}.invoice-info{line-height:24px!important;color:#444;vertical-align:bottom;margin-left:9px;margin-right:9px}.invoice-info-label{display:inline-block;max-width:100px;text-align:right;font-size:14px}.invoice-box .label-large[class*=arrowed]{margin-left:11px!important;max-width:95%}.error-container{margin:20px;padding:0;background:#FFF}@media only screen and (max-width:767px){.error-container{margin:12px}}@media only screen and (max-width:479px){.error-container{margin:6px}}.ace-thumbnails{list-style:none;margin:0;padding:0}.ace-thumbnails>li{float:left;display:block;position:relative;overflow:hidden;margin:2px;border:2px solid #333}.ace-thumbnails>li>:first-child{display:block;position:relative}.ace-thumbnails>li>:first-child:focus{outline:0}.ace-thumbnails>li .tags{display:inline-block;position:absolute;bottom:0;right:0;overflow:visible;direction:rtl;padding:0;margin:0;height:auto;width:auto;background-color:transparent;border-width:0;vertical-align:inherit}.ace-thumbnails>li .tags>.label-holder{opacity:.92;filter:alpha(opacity=92);display:table;margin:1px 0 0 0;direction:ltr;text-align:left}.ace-thumbnails>li .tags>.label-holder:hover{opacity:1;filter:alpha(opacity=100)}.ace-thumbnails>li>.tools{position:absolute;top:0;bottom:0;left:-30px;width:24px;background-color:rgba(0,0,0,.55);text-align:center;vertical-align:middle;-webkit-transition:all .2s ease;-o-transition:all .2s ease;transition:all .2s ease}.ace-thumbnails>li>.tools.tools-right{left:auto;right:-30px}.ace-thumbnails>li>.tools.tools-bottom{width:auto;height:28px;left:0;right:0;top:auto;bottom:-30px}.ace-thumbnails>li>.tools.tools-top{width:auto;height:28px;left:0;right:0;top:-30px;bottom:auto}.ace-thumbnails>li:hover>.tools{left:0;right:0}.ace-thumbnails>li:hover>.tools.tools-bottom{top:auto;bottom:0}.ace-thumbnails>li:hover>.tools.tools-top{bottom:auto;top:0}.ace-thumbnails>li:hover>.tools.tools-right{left:auto;right:0}.ace-thumbnails>li>.in.tools{left:0;right:0}.ace-thumbnails>li>.in.tools.tools-bottom{top:auto;bottom:0}.ace-thumbnails>li>.in.tools.tools-top{bottom:auto;top:0}.ace-thumbnails>li>.in.tools.tools-right{left:auto;right:0}.ace-thumbnails>li>.tools>a,.ace-thumbnails>li>:first-child .inner a{display:inline-block;color:#FFF;font-size:18px;font-weight:400;padding:0 4px}.ace-thumbnails>li>.tools>a:hover,.ace-thumbnails>li>:first-child .inner a:hover{text-decoration:none;color:#C9E2EA}.ace-thumbnails>li .tools.tools-bottom>a,.ace-thumbnails>li .tools.tools-top>a{display:inline-block}.ace-thumbnails>li>:first-child>.text{position:absolute;right:0;left:0;bottom:0;top:0;text-align:center;color:#FFF;background-color:rgba(0,0,0,.55);opacity:0;filter:alpha(opacity=0);-webkit-transition:all .2s ease;-o-transition:all .2s ease;transition:all .2s ease}.ace-thumbnails>li>:first-child>.text:before{content:'';display:inline-block;height:100%;vertical-align:middle;margin-right:0}.ace-thumbnails>li>:first-child>.text>.inner{padding:4px 0;margin:0;display:inline-block;vertical-align:middle;max-width:90%}.ace-thumbnails>li:hover>:first-child>.text{opacity:1;filter:alpha(opacity=100)}@media only screen and (max-width:480px){.ace-thumbnails{text-align:center}.ace-thumbnails>li{float:none;display:inline-block}}.dialogs{padding:9px;position:relative}.itemdiv{padding-right:3px;min-height:66px;position:relative}.itemdiv>.user{display:inline-block;width:42px;position:absolute;left:0}.itemdiv>.user>img,.itemdiv>.user>.img{border-radius:100%;border:2px solid #5293C4;max-width:40px;position:relative}.itemdiv>.user>.img{padding:2px}.itemdiv>.body{width:auto;margin-left:50px;margin-right:12px;position:relative}.itemdiv>.body>.time{display:block;font-size:11px;font-weight:700;color:#666;position:absolute;right:9px;top:0}.itemdiv>.body>.time .ace-icon{font-size:14px;font-weight:400}.itemdiv>.body>.name{display:block;color:#999}.itemdiv>.body>.name>b{color:#777}.itemdiv>.body>.text{display:block;position:relative;margin-top:2px;padding-bottom:19px;padding-left:7px;font-size:13px}.itemdiv>.body>.text:after{display:block;content:"";height:1px;font-size:0;overflow:hidden;position:absolute;left:16px;right:-12px;margin-top:9px;border-top:1px solid #E4ECF3}.itemdiv>.body>.text>.ace-icon:first-child{color:#DCE3ED;margin-right:4px}.itemdiv:last-child>.body>.text{border-bottom-width:0}.itemdiv:last-child>.body>.text:after{display:none}.itemdiv.dialogdiv{padding-bottom:14px}.itemdiv.dialogdiv:before{position:absolute;display:block;content:"";top:0;bottom:0;left:19px;width:3px;max-width:3px;background-color:#E1E6ED;border:1px solid #D7DBDD;border-width:0 1px}.itemdiv.dialogdiv:last-child{padding-bottom:0}.itemdiv.dialogdiv:last-child:before{display:none}.itemdiv.dialogdiv>.user>img{border-color:#C9D6E5}.itemdiv.dialogdiv>.body{border:1px solid #DDE4ED;padding:5px 8px 8px;border-left-width:2px;margin-right:1px}.itemdiv.dialogdiv>.body:before{content:"";display:block;position:absolute;left:-7px;top:11px;width:8px;height:8px;border:2px solid #DDE4ED;border-width:2px 0 0 2px;background-color:#FFF;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-transform:rotate(-45deg);-ms-transform:rotate(-45deg);-o-transform:rotate(-45deg);transform:rotate(-45deg)}.itemdiv.dialogdiv>.body>.time{position:static;float:right}.itemdiv.dialogdiv>.body>.text{padding-left:0;padding-bottom:0}.itemdiv.dialogdiv>.body>.text:after{display:none}.itemdiv.dialogdiv .tooltip-inner{word-break:break-all}.itemdiv.memberdiv{width:175px;padding:2px;margin:3px 0;float:left;border-bottom:1px solid #E8E8E8}@media (min-width:992px){.itemdiv.memberdiv{max-width:50%}}@media (max-width:991px){.itemdiv.memberdiv{min-width:33.333%}}.itemdiv.memberdiv>.user>img{border-color:#DCE3ED}.itemdiv.memberdiv>.body>.time{position:static}.itemdiv.memberdiv>.body>.name{line-height:18px;height:18px;margin-bottom:0}.itemdiv.memberdiv>.body>.name>a{display:inline-block;max-width:100px;max-height:18px;overflow:hidden;text-overflow:ellipsis;word-break:break-all}.itemdiv .tools{position:absolute;right:5px;bottom:10px;display:none}.itemdiv .tools .btn{border-radius:36px;margin:1px 0}.itemdiv .body .tools{bottom:4px}.itemdiv.commentdiv .tools{right:9px}.itemdiv:hover .tools{display:inline-block}.item-list{margin:0;padding:0;list-style:none}.item-list>li{padding:9px;background-color:#FFF;margin-top:-1px;position:relative}.item-list>li.selected{color:#8090A0;background-color:#F4F9FC}.item-list>li.selected label,.item-list>li.selected .lbl{text-decoration:line-through;color:#8090A0}.item-list>li>.checkbox{display:inline-block}.item-list>li>label.inline{display:inline-block}.item-list>li label{font-size:13px}.item-list>li .percentage{font-size:11px;font-weight:700;color:#777}.item-list>li.ui-sortable-helper{cursor:move}li[class*=item-]{border:1px solid #DDD;border-left-width:3px}li.item-orange{border-left-color:#e8b110}li.item-orange2{border-left-color:#f79263}li.item-red{border-left-color:#d53f40}li.item-red2{border-left-color:#d15b47}li.item-green{border-left-color:#9abc32}li.item-green2{border-left-color:#0490a6}li.item-blue{border-left-color:#4f99c6}li.item-blue2{border-left-color:#3983c2}li.item-blue3{border-left-color:#1144eb}li.item-pink{border-left-color:#cb6fd7}li.item-purple{border-left-color:#6f3cc4}li.item-black{border-left-color:#505050}li.item-grey{border-left-color:#a0a0a0}li.item-brown{border-left-color:brown}li.item-default{border-left-color:#abbac3}.ui-sortable-placeholder,.ui-sortable-helper,.ui-sortable-placeholder>a,.ui-sortable-helper>a{cursor:move!important}@media only screen and (max-width:480px){.itemdiv.memberdiv{float:none;width:auto}}.profile-user-info{display:table;width:98%;width:calc(100% - 24px);margin:0 auto}.profile-info-row{display:table-row}.profile-info-name{text-align:right;padding:6px 10px 6px 4px;font-weight:400;color:#667E99;background-color:transparent;border-top:1px dotted #D5E4F1;display:table-cell;width:110px;vertical-align:middle}.profile-info-value{display:table-cell;padding:6px 4px 6px 6px;border-top:1px dotted #D5E4F1}.profile-info-value>span+span:before{display:inline;content:",";margin-left:1px;margin-right:3px;color:#666;border-bottom:1px solid #FFF}.profile-info-value>span+span.editable-container:before{display:none}.profile-info-row:first-child .profile-info-name{border-top:none}.profile-info-row:first-child .profile-info-value{border-top:none}.profile-user-info-striped{border:1px solid #DCEBF7}.profile-user-info-striped .profile-info-name{color:#336199;background-color:#EDF3F4;border-top:1px solid #F7FBFF}.profile-user-info-striped .profile-info-value{border-top:1px dotted #DCEBF7;padding-left:12px}.profile-picture{border:1px solid #CCC;background-color:#FFF;padding:4px;display:inline-block;max-width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;box-shadow:1px 1px 1px rgba(0,0,0,.15)}.profile-activity{padding:10px 4px;border-bottom:1px dotted #D0D8E0;position:relative;border-left:1px dotted #FFF;border-right:1px dotted #FFF}.profile-activity:first-child{border-top:1px dotted transparent}.profile-activity:first-child:hover{border-top-color:#D0D8E0}.profile-activity:hover{background-color:#F4F9FD;border-left:1px dotted #D0D8E0;border-right:1px dotted #D0D8E0}.profile-activity img{border:2px solid #C9D6E5;border-radius:100%;max-width:40px;margin-right:10px;margin-left:0;box-shadow:none}.profile-activity .thumbicon{background-color:#74ABD7;display:inline-block;border-radius:100%;width:38px;height:38px;color:#FFF;font-size:18px;text-align:center;line-height:38px;margin-right:10px;margin-left:0;text-shadow:none!important}.profile-activity .time{display:block;margin-top:4px;color:#777}.profile-activity a.user{font-weight:700;color:#9585BF}.profile-activity .tools{position:absolute;right:12px;bottom:8px;display:none}.profile-activity:hover .tools{display:block}.user-profile .ace-thumbnails li{border:1px solid #CCC;padding:3px;margin:6px}.user-profile .ace-thumbnails li .tools{left:3px;right:3px}.user-profile .ace-thumbnails li:hover .tools{bottom:3px}.user-profile .user-title-label:hover{text-decoration:none}.user-profile .user-title-label+.dropdown-menu{margin-left:-12px}.profile-contact-links{padding:4px 2px 5px;border:1px solid #E0E2E5;background-color:#F8FAFC}.btn-link:hover .ace-icon{text-decoration:none!important}.profile-social-links>a{text-decoration:none;margin:0 1px}.profile-social-links>a:hover>.ace-icon{text-decoration:none}.profile-skills .progress{height:26px;margin-bottom:2px;background-color:transparent}.profile-skills .progress .progress-bar{line-height:26px;font-size:13px;font-weight:700;font-family:"Open Sans";padding:0 8px}.profile-users .user{display:block;position:static;text-align:center;width:auto}.profile-users .user img{padding:2px;border-radius:100%;border:1px solid #AAA;max-width:none;width:64px;-webkit-transition:all .1s;-o-transition:all .1s;transition:all .1s}.profile-users .user img:hover{-webkit-box-shadow:0 0 1px 1px rgba(0,0,0,.33);box-shadow:0 0 1px 1px rgba(0,0,0,.33)}.profile-users .memberdiv{background-color:#FFF;width:100px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;border:none;text-align:center;margin:0 8px 24px}.profile-users .memberdiv .name a:hover .ace-icon{text-decoration:none}.profile-users .memberdiv .body{display:inline-block;margin:8px 0 0 0}.profile-users .memberdiv .popover{visibility:hidden;min-width:0;max-height:0;max-width:0;margin-left:0;margin-right:0;top:-5%;left:auto;right:auto;opacity:0;display:none;position:absolute;-webkit-transition:opacity .2s linear 0s,visibility 0s linear .2s,max-height 0s linear .2s,max-width 0s linear .2s,min-width 0s linear .2s;-o-transition:opacity .2s linear 0s,visibility 0s linear .2s,max-height 0s linear .2s,max-width 0s linear .2s,min-width 0s linear .2s;transition:opacity .2s linear 0s,visibility 0s linear .2s,max-height 0s linear .2s,max-width 0s linear .2s,min-width 0s linear .2s}.profile-users .memberdiv .popover.right{left:100%;right:auto;display:block}.profile-users .memberdiv .popover.left{left:auto;right:100%;display:block}.profile-users .memberdiv>:first-child:hover .popover{visibility:visible;opacity:1;z-index:1060;max-height:250px;max-width:250px;min-width:150px;-webkit-transition-delay:0s;-moz-transition-delay:0s;-o-transition-delay:0s;transition-delay:0s}.profile-users .memberdiv .tools{position:static;display:block;width:100%;margin-top:2px}.profile-users .memberdiv .tools>a{margin:0 2px}.profile-users .memberdiv .tools>a:hover{text-decoration:none}.user-status{display:inline-block;width:11px;height:11px;background-color:#FFF;border:3px solid #AAA;border-radius:100%;vertical-align:middle;margin-right:1px}.user-status.status-online{border-color:#8AC16C}.user-status.status-busy{border-color:#E07F69}.user-status.status-idle{border-color:#FFB752}.tab-content.profile-edit-tab-content{border:1px solid #DDD;padding:8px 32px 32px;-webkit-box-shadow:1px 1px 0 0 rgba(0,0,0,.2);box-shadow:1px 1px 0 0 rgba(0,0,0,.2);background-color:#FFF}@media only screen and (max-width:480px){.profile-info-name{width:80px}.profile-user-info-striped .profile-info-name{float:none;width:auto;text-align:left;padding:6px 4px 6px 10px;display:block}.profile-user-info-striped .profile-info-value{margin-left:10px;display:block}}@media only screen and (max-width:480px){.user-profile .memberdiv{width:50%;margin-left:0;margin-right:0}}.inbox-tabs.nav-tabs>li>a{background-color:#FAFAFA}.inbox-tabs.nav-tabs>li.active:not(.open)>a,.inbox-tabs.nav-tabs>li.active:not(.open)>a:hover,.inbox-tabs.nav-tabs>li.active:not(.open)>a:focus{background-color:#F1F5FA;box-shadow:0 -2px 3px 0 rgba(0,0,0,.1);color:#48768E}.inbox-tabs.nav-tabs>li>a.btn-new-mail{background-color:transparent;border:none!important;padding:0!important}.inbox-tabs.nav-tabs>li>a.btn-new-mail>.btn{border-width:0!important;border-radius:3px!important;padding:0 6px!important;position:relative;transition:none!important}.inbox-tabs.nav-tabs>li.active>a.btn-new-mail{box-shadow:none!important}.inbox-tabs.nav-tabs>li.active>a.btn-new-mail>.btn:before{content:"";display:block;position:absolute;top:100%;left:50%;margin-left:-6px;border-width:6px 8px;border-style:solid;border-color:transparent;border-top-color:inherit}.inbox-tabs.nav-tabs.tab-size-bigger>li>a{padding:5px 15px 7px;font-size:14px}.inbox-tabs.nav-tabs.tab-size-bigger>li>a>.ace-icon:first-child{margin-bottom:5px}.inbox-tabs.nav-tabs.tab-size-bigger>li>a.btn-new-mail>.btn{padding:10px!important;border-radius:7px!important}.inbox-tabs.nav-tabs.tab-size-bigger>li.active>a.btn-new-mail{margin-top:0!important;top:1px}.inbox-tabs.nav-tabs.tab-size-bigger>li.active>a.btn-new-mail>.btn:before{left:50%;margin-left:-8px;border-width:8px 10px}@media only screen and (max-width:479px){.inbox-tabs>.li-new-mail{display:block;text-align:right;margin-bottom:8px!important;float:none!important}.inbox-tabs>.li-new-mail>.btn-new-mail{display:inline-block;width:auto}}.message-container{position:relative}.message-list{position:relative}.message-item{border:1px solid #EAEDF1;border-bottom-width:0;padding:12px 12px 14px;line-height:18px;position:relative;background-color:#FFF}.message-item:first-child{border-top-width:0}.message-item:hover{border-color:#E2EAF2;background-color:#F2F6F9}.message-item:hover+.message-item{border-top-color:#E2EAF2}.message-item:hover+.message-item.selected{border-top-color:#FFF}.message-item.selected{background-color:#EFF4F7;border-color:#FFF #E2EAF2}.message-item.selected+.message-item{border-top-color:#FFF}.message-item.selected+.message-item:hover+.message-item{border-top-color:#FFF}.message-navbar input.ace+.lbl::before,.message-item input.ace+.lbl::before{top:auto}.message-item .sender{margin:0 6px 0 4px;vertical-align:middle;color:#467287;display:inline-block;width:110px;height:18px;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;cursor:pointer}.message-item.message-unread .sender{color:#6A9CBA;font-weight:700}.message-item .summary{vertical-align:middle;display:inline-block;position:relative;margin-left:30px;max-width:250px;max-width:calc(100% - 300px);min-width:200px;white-space:nowrap}.message-item .summary .text{color:#555;vertical-align:middle;display:inline-block;width:auto;max-width:100%;height:18px;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;cursor:pointer}.message-item .summary .text:hover{text-decoration:underline}.message-item .summary .message-flags{display:block;position:absolute;right:100%;margin-right:4px;height:18px;white-space:nowrap}.message-item.message-unread .summary .text{color:#609FC4;font-weight:700}.message-item .time{float:right;width:60px;height:18px;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;color:#666}.message-item.message-unread .time{font-weight:700;color:#609FC4}.message-item.message-unread .message-content .time{font-weight:400}.message-item .attachment{color:#999;font-size:18px;vertical-align:middle;float:right;margin:0 12px;position:relative}.message-item.message-unread .attachment{color:#4F99C6}.message-content .time{font-weight:400}.message-star{vertical-align:middle;margin:2px 4px 0 6px;font-size:15px;cursor:pointer}.message-star:hover{color:#feb902!important;text-decoration:none}.mail-tag:empty{display:inline-block;width:8px;height:11px;padding:0;line-height:normal;vertical-align:middle;margin:0 1px 0 0}.badge.mail-tag{border-radius:2px}.dropdown-menu>li>a>.mail-tag{vertical-align:inherit}@media only screen and (max-width:991px){.message-item .summary{min-width:0}.message-item .sender{width:100px}}@media only screen and (max-width:550px){.message-item .summary{margin:8px 0 0 32px;max-width:95%;min-width:0;display:block}.message-item .sender{width:auto;max-width:150px}.message-item .summary .text{max-width:95%}}.btn-message,.btn-message:hover,.btn-message:focus,.btn-message:active,.open .btn-message.dropdown-toggle{background-color:#FFF!important;border:1px solid #94B9CE!important;color:#7CA3BA!important;text-shadow:none!important}.message-content{padding:16px 12px;border:1px solid #E9E9E9;-webkit-box-shadow:0 0 1px 1px rgba(0,0,0,.02);box-shadow:0 0 1px 1px rgba(0,0,0,.02);background-color:rgba(255,255,255,.8);border-top-width:0}.message-item .message-content{margin-top:16px;border-top-width:1px}.message-body{padding:0 9px;color:#6A7177}.message-navbar{line-height:24px;padding:10px 12px;border:1px solid #D6E1EA;border-color:#D6E1EA transparent;background-color:#F1F5FA;text-align:center;position:relative}.message-navbar .dropdown-toggle,.message-content .dropdown-toggle{color:#777}.message-navbar .dropdown-toggle:hover,.message-content .dropdown-toggle:hover,.message-navbar .dropdown-toggle:focus,.message-content .dropdown-toggle:focus{text-decoration:none;color:#2283C5}.message-bar{display:inline-block;min-height:28px}@media only screen and (max-width:480px){.message-bar{display:block;min-height:60px}}.message-footer{background-color:#F1F1F1;padding:12px 16px;border:1px solid #E6E6E6;border-width:1px 0;border-top:1px solid #E4E9EE}.message-footer .pagination{margin:0}.message-footer .pagination>li{margin:0;padding:0}.message-footer .pagination>li>a,.message-footer .pagination>li>span{color:#777;padding:3px 6px;margin-left:1px;margin-right:1px;background-color:transparent;border:1px solid transparent}.message-footer .pagination>li.disabled>span{color:#BBB;cursor:default;background-color:transparent;border-color:transparent}.message-footer .pagination>li>a:hover{border-color:#91bad6;color:#2283C5;text-decoration:none;background-color:#FFF}.message-footer input[type=text]{font-size:12px;width:34px;height:24px;line-height:20px;margin-bottom:0;padding:3px;vertical-align:middle;text-align:center}.message-footer-style2 .pagination>li>a,.message-footer-style2 .pagination>li>span{border:1px solid #B5B5B5;border-radius:100%!important;width:26px;height:26px;line-height:26px;display:inline-block;text-align:center;padding:0}.message-footer-style2 .pagination>li>span,.message-footer-style2 .pagination>li.disabled>span{border-color:#CCC}.message-footer-style2 .pagination>li>a:hover{border-color:#84AFC9;background-color:#F7F7F7}.message-item.message-inline-open{background-color:#F2F6F9;border:1px solid #DDD;border-bottom-color:#CCC}.message-item.message-inline-open:first-child{border-top-color:#EEE}.message-item.message-inline-open:last-child{border-bottom-color:#DDD}.message-item.message-inline-open+.message-item{border-bottom-color:transparent}.message-loading-overlay{position:absolute;z-index:14;top:0;bottom:0;right:0;left:0;background-color:rgba(255,255,255,.5);text-align:center}.message-loading-overlay>.ace-icon{position:absolute;top:15%;left:0;right:0;text-align:center}.message-content .sender{color:#6A9CBA;font-weight:700;width:auto;text-overflow:inherit;vertical-align:middle;margin:0}.message-content .time{width:auto;text-overflow:inherit;white-space:normal;float:none;vertical-align:middle}ul.attachment-list{margin:6px 0 4px 8px}ul.attachment-list>li{margin-bottom:3px}.message-attachment{padding-left:10px;padding-right:10px}.attached-file{color:#777;width:200px;display:inline-block}.attached-file>.ace-icon{display:inline-block;width:16px;margin-right:2px;vertical-align:middle}.attached-file:hover{text-decoration:none;color:#438EB9}.attached-file:hover .attached-name{color:#2283C5}.attached-file .attached-name{display:inline-block;max-width:175px;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;vertical-align:middle}.messagebar-item-left,.messagebar-item-right{position:absolute;bottom:14px;left:12px;text-align:left}.messagebar-item-right{right:12px;left:auto}.message-navbar .nav-search{right:auto;left:5px;top:auto;bottom:11px}.message-navbar .messagebar-item-left~.nav-search{left:60px}.message-form{border:1px solid #ddd;border-top:none;padding-top:22px}@media only screen and (max-width:480px){.message-form{padding-left:16px;padding-right:16px}}.message-form .form-actions{margin-bottom:0}.message-form .wysiwyg-editor{overflow:auto;min-height:150px;max-height:250px;height:auto}.btn-send-message{position:relative;top:6px;vertical-align:middle}.btn-back-message-list{color:#777}.btn-back-message-list:hover{color:#478FCA;text-decoration:none}.message-condensed .message-item{padding-top:8px;padding-bottom:9px}.message-condensed .message-navbar,.message-condensed .message-footer{padding-top:7px;padding-bottom:7px}.message-condensed .messagebar-item-left,.message-condensed .messagebar-item-right{bottom:9px}.message-condensed .message-navbar .nav-search{bottom:7px}@media only screen and (max-width:480px){.message-condensed .message-bar{min-height:42px}}.inbox-folders .btn-block{margin-top:0}@media only screen and (max-width:767px){.inbox-folders.inbox-folders-responsive .btn-block{width:24%}}@media only screen and (max-width:600px){.inbox-folders.inbox-folders-responsive .btn-block{width:48%}}@media only screen and (max-width:320px){.inbox-folders.inbox-folders-responsive .btn-block{width:99%}}.inbox-folders .btn-lighter,.inbox-folders .btn-lighter.active{background-color:#F4F4F4!important;text-shadow:none!important;color:#7C8395!important;border:1px solid #FFF!important;padding:5px 11px}.inbox-folders .btn-lighter.active{background-color:#EDF2F8!important;color:#53617C!important}.inbox-folders .btn-lighter:hover{background-color:#EFEFEF!important;color:#6092C4!important}.inbox-folders .btn>.ace-icon:first-child{display:inline-block;width:14px;text-align:left}.inbox-folders .btn-lighter+.btn-lighter{border-top-width:0!important}.inbox-folders .btn.active:before{display:block;content:"";position:absolute;top:1px;bottom:1px;left:-1px;border-left:3px solid #4F99C6}.inbox-folders .btn.active:after{display:none}.inbox-folders .btn .counter{border-radius:3px;position:absolute;right:8px;top:8px;padding-left:6px;padding-right:6px;opacity:.75;filter:alpha(opacity=75)}.inbox-folders .btn:hover .badge{opacity:1;filter:alpha(opacity=100)}.timeline-container{position:relative;padding-top:4px;margin-bottom:32px}.timeline-container:last-child{margin-bottom:0}.timeline-container:before{content:"";display:block;position:absolute;left:28px;top:0;bottom:0;border:1px solid #E2E3E7;background-color:#E7EAEF;width:4px;border-width:0 1px}.timeline-container:first-child:before{border-top-width:1px}.timeline-container:last-child:before{border-bottom-width:1px}.timeline-item{position:relative;margin-bottom:8px}.timeline-item .widget-box{background-color:#F2F6F9;color:#595C66}.timeline-item .transparent.widget-box{border-left:3px solid #DAE1E5}.timeline-item .transparent .widget-header{background-color:#ECF1F4;border-bottom-width:0}.timeline-item .transparent .widget-header>.widget-title{margin-left:8px}.timeline-item:nth-child(even) .widget-box{background-color:#F3F3F3;color:#616161}.timeline-item:nth-child(even) .widget-box.transparent{border-left-color:#DBDBDB!important}.timeline-item:nth-child(even) .widget-box.transparent .widget-header{background-color:#EEE!important}.timeline-item .widget-box{margin:0;position:relative;max-width:none;margin-left:60px}.timeline-item .widget-main{margin:0;position:relative;max-width:none;border-bottom-width:0}.timeline-item .widget-body{background-color:transparent}.timeline-item .widget-toolbox{padding:4px 8px 0!important;background-color:transparent!important;border-width:0!important;margin:0 0!important}.timeline-info{float:left;width:60px;text-align:center;position:relative}.timeline-info img{border-radius:100%;max-width:42px}.timeline-info .label,.timeline-info .badge{font-size:12px}.timeline-container:not(.timeline-style2) .timeline-indicator{opacity:1;border-radius:100%;display:inline-block;font-size:16px;height:36px;line-height:30px;width:36px;text-align:center;text-shadow:none!important;padding:0;cursor:default;border:3px solid #FFF!important}.timeline-label{display:block;clear:both;margin:0 0 18px;margin-left:34px}.timeline-item img{border:1px solid #AAA;padding:2px;background-color:#FFF}.timeline-style2:before{display:none}.timeline-style2 .timeline-item{padding-bottom:22px;margin-bottom:0}.timeline-style2 .timeline-item:last-child{padding-bottom:0}.timeline-style2 .timeline-item:before{content:"";display:block;position:absolute;left:90px;top:5px;bottom:-5px;border-width:0;background-color:#DDD;width:2px;max-width:2px}.timeline-style2 .timeline-item:last-child:before{display:none}.timeline-style2 .timeline-item:first-child:before{display:block}.timeline-style2 .timeline-item .transparent .widget-header{background-color:transparent!important}.timeline-style2 .timeline-item .transparent.widget-box{background-color:transparent!important;border-left:none!important}.timeline-style2 .timeline-info{width:100px}.timeline-style2 .timeline-indicator{font-size:0;height:12px;line-height:12px;width:12px;border-width:1px!important;background-color:#FFF!important;position:absolute;left:85px;top:3px;opacity:1;border-radius:100%;display:inline-block;padding:0}.timeline-style2 .timeline-date{display:inline-block;width:72px;text-align:right;margin-right:25px;color:#777}.timeline-style2 .timeline-item .widget-box{margin-left:112px}.timeline-style2 .timeline-label{width:75px;text-align:center;margin-left:0;margin-bottom:10px;text-align:right;color:#666;font-size:14px}.timeline-time{text-align:center;position:static}.dataTables_length select{width:70px;height:25px;padding:2px 3px}.dataTables_length label{font-weight:400}.dataTables_filter{text-align:right}.dataTables_filter input[type=text],.dataTables_filter input[type=search]{width:125px;height:18px;line-height:18px;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;padding:4px 6px}.dataTables_filter label{font-weight:400}.dataTables_info{font-size:14px}.dataTables_paginate{text-align:right}.dataTables_paginate .pagination{margin:0 12px}.dataTables_wrapper label{display:inline-block;font-size:13px}.dataTables_wrapper input[type=text],.dataTables_wrapper input[type=search],.dataTables_wrapper select{margin-bottom:0!important;margin:0 4px}.dataTables_wrapper .row{margin:0!important}.dataTables_wrapper .row:first-child{padding-top:12px;padding-bottom:12px;background-color:#EFF3F8}.dataTables_wrapper .row:first-child+.dataTable{border-top:1px solid #ddd;border-bottom:1px solid #ddd}.dataTables_wrapper .row:last-child{border-bottom:1px solid #e0e0e0;padding-top:12px;padding-bottom:12px;background-color:#EFF3F8}.dataTables_wrapper .dataTables_scroll+.row{border-top:1px solid #e0e0e0}.dataTable{margin-bottom:0}.dataTable>thead>tr>th[class*=sort]{cursor:pointer}.dataTable>thead>tr>th[class*=sort]:after{float:right;display:inline;content:"\f0dc";font-family:FontAwesome;font-size:13px;font-weight:400;color:#555}.dataTable>thead>tr>th[class*=sort]:hover{color:#547ea8}.dataTable>thead>tr>th[class*=sorting_]{color:#307ecc}.dataTable>thead>tr>th.sorting_desc,.dataTable>thead>tr>th.sorting_asc{background-image:-webkit-linear-gradient(top,#eff3f8 0,#e3e7ed 100%);background-image:-o-linear-gradient(top,#eff3f8 0,#e3e7ed 100%);background-image:linear-gradient(to bottom,#eff3f8 0,#e3e7ed 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffeff3f8', endColorstr='#ffe3e7ed', GradientType=0)}.dataTable>thead>tr>th.sorting_desc:after{content:"\f0dd";top:-6px;color:#307ecc}.dataTable>thead>tr>th.sorting_asc:after{content:"\f0de";top:4px;color:#307ecc}.dataTable>thead>tr>th.sorting_disabled{cursor:inherit}.dataTable>thead>tr>th.sorting_disabled:after{display:none}.dataTables_scrollHead+.dataTables_scrollBody>.dataTable>thead>tr>th:after{display:none}.dataTables_scrollHeadInner{width:auto!important}.dataTables_scrollHeadInner>.dataTable>thead>tr>th{border-bottom-width:0!important}.dataTables_borderWrap .dataTables_scrollBody,.dataTables_borderWrap .dataTables_scrollHead{border:1px solid #ddd!important;border-width:0 1px!important}.dataTables_borderWrap .dataTables_scrollBody .table-bordered,.dataTables_borderWrap .dataTables_scrollHead .table-bordered{border-left-width:0;border-right-width:0}.dataTables_borderWrap .dataTables_scrollBody .table-bordered>thead>tr>th:first-child,.dataTables_borderWrap .dataTables_scrollHead .table-bordered>thead>tr>th:first-child,.dataTables_borderWrap .dataTables_scrollBody .table-bordered>tbody>tr>td:first-child,.dataTables_borderWrap .dataTables_scrollHead .table-bordered>tbody>tr>td:first-child{border-left-width:0}.dataTables_borderWrap .dataTables_scrollBody .table-bordered>thead>tr>th:last-child,.dataTables_borderWrap .dataTables_scrollHead .table-bordered>thead>tr>th:last-child,.dataTables_borderWrap .dataTables_scrollBody .table-bordered>tbody>tr>td:last-child,.dataTables_borderWrap .dataTables_scrollHead .table-bordered>tbody>tr>td:last-child{border-right-width:0}table.dataTable{clear:both;max-width:none!important}table.dataTable th:active{outline:0}div.dataTables_scrollHead table{margin-bottom:0!important;border-bottom-left-radius:0;border-bottom-right-radius:0}div.dataTables_scrollHead table thead tr:last-child th:first-child,div.dataTables_scrollHead table thead tr:last-child td:first-child{border-bottom-left-radius:0!important;border-bottom-right-radius:0!important}div.dataTables_scrollBody table{border-top:none;margin-top:0!important;margin-bottom:0!important}div.dataTables_scrollBody tbody tr:first-child th,div.dataTables_scrollBody tbody tr:first-child td{border-top:none}div.dataTables_scrollFoot table{margin-top:0!important;border-top:none}.DTTT_Print .main-content{margin-left:0!important;margin-right:0!important}.DTTT_Print .navbar-fixed-top+.main-container{padding-top:0}.tableTools-container{margin-bottom:8px}.tableTools-alert.gritter-item-wrapper{padding:12px 11px 8px;z-index:1999}ul.ColVis_collection{z-index:2002}ul.ColVis_collection>li>a{padding:0}ul.ColVis_collection>li>a:focus{outline:0}ul.ColVis_collection>li.ColVis_Special{border-top:1px solid #DDD}ul.ColVis_collection>li.ColVis_Special>a{padding:6px 11px 7px;text-align:center}ul.ColVis_collection label{margin:auto;padding:6px 11px 7px;display:block;cursor:pointer}div.ColVis_catcher{position:absolute;z-index:1101}div.ColVis_collectionBackground{position:fixed;top:0;left:0;height:100%;width:100%;background-color:#000;z-index:1100}.fc-toolbar h2{font-size:22px;color:#65A0CE}.fc-unthemed th,.fc-unthemed td,.fc-unthemed hr,.fc-unthemed thead,.fc-unthemed tbody,.fc-unthemed .fc-row,.fc-unthemed .fc-popover{border-color:#BCD4E5}.fc-unthemed .fc-today{background:#FFC}.fc-event{border-width:0;color:#fff;padding:1px 1px 2px 2px;border-radius:0}.fc-event:not([class*=label-]){background-color:#abbac3}.fc-event.label-yellow{color:#963}.fc-event.label-light{color:#888}.label-yellow .fc-event{color:#963}.label-light .fc-event{color:#888}[class*=label-]>.fc-event,[class*=label-]>.fc-event>.fc-event-skin.fc-event-head{background-color:inherit}.fc-event.ui-draggable-dragging{cursor:move}.fc-event.fc-event-vert,.fc-event-vert>.fc-event{padding:0 0 1px}.fc-day-number{color:#2E6589;opacity:1;filter:alpha(opacity=100)}.fc-widget-header,.fc .fc-axis{background:#ECF2F7;color:#8090A0}.fc-event-hori,.fc-event-vert{border-radius:0!important;border-color:transparent}.fc-event-vert .fc-event-content{padding-left:1px;padding-right:1px}.fc-event-vert .fc-event-time{padding:0}.fc-state-default{border:none}.fc-state-default,.fc-state-default .fc-button-inner{border:none;background-color:#abbac3;color:#FFF;background-image:none;box-shadow:none;text-shadow:none;border-radius:0!important;margin-left:2px}.fc-state-default .fc-button-effect{display:none}.fc-state-disabled,.fc-state-disabled .fc-button-inner{opacity:.75;filter:alpha(opacity=75);color:#DDD}.fc-state-active,.fc-state-active .fc-button-inner{border-color:#4F99C6;background-color:#6FB3E0}.fc-state-hover,.fc-state-hover .fc-button-inner{background-color:#8B9AA3}.fc .fc-button-group>*{margin:0 1px 0 0}.external-event{margin:6px 0;padding:0;cursor:default;display:block;font-size:13px;line-height:28px;color:#fff}.external-event:not([class*=label-]){background-color:#abbac3}.external-event:hover{opacity:1;filter:alpha(opacity=100)}.external-event.ui-draggable-dragging{cursor:move}.external-event.label-yellow{color:#963}.external-event.label-light{color:#888}.external-event>.ace-icon:first-child{display:inline-block;height:32px;width:32px;text-align:center;line-height:30px;margin-right:5px;font-size:15px;border-right:1px solid #FFF}@media only screen and (max-width:480px){.fc-header td{display:block;width:auto;text-align:left}}.chosen-container+.help-inline{vertical-align:middle}.chosen-container,[class*=chosen-container]{vertical-align:middle}.chosen-container>.chosen-single,[class*=chosen-container]>.chosen-single{line-height:28px;height:32px;box-shadow:none;background:#FAFAFA}.chosen-choices{box-shadow:none!important}.chosen-container-single .chosen-single abbr{background:0 0}.chosen-container-single .chosen-single abbr:after{content:"\f00d";display:inline-block;color:#888;font-family:FontAwesome;font-size:13px;position:absolute;right:0;top:-7px}.chosen-container-single .chosen-single abbr:hover:after{color:#464646}.chosen-container-single.chosen-disabled .chosen-single abbr:hover:after{color:#464646}.chosen-single div b{background:none!important}.chosen-single div b:before{content:"\f0d7";display:inline-block;color:#888;font-family:FontAwesome;font-size:12px;position:relative;top:-1px;left:1px}.chosen-container-active.chosen-with-drop .chosen-single div b:before{content:"\f0d8"}.chosen-container-single .chosen-search{position:relative}.chosen-container-single .chosen-search input[type=text]{background:0 0;border-radius:0;line-height:28px;height:28px}.chosen-container-single .chosen-search:after{content:"\f002";display:inline-block;color:#888;font-family:FontAwesome;font-size:14px;position:absolute;top:8px;right:12px}.chosen-container-multi .chosen-choices li.search-field input[type=text]{height:25px}.chosen-container-multi .chosen-choices li.search-choice{line-height:16px;padding-bottom:4px}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close{background:0 0}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:before{content:"\f00d";display:inline-block;color:#888;font-family:FontAwesome;font-size:13px;position:absolute;right:2px;top:-1px}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:hover{text-decoration:none}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:hover:before{color:#464646}.chosen-container-multi .chosen-choices li.search-choice-focus .search-choice-close:before{color:#464646}.chosen-container .chosen-results-scroll-down span,.chosen-container .chosen-results-scroll-up span{background:0 0}.chosen-container .chosen-results-scroll-down span:before,.chosen-container .chosen-results-scroll-up span:before{content:"\f0d7";display:inline-block;color:#888;font-family:FontAwesome;font-size:12px;position:relative;top:-1px;left:1px}.chosen-container .chosen-results-scroll-up span:before{content:"\f0d8"}.chosen-container-active .chosen-single-with-drop div b:before{content:"\f0d8"}.chosen-rtl .chosen-search input[type=text]{background:0 0}.chosen-rtl .chosen-search:after{content:"";display:none}.chosen-rtl .chosen-search:before{content:"\f002";display:inline-block;color:#888;font-family:FontAwesome;font-size:14px;position:absolute;top:9px;left:12px}.chosen-container-single .chosen-single{border-radius:0}.chosen-container .chosen-results li.highlighted{background:#316AC5;color:#FFF}.chosen-container-single .chosen-drop{border-radius:0;border-bottom:3px solid #4492C9;border-color:#4492C9}.chosen-single.chosen-single-with-drop,.chosen-container-active .chosen-single{border-color:#4492C9}.form-group.has-error .chosen-single{border-color:#f2a696!important}.form-group.has-info .chosen-single{border-color:#72aec2!important}.form-group.has-warning .chosen-single{border-color:#e3c94c!important}.form-group.has-success .chosen-single{border-color:#9cc573!important}.chosen-container-active.chosen-with-drop .chosen-single{border-color:#4492C9}.chosen-container .chosen-drop{display:none}.chosen-container.chosen-with-drop .chosen-drop{left:auto;right:auto;display:block}@media only screen and (-webkit-min-device-pixel-ratio:2),only screen and (min-resolution:144dpi){.chosen-rtl .chosen-search input[type=text],.chosen-container-single .chosen-single abbr,.chosen-container-single .chosen-single div b,.chosen-container-single .chosen-search input[type=text],.chosen-container-multi .chosen-choices li.search-choice .search-choice-close,.chosen-container .chosen-results-scroll-down span,.chosen-container .chosen-results-scroll-up span{background-image:none!important;background-repeat:no-repeat!important;background-size:auto!important}}.tag-input-style+.chosen-container-multi .chosen-choices li.search-choice{background-image:none;background-color:#91b8d0;color:#FFF;display:inline-block;font-size:13px;font-weight:400;margin-bottom:3px;margin-right:3px;padding:6px 22px 7px 9px;position:relative;text-shadow:1px 1px 1px rgba(0,0,0,.15);transition:all .2s ease 0s;vertical-align:baseline;white-space:nowrap;border:none;-webkit-box-shadow:none;box-shadow:none;border-radius:0}.tag-input-style+.chosen-container-multi .chosen-choices li.search-choice .search-choice-close{position:absolute;top:0;bottom:0;right:0;width:18px;height:auto;line-height:25px;text-align:center}.tag-input-style+.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:before{color:#FFF;position:static;font-size:11px}.tag-input-style+.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:hover{background-color:rgba(0,0,0,.2)}.tag-input-style+.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:hover:before{color:#FFF}.tag-input-style+.chosen-container-multi.chosen-rtl .chosen-choices li.search-choice{padding:6px 9px 7px 22px;margin-left:0;margin-right:3px!important}.tag-input-style+.chosen-container-multi.chosen-rtl .chosen-choices li.search-choice .search-choice-close{right:auto;left:0}.select2-container .select2-choice{border-radius:0;height:32px;line-height:28px}.select2-container.select2-drop-above .select2-choice{border-radius:0}.select2-container[class*=input-]{max-width:none}.select2-container.input-mini{min-width:100px}.select2-container .select2-choice abbr,.select2-search-choice-close{background:0 0}.select2-container .select2-choice abbr:before,.select2-search-choice-close:before{font-family:FontAwesome;font-size:12px;display:inline;content:"\f00d";color:#888;position:relative;top:-1px}.select2-container .select2-choice abbr:hover:before,.select2-search-choice-close:hover:before{color:#555}.select2-container .select2-choice abbr:before{top:-7px}.select2-search-choice-close:hover{text-decoration:none!important}.select2-drop{border-radius:0;border:1px solid #4492C9;border-width:0 1px 3px}.select2-drop.select2-drop-above{border-radius:0}.select2-container .select2-choice{background:#FAFAFA none}.select2-container-active .select2-choice,.select2-container-active .select2-choices,.select2-dropdown-open.select2-drop-above .select2-choice,.select2-dropdown-open.select2-drop-above .select2-choices,.select2-container-multi.select2-container-active .select2-choices{border-color:#4492C9}.select2-results .select2-highlighted{background:#316AC5}.select2-container .select2-choice .select2-arrow{border-radius:0;background:transparent none;border:none}.select2-container .select2-choice .select2-arrow b{background:0 0}.select2-container .select2-choice .select2-arrow b:before{font-family:FontAwesome;font-size:12px;display:inline;content:"\f0d7";color:#888;position:relative;left:5px}.select2-dropdown-open .select2-choice .select2-arrow b:before{content:"\f0d8"}.select2-search .select2-input{background:#fff none;margin-top:4px}.select2-search:after{font-family:FontAwesome;font-size:14px;display:inline;content:"\f002";color:#777;position:relative;top:0;left:-20px;z-index:0}.select2-dropdown-open.select2-drop-above .select2-choice,.select2-dropdown-open.select2-drop-above .select2-choices{background-image:none;background-color:#F6F6F6}.select2-container-multi .select2-choices .select2-search-field input{border:none!important;-webkit-box-shadow:none!important;box-shadow:none!important;background:none!important;font-size:14px}.select2-container-multi .select2-choices .select2-search-choice{line-height:16px;padding-bottom:4px}.select2-container-active .select2-choice,.select2-container-active .select2-choices,.select2-container-multi.select2-container-active .select2-choices,.select2-dropdown-open.select2-drop-above .select2-choice,.select2-dropdown-open.select2-drop-above .select2-choices{-webkit-box-shadow:none;box-shadow:none}.select2-search input.select2-active{background-color:#FFF;position:relative;z-index:1}@media only screen and (-webkit-min-device-pixel-ratio:1.5),only screen and (min-resolution:144dpi){.select2-search input,.select2-search-choice-close,.select2-container .select2-choice abbr,.select2-container .select2-choice div b{background-image:none!important;background-size:auto!important}.select2-search input{background-position:auto!important}}.select2-container-active.select2-dropdown-open .select2-choice{background-image:-webkit-linear-gradient(top,#eee 0,#fff 100%);background-image:-o-linear-gradient(top,#eee 0,#fff 100%);background-image:linear-gradient(to bottom,#eee 0,#fff 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffeeeeee', endColorstr='#ffffffff', GradientType=0)}.select2-container-active.select2-drop-above .select2-choice{background-image:-webkit-linear-gradient(top,#fff 0,#eee 100%);background-image:-o-linear-gradient(top,#fff 0,#eee 100%);background-image:linear-gradient(to bottom,#fff 0,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0)}.form-group.has-error .select2-choice,.form-group.has-error .select2-choices{border-color:#f2a696!important}.form-group.has-info .select2-choice,.form-group.has-info .select2-choices{border-color:#72aec2!important}.form-group.has-warning .select2-choice,.form-group.has-warning .select2-choices{border-color:#e3c94c!important}.form-group.has-success .select2-choice,.form-group.has-success .select2-choices{border-color:#9cc573!important}@media only screen and (-webkit-min-device-pixel-ratio:1.5),only screen and (min-resolution:144dpi){.select2-search input,.select2-search-choice-close,.select2-container .select2-choice abbr,.select2-container .select2-choice .select2-arrow b{background-image:none!important;background-repeat:no-repeat!important;background-size:auto!important}.select2-search input{background-position:auto!important}}.select2-container-multi.tag-input-style .select2-choices .select2-search-choice{background-image:none;background-color:#91b8d0;color:#FFF;display:inline-block;font-size:13px;font-weight:400;margin-bottom:3px;margin-right:0;padding:6px 22px 7px 9px;position:relative;text-shadow:1px 1px 1px rgba(0,0,0,.15);transition:all .2s ease 0s;vertical-align:baseline;white-space:nowrap;border:none;-webkit-box-shadow:none;box-shadow:none;border-radius:0}.select2-container-multi.tag-input-style .select2-choices .select2-search-choice .select2-search-choice-close{position:absolute;top:0;bottom:0;right:0;left:auto;width:18px;height:auto;line-height:25px;text-align:center}.select2-container-multi.tag-input-style .select2-choices .select2-search-choice .select2-search-choice-close:before{color:#FFF;position:static;font-size:11px}.select2-container-multi.tag-input-style .select2-choices .select2-search-choice .select2-search-choice-close:hover{background-color:rgba(0,0,0,.2)}.select2-container-multi.tag-input-style .select2-choices .select2-search-choice .select2-search-choice-close:hover:before{color:#FFF}#colorbox:focus,#colorbox:active{outline:0}#cboxTopLeft,#cboxTopCenter,#cboxTopRight,#cboxMiddleLeft,#cboxMiddleRight,#cboxBottomLeft,#cboxBottomCenter,#cboxBottomRight{background:none!important;opacity:0}#cboxContent{border:12px solid #000;background-color:#FFF;padding:7px}#cboxOverlay{background:rgba(0,0,0,.95);background:#000}#cboxCurrent{left:64px;margin-bottom:4px;font-size:14px}#cboxTitle{margin-bottom:4px;font-size:14px;color:#777}#cboxNext,#cboxPrevious,#cboxClose{background:0 0;text-indent:0;width:26px;height:26px;line-height:22px;padding:0 4px;text-align:center;border:2px solid #999;border-radius:16px;color:#666;font-size:12px;margin-left:5px;margin-bottom:5px}#cboxNext:hover,#cboxPrevious:hover{color:#333;border-color:#666}#cboxContent{overflow:visible}#cboxClose{background-color:#000;border:2px solid #FFF;border-radius:32px;color:#FFF;font-size:21px;height:28px;width:28px;padding-bottom:2px;margin-left:0;right:-14px;top:-14px}#cboxLoadingOverlay{background:none!important}#cboxLoadingGraphic{background:#FFF none!important;text-align:center}#cboxLoadingGraphic>.ace-icon{display:inline-block;background-color:#FFF;border-radius:8px;width:32px;height:32px;position:relative;top:48%;text-align:center;vertical-align:middle;font-size:24px;color:#FE7E3E}.ace-spinner{display:inline-block}.ace-spinner .spinbox-buttons.btn-group-vertical{min-width:18px}.ace-spinner .spinbox-buttons.btn-group-vertical>.btn{font-size:10px;padding:0;width:22px;height:16px;line-height:8px;margin-left:0}.ace-spinner .spinbox-buttons.btn-group-vertical>.btn:first-child{margin-top:0}.ace-spinner .spinbox-buttons.btn-group-vertical>.btn>.ace-icon{margin:0;padding:0}.ace-spinner .spinbox-buttons.btn-group-vertical>.btn+.btn{margin-top:2px}.ace-spinner .spinbox-buttons.btn-group-vertical>.btn-xs{height:14px;line-height:7px}.ace-spinner .spinbox-buttons.btn-group-vertical>.btn-lg{height:22px;line-height:10px;width:22px}.ace-spinner .spinbox-buttons>button.btn.spinbox-up:active{top:-1px}.ace-spinner:not(.touch-spinner) .spinbox-buttons>.btn>.ace-icon{margin-top:-1px}.ace-spinner.touch-spinner .spinbox-buttons{margin:0;font-size:0}.ace-spinner.touch-spinner .spinbox-buttons .btn-sm{width:32px}.ace-spinner.touch-spinner .spinbox-buttons .btn-xs{width:24px}.ace-spinner.touch-spinner .spinbox-buttons .btn-lg{width:40px}.ace-spinner.touch-spinner .spinbox-buttons>.btn{margin:0 1px!important}.ace-spinner.touch-spinner .spinbox-buttons>.btn-xs{padding-top:3px;padding-bottom:3px}.ace-spinner.touch-spinner .spinbox-buttons>.btn>.ace-icon{vertical-align:middle;display:inline-block}.steps{list-style:none;display:table;width:100%;padding:0;margin:0;position:relative}.steps li{display:table-cell;text-align:center;width:1%}.steps li .step{border:5px solid #ced1d6;color:#546474;font-size:15px;border-radius:100%;background-color:#FFF;position:relative;z-index:2;display:inline-block;width:40px;height:40px;line-height:30px;text-align:center}.steps li:before{display:block;content:"";width:100%;height:1px;font-size:0;overflow:hidden;border-top:4px solid #CED1D6;position:relative;top:21px;z-index:1}.steps li.last-child:before{max-width:50%;width:50%}.steps li:last-child:before{max-width:50%;width:50%}.steps li:first-child:before{max-width:51%;left:50%}.steps li.active:before,.steps li.complete:before,.steps li.active .step,.steps li.complete .step{border-color:#5293c4}.steps li.complete .step{cursor:default;color:#FFF;-webkit-transition:transform ease .1s;-o-transition:transform ease .1s;transition:transform ease .1s}.steps li.complete .step:before{display:block;position:absolute;top:0;left:0;bottom:0;right:0;line-height:30px;text-align:center;border-radius:100%;content:"\f00c";background-color:#FFF;z-index:3;font-family:FontAwesome;font-size:17px;color:#87ba21}.steps li.complete:hover .step{-moz-transform:scale(1.1);-webkit-transform:scale(1.1);-o-transform:scale(1.1);-ms-transform:scale(1.1);transform:scale(1.1);border-color:#80afd4}.steps li.complete:hover:before{border-color:#80afd4}.steps li .title{display:block;margin-top:4px;max-width:100%;color:#949ea7;font-size:14px;z-index:104;text-align:center;table-layout:fixed;word-wrap:break-word}.steps li.complete .title,.steps li.active .title{color:#2b3d53}.step-content{position:relative}.step-content .step-pane{display:none;min-height:200px;padding:4px 8px 12px}.step-content .step-pane.active{display:block}.wizard-actions{text-align:right}@media only screen and (max-width:767px){.steps li .step{width:30px;height:30px;line-height:24px;border-width:3px}.steps li:before,.steps li:after{border-width:3px}.steps li.complete .step:before{line-height:24px;font-size:13px}.steps li:before{top:16px}.step-content .step-pane{padding:4px 4px 6px;min-height:150px}}.tree{margin:auto;padding:0 0 0 9px;overflow-x:hidden;overflow-y:auto;position:relative}.tree:before{display:inline-block;content:"";position:absolute;top:-20px;bottom:16px;left:0;z-index:1;border:1px dotted #67b2dd;border-width:0 0 0 1px}.tree .tree-branch-name,.tree .tree-item-name{cursor:pointer}.tree .tree-branch{width:auto;min-height:20px;cursor:pointer}.tree .tree-branch .tree-branch-header{position:relative;height:20px;line-height:20px}.tree .tree-branch .tree-branch-header:hover{background-color:#F0F7FC}.tree .tree-branch .tree-branch-header .tree-branch-name,.tree .tree-item .tree-item-name{display:inline;z-index:2}.tree .tree-branch .tree-branch-header>.tree-branch-name>.ace-icon:first-child,.tree .tree-item>.tree-item-name>.ace-icon:first-child{display:inline-block;position:relative;z-index:2;top:-1px}.tree .tree-branch>.tree-branch-header>.tree-branch-name>.tree-label{margin-left:2px}.tree .tree-branch>.tree-branch-header>.tree-branch-name>.ace-icon:first-child{margin:-2px 0 0 -2px}.tree .tree-branch:last-child:after{display:inline-block;content:"";position:absolute;z-index:1;top:15px;bottom:0;left:-15px;border-left:1px solid #FFF}.tree .tree-branch .tree-branch-children{margin:0 0 0 23px;padding:0;position:relative}.tree .tree-branch .tree-branch-children:before{display:inline-block;content:"";position:absolute;z-index:1;top:-14px;bottom:16px;left:-14px;border:1px dotted #67b2dd;border-width:0 0 0 1px}.tree .tree-item{position:relative;height:20px;line-height:20px;cursor:pointer}.tree .tree-item:hover{background-color:#F0F7FC}.tree .tree-item>.tree-item-name>.ace-icon:first-child{margin-right:3px}.tree .tree-item>.tree-item-name>.tree-label>.ace-icon:first-child{margin-left:3px;margin-right:3px}.tree .tree-item>.ace-icon:first-child{margin-top:-1px}.tree .tree-branch,.tree .tree-item{position:relative;list-style:none}.tree .tree-branch:before,.tree .tree-item:before{display:inline-block;content:"";position:absolute;top:14px;left:-13px;width:18px;height:0;border-top:1px dotted #67b2dd;z-index:1}.tree .tree-selected{background-color:rgba(98,168,209,.1);color:#6398B0}.tree .tree-selected:hover{background-color:rgba(98,168,209,.1)}.tree .tree-item,.tree .tree-branch{border:1px solid #FFF}.tree .tree-branch .tree-branch-header{border-radius:0}.tree .tree-item,.tree .tree-branch .tree-branch-header{margin:0;padding:5px;color:#4D6878;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.tree .tree-item>.tree-item-name>.ace-icon:first-child{color:#F9E8CE;width:13px;height:13px;line-height:13px;font-size:11px;text-align:center;border-radius:3px;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;background-color:#FAFAFA;border:1px solid #CCC;box-shadow:0 1px 2px rgba(0,0,0,.05)}.tree .tree-selected>.tree-item-name>.ace-icon:first-child{background-color:#F9A021;border-color:#F9A021;color:#FFF}.tree .tree-plus.ace-icon:first-child,.tree .tree-minus.ace-icon:first-child{display:inline-block;font-style:normal;border:1px solid #DDD;vertical-align:middle;height:11px;width:11px;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;text-align:center;border:1px solid #8BAEBF;line-height:10px;background-color:#FFF;position:relative;z-index:2}.tree .tree-plus.ace-icon:first-child:before,.tree .tree-minus.ace-icon:first-child:before{content:"";display:block;width:7px;height:0;border-top:1px solid #4D6878;position:absolute;top:5px;left:2px}.tree .tree-plus.ace-icon:first-child:after{content:"";display:block;height:7px;width:0;border-left:1px solid #4D6878;position:absolute;top:2px;left:5px}.tree .tree-unselectable .tree-item>.tree-item-name>.tree-label>.ace-icon:first-child{color:#5084A0;width:13px;height:13px;line-height:13px;font-size:10px;text-align:center;border-radius:0;background-color:transparent;border:none;box-shadow:none}.tree .ace-icon[class*="-down"]{transform:rotate(-45deg)}.tree .ace-icon[class*="-download"]{transform:none}.tree .fa-spin{height:auto}.tree .tree-loading{margin-left:36px}.tree img{display:inline;veritcal-align:middle}.gritter-item-wrapper{background-image:none!important;box-shadow:0 2px 10px rgba(50,50,50,.5);background:rgba(50,50,50,.92)}.gritter-item-wrapper.gritter-info{background:rgba(49,81,133,.92)}.gritter-item-wrapper.gritter-error{background:rgba(153,40,18,.92)}.gritter-item-wrapper.gritter-success{background:rgba(89,131,75,.92)}.gritter-item-wrapper.gritter-warning{background:rgba(190,112,31,.92)}.gritter-item-wrapper.gritter-light{background:rgba(245,245,245,.95);border:1px solid #BBB}.gritter-item-wrapper.gritter-light.gritter-info{background:rgba(232,242,255,.95)}.gritter-item-wrapper.gritter-light.gritter-info .gritter-item{color:#4A577D}.gritter-item-wrapper.gritter-light.gritter-error{background:rgba(255,235,235,.95)}.gritter-item-wrapper.gritter-light.gritter-error .gritter-item{color:#894A38}.gritter-item-wrapper.gritter-light.gritter-success{background:rgba(239,250,227,.95)}.gritter-item-wrapper.gritter-light.gritter-success .gritter-item{color:#416131}.gritter-item-wrapper.gritter-light.gritter-warning{background:rgba(252,248,227,.95)}.gritter-item-wrapper.gritter-light.gritter-warning .gritter-item{color:#946446}.gritter-item p{line-height:1.8}.gritter-top,.gritter-bottom,.gritter-item{background-image:none}.gritter-close{left:auto;right:3px;background-image:none;width:18px;height:18px;line-height:17px;text-align:center;border:2px solid transparent;border-radius:16px;color:#E17B67}.gritter-close:before{font-family:FontAwesome;font-size:16px;content:"\f00d"}.gritter-info .gritter-close{color:orange}.gritter-error .gritter-close,.gritter-success .gritter-close,.gritter-warning .gritter-close{color:#FFEA07}.gritter-close:hover{color:#FFF!important}.gritter-title{text-shadow:none}.gritter-light .gritter-item,.gritter-light .gritter-bottom,.gritter-light .gritter-top,.gritter-light .gritter-close{background-image:none;color:#444}.gritter-light .gritter-title{text-shadow:none}.gritter-light .gritter-close:hover{color:#8A3104!important}.gritter-center{position:fixed;left:33%;right:33%;top:33%}@media only screen and (max-width:767px){.gritter-center{left:16%;right:16%;top:30%}}@media only screen and (max-width:480px){.gritter-center{left:30px;right:30px}}@media only screen and (max-width:320px){.gritter-center{left:10px;right:10px}}.wysiwyg-editor{max-height:250px;height:250px;background-color:#F7F8FA;border-collapse:separate;border:1px solid #BBC0CA;padding:4px;box-sizing:content-box;overflow-y:scroll;overflow-x:hidden;outline:0}.wysiwyg-editor:focus{background-color:#FFF}.wysiwyg-toolbar{line-height:33px;margin:0!important;position:relative}.wysiwyg-toolbar .dropdown-menu{text-align:left}.wysiwyg-toolbar .btn-group{float:none!important;font-size:0}.wysiwyg-toolbar .btn-group>.btn{float:none;padding-left:0;padding-right:0;text-align:center;margin-left:1px}.wysiwyg-toolbar .btn-group>.btn>.ace-icon:first-child{font-size:14px;width:25px;max-width:25px;display:inline-block;border-width:1px!important}.wysiwyg-toolbar .btn-group>.btn.dropdown-toggle>.ace-icon:last-child{margin-right:4px}.wysiwyg-style1 .btn-group>.btn,.wysiwyg-style2 .btn-group>.btn,.wysiwyg-style1 .btn-group>.inline>.btn,.wysiwyg-style2 .btn-group>.inline>.btn{margin:0!important;background:#FFF!important;border-width:0!important;color:#ADB3BE!important;text-shadow:none!important}.wysiwyg-style1 .btn-group>.btn.active,.wysiwyg-style2 .btn-group>.btn.active,.wysiwyg-style1 .btn-group>.inline>.btn.active,.wysiwyg-style2 .btn-group>.inline>.btn.active{color:#5B80CE!important}.wysiwyg-style1 .btn-group>.btn.active:after,.wysiwyg-style2 .btn-group>.btn.active:after,.wysiwyg-style1 .btn-group>.inline>.btn.active:after,.wysiwyg-style2 .btn-group>.inline>.btn.active:after{display:none}.wysiwyg-style1 .btn-group,.wysiwyg-style2 .btn-group{position:relative}.wysiwyg-style1 .btn-group:after,.wysiwyg-style2 .btn-group:after{display:block;content:"";position:absolute;left:-2px;top:6px;bottom:6px;width:0;max-width:0;border-left:1px solid #E1E6EA}.wysiwyg-style1 .btn-group:first-child:after,.wysiwyg-style2 .btn-group:first-child:after{display:none}.wysiwyg-style2{background-color:#E5E5E5}.wysiwyg-style2+.wysiwyg-editor{border-color:#DDD;background-color:#FFF;border-top:none}.wysiwyg-style2 .btn-group>.btn,.wysiwyg-style2 .btn-group>.inline>.btn{margin:0 1px 0 0!important;background:#FFF!important;border:none!important;color:#8D939E!important;text-shadow:none!important}.wysiwyg-style2 .btn-group>.btn.active,.wysiwyg-style2 .btn-group>.inline>.btn.active{color:#FFF!important;background:#6AAEDF!important}.wysiwyg-style2 .btn-group:after{display:none}.wysiwyg-toolbar .btn-colorpicker{width:24px;height:24px;position:relative;background:#87B87F;background:-moz-linear-gradient(top,#cf3e73 10%,#fff 20%,#2283c5 30%,#fff 40%,#87b87f 50%,#fff 60%,#ffb752 70%,#fff 80%,#d15b47 90%,#fff 100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(10%,#cf3e73),color-stop(20%,#fff),color-stop(30%,#2283c5),color-stop(40%,#fff),color-stop(50%,#87b87f),color-stop(60%,#fff),color-stop(70%,#ffb752),color-stop(80%,#fff),color-stop(90%,#d15b47),color-stop(100%,#fff));background:-webkit-linear-gradient(top,#cf3e73 10%,#fff 20%,#2283c5 30%,#fff 40%,#87b87f 50%,#fff 60%,#ffb752 70%,#fff 80%,#d15b47 90%,#fff 100%);background:-o-linear-gradient(top,#cf3e73 10%,#fff 20%,#2283c5 30%,#fff 40%,#87b87f 50%,#fff 60%,#ffb752 70%,#fff 80%,#d15b47 90%,#fff 100%);background:-ms-linear-gradient(top,#cf3e73 10%,#fff 20%,#2283c5 30%,#fff 40%,#87b87f 50%,#fff 60%,#ffb752 70%,#fff 80%,#d15b47 90%,#fff 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#CF3E73', endColorstr='#FFB752', GradientType=0);background:linear-gradient(top,#cf3e73 10%,#fff 20%,#2283c5 30%,#fff 40%,#87b87f 50%,#fff 60%,#ffb752 70%,#fff 80%,#d15b47 90%,#fff 100%)}.wysiwyg-toolbar .dropdown-colorpicker>.dropdown-menu{top:auto}.wysiwyg-toolbar input[type=file]{position:fixed;z-index:-10;opacity:0;max-width:0;max-height:0;display:block}.wysiwyg-toolbar .wysiwyg-choose-file{display:inline-block;width:auto;margin:4px auto 0;padding-left:5px;padding-right:5px}.wysiwyg-toolbar .dropdown-menu input[type=text]{margin-left:8px;margin-bottom:0}.wysiwyg-toolbar .dropdown-menu input[type=text].form-control{min-width:150px}.wysiwyg-toolbar .dropdown-menu .btn{margin-right:8px;margin-left:8px}.wysiwyg-style1 .btn-colorpicker{width:20px;height:20px;margin-left:4px}@media screen and (-webkit-min-device-pixel-ratio:0){.wysiwyg-editor img{display:inline!important}.wysiwyg-editor .ui-wrapper{border:1px dotted #D00;overflow:visible!important;display:inline-block!important;vertical-align:middle}.wysiwyg-editor .ui-wrapper:after{content:"";display:block;position:absolute;right:-3px;bottom:-3px;width:7px;height:7px;border:1px solid #D00;background-color:#FFF;z-index:1}}.widget-header .wysiwyg-toolbar{background-color:transparent}.widget-header .wysiwyg-toolbar .btn-group>.btn,.widget-header .wysiwyg-toolbar .btn-group>.inline>.btn{border-color:transparent;background:rgba(255,255,255,.25)!important;color:#FFF!important;min-width:32px;border-width:1px!important;border-radius:4px!important;padding:2px 1px 4px}.widget-header .wysiwyg-toolbar .btn-group>.btn.active,.widget-header .wysiwyg-toolbar .btn-group>.inline>.btn.active{background:rgba(0,0,0,.25)!important}.widget-body .wysiwyg-editor{border-width:0}.wysiwyg-speech-input{width:20px!important;color:transparent!important;background:transparent none!important;border-width:0!important;-moz-transform:scale(2,2);-webkit-transform:scale(2,2);-o-transform:scale(2,2);-ms-transform:scale(2,2);transform:scale(2,2);-webkit-box-shadow:none!important;box-shadow:none!important;position:absolute;right:0;top:-10px;cursor:pointer}.wysiwyg-speech-input:focus{-webkit-box-shadow:none!important;box-shadow:none!important}.widget-body .md-header{margin-top:-30px;margin-left:9px}.widget-body .md-header .btn{border-color:transparent;background:rgba(255,255,255,.25)!important;color:#FFF!important;text-align:center;min-width:32px;border-width:1px!important;border-radius:4px!important;padding:2px 4px 4px}.widget-body .md-header .btn>.ace-icon{font-size:14px;width:25px;max-width:25px;display:inline-block}.widget-body .md-header .btn-inverse{background:rgba(0,0,0,.25)!important;padding-right:5px;margin-left:4px}.md-fullscreen-controls{display:none}.widget-body .md-preview{padding:8px;min-height:200px}.widget-body .md-input{border:none!important;box-shadow:none!important;display:block;margin-bottom:0;background-color:rgba(48,126,204,.07);padding:8px;width:100%}.widget-body .md-input:focus{background-color:#FFF;box-shadow:none!important}.editable-container .popover-title{color:#438EB9}.editable-click{border-bottom:1px dashed #BBB;cursor:pointer;font-weight:400}img.editable-click{border:1px dotted #BBB}.editable-click:hover{border-color:#08C;color:#08C}img.editable-click:hover{opacity:.75;filter:alpha(opacity=75)}.editable-buttons,.editable-input{display:inline-block}.editable-buttons{margin-left:1px}.editable-buttons .btn{padding:0;width:28px;line-height:24px;border-width:3px;font-size:12px;margin:0 1px 0 0}.editable-buttons .btn>.ace-icon{margin:0}.editable-clear-x{cursor:pointer;color:#888;background:0 0}.editable-clear-x:hover{color:#D15B47}.editable-clear-x:before{display:inline-block;content:"\f057";font-family:FontAwesome;font-size:15px;position:absolute;margin-top:-9px;width:16px;height:30px;line-height:30px;text-align:center}.editable-input .ace-spinner{margin-right:8px}.editable-input .ace-spinner .spinner-input{width:100%}.editable-inline .editable-slider{margin-top:10px;margin-right:4px}.editable-popup .editable-slider{display:block;margin-bottom:16px;margin-top:4px}.editable-slider input[type=text]{display:none}.editable-slider input[type=range]{outline:0!important}.editable-input .ace-file-input{display:block}.editable-image .ace-file-multiple .ace-file-container.selected{border-color:transparent}.editable-image+.editable-buttons,.editable-wysiwyg+.editable-buttons{display:block;text-align:center;margin-top:8px}.editable-wysiwyg{width:95%}.editable-wysiwyg .wysiwyg-editor{height:auto;overflow-y:hidden}.editableform .input-append.dropdown-menu{display:none}.editableform .open .input-append.dropdown-menu{display:block}.editable-container .editableform{margin-bottom:10px}.editable-inline .editableform{margin-bottom:0}.editableform .control-group{display:block}.editableform-loading{background:0 0}.editableform-loading .ace-icon,.editableform-loading .progress{position:relative;top:35%}.input-group.date .input-group-addon{cursor:pointer}.datepicker td,.daterangepicker td,.datepicker th,.daterangepicker th{border-radius:0!important;font-size:13px}.datepicker td.active,.daterangepicker td.active,.datepicker td.active:hover,.daterangepicker td.active:hover{background:#2283c5!important}.datepicker td.active.disabled,.daterangepicker td.active.disabled,.datepicker td.active.disabled:hover,.daterangepicker td.active.disabled:hover{background:#8b9aa3!important}.datepicker td,.datepicker th{min-width:32px}.datepicker-dropdown.datepicker-orient-bottom:after,.datepicker-dropdown.datepicker-orient-bottom:before{top:auto}.daterangepicker .calendar-date{border-radius:0}.datepicker-months .month,.datepicker-years .year{border-radius:0!important}.datepicker-months .month.active,.datepicker-years .year.active,.datepicker-months .month.active:hover,.datepicker-years .year.active:hover,.datepicker-months .month.active:focus,.datepicker-years .year.active:focus,.datepicker-months .month.active:active,.datepicker-years .year.active:active{background-image:none!important;background-color:#2283c5!important}.bootstrap-timepicker-widget table td input{width:32px}.well .datepicker table tr td.day:hover{background-color:#7d8893;color:#FFF}.bootstrap-timepicker-widget table td a:hover{border-radius:0}.daterangepicker.opensleft:before,.daterangepicker.opensright:before{-moz-border-bottom-colors:rgba(0,0,0,.2)}.daterangepicker.opensleft:after,.daterangepicker.opensright:after{-moz-border-bottom-colors:#fff}.datepicker-dropdown:before{-moz-border-bottom-colors:rgba(0,0,0,.2)}.datepicker-dropdown:after{-moz-border-bottom-colors:#fff}.datepicker-dropdown.datepicker-orient-bottom:before{-moz-border-top-colors:#999}.datepicker-dropdown.datepicker-orient-bottom:after{-moz-border-top-colors:#FFF}.bootstrap-timepicker-widget.dropdown-menu:before{-moz-border-bottom-colors:rgba(0,0,0,.2)}.bootstrap-timepicker-widget.dropdown-menu:after{-moz-border-bottom-colors:#FFF}.bootstrap-timepicker-widget.timepicker-orient-bottom:before{-moz-border-top-colors:#999}.bootstrap-timepicker-widget.timepicker-orient-bottom:after{-moz-border-top-colors:#FFF}.bootstrap-datetimepicker-widget [class=btn]{border-width:0!important;background-color:transparent!important;color:#7399b8!important;text-shadow:none!important}.bootstrap-datetimepicker-widget [class=btn]:hover{color:#1B6AAA!important}.bootstrap-datetimepicker-widget .btn.btn-primary{border-width:3px!important}.bootstrap-datetimepicker-widget .picker-switch{margin-bottom:2px}.bootstrap-datetimepicker-widget .picker-switch .btn{width:90%!important;background-color:#EEE!important;color:#478fca!important;font-size:16px}.bootstrap-datetimepicker-widget .picker-switch .btn:hover{background-color:#e3edf5!important}.bootstrap-datetimepicker-widget td span{border-radius:0}.bootstrap-datetimepicker-widget .timepicker-hour,.bootstrap-datetimepicker-widget .timepicker-minute,.bootstrap-datetimepicker-widget .timepicker-second{color:#555!important}.ui-slider{background-color:#D5D5D5}.ui-slider-horizontal{height:9px}.ui-slider-vertical{width:9px}.ui-slider .ui-slider-handle{border-radius:0;width:1.45em;height:1.45em;background-color:#F8F8F8;border:1px solid}.ui-slider .ui-slider-handle:before,.ui-slider .ui-slider-handle:after{display:block;content:"";position:absolute;top:4px;left:5px;width:4px;height:8px;border:1px solid;border-width:0 1px;border-color:inherit}.ui-slider .ui-slider-handle:after{left:8px;border-width:0 1px 0 0}.ui-slider .ui-slider-handle:hover{background-color:#FFF}.ui-slider .ui-slider-handle:hover,.ui-slider .ui-slider-handle:focus,.ui-slider .ui-slider-handle:active{outline:0;-webkit-box-shadow:1px 1px 1px 0 rgba(0,0,0,.3);box-shadow:1px 1px 1px 0 rgba(0,0,0,.3)}.ui-slider-horizontal .ui-slider-handle{margin-left:-.725em;top:-.4em}.ui-slider-vertical .ui-slider-handle{left:-.35em;margin-bottom:-.65em}.ui-slider-small.ui-slider-horizontal{height:5px}.ui-slider-small.ui-slider-vertical{width:5px}.ui-slider-small .ui-slider-handle{border-radius:100%;width:17px;height:17px;margin-bottom:-.45em;left:-.35em}.ui-slider-small .ui-slider-handle:before,.ui-slider-small .ui-slider-handle:after{height:7px;left:5px;width:3px}.ui-slider-small .ui-slider-handle:after{left:7px}.ui-slider-simple .ui-slider-handle:after,.ui-slider-simple .ui-slider-handle:before{display:none}.ui-slider-range{background-color:#4aa4ce}.ui-slider-handle{outline:0!important;border-color:#4aa4ce!important}.ui-state-disabled.ui-slider{background-color:#E5E5E5}.ui-state-disabled .ui-slider-range{background-color:#8daebe}.ui-state-disabled .ui-slider-handle{-webkit-box-shadow:none!important;box-shadow:none!important;border-color:#8daebe!important}.ui-slider-green .ui-slider-range{background-color:#8bbc67}.ui-slider-green .ui-slider-handle{border-color:#8bbc67!important}.ui-slider-green.ui-state-disabled .ui-slider-range{background-color:#aab0a6}.ui-slider-green.ui-state-disabled .ui-slider-handle{border-color:#aab0a6!important}.ui-slider-red .ui-slider-range{background-color:#d36e6e}.ui-slider-red .ui-slider-handle{border-color:#d36e6e!important}.ui-slider-red.ui-state-disabled .ui-slider-range{background-color:#c8acac}.ui-slider-red.ui-state-disabled .ui-slider-handle{border-color:#c8acac!important}.ui-slider-purple .ui-slider-range{background-color:#ac68ba}.ui-slider-purple .ui-slider-handle{border-color:#ac68ba!important}.ui-slider-purple.ui-state-disabled .ui-slider-range{background-color:#ada7ae}.ui-slider-purple.ui-state-disabled .ui-slider-handle{border-color:#ada7ae!important}.ui-slider-orange .ui-slider-range{background-color:#efad62}.ui-slider-orange .ui-slider-handle{border-color:#efad62!important}.ui-slider-orange.ui-state-disabled .ui-slider-range{background-color:#e0c4a4}.ui-slider-orange.ui-state-disabled .ui-slider-handle{border-color:#e0c4a4!important}.ui-slider-dark .ui-slider-range{background-color:#606060}.ui-slider-dark .ui-slider-handle{border-color:#606060!important}.ui-slider-dark.ui-state-disabled .ui-slider-range{background-color:#7a7a7a}.ui-slider-dark.ui-state-disabled .ui-slider-handle{border-color:#7a7a7a!important}.ui-slider-pink .ui-slider-range{background-color:#d6487e}.ui-slider-pink .ui-slider-handle{border-color:#d6487e!important}.ui-slider-pink.ui-state-disabled .ui-slider-range{background-color:#c38ea2}.ui-slider-pink.ui-state-disabled .ui-slider-handle{border-color:#c38ea2!important}.ui-datepicker{background-color:#FFF;border:1px solid rgba(0,0,0,.2);-webkit-box-shadow:0 2px 4px rgba(0,0,0,.2);box-shadow:0 2px 4px rgba(0,0,0,.2)}.ui-datepicker .ui-datepicker-prev,.ui-datepicker .ui-datepicker-next{height:26px;min-width:32px;max-width:32px;text-align:center;cursor:pointer;color:transparent;line-height:26px;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.ui-datepicker .ui-datepicker-prev .ui-icon,.ui-datepicker .ui-datepicker-next .ui-icon{color:transparent;visibility:hidden}.ui-datepicker .ui-datepicker-prev:hover,.ui-datepicker .ui-datepicker-next:hover{background-color:#EEE;text-decoration:none}.ui-datepicker .ui-datepicker-prev:before,.ui-datepicker .ui-datepicker-next:before{display:inline;font-family:FontAwesome;font-size:14px;content:"\f060";color:#393939}.ui-datepicker .ui-datepicker-prev-hover,.ui-datepicker .ui-datepicker-next-hover{top:2px}.ui-datepicker .ui-datepicker-next:before{content:"\f061"}.ui-datepicker .ui-datepicker-prev-hover{left:2px}.ui-datepicker .ui-datepicker-next-hover{right:2px}.ui-datepicker td{padding:0}.ui-datepicker td>a,.ui-datepicker td>span{display:inline-block;height:22px;min-width:24px;max-width:24px;text-align:center;color:#393939;font-size:13px;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.ui-datepicker td>a:hover{background-color:#EEE}.ui-datepicker td>a.ui-state-highlight{background-color:#D5E5EF}.ui-datepicker td>a.ui-state-active{background-color:#2283c5;color:#FFF}.ui-datepicker td>a.ui-priority-secondary{color:#888}.ui-datepicker td>span{color:#999}.ui-datepicker td .ui-datepicker-title select{height:24px;line-height:24px;padding:2px 3px}.ui-datepicker td .ui-datepicker-buttonpane{background-color:#DDD;height:1px}.ui-widget-overlay{background:rgba(0,0,0,.25);opacity:1!important;filter:alpha(opacity=100)!important;z-index:1039!important}.ui-dialog,.ui-jqdialog{z-index:1040!important;background-color:#FFF;padding:0;border:1px solid #DDD;-webkit-box-shadow:0 2px 4px rgba(0,0,0,.2);box-shadow:0 2px 4px rgba(0,0,0,.2)}.ui-dialog .ui-dialog-titlebar,.ui-jqdialog .ui-dialog-titlebar,.ui-dialog .ui-jqdialog-titlebar,.ui-jqdialog .ui-jqdialog-titlebar{background-color:#F1F1F1;font-size:16px;color:#669fc7;padding:0}.ui-dialog .ui-dialog-title,.ui-jqdialog .ui-dialog-title,.ui-dialog .ui-jqdialog-title,.ui-jqdialog .ui-jqdialog-title{float:none!important;width:auto}.ui-dialog .widget-header,.ui-jqdialog .widget-header{margin:0;border-width:0 0 1px 0}.ui-dialog .ui-dialog-buttonpane,.ui-jqdialog .ui-dialog-buttonpane,.ui-dialog .ui-jqdialog-buttonpane,.ui-jqdialog .ui-jqdialog-buttonpane{background-color:#eff3f8;border-top:1px solid #e4e9ee}.ui-dialog .ui-dialog-buttonpane button,.ui-jqdialog .ui-dialog-buttonpane button,.ui-dialog .ui-jqdialog-buttonpane button,.ui-jqdialog .ui-jqdialog-buttonpane button{font-size:14px}.ui-dialog .ui-dialog-titlebar-close,.ui-jqdialog .ui-dialog-titlebar-close,.ui-dialog .ui-jqdialog-titlebar-close,.ui-jqdialog .ui-jqdialog-titlebar-close{border:none;background:0 0;opacity:.4;color:#d15b47;padding:0;top:50%;right:8px!important;text-align:center}.ui-dialog .ui-dialog-titlebar-close:before,.ui-jqdialog .ui-dialog-titlebar-close:before,.ui-dialog .ui-jqdialog-titlebar-close:before,.ui-jqdialog .ui-jqdialog-titlebar-close:before{content:"\f00d";display:inline;font-family:FontAwesome;font-size:16px}.ui-dialog .ui-dialog-titlebar-close:hover,.ui-jqdialog .ui-dialog-titlebar-close:hover,.ui-dialog .ui-jqdialog-titlebar-close:hover,.ui-jqdialog .ui-jqdialog-titlebar-close:hover{opacity:1;text-decoration:none;padding:0}.ui-dialog .ui-dialog-titlebar-close .ui-button-text,.ui-jqdialog .ui-dialog-titlebar-close .ui-button-text,.ui-dialog .ui-jqdialog-titlebar-close .ui-button-text,.ui-jqdialog .ui-jqdialog-titlebar-close .ui-button-text{text-indent:0;visibility:hidden}.ui-dialog .widget-header .ui-dialog-titlebar-close,.ui-jqdialog .widget-header .ui-dialog-titlebar-close,.ui-dialog .widget-header .ui-jqdialog-titlebar-close,.ui-jqdialog .widget-header .ui-jqdialog-titlebar-close{right:10px!important}.ui-accordion .ui-accordion-header{color:#478fca;font-weight:400;background-color:#F9F9F9;border:1px solid #cdd8e3;padding:8px 8px 9px 24px}.ui-accordion .ui-accordion-header:hover{color:#6ea6cc;background-color:#f1f8fd}.ui-accordion .ui-accordion-header.ui-state-active{color:#4c8fbd;background-color:#eef4f9;position:relative;font-weight:700}.ui-accordion .ui-accordion-header .ui-accordion-header-icon{text-indent:0;margin-top:0;position:absolute;left:10px;top:7px}.ui-accordion .ui-accordion-header .ui-accordion-header-icon:before{display:inline;font-family:FontAwesome;font-size:15px;content:"\f0da"}.ui-accordion .ui-accordion-header.ui-state-active .ui-accordion-header-icon:before{content:"\f0d7";font-weight:400}.ui-accordion .ui-accordion-content{border:1px solid #cdd8e3;border-top-width:0;padding:11px 16px}.ui-tabs .ui-tabs-nav{padding:0;border-bottom:1px solid #C5D0DC}.ui-tabs .ui-tabs-nav li.ui-state-default>a{background-color:#F9F9F9;border:1px solid #C5D0DC;border-bottom-width:0;color:#999;line-height:16px;margin-right:-1px;z-index:11;padding:8px 12px;position:relative;top:2px}.ui-tabs .ui-tabs-nav li>a:focus{outline:0}.ui-tabs .ui-tabs-nav li.ui-tabs-active>a{background-color:#FFF;border:1px solid;border-color:#4C8FBD #C5D0DC transparent;border-top-width:2px;-webkit-box-shadow:0 -2px 3px 0 rgba(0,0,0,.15);box-shadow:0 -2px 3px 0 rgba(0,0,0,.15);color:#576373;position:relative;top:1px}.ui-tabs .ui-tabs-panel{border:1px solid #C5D0DC;border-top-width:0;margin:0;left:auto;right:auto;top:auto;bottom:auto}.ui-menu{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;width:150px;-webkit-box-shadow:0 2px 4px rgba(0,0,0,.2);box-shadow:0 2px 4px rgba(0,0,0,.2);background-color:#FFF;border:1px solid rgba(0,0,0,.2);padding:3px}.ui-menu .ui-state-focus,.ui-menu .ui-state-active{margin:auto}.ui-menu .ui-menu-item{padding:5px 10px 6px;color:#444;cursor:pointer;display:block;-webkit-box-sizing:inherit;-moz-box-sizing:inherit;box-sizing:inherit}.ui-menu .ui-menu-item .ui-menu-icon{float:right;position:relative;left:auto;right:4px;bottom:auto;text-indent:0}.ui-menu .ui-menu-item .ui-menu-icon:before{content:"\f105";font-family:FontAwesome;font-size:14px;display:inline}.ui-menu .ui-menu-item:hover,.ui-menu .ui-state-focus,.ui-menu .ui-state-active,.ui-menu .ui-menu-item:hover>.ui-menu-icon,.ui-menu .ui-state-focus>.ui-menu-icon,.ui-menu .ui-state-active>.ui-menu-icon{text-decoration:none;background-color:#4f99c6;color:#FFF;margin:auto;font-weight:400}.ui-menu .ui-menu-item:hover .ui-menu-icon,.ui-menu .ui-state-focus .ui-menu-icon,.ui-menu .ui-state-active .ui-menu-icon,.ui-menu .ui-menu-item:hover>.ui-menu-icon .ui-menu-icon,.ui-menu .ui-state-focus>.ui-menu-icon .ui-menu-icon,.ui-menu .ui-state-active>.ui-menu-icon .ui-menu-icon{color:#FFF}.ui-menu .ui-state-disabled,.ui-menu .ui-state-disabled .ui-menu-icon{color:#999;cursor:default}.ui-menu .ui-state-disabled:hover,.ui-menu .ui-state-disabled.ui-state-focus,.ui-menu .ui-state-disabled.ui-state-active,.ui-menu .ui-state-disabled:hover .ui-menu-icon,.ui-menu .ui-state-disabled.ui-state-focus .ui-menu-icon,.ui-menu .ui-state-disabled.ui-state-active .ui-menu-icon{background-color:#FFF;color:#999}.ui-autocomplete{background-color:#FFF;border:1px solid rgba(0,0,0,.2);-webkit-box-shadow:0 2px 4px rgba(0,0,0,.2);box-shadow:0 2px 4px rgba(0,0,0,.2)}.ui-autocomplete-category{padding:6px;position:relative;background-color:#eef4f9;color:#478fca;font-weight:bolder;border:1px solid #DAE6ED;border-width:1px 0}.ui-spinner-button{border-width:0!important;font-size:10px;height:16px;line-height:16px;width:18px;color:#FFF!important;text-shadow:0 -1px 0 rgba(0,0,0,.25)!important;display:inline-block;position:absolute;text-align:center;padding:0}.ui-spinner-button>.ace-icon{width:18px;display:inline-block}.ui-spinner-up{top:0;right:5px}.ui-spinner-down{bottom:3px;right:5px}.ui-spinner-input{margin-top:0;padding:5px;max-width:100px;font-size:14px}.ui-tooltip{background-color:#444;color:#FFF}.ui-progressbar{background-color:#f5f5f5;height:22px}.ui-progressbar .ui-progressbar-value{margin:0}.ui-progressbar .ui-progressbar-value[class=progress-bar]{background-color:#2a91d8}.ui-selectmenu-button{border:1px solid #aaa}.ui-selectmenu-button[aria-expanded=true]{border-color:#4492C9}.ui-selectmenu-button span.ui-icon{text-indent:0;margin-top:-10px}.ui-selectmenu-button .ui-icon:before{content:"\f0d7";display:inline-block;color:#888;font-family:FontAwesome;font-size:14px}.ui-jqgrid .ui-jqgrid-view,.ui-jqgrid .ui-paging-info,.ui-jqgrid .ui-pg-table,.ui-jqgrid .ui-pg-selbox{font-size:13px}.ui-jqgrid .ui-jqgrid-title{float:left;margin:8px}.ui-jqgrid .ui-jqgrid-title-rtl{float:right;margin:8px}.ui-jqgrid-view>.ui-jqgrid-titlebar{height:40px;line-height:24px;color:#FFF;background:#307ecc;padding:0;font-size:15px}.ui-jqgrid tr.jqgrow.ui-row-rtl td:last-child{border-right:none;border-left:1px solid #E1E1E1}.ui-jqgrid .ui-jqgrid-hdiv{background-color:#eff3f8;border:1px solid #D3D3D3;border-width:1px 0 0 1px;line-height:15px;font-weight:700;color:#777;text-shadow:none}.ui-jqgrid .ui-jqgrid-htable thead{background-color:#eff3f8}.ui-jqgrid .ui-jqgrid-htable th span.ui-jqgrid-resize{height:45px!important}.ui-jqgrid .ui-jqgrid-htable th div{padding-top:12px;padding-bottom:12px}.ui-jqgrid-hdiv .ui-jqgrid-htable{border-top:none}.ui-jqgrid-hdiv .ui-jqgrid-htable{border-top:1px solid #E1E1E1}.ui-jqgrid-titlebar{position:relative;top:1px;z-index:1}.ui-jqgrid tr.jqgrow,.ui-jqgrid tr.ui-row-ltr,.ui-jqgrid tr.ui-row-rtl{border:none}.ui-jqgrid tr.ui-row-ltr td,.ui-jqgrid tr.ui-row-rtl td{border-bottom:1px solid #E1E1E1;padding:6px 4px;border-color:#E1E1E1}.ui-jqgrid tr.ui-state-highlight.ui-row-ltr td{border-right-color:#C7D3A9}.ui-jqgrid tr.ui-state-highlight.ui-row-rtl td{border-left-color:#C7D3A9}.ui-jqgrid-btable .ui-widget-content.ui-priority-secondary{background-image:none;background-color:#F9F9F9;opacity:1}.ui-jqgrid-btable .ui-widget-content.ui-state-hover{background-image:none;background-color:#EFF4F7;opacity:1}.ui-jqgrid-btable .ui-widget-content.ui-state-highlight{background-color:#E4EFC9}.ui-jqgrid .ui-jqgrid-pager{line-height:15px;height:55px;padding-top:3px!important;padding-bottom:5px!important;background-color:#eff3f8!important;border-bottom:1px solid #E1E1E1!important;border-top:1px solid #E1E1E1!important}.ui-jqgrid .ui-pg-input{font-size:inherit;width:24px;height:20px;line-height:16px;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;text-align:center;padding-top:1px;padding-bottom:1px}.ui-jqgrid .ui-pg-selbox{display:block;height:24px;width:60px;margin:0;padding:1px;line-height:normal}.ui-jqgrid .ui-jqgrid-htable th div{overflow:visible}.ui-jqgrid .ui-pager-control{height:50px;position:relative;padding-left:9px;padding-right:9px}.ui-jqgrid .ui-jqgrid-toppager{height:auto!important;background-color:#eff3f8;border-bottom:1px solid #E1E1E1!important}.ui-jqgrid .jqgrow .editable{max-width:90%;max-width:calc(92%)!important}.ui-pg-table .navtable .ui-corner-all{border-radius:0}.ui-jqgrid .ui-pg-button:hover{padding:1px}.ui-jqgrid .ui-pg-button .ui-separator{margin-left:4px;margin-right:4px;border-color:#C9D4DB}.ui-jqgrid .ui-jqgrid-btable{border-left:1px solid #E1E1E1}.ui-jqgrid .ui-jqgrid-bdiv{border-top:1px solid #E1E1E1}.ui-jqgrid .loading{position:absolute;top:45%;left:45%;width:auto;height:auto;z-index:101;padding:6px;margin:5px;text-align:center;font-weight:700;font-size:12px;background-color:#FFF;border:2px solid #8EB8D1;color:#E2B018}.ui-jqgrid .ui-search-toolbar{border-top:1px solid #E1E1E1}.ui-jqgrid .ui-jqgrid-labels{border-bottom:none;background:#F2F2F2;background-image:-webkit-linear-gradient(top,#f8f8f8 0,#ececec 100%);background-image:-o-linear-gradient(top,#f8f8f8 0,#ececec 100%);background-image:linear-gradient(to bottom,#f8f8f8 0,#ececec 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff8f8f8', endColorstr='#ffececec', GradientType=0);padding:0!important;border-left:1px solid #E1E1E1!important}.ui-jqgrid .ui-jqgrid-labels th{border-right:1px solid #E1E1E1!important;text-align:left!important}.ui-jqgrid-labels th[id*="_cb"]:first-child>div{padding-top:0;text-align:center!important}.ui-jqgrid-sortable{padding-left:4px;font-size:13px;color:#777;font-weight:700}.ui-jqgrid-sortable:hover{color:#547ea8}th[aria-selected=true]{background-image:-webkit-linear-gradient(top,#eff3f8 0,#e3e7ed 100%);background-image:-o-linear-gradient(top,#eff3f8 0,#e3e7ed 100%);background-image:linear-gradient(to bottom,#eff3f8 0,#e3e7ed 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffeff3f8', endColorstr='#ffe3e7ed', GradientType=0)}th[aria-selected=true] .ui-jqgrid-sortable{color:#307ecc}.ui-jqgrid .ui-icon{text-indent:0;color:#307ecc;float:none;right:2px}.rtl .ui-jqgrid .ui-icon{right:auto;left:2px}.ui-jqgrid .ui-icon.ui-state-disabled{color:#BBB}.ui-jqgrid .ui-icon.ui-state-disabled:hover{padding:0}.ui-grid-ico-sort:before{display:inline;content:"\f0d7";font-family:FontAwesome;font-size:12px}.ui-icon-asc:before{content:"\f0d8"}.ui-pg-table>tbody>tr>.ui-pg-button>.ui-icon{display:inline-block;padding:0;width:24px;height:24px;line-height:22px;text-align:center;position:static;float:none;margin:0 2px!important;color:gray;border:1px solid #CCC;background-color:#FFF;border-radius:100%}.ui-pg-table>tbody>tr>.ui-pg-button>.ui-icon:hover{color:#699AB5;border-color:#699AB5}.ui-pg-table>tbody>tr>.ui-pg-button>.ui-icon:before{width:20px;text-align:center;display:inline-block}.ui-pg-table>tbody>tr>.ui-pg-button.ui-state-disabled .ui-icon{color:#B0B0B0;background-color:#F7F7F7;border-color:#DDD;-moz-transform:scale(0.9);-webkit-transform:scale(0.9);-o-transform:scale(0.9);-ms-transform:scale(0.9);transform:scale(0.9)}.ui-jqgrid-btable input,.ui-jqgrid-btable textarea,.ui-jqgrid-btable select{padding:2px;width:auto;max-width:100%;margin-bottom:0}.ui-jqgrid-btable select{padding:1px;height:25px;line-height:25px}.ui-pg-div .ui-icon{display:inline-block;width:18px;float:none;position:static;text-align:center;opacity:.85;-webkit-transition:all .12s;-o-transition:all .12s;transition:all .12s;margin:0 1px;vertical-align:middle;cursor:pointer;font-size:17px}.ui-pg-div .ui-icon:hover{-moz-transform:scale(1.2);-webkit-transform:scale(1.2);-o-transform:scale(1.2);-ms-transform:scale(1.2);transform:scale(1.2);opacity:1;position:static;margin:0 1px}.ui-pg-div .ui-icon:before{font-family:FontAwesome;display:inline}.ui-jqgrid .ui-icon-pencil{color:#478FCA}.ui-jqgrid .ui-icon-pencil:before{content:"\f040"}.ui-jqgrid .ui-icon-trash{color:#DD5A43}.ui-jqgrid .ui-icon-trash:before{content:"\f014"}.ui-jqgrid .ui-icon-disk{color:#69AA46}.ui-jqgrid .ui-icon-disk:before{content:"\f00c"}.ui-jqgrid .ui-icon-cancel{color:#DD5A43}.ui-jqgrid .ui-icon-cancel:before{content:"\f00d"}.ui-jqdialog-content,.ui-jqdialog .ui-jqdialog-content{font-size:13px;padding:4px 0 0}.ui-jqdialog-content .formdata,.ui-jqdialog .ui-jqdialog-content .formdata{font-size:13px;padding:6px 12px}.ui-jqdialog-content .form-view-data,.ui-jqdialog .ui-jqdialog-content .form-view-data{vertical-align:middle;font-size:13px}.ui-jqdialog-content[id*=alertcnt_],.ui-jqdialog .ui-jqdialog-content[id*=alertcnt_]{padding:8px 11px}.ui-jqdialog-content .CaptionTD{font-size:12px;text-align:right;color:#666}.ui-jqdialog-content .FormData{border-bottom:1px dotted #E8E8E8}.ui-jqdialog-content .FormData:last-child{border-bottom:none}.ui-jqdialog-content .FormData>td{padding-top:6px;padding-bottom:6px}.ui-jqdialog-content input.FormElement{width:auto}.ui-jqdialog-content select.FormElement{padding:1px;height:25px;line-height:25px;width:auto}.ui-jqdialog-content td.EditButton{padding:8px}.EditTable{background-color:#eff3f8;border-top:1px solid #D6E1EA!important;padding:8px}.EditTable tr:first-child{display:none}.EditTable .navButton .fm-button{float:none!important;width:auto!important;margin:1px 1px 2px!important;background-color:transparent;border-radius:100%}.EditTable .navButton .fm-button:hover{background-color:transparent}.EditTable .navButton .fm-button:focus{outline:0}.EditTable .navButton .fm-button .ace-icon{display:inline-block;color:#999;border:1px solid #AAA;width:26px;height:26px;line-height:26px;text-align:center;border-radius:100%;background-color:#FFF}.EditTable .navButton .fm-button:hover .ace-icon{color:#699AB5;border-color:#699AB5}.EditTable .navButton .fm-button.ui-state-disabled .ace-icon,.EditTable .navButton .fm-button.ui-state-disabled:hover .ace-icon{color:#BBB;border-color:#CCC;-moz-transform:scale(0.88);-webkit-transform:scale(0.88);-o-transform:scale(0.88);-ms-transform:scale(0.88);transform:scale(0.88)}.FormGrid .EditTable{background-color:#FFF;border-top:none!important;padding:0}.FormGrid .EditTable tr:first-child{display:none}.ui-jqgrid .ui-jqgrid-view input,.ui-jqgrid .ui-jqgrid-view select,.ui-jqgrid .ui-jqgrid-view textarea,.ui-jqgrid .ui-jqgrid-view button{font-size:13px}.ui-jqdialog-content .searchFilter select{padding:1px;height:26px;line-height:26px;width:auto;max-width:95%;margin-bottom:0}.ui-jqdialog-content .searchFilter .input-elm{margin-bottom:0;height:18px;line-height:18px;width:95%!important;padding-left:1px;padding-right:1px;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.ui-jqdialog-content .searchFilter table{margin-left:4px}.ui-jqdialog-content .searchFilter tr td{padding:5px 0}.ui-jqdialog-content .searchFilter .add-group,.ui-jqdialog-content .searchFilter .add-rule,.ui-jqdialog-content .searchFilter .delete-group{margin-left:4px!important;font-size:15px!important}.ui-jqdialog-content .searchFilter .delete-rule{border:none;background-color:#FFF;color:#D15B47;font-size:20px;width:22px;line-height:10px;padding:0;text-shadow:none!important;display:inline-block;-webkit-transition:all .1s;-o-transition:all .1s;transition:all .1s;opacity:.85}.ui-jqdialog-content .searchFilter .delete-rule:hover{-moz-transform:scale(1.1);-webkit-transform:scale(1.1);-o-transform:scale(1.1);-ms-transform:scale(1.1);transform:scale(1.1);color:#B74635;opacity:1}.ui-jqdialog-content .searchFilter .queryresult{margin-bottom:11px}.ui-jqdialog-content .searchFilter .queryresult td.query{padding:6px 11px;border:1px solid #E1E1E1;background-color:#EEE}.ui-jqdialog-content .searchFilter .queryresult td.query:empty{display:none}.ui-state-error{background-color:#f2dede;border:1px solid #ebccd1;color:#a94442;margin:4px 4px 8px;padding:6px 10px;text-shadow:0 1px 0 rgba(255,255,255,.5);font-size:13px}.ui-jqdialog .ui-widget-header{background-image:-webkit-linear-gradient(top,#fff 0,#eee 100%);background-image:-o-linear-gradient(top,#fff 0,#eee 100%);background-image:linear-gradient(to bottom,#fff 0,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0);border-image:none;border-bottom:1px solid solid;color:#669FC7;min-height:38px;position:relative}.ui-jqdialog .ui-widget-header .ui-jqdialog-title{line-height:38px;margin:0;padding:0;padding-left:12px;text-align:left}.widget-header .ui-jqdialog-title{padding-left:0!important;padding-right:0!important}.ui-jqdialog .ui-widget-header .widget-header{border-bottom:none}.ui-jqdialog .ui-jqdialog-titlebar{border-bottom:1px solid #DDD!important}.fm-button{margin:0 4px}.fm-button:not(.btn){background-color:#abbac3;border-radius:0;box-shadow:none;color:#FFF;cursor:pointer;display:inline-block;font-size:13px;line-height:28px;padding:0 12px 1px;margin:0 8px;position:relative;text-shadow:0 -1px 0 rgba(0,0,0,.25);-webkit-transition:all .15s;-o-transition:all .15s;transition:all .15s;vertical-align:middle}.fm-button.ui-state-default:hover{background-color:#8b9aa3}.ui-jqgrid .ui-jqgrid-htable .ui-search-toolbar th{height:30px;padding-top:2px;white-space:normal}.ui-jqgrid .ui-jqgrid-htable .ui-search-toolbar th div{padding-top:0;padding-bottom:0;height:30px;line-height:26px}.ui-jqgrid .ui-jqgrid-titlebar-close{top:10%;height:auto;padding:0;margin:2px 8px 0 0;text-align:center;border-radius:4px}.ui-jqgrid .ui-jqgrid-titlebar-close:hover{background-color:rgba(255,255,255,.2)}.ui-jqgrid .ui-jqgrid-titlebar-close .ui-icon:before{display:inline-block;font-family:FontAwesome;content:"\f077";color:#FFF}.ui-jqgrid .ui-jqgrid-titlebar-close .ui-icon-circle-triangle-s:before{content:"\f078"}.ui-jqgrid .tree-wrap-ltr{margin:0 4px;float:none;display:inline}.ui-jqgrid .tree-wrap-rtl{margin:2px 4px 0}.ui-jqgrid .ui-subgrid{border-bottom:1px solid #E1E1E1;background-color:#F6FAFF}.ui-jqgrid .ui-subgrid .ui-jqgrid-btable{background-color:#FFF}.ui-jqgrid .ui-subgrid .ui-jqgrid .ui-jqgrid-hdiv{background-color:transparent;margin-top:4px}.ui-jqgrid .ui-subgrid .ui-jqgrid .ui-jqgrid-hdiv .ui-jqgrid-htable .ui-jqgrid-labels{border-bottom:1px solid #E1E1E1;background:#F1F1F1}.ui-jqgrid .ui-subgrid .ui-jqgrid .ui-jqgrid-hdiv .ui-jqgrid-htable th[aria-selected=true]{background:#E5E9EF}.ui-jqgrid .ui-subgrid .ui-jqgrid .ui-jqgrid-hdiv .ui-jqgrid-htable th .ui-jqgrid-sortable{font-size:12px}.ui-jqgrid .ui-subgrid .ui-jqgrid .ui-jqgrid-hdiv .ui-jqgrid-htable th div{padding-top:8px;padding-bottom:8px}.ui-jqgrid .ui-subgrid .ui-jqgrid .ui-jqgrid-hdiv .ui-jqgrid-htable th span.ui-jqgrid-resize{height:36px!important}.ui-jqgrid .ui-subgrid .ui-jqgrid .ui-jqgrid-bdiv{height:auto!important;max-height:150px;margin-bottom:4px;border-top-width:0;border-bottom:1px solid #E1E1E1}.ui-jqgrid .ui-sgcollapsed>a:hover{text-decoration:none}@media only screen and (max-width:767px){.ui-jqgrid .ui-jqgrid-pager{height:90px}.ui-jqgrid .ui-jqgrid-pager>.ui-pager-control{height:85px;padding-top:9px}.ui-jqgrid .ui-jqgrid-pager>.ui-pager-control>.ui-pg-table>tbody>tr>td{vertical-align:top}.ui-jqgrid .ui-jqgrid-pager>.ui-pager-control>.ui-pg-table>tbody>tr>td#grid-pager_center{width:0!important;position:static}.ui-jqgrid .ui-jqgrid-pager>.ui-pager-control>.ui-pg-table>tbody>tr>td#grid-pager_center>.ui-pg-table{margin:36px auto 0;position:absolute;right:0;left:0;text-align:center}}@media only screen and (max-width:767px) and (-webkit-min-device-pixel-ratio:0){.ui-jqgrid .ui-jqgrid-pager>.ui-pager-control>.ui-pg-table>tbody>tr>td#grid-pager_center>.ui-pg-table{width:300px}}.dd{position:relative;display:block;margin:0;padding:0;max-width:600px;list-style:none;line-height:20px}.dd-list{display:block;position:relative;margin:0;padding:0;list-style:none}.dd-list .dd-list{padding-left:30px}.dd-collapsed .dd-list{display:none}.dd-item,.dd-empty,.dd-placeholder{display:block;position:relative;margin:0;padding:0;min-height:20px;line-height:20px}.dd-handle,.dd2-content{display:block;min-height:38px;margin:5px 0;padding:8px 12px;background:#F8FAFF;border:1px solid #DAE2EA;color:#7C9EB2;text-decoration:none;font-weight:700;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.dd-handle:hover,.dd2-content:hover{color:#438EB9;background:#F4F6F7;border-color:#DCE2E8}.dd-handle[class*=btn-],.dd2-content[class*=btn-]{color:#FFF;border:none;padding:9px 12px}.dd-handle[class*=btn-]:hover,.dd2-content[class*=btn-]:hover{opacity:.85;color:#FFF}.dd2-handle+.dd2-content,.dd2-handle+.dd2-content[class*=btn-]{padding-left:44px}.dd-handle[class*=btn-]:hover,.dd2-content[class*=btn-] .dd2-handle[class*=btn-]:hover+.dd2-content[class*=btn-]{color:#FFF}.dd-item>button:hover~.dd-handle,.dd-item>button:hover~.dd2-content{color:#438EB9;background:#F4F6F7;border-color:#DCE2E8}.dd-item>button:hover~.dd-handle[class*=btn-],.dd-item>button:hover~.dd2-content[class*=btn-]{opacity:.85;color:#FFF}.dd2-handle:hover~.dd2-content{color:#438EB9;background:#F4F6F7;border-color:#DCE2E8}.dd2-handle:hover~.dd2-content[class*=btn-]{opacity:.85;color:#FFF}.dd2-item.dd-item>button{margin-left:34px}.dd-item>button{display:block;position:relative;z-index:1;cursor:pointer;float:left;width:25px;height:20px;margin:5px 1px 5px 5px;padding:0;text-indent:100%;white-space:nowrap;overflow:hidden;border:0;background:0 0;font-size:12px;line-height:1;text-align:center;font-weight:700;top:4px;left:1px;color:#707070}.dd-item>button:before{font-family:FontAwesome;content:'\f067';display:block;position:absolute;width:100%;text-align:center;text-indent:0;font-weight:400;font-size:14px}.dd-item>button[data-action=collapse]:before{content:'\f068'}.dd-item>button:hover{color:#707070}.dd-item.dd-colored>button,.dd-item.dd-colored>button:hover{color:#EEE}.dd-placeholder,.dd-empty{margin:5px 0;padding:0;min-height:30px;background:#F0F9FF;border:2px dashed #BED2DB;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.dd-empty{border-color:#AAA;border-style:solid;background-color:#e5e5e5}.dd-dragel{position:absolute;pointer-events:none;z-index:999;opacity:.8}.dd-dragel>li>.dd-handle{color:#4B92BE;background:#F1F5FA;border-color:#D6E1EA;border-left:2px solid #777;position:relative}.dd-dragel>li>.dd-handle[class*=btn-]{color:#FFF}.dd-dragel>.dd-item>.dd-handle{margin-top:0}.dd-list>li[class*=item-]{border-width:0;padding:0}.dd-list>li[class*=item-]>.dd-handle{border-left:2px solid;border-left-color:inherit}.dd-list>li>.dd-handle .sticker{position:absolute;right:0;top:0}.dd2-handle,.dd-dragel>li>.dd2-handle{left:0;top:0;width:36px;margin:0;border-width:1px 1px 0 0;text-align:center;padding:0!important;line-height:38px;height:38px;background:#EBEDF2;border:1px solid #DEE4EA;cursor:pointer;overflow:hidden;position:absolute;z-index:1}.dd2-handle:hover,.dd-dragel>li>.dd2-handle{background:#E3E8ED}.dd2-content[class*=btn-]{text-shadow:none!important}.dd2-handle[class*=btn-]{text-shadow:none!important;background:rgba(0,0,0,.1)!important;border-right:1px solid #EEE}.dd2-handle[class*=btn-]:hover{background:rgba(0,0,0,.08)!important}.dd-dragel .dd2-handle[class*=btn-]{border-color:transparent;border-right-color:#EEE}.dd2-handle.btn-yellow{text-shadow:none!important;background:rgba(0,0,0,.05)!important;border-right:1px solid #FFF}.dd2-handle.btn-yellow:hover{background:rgba(0,0,0,.08)!important}.dd-dragel .dd2-handle.btn-yellow{border-color:transparent;border-right-color:#FFF}.dd-item>.dd2-handle .drag-icon{display:none}.dd-dragel>.dd-item>.dd2-handle .drag-icon{display:inline}.dd-dragel>.dd-item>.dd2-handle .normal-icon{display:none}.dropzone{border-radius:0;border:1px solid rgba(0,0,0,.06)}.dropzone .dz-default.dz-message{background-image:none;font-size:24px;text-align:center;line-height:32px;left:0;width:100%;margin-left:auto}.dropzone .dz-default.dz-message span{display:inline;color:#555}.dropzone .dz-default.dz-message span .upload-icon{opacity:.7;filter:alpha(opacity=70);margin-top:8px;cursor:pointer}.dropzone .dz-default.dz-message span .upload-icon:hover{opacity:1;filter:alpha(opacity=100)}.dropzone .dz-preview .dz-error-mark,.dropzone-previews .dz-preview .dz-error-mark,.dropzone .dz-preview .dz-success-mark,.dropzone-previews .dz-preview .dz-success-mark{background-image:none;background-color:rgba(255,255,255,.8);border-radius:100%;text-align:center;line-height:35px}.dropzone .dz-preview .dz-error-mark:before,.dropzone-previews .dz-preview .dz-error-mark:before{font-family:FontAwesome;font-size:30px;color:#DB6262;content:"\f00d"}.dropzone .dz-preview .dz-success-mark:before,.dropzone-previews .dz-preview .dz-success-mark:before{font-family:FontAwesome;font-size:30px;color:#6DA552;content:"\f00c"}.dropzone a.dz-remove,.dropzone-previews a.dz-remove{border:none;border-radius:0;color:#FFF;background:#D15B47;cursor:pointer}.dropzone a.dz-remove:hover,.dropzone-previews a.dz-remove:hover{color:#FFF;background:#B74635}.dropzone .progress,.dropzone-previews .progress{margin-bottom:0}.dropzone .dz-preview.dz-success .progress,.dropzone-previews .dz-preview.dz-success .progress,.dropzone .dz-preview.dz-error .progress,.dropzone-previews .dz-preview.dz-error .progress{display:none}input.typeahead,input.tt-query,input.tt-hint{min-width:175px;font-size:16px;line-height:24px;border:1px solid #CCC;border-radius:0;outline:0}input.tt-hint,.form-group input.tt-hint{background-color:#FFF!important;color:#B0B0B0!important}.tt-dropdown-menu{text-align:left;position:absolute;left:0!important;right:0!important;min-width:175px;margin-top:2px;padding:8px 0;background-color:#FFF;border:1px solid #D0D0D0;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 2px 4px rgba(0,0,0,.2);box-shadow:0 2px 4px rgba(0,0,0,.2)}.tt-suggestion{padding:3px 12px 4px;font-size:16px;line-height:24px}.tt-suggestion.tt-cursor{color:#FFF;background-color:#4F99C6;cursor:pointer}.tt-suggestion p{margin:0}input.typeahead.scrollable~.tt-dropdown-menu{max-height:200px;overflow-y:auto}.btn-group>.btn.moveall:first-child,.btn-group>.btn.remove:first-child{margin:0}.btn-group>.btn.moveall:first-child+.btn.move,.btn-group>.btn.remove:first-child+.btn.removeall{margin:0}.bootstrap-duallistbox-container .info{font-size:12px}.bootstrap-duallistbox-container .clear1,.bootstrap-duallistbox-container .clear2{font-size:12px}.multiselect-container>li>a{padding:0}.multiselect-container>li>a>label{padding:7px 10px 7px 20px}.cancel-on-png,.cancel-off-png,.star-on-png,.star-off-png,.star-half-png{font-size:2em}.cancel-on-png,.cancel-off-png,.star-on-png,.star-off-png,.star-half-png{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;font-family:FontAwesome;font-style:normal;font-variant:normal;font-weight:400;line-height:1;speak:none;text-transform:none;color:#777}.cancel-on-png{color:#dd5a43}.cancel-on-png:before{content:"\f057"}.cancel-off-png{color:#e08374}.cancel-off-png:before{content:"\f05c"}.star-on-png{color:#feb902}.star-on-png:before{content:"\f005"}.star-off-png{color:#777}.star-off-png:before{content:"\f006"}.star-half-png{color:#feb902}.star-half-png:before{content:"\f123"}.icon-animated-bell{display:inline-block;-moz-animation:ringing 2s 5 ease 1s;-webkit-animation:ringing 2s 5 ease 1s;-o-animation:ringing 2s 5 ease 1s;-ms-animation:ringing 2s 5 ease 1s;animation:ringing 2s 5 ease 1s;-moz-transform-origin:50% 0;-webkit-transform-origin:50% 0;-o-transform-origin:50% 0;-ms-transform-origin:50% 0;transform-origin:50% 0}@-moz-keyframes ringing{0%{-moz-transform:rotate(-15deg)}2%{-moz-transform:rotate(15deg)}4%{-moz-transform:rotate(-18deg)}6%{-moz-transform:rotate(18deg)}8%{-moz-transform:rotate(-22deg)}10%{-moz-transform:rotate(22deg)}12%{-moz-transform:rotate(-18deg)}14%{-moz-transform:rotate(18deg)}16%{-moz-transform:rotate(-12deg)}18%{-moz-transform:rotate(12deg)}20%{-moz-transform:rotate(0deg)}}@-webkit-keyframes ringing{0%{-webkit-transform:rotate(-15deg)}2%{-webkit-transform:rotate(15deg)}4%{-webkit-transform:rotate(-18deg)}6%{-webkit-transform:rotate(18deg)}8%{-webkit-transform:rotate(-22deg)}10%{-webkit-transform:rotate(22deg)}12%{-webkit-transform:rotate(-18deg)}14%{-webkit-transform:rotate(18deg)}16%{-webkit-transform:rotate(-12deg)}18%{-webkit-transform:rotate(12deg)}20%{-webkit-transform:rotate(0deg)}}@-ms-keyframes ringing{0%{-ms-transform:rotate(-15deg)}2%{-ms-transform:rotate(15deg)}4%{-ms-transform:rotate(-18deg)}6%{-ms-transform:rotate(18deg)}8%{-ms-transform:rotate(-22deg)}10%{-ms-transform:rotate(22deg)}12%{-ms-transform:rotate(-18deg)}14%{-ms-transform:rotate(18deg)}16%{-ms-transform:rotate(-12deg)}18%{-ms-transform:rotate(12deg)}20%{-ms-transform:rotate(0deg)}}@keyframes ringing{0%{transform:rotate(-15deg)}2%{transform:rotate(15deg)}4%{transform:rotate(-18deg)}6%{transform:rotate(18deg)}8%{transform:rotate(-22deg)}10%{transform:rotate(22deg)}12%{transform:rotate(-18deg)}14%{transform:rotate(18deg)}16%{transform:rotate(-12deg)}18%{transform:rotate(12deg)}20%{transform:rotate(0deg)}}.icon-animated-vertical{display:inline-block;-moz-animation:vertical 2s 5 ease 2s;-webkit-animation:vertical 2s 5 ease 2s;-o-animation:vertical 2s 5 ease 2s;-ms-animation:vertical 2s 5 ease 2s;animation:vertical 2s 5 ease 2s}@-moz-keyframes vertical{0%{-moz-transform:translate(0,-3px)}4%{-moz-transform:translate(0,3px)}8%{-moz-transform:translate(0,-3px)}12%{-moz-transform:translate(0,3px)}16%{-moz-transform:translate(0,-3px)}20%{-moz-transform:translate(0,3px)}22%{-moz-transform:translate(0,0)}}@-webkit-keyframes vertical{0%{-webkit-transform:translate(0,-3px)}4%{-webkit-transform:translate(0,3px)}8%{-webkit-transform:translate(0,-3px)}12%{-webkit-transform:translate(0,3px)}16%{-webkit-transform:translate(0,-3px)}20%{-webkit-transform:translate(0,3px)}22%{-webkit-transform:translate(0,0)}}@-ms-keyframes vertical{0%{-ms-transform:translate(0,-3px)}4%{-ms-transform:translate(0,3px)}8%{-ms-transform:translate(0,-3px)}12%{-ms-transform:translate(0,3px)}16%{-ms-transform:translate(0,-3px)}20%{-ms-transform:translate(0,3px)}22%{-ms-transform:translate(0,0)}}@keyframes vertical{0%{transform:translate(0,-3px)}4%{transform:translate(0,3px)}8%{transform:translate(0,-3px)}12%{transform:translate(0,3px)}16%{transform:translate(0,-3px)}20%{transform:translate(0,3px)}22%{transform:translate(0,0)}}.icon-animated-hand-pointer{display:inline-block;-moz-animation:hand-pointer 2s 4 ease 2s;-webkit-animation:hand-pointer 2s 4 ease 2s;-o-animation:hand-pointer 2s 4 ease 2s;-ms-animation:hand-pointer 2s 4 ease 2s;animation:hand-pointer 2s 4 ease 2s}@-moz-keyframes hand-pointer{0%{-moz-transform:translate(0,0)}6%{-moz-transform:translate(5px,0)}12%{-moz-transform:translate(0,0)}18%{-moz-transform:translate(5px,0)}24%{-moz-transform:translate(0,0)}30%{-moz-transform:translate(5px,0)}36%{-moz-transform:translate(0,0)}}.icon-animated-wrench{display:inline-block;-moz-animation:wrenching 2.5s 4 ease;-webkit-animation:wrenching 2.5s 4 ease;-o-animation:wrenching 2.5s 4 ease;-ms-animation:wrenching 2.5s 4 ease;animation:wrenching 2.5s 4 ease;-moz-transform-origin:90% 35%;-webkit-transform-origin:90% 35%;-o-transform-origin:90% 35%;-ms-transform-origin:90% 35%;transform-origin:90% 35%}@-moz-keyframes wrenching{0%{-moz-transform:rotate(-12deg)}8%{-moz-transform:rotate(12deg)}10%{-moz-transform:rotate(24deg)}18%{-moz-transform:rotate(-24deg)}20%{-moz-transform:rotate(-24deg)}28%{-moz-transform:rotate(24deg)}30%{-moz-transform:rotate(24deg)}38%{-moz-transform:rotate(-24deg)}40%{-moz-transform:rotate(-24deg)}48%{-moz-transform:rotate(24deg)}50%{-moz-transform:rotate(24deg)}58%{-moz-transform:rotate(-24deg)}60%{-moz-transform:rotate(-24deg)}68%{-moz-transform:rotate(24deg)}75%{-moz-transform:rotate(0deg)}}@-webkit-keyframes wrenching{0%{-webkit-transform:rotate(-12deg)}8%{-webkit-transform:rotate(12deg)}10%{-webkit-transform:rotate(24deg)}18%{-webkit-transform:rotate(-24deg)}20%{-webkit-transform:rotate(-24deg)}28%{-webkit-transform:rotate(24deg)}30%{-webkit-transform:rotate(24deg)}38%{-webkit-transform:rotate(-24deg)}40%{-webkit-transform:rotate(-24deg)}48%{-webkit-transform:rotate(24deg)}50%{-webkit-transform:rotate(24deg)}58%{-webkit-transform:rotate(-24deg)}60%{-webkit-transform:rotate(-24deg)}68%{-webkit-transform:rotate(24deg)}75%{-webkit-transform:rotate(0deg)}}@-o-keyframes wrenching{0%{-o-transform:rotate(-12deg)}8%{-o-transform:rotate(12deg)}10%{-o-transform:rotate(24deg)}18%{-o-transform:rotate(-24deg)}20%{-o-transform:rotate(-24deg)}28%{-o-transform:rotate(24deg)}30%{-o-transform:rotate(24deg)}38%{-o-transform:rotate(-24deg)}40%{-o-transform:rotate(-24deg)}48%{-o-transform:rotate(24deg)}50%{-o-transform:rotate(24deg)}58%{-o-transform:rotate(-24deg)}60%{-o-transform:rotate(-24deg)}68%{-o-transform:rotate(24deg)}75%{-o-transform:rotate(0deg)}}@-ms-keyframes wrenching{0%{-ms-transform:rotate(-12deg)}8%{-ms-transform:rotate(12deg)}10%{-ms-transform:rotate(24deg)}18%{-ms-transform:rotate(-24deg)}20%{-ms-transform:rotate(-24deg)}28%{-ms-transform:rotate(24deg)}30%{-ms-transform:rotate(24deg)}38%{-ms-transform:rotate(-24deg)}40%{-ms-transform:rotate(-24deg)}48%{-ms-transform:rotate(24deg)}50%{-ms-transform:rotate(24deg)}58%{-ms-transform:rotate(-24deg)}60%{-ms-transform:rotate(-24deg)}68%{-ms-transform:rotate(24deg)}75%{-ms-transform:rotate(0deg)}}@keyframes wrenching{0%{transform:rotate(-12deg)}8%{transform:rotate(12deg)}10%{transform:rotate(24deg)}18%{transform:rotate(-24deg)}20%{transform:rotate(-24deg)}28%{transform:rotate(24deg)}30%{transform:rotate(24deg)}38%{transform:rotate(-24deg)}40%{transform:rotate(-24deg)}48%{transform:rotate(24deg)}50%{transform:rotate(24deg)}58%{transform:rotate(-24deg)}60%{transform:rotate(-24deg)}68%{transform:rotate(24deg)}75%{transform:rotate(0deg)}}@-moz-keyframes blinking{0%{opacity:1}40%{opacity:0}80%{opacity:1}}@-webkit-keyframes blinking{0%{opacity:1}40%{opacity:0}80%{opacity:1}}@-ms-keyframes blinking{0%{opacity:1}40%{opacity:0}80%{opacity:1}}@keyframes blinking{0%{opacity:1}40%{opacity:0}80%{opacity:1}}@-moz-keyframes pulsating{0%{-moz-transform:scale(1)}5%{-moz-transform:scale(0.75)}10%{-moz-transform:scale(1)}15%{-moz-transform:scale(1.25)}20%{-moz-transform:scale(1)}25%{-moz-transform:scale(0.75)}30%{-moz-transform:scale(1)}35%{-moz-transform:scale(1.25)}40%{-moz-transform:scale(1)}}@-webkit-keyframes pulsating{0%{-webkit-transform:scale(1)}5%{-webkit-transform:scale(0.75)}10%{-webkit-transform:scale(1)}15%{-webkit-transform:scale(1.25)}20%{-webkit-transform:scale(1)}25%{-webkit-transform:scale(0.75)}30%{-webkit-transform:scale(1)}35%{-webkit-transform:scale(1.25)}40%{-webkit-transform:scale(1)}}@-ms-keyframes pulsating{0%{-ms-transform:scale(1)}5%{-ms-transform:scale(0.75)}10%{-ms-transform:scale(1)}15%{-ms-transform:scale(1.25)}20%{-ms-transform:scale(1)}25%{-ms-transform:scale(0.75)}30%{-ms-transform:scale(1)}35%{-ms-transform:scale(1.25)}40%{-ms-transform:scale(1)}}@keyframes pulsating{0%{transform:scale(1)}5%{transform:scale(0.75)}10%{transform:scale(1)}15%{transform:scale(1.25)}20%{transform:scale(1)}25%{transform:scale(0.75)}30%{transform:scale(1)}35%{transform:scale(1.25)}40%{transform:scale(1)}}.btn-scroll-up{border-width:0;position:fixed;right:2px;z-index:99;-webkit-transition-duration:.3s;transition-duration:.3s;opacity:0;filter:alpha(opacity=0);bottom:-24px;visibility:hidden}.btn-scroll-up.display{opacity:.7;filter:alpha(opacity=70);bottom:2px;visibility:visible}.btn-scroll-up:hover{opacity:1;filter:alpha(opacity=100)}.btn-scroll-up:focus{outline:0}@media (min-width:768px){.main-container.container>.btn-scroll-up{right:auto;margin-left:714px}}@media (min-width:992px){.main-container.container>.btn-scroll-up{right:auto;margin-left:934px}}@media (min-width:1200px){.main-container.container>.btn-scroll-up{right:auto;margin-left:1134px}}.ace-settings-container{position:absolute;right:0;top:auto;z-index:12}.btn.btn-app.ace-settings-btn{float:left;display:block;text-align:center;border-radius:6px 0 0 6px;opacity:.55;vertical-align:top;margin:0}.btn.btn-app.ace-settings-btn:hover,.btn.btn-app.ace-settings-btn.open{opacity:1}.btn.btn-app.ace-settings-btn.btn-xs{width:42px}.ace-settings-box{display:block;float:left;max-width:0;max-height:0;overflow:hidden;padding:0;-moz-transform:translate(0,0);-webkit-transform:translate(0,0);-o-transform:translate(0,0);-ms-transform:translate(0,0);transform:translate(0,0);background-color:#FFF;border:0 solid #ffb34b;-webkit-transition:max-width .25s linear 0s,max-height 0s linear .25s,padding 0s linear .25s,border-width 0s linear .25s;-o-transition:max-width .25s linear 0s,max-height 0s linear .25s,padding 0s linear .25s,border-width 0s linear .25s;transition:max-width .25s linear 0s,max-height 0s linear .25s,padding 0s linear .25s,border-width 0s linear .25s}.ace-settings-box.open{max-width:320px;max-height:1000px;padding:0 14px;border-width:2px;-webkit-transition-delay:0s;-moz-transition-delay:0s;-o-transition-delay:0s;transition-delay:0s}.ace-settings-box.open .ace-settings-item{z-index:auto;min-width:140px}.ace-settings-box .ace-settings-item{margin:6px 0;color:#444;max-height:24px;position:relative;z-index:-1;white-space:nowrap}.ace-settings-box .ace-settings-item>label.lbl{font-size:13px}@media (max-width:480px){.ace-settings-container{text-align:right}.ace-settings-box{float:none!important;text-align:left}.btn.ace-settings-btn{float:none!important;display:inline-block}}@media (max-width:320px){.ace-settings-box>.clearfix>.pull-left,.ace-settings-box>.clearfix>.pull-right{float:none!important}}.grid2,.grid3,.grid4{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;display:block;margin:0 1%;padding:0 2%;float:left;border-left:1px solid #E3E3E3}.grid2:first-child,.grid3:first-child,.grid4:first-child{border-left:none}.grid2{width:48%}.grid3{width:31.33%}.grid4{width:23%;padding:0 1%}.draggable-placeholder{border:2px dashed #D9D9D9!important;background-color:#F7F7F7!important}.easyPieChart,.easy-pie-chart{position:relative;text-align:center}.easyPieChart canvas,.easy-pie-chart canvas{position:absolute;top:0;left:0}.knob-container{direction:ltr;text-align:left}.tags{display:inline-block;padding:4px 6px;color:#777;vertical-align:middle;background-color:#FFF;border:1px solid #d5d5d5;width:206px}.tags:hover{border-color:#b5b5b5}.tags-hover,.tags-hover:hover{border-color:#f59942;outline:0}.tags[class*=span]{float:none;margin-left:0}.tags input[type=text],.tags input[type=text]:focus{border:none;display:inline;outline:0;margin:0;padding:0;line-height:18px;-webkit-box-shadow:none;box-shadow:none;width:100%}.tags .tag{display:inline-block;position:relative;font-size:13px;font-weight:400;vertical-align:baseline;white-space:nowrap;background-color:#91b8d0;color:#FFF;text-shadow:1px 1px 1px rgba(0,0,0,.15);padding:4px 22px 5px 9px;margin-bottom:3px;margin-right:3px;-webkit-transition:all .2s;-o-transition:all .2s;transition:all .2s}.tags .tag:empty{display:none}.tags .tag-important{background-color:#d15b47}.tags .tag-warning{background-color:#ffb752}.tags .tag-success{background-color:#87b87f}.tags .tag-info{background-color:#6fb3e0}.tags .tag-inverse{background-color:#555}.tags .tag .close{font-size:15px;line-height:20px;opacity:1;filter:alpha(opacity=100);color:#FFF;text-shadow:none;float:none;position:absolute;right:0;top:0;bottom:0;width:18px;text-align:center}.tags .tag .close:hover{background-color:rgba(0,0,0,.2)}.page-content>.row .col-xs-12,.page-content>.row .col-sm-12,.page-content>.row .col-md-12,.page-content>.row .col-lg-12{float:left;max-width:100%}.col-xs-reset{width:auto;padding-left:0;padding-right:0;float:none!important}@media (min-width:768px){.col-sm-reset{width:auto;padding-left:0;padding-right:0;float:none!important}}@media (min-width:992px){.col-md-reset{width:auto;padding-left:0;padding-right:0;float:none!important}}@media (min-width:1200px){.col-lg-reset{width:auto;padding-left:0;padding-right:0;float:none!important}}.jqstooltip,.legendColorBox div{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.legendLabel{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;height:22px;padding-left:2px;font-size:10px}@media only screen and (max-width:991px){body{overflow-x:hidden}}.navbar-fixed-top+.main-container{padding-top:45px}@media (max-width:479px){.navbar-fixed-top+.main-container{padding-top:90px}.navbar-fixed-top.navbar-collapse+.main-container{padding-top:45px}}@media only screen and (max-width:360px){.grid2,.grid3,.grid4{float:none;display:block;width:96%;border-left-width:0;position:relative;margin-bottom:11px;border-bottom:1px solid #E3E3E3;padding-bottom:4px}.grid2>[class*=pull-],.grid3>[class*=pull-],.grid4>[class*=pull-]{float:none!important;display:inline-block;position:absolute;right:11px;top:0;margin-top:0}.grid2:last-child,.grid3:last-child,.grid4:last-child{border-bottom-width:0}}@media only screen and (max-width:480px){.hidden-480{display:none!important}}@media only screen and (max-width:320px){.hidden-320{display:none!important}}.no-skin .navbar .navbar-toggle{background-color:#75B3D7}.no-skin .navbar .navbar-toggle:focus{background-color:#75B3D7;border-color:transparent}.no-skin .navbar .navbar-toggle:hover{background-color:#61a8d1;border-color:rgba(255,255,255,.1)}.no-skin .navbar .navbar-toggle.display,.no-skin .navbar .navbar-toggle[data-toggle=collapse]:not(.collapsed){background-color:#4d9dcc;box-shadow:inset 1px 1px 2px 0 rgba(0,0,0,.25);border-color:rgba(255,255,255,.35)}.no-skin .sidebar{background-color:#f2f2f2;border-style:solid;border-color:#ccc;border-width:0 1px 0 0}.no-skin .nav-list .open>a,.no-skin .nav-list .open>a:hover,.no-skin .nav-list .open>a:focus{background-color:#fafafa}.no-skin .nav-list>li{border-color:#e5e5e5}.no-skin .nav-list>li>a{background-color:#f8f8f8;color:#585858}.no-skin .nav-list>li>a:focus{background-color:#f8f8f8;color:#1963aa}.no-skin .nav-list>li:hover>a{background-color:#fff;color:#266cad}.no-skin .nav-list>li.open>a{background-color:#fafafa;color:#1963aa}.no-skin .nav-list>li.active>a{font-weight:700;color:#2b7dbc}.no-skin .nav-list>li.active>a,.no-skin .nav-list>li.active>a:hover,.no-skin .nav-list>li.active>a:focus{background-color:#fff}.no-skin .nav-list>li .submenu{background-color:#fff;border-color:#e5e5e5}.no-skin .nav-list>li .submenu>li>a{border-top-color:#e4e4e4;background-color:#fff;color:#616161}.no-skin .nav-list>li .submenu>li>a:hover{color:#4b88b7;background-color:#f1f5f9}.no-skin .nav-list>li .submenu>li.active>a{color:#2b7dbc}.no-skin .nav-list>li .submenu>li.active>a>.menu-icon{color:#c86139}.no-skin .nav-list>li .submenu>li.active.open>a>.menu-icon{color:inherit}@media only screen and (min-width:992px){.no-skin .nav-list>li .submenu>li.active.hover>a.dropdown-toggle>.menu-icon{color:inherit}}.no-skin .nav-list>li .submenu>li.active:not(.open)>a{background-color:#f5f7fa}.no-skin .nav-list>li .submenu>li.active:not(.open)>a:hover{background-color:#f1f5f9}.no-skin .nav-list>li>.submenu .open>a,.no-skin .nav-list>li>.submenu .open>a:hover,.no-skin .nav-list>li>.submenu .open>a:focus{border-color:#e4e4e4}.no-skin .nav-list>li>.submenu li>.submenu>li a{color:#757575}.no-skin .nav-list>li>.submenu li>.submenu>li a:hover{color:#4b88b7;background-color:#f1f5f9}.no-skin .nav-list>li>.submenu li.open>a{color:#4b88b7}.no-skin .nav-list>li>.submenu li>.submenu li.open>a,.no-skin .nav-list>li>.submenu li>.submenu li.active>a{color:#4b88b7}.no-skin .nav-list>li>.submenu:before,.no-skin .nav-list>li>.submenu>li:before{border-color:#9dbdd6}.no-skin .nav-list>li.active>.submenu:before,.no-skin .nav-list>li.active>.submenu>li:before{border-color:#8eb3d0}.no-skin .sidebar-toggle{background-color:#f3f3f3;border-color:#e0e0e0}.no-skin .sidebar-toggle>.ace-icon{border-color:#bbb;color:#aaa;background-color:#fff}.no-skin .sidebar-shortcuts{background-color:#fafafa}.no-skin .sidebar-fixed .sidebar-shortcuts{border-color:#ddd}.no-skin .sidebar-shortcuts-mini{background-color:#fff}.no-skin .nav-list li>.arrow:before{border-right-color:#B8B8B8;-moz-border-right-colors:#B8B8B8;border-width:10px 10px 10px 0;left:-11px}.no-skin .nav-list li>.arrow:after{border-right-color:#fff;-moz-border-right-colors:#fff;border-width:10px 10px 10px 0;left:-10px}.no-skin .nav-list>li.pull_up>.arrow:after{border-right-color:#fff!important;-moz-border-right-colors:#fff!important;border-width:10px 10px 10px 0!important;left:-10px!important}.no-skin .nav-list>li.pull_up>.arrow:before{border-width:10px 10px 10px 0!important;left:-11px!important}.no-skin .nav-list li.active>a:after{border-right-color:#2b7dbc;-moz-border-right-colors:#2b7dbc}.no-skin .nav-list>li.active:after{display:block;content:"";position:absolute;right:-2px;top:-1px;bottom:0;z-index:1;border:2px solid;border-width:0 2px 0 0;border-color:#2b7dbc}.no-skin .sidebar-scroll .nav-list>li.active:after{right:0}@media only screen and (max-width:991px){.no-skin .sidebar.responsive .nav-list>li.active.open>a:after,.no-skin .sidebar.responsive-max .nav-list>li.active.open>a:after{display:block}.no-skin .sidebar.responsive .nav-list li li.active>a:after,.no-skin .sidebar.responsive-max .nav-list li li.active>a:after{display:none}.no-skin .sidebar.responsive .nav-list>li.active:after,.no-skin .sidebar.responsive-max .nav-list>li.active:after{height:41px}}.no-skin .sidebar.menu-min .nav-list>li>a>.menu-text{background-color:#f5f5f5;-webkit-box-shadow:2px 1px 2px 0 rgba(0,0,0,.1);box-shadow:2px 1px 2px 0 rgba(0,0,0,.1);border-color:#ccc}.no-skin .sidebar.menu-min .nav-list>li>a.dropdown-toggle>.menu-text{-webkit-box-shadow:2px 2px 2px 0 rgba(0,0,0,.1);box-shadow:2px 2px 2px 0 rgba(0,0,0,.1)}.no-skin .sidebar.menu-min .nav-list>li.active>.submenu{border-left-color:#83b6d1}.no-skin .sidebar.menu-min .nav-list>li>.submenu{background-color:#fff;border:1px solid #ccc;border-top-color:#e6e6e6;-webkit-box-shadow:2px 2px 2px 0 rgba(0,0,0,.1);box-shadow:2px 2px 2px 0 rgba(0,0,0,.1)}.no-skin .sidebar.menu-min .nav-list>li>.arrow:after{border-right-color:#f5f5f5;-moz-border-right-colors:#f5f5f5;border-width:8px 8px 8px 0;left:-8px}.no-skin .sidebar.menu-min .nav-list>li>.arrow:before{border-width:8px 8px 8px 0;left:-9px}.no-skin .sidebar.menu-min .nav-list>li.active>.arrow:before{border-right-color:#5a9ec2;-moz-border-right-colors:#5a9ec2}.no-skin .sidebar.menu-min .nav-list>li.active>a>.menu-text{border-left-color:#83b6d1}.no-skin .sidebar.menu-min .sidebar-shortcuts-large{background-color:#fff;-webkit-box-shadow:2px 1px 2px 0 rgba(0,0,0,.1);box-shadow:2px 1px 2px 0 rgba(0,0,0,.1);border-color:#ccc}.no-skin .sidebar.menu-min .sidebar-toggle>.ace-icon{border-color:#b1b1b1}@media (max-width:991px){.no-skin .sidebar.responsive-min .nav-list>li>a>.menu-text{background-color:#f5f5f5;-webkit-box-shadow:2px 1px 2px 0 rgba(0,0,0,.1);box-shadow:2px 1px 2px 0 rgba(0,0,0,.1);border-color:#ccc}.no-skin .sidebar.responsive-min .nav-list>li>a.dropdown-toggle>.menu-text{-webkit-box-shadow:2px 2px 2px 0 rgba(0,0,0,.1);box-shadow:2px 2px 2px 0 rgba(0,0,0,.1)}.no-skin .sidebar.responsive-min .nav-list>li.active>.submenu{border-left-color:#83b6d1}.no-skin .sidebar.responsive-min .nav-list>li>.submenu{background-color:#fff;border:1px solid #ccc;border-top-color:#e6e6e6;-webkit-box-shadow:2px 2px 2px 0 rgba(0,0,0,.1);box-shadow:2px 2px 2px 0 rgba(0,0,0,.1)}.no-skin .sidebar.responsive-min .nav-list>li>.arrow:after{border-right-color:#f5f5f5;-moz-border-right-colors:#f5f5f5;border-width:8px 8px 8px 0;left:-8px}.no-skin .sidebar.responsive-min .nav-list>li>.arrow:before{border-width:8px 8px 8px 0;left:-9px}.no-skin .sidebar.responsive-min .nav-list>li.active>.arrow:before{border-right-color:#5a9ec2;-moz-border-right-colors:#5a9ec2}.no-skin .sidebar.responsive-min .nav-list>li.active>a>.menu-text{border-left-color:#83b6d1}.no-skin .sidebar.responsive-min .sidebar-shortcuts-large{background-color:#fff;-webkit-box-shadow:2px 1px 2px 0 rgba(0,0,0,.1);box-shadow:2px 1px 2px 0 rgba(0,0,0,.1);border-color:#ccc}.no-skin .sidebar.responsive-min .sidebar-toggle>.ace-icon{border-color:#b1b1b1}}@media only screen and (min-width:992px){.no-skin .nav-list li.hover>.submenu{-webkit-box-shadow:2px 1px 2px 0 rgba(0,0,0,.1);box-shadow:2px 1px 2px 0 rgba(0,0,0,.1);border-color:#ccc}.no-skin .nav-list li.hover>.submenu>li.active>a{background-color:#f5f5f5}.no-skin .nav-list li.hover>.submenu>li:hover>a{background-color:#eef3f7;color:#2e7db4}}@media only screen and (min-width:992px) and (max-width:991px){.no-skin .sidebar.navbar-collapse .nav-list li li.hover.active.open>a{background-color:#fff}.no-skin .sidebar.navbar-collapse .nav-list li li.hover:hover>a{background-color:#fff}.no-skin .sidebar.navbar-collapse .nav-list li li.hover>a:hover,.no-skin .sidebar.navbar-collapse .nav-list li li.hover.open>a:hover,.no-skin .sidebar.navbar-collapse .nav-list li li.hover.open.active>a:hover{background-color:#f1f5f9}.no-skin .sidebar.navbar-collapse .nav-list>li .submenu>li.active.hover>a.dropdown-toggle>.menu-icon{color:#c86139}.no-skin .sidebar.navbar-collapse .nav-list>li .submenu>li.active.open.hover>a.dropdown-toggle>.menu-icon{color:inherit}}@media only screen and (min-width:992px){.no-skin .sidebar.navbar-collapse .nav-list>li.open.hover:not(:hover):not(:focus):not(.active)>a{color:#585858}.no-skin .sidebar.navbar-collapse .nav-list>li.open.hover:not(:hover):not(:focus):not(.active)>a>.arrow{color:inherit}.no-skin .sidebar.navbar-collapse .nav-list>li.open.hover:hover>a{background-color:#fff}.no-skin .sidebar.navbar-collapse .nav-list>li>.submenu li.open.hover:not(:hover):not(:focus):not(.active)>a{color:#616161}.no-skin .sidebar.navbar-collapse .nav-list>li>.submenu li.open.hover:not(:hover):not(:focus):not(.active)>a>.arrow{color:inherit}}@media only screen and (min-width:992px) and (max-width:991px){.no-skin .sidebar.navbar-collapse .nav-list li.hover>.submenu{border-top-color:#e5e5e5;background-color:#fff}.no-skin .nav-list li.hover>.submenu>li.active:not(.open)>a{background-color:#f5f7fa}.no-skin .nav-list li.hover>.submenu>li.active:not(.open)>a:hover{background-color:#f1f5f9}}@media only screen and (min-width:992px){.no-skin .sidebar.h-sidebar{background-color:#f8f8f8}.no-skin .sidebar.h-sidebar:before{background-color:#e4e4e4;-webkit-box-shadow:0 -1px 1px 0 rgba(0,0,0,.05) inset;box-shadow:0 -1px 1px 0 rgba(0,0,0,.05) inset}.no-skin .sidebar.h-sidebar .nav-list>li:hover,.no-skin .sidebar.h-sidebar .nav-list>li:hover+li{border-left-color:#cedde5}.no-skin .sidebar.h-sidebar .nav-list>li:last-child:hover{border-right-color:#cedde5}.no-skin .sidebar.h-sidebar .nav-list>li.active,.no-skin .sidebar.h-sidebar .nav-list>li.active+li,.no-skin .sidebar.h-sidebar .nav-list>li:hover+li.active{border-left-color:#79b0ce}.no-skin .sidebar.h-sidebar .nav-list>li.active:last-child{border-right-color:#79b0ce}.no-skin .sidebar.h-sidebar .nav-list>li.active:before{background-color:#2b7dbc}.no-skin .sidebar.h-sidebar .nav-list>li.active>a:after{border-width:0 0 2px 0;border-color:transparent;border-bottom-color:#FFF;left:0;right:0;top:auto;bottom:-2px}.no-skin .sidebar.h-sidebar .sidebar-shortcuts-large{background-color:#FFF;border-color:#ccc;-webkit-box-shadow:2px 1px 2px 0 rgba(0,0,0,.1);box-shadow:2px 1px 2px 0 rgba(0,0,0,.1)}.no-skin .sidebar.h-sidebar .sidebar-shortcuts-large:after{border-bottom-color:#FFF;-moz-border-bottom-colors:#FFF}.no-skin .sidebar.h-sidebar .nav-list>li.hover>.submenu{border-color:#ccc}.no-skin .sidebar.h-sidebar.menu-min .nav-list>li.hover>.submenu{border-top-color:#e6e6e6}.no-skin .sidebar.h-sidebar .nav-list>li.hover>.arrow:after{border-color:transparent;-moz-border-right-colors:none;-moz-border-top-colors:none;-moz-border-left-colors:none;border-bottom-color:#FFF;-moz-border-bottom-colors:#FFF}.no-skin .sidebar.h-sidebar .nav-list>li.hover>.arrow:before{border-color:transparent;-moz-border-right-colors:none;-moz-border-top-colors:none;-moz-border-left-colors:none;-moz-border-bottom-colors:#B8B8B8;border-bottom-color:#B8B8B8}.no-skin .sidebar.h-sidebar.menu-min .nav-list>li.hover>.arrow:after{-moz-border-bottom-colors:#F5F5F5;border-bottom-color:#F5F5F5}.no-skin .sidebar.h-sidebar.menu-min .nav-list>li.active>a>.menu-text{border-left-color:#ccc}}@media only screen and (max-width:991px){.no-skin .sidebar{border-width:0 1px 1px 0;border-top-color:#d6d6d6}.no-skin .menu-toggler+.sidebar.responsive{border-top-width:1px}.no-skin .sidebar.responsive-min{border-width:0 1px 0 0}.no-skin .sidebar.navbar-collapse{border-width:0;border-bottom-width:1px!important;border-bottom-color:#ccc;-webkit-box-shadow:0 2px 2px rgba(0,0,0,.1)!important;box-shadow:0 2px 2px rgba(0,0,0,.1)!important}.no-skin .sidebar.navbar-collapse.menu-min .nav-list>li>.submenu{background-color:#fff}}.no-skin .sidebar-scroll .sidebar-shortcuts{border-bottom-color:#ddd}.no-skin .sidebar-scroll .sidebar-toggle{border-top-color:#ddd}.no-skin .main-container .menu-toggler{background-color:#444}.no-skin .main-container .menu-toggler:before{border-top-color:#87b87f;border-bottom-color:#6fb3e0}.no-skin .main-container .menu-toggler:after{border-top-color:#ffa24d;border-bottom-color:#d15b47}.no-skin .main-container .menu-toggler>.toggler-text{border-top-color:#444;-moz-border-top-colors:#444}.no-skin .nav-list>li.disabled:before{display:none!important}.no-skin .nav-list>li.disabled>a{background-color:#ebebeb!important;color:#656565!important}.no-skin .nav-list li .submenu>li.disabled>a,.no-skin .nav-list li.disabled .submenu>li>a{background-color:#f2f2f2!important;color:#7a7a7a!important;cursor:not-allowed!important}.no-skin .nav-list li .submenu>li.disabled>a>.menu-icon,.no-skin .nav-list li.disabled .submenu>li>a>.menu-icon{display:none}.nav-list li.highlight li.active>a:after,.nav-list li li.highlight.active>a:after,.nav-list li.highlight li.active>a:before,.nav-list li li.highlight.active>a:before{display:none}.nav-list>li.highlight.active>a:after,.nav-list>li.highlight.active>a:before{display:block}.no-skin .nav-list>li.highlight:hover,.no-skin .nav-list>li.highlight.active{border-color:#c8d8e2}.no-skin .nav-list>li.highlight:hover+li,.no-skin .nav-list>li.highlight.active+li{border-top-color:#c8d8e2}.no-skin .nav-list>li.highlight:hover>a,.no-skin .nav-list>li.highlight.active>a{background-color:#FFF}.no-skin .nav-list>li.highlight.active:after{display:none}.no-skin .nav-list>li.highlight.active:before{display:block;background-color:#4f90c2}.no-skin .nav-list>li.highlight.active>a{background-color:#f2f6f9!important}.no-skin .nav-list>li.highlight.active>a:before,.no-skin .nav-list>li.highlight.active>a:after{display:block;content:"";position:absolute;top:-1px;right:-10px;bottom:auto;z-index:1;border-style:solid;border-width:20px 0 21px 10px;border-color:transparent}.no-skin .nav-list>li.highlight.active>a:before{border-left-color:#a0bccd;-moz-border-left-colors:#a0bccd;right:-11px}.no-skin .nav-list>li.highlight.active>a:after{border-left-color:#f2f6f9;-moz-border-left-colors:#f2f6f9}.no-skin .nav-list li li.highlight.active>a{background-color:#f2f6f9}.no-skin .nav-list li li.highlight.active.open>a{background-color:#FFF}.no-skin .nav-list li li.highlight.active.open>a:hover{background-color:#f1f5f9}@media (min-width:992px){.no-skin .sidebar.h-sidebar .nav-list>li.highlight.active>a:after{display:block;content:"";position:absolute;left:0;top:auto;right:auto;bottom:-2px;left:50%;margin-left:-7px;border-color:transparent;-moz-border-right-colors:none;-moz-border-left-colors:none;-moz-border-top-colors:none;border-width:8px 7px;border-bottom-color:#FFF;-moz-border-bottom-colors:#FFF}.no-skin .sidebar.h-sidebar .nav-list>li.highlight.active>a:before{content:"";position:absolute;display:block;left:0;top:auto;right:auto;bottom:-1px;left:50%;margin-left:-7px;border-width:8px;border-color:transparent;-moz-border-right-colors:none;-moz-border-left-colors:none;-moz-border-top-colors:none;border-bottom-color:#74add7;-moz-border-bottom-colors:#74add7}.no-skin .sidebar.h-sidebar .nav-list>li.highlight.active:hover>a:after,.no-skin .sidebar.h-sidebar .nav-list>li.highlight.active.hover-show>a:after,.no-skin .sidebar.h-sidebar .nav-list>li.highlight.active:hover>a:before,.no-skin .sidebar.h-sidebar .nav-list>li.highlight.active.hover-show>a:before{display:none}}@media (min-width:992px){.sidebar.compact .nav-list li.highlight.active>a:after,.sidebar.compact .nav-list li.highlight.active>a:before{display:none}.sidebar.compact.menu-min .nav-list li.highlight.active>a:after,.sidebar.compact.menu-min .nav-list li.highlight.active>a:before{display:block}}@media (min-width:992px){.sidebar.h-sidebar .nav-list li.highlight.active>a:after,.sidebar.h-sidebar .nav-list li.highlight.active>a:before{display:block;border-width:8px!important;-moz-border-left-colors:none!important;-moz-border-right-colors:none!important;border-left-color:transparent!important;border-right-color:transparent!important}.sidebar.h-sidebar .nav-list>li.highlight.active:hover>a:after,.sidebar.h-sidebar .nav-list>li.highlight.active:hover>a:before{display:none!important}}.sidebar-scroll .nav-list>li.active.highlight>a:after,.sidebar-scroll .nav-list>li.active.highlight>a:before{display:none!important}.onpage-help-backdrop{position:absolute;z-index:99990;top:0;bottom:0;left:0;right:0;background-color:#000;filter:alpha(opacity=5);background-color:rgba(0,0,0,.05)}.onpage-help-section{display:block;position:absolute;z-index:100000;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#4DFFFFFF', endColorstr='#4DFFFFFF', GradientType=0);background-color:rgba(255,255,255,.3);border:1px dashed #8BBCD3;border-radius:4px;transition:background-color .2s,border-color .2s;-webkit-transition:background-color .2s,border-color .2s;text-align:center;vertical-align:middle;outline:0!important}.onpage-help-section>.ie-hover-fix{display:block;position:absolute;top:0;bottom:0;left:0;right:0;background-color:#FFF;filter:alpha(opacity=1)}.onpage-help-section:focus,.onpage-help-section:active{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#33C9D8EA', endColorstr='#33C9D8EA', GradientType=0);background-color:rgba(201,216,234,.2);border-color:#77ACC4}.onpage-help-section:hover{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#66C9D8EA', endColorstr='#66C9D8EA', GradientType=0);background-color:rgba(201,216,234,.4);border-color:#77ACC4;border-style:solid}.onpage-help-section>.help-icon-1{font-size:18px;display:inline-block;position:absolute;z-index:1;top:50%;left:50%;transform:translate(-50%,-50%);-webkit-transform:translate(-50%,-50%);opacity:0;filter:alpha(opacity=0);color:#FFF;text-shadow:0 0 2px #000;background-color:#85B8DB;border:2px solid #FFF;border-radius:100%;box-shadow:0 0 2px 1px rgba(0,0,0,.4);width:48px;height:48px;line-height:46px;transition:opacity .2s;-webkit-transition:opacity .2s}.onpage-help-section:focus>.help-icon-1,.onpage-help-section:active>.help-icon-1{opacity:.5}.onpage-help-section:hover>.help-icon-1{opacity:1;filter:alpha(opacity=100)}.onpage-help-section.help-section-small>.help-icon-1{font-size:18px;width:28px;height:28px;line-height:26px;border-radius:12px}.onpage-help-section.help-section-smaller>.help-icon-1{font-size:14px;width:20px;height:20px;line-height:17px;border-radius:8px}.onpage-help-section>.help-icon-2{position:absolute;z-index:2;left:-4px;top:-4px;width:18px;height:18px;line-height:16px;display:block;font-size:16px;color:orange;background-color:#FFF;border:1px solid orange;border-radius:4px;opacity:1;transition:all .2s;-webkit-transition:all .2s}.onpage-help-section:hover>.help-icon-2{color:#59A34E;border-color:#59A34E;transform:scale(1.25);-webkit-transform:scale(1.25)}.onpage-help-modal{z-index:100010}.onpage-help-modal+.modal-backdrop{z-index:100009}.onpage-help-modal-buttons button{border-radius:100%;border-width:2px!important}.onpage-help-modal-buttons button:focus{outline:0!important}.onpage-help-modal-buttons button.disabled{transform:scale(0.9);-webkit-transform:scale(0.9)}.onpage-help-content{max-width:800px;margin:0 auto}.code-modal.onpage-help-modal .modal-dialog{margin-top:6px;margin-bottom:6px}.code-modal.onpage-help-modal .modal-header{padding-top:6px;padding-bottom:6px}.code-modal.onpage-help-modal .modal-body{padding:10px 12px}.onpage-help-modal pre{border-width:0;box-shadow:none;border-radius:0;margin-top:8px}.onpage-help-modal .modal-title code{font-size:13px}.onpage-help-modal .modal-body{font-size:14px}@media print{.navbar{display:none!important}.sidebar{display:none!important}.main-content{margin-left:0!important;margin-right:0!important}.main-content .nav-search{display:none!important}.main-content .breadcrumbs{float:right;border-width:0!important}.main-content .breadcrumbs .breadcrumb>li+li:before{content:"/"}.main-content .breadcrumbs .breadcrumb .home-icon{display:none}.ace-settings-container{display:none!important}.footer{width:100%;height:auto;position:relative}.footer .footer-inner,.footer .footer-inner .footer-content{width:100%}.btn-scroll-up{display:none!important}.btn,.btn.btn-app{background:transparent none!important;border-width:1px!important;border-radius:0!important;color:#555!important}.label{border:1px solid #666!important}.label[class*=arrowed]:before,.label[class*=arrowed]:after{display:none!important}}
\ No newline at end of file
diff --git a/NewLife.Cube/Content/ace/css/images/meteorshower2.jpg b/NewLife.Cube/Content/ace/css/images/meteorshower2.jpg
deleted file mode 100644
index 6a227d4bb8..0000000000
Binary files a/NewLife.Cube/Content/ace/css/images/meteorshower2.jpg and /dev/null differ
diff --git a/NewLife.Cube/Content/ace/css/images/pattern.jpg b/NewLife.Cube/Content/ace/css/images/pattern.jpg
deleted file mode 100644
index fae09c77f6..0000000000
Binary files a/NewLife.Cube/Content/ace/css/images/pattern.jpg and /dev/null differ
diff --git a/NewLife.Cube/Content/ace/fonts/OpenSans-300.woff b/NewLife.Cube/Content/ace/fonts/OpenSans-300.woff
deleted file mode 100644
index 99f335326a..0000000000
Binary files a/NewLife.Cube/Content/ace/fonts/OpenSans-300.woff and /dev/null differ
diff --git a/NewLife.Cube/Content/ace/fonts/OpenSans-400.woff b/NewLife.Cube/Content/ace/fonts/OpenSans-400.woff
deleted file mode 100644
index 55b25f8670..0000000000
Binary files a/NewLife.Cube/Content/ace/fonts/OpenSans-400.woff and /dev/null differ
diff --git a/NewLife.Cube/Content/ace/js/ace-elements.min.js b/NewLife.Cube/Content/ace/js/ace-elements.min.js
deleted file mode 100644
index b54d2f2084..0000000000
--- a/NewLife.Cube/Content/ace/js/ace-elements.min.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*!
- * Ace v1.3.3
- */
-if("undefined"==typeof jQuery)throw new Error("Ace's JavaScript requires jQuery");!function(a,b){var c=function(c,d){function e(a){a.preventDefault(),a.stopPropagation();var b=B.offset(),c=b[p],d=v?a.pageY:a.pageX;d>c+H?(H=d-c-G+J,H>I&&(H=I)):(H=d-c-J,0>H&&(H=0)),m.update_scroll()}function f(b){b.preventDefault(),b.stopPropagation(),cb=bb=v?b.pageY:b.pageX,R=!0,a("html").off("mousemove.ace_scroll").on("mousemove.ace_scroll",g),a(S).off("mouseup.ace_scroll").on("mouseup.ace_scroll",h),B.addClass("active"),T&&m.$element.trigger("drag.start")}function g(a){a.preventDefault(),a.stopPropagation(),cb=v?a.pageY:a.pageX,cb-bb+H>I?cb=bb+I-H:0>cb-bb+H&&(cb=bb-H),H+=cb-bb,bb=cb,0>H?H=0:H>I&&(H=I),m.update_scroll()}function h(b){b.preventDefault(),b.stopPropagation(),R=!1,a("html").off(".ace_scroll"),a(S).off(".ace_scroll"),B.removeClass("active"),T&&m.$element.trigger("drag.end"),x&&X&&!Z&&j()}function i(a){var b=+new Date;if($&&b-eb>1e3){var c=A[u];_!=c&&(_=c,ab=!0,m.reset(!0)),eb=b}x&&X&&(null!=db&&(clearTimeout(db),db=null),B.addClass("not-idle"),Z||1!=a||j())}function j(){null!=db&&(clearTimeout(db),db=null),db=setTimeout(function(){db=null,B.removeClass("not-idle")},Y)}function k(){B.css("visibility","hidden").addClass("scroll-hover"),O=v?parseInt(B.outerWidth())||0:parseInt(B.outerHeight())||0,B.css("visibility","").removeClass("scroll-hover")}function l(){if(W!==!1){var a=z.offset(),b=a.left,c=a.top;v?N||(b+=z.outerWidth()-O):N||(c+=z.outerHeight()-O),W===!0?B.css({top:parseInt(c),left:parseInt(b)}):"left"===W?B.css("left",parseInt(b)):"top"===W&&B.css("top",parseInt(c))}}var m=this,n=ace.helper.getAttrSettings(c,a.fn.ace_scroll.defaults),o=a.extend({},a.fn.ace_scroll.defaults,d,n);this.size=0,this.lock=!1,this.lock_anyway=!1,this.$element=a(c),this.element=c;var p,q,r,s,t,u,v=!0,w=!1,x=!1,y=!1,z=null,A=null,B=null,C=null,D=null,E=null,F=null,G=0,H=0,I=0,J=0,K=!0,L=!1,M="",N=!1,O=0,P=1,Q=!1,R=!1,S="onmouseup"in window?window:"html",T=o.dragEvent||!1,U=d.scrollEvent||!1,V=o.detached||!1,W=o.updatePos||!1,X=o.hideOnIdle||!1,Y=o.hideDelay||1500,Z=!1,$=o.observeContent||!1,_=0,ab=!0;this.create=function(b){if(!y){b&&(o=a.extend({},a.fn.ace_scroll.defaults,b)),this.size=parseInt(this.$element.attr("data-size"))||o.size||200,v=!o.horizontal,p=v?"top":"left",q=v?"height":"width",r=v?"maxHeight":"maxWidth",s=v?"clientHeight":"clientWidth",t=v?"scrollTop":"scrollLeft",u=v?"scrollHeight":"scrollWidth",this.$element.addClass("ace-scroll"),"static"==this.$element.css("position")?(Q=this.element.style.position,this.element.style.position="relative"):Q=!1;var c=null;V?c=a('<div class="scroll-track scroll-detached"><div class="scroll-bar"></div></div>').appendTo("body"):(this.$element.wrapInner('<div class="scroll-content" />'),this.$element.prepend('<div class="scroll-track"><div class="scroll-bar"></div></div>')),z=this.$element,V||(z=this.$element.find(".scroll-content").eq(0)),v||z.wrapInner("<div />"),A=z.get(0),V?(B=c,l()):B=this.$element.find(".scroll-track").eq(0),C=B.find(".scroll-bar").eq(0),D=B.get(0),E=C.get(0),F=E.style,v||B.addClass("scroll-hz"),o.styleClass&&(M=o.styleClass,B.addClass(M),N=!!M.match(/scroll\-left|scroll\-top/)),0==O&&(B.show(),k()),B.hide(),B.on("mousedown",e),C.on("mousedown",f),z.on("scroll",function(){K&&(H=parseInt(Math.round(this[t]*P)),F[p]=H+"px"),K=!1,U&&this.$element.trigger("scroll",[A])}),o.mouseWheel&&(this.lock=o.mouseWheelLock,this.lock_anyway=o.lockAnyway,this.$element.on(a.event.special.mousewheel?"mousewheel.ace_scroll":"mousewheel.ace_scroll DOMMouseScroll.ace_scroll",function(b){if(!w){if(i(!0),!x)return!m.lock_anyway;R&&(R=!1,a("html").off(".ace_scroll"),a(S).off(".ace_scroll"),T&&m.$element.trigger("drag.end")),b.deltaY=b.deltaY||0;var c=b.deltaY>0||b.originalEvent.detail<0||b.originalEvent.wheelDelta>0?1:-1,d=!1,e=A[s],f=A[t];m.lock||(d=-1==c?A[u]<=f+e:0==f),m.move_bar(!0);var g=parseInt(e/8);return 80>g&&(g=80),g>m.size&&(g=m.size),g+=1,A[t]=f-c*g,d&&!m.lock_anyway}}));var d=ace.vars.touch&&"ace_drag"in a.event.special&&o.touchDrag;if(d){var g="",h=d?"ace_drag":"swipe";this.$element.on(h+".ace_scroll",function(a){if(w)return void(a.retval.cancel=!0);if(i(!0),!x)return void(a.retval.cancel=this.lock_anyway);if(g=a.direction,v&&("up"==g||"down"==g)||!v&&("left"==g||"right"==g)){var b=v?a.dy:a.dx;0!=b&&(Math.abs(b)>20&&d&&(b=2*b),m.move_bar(!0),A[t]=A[t]+b)}})}X&&B.addClass("idle-hide"),$&&B.on("mouseenter.ace_scroll",function(){Z=!0,i(!1)}).on("mouseleave.ace_scroll",function(){Z=!1,0==R&&j()}),this.$element.on("mouseenter.ace_scroll touchstart.ace_scroll",function(){ab=!0,$?i(!0):o.hoverReset&&m.reset(!0),B.addClass("scroll-hover")}).on("mouseleave.ace_scroll touchend.ace_scroll",function(){B.removeClass("scroll-hover")}),v||z.children(0).css(q,this.size),z.css(r,this.size),w=!1,y=!0}},this.is_active=function(){return x},this.is_enabled=function(){return!w},this.move_bar=function(a){K=a},this.get_track=function(){return D},this.reset=function(a){if(!w){y||this.create();var b=this.size;if(!a||ab){if(ab=!1,V){var c=parseInt(Math.round((parseInt(z.css("border-top-width"))+parseInt(z.css("border-bottom-width")))/2.5));b-=c}var d=v?A[u]:b;if(v&&0==d||!v&&0==this.element.scrollWidth)return void B.removeClass("scroll-active");var e=v?b:A.clientWidth;v||z.children(0).css(q,b),z.css(r,this.size),d>e?(x=!0,B.css(q,e).show(),P=parseFloat((e/d).toFixed(5)),G=parseInt(Math.round(e*P)),J=parseInt(Math.round(G/2)),I=e-G,H=parseInt(Math.round(A[t]*P)),F[q]=G+"px",F[p]=H+"px",B.addClass("scroll-active"),0==O&&k(),L||(o.reset&&(A[t]=0,F[p]=0),L=!0),V&&l()):(x=!1,B.hide(),B.removeClass("scroll-active"),z.css(r,""))}}},this.disable=function(){A[t]=0,F[p]=0,w=!0,x=!1,B.hide(),this.$element.addClass("scroll-disabled"),B.removeClass("scroll-active"),z.css(r,"")},this.enable=function(){w=!1,this.$element.removeClass("scroll-disabled")},this.destroy=function(){x=!1,w=!1,y=!1,this.$element.removeClass("ace-scroll scroll-disabled scroll-active"),this.$element.off(".ace_scroll"),V||(v||z.find("> div").children().unwrap(),z.children().unwrap(),z.remove()),B.remove(),Q!==!1&&(this.element.style.position=Q),null!=db&&(clearTimeout(db),db=null)},this.modify=function(b){b&&(o=a.extend({},o,b)),this.destroy(),this.create(),ab=!0,this.reset(!0)},this.update=function(c){c&&(o=a.extend({},o,c)),this.size=c.size||this.size,this.lock=c.mouseWheelLock||this.lock,this.lock_anyway=c.lockAnyway||this.lock_anyway,c.styleClass!=b&&(M&&B.removeClass(M),M=c.styleClass,M&&B.addClass(M),N=!!M.match(/scroll\-left|scroll\-top/))},this.start=function(){A[t]=0},this.end=function(){A[t]=A[u]},this.hide=function(){B.hide()},this.show=function(){B.show()},this.update_scroll=function(){K=!1,F[p]=H+"px",A[t]=parseInt(Math.round(H/P))};var bb=-1,cb=-1,db=null,eb=0;return this.track_size=function(){return 0==O&&k(),O},this.create(),ab=!0,this.reset(!0),_=A[u],this};a.fn.ace_scroll=function(d,e){var f,g=this.each(function(){var b=a(this),g=b.data("ace_scroll"),h="object"==typeof d&&d;g||b.data("ace_scroll",g=new c(this,h)),"string"==typeof d&&(f=g[d](e))});return f===b?g:f},a.fn.ace_scroll.defaults={size:200,horizontal:!1,mouseWheel:!0,mouseWheelLock:!1,lockAnyway:!1,styleClass:!1,observeContent:!1,hideOnIdle:!1,hideDelay:1500,hoverReset:!0,reset:!1,dragEvent:!1,touchDrag:!0,touchSwipe:!1,scrollEvent:!1,detached:!1,updatePos:!0}}(window.jQuery),function(a,b){var c=function(b,c){var d=ace.helper.getAttrSettings(b,a.fn.ace_colorpicker.defaults),e=a.extend({},a.fn.ace_colorpicker.defaults,c,d),f=a(b),g="",h="",i=null,j=[];f.addClass("hide").find("option").each(function(){var a="colorpick-btn",b=this.value.replace(/[^\w\s,#\(\)\.]/g,"");this.value!=b&&(this.value=b),this.selected&&(a+=" selected",h=b),j.push(b),g+='<li><a class="'+a+'" href="#" style="background-color:'+b+';" data-color="'+b+'"></a></li>'}).end().on("change.color",function(){f.next().find(".btn-colorpicker").css("background-color",this.value)}).after('<div class="dropdown dropdown-colorpicker">		<a data-toggle="dropdown" class="dropdown-toggle" '+(e.auto_pos?'data-position="auto"':"")+' href="#"><span class="btn-colorpicker" style="background-color:'+h+'"></span></a><ul class="dropdown-menu'+(e.caret?" dropdown-caret":"")+(e.pull_right?" dropdown-menu-right":"")+'">'+g+"</ul></div>");var k=f.next().find(".dropdown-menu");k.on(ace.click_event,function(b){var c=a(b.target);if(!c.is(".colorpick-btn"))return!1;i&&i.removeClass("selected"),i=c,i.addClass("selected");var d=i.data("color");return f.val(d).trigger("change"),b.preventDefault(),!0}),i=f.next().find("a.selected"),this.pick=function(c,d){if("number"==typeof c){if(c>=j.length)return;b.selectedIndex=c,k.find("a:eq("+c+")").trigger(ace.click_event)}else if("string"==typeof c){var e=c.replace(/[^\w\s,#\(\)\.]/g,"");if(c=j.indexOf(e),-1==c&&d===!0&&(j.push(e),a("<option />").appendTo(f).val(e),a('<li><a class="colorpick-btn" href="#"></a></li>').appendTo(k).find("a").css("background-color",e).data("color",e),c=j.length-1),-1==c)return;k.find("a:eq("+c+")").trigger(ace.click_event)}},this.destroy=function(){f.removeClass("hide").off("change.color").next().remove(),j=[]}};a.fn.ace_colorpicker=function(d,e){var f,g=this.each(function(){var b=a(this),g=b.data("ace_colorpicker"),h="object"==typeof d&&d;g||b.data("ace_colorpicker",g=new c(this,h)),"string"==typeof d&&(f=g[d](e))});return f===b?g:f},a.fn.ace_colorpicker.defaults={pull_right:!1,caret:!0,auto_pos:!0}}(window.jQuery),function(a,b){var c="multiple"in document.createElement("INPUT"),d="FileList"in window,e="FileReader"in window,f="File"in window,g=function(b,c){var d=this,e=ace.helper.getAttrSettings(b,a.fn.ace_file_input.defaults);this.settings=a.extend({},a.fn.ace_file_input.defaults,c,e),this.$element=a(b),this.element=b,this.disabled=!1,this.can_reset=!0,this.$element.off("change.ace_inner_call").on("change.ace_inner_call",function(a,b){return d.disabled||b===!0?void 0:i.call(d)});var f=this.$element.closest("label").css({display:"block"}),g=0==f.length?"label":"span";this.$element.wrap("<"+g+' class="ace-file-input" />'),this.apply_settings(),this.reset_input_field()};g.error={FILE_LOAD_FAILED:1,IMAGE_LOAD_FAILED:2,THUMBNAIL_FAILED:3},g.prototype.apply_settings=function(){var b=this;this.multi=this.$element.attr("multiple")&&c,this.well_style="well"==this.settings.style,this.well_style?this.$element.parent().addClass("ace-file-multiple"):this.$element.parent().removeClass("ace-file-multiple"),this.$element.parent().find(":not(input[type=file])").remove(),this.$element.after('<span class="ace-file-container" data-title="'+this.settings.btn_choose+'"><span class="ace-file-name" data-title="'+this.settings.no_file+'">'+(this.settings.no_icon?'<i class="'+ace.vars.icon+this.settings.no_icon+'"></i>':"")+"</span></span>"),this.$label=this.$element.next(),this.$container=this.$element.closest(".ace-file-input");var e=!!this.settings.icon_remove;if(e){var f=a('<a class="remove" href="#"><i class="'+ace.vars.icon+this.settings.icon_remove+'"></i></a>').appendTo(this.$element.parent());f.on(ace.click_event,function(a){if(a.preventDefault(),!b.can_reset)return!1;var c=!0;if(b.settings.before_remove&&(c=b.settings.before_remove.call(b.element)),!c)return!1;b.reset_input();return!1})}this.settings.droppable&&d&&h.call(this)},g.prototype.show_file_list=function(b,c){var d="undefined"==typeof b?this.$element.data("ace_input_files"):b;if(d&&0!=d.length){this.well_style&&(this.$label.find(".ace-file-name").remove(),this.settings.btn_change||this.$label.addClass("hide-placeholder")),this.$label.attr("data-title",this.settings.btn_change).addClass("selected");for(var g=0;g<d.length;g++){var h="",i=!1;if("string"==typeof d[g])h=d[g];else if(f&&d[g]instanceof File)h=a.trim(d[g].name);else{if(!(d[g]instanceof Object&&d[g].hasOwnProperty("name")))continue;h=d[g].name,d[g].hasOwnProperty("type")&&(i=d[g].type),d[g].hasOwnProperty("path")||(d[g].path=d[g].name)}var k=h.lastIndexOf("\\")+1;0==k&&(k=h.lastIndexOf("/")+1),h=h.substr(k),0==i&&(i=/\.(jpe?g|png|gif|svg|bmp|tiff?)$/i.test(h)?"image":/\.(mpe?g|flv|mov|avi|swf|mp4|mkv|webm|wmv|3gp)$/i.test(h)?"video":/\.(mp3|ogg|wav|wma|amr|aac)$/i.test(h)?"audio":"file");var l={file:"fa fa-file",image:"fa fa-picture-o file-image",video:"fa fa-film file-video",audio:"fa fa-music file-audio"},m=l[i];if(this.well_style){this.$label.append('<span class="ace-file-name" data-title="'+h+'"><i class="'+ace.vars.icon+m+'"></i></span>');var n=c===!0&&f&&d[g]instanceof File?a.trim(d[g].type):"",o=e&&this.settings.thumbnail&&(n.length>0&&n.match("image")||0==n.length&&"image"==i);if(o){var p=this;a.when(j.call(this,d[g])).fail(function(a){p.settings.preview_error&&p.settings.preview_error.call(p,h,a.code)})}}else this.$label.find(".ace-file-name").attr({"data-title":h}).find(ace.vars[".icon"]).attr("class",ace.vars.icon+m)}return!0}},g.prototype.reset_input=function(){this.reset_input_ui(),this.reset_input_field()},g.prototype.reset_input_ui=function(){this.$label.attr({"data-title":this.settings.btn_choose,"class":"ace-file-container"}).find(".ace-file-name:first").attr({"data-title":this.settings.no_file,"class":"ace-file-name"}).find(ace.vars[".icon"]).attr("class",ace.vars.icon+this.settings.no_icon).prev("img").remove(),this.settings.no_icon||this.$label.find(ace.vars[".icon"]).remove(),this.$label.find(".ace-file-name").not(":first").remove(),this.reset_input_data()},g.prototype.reset_input_field=function(){this.$element.wrap("<form>").parent().get(0).reset(),this.$element.unwrap()},g.prototype.reset_input_data=function(){this.$element.data("ace_input_files")&&(this.$element.removeData("ace_input_files"),this.$element.removeData("ace_input_method"))},g.prototype.enable_reset=function(a){this.can_reset=a},g.prototype.disable=function(){this.disabled=!0,this.$element.attr("disabled","disabled").addClass("disabled")},g.prototype.enable=function(){this.disabled=!1,this.$element.removeAttr("disabled").removeClass("disabled")},g.prototype.files=function(){return a(this).data("ace_input_files")||null},g.prototype.method=function(){return a(this).data("ace_input_method")||""},g.prototype.update_settings=function(b){this.settings=a.extend({},this.settings,b),this.apply_settings()},g.prototype.loading=function(b){if(b===!1)this.$container.find(".ace-file-overlay").remove(),this.element.removeAttribute("readonly");else{var c="string"==typeof b?b:'<i class="overlay-content fa fa-spin fa-spinner orange2 fa-2x"></i>',d=this.$container.find(".ace-file-overlay");0==d.length&&(d=a('<div class="ace-file-overlay"></div>').appendTo(this.$container),d.on("click tap",function(a){return a.stopImmediatePropagation(),a.preventDefault(),!1}),this.element.setAttribute("readonly","true")),d.empty().append(c)}};var h=function(){var a=this,b=this.$element.parent();b.off("dragenter").on("dragenter",function(a){a.preventDefault(),a.stopPropagation()}).off("dragover").on("dragover",function(a){a.preventDefault(),a.stopPropagation()}).off("drop").on("drop",function(b){if(b.preventDefault(),b.stopPropagation(),!a.disabled){var c=b.originalEvent.dataTransfer,d=c.files;if(!a.multi&&d.length>1){var e=[];e.push(d[0]),d=e}return d=l.call(a,d,!0),d===!1?!1:(a.$element.data("ace_input_method","drop"),a.$element.data("ace_input_files",d),a.show_file_list(d,!0),a.$element.triggerHandler("change",[!0]),!0)}})},i=function(){var a=this.element.files||[this.element.value];return a=l.call(this,a,!1),a===!1?!1:(this.$element.data("ace_input_method","select"),this.$element.data("ace_input_files",a),this.show_file_list(a,!0),!0)},j=function(b){var c=this,d=c.$label.find(".ace-file-name:last"),e=new a.Deferred,h=function(b){d.prepend("<img class='middle' style='display:none;' />");var c=d.find("img:last").get(0);a(c).one("load",function(){i.call(null,c)}).one("error",function(){j.call(null,c)}),c.src=b},i=function(b){var f=50;"large"==c.settings.thumbnail?f=150:"fit"==c.settings.thumbnail&&(f=d.width()),d.addClass(f>50?"large":"");var h=k(b,f);if(null==h)return a(this).remove(),void e.reject({code:g.error.THUMBNAIL_FAILED});var i=h.w,j=h.h;"small"==c.settings.thumbnail&&(i=j=f),a(b).css({"background-image":"url("+h.src+")",width:i,height:j}).data("thumb",h.src).attr({src:"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVQImWNgYGBgAAAABQABh6FO1AAAAABJRU5ErkJggg=="}).show(),e.resolve()},j=function(){d.find("img").remove(),e.reject({code:g.error.IMAGE_LOAD_FAILED})};if(f&&b instanceof File){var l=new FileReader;l.onload=function(a){h(a.target.result)},l.onerror=function(){e.reject({code:g.error.FILE_LOAD_FAILED})},l.readAsDataURL(b)}else b instanceof Object&&b.hasOwnProperty("path")&&h(b.path);return e.promise()},k=function(b,c){var d=b.width,e=b.height;d=d>0?d:a(b).width(),e=e>0?e:a(b).height(),(d>c||e>c)&&(d>e?(e=parseInt(c/d*e),d=c):(d=parseInt(c/e*d),e=c));var f;try{var g=document.createElement("canvas");g.width=d,g.height=e;var h=g.getContext("2d");h.drawImage(b,0,0,b.width,b.height,0,0,d,e),f=g.toDataURL()}catch(i){f=null}return f?(/^data\:image\/(png|jpe?g|gif);base64,[0-9A-Za-z\+\/\=]+$/.test(f)||(f=null),f?{src:f,w:d,h:e}:null):null},l=function(a,b){var c=o.call(this,a,b);return-1===c?(this.reset_input(),!1):c&&0!=c.length?((c instanceof Array||d&&c instanceof FileList)&&(a=c),c=!0,this.settings.before_change&&(c=this.settings.before_change.call(this.element,a,b)),-1===c?(this.reset_input(),!1):c&&0!=c.length?((c instanceof Array||d&&c instanceof FileList)&&(a=c),a):(this.$element.data("ace_input_files")||this.reset_input(),!1)):(this.$element.data("ace_input_files")||this.reset_input(),!1)},m=function(a){return a?("string"==typeof a&&(a=[a]),0==a.length?null:new RegExp(".(?:"+a.join("|")+")$","i")):null},n=function(a){return a?("string"==typeof a&&(a=[a]),0==a.length?null:new RegExp("^(?:"+a.join("|").replace(/\//g,"\\/")+")$","i")):null},o=function(b,c){var d=m(this.settings.allowExt),e=m(this.settings.denyExt),g=n(this.settings.allowMime),h=n(this.settings.denyMime),i=this.settings.maxSize||!1;if(!(d||e||g||h||i))return!0;for(var j=[],k={},l=0;l<b.length;l++){var o=b[l],p=f?o.name:o;if(!d||d.test(p))if(e&&e.test(p))"ext"in k||(k.ext=[]),k.ext.push(p);else{var q;if(f){if((q=a.trim(o.type)).length>0){if(g&&!g.test(q)){"mime"in k||(k.mime=[]),k.mime.push(p);continue}if(h&&h.test(q)){"mime"in k||(k.mime=[]),k.mime.push(p);continue}}i&&o.size>i?("size"in k||(k.size=[]),k.size.push(p)):j.push(o)}else j.push(o)}else"ext"in k||(k.ext=[]),k.ext.push(p)}if(j.length==b.length)return b;var r={ext:0,mime:0,size:0};"ext"in k&&(r.ext=k.ext.length),"mime"in k&&(r.mime=k.mime.length),"size"in k&&(r.size=k.size.length);var s;return this.$element.trigger(s=new a.Event("file.error.ace"),{file_count:b.length,invalid_count:b.length-j.length,error_list:k,error_count:r,dropped:c}),s.isDefaultPrevented()?-1:j};a.fn.aceFileInput=a.fn.ace_file_input=function(c,d){var e,f=this.each(function(){var b=a(this),f=b.data("ace_file_input"),h="object"==typeof c&&c;f||b.data("ace_file_input",f=new g(this,h)),"string"==typeof c&&(e=f[c](d))});return e===b?f:e},a.fn.ace_file_input.defaults={style:!1,no_file:"No File ...",no_icon:"fa fa-upload",btn_choose:"Choose",btn_change:"Change",icon_remove:"fa fa-times",droppable:!1,thumbnail:!1,allowExt:null,denyExt:null,allowMime:null,denyMime:null,maxSize:!1,before_change:null,before_remove:null,preview_error:null}}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.bs_typeahead.defaults,c),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.source=this.options.source,this.$menu=a(this.options.menu),this.shown=!1,this.listen()};b.prototype={constructor:b,select:function(){var a=this.$menu.find(".active").attr("data-value");return this.$element.val(this.updater(a)).change(),this.hide()},updater:function(a){return a},show:function(){var b=a.extend({},this.$element.position(),{height:this.$element[0].offsetHeight});return this.$menu.insertAfter(this.$element).css({top:b.top+b.height,left:b.left}).show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(){var b;return this.query=this.$element.val(),!this.query||this.query.length<this.options.minLength?this.shown?this.hide():this:(b=a.isFunction(this.source)?this.source(this.query,a.proxy(this.process,this)):this.source,b?this.process(b):this)},process:function(b){var c=this;return b=a.grep(b,function(a){return c.matcher(a)}),b=this.sorter(b),b.length?this.render(b.slice(0,this.options.items)).show():this.shown?this.hide():this},matcher:function(a){return~a.toLowerCase().indexOf(this.query.toLowerCase())},sorter:function(a){for(var b,c=[],d=[],e=[];b=a.shift();)b.toLowerCase().indexOf(this.query.toLowerCase())?~b.indexOf(this.query)?d.push(b):e.push(b):c.push(b);return c.concat(d,e)},highlighter:function(a){var b=this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&");return a.replace(new RegExp("("+b+")","ig"),function(a,b){return"<strong>"+b+"</strong>"})},render:function(b){var c=this;return b=a(b).map(function(b,d){return b=a(c.options.item).attr("data-value",d),b.find("a").html(c.highlighter(d)),b[0]}),b.first().addClass("active"),this.$menu.html(b),this},next:function(){var b=this.$menu.find(".active").removeClass("active"),c=b.next();c.length||(c=a(this.$menu.find("li")[0])),c.addClass("active")},prev:function(){var a=this.$menu.find(".active").removeClass("active"),b=a.prev();b.length||(b=this.$menu.find("li").last()),b.addClass("active")},listen:function(){this.$element.on("focus",a.proxy(this.focus,this)).on("blur",a.proxy(this.blur,this)).on("keypress",a.proxy(this.keypress,this)).on("keyup",a.proxy(this.keyup,this)),this.eventSupported("keydown")&&this.$element.on("keydown",a.proxy(this.keydown,this)),this.$menu.on("click",a.proxy(this.click,this)).on("mouseenter","li",a.proxy(this.mouseenter,this)).on("mouseleave","li",a.proxy(this.mouseleave,this))},eventSupported:function(a){var b=a in this.$element;return b||(this.$element.setAttribute(a,"return;"),b="function"==typeof this.$element[a]),b},move:function(a){if(this.shown){switch(a.keyCode){case 9:case 13:case 27:a.preventDefault();break;case 38:a.preventDefault(),this.prev();break;case 40:a.preventDefault(),this.next()}a.stopPropagation()}},keydown:function(b){this.suppressKeyPressRepeat=~a.inArray(b.keyCode,[40,38,9,13,27]),this.move(b)},keypress:function(a){this.suppressKeyPressRepeat||this.move(a)},keyup:function(a){switch(a.keyCode){case 40:case 38:case 16:case 17:case 18:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}a.stopPropagation(),a.preventDefault()},focus:function(){this.focused=!0},blur:function(){this.focused=!1,!this.mousedover&&this.shown&&this.hide()},click:function(a){a.stopPropagation(),a.preventDefault(),this.select(),this.$element.focus()},mouseenter:function(b){this.mousedover=!0,this.$menu.find(".active").removeClass("active"),a(b.currentTarget).addClass("active")},mouseleave:function(){this.mousedover=!1,!this.focused&&this.shown&&this.hide()}};var c=a.fn.bs_typeahead;a.fn.bs_typeahead=function(c){return this.each(function(){var d=a(this),e=d.data("bs_typeahead"),f="object"==typeof c&&c;e||d.data("bs_typeahead",e=new b(this,f)),"string"==typeof c&&e[c]()})},a.fn.bs_typeahead.defaults={source:[],items:8,menu:'<ul class="typeahead dropdown-menu"></ul>',item:'<li><a href="#"></a></li>',minLength:1},a.fn.bs_typeahead.Constructor=b,a.fn.bs_typeahead.noConflict=function(){return a.fn.bs_typeahead=c,this},a(document).on("focus.bs_typeahead.data-api",'[data-provide="bs_typeahead"]',function(){var b=a(this);b.data("bs_typeahead")||b.bs_typeahead(b.data())})}(window.jQuery),function(a){a.fn.ace_wysiwyg=function(b){var c=a.extend({speech_button:!0,wysiwyg:{}},b),d=["#ac725e","#d06b64","#f83a22","#fa573c","#ff7537","#ffad46","#42d692","#16a765","#7bd148","#b3dc6c","#fbe983","#fad165","#92e1c0","#9fe1e7","#9fc6e7","#4986e7","#9a9cff","#b99aff","#c2c2c2","#cabdbf","#cca6ac","#f691b2","#cd74e6","#a47ae2","#444444"],e={font:{values:["Arial","Courier","Comic Sans MS","Helvetica","Open Sans","Tahoma","Verdana"],icon:"fa fa-font",title:"Font"},fontSize:{values:{5:"Huge",3:"Normal",1:"Small"},icon:"fa fa-text-height",title:"Font Size"},bold:{icon:"fa fa-bold",title:"Bold (Ctrl/Cmd+B)"},italic:{icon:"fa fa-italic",title:"Italic (Ctrl/Cmd+I)"},strikethrough:{icon:"fa fa-strikethrough",title:"Strikethrough"},underline:{icon:"fa fa-underline",title:"Underline"},insertunorderedlist:{icon:"fa fa-list-ul",title:"Bullet list"},insertorderedlist:{icon:"fa fa-list-ol",title:"Number list"},outdent:{icon:"fa fa-outdent",title:"Reduce indent (Shift+Tab)"},indent:{icon:"fa fa-indent",title:"Indent (Tab)"},justifyleft:{icon:"fa fa-align-left",title:"Align Left (Ctrl/Cmd+L)"},justifycenter:{icon:"fa fa-align-center",title:"Center (Ctrl/Cmd+E)"},justifyright:{icon:"fa fa-align-right",title:"Align Right (Ctrl/Cmd+R)"},justifyfull:{icon:"fa fa-align-justify",title:"Justify (Ctrl/Cmd+J)"},createLink:{icon:"fa fa-link",title:"Hyperlink",button_text:"Add",placeholder:"URL",button_class:"btn-primary"},unlink:{icon:"fa fa-chain-broken",title:"Remove Hyperlink"},insertImage:{icon:"fa fa-picture-o",title:"Insert picture",button_text:'<i class="'+ace.vars.icon+'fa fa-file"></i> Choose Image &hellip;',placeholder:"Image URL",button_insert:"Insert",button_class:"btn-success",button_insert_class:"btn-primary",choose_file:!0},foreColor:{values:d,title:"Change Color"},backColor:{values:d,title:"Change Background Color"},undo:{icon:"fa fa-undo",title:"Undo (Ctrl/Cmd+Z)"},redo:{icon:"fa fa-repeat",title:"Redo (Ctrl/Cmd+Y)"},viewSource:{icon:"fa fa-code",title:"View Source"}},f=c.toolbar||["font",null,"fontSize",null,"bold","italic","strikethrough","underline",null,"insertunorderedlist","insertorderedlist","outdent","indent",null,"justifyleft","justifycenter","justifyright","justifyfull",null,"createLink","unlink",null,"insertImage",null,"foreColor",null,"undo","redo",null,"viewSource"];return this.each(function(){var b=' <div class="wysiwyg-toolbar btn-toolbar center"> <div class="btn-group"> ';for(var d in f)if(f.hasOwnProperty(d)){var g=f[d];if(null===g){b+=' </div> <div class="btn-group"> ';continue}if("string"==typeof g&&g in e)g=e[g],g.name=f[d];else{if(!("object"==typeof g&&g.name in e))continue;g=a.extend(e[g.name],g)}var h="className"in g?g.className:"btn-default";switch(g.name){case"font":b+=' <a class="btn btn-sm '+h+' dropdown-toggle" data-toggle="dropdown" title="'+g.title+'"><i class="'+ace.vars.icon+g.icon+'"></i><i class="'+ace.vars.icon+'fa fa-angle-down icon-on-right"></i></a> ',b+=' <ul class="dropdown-menu dropdown-light dropdown-caret">';for(var i in g.values)g.values.hasOwnProperty(i)&&(b+=' <li><a data-edit="fontName '+g.values[i]+'" style="font-family:\''+g.values[i]+"'\">"+g.values[i]+"</a></li> ");b+=" </ul>";break;case"fontSize":b+=' <a class="btn btn-sm '+h+' dropdown-toggle" data-toggle="dropdown" title="'+g.title+'"><i class="'+ace.vars.icon+g.icon+'"></i>&nbsp;<i class="'+ace.vars.icon+'fa fa-angle-down icon-on-right"></i></a> ',b+=' <ul class="dropdown-menu dropdown-light dropdown-caret"> ';for(var j in g.values)g.values.hasOwnProperty(j)&&(b+=' <li><a data-edit="fontSize '+j+'"><font size="'+j+'">'+g.values[j]+"</font></a></li> ");b+=" </ul> ";break;case"createLink":b+=' <div class="btn-group"> <a class="btn btn-sm '+h+' dropdown-toggle" data-toggle="dropdown" title="'+g.title+'"><i class="'+ace.vars.icon+g.icon+'"></i></a> ',b+=' <div class="dropdown-menu dropdown-caret dropdown-menu-right">							 <div class="input-group">								<input class="form-control" placeholder="'+g.placeholder+'" type="text" data-edit="'+g.name+'" />								<span class="input-group-btn">									<button class="btn btn-sm '+g.button_class+'" type="button">'+g.button_text+"</button>								</span>							 </div>						</div> </div>";break;case"insertImage":b+=' <div class="btn-group"> <a class="btn btn-sm '+h+' dropdown-toggle" data-toggle="dropdown" title="'+g.title+'"><i class="'+ace.vars.icon+g.icon+'"></i></a> ',b+=' <div class="dropdown-menu dropdown-caret dropdown-menu-right">							 <div class="input-group">								<input class="form-control" placeholder="'+g.placeholder+'" type="text" data-edit="'+g.name+'" />								<span class="input-group-btn">									<button class="btn btn-sm '+g.button_insert_class+'" type="button">'+g.button_insert+"</button>								</span>							 </div>",g.choose_file&&"FileReader"in window&&(b+='<div class="space-2"></div>							 <label class="center block no-margin-bottom">								<button class="btn btn-sm '+g.button_class+' wysiwyg-choose-file" type="button">'+g.button_text+'</button>								<input type="file" data-edit="'+g.name+'" />							  </label>'),b+=" </div> </div>";break;case"foreColor":case"backColor":b+=' <select class="hide wysiwyg_colorpicker" title="'+g.title+'"> ',a.each(g.values,function(a,c){b+=' <option value="'+c+'">'+c+"</option> "}),b+=" </select> ",b+=' <input style="display:none;" disabled class="hide" type="text" data-edit="'+g.name+'" /> ';break;case"viewSource":b+=' <a class="btn btn-sm '+h+'" data-view="source" title="'+g.title+'"><i class="'+ace.vars.icon+g.icon+'"></i></a> ';break;default:b+=' <a class="btn btn-sm '+h+'" data-edit="'+g.name+'" title="'+g.title+'"><i class="'+ace.vars.icon+g.icon+'"></i></a> '}}b+=" </div> ";var k;c.speech_button&&"onwebkitspeechchange"in(k=document.createElement("input"))&&(b+=' <input class="wysiwyg-speech-input" type="text" data-edit="inserttext" x-webkit-speech />'),k=null,b+=" </div> ",b=c.toolbar_place?c.toolbar_place.call(this,b):a(this).before(b).prev(),b.find("a[title]").tooltip({animation:!1,container:"body"}),b.find(".dropdown-menu input[type=text]").on("click",function(){return!1}).on("change",function(){a(this).closest(".dropdown-menu").siblings(".dropdown-toggle").dropdown("toggle")}).on("keydown",function(b){27==b.which?(this.value="",a(this).change()):13==b.which&&(b.preventDefault(),b.stopPropagation(),a(this).change())}),b.find("input[type=file]").prev().on(ace.click_event,function(){a(this).next().click()}),b.find(".wysiwyg_colorpicker").each(function(){a(this).ace_colorpicker({pull_right:!0}).change(function(){a(this).nextAll("input").eq(0).val(this.value).change()}).next().find(".btn-colorpicker").tooltip({title:this.title,animation:!1,container:"body"})});var l=a(this),m=!1;b.find("a[data-view=source]").on("click",function(b){if(b.preventDefault(),m){var c=l.next();l.html(c.val()).show(),c.remove(),a(this).removeClass("active")}else a("<textarea />").css({width:l.outerWidth(),height:l.outerHeight()}).val(l.html()).insertAfter(l),l.hide(),a(this).addClass("active");m=!m});var n=a.extend({},{activeToolbarClass:"active",toolbarSelector:b},c.wysiwyg||{});a(this).wysiwyg(n)}),this}}(window.jQuery),function(a,b){function c(b,c){var d=ace.helper.getAttrSettings(b,a.fn.ace_spinner.defaults),e=a.extend({},a.fn.ace_spinner.defaults,c,d),f=e.max;f=(""+f).length;var g=parseInt(Math.max(20*f+40,90)),h=a(b),i="btn-sm",j=2;h.hasClass("input-sm")?(i="btn-xs",j=1):h.hasClass("input-lg")&&(i="btn-lg",j=3),2==j?g+=25:3==j&&(g+=50),h.addClass("spinbox-input form-control text-center").wrap('<div class="ace-spinner middle">');var k=h.closest(".ace-spinner").spinbox(e).wrapInner("<div class='input-group'></div>"),l=k.data("fu.spinbox");e.on_sides?(h.before('<div class="spinbox-buttons input-group-btn">					<button type="button" class="btn spinbox-down '+i+" "+e.btn_down_class+'">						<i class="icon-only '+ace.vars.icon+e.icon_down+'"></i>					</button>				</div>').after('<div class="spinbox-buttons input-group-btn">					<button type="button" class="btn spinbox-up '+i+" "+e.btn_up_class+'">						<i class="icon-only '+ace.vars.icon+e.icon_up+'"></i>					</button>				</div>'),k.addClass("touch-spinner"),k.css("width",g+"px")):(h.after('<div class="spinbox-buttons input-group-btn">					<button type="button" class="btn spinbox-up '+i+" "+e.btn_up_class+'">						<i class="icon-only '+ace.vars.icon+e.icon_up+'"></i>					</button>					<button type="button" class="btn spinbox-down '+i+" "+e.btn_down_class+'">						<i class="icon-only '+ace.vars.icon+e.icon_down+'"></i>					</button>				</div>'),ace.vars.touch||e.touch_spinner?(k.addClass("touch-spinner"),k.css("width",g+"px")):(h.next().addClass("btn-group-vertical"),k.css("width",g+"px"))),k.on("changed",function(){h.trigger("change")
-}),this._call=function(a,b){l[a](b)}}a.fn.ace_spinner=function(d,e){var f,g=this.each(function(){var b=a(this),g=b.data("ace_spinner"),h="object"==typeof d&&d;g||(h=a.extend({},a.fn.ace_spinner.defaults,d),b.data("ace_spinner",g=new c(this,h))),"string"==typeof d&&(f=g._call(d,e))});return f===b?g:f},a.fn.ace_spinner.defaults={icon_up:"fa fa-chevron-up",icon_down:"fa fa-chevron-down",on_sides:!1,btn_up_class:"",btn_down_class:"",max:999,touch_spinner:!1}}(window.jQuery),function(a){a.fn.aceTree=a.fn.ace_tree=function(b){var c={"open-icon":ace.vars.icon+"fa fa-folder-open","close-icon":ace.vars.icon+"fa fa-folder",selectable:!0,"selected-icon":ace.vars.icon+"fa fa-check","unselected-icon":ace.vars.icon+"fa fa-times",loadingHTML:"Loading..."};return this.each(function(){var d=ace.helper.getAttrSettings(this,c),e=a.extend({},c,b,d),f=a(this);f.addClass("tree").attr("role","tree"),f.html('<li class="tree-branch hide" data-template="treebranch" role="treeitem" aria-expanded="false">				<div class="tree-branch-header">					<span class="tree-branch-name">						<i class="icon-folder '+e["close-icon"]+'"></i>						<span class="tree-label"></span>					</span>				</div>				<ul class="tree-branch-children" role="group"></ul>				<div class="tree-loader" role="alert">'+e.loadingHTML+'</div>			</div>			<li class="tree-item hide" data-template="treeitem" role="treeitem">				<span class="tree-item-name">				  '+(null==e["unselected-icon"]?"":'<i class="icon-item '+e["unselected-icon"]+'"></i>')+'				  <span class="tree-label"></span>				</span>			</li>'),f.addClass(1==e.selectable?"tree-selectable":"tree-unselectable"),f.tree(e)}),this}}(window.jQuery),function(a){a.fn.aceWizard=a.fn.ace_wizard=function(b){return this.each(function(){var c=a(this);c.wizard(),ace.vars.old_ie&&c.find("ul.steps > li").last().addClass("last-child");var d=b&&b.buttons?a(b.buttons):c.siblings(".wizard-actions").eq(0),e=c.data("fu.wizard");e.$prevBtn.remove(),e.$nextBtn.remove(),e.$prevBtn=d.find(".btn-prev").eq(0).on(ace.click_event,function(){e.previous()}).attr("disabled","disabled"),e.$nextBtn=d.find(".btn-next").eq(0).on(ace.click_event,function(){e.next()}).removeAttr("disabled"),e.nextText=e.$nextBtn.text();var f=b&&(b.selectedItem&&b.selectedItem.step||b.step);f&&(e.currentStep=f,e.setState())}),this}}(window.jQuery),function(a,b){function c(b,c){var e=this,f=a(b),g="right",h=!1,i=f.hasClass("fade"),j=ace.helper.getAttrSettings(b,a.fn.ace_aside.defaults);if(this.settings=a.extend({},a.fn.ace_aside.defaults,c,j),!this.settings.background||c.scroll_style||j.scroll_style||(this.settings.scroll_style="scroll-white no-track"),this.container=this.settings.container,this.container)try{a(this.container).get(0)==document.body&&(this.container=null)}catch(k){}this.container&&(this.settings.backdrop=!1,f.addClass("aside-contained"));var l=f.find(".modal-dialog"),m=f.find(".modal-content"),n=300;this.initiate=function(){b.className=b.className.replace(/(\s|^)aside\-(right|top|left|bottom)(\s|$)/gi,"$1$3"),g=this.settings.placement,g&&(g=a.trim(g.toLowerCase())),g&&/right|top|left|bottom/.test(g)||(g="right"),f.attr("data-placement",g),f.addClass("aside-"+g),/right|left/.test(g)?(h=!0,f.addClass("aside-vc")):f.addClass("aside-hz"),this.settings.fixed&&f.addClass("aside-fixed"),this.settings.background&&f.addClass("aside-dark"),this.settings.offset&&f.addClass("navbar-offset"),this.settings.transition||f.addClass("transition-off"),f.addClass("aside-hidden"),this.insideContainer(),l=f.find(".modal-dialog"),m=f.find(".modal-content"),this.settings.body_scroll||f.on("mousewheel.aside DOMMouseScroll.aside touchmove.aside pointermove.aside",function(b){return a.contains(m[0],b.target)?void 0:(b.preventDefault(),!1)}),0==this.settings.backdrop&&f.addClass("no-backdrop")},this.show=function(){if(0==this.settings.backdrop)try{f.data("bs.modal").$backdrop.remove()}catch(b){}this.container?a(this.container).addClass("overflow-hidden"):f.css("position","fixed"),f.removeClass("aside-hidden")},this.hide=function(){this.container&&(this.container.addClass("overflow-hidden"),ace.vars.firefox&&b.offsetHeight),o(),ace.vars.transition&&!i&&f.one("bsTransitionEnd",function(){f.addClass("aside-hidden"),f.css("position",""),e.container&&e.container.removeClass("overflow-hidden")}).emulateTransitionEnd(n)},this.shown=function(){if(o(),a("body").removeClass("modal-open").css("padding-right",""),"invisible"==this.settings.backdrop)try{f.data("bs.modal").$backdrop.css("opacity",0)}catch(b){}var c=h?m.height():l.height();ace.vars.touch?m.addClass("overflow-scroll").css("max-height",c+"px"):m.hasClass("ace-scroll")||m.ace_scroll({size:c,reset:!0,mouseWheelLock:!0,lockAnyway:!this.settings.body_scroll,styleClass:this.settings.scroll_style,observeContent:!0,hideOnIdle:!ace.vars.old_ie,hideDelay:1500}),d.off("resize.modal.aside").on("resize.modal.aside",function(){if(ace.vars.touch)m.css("max-height",(h?m.height():l.height())+"px");else{m.ace_scroll("disable");var a=h?m.height():l.height();m.ace_scroll("update",{size:a}).ace_scroll("enable").ace_scroll("reset")}}).triggerHandler("resize.modal.aside"),e.container&&ace.vars.transition&&!i&&f.one("bsTransitionEnd",function(){e.container.removeClass("overflow-hidden")}).emulateTransitionEnd(n)},this.hidden=function(){d.off(".aside"),(!ace.vars.transition||i)&&(f.addClass("aside-hidden"),f.css("position",""))},this.insideContainer=function(){var b=a(".main-container"),c=f.find(".modal-dialog");if(c.css({right:"",left:""}),b.hasClass("container")){var e=!1;1==h&&(c.css(g,parseInt((d.width()-b.width())/2)),e=!0),e&&ace.vars.firefox&&ace.helper.redraw(b[0])}},this.flip=function(){var a={right:"left",left:"right",top:"bottom",bottom:"top"};f.removeClass("aside-"+g).addClass("aside-"+a[g]),g=a[g]};var o=function(){var a=f.find(".aside-trigger");if(0!=a.length){a.toggleClass("open");var b=a.find(ace.vars[".icon"]);0!=b.length&&b.toggleClass(b.attr("data-icon1")+" "+b.attr("data-icon2"))}};this.initiate(),this.container&&(this.container=a(this.container)),f.appendTo(this.container||"body")}var d=a(window);a(document).on("show.bs.modal",".modal.aside",function(){a(".aside.in").modal("hide"),a(this).ace_aside("show")}).on("hide.bs.modal",".modal.aside",function(){a(this).ace_aside("hide")}).on("shown.bs.modal",".modal.aside",function(){a(this).ace_aside("shown")}).on("hidden.bs.modal",".modal.aside",function(){a(this).ace_aside("hidden")}),a(window).on("resize.aside_container",function(){a(".modal.aside").ace_aside("insideContainer")}),a(document).on("settings.ace.aside",function(b,c){"main_container_fixed"==c&&a(".modal.aside").ace_aside("insideContainer")}),a.fn.aceAside=a.fn.ace_aside=function(d,e){var f,g=this.each(function(){var b=a(this),g=b.data("ace_aside"),h="object"==typeof d&&d;g||b.data("ace_aside",g=new c(this,h)),"string"==typeof d&&"function"==typeof g[d]&&(f=e instanceof Array?g[d].apply(g,e):g[d](e))});return f===b?g:f},a.fn.ace_aside.defaults={fixed:!1,background:!1,offset:!1,body_scroll:!1,transition:!0,scroll_style:"scroll-dark no-track",container:null,backdrop:!1,placement:"right"}}(window.jQuery);
\ No newline at end of file
diff --git a/NewLife.Cube/Content/ace/js/ace-extra.min.js b/NewLife.Cube/Content/ace/js/ace-extra.min.js
deleted file mode 100644
index 3129fd28dd..0000000000
--- a/NewLife.Cube/Content/ace/js/ace-extra.min.js
+++ /dev/null
@@ -1 +0,0 @@
-"ace"in window||(window.ace={}),ace.config={cookie_expiry:604800,cookie_path:"",storage_method:2},"vars"in window.ace||(window.ace.vars={}),ace.vars.very_old_ie=!("querySelector"in document.documentElement),ace.settings={is:function(a,b){return 1==ace.data.get("settings",a+"-"+b)},exists:function(a,b){return null!==ace.data.get("settings",a+"-"+b)},set:function(a,b){ace.data.set("settings",a+"-"+b,1)},unset:function(a,b){ace.data.set("settings",a+"-"+b,-1)},remove:function(a,b){ace.data.remove("settings",a+"-"+b)},navbar_fixed:function(a,b,c,d){if(ace.vars.very_old_ie)return!1;var a=a||"#navbar";if("string"==typeof a&&(a=document.querySelector(a)),!a)return!1;if(b=b||!1,c=c&&!0,!b&&d!==!1){var e=null;(ace.settings.is("sidebar","fixed")||(e=document.getElementById("sidebar"))&&ace.hasClass(e,"sidebar-fixed"))&&ace.settings.sidebar_fixed(e,!1,c)}b?(ace.hasClass(a,"navbar-fixed-top")||ace.addClass(a,"navbar-fixed-top"),c!==!1&&ace.settings.set("navbar","fixed")):(ace.removeClass(a,"navbar-fixed-top"),c!==!1&&ace.settings.unset("navbar","fixed"));try{document.getElementById("ace-settings-navbar").checked=b}catch(f){}window.jQuery&&jQuery(document).trigger("settings.ace",["navbar_fixed",b,a])},sidebar_fixed:function(a,b,c,d){if(ace.vars.very_old_ie)return!1;var a=a||"#sidebar";if("string"==typeof a&&(a=document.querySelector(a)),!a)return!1;if(b=b||!1,c=c&&!0,!b&&d!==!1){var e=null;(ace.settings.is("breadcrumbs","fixed")||(e=document.getElementById("breadcrumbs"))&&ace.hasClass(e,"breadcrumbs-fixed"))&&ace.settings.breadcrumbs_fixed(e,!1,c)}if(b&&d!==!1&&!ace.settings.is("navbar","fixed")&&ace.settings.navbar_fixed(null,!0,c),b){if(!ace.hasClass(a,"sidebar-fixed")){ace.addClass(a,"sidebar-fixed");var f=document.getElementById("menu-toggler");f&&ace.addClass(f,"fixed")}c!==!1&&ace.settings.set("sidebar","fixed")}else{ace.removeClass(a,"sidebar-fixed");var f=document.getElementById("menu-toggler");f&&ace.removeClass(f,"fixed"),c!==!1&&ace.settings.unset("sidebar","fixed")}try{document.getElementById("ace-settings-sidebar").checked=b}catch(g){}window.jQuery&&jQuery(document).trigger("settings.ace",["sidebar_fixed",b,a])},breadcrumbs_fixed:function(a,b,c,d){if(ace.vars.very_old_ie)return!1;var a=a||"#breadcrumbs";if("string"==typeof a&&(a=document.querySelector(a)),!a)return!1;b=b||!1,c=c&&!0,b&&d!==!1&&!ace.settings.is("sidebar","fixed")&&ace.settings.sidebar_fixed(null,!0,c),b?(ace.hasClass(a,"breadcrumbs-fixed")||ace.addClass(a,"breadcrumbs-fixed"),c!==!1&&ace.settings.set("breadcrumbs","fixed")):(ace.removeClass(a,"breadcrumbs-fixed"),c!==!1&&ace.settings.unset("breadcrumbs","fixed"));try{document.getElementById("ace-settings-breadcrumbs").checked=b}catch(e){}window.jQuery&&jQuery(document).trigger("settings.ace",["breadcrumbs_fixed",b,a])},main_container_fixed:function(a,b,c){if(ace.vars.very_old_ie)return!1;b=b||!1,c=c&&!0;var a=a||"#main-container";if("string"==typeof a&&(a=document.querySelector(a)),!a)return!1;var d=document.getElementById("navbar-container");b?(ace.hasClass(a,"container")||ace.addClass(a,"container"),d&&!ace.hasClass(d,"container")&&ace.addClass(d,"container"),c!==!1&&ace.settings.set("main-container","fixed")):(ace.removeClass(a,"container"),d&&ace.removeClass(d,"container"),c!==!1&&ace.settings.unset("main-container","fixed"));try{document.getElementById("ace-settings-add-container").checked=b}catch(e){}if(navigator.userAgent.match(/webkit/i)){var f=document.getElementById("sidebar");ace.toggleClass(f,"menu-min"),setTimeout(function(){ace.toggleClass(f,"menu-min")},0)}window.jQuery&&jQuery(document).trigger("settings.ace",["main_container_fixed",b,a])},sidebar_collapsed:function(a,b,c){if(ace.vars.very_old_ie)return!1;var a=a||"#sidebar";if("string"==typeof a&&(a=document.querySelector(a)),!a)return!1;if(b=b||!1,b?(ace.addClass(a,"menu-min"),c!==!1&&ace.settings.set("sidebar","collapsed")):(ace.removeClass(a,"menu-min"),c!==!1&&ace.settings.unset("sidebar","collapsed")),window.jQuery&&jQuery(document).trigger("settings.ace",["sidebar_collapsed",b,a]),!window.jQuery){var d=document.querySelector('.sidebar-collapse[data-target="#'+(a.getAttribute("id")||"")+'"]');if(d||(d=a.querySelector(".sidebar-collapse")),!d)return;var e,f,g=d.querySelector("[data-icon1][data-icon2]");if(!g)return;e=g.getAttribute("data-icon1"),f=g.getAttribute("data-icon2"),b?(ace.removeClass(g,e),ace.addClass(g,f)):(ace.removeClass(g,f),ace.addClass(g,e))}}},ace.settings.check=function(a,b){if(ace.settings.exists(a,b)){var c=ace.settings.is(a,b),d={"navbar-fixed":"navbar-fixed-top","sidebar-fixed":"sidebar-fixed","breadcrumbs-fixed":"breadcrumbs-fixed","sidebar-collapsed":"menu-min","main-container-fixed":"container"},e=document.getElementById(a);c!=ace.hasClass(e,d[a+"-"+b])&&ace.settings[a.replace("-","_")+"_"+b](null,c)}},ace.data_storage=function(a,b){var c="ace_",d=null,e=0;(1==a||a===b)&&"localStorage"in window&&null!==window.localStorage?(d=ace.storage,e=1):null==d&&(2==a||a===b)&&"cookie"in document&&null!==document.cookie&&(d=ace.cookie,e=2),this.set=function(a,b,f,g,h){if(d)if(f===h)f=b,b=a,null==f?d.remove(c+b):1==e?d.set(c+b,f):2==e&&d.set(c+b,f,ace.config.cookie_expiry,g||ace.config.cookie_path);else if(1==e)null==f?d.remove(c+a+"_"+b):d.set(c+a+"_"+b,f);else if(2==e){var i=d.get(c+a),j=i?JSON.parse(i):{};if(null==f){if(delete j[b],0==ace.sizeof(j))return void d.remove(c+a)}else j[b]=f;d.set(c+a,JSON.stringify(j),ace.config.cookie_expiry,g||ace.config.cookie_path)}},this.get=function(a,b,f){if(!d)return null;if(b===f)return b=a,d.get(c+b);if(1==e)return d.get(c+a+"_"+b);if(2==e){var g=d.get(c+a),h=g?JSON.parse(g):{};return b in h?h[b]:null}},this.remove=function(a,b,c){d&&(b===c?(b=a,this.set(b,null)):this.set(a,b,null))}},ace.cookie={get:function(a){var b,c,d=document.cookie,e=a+"=";if(d){if(c=d.indexOf("; "+e),-1==c){if(c=d.indexOf(e),0!=c)return null}else c+=2;return b=d.indexOf(";",c),-1==b&&(b=d.length),decodeURIComponent(d.substring(c+e.length,b))}},set:function(a,b,c,d,e,f){var g=new Date;"object"==typeof c&&c.toGMTString?c=c.toGMTString():parseInt(c,10)?(g.setTime(g.getTime()+1e3*parseInt(c,10)),c=g.toGMTString()):c="",document.cookie=a+"="+encodeURIComponent(b)+(c?"; expires="+c:"")+(d?"; path="+d:"")+(e?"; domain="+e:"")+(f?"; secure":"")},remove:function(a,b){this.set(a,"",-1e3,b)}},ace.storage={get:function(a){return window.localStorage.getItem(a)},set:function(a,b){window.localStorage.setItem(a,b)},remove:function(a){window.localStorage.removeItem(a)}},ace.sizeof=function(a){var b=0;for(var c in a)a.hasOwnProperty(c)&&b++;return b},ace.hasClass=function(a,b){return(" "+a.className+" ").indexOf(" "+b+" ")>-1},ace.addClass=function(a,b){if(!ace.hasClass(a,b)){var c=a.className;a.className=c+(c.length?" ":"")+b}},ace.removeClass=function(a,b){ace.replaceClass(a,b)},ace.replaceClass=function(a,b,c){var d=new RegExp("(^|\\s)"+b+"(\\s|$)","i");a.className=a.className.replace(d,function(a,b,d){return c?b+c+d:" "}).replace(/^\s+|\s+$/g,"")},ace.toggleClass=function(a,b){ace.hasClass(a,b)?ace.removeClass(a,b):ace.addClass(a,b)},ace.isHTTMlElement=function(a){return window.HTMLElement?a instanceof HTMLElement:"nodeType"in a?1==a.nodeType:!1},ace.data=new ace.data_storage(ace.config.storage_method);
\ No newline at end of file
diff --git a/NewLife.Cube/Content/ace/js/ace.min.js b/NewLife.Cube/Content/ace/js/ace.min.js
deleted file mode 100644
index 1311b7e43c..0000000000
--- a/NewLife.Cube/Content/ace/js/ace.min.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*!
- * Ace v1.3.3
- */
-if("undefined"==typeof jQuery)throw new Error("Ace's JavaScript requires jQuery");!function(){"ace"in window||(window.ace={}),"helper"in window.ace||(window.ace.helper={}),"vars"in window.ace||(window.ace.vars={}),window.ace.vars.icon=" ace-icon ",window.ace.vars[".icon"]=".ace-icon",ace.vars.touch="ontouchstart"in window;var a=navigator.userAgent;ace.vars.webkit=!!a.match(/AppleWebKit/i),ace.vars.safari=!!a.match(/Safari/i)&&!a.match(/Chrome/i),ace.vars.android=ace.vars.safari&&!!a.match(/Android/i),ace.vars.ios_safari=!!a.match(/OS ([4-9])(_\d)+ like Mac OS X/i)&&!a.match(/CriOS/i),ace.vars.ie=window.navigator.msPointerEnabled||document.all&&document.querySelector,ace.vars.old_ie=document.all&&!document.addEventListener,ace.vars.very_old_ie=document.all&&!document.querySelector,ace.vars.firefox="MozAppearance"in document.documentElement.style,ace.vars.non_auto_fixed=ace.vars.android||ace.vars.ios_safari}(),function(a){ace.click_event=ace.vars.touch&&a.fn.tap?"tap":"click"}(jQuery),jQuery(function(a){function b(){ace.vars.non_auto_fixed&&a("body").addClass("mob-safari"),ace.vars.transition=!!a.support.transition.end}function c(){var b=a(".sidebar");a.fn.ace_sidebar&&b.ace_sidebar(),a.fn.ace_sidebar_scroll&&b.ace_sidebar_scroll({include_toggle:!1||ace.vars.safari||ace.vars.ios_safari}),a.fn.ace_sidebar_hover&&b.ace_sidebar_hover({sub_hover_delay:750,sub_scroll_style:"no-track scroll-thin scroll-margin scroll-visible"})}function d(){if(a.fn.ace_ajax){window.Pace&&(window.paceOptions={ajax:!0,document:!0,eventLag:!1});var b={close_active:!0,default_url:"page/index",content_url:function(a){if(!a.match(/^page\//))return!1;var b=document.location.pathname;return b.match(/(\/ajax\/)(index\.html)?/)?b.replace(/(\/ajax\/)(index\.html)?/,"/ajax/content/"+a.replace(/^page\//,"")+".html"):b+"?"+a.replace(/\//,"=")}};window.Pace&&(b.loading_overlay="body"),a("[data-ajax-content=true]").ace_ajax(b),a(window).on("error.ace_ajax",function(){a("[data-ajax-content=true]").each(function(){var b=a(this);b.ace_ajax("working")&&(window.Pace&&Pace.running&&Pace.stop(),b.ace_ajax("stopLoading",!0))})})}}function e(){var b=!!a.fn.ace_scroll;b&&a(".dropdown-content").ace_scroll({reset:!1,mouseWheelLock:!0}),b&&!ace.vars.old_ie&&(a(window).on("resize.reset_scroll",function(){a(".ace-scroll:not(.scroll-disabled)").not(":hidden").ace_scroll("reset")}),b&&a(document).on("settings.ace.reset_scroll",function(b,c){"sidebar_collapsed"==c&&a(".ace-scroll:not(.scroll-disabled)").not(":hidden").ace_scroll("reset")}))}function f(){a(document).on("click.dropdown.pos",'.dropdown-toggle[data-position="auto"]',function(){var b=a(this).offset(),c=a(this.parentNode);parseInt(b.top+a(this).height())+50>ace.helper.scrollTop()+ace.helper.winHeight()-c.find(".dropdown-menu").eq(0).height()?c.addClass("dropup"):c.removeClass("dropup")})}function g(){a('.ace-nav [class*="icon-animated-"]').closest("a").one("click",function(){var b=a(this).find('[class*="icon-animated-"]').eq(0),c=b.attr("class").match(/icon\-animated\-([\d\w]+)/);b.removeClass(c[0])}),a(document).on("click",".dropdown-navbar .nav-tabs",function(b){b.stopPropagation();{var c;b.target}(c=a(b.target).closest("[data-toggle=tab]"))&&c.length>0&&(c.tab("show"),b.preventDefault(),a(window).triggerHandler("resize.navbar.dropdown"))})}function h(){a(".sidebar .nav-list .badge[title],.sidebar .nav-list .badge[title]").each(function(){var b=a(this).attr("class").match(/tooltip\-(?:\w+)/);b=b?b[0]:"tooltip-error",a(this).tooltip({placement:function(b,c){var d=a(c).offset();return parseInt(d.left)<parseInt(document.body.scrollWidth/2)?"right":"left"},container:"body",template:'<div class="tooltip '+b+'"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'})})}function i(){var b=a(".btn-scroll-up");if(b.length>0){var c=!1;a(window).on("scroll.scroll_btn",function(){var a=ace.helper.scrollTop(),d=ace.helper.winHeight(),e=document.body.scrollHeight;a>parseInt(d/4)||a>0&&e>=d&&d+a>=e-1?c||(b.addClass("display"),c=!0):c&&(b.removeClass("display"),c=!1)}).triggerHandler("scroll.scroll_btn"),b.on(ace.click_event,function(){var b=Math.min(500,Math.max(100,parseInt(ace.helper.scrollTop()/3)));return a("html,body").animate({scrollTop:0},b),!1})}}function j(){if(ace.vars.webkit){var b=a(".ace-nav").get(0);b&&a(window).on("resize.webkit_fix",function(){ace.helper.redraw(b)})}ace.vars.ios_safari&&a(document).on("ace.settings.ios_fix",function(b,c,d){"navbar_fixed"==c&&(a(document).off("focus.ios_fix blur.ios_fix","input,textarea,.wysiwyg-editor"),1==d&&a(document).on("focus.ios_fix","input,textarea,.wysiwyg-editor",function(){a(window).on("scroll.ios_fix",function(){var b=a("#navbar").get(0);b&&ace.helper.redraw(b)})}).on("blur.ios_fix","input,textarea,.wysiwyg-editor",function(){a(window).off("scroll.ios_fix")}))}).triggerHandler("ace.settings.ios_fix",["navbar_fixed","fixed"==a("#navbar").css("position")])}function k(){a(document).on("hide.bs.collapse show.bs.collapse",function(b){var c=b.target.getAttribute("id"),d=a('a[href*="#'+c+'"]');0==d.length&&(d=a('a[data-target*="#'+c+'"]')),0!=d.length&&d.find(ace.vars[".icon"]).each(function(){var c,d=a(this),e=null,f=null;return(e=d.attr("data-icon-show"))?f=d.attr("data-icon-hide"):(c=d.attr("class").match(/fa\-(.*)\-(up|down)/))&&(e="fa-"+c[1]+"-down",f="fa-"+c[1]+"-up"),e?("show"==b.type?d.removeClass(e).addClass(f):d.removeClass(f).addClass(e),!1):void 0})})}function l(){function b(){var b=a(this).find("> .dropdown-menu");if("fixed"==b.css("position")){var d=parseInt(a(window).width()),e=d>320?60:d>240?40:30,f=parseInt(d)-e,g=parseInt(a(window).height())-30,h=parseInt(Math.min(f,320));b.css("width",h);var i=!1,j=0,k=b.find(".tab-pane.active .dropdown-content.ace-scroll");0==k.length?k=b.find(".dropdown-content.ace-scroll"):i=!0;var l=k.closest(".dropdown-menu"),m=b[0].scrollHeight;if(1==k.length){var n=k.find(".scroll-content")[0];n&&(m=n.scrollHeight),j+=l.find(".dropdown-header").outerHeight(),j+=l.find(".dropdown-footer").outerHeight();var o=l.closest(".tab-content");0!=o.length&&(j+=o.siblings(".nav-tabs").eq(0).height())}var p=parseInt(Math.min(g,480,m+j)),q=parseInt(Math.abs((f+e-h)/2)),r=parseInt(Math.abs((g+30-p)/2)),s=parseInt(b.css("z-index"))||0;if(b.css({height:p,left:q,right:"auto",top:r-(i?3:1)}),1==k.length&&(ace.vars.touch?k.ace_scroll("disable").css("max-height",p-j).addClass("overflow-scroll"):k.ace_scroll("update",{size:p-j}).ace_scroll("enable").ace_scroll("reset")),b.css("height",p+(i?7:2)),b.hasClass("user-menu")){b.css("height","");var t=a(this).find(".user-info");t.css(1==t.length&&"fixed"==t.css("position")?{left:q,right:"auto",top:r,width:h-2,"max-width":h-2,"z-index":s+1}:{left:"",right:"",top:"",width:"","max-width":"","z-index":""})}a(this).closest(".navbar.navbar-fixed-top").css("z-index",s)}else 0!=b.length&&c.call(this,b);var u=this;a(window).off("resize.navbar.dropdown").one("resize.navbar.dropdown",function(){a(u).triggerHandler("shown.bs.dropdown.navbar")})}function c(b){if(b=b||a(this).find("> .dropdown-menu"),b.length>0&&(b.css({width:"",height:"",left:"",right:"",top:""}).find(".dropdown-content").each(function(){ace.vars.touch&&a(this).css("max-height","").removeClass("overflow-scroll");var b=parseInt(a(this).attr("data-size")||0)||a.fn.ace_scroll.defaults.size;a(this).ace_scroll("update",{size:b}).ace_scroll("enable").ace_scroll("reset")}),b.hasClass("user-menu"))){a(this).find(".user-info").css({left:"",right:"",top:"",width:"","max-width":"","z-index":""})}a(this).closest(".navbar").css("z-index","")}ace.vars.old_ie||a(".ace-nav > li").on("shown.bs.dropdown.navbar",function(){b.call(this)}).on("hidden.bs.dropdown.navbar",function(){a(window).off("resize.navbar.dropdown"),c.call(this)})}b(),c(),d(),e(),f(),g(),h(),i(),j(),k(),l()}),function(a){a.unCamelCase=function(a){return a.replace(/([a-z])([A-Z])/g,function(a,b,c){return b+"-"+c.toLowerCase()})},a.strToVal=function(a){var b=a.match(/^(?:(true)|(false)|(null)|(\-?[\d]+(?:\.[\d]+)?)|(\[.*\]|\{.*\}))$/i),c=a;if(b)if(b[1])c=!0;else if(b[2])c=!1;else if(b[3])c=null;else if(b[4])c=parseFloat(a);else if(b[5])try{c=JSON.parse(a)}catch(d){}return c},a.getAttrSettings=function(b,c,d){var e=c instanceof Array?1:2,d=d?d.replace(/([^\-])$/,"$1-"):"";d="data-"+d;var f={};for(var g in c)if(c.hasOwnProperty(g)){var h,i=1==e?c[g]:g,j=a.unCamelCase(i.replace(/[^A-Za-z0-9]{1,}/g,"-")).toLowerCase();if(!(h=b.getAttribute(d+j)))continue;f[i]=a.strToVal(h)}return f},a.scrollTop=function(){return document.scrollTop||document.documentElement.scrollTop||document.body.scrollTop},a.winHeight=function(){return window.innerHeight||document.documentElement.clientHeight},a.redraw=function(a,b){var c=a.style.display;a.style.display="none",a.offsetHeight,b!==!0?a.style.display=c:setTimeout(function(){a.style.display=c},10)}}(ace.helper),function(a,b){function c(b,c){function e(b){var c="",d=a(".breadcrumb");if(d.length>0&&d.is(":visible")){d.find("> li:not(:first-child)").remove();var e=0;b.parents(".nav li").each(function(){var b=a(this).find("> a"),f=b.clone();f.find("i,.fa,.glyphicon,.ace-icon,.menu-icon,.badge,.label").remove();var g=f.text();f.remove();var h=b.attr("href");if(0==e){var i=a('<li class="active"></li>').appendTo(d);i.text(g),c=g}else{var i=a("<li><a /></li>").insertAfter(d.find("> li:first-child"));i.find("a").attr("href",h).text(g)}e++})}return c}function f(b){var c=g.find(".ajax-append-title");if(c.length>0)document.title=c.text(),c.remove();else if(b.length>0){var d=a.trim(String(document.title).replace(/^(.*)[\-]/,""));d&&(d=" - "+d),b=a.trim(b)+d}}var g=a(b),h=this;g.attr("data-ajax-content","true");var i=ace.helper.getAttrSettings(b,a.fn.ace_ajax.defaults);this.settings=a.extend({},a.fn.ace_ajax.defaults,c,i);var j=!1,k=a();this.force_reload=!1,this.loadUrl=function(a,b){var c=!1;a=a.replace(/^(\#\!)?\#/,""),this.force_reload=b===!1,"function"==typeof this.settings.content_url&&(c=this.settings.content_url(a)),"string"==typeof c&&this.getUrl(c,a,!1)},this.loadAddr=function(a,b,c){this.force_reload=c===!1,this.getUrl(a,b,!1)},this.getUrl=function(b,c,d){if(!j){var i;g.trigger(i=a.Event("ajaxloadstart"),{url:b,hash:c}),i.isDefaultPrevented()||(h.startLoading(),a.ajax({url:b,cache:!this.force_reload}).error(function(){g.trigger("ajaxloaderror",{url:b,hash:c}),h.stopLoading(!0)}).done(function(i){g.trigger("ajaxloaddone",{url:b,hash:c});var j=null,l="";if("function"==typeof h.settings.update_active)j=h.settings.update_active.call(null,c,b);else if(h.settings.update_active===!0&&c&&(j=a('a[data-url="'+c+'"]'),j.length>0)){var m=j.closest(".nav");if(m.length>0){m.find(".active").each(function(){var b="active";(a(this).hasClass("hover")||h.settings.close_active)&&(b+=" open"),a(this).removeClass(b),h.settings.close_active&&a(this).find(" > .submenu").css("display","")});{j.closest("li").addClass("active").parents(".nav li").addClass("active open")}m.closest(".sidebar[data-sidebar-scroll=true]").each(function(){var b=a(this);b.ace_sidebar_scroll("reset"),d&&b.ace_sidebar_scroll("scroll_to_active")})}}"function"==typeof h.settings.update_breadcrumbs?l=h.settings.update_breadcrumbs.call(null,c,b,j):h.settings.update_breadcrumbs===!0&&null!=j&&j.length>0&&(l=e(j)),i=String(i).replace(/<(title|link)([\s\>])/gi,'<div class="hidden ajax-append-$1"$2').replace(/<\/(title|link)\>/gi,"</div>"),k.addClass("content-loaded").detach(),g.empty().html(i),a(h.settings.loading_overlay||g).append(k),setTimeout(function(){a("head").find("link.ace-ajax-stylesheet").remove();for(var b=["link.ace-main-stylesheet","link#main-ace-style",'link[href*="/ace.min.css"]','link[href*="/ace.css"]'],c=[],d=0;d<b.length&&(c=a("head").find(b[d]).first(),!(c.length>0));d++);g.find(".ajax-append-link").each(function(){var b=a(this);if(b.attr("href")){var d=jQuery("<link />",{type:"text/css",rel:"stylesheet","class":"ace-ajax-stylesheet"});c.length>0?d.insertBefore(c):d.appendTo("head"),d.attr("href",b.attr("href"))}b.remove()})},10),"function"==typeof h.settings.update_title?h.settings.update_title.call(null,c,b,l):h.settings.update_title===!0&&f(l),d||a("html,body").animate({scrollTop:0},250),g.trigger("ajaxloadcomplete",{url:b,hash:c}),h.stopLoading()}))}};var l=!1,m=null;this.startLoading=function(){j||(j=!0,this.settings.loading_overlay||"static"!=g.css("position")||(g.css("position","relative"),l=!0),k.remove(),k=a('<div class="ajax-loading-overlay"><i class="ajax-loading-icon '+(this.settings.loading_icon||"")+'"></i> '+this.settings.loading_text+"</div>"),"body"==this.settings.loading_overlay?a("body").append(k.addClass("ajax-overlay-body")):this.settings.loading_overlay?a(this.settings.loading_overlay).append(k):g.append(k),this.settings.max_load_wait!==!1&&(m=setTimeout(function(){if(m=null,j){var b;g.trigger(b=a.Event("ajaxloadlong")),b.isDefaultPrevented()||h.stopLoading(!0)}},1e3*this.settings.max_load_wait)))},this.stopLoading=function(a){a===!0?(j=!1,k.remove(),l&&(g.css("position",""),l=!1),null!=m&&(clearTimeout(m),m=null)):(k.addClass("almost-loaded"),g.one("ajaxscriptsloaded.inner_call",function(){h.stopLoading(!0)}))},this.working=function(){return j},this.loadScripts=function(b,c){a.ajaxPrefilter("script",function(a){a.cache=!0}),setTimeout(function(){function e(){"function"==typeof c&&c(),a('.btn-group[data-toggle="buttons"] > .btn').button(),g.trigger("ajaxscriptsloaded")}function f(a){a+=1,a<b.length?h(a):e()}function h(c){if(c=c||0,!b[c])return f(c);var g="js-"+b[c].replace(/[^\w\d\-]/g,"-").replace(/\-\-/g,"-");d[g]!==!0?a.getScript(b[c]).done(function(){d[g]=!0}).complete(function(){k++,k>=i&&j?e():f(c)}):f(c)}for(var i=0,k=0,l=0;l<b.length;l++)b[l]&&!function(){var a="js-"+b[l].replace(/[^\w\d\-]/g,"-").replace(/\-\-/g,"-");d[a]!==!0&&i++}();i>0?h():e()},10)},a(window).off("hashchange.ace_ajax").on("hashchange.ace_ajax",function(){var b=a.trim(window.location.hash);b&&0!=b.length&&h.loadUrl(b)}).trigger("hashchange.ace_ajax",[!0]);var n=a.trim(window.location.hash);!n&&this.settings.default_url&&(window.location.hash=this.settings.default_url)}var d={};a.fn.aceAjax=a.fn.ace_ajax=function(d,e,f,g){var h,i=this.each(function(){var i=a(this),j=i.data("ace_ajax"),k="object"==typeof d&&d;j||i.data("ace_ajax",j=new c(this,k)),"string"==typeof d&&"function"==typeof j[d]&&(h=g!=b?j[d](e,f,g):f!=b?j[d](e,f):j[d](e))});return h===b?i:h},a.fn.aceAjax.defaults=a.fn.ace_ajax.defaults={content_url:!1,default_url:!1,loading_icon:"fa fa-spin fa-spinner fa-2x orange",loading_text:"",loading_overlay:null,update_breadcrumbs:!0,update_title:!0,update_active:!0,close_active:!1,max_load_wait:!1}}(window.jQuery),function(a,b){if(ace.vars.touch){var c="touchstart MSPointerDown pointerdown",d="touchend touchcancel MSPointerUp MSPointerCancel pointerup pointercancel",e="touchmove MSPointerMove MSPointerHover pointermove";a.event.special.ace_drag={setup:function(){var f=0,g=a(this);g.on(c,function(c){function h(a){if(k){var b=a.originalEvent.touches?a.originalEvent.touches[0]:a;if(i={coords:[b.pageX,b.pageY]},k&&i&&(m=0,n=0,l=Math.abs(n=k.coords[1]-i.coords[1])>f&&Math.abs(m=k.coords[0]-i.coords[0])<=Math.abs(n)?n>0?"up":"down":Math.abs(m=k.coords[0]-i.coords[0])>f&&Math.abs(n)<=Math.abs(m)?m>0?"left":"right":!1,l!==!1)){var c={cancel:!1};k.origin.trigger({type:"ace_drag",direction:l,dx:m,dy:n,retval:c}),0==c.cancel&&a.preventDefault()}k.coords[0]=i.coords[0],k.coords[1]=i.coords[1]}}var i,j=c.originalEvent.touches?c.originalEvent.touches[0]:c,k={coords:[j.pageX,j.pageY],origin:a(c.target)},l=!1,m=0,n=0;g.on(e,h).one(d,function(){g.off(e,h),k=i=b})})}}}}(window.jQuery),function(a,b){function c(c,e){function f(){this.mobile_view=this.mobile_style<4&&this.is_mobile_view(),this.collapsible=!this.mobile_view&&this.is_collapsible(),this.minimized=!this.collapsible&&this.$sidebar.hasClass(l)||3==this.mobile_style&&this.mobile_view&&this.$sidebar.hasClass(m),this.horizontal=!(this.mobile_view||this.collapsible)&&this.$sidebar.hasClass(n)}var g=this;this.$sidebar=a(c),this.$sidebar.attr("data-sidebar","true"),this.$sidebar.attr("id")||this.$sidebar.attr("id","id-sidebar-"+ ++d);var h=ace.helper.getAttrSettings(c,a.fn.ace_sidebar.defaults,"sidebar-");this.settings=a.extend({},a.fn.ace_sidebar.defaults,e,h),this.minimized=!1,this.collapsible=!1,this.horizontal=!1,this.mobile_view=!1,this.vars=function(){return{minimized:this.minimized,collapsible:this.collapsible,horizontal:this.horizontal,mobile_view:this.mobile_view}},this.get=function(a){return this.hasOwnProperty(a)?this[a]:void 0},this.set=function(a,b){this.hasOwnProperty(a)&&(this[a]=b)},this.ref=function(){return this};var i=function(c){var d,e,f=a(this).find(ace.vars[".icon"]);f.length>0&&(d=f.attr("data-icon1"),e=f.attr("data-icon2"),c!==b?c?f.removeClass(d).addClass(e):f.removeClass(e).addClass(d):f.toggleClass(d).toggleClass(e))},j=function(){var b=g.$sidebar.find(".sidebar-collapse");return 0==b.length&&(b=a('.sidebar-collapse[data-target="#'+(g.$sidebar.attr("id")||"")+'"]')),b=0!=b.length?b[0]:null};this.toggleMenu=function(a,b){if(!this.collapsible){this.minimized=!this.minimized;try{ace.settings.sidebar_collapsed(c,this.minimized,!(a===!1||b===!1))}catch(d){this.minimized?this.$sidebar.addClass("menu-min"):this.$sidebar.removeClass("menu-min")}a||(a=j()),a&&i.call(a,this.minimized),ace.vars.old_ie&&ace.helper.redraw(c)}},this.collapse=function(a,b){this.collapsible||(this.minimized=!1,this.toggleMenu(a,b))},this.expand=function(a,b){this.collapsible||(this.minimized=!0,this.toggleMenu(a,b))},this.toggleResponsive=function(b){if(this.mobile_view&&3==this.mobile_style){if(this.$sidebar.hasClass("menu-min")){this.$sidebar.removeClass("menu-min");var c=j();c&&i.call(c)}if(this.minimized=!this.$sidebar.hasClass("responsive-min"),this.$sidebar.toggleClass("responsive-min responsive-max"),b||(b=this.$sidebar.find(".sidebar-expand"),0==b.length&&(b=a('.sidebar-expand[data-target="#'+(this.$sidebar.attr("id")||"")+'"]')),b=0!=b.length?b[0]:null),b){var d,e,f=a(b).find(ace.vars[".icon"]);f.length>0&&(d=f.attr("data-icon1"),e=f.attr("data-icon2"),f.toggleClass(d).toggleClass(e))}a(document).triggerHandler("settings.ace",["sidebar_collapsed",this.minimized])}},this.is_collapsible=function(){var b;return this.$sidebar.hasClass("navbar-collapse")&&null!=(b=a('.navbar-toggle[data-target="#'+(this.$sidebar.attr("id")||"")+'"]').get(0))&&b.scrollHeight>0},this.is_mobile_view=function(){var b;return null!=(b=a('.menu-toggler[data-target="#'+(this.$sidebar.attr("id")||"")+'"]').get(0))&&b.scrollHeight>0},this.$sidebar.on(ace.click_event+".ace.submenu",".nav-list",function(b){var c=this,d=a(b.target).closest("a");if(d&&0!=d.length){var e=g.minimized&&!g.collapsible;if(d.hasClass("dropdown-toggle")){b.preventDefault();var f=d.siblings(".submenu").get(0);if(!f)return!1;var h=a(f),i=0,j=f.parentNode.parentNode;if(e&&j==c||h.parent().hasClass("hover")&&"absolute"==h.css("position")&&!g.collapsible)return!1;var k=0==f.scrollHeight;return k&&a(j).find("> .open > .submenu").each(function(){this==f||a(this.parentNode).hasClass("active")||(i-=this.scrollHeight,g.hide(this,g.settings.duration,!1))}),k?(g.show(f,g.settings.duration),0!=i&&(i+=f.scrollHeight)):(g.hide(f,g.settings.duration),i-=f.scrollHeight),0!=i&&("true"!=g.$sidebar.attr("data-sidebar-scroll")||g.minimized||g.$sidebar.ace_sidebar_scroll("prehide",i)),!1}if("tap"==ace.click_event&&e&&d.get(0).parentNode.parentNode==c){var l=d.find(".menu-text").get(0);if(null!=l&&b.target!=l&&!a.contains(l,b.target))return b.preventDefault(),!1}if(ace.vars.ios_safari&&"false"!==d.attr("data-link"))return document.location=d.attr("href"),b.preventDefault(),!1}});var k=!1;this.show=function(b,c,d){if(d=d!==!1,d&&k)return!1;var e,f=a(b);if(f.trigger(e=a.Event("show.ace.submenu")),e.isDefaultPrevented())return!1;d&&(k=!0),c=c||this.settings.duration,f.css({height:0,overflow:"hidden",display:"block"}).removeClass("nav-hide").addClass("nav-show").parent().addClass("open"),b.scrollTop=0,c>0&&f.css({height:b.scrollHeight,"transition-property":"height","transition-duration":c/1e3+"s"});var g=function(b,c){b&&b.stopPropagation(),f.css({"transition-property":"","transition-duration":"",overflow:"",height:""}),c!==!1&&f.trigger(a.Event("shown.ace.submenu")),d&&(k=!1)};return c>0&&a.support.transition.end?f.one(a.support.transition.end,g):g(),ace.vars.android&&setTimeout(function(){g(null,!1),ace.helper.redraw(b)},c+20),!0},this.hide=function(b,c,d){if(d=d!==!1,d&&k)return!1;var e,f=a(b);if(f.trigger(e=a.Event("hide.ace.submenu")),e.isDefaultPrevented())return!1;d&&(k=!0),c=c||this.settings.duration,f.css({height:b.scrollHeight,overflow:"hidden",display:"block"}).parent().removeClass("open"),b.offsetHeight,c>0&&f.css({height:0,"transition-property":"height","transition-duration":c/1e3+"s"});var g=function(b,c){b&&b.stopPropagation(),f.css({display:"none",overflow:"",height:"","transition-property":"","transition-duration":""}).removeClass("nav-show").addClass("nav-hide"),c!==!1&&f.trigger(a.Event("hidden.ace.submenu")),d&&(k=!1)};return c>0&&a.support.transition.end?f.one(a.support.transition.end,g):g(),ace.vars.android&&setTimeout(function(){g(null,!1),ace.helper.redraw(b)},c+20),!0},this.toggle=function(a,b){if(b=b||g.settings.duration,0==a.scrollHeight){if(this.show(a,b))return 1}else if(this.hide(a,b))return-1;return 0};var l="menu-min",m="responsive-min",n="h-sidebar",o=function(){this.mobile_style=1,this.$sidebar.hasClass("responsive")&&!a('.menu-toggler[data-target="#'+this.$sidebar.attr("id")+'"]').hasClass("navbar-toggle")?this.mobile_style=2:this.$sidebar.hasClass(m)?this.mobile_style=3:this.$sidebar.hasClass("navbar-collapse")&&(this.mobile_style=4)};o.call(g),a(window).on("resize.sidebar.vars",function(){f.call(g)}).triggerHandler("resize.sidebar.vars")}var d=0;a(document).on(ace.click_event+".ace.menu",".menu-toggler",function(b){var c=a(this),d=a(c.attr("data-target"));if(0!=d.length){b.preventDefault(),d.toggleClass("display"),c.toggleClass("display");var e=ace.click_event+".ace.autohide",f="true"===d.attr("data-auto-hide");return c.hasClass("display")?(f&&a(document).on(e,function(b){return d.get(0)==b.target||a.contains(d.get(0),b.target)?void b.stopPropagation():(d.removeClass("display"),c.removeClass("display"),void a(document).off(e))}),"true"==d.attr("data-sidebar-scroll")&&d.ace_sidebar_scroll("reset")):f&&a(document).off(e),!1}}).on(ace.click_event+".ace.menu",".sidebar-collapse",function(b){var c=a(this).attr("data-target"),d=null;c&&(d=a(c)),(null==d||0==d.length)&&(d=a(this).closest(".sidebar")),0!=d.length&&(b.preventDefault(),d.ace_sidebar("toggleMenu",this))}).on(ace.click_event+".ace.menu",".sidebar-expand",function(b){var c=a(this).attr("data-target"),d=null;if(c&&(d=a(c)),(null==d||0==d.length)&&(d=a(this).closest(".sidebar")),0!=d.length){var e=this;b.preventDefault(),d.ace_sidebar("toggleResponsive",this);var f=ace.click_event+".ace.autohide";"true"===d.attr("data-auto-hide")&&(d.hasClass("responsive-max")?a(document).on(f,function(b){return d.get(0)==b.target||a.contains(d.get(0),b.target)?void b.stopPropagation():(d.ace_sidebar("toggleResponsive",e),void a(document).off(f))}):a(document).off(f))}}),a.fn.ace_sidebar=function(d,e){var f,g=this.each(function(){var b=a(this),g=b.data("ace_sidebar"),h="object"==typeof d&&d;g||b.data("ace_sidebar",g=new c(this,h)),"string"==typeof d&&"function"==typeof g[d]&&(f=e instanceof Array?g[d].apply(g,e):g[d](e))});return f===b?g:f},a.fn.ace_sidebar.defaults={duration:300}}(window.jQuery),function(a,b){function c(b,c){var f=this,g=a(window),h=a(b),i=h.find(".nav-list"),j=h.find(".sidebar-toggle").eq(0),k=h.find(".sidebar-shortcuts").eq(0),l=i.get(0);if(l){var m=ace.helper.getAttrSettings(b,a.fn.ace_sidebar_scroll.defaults);this.settings=a.extend({},a.fn.ace_sidebar_scroll.defaults,c,m);var n=f.settings.scroll_to_active,o=h.ace_sidebar("ref");h.attr("data-sidebar-scroll","true");var p=null,q=null,r=null,s=null,t=null,u=null;this.is_scrolling=!1;var v=!1;this.sidebar_fixed=e(b,"fixed");var w,x,y=function(){var a=i.parent().offset();return f.sidebar_fixed&&(a.top-=ace.helper.scrollTop()),g.innerHeight()-a.top-(f.settings.include_toggle?0:j.outerHeight())},z=function(){return l.clientHeight},A=function(b){if(!v&&f.sidebar_fixed){i.wrap('<div class="nav-wrap-up pos-rel" />'),i.after("<div><div></div></div>"),i.wrap('<div class="nav-wrap" />'),f.settings.include_toggle||j.css({"z-index":1}),f.settings.include_shortcuts||k.css({"z-index":99}),p=i.parent().next().ace_scroll({size:y(),mouseWheelLock:!0,hoverReset:!1,dragEvent:!0,styleClass:f.settings.scroll_style,touchDrag:!1}).closest(".ace-scroll").addClass("nav-scroll"),u=p.data("ace_scroll"),q=p.find(".scroll-content").eq(0),r=q.find(" > div").eq(0),t=a(u.get_track()),s=t.find(".scroll-bar").eq(0),f.settings.include_shortcuts&&0!=k.length&&(i.parent().prepend(k).wrapInner("<div />"),i=i.parent()),f.settings.include_toggle&&0!=j.length&&(i.append(j),i.closest(".nav-wrap").addClass("nav-wrap-t")),i.css({position:"relative"}),1==f.settings.scroll_outside&&p.addClass("scrollout"),l=i.get(0),l.style.top=0,q.on("scroll.nav",function(){l.style.top=-1*this.scrollTop+"px"}),i.on(a.event.special.mousewheel?"mousewheel.ace_scroll":"mousewheel.ace_scroll DOMMouseScroll.ace_scroll",function(a){return f.is_scrolling&&u.is_active()?p.trigger(a):!f.settings.lock_anyway}),i.on("mouseenter.ace_scroll",function(){t.addClass("scroll-hover")}).on("mouseleave.ace_scroll",function(){t.removeClass("scroll-hover")});var c=q.get(0);if(i.on("ace_drag.nav",function(b){if(!f.is_scrolling||!u.is_active())return void(b.retval.cancel=!0);if(0!=a(b.target).closest(".can-scroll").length)return void(b.retval.cancel=!0);if("up"==b.direction||"down"==b.direction){u.move_bar(!0);var d=b.dy;d=parseInt(Math.min(w,d)),Math.abs(d)>2&&(d=2*d),0!=d&&(c.scrollTop=c.scrollTop+d,l.style.top=-1*c.scrollTop+"px")}}),f.settings.smooth_scroll&&i.on("touchstart.nav MSPointerDown.nav pointerdown.nav",function(){i.css("transition-property","none"),s.css("transition-property","none")}).on("touchend.nav touchcancel.nav MSPointerUp.nav MSPointerCancel.nav pointerup.nav pointercancel.nav",function(){i.css("transition-property","top"),s.css("transition-property","top")}),d&&!f.settings.include_toggle){var e=j.get(0);e&&q.on("scroll.safari",function(){ace.helper.redraw(e)})}if(v=!0,1==b&&(f.reset(),n&&f.scroll_to_active(),n=!1),"number"==typeof f.settings.smooth_scroll&&f.settings.smooth_scroll>0&&(i.css({"transition-property":"top","transition-duration":(f.settings.smooth_scroll/1e3).toFixed(2)+"s"}),s.css({"transition-property":"top","transition-duration":(f.settings.smooth_scroll/1500).toFixed(2)+"s"}),p.on("drag.start",function(a){a.stopPropagation(),i.css("transition-property","none")}).on("drag.end",function(a){a.stopPropagation(),i.css("transition-property","top")})),ace.vars.android){var g=ace.helper.scrollTop();2>g&&(window.scrollTo(g,0),setTimeout(function(){f.reset()},20));var h,m=ace.helper.winHeight();a(window).on("scroll.ace_scroll",function(){f.is_scrolling&&u.is_active()&&(h=ace.helper.winHeight(),h!=m&&(m=h,f.reset()))})}}};this.scroll_to_active=function(){if(u&&u.is_active())try{var a,b=o.vars(),c=h.find(".nav-list");b.minimized&&!b.collapsible?a=c.find("> .active"):(a=i.find("> .active.hover"),0==a.length&&(a=i.find(".active:not(.open)")));var d=a.outerHeight();c=c.get(0);for(var e=a.get(0);e!=c;)d+=e.offsetTop,e=e.parentNode;var f=d-p.height();f>0&&(l.style.top=-f+"px",q.scrollTop(f))}catch(g){}},this.reset=function(a){if(a===!0&&(this.sidebar_fixed=e(b,"fixed")),!this.sidebar_fixed)return void this.disable();v||A();var c=o.vars(),d=!c.collapsible&&!c.horizontal&&(w=y())<(x=l.clientHeight);this.is_scrolling=!0,d&&(r.css({height:x,width:8}),p.prev().css({"max-height":w}),u.update({size:w}),u.enable(),u.reset()),d&&u.is_active()?h.addClass("sidebar-scroll"):this.is_scrolling&&this.disable()},this.disable=function(){this.is_scrolling=!1,p&&(p.css({height:"","max-height":""}),r.css({height:"",width:""}),p.prev().css({"max-height":""}),u.disable()),parseInt(l.style.top)<0&&f.settings.smooth_scroll&&a.support.transition.end?i.one(a.support.transition.end,function(){h.removeClass("sidebar-scroll"),i.off(".trans")}):h.removeClass("sidebar-scroll"),l.style.top=0},this.prehide=function(a){if(this.is_scrolling&&!o.get("minimized"))if(z()+a<y())this.disable();else if(0>a){var b=q.scrollTop()+a;if(0>b)return;l.style.top=-1*b+"px"}},this._reset=function(a){a===!0&&(this.sidebar_fixed=e(b,"fixed")),ace.vars.webkit?setTimeout(function(){f.reset()},0):this.reset()},this.set_hover=function(){t&&t.addClass("scroll-hover")},this.get=function(a){return this.hasOwnProperty(a)?this[a]:void 0},this.set=function(a,b){this.hasOwnProperty(a)&&(this[a]=b)},this.ref=function(){return this},this.updateStyle=function(a){null!=u&&u.update({styleClass:a})},h.on("hidden.ace.submenu.sidebar_scroll shown.ace.submenu.sidebar_scroll",".submenu",function(a){a.stopPropagation(),o.get("minimized")||(f._reset(),"shown"==a.type&&f.set_hover())}),A(!0)}}var d=ace.vars.safari&&navigator.userAgent.match(/version\/[1-5]/i),e="getComputedStyle"in window?function(a,b){return a.offsetHeight,window.getComputedStyle(a).position==b}:function(b,c){return b.offsetHeight,a(b).css("position")==c};a(document).on("settings.ace.sidebar_scroll",function(b,c){a(".sidebar[data-sidebar-scroll=true]").each(function(){var b=a(this),d=b.ace_sidebar_scroll("ref");if("sidebar_collapsed"==c&&e(this,"fixed"))"true"==b.attr("data-sidebar-hover")&&b.ace_sidebar_hover("reset"),d._reset();else if("sidebar_fixed"===c||"navbar_fixed"===c){var f=d.get("is_scrolling"),g=e(this,"fixed");d.set("sidebar_fixed",g),g&&!f?d._reset():g||d.disable()}})}),a(window).on("resize.ace.sidebar_scroll",function(){a(".sidebar[data-sidebar-scroll=true]").each(function(){var b=a(this);"true"==b.attr("data-sidebar-hover")&&b.ace_sidebar_hover("reset");var c=a(this).ace_sidebar_scroll("ref"),d=e(this,"fixed");c.set("sidebar_fixed",d),c._reset()})}),a.fn.ace_sidebar_scroll||(a.fn.ace_sidebar_scroll=function(d,e){var f,g=this.each(function(){var b=a(this),g=b.data("ace_sidebar_scroll"),h="object"==typeof d&&d;g||b.data("ace_sidebar_scroll",g=new c(this,h)),"string"==typeof d&&"function"==typeof g[d]&&(f=g[d](e))});return f===b?g:f},a.fn.ace_sidebar_scroll.defaults={scroll_to_active:!0,include_shortcuts:!0,include_toggle:!1,smooth_scroll:150,scroll_outside:!1,scroll_style:"",lock_anyway:!1})}(window.jQuery),function(a,b){function c(b,c){function h(b){var c=b,d=a(c),e=null,f=!1;this.show=function(){null!=e&&clearTimeout(e),e=null,d.addClass("hover-show hover-shown"),f=!0;for(var a=0;a<g.length;a++)g[a].find(".hover-show").not(".hover-shown").each(function(){i(this).hide()})},this.hide=function(){f=!1,d.removeClass("hover-show hover-shown hover-flip"),null!=e&&clearTimeout(e),e=null;var a=d.find("> .submenu").get(0);a&&j(a,"hide")},this.hideDelay=function(a){null!=e&&clearTimeout(e),d.removeClass("hover-shown"),e=setTimeout(function(){f=!1,d.removeClass("hover-show hover-flip"),e=null;var b=d.find("> .submenu").get(0);b&&j(b,"hide"),"function"==typeof a&&a.call(this)},m.settings.sub_hover_delay)},this.is_visible=function(){return f}}function i(b){var c=a(b).data("subHide");return c||a(b).data("subHide",c=new h(b)),c}function j(b,c){var d=a(b).data("ace_scroll");return d?"string"==typeof c?(d[c](),!0):d:!1}function k(c){var d=a(this),f=a(c);c.style.top="",c.style.bottom="";var g=null;q.minimized&&(g=d.find(".menu-text").get(0))&&(g.style.marginTop="");var h=ace.helper.scrollTop(),i=0,k=h;v&&(i=b.offsetTop,k+=i+1);var m=d.offset();m.top=parseInt(m.top);var n,o=0;c.style.maxHeight="";var r=c.scrollHeight,n=d.height();g&&(o=n,m.top+=o);var u=parseInt(m.top+r),x=0,y=t.height(),z=parseInt(m.top-k-o),A=y,B=q.horizontal,C=!1;B&&this.parentNode==p&&(x=0,m.top+=d.height(),C=!0),!C&&(x=u-(y+h))>=0&&(x=z>x?x:z,0==x&&(x=20),z-x>10&&(x+=parseInt(Math.min(25,z-x))),m.top+(n-o)>u-x&&(x-=m.top+(n-o)-(u-x)),x>0&&(c.style.top=-x+"px",g&&(g.style.marginTop=-x+"px"))),0>x&&(x=0);
-var D=x>0&&x>n-20;if(D?d.addClass("pull_up"):d.removeClass("pull_up"),B)if(d.parent().parent().hasClass("hover-flip"))d.addClass("hover-flip");else{var E=f.offset(),F=f.width(),G=t.width();E.left+F>G&&d.addClass("hover-flip")}var H=d.hasClass("hover")&&!q.mobile_view;if(!(H&&f.find("> li > .submenu").length>0)){var I=A-(m.top-h)+x,J=x-I;if(J>0&&n>J&&(I+=parseInt(Math.max(n,n-J))),I-=5,!(90>I)){var K=!1;if(e)f.addClass("sub-scroll").css("max-height",I+"px");else{if(K=j(c),0==K){f.ace_scroll({observeContent:!0,detached:!0,updatePos:!1,reset:!0,mouseWheelLock:!0,styleClass:l.settings.sub_scroll_style}),K=j(c);var L=K.get_track();L&&f.after(L)}K.update({size:I})}if(w=I,!e&&K){I>14&&r-I>4?(K.enable(),K.reset()):K.disable();var L=K.get_track();if(L){L.style.top=-(x-o-1)+"px";var m=f.position(),M=m.left;M+=s?2:f.outerWidth()-K.track_size(),L.style.left=parseInt(M)+"px",C&&(L.style.left=parseInt(M-2)+"px",L.style.top=parseInt(m.top)+(g?o-2:0)+"px")}}ace.vars.safari&&ace.helper.redraw(c)}}}var l=this,m=this,n=ace.helper.getAttrSettings(b,a.fn.ace_sidebar_hover.defaults);this.settings=a.extend({},a.fn.ace_sidebar_hover.defaults,c,n);var o=a(b),p=o.find(".nav-list").get(0);o.attr("data-sidebar-hover","true"),g.push(o);var q={},r=ace.vars.old_ie,s=!1;d&&(l.settings.sub_hover_delay=parseInt(Math.max(l.settings.sub_hover_delay,2500)));var t=a(window),u=a(".navbar").eq(0),v="fixed"==u.css("position");this.update_vars=function(){v="fixed"==u.css("position")},l.dirty=!1,this.reset=function(){0!=l.dirty&&(l.dirty=!1,o.find(".submenu").each(function(){var b=a(this),c=b.parent();b.css({top:"",bottom:"","max-height":""}),b.hasClass("ace-scroll")?b.ace_scroll("disable"):b.removeClass("sub-scroll"),f(this,"absolute")?b.addClass("can-scroll"):b.removeClass("can-scroll"),c.removeClass("pull_up").find(".menu-text:first").css("margin-top","")}),o.find(".hover-show").removeClass("hover-show hover-shown hover-flip"))},this.updateStyle=function(a){sub_scroll_style=a,o.find(".submenu.ace-scroll").ace_scroll("update",{styleClass:a})},this.changeDir=function(a){s="right"===a};var w=-1;e||o.on("hide.ace.submenu.sidebar_hover",".submenu",function(b){if(!(1>w)){b.stopPropagation();var c=a(this).closest(".ace-scroll.can-scroll");0!=c.length&&f(c[0],"absolute")&&c[0].scrollHeight-this.scrollHeight<w&&c.ace_scroll("disable")}}),e||o.on("shown.ace.submenu.sidebar_hover hidden.ace.submenu.sidebar_hover",".submenu",function(){if(!(1>w)){var b=a(this).closest(".ace-scroll.can-scroll");if(0!=b.length&&f(b[0],"absolute")){var c=b[0].scrollHeight;w>14&&c-w>4?b.ace_scroll("enable").ace_scroll("reset"):b.ace_scroll("disable")}}});var x=-1,y=d?"touchstart.sub_hover":"mouseenter.sub_hover",z=d?"touchend.sub_hover touchcancel.sub_hover":"mouseleave.sub_hover";o.on(y,".nav-list li, .sidebar-shortcuts",function(){if(q=o.ace_sidebar("vars"),!q.collapsible){var b=a(this),c=!1,e=b.hasClass("hover"),g=b.find("> .submenu").get(0);if(!(g||this.parentNode==p||e||(c=b.hasClass("sidebar-shortcuts"))))return void(g&&a(g).removeClass("can-scroll"));var h=g,j=!1;if(h||this.parentNode!=p||(h=b.find("> a > .menu-text").get(0)),!h&&c&&(h=b.find(".sidebar-shortcuts-large").get(0)),!(h&&(j=f(h,"absolute"))||e))return void(g&&a(g).removeClass("can-scroll"));var m=i(this);if(g)if(j){l.dirty=!0;var n=ace.helper.scrollTop();if(!m.is_visible()||!d&&n!=x||r)if(a(g).addClass("can-scroll"),r||d){var s=this;setTimeout(function(){k.call(s,g)},0)}else k.call(this,g);x=n}else a(g).removeClass("can-scroll");m.show()}}).on(z,".nav-list li, .sidebar-shortcuts",function(){q=o.ace_sidebar("vars"),q.collapsible||a(this).hasClass("hover-show")&&i(this).hideDelay()})}if(!ace.vars.very_old_ie){var d=ace.vars.touch,e=ace.vars.old_ie||d,f="getComputedStyle"in window?function(a,b){return a.offsetHeight,window.getComputedStyle(a).position==b}:function(b,c){return b.offsetHeight,a(b).css("position")==c};a(window).on("resize.sidebar.ace_hover",function(){a(".sidebar[data-sidebar-hover=true]").ace_sidebar_hover("update_vars").ace_sidebar_hover("reset")}),a(document).on("settings.ace.ace_hover",function(b,c){"sidebar_collapsed"==c?a(".sidebar[data-sidebar-hover=true]").ace_sidebar_hover("reset"):"navbar_fixed"==c&&a(".sidebar[data-sidebar-hover=true]").ace_sidebar_hover("update_vars")});var g=[];a.fn.ace_sidebar_hover=function(d,e){var f,g=this.each(function(){var b=a(this),g=b.data("ace_sidebar_hover"),h="object"==typeof d&&d;g||b.data("ace_sidebar_hover",g=new c(this,h)),"string"==typeof d&&"function"==typeof g[d]&&(f=g[d](e))});return f===b?g:f},a.fn.ace_sidebar_hover.defaults={sub_sub_hover_delay:750,sub_scroll_style:"no-track scroll-thin"}}}(window.jQuery),function(a,b){function c(b,c){var d=b.find(".widget-main").eq(0);a(window).off("resize.widget.scroll");var e=ace.vars.old_ie||ace.vars.touch;if(c){var f=d.data("ace_scroll");f&&d.data("save_scroll",{size:f.size,lock:f.lock,lock_anyway:f.lock_anyway});var g=b.height()-b.find(".widget-header").height()-10;g=parseInt(g),d.css("min-height",g),e?(f&&d.ace_scroll("disable"),d.css("max-height",g).addClass("overflow-scroll")):(f?d.ace_scroll("update",{size:g,mouseWheelLock:!0,lockAnyway:!0}):d.ace_scroll({size:g,mouseWheelLock:!0,lockAnyway:!0}),d.ace_scroll("enable").ace_scroll("reset")),a(window).on("resize.widget.scroll",function(){var a=b.height()-b.find(".widget-header").height()-10;a=parseInt(a),d.css("min-height",a),e?d.css("max-height",a).addClass("overflow-scroll"):d.ace_scroll("update",{size:a}).ace_scroll("reset")})}else{d.css("min-height","");var h=d.data("save_scroll");h&&d.ace_scroll("update",{size:h.size,mouseWheelLock:h.lock,lockAnyway:h.lock_anyway}).ace_scroll("enable").ace_scroll("reset"),e?d.css("max-height","").removeClass("overflow-scroll"):h||d.ace_scroll("disable")}}var d=function(b){this.$box=a(b);this.reload=function(){var a=this.$box,b=!1;"static"==a.css("position")&&(b=!0,a.addClass("position-relative")),a.append('<div class="widget-box-overlay"><i class="'+ace.vars.icon+'loading-icon fa fa-spinner fa-spin fa-2x white"></i></div>'),a.one("reloaded.ace.widget",function(){a.find(".widget-box-overlay").remove(),b&&a.removeClass("position-relative")})},this.close=function(){var a=this.$box,b=300;a.fadeOut(b,function(){a.trigger("closed.ace.widget"),a.remove()})},this.toggle=function(a,b){var c=this.$box,d=c.find(".widget-body").eq(0),e=null,f="undefined"!=typeof a?a:c.hasClass("collapsed")?"show":"hide",g="show"==f?"shown":"hidden";if("undefined"==typeof b&&(b=c.find("> .widget-header a[data-action=collapse]").eq(0),0==b.length&&(b=null)),b){e=b.find(ace.vars[".icon"]).eq(0);var h,i=null,j=null;(i=e.attr("data-icon-show"))?j=e.attr("data-icon-hide"):(h=e.attr("class").match(/fa\-(.*)\-(up|down)/))&&(i="fa-"+h[1]+"-down",j="fa-"+h[1]+"-up")}var k=250,l=200;"show"==f?(e&&e.removeClass(i).addClass(j),d.hide(),c.removeClass("collapsed"),d.slideDown(k,function(){c.trigger(g+".ace.widget")})):(e&&e.removeClass(j).addClass(i),d.slideUp(l,function(){c.addClass("collapsed"),c.trigger(g+".ace.widget")}))},this.hide=function(){this.toggle("hide")},this.show=function(){this.toggle("show")},this.fullscreen=function(){var a=this.$box.find("> .widget-header a[data-action=fullscreen]").find(ace.vars[".icon"]).eq(0),b=null,d=null;(b=a.attr("data-icon1"))?d=a.attr("data-icon2"):(b="fa-expand",d="fa-compress"),this.$box.hasClass("fullscreen")?(a.addClass(b).removeClass(d),this.$box.removeClass("fullscreen"),c(this.$box,!1)):(a.removeClass(b).addClass(d),this.$box.addClass("fullscreen"),c(this.$box,!0)),this.$box.trigger("fullscreened.ace.widget")}};a.fn.widget_box=function(c,e){var f,g=this.each(function(){var b=a(this),g=b.data("widget_box"),h="object"==typeof c&&c;g||b.data("widget_box",g=new d(this,h)),"string"==typeof c&&(f=g[c](e))});return f===b?g:f},a(document).on("click.ace.widget",".widget-header a[data-action]",function(b){b.preventDefault();var c=a(this),e=c.closest(".widget-box");if(0!=e.length&&!e.hasClass("ui-sortable-helper")){var f=e.data("widget_box");f||e.data("widget_box",f=new d(e.get(0)));var g=c.data("action");if("collapse"==g){var h,i=e.hasClass("collapsed")?"show":"hide";if(e.trigger(h=a.Event(i+".ace.widget")),h.isDefaultPrevented())return;f.toggle(i,c)}else if("close"==g){var h;if(e.trigger(h=a.Event("close.ace.widget")),h.isDefaultPrevented())return;f.close()}else if("reload"==g){c.blur();var h;if(e.trigger(h=a.Event("reload.ace.widget")),h.isDefaultPrevented())return;f.reload()}else if("fullscreen"==g){var h;if(e.trigger(h=a.Event("fullscreen.ace.widget")),h.isDefaultPrevented())return;f.fullscreen()}else"settings"==g&&e.trigger("setting.ace.widget")}})}(window.jQuery),function(a){a("#ace-settings-btn").on(ace.click_event,function(b){b.preventDefault(),a(this).toggleClass("open"),a("#ace-settings-box").toggleClass("open")}),a("#ace-settings-navbar").on("click",function(){ace.settings.navbar_fixed(null,this.checked)}).each(function(){this.checked=ace.settings.is("navbar","fixed")}),a("#ace-settings-sidebar").on("click",function(){ace.settings.sidebar_fixed(null,this.checked)}).each(function(){this.checked=ace.settings.is("sidebar","fixed")}),a("#ace-settings-breadcrumbs").on("click",function(){ace.settings.breadcrumbs_fixed(null,this.checked)}).each(function(){this.checked=ace.settings.is("breadcrumbs","fixed")}),a("#ace-settings-add-container").on("click",function(){ace.settings.main_container_fixed(null,this.checked)}).each(function(){this.checked=ace.settings.is("main-container","fixed")}),a("#ace-settings-compact").on("click",function(){if(this.checked){a("#sidebar").addClass("compact");var b=a("#ace-settings-hover");b.length>0&&b.removeAttr("checked").trigger("click")}else a("#sidebar").removeClass("compact"),a("#sidebar[data-sidebar-scroll=true]").ace_sidebar_scroll("reset");ace.vars.old_ie&&ace.helper.redraw(a("#sidebar")[0],!0)}),a("#ace-settings-highlight").on("click",function(){this.checked?a("#sidebar .nav-list > li").addClass("highlight"):a("#sidebar .nav-list > li").removeClass("highlight"),ace.vars.old_ie&&ace.helper.redraw(a("#sidebar")[0])}),a("#ace-settings-hover").on("click",function(){if(!a("#sidebar").hasClass("h-sidebar")){if(this.checked)a("#sidebar li").addClass("hover").filter(".open").removeClass("open").find("> .submenu").css("display","none");else{a("#sidebar li.hover").removeClass("hover");var b=a("#ace-settings-compact");b.length>0&&b.get(0).checked&&b.trigger("click")}a(".sidebar[data-sidebar-hover=true]").ace_sidebar_hover("reset"),a(".sidebar[data-sidebar-scroll=true]").ace_sidebar_scroll("reset"),ace.vars.old_ie&&ace.helper.redraw(a("#sidebar")[0])}})}(jQuery),function(a){a("#ace-settings-rtl").removeAttr("checked").on("click",function(){b()});var b=function(){function b(b){function c(a,b){e.find("."+a).removeClass(a).addClass("tmp-rtl-"+a).end().find("."+b).removeClass(b).addClass(a).end().find(".tmp-rtl-"+a).removeClass("tmp-rtl-"+a).addClass(b)}var d=a(document.body);b||d.toggleClass("rtl"),b=b||document.body;var e=a(b);e.find(".dropdown-menu:not(.datepicker-dropdown,.colorpicker)").toggleClass("dropdown-menu-right").end().find(".pull-right:not(.dropdown-menu,blockquote,.profile-skills .pull-right)").removeClass("pull-right").addClass("tmp-rtl-pull-right").end().find(".pull-left:not(.dropdown-submenu,.profile-skills .pull-left)").removeClass("pull-left").addClass("pull-right").end().find(".tmp-rtl-pull-right").removeClass("tmp-rtl-pull-right").addClass("pull-left").end().find(".chosen-select").toggleClass("chosen-rtl").next().toggleClass("chosen-rtl"),c("align-left","align-right"),c("no-padding-left","no-padding-right"),c("arrowed","arrowed-right"),c("arrowed-in","arrowed-in-right"),c("tabs-left","tabs-right"),c("messagebar-item-left","messagebar-item-right"),a(".modal.aside-vc").ace_aside("flip").ace_aside("insideContainer"),e.find(".fa").each(function(){if(!(this.className.match(/ui-icon/)||a(this).closest(".fc-button").length>0))for(var b=this.attributes.length,c=0;b>c;c++){var d=this.attributes[c].value;d.match(/fa\-(?:[\w\-]+)\-left/)?this.attributes[c].value=d.replace(/fa\-([\w\-]+)\-(left)/i,"fa-$1-right"):d.match(/fa\-(?:[\w\-]+)\-right/)&&(this.attributes[c].value=d.replace(/fa\-([\w\-]+)\-(right)/i,"fa-$1-left"))}});var f=d.hasClass("rtl");f?(e.find(".scroll-hz").addClass("make-ltr").find(".scroll-content").wrapInner('<div class="make-rtl" />'),a(".sidebar[data-sidebar-hover=true]").ace_sidebar_hover("changeDir","right")):(e.find(".scroll-hz").removeClass("make-ltr").find(".make-rtl").children().unwrap(),a(".sidebar[data-sidebar-hover=true]").ace_sidebar_hover("changeDir","left")),a.fn.ace_scroll&&e.find(".scroll-hz").ace_scroll("reset");try{var g=a("#piechart-placeholder");if(g.length>0){var h=d.hasClass("rtl")?"nw":"ne";g.data("draw").call(g.get(0),g,g.data("chart"),h)}}catch(i){}ace.helper.redraw(b,!0)}if(0==a("#ace-rtl-stylesheet").length){var c=a("head").find("link.ace-main-stylesheet");0==c.length&&(c=a("head").find('link[href*="/ace.min.css"],link[href*="/ace-part2.min.css"]'),0==c.length&&(c=a("head").find('link[href*="/ace.css"],link[href*="/ace-part2.css"]')));var d=a("head").find("link#ace-skins-stylesheet"),e=c.first().attr("href").replace(/(\.min)?\.css$/i,"-rtl$1.css");a.ajax({url:e}).done(function(){var a=jQuery("<link />",{type:"text/css",rel:"stylesheet",id:"ace-rtl-stylesheet"});d.length>0?a.insertAfter(d):c.length>0?a.insertAfter(c.last()):a.appendTo("head"),a.attr("href",e),b(),window.Pace&&Pace.running&&Pace.stop()})}else b();a(".page-content-area[data-ajax-content=true]").on("ajaxscriptsloaded.rtl",function(){a("body").hasClass("rtl")&&b(this)})}}(jQuery),function(a){try{a("#skin-colorpicker").ace_colorpicker({auto_pos:!1})}catch(b){}a("#skin-colorpicker").on("change",function(){function b(b){var c=a(document.body);c.removeClass("no-skin skin-1 skin-2 skin-3"),c.addClass(b),ace.data.set("skin",b);var d=["red","blue","green",""];a(".ace-nav > li.grey").removeClass("dark"),a(".ace-nav > li").removeClass("no-border margin-1"),a(".ace-nav > li:not(:last-child)").removeClass("light-pink").find("> a > "+ace.vars[".icon"]).removeClass("pink").end().eq(0).find(".badge").removeClass("badge-warning"),a(".sidebar-shortcuts .btn").removeClass("btn-pink btn-white").find(ace.vars[".icon"]).removeClass("white"),a(".ace-nav > li.grey").removeClass("red").find(".badge").removeClass("badge-yellow"),a(".sidebar-shortcuts .btn").removeClass("btn-primary btn-white");var e=0;a(".sidebar-shortcuts .btn").each(function(){a(this).find(ace.vars[".icon"]).removeClass(d[e++])});var f=["btn-success","btn-info","btn-warning","btn-danger"];if("no-skin"==b){var e=0;a(".sidebar-shortcuts .btn").each(function(){a(this).attr("class","btn "+f[e++%4])}),a(".sidebar[data-sidebar-scroll=true]").ace_sidebar_scroll("updateStyle",""),a(".sidebar[data-sidebar-hover=true]").ace_sidebar_hover("updateStyle","no-track scroll-thin")}else if("skin-1"==b){a(".ace-nav > li.grey").addClass("dark");var e=0;a(".sidebar-shortcuts").find(".btn").each(function(){a(this).attr("class","btn "+f[e++%4])}),a(".sidebar[data-sidebar-scroll=true]").ace_sidebar_scroll("updateStyle","scroll-white no-track"),a(".sidebar[data-sidebar-hover=true]").ace_sidebar_hover("updateStyle","no-track scroll-thin scroll-white")}else if("skin-2"==b)a(".ace-nav > li").addClass("no-border margin-1"),a(".ace-nav > li:not(:last-child)").addClass("light-pink").find("> a > "+ace.vars[".icon"]).addClass("pink").end().eq(0).find(".badge").addClass("badge-warning"),a(".sidebar-shortcuts .btn").attr("class","btn btn-white btn-pink").find(ace.vars[".icon"]).addClass("white"),a(".sidebar[data-sidebar-scroll=true]").ace_sidebar_scroll("updateStyle","scroll-white no-track"),a(".sidebar[data-sidebar-hover=true]").ace_sidebar_hover("updateStyle","no-track scroll-thin scroll-white");else if("skin-3"==b){c.addClass("no-skin"),a(".ace-nav > li.grey").addClass("red").find(".badge").addClass("badge-yellow");var e=0;a(".sidebar-shortcuts .btn").each(function(){a(this).attr("class","btn btn-primary btn-white"),a(this).find(ace.vars[".icon"]).addClass(d[e++])}),a(".sidebar[data-sidebar-scroll=true]").ace_sidebar_scroll("updateStyle","scroll-dark no-track"),a(".sidebar[data-sidebar-hover=true]").ace_sidebar_hover("updateStyle","no-track scroll-thin")}a(".sidebar[data-sidebar-scroll=true]").ace_sidebar_scroll("reset"),ace.vars.old_ie&&ace.helper.redraw(document.body,!0)}var c=a(this).find("option:selected").data("skin");if(0==a("#ace-skins-stylesheet").length){var d=a("head").find("link.ace-main-stylesheet");0==d.length&&(d=a("head").find('link[href*="/ace.min.css"],link[href*="/ace-part2.min.css"]'),0==d.length&&(d=a("head").find('link[href*="/ace.css"],link[href*="/ace-part2.css"]')));var e=d.first().attr("href").replace(/(\.min)?\.css$/i,"-skins$1.css");a.ajax({url:e}).done(function(){var a=jQuery("<link />",{type:"text/css",rel:"stylesheet",id:"ace-skins-stylesheet"});d.length>0?a.insertAfter(d.last()):a.appendTo("head"),a.attr("href",e),b(c),window.Pace&&Pace.running&&Pace.stop()})}else b(c)})}(jQuery),function(a){a(document).on("reload.ace.widget",".widget-box",function(){var b=a(this);setTimeout(function(){b.trigger("reloaded.ace.widget")},parseInt(1e3*Math.random()+1e3))})}(window.jQuery),function(a){ace.vars.US_STATES=["Alabama","Alaska","Arizona","Arkansas","California","Colorado","Connecticut","Delaware","Florida","Georgia","Hawaii","Idaho","Illinois","Indiana","Iowa","Kansas","Kentucky","Louisiana","Maine","Maryland","Massachusetts","Michigan","Minnesota","Mississippi","Missouri","Montana","Nebraska","Nevada","New Hampshire","New Jersey","New Mexico","New York","North Dakota","North Carolina","Ohio","Oklahoma","Oregon","Pennsylvania","Rhode Island","South Carolina","South Dakota","Tennessee","Texas","Utah","Vermont","Virginia","Washington","West Virginia","Wisconsin","Wyoming"];try{a("#nav-search-input").bs_typeahead({source:ace.vars.US_STATES,updater:function(b){return a("#nav-search-input").focus(),b}})}catch(b){}}(window.jQuery);
\ No newline at end of file
diff --git a/NewLife.Cube/Content/ace/js/additional-methods.min.js b/NewLife.Cube/Content/ace/js/additional-methods.min.js
deleted file mode 100644
index bf1446ad6e..0000000000
--- a/NewLife.Cube/Content/ace/js/additional-methods.min.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/*!
- * jQuery Validation Plugin v1.13.1
- *
- * http://jqueryvalidation.org/
- *
- * Copyright (c) 2014 Jörn Zaefferer
- * Released under the MIT license
- */
-!function(a){"function"==typeof define&&define.amd?define(["jquery","./jquery.validate"],a):a(jQuery)}(function(a){!function(){function b(a){return a.replace(/<.[^<>]*?>/g," ").replace(/&nbsp;|&#160;/gi," ").replace(/[.(),;:!?%#$'\"_+=\/\-“”’]*/g,"")}a.validator.addMethod("maxWords",function(a,c,d){return this.optional(c)||b(a).match(/\b\w+\b/g).length<=d},a.validator.format("Please enter {0} words or less.")),a.validator.addMethod("minWords",function(a,c,d){return this.optional(c)||b(a).match(/\b\w+\b/g).length>=d},a.validator.format("Please enter at least {0} words.")),a.validator.addMethod("rangeWords",function(a,c,d){var e=b(a),f=/\b\w+\b/g;return this.optional(c)||e.match(f).length>=d[0]&&e.match(f).length<=d[1]},a.validator.format("Please enter between {0} and {1} words."))}(),a.validator.addMethod("accept",function(b,c,d){var e,f,g="string"==typeof d?d.replace(/\s/g,"").replace(/,/g,"|"):"image/*",h=this.optional(c);if(h)return h;if("file"===a(c).attr("type")&&(g=g.replace(/\*/g,".*"),c.files&&c.files.length))for(e=0;e<c.files.length;e++)if(f=c.files[e],!f.type.match(new RegExp(".?("+g+")$","i")))return!1;return!0},a.validator.format("Please enter a value with a valid mimetype.")),a.validator.addMethod("alphanumeric",function(a,b){return this.optional(b)||/^\w+$/i.test(a)},"Letters, numbers, and underscores only please"),a.validator.addMethod("bankaccountNL",function(a,b){if(this.optional(b))return!0;if(!/^[0-9]{9}|([0-9]{2} ){3}[0-9]{3}$/.test(a))return!1;var c,d,e,f=a.replace(/ /g,""),g=0,h=f.length;for(c=0;h>c;c++)d=h-c,e=f.substring(c,c+1),g+=d*e;return g%11===0},"Please specify a valid bank account number"),a.validator.addMethod("bankorgiroaccountNL",function(b,c){return this.optional(c)||a.validator.methods.bankaccountNL.call(this,b,c)||a.validator.methods.giroaccountNL.call(this,b,c)},"Please specify a valid bank or giro account number"),a.validator.addMethod("bic",function(a,b){return this.optional(b)||/^([A-Z]{6}[A-Z2-9][A-NP-Z1-2])(X{3}|[A-WY-Z0-9][A-Z0-9]{2})?$/.test(a)},"Please specify a valid BIC code"),a.validator.addMethod("cifES",function(a){"use strict";var b,c,d,e,f,g,h=[];if(a=a.toUpperCase(),!a.match("((^[A-Z]{1}[0-9]{7}[A-Z0-9]{1}$|^[T]{1}[A-Z0-9]{8}$)|^[0-9]{8}[A-Z]{1}$)"))return!1;for(d=0;9>d;d++)h[d]=parseInt(a.charAt(d),10);for(c=h[2]+h[4]+h[6],e=1;8>e;e+=2)f=(2*h[e]).toString(),g=f.charAt(1),c+=parseInt(f.charAt(0),10)+(""===g?0:parseInt(g,10));return/^[ABCDEFGHJNPQRSUVW]{1}/.test(a)?(c+="",b=10-parseInt(c.charAt(c.length-1),10),a+=b,h[8].toString()===String.fromCharCode(64+b)||h[8].toString()===a.charAt(a.length-1)):!1},"Please specify a valid CIF number."),a.validator.addMethod("creditcardtypes",function(a,b,c){if(/[^0-9\-]+/.test(a))return!1;a=a.replace(/\D/g,"");var d=0;return c.mastercard&&(d|=1),c.visa&&(d|=2),c.amex&&(d|=4),c.dinersclub&&(d|=8),c.enroute&&(d|=16),c.discover&&(d|=32),c.jcb&&(d|=64),c.unknown&&(d|=128),c.all&&(d=255),1&d&&/^(5[12345])/.test(a)?16===a.length:2&d&&/^(4)/.test(a)?16===a.length:4&d&&/^(3[47])/.test(a)?15===a.length:8&d&&/^(3(0[012345]|[68]))/.test(a)?14===a.length:16&d&&/^(2(014|149))/.test(a)?15===a.length:32&d&&/^(6011)/.test(a)?16===a.length:64&d&&/^(3)/.test(a)?16===a.length:64&d&&/^(2131|1800)/.test(a)?15===a.length:128&d?!0:!1},"Please enter a valid credit card number."),a.validator.addMethod("currency",function(a,b,c){var d,e="string"==typeof c,f=e?c:c[0],g=e?!0:c[1];return f=f.replace(/,/g,""),f=g?f+"]":f+"]?",d="^["+f+"([1-9]{1}[0-9]{0,2}(\\,[0-9]{3})*(\\.[0-9]{0,2})?|[1-9]{1}[0-9]{0,}(\\.[0-9]{0,2})?|0(\\.[0-9]{0,2})?|(\\.[0-9]{1,2})?)$",d=new RegExp(d),this.optional(b)||d.test(a)},"Please specify a valid currency"),a.validator.addMethod("dateFA",function(a,b){return this.optional(b)||/^[1-4]\d{3}\/((0?[1-6]\/((3[0-1])|([1-2][0-9])|(0?[1-9])))|((1[0-2]|(0?[7-9]))\/(30|([1-2][0-9])|(0?[1-9]))))$/.test(a)},"Please enter a correct date"),a.validator.addMethod("dateITA",function(a,b){var c,d,e,f,g,h=!1,i=/^\d{1,2}\/\d{1,2}\/\d{4}$/;return i.test(a)?(c=a.split("/"),d=parseInt(c[0],10),e=parseInt(c[1],10),f=parseInt(c[2],10),g=new Date(f,e-1,d,12,0,0,0),h=g.getUTCFullYear()===f&&g.getUTCMonth()===e-1&&g.getUTCDate()===d?!0:!1):h=!1,this.optional(b)||h},"Please enter a correct date"),a.validator.addMethod("dateNL",function(a,b){return this.optional(b)||/^(0?[1-9]|[12]\d|3[01])[\.\/\-](0?[1-9]|1[012])[\.\/\-]([12]\d)?(\d\d)$/.test(a)},"Please enter a correct date"),a.validator.addMethod("extension",function(a,b,c){return c="string"==typeof c?c.replace(/,/g,"|"):"png|jpe?g|gif",this.optional(b)||a.match(new RegExp(".("+c+")$","i"))},a.validator.format("Please enter a value with a valid extension.")),a.validator.addMethod("giroaccountNL",function(a,b){return this.optional(b)||/^[0-9]{1,7}$/.test(a)},"Please specify a valid giro account number"),a.validator.addMethod("iban",function(a,b){if(this.optional(b))return!0;var c,d,e,f,g,h,i,j,k,l=a.replace(/ /g,"").toUpperCase(),m="",n=!0,o="",p="";if(!/^([a-zA-Z0-9]{4} ){2,8}[a-zA-Z0-9]{1,4}|[a-zA-Z0-9]{12,34}$/.test(l))return!1;if(c=l.substring(0,2),h={AL:"\\d{8}[\\dA-Z]{16}",AD:"\\d{8}[\\dA-Z]{12}",AT:"\\d{16}",AZ:"[\\dA-Z]{4}\\d{20}",BE:"\\d{12}",BH:"[A-Z]{4}[\\dA-Z]{14}",BA:"\\d{16}",BR:"\\d{23}[A-Z][\\dA-Z]",BG:"[A-Z]{4}\\d{6}[\\dA-Z]{8}",CR:"\\d{17}",HR:"\\d{17}",CY:"\\d{8}[\\dA-Z]{16}",CZ:"\\d{20}",DK:"\\d{14}",DO:"[A-Z]{4}\\d{20}",EE:"\\d{16}",FO:"\\d{14}",FI:"\\d{14}",FR:"\\d{10}[\\dA-Z]{11}\\d{2}",GE:"[\\dA-Z]{2}\\d{16}",DE:"\\d{18}",GI:"[A-Z]{4}[\\dA-Z]{15}",GR:"\\d{7}[\\dA-Z]{16}",GL:"\\d{14}",GT:"[\\dA-Z]{4}[\\dA-Z]{20}",HU:"\\d{24}",IS:"\\d{22}",IE:"[\\dA-Z]{4}\\d{14}",IL:"\\d{19}",IT:"[A-Z]\\d{10}[\\dA-Z]{12}",KZ:"\\d{3}[\\dA-Z]{13}",KW:"[A-Z]{4}[\\dA-Z]{22}",LV:"[A-Z]{4}[\\dA-Z]{13}",LB:"\\d{4}[\\dA-Z]{20}",LI:"\\d{5}[\\dA-Z]{12}",LT:"\\d{16}",LU:"\\d{3}[\\dA-Z]{13}",MK:"\\d{3}[\\dA-Z]{10}\\d{2}",MT:"[A-Z]{4}\\d{5}[\\dA-Z]{18}",MR:"\\d{23}",MU:"[A-Z]{4}\\d{19}[A-Z]{3}",MC:"\\d{10}[\\dA-Z]{11}\\d{2}",MD:"[\\dA-Z]{2}\\d{18}",ME:"\\d{18}",NL:"[A-Z]{4}\\d{10}",NO:"\\d{11}",PK:"[\\dA-Z]{4}\\d{16}",PS:"[\\dA-Z]{4}\\d{21}",PL:"\\d{24}",PT:"\\d{21}",RO:"[A-Z]{4}[\\dA-Z]{16}",SM:"[A-Z]\\d{10}[\\dA-Z]{12}",SA:"\\d{2}[\\dA-Z]{18}",RS:"\\d{18}",SK:"\\d{20}",SI:"\\d{15}",ES:"\\d{20}",SE:"\\d{20}",CH:"\\d{5}[\\dA-Z]{12}",TN:"\\d{20}",TR:"\\d{5}[\\dA-Z]{17}",AE:"\\d{3}\\d{16}",GB:"[A-Z]{4}\\d{14}",VG:"[\\dA-Z]{4}\\d{16}"},g=h[c],"undefined"!=typeof g&&(i=new RegExp("^[A-Z]{2}\\d{2}"+g+"$",""),!i.test(l)))return!1;for(d=l.substring(4,l.length)+l.substring(0,4),j=0;j<d.length;j++)e=d.charAt(j),"0"!==e&&(n=!1),n||(m+="0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ".indexOf(e));for(k=0;k<m.length;k++)f=m.charAt(k),p=""+o+f,o=p%97;return 1===o},"Please specify a valid IBAN"),a.validator.addMethod("integer",function(a,b){return this.optional(b)||/^-?\d+$/.test(a)},"A positive or negative non-decimal number please"),a.validator.addMethod("ipv4",function(a,b){return this.optional(b)||/^(25[0-5]|2[0-4]\d|[01]?\d\d?)\.(25[0-5]|2[0-4]\d|[01]?\d\d?)\.(25[0-5]|2[0-4]\d|[01]?\d\d?)\.(25[0-5]|2[0-4]\d|[01]?\d\d?)$/i.test(a)},"Please enter a valid IP v4 address."),a.validator.addMethod("ipv6",function(a,b){return this.optional(b)||/^((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))$/i.test(a)},"Please enter a valid IP v6 address."),a.validator.addMethod("lettersonly",function(a,b){return this.optional(b)||/^[a-z]+$/i.test(a)},"Letters only please"),a.validator.addMethod("letterswithbasicpunc",function(a,b){return this.optional(b)||/^[a-z\-.,()'"\s]+$/i.test(a)},"Letters or punctuation only please"),a.validator.addMethod("mobileNL",function(a,b){return this.optional(b)||/^((\+|00(\s|\s?\-\s?)?)31(\s|\s?\-\s?)?(\(0\)[\-\s]?)?|0)6((\s|\s?\-\s?)?[0-9]){8}$/.test(a)},"Please specify a valid mobile number"),a.validator.addMethod("mobileUK",function(a,b){return a=a.replace(/\(|\)|\s+|-/g,""),this.optional(b)||a.length>9&&a.match(/^(?:(?:(?:00\s?|\+)44\s?|0)7(?:[1345789]\d{2}|624)\s?\d{3}\s?\d{3})$/)},"Please specify a valid mobile number"),a.validator.addMethod("nieES",function(a){"use strict";return a=a.toUpperCase(),a.match("((^[A-Z]{1}[0-9]{7}[A-Z0-9]{1}$|^[T]{1}[A-Z0-9]{8}$)|^[0-9]{8}[A-Z]{1}$)")?/^[T]{1}/.test(a)?a[8]===/^[T]{1}[A-Z0-9]{8}$/.test(a):/^[XYZ]{1}/.test(a)?a[8]==="TRWAGMYFPDXBNJZSQVHLCKE".charAt(a.replace("X","0").replace("Y","1").replace("Z","2").substring(0,8)%23):!1:!1},"Please specify a valid NIE number."),a.validator.addMethod("nifES",function(a){"use strict";return a=a.toUpperCase(),a.match("((^[A-Z]{1}[0-9]{7}[A-Z0-9]{1}$|^[T]{1}[A-Z0-9]{8}$)|^[0-9]{8}[A-Z]{1}$)")?/^[0-9]{8}[A-Z]{1}$/.test(a)?"TRWAGMYFPDXBNJZSQVHLCKE".charAt(a.substring(8,0)%23)===a.charAt(8):/^[KLM]{1}/.test(a)?a[8]===String.fromCharCode(64):!1:!1},"Please specify a valid NIF number."),a.validator.addMethod("nowhitespace",function(a,b){return this.optional(b)||/^\S+$/i.test(a)},"No white space please"),a.validator.addMethod("pattern",function(a,b,c){return this.optional(b)?!0:("string"==typeof c&&(c=new RegExp("^(?:"+c+")$")),c.test(a))},"Invalid format."),a.validator.addMethod("phoneNL",function(a,b){return this.optional(b)||/^((\+|00(\s|\s?\-\s?)?)31(\s|\s?\-\s?)?(\(0\)[\-\s]?)?|0)[1-9]((\s|\s?\-\s?)?[0-9]){8}$/.test(a)},"Please specify a valid phone number."),a.validator.addMethod("phoneUK",function(a,b){return a=a.replace(/\(|\)|\s+|-/g,""),this.optional(b)||a.length>9&&a.match(/^(?:(?:(?:00\s?|\+)44\s?)|(?:\(?0))(?:\d{2}\)?\s?\d{4}\s?\d{4}|\d{3}\)?\s?\d{3}\s?\d{3,4}|\d{4}\)?\s?(?:\d{5}|\d{3}\s?\d{3})|\d{5}\)?\s?\d{4,5})$/)},"Please specify a valid phone number"),a.validator.addMethod("phoneUS",function(a,b){return a=a.replace(/\s+/g,""),this.optional(b)||a.length>9&&a.match(/^(\+?1-?)?(\([2-9]([02-9]\d|1[02-9])\)|[2-9]([02-9]\d|1[02-9]))-?[2-9]([02-9]\d|1[02-9])-?\d{4}$/)},"Please specify a valid phone number"),a.validator.addMethod("phonesUK",function(a,b){return a=a.replace(/\(|\)|\s+|-/g,""),this.optional(b)||a.length>9&&a.match(/^(?:(?:(?:00\s?|\+)44\s?|0)(?:1\d{8,9}|[23]\d{9}|7(?:[1345789]\d{8}|624\d{6})))$/)},"Please specify a valid uk phone number"),a.validator.addMethod("postalCodeCA",function(a,b){return this.optional(b)||/^[ABCEGHJKLMNPRSTVXY]\d[A-Z] \d[A-Z]\d$/.test(a)},"Please specify a valid postal code"),a.validator.addMethod("postalcodeBR",function(a,b){return this.optional(b)||/^\d{2}.\d{3}-\d{3}?$|^\d{5}-?\d{3}?$/.test(a)},"Informe um CEP válido."),a.validator.addMethod("postalcodeIT",function(a,b){return this.optional(b)||/^\d{5}$/.test(a)},"Please specify a valid postal code"),a.validator.addMethod("postalcodeNL",function(a,b){return this.optional(b)||/^[1-9][0-9]{3}\s?[a-zA-Z]{2}$/.test(a)},"Please specify a valid postal code"),a.validator.addMethod("postcodeUK",function(a,b){return this.optional(b)||/^((([A-PR-UWYZ][0-9])|([A-PR-UWYZ][0-9][0-9])|([A-PR-UWYZ][A-HK-Y][0-9])|([A-PR-UWYZ][A-HK-Y][0-9][0-9])|([A-PR-UWYZ][0-9][A-HJKSTUW])|([A-PR-UWYZ][A-HK-Y][0-9][ABEHMNPRVWXY]))\s?([0-9][ABD-HJLNP-UW-Z]{2})|(GIR)\s?(0AA))$/i.test(a)},"Please specify a valid UK postcode"),a.validator.addMethod("require_from_group",function(b,c,d){var e=a(d[1],c.form),f=e.eq(0),g=f.data("valid_req_grp")?f.data("valid_req_grp"):a.extend({},this),h=e.filter(function(){return g.elementValue(this)}).length>=d[0];return f.data("valid_req_grp",g),a(c).data("being_validated")||(e.data("being_validated",!0),e.each(function(){g.element(this)}),e.data("being_validated",!1)),h},a.validator.format("Please fill at least {0} of these fields.")),a.validator.addMethod("skip_or_fill_minimum",function(b,c,d){var e=a(d[1],c.form),f=e.eq(0),g=f.data("valid_skip")?f.data("valid_skip"):a.extend({},this),h=e.filter(function(){return g.elementValue(this)}).length,i=0===h||h>=d[0];return f.data("valid_skip",g),a(c).data("being_validated")||(e.data("being_validated",!0),e.each(function(){g.element(this)}),e.data("being_validated",!1)),i},a.validator.format("Please either skip these fields or fill at least {0} of them.")),jQuery.validator.addMethod("stateUS",function(a,b,c){var d,e="undefined"==typeof c,f=e||"undefined"==typeof c.caseSensitive?!1:c.caseSensitive,g=e||"undefined"==typeof c.includeTerritories?!1:c.includeTerritories,h=e||"undefined"==typeof c.includeMilitary?!1:c.includeMilitary;return d=g||h?g&&h?"^(A[AEKLPRSZ]|C[AOT]|D[CE]|FL|G[AU]|HI|I[ADLN]|K[SY]|LA|M[ADEINOPST]|N[CDEHJMVY]|O[HKR]|P[AR]|RI|S[CD]|T[NX]|UT|V[AIT]|W[AIVY])$":g?"^(A[KLRSZ]|C[AOT]|D[CE]|FL|G[AU]|HI|I[ADLN]|K[SY]|LA|M[ADEINOPST]|N[CDEHJMVY]|O[HKR]|P[AR]|RI|S[CD]|T[NX]|UT|V[AIT]|W[AIVY])$":"^(A[AEKLPRZ]|C[AOT]|D[CE]|FL|GA|HI|I[ADLN]|K[SY]|LA|M[ADEINOST]|N[CDEHJMVY]|O[HKR]|PA|RI|S[CD]|T[NX]|UT|V[AT]|W[AIVY])$":"^(A[KLRZ]|C[AOT]|D[CE]|FL|GA|HI|I[ADLN]|K[SY]|LA|M[ADEINOST]|N[CDEHJMVY]|O[HKR]|PA|RI|S[CD]|T[NX]|UT|V[AT]|W[AIVY])$",d=f?new RegExp(d):new RegExp(d,"i"),this.optional(b)||d.test(a)},"Please specify a valid state"),a.validator.addMethod("strippedminlength",function(b,c,d){return a(b).text().length>=d},a.validator.format("Please enter at least {0} characters")),a.validator.addMethod("time",function(a,b){return this.optional(b)||/^([01]\d|2[0-3])(:[0-5]\d){1,2}$/.test(a)},"Please enter a valid time, between 00:00 and 23:59"),a.validator.addMethod("time12h",function(a,b){return this.optional(b)||/^((0?[1-9]|1[012])(:[0-5]\d){1,2}(\ ?[AP]M))$/i.test(a)},"Please enter a valid time in 12-hour am/pm format"),a.validator.addMethod("url2",function(a,b){return this.optional(b)||/^(https?|ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)*(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i.test(a)},a.validator.messages.url),a.validator.addMethod("vinUS",function(a){if(17!==a.length)return!1;var b,c,d,e,f,g,h=["A","B","C","D","E","F","G","H","J","K","L","M","N","P","R","S","T","U","V","W","X","Y","Z"],i=[1,2,3,4,5,6,7,8,1,2,3,4,5,7,9,2,3,4,5,6,7,8,9],j=[8,7,6,5,4,3,2,10,0,9,8,7,6,5,4,3,2],k=0;for(b=0;17>b;b++){if(e=j[b],d=a.slice(b,b+1),8===b&&(g=d),isNaN(d)){for(c=0;c<h.length;c++)if(d.toUpperCase()===h[c]){d=i[c],d*=e,isNaN(g)&&8===c&&(g=h[c]);break}}else d*=e;k+=d}return f=k%11,10===f&&(f="X"),f===g?!0:!1},"The specified vehicle identification number (VIN) is invalid."),a.validator.addMethod("zipcodeUS",function(a,b){return this.optional(b)||/^\d{5}(-\d{4})?$/.test(a)},"The specified US ZIP Code is invalid"),a.validator.addMethod("ziprange",function(a,b){return this.optional(b)||/^90[2-5]\d\{2\}-\d{4}$/.test(a)},"Your ZIP-code must be in the range 902xx-xxxx to 905xx-xxxx")});
\ No newline at end of file
diff --git a/NewLife.Cube/Content/ace/js/bootbox.min.js b/NewLife.Cube/Content/ace/js/bootbox.min.js
deleted file mode 100644
index 5da5b4f737..0000000000
--- a/NewLife.Cube/Content/ace/js/bootbox.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(a,b){"use strict";"function"==typeof define&&define.amd?define(["jquery"],b):"object"==typeof exports?module.exports=b(require("jquery")):a.bootbox=b(a.jQuery)}(this,function a(b,c){"use strict";function d(a){var b=q[o.locale];return b?b[a]:q.en[a]}function e(a,c,d){a.stopPropagation(),a.preventDefault();var e=b.isFunction(d)&&d(a)===!1;e||c.modal("hide")}function f(a){var b,c=0;for(b in a)c++;return c}function g(a,c){var d=0;b.each(a,function(a,b){c(a,b,d++)})}function h(a){var c,d;if("object"!=typeof a)throw new Error("Please supply an object of options");if(!a.message)throw new Error("Please specify a message");return a=b.extend({},o,a),a.buttons||(a.buttons={}),a.backdrop=a.backdrop?"static":!1,c=a.buttons,d=f(c),g(c,function(a,e,f){if(b.isFunction(e)&&(e=c[a]={callback:e}),"object"!==b.type(e))throw new Error("button with key "+a+" must be an object");e.label||(e.label=a),e.className||(e.className=2>=d&&f===d-1?"btn-primary":"btn-default")}),a}function i(a,b){var c=a.length,d={};if(1>c||c>2)throw new Error("Invalid argument length");return 2===c||"string"==typeof a[0]?(d[b[0]]=a[0],d[b[1]]=a[1]):d=a[0],d}function j(a,c,d){return b.extend(!0,{},a,i(c,d))}function k(a,b,c,d){var e={className:"bootbox-"+a,buttons:l.apply(null,b)};return m(j(e,d,c),b)}function l(){for(var a={},b=0,c=arguments.length;c>b;b++){var e=arguments[b],f=e.toLowerCase(),g=e.toUpperCase();a[f]={label:d(g)}}return a}function m(a,b){var d={};return g(b,function(a,b){d[b]=!0}),g(a.buttons,function(a){if(d[a]===c)throw new Error("button key "+a+" is not allowed (options are "+b.join("\n")+")")}),a}var n={dialog:"<div class='bootbox modal' tabindex='-1' role='dialog'><div class='modal-dialog'><div class='modal-content'><div class='modal-body'><div class='bootbox-body'></div></div></div></div></div>",header:"<div class='modal-header'><h4 class='modal-title'></h4></div>",footer:"<div class='modal-footer'></div>",closeButton:"<button type='button' class='bootbox-close-button close' data-dismiss='modal' aria-hidden='true'>&times;</button>",form:"<form class='bootbox-form'></form>",inputs:{text:"<input class='bootbox-input bootbox-input-text form-control' autocomplete=off type=text />",textarea:"<textarea class='bootbox-input bootbox-input-textarea form-control'></textarea>",email:"<input class='bootbox-input bootbox-input-email form-control' autocomplete='off' type='email' />",select:"<select class='bootbox-input bootbox-input-select form-control'></select>",checkbox:"<div class='checkbox'><label><input class='bootbox-input bootbox-input-checkbox' type='checkbox' /></label></div>",date:"<input class='bootbox-input bootbox-input-date form-control' autocomplete=off type='date' />",time:"<input class='bootbox-input bootbox-input-time form-control' autocomplete=off type='time' />",number:"<input class='bootbox-input bootbox-input-number form-control' autocomplete=off type='number' />",password:"<input class='bootbox-input bootbox-input-password form-control' autocomplete='off' type='password' />"}},o={locale:"en",backdrop:!0,animate:!0,className:null,closeButton:!0,show:!0,container:"body"},p={};p.alert=function(){var a;if(a=k("alert",["ok"],["message","callback"],arguments),a.callback&&!b.isFunction(a.callback))throw new Error("alert requires callback property to be a function when provided");return a.buttons.ok.callback=a.onEscape=function(){return b.isFunction(a.callback)?a.callback():!0},p.dialog(a)},p.confirm=function(){var a;if(a=k("confirm",["cancel","confirm"],["message","callback"],arguments),a.buttons.cancel.callback=a.onEscape=function(){return a.callback(!1)},a.buttons.confirm.callback=function(){return a.callback(!0)},!b.isFunction(a.callback))throw new Error("confirm requires a callback");return p.dialog(a)},p.prompt=function(){var a,d,e,f,h,i,k;if(f=b(n.form),d={className:"bootbox-prompt",buttons:l("cancel","confirm"),value:"",inputType:"text"},a=m(j(d,arguments,["title","callback"]),["cancel","confirm"]),i=a.show===c?!0:a.show,a.message=f,a.buttons.cancel.callback=a.onEscape=function(){return a.callback(null)},a.buttons.confirm.callback=function(){var c;switch(a.inputType){case"text":case"textarea":case"email":case"select":case"date":case"time":case"number":case"password":c=h.val();break;case"checkbox":var d=h.find("input:checked");c=[],g(d,function(a,d){c.push(b(d).val())})}return a.callback(c)},a.show=!1,!a.title)throw new Error("prompt requires a title");if(!b.isFunction(a.callback))throw new Error("prompt requires a callback");if(!n.inputs[a.inputType])throw new Error("invalid prompt type");switch(h=b(n.inputs[a.inputType]),a.inputType){case"text":case"textarea":case"email":case"date":case"time":case"number":case"password":h.val(a.value);break;case"select":var o={};if(k=a.inputOptions||[],!k.length)throw new Error("prompt with select requires options");g(k,function(a,d){var e=h;if(d.value===c||d.text===c)throw new Error("given options in wrong format");d.group&&(o[d.group]||(o[d.group]=b("<optgroup/>").attr("label",d.group)),e=o[d.group]),e.append("<option value='"+d.value+"'>"+d.text+"</option>")}),g(o,function(a,b){h.append(b)}),h.val(a.value);break;case"checkbox":var q=b.isArray(a.value)?a.value:[a.value];if(k=a.inputOptions||[],!k.length)throw new Error("prompt with checkbox requires options");if(!k[0].value||!k[0].text)throw new Error("given options in wrong format");h=b("<div/>"),g(k,function(c,d){var e=b(n.inputs[a.inputType]);e.find("input").attr("value",d.value),e.find("label").append(d.text),g(q,function(a,b){b===d.value&&e.find("input").prop("checked",!0)}),h.append(e)})}return a.placeholder&&h.attr("placeholder",a.placeholder),a.pattern&&h.attr("pattern",a.pattern),f.append(h),f.on("submit",function(a){a.preventDefault(),a.stopPropagation(),e.find(".btn-primary").click()}),e=p.dialog(a),e.off("shown.bs.modal"),e.on("shown.bs.modal",function(){h.focus()}),i===!0&&e.modal("show"),e},p.dialog=function(a){a=h(a);var c=b(n.dialog),d=c.find(".modal-dialog"),f=c.find(".modal-body"),i=a.buttons,j="",k={onEscape:a.onEscape};if(g(i,function(a,b){j+="<button data-bb-handler='"+a+"' type='button' class='btn "+b.className+"'>"+b.label+"</button>",k[a]=b.callback}),f.find(".bootbox-body").html(a.message),a.animate===!0&&c.addClass("fade"),a.className&&c.addClass(a.className),"large"===a.size&&d.addClass("modal-lg"),"small"===a.size&&d.addClass("modal-sm"),a.title&&f.before(n.header),a.closeButton){var l=b(n.closeButton);a.title?c.find(".modal-header").prepend(l):l.css("margin-top","-10px").prependTo(f)}return a.title&&c.find(".modal-title").html(a.title),j.length&&(f.after(n.footer),c.find(".modal-footer").html(j)),c.on("hidden.bs.modal",function(a){a.target===this&&c.remove()}),c.on("shown.bs.modal",function(){c.find(".btn-primary:first").focus()}),c.on("escape.close.bb",function(a){k.onEscape&&e(a,c,k.onEscape)}),c.on("click",".modal-footer button",function(a){var d=b(this).data("bb-handler");e(a,c,k[d])}),c.on("click",".bootbox-close-button",function(a){e(a,c,k.onEscape)}),c.on("keyup",function(a){27===a.which&&c.trigger("escape.close.bb")}),b(a.container).append(c),c.modal({backdrop:a.backdrop,keyboard:!1,show:!1}),a.show&&c.modal("show"),c},p.setDefaults=function(){var a={};2===arguments.length?a[arguments[0]]=arguments[1]:a=arguments[0],b.extend(o,a)},p.hideAll=function(){return b(".bootbox").modal("hide"),p};var q={br:{OK:"OK",CANCEL:"Cancelar",CONFIRM:"Sim"},cs:{OK:"OK",CANCEL:"Zrušit",CONFIRM:"Potvrdit"},da:{OK:"OK",CANCEL:"Annuller",CONFIRM:"Accepter"},de:{OK:"OK",CANCEL:"Abbrechen",CONFIRM:"Akzeptieren"},el:{OK:"Εντάξει",CANCEL:"Ακύρωση",CONFIRM:"Επιβεβαίωση"},en:{OK:"OK",CANCEL:"Cancel",CONFIRM:"OK"},es:{OK:"OK",CANCEL:"Cancelar",CONFIRM:"Aceptar"},et:{OK:"OK",CANCEL:"Katkesta",CONFIRM:"OK"},fi:{OK:"OK",CANCEL:"Peruuta",CONFIRM:"OK"},fr:{OK:"OK",CANCEL:"Annuler",CONFIRM:"D'accord"},he:{OK:"אישור",CANCEL:"ביטול",CONFIRM:"אישור"},id:{OK:"OK",CANCEL:"Batal",CONFIRM:"OK"},it:{OK:"OK",CANCEL:"Annulla",CONFIRM:"Conferma"},ja:{OK:"OK",CANCEL:"キャンセル",CONFIRM:"確認"},lt:{OK:"Gerai",CANCEL:"Atšaukti",CONFIRM:"Patvirtinti"},lv:{OK:"Labi",CANCEL:"Atcelt",CONFIRM:"Apstiprināt"},nl:{OK:"OK",CANCEL:"Annuleren",CONFIRM:"Accepteren"},no:{OK:"OK",CANCEL:"Avbryt",CONFIRM:"OK"},pl:{OK:"OK",CANCEL:"Anuluj",CONFIRM:"Potwierdź"},pt:{OK:"OK",CANCEL:"Cancelar",CONFIRM:"Confirmar"},ru:{OK:"OK",CANCEL:"Отмена",CONFIRM:"Применить"},sv:{OK:"OK",CANCEL:"Avbryt",CONFIRM:"OK"},tr:{OK:"Tamam",CANCEL:"İptal",CONFIRM:"Onayla"},zh_CN:{OK:"OK",CANCEL:"取消",CONFIRM:"确认"},zh_TW:{OK:"OK",CANCEL:"取消",CONFIRM:"確認"}};return p.init=function(c){return a(c||b)},p});
\ No newline at end of file
diff --git a/NewLife.Cube/Content/ace/js/chosen.jquery.min.js b/NewLife.Cube/Content/ace/js/chosen.jquery.min.js
deleted file mode 100644
index b3ba08d6d1..0000000000
--- a/NewLife.Cube/Content/ace/js/chosen.jquery.min.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/*!
-Chosen, a Select Box Enhancer for jQuery and Prototype
-by Patrick Filler for Harvest, http://getharvest.com
-
-Version 1.2.0
-Full source at https://github.com/harvesthq/chosen
-Copyright (c) 2011-2014 Harvest http://getharvest.com
-
-MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md
-This file is generated by `grunt build`, do not edit it by hand.
-*/
-(function(){var a,b,c,d,e,f={}.hasOwnProperty,g=function(a,b){function c(){this.constructor=a}for(var d in b)f.call(b,d)&&(a[d]=b[d]);return c.prototype=b.prototype,a.prototype=new c,a.__super__=b.prototype,a};d=function(){function a(){this.options_index=0,this.parsed=[]}return a.prototype.add_node=function(a){return"OPTGROUP"===a.nodeName.toUpperCase()?this.add_group(a):this.add_option(a)},a.prototype.add_group=function(a){var b,c,d,e,f,g;for(b=this.parsed.length,this.parsed.push({array_index:b,group:!0,label:this.escapeExpression(a.label),children:0,disabled:a.disabled}),f=a.childNodes,g=[],d=0,e=f.length;e>d;d++)c=f[d],g.push(this.add_option(c,b,a.disabled));return g},a.prototype.add_option=function(a,b,c){return"OPTION"===a.nodeName.toUpperCase()?(""!==a.text?(null!=b&&(this.parsed[b].children+=1),this.parsed.push({array_index:this.parsed.length,options_index:this.options_index,value:a.value,text:a.text,html:a.innerHTML,selected:a.selected,disabled:c===!0?c:a.disabled,group_array_index:b,classes:a.className,style:a.style.cssText})):this.parsed.push({array_index:this.parsed.length,options_index:this.options_index,empty:!0}),this.options_index+=1):void 0},a.prototype.escapeExpression=function(a){var b,c;return null==a||a===!1?"":/[\&\<\>\"\'\`]/.test(a)?(b={"<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;","`":"&#x60;"},c=/&(?!\w+;)|[\<\>\"\'\`]/g,a.replace(c,function(a){return b[a]||"&amp;"})):a},a}(),d.select_to_array=function(a){var b,c,e,f,g;for(c=new d,g=a.childNodes,e=0,f=g.length;f>e;e++)b=g[e],c.add_node(b);return c.parsed},b=function(){function a(b,c){this.form_field=b,this.options=null!=c?c:{},a.browser_is_supported()&&(this.is_multiple=this.form_field.multiple,this.set_default_text(),this.set_default_values(),this.setup(),this.set_up_html(),this.register_observers())}return a.prototype.set_default_values=function(){var a=this;return this.click_test_action=function(b){return a.test_active_click(b)},this.activate_action=function(b){return a.activate_field(b)},this.active_field=!1,this.mouse_on_container=!1,this.results_showing=!1,this.result_highlighted=null,this.allow_single_deselect=null!=this.options.allow_single_deselect&&null!=this.form_field.options[0]&&""===this.form_field.options[0].text?this.options.allow_single_deselect:!1,this.disable_search_threshold=this.options.disable_search_threshold||0,this.disable_search=this.options.disable_search||!1,this.enable_split_word_search=null!=this.options.enable_split_word_search?this.options.enable_split_word_search:!0,this.group_search=null!=this.options.group_search?this.options.group_search:!0,this.search_contains=this.options.search_contains||!1,this.single_backstroke_delete=null!=this.options.single_backstroke_delete?this.options.single_backstroke_delete:!0,this.max_selected_options=this.options.max_selected_options||1/0,this.inherit_select_classes=this.options.inherit_select_classes||!1,this.display_selected_options=null!=this.options.display_selected_options?this.options.display_selected_options:!0,this.display_disabled_options=null!=this.options.display_disabled_options?this.options.display_disabled_options:!0},a.prototype.set_default_text=function(){return this.default_text=this.form_field.getAttribute("data-placeholder")?this.form_field.getAttribute("data-placeholder"):this.is_multiple?this.options.placeholder_text_multiple||this.options.placeholder_text||a.default_multiple_text:this.options.placeholder_text_single||this.options.placeholder_text||a.default_single_text,this.results_none_found=this.form_field.getAttribute("data-no_results_text")||this.options.no_results_text||a.default_no_result_text},a.prototype.mouse_enter=function(){return this.mouse_on_container=!0},a.prototype.mouse_leave=function(){return this.mouse_on_container=!1},a.prototype.input_focus=function(){var a=this;if(this.is_multiple){if(!this.active_field)return setTimeout(function(){return a.container_mousedown()},50)}else if(!this.active_field)return this.activate_field()},a.prototype.input_blur=function(){var a=this;return this.mouse_on_container?void 0:(this.active_field=!1,setTimeout(function(){return a.blur_test()},100))},a.prototype.results_option_build=function(a){var b,c,d,e,f;for(b="",f=this.results_data,d=0,e=f.length;e>d;d++)c=f[d],b+=c.group?this.result_add_group(c):this.result_add_option(c),(null!=a?a.first:void 0)&&(c.selected&&this.is_multiple?this.choice_build(c):c.selected&&!this.is_multiple&&this.single_set_selected_text(c.text));return b},a.prototype.result_add_option=function(a){var b,c;return a.search_match&&this.include_option_in_results(a)?(b=[],a.disabled||a.selected&&this.is_multiple||b.push("active-result"),!a.disabled||a.selected&&this.is_multiple||b.push("disabled-result"),a.selected&&b.push("result-selected"),null!=a.group_array_index&&b.push("group-option"),""!==a.classes&&b.push(a.classes),c=document.createElement("li"),c.className=b.join(" "),c.style.cssText=a.style,c.setAttribute("data-option-array-index",a.array_index),c.innerHTML=a.search_text,this.outerHTML(c)):""},a.prototype.result_add_group=function(a){var b;return(a.search_match||a.group_match)&&a.active_options>0?(b=document.createElement("li"),b.className="group-result",b.innerHTML=a.search_text,this.outerHTML(b)):""},a.prototype.results_update_field=function(){return this.set_default_text(),this.is_multiple||this.results_reset_cleanup(),this.result_clear_highlight(),this.results_build(),this.results_showing?this.winnow_results():void 0},a.prototype.reset_single_select_options=function(){var a,b,c,d,e;for(d=this.results_data,e=[],b=0,c=d.length;c>b;b++)a=d[b],e.push(a.selected?a.selected=!1:void 0);return e},a.prototype.results_toggle=function(){return this.results_showing?this.results_hide():this.results_show()},a.prototype.results_search=function(){return this.results_showing?this.winnow_results():this.results_show()},a.prototype.winnow_results=function(){var a,b,c,d,e,f,g,h,i,j,k,l;for(this.no_results_clear(),d=0,f=this.get_search_text(),a=f.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&"),i=new RegExp(a,"i"),c=this.get_search_regex(a),l=this.results_data,j=0,k=l.length;k>j;j++)b=l[j],b.search_match=!1,e=null,this.include_option_in_results(b)&&(b.group&&(b.group_match=!1,b.active_options=0),null!=b.group_array_index&&this.results_data[b.group_array_index]&&(e=this.results_data[b.group_array_index],0===e.active_options&&e.search_match&&(d+=1),e.active_options+=1),(!b.group||this.group_search)&&(b.search_text=b.group?b.label:b.text,b.search_match=this.search_string_match(b.search_text,c),b.search_match&&!b.group&&(d+=1),b.search_match?(f.length&&(g=b.search_text.search(i),h=b.search_text.substr(0,g+f.length)+"</em>"+b.search_text.substr(g+f.length),b.search_text=h.substr(0,g)+"<em>"+h.substr(g)),null!=e&&(e.group_match=!0)):null!=b.group_array_index&&this.results_data[b.group_array_index].search_match&&(b.search_match=!0)));return this.result_clear_highlight(),1>d&&f.length?(this.update_results_content(""),this.no_results(f)):(this.update_results_content(this.results_option_build()),this.winnow_results_set_highlight())},a.prototype.get_search_regex=function(a){var b;return b=this.search_contains?"":"^",new RegExp(b+a,"i")},a.prototype.search_string_match=function(a,b){var c,d,e,f;if(b.test(a))return!0;if(this.enable_split_word_search&&(a.indexOf(" ")>=0||0===a.indexOf("["))&&(d=a.replace(/\[|\]/g,"").split(" "),d.length))for(e=0,f=d.length;f>e;e++)if(c=d[e],b.test(c))return!0},a.prototype.choices_count=function(){var a,b,c,d;if(null!=this.selected_option_count)return this.selected_option_count;for(this.selected_option_count=0,d=this.form_field.options,b=0,c=d.length;c>b;b++)a=d[b],a.selected&&(this.selected_option_count+=1);return this.selected_option_count},a.prototype.choices_click=function(a){return a.preventDefault(),this.results_showing||this.is_disabled?void 0:this.results_show()},a.prototype.keyup_checker=function(a){var b,c;switch(b=null!=(c=a.which)?c:a.keyCode,this.search_field_scale(),b){case 8:if(this.is_multiple&&this.backstroke_length<1&&this.choices_count()>0)return this.keydown_backstroke();if(!this.pending_backstroke)return this.result_clear_highlight(),this.results_search();break;case 13:if(a.preventDefault(),this.results_showing)return this.result_select(a);break;case 27:return this.results_showing&&this.results_hide(),!0;case 9:case 38:case 40:case 16:case 91:case 17:break;default:return this.results_search()}},a.prototype.clipboard_event_checker=function(){var a=this;return setTimeout(function(){return a.results_search()},50)},a.prototype.container_width=function(){return null!=this.options.width?this.options.width:""+this.form_field.offsetWidth+"px"},a.prototype.include_option_in_results=function(a){return this.is_multiple&&!this.display_selected_options&&a.selected?!1:!this.display_disabled_options&&a.disabled?!1:a.empty?!1:!0},a.prototype.search_results_touchstart=function(a){return this.touch_started=!0,this.search_results_mouseover(a)},a.prototype.search_results_touchmove=function(a){return this.touch_started=!1,this.search_results_mouseout(a)},a.prototype.search_results_touchend=function(a){return this.touch_started?this.search_results_mouseup(a):void 0},a.prototype.outerHTML=function(a){var b;return a.outerHTML?a.outerHTML:(b=document.createElement("div"),b.appendChild(a),b.innerHTML)},a.browser_is_supported=function(){return"Microsoft Internet Explorer"===window.navigator.appName?document.documentMode>=8:/iP(od|hone)/i.test(window.navigator.userAgent)?!1:/Android/i.test(window.navigator.userAgent)&&/Mobile/i.test(window.navigator.userAgent)?!1:!0},a.default_multiple_text="Select Some Options",a.default_single_text="Select an Option",a.default_no_result_text="No results match",a}(),a=jQuery,a.fn.extend({chosen:function(d){return b.browser_is_supported()?this.each(function(){var b,e;b=a(this),e=b.data("chosen"),"destroy"===d&&e instanceof c?e.destroy():e instanceof c||b.data("chosen",new c(this,d))}):this}}),c=function(b){function c(){return e=c.__super__.constructor.apply(this,arguments)}return g(c,b),c.prototype.setup=function(){return this.form_field_jq=a(this.form_field),this.current_selectedIndex=this.form_field.selectedIndex,this.is_rtl=this.form_field_jq.hasClass("chosen-rtl")},c.prototype.set_up_html=function(){var b,c;return b=["chosen-container"],b.push("chosen-container-"+(this.is_multiple?"multi":"single")),this.inherit_select_classes&&this.form_field.className&&b.push(this.form_field.className),this.is_rtl&&b.push("chosen-rtl"),c={"class":b.join(" "),style:"width: "+this.container_width()+";",title:this.form_field.title},this.form_field.id.length&&(c.id=this.form_field.id.replace(/[^\w]/g,"_")+"_chosen"),this.container=a("<div />",c),this.container.html(this.is_multiple?'<ul class="chosen-choices"><li class="search-field"><input type="text" value="'+this.default_text+'" class="default" autocomplete="off" style="width:25px;" /></li></ul><div class="chosen-drop"><ul class="chosen-results"></ul></div>':'<a class="chosen-single chosen-default" tabindex="-1"><span>'+this.default_text+'</span><div><b></b></div></a><div class="chosen-drop"><div class="chosen-search"><input type="text" autocomplete="off" /></div><ul class="chosen-results"></ul></div>'),this.form_field_jq.hide().after(this.container),this.dropdown=this.container.find("div.chosen-drop").first(),this.search_field=this.container.find("input").first(),this.search_results=this.container.find("ul.chosen-results").first(),this.search_field_scale(),this.search_no_results=this.container.find("li.no-results").first(),this.is_multiple?(this.search_choices=this.container.find("ul.chosen-choices").first(),this.search_container=this.container.find("li.search-field").first()):(this.search_container=this.container.find("div.chosen-search").first(),this.selected_item=this.container.find(".chosen-single").first()),this.results_build(),this.set_tab_index(),this.set_label_behavior(),this.form_field_jq.trigger("chosen:ready",{chosen:this})},c.prototype.register_observers=function(){var a=this;return this.container.bind("touchstart.chosen",function(b){a.container_mousedown(b)}),this.container.bind("touchend.chosen",function(b){a.container_mouseup(b)}),this.container.bind("mousedown.chosen",function(b){a.container_mousedown(b)}),this.container.bind("mouseup.chosen",function(b){a.container_mouseup(b)}),this.container.bind("mouseenter.chosen",function(b){a.mouse_enter(b)}),this.container.bind("mouseleave.chosen",function(b){a.mouse_leave(b)}),this.search_results.bind("mouseup.chosen",function(b){a.search_results_mouseup(b)}),this.search_results.bind("mouseover.chosen",function(b){a.search_results_mouseover(b)}),this.search_results.bind("mouseout.chosen",function(b){a.search_results_mouseout(b)}),this.search_results.bind("mousewheel.chosen DOMMouseScroll.chosen",function(b){a.search_results_mousewheel(b)}),this.search_results.bind("touchstart.chosen",function(b){a.search_results_touchstart(b)}),this.search_results.bind("touchmove.chosen",function(b){a.search_results_touchmove(b)}),this.search_results.bind("touchend.chosen",function(b){a.search_results_touchend(b)}),this.form_field_jq.bind("chosen:updated.chosen",function(b){a.results_update_field(b)}),this.form_field_jq.bind("chosen:activate.chosen",function(b){a.activate_field(b)}),this.form_field_jq.bind("chosen:open.chosen",function(b){a.container_mousedown(b)}),this.form_field_jq.bind("chosen:close.chosen",function(b){a.input_blur(b)}),this.search_field.bind("blur.chosen",function(b){a.input_blur(b)}),this.search_field.bind("keyup.chosen",function(b){a.keyup_checker(b)}),this.search_field.bind("keydown.chosen",function(b){a.keydown_checker(b)}),this.search_field.bind("focus.chosen",function(b){a.input_focus(b)}),this.search_field.bind("cut.chosen",function(b){a.clipboard_event_checker(b)}),this.search_field.bind("paste.chosen",function(b){a.clipboard_event_checker(b)}),this.is_multiple?this.search_choices.bind("click.chosen",function(b){a.choices_click(b)}):this.container.bind("click.chosen",function(a){a.preventDefault()})},c.prototype.destroy=function(){return a(this.container[0].ownerDocument).unbind("click.chosen",this.click_test_action),this.search_field[0].tabIndex&&(this.form_field_jq[0].tabIndex=this.search_field[0].tabIndex),this.container.remove(),this.form_field_jq.removeData("chosen"),this.form_field_jq.show()},c.prototype.search_field_disabled=function(){return this.is_disabled=this.form_field_jq[0].disabled,this.is_disabled?(this.container.addClass("chosen-disabled"),this.search_field[0].disabled=!0,this.is_multiple||this.selected_item.unbind("focus.chosen",this.activate_action),this.close_field()):(this.container.removeClass("chosen-disabled"),this.search_field[0].disabled=!1,this.is_multiple?void 0:this.selected_item.bind("focus.chosen",this.activate_action))},c.prototype.container_mousedown=function(b){return this.is_disabled||(b&&"mousedown"===b.type&&!this.results_showing&&b.preventDefault(),null!=b&&a(b.target).hasClass("search-choice-close"))?void 0:(this.active_field?this.is_multiple||!b||a(b.target)[0]!==this.selected_item[0]&&!a(b.target).parents("a.chosen-single").length||(b.preventDefault(),this.results_toggle()):(this.is_multiple&&this.search_field.val(""),a(this.container[0].ownerDocument).bind("click.chosen",this.click_test_action),this.results_show()),this.activate_field())},c.prototype.container_mouseup=function(a){return"ABBR"!==a.target.nodeName||this.is_disabled?void 0:this.results_reset(a)},c.prototype.search_results_mousewheel=function(a){var b;return a.originalEvent&&(b=a.originalEvent.deltaY||-a.originalEvent.wheelDelta||a.originalEvent.detail),null!=b?(a.preventDefault(),"DOMMouseScroll"===a.type&&(b=40*b),this.search_results.scrollTop(b+this.search_results.scrollTop())):void 0},c.prototype.blur_test=function(){return!this.active_field&&this.container.hasClass("chosen-container-active")?this.close_field():void 0},c.prototype.close_field=function(){return a(this.container[0].ownerDocument).unbind("click.chosen",this.click_test_action),this.active_field=!1,this.results_hide(),this.container.removeClass("chosen-container-active"),this.clear_backstroke(),this.show_search_field_default(),this.search_field_scale()},c.prototype.activate_field=function(){return this.container.addClass("chosen-container-active"),this.active_field=!0,this.search_field.val(this.search_field.val()),this.search_field.focus()},c.prototype.test_active_click=function(b){var c;return c=a(b.target).closest(".chosen-container"),c.length&&this.container[0]===c[0]?this.active_field=!0:this.close_field()},c.prototype.results_build=function(){return this.parsing=!0,this.selected_option_count=null,this.results_data=d.select_to_array(this.form_field),this.is_multiple?this.search_choices.find("li.search-choice").remove():this.is_multiple||(this.single_set_selected_text(),this.disable_search||this.form_field.options.length<=this.disable_search_threshold?(this.search_field[0].readOnly=!0,this.container.addClass("chosen-container-single-nosearch")):(this.search_field[0].readOnly=!1,this.container.removeClass("chosen-container-single-nosearch"))),this.update_results_content(this.results_option_build({first:!0})),this.search_field_disabled(),this.show_search_field_default(),this.search_field_scale(),this.parsing=!1},c.prototype.result_do_highlight=function(a){var b,c,d,e,f;if(a.length){if(this.result_clear_highlight(),this.result_highlight=a,this.result_highlight.addClass("highlighted"),d=parseInt(this.search_results.css("maxHeight"),10),f=this.search_results.scrollTop(),e=d+f,c=this.result_highlight.position().top+this.search_results.scrollTop(),b=c+this.result_highlight.outerHeight(),b>=e)return this.search_results.scrollTop(b-d>0?b-d:0);if(f>c)return this.search_results.scrollTop(c)}},c.prototype.result_clear_highlight=function(){return this.result_highlight&&this.result_highlight.removeClass("highlighted"),this.result_highlight=null},c.prototype.results_show=function(){return this.is_multiple&&this.max_selected_options<=this.choices_count()?(this.form_field_jq.trigger("chosen:maxselected",{chosen:this}),!1):(this.container.addClass("chosen-with-drop"),this.results_showing=!0,this.search_field.focus(),this.search_field.val(this.search_field.val()),this.winnow_results(),this.form_field_jq.trigger("chosen:showing_dropdown",{chosen:this}))},c.prototype.update_results_content=function(a){return this.search_results.html(a)},c.prototype.results_hide=function(){return this.results_showing&&(this.result_clear_highlight(),this.container.removeClass("chosen-with-drop"),this.form_field_jq.trigger("chosen:hiding_dropdown",{chosen:this})),this.results_showing=!1},c.prototype.set_tab_index=function(){var a;return this.form_field.tabIndex?(a=this.form_field.tabIndex,this.form_field.tabIndex=-1,this.search_field[0].tabIndex=a):void 0},c.prototype.set_label_behavior=function(){var b=this;return this.form_field_label=this.form_field_jq.parents("label"),!this.form_field_label.length&&this.form_field.id.length&&(this.form_field_label=a("label[for='"+this.form_field.id+"']")),this.form_field_label.length>0?this.form_field_label.bind("click.chosen",function(a){return b.is_multiple?b.container_mousedown(a):b.activate_field()}):void 0},c.prototype.show_search_field_default=function(){return this.is_multiple&&this.choices_count()<1&&!this.active_field?(this.search_field.val(this.default_text),this.search_field.addClass("default")):(this.search_field.val(""),this.search_field.removeClass("default"))},c.prototype.search_results_mouseup=function(b){var c;return c=a(b.target).hasClass("active-result")?a(b.target):a(b.target).parents(".active-result").first(),c.length?(this.result_highlight=c,this.result_select(b),this.search_field.focus()):void 0},c.prototype.search_results_mouseover=function(b){var c;return c=a(b.target).hasClass("active-result")?a(b.target):a(b.target).parents(".active-result").first(),c?this.result_do_highlight(c):void 0},c.prototype.search_results_mouseout=function(b){return a(b.target).hasClass("active-result")?this.result_clear_highlight():void 0},c.prototype.choice_build=function(b){var c,d,e=this;return c=a("<li />",{"class":"search-choice"}).html("<span>"+b.html+"</span>"),b.disabled?c.addClass("search-choice-disabled"):(d=a("<a />",{"class":"search-choice-close","data-option-array-index":b.array_index}),d.bind("click.chosen",function(a){return e.choice_destroy_link_click(a)}),c.append(d)),this.search_container.before(c)},c.prototype.choice_destroy_link_click=function(b){return b.preventDefault(),b.stopPropagation(),this.is_disabled?void 0:this.choice_destroy(a(b.target))},c.prototype.choice_destroy=function(a){return this.result_deselect(a[0].getAttribute("data-option-array-index"))?(this.show_search_field_default(),this.is_multiple&&this.choices_count()>0&&this.search_field.val().length<1&&this.results_hide(),a.parents("li").first().remove(),this.search_field_scale()):void 0},c.prototype.results_reset=function(){return this.reset_single_select_options(),this.form_field.options[0].selected=!0,this.single_set_selected_text(),this.show_search_field_default(),this.results_reset_cleanup(),this.form_field_jq.trigger("change"),this.active_field?this.results_hide():void 0},c.prototype.results_reset_cleanup=function(){return this.current_selectedIndex=this.form_field.selectedIndex,this.selected_item.find("abbr").remove()},c.prototype.result_select=function(a){var b,c;return this.result_highlight?(b=this.result_highlight,this.result_clear_highlight(),this.is_multiple&&this.max_selected_options<=this.choices_count()?(this.form_field_jq.trigger("chosen:maxselected",{chosen:this}),!1):(this.is_multiple?b.removeClass("active-result"):this.reset_single_select_options(),c=this.results_data[b[0].getAttribute("data-option-array-index")],c.selected=!0,this.form_field.options[c.options_index].selected=!0,this.selected_option_count=null,this.is_multiple?this.choice_build(c):this.single_set_selected_text(c.text),(a.metaKey||a.ctrlKey)&&this.is_multiple||this.results_hide(),this.search_field.val(""),(this.is_multiple||this.form_field.selectedIndex!==this.current_selectedIndex)&&this.form_field_jq.trigger("change",{selected:this.form_field.options[c.options_index].value}),this.current_selectedIndex=this.form_field.selectedIndex,this.search_field_scale())):void 0},c.prototype.single_set_selected_text=function(a){return null==a&&(a=this.default_text),a===this.default_text?this.selected_item.addClass("chosen-default"):(this.single_deselect_control_build(),this.selected_item.removeClass("chosen-default")),this.selected_item.find("span").text(a)},c.prototype.result_deselect=function(a){var b;return b=this.results_data[a],this.form_field.options[b.options_index].disabled?!1:(b.selected=!1,this.form_field.options[b.options_index].selected=!1,this.selected_option_count=null,this.result_clear_highlight(),this.results_showing&&this.winnow_results(),this.form_field_jq.trigger("change",{deselected:this.form_field.options[b.options_index].value}),this.search_field_scale(),!0)},c.prototype.single_deselect_control_build=function(){return this.allow_single_deselect?(this.selected_item.find("abbr").length||this.selected_item.find("span").first().after('<abbr class="search-choice-close"></abbr>'),this.selected_item.addClass("chosen-single-with-deselect")):void 0},c.prototype.get_search_text=function(){return this.search_field.val()===this.default_text?"":a("<div/>").text(a.trim(this.search_field.val())).html()},c.prototype.winnow_results_set_highlight=function(){var a,b;return b=this.is_multiple?[]:this.search_results.find(".result-selected.active-result"),a=b.length?b.first():this.search_results.find(".active-result").first(),null!=a?this.result_do_highlight(a):void 0},c.prototype.no_results=function(b){var c;return c=a('<li class="no-results">'+this.results_none_found+' "<span></span>"</li>'),c.find("span").first().html(b),this.search_results.append(c),this.form_field_jq.trigger("chosen:no_results",{chosen:this})},c.prototype.no_results_clear=function(){return this.search_results.find(".no-results").remove()},c.prototype.keydown_arrow=function(){var a;return this.results_showing&&this.result_highlight?(a=this.result_highlight.nextAll("li.active-result").first())?this.result_do_highlight(a):void 0:this.results_show()},c.prototype.keyup_arrow=function(){var a;return this.results_showing||this.is_multiple?this.result_highlight?(a=this.result_highlight.prevAll("li.active-result"),a.length?this.result_do_highlight(a.first()):(this.choices_count()>0&&this.results_hide(),this.result_clear_highlight())):void 0:this.results_show()},c.prototype.keydown_backstroke=function(){var a;return this.pending_backstroke?(this.choice_destroy(this.pending_backstroke.find("a").first()),this.clear_backstroke()):(a=this.search_container.siblings("li.search-choice").last(),a.length&&!a.hasClass("search-choice-disabled")?(this.pending_backstroke=a,this.single_backstroke_delete?this.keydown_backstroke():this.pending_backstroke.addClass("search-choice-focus")):void 0)},c.prototype.clear_backstroke=function(){return this.pending_backstroke&&this.pending_backstroke.removeClass("search-choice-focus"),this.pending_backstroke=null},c.prototype.keydown_checker=function(a){var b,c;switch(b=null!=(c=a.which)?c:a.keyCode,this.search_field_scale(),8!==b&&this.pending_backstroke&&this.clear_backstroke(),b){case 8:this.backstroke_length=this.search_field.val().length;break;case 9:this.results_showing&&!this.is_multiple&&this.result_select(a),this.mouse_on_container=!1;break;case 13:this.results_showing&&a.preventDefault();break;case 32:this.disable_search&&a.preventDefault();break;case 38:a.preventDefault(),this.keyup_arrow();break;case 40:a.preventDefault(),this.keydown_arrow()}},c.prototype.search_field_scale=function(){var b,c,d,e,f,g,h,i,j;if(this.is_multiple){for(d=0,h=0,f="position:absolute; left: -1000px; top: -1000px; display:none;",g=["font-size","font-style","font-weight","font-family","line-height","text-transform","letter-spacing"],i=0,j=g.length;j>i;i++)e=g[i],f+=e+":"+this.search_field.css(e)+";";return b=a("<div />",{style:f}),b.text(this.search_field.val()),a("body").append(b),h=b.width()+25,b.remove(),c=this.container.outerWidth(),h>c-10&&(h=c-10),this.search_field.css({width:h+"px"})}},c}(b)}).call(this);
\ No newline at end of file
diff --git a/NewLife.Cube/Content/ace/js/dropzone.min.js b/NewLife.Cube/Content/ace/js/dropzone.min.js
deleted file mode 100644
index 05738a8362..0000000000
--- a/NewLife.Cube/Content/ace/js/dropzone.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(){function a(b){var c=a.modules[b];if(!c)throw new Error('failed to require "'+b+'"');return"exports"in c||"function"!=typeof c.definition||(c.client=c.component=!0,c.definition.call(this,c.exports={},c),delete c.definition),c.exports}a.modules={},a.register=function(b,c){a.modules[b]={definition:c}},a.define=function(b,c){a.modules[b]={exports:c}},a.register("component~emitter@1.1.2",function(a,b){function c(a){return a?d(a):void 0}function d(a){for(var b in c.prototype)a[b]=c.prototype[b];return a}b.exports=c,c.prototype.on=c.prototype.addEventListener=function(a,b){return this._callbacks=this._callbacks||{},(this._callbacks[a]=this._callbacks[a]||[]).push(b),this},c.prototype.once=function(a,b){function c(){d.off(a,c),b.apply(this,arguments)}var d=this;return this._callbacks=this._callbacks||{},c.fn=b,this.on(a,c),this},c.prototype.off=c.prototype.removeListener=c.prototype.removeAllListeners=c.prototype.removeEventListener=function(a,b){if(this._callbacks=this._callbacks||{},0==arguments.length)return this._callbacks={},this;var c=this._callbacks[a];if(!c)return this;if(1==arguments.length)return delete this._callbacks[a],this;for(var d,e=0;e<c.length;e++)if(d=c[e],d===b||d.fn===b){c.splice(e,1);break}return this},c.prototype.emit=function(a){this._callbacks=this._callbacks||{};var b=[].slice.call(arguments,1),c=this._callbacks[a];if(c){c=c.slice(0);for(var d=0,e=c.length;e>d;++d)c[d].apply(this,b)}return this},c.prototype.listeners=function(a){return this._callbacks=this._callbacks||{},this._callbacks[a]||[]},c.prototype.hasListeners=function(a){return!!this.listeners(a).length}}),a.register("dropzone",function(b,c){c.exports=a("dropzone/lib/dropzone.js")}),a.register("dropzone/lib/dropzone.js",function(b,c){(function(){var b,d,e,f,g,h,i,j,k={}.hasOwnProperty,l=function(a,b){function c(){this.constructor=a}for(var d in b)k.call(b,d)&&(a[d]=b[d]);return c.prototype=b.prototype,a.prototype=new c,a.__super__=b.prototype,a},m=[].slice;d="undefined"!=typeof Emitter&&null!==Emitter?Emitter:a("component~emitter@1.1.2"),i=function(){},b=function(a){function b(a,d){var e,f,g;if(this.element=a,this.version=b.version,this.defaultOptions.previewTemplate=this.defaultOptions.previewTemplate.replace(/\n*/g,""),this.clickableElements=[],this.listeners=[],this.files=[],"string"==typeof this.element&&(this.element=document.querySelector(this.element)),!this.element||null==this.element.nodeType)throw new Error("Invalid dropzone element.");if(this.element.dropzone)throw new Error("Dropzone already attached.");if(b.instances.push(this),this.element.dropzone=this,e=null!=(g=b.optionsForElement(this.element))?g:{},this.options=c({},this.defaultOptions,e,null!=d?d:{}),this.options.forceFallback||!b.isBrowserSupported())return this.options.fallback.call(this);if(null==this.options.url&&(this.options.url=this.element.getAttribute("action")),!this.options.url)throw new Error("No URL provided.");if(this.options.acceptedFiles&&this.options.acceptedMimeTypes)throw new Error("You can't provide both 'acceptedFiles' and 'acceptedMimeTypes'. 'acceptedMimeTypes' is deprecated.");this.options.acceptedMimeTypes&&(this.options.acceptedFiles=this.options.acceptedMimeTypes,delete this.options.acceptedMimeTypes),this.options.method=this.options.method.toUpperCase(),(f=this.getExistingFallback())&&f.parentNode&&f.parentNode.removeChild(f),this.options.previewsContainer!==!1&&(this.previewsContainer=this.options.previewsContainer?b.getElement(this.options.previewsContainer,"previewsContainer"):this.element),this.options.clickable&&(this.clickableElements=this.options.clickable===!0?[this.element]:b.getElements(this.options.clickable,"clickable")),this.init()}var c;return l(b,a),b.prototype.events=["drop","dragstart","dragend","dragenter","dragover","dragleave","addedfile","removedfile","thumbnail","error","errormultiple","processing","processingmultiple","uploadprogress","totaluploadprogress","sending","sendingmultiple","success","successmultiple","canceled","canceledmultiple","complete","completemultiple","reset","maxfilesexceeded","maxfilesreached"],b.prototype.defaultOptions={url:null,method:"post",withCredentials:!1,parallelUploads:2,uploadMultiple:!1,maxFilesize:256,paramName:"file",createImageThumbnails:!0,maxThumbnailFilesize:10,thumbnailWidth:100,thumbnailHeight:100,maxFiles:null,params:{},clickable:!0,ignoreHiddenFiles:!0,acceptedFiles:null,acceptedMimeTypes:null,autoProcessQueue:!0,autoQueue:!0,addRemoveLinks:!1,previewsContainer:null,dictDefaultMessage:"Drop files here to upload",dictFallbackMessage:"Your browser does not support drag'n'drop file uploads.",dictFallbackText:"Please use the fallback form below to upload your files like in the olden days.",dictFileTooBig:"File is too big ({{filesize}}MiB). Max filesize: {{maxFilesize}}MiB.",dictInvalidFileType:"You can't upload files of this type.",dictResponseError:"Server responded with {{statusCode}} code.",dictCancelUpload:"Cancel upload",dictCancelUploadConfirmation:"Are you sure you want to cancel this upload?",dictRemoveFile:"Remove file",dictRemoveFileConfirmation:null,dictMaxFilesExceeded:"You can not upload any more files.",accept:function(a,b){return b()},init:function(){return i},forceFallback:!1,fallback:function(){var a,c,d,e,f,g;for(this.element.className=""+this.element.className+" dz-browser-not-supported",g=this.element.getElementsByTagName("div"),e=0,f=g.length;f>e;e++)a=g[e],/(^| )dz-message($| )/.test(a.className)&&(c=a,a.className="dz-message");return c||(c=b.createElement('<div class="dz-message"><span></span></div>'),this.element.appendChild(c)),d=c.getElementsByTagName("span")[0],d&&(d.textContent=this.options.dictFallbackMessage),this.element.appendChild(this.getFallbackForm())},resize:function(a){var b,c,d;return b={srcX:0,srcY:0,srcWidth:a.width,srcHeight:a.height},c=a.width/a.height,b.optWidth=this.options.thumbnailWidth,b.optHeight=this.options.thumbnailHeight,null==b.optWidth&&null==b.optHeight?(b.optWidth=b.srcWidth,b.optHeight=b.srcHeight):null==b.optWidth?b.optWidth=c*b.optHeight:null==b.optHeight&&(b.optHeight=1/c*b.optWidth),d=b.optWidth/b.optHeight,a.height<b.optHeight||a.width<b.optWidth?(b.trgHeight=b.srcHeight,b.trgWidth=b.srcWidth):c>d?(b.srcHeight=a.height,b.srcWidth=b.srcHeight*d):(b.srcWidth=a.width,b.srcHeight=b.srcWidth/d),b.srcX=(a.width-b.srcWidth)/2,b.srcY=(a.height-b.srcHeight)/2,b},drop:function(){return this.element.classList.remove("dz-drag-hover")},dragstart:i,dragend:function(){return this.element.classList.remove("dz-drag-hover")},dragenter:function(){return this.element.classList.add("dz-drag-hover")},dragover:function(){return this.element.classList.add("dz-drag-hover")},dragleave:function(){return this.element.classList.remove("dz-drag-hover")},paste:i,reset:function(){return this.element.classList.remove("dz-started")},addedfile:function(a){var c,d,e,f,g,h,i,j,k,l,m,n,o;if(this.element===this.previewsContainer&&this.element.classList.add("dz-started"),this.previewsContainer){for(a.previewElement=b.createElement(this.options.previewTemplate.trim()),a.previewTemplate=a.previewElement,this.previewsContainer.appendChild(a.previewElement),l=a.previewElement.querySelectorAll("[data-dz-name]"),f=0,i=l.length;i>f;f++)c=l[f],c.textContent=a.name;for(m=a.previewElement.querySelectorAll("[data-dz-size]"),g=0,j=m.length;j>g;g++)c=m[g],c.innerHTML=this.filesize(a.size);for(this.options.addRemoveLinks&&(a._removeLink=b.createElement('<a class="dz-remove" href="javascript:undefined;" data-dz-remove>'+this.options.dictRemoveFile+"</a>"),a.previewElement.appendChild(a._removeLink)),d=function(c){return function(d){return d.preventDefault(),d.stopPropagation(),a.status===b.UPLOADING?b.confirm(c.options.dictCancelUploadConfirmation,function(){return c.removeFile(a)}):c.options.dictRemoveFileConfirmation?b.confirm(c.options.dictRemoveFileConfirmation,function(){return c.removeFile(a)}):c.removeFile(a)}}(this),n=a.previewElement.querySelectorAll("[data-dz-remove]"),o=[],h=0,k=n.length;k>h;h++)e=n[h],o.push(e.addEventListener("click",d));return o}},removedfile:function(a){var b;return a.previewElement&&null!=(b=a.previewElement)&&b.parentNode.removeChild(a.previewElement),this._updateMaxFilesReachedClass()},thumbnail:function(a,b){var c,d,e,f,g;if(a.previewElement){for(a.previewElement.classList.remove("dz-file-preview"),a.previewElement.classList.add("dz-image-preview"),f=a.previewElement.querySelectorAll("[data-dz-thumbnail]"),g=[],d=0,e=f.length;e>d;d++)c=f[d],c.alt=a.name,g.push(c.src=b);return g}},error:function(a,b){var c,d,e,f,g;if(a.previewElement){for(a.previewElement.classList.add("dz-error"),"String"!=typeof b&&b.error&&(b=b.error),f=a.previewElement.querySelectorAll("[data-dz-errormessage]"),g=[],d=0,e=f.length;e>d;d++)c=f[d],g.push(c.textContent=b);return g}},errormultiple:i,processing:function(a){return a.previewElement&&(a.previewElement.classList.add("dz-processing"),a._removeLink)?a._removeLink.textContent=this.options.dictCancelUpload:void 0},processingmultiple:i,uploadprogress:function(a,b){var c,d,e,f,g;if(a.previewElement){for(f=a.previewElement.querySelectorAll("[data-dz-uploadprogress]"),g=[],d=0,e=f.length;e>d;d++)c=f[d],g.push(c.style.width=""+b+"%");return g}},totaluploadprogress:i,sending:i,sendingmultiple:i,success:function(a){return a.previewElement?a.previewElement.classList.add("dz-success"):void 0},successmultiple:i,canceled:function(a){return this.emit("error",a,"Upload canceled.")},canceledmultiple:i,complete:function(a){return a._removeLink?a._removeLink.textContent=this.options.dictRemoveFile:void 0},completemultiple:i,maxfilesexceeded:i,maxfilesreached:i,previewTemplate:'<div class="dz-preview dz-file-preview">\n  <div class="dz-details">\n    <div class="dz-filename"><span data-dz-name></span></div>\n    <div class="dz-size" data-dz-size></div>\n    <img data-dz-thumbnail />\n  </div>\n  <div class="dz-progress"><span class="dz-upload" data-dz-uploadprogress></span></div>\n  <div class="dz-success-mark"><span>✔</span></div>\n  <div class="dz-error-mark"><span>✘</span></div>\n  <div class="dz-error-message"><span data-dz-errormessage></span></div>\n</div>'},c=function(){var a,b,c,d,e,f,g;for(d=arguments[0],c=2<=arguments.length?m.call(arguments,1):[],f=0,g=c.length;g>f;f++){b=c[f];for(a in b)e=b[a],d[a]=e}return d},b.prototype.getAcceptedFiles=function(){var a,b,c,d,e;for(d=this.files,e=[],b=0,c=d.length;c>b;b++)a=d[b],a.accepted&&e.push(a);return e},b.prototype.getRejectedFiles=function(){var a,b,c,d,e;for(d=this.files,e=[],b=0,c=d.length;c>b;b++)a=d[b],a.accepted||e.push(a);return e},b.prototype.getFilesWithStatus=function(a){var b,c,d,e,f;for(e=this.files,f=[],c=0,d=e.length;d>c;c++)b=e[c],b.status===a&&f.push(b);return f},b.prototype.getQueuedFiles=function(){return this.getFilesWithStatus(b.QUEUED)},b.prototype.getUploadingFiles=function(){return this.getFilesWithStatus(b.UPLOADING)},b.prototype.getActiveFiles=function(){var a,c,d,e,f;for(e=this.files,f=[],c=0,d=e.length;d>c;c++)a=e[c],(a.status===b.UPLOADING||a.status===b.QUEUED)&&f.push(a);return f},b.prototype.init=function(){var a,c,d,e,f,g,h;for("form"===this.element.tagName&&this.element.setAttribute("enctype","multipart/form-data"),this.element.classList.contains("dropzone")&&!this.element.querySelector(".dz-message")&&this.element.appendChild(b.createElement('<div class="dz-default dz-message"><span>'+this.options.dictDefaultMessage+"</span></div>")),this.clickableElements.length&&(d=function(a){return function(){return a.hiddenFileInput&&document.body.removeChild(a.hiddenFileInput),a.hiddenFileInput=document.createElement("input"),a.hiddenFileInput.setAttribute("type","file"),(null==a.options.maxFiles||a.options.maxFiles>1)&&a.hiddenFileInput.setAttribute("multiple","multiple"),a.hiddenFileInput.className="dz-hidden-input",null!=a.options.acceptedFiles&&a.hiddenFileInput.setAttribute("accept",a.options.acceptedFiles),a.hiddenFileInput.style.visibility="hidden",a.hiddenFileInput.style.position="absolute",a.hiddenFileInput.style.top="0",a.hiddenFileInput.style.left="0",a.hiddenFileInput.style.height="0",a.hiddenFileInput.style.width="0",document.body.appendChild(a.hiddenFileInput),a.hiddenFileInput.addEventListener("change",function(){var b,c,e,f;if(c=a.hiddenFileInput.files,c.length)for(e=0,f=c.length;f>e;e++)b=c[e],a.addFile(b);return d()})}}(this))(),this.URL=null!=(g=window.URL)?g:window.webkitURL,h=this.events,e=0,f=h.length;f>e;e++)a=h[e],this.on(a,this.options[a]);return this.on("uploadprogress",function(a){return function(){return a.updateTotalUploadProgress()}}(this)),this.on("removedfile",function(a){return function(){return a.updateTotalUploadProgress()}}(this)),this.on("canceled",function(a){return function(b){return a.emit("complete",b)}}(this)),this.on("complete",function(a){return function(){return 0===a.getUploadingFiles().length&&0===a.getQueuedFiles().length?setTimeout(function(){return a.emit("queuecomplete")},0):void 0}}(this)),c=function(a){return a.stopPropagation(),a.preventDefault?a.preventDefault():a.returnValue=!1},this.listeners=[{element:this.element,events:{dragstart:function(a){return function(b){return a.emit("dragstart",b)}}(this),dragenter:function(a){return function(b){return c(b),a.emit("dragenter",b)}}(this),dragover:function(a){return function(b){var d;try{d=b.dataTransfer.effectAllowed}catch(e){}return b.dataTransfer.dropEffect="move"===d||"linkMove"===d?"move":"copy",c(b),a.emit("dragover",b)}}(this),dragleave:function(a){return function(b){return a.emit("dragleave",b)}}(this),drop:function(a){return function(b){return c(b),a.drop(b)}}(this),dragend:function(a){return function(b){return a.emit("dragend",b)}}(this)}}],this.clickableElements.forEach(function(a){return function(c){return a.listeners.push({element:c,events:{click:function(d){return c!==a.element||d.target===a.element||b.elementInside(d.target,a.element.querySelector(".dz-message"))?a.hiddenFileInput.click():void 0}}})}}(this)),this.enable(),this.options.init.call(this)},b.prototype.destroy=function(){var a;return this.disable(),this.removeAllFiles(!0),(null!=(a=this.hiddenFileInput)?a.parentNode:void 0)&&(this.hiddenFileInput.parentNode.removeChild(this.hiddenFileInput),this.hiddenFileInput=null),delete this.element.dropzone,b.instances.splice(b.instances.indexOf(this),1)},b.prototype.updateTotalUploadProgress=function(){var a,b,c,d,e,f,g,h;if(d=0,c=0,a=this.getActiveFiles(),a.length){for(h=this.getActiveFiles(),f=0,g=h.length;g>f;f++)b=h[f],d+=b.upload.bytesSent,c+=b.upload.total;e=100*d/c}else e=100;return this.emit("totaluploadprogress",e,c,d)},b.prototype._getParamName=function(a){return"function"==typeof this.options.paramName?this.options.paramName(a):""+this.options.paramName+(this.options.uploadMultiple?"["+a+"]":"")},b.prototype.getFallbackForm=function(){var a,c,d,e;return(a=this.getExistingFallback())?a:(d='<div class="dz-fallback">',this.options.dictFallbackText&&(d+="<p>"+this.options.dictFallbackText+"</p>"),d+='<input type="file" name="'+this._getParamName(0)+'" '+(this.options.uploadMultiple?'multiple="multiple"':void 0)+' /><input type="submit" value="Upload!"></div>',c=b.createElement(d),"FORM"!==this.element.tagName?(e=b.createElement('<form action="'+this.options.url+'" enctype="multipart/form-data" method="'+this.options.method+'"></form>'),e.appendChild(c)):(this.element.setAttribute("enctype","multipart/form-data"),this.element.setAttribute("method",this.options.method)),null!=e?e:c)},b.prototype.getExistingFallback=function(){var a,b,c,d,e,f;for(b=function(a){var b,c,d;for(c=0,d=a.length;d>c;c++)if(b=a[c],/(^| )fallback($| )/.test(b.className))return b},f=["div","form"],d=0,e=f.length;e>d;d++)if(c=f[d],a=b(this.element.getElementsByTagName(c)))return a},b.prototype.setupEventListeners=function(){var a,b,c,d,e,f,g;for(f=this.listeners,g=[],d=0,e=f.length;e>d;d++)a=f[d],g.push(function(){var d,e;d=a.events,e=[];for(b in d)c=d[b],e.push(a.element.addEventListener(b,c,!1));return e}());return g},b.prototype.removeEventListeners=function(){var a,b,c,d,e,f,g;for(f=this.listeners,g=[],d=0,e=f.length;e>d;d++)a=f[d],g.push(function(){var d,e;d=a.events,e=[];for(b in d)c=d[b],e.push(a.element.removeEventListener(b,c,!1));return e}());return g},b.prototype.disable=function(){var a,b,c,d,e;for(this.clickableElements.forEach(function(a){return a.classList.remove("dz-clickable")}),this.removeEventListeners(),d=this.files,e=[],b=0,c=d.length;c>b;b++)a=d[b],e.push(this.cancelUpload(a));return e},b.prototype.enable=function(){return this.clickableElements.forEach(function(a){return a.classList.add("dz-clickable")}),this.setupEventListeners()},b.prototype.filesize=function(a){var b;return a>=109951162777.6?(a/=109951162777.6,b="TiB"):a>=107374182.4?(a/=107374182.4,b="GiB"):a>=104857.6?(a/=104857.6,b="MiB"):a>=102.4?(a/=102.4,b="KiB"):(a=10*a,b="b"),"<strong>"+Math.round(a)/10+"</strong> "+b},b.prototype._updateMaxFilesReachedClass=function(){return null!=this.options.maxFiles&&this.getAcceptedFiles().length>=this.options.maxFiles?(this.getAcceptedFiles().length===this.options.maxFiles&&this.emit("maxfilesreached",this.files),this.element.classList.add("dz-max-files-reached")):this.element.classList.remove("dz-max-files-reached")},b.prototype.drop=function(a){var b,c;a.dataTransfer&&(this.emit("drop",a),b=a.dataTransfer.files,b.length&&(c=a.dataTransfer.items,c&&c.length&&null!=c[0].webkitGetAsEntry?this._addFilesFromItems(c):this.handleFiles(b)))},b.prototype.paste=function(a){var b,c;if(null!=(null!=a&&null!=(c=a.clipboardData)?c.items:void 0))return this.emit("paste",a),b=a.clipboardData.items,b.length?this._addFilesFromItems(b):void 0},b.prototype.handleFiles=function(a){var b,c,d,e;for(e=[],c=0,d=a.length;d>c;c++)b=a[c],e.push(this.addFile(b));return e},b.prototype._addFilesFromItems=function(a){var b,c,d,e,f;for(f=[],d=0,e=a.length;e>d;d++)c=a[d],f.push(null!=c.webkitGetAsEntry&&(b=c.webkitGetAsEntry())?b.isFile?this.addFile(c.getAsFile()):b.isDirectory?this._addFilesFromDirectory(b,b.name):void 0:null!=c.getAsFile?null==c.kind||"file"===c.kind?this.addFile(c.getAsFile()):void 0:void 0);return f},b.prototype._addFilesFromDirectory=function(a,b){var c,d;return c=a.createReader(),d=function(a){return function(c){var d,e,f;for(e=0,f=c.length;f>e;e++)d=c[e],d.isFile?d.file(function(c){return a.options.ignoreHiddenFiles&&"."===c.name.substring(0,1)?void 0:(c.fullPath=""+b+"/"+c.name,a.addFile(c))}):d.isDirectory&&a._addFilesFromDirectory(d,""+b+"/"+d.name)}}(this),c.readEntries(d,function(a){return"undefined"!=typeof console&&null!==console&&"function"==typeof console.log?console.log(a):void 0})},b.prototype.accept=function(a,c){return a.size>1024*this.options.maxFilesize*1024?c(this.options.dictFileTooBig.replace("{{filesize}}",Math.round(a.size/1024/10.24)/100).replace("{{maxFilesize}}",this.options.maxFilesize)):b.isValidFile(a,this.options.acceptedFiles)?null!=this.options.maxFiles&&this.getAcceptedFiles().length>=this.options.maxFiles?(c(this.options.dictMaxFilesExceeded.replace("{{maxFiles}}",this.options.maxFiles)),this.emit("maxfilesexceeded",a)):this.options.accept.call(this,a,c):c(this.options.dictInvalidFileType)},b.prototype.addFile=function(a){return a.upload={progress:0,total:a.size,bytesSent:0},this.files.push(a),a.status=b.ADDED,this.emit("addedfile",a),this._enqueueThumbnail(a),this.accept(a,function(b){return function(c){return c?(a.accepted=!1,b._errorProcessing([a],c)):(a.accepted=!0,b.options.autoQueue&&b.enqueueFile(a)),b._updateMaxFilesReachedClass()}}(this))},b.prototype.enqueueFiles=function(a){var b,c,d;for(c=0,d=a.length;d>c;c++)b=a[c],this.enqueueFile(b);return null},b.prototype.enqueueFile=function(a){if(a.status!==b.ADDED||a.accepted!==!0)throw new Error("This file can't be queued because it has already been processed or was rejected.");return a.status=b.QUEUED,this.options.autoProcessQueue?setTimeout(function(a){return function(){return a.processQueue()}}(this),0):void 0},b.prototype._thumbnailQueue=[],b.prototype._processingThumbnail=!1,b.prototype._enqueueThumbnail=function(a){return this.options.createImageThumbnails&&a.type.match(/image.*/)&&a.size<=1024*this.options.maxThumbnailFilesize*1024?(this._thumbnailQueue.push(a),setTimeout(function(a){return function(){return a._processThumbnailQueue()}}(this),0)):void 0},b.prototype._processThumbnailQueue=function(){return this._processingThumbnail||0===this._thumbnailQueue.length?void 0:(this._processingThumbnail=!0,this.createThumbnail(this._thumbnailQueue.shift(),function(a){return function(){return a._processingThumbnail=!1,a._processThumbnailQueue()}}(this)))},b.prototype.removeFile=function(a){return a.status===b.UPLOADING&&this.cancelUpload(a),this.files=j(this.files,a),this.emit("removedfile",a),0===this.files.length?this.emit("reset"):void 0},b.prototype.removeAllFiles=function(a){var c,d,e,f;for(null==a&&(a=!1),f=this.files.slice(),d=0,e=f.length;e>d;d++)c=f[d],(c.status!==b.UPLOADING||a)&&this.removeFile(c);return null},b.prototype.createThumbnail=function(a,b){var c;return c=new FileReader,c.onload=function(d){return function(){var e;return e=document.createElement("img"),e.onload=function(){var c,f,g,i,j,k,l,m;return a.width=e.width,a.height=e.height,g=d.options.resize.call(d,a),null==g.trgWidth&&(g.trgWidth=g.optWidth),null==g.trgHeight&&(g.trgHeight=g.optHeight),c=document.createElement("canvas"),f=c.getContext("2d"),c.width=g.trgWidth,c.height=g.trgHeight,h(f,e,null!=(j=g.srcX)?j:0,null!=(k=g.srcY)?k:0,g.srcWidth,g.srcHeight,null!=(l=g.trgX)?l:0,null!=(m=g.trgY)?m:0,g.trgWidth,g.trgHeight),i=c.toDataURL("image/png"),d.emit("thumbnail",a,i),null!=b?b():void 0},e.src=c.result}}(this),c.readAsDataURL(a)},b.prototype.processQueue=function(){var a,b,c,d;if(b=this.options.parallelUploads,c=this.getUploadingFiles().length,a=c,!(c>=b)&&(d=this.getQueuedFiles(),d.length>0)){if(this.options.uploadMultiple)return this.processFiles(d.slice(0,b-c));for(;b>a;){if(!d.length)return;this.processFile(d.shift()),a++}}},b.prototype.processFile=function(a){return this.processFiles([a])},b.prototype.processFiles=function(a){var c,d,e;for(d=0,e=a.length;e>d;d++)c=a[d],c.processing=!0,c.status=b.UPLOADING,this.emit("processing",c);return this.options.uploadMultiple&&this.emit("processingmultiple",a),this.uploadFiles(a)},b.prototype._getFilesWithXhr=function(a){var b,c;return c=function(){var c,d,e,f;for(e=this.files,f=[],c=0,d=e.length;d>c;c++)b=e[c],b.xhr===a&&f.push(b);return f}.call(this)},b.prototype.cancelUpload=function(a){var c,d,e,f,g,h,i;if(a.status===b.UPLOADING){for(d=this._getFilesWithXhr(a.xhr),e=0,g=d.length;g>e;e++)c=d[e],c.status=b.CANCELED;for(a.xhr.abort(),f=0,h=d.length;h>f;f++)c=d[f],this.emit("canceled",c);this.options.uploadMultiple&&this.emit("canceledmultiple",d)}else((i=a.status)===b.ADDED||i===b.QUEUED)&&(a.status=b.CANCELED,this.emit("canceled",a),this.options.uploadMultiple&&this.emit("canceledmultiple",[a]));return this.options.autoProcessQueue?this.processQueue():void 0},b.prototype.uploadFile=function(a){return this.uploadFiles([a])},b.prototype.uploadFiles=function(a){var d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C,D,E,F,G,H,I;for(t=new XMLHttpRequest,u=0,y=a.length;y>u;u++)d=a[u],d.xhr=t;t.open(this.options.method,this.options.url,!0),t.withCredentials=!!this.options.withCredentials,q=null,f=function(b){return function(){var c,e,f;for(f=[],c=0,e=a.length;e>c;c++)d=a[c],f.push(b._errorProcessing(a,q||b.options.dictResponseError.replace("{{statusCode}}",t.status),t));return f}}(this),r=function(b){return function(c){var e,f,g,h,i,j,k,l,m;if(null!=c)for(f=100*c.loaded/c.total,g=0,j=a.length;j>g;g++)d=a[g],d.upload={progress:f,total:c.total,bytesSent:c.loaded};else{for(e=!0,f=100,h=0,k=a.length;k>h;h++)d=a[h],(100!==d.upload.progress||d.upload.bytesSent!==d.upload.total)&&(e=!1),d.upload.progress=f,d.upload.bytesSent=d.upload.total;if(e)return}for(m=[],i=0,l=a.length;l>i;i++)d=a[i],m.push(b.emit("uploadprogress",d,f,d.upload.bytesSent));return m}}(this),t.onload=function(c){return function(d){var e;if(a[0].status!==b.CANCELED&&4===t.readyState){if(q=t.responseText,t.getResponseHeader("content-type")&&~t.getResponseHeader("content-type").indexOf("application/json"))try{q=JSON.parse(q)}catch(g){d=g,q="Invalid JSON response from server."}return r(),200<=(e=t.status)&&300>e?c._finished(a,q,d):f()}}}(this),t.onerror=function(){return function(){return a[0].status!==b.CANCELED?f():void 0}}(this),p=null!=(D=t.upload)?D:t,p.onprogress=r,i={Accept:"application/json","Cache-Control":"no-cache","X-Requested-With":"XMLHttpRequest"},this.options.headers&&c(i,this.options.headers);for(g in i)h=i[g],t.setRequestHeader(g,h);if(e=new FormData,this.options.params){E=this.options.params;for(n in E)s=E[n],e.append(n,s)}for(v=0,z=a.length;z>v;v++)d=a[v],this.emit("sending",d,t,e);if(this.options.uploadMultiple&&this.emit("sendingmultiple",a,t,e),"FORM"===this.element.tagName)for(F=this.element.querySelectorAll("input, textarea, select, button"),w=0,A=F.length;A>w;w++)if(k=F[w],l=k.getAttribute("name"),m=k.getAttribute("type"),"SELECT"===k.tagName&&k.hasAttribute("multiple"))for(G=k.options,x=0,B=G.length;B>x;x++)o=G[x],o.selected&&e.append(l,o.value);else(!m||"checkbox"!==(H=m.toLowerCase())&&"radio"!==H||k.checked)&&e.append(l,k.value);for(j=C=0,I=a.length-1;I>=0?I>=C:C>=I;j=I>=0?++C:--C)e.append(this._getParamName(j),a[j],a[j].name);return t.send(e)},b.prototype._finished=function(a,c,d){var e,f,g;for(f=0,g=a.length;g>f;f++)e=a[f],e.status=b.SUCCESS,this.emit("success",e,c,d),this.emit("complete",e);return this.options.uploadMultiple&&(this.emit("successmultiple",a,c,d),this.emit("completemultiple",a)),this.options.autoProcessQueue?this.processQueue():void 0},b.prototype._errorProcessing=function(a,c,d){var e,f,g;for(f=0,g=a.length;g>f;f++)e=a[f],e.status=b.ERROR,this.emit("error",e,c,d),this.emit("complete",e);return this.options.uploadMultiple&&(this.emit("errormultiple",a,c,d),this.emit("completemultiple",a)),this.options.autoProcessQueue?this.processQueue():void 0},b}(d),b.version="3.10.2",b.options={},b.optionsForElement=function(a){return a.getAttribute("id")?b.options[e(a.getAttribute("id"))]:void 0},b.instances=[],b.forElement=function(a){if("string"==typeof a&&(a=document.querySelector(a)),null==(null!=a?a.dropzone:void 0))throw new Error("No Dropzone found for given element. This is probably because you're trying to access it before Dropzone had the time to initialize. Use the `init` option to setup any additional observers on your Dropzone.");return a.dropzone},b.autoDiscover=!0,b.discover=function(){var a,c,d,e,f,g;for(document.querySelectorAll?d=document.querySelectorAll(".dropzone"):(d=[],a=function(a){var b,c,e,f;for(f=[],c=0,e=a.length;e>c;c++)b=a[c],f.push(/(^| )dropzone($| )/.test(b.className)?d.push(b):void 0);return f},a(document.getElementsByTagName("div")),a(document.getElementsByTagName("form"))),g=[],e=0,f=d.length;f>e;e++)c=d[e],g.push(b.optionsForElement(c)!==!1?new b(c):void 0);return g},b.blacklistedBrowsers=[/opera.*Macintosh.*version\/12/i],b.isBrowserSupported=function(){var a,c,d,e,f;if(a=!0,window.File&&window.FileReader&&window.FileList&&window.Blob&&window.FormData&&document.querySelector)if("classList"in document.createElement("a"))for(f=b.blacklistedBrowsers,d=0,e=f.length;e>d;d++)c=f[d],c.test(navigator.userAgent)&&(a=!1);else a=!1;else a=!1;return a},j=function(a,b){var c,d,e,f;for(f=[],d=0,e=a.length;e>d;d++)c=a[d],c!==b&&f.push(c);return f},e=function(a){return a.replace(/[\-_](\w)/g,function(a){return a.charAt(1).toUpperCase()})},b.createElement=function(a){var b;return b=document.createElement("div"),b.innerHTML=a,b.childNodes[0]},b.elementInside=function(a,b){if(a===b)return!0;for(;a=a.parentNode;)if(a===b)return!0;return!1},b.getElement=function(a,b){var c;if("string"==typeof a?c=document.querySelector(a):null!=a.nodeType&&(c=a),null==c)throw new Error("Invalid `"+b+"` option provided. Please provide a CSS selector or a plain HTML element.");return c},b.getElements=function(a,b){var c,d,e,f,g,h,i,j;if(a instanceof Array){e=[];try{for(f=0,h=a.length;h>f;f++)d=a[f],e.push(this.getElement(d,b))}catch(k){c=k,e=null}}else if("string"==typeof a)for(e=[],j=document.querySelectorAll(a),g=0,i=j.length;i>g;g++)d=j[g],e.push(d);else null!=a.nodeType&&(e=[a]);if(null==e||!e.length)throw new Error("Invalid `"+b+"` option provided. Please provide a CSS selector, a plain HTML element or a list of those.");return e},b.confirm=function(a,b,c){return window.confirm(a)?b():null!=c?c():void 0},b.isValidFile=function(a,b){var c,d,e,f,g;if(!b)return!0;for(b=b.split(","),d=a.type,c=d.replace(/\/.*$/,""),f=0,g=b.length;g>f;f++)if(e=b[f],e=e.trim(),"."===e.charAt(0)){if(-1!==a.name.toLowerCase().indexOf(e.toLowerCase(),a.name.length-e.length))return!0}else if(/\/\*$/.test(e)){if(c===e.replace(/\/.*$/,""))return!0}else if(d===e)return!0;return!1},"undefined"!=typeof jQuery&&null!==jQuery&&(jQuery.fn.dropzone=function(a){return this.each(function(){return new b(this,a)})}),"undefined"!=typeof c&&null!==c?c.exports=b:window.Dropzone=b,b.ADDED="added",b.QUEUED="queued",b.ACCEPTED=b.QUEUED,b.UPLOADING="uploading",b.PROCESSING=b.UPLOADING,b.CANCELED="canceled",b.ERROR="error",b.SUCCESS="success",g=function(a){var b,c,d,e,f,g,h,i,j,k;for(h=a.naturalWidth,g=a.naturalHeight,c=document.createElement("canvas"),c.width=1,c.height=g,d=c.getContext("2d"),d.drawImage(a,0,0),e=d.getImageData(0,0,1,g).data,k=0,f=g,i=g;i>k;)b=e[4*(i-1)+3],0===b?f=i:k=i,i=f+k>>1;return j=i/g,0===j?1:j},h=function(a,b,c,d,e,f,h,i,j,k){var l;return l=g(b),a.drawImage(b,c,d,e,f,h,i,j,k/l)},f=function(a,b){var c,d,e,f,g,h,i,j,k;if(e=!1,k=!0,d=a.document,j=d.documentElement,c=d.addEventListener?"addEventListener":"attachEvent",i=d.addEventListener?"removeEventListener":"detachEvent",h=d.addEventListener?"":"on",f=function(c){return"readystatechange"!==c.type||"complete"===d.readyState?(("load"===c.type?a:d)[i](h+c.type,f,!1),!e&&(e=!0)?b.call(a,c.type||c):void 0):void 0},g=function(){var a;try{j.doScroll("left")}catch(b){return a=b,void setTimeout(g,50)}return f("poll")},"complete"!==d.readyState){if(d.createEventObject&&j.doScroll){try{k=!a.frameElement}catch(l){}k&&g()}return d[c](h+"DOMContentLoaded",f,!1),d[c](h+"readystatechange",f,!1),a[c](h+"load",f,!1)}},b._autoDiscoverFunction=function(){return b.autoDiscover?b.discover():void 0},f(window,b._autoDiscoverFunction)}).call(this)}),"object"==typeof exports?module.exports=a("dropzone"):"function"==typeof define&&define.amd?define([],function(){return a("dropzone")}):this.Dropzone=a("dropzone")}();
\ No newline at end of file
diff --git a/NewLife.Cube/Content/ace/js/excanvas.min.js b/NewLife.Cube/Content/ace/js/excanvas.min.js
deleted file mode 100644
index 131b013294..0000000000
--- a/NewLife.Cube/Content/ace/js/excanvas.min.js
+++ /dev/null
@@ -1 +0,0 @@
-document.createElement("canvas").getContext||!function(){function a(){return this.context_||(this.context_=new u(this))}function b(a,b){var c=O.call(arguments,2);return function(){return a.apply(b,c.concat(O.call(arguments)))}}function c(a){return String(a).replace(/&/g,"&amp;").replace(/"/g,"&quot;")}function d(a,b,c){a.namespaces[b]||a.namespaces.add(b,c,"#default#VML")}function e(a){if(d(a,"g_vml_","urn:schemas-microsoft-com:vml"),d(a,"g_o_","urn:schemas-microsoft-com:office:office"),!a.styleSheets.ex_canvas_){var b=a.createStyleSheet();b.owningElement.id="ex_canvas_",b.cssText="canvas{display:inline-block;overflow:hidden;text-align:left;width:300px;height:150px}"}}function f(a){var b=a.srcElement;switch(a.propertyName){case"width":b.getContext().clearRect(),b.style.width=b.attributes.width.nodeValue+"px",b.firstChild.style.width=b.clientWidth+"px";break;case"height":b.getContext().clearRect(),b.style.height=b.attributes.height.nodeValue+"px",b.firstChild.style.height=b.clientHeight+"px"}}function g(a){var b=a.srcElement;b.firstChild&&(b.firstChild.style.width=b.clientWidth+"px",b.firstChild.style.height=b.clientHeight+"px")}function h(){return[[1,0,0],[0,1,0],[0,0,1]]}function i(a,b){for(var c=h(),d=0;3>d;d++)for(var e=0;3>e;e++){for(var f=0,g=0;3>g;g++)f+=a[d][g]*b[g][e];c[d][e]=f}return c}function j(a,b){b.fillStyle=a.fillStyle,b.lineCap=a.lineCap,b.lineJoin=a.lineJoin,b.lineWidth=a.lineWidth,b.miterLimit=a.miterLimit,b.shadowBlur=a.shadowBlur,b.shadowColor=a.shadowColor,b.shadowOffsetX=a.shadowOffsetX,b.shadowOffsetY=a.shadowOffsetY,b.strokeStyle=a.strokeStyle,b.globalAlpha=a.globalAlpha,b.font=a.font,b.textAlign=a.textAlign,b.textBaseline=a.textBaseline,b.arcScaleX_=a.arcScaleX_,b.arcScaleY_=a.arcScaleY_,b.lineScale_=a.lineScale_}function k(a){var b=a.indexOf("(",3),c=a.indexOf(")",b+1),d=a.substring(b+1,c).split(",");return(4!=d.length||"a"!=a.charAt(3))&&(d[3]=1),d}function l(a){return parseFloat(a)/100}function m(a,b,c){return Math.min(c,Math.max(b,a))}function n(a){var b,c,d,e,f,g;if(e=parseFloat(a[0])/360%360,0>e&&e++,f=m(l(a[1]),0,1),g=m(l(a[2]),0,1),0==f)b=c=d=g;else{var h=.5>g?g*(1+f):g+f-g*f,i=2*g-h;b=o(i,h,e+1/3),c=o(i,h,e),d=o(i,h,e-1/3)}return"#"+Q[Math.floor(255*b)]+Q[Math.floor(255*c)]+Q[Math.floor(255*d)]}function o(a,b,c){return 0>c&&c++,c>1&&c--,1>6*c?a+6*(b-a)*c:1>2*c?b:2>3*c?a+(b-a)*(2/3-c)*6:a}function p(a){if(a in U)return U[a];var b,c=1;if(a=String(a),"#"==a.charAt(0))b=a;else if(/^rgb/.test(a)){for(var d,e=k(a),b="#",f=0;3>f;f++)d=-1!=e[f].indexOf("%")?Math.floor(255*l(e[f])):+e[f],b+=Q[m(d,0,255)];c=+e[3]}else if(/^hsl/.test(a)){var e=k(a);b=n(e),c=e[3]}else b=T[a]||a;return U[a]={color:b,alpha:c}}function q(a){if(W[a])return W[a];var b=document.createElement("div"),c=b.style;try{c.font=a}catch(d){}return W[a]={style:c.fontStyle||V.style,variant:c.fontVariant||V.variant,weight:c.fontWeight||V.weight,size:c.fontSize||V.size,family:c.fontFamily||V.family}}function r(a,b){var c={};for(var d in a)c[d]=a[d];var e=parseFloat(b.currentStyle.fontSize),f=parseFloat(a.size);return c.size="number"==typeof a.size?a.size:-1!=a.size.indexOf("px")?f:-1!=a.size.indexOf("em")?e*f:-1!=a.size.indexOf("%")?e/100*f:-1!=a.size.indexOf("pt")?f/.75:e,c.size*=.981,c}function s(a){return a.style+" "+a.variant+" "+a.weight+" "+a.size+"px "+a.family}function t(a){return X[a]||"square"}function u(a){this.m_=h(),this.mStack_=[],this.aStack_=[],this.currentPath_=[],this.strokeStyle="#000",this.fillStyle="#000",this.lineWidth=1,this.lineJoin="miter",this.lineCap="butt",this.miterLimit=1*M,this.globalAlpha=1,this.font="10px sans-serif",this.textAlign="left",this.textBaseline="alphabetic",this.canvas=a;var b="width:"+a.clientWidth+"px;height:"+a.clientHeight+"px;overflow:hidden;position:absolute",c=a.ownerDocument.createElement("div");c.style.cssText=b,a.appendChild(c);var d=c.cloneNode(!1);d.style.backgroundColor="red",d.style.filter="alpha(opacity=0)",a.appendChild(d),this.element_=c,this.arcScaleX_=1,this.arcScaleY_=1,this.lineScale_=1}function v(a,b,c,d){a.currentPath_.push({type:"bezierCurveTo",cp1x:b.x,cp1y:b.y,cp2x:c.x,cp2y:c.y,x:d.x,y:d.y}),a.currentX_=d.x,a.currentY_=d.y}function w(a,b){var c=p(a.strokeStyle),d=c.color,e=c.alpha*a.globalAlpha,f=a.lineScale_*a.lineWidth;1>f&&(e*=f),b.push("<g_vml_:stroke",' opacity="',e,'"',' joinstyle="',a.lineJoin,'"',' miterlimit="',a.miterLimit,'"',' endcap="',t(a.lineCap),'"',' weight="',f,'px"',' color="',d,'" />')}function x(a,b,c,d){var e=a.fillStyle,f=a.arcScaleX_,g=a.arcScaleY_,h=d.x-c.x,i=d.y-c.y;if(e instanceof B){var j=0,k={x:0,y:0},l=0,m=1;if("gradient"==e.type_){var n=e.x0_/f,o=e.y0_/g,q=e.x1_/f,r=e.y1_/g,s=y(a,n,o),t=y(a,q,r),u=t.x-s.x,v=t.y-s.y;j=180*Math.atan2(u,v)/Math.PI,0>j&&(j+=360),1e-6>j&&(j=0)}else{var s=y(a,e.x0_,e.y0_);k={x:(s.x-c.x)/h,y:(s.y-c.y)/i},h/=f*M,i/=g*M;var w=G.max(h,i);l=2*e.r0_/w,m=2*e.r1_/w-l}var x=e.colors_;x.sort(function(a,b){return a.offset-b.offset});for(var z=x.length,A=x[0].color,D=x[z-1].color,E=x[0].alpha*a.globalAlpha,F=x[z-1].alpha*a.globalAlpha,H=[],I=0;z>I;I++){var J=x[I];H.push(J.offset*m+l+" "+J.color)}b.push('<g_vml_:fill type="',e.type_,'"',' method="none" focus="100%"',' color="',A,'"',' color2="',D,'"',' colors="',H.join(","),'"',' opacity="',F,'"',' g_o_:opacity2="',E,'"',' angle="',j,'"',' focusposition="',k.x,",",k.y,'" />')}else if(e instanceof C){if(h&&i){var K=-c.x,L=-c.y;b.push("<g_vml_:fill",' position="',K/h*f*f,",",L/i*g*g,'"',' type="tile"',' src="',e.src_,'" />')}}else{var N=p(a.fillStyle),O=N.color,P=N.alpha*a.globalAlpha;b.push('<g_vml_:fill color="',O,'" opacity="',P,'" />')}}function y(a,b,c){var d=a.m_;return{x:M*(b*d[0][0]+c*d[1][0]+d[2][0])-N,y:M*(b*d[0][1]+c*d[1][1]+d[2][1])-N}}function z(a){return isFinite(a[0][0])&&isFinite(a[0][1])&&isFinite(a[1][0])&&isFinite(a[1][1])&&isFinite(a[2][0])&&isFinite(a[2][1])}function A(a,b,c){if(z(b)&&(a.m_=b,c)){var d=b[0][0]*b[1][1]-b[0][1]*b[1][0];a.lineScale_=L(K(d))}}function B(a){this.type_=a,this.x0_=0,this.y0_=0,this.r0_=0,this.x1_=0,this.y1_=0,this.r1_=0,this.colors_=[]}function C(a,b){switch(E(a),b){case"repeat":case null:case"":this.repetition_="repeat";break;case"repeat-x":case"repeat-y":case"no-repeat":this.repetition_=b;break;default:D("SYNTAX_ERR")}this.src_=a.src,this.width_=a.width,this.height_=a.height}function D(a){throw new F(a)}function E(a){a&&1==a.nodeType&&"IMG"==a.tagName||D("TYPE_MISMATCH_ERR"),"complete"!=a.readyState&&D("INVALID_STATE_ERR")}function F(a){this.code=this[a],this.message=a+": DOM Exception "+this.code}var G=Math,H=G.round,I=G.sin,J=G.cos,K=G.abs,L=G.sqrt,M=10,N=M/2,O=(+navigator.userAgent.match(/MSIE ([\d.]+)?/)[1],Array.prototype.slice);e(document);var P={init:function(a){var c=a||document;c.createElement("canvas"),c.attachEvent("onreadystatechange",b(this.init_,this,c))},init_:function(a){for(var b=a.getElementsByTagName("canvas"),c=0;c<b.length;c++)this.initElement(b[c])},initElement:function(b){if(!b.getContext){b.getContext=a,e(b.ownerDocument),b.innerHTML="",b.attachEvent("onpropertychange",f),b.attachEvent("onresize",g);var c=b.attributes;c.width&&c.width.specified?b.style.width=c.width.nodeValue+"px":b.width=b.clientWidth,c.height&&c.height.specified?b.style.height=c.height.nodeValue+"px":b.height=b.clientHeight}return b}};P.init();for(var Q=[],R=0;16>R;R++)for(var S=0;16>S;S++)Q[16*R+S]=R.toString(16)+S.toString(16);var T={aliceblue:"#F0F8FF",antiquewhite:"#FAEBD7",aquamarine:"#7FFFD4",azure:"#F0FFFF",beige:"#F5F5DC",bisque:"#FFE4C4",black:"#000000",blanchedalmond:"#FFEBCD",blueviolet:"#8A2BE2",brown:"#A52A2A",burlywood:"#DEB887",cadetblue:"#5F9EA0",chartreuse:"#7FFF00",chocolate:"#D2691E",coral:"#FF7F50",cornflowerblue:"#6495ED",cornsilk:"#FFF8DC",crimson:"#DC143C",cyan:"#00FFFF",darkblue:"#00008B",darkcyan:"#008B8B",darkgoldenrod:"#B8860B",darkgray:"#A9A9A9",darkgreen:"#006400",darkgrey:"#A9A9A9",darkkhaki:"#BDB76B",darkmagenta:"#8B008B",darkolivegreen:"#556B2F",darkorange:"#FF8C00",darkorchid:"#9932CC",darkred:"#8B0000",darksalmon:"#E9967A",darkseagreen:"#8FBC8F",darkslateblue:"#483D8B",darkslategray:"#2F4F4F",darkslategrey:"#2F4F4F",darkturquoise:"#00CED1",darkviolet:"#9400D3",deeppink:"#FF1493",deepskyblue:"#00BFFF",dimgray:"#696969",dimgrey:"#696969",dodgerblue:"#1E90FF",firebrick:"#B22222",floralwhite:"#FFFAF0",forestgreen:"#228B22",gainsboro:"#DCDCDC",ghostwhite:"#F8F8FF",gold:"#FFD700",goldenrod:"#DAA520",grey:"#808080",greenyellow:"#ADFF2F",honeydew:"#F0FFF0",hotpink:"#FF69B4",indianred:"#CD5C5C",indigo:"#4B0082",ivory:"#FFFFF0",khaki:"#F0E68C",lavender:"#E6E6FA",lavenderblush:"#FFF0F5",lawngreen:"#7CFC00",lemonchiffon:"#FFFACD",lightblue:"#ADD8E6",lightcoral:"#F08080",lightcyan:"#E0FFFF",lightgoldenrodyellow:"#FAFAD2",lightgreen:"#90EE90",lightgrey:"#D3D3D3",lightpink:"#FFB6C1",lightsalmon:"#FFA07A",lightseagreen:"#20B2AA",lightskyblue:"#87CEFA",lightslategray:"#778899",lightslategrey:"#778899",lightsteelblue:"#B0C4DE",lightyellow:"#FFFFE0",limegreen:"#32CD32",linen:"#FAF0E6",magenta:"#FF00FF",mediumaquamarine:"#66CDAA",mediumblue:"#0000CD",mediumorchid:"#BA55D3",mediumpurple:"#9370DB",mediumseagreen:"#3CB371",mediumslateblue:"#7B68EE",mediumspringgreen:"#00FA9A",mediumturquoise:"#48D1CC",mediumvioletred:"#C71585",midnightblue:"#191970",mintcream:"#F5FFFA",mistyrose:"#FFE4E1",moccasin:"#FFE4B5",navajowhite:"#FFDEAD",oldlace:"#FDF5E6",olivedrab:"#6B8E23",orange:"#FFA500",orangered:"#FF4500",orchid:"#DA70D6",palegoldenrod:"#EEE8AA",palegreen:"#98FB98",paleturquoise:"#AFEEEE",palevioletred:"#DB7093",papayawhip:"#FFEFD5",peachpuff:"#FFDAB9",peru:"#CD853F",pink:"#FFC0CB",plum:"#DDA0DD",powderblue:"#B0E0E6",rosybrown:"#BC8F8F",royalblue:"#4169E1",saddlebrown:"#8B4513",salmon:"#FA8072",sandybrown:"#F4A460",seagreen:"#2E8B57",seashell:"#FFF5EE",sienna:"#A0522D",skyblue:"#87CEEB",slateblue:"#6A5ACD",slategray:"#708090",slategrey:"#708090",snow:"#FFFAFA",springgreen:"#00FF7F",steelblue:"#4682B4",tan:"#D2B48C",thistle:"#D8BFD8",tomato:"#FF6347",turquoise:"#40E0D0",violet:"#EE82EE",wheat:"#F5DEB3",whitesmoke:"#F5F5F5",yellowgreen:"#9ACD32"},U={},V={style:"normal",variant:"normal",weight:"normal",size:10,family:"sans-serif"},W={},X={butt:"flat",round:"round"},Y=u.prototype;Y.clearRect=function(){this.textMeasureEl_&&(this.textMeasureEl_.removeNode(!0),this.textMeasureEl_=null),this.element_.innerHTML=""},Y.beginPath=function(){this.currentPath_=[]},Y.moveTo=function(a,b){var c=y(this,a,b);this.currentPath_.push({type:"moveTo",x:c.x,y:c.y}),this.currentX_=c.x,this.currentY_=c.y},Y.lineTo=function(a,b){var c=y(this,a,b);this.currentPath_.push({type:"lineTo",x:c.x,y:c.y}),this.currentX_=c.x,this.currentY_=c.y},Y.bezierCurveTo=function(a,b,c,d,e,f){var g=y(this,e,f),h=y(this,a,b),i=y(this,c,d);v(this,h,i,g)},Y.quadraticCurveTo=function(a,b,c,d){var e=y(this,a,b),f=y(this,c,d),g={x:this.currentX_+2/3*(e.x-this.currentX_),y:this.currentY_+2/3*(e.y-this.currentY_)},h={x:g.x+(f.x-this.currentX_)/3,y:g.y+(f.y-this.currentY_)/3};v(this,g,h,f)},Y.arc=function(a,b,c,d,e,f){c*=M;var g=f?"at":"wa",h=a+J(d)*c-N,i=b+I(d)*c-N,j=a+J(e)*c-N,k=b+I(e)*c-N;h!=j||f||(h+=.125);var l=y(this,a,b),m=y(this,h,i),n=y(this,j,k);this.currentPath_.push({type:g,x:l.x,y:l.y,radius:c,xStart:m.x,yStart:m.y,xEnd:n.x,yEnd:n.y})},Y.rect=function(a,b,c,d){this.moveTo(a,b),this.lineTo(a+c,b),this.lineTo(a+c,b+d),this.lineTo(a,b+d),this.closePath()},Y.strokeRect=function(a,b,c,d){var e=this.currentPath_;this.beginPath(),this.moveTo(a,b),this.lineTo(a+c,b),this.lineTo(a+c,b+d),this.lineTo(a,b+d),this.closePath(),this.stroke(),this.currentPath_=e},Y.fillRect=function(a,b,c,d){var e=this.currentPath_;this.beginPath(),this.moveTo(a,b),this.lineTo(a+c,b),this.lineTo(a+c,b+d),this.lineTo(a,b+d),this.closePath(),this.fill(),this.currentPath_=e},Y.createLinearGradient=function(a,b,c,d){var e=new B("gradient");return e.x0_=a,e.y0_=b,e.x1_=c,e.y1_=d,e},Y.createRadialGradient=function(a,b,c,d,e,f){var g=new B("gradientradial");return g.x0_=a,g.y0_=b,g.r0_=c,g.x1_=d,g.y1_=e,g.r1_=f,g},Y.drawImage=function(a){var b,c,d,e,f,g,h,i,j=a.runtimeStyle.width,k=a.runtimeStyle.height;a.runtimeStyle.width="auto",a.runtimeStyle.height="auto";var l=a.width,m=a.height;if(a.runtimeStyle.width=j,a.runtimeStyle.height=k,3==arguments.length)b=arguments[1],c=arguments[2],f=g=0,h=d=l,i=e=m;else if(5==arguments.length)b=arguments[1],c=arguments[2],d=arguments[3],e=arguments[4],f=g=0,h=l,i=m;else{if(9!=arguments.length)throw Error("Invalid number of arguments");f=arguments[1],g=arguments[2],h=arguments[3],i=arguments[4],b=arguments[5],c=arguments[6],d=arguments[7],e=arguments[8]}var n=y(this,b,c),o=[],p=10,q=10;if(o.push(" <g_vml_:group",' coordsize="',M*p,",",M*q,'"',' coordorigin="0,0"',' style="width:',p,"px;height:",q,"px;position:absolute;"),1!=this.m_[0][0]||this.m_[0][1]||1!=this.m_[1][1]||this.m_[1][0]){var r=[];r.push("M11=",this.m_[0][0],",","M12=",this.m_[1][0],",","M21=",this.m_[0][1],",","M22=",this.m_[1][1],",","Dx=",H(n.x/M),",","Dy=",H(n.y/M),"");var s=n,t=y(this,b+d,c),u=y(this,b,c+e),v=y(this,b+d,c+e);s.x=G.max(s.x,t.x,u.x,v.x),s.y=G.max(s.y,t.y,u.y,v.y),o.push("padding:0 ",H(s.x/M),"px ",H(s.y/M),"px 0;filter:progid:DXImageTransform.Microsoft.Matrix(",r.join(""),", sizingmethod='clip');")}else o.push("top:",H(n.y/M),"px;left:",H(n.x/M),"px;");o.push(' ">','<g_vml_:image src="',a.src,'"',' style="width:',M*d,"px;"," height:",M*e,'px"',' cropleft="',f/l,'"',' croptop="',g/m,'"',' cropright="',(l-f-h)/l,'"',' cropbottom="',(m-g-i)/m,'"'," />","</g_vml_:group>"),this.element_.insertAdjacentHTML("BeforeEnd",o.join(""))},Y.stroke=function(a){for(var b=10,c=10,d=5e3,e={x:null,y:null},f={x:null,y:null},g=0;g<this.currentPath_.length;g+=d){var h=[];h.push("<g_vml_:shape",' filled="',!!a,'"',' style="position:absolute;width:',b,"px;height:",c,'px;"',' coordorigin="0,0"',' coordsize="',M*b,",",M*c,'"',' stroked="',!a,'"',' path="');for(var i=g;i<Math.min(g+d,this.currentPath_.length);i++){i%d==0&&i>0&&h.push(" m ",H(this.currentPath_[i-1].x),",",H(this.currentPath_[i-1].y));var j,k=this.currentPath_[i];switch(k.type){case"moveTo":j=k,h.push(" m ",H(k.x),",",H(k.y));break;case"lineTo":h.push(" l ",H(k.x),",",H(k.y));break;case"close":h.push(" x "),k=null;break;case"bezierCurveTo":h.push(" c ",H(k.cp1x),",",H(k.cp1y),",",H(k.cp2x),",",H(k.cp2y),",",H(k.x),",",H(k.y));break;case"at":case"wa":h.push(" ",k.type," ",H(k.x-this.arcScaleX_*k.radius),",",H(k.y-this.arcScaleY_*k.radius)," ",H(k.x+this.arcScaleX_*k.radius),",",H(k.y+this.arcScaleY_*k.radius)," ",H(k.xStart),",",H(k.yStart)," ",H(k.xEnd),",",H(k.yEnd))}k&&((null==e.x||k.x<e.x)&&(e.x=k.x),(null==f.x||k.x>f.x)&&(f.x=k.x),(null==e.y||k.y<e.y)&&(e.y=k.y),(null==f.y||k.y>f.y)&&(f.y=k.y))}h.push(' ">'),a?x(this,h,e,f):w(this,h),h.push("</g_vml_:shape>"),this.element_.insertAdjacentHTML("beforeEnd",h.join(""))}},Y.fill=function(){this.stroke(!0)},Y.closePath=function(){this.currentPath_.push({type:"close"})},Y.save=function(){var a={};j(this,a),this.aStack_.push(a),this.mStack_.push(this.m_),this.m_=i(h(),this.m_)},Y.restore=function(){this.aStack_.length&&(j(this.aStack_.pop(),this),this.m_=this.mStack_.pop())},Y.translate=function(a,b){var c=[[1,0,0],[0,1,0],[a,b,1]];A(this,i(c,this.m_),!1)},Y.rotate=function(a){var b=J(a),c=I(a),d=[[b,c,0],[-c,b,0],[0,0,1]];A(this,i(d,this.m_),!1)},Y.scale=function(a,b){this.arcScaleX_*=a,this.arcScaleY_*=b;var c=[[a,0,0],[0,b,0],[0,0,1]];A(this,i(c,this.m_),!0)},Y.transform=function(a,b,c,d,e,f){var g=[[a,b,0],[c,d,0],[e,f,1]];A(this,i(g,this.m_),!0)},Y.setTransform=function(a,b,c,d,e,f){var g=[[a,b,0],[c,d,0],[e,f,1]];A(this,g,!0)},Y.drawText_=function(a,b,d,e,f){var g=this.m_,h=1e3,i=0,j=h,k={x:0,y:0},l=[],m=r(q(this.font),this.element_),n=s(m),o=this.element_.currentStyle,p=this.textAlign.toLowerCase();switch(p){case"left":case"center":case"right":break;case"end":p="ltr"==o.direction?"right":"left";break;case"start":p="rtl"==o.direction?"right":"left";break;default:p="left"}switch(this.textBaseline){case"hanging":case"top":k.y=m.size/1.75;break;case"middle":break;default:case null:case"alphabetic":case"ideographic":case"bottom":k.y=-m.size/2.25}switch(p){case"right":i=h,j=.05;break;case"center":i=j=h/2}var t=y(this,b+k.x,d+k.y);l.push('<g_vml_:line from="',-i,' 0" to="',j,' 0.05" ',' coordsize="100 100" coordorigin="0 0"',' filled="',!f,'" stroked="',!!f,'" style="position:absolute;width:1px;height:1px;">'),f?w(this,l):x(this,l,{x:-i,y:0},{x:j,y:m.size});var u=g[0][0].toFixed(3)+","+g[1][0].toFixed(3)+","+g[0][1].toFixed(3)+","+g[1][1].toFixed(3)+",0,0",v=H(t.x/M)+","+H(t.y/M);l.push('<g_vml_:skew on="t" matrix="',u,'" ',' offset="',v,'" origin="',i,' 0" />','<g_vml_:path textpathok="true" />','<g_vml_:textpath on="true" string="',c(a),'" style="v-text-align:',p,";font:",c(n),'" /></g_vml_:line>'),this.element_.insertAdjacentHTML("beforeEnd",l.join(""))},Y.fillText=function(a,b,c,d){this.drawText_(a,b,c,d,!1)},Y.strokeText=function(a,b,c,d){this.drawText_(a,b,c,d,!0)},Y.measureText=function(a){if(!this.textMeasureEl_){var b='<span style="position:absolute;top:-20000px;left:0;padding:0;margin:0;border:none;white-space:pre;"></span>';this.element_.insertAdjacentHTML("beforeEnd",b),this.textMeasureEl_=this.element_.lastChild}var c=this.element_.ownerDocument;return this.textMeasureEl_.innerHTML="",this.textMeasureEl_.style.font=this.font,this.textMeasureEl_.appendChild(c.createTextNode(a)),{width:this.textMeasureEl_.offsetWidth}},Y.clip=function(){},Y.arcTo=function(){},Y.createPattern=function(a,b){return new C(a,b)},B.prototype.addColorStop=function(a,b){b=p(b),this.colors_.push({offset:a,color:b.color,alpha:b.alpha})};var Z=F.prototype=new Error;Z.INDEX_SIZE_ERR=1,Z.DOMSTRING_SIZE_ERR=2,Z.HIERARCHY_REQUEST_ERR=3,Z.WRONG_DOCUMENT_ERR=4,Z.INVALID_CHARACTER_ERR=5,Z.NO_DATA_ALLOWED_ERR=6,Z.NO_MODIFICATION_ALLOWED_ERR=7,Z.NOT_FOUND_ERR=8,Z.NOT_SUPPORTED_ERR=9,Z.INUSE_ATTRIBUTE_ERR=10,Z.INVALID_STATE_ERR=11,Z.SYNTAX_ERR=12,Z.INVALID_MODIFICATION_ERR=13,Z.NAMESPACE_ERR=14,Z.INVALID_ACCESS_ERR=15,Z.VALIDATION_ERR=16,Z.TYPE_MISMATCH_ERR=17,G_vmlCanvasManager=P,CanvasRenderingContext2D=u,CanvasGradient=B,CanvasPattern=C,DOMException=F}();
\ No newline at end of file
diff --git a/NewLife.Cube/Content/ace/js/fullcalendar.min.js b/NewLife.Cube/Content/ace/js/fullcalendar.min.js
deleted file mode 100644
index c9c3dcdab4..0000000000
--- a/NewLife.Cube/Content/ace/js/fullcalendar.min.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/*!
- * FullCalendar v2.2.3
- * Docs & License: http://arshaw.com/fullcalendar/
- * (c) 2013 Adam Shaw
- */
-!function(a){"function"==typeof define&&define.amd?define(["jquery","moment"],a):a(jQuery,moment)}(function(a,b){function c(a,b){return b.longDateFormat("LT").replace(":mm","(:mm)").replace(/(\Wmm)$/,"($1)").replace(/\s*a$/i,"t")}function d(a,b){var c=b.longDateFormat("L");return c=c.replace(/^Y+[^\w\s]*|[^\w\s]*Y+$/g,""),a.isRTL?c+=" ddd":c="ddd "+c,c}function e(a){f(Gb,a)}function f(b){function c(c,d){a.isPlainObject(d)&&a.isPlainObject(b[c])&&!g(c)?b[c]=f({},b[c],d):void 0!==d&&(b[c]=d)}for(var d=1;d<arguments.length;d++)a.each(arguments[d],c);return b}function g(a){return/(Time|Duration)$/.test(a)}function h(c,d){function e(a){var c=b.localeData||b.langData;return c.call(b,a)||c.call(b,"en")}function g(a){cb?l()&&(p(),n(a)):h()}function h(){db=Z.theme?"ui":"fc",c.addClass("fc"),c.addClass(Z.isRTL?"fc-rtl":"fc-ltr"),c.addClass(Z.theme?"ui-widget":"fc-unthemed"),cb=a("<div class='fc-view-container'/>").prependTo(c),ab=new i(X,Z),bb=ab.render(),bb&&c.prepend(bb),m(Z.defaultView),Z.handleWindowResize&&(gb=J(r,Z.windowResizeDelay),a(window).resize(gb))}function k(){eb&&eb.destroy(),ab.destroy(),cb.remove(),c.removeClass("fc fc-ltr fc-rtl fc-unthemed ui-widget"),a(window).unbind("resize",gb)}function l(){return c.is(":visible")}function m(a){n(0,a)}function n(b,c){lb++,eb&&c&&eb.name!==c&&(ab.deactivateButton(eb.name),Q(),eb.start&&eb.destroy(),eb.el.remove(),eb=null),!eb&&c&&(eb=new Kb[c](X),eb.el=a("<div class='fc-view fc-"+c+"-view' />").appendTo(cb),ab.activateButton(c)),eb&&(b&&(hb=eb.incrementDate(hb,b)),eb.start&&!b&&hb.isWithin(eb.intervalStart,eb.intervalEnd)||l()&&(Q(),eb.start&&eb.destroy(),eb.render(hb),R(),z(),A(),v())),R(),lb--}function o(a){return l()?(a&&q(),lb++,eb.updateSize(!0),lb--,!0):void 0}function p(){l()&&q()}function q(){fb="number"==typeof Z.contentHeight?Z.contentHeight:"number"==typeof Z.height?Z.height-(bb?bb.outerHeight(!0):0):Math.round(cb.width()/Math.max(Z.aspectRatio,.5))}function r(a){!lb&&a.target===window&&eb.start&&o(!0)&&eb.trigger("windowResize",kb)}function s(){u(),w()}function t(){l()&&(Q(),eb.destroyEvents(),eb.renderEvents(mb),R())}function u(){Q(),eb.destroyEvents(),R()}function v(){!Z.lazyFetching||ib(eb.start,eb.end)?w():t()}function w(){jb(eb.start,eb.end)}function x(a){mb=a,t()}function y(){t()}function z(){ab.updateTitle(eb.title)}function A(){var a=X.getNow();a.isWithin(eb.intervalStart,eb.intervalEnd)?ab.disableButton("today"):ab.enableButton("today")}function B(a,b){a=X.moment(a),b=b?X.moment(b):a.clone().add(a.hasTime()?X.defaultTimedEventDuration:X.defaultAllDayEventDuration),eb.select(a,b)}function D(){eb&&eb.unselect()}function E(){n(-1)}function F(){n(1)}function G(){hb.add(-1,"years"),n()}function I(){hb.add(1,"years"),n()}function K(){hb=X.getNow(),n()}function L(a){hb=X.moment(a),n()}function M(a){hb.add(b.duration(a)),n()}function N(a,b){var c,d;b&&void 0!==Kb[b]||(b=b||"day",c=ab.getViewsWithButtons().join(" "),d=c.match(new RegExp("\\w+"+H(b))),d||(d=c.match(/\w+Day/)),b=d?d[0]:"agendaDay"),hb=a,m(b)}function O(){return hb.clone()}function Q(){cb.css({width:"100%",height:cb.height(),overflow:"hidden"})}function R(){cb.css({width:"",height:"",overflow:""})}function T(){return X}function U(){return eb}function V(a,b){return void 0===b?Z[a]:void(("height"==a||"contentHeight"==a||"aspectRatio"==a)&&(Z[a]=b,o(!0)))}function W(a,b){return Z[a]?Z[a].apply(b||kb,Array.prototype.slice.call(arguments,2)):void 0}var X=this;d=d||{};var Y,Z=f({},Gb,d);Y=Z.lang in Hb?Hb[Z.lang]:Hb[Gb.lang],Y&&(Z=f({},Gb,Y,d)),Z.isRTL&&(Z=f({},Gb,Ib,Y||{},d)),X.options=Z,X.render=g,X.destroy=k,X.refetchEvents=s,X.reportEvents=x,X.reportEventChange=y,X.rerenderEvents=t,X.changeView=m,X.select=B,X.unselect=D,X.prev=E,X.next=F,X.prevYear=G,X.nextYear=I,X.today=K,X.gotoDate=L,X.incrementDate=M,X.zoomTo=N,X.getDate=O,X.getCalendar=T,X.getView=U,X.option=V,X.trigger=W;var $=C(e(Z.lang));if(Z.monthNames&&($._months=Z.monthNames),Z.monthNamesShort&&($._monthsShort=Z.monthNamesShort),Z.dayNames&&($._weekdays=Z.dayNames),Z.dayNamesShort&&($._weekdaysShort=Z.dayNamesShort),null!=Z.firstDay){var _=C($._week);_.dow=Z.firstDay,$._week=_}X.defaultAllDayEventDuration=b.duration(Z.defaultAllDayEventDuration),X.defaultTimedEventDuration=b.duration(Z.defaultTimedEventDuration),X.moment=function(){var a;return"local"===Z.timezone?(a=Jb.moment.apply(null,arguments),a.hasTime()&&a.local()):a="UTC"===Z.timezone?Jb.moment.utc.apply(null,arguments):Jb.moment.parseZone.apply(null,arguments),"_locale"in a?a._locale=$:a._lang=$,a},X.getIsAmbigTimezone=function(){return"local"!==Z.timezone&&"UTC"!==Z.timezone},X.rezoneDate=function(a){return X.moment(a.toArray())},X.getNow=function(){var a=Z.now;return"function"==typeof a&&(a=a()),X.moment(a)},X.calculateWeekNumber=function(a){var b=Z.weekNumberCalculation;return"function"==typeof b?b(a):"local"===b?a.week():"ISO"===b.toUpperCase()?a.isoWeek():void 0},X.getEventEnd=function(a){return a.end?a.end.clone():X.getDefaultEventEnd(a.allDay,a.start)},X.getDefaultEventEnd=function(a,b){var c=b.clone();return a?c.stripTime().add(X.defaultAllDayEventDuration):c.add(X.defaultTimedEventDuration),X.getIsAmbigTimezone()&&c.stripZone(),c},X.formatRange=function(a,b,c){return"function"==typeof c&&(c=c.call(X,Z,$)),S(a,b,c,null,Z.isRTL)},X.formatDate=function(a,b){return"function"==typeof b&&(b=b.call(X,Z,$)),P(a,b)},j.call(X,Z);var ab,bb,cb,db,eb,fb,gb,hb,ib=X.isFetchNeeded,jb=X.fetchEvents,kb=c[0],lb=0,mb=[];hb=null!=Z.defaultDate?X.moment(Z.defaultDate):X.getNow(),X.getSuggestedViewHeight=function(){return void 0===fb&&p(),fb},X.isHeightAuto=function(){return"auto"===Z.contentHeight||"auto"===Z.height}}function i(b,c){function d(){var b=c.header;return n=c.theme?"ui":"fc",b?o=a("<div class='fc-toolbar'/>").append(f("left")).append(f("right")).append(f("center")).append('<div class="fc-clear"/>'):void 0}function e(){o.remove()}function f(d){var e=a('<div class="fc-'+d+'"/>'),f=c.header[d];return f&&a.each(f.split(" "),function(){var d,f=a(),g=!0;a.each(this.split(","),function(d,e){var h,i,j,k,l,m,o,q;"title"==e?(f=f.add(a("<h2>&nbsp;</h2>")),g=!1):(b[e]?h=function(){b[e]()}:Kb[e]&&(h=function(){b.changeView(e)},p.push(e)),h&&(i=y(c.themeButtonIcons,e),j=y(c.buttonIcons,e),k=y(c.defaultButtonText,e),l=y(c.buttonText,e),m=l?F(l):i&&c.theme?"<span class='ui-icon ui-icon-"+i+"'></span>":j&&!c.theme?"<span class='fc-icon fc-icon-"+j+"'></span>":F(k||e),o=["fc-"+e+"-button",n+"-button",n+"-state-default"],q=a('<button type="button" class="'+o.join(" ")+'">'+m+"</button>").click(function(){q.hasClass(n+"-state-disabled")||(h(),(q.hasClass(n+"-state-active")||q.hasClass(n+"-state-disabled"))&&q.removeClass(n+"-state-hover"))}).mousedown(function(){q.not("."+n+"-state-active").not("."+n+"-state-disabled").addClass(n+"-state-down")}).mouseup(function(){q.removeClass(n+"-state-down")}).hover(function(){q.not("."+n+"-state-active").not("."+n+"-state-disabled").addClass(n+"-state-hover")},function(){q.removeClass(n+"-state-hover").removeClass(n+"-state-down")}),f=f.add(q)))}),g&&f.first().addClass(n+"-corner-left").end().last().addClass(n+"-corner-right").end(),f.length>1?(d=a("<div/>"),g&&d.addClass("fc-button-group"),d.append(f),e.append(d)):e.append(f)}),e}function g(a){o.find("h2").text(a)}function h(a){o.find(".fc-"+a+"-button").addClass(n+"-state-active")}function i(a){o.find(".fc-"+a+"-button").removeClass(n+"-state-active")}function j(a){o.find(".fc-"+a+"-button").attr("disabled","disabled").addClass(n+"-state-disabled")}function k(a){o.find(".fc-"+a+"-button").removeAttr("disabled").removeClass(n+"-state-disabled")}function l(){return p}var m=this;m.render=d,m.destroy=e,m.updateTitle=g,m.activateButton=h,m.deactivateButton=i,m.disableButton=j,m.enableButton=k,m.getViewsWithButtons=l;var n,o=a(),p=[]}function j(c){function d(a,b){return!M||a.clone().stripZone()<M.clone().stripZone()||b.clone().stripZone()>N.clone().stripZone()}function e(a,b){M=a,N=b,X=[];var c=++U,d=T.length;V=d;for(var e=0;d>e;e++)f(T[e],c)}function f(b,c){g(b,function(d){var e,f,g,h=a.isArray(b.events);if(c==U){if(d)for(e=0;e<d.length;e++)f=d[e],g=h?f:u(f,b),g&&X.push.apply(X,w(g));V--,V||Q(X)}})}function g(b,d){var e,f,h=Jb.sourceFetchers;for(e=0;e<h.length;e++){if(f=h[e].call(L,b,M.clone(),N.clone(),c.timezone,d),f===!0)return;if("object"==typeof f)return void g(f,d)}var i=b.events;if(i)a.isFunction(i)?(s(),i.call(L,M.clone(),N.clone(),c.timezone,function(a){d(a),t()})):a.isArray(i)?d(i):d();else{var j=b.url;if(j){var k,l=b.success,m=b.error,n=b.complete;k=a.isFunction(b.data)?b.data():b.data;var o=a.extend({},k||{}),p=E(b.startParam,c.startParam),q=E(b.endParam,c.endParam),r=E(b.timezoneParam,c.timezoneParam);p&&(o[p]=M.format()),q&&(o[q]=N.format()),c.timezone&&"local"!=c.timezone&&(o[r]=c.timezone),s(),a.ajax(a.extend({},Lb,b,{data:o,success:function(b){b=b||[];var c=D(l,this,arguments);a.isArray(c)&&(b=c),d(b)},error:function(){D(m,this,arguments),d()},complete:function(){D(n,this,arguments),t()}}))}else d()}}function h(a){var b=i(a);b&&(T.push(b),V++,f(b,U))}function i(b){var c,d,e=Jb.sourceNormalizers;if(a.isFunction(b)||a.isArray(b)?c={events:b}:"string"==typeof b?c={url:b}:"object"==typeof b&&(c=a.extend({},b)),c){for(c.className?"string"==typeof c.className&&(c.className=c.className.split(/\s+/)):c.className=[],a.isArray(c.events)&&(c.origArray=c.events,c.events=a.map(c.events,function(a){return u(a,c)})),d=0;d<e.length;d++)e[d].call(L,c);return c}}function j(b){T=a.grep(T,function(a){return!l(a,b)}),X=a.grep(X,function(a){return!l(a.source,b)}),Q(X)}function l(a,b){return a&&b&&m(a)==m(b)}function m(a){return("object"==typeof a?a.origArray||a.googleCalendarId||a.url||a.events:null)||a}function n(a){a.start=L.moment(a.start),a.end&&(a.end=L.moment(a.end)),x(a),o(a),Q(X)}function o(a){var b,c,d,e;for(b=0;b<X.length;b++)if(c=X[b],c._id==a._id&&c!==a)for(d=0;d<Y.length;d++)e=Y[d],void 0!==a[e]&&(c[e]=a[e])}function p(a,b){var c,d,e,f=u(a);if(f){for(c=w(f),d=0;d<c.length;d++)e=c[d],e.source||(b&&(S.events.push(e),e.source=S),X.push(e));return Q(X),c}return[]}function q(b){var c,d;for(null==b?b=function(){return!0}:a.isFunction(b)||(c=b+"",b=function(a){return a._id==c}),X=a.grep(X,b,!0),d=0;d<T.length;d++)a.isArray(T[d].events)&&(T[d].events=a.grep(T[d].events,b,!0));Q(X)}function r(b){return a.isFunction(b)?a.grep(X,b):null!=b?(b+="",a.grep(X,function(a){return a._id==b})):X}function s(){W++||O("loading",null,!0,P())}function t(){--W||O("loading",null,!1,P())}function u(d,e){var f,g,h,i,j={};if(c.eventDataTransform&&(d=c.eventDataTransform(d)),e&&e.eventDataTransform&&(d=e.eventDataTransform(d)),a.extend(j,d),e&&(j.source=e),j._id=d._id||(void 0===d.id?"_fc"+Mb++:d.id+""),j.className=d.className?"string"==typeof d.className?d.className.split(/\s+/):d.className:[],f=d.start||d.date,g=d.end,B(f)&&(f=b.duration(f)),B(g)&&(g=b.duration(g)),d.dow||b.isDuration(f)||b.isDuration(g))j.start=f?b.duration(f):null,j.end=g?b.duration(g):null,j._recurring=!0;else{if(f&&(f=L.moment(f),!f.isValid()))return!1;g&&(g=L.moment(g),g.isValid()||(g=null)),h=d.allDay,void 0===h&&(i=E(e?e.allDayDefault:void 0,c.allDayDefault),h=void 0!==i?i:!(f.hasTime()||g&&g.hasTime())),v(f,g,h,j)}return j}function v(a,b,d,e){d?(a.hasTime()&&a.stripTime(),b&&b.hasTime()&&b.stripTime()):(a.hasTime()||(a=L.rezoneDate(a)),b&&!b.hasTime()&&(b=L.rezoneDate(b))),b&&a>=b&&(b=null),e.allDay=d,e.start=a,e.end=b||null,c.forceEventDuration&&!e.end&&(e.end=R(e)),k(e)}function w(b,c,d){var e,f,g,h,i,j,k,l,m,n=[];if(c=c||M,d=d||N,b)if(b._recurring){if(f=b.dow)for(e={},g=0;g<f.length;g++)e[f[g]]=!0;for(h=c.clone().stripTime();h.isBefore(d);)(!e||e[h.day()])&&(i=b.start,j=b.end,k=h.clone(),l=null,i&&(k=k.time(i)),j&&(l=h.clone().time(j)),m=a.extend({},b),v(k,l,!i&&!j,m),n.push(m)),h.add(1,"days")}else n.push(b);return n}function x(a,b,c){var d,e,f,g,h=a._allDay,i=a._start,j=a._end,k=!1;return b||c||(b=a.start,c=a.end),d=a.allDay!=h?a.allDay:!(b||c).hasTime(),d&&(b&&(b=b.clone().stripTime()),c&&(c=c.clone().stripTime())),b&&(e=d?z(b,i.clone().stripTime()):z(b,i)),d!=h?k=!0:c&&(f=z(c||L.getDefaultEventEnd(d,b||i),b||i).subtract(z(j||L.getDefaultEventEnd(h,i),i))),g=y(r(a._id),k,d,e,f),{dateDelta:e,durationDelta:f,undo:g}}function y(b,d,e,f,g){var h=L.getIsAmbigTimezone(),i=[];return a.each(b,function(a,b){var j=b._allDay,l=b._start,m=b._end,n=null!=e?e:j,o=l.clone(),p=!d&&m?m.clone():null;n?(o.stripTime(),p&&p.stripTime()):(o.hasTime()||(o=L.rezoneDate(o)),p&&!p.hasTime()&&(p=L.rezoneDate(p))),p||!c.forceEventDuration&&!+g||(p=L.getDefaultEventEnd(n,o)),o.add(f),p&&p.add(f).add(g),h&&(+f||+g)&&(o.stripZone(),p&&p.stripZone()),b.allDay=n,b.start=o,b.end=p,k(b),i.push(function(){b.allDay=j,b.start=l,b.end=m,k(b)})}),function(){for(var a=0;a<i.length;a++)i[a]()}}function A(){var b,d=c.businessHours,e={className:"fc-nonbusiness",start:"09:00",end:"17:00",dow:[1,2,3,4,5],rendering:"inverse-background"},f=L.getView();return d&&(b="object"==typeof d?a.extend({},e,d):e),b?w(u(b),f.start,f.end):[]}function C(a,b,d){var e=a.source||{},f=E(a.constraint,e.constraint,c.eventConstraint),g=E(a.overlap,e.overlap,c.eventOverlap);return H(b,d,f,g,a)}function F(a,b){return H(a,b,c.selectConstraint,c.selectOverlap)}function G(a,b,c){var d;return c&&(d=w(u(c))[0])?C(d,a,b):F(a,b)}function H(a,b,c,d,e){var f,g,h,i,j;if(a=a.clone().stripZone(),b=b.clone().stripZone(),null!=c){for(f=I(c),g=!1,h=0;h<f.length;h++)if(J(f[h],a,b)){g=!0;break}if(!g)return!1}for(h=0;h<X.length;h++)if(i=X[h],(!e||e._id!==i._id)&&K(i,a,b)){if(d===!1)return!1;if("function"==typeof d&&!d(i,e))return!1;if(e){if(j=E(i.overlap,(i.source||{}).overlap),j===!1)return!1;if("function"==typeof j&&!j(e,i))return!1}}return!0}function I(a){return"businessHours"===a?A():"object"==typeof a?w(u(a)):r(a)}function J(a,b,c){var d=a.start.clone().stripZone(),e=L.getEventEnd(a).stripZone();return b>=d&&e>=c}function K(a,b,c){var d=a.start.clone().stripZone(),e=L.getEventEnd(a).stripZone();return e>b&&c>d}var L=this;L.isFetchNeeded=d,L.fetchEvents=e,L.addEventSource=h,L.removeEventSource=j,L.updateEvent=n,L.renderEvent=p,L.removeEvents=q,L.clientEvents=r,L.mutateEvent=x;var M,N,O=L.trigger,P=L.getView,Q=L.reportEvents,R=L.getEventEnd,S={events:[]},T=[S],U=0,V=0,W=0,X=[];a.each((c.events?[c.events]:[]).concat(c.eventSources||[]),function(a,b){var c=i(b);c&&T.push(c)});var Y=["title","url","allDay","className","editable","color","backgroundColor","borderColor","textColor"];L.getBusinessHoursEvents=A,L.isEventAllowedInRange=C,L.isSelectionAllowedInRange=F,L.isExternalDragAllowedInRange=G}function k(a){a._allDay=a.allDay,a._start=a.start.clone(),a._end=a.end?a.end.clone():null}function l(a,b){b.left&&a.css({"border-left-width":1,"margin-left":b.left-1}),b.right&&a.css({"border-right-width":1,"margin-right":b.right-1})}function m(a){a.css({"margin-left":"","margin-right":"","border-left-width":"","border-right-width":""})}function n(){a("body").addClass("fc-not-allowed")}function o(){a("body").removeClass("fc-not-allowed")}function p(b,c,d){var e=Math.floor(c/b.length),f=Math.floor(c-e*(b.length-1)),g=[],h=[],i=[],j=0;q(b),b.each(function(c,d){var k=c===b.length-1?f:e,l=a(d).outerHeight(!0);k>l?(g.push(d),h.push(l),i.push(a(d).height())):j+=l}),d&&(c-=j,e=Math.floor(c/g.length),f=Math.floor(c-e*(g.length-1))),a(g).each(function(b,c){var d=b===g.length-1?f:e,j=h[b],k=i[b],l=d-(j-k);d>j&&a(c).height(l)})}function q(a){a.height("")}function r(b){var c=0;return b.find("> *").each(function(b,d){var e=a(d).outerWidth();e>c&&(c=e)}),c++,b.width(c),c}function s(a,b){return a.height(b).addClass("fc-scroller"),a[0].scrollHeight-1>a[0].clientHeight?!0:(t(a),!1)}function t(a){a.height("").removeClass("fc-scroller")}function u(b){var c=b.css("position"),d=b.parents().filter(function(){var b=a(this);return/(auto|scroll)/.test(b.css("overflow")+b.css("overflow-y")+b.css("overflow-x"))}).eq(0);return"fixed"!==c&&d.length?d:a(b[0].ownerDocument||document)}function v(a){var b=a.offset().left,c=b+a.width(),d=a.children(),e=d.offset().left,f=e+d.outerWidth();return{left:e-b,right:c-f}}function w(a){return 1==a.which&&!a.ctrlKey}function x(a,b,c,d){var e,f,g,h;return b>c&&d>a?(a>=c?(e=a.clone(),g=!0):(e=c.clone(),g=!1),d>=b?(f=b.clone(),h=!0):(f=d.clone(),h=!1),{start:e,end:f,isStart:g,isEnd:h}):void 0}function y(a,b){if(a=a||{},void 0!==a[b])return a[b];for(var c,d=b.split(/(?=[A-Z])/),e=d.length-1;e>=0;e--)if(c=a[d[e].toLowerCase()],void 0!==c)return c;return a["default"]}function z(a,c){return b.duration({days:a.clone().stripTime().diff(c.clone().stripTime(),"days"),ms:a.time()-c.time()})}function A(a){return"[object Date]"===Object.prototype.toString.call(a)||a instanceof Date}function B(a){return/^\d+\:\d+(?:\:\d+\.?(?:\d{3})?)?$/.test(a)}function C(a){var b=function(){};return b.prototype=a,new b}function D(b,c,d){if(a.isFunction(b)&&(b=[b]),b){var e,f;for(e=0;e<b.length;e++)f=b[e].apply(c,d)||f;return f}}function E(){for(var a=0;a<arguments.length;a++)if(void 0!==arguments[a])return arguments[a]}function F(a){return(a+"").replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"&#039;").replace(/"/g,"&quot;").replace(/\n/g,"<br />")}function G(a){return a.replace(/&.*?;/g,"")}function H(a){return a.charAt(0).toUpperCase()+a.slice(1)}function I(a,b){return a-b}function J(a,b){var c,d,e,f,g=function(){var h=+new Date-f;b>h&&h>0?c=setTimeout(g,b-h):(c=null,a.apply(e,d),c||(e=d=null))};return function(){e=this,d=arguments,f=+new Date,c||(c=setTimeout(g,b))}}function K(c,d,e){var f,g,h,i,j=c[0],k=1==c.length&&"string"==typeof j;return b.isMoment(j)?(i=b.apply(null,c),M(j,i)):A(j)||void 0===j?i=b.apply(null,c):(f=!1,g=!1,k?Rb.test(j)?(j+="-01",c=[j],f=!0,g=!0):(h=Sb.exec(j))&&(f=!h[5],g=!0):a.isArray(j)&&(g=!0),i=d?b.utc.apply(b,c):b.apply(null,c),f?(i._ambigTime=!0,i._ambigZone=!0):e&&(g?i._ambigZone=!0:k&&i.zone(j))),i._fullCalendar=!0,i}function L(a,b){var c,d=[],e=!1,f=!1;for(c=0;c<a.length;c++)d.push(Jb.moment.parseZone(a[c])),e=e||d[c]._ambigTime,f=f||d[c]._ambigZone;for(c=0;c<d.length;c++)e&&!b?d[c].stripTime():f&&d[c].stripZone();return d}function M(a,b){a._ambigTime?b._ambigTime=!0:b._ambigTime&&(b._ambigTime=!1),a._ambigZone?b._ambigZone=!0:b._ambigZone&&(b._ambigZone=!1)}function N(a,b){a.year(b[0]||0).month(b[1]||0).date(b[2]||0).hours(b[3]||0).minutes(b[4]||0).seconds(b[5]||0).milliseconds(b[6]||0)}function O(a,b){return Ub.format.call(a,b)}function P(a,b){return Q(a,V(b))}function Q(a,b){var c,d="";for(c=0;c<b.length;c++)d+=R(a,b[c]);return d}function R(a,b){var c,d;return"string"==typeof b?b:(c=b.token)?Vb[c]?Vb[c](a):O(a,c):b.maybe&&(d=Q(a,b.maybe),d.match(/[1-9]/))?d:""}function S(a,b,c,d,e){var f;return a=Jb.moment.parseZone(a),b=Jb.moment.parseZone(b),f=(a.localeData||a.lang).call(a),c=f.longDateFormat(c)||c,d=d||" - ",T(a,b,V(c),d,e)}function T(a,b,c,d,e){var f,g,h,i,j="",k="",l="",m="",n="";for(g=0;g<c.length&&(f=U(a,b,c[g]),f!==!1);g++)j+=f;for(h=c.length-1;h>g&&(f=U(a,b,c[h]),f!==!1);h--)k=f+k;for(i=g;h>=i;i++)l+=R(a,c[i]),m+=R(b,c[i]);return(l||m)&&(n=e?m+d+l:l+d+m),j+n+k}function U(a,b,c){var d,e;return"string"==typeof c?c:(d=c.token)&&(e=Wb[d.charAt(0)],e&&a.isSame(b,e))?O(a,d):!1}function V(a){return a in Xb?Xb[a]:Xb[a]=W(a)}function W(a){for(var b,c=[],d=/\[([^\]]*)\]|\(([^\)]*)\)|(LT|(\w)\4*o?)|([^\w\[\(]+)/g;b=d.exec(a);)b[1]?c.push(b[1]):b[2]?c.push({maybe:W(b[2])}):b[3]?c.push({token:b[3]}):b[5]&&c.push(b[5]);return c}function X(a){this.options=a||{}}function Y(a){this.grid=a}function Z(a){this.coordMaps=a}function $(a,b){this.coordMap=a,this.options=b||{}}function _(a,b){return a||b?a&&b?a.grid===b.grid&&a.row===b.row&&a.col===b.col:!1:!0}function ab(b,c){this.options=c=c||{},this.sourceEl=b,this.parentEl=c.parentEl?a(c.parentEl):b.parent()}function bb(a){this.view=a}function cb(a){bb.call(this,a),this.coordMap=new Y(this),this.elsByFill={}}function db(a){var b=fb(a);return"background"===b||"inverse-background"===b}function eb(a){return"inverse-background"===fb(a)}function fb(a){return E((a.source||{}).rendering,a.rendering)}function gb(a){var b,c,d={};for(b=0;b<a.length;b++)c=a[b],(d[c._id]||(d[c._id]=[])).push(c);return d}function hb(a,b){return a.eventStartMS-b.eventStartMS}function ib(a,b){return a.eventStartMS-b.eventStartMS||b.eventDurationMS-a.eventDurationMS||b.event.allDay-a.event.allDay||(a.event.title||"").localeCompare(b.event.title)}function jb(a){cb.call(this,a)}function kb(a,b){var c,d;for(c=0;c<b.length;c++)if(d=b[c],d.leftCol<=a.rightCol&&d.rightCol>=a.leftCol)return!0;return!1}function lb(a,b){return a.leftCol-b.leftCol}function mb(a){cb.call(this,a)}function nb(a){var b,c,d;if(a.sort(ib),b=ob(a),pb(b),c=b[0]){for(d=0;d<c.length;d++)qb(c[d]);for(d=0;d<c.length;d++)rb(c[d],0,0)}}function ob(a){var b,c,d,e=[];for(b=0;b<a.length;b++){for(c=a[b],d=0;d<e.length&&sb(c,e[d]).length;d++);c.level=d,(e[d]||(e[d]=[])).push(c)}return e}function pb(a){var b,c,d,e,f;for(b=0;b<a.length;b++)for(c=a[b],d=0;d<c.length;d++)for(e=c[d],e.forwardSegs=[],f=b+1;f<a.length;f++)sb(e,a[f],e.forwardSegs)}function qb(a){var b,c,d=a.forwardSegs,e=0;if(void 0===a.forwardPressure){for(b=0;b<d.length;b++)c=d[b],qb(c),e=Math.max(e,1+c.forwardPressure);a.forwardPressure=e}}function rb(a,b,c){var d,e=a.forwardSegs;if(void 0===a.forwardCoord)for(e.length?(e.sort(ub),rb(e[0],b+1,c),a.forwardCoord=e[0].backwardCoord):a.forwardCoord=1,a.backwardCoord=a.forwardCoord-(a.forwardCoord-c)/(b+1),d=0;d<e.length;d++)rb(e[d],0,a.forwardCoord)}function sb(a,b,c){c=c||[];for(var d=0;d<b.length;d++)tb(a,b[d])&&c.push(b[d]);return c}function tb(a,b){return a.bottom>b.top&&a.top<b.bottom}function ub(a,b){return b.forwardPressure-a.forwardPressure||(a.backwardCoord||0)-(b.backwardCoord||0)||ib(a,b)}function vb(c){function d(b){var c=B[b];return a.isPlainObject(c)&&!g(b)?y(c,z.name):c}function e(a,b){return c.trigger.apply(c,[a,b||z].concat(Array.prototype.slice.call(arguments,2),[z]))}function f(a){var b=a.source||{};return E(a.startEditable,b.startEditable,d("eventStartEditable"),a.editable,b.editable,d("editable"))}function h(a){var b=a.source||{};return E(a.durationEditable,b.durationEditable,d("eventDurationEditable"),a.editable,b.editable,d("editable"))}function i(a,b,d,f){var g=c.mutateEvent(b,d,null);e("eventDrop",a,b,g.dateDelta,function(){g.undo(),A()},f,{}),A()}function j(a,b,d,f){var g=c.mutateEvent(b,null,d);e("eventResize",a,b,g.durationDelta,function(){g.undo(),A()},f,{}),A()}function k(a){return b.isMoment(a)&&(a=a.day()),G[a]}function l(){return D}function m(a,b,c){var d=a.clone();for(b=b||1;G[(d.day()+(c?b:0)+7)%7];)d.add(b,"days");return d}function n(){var a=o.apply(null,arguments),b=p(a),c=q(b);return c}function o(a,b){var c=z.colCnt,d=K?-1:1,e=K?c-1:0;"object"==typeof a&&(b=a.col,a=a.row);var f=a*c+(b*d+e);return f}function p(a){var b=z.start.day();return a+=H[b],7*Math.floor(a/D)+J[(a%D+D)%D]-b}function q(a){return z.start.clone().add(a,"days")}function r(a){var b=s(a),c=t(b),d=u(c);return d}function s(a){return a.clone().stripTime().diff(z.start,"days")}function t(a){var b=z.start.day();return a+=b,Math.floor(a/7)*D+H[(a%7+7)%7]-H[b]}function u(a){var b=z.colCnt,c=K?-1:1,d=K?b-1:0,e=Math.floor(a/b),f=(a%b+b)%b*c+d;return{row:e,col:f}}function v(a,b){for(var c=z.rowCnt,d=z.colCnt,e=[],f=w(a,b),g=s(f.start),h=s(f.end),i=t(g),j=t(h)-1,k=0;c>k;k++){var l=k*d,m=l+d-1,n=Math.max(i,l),o=Math.min(j,m);if(o>=n){var q=u(n),r=u(o),v=[q.col,r.col].sort(I),x=p(n)==g,y=p(o)+1==h;e.push({row:k,leftCol:v[0],rightCol:v[1],isStart:x,isEnd:y})}}return e}function w(a,b){var c,d,e=a.clone().stripTime();return b&&(c=b.clone().stripTime(),d=+b.time(),d&&d>=C&&c.add(1,"days")),(!b||e>=c)&&(c=e.clone().add(1,"days")),{start:e,end:c}}function x(a){var b=w(a.start,a.end);return b.end.diff(b.start,"days")>1}var z=this;z.calendar=c,z.opt=d,z.trigger=e,z.isEventDraggable=f,z.isEventResizable=h,z.eventDrop=i,z.eventResize=j;var A=c.reportEventChange,B=c.options,C=b.duration(B.nextDayThreshold);z.init(),z.getEventTimeText=function(a,b){var e,f;return"object"==typeof a&&"object"==typeof b?(e=a,f=b,b=arguments[2]):(e=a.start,f=a.end),b=b||d("timeFormat"),f&&d("displayEventEnd")?c.formatRange(e,f,b):c.formatDate(e,b)},z.isHiddenDay=k,z.skipHiddenDays=m,z.getCellsPerWeek=l,z.dateToCell=r,z.dateToDayOffset=s,z.dayOffsetToCellOffset=t,z.cellOffsetToCell=u,z.cellToDate=n,z.cellToCellOffset=o,z.cellOffsetToDayOffset=p,z.dayOffsetToDate=q,z.rangeToSegments=v,z.isMultiDayEvent=x;var D,F=d("hiddenDays")||[],G=[],H=[],J=[],K=d("isRTL");!function(){d("weekends")===!1&&F.push(0,6);for(var b=0,c=0;7>b;b++)H[b]=c,G[b]=-1!=a.inArray(b,F),G[b]||(J[c]=b,c++);if(D=c,!D)throw"invalid hiddenDays"}()}function wb(c){var d,e,f,g,h=Jb.dataAttrPrefix;return h&&(h+="-"),d=c.data(h+"event")||null,d&&(d="object"==typeof d?a.extend({},d):{},e=d.start,null==e&&(e=d.time),f=d.duration,g=d.stick,delete d.start,delete d.time,delete d.duration,delete d.stick),null==e&&(e=c.data(h+"start")),null==e&&(e=c.data(h+"time")),null==f&&(f=c.data(h+"duration")),null==g&&(g=c.data(h+"stick")),e=null!=e?b.duration(e):null,f=null!=f?b.duration(f):null,g=Boolean(g),{eventProps:d,startTime:e,duration:f,stick:g}}function xb(a){vb.call(this,a),this.dayGrid=new jb(this),this.coordMap=this.dayGrid.coordMap}function yb(a){xb.call(this,a)}function zb(a){xb.call(this,a)}function Ab(a){xb.call(this,a)}function Bb(a,b){return b.longDateFormat("LT").replace(":mm","(:mm)").replace(/(\Wmm)$/,"($1)").replace(/\s*a$/i,"a")}function Cb(a,b){return b.longDateFormat("LT").replace(/\s*a$/i,"")}function Db(a){vb.call(this,a),this.timeGrid=new mb(this),this.opt("allDaySlot")?(this.dayGrid=new jb(this),this.coordMap=new Z([this.dayGrid.coordMap,this.timeGrid.coordMap])):this.coordMap=this.timeGrid.coordMap}function Eb(a){Db.call(this,a)}function Fb(a){Db.call(this,a)}var Gb={lang:"en",defaultTimedEventDuration:"02:00:00",defaultAllDayEventDuration:{days:1},forceEventDuration:!1,nextDayThreshold:"09:00:00",defaultView:"month",aspectRatio:1.35,header:{left:"title",center:"",right:"today prev,next"},weekends:!0,weekNumbers:!1,weekNumberTitle:"W",weekNumberCalculation:"local",lazyFetching:!0,startParam:"start",endParam:"end",timezoneParam:"timezone",timezone:!1,titleFormat:{month:"MMMM YYYY",week:"ll",day:"LL"},columnFormat:{month:"ddd",week:d,day:"dddd"},timeFormat:{"default":c},displayEventEnd:{month:!1,basicWeek:!1,"default":!0},isRTL:!1,defaultButtonText:{prev:"prev",next:"next",prevYear:"prev year",nextYear:"next year",today:"today",month:"month",week:"week",day:"day"},buttonIcons:{prev:"left-single-arrow",next:"right-single-arrow",prevYear:"left-double-arrow",nextYear:"right-double-arrow"},theme:!1,themeButtonIcons:{prev:"circle-triangle-w",next:"circle-triangle-e",prevYear:"seek-prev",nextYear:"seek-next"},dragOpacity:.75,dragRevertDuration:500,dragScroll:!0,unselectAuto:!0,dropAccept:"*",eventLimit:!1,eventLimitText:"more",eventLimitClick:"popover",dayPopoverFormat:"LL",handleWindowResize:!0,windowResizeDelay:200},Hb={en:{columnFormat:{week:"ddd M/D"},dayPopoverFormat:"dddd, MMMM D"}},Ib={header:{left:"next,prev today",center:"",right:"title"},buttonIcons:{prev:"right-single-arrow",next:"left-single-arrow",prevYear:"right-double-arrow",nextYear:"left-double-arrow"},themeButtonIcons:{prev:"circle-triangle-e",next:"circle-triangle-w",nextYear:"seek-prev",prevYear:"seek-next"}},Jb=a.fullCalendar={version:"2.2.3"},Kb=Jb.views={};a.fn.fullCalendar=function(b){var c=Array.prototype.slice.call(arguments,1),d=this;return this.each(function(e,f){var g,i=a(f),j=i.data("fullCalendar");"string"==typeof b?j&&a.isFunction(j[b])&&(g=j[b].apply(j,c),e||(d=g),"destroy"===b&&i.removeData("fullCalendar")):j||(j=new h(i,b),i.data("fullCalendar",j),j.render())}),d},Jb.langs=Hb,Jb.datepickerLang=function(b,c,d){var e=Hb[b];e||(e=Hb[b]={}),f(e,{isRTL:d.isRTL,weekNumberTitle:d.weekHeader,titleFormat:{month:d.showMonthAfterYear?"YYYY["+d.yearSuffix+"] MMMM":"MMMM YYYY["+d.yearSuffix+"]"},defaultButtonText:{prev:G(d.prevText),next:G(d.nextText),today:G(d.currentText)}}),a.datepicker&&(a.datepicker.regional[c]=a.datepicker.regional[b]=d,a.datepicker.regional.en=a.datepicker.regional[""],a.datepicker.setDefaults(d))},Jb.lang=function(a,b){var c;b&&(c=Hb[a],c||(c=Hb[a]={}),f(c,b||{})),Gb.lang=a},Jb.sourceNormalizers=[],Jb.sourceFetchers=[];var Lb={dataType:"json",cache:!1},Mb=1,Nb=["sun","mon","tue","wed","thu","fri","sat"];Jb.applyAll=D;var Ob,Pb,Qb,Rb=/^\s*\d{4}-\d\d$/,Sb=/^\s*\d{4}-(?:(\d\d-\d\d)|(W\d\d$)|(W\d\d-\d)|(\d\d\d))((T| )(\d\d(:\d\d(:\d\d(\.\d+)?)?)?)?)?$/,Tb=b.fn,Ub=a.extend({},Tb);Jb.moment=function(){return K(arguments)},Jb.moment.utc=function(){var a=K(arguments,!0);return a.hasTime()&&a.utc(),a},Jb.moment.parseZone=function(){return K(arguments,!0,!0)},Tb.clone=function(){var a=Ub.clone.apply(this,arguments);return M(this,a),this._fullCalendar&&(a._fullCalendar=!0),a},Tb.time=function(a){if(!this._fullCalendar)return Ub.time.apply(this,arguments);if(null==a)return b.duration({hours:this.hours(),minutes:this.minutes(),seconds:this.seconds(),milliseconds:this.milliseconds()});this._ambigTime=!1,b.isDuration(a)||b.isMoment(a)||(a=b.duration(a));var c=0;return b.isDuration(a)&&(c=24*Math.floor(a.asDays())),this.hours(c+a.hours()).minutes(a.minutes()).seconds(a.seconds()).milliseconds(a.milliseconds())},Tb.stripTime=function(){var a=this.toArray();return this.utc(),Pb(this,a.slice(0,3)),this._ambigTime=!0,this._ambigZone=!0,this},Tb.hasTime=function(){return!this._ambigTime},Tb.stripZone=function(){var a=this.toArray(),b=this._ambigTime;return this.utc(),Pb(this,a),b&&(this._ambigTime=!0),this._ambigZone=!0,this},Tb.hasZone=function(){return!this._ambigZone},Tb.zone=function(a){return null!=a&&(this._ambigTime=!1,this._ambigZone=!1),Ub.zone.apply(this,arguments)},Tb.local=function(){var a=this.toArray(),b=this._ambigZone;return Ub.local.apply(this,arguments),b&&Qb(this,a),this},Tb.format=function(){return this._fullCalendar&&arguments[0]?P(this,arguments[0]):this._ambigTime?O(this,"YYYY-MM-DD"):this._ambigZone?O(this,"YYYY-MM-DD[T]HH:mm:ss"):Ub.format.apply(this,arguments)},Tb.toISOString=function(){return this._ambigTime?O(this,"YYYY-MM-DD"):this._ambigZone?O(this,"YYYY-MM-DD[T]HH:mm:ss"):Ub.toISOString.apply(this,arguments)},Tb.isWithin=function(a,b){var c=L([this,a,b]);return c[0]>=c[1]&&c[0]<c[2]},Tb.isSame=function(a,b){var c;return this._fullCalendar?b?(c=L([this,a],!0),Ub.isSame.call(c[0],c[1],b)):(a=Jb.moment.parseZone(a),Ub.isSame.call(this,a)&&Boolean(this._ambigTime)===Boolean(a._ambigTime)&&Boolean(this._ambigZone)===Boolean(a._ambigZone)):Ub.isSame.apply(this,arguments)},a.each(["isBefore","isAfter"],function(a,b){Tb[b]=function(a,c){var d;return this._fullCalendar?(d=L([this,a]),Ub[b].call(d[0],d[1],c)):Ub[b].apply(this,arguments)}}),Ob="_d"in b()&&"updateOffset"in b,Pb=Ob?function(a,c){a._d.setTime(Date.UTC.apply(Date,c)),b.updateOffset(a,!1)}:N,Qb=Ob?function(a,c){a._d.setTime(+new Date(c[0]||0,c[1]||0,c[2]||0,c[3]||0,c[4]||0,c[5]||0,c[6]||0)),b.updateOffset(a,!1)}:N;var Vb={t:function(a){return O(a,"a").charAt(0)},T:function(a){return O(a,"A").charAt(0)}};Jb.formatRange=S;var Wb={Y:"year",M:"month",D:"day",d:"day",A:"second",a:"second",T:"second",t:"second",H:"second",h:"second",m:"second",s:"second"},Xb={};X.prototype={isHidden:!0,options:null,el:null,documentMousedownProxy:null,margin:10,show:function(){this.isHidden&&(this.el||this.render(),this.el.show(),this.position(),this.isHidden=!1,this.trigger("show"))},hide:function(){this.isHidden||(this.el.hide(),this.isHidden=!0,this.trigger("hide"))},render:function(){var b=this,c=this.options;this.el=a('<div class="fc-popover"/>').addClass(c.className||"").css({top:0,left:0}).append(c.content).appendTo(c.parentEl),this.el.on("click",".fc-close",function(){b.hide()}),c.autoHide&&a(document).on("mousedown",this.documentMousedownProxy=a.proxy(this,"documentMousedown"))},documentMousedown:function(b){this.el&&!a(b.target).closest(this.el).length&&this.hide()},destroy:function(){this.hide(),this.el&&(this.el.remove(),this.el=null),a(document).off("mousedown",this.documentMousedownProxy)
-},position:function(){var b,c,d,e,f,g=this.options,h=this.el.offsetParent().offset(),i=this.el.outerWidth(),j=this.el.outerHeight(),k=a(window),l=u(this.el);e=g.top||0,f=void 0!==g.left?g.left:void 0!==g.right?g.right-i:0,l.is(window)||l.is(document)?(l=k,b=0,c=0):(d=l.offset(),b=d.top,c=d.left),b+=k.scrollTop(),c+=k.scrollLeft(),g.viewportConstrain!==!1&&(e=Math.min(e,b+l.outerHeight()-j-this.margin),e=Math.max(e,b+this.margin),f=Math.min(f,c+l.outerWidth()-i-this.margin),f=Math.max(f,c+this.margin)),this.el.css({top:e-h.top,left:f-h.left})},trigger:function(a){this.options[a]&&this.options[a].apply(this,Array.prototype.slice.call(arguments,1))}},Y.prototype={grid:null,rows:null,cols:null,containerEl:null,minX:null,maxX:null,minY:null,maxY:null,build:function(){this.grid.buildCoords(this.rows=[],this.cols=[]),this.computeBounds()},getCell:function(a,b){var c,d=null,e=this.rows,f=this.cols,g=-1,h=-1;if(this.inBounds(a,b)){for(c=0;c<e.length;c++)if(b>=e[c][0]&&b<e[c][1]){g=c;break}for(c=0;c<f.length;c++)if(a>=f[c][0]&&a<f[c][1]){h=c;break}g>=0&&h>=0&&(d={row:g,col:h},d.grid=this.grid,d.date=this.grid.getCellDate(d))}return d},computeBounds:function(){var a;this.containerEl&&(a=this.containerEl.offset(),this.minX=a.left,this.maxX=a.left+this.containerEl.outerWidth(),this.minY=a.top,this.maxY=a.top+this.containerEl.outerHeight())},inBounds:function(a,b){return this.containerEl?a>=this.minX&&a<this.maxX&&b>=this.minY&&b<this.maxY:!0}},Z.prototype={coordMaps:null,build:function(){var a,b=this.coordMaps;for(a=0;a<b.length;a++)b[a].build()},getCell:function(a,b){var c,d=this.coordMaps,e=null;for(c=0;c<d.length&&!e;c++)e=d[c].getCell(a,b);return e}},$.prototype={coordMap:null,options:null,isListening:!1,isDragging:!1,origCell:null,origDate:null,cell:null,date:null,mouseX0:null,mouseY0:null,mousemoveProxy:null,mouseupProxy:null,scrollEl:null,scrollBounds:null,scrollTopVel:null,scrollLeftVel:null,scrollIntervalId:null,scrollHandlerProxy:null,scrollSensitivity:30,scrollSpeed:200,scrollIntervalMs:50,mousedown:function(a){w(a)&&(a.preventDefault(),this.startListening(a),this.options.distance||this.startDrag(a))},startListening:function(b){var c,d;this.isListening||(b&&this.options.scroll&&(c=u(a(b.target)),c.is(window)||c.is(document)||(this.scrollEl=c,this.scrollHandlerProxy=J(a.proxy(this,"scrollHandler"),100),this.scrollEl.on("scroll",this.scrollHandlerProxy))),this.computeCoords(),b&&(d=this.getCell(b),this.origCell=d,this.origDate=d?d.date:null,this.mouseX0=b.pageX,this.mouseY0=b.pageY),a(document).on("mousemove",this.mousemoveProxy=a.proxy(this,"mousemove")).on("mouseup",this.mouseupProxy=a.proxy(this,"mouseup")).on("selectstart",this.preventDefault),this.isListening=!0,this.trigger("listenStart",b))},computeCoords:function(){this.coordMap.build(),this.computeScrollBounds()},mousemove:function(a){var b,c;this.isDragging||(b=this.options.distance||1,c=Math.pow(a.pageX-this.mouseX0,2)+Math.pow(a.pageY-this.mouseY0,2),c>=b*b&&this.startDrag(a)),this.isDragging&&this.drag(a)},startDrag:function(a){var b;this.isListening||this.startListening(),this.isDragging||(this.isDragging=!0,this.trigger("dragStart",a),b=this.getCell(a),b&&this.cellOver(b,!0))},drag:function(a){var b;this.isDragging&&(b=this.getCell(a),_(b,this.cell)||(this.cell&&this.cellOut(),b&&this.cellOver(b)),this.dragScroll(a))},cellOver:function(a){this.cell=a,this.date=a.date,this.trigger("cellOver",a,a.date)},cellOut:function(){this.cell&&(this.trigger("cellOut",this.cell),this.cell=null,this.date=null)},mouseup:function(a){this.stopDrag(a),this.stopListening(a)},stopDrag:function(a){this.isDragging&&(this.stopScrolling(),this.trigger("dragStop",a),this.isDragging=!1)},stopListening:function(b){this.isListening&&(this.scrollEl&&(this.scrollEl.off("scroll",this.scrollHandlerProxy),this.scrollHandlerProxy=null),a(document).off("mousemove",this.mousemoveProxy).off("mouseup",this.mouseupProxy).off("selectstart",this.preventDefault),this.mousemoveProxy=null,this.mouseupProxy=null,this.isListening=!1,this.trigger("listenStop",b),this.origCell=this.cell=null,this.origDate=this.date=null)},getCell:function(a){return this.coordMap.getCell(a.pageX,a.pageY)},trigger:function(a){this.options[a]&&this.options[a].apply(this,Array.prototype.slice.call(arguments,1))},preventDefault:function(a){a.preventDefault()},computeScrollBounds:function(){var a,b=this.scrollEl;b&&(a=b.offset(),this.scrollBounds={top:a.top,left:a.left,bottom:a.top+b.outerHeight(),right:a.left+b.outerWidth()})},dragScroll:function(a){var b,c,d,e,f=this.scrollSensitivity,g=this.scrollBounds,h=0,i=0;g&&(b=(f-(a.pageY-g.top))/f,c=(f-(g.bottom-a.pageY))/f,d=(f-(a.pageX-g.left))/f,e=(f-(g.right-a.pageX))/f,b>=0&&1>=b?h=b*this.scrollSpeed*-1:c>=0&&1>=c&&(h=c*this.scrollSpeed),d>=0&&1>=d?i=d*this.scrollSpeed*-1:e>=0&&1>=e&&(i=e*this.scrollSpeed)),this.setScrollVel(h,i)},setScrollVel:function(b,c){this.scrollTopVel=b,this.scrollLeftVel=c,this.constrainScrollVel(),!this.scrollTopVel&&!this.scrollLeftVel||this.scrollIntervalId||(this.scrollIntervalId=setInterval(a.proxy(this,"scrollIntervalFunc"),this.scrollIntervalMs))},constrainScrollVel:function(){var a=this.scrollEl;this.scrollTopVel<0?a.scrollTop()<=0&&(this.scrollTopVel=0):this.scrollTopVel>0&&a.scrollTop()+a[0].clientHeight>=a[0].scrollHeight&&(this.scrollTopVel=0),this.scrollLeftVel<0?a.scrollLeft()<=0&&(this.scrollLeftVel=0):this.scrollLeftVel>0&&a.scrollLeft()+a[0].clientWidth>=a[0].scrollWidth&&(this.scrollLeftVel=0)},scrollIntervalFunc:function(){var a=this.scrollEl,b=this.scrollIntervalMs/1e3;this.scrollTopVel&&a.scrollTop(a.scrollTop()+this.scrollTopVel*b),this.scrollLeftVel&&a.scrollLeft(a.scrollLeft()+this.scrollLeftVel*b),this.constrainScrollVel(),this.scrollTopVel||this.scrollLeftVel||this.stopScrolling()},stopScrolling:function(){this.scrollIntervalId&&(clearInterval(this.scrollIntervalId),this.scrollIntervalId=null,this.computeCoords())},scrollHandler:function(){this.scrollIntervalId||this.computeCoords()}},ab.prototype={options:null,sourceEl:null,el:null,parentEl:null,top0:null,left0:null,mouseY0:null,mouseX0:null,topDelta:null,leftDelta:null,mousemoveProxy:null,isFollowing:!1,isHidden:!1,isAnimating:!1,start:function(b){this.isFollowing||(this.isFollowing=!0,this.mouseY0=b.pageY,this.mouseX0=b.pageX,this.topDelta=0,this.leftDelta=0,this.isHidden||this.updatePosition(),a(document).on("mousemove",this.mousemoveProxy=a.proxy(this,"mousemove")))},stop:function(b,c){function d(){this.isAnimating=!1,e.destroyEl(),this.top0=this.left0=null,c&&c()}var e=this,f=this.options.revertDuration;this.isFollowing&&!this.isAnimating&&(this.isFollowing=!1,a(document).off("mousemove",this.mousemoveProxy),b&&f&&!this.isHidden?(this.isAnimating=!0,this.el.animate({top:this.top0,left:this.left0},{duration:f,complete:d})):d())},getEl:function(){var a=this.el;return a||(this.sourceEl.width(),a=this.el=this.sourceEl.clone().css({position:"absolute",visibility:"",display:this.isHidden?"none":"",margin:0,right:"auto",bottom:"auto",width:this.sourceEl.width(),height:this.sourceEl.height(),opacity:this.options.opacity||"",zIndex:this.options.zIndex}).appendTo(this.parentEl)),a},destroyEl:function(){this.el&&(this.el.remove(),this.el=null)},updatePosition:function(){var a,b;this.getEl(),null===this.top0&&(this.sourceEl.width(),a=this.sourceEl.offset(),b=this.el.offsetParent().offset(),this.top0=a.top-b.top,this.left0=a.left-b.left),this.el.css({top:this.top0+this.topDelta,left:this.left0+this.leftDelta})},mousemove:function(a){this.topDelta=a.pageY-this.mouseY0,this.leftDelta=a.pageX-this.mouseX0,this.isHidden||this.updatePosition()},hide:function(){this.isHidden||(this.isHidden=!0,this.el&&this.el.hide())},show:function(){this.isHidden&&(this.isHidden=!1,this.updatePosition(),this.getEl().show())}},bb.prototype={view:null,cellHtml:"<td/>",rowHtml:function(a,b){var c,d,e=this.view,f=this.getHtmlRenderer("cell",a),g="";for(b=b||0,c=0;c<e.colCnt;c++)d=e.cellToDate(b,c),g+=f(b,c,d);return g=this.bookendCells(g,a,b),"<tr>"+g+"</tr>"},bookendCells:function(a,b,c){var d=this.view,e=this.getHtmlRenderer("intro",b)(c||0),f=this.getHtmlRenderer("outro",b)(c||0),g=d.opt("isRTL"),h=g?f:e,i=g?e:f;return"string"==typeof a?h+a+i:a.prepend(h).append(i)},getHtmlRenderer:function(a,b){var c,d,e,f,g=this.view;return c=a+"Html",b&&(d=b+H(a)+"Html"),d&&(f=g[d])?e=g:d&&(f=this[d])?e=this:(f=g[c])?e=g:(f=this[c])&&(e=this),"function"==typeof f?function(){return f.apply(e,arguments)||""}:function(){return f||""}}},cb.prototype=C(bb.prototype),a.extend(cb.prototype,{el:null,coordMap:null,cellDuration:null,elsByFill:null,render:function(){this.bindHandlers()},destroy:function(){},buildCoords:function(){},getCellDate:function(){},getCellDayEl:function(){},rangeToSegs:function(){},bindHandlers:function(){var b=this;this.el.on("mousedown",function(c){a(c.target).is(".fc-event-container *, .fc-more")||a(c.target).closest(".fc-popover").length||b.dayMousedown(c)}),this.bindSegHandlers()},dayMousedown:function(a){var b,c,d,e=this,f=this.view,g=f.calendar,h=f.opt("selectable"),i=null,j=new $(this.coordMap,{scroll:f.opt("dragScroll"),dragStart:function(){f.unselect()},cellOver:function(a,f){j.origDate&&(d=e.getCellDayEl(a),i=[f,j.origDate].sort(I),b=i[0],c=i[1].clone().add(e.cellDuration),h&&(g.isSelectionAllowedInRange(b,c)?e.renderSelection(b,c):(i=null,n())))},cellOut:function(){i=null,e.destroySelection(),o()},listenStop:function(a){i&&(i[0].isSame(i[1])&&f.trigger("dayClick",d[0],b,a),h&&f.reportSelection(b,c,a)),o()}});j.mousedown(a)},renderDrag:function(){},destroyDrag:function(){},renderResize:function(){},destroyResize:function(){},renderRangeHelper:function(a,b,c){var d,e=this.view;!b&&e.opt("forceEventDuration")&&(b=e.calendar.getDefaultEventEnd(!a.hasTime(),a)),d=c?C(c.event):{},d.start=a,d.end=b,d.allDay=!(a.hasTime()||b&&b.hasTime()),d.className=(d.className||[]).concat("fc-helper"),c||(d.editable=!1),this.renderHelper(d,c)},renderHelper:function(){},destroyHelper:function(){},renderSelection:function(a,b){this.renderHighlight(a,b)},destroySelection:function(){this.destroyHighlight()},renderHighlight:function(a,b){this.renderFill("highlight",this.rangeToSegs(a,b))},destroyHighlight:function(){this.destroyFill("highlight")},highlightSegClasses:function(){return["fc-highlight"]},renderFill:function(){},destroyFill:function(a){var b=this.elsByFill[a];b&&(b.remove(),delete this.elsByFill[a])},renderFillSegEls:function(b,c){var d,e=this,f=this[b+"SegEl"],g="",h=[];if(c.length){for(d=0;d<c.length;d++)g+=this.fillSegHtml(b,c[d]);a(g).each(function(b,d){var g=c[b],i=a(d);f&&(i=f.call(e,g,i)),i&&(i=a(i),i.is(e.fillSegTag)&&(g.el=i,h.push(g)))})}return h},fillSegTag:"div",fillSegHtml:function(a,b){var c=this[a+"SegClasses"],d=this[a+"SegStyles"],e=c?c.call(this,b):[],f=d?d.call(this,b):"";return"<"+this.fillSegTag+(e.length?' class="'+e.join(" ")+'"':"")+(f?' style="'+f+'"':"")+" />"},headHtml:function(){return'<div class="fc-row '+this.view.widgetHeaderClass+'"><table><thead>'+this.rowHtml("head")+"</thead></table></div>"},headCellHtml:function(a,b,c){var d=this.view,e=d.calendar,f=d.opt("columnFormat");return'<th class="fc-day-header '+d.widgetHeaderClass+" fc-"+Nb[c.day()]+'">'+F(e.formatDate(c,f))+"</th>"},bgCellHtml:function(a,b,c){var d=this.view,e=this.getDayClasses(c);return e.unshift("fc-day",d.widgetContentClass),'<td class="'+e.join(" ")+'" data-date="'+c.format()+'"></td>'},getDayClasses:function(a){var b=this.view,c=b.calendar.getNow().stripTime(),d=["fc-"+Nb[a.day()]];return"month"===b.name&&a.month()!=b.intervalStart.month()&&d.push("fc-other-month"),a.isSame(c,"day")?d.push("fc-today",b.highlightStateClass):d.push(c>a?"fc-past":"fc-future"),d}}),a.extend(cb.prototype,{mousedOverSeg:null,isDraggingSeg:!1,isResizingSeg:!1,segs:null,renderEvents:function(a){var b,c,d=this.eventsToSegs(a),e=[],f=[];for(b=0;b<d.length;b++)c=d[b],db(c.event)?e.push(c):f.push(c);e=this.renderBgSegs(e)||e,f=this.renderFgSegs(f)||f,this.segs=e.concat(f)},destroyEvents:function(){this.triggerSegMouseout(),this.destroyFgSegs(),this.destroyBgSegs(),this.segs=null},getSegs:function(){return this.segs||[]},renderFgSegs:function(){},destroyFgSegs:function(){},renderFgSegEls:function(b,c){var d,e=this.view,f="",g=[];if(b.length){for(d=0;d<b.length;d++)f+=this.fgSegHtml(b[d],c);a(f).each(function(c,d){var f=b[c],h=e.resolveEventEl(f.event,a(d));h&&(h.data("fc-seg",f),f.el=h,g.push(f))})}return g},fgSegHtml:function(){},renderBgSegs:function(a){return this.renderFill("bgEvent",a)},destroyBgSegs:function(){this.destroyFill("bgEvent")},bgEventSegEl:function(a,b){return this.view.resolveEventEl(a.event,b)},bgEventSegClasses:function(a){var b=a.event,c=b.source||{};return["fc-bgevent"].concat(b.className,c.className||[])},bgEventSegStyles:function(a){var b=this.view,c=a.event,d=c.source||{},e=c.color,f=d.color,g=b.opt("eventColor"),h=c.backgroundColor||e||d.backgroundColor||f||b.opt("eventBackgroundColor")||g;return h?"background-color:"+h:""},businessHoursSegClasses:function(){return["fc-nonbusiness","fc-bgevent"]},bindSegHandlers:function(){var b=this,c=this.view;a.each({mouseenter:function(a,c){b.triggerSegMouseover(a,c)},mouseleave:function(a,c){b.triggerSegMouseout(a,c)},click:function(a,b){return c.trigger("eventClick",this,a.event,b)},mousedown:function(d,e){a(e.target).is(".fc-resizer")&&c.isEventResizable(d.event)?b.segResizeMousedown(d,e):c.isEventDraggable(d.event)&&b.segDragMousedown(d,e)}},function(c,d){b.el.on(c,".fc-event-container > *",function(c){var e=a(this).data("fc-seg");return!e||b.isDraggingSeg||b.isResizingSeg?void 0:d.call(this,e,c)})})},triggerSegMouseover:function(a,b){this.mousedOverSeg||(this.mousedOverSeg=a,this.view.trigger("eventMouseover",a.el[0],a.event,b))},triggerSegMouseout:function(a,b){b=b||{},this.mousedOverSeg&&(a=a||this.mousedOverSeg,this.mousedOverSeg=null,this.view.trigger("eventMouseout",a.el[0],a.event,b))},segDragMousedown:function(a,b){var c,d,e=this,f=this.view,g=f.calendar,h=a.el,i=a.event,j=new ab(a.el,{parentEl:f.el,opacity:f.opt("dragOpacity"),revertDuration:f.opt("dragRevertDuration"),zIndex:2}),k=new $(f.coordMap,{distance:5,scroll:f.opt("dragScroll"),listenStart:function(a){j.hide(),j.start(a)},dragStart:function(b){e.triggerSegMouseout(a,b),e.isDraggingSeg=!0,f.hideEvent(i),f.trigger("eventDragStart",h[0],i,b,{})},cellOver:function(b,h){var l=a.cellDate||k.origDate,m=e.computeDraggedEventDates(a,l,h);c=m.start,d=m.end,g.isEventAllowedInRange(i,c,m.visibleEnd)?f.renderDrag(c,d,a)?j.hide():j.show():(c=null,j.show(),n())},cellOut:function(){c=null,f.destroyDrag(),j.show(),o()},dragStop:function(a){var b=c&&!c.isSame(i.start);j.stop(!b,function(){e.isDraggingSeg=!1,f.destroyDrag(),f.showEvent(i),f.trigger("eventDragStop",h[0],i,a,{}),b&&f.eventDrop(h[0],i,c,a)}),o()},listenStop:function(){j.stop()}});k.mousedown(b)},computeDraggedEventDates:function(a,b,c){var d,e,f,g,h,i=this.view,j=a.event,k=j.start,l=i.calendar.getEventEnd(j);return c.hasTime()===b.hasTime()?(d=z(c,b),e=k.clone().add(d),f=null===j.end?null:l.clone().add(d),g=j.allDay):(e=c,f=null,g=!c.hasTime()),h=f||i.calendar.getDefaultEventEnd(g,e),{start:e,end:f,visibleEnd:h}},segResizeMousedown:function(a,b){function c(){e.destroyResize(),f.showEvent(i)}var d,e=this,f=this.view,g=f.calendar,h=a.el,i=a.event,j=i.start,k=f.calendar.getEventEnd(i),l=null;d=new $(this.coordMap,{distance:5,scroll:f.opt("dragScroll"),dragStart:function(b){e.triggerSegMouseout(a,b),e.isResizingSeg=!0,f.trigger("eventResizeStart",h[0],i,b,{})},cellOver:function(b,d){d.isBefore(j)&&(d=j),l=d.clone().add(e.cellDuration),g.isEventAllowedInRange(i,j,l)?l.isSame(k)?(l=null,c()):(e.renderResize(j,l,a),f.hideEvent(i)):(l=null,c(),n())},cellOut:function(){l=null,c(),o()},dragStop:function(a){e.isResizingSeg=!1,c(),o(),f.trigger("eventResizeStop",h[0],i,a,{}),l&&f.eventResize(h[0],i,l,a)}}),d.mousedown(b)},getSegClasses:function(a,b,c){var d=a.event,e=["fc-event",a.isStart?"fc-start":"fc-not-start",a.isEnd?"fc-end":"fc-not-end"].concat(d.className,d.source?d.source.className:[]);return b&&e.push("fc-draggable"),c&&e.push("fc-resizable"),e},getEventSkinCss:function(a){var b=this.view,c=a.source||{},d=a.color,e=c.color,f=b.opt("eventColor"),g=a.backgroundColor||d||c.backgroundColor||e||b.opt("eventBackgroundColor")||f,h=a.borderColor||d||c.borderColor||e||b.opt("eventBorderColor")||f,i=a.textColor||c.textColor||b.opt("eventTextColor"),j=[];return g&&j.push("background-color:"+g),h&&j.push("border-color:"+h),i&&j.push("color:"+i),j.join(";")},eventsToSegs:function(a,b){var c,d=this.eventsToRanges(a),e=[];for(c=0;c<d.length;c++)e.push.apply(e,this.eventRangeToSegs(d[c],b));return e},eventsToRanges:function(b){var c=this,d=gb(b),e=[];return a.each(d,function(a,b){b.length&&e.push.apply(e,eb(b[0])?c.eventsToInverseRanges(b):c.eventsToNormalRanges(b))}),e},eventsToNormalRanges:function(a){var b,c,d,e,f=this.view.calendar,g=[];for(b=0;b<a.length;b++)c=a[b],d=c.start.clone().stripZone(),e=f.getEventEnd(c).stripZone(),g.push({event:c,start:d,end:e,eventStartMS:+d,eventDurationMS:e-d});return g},eventsToInverseRanges:function(a){var b,c,d=this.view,e=d.start.clone().stripZone(),f=d.end.clone().stripZone(),g=this.eventsToNormalRanges(a),h=[],i=a[0],j=e;for(g.sort(hb),b=0;b<g.length;b++)c=g[b],c.start>j&&h.push({event:i,start:j,end:c.start}),j=c.end;return f>j&&h.push({event:i,start:j,end:f}),h},eventRangeToSegs:function(a,b){var c,d,e;for(c=b?b(a.start,a.end):this.rangeToSegs(a.start,a.end),d=0;d<c.length;d++)e=c[d],e.event=a.event,e.eventStartMS=a.eventStartMS,e.eventDurationMS=a.eventDurationMS;return c}}),jb.prototype=C(cb.prototype),a.extend(jb.prototype,{numbersVisible:!1,cellDuration:b.duration({days:1}),bottomCoordPadding:0,rowEls:null,dayEls:null,helperEls:null,render:function(b){var c,d=this.view,e="";for(c=0;c<d.rowCnt;c++)e+=this.dayRowHtml(c,b);this.el.html(e),this.rowEls=this.el.find(".fc-row"),this.dayEls=this.el.find(".fc-day"),this.dayEls.each(function(b,c){var e=d.cellToDate(Math.floor(b/d.colCnt),b%d.colCnt);d.trigger("dayRender",null,e,a(c))}),cb.prototype.render.call(this)},destroy:function(){this.destroySegPopover()},dayRowHtml:function(a,b){var c=this.view,d=["fc-row","fc-week",c.widgetContentClass];return b&&d.push("fc-rigid"),'<div class="'+d.join(" ")+'"><div class="fc-bg"><table>'+this.rowHtml("day",a)+'</table></div><div class="fc-content-skeleton"><table>'+(this.numbersVisible?"<thead>"+this.rowHtml("number",a)+"</thead>":"")+"</table></div></div>"},dayCellHtml:function(a,b,c){return this.bgCellHtml(a,b,c)},buildCoords:function(b,c){var d,e,f,g=this.view.colCnt;this.dayEls.slice(0,g).each(function(b,g){d=a(g),e=d.offset().left,b&&(f[1]=e),f=[e],c[b]=f}),f[1]=e+d.outerWidth(),this.rowEls.each(function(c,g){d=a(g),e=d.offset().top,c&&(f[1]=e),f=[e],b[c]=f}),f[1]=e+d.outerHeight()+this.bottomCoordPadding},getCellDate:function(a){return this.view.cellToDate(a)},getCellDayEl:function(a){return this.dayEls.eq(a.row*this.view.colCnt+a.col)},rangeToSegs:function(a,b){return this.view.rangeToSegments(a,b)},renderDrag:function(a,b,c){var d;return this.renderHighlight(a,b||this.view.calendar.getDefaultEventEnd(!0,a)),c&&!c.el.closest(this.el).length?(this.renderRangeHelper(a,b,c),d=this.view.opt("dragOpacity"),void 0!==d&&this.helperEls.css("opacity",d),!0):void 0},destroyDrag:function(){this.destroyHighlight(),this.destroyHelper()},renderResize:function(a,b,c){this.renderHighlight(a,b),this.renderRangeHelper(a,b,c)},destroyResize:function(){this.destroyHighlight(),this.destroyHelper()},renderHelper:function(b,c){var d,e=[],f=this.eventsToSegs([b]);f=this.renderFgSegEls(f),d=this.renderSegRows(f),this.rowEls.each(function(b,f){var g,h=a(f),i=a('<div class="fc-helper-skeleton"><table/></div>');g=c&&c.row===b?c.el.position().top:h.find(".fc-content-skeleton tbody").position().top,i.css("top",g).find("table").append(d[b].tbodyEl),h.append(i),e.push(i[0])}),this.helperEls=a(e)},destroyHelper:function(){this.helperEls&&(this.helperEls.remove(),this.helperEls=null)},fillSegTag:"td",renderFill:function(b,c){var d,e,f,g=[];for(c=this.renderFillSegEls(b,c),d=0;d<c.length;d++)e=c[d],f=this.renderFillRow(b,e),this.rowEls.eq(e.row).append(f),g.push(f[0]);return this.elsByFill[b]=a(g),c},renderFillRow:function(b,c){var d,e,f=this.view.colCnt,g=c.leftCol,h=c.rightCol+1;return d=a('<div class="fc-'+b.toLowerCase()+'-skeleton"><table><tr/></table></div>'),e=d.find("tr"),g>0&&e.append('<td colspan="'+g+'"/>'),e.append(c.el.attr("colspan",h-g)),f>h&&e.append('<td colspan="'+(f-h)+'"/>'),this.bookendCells(e,b),d}}),a.extend(jb.prototype,{rowStructs:null,destroyEvents:function(){this.destroySegPopover(),cb.prototype.destroyEvents.apply(this,arguments)},getSegs:function(){return cb.prototype.getSegs.call(this).concat(this.popoverSegs||[])},renderBgSegs:function(b){var c=a.grep(b,function(a){return a.event.allDay});return cb.prototype.renderBgSegs.call(this,c)},renderFgSegs:function(b){var c;return b=this.renderFgSegEls(b),c=this.rowStructs=this.renderSegRows(b),this.rowEls.each(function(b,d){a(d).find(".fc-content-skeleton > table").append(c[b].tbodyEl)}),b},destroyFgSegs:function(){for(var a,b=this.rowStructs||[];a=b.pop();)a.tbodyEl.remove();this.rowStructs=null},renderSegRows:function(a){var b,c,d=[];for(b=this.groupSegRows(a),c=0;c<b.length;c++)d.push(this.renderSegRow(c,b[c]));return d},fgSegHtml:function(a,b){var c,d=this.view,e=d.opt("isRTL"),f=a.event,g=d.isEventDraggable(f),h=!b&&f.allDay&&a.isEnd&&d.isEventResizable(f),i=this.getSegClasses(a,g,h),j=this.getEventSkinCss(f),k="";return i.unshift("fc-day-grid-event"),!f.allDay&&a.isStart&&(k='<span class="fc-time">'+F(d.getEventTimeText(f))+"</span>"),c='<span class="fc-title">'+(F(f.title||"")||"&nbsp;")+"</span>",'<a class="'+i.join(" ")+'"'+(f.url?' href="'+F(f.url)+'"':"")+(j?' style="'+j+'"':"")+'><div class="fc-content">'+(e?c+" "+k:k+" "+c)+"</div>"+(h?'<div class="fc-resizer"/>':"")+"</a>"},renderSegRow:function(b,c){function d(b){for(;b>g;)k=(s[e-1]||[])[g],k?k.attr("rowspan",parseInt(k.attr("rowspan")||1,10)+1):(k=a("<td/>"),h.append(k)),r[e][g]=k,s[e][g]=k,g++}var e,f,g,h,i,j,k,l=this.view,m=l.colCnt,n=this.buildSegLevels(c),o=Math.max(1,n.length),p=a("<tbody/>"),q=[],r=[],s=[];for(e=0;o>e;e++){if(f=n[e],g=0,h=a("<tr/>"),q.push([]),r.push([]),s.push([]),f)for(i=0;i<f.length;i++){for(j=f[i],d(j.leftCol),k=a('<td class="fc-event-container"/>').append(j.el),j.leftCol!=j.rightCol?k.attr("colspan",j.rightCol-j.leftCol+1):s[e][g]=k;g<=j.rightCol;)r[e][g]=k,q[e][g]=j,g++;h.append(k)}d(m),this.bookendCells(h,"eventSkeleton"),p.append(h)}return{row:b,tbodyEl:p,cellMatrix:r,segMatrix:q,segLevels:n,segs:c}},buildSegLevels:function(a){var b,c,d,e=[];for(a.sort(ib),b=0;b<a.length;b++){for(c=a[b],d=0;d<e.length&&kb(c,e[d]);d++);c.level=d,(e[d]||(e[d]=[])).push(c)}for(d=0;d<e.length;d++)e[d].sort(lb);return e},groupSegRows:function(a){var b,c=this.view,d=[];for(b=0;b<c.rowCnt;b++)d.push([]);for(b=0;b<a.length;b++)d[a[b].row].push(a[b]);return d}}),a.extend(jb.prototype,{segPopover:null,popoverSegs:null,destroySegPopover:function(){this.segPopover&&this.segPopover.hide()},limitRows:function(a){var b,c,d=this.rowStructs||[];for(b=0;b<d.length;b++)this.unlimitRow(b),c=a?"number"==typeof a?a:this.computeRowLevelLimit(b):!1,c!==!1&&this.limitRow(b,c)},computeRowLevelLimit:function(a){var b,c,d=this.rowEls.eq(a),e=d.height(),f=this.rowStructs[a].tbodyEl.children();for(b=0;b<f.length;b++)if(c=f.eq(b).removeClass("fc-limited"),c.position().top+c.outerHeight()>e)return b;return!1},limitRow:function(b,c){function d(d){for(;d>y;)e={row:b,col:y},k=u.getCellSegs(e,c),k.length&&(n=g[c-1][y],t=u.renderMoreLink(e,k),s=a("<div/>").append(t),n.append(s),x.push(s[0])),y++}var e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u=this,v=this.view,w=this.rowStructs[b],x=[],y=0;if(c&&c<w.segLevels.length){for(f=w.segLevels[c-1],g=w.cellMatrix,h=w.tbodyEl.children().slice(c).addClass("fc-limited").get(),i=0;i<f.length;i++){for(j=f[i],d(j.leftCol),m=[],l=0;y<=j.rightCol;)e={row:b,col:y},k=this.getCellSegs(e,c),m.push(k),l+=k.length,y++;if(l){for(n=g[c-1][j.leftCol],o=n.attr("rowspan")||1,p=[],q=0;q<m.length;q++)r=a('<td class="fc-more-cell"/>').attr("rowspan",o),k=m[q],e={row:b,col:j.leftCol+q},t=this.renderMoreLink(e,[j].concat(k)),s=a("<div/>").append(t),r.append(s),p.push(r[0]),x.push(r[0]);n.addClass("fc-limited").after(a(p)),h.push(n[0])}}d(v.colCnt),w.moreEls=a(x),w.limitedEls=a(h)}},unlimitRow:function(a){var b=this.rowStructs[a];b.moreEls&&(b.moreEls.remove(),b.moreEls=null),b.limitedEls&&(b.limitedEls.removeClass("fc-limited"),b.limitedEls=null)},renderMoreLink:function(b,c){var d=this,e=this.view;return a('<a class="fc-more"/>').text(this.getMoreLinkText(c.length)).on("click",function(f){var g=e.opt("eventLimitClick"),h=e.cellToDate(b),i=a(this),j=d.getCellDayEl(b),k=d.getCellSegs(b),l=d.resliceDaySegs(k,h),m=d.resliceDaySegs(c,h);"function"==typeof g&&(g=e.trigger("eventLimitClick",null,{date:h,dayEl:j,moreEl:i,segs:l,hiddenSegs:m},f)),"popover"===g?d.showSegPopover(h,b,i,l):"string"==typeof g&&e.calendar.zoomTo(h,g)})},showSegPopover:function(a,b,c,d){var e,f,g=this,h=this.view,i=c.parent();e=1==h.rowCnt?this.view.el:this.rowEls.eq(b.row),f={className:"fc-more-popover",content:this.renderSegPopoverContent(a,d),parentEl:this.el,top:e.offset().top,autoHide:!0,viewportConstrain:h.opt("popoverViewportConstrain"),hide:function(){g.segPopover.destroy(),g.segPopover=null,g.popoverSegs=null}},h.opt("isRTL")?f.right=i.offset().left+i.outerWidth()+1:f.left=i.offset().left-1,this.segPopover=new X(f),this.segPopover.show()},renderSegPopoverContent:function(b,c){var d,e=this.view,f=e.opt("theme"),g=b.format(e.opt("dayPopoverFormat")),h=a('<div class="fc-header '+e.widgetHeaderClass+'"><span class="fc-close '+(f?"ui-icon ui-icon-closethick":"fc-icon fc-icon-x")+'"></span><span class="fc-title">'+F(g)+'</span><div class="fc-clear"/></div><div class="fc-body '+e.widgetContentClass+'"><div class="fc-event-container"></div></div>'),i=h.find(".fc-event-container");for(c=this.renderFgSegEls(c,!0),this.popoverSegs=c,d=0;d<c.length;d++)c[d].cellDate=b,i.append(c[d].el);return h},resliceDaySegs:function(b,c){var d=a.map(b,function(a){return a.event}),e=c.clone().stripTime(),f=e.clone().add(1,"days");return this.eventsToSegs(d,function(a,b){var c=x(a,b,e,f);return c?[c]:[]})},getMoreLinkText:function(a){var b=this.view,c=b.opt("eventLimitText");return"function"==typeof c?c(a):"+"+a+" "+c},getCellSegs:function(a,b){for(var c,d=this.rowStructs[a.row].segMatrix,e=b||0,f=[];e<d.length;)c=d[e][a.col],c&&f.push(c),e++;return f}}),mb.prototype=C(cb.prototype),a.extend(mb.prototype,{slotDuration:null,snapDuration:null,minTime:null,maxTime:null,dayEls:null,slatEls:null,slatTops:null,helperEl:null,businessHourSegs:null,render:function(){this.processOptions(),this.el.html(this.renderHtml()),this.dayEls=this.el.find(".fc-day"),this.slatEls=this.el.find(".fc-slats tr"),this.computeSlatTops(),this.renderBusinessHours(),cb.prototype.render.call(this)},renderBusinessHours:function(){var a=this.view.calendar.getBusinessHoursEvents();this.businessHourSegs=this.renderFill("businessHours",this.eventsToSegs(a),"bgevent")},renderHtml:function(){return'<div class="fc-bg"><table>'+this.rowHtml("slotBg")+'</table></div><div class="fc-slats"><table>'+this.slatRowHtml()+"</table></div>"},slotBgCellHtml:function(a,b,c){return this.bgCellHtml(a,b,c)},slatRowHtml:function(){for(var a,c,d,e=this.view,f=e.calendar,g=e.opt("isRTL"),h="",i=this.slotDuration.asMinutes()%15===0,j=b.duration(+this.minTime);j<this.maxTime;)a=e.start.clone().time(j),c=a.minutes(),d='<td class="fc-axis fc-time '+e.widgetContentClass+'" '+e.axisStyleAttr()+">"+(i&&c?"":"<span>"+F(f.formatDate(a,e.opt("axisFormat")))+"</span>")+"</td>",h+="<tr "+(c?'class="fc-minor"':"")+">"+(g?"":d)+'<td class="'+e.widgetContentClass+'"/>'+(g?d:"")+"</tr>",j.add(this.slotDuration);return h},processOptions:function(){var a=this.view,c=a.opt("slotDuration"),d=a.opt("snapDuration");c=b.duration(c),d=d?b.duration(d):c,this.slotDuration=c,this.snapDuration=d,this.cellDuration=d,this.minTime=b.duration(a.opt("minTime")),this.maxTime=b.duration(a.opt("maxTime"))},rangeToSegs:function(a,b){var c,d,e,f,g,h=this.view,i=[];for(a=a.clone().stripZone(),b=b.clone().stripZone(),d=0;d<h.colCnt;d++)e=h.cellToDate(0,d),f=e.clone().time(this.minTime),g=e.clone().time(this.maxTime),c=x(a,b,f,g),c&&(c.col=d,i.push(c));return i},resize:function(){this.computeSlatTops(),this.updateSegVerticals()},buildCoords:function(c,d){var e,f,g=this.view.colCnt,h=this.el.offset().top,i=b.duration(+this.minTime),j=null;for(this.dayEls.slice(0,g).each(function(b,c){e=a(c),f=e.offset().left,j&&(j[1]=f),j=[f],d[b]=j}),j[1]=f+e.outerWidth(),j=null;i<this.maxTime;)f=h+this.computeTimeTop(i),j&&(j[1]=f),j=[f],c.push(j),i.add(this.snapDuration);j[1]=h+this.computeTimeTop(i)},getCellDate:function(a){var b=this.view,c=b.calendar;return c.rezoneDate(b.cellToDate(0,a.col).time(this.minTime+this.snapDuration*a.row))},getCellDayEl:function(a){return this.dayEls.eq(a.col)},computeDateTop:function(a,c){return this.computeTimeTop(b.duration(a.clone().stripZone()-c.clone().stripTime()))},computeTimeTop:function(a){var b,c,d,e,f=(a-this.minTime)/this.slotDuration;return f=Math.max(0,f),f=Math.min(this.slatEls.length,f),b=Math.floor(f),c=f-b,d=this.slatTops[b],c?(e=this.slatTops[b+1],d+(e-d)*c):d},computeSlatTops:function(){var b,c=[];this.slatEls.each(function(d,e){b=a(e).position().top,c.push(b)}),c.push(b+this.slatEls.last().outerHeight()),this.slatTops=c},renderDrag:function(a,b,c){var d;return c?(this.renderRangeHelper(a,b,c),d=this.view.opt("dragOpacity"),void 0!==d&&this.helperEl.css("opacity",d),!0):void this.renderHighlight(a,b||this.view.calendar.getDefaultEventEnd(!1,a))},destroyDrag:function(){this.destroyHelper(),this.destroyHighlight()},renderResize:function(a,b,c){this.renderRangeHelper(a,b,c)},destroyResize:function(){this.destroyHelper()},renderHelper:function(b,c){var d,e,f,g,h=this.eventsToSegs([b]);for(h=this.renderFgSegEls(h),d=this.renderSegTable(h),e=0;e<h.length;e++)f=h[e],c&&c.col===f.col&&(g=c.el,f.el.css({left:g.css("left"),right:g.css("right"),"margin-left":g.css("margin-left"),"margin-right":g.css("margin-right")}));this.helperEl=a('<div class="fc-helper-skeleton"/>').append(d).appendTo(this.el)},destroyHelper:function(){this.helperEl&&(this.helperEl.remove(),this.helperEl=null)},renderSelection:function(a,b){this.view.opt("selectHelper")?this.renderRangeHelper(a,b):this.renderHighlight(a,b)},destroySelection:function(){this.destroyHelper(),this.destroyHighlight()},renderFill:function(b,c,d){var e,f,g,h,i,j,k,l,m,n,o=this.view;if(c.length){for(c=this.renderFillSegEls(b,c),e=this.groupSegCols(c),d=d||b.toLowerCase(),f=a('<div class="fc-'+d+'-skeleton"><table><tr/></table></div>'),g=f.find("tr"),h=0;h<e.length;h++)if(i=e[h],j=a("<td/>").appendTo(g),i.length)for(k=a('<div class="fc-'+d+'-container"/>').appendTo(j),l=o.cellToDate(0,h),m=0;m<i.length;m++)n=i[m],k.append(n.el.css({top:this.computeDateTop(n.start,l),bottom:-this.computeDateTop(n.end,l)}));this.bookendCells(g,b),this.el.append(f),this.elsByFill[b]=f}return c}}),a.extend(mb.prototype,{eventSkeletonEl:null,renderFgSegs:function(b){return b=this.renderFgSegEls(b),this.el.append(this.eventSkeletonEl=a('<div class="fc-content-skeleton"/>').append(this.renderSegTable(b))),b},destroyFgSegs:function(){this.eventSkeletonEl&&(this.eventSkeletonEl.remove(),this.eventSkeletonEl=null)},renderSegTable:function(b){var c,d,e,f,g,h,i=a("<table><tr/></table>"),j=i.find("tr");for(c=this.groupSegCols(b),this.computeSegVerticals(b),f=0;f<c.length;f++){for(g=c[f],nb(g),h=a('<div class="fc-event-container"/>'),d=0;d<g.length;d++)e=g[d],e.el.css(this.generateSegPositionCss(e)),e.bottom-e.top<30&&e.el.addClass("fc-short"),h.append(e.el);j.append(a("<td/>").append(h))}return this.bookendCells(j,"eventSkeleton"),i},updateSegVerticals:function(){var a,b=(this.segs||[]).concat(this.businessHourSegs||[]);
-for(this.computeSegVerticals(b),a=0;a<b.length;a++)b[a].el.css(this.generateSegVerticalCss(b[a]))},computeSegVerticals:function(a){var b,c;for(b=0;b<a.length;b++)c=a[b],c.top=this.computeDateTop(c.start,c.start),c.bottom=this.computeDateTop(c.end,c.start)},fgSegHtml:function(a,b){var c,d,e,f=this.view,g=a.event,h=f.isEventDraggable(g),i=!b&&a.isEnd&&f.isEventResizable(g),j=this.getSegClasses(a,h,i),k=this.getEventSkinCss(g);return j.unshift("fc-time-grid-event"),f.isMultiDayEvent(g)?(a.isStart||a.isEnd)&&(c=f.getEventTimeText(a.start,a.end),d=f.getEventTimeText(a.start,a.end,"LT"),e=f.getEventTimeText(a.start,null)):(c=f.getEventTimeText(g),d=f.getEventTimeText(g,"LT"),e=f.getEventTimeText(g.start,null)),'<a class="'+j.join(" ")+'"'+(g.url?' href="'+F(g.url)+'"':"")+(k?' style="'+k+'"':"")+'><div class="fc-content">'+(c?'<div class="fc-time" data-start="'+F(e)+'" data-full="'+F(d)+'"><span>'+F(c)+"</span></div>":"")+(g.title?'<div class="fc-title">'+F(g.title)+"</div>":"")+'</div><div class="fc-bg"/>'+(i?'<div class="fc-resizer"/>':"")+"</a>"},generateSegPositionCss:function(a){var b,c,d=this.view,e=d.opt("isRTL"),f=d.opt("slotEventOverlap"),g=a.backwardCoord,h=a.forwardCoord,i=this.generateSegVerticalCss(a);return f&&(h=Math.min(1,g+2*(h-g))),e?(b=1-h,c=g):(b=g,c=1-h),i.zIndex=a.level+1,i.left=100*b+"%",i.right=100*c+"%",f&&a.forwardPressure&&(i[e?"marginLeft":"marginRight"]=20),i},generateSegVerticalCss:function(a){return{top:a.top,bottom:-a.bottom}},groupSegCols:function(a){var b,c=this.view,d=[];for(b=0;b<c.colCnt;b++)d.push([]);for(b=0;b<a.length;b++)d[a[b].col].push(a[b]);return d}}),vb.prototype={calendar:null,coordMap:null,el:null,start:null,end:null,intervalStart:null,intervalEnd:null,rowCnt:null,colCnt:null,isSelected:!1,scrollerEl:null,scrollTop:null,widgetHeaderClass:null,widgetContentClass:null,highlightStateClass:null,documentMousedownProxy:null,documentDragStartProxy:null,init:function(){var b=this.opt("theme")?"ui":"fc";this.widgetHeaderClass=b+"-widget-header",this.widgetContentClass=b+"-widget-content",this.highlightStateClass=b+"-state-highlight",this.documentMousedownProxy=a.proxy(this,"documentMousedown"),this.documentDragStartProxy=a.proxy(this,"documentDragStart")},render:function(){this.updateSize(),this.trigger("viewRender",this,this,this.el),a(document).on("mousedown",this.documentMousedownProxy).on("dragstart",this.documentDragStartProxy)},destroy:function(){this.unselect(),this.trigger("viewDestroy",this,this,this.el),this.destroyEvents(),this.el.empty(),a(document).off("mousedown",this.documentMousedownProxy).off("dragstart",this.documentDragStartProxy)},incrementDate:function(){},updateSize:function(a){a&&this.recordScroll(),this.updateHeight(),this.updateWidth()},updateWidth:function(){},updateHeight:function(){var a=this.calendar;this.setHeight(a.getSuggestedViewHeight(),a.isHeightAuto())},setHeight:function(){},computeScrollerHeight:function(a){var b,c=this.el.add(this.scrollerEl);return c.css({position:"relative",left:-1}),b=this.el.outerHeight()-this.scrollerEl.height(),c.css({position:"",left:""}),a-b},recordScroll:function(){this.scrollerEl&&(this.scrollTop=this.scrollerEl.scrollTop())},restoreScroll:function(){null!==this.scrollTop&&this.scrollerEl.scrollTop(this.scrollTop)},renderEvents:function(){this.segEach(function(a){this.trigger("eventAfterRender",a.event,a.event,a.el)}),this.trigger("eventAfterAllRender")},destroyEvents:function(){this.segEach(function(a){this.trigger("eventDestroy",a.event,a.event,a.el)})},resolveEventEl:function(b,c){var d=this.trigger("eventRender",b,b,c);return d===!1?c=null:d&&d!==!0&&(c=a(d)),c},showEvent:function(a){this.segEach(function(a){a.el.css("visibility","")},a)},hideEvent:function(a){this.segEach(function(a){a.el.css("visibility","hidden")},a)},segEach:function(a,b){var c,d=this.getSegs();for(c=0;c<d.length;c++)b&&d[c].event._id!==b._id||a.call(this,d[c])},getSegs:function(){},renderDrag:function(){},destroyDrag:function(){},documentDragStart:function(b){var c,d,e,f,g,h=this,i=this.calendar,j=null,k=null,l=null;this.opt("droppable")&&(c=a(b.target),d=this.opt("dropAccept"),(a.isFunction(d)?d.call(c[0],c):c.is(d))&&(e=wb(c),f=e.eventProps,g=new $(this.coordMap,{cellOver:function(b,c){j=c,k=e.duration?j.clone().add(e.duration):null,l=k||i.getDefaultEventEnd(!j.hasTime(),j),f&&a.extend(f,{start:j,end:k}),i.isExternalDragAllowedInRange(j,l,f)?h.renderDrag(j,l):(j=null,n())},cellOut:function(){j=null,h.destroyDrag(),o()}}),a(document).one("dragstop",function(a,b){var d;h.destroyDrag(),o(),j&&(e.startTime&&!j.hasTime()&&j.time(e.startTime),h.trigger("drop",c[0],j,a,b),f&&(d=i.renderEvent(f,e.stick),h.trigger("eventReceive",null,d[0])))}),g.startDrag(b)))},select:function(a,b,c){this.unselect(c),this.renderSelection(a,b),this.reportSelection(a,b,c)},renderSelection:function(){},reportSelection:function(a,b,c){this.isSelected=!0,this.trigger("select",null,a,b,c)},unselect:function(a){this.isSelected&&(this.isSelected=!1,this.destroySelection(),this.trigger("unselect",null,a))},destroySelection:function(){},documentMousedown:function(b){var c;this.isSelected&&this.opt("unselectAuto")&&w(b)&&(c=this.opt("unselectCancel"),c&&a(b.target).closest(c).length||this.unselect(b))}},Jb.dataAttrPrefix="",xb.prototype=C(vb.prototype),a.extend(xb.prototype,{dayGrid:null,dayNumbersVisible:!1,weekNumbersVisible:!1,weekNumberWidth:null,headRowEl:null,render:function(a,b,c){this.rowCnt=a,this.colCnt=b,this.dayNumbersVisible=c,this.weekNumbersVisible=this.opt("weekNumbers"),this.dayGrid.numbersVisible=this.dayNumbersVisible||this.weekNumbersVisible,this.el.addClass("fc-basic-view").html(this.renderHtml()),this.headRowEl=this.el.find("thead .fc-row"),this.scrollerEl=this.el.find(".fc-day-grid-container"),this.dayGrid.coordMap.containerEl=this.scrollerEl,this.dayGrid.el=this.el.find(".fc-day-grid"),this.dayGrid.render(this.hasRigidRows()),vb.prototype.render.call(this)},destroy:function(){this.dayGrid.destroy(),vb.prototype.destroy.call(this)},renderHtml:function(){return'<table><thead><tr><td class="'+this.widgetHeaderClass+'">'+this.dayGrid.headHtml()+'</td></tr></thead><tbody><tr><td class="'+this.widgetContentClass+'"><div class="fc-day-grid-container"><div class="fc-day-grid"/></div></td></tr></tbody></table>'},headIntroHtml:function(){return this.weekNumbersVisible?'<th class="fc-week-number '+this.widgetHeaderClass+'" '+this.weekNumberStyleAttr()+"><span>"+F(this.opt("weekNumberTitle"))+"</span></th>":void 0},numberIntroHtml:function(a){return this.weekNumbersVisible?'<td class="fc-week-number" '+this.weekNumberStyleAttr()+"><span>"+this.calendar.calculateWeekNumber(this.cellToDate(a,0))+"</span></td>":void 0},dayIntroHtml:function(){return this.weekNumbersVisible?'<td class="fc-week-number '+this.widgetContentClass+'" '+this.weekNumberStyleAttr()+"></td>":void 0},introHtml:function(){return this.weekNumbersVisible?'<td class="fc-week-number" '+this.weekNumberStyleAttr()+"></td>":void 0},numberCellHtml:function(a,b,c){var d;return this.dayNumbersVisible?(d=this.dayGrid.getDayClasses(c),d.unshift("fc-day-number"),'<td class="'+d.join(" ")+'" data-date="'+c.format()+'">'+c.date()+"</td>"):"<td/>"},weekNumberStyleAttr:function(){return null!==this.weekNumberWidth?'style="width:'+this.weekNumberWidth+'px"':""},hasRigidRows:function(){var a=this.opt("eventLimit");return a&&"number"!=typeof a},updateWidth:function(){this.weekNumbersVisible&&(this.weekNumberWidth=r(this.el.find(".fc-week-number")))},setHeight:function(a,b){var c,d=this.opt("eventLimit");t(this.scrollerEl),m(this.headRowEl),this.dayGrid.destroySegPopover(),d&&"number"==typeof d&&this.dayGrid.limitRows(d),c=this.computeScrollerHeight(a),this.setGridHeight(c,b),d&&"number"!=typeof d&&this.dayGrid.limitRows(d),!b&&s(this.scrollerEl,c)&&(l(this.headRowEl,v(this.scrollerEl)),c=this.computeScrollerHeight(a),this.scrollerEl.height(c),this.restoreScroll())},setGridHeight:function(a,b){b?q(this.dayGrid.rowEls):p(this.dayGrid.rowEls,a,!0)},renderEvents:function(a){this.dayGrid.renderEvents(a),this.updateHeight(),vb.prototype.renderEvents.call(this,a)},getSegs:function(){return this.dayGrid.getSegs()},destroyEvents:function(){vb.prototype.destroyEvents.call(this),this.recordScroll(),this.dayGrid.destroyEvents()},renderDrag:function(a,b,c){return this.dayGrid.renderDrag(a,b,c)},destroyDrag:function(){this.dayGrid.destroyDrag()},renderSelection:function(a,b){this.dayGrid.renderSelection(a,b)},destroySelection:function(){this.dayGrid.destroySelection()}}),e({fixedWeekCount:!0}),Kb.month=yb,yb.prototype=C(xb.prototype),a.extend(yb.prototype,{name:"month",incrementDate:function(a,b){return a.clone().stripTime().add(b,"months").startOf("month")},render:function(a){var b;this.intervalStart=a.clone().stripTime().startOf("month"),this.intervalEnd=this.intervalStart.clone().add(1,"months"),this.start=this.intervalStart.clone(),this.start=this.skipHiddenDays(this.start),this.start.startOf("week"),this.start=this.skipHiddenDays(this.start),this.end=this.intervalEnd.clone(),this.end=this.skipHiddenDays(this.end,-1,!0),this.end.add((7-this.end.weekday())%7,"days"),this.end=this.skipHiddenDays(this.end,-1,!0),b=Math.ceil(this.end.diff(this.start,"weeks",!0)),this.isFixedWeeks()&&(this.end.add(6-b,"weeks"),b=6),this.title=this.calendar.formatDate(this.intervalStart,this.opt("titleFormat")),xb.prototype.render.call(this,b,this.getCellsPerWeek(),!0)},setGridHeight:function(a,b){b=b||"variable"===this.opt("weekMode"),b&&(a*=this.rowCnt/6),p(this.dayGrid.rowEls,a,!b)},isFixedWeeks:function(){var a=this.opt("weekMode");return a?"fixed"===a:this.opt("fixedWeekCount")}}),Kb.basicWeek=zb,zb.prototype=C(xb.prototype),a.extend(zb.prototype,{name:"basicWeek",incrementDate:function(a,b){return a.clone().stripTime().add(b,"weeks").startOf("week")},render:function(a){this.intervalStart=a.clone().stripTime().startOf("week"),this.intervalEnd=this.intervalStart.clone().add(1,"weeks"),this.start=this.skipHiddenDays(this.intervalStart),this.end=this.skipHiddenDays(this.intervalEnd,-1,!0),this.title=this.calendar.formatRange(this.start,this.end.clone().subtract(1),this.opt("titleFormat")," — "),xb.prototype.render.call(this,1,this.getCellsPerWeek(),!1)}}),Kb.basicDay=Ab,Ab.prototype=C(xb.prototype),a.extend(Ab.prototype,{name:"basicDay",incrementDate:function(a,b){var c=a.clone().stripTime().add(b,"days");return c=this.skipHiddenDays(c,0>b?-1:1)},render:function(a){this.start=this.intervalStart=a.clone().stripTime(),this.end=this.intervalEnd=this.start.clone().add(1,"days"),this.title=this.calendar.formatDate(this.start,this.opt("titleFormat")),xb.prototype.render.call(this,1,1,!1)}}),e({allDaySlot:!0,allDayText:"all-day",scrollTime:"06:00:00",slotDuration:"00:30:00",axisFormat:Bb,timeFormat:{agenda:Cb},minTime:"00:00:00",maxTime:"24:00:00",slotEventOverlap:!0});var Yb=5;Db.prototype=C(vb.prototype),a.extend(Db.prototype,{timeGrid:null,dayGrid:null,axisWidth:null,noScrollRowEls:null,bottomRuleEl:null,bottomRuleHeight:null,render:function(b){this.rowCnt=1,this.colCnt=b,this.el.addClass("fc-agenda-view").html(this.renderHtml()),this.scrollerEl=this.el.find(".fc-time-grid-container"),this.timeGrid.coordMap.containerEl=this.scrollerEl,this.timeGrid.el=this.el.find(".fc-time-grid"),this.timeGrid.render(),this.bottomRuleEl=a('<hr class="'+this.widgetHeaderClass+'"/>').appendTo(this.timeGrid.el),this.dayGrid&&(this.dayGrid.el=this.el.find(".fc-day-grid"),this.dayGrid.render(),this.dayGrid.bottomCoordPadding=this.dayGrid.el.next("hr").outerHeight()),this.noScrollRowEls=this.el.find(".fc-row:not(.fc-scroller *)"),vb.prototype.render.call(this),this.resetScroll()},destroy:function(){this.timeGrid.destroy(),this.dayGrid&&this.dayGrid.destroy(),vb.prototype.destroy.call(this)},renderHtml:function(){return'<table><thead><tr><td class="'+this.widgetHeaderClass+'">'+this.timeGrid.headHtml()+'</td></tr></thead><tbody><tr><td class="'+this.widgetContentClass+'">'+(this.dayGrid?'<div class="fc-day-grid"/><hr class="'+this.widgetHeaderClass+'"/>':"")+'<div class="fc-time-grid-container"><div class="fc-time-grid"/></div></td></tr></tbody></table>'},headIntroHtml:function(){var a,b,c,d;return this.opt("weekNumbers")?(a=this.cellToDate(0,0),b=this.calendar.calculateWeekNumber(a),c=this.opt("weekNumberTitle"),d=this.opt("isRTL")?b+c:c+b,'<th class="fc-axis fc-week-number '+this.widgetHeaderClass+'" '+this.axisStyleAttr()+"><span>"+F(d)+"</span></th>"):'<th class="fc-axis '+this.widgetHeaderClass+'" '+this.axisStyleAttr()+"></th>"},dayIntroHtml:function(){return'<td class="fc-axis '+this.widgetContentClass+'" '+this.axisStyleAttr()+"><span>"+(this.opt("allDayHtml")||F(this.opt("allDayText")))+"</span></td>"},slotBgIntroHtml:function(){return'<td class="fc-axis '+this.widgetContentClass+'" '+this.axisStyleAttr()+"></td>"},introHtml:function(){return'<td class="fc-axis" '+this.axisStyleAttr()+"></td>"},axisStyleAttr:function(){return null!==this.axisWidth?'style="width:'+this.axisWidth+'px"':""},updateSize:function(a){a&&this.timeGrid.resize(),vb.prototype.updateSize.call(this,a)},updateWidth:function(){this.axisWidth=r(this.el.find(".fc-axis"))},setHeight:function(a,b){var c,d;null===this.bottomRuleHeight&&(this.bottomRuleHeight=this.bottomRuleEl.outerHeight()),this.bottomRuleEl.hide(),this.scrollerEl.css("overflow",""),t(this.scrollerEl),m(this.noScrollRowEls),this.dayGrid&&(this.dayGrid.destroySegPopover(),c=this.opt("eventLimit"),c&&"number"!=typeof c&&(c=Yb),c&&this.dayGrid.limitRows(c)),b||(d=this.computeScrollerHeight(a),s(this.scrollerEl,d)?(l(this.noScrollRowEls,v(this.scrollerEl)),d=this.computeScrollerHeight(a),this.scrollerEl.height(d),this.restoreScroll()):(this.scrollerEl.height(d).css("overflow","hidden"),this.bottomRuleEl.show()))},resetScroll:function(){function a(){c.scrollerEl.scrollTop(e)}var c=this,d=b.duration(this.opt("scrollTime")),e=this.timeGrid.computeTimeTop(d);e=Math.ceil(e),e&&e++,a(),setTimeout(a,0)},renderEvents:function(a){var b,c,d=[],e=[],f=[];for(c=0;c<a.length;c++)a[c].allDay?d.push(a[c]):e.push(a[c]);b=this.timeGrid.renderEvents(e),this.dayGrid&&(f=this.dayGrid.renderEvents(d)),this.updateHeight(),vb.prototype.renderEvents.call(this,a)},getSegs:function(){return this.timeGrid.getSegs().concat(this.dayGrid?this.dayGrid.getSegs():[])},destroyEvents:function(){vb.prototype.destroyEvents.call(this),this.recordScroll(),this.timeGrid.destroyEvents(),this.dayGrid&&this.dayGrid.destroyEvents()},renderDrag:function(a,b,c){return a.hasTime()?this.timeGrid.renderDrag(a,b,c):this.dayGrid?this.dayGrid.renderDrag(a,b,c):void 0},destroyDrag:function(){this.timeGrid.destroyDrag(),this.dayGrid&&this.dayGrid.destroyDrag()},renderSelection:function(a,b){a.hasTime()||b.hasTime()?this.timeGrid.renderSelection(a,b):this.dayGrid&&this.dayGrid.renderSelection(a,b)},destroySelection:function(){this.timeGrid.destroySelection(),this.dayGrid&&this.dayGrid.destroySelection()}}),Kb.agendaWeek=Eb,Eb.prototype=C(Db.prototype),a.extend(Eb.prototype,{name:"agendaWeek",incrementDate:function(a,b){return a.clone().stripTime().add(b,"weeks").startOf("week")},render:function(a){this.intervalStart=a.clone().stripTime().startOf("week"),this.intervalEnd=this.intervalStart.clone().add(1,"weeks"),this.start=this.skipHiddenDays(this.intervalStart),this.end=this.skipHiddenDays(this.intervalEnd,-1,!0),this.title=this.calendar.formatRange(this.start,this.end.clone().subtract(1),this.opt("titleFormat")," — "),Db.prototype.render.call(this,this.getCellsPerWeek())}}),Kb.agendaDay=Fb,Fb.prototype=C(Db.prototype),a.extend(Fb.prototype,{name:"agendaDay",incrementDate:function(a,b){var c=a.clone().stripTime().add(b,"days");return c=this.skipHiddenDays(c,0>b?-1:1)},render:function(a){this.start=this.intervalStart=a.clone().stripTime(),this.end=this.intervalEnd=this.start.clone().add(1,"days"),this.title=this.calendar.formatDate(this.start,this.opt("titleFormat")),Db.prototype.render.call(this,1)}})});
\ No newline at end of file
diff --git a/NewLife.Cube/Content/ace/js/jquery.autosize.min.js b/NewLife.Cube/Content/ace/js/jquery.autosize.min.js
deleted file mode 100644
index fe877cf6c0..0000000000
--- a/NewLife.Cube/Content/ace/js/jquery.autosize.min.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/*!
-	Autosize 1.18.15
-	license: MIT
-	http://www.jacklmoore.com/autosize
-*/
-!function(a){var b,c={className:"autosizejs",id:"autosizejs",append:"\n",callback:!1,resizeDelay:10,placeholder:!0},d='<textarea tabindex="-1" style="position:absolute; top:-999px; left:0; right:auto; bottom:auto; border:0; padding: 0; -moz-box-sizing:content-box; -webkit-box-sizing:content-box; box-sizing:content-box; word-wrap:break-word; height:0 !important; min-height:0 !important; overflow:hidden; transition:none; -webkit-transition:none; -moz-transition:none;"/>',e=["fontFamily","fontSize","fontWeight","fontStyle","letterSpacing","textTransform","wordSpacing","textIndent","whiteSpace"],f=a(d).data("autosize",!0)[0];f.style.lineHeight="99px","99px"===a(f).css("lineHeight")&&e.push("lineHeight"),f.style.lineHeight="",a.fn.autosize=function(d){return this.length?(d=a.extend({},c,d||{}),f.parentNode!==document.body&&a(document.body).append(f),this.each(function(){function c(){var b,c=window.getComputedStyle?window.getComputedStyle(m,null):!1;c?(b=m.getBoundingClientRect().width,(0===b||"number"!=typeof b)&&(b=parseFloat(c.width)),a.each(["paddingLeft","paddingRight","borderLeftWidth","borderRightWidth"],function(a,d){b-=parseFloat(c[d])})):b=n.width(),f.style.width=Math.max(b,0)+"px"}function g(){var g={};if(b=m,f.className=d.className,f.id=d.id,j=parseFloat(n.css("maxHeight")),a.each(e,function(a,b){g[b]=n.css(b)}),a(f).css(g).attr("wrap",n.attr("wrap")),c(),window.chrome){var h=m.style.width;m.style.width="0px";{m.offsetWidth}m.style.width=h}}function h(){var a,e;b!==m?g():c(),f.value=!m.value&&d.placeholder?n.attr("placeholder")||"":m.value,f.value+=d.append||"",f.style.overflowY=m.style.overflowY,e=parseFloat(m.style.height),f.scrollTop=0,f.scrollTop=9e4,a=f.scrollTop,j&&a>j?(m.style.overflowY="scroll",a=j):(m.style.overflowY="hidden",k>a&&(a=k)),a+=o,e!==a&&(m.style.height=a+"px",f.className=f.className,p&&d.callback.call(m,m),n.trigger("autosize.resized"))}function i(){clearTimeout(l),l=setTimeout(function(){var a=n.width();a!==r&&(r=a,h())},parseInt(d.resizeDelay,10))}var j,k,l,m=this,n=a(m),o=0,p=a.isFunction(d.callback),q={height:m.style.height,overflow:m.style.overflow,overflowY:m.style.overflowY,wordWrap:m.style.wordWrap,resize:m.style.resize},r=n.width(),s=n.css("resize");n.data("autosize")||(n.data("autosize",!0),("border-box"===n.css("box-sizing")||"border-box"===n.css("-moz-box-sizing")||"border-box"===n.css("-webkit-box-sizing"))&&(o=n.outerHeight()-n.height()),k=Math.max(parseFloat(n.css("minHeight"))-o||0,n.height()),n.css({overflow:"hidden",overflowY:"hidden",wordWrap:"break-word"}),"vertical"===s?n.css("resize","none"):"both"===s&&n.css("resize","horizontal"),"onpropertychange"in m?"oninput"in m?n.on("input.autosize keyup.autosize",h):n.on("propertychange.autosize",function(){"value"===event.propertyName&&h()}):n.on("input.autosize",h),d.resizeDelay!==!1&&a(window).on("resize.autosize",i),n.on("autosize.resize",h),n.on("autosize.resizeIncludeStyle",function(){b=null,h()}),n.on("autosize.destroy",function(){b=null,clearTimeout(l),a(window).off("resize",i),n.off("autosize").off(".autosize").css(q).removeData("autosize")}),h())})):this}}(jQuery||$);
\ No newline at end of file
diff --git a/NewLife.Cube/Content/ace/js/pace.min.js b/NewLife.Cube/Content/ace/js/pace.min.js
deleted file mode 100644
index ebae557204..0000000000
--- a/NewLife.Cube/Content/ace/js/pace.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(){var a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W=[].slice,X={}.hasOwnProperty,Y=function(a,b){function c(){this.constructor=a}for(var d in b)X.call(b,d)&&(a[d]=b[d]);return c.prototype=b.prototype,a.prototype=new c,a.__super__=b.prototype,a},Z=[].indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(b in this&&this[b]===a)return b;return-1};for(t={catchupTime:500,initialRate:.03,minTime:500,ghostTime:500,maxProgressPerFrame:10,easeFactor:1.25,startOnPageLoad:!0,restartOnPushState:!0,restartOnRequestAfter:500,target:"body",elements:{checkInterval:100,selectors:["body"]},eventLag:{minSamples:10,sampleCount:3,lagThreshold:3},ajax:{trackMethods:["GET"],trackWebSockets:!0,ignoreURLs:[]}},B=function(){var a;return null!=(a="undefined"!=typeof performance&&null!==performance&&"function"==typeof performance.now?performance.now():void 0)?a:+new Date},D=window.requestAnimationFrame||window.mozRequestAnimationFrame||window.webkitRequestAnimationFrame||window.msRequestAnimationFrame,s=window.cancelAnimationFrame||window.mozCancelAnimationFrame,null==D&&(D=function(a){return setTimeout(a,50)},s=function(a){return clearTimeout(a)}),F=function(a){var b,c;return b=B(),(c=function(){var d;return d=B()-b,d>=33?(b=B(),a(d,function(){return D(c)})):setTimeout(c,33-d)})()},E=function(){var a,b,c;return c=arguments[0],b=arguments[1],a=3<=arguments.length?W.call(arguments,2):[],"function"==typeof c[b]?c[b].apply(c,a):c[b]},u=function(){var a,b,c,d,e,f,g;for(b=arguments[0],d=2<=arguments.length?W.call(arguments,1):[],f=0,g=d.length;g>f;f++)if(c=d[f])for(a in c)X.call(c,a)&&(e=c[a],null!=b[a]&&"object"==typeof b[a]&&null!=e&&"object"==typeof e?u(b[a],e):b[a]=e);return b},p=function(a){var b,c,d,e,f;for(c=b=0,e=0,f=a.length;f>e;e++)d=a[e],c+=Math.abs(d),b++;return c/b},w=function(a,b){var c,d,e;if(null==a&&(a="options"),null==b&&(b=!0),e=document.querySelector("[data-pace-"+a+"]")){if(c=e.getAttribute("data-pace-"+a),!b)return c;try{return JSON.parse(c)}catch(f){return d=f,"undefined"!=typeof console&&null!==console?console.error("Error parsing inline pace options",d):void 0}}},g=function(){function a(){}return a.prototype.on=function(a,b,c,d){var e;return null==d&&(d=!1),null==this.bindings&&(this.bindings={}),null==(e=this.bindings)[a]&&(e[a]=[]),this.bindings[a].push({handler:b,ctx:c,once:d})},a.prototype.once=function(a,b,c){return this.on(a,b,c,!0)},a.prototype.off=function(a,b){var c,d,e;if(null!=(null!=(d=this.bindings)?d[a]:void 0)){if(null==b)return delete this.bindings[a];for(c=0,e=[];c<this.bindings[a].length;)e.push(this.bindings[a][c].handler===b?this.bindings[a].splice(c,1):c++);return e}},a.prototype.trigger=function(){var a,b,c,d,e,f,g,h,i;if(c=arguments[0],a=2<=arguments.length?W.call(arguments,1):[],null!=(g=this.bindings)?g[c]:void 0){for(e=0,i=[];e<this.bindings[c].length;)h=this.bindings[c][e],d=h.handler,b=h.ctx,f=h.once,d.apply(null!=b?b:this,a),i.push(f?this.bindings[c].splice(e,1):e++);return i}},a}(),null==window.Pace&&(window.Pace={}),u(Pace,g.prototype),C=Pace.options=u({},t,window.paceOptions,w()),T=["ajax","document","eventLag","elements"],P=0,R=T.length;R>P;P++)J=T[P],C[J]===!0&&(C[J]=t[J]);i=function(a){function b(){return U=b.__super__.constructor.apply(this,arguments)}return Y(b,a),b}(Error),b=function(){function a(){this.progress=0}return a.prototype.getElement=function(){var a;if(null==this.el){if(a=document.querySelector(C.target),!a)throw new i;this.el=document.createElement("div"),this.el.className="pace pace-active",document.body.className=document.body.className.replace(/pace-done/g,""),document.body.className+=" pace-running",this.el.innerHTML='<div class="pace-progress">\n  <div class="pace-progress-inner"></div>\n</div>\n<div class="pace-activity"></div>',null!=a.firstChild?a.insertBefore(this.el,a.firstChild):a.appendChild(this.el)}return this.el},a.prototype.finish=function(){var a;return a=this.getElement(),a.className=a.className.replace("pace-active",""),a.className+=" pace-inactive",document.body.className=document.body.className.replace("pace-running",""),document.body.className+=" pace-done"},a.prototype.update=function(a){return this.progress=a,this.render()},a.prototype.destroy=function(){try{this.getElement().parentNode.removeChild(this.getElement())}catch(a){i=a}return this.el=void 0},a.prototype.render=function(){var a,b;return null==document.querySelector(C.target)?!1:(a=this.getElement(),a.children[0].style.width=""+this.progress+"%",(!this.lastRenderedProgress||this.lastRenderedProgress|0!==this.progress|0)&&(a.children[0].setAttribute("data-progress-text",""+(0|this.progress)+"%"),this.progress>=100?b="99":(b=this.progress<10?"0":"",b+=0|this.progress),a.children[0].setAttribute("data-progress",""+b)),this.lastRenderedProgress=this.progress)},a.prototype.done=function(){return this.progress>=100},a}(),h=function(){function a(){this.bindings={}}return a.prototype.trigger=function(a,b){var c,d,e,f,g;if(null!=this.bindings[a]){for(f=this.bindings[a],g=[],d=0,e=f.length;e>d;d++)c=f[d],g.push(c.call(this,b));return g}},a.prototype.on=function(a,b){var c;return null==(c=this.bindings)[a]&&(c[a]=[]),this.bindings[a].push(b)},a}(),O=window.XMLHttpRequest,N=window.XDomainRequest,M=window.WebSocket,v=function(a,b){var c,d,e,f;f=[];for(d in b.prototype)try{e=b.prototype[d],f.push(null==a[d]&&"function"!=typeof e?a[d]=e:void 0)}catch(g){c=g}return f},z=[],Pace.ignore=function(){var a,b,c;return b=arguments[0],a=2<=arguments.length?W.call(arguments,1):[],z.unshift("ignore"),c=b.apply(null,a),z.shift(),c},Pace.track=function(){var a,b,c;return b=arguments[0],a=2<=arguments.length?W.call(arguments,1):[],z.unshift("track"),c=b.apply(null,a),z.shift(),c},I=function(a){var b;if(null==a&&(a="GET"),"track"===z[0])return"force";if(!z.length&&C.ajax){if("socket"===a&&C.ajax.trackWebSockets)return!0;if(b=a.toUpperCase(),Z.call(C.ajax.trackMethods,b)>=0)return!0}return!1},j=function(a){function b(){var a,c=this;b.__super__.constructor.apply(this,arguments),a=function(a){var b;return b=a.open,a.open=function(d,e){return I(d)&&c.trigger("request",{type:d,url:e,request:a}),b.apply(a,arguments)}},window.XMLHttpRequest=function(b){var c;return c=new O(b),a(c),c};try{v(window.XMLHttpRequest,O)}catch(d){}if(null!=N){window.XDomainRequest=function(){var b;return b=new N,a(b),b};try{v(window.XDomainRequest,N)}catch(d){}}if(null!=M&&C.ajax.trackWebSockets){window.WebSocket=function(a,b){var d;return d=null!=b?new M(a,b):new M(a),I("socket")&&c.trigger("request",{type:"socket",url:a,protocols:b,request:d}),d};try{v(window.WebSocket,M)}catch(d){}}}return Y(b,a),b}(h),Q=null,x=function(){return null==Q&&(Q=new j),Q},H=function(a){var b,c,d,e;for(e=C.ajax.ignoreURLs,c=0,d=e.length;d>c;c++)if(b=e[c],"string"==typeof b){if(-1!==a.indexOf(b))return!0}else if(b.test(a))return!0;return!1},x().on("request",function(b){var c,d,e,f,g;return f=b.type,e=b.request,g=b.url,H(g)?void 0:Pace.running||C.restartOnRequestAfter===!1&&"force"!==I(f)?void 0:(d=arguments,c=C.restartOnRequestAfter||0,"boolean"==typeof c&&(c=0),setTimeout(function(){var b,c,g,h,i,j;if(b="socket"===f?e.readyState<2:0<(h=e.readyState)&&4>h){for(Pace.restart(),i=Pace.sources,j=[],c=0,g=i.length;g>c;c++){if(J=i[c],J instanceof a){J.watch.apply(J,d);break}j.push(void 0)}return j}},c))}),a=function(){function a(){var a=this;this.elements=[],x().on("request",function(){return a.watch.apply(a,arguments)})}return a.prototype.watch=function(a){var b,c,d,e;return d=a.type,b=a.request,e=a.url,H(e)?void 0:(c="socket"===d?new m(b):new n(b),this.elements.push(c))},a}(),n=function(){function a(a){var b,c,d,e,f,g,h=this;if(this.progress=0,null!=window.ProgressEvent)for(c=null,a.addEventListener("progress",function(a){return h.progress=a.lengthComputable?100*a.loaded/a.total:h.progress+(100-h.progress)/2}),g=["load","abort","timeout","error"],d=0,e=g.length;e>d;d++)b=g[d],a.addEventListener(b,function(){return h.progress=100});else f=a.onreadystatechange,a.onreadystatechange=function(){var b;return 0===(b=a.readyState)||4===b?h.progress=100:3===a.readyState&&(h.progress=50),"function"==typeof f?f.apply(null,arguments):void 0}}return a}(),m=function(){function a(a){var b,c,d,e,f=this;for(this.progress=0,e=["error","open"],c=0,d=e.length;d>c;c++)b=e[c],a.addEventListener(b,function(){return f.progress=100})}return a}(),d=function(){function a(a){var b,c,d,f;for(null==a&&(a={}),this.elements=[],null==a.selectors&&(a.selectors=[]),f=a.selectors,c=0,d=f.length;d>c;c++)b=f[c],this.elements.push(new e(b))}return a}(),e=function(){function a(a){this.selector=a,this.progress=0,this.check()}return a.prototype.check=function(){var a=this;return document.querySelector(this.selector)?this.done():setTimeout(function(){return a.check()},C.elements.checkInterval)},a.prototype.done=function(){return this.progress=100},a}(),c=function(){function a(){var a,b,c=this;this.progress=null!=(b=this.states[document.readyState])?b:100,a=document.onreadystatechange,document.onreadystatechange=function(){return null!=c.states[document.readyState]&&(c.progress=c.states[document.readyState]),"function"==typeof a?a.apply(null,arguments):void 0}}return a.prototype.states={loading:0,interactive:50,complete:100},a}(),f=function(){function a(){var a,b,c,d,e,f=this;this.progress=0,a=0,e=[],d=0,c=B(),b=setInterval(function(){var g;return g=B()-c-50,c=B(),e.push(g),e.length>C.eventLag.sampleCount&&e.shift(),a=p(e),++d>=C.eventLag.minSamples&&a<C.eventLag.lagThreshold?(f.progress=100,clearInterval(b)):f.progress=100*(3/(a+3))},50)}return a}(),l=function(){function a(a){this.source=a,this.last=this.sinceLastUpdate=0,this.rate=C.initialRate,this.catchup=0,this.progress=this.lastProgress=0,null!=this.source&&(this.progress=E(this.source,"progress"))}return a.prototype.tick=function(a,b){var c;return null==b&&(b=E(this.source,"progress")),b>=100&&(this.done=!0),b===this.last?this.sinceLastUpdate+=a:(this.sinceLastUpdate&&(this.rate=(b-this.last)/this.sinceLastUpdate),this.catchup=(b-this.progress)/C.catchupTime,this.sinceLastUpdate=0,this.last=b),b>this.progress&&(this.progress+=this.catchup*a),c=1-Math.pow(this.progress/100,C.easeFactor),this.progress+=c*this.rate*a,this.progress=Math.min(this.lastProgress+C.maxProgressPerFrame,this.progress),this.progress=Math.max(0,this.progress),this.progress=Math.min(100,this.progress),this.lastProgress=this.progress,this.progress},a}(),K=null,G=null,q=null,L=null,o=null,r=null,Pace.running=!1,y=function(){return C.restartOnPushState?Pace.restart():void 0},null!=window.history.pushState&&(S=window.history.pushState,window.history.pushState=function(){return y(),S.apply(window.history,arguments)}),null!=window.history.replaceState&&(V=window.history.replaceState,window.history.replaceState=function(){return y(),V.apply(window.history,arguments)}),k={ajax:a,elements:d,document:c,eventLag:f},(A=function(){var a,c,d,e,f,g,h,i;for(Pace.sources=K=[],g=["ajax","elements","document","eventLag"],c=0,e=g.length;e>c;c++)a=g[c],C[a]!==!1&&K.push(new k[a](C[a]));for(i=null!=(h=C.extraSources)?h:[],d=0,f=i.length;f>d;d++)J=i[d],K.push(new J(C));return Pace.bar=q=new b,G=[],L=new l})(),Pace.stop=function(){return Pace.trigger("stop"),Pace.running=!1,q.destroy(),r=!0,null!=o&&("function"==typeof s&&s(o),o=null),A()},Pace.restart=function(){return Pace.trigger("restart"),Pace.stop(),Pace.start()},Pace.go=function(){var a;return Pace.running=!0,q.render(),a=B(),r=!1,o=F(function(b,c){var d,e,f,g,h,i,j,k,m,n,o,p,s,t,u,v;for(k=100-q.progress,e=o=0,f=!0,i=p=0,t=K.length;t>p;i=++p)for(J=K[i],n=null!=G[i]?G[i]:G[i]=[],h=null!=(v=J.elements)?v:[J],j=s=0,u=h.length;u>s;j=++s)g=h[j],m=null!=n[j]?n[j]:n[j]=new l(g),f&=m.done,m.done||(e++,o+=m.tick(b));return d=o/e,q.update(L.tick(b,d)),q.done()||f||r?(q.update(100),Pace.trigger("done"),setTimeout(function(){return q.finish(),Pace.running=!1,Pace.trigger("hide")},Math.max(C.ghostTime,Math.max(C.minTime-(B()-a),0)))):c()})},Pace.start=function(a){u(C,a),Pace.running=!0;try{q.render()}catch(b){i=b}return document.querySelector(".pace")?(Pace.trigger("start"),Pace.go()):setTimeout(Pace.start,50)},"function"==typeof define&&define.amd?define(function(){return Pace}):"object"==typeof exports?module.exports=Pace:C.startOnPageLoad&&Pace.start()}).call(this);
\ No newline at end of file
diff --git a/NewLife.Cube/Content/ace/js/prettify.min.js b/NewLife.Cube/Content/ace/js/prettify.min.js
deleted file mode 100644
index a1247177ff..0000000000
--- a/NewLife.Cube/Content/ace/js/prettify.min.js
+++ /dev/null
@@ -1 +0,0 @@
-var IN_GLOBAL_SCOPE=!0;window.PR_SHOULD_USE_CONTINUATION=!0;var prettyPrintOne,prettyPrint;!function(){function a(a){function b(a){var b=a.charCodeAt(0);if(92!==b)return b;var c=a.charAt(1);return b=l[c],b?b:c>="0"&&"7">=c?parseInt(a.substring(1),8):"u"===c||"x"===c?parseInt(a.substring(2),16):a.charCodeAt(1)}function c(a){if(32>a)return(16>a?"\\x0":"\\x")+a.toString(16);var b=String.fromCharCode(a);return"\\"===b||"-"===b||"]"===b||"^"===b?"\\"+b:b}function d(a){var d=a.substring(1,a.length-1).match(new RegExp("\\\\u[0-9A-Fa-f]{4}|\\\\x[0-9A-Fa-f]{2}|\\\\[0-3][0-7]{0,2}|\\\\[0-7]{1,2}|\\\\[\\s\\S]|-|[^-\\\\]","g")),e=[],f="^"===d[0],g=["["];f&&g.push("^");for(var h=f?1:0,i=d.length;i>h;++h){var j=d[h];if(/\\[bdsw]/i.test(j))g.push(j);else{var k,l=b(j);i>h+2&&"-"===d[h+1]?(k=b(d[h+2]),h+=2):k=l,e.push([l,k]),65>k||l>122||(65>k||l>90||e.push([32|Math.max(65,l),32|Math.min(k,90)]),97>k||l>122||e.push([-33&Math.max(97,l),-33&Math.min(k,122)]))}}e.sort(function(a,b){return a[0]-b[0]||b[1]-a[1]});for(var m=[],n=[],h=0;h<e.length;++h){var o=e[h];o[0]<=n[1]+1?n[1]=Math.max(n[1],o[1]):m.push(n=o)}for(var h=0;h<m.length;++h){var o=m[h];g.push(c(o[0])),o[1]>o[0]&&(o[1]+1>o[0]&&g.push("-"),g.push(c(o[1])))}return g.push("]"),g.join("")}function e(a){for(var b=a.source.match(new RegExp("(?:\\[(?:[^\\x5C\\x5D]|\\\\[\\s\\S])*\\]|\\\\u[A-Fa-f0-9]{4}|\\\\x[A-Fa-f0-9]{2}|\\\\[0-9]+|\\\\[^ux0-9]|\\(\\?[:!=]|[\\(\\)\\^]|[^\\x5B\\x5C\\(\\)\\^]+)","g")),e=b.length,h=[],i=0,j=0;e>i;++i){var k=b[i];if("("===k)++j;else if("\\"===k.charAt(0)){var l=+k.substring(1);l&&(j>=l?h[l]=-1:b[i]=c(l))}}for(var i=1;i<h.length;++i)-1===h[i]&&(h[i]=++f);for(var i=0,j=0;e>i;++i){var k=b[i];if("("===k)++j,h[j]||(b[i]="(?:");else if("\\"===k.charAt(0)){var l=+k.substring(1);l&&j>=l&&(b[i]="\\"+h[l])}}for(var i=0;e>i;++i)"^"===b[i]&&"^"!==b[i+1]&&(b[i]="");if(a.ignoreCase&&g)for(var i=0;e>i;++i){var k=b[i],m=k.charAt(0);k.length>=2&&"["===m?b[i]=d(k):"\\"!==m&&(b[i]=k.replace(/[a-zA-Z]/g,function(a){var b=a.charCodeAt(0);return"["+String.fromCharCode(-33&b,32|b)+"]"}))}return b.join("")}for(var f=0,g=!1,h=!1,i=0,j=a.length;j>i;++i){var k=a[i];if(k.ignoreCase)h=!0;else if(/[a-z]/i.test(k.source.replace(/\\u[0-9a-f]{4}|\\x[0-9a-f]{2}|\\[^ux]/gi,""))){g=!0,h=!1;break}}for(var l={b:8,t:9,n:10,v:11,f:12,r:13},m=[],i=0,j=a.length;j>i;++i){var k=a[i];if(k.global||k.multiline)throw new Error(""+k);m.push("(?:"+e(k)+")")}return new RegExp(m.join("|"),h?"gi":"g")}function b(a,b){function c(a){var i=a.nodeType;if(1==i){if(d.test(a.className))return;for(var j=a.firstChild;j;j=j.nextSibling)c(j);var k=a.nodeName.toLowerCase();("br"===k||"li"===k)&&(e[h]="\n",g[h<<1]=f++,g[h++<<1|1]=a)}else if(3==i||4==i){var l=a.nodeValue;l.length&&(l=b?l.replace(/\r\n?/g,"\n"):l.replace(/[ \t\r\n]+/g," "),e[h]=l,g[h<<1]=f,f+=l.length,g[h++<<1|1]=a)}}var d=/(?:^|\s)nocode(?:\s|$)/,e=[],f=0,g=[],h=0;return c(a),{sourceCode:e.join("").replace(/\n$/,""),spans:g}}function c(a,b,c,d){if(b){var e={sourceCode:b,basePos:a};c(e),d.push.apply(d,e.decorations)}}function d(a){for(var b=void 0,c=a.firstChild;c;c=c.nextSibling){var d=c.nodeType;b=1===d?b?a:c:3===d&&R.test(c.nodeValue)?a:b}return b===a?void 0:b}function e(b,d){var e,f={};!function(){for(var c=b.concat(d),g=[],h={},i=0,j=c.length;j>i;++i){var k=c[i],l=k[3];if(l)for(var m=l.length;--m>=0;)f[l.charAt(m)]=k;var n=k[1],o=""+n;h.hasOwnProperty(o)||(g.push(n),h[o]=null)}g.push(/[\0-\uffff]/),e=a(g)}();var g=d.length,h=function(a){for(var b=a.sourceCode,i=a.basePos,k=[i,J],l=0,m=b.match(e)||[],n={},o=0,p=m.length;p>o;++o){var q,r=m[o],s=n[r],t=void 0;if("string"==typeof s)q=!1;else{var u=f[r.charAt(0)];if(u)t=r.match(u[1]),s=u[0];else{for(var v=0;g>v;++v)if(u=d[v],t=r.match(u[1])){s=u[0];break}t||(s=J)}q=s.length>=5&&"lang-"===s.substring(0,5),!q||t&&"string"==typeof t[1]||(q=!1,s=M),q||(n[r]=s)}var w=l;if(l+=r.length,q){var x=t[1],y=r.indexOf(x),z=y+x.length;t[2]&&(z=r.length-t[2].length,y=z-x.length);var A=s.substring(5);c(i+w,r.substring(0,y),h,k),c(i+w+y,x,j(A,x),k),c(i+w+z,r.substring(z),h,k)}else k.push(i+w,s)}a.decorations=k};return h}function f(a){var b=[],c=[];b.push(a.tripleQuotedStrings?[D,/^(?:\'\'\'(?:[^\'\\]|\\[\s\S]|\'{1,2}(?=[^\']))*(?:\'\'\'|$)|\"\"\"(?:[^\"\\]|\\[\s\S]|\"{1,2}(?=[^\"]))*(?:\"\"\"|$)|\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$))/,null,"'\""]:a.multiLineStrings?[D,/^(?:\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$)|\`(?:[^\\\`]|\\[\s\S])*(?:\`|$))/,null,"'\"`"]:[D,/^(?:\'(?:[^\\\'\r\n]|\\.)*(?:\'|$)|\"(?:[^\\\"\r\n]|\\.)*(?:\"|$))/,null,"\"'"]),a.verbatimStrings&&c.push([D,/^@\"(?:[^\"]|\"\")*(?:\"|$)/,null]);var d=a.hashComments;d&&(a.cStyleComments?(b.push(d>1?[F,/^#(?:##(?:[^#]|#(?!##))*(?:###|$)|.*)/,null,"#"]:[F,/^#(?:(?:define|e(?:l|nd)if|else|error|ifn?def|include|line|pragma|undef|warning)\b|[^\r\n]*)/,null,"#"]),c.push([D,/^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h(?:h|pp|\+\+)?|[a-z]\w*)>/,null])):b.push([F,/^#[^\r\n]*/,null,"#"])),a.cStyleComments&&(c.push([F,/^\/\/[^\r\n]*/,null]),c.push([F,/^\/\*[\s\S]*?(?:\*\/|$)/,null]));var f=a.regexLiterals;if(f){var g=f>1?"":"\n\r",h=g?".":"[\\S\\s]",i="/(?=[^/*"+g+"])(?:[^/\\x5B\\x5C"+g+"]|\\x5C"+h+"|\\x5B(?:[^\\x5C\\x5D"+g+"]|\\x5C"+h+")*(?:\\x5D|$))+/";c.push(["lang-regex",RegExp("^"+Q+"("+i+")")])}var j=a.types;j&&c.push([G,j]);var k=(""+a.keywords).replace(/^ | $/g,"");k.length&&c.push([E,new RegExp("^(?:"+k.replace(/[\s,]+/g,"|")+")\\b"),null]),b.push([J,/^\s+/,null," \r\n	 "]);var l="^.[^\\s\\w.$@'\"`/\\\\]*";return a.regexLiterals&&(l+="(?!s*/)"),c.push([H,/^@[a-z_$][a-z_$@0-9]*/i,null],[G,/^(?:[@_]?[A-Z]+[a-z][A-Za-z_$@0-9]*|\w+_t\b)/,null],[J,/^[a-z_$][a-z_$@0-9]*/i,null],[H,new RegExp("^(?:0x[a-f0-9]+|(?:\\d(?:_\\d+)*\\d*(?:\\.\\d*)?|\\.\\d\\+)(?:e[+\\-]?\\d+)?)[a-z]*","i"),null,"0123456789"],[J,/^\\[\s\S]?/,null],[I,new RegExp(l),null]),e(b,c)}function g(a,b,c){function d(a){var b=a.nodeType;if(1!=b||f.test(a.className)){if((3==b||4==b)&&c){var i=a.nodeValue,j=i.match(g);if(j){var k=i.substring(0,j.index);a.nodeValue=k;var l=i.substring(j.index+j[0].length);if(l){var m=a.parentNode;m.insertBefore(h.createTextNode(l),a.nextSibling)}e(a),k||a.parentNode.removeChild(a)}}}else if("br"===a.nodeName)e(a),a.parentNode&&a.parentNode.removeChild(a);else for(var n=a.firstChild;n;n=n.nextSibling)d(n)}function e(a){function b(a,c){var d=c?a.cloneNode(!1):a,e=a.parentNode;if(e){var f=b(e,1),g=a.nextSibling;f.appendChild(d);for(var h=g;h;h=g)g=h.nextSibling,f.appendChild(h)}return d}for(;!a.nextSibling;)if(a=a.parentNode,!a)return;for(var c,d=b(a.nextSibling,0);(c=d.parentNode)&&1===c.nodeType;)d=c;j.push(d)}for(var f=/(?:^|\s)nocode(?:\s|$)/,g=/\r\n?|\n/,h=a.ownerDocument,i=h.createElement("li");a.firstChild;)i.appendChild(a.firstChild);for(var j=[i],k=0;k<j.length;++k)d(j[k]);b===(0|b)&&j[0].setAttribute("value",b);var l=h.createElement("ol");l.className="linenums";for(var m=Math.max(0,b-1|0)||0,k=0,n=j.length;n>k;++k)i=j[k],i.className="L"+(k+m)%10,i.firstChild||i.appendChild(h.createTextNode(" ")),l.appendChild(i);a.appendChild(l)}function h(a){var b=/\bMSIE\s(\d+)/.exec(navigator.userAgent);b=b&&+b[1]<=8;var c=/\n/g,d=a.sourceCode,e=d.length,f=0,g=a.spans,h=g.length,i=0,j=a.decorations,k=j.length,l=0;j[k]=e;var m,n;for(n=m=0;k>n;)j[n]!==j[n+2]?(j[m++]=j[n++],j[m++]=j[n++]):n+=2;for(k=m,n=m=0;k>n;){for(var o=j[n],p=j[n+1],q=n+2;k>=q+2&&j[q+1]===p;)q+=2;j[m++]=o,j[m++]=p,n=q}k=j.length=m;var r,s=a.sourceNode;s&&(r=s.style.display,s.style.display="none");try{for(;h>i;){var t,u=(g[i],g[i+2]||e),v=j[l+2]||e,q=Math.min(u,v),w=g[i+1];if(1!==w.nodeType&&(t=d.substring(f,q))){b&&(t=t.replace(c,"\r")),w.nodeValue=t;var x=w.ownerDocument,y=x.createElement("span");y.className=j[l+1];var z=w.parentNode;z.replaceChild(y,w),y.appendChild(w),u>f&&(g[i+1]=w=x.createTextNode(d.substring(q,u)),z.insertBefore(w,y.nextSibling))}f=q,f>=u&&(i+=2),f>=v&&(l+=2)}}finally{s&&(s.style.display=r)}}function i(a,b){for(var c=b.length;--c>=0;){var d=b[c];T.hasOwnProperty(d)?n.console&&console.warn("cannot override language handler %s",d):T[d]=a}}function j(a,b){return a&&T.hasOwnProperty(a)||(a=/^\s*</.test(b)?"default-markup":"default-code"),T[a]}function k(a){var c=a.langExtension;try{var d=b(a.sourceNode,a.pre),e=d.sourceCode;a.sourceCode=e,a.spans=d.spans,a.basePos=0,j(c,e)(a),h(a)}catch(f){n.console&&console.log(f&&f.stack||f)}}function l(a,b,c){var d=document.createElement("div");d.innerHTML="<pre>"+a+"</pre>",d=d.firstChild,c&&g(d,c,!0);var e={langExtension:b,numberLines:c,sourceNode:d,pre:1};return k(e),d.innerHTML}function m(a,b){function c(a){return f.getElementsByTagName(a)}function e(){for(var b=n.PR_SHOULD_USE_CONTINUATION?p.now()+250:1/0;r<j.length&&p.now()<b;r++){for(var c=j[r],f=y,i=c;i=i.previousSibling;){var l=i.nodeType,m=(7===l||8===l)&&i.nodeValue;if(m?!/^\??prettify\b/.test(m):3!==l||/\S/.test(i.nodeValue))break;if(m){f={},m.replace(/\b(\w+)=([\w:.%+-]+)/g,function(a,b,c){f[b]=c});break}}var o=c.className;if((f!==y||t.test(o))&&!u.test(o)){for(var z=!1,A=c.parentNode;A;A=A.parentNode){var B=A.tagName;if(x.test(B)&&A.className&&t.test(A.className)){z=!0;break}}if(!z){c.className+=" prettyprinted";var C=f.lang;if(!C){C=o.match(s);var D;!C&&(D=d(c))&&w.test(D.tagName)&&(C=D.className.match(s)),C&&(C=C[1])}var E;if(v.test(c.tagName))E=1;else{var F=c.currentStyle,G=h.defaultView,H=F?F.whiteSpace:G&&G.getComputedStyle?G.getComputedStyle(c,null).getPropertyValue("white-space"):0;E=H&&"pre"===H.substring(0,3)}var I=f.linenums;(I="true"===I||+I)||(I=o.match(/\blinenums\b(?::(\d+))?/),I=I?I[1]&&I[1].length?+I[1]:!0:!1),I&&g(c,I,E),q={langExtension:C,sourceNode:c,numberLines:I,pre:E},k(q)}}}r<j.length?setTimeout(e,250):"function"==typeof a&&a()}for(var f=b||document.body,h=f.ownerDocument||document,i=[c("pre"),c("code"),c("xmp")],j=[],l=0;l<i.length;++l)for(var m=0,o=i[l].length;o>m;++m)j.push(i[l][m]);i=null;var p=Date;p.now||(p={now:function(){return+new Date}});var q,r=0,s=/\blang(?:uage)?-([\w.]+)(?!\S)/,t=/\bprettyprint\b/,u=/\bprettyprinted\b/,v=/pre|xmp/i,w=/^code$/i,x=/^(?:pre|code|xmp)$/i,y={};e()}var n=window,o=["break,continue,do,else,for,if,return,while"],p=[o,"auto,case,char,const,default,double,enum,extern,float,goto,inline,int,long,register,short,signed,sizeof,static,struct,switch,typedef,union,unsigned,void,volatile"],q=[p,"catch,class,delete,false,import,new,operator,private,protected,public,this,throw,true,try,typeof"],r=[q,"alignof,align_union,asm,axiom,bool,concept,concept_map,const_cast,constexpr,decltype,delegate,dynamic_cast,explicit,export,friend,generic,late_check,mutable,namespace,nullptr,property,reinterpret_cast,static_assert,static_cast,template,typeid,typename,using,virtual,where"],s=[q,"abstract,assert,boolean,byte,extends,final,finally,implements,import,instanceof,interface,null,native,package,strictfp,super,synchronized,throws,transient"],t=[s,"as,base,by,checked,decimal,delegate,descending,dynamic,event,fixed,foreach,from,group,implicit,in,internal,into,is,let,lock,object,out,override,orderby,params,partial,readonly,ref,sbyte,sealed,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort,var,virtual,where"],u="all,and,by,catch,class,else,extends,false,finally,for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then,throw,true,try,unless,until,when,while,yes",v=[q,"debugger,eval,export,function,get,null,set,undefined,var,with,Infinity,NaN"],w="caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END",x=[o,"and,as,assert,class,def,del,elif,except,exec,finally,from,global,import,in,is,lambda,nonlocal,not,or,pass,print,raise,try,with,yield,False,True,None"],y=[o,"alias,and,begin,case,class,def,defined,elsif,end,ensure,false,in,module,next,nil,not,or,redo,rescue,retry,self,super,then,true,undef,unless,until,when,yield,BEGIN,END"],z=[o,"as,assert,const,copy,drop,enum,extern,fail,false,fn,impl,let,log,loop,match,mod,move,mut,priv,pub,pure,ref,self,static,struct,true,trait,type,unsafe,use"],A=[o,"case,done,elif,esac,eval,fi,function,in,local,set,then,until"],B=[r,t,v,w,x,y,A],C=/^(DIR|FILE|vector|(de|priority_)?queue|list|stack|(const_)?iterator|(multi)?(set|map)|bitset|u?(int|float)\d*)\b/,D="str",E="kwd",F="com",G="typ",H="lit",I="pun",J="pln",K="tag",L="dec",M="src",N="atn",O="atv",P="nocode",Q="(?:^^\\.?|[+-]|[!=]=?=?|\\#|%=?|&&?=?|\\(|\\*=?|[+\\-]=|->|\\/=?|::?|<<?=?|>>?>?=?|,|;|\\?|@|\\[|~|{|\\^\\^?=?|\\|\\|?=?|break|case|continue|delete|do|else|finally|instanceof|return|throw|try|typeof)\\s*",R=/\S/,S=f({keywords:B,hashComments:!0,cStyleComments:!0,multiLineStrings:!0,regexLiterals:!0}),T={};i(S,["default-code"]),i(e([],[[J,/^[^<?]+/],[L,/^<!\w[^>]*(?:>|$)/],[F,/^<\!--[\s\S]*?(?:-\->|$)/],["lang-",/^<\?([\s\S]+?)(?:\?>|$)/],["lang-",/^<%([\s\S]+?)(?:%>|$)/],[I,/^(?:<[%?]|[%?]>)/],["lang-",/^<xmp\b[^>]*>([\s\S]+?)<\/xmp\b[^>]*>/i],["lang-js",/^<script\b[^>]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-css",/^<style\b[^>]*>([\s\S]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i]]),["default-markup","htm","html","mxml","xhtml","xml","xsl"]),i(e([[J,/^[\s]+/,null," 	\r\n"],[O,/^(?:\"[^\"]*\"?|\'[^\']*\'?)/,null,"\"'"]],[[K,/^^<\/?[a-z](?:[\w.:-]*\w)?|\/?>$/i],[N,/^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i],["lang-uq.val",/^=\s*([^>\'\"\s]*(?:[^>\'\"\s\/]|\/(?=\s)))/],[I,/^[=<>\/]+/],["lang-js",/^on\w+\s*=\s*\"([^\"]+)\"/i],["lang-js",/^on\w+\s*=\s*\'([^\']+)\'/i],["lang-js",/^on\w+\s*=\s*([^\"\'>\s]+)/i],["lang-css",/^style\s*=\s*\"([^\"]+)\"/i],["lang-css",/^style\s*=\s*\'([^\']+)\'/i],["lang-css",/^style\s*=\s*([^\"\'>\s]+)/i]]),["in.tag"]),i(e([],[[O,/^[\s\S]+/]]),["uq.val"]),i(f({keywords:r,hashComments:!0,cStyleComments:!0,types:C}),["c","cc","cpp","cxx","cyc","m"]),i(f({keywords:"null,true,false"}),["json"]),i(f({keywords:t,hashComments:!0,cStyleComments:!0,verbatimStrings:!0,types:C}),["cs"]),i(f({keywords:s,cStyleComments:!0}),["java"]),i(f({keywords:A,hashComments:!0,multiLineStrings:!0}),["bash","bsh","csh","sh"]),i(f({keywords:x,hashComments:!0,multiLineStrings:!0,tripleQuotedStrings:!0}),["cv","py","python"]),i(f({keywords:w,hashComments:!0,multiLineStrings:!0,regexLiterals:2}),["perl","pl","pm"]),i(f({keywords:y,hashComments:!0,multiLineStrings:!0,regexLiterals:!0}),["rb","ruby"]),i(f({keywords:v,cStyleComments:!0,regexLiterals:!0}),["javascript","js"]),i(f({keywords:u,hashComments:3,cStyleComments:!0,multilineStrings:!0,tripleQuotedStrings:!0,regexLiterals:!0}),["coffee"]),i(f({keywords:z,cStyleComments:!0,multilineStrings:!0}),["rc","rs","rust"]),i(e([],[[D,/^[\s\S]+/]]),["regex"]);var U=n.PR={createSimpleLexer:e,registerLangHandler:i,sourceDecorator:f,PR_ATTRIB_NAME:N,PR_ATTRIB_VALUE:O,PR_COMMENT:F,PR_DECLARATION:L,PR_KEYWORD:E,PR_LITERAL:H,PR_NOCODE:P,PR_PLAIN:J,PR_PUNCTUATION:I,PR_SOURCE:M,PR_STRING:D,PR_TAG:K,PR_TYPE:G,prettyPrintOne:IN_GLOBAL_SCOPE?n.prettyPrintOne=l:prettyPrintOne=l,prettyPrint:prettyPrint=IN_GLOBAL_SCOPE?n.prettyPrint=m:prettyPrint=m};"function"==typeof define&&define.amd&&define("google-code-prettify",[],function(){return U})}();
\ No newline at end of file
diff --git a/NewLife.Cube/Content/ace/js/select2.min.js b/NewLife.Cube/Content/ace/js/select2.min.js
deleted file mode 100644
index 531417bff2..0000000000
--- a/NewLife.Cube/Content/ace/js/select2.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-!function(a){"undefined"==typeof a.fn.each2&&a.extend(a.fn,{each2:function(b){for(var c=a([0]),d=-1,e=this.length;++d<e&&(c.context=c[0]=this[d])&&b.call(c[0],d,c)!==!1;);return this}})}(jQuery),function(a,b){"use strict";function c(b){var c=a(document.createTextNode(""));b.before(c),c.before(b),c.remove()}function d(a){function b(a){return O[a]||a}return a.replace(/[^\u0000-\u007E]/g,b)}function e(a,b){for(var c=0,d=b.length;d>c;c+=1)if(g(a,b[c]))return c;return-1}function f(){var b=a(N);b.appendTo(document.body);var c={width:b.width()-b[0].clientWidth,height:b.height()-b[0].clientHeight};return b.remove(),c}function g(a,c){return a===c?!0:a===b||c===b?!1:null===a||null===c?!1:a.constructor===String?a+""==c+"":c.constructor===String?c+""==a+"":!1}function h(a,b,c){var d,e,f;if(null===a||a.length<1)return[];for(d=a.split(b),e=0,f=d.length;f>e;e+=1)d[e]=c(d[e]);return d}function i(a){return a.outerWidth(!1)-a.width()}function j(c){var d="keyup-change-value";c.on("keydown",function(){a.data(c,d)===b&&a.data(c,d,c.val())}),c.on("keyup",function(){var e=a.data(c,d);e!==b&&c.val()!==e&&(a.removeData(c,d),c.trigger("keyup-change"))})}function k(c){c.on("mousemove",function(c){var d=L;(d===b||d.x!==c.pageX||d.y!==c.pageY)&&a(c.target).trigger("mousemove-filtered",c)})}function l(a,c,d){d=d||b;var e;return function(){var b=arguments;window.clearTimeout(e),e=window.setTimeout(function(){c.apply(d,b)},a)}}function m(a,b){var c=l(a,function(a){b.trigger("scroll-debounced",a)});b.on("scroll",function(a){e(a.target,b.get())>=0&&c(a)})}function n(a){a[0]!==document.activeElement&&window.setTimeout(function(){var b,c=a[0],d=a.val().length;a.focus();var e=c.offsetWidth>0||c.offsetHeight>0;e&&c===document.activeElement&&(c.setSelectionRange?c.setSelectionRange(d,d):c.createTextRange&&(b=c.createTextRange(),b.collapse(!1),b.select()))},0)}function o(b){b=a(b)[0];var c=0,d=0;if("selectionStart"in b)c=b.selectionStart,d=b.selectionEnd-c;else if("selection"in document){b.focus();var e=document.selection.createRange();d=document.selection.createRange().text.length,e.moveStart("character",-b.value.length),c=e.text.length-d}return{offset:c,length:d}}function p(a){a.preventDefault(),a.stopPropagation()}function q(a){a.preventDefault(),a.stopImmediatePropagation()}function r(b){if(!I){var c=b[0].currentStyle||window.getComputedStyle(b[0],null);I=a(document.createElement("div")).css({position:"absolute",left:"-10000px",top:"-10000px",display:"none",fontSize:c.fontSize,fontFamily:c.fontFamily,fontStyle:c.fontStyle,fontWeight:c.fontWeight,letterSpacing:c.letterSpacing,textTransform:c.textTransform,whiteSpace:"nowrap"}),I.attr("class","select2-sizer"),a(document.body).append(I)}return I.text(b.val()),I.width()}function s(b,c,d){var e,f,g=[];e=a.trim(b.attr("class")),e&&(e=""+e,a(e.split(/\s+/)).each2(function(){0===this.indexOf("select2-")&&g.push(this)})),e=a.trim(c.attr("class")),e&&(e=""+e,a(e.split(/\s+/)).each2(function(){0!==this.indexOf("select2-")&&(f=d(this),f&&g.push(f))})),b.attr("class",g.join(" "))}function t(a,b,c,e){var f=d(a.toUpperCase()).indexOf(d(b.toUpperCase())),g=b.length;return 0>f?void c.push(e(a)):(c.push(e(a.substring(0,f))),c.push("<span class='select2-match'>"),c.push(e(a.substring(f,f+g))),c.push("</span>"),void c.push(e(a.substring(f+g,a.length))))}function u(a){var b={"\\":"&#92;","&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;","/":"&#47;"};return String(a).replace(/[&<>"'\/\\]/g,function(a){return b[a]})}function v(c){var d,e=null,f=c.quietMillis||100,g=c.url,h=this;return function(i){window.clearTimeout(d),d=window.setTimeout(function(){var d=c.data,f=g,j=c.transport||a.fn.select2.ajaxDefaults.transport,k={type:c.type||"GET",cache:c.cache||!1,jsonpCallback:c.jsonpCallback||b,dataType:c.dataType||"json"},l=a.extend({},a.fn.select2.ajaxDefaults.params,k);d=d?d.call(h,i.term,i.page,i.context):null,f="function"==typeof f?f.call(h,i.term,i.page,i.context):f,e&&"function"==typeof e.abort&&e.abort(),c.params&&(a.isFunction(c.params)?a.extend(l,c.params.call(h)):a.extend(l,c.params)),a.extend(l,{url:f,dataType:c.dataType,data:d,success:function(a){var b=c.results(a,i.page,i);i.callback(b)},error:function(a,b,c){var d={hasError:!0,jqXHR:a,textStatus:b,errorThrown:c};i.callback(d)}}),e=j.call(h,l)},f)}}function w(b){var c,d,e=b,f=function(a){return""+a.text};a.isArray(e)&&(d=e,e={results:d}),a.isFunction(e)===!1&&(d=e,e=function(){return d});var g=e();return g.text&&(f=g.text,a.isFunction(f)||(c=g.text,f=function(a){return a[c]})),function(b){var c,d=b.term,g={results:[]};return""===d?void b.callback(e()):(c=function(e,g){var h,i;if(e=e[0],e.children){h={};for(i in e)e.hasOwnProperty(i)&&(h[i]=e[i]);h.children=[],a(e.children).each2(function(a,b){c(b,h.children)}),(h.children.length||b.matcher(d,f(h),e))&&g.push(h)}else b.matcher(d,f(e),e)&&g.push(e)},a(e().results).each2(function(a,b){c(b,g.results)}),void b.callback(g))}}function x(c){var d=a.isFunction(c);return function(e){var f=e.term,g={results:[]},h=d?c(e):c;a.isArray(h)&&(a(h).each(function(){var a=this.text!==b,c=a?this.text:this;(""===f||e.matcher(f,c))&&g.results.push(a?this:{id:this,text:this})}),e.callback(g))}}function y(b,c){if(a.isFunction(b))return!0;if(!b)return!1;if("string"==typeof b)return!0;throw new Error(c+" must be a string, function, or falsy value")}function z(b,c){if(a.isFunction(b)){var d=Array.prototype.slice.call(arguments,2);return b.apply(c,d)}return b}function A(b){var c=0;return a.each(b,function(a,b){b.children?c+=A(b.children):c++}),c}function B(a,c,d,e){var f,h,i,j,k,l=a,m=!1;if(!e.createSearchChoice||!e.tokenSeparators||e.tokenSeparators.length<1)return b;for(;;){for(h=-1,i=0,j=e.tokenSeparators.length;j>i&&(k=e.tokenSeparators[i],h=a.indexOf(k),!(h>=0));i++);if(0>h)break;if(f=a.substring(0,h),a=a.substring(h+k.length),f.length>0&&(f=e.createSearchChoice.call(this,f,c),f!==b&&null!==f&&e.id(f)!==b&&null!==e.id(f))){for(m=!1,i=0,j=c.length;j>i;i++)if(g(e.id(f),e.id(c[i]))){m=!0;break}m||d(f)}}return l!==a?a:void 0}function C(){var b=this;a.each(arguments,function(a,c){b[c].remove(),b[c]=null})}function D(b,c){var d=function(){};return d.prototype=new b,d.prototype.constructor=d,d.prototype.parent=b.prototype,d.prototype=a.extend(d.prototype,c),d}if(window.Select2===b){var E,F,G,H,I,J,K,L={x:0,y:0},M={TAB:9,ENTER:13,ESC:27,SPACE:32,LEFT:37,UP:38,RIGHT:39,DOWN:40,SHIFT:16,CTRL:17,ALT:18,PAGE_UP:33,PAGE_DOWN:34,HOME:36,END:35,BACKSPACE:8,DELETE:46,isArrow:function(a){switch(a=a.which?a.which:a){case M.LEFT:case M.RIGHT:case M.UP:case M.DOWN:return!0}return!1},isControl:function(a){var b=a.which;switch(b){case M.SHIFT:case M.CTRL:case M.ALT:return!0}return a.metaKey?!0:!1},isFunctionKey:function(a){return a=a.which?a.which:a,a>=112&&123>=a}},N="<div class='select2-measure-scrollbar'></div>",O={"Ⓐ":"A","Ａ":"A","À":"A","Á":"A","Â":"A","Ầ":"A","Ấ":"A","Ẫ":"A","Ẩ":"A","Ã":"A","Ā":"A","Ă":"A","Ằ":"A","Ắ":"A","Ẵ":"A","Ẳ":"A","Ȧ":"A","Ǡ":"A","Ä":"A","Ǟ":"A","Ả":"A","Å":"A","Ǻ":"A","Ǎ":"A","Ȁ":"A","Ȃ":"A","Ạ":"A","Ậ":"A","Ặ":"A","Ḁ":"A","Ą":"A","Ⱥ":"A","Ɐ":"A","Ꜳ":"AA","Æ":"AE","Ǽ":"AE","Ǣ":"AE","Ꜵ":"AO","Ꜷ":"AU","Ꜹ":"AV","Ꜻ":"AV","Ꜽ":"AY","Ⓑ":"B","Ｂ":"B","Ḃ":"B","Ḅ":"B","Ḇ":"B","Ƀ":"B","Ƃ":"B","Ɓ":"B","Ⓒ":"C","Ｃ":"C","Ć":"C","Ĉ":"C","Ċ":"C","Č":"C","Ç":"C","Ḉ":"C","Ƈ":"C","Ȼ":"C","Ꜿ":"C","Ⓓ":"D","Ｄ":"D","Ḋ":"D","Ď":"D","Ḍ":"D","Ḑ":"D","Ḓ":"D","Ḏ":"D","Đ":"D","Ƌ":"D","Ɗ":"D","Ɖ":"D","Ꝺ":"D","Ǳ":"DZ","Ǆ":"DZ","ǲ":"Dz","ǅ":"Dz","Ⓔ":"E","Ｅ":"E","È":"E","É":"E","Ê":"E","Ề":"E","Ế":"E","Ễ":"E","Ể":"E","Ẽ":"E","Ē":"E","Ḕ":"E","Ḗ":"E","Ĕ":"E","Ė":"E","Ë":"E","Ẻ":"E","Ě":"E","Ȅ":"E","Ȇ":"E","Ẹ":"E","Ệ":"E","Ȩ":"E","Ḝ":"E","Ę":"E","Ḙ":"E","Ḛ":"E","Ɛ":"E","Ǝ":"E","Ⓕ":"F","Ｆ":"F","Ḟ":"F","Ƒ":"F","Ꝼ":"F","Ⓖ":"G","Ｇ":"G","Ǵ":"G","Ĝ":"G","Ḡ":"G","Ğ":"G","Ġ":"G","Ǧ":"G","Ģ":"G","Ǥ":"G","Ɠ":"G","Ꞡ":"G","Ᵹ":"G","Ꝿ":"G","Ⓗ":"H","Ｈ":"H","Ĥ":"H","Ḣ":"H","Ḧ":"H","Ȟ":"H","Ḥ":"H","Ḩ":"H","Ḫ":"H","Ħ":"H","Ⱨ":"H","Ⱶ":"H","Ɥ":"H","Ⓘ":"I","Ｉ":"I","Ì":"I","Í":"I","Î":"I","Ĩ":"I","Ī":"I","Ĭ":"I","İ":"I","Ï":"I","Ḯ":"I","Ỉ":"I","Ǐ":"I","Ȉ":"I","Ȋ":"I","Ị":"I","Į":"I","Ḭ":"I","Ɨ":"I","Ⓙ":"J","Ｊ":"J","Ĵ":"J","Ɉ":"J","Ⓚ":"K","Ｋ":"K","Ḱ":"K","Ǩ":"K","Ḳ":"K","Ķ":"K","Ḵ":"K","Ƙ":"K","Ⱪ":"K","Ꝁ":"K","Ꝃ":"K","Ꝅ":"K","Ꞣ":"K","Ⓛ":"L","Ｌ":"L","Ŀ":"L","Ĺ":"L","Ľ":"L","Ḷ":"L","Ḹ":"L","Ļ":"L","Ḽ":"L","Ḻ":"L","Ł":"L","Ƚ":"L","Ɫ":"L","Ⱡ":"L","Ꝉ":"L","Ꝇ":"L","Ꞁ":"L","Ǉ":"LJ","ǈ":"Lj","Ⓜ":"M","Ｍ":"M","Ḿ":"M","Ṁ":"M","Ṃ":"M","Ɱ":"M","Ɯ":"M","Ⓝ":"N","Ｎ":"N","Ǹ":"N","Ń":"N","Ñ":"N","Ṅ":"N","Ň":"N","Ṇ":"N","Ņ":"N","Ṋ":"N","Ṉ":"N","Ƞ":"N","Ɲ":"N","Ꞑ":"N","Ꞥ":"N","Ǌ":"NJ","ǋ":"Nj","Ⓞ":"O","Ｏ":"O","Ò":"O","Ó":"O","Ô":"O","Ồ":"O","Ố":"O","Ỗ":"O","Ổ":"O","Õ":"O","Ṍ":"O","Ȭ":"O","Ṏ":"O","Ō":"O","Ṑ":"O","Ṓ":"O","Ŏ":"O","Ȯ":"O","Ȱ":"O","Ö":"O","Ȫ":"O","Ỏ":"O","Ő":"O","Ǒ":"O","Ȍ":"O","Ȏ":"O","Ơ":"O","Ờ":"O","Ớ":"O","Ỡ":"O","Ở":"O","Ợ":"O","Ọ":"O","Ộ":"O","Ǫ":"O","Ǭ":"O","Ø":"O","Ǿ":"O","Ɔ":"O","Ɵ":"O","Ꝋ":"O","Ꝍ":"O","Ƣ":"OI","Ꝏ":"OO","Ȣ":"OU","Ⓟ":"P","Ｐ":"P","Ṕ":"P","Ṗ":"P","Ƥ":"P","Ᵽ":"P","Ꝑ":"P","Ꝓ":"P","Ꝕ":"P","Ⓠ":"Q","Ｑ":"Q","Ꝗ":"Q","Ꝙ":"Q","Ɋ":"Q","Ⓡ":"R","Ｒ":"R","Ŕ":"R","Ṙ":"R","Ř":"R","Ȑ":"R","Ȓ":"R","Ṛ":"R","Ṝ":"R","Ŗ":"R","Ṟ":"R","Ɍ":"R","Ɽ":"R","Ꝛ":"R","Ꞧ":"R","Ꞃ":"R","Ⓢ":"S","Ｓ":"S","ẞ":"S","Ś":"S","Ṥ":"S","Ŝ":"S","Ṡ":"S","Š":"S","Ṧ":"S","Ṣ":"S","Ṩ":"S","Ș":"S","Ş":"S","Ȿ":"S","Ꞩ":"S","Ꞅ":"S","Ⓣ":"T","Ｔ":"T","Ṫ":"T","Ť":"T","Ṭ":"T","Ț":"T","Ţ":"T","Ṱ":"T","Ṯ":"T","Ŧ":"T","Ƭ":"T","Ʈ":"T","Ⱦ":"T","Ꞇ":"T","Ꜩ":"TZ","Ⓤ":"U","Ｕ":"U","Ù":"U","Ú":"U","Û":"U","Ũ":"U","Ṹ":"U","Ū":"U","Ṻ":"U","Ŭ":"U","Ü":"U","Ǜ":"U","Ǘ":"U","Ǖ":"U","Ǚ":"U","Ủ":"U","Ů":"U","Ű":"U","Ǔ":"U","Ȕ":"U","Ȗ":"U","Ư":"U","Ừ":"U","Ứ":"U","Ữ":"U","Ử":"U","Ự":"U","Ụ":"U","Ṳ":"U","Ų":"U","Ṷ":"U","Ṵ":"U","Ʉ":"U","Ⓥ":"V","Ｖ":"V","Ṽ":"V","Ṿ":"V","Ʋ":"V","Ꝟ":"V","Ʌ":"V","Ꝡ":"VY","Ⓦ":"W","Ｗ":"W","Ẁ":"W","Ẃ":"W","Ŵ":"W","Ẇ":"W","Ẅ":"W","Ẉ":"W","Ⱳ":"W","Ⓧ":"X","Ｘ":"X","Ẋ":"X","Ẍ":"X","Ⓨ":"Y","Ｙ":"Y","Ỳ":"Y","Ý":"Y","Ŷ":"Y","Ỹ":"Y","Ȳ":"Y","Ẏ":"Y","Ÿ":"Y","Ỷ":"Y","Ỵ":"Y","Ƴ":"Y","Ɏ":"Y","Ỿ":"Y","Ⓩ":"Z","Ｚ":"Z","Ź":"Z","Ẑ":"Z","Ż":"Z","Ž":"Z","Ẓ":"Z","Ẕ":"Z","Ƶ":"Z","Ȥ":"Z","Ɀ":"Z","Ⱬ":"Z","Ꝣ":"Z","ⓐ":"a","ａ":"a","ẚ":"a","à":"a","á":"a","â":"a","ầ":"a","ấ":"a","ẫ":"a","ẩ":"a","ã":"a","ā":"a","ă":"a","ằ":"a","ắ":"a","ẵ":"a","ẳ":"a","ȧ":"a","ǡ":"a","ä":"a","ǟ":"a","ả":"a","å":"a","ǻ":"a","ǎ":"a","ȁ":"a","ȃ":"a","ạ":"a","ậ":"a","ặ":"a","ḁ":"a","ą":"a","ⱥ":"a","ɐ":"a","ꜳ":"aa","æ":"ae","ǽ":"ae","ǣ":"ae","ꜵ":"ao","ꜷ":"au","ꜹ":"av","ꜻ":"av","ꜽ":"ay","ⓑ":"b","ｂ":"b","ḃ":"b","ḅ":"b","ḇ":"b","ƀ":"b","ƃ":"b","ɓ":"b","ⓒ":"c","ｃ":"c","ć":"c","ĉ":"c","ċ":"c","č":"c","ç":"c","ḉ":"c","ƈ":"c","ȼ":"c","ꜿ":"c","ↄ":"c","ⓓ":"d","ｄ":"d","ḋ":"d","ď":"d","ḍ":"d","ḑ":"d","ḓ":"d","ḏ":"d","đ":"d","ƌ":"d","ɖ":"d","ɗ":"d","ꝺ":"d","ǳ":"dz","ǆ":"dz","ⓔ":"e","ｅ":"e","è":"e","é":"e","ê":"e","ề":"e","ế":"e","ễ":"e","ể":"e","ẽ":"e","ē":"e","ḕ":"e","ḗ":"e","ĕ":"e","ė":"e","ë":"e","ẻ":"e","ě":"e","ȅ":"e","ȇ":"e","ẹ":"e","ệ":"e","ȩ":"e","ḝ":"e","ę":"e","ḙ":"e","ḛ":"e","ɇ":"e","ɛ":"e","ǝ":"e","ⓕ":"f","ｆ":"f","ḟ":"f","ƒ":"f","ꝼ":"f","ⓖ":"g","ｇ":"g","ǵ":"g","ĝ":"g","ḡ":"g","ğ":"g","ġ":"g","ǧ":"g","ģ":"g","ǥ":"g","ɠ":"g","ꞡ":"g","ᵹ":"g","ꝿ":"g","ⓗ":"h","ｈ":"h","ĥ":"h","ḣ":"h","ḧ":"h","ȟ":"h","ḥ":"h","ḩ":"h","ḫ":"h","ẖ":"h","ħ":"h","ⱨ":"h","ⱶ":"h","ɥ":"h","ƕ":"hv","ⓘ":"i","ｉ":"i","ì":"i","í":"i","î":"i","ĩ":"i","ī":"i","ĭ":"i","ï":"i","ḯ":"i","ỉ":"i","ǐ":"i","ȉ":"i","ȋ":"i","ị":"i","į":"i","ḭ":"i","ɨ":"i","ı":"i","ⓙ":"j","ｊ":"j","ĵ":"j","ǰ":"j","ɉ":"j","ⓚ":"k","ｋ":"k","ḱ":"k","ǩ":"k","ḳ":"k","ķ":"k","ḵ":"k","ƙ":"k","ⱪ":"k","ꝁ":"k","ꝃ":"k","ꝅ":"k","ꞣ":"k","ⓛ":"l","ｌ":"l","ŀ":"l","ĺ":"l","ľ":"l","ḷ":"l","ḹ":"l","ļ":"l","ḽ":"l","ḻ":"l","ſ":"l","ł":"l","ƚ":"l","ɫ":"l","ⱡ":"l","ꝉ":"l","ꞁ":"l","ꝇ":"l","ǉ":"lj","ⓜ":"m","ｍ":"m","ḿ":"m","ṁ":"m","ṃ":"m","ɱ":"m","ɯ":"m","ⓝ":"n","ｎ":"n","ǹ":"n","ń":"n","ñ":"n","ṅ":"n","ň":"n","ṇ":"n","ņ":"n","ṋ":"n","ṉ":"n","ƞ":"n","ɲ":"n","ŉ":"n","ꞑ":"n","ꞥ":"n","ǌ":"nj","ⓞ":"o","ｏ":"o","ò":"o","ó":"o","ô":"o","ồ":"o","ố":"o","ỗ":"o","ổ":"o","õ":"o","ṍ":"o","ȭ":"o","ṏ":"o","ō":"o","ṑ":"o","ṓ":"o","ŏ":"o","ȯ":"o","ȱ":"o","ö":"o","ȫ":"o","ỏ":"o","ő":"o","ǒ":"o","ȍ":"o","ȏ":"o","ơ":"o","ờ":"o","ớ":"o","ỡ":"o","ở":"o","ợ":"o","ọ":"o","ộ":"o","ǫ":"o","ǭ":"o","ø":"o","ǿ":"o","ɔ":"o","ꝋ":"o","ꝍ":"o","ɵ":"o","ƣ":"oi","ȣ":"ou","ꝏ":"oo","ⓟ":"p","ｐ":"p","ṕ":"p","ṗ":"p","ƥ":"p","ᵽ":"p","ꝑ":"p","ꝓ":"p","ꝕ":"p","ⓠ":"q","ｑ":"q","ɋ":"q","ꝗ":"q","ꝙ":"q","ⓡ":"r","ｒ":"r","ŕ":"r","ṙ":"r","ř":"r","ȑ":"r","ȓ":"r","ṛ":"r","ṝ":"r","ŗ":"r","ṟ":"r","ɍ":"r","ɽ":"r","ꝛ":"r","ꞧ":"r","ꞃ":"r","ⓢ":"s","ｓ":"s","ß":"s","ś":"s","ṥ":"s","ŝ":"s","ṡ":"s","š":"s","ṧ":"s","ṣ":"s","ṩ":"s","ș":"s","ş":"s","ȿ":"s","ꞩ":"s","ꞅ":"s","ẛ":"s","ⓣ":"t","ｔ":"t","ṫ":"t","ẗ":"t","ť":"t","ṭ":"t","ț":"t","ţ":"t","ṱ":"t","ṯ":"t","ŧ":"t","ƭ":"t","ʈ":"t","ⱦ":"t","ꞇ":"t","ꜩ":"tz","ⓤ":"u","ｕ":"u","ù":"u","ú":"u","û":"u","ũ":"u","ṹ":"u","ū":"u","ṻ":"u","ŭ":"u","ü":"u","ǜ":"u","ǘ":"u","ǖ":"u","ǚ":"u","ủ":"u","ů":"u","ű":"u","ǔ":"u","ȕ":"u","ȗ":"u","ư":"u","ừ":"u","ứ":"u","ữ":"u","ử":"u","ự":"u","ụ":"u","ṳ":"u","ų":"u","ṷ":"u","ṵ":"u","ʉ":"u","ⓥ":"v","ｖ":"v","ṽ":"v","ṿ":"v","ʋ":"v","ꝟ":"v","ʌ":"v","ꝡ":"vy","ⓦ":"w","ｗ":"w","ẁ":"w","ẃ":"w","ŵ":"w","ẇ":"w","ẅ":"w","ẘ":"w","ẉ":"w","ⱳ":"w","ⓧ":"x","ｘ":"x","ẋ":"x","ẍ":"x","ⓨ":"y","ｙ":"y","ỳ":"y","ý":"y","ŷ":"y","ỹ":"y","ȳ":"y","ẏ":"y","ÿ":"y","ỷ":"y","ẙ":"y","ỵ":"y","ƴ":"y","ɏ":"y","ỿ":"y","ⓩ":"z","ｚ":"z","ź":"z","ẑ":"z","ż":"z","ž":"z","ẓ":"z","ẕ":"z","ƶ":"z","ȥ":"z","ɀ":"z","ⱬ":"z","ꝣ":"z","Ά":"Α","Έ":"Ε","Ή":"Η","Ί":"Ι","Ϊ":"Ι","Ό":"Ο","Ύ":"Υ","Ϋ":"Υ","Ώ":"Ω","ά":"α","έ":"ε","ή":"η","ί":"ι","ϊ":"ι","ΐ":"ι","ό":"ο","ύ":"υ","ϋ":"υ","ΰ":"υ","ω":"ω","ς":"σ"};J=a(document),H=function(){var a=1;return function(){return a++}}(),E=D(Object,{bind:function(a){var b=this;return function(){a.apply(b,arguments)}},init:function(c){var d,e,g=".select2-results";this.opts=c=this.prepareOpts(c),this.id=c.id,c.element.data("select2")!==b&&null!==c.element.data("select2")&&c.element.data("select2").destroy(),this.container=this.createContainer(),this.liveRegion=a(".select2-hidden-accessible"),0==this.liveRegion.length&&(this.liveRegion=a("<span>",{role:"status","aria-live":"polite"}).addClass("select2-hidden-accessible").appendTo(document.body)),this.containerId="s2id_"+(c.element.attr("id")||"autogen"+H()),this.containerEventName=this.containerId.replace(/([.])/g,"_").replace(/([;&,\-\.\+\*\~':"\!\^#$%@\[\]\(\)=>\|])/g,"\\$1"),this.container.attr("id",this.containerId),this.container.attr("title",c.element.attr("title")),this.body=a(document.body),s(this.container,this.opts.element,this.opts.adaptContainerCssClass),this.container.attr("style",c.element.attr("style")),this.container.css(z(c.containerCss,this.opts.element)),this.container.addClass(z(c.containerCssClass,this.opts.element)),this.elementTabIndex=this.opts.element.attr("tabindex"),this.opts.element.data("select2",this).attr("tabindex","-1").before(this.container).on("click.select2",p),this.container.data("select2",this),this.dropdown=this.container.find(".select2-drop"),s(this.dropdown,this.opts.element,this.opts.adaptDropdownCssClass),this.dropdown.addClass(z(c.dropdownCssClass,this.opts.element)),this.dropdown.data("select2",this),this.dropdown.on("click",p),this.results=d=this.container.find(g),this.search=e=this.container.find("input.select2-input"),this.queryCount=0,this.resultsPage=0,this.context=null,this.initContainer(),this.container.on("click",p),k(this.results),this.dropdown.on("mousemove-filtered",g,this.bind(this.highlightUnderEvent)),this.dropdown.on("touchstart touchmove touchend",g,this.bind(function(a){this._touchEvent=!0,this.highlightUnderEvent(a)})),this.dropdown.on("touchmove",g,this.bind(this.touchMoved)),this.dropdown.on("touchstart touchend",g,this.bind(this.clearTouchMoved)),this.dropdown.on("click",this.bind(function(){this._touchEvent&&(this._touchEvent=!1,this.selectHighlighted())})),m(80,this.results),this.dropdown.on("scroll-debounced",g,this.bind(this.loadMoreIfNeeded)),a(this.container).on("change",".select2-input",function(a){a.stopPropagation()}),a(this.dropdown).on("change",".select2-input",function(a){a.stopPropagation()}),a.fn.mousewheel&&d.mousewheel(function(a,b,c,e){var f=d.scrollTop();e>0&&0>=f-e?(d.scrollTop(0),p(a)):0>e&&d.get(0).scrollHeight-d.scrollTop()+e<=d.height()&&(d.scrollTop(d.get(0).scrollHeight-d.height()),p(a))}),j(e),e.on("keyup-change input paste",this.bind(this.updateResults)),e.on("focus",function(){e.addClass("select2-focused")}),e.on("blur",function(){e.removeClass("select2-focused")}),this.dropdown.on("mouseup",g,this.bind(function(b){a(b.target).closest(".select2-result-selectable").length>0&&(this.highlightUnderEvent(b),this.selectHighlighted(b))})),this.dropdown.on("click mouseup mousedown touchstart touchend focusin",function(a){a.stopPropagation()}),this.nextSearchTerm=b,a.isFunction(this.opts.initSelection)&&(this.initSelection(),this.monitorSource()),null!==c.maximumInputLength&&this.search.attr("maxlength",c.maximumInputLength);var h=c.element.prop("disabled");h===b&&(h=!1),this.enable(!h);var i=c.element.prop("readonly");i===b&&(i=!1),this.readonly(i),K=K||f(),this.autofocus=c.element.prop("autofocus"),c.element.prop("autofocus",!1),this.autofocus&&this.focus(),this.search.attr("placeholder",c.searchInputPlaceholder)},destroy:function(){var a=this.opts.element,c=a.data("select2"),d=this;this.close(),a.length&&a[0].detachEvent&&d._sync&&a.each(function(){d._sync&&this.detachEvent("onpropertychange",d._sync)}),this.propertyObserver&&(this.propertyObserver.disconnect(),this.propertyObserver=null),this._sync=null,c!==b&&(c.container.remove(),c.liveRegion.remove(),c.dropdown.remove(),a.show().removeData("select2").off(".select2").prop("autofocus",this.autofocus||!1),this.elementTabIndex?a.attr({tabindex:this.elementTabIndex}):a.removeAttr("tabindex"),a.show()),C.call(this,"container","liveRegion","dropdown","results","search")},optionToData:function(a){return a.is("option")?{id:a.prop("value"),text:a.text(),element:a.get(),css:a.attr("class"),disabled:a.prop("disabled"),locked:g(a.attr("locked"),"locked")||g(a.data("locked"),!0)}:a.is("optgroup")?{text:a.attr("label"),children:[],element:a.get(),css:a.attr("class")}:void 0},prepareOpts:function(c){var d,e,f,i,j=this;if(d=c.element,"select"===d.get(0).tagName.toLowerCase()&&(this.select=e=c.element),e&&a.each(["id","multiple","ajax","query","createSearchChoice","initSelection","data","tags"],function(){if(this in c)throw new Error("Option '"+this+"' is not allowed for Select2 when attached to a <select> element.")}),c=a.extend({},{populateResults:function(d,e,f){var g,h=this.opts.id,i=this.liveRegion;(g=function(d,e,k){var l,m,n,o,p,q,r,s,t,u;d=c.sortResults(d,e,f);var v=[];for(l=0,m=d.length;m>l;l+=1)n=d[l],p=n.disabled===!0,o=!p&&h(n)!==b,q=n.children&&n.children.length>0,r=a("<li></li>"),r.addClass("select2-results-dept-"+k),r.addClass("select2-result"),r.addClass(o?"select2-result-selectable":"select2-result-unselectable"),p&&r.addClass("select2-disabled"),q&&r.addClass("select2-result-with-children"),r.addClass(j.opts.formatResultCssClass(n)),r.attr("role","presentation"),s=a(document.createElement("div")),s.addClass("select2-result-label"),s.attr("id","select2-result-label-"+H()),s.attr("role","option"),u=c.formatResult(n,s,f,j.opts.escapeMarkup),u!==b&&(s.html(u),r.append(s)),q&&(t=a("<ul></ul>"),t.addClass("select2-result-sub"),g(n.children,t,k+1),r.append(t)),r.data("select2-data",n),v.push(r[0]);e.append(v),i.text(c.formatMatches(d.length))})(e,d,0)}},a.fn.select2.defaults,c),"function"!=typeof c.id&&(f=c.id,c.id=function(a){return a[f]}),a.isArray(c.element.data("select2Tags"))){if("tags"in c)throw"tags specified as both an attribute 'data-select2-tags' and in options of Select2 "+c.element.attr("id");c.tags=c.element.data("select2Tags")}if(e?(c.query=this.bind(function(a){var c,e,f,g={results:[],more:!1},h=a.term;f=function(b,c){var d;b.is("option")?a.matcher(h,b.text(),b)&&c.push(j.optionToData(b)):b.is("optgroup")&&(d=j.optionToData(b),b.children().each2(function(a,b){f(b,d.children)}),d.children.length>0&&c.push(d))},c=d.children(),this.getPlaceholder()!==b&&c.length>0&&(e=this.getPlaceholderOption(),e&&(c=c.not(e))),c.each2(function(a,b){f(b,g.results)}),a.callback(g)}),c.id=function(a){return a.id}):"query"in c||("ajax"in c?(i=c.element.data("ajax-url"),i&&i.length>0&&(c.ajax.url=i),c.query=v.call(c.element,c.ajax)):"data"in c?c.query=w(c.data):"tags"in c&&(c.query=x(c.tags),c.createSearchChoice===b&&(c.createSearchChoice=function(b){return{id:a.trim(b),text:a.trim(b)}}),c.initSelection===b&&(c.initSelection=function(b,d){var e=[];a(h(b.val(),c.separator,c.transformVal)).each(function(){var b={id:this,text:this},d=c.tags;a.isFunction(d)&&(d=d()),a(d).each(function(){return g(this.id,b.id)?(b=this,!1):void 0}),e.push(b)}),d(e)}))),"function"!=typeof c.query)throw"query function not defined for Select2 "+c.element.attr("id");if("top"===c.createSearchChoicePosition)c.createSearchChoicePosition=function(a,b){a.unshift(b)};else if("bottom"===c.createSearchChoicePosition)c.createSearchChoicePosition=function(a,b){a.push(b)};else if("function"!=typeof c.createSearchChoicePosition)throw"invalid createSearchChoicePosition option must be 'top', 'bottom' or a custom function";return c},monitorSource:function(){var c,d=this.opts.element,e=this;d.on("change.select2",this.bind(function(){this.opts.element.data("select2-change-triggered")!==!0&&this.initSelection()})),this._sync=this.bind(function(){var a=d.prop("disabled");a===b&&(a=!1),this.enable(!a);var c=d.prop("readonly");c===b&&(c=!1),this.readonly(c),this.container&&(s(this.container,this.opts.element,this.opts.adaptContainerCssClass),this.container.addClass(z(this.opts.containerCssClass,this.opts.element))),this.dropdown&&(s(this.dropdown,this.opts.element,this.opts.adaptDropdownCssClass),this.dropdown.addClass(z(this.opts.dropdownCssClass,this.opts.element)))}),d.length&&d[0].attachEvent&&d.each(function(){this.attachEvent("onpropertychange",e._sync)}),c=window.MutationObserver||window.WebKitMutationObserver||window.MozMutationObserver,c!==b&&(this.propertyObserver&&(delete this.propertyObserver,this.propertyObserver=null),this.propertyObserver=new c(function(b){a.each(b,e._sync)}),this.propertyObserver.observe(d.get(0),{attributes:!0,subtree:!1}))},triggerSelect:function(b){var c=a.Event("select2-selecting",{val:this.id(b),object:b,choice:b});return this.opts.element.trigger(c),!c.isDefaultPrevented()},triggerChange:function(b){b=b||{},b=a.extend({},b,{type:"change",val:this.val()}),this.opts.element.data("select2-change-triggered",!0),this.opts.element.trigger(b),this.opts.element.data("select2-change-triggered",!1),this.opts.element.click(),this.opts.blurOnChange&&this.opts.element.blur()},isInterfaceEnabled:function(){return this.enabledInterface===!0},enableInterface:function(){var a=this._enabled&&!this._readonly,b=!a;return a===this.enabledInterface?!1:(this.container.toggleClass("select2-container-disabled",b),this.close(),this.enabledInterface=a,!0)},enable:function(a){a===b&&(a=!0),this._enabled!==a&&(this._enabled=a,this.opts.element.prop("disabled",!a),this.enableInterface())},disable:function(){this.enable(!1)},readonly:function(a){a===b&&(a=!1),this._readonly!==a&&(this._readonly=a,this.opts.element.prop("readonly",a),this.enableInterface())},opened:function(){return this.container?this.container.hasClass("select2-dropdown-open"):!1},positionDropdown:function(){var b,c,d,e,f,g=this.dropdown,h=this.container,i=h.offset(),j=h.outerHeight(!1),k=h.outerWidth(!1),l=g.outerHeight(!1),m=a(window),n=m.width(),o=m.height(),p=m.scrollLeft()+n,q=m.scrollTop()+o,r=i.top+j,s=i.left,t=q>=r+l,u=i.top-l>=m.scrollTop(),v=g.outerWidth(!1),w=function(){return p>=s+v},x=function(){return i.left+p+h.outerWidth(!1)>v},y=g.hasClass("select2-drop-above");y?(c=!0,!u&&t&&(d=!0,c=!1)):(c=!1,!t&&u&&(d=!0,c=!0)),d&&(g.hide(),i=this.container.offset(),j=this.container.outerHeight(!1),k=this.container.outerWidth(!1),l=g.outerHeight(!1),p=m.scrollLeft()+n,q=m.scrollTop()+o,r=i.top+j,s=i.left,v=g.outerWidth(!1),g.show(),this.focusSearch()),this.opts.dropdownAutoWidth?(f=a(".select2-results",g)[0],g.addClass("select2-drop-auto-width"),g.css("width",""),v=g.outerWidth(!1)+(f.scrollHeight===f.clientHeight?0:K.width),v>k?k=v:v=k,l=g.outerHeight(!1)):this.container.removeClass("select2-drop-auto-width"),"static"!==this.body.css("position")&&(b=this.body.offset(),r-=b.top,s-=b.left),!w()&&x()&&(s=i.left+this.container.outerWidth(!1)-v),e={left:s,width:k},c?(e.top=i.top-l,e.bottom="auto",this.container.addClass("select2-drop-above"),g.addClass("select2-drop-above")):(e.top=r,e.bottom="auto",this.container.removeClass("select2-drop-above"),g.removeClass("select2-drop-above")),e=a.extend(e,z(this.opts.dropdownCss,this.opts.element)),g.css(e)},shouldOpen:function(){var b;return this.opened()?!1:this._enabled===!1||this._readonly===!0?!1:(b=a.Event("select2-opening"),this.opts.element.trigger(b),!b.isDefaultPrevented())},clearDropdownAlignmentPreference:function(){this.container.removeClass("select2-drop-above"),this.dropdown.removeClass("select2-drop-above")},open:function(){return this.shouldOpen()?(this.opening(),J.on("mousemove.select2Event",function(a){L.x=a.pageX,L.y=a.pageY}),!0):!1},opening:function(){var b,d=this.containerEventName,e="scroll."+d,f="resize."+d,g="orientationchange."+d;this.container.addClass("select2-dropdown-open").addClass("select2-container-active"),this.clearDropdownAlignmentPreference(),this.dropdown[0]!==this.body.children().last()[0]&&this.dropdown.detach().appendTo(this.body),b=a("#select2-drop-mask"),0===b.length&&(b=a(document.createElement("div")),b.attr("id","select2-drop-mask").attr("class","select2-drop-mask"),b.hide(),b.appendTo(this.body),b.on("mousedown touchstart click",function(d){c(b);var e,f=a("#select2-drop");f.length>0&&(e=f.data("select2"),e.opts.selectOnBlur&&e.selectHighlighted({noFocus:!0}),e.close(),d.preventDefault(),d.stopPropagation())})),this.dropdown.prev()[0]!==b[0]&&this.dropdown.before(b),a("#select2-drop").removeAttr("id"),this.dropdown.attr("id","select2-drop"),b.show(),this.positionDropdown(),this.dropdown.show(),this.positionDropdown(),this.dropdown.addClass("select2-drop-active");var h=this;this.container.parents().add(window).each(function(){a(this).on(f+" "+e+" "+g,function(){h.opened()&&h.positionDropdown()})})},close:function(){if(this.opened()){var b=this.containerEventName,c="scroll."+b,d="resize."+b,e="orientationchange."+b;this.container.parents().add(window).each(function(){a(this).off(c).off(d).off(e)}),this.clearDropdownAlignmentPreference(),a("#select2-drop-mask").hide(),this.dropdown.removeAttr("id"),this.dropdown.hide(),this.container.removeClass("select2-dropdown-open").removeClass("select2-container-active"),this.results.empty(),J.off("mousemove.select2Event"),this.clearSearch(),this.search.removeClass("select2-active"),this.opts.element.trigger(a.Event("select2-close"))}},externalSearch:function(a){this.open(),this.search.val(a),this.updateResults(!1)},clearSearch:function(){},getMaximumSelectionSize:function(){return z(this.opts.maximumSelectionSize,this.opts.element)},ensureHighlightVisible:function(){var b,c,d,e,f,g,h,i,j=this.results;if(c=this.highlight(),!(0>c)){if(0==c)return void j.scrollTop(0);b=this.findHighlightableChoices().find(".select2-result-label"),d=a(b[c]),i=(d.offset()||{}).top||0,e=i+d.outerHeight(!0),c===b.length-1&&(h=j.find("li.select2-more-results"),h.length>0&&(e=h.offset().top+h.outerHeight(!0))),f=j.offset().top+j.outerHeight(!1),e>f&&j.scrollTop(j.scrollTop()+(e-f)),g=i-j.offset().top,0>g&&"none"!=d.css("display")&&j.scrollTop(j.scrollTop()+g)}},findHighlightableChoices:function(){return this.results.find(".select2-result-selectable:not(.select2-disabled):not(.select2-selected)")},moveHighlight:function(b){for(var c=this.findHighlightableChoices(),d=this.highlight();d>-1&&d<c.length;){d+=b;var e=a(c[d]);if(e.hasClass("select2-result-selectable")&&!e.hasClass("select2-disabled")&&!e.hasClass("select2-selected")){this.highlight(d);break}}},highlight:function(b){var c,d,f=this.findHighlightableChoices();return 0===arguments.length?e(f.filter(".select2-highlighted")[0],f.get()):(b>=f.length&&(b=f.length-1),0>b&&(b=0),this.removeHighlight(),c=a(f[b]),c.addClass("select2-highlighted"),this.search.attr("aria-activedescendant",c.find(".select2-result-label").attr("id")),this.ensureHighlightVisible(),this.liveRegion.text(c.text()),d=c.data("select2-data"),void(d&&this.opts.element.trigger({type:"select2-highlight",val:this.id(d),choice:d})))},removeHighlight:function(){this.results.find(".select2-highlighted").removeClass("select2-highlighted")},touchMoved:function(){this._touchMoved=!0},clearTouchMoved:function(){this._touchMoved=!1},countSelectableResults:function(){return this.findHighlightableChoices().length},highlightUnderEvent:function(b){var c=a(b.target).closest(".select2-result-selectable");if(c.length>0&&!c.is(".select2-highlighted")){var d=this.findHighlightableChoices();this.highlight(d.index(c))}else 0==c.length&&this.removeHighlight()},loadMoreIfNeeded:function(){var a,b=this.results,c=b.find("li.select2-more-results"),d=this.resultsPage+1,e=this,f=this.search.val(),g=this.context;0!==c.length&&(a=c.offset().top-b.offset().top-b.height(),a<=this.opts.loadMorePadding&&(c.addClass("select2-active"),this.opts.query({element:this.opts.element,term:f,page:d,context:g,matcher:this.opts.matcher,callback:this.bind(function(a){e.opened()&&(e.opts.populateResults.call(this,b,a.results,{term:f,page:d,context:g}),e.postprocessResults(a,!1,!1),a.more===!0?(c.detach().appendTo(b).html(e.opts.escapeMarkup(z(e.opts.formatLoadMore,e.opts.element,d+1))),window.setTimeout(function(){e.loadMoreIfNeeded()},10)):c.remove(),e.positionDropdown(),e.resultsPage=d,e.context=a.context,this.opts.element.trigger({type:"select2-loaded",items:a}))})})))},tokenize:function(){},updateResults:function(c){function d(){j.removeClass("select2-active"),m.positionDropdown(),m.liveRegion.text(k.find(".select2-no-results,.select2-selection-limit,.select2-searching").length?k.text():m.opts.formatMatches(k.find('.select2-result-selectable:not(".select2-selected")').length))}function e(a){k.html(a),d()}var f,h,i,j=this.search,k=this.results,l=this.opts,m=this,n=j.val(),o=a.data(this.container,"select2-last-term");if((c===!0||!o||!g(n,o))&&(a.data(this.container,"select2-last-term",n),c===!0||this.showSearchInput!==!1&&this.opened())){i=++this.queryCount;var p=this.getMaximumSelectionSize();if(p>=1&&(f=this.data(),a.isArray(f)&&f.length>=p&&y(l.formatSelectionTooBig,"formatSelectionTooBig")))return void e("<li class='select2-selection-limit'>"+z(l.formatSelectionTooBig,l.element,p)+"</li>");if(j.val().length<l.minimumInputLength)return e(y(l.formatInputTooShort,"formatInputTooShort")?"<li class='select2-no-results'>"+z(l.formatInputTooShort,l.element,j.val(),l.minimumInputLength)+"</li>":""),void(c&&this.showSearch&&this.showSearch(!0));if(l.maximumInputLength&&j.val().length>l.maximumInputLength)return void e(y(l.formatInputTooLong,"formatInputTooLong")?"<li class='select2-no-results'>"+z(l.formatInputTooLong,l.element,j.val(),l.maximumInputLength)+"</li>":"");l.formatSearching&&0===this.findHighlightableChoices().length&&e("<li class='select2-searching'>"+z(l.formatSearching,l.element)+"</li>"),j.addClass("select2-active"),this.removeHighlight(),h=this.tokenize(),h!=b&&null!=h&&j.val(h),this.resultsPage=1,l.query({element:l.element,term:j.val(),page:this.resultsPage,context:null,matcher:l.matcher,callback:this.bind(function(f){var h;if(i==this.queryCount){if(!this.opened())return void this.search.removeClass("select2-active");if(f.hasError!==b&&y(l.formatAjaxError,"formatAjaxError"))return void e("<li class='select2-ajax-error'>"+z(l.formatAjaxError,l.element,f.jqXHR,f.textStatus,f.errorThrown)+"</li>");if(this.context=f.context===b?null:f.context,this.opts.createSearchChoice&&""!==j.val()&&(h=this.opts.createSearchChoice.call(m,j.val(),f.results),h!==b&&null!==h&&m.id(h)!==b&&null!==m.id(h)&&0===a(f.results).filter(function(){return g(m.id(this),m.id(h))
-}).length&&this.opts.createSearchChoicePosition(f.results,h)),0===f.results.length&&y(l.formatNoMatches,"formatNoMatches"))return void e("<li class='select2-no-results'>"+z(l.formatNoMatches,l.element,j.val())+"</li>");k.empty(),m.opts.populateResults.call(this,k,f.results,{term:j.val(),page:this.resultsPage,context:null}),f.more===!0&&y(l.formatLoadMore,"formatLoadMore")&&(k.append("<li class='select2-more-results'>"+l.escapeMarkup(z(l.formatLoadMore,l.element,this.resultsPage))+"</li>"),window.setTimeout(function(){m.loadMoreIfNeeded()},10)),this.postprocessResults(f,c),d(),this.opts.element.trigger({type:"select2-loaded",items:f})}})})}},cancel:function(){this.close()},blur:function(){this.opts.selectOnBlur&&this.selectHighlighted({noFocus:!0}),this.close(),this.container.removeClass("select2-container-active"),this.search[0]===document.activeElement&&this.search.blur(),this.clearSearch(),this.selection.find(".select2-search-choice-focus").removeClass("select2-search-choice-focus")},focusSearch:function(){n(this.search)},selectHighlighted:function(a){if(this._touchMoved)return void this.clearTouchMoved();var b=this.highlight(),c=this.results.find(".select2-highlighted"),d=c.closest(".select2-result").data("select2-data");d?(this.highlight(b),this.onSelect(d,a)):a&&a.noFocus&&this.close()},getPlaceholder:function(){var a;return this.opts.element.attr("placeholder")||this.opts.element.attr("data-placeholder")||this.opts.element.data("placeholder")||this.opts.placeholder||((a=this.getPlaceholderOption())!==b?a.text():b)},getPlaceholderOption:function(){if(this.select){var c=this.select.children("option").first();if(this.opts.placeholderOption!==b)return"first"===this.opts.placeholderOption&&c||"function"==typeof this.opts.placeholderOption&&this.opts.placeholderOption(this.select);if(""===a.trim(c.text())&&""===c.val())return c}},initContainerWidth:function(){function c(){var c,d,e,f,g,h;if("off"===this.opts.width)return null;if("element"===this.opts.width)return 0===this.opts.element.outerWidth(!1)?"auto":this.opts.element.outerWidth(!1)+"px";if("copy"===this.opts.width||"resolve"===this.opts.width){if(c=this.opts.element.attr("style"),c!==b)for(d=c.split(";"),f=0,g=d.length;g>f;f+=1)if(h=d[f].replace(/\s/g,""),e=h.match(/^width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/i),null!==e&&e.length>=1)return e[1];return"resolve"===this.opts.width?(c=this.opts.element.css("width"),c.indexOf("%")>0?c:0===this.opts.element.outerWidth(!1)?"auto":this.opts.element.outerWidth(!1)+"px"):null}return a.isFunction(this.opts.width)?this.opts.width():this.opts.width}var d=c.call(this);null!==d&&this.container.css("width",d)}}),F=D(E,{createContainer:function(){var b=a(document.createElement("div")).attr({"class":"select2-container"}).html(["<a href='javascript:void(0)' class='select2-choice' tabindex='-1'>","   <span class='select2-chosen'>&#160;</span><abbr class='select2-search-choice-close'></abbr>","   <span class='select2-arrow' role='presentation'><b role='presentation'></b></span>","</a>","<label for='' class='select2-offscreen'></label>","<input class='select2-focusser select2-offscreen' type='text' aria-haspopup='true' role='button' />","<div class='select2-drop select2-display-none'>","   <div class='select2-search'>","       <label for='' class='select2-offscreen'></label>","       <input type='text' autocomplete='off' autocorrect='off' autocapitalize='off' spellcheck='false' class='select2-input' role='combobox' aria-expanded='true'","       aria-autocomplete='list' />","   </div>","   <ul class='select2-results' role='listbox'>","   </ul>","</div>"].join(""));return b},enableInterface:function(){this.parent.enableInterface.apply(this,arguments)&&this.focusser.prop("disabled",!this.isInterfaceEnabled())},opening:function(){var c,d,e;this.opts.minimumResultsForSearch>=0&&this.showSearch(!0),this.parent.opening.apply(this,arguments),this.showSearchInput!==!1&&this.search.val(this.focusser.val()),this.opts.shouldFocusInput(this)&&(this.search.focus(),c=this.search.get(0),c.createTextRange?(d=c.createTextRange(),d.collapse(!1),d.select()):c.setSelectionRange&&(e=this.search.val().length,c.setSelectionRange(e,e))),""===this.search.val()&&this.nextSearchTerm!=b&&(this.search.val(this.nextSearchTerm),this.search.select()),this.focusser.prop("disabled",!0).val(""),this.updateResults(!0),this.opts.element.trigger(a.Event("select2-open"))},close:function(){this.opened()&&(this.parent.close.apply(this,arguments),this.focusser.prop("disabled",!1),this.opts.shouldFocusInput(this)&&this.focusser.focus())},focus:function(){this.opened()?this.close():(this.focusser.prop("disabled",!1),this.opts.shouldFocusInput(this)&&this.focusser.focus())},isFocused:function(){return this.container.hasClass("select2-container-active")},cancel:function(){this.parent.cancel.apply(this,arguments),this.focusser.prop("disabled",!1),this.opts.shouldFocusInput(this)&&this.focusser.focus()},destroy:function(){a("label[for='"+this.focusser.attr("id")+"']").attr("for",this.opts.element.attr("id")),this.parent.destroy.apply(this,arguments),C.call(this,"selection","focusser")},initContainer:function(){var b,d,e=this.container,f=this.dropdown,g=H();this.showSearch(this.opts.minimumResultsForSearch<0?!1:!0),this.selection=b=e.find(".select2-choice"),this.focusser=e.find(".select2-focusser"),b.find(".select2-chosen").attr("id","select2-chosen-"+g),this.focusser.attr("aria-labelledby","select2-chosen-"+g),this.results.attr("id","select2-results-"+g),this.search.attr("aria-owns","select2-results-"+g),this.focusser.attr("id","s2id_autogen"+g),d=a("label[for='"+this.opts.element.attr("id")+"']"),this.opts.element.focus(this.bind(function(){this.focus()})),this.focusser.prev().text(d.text()).attr("for",this.focusser.attr("id"));var h=this.opts.element.attr("title");this.opts.element.attr("title",h||d.text()),this.focusser.attr("tabindex",this.elementTabIndex),this.search.attr("id",this.focusser.attr("id")+"_search"),this.search.prev().text(a("label[for='"+this.focusser.attr("id")+"']").text()).attr("for",this.search.attr("id")),this.search.on("keydown",this.bind(function(a){if(this.isInterfaceEnabled()&&229!=a.keyCode){if(a.which===M.PAGE_UP||a.which===M.PAGE_DOWN)return void p(a);switch(a.which){case M.UP:case M.DOWN:return this.moveHighlight(a.which===M.UP?-1:1),void p(a);case M.ENTER:return this.selectHighlighted(),void p(a);case M.TAB:return void this.selectHighlighted({noFocus:!0});case M.ESC:return this.cancel(a),void p(a)}}})),this.search.on("blur",this.bind(function(){document.activeElement===this.body.get(0)&&window.setTimeout(this.bind(function(){this.opened()&&this.search.focus()}),0)})),this.focusser.on("keydown",this.bind(function(a){if(this.isInterfaceEnabled()&&a.which!==M.TAB&&!M.isControl(a)&&!M.isFunctionKey(a)&&a.which!==M.ESC){if(this.opts.openOnEnter===!1&&a.which===M.ENTER)return void p(a);if(a.which==M.DOWN||a.which==M.UP||a.which==M.ENTER&&this.opts.openOnEnter){if(a.altKey||a.ctrlKey||a.shiftKey||a.metaKey)return;return this.open(),void p(a)}return a.which==M.DELETE||a.which==M.BACKSPACE?(this.opts.allowClear&&this.clear(),void p(a)):void 0}})),j(this.focusser),this.focusser.on("keyup-change input",this.bind(function(a){if(this.opts.minimumResultsForSearch>=0){if(a.stopPropagation(),this.opened())return;this.open()}})),b.on("mousedown touchstart","abbr",this.bind(function(a){this.isInterfaceEnabled()&&(this.clear(),q(a),this.close(),this.selection&&this.selection.focus())})),b.on("mousedown touchstart",this.bind(function(d){c(b),this.container.hasClass("select2-container-active")||this.opts.element.trigger(a.Event("select2-focus")),this.opened()?this.close():this.isInterfaceEnabled()&&this.open(),p(d)})),f.on("mousedown touchstart",this.bind(function(){this.opts.shouldFocusInput(this)&&this.search.focus()})),b.on("focus",this.bind(function(a){p(a)})),this.focusser.on("focus",this.bind(function(){this.container.hasClass("select2-container-active")||this.opts.element.trigger(a.Event("select2-focus")),this.container.addClass("select2-container-active")})).on("blur",this.bind(function(){this.opened()||(this.container.removeClass("select2-container-active"),this.opts.element.trigger(a.Event("select2-blur")))})),this.search.on("focus",this.bind(function(){this.container.hasClass("select2-container-active")||this.opts.element.trigger(a.Event("select2-focus")),this.container.addClass("select2-container-active")})),this.initContainerWidth(),this.opts.element.hide(),this.setPlaceholder()},clear:function(b){var c=this.selection.data("select2-data");if(c){var d=a.Event("select2-clearing");if(this.opts.element.trigger(d),d.isDefaultPrevented())return;var e=this.getPlaceholderOption();this.opts.element.val(e?e.val():""),this.selection.find(".select2-chosen").empty(),this.selection.removeData("select2-data"),this.setPlaceholder(),b!==!1&&(this.opts.element.trigger({type:"select2-removed",val:this.id(c),choice:c}),this.triggerChange({removed:c}))}},initSelection:function(){if(this.isPlaceholderOptionSelected())this.updateSelection(null),this.close(),this.setPlaceholder();else{var a=this;this.opts.initSelection.call(null,this.opts.element,function(c){c!==b&&null!==c&&(a.updateSelection(c),a.close(),a.setPlaceholder(),a.nextSearchTerm=a.opts.nextSearchTerm(c,a.search.val()))})}},isPlaceholderOptionSelected:function(){var a;return this.getPlaceholder()===b?!1:(a=this.getPlaceholderOption())!==b&&a.prop("selected")||""===this.opts.element.val()||this.opts.element.val()===b||null===this.opts.element.val()},prepareOpts:function(){var b=this.parent.prepareOpts.apply(this,arguments),c=this;return"select"===b.element.get(0).tagName.toLowerCase()?b.initSelection=function(a,b){var d=a.find("option").filter(function(){return this.selected&&!this.disabled});b(c.optionToData(d))}:"data"in b&&(b.initSelection=b.initSelection||function(c,d){var e=c.val(),f=null;b.query({matcher:function(a,c,d){var h=g(e,b.id(d));return h&&(f=d),h},callback:a.isFunction(d)?function(){d(f)}:a.noop})}),b},getPlaceholder:function(){return this.select&&this.getPlaceholderOption()===b?b:this.parent.getPlaceholder.apply(this,arguments)},setPlaceholder:function(){var a=this.getPlaceholder();if(this.isPlaceholderOptionSelected()&&a!==b){if(this.select&&this.getPlaceholderOption()===b)return;this.selection.find(".select2-chosen").html(this.opts.escapeMarkup(a)),this.selection.addClass("select2-default"),this.container.removeClass("select2-allowclear")}},postprocessResults:function(a,b,c){var d=0,e=this;if(this.findHighlightableChoices().each2(function(a,b){return g(e.id(b.data("select2-data")),e.opts.element.val())?(d=a,!1):void 0}),c!==!1&&this.highlight(b===!0&&d>=0?d:0),b===!0){var f=this.opts.minimumResultsForSearch;f>=0&&this.showSearch(A(a.results)>=f)}},showSearch:function(b){this.showSearchInput!==b&&(this.showSearchInput=b,this.dropdown.find(".select2-search").toggleClass("select2-search-hidden",!b),this.dropdown.find(".select2-search").toggleClass("select2-offscreen",!b),a(this.dropdown,this.container).toggleClass("select2-with-searchbox",b))},onSelect:function(a,b){if(this.triggerSelect(a)){var c=this.opts.element.val(),d=this.data();this.opts.element.val(this.id(a)),this.updateSelection(a),this.opts.element.trigger({type:"select2-selected",val:this.id(a),choice:a}),this.nextSearchTerm=this.opts.nextSearchTerm(a,this.search.val()),this.close(),b&&b.noFocus||!this.opts.shouldFocusInput(this)||this.focusser.focus(),g(c,this.id(a))||this.triggerChange({added:a,removed:d})}},updateSelection:function(a){var c,d,e=this.selection.find(".select2-chosen");this.selection.data("select2-data",a),e.empty(),null!==a&&(c=this.opts.formatSelection(a,e,this.opts.escapeMarkup)),c!==b&&e.append(c),d=this.opts.formatSelectionCssClass(a,e),d!==b&&e.addClass(d),this.selection.removeClass("select2-default"),this.opts.allowClear&&this.getPlaceholder()!==b&&this.container.addClass("select2-allowclear")},val:function(){var a,c=!1,d=null,e=this,f=this.data();if(0===arguments.length)return this.opts.element.val();if(a=arguments[0],arguments.length>1&&(c=arguments[1]),this.select)this.select.val(a).find("option").filter(function(){return this.selected}).each2(function(a,b){return d=e.optionToData(b),!1}),this.updateSelection(d),this.setPlaceholder(),c&&this.triggerChange({added:d,removed:f});else{if(!a&&0!==a)return void this.clear(c);if(this.opts.initSelection===b)throw new Error("cannot call val() if initSelection() is not defined");this.opts.element.val(a),this.opts.initSelection(this.opts.element,function(a){e.opts.element.val(a?e.id(a):""),e.updateSelection(a),e.setPlaceholder(),c&&e.triggerChange({added:a,removed:f})})}},clearSearch:function(){this.search.val(""),this.focusser.val("")},data:function(a){var c,d=!1;return 0===arguments.length?(c=this.selection.data("select2-data"),c==b&&(c=null),c):(arguments.length>1&&(d=arguments[1]),void(a?(c=this.data(),this.opts.element.val(a?this.id(a):""),this.updateSelection(a),d&&this.triggerChange({added:a,removed:c})):this.clear(d)))}}),G=D(E,{createContainer:function(){var b=a(document.createElement("div")).attr({"class":"select2-container select2-container-multi"}).html(["<ul class='select2-choices'>","  <li class='select2-search-field'>","    <label for='' class='select2-offscreen'></label>","    <input type='text' autocomplete='off' autocorrect='off' autocapitalize='off' spellcheck='false' class='select2-input'>","  </li>","</ul>","<div class='select2-drop select2-drop-multi select2-display-none'>","   <ul class='select2-results'>","   </ul>","</div>"].join(""));return b},prepareOpts:function(){var b=this.parent.prepareOpts.apply(this,arguments),c=this;return"select"===b.element.get(0).tagName.toLowerCase()?b.initSelection=function(a,b){var d=[];a.find("option").filter(function(){return this.selected&&!this.disabled}).each2(function(a,b){d.push(c.optionToData(b))}),b(d)}:"data"in b&&(b.initSelection=b.initSelection||function(c,d){var e=h(c.val(),b.separator,b.transformVal),f=[];b.query({matcher:function(c,d,h){var i=a.grep(e,function(a){return g(a,b.id(h))}).length;return i&&f.push(h),i},callback:a.isFunction(d)?function(){for(var a=[],c=0;c<e.length;c++)for(var h=e[c],i=0;i<f.length;i++){var j=f[i];if(g(h,b.id(j))){a.push(j),f.splice(i,1);break}}d(a)}:a.noop})}),b},selectChoice:function(a){var b=this.container.find(".select2-search-choice-focus");b.length&&a&&a[0]==b[0]||(b.length&&this.opts.element.trigger("choice-deselected",b),b.removeClass("select2-search-choice-focus"),a&&a.length&&(this.close(),a.addClass("select2-search-choice-focus"),this.opts.element.trigger("choice-selected",a)))},destroy:function(){a("label[for='"+this.search.attr("id")+"']").attr("for",this.opts.element.attr("id")),this.parent.destroy.apply(this,arguments),C.call(this,"searchContainer","selection")},initContainer:function(){var b,c=".select2-choices";this.searchContainer=this.container.find(".select2-search-field"),this.selection=b=this.container.find(c);var d=this;this.selection.on("click",".select2-container:not(.select2-container-disabled) .select2-search-choice:not(.select2-locked)",function(){d.search[0].focus(),d.selectChoice(a(this))}),this.search.attr("id","s2id_autogen"+H()),this.search.prev().text(a("label[for='"+this.opts.element.attr("id")+"']").text()).attr("for",this.search.attr("id")),this.opts.element.focus(this.bind(function(){this.focus()})),this.search.on("input paste",this.bind(function(){this.search.attr("placeholder")&&0==this.search.val().length||this.isInterfaceEnabled()&&(this.opened()||this.open())})),this.search.attr("tabindex",this.elementTabIndex),this.keydowns=0,this.search.on("keydown",this.bind(function(a){if(this.isInterfaceEnabled()){++this.keydowns;var c=b.find(".select2-search-choice-focus"),d=c.prev(".select2-search-choice:not(.select2-locked)"),e=c.next(".select2-search-choice:not(.select2-locked)"),f=o(this.search);if(c.length&&(a.which==M.LEFT||a.which==M.RIGHT||a.which==M.BACKSPACE||a.which==M.DELETE||a.which==M.ENTER)){var g=c;return a.which==M.LEFT&&d.length?g=d:a.which==M.RIGHT?g=e.length?e:null:a.which===M.BACKSPACE?this.unselect(c.first())&&(this.search.width(10),g=d.length?d:e):a.which==M.DELETE?this.unselect(c.first())&&(this.search.width(10),g=e.length?e:null):a.which==M.ENTER&&(g=null),this.selectChoice(g),p(a),void(g&&g.length||this.open())}if((a.which===M.BACKSPACE&&1==this.keydowns||a.which==M.LEFT)&&0==f.offset&&!f.length)return this.selectChoice(b.find(".select2-search-choice:not(.select2-locked)").last()),void p(a);if(this.selectChoice(null),this.opened())switch(a.which){case M.UP:case M.DOWN:return this.moveHighlight(a.which===M.UP?-1:1),void p(a);case M.ENTER:return this.selectHighlighted(),void p(a);case M.TAB:return this.selectHighlighted({noFocus:!0}),void this.close();case M.ESC:return this.cancel(a),void p(a)}if(a.which!==M.TAB&&!M.isControl(a)&&!M.isFunctionKey(a)&&a.which!==M.BACKSPACE&&a.which!==M.ESC){if(a.which===M.ENTER){if(this.opts.openOnEnter===!1)return;if(a.altKey||a.ctrlKey||a.shiftKey||a.metaKey)return}this.open(),(a.which===M.PAGE_UP||a.which===M.PAGE_DOWN)&&p(a),a.which===M.ENTER&&p(a)}}})),this.search.on("keyup",this.bind(function(){this.keydowns=0,this.resizeSearch()})),this.search.on("blur",this.bind(function(b){this.container.removeClass("select2-container-active"),this.search.removeClass("select2-focused"),this.selectChoice(null),this.opened()||this.clearSearch(),b.stopImmediatePropagation(),this.opts.element.trigger(a.Event("select2-blur"))})),this.container.on("click",c,this.bind(function(b){this.isInterfaceEnabled()&&(a(b.target).closest(".select2-search-choice").length>0||(this.selectChoice(null),this.clearPlaceholder(),this.container.hasClass("select2-container-active")||this.opts.element.trigger(a.Event("select2-focus")),this.open(),this.focusSearch(),b.preventDefault()))})),this.container.on("focus",c,this.bind(function(){this.isInterfaceEnabled()&&(this.container.hasClass("select2-container-active")||this.opts.element.trigger(a.Event("select2-focus")),this.container.addClass("select2-container-active"),this.dropdown.addClass("select2-drop-active"),this.clearPlaceholder())})),this.initContainerWidth(),this.opts.element.hide(),this.clearSearch()},enableInterface:function(){this.parent.enableInterface.apply(this,arguments)&&this.search.prop("disabled",!this.isInterfaceEnabled())},initSelection:function(){if(""===this.opts.element.val()&&""===this.opts.element.text()&&(this.updateSelection([]),this.close(),this.clearSearch()),this.select||""!==this.opts.element.val()){var a=this;this.opts.initSelection.call(null,this.opts.element,function(c){c!==b&&null!==c&&(a.updateSelection(c),a.close(),a.clearSearch())})}},clearSearch:function(){var a=this.getPlaceholder(),c=this.getMaxSearchWidth();a!==b&&0===this.getVal().length&&this.search.hasClass("select2-focused")===!1?(this.search.val(a).addClass("select2-default"),this.search.width(c>0?c:this.container.css("width"))):this.search.val("").width(10)},clearPlaceholder:function(){this.search.hasClass("select2-default")&&this.search.val("").removeClass("select2-default")},opening:function(){this.clearPlaceholder(),this.resizeSearch(),this.parent.opening.apply(this,arguments),this.focusSearch(),""===this.search.val()&&this.nextSearchTerm!=b&&(this.search.val(this.nextSearchTerm),this.search.select()),this.updateResults(!0),this.opts.shouldFocusInput(this)&&this.search.focus(),this.opts.element.trigger(a.Event("select2-open"))},close:function(){this.opened()&&this.parent.close.apply(this,arguments)},focus:function(){this.close(),this.search.focus()},isFocused:function(){return this.search.hasClass("select2-focused")},updateSelection:function(b){var c=[],d=[],f=this;a(b).each(function(){e(f.id(this),c)<0&&(c.push(f.id(this)),d.push(this))}),b=d,this.selection.find(".select2-search-choice").remove(),a(b).each(function(){f.addSelectedChoice(this)}),f.postprocessResults()},tokenize:function(){var a=this.search.val();a=this.opts.tokenizer.call(this,a,this.data(),this.bind(this.onSelect),this.opts),null!=a&&a!=b&&(this.search.val(a),a.length>0&&this.open())},onSelect:function(a,c){this.triggerSelect(a)&&""!==a.text&&(this.addSelectedChoice(a),this.opts.element.trigger({type:"selected",val:this.id(a),choice:a}),this.nextSearchTerm=this.opts.nextSearchTerm(a,this.search.val()),this.clearSearch(),this.updateResults(),(this.select||!this.opts.closeOnSelect)&&this.postprocessResults(a,!1,this.opts.closeOnSelect===!0),this.opts.closeOnSelect?(this.close(),this.search.width(10)):this.countSelectableResults()>0?(this.search.width(10),this.resizeSearch(),this.getMaximumSelectionSize()>0&&this.val().length>=this.getMaximumSelectionSize()?this.updateResults(!0):this.nextSearchTerm!=b&&(this.search.val(this.nextSearchTerm),this.updateResults(),this.search.select()),this.positionDropdown()):(this.close(),this.search.width(10)),this.triggerChange({added:a}),c&&c.noFocus||this.focusSearch())},cancel:function(){this.close(),this.focusSearch()},addSelectedChoice:function(c){var d,e,f=!c.locked,g=a("<li class='select2-search-choice'>    <div></div>    <a href='#' class='select2-search-choice-close' tabindex='-1'></a></li>"),h=a("<li class='select2-search-choice select2-locked'><div></div></li>"),i=f?g:h,j=this.id(c),k=this.getVal();d=this.opts.formatSelection(c,i.find("div"),this.opts.escapeMarkup),d!=b&&i.find("div").replaceWith(a("<div></div>").html(d)),e=this.opts.formatSelectionCssClass(c,i.find("div")),e!=b&&i.addClass(e),f&&i.find(".select2-search-choice-close").on("mousedown",p).on("click dblclick",this.bind(function(b){this.isInterfaceEnabled()&&(this.unselect(a(b.target)),this.selection.find(".select2-search-choice-focus").removeClass("select2-search-choice-focus"),p(b),this.close(),this.focusSearch())})).on("focus",this.bind(function(){this.isInterfaceEnabled()&&(this.container.addClass("select2-container-active"),this.dropdown.addClass("select2-drop-active"))})),i.data("select2-data",c),i.insertBefore(this.searchContainer),k.push(j),this.setVal(k)},unselect:function(b){var c,d,f=this.getVal();if(b=b.closest(".select2-search-choice"),0===b.length)throw"Invalid argument: "+b+". Must be .select2-search-choice";if(c=b.data("select2-data")){var g=a.Event("select2-removing");if(g.val=this.id(c),g.choice=c,this.opts.element.trigger(g),g.isDefaultPrevented())return!1;for(;(d=e(this.id(c),f))>=0;)f.splice(d,1),this.setVal(f),this.select&&this.postprocessResults();return b.remove(),this.opts.element.trigger({type:"select2-removed",val:this.id(c),choice:c}),this.triggerChange({removed:c}),!0}},postprocessResults:function(a,b,c){var d=this.getVal(),f=this.results.find(".select2-result"),g=this.results.find(".select2-result-with-children"),h=this;f.each2(function(a,b){var c=h.id(b.data("select2-data"));e(c,d)>=0&&(b.addClass("select2-selected"),b.find(".select2-result-selectable").addClass("select2-selected"))}),g.each2(function(a,b){b.is(".select2-result-selectable")||0!==b.find(".select2-result-selectable:not(.select2-selected)").length||b.addClass("select2-selected")}),-1==this.highlight()&&c!==!1&&this.opts.closeOnSelect===!0&&h.highlight(0),!this.opts.createSearchChoice&&!f.filter(".select2-result:not(.select2-selected)").length>0&&(!a||a&&!a.more&&0===this.results.find(".select2-no-results").length)&&y(h.opts.formatNoMatches,"formatNoMatches")&&this.results.append("<li class='select2-no-results'>"+z(h.opts.formatNoMatches,h.opts.element,h.search.val())+"</li>")},getMaxSearchWidth:function(){return this.selection.width()-i(this.search)},resizeSearch:function(){var a,b,c,d,e,f=i(this.search);a=r(this.search)+10,b=this.search.offset().left,c=this.selection.width(),d=this.selection.offset().left,e=c-(b-d)-f,a>e&&(e=c-f),40>e&&(e=c-f),0>=e&&(e=a),this.search.width(Math.floor(e))},getVal:function(){var a;return this.select?(a=this.select.val(),null===a?[]:a):(a=this.opts.element.val(),h(a,this.opts.separator,this.opts.transformVal))},setVal:function(b){var c;this.select?this.select.val(b):(c=[],a(b).each(function(){e(this,c)<0&&c.push(this)}),this.opts.element.val(0===c.length?"":c.join(this.opts.separator)))},buildChangeDetails:function(a,b){for(var b=b.slice(0),a=a.slice(0),c=0;c<b.length;c++)for(var d=0;d<a.length;d++)g(this.opts.id(b[c]),this.opts.id(a[d]))&&(b.splice(c,1),c>0&&c--,a.splice(d,1),d--);return{added:b,removed:a}},val:function(c,d){var e,f=this;if(0===arguments.length)return this.getVal();if(e=this.data(),e.length||(e=[]),!c&&0!==c)return this.opts.element.val(""),this.updateSelection([]),this.clearSearch(),void(d&&this.triggerChange({added:this.data(),removed:e}));if(this.setVal(c),this.select)this.opts.initSelection(this.select,this.bind(this.updateSelection)),d&&this.triggerChange(this.buildChangeDetails(e,this.data()));else{if(this.opts.initSelection===b)throw new Error("val() cannot be called if initSelection() is not defined");this.opts.initSelection(this.opts.element,function(b){var c=a.map(b,f.id);f.setVal(c),f.updateSelection(b),f.clearSearch(),d&&f.triggerChange(f.buildChangeDetails(e,f.data()))})}this.clearSearch()},onSortStart:function(){if(this.select)throw new Error("Sorting of elements is not supported when attached to <select>. Attach to <input type='hidden'/> instead.");this.search.width(0),this.searchContainer.hide()},onSortEnd:function(){var b=[],c=this;this.searchContainer.show(),this.searchContainer.appendTo(this.searchContainer.parent()),this.resizeSearch(),this.selection.find(".select2-search-choice").each(function(){b.push(c.opts.id(a(this).data("select2-data")))}),this.setVal(b),this.triggerChange()},data:function(b,c){var d,e,f=this;return 0===arguments.length?this.selection.children(".select2-search-choice").map(function(){return a(this).data("select2-data")}).get():(e=this.data(),b||(b=[]),d=a.map(b,function(a){return f.opts.id(a)}),this.setVal(d),this.updateSelection(b),this.clearSearch(),c&&this.triggerChange(this.buildChangeDetails(e,this.data())),void 0)}}),a.fn.select2=function(){var c,d,f,g,h,i=Array.prototype.slice.call(arguments,0),j=["val","destroy","opened","open","close","focus","isFocused","container","dropdown","onSortStart","onSortEnd","enable","disable","readonly","positionDropdown","data","search"],k=["opened","isFocused","container","dropdown"],l=["val","data"],m={search:"externalSearch"};return this.each(function(){if(0===i.length||"object"==typeof i[0])c=0===i.length?{}:a.extend({},i[0]),c.element=a(this),"select"===c.element.get(0).tagName.toLowerCase()?h=c.element.prop("multiple"):(h=c.multiple||!1,"tags"in c&&(c.multiple=h=!0)),d=h?new window.Select2["class"].multi:new window.Select2["class"].single,d.init(c);else{if("string"!=typeof i[0])throw"Invalid arguments to select2 plugin: "+i;if(e(i[0],j)<0)throw"Unknown method: "+i[0];if(g=b,d=a(this).data("select2"),d===b)return;if(f=i[0],"container"===f?g=d.container:"dropdown"===f?g=d.dropdown:(m[f]&&(f=m[f]),g=d[f].apply(d,i.slice(1))),e(i[0],k)>=0||e(i[0],l)>=0&&1==i.length)return!1}}),g===b?this:g},a.fn.select2.defaults={width:"copy",loadMorePadding:0,closeOnSelect:!0,openOnEnter:!0,containerCss:{},dropdownCss:{},containerCssClass:"",dropdownCssClass:"",formatResult:function(a,b,c,d){var e=[];return t(this.text(a),c.term,e,d),e.join("")},transformVal:function(b){return a.trim(b)},formatSelection:function(a,c,d){return a?d(this.text(a)):b},sortResults:function(a){return a},formatResultCssClass:function(a){return a.css},formatSelectionCssClass:function(){return b},minimumResultsForSearch:0,minimumInputLength:0,maximumInputLength:null,maximumSelectionSize:0,id:function(a){return a==b?null:a.id},text:function(b){return b&&this.data&&this.data.text?a.isFunction(this.data.text)?this.data.text(b):b[this.data.text]:b.text},matcher:function(a,b){return d(""+b).toUpperCase().indexOf(d(""+a).toUpperCase())>=0},separator:",",tokenSeparators:[],tokenizer:B,escapeMarkup:u,blurOnChange:!1,selectOnBlur:!1,adaptContainerCssClass:function(a){return a},adaptDropdownCssClass:function(){return null},nextSearchTerm:function(){return b},searchInputPlaceholder:"",createSearchChoicePosition:"top",shouldFocusInput:function(a){var b="ontouchstart"in window||navigator.msMaxTouchPoints>0;return b&&a.opts.minimumResultsForSearch<0?!1:!0}},a.fn.select2.locales=[],a.fn.select2.locales.en={formatMatches:function(a){return 1===a?"One result is available, press enter to select it.":a+" results are available, use up and down arrow keys to navigate."},formatNoMatches:function(){return"No matches found"},formatAjaxError:function(){return"Loading failed"},formatInputTooShort:function(a,b){var c=b-a.length;return"Please enter "+c+" or more character"+(1==c?"":"s")},formatInputTooLong:function(a,b){var c=a.length-b;return"Please delete "+c+" character"+(1==c?"":"s")},formatSelectionTooBig:function(a){return"You can only select "+a+" item"+(1==a?"":"s")},formatLoadMore:function(){return"Loading more results…"},formatSearching:function(){return"Searching…"}},a.extend(a.fn.select2.defaults,a.fn.select2.locales.en),a.fn.select2.ajaxDefaults={transport:a.ajax,params:{type:"GET",cache:!1,dataType:"json"}},window.Select2={query:{ajax:v,local:w,tags:x},util:{debounce:l,markMatch:t,escapeMarkup:u,stripDiacritics:d},"class":{"abstract":E,single:F,multi:G}}}}(jQuery);
\ No newline at end of file
diff --git a/NewLife.Cube/Content/ace/js/spin.min.js b/NewLife.Cube/Content/ace/js/spin.min.js
deleted file mode 100644
index b5f5d24ad1..0000000000
--- a/NewLife.Cube/Content/ace/js/spin.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(a,b){"object"==typeof exports?module.exports=b():"function"==typeof define&&define.amd?define(b):a.Spinner=b()}(this,function(){"use strict";function a(a,b){var c,d=document.createElement(a||"div");for(c in b)d[c]=b[c];return d}function b(a){for(var b=1,c=arguments.length;c>b;b++)a.appendChild(arguments[b]);return a}function c(a,b,c,d){var e=["opacity",b,~~(100*a),c,d].join("-"),f=.01+c/d*100,g=Math.max(1-(1-a)/b*(100-f),a),h=j.substring(0,j.indexOf("Animation")).toLowerCase(),i=h&&"-"+h+"-"||"";return l[e]||(m.insertRule("@"+i+"keyframes "+e+"{0%{opacity:"+g+"}"+f+"%{opacity:"+a+"}"+(f+.01)+"%{opacity:1}"+(f+b)%100+"%{opacity:"+a+"}100%{opacity:"+g+"}}",m.cssRules.length),l[e]=1),e}function d(a,b){var c,d,e=a.style;for(b=b.charAt(0).toUpperCase()+b.slice(1),d=0;d<k.length;d++)if(c=k[d]+b,void 0!==e[c])return c;return void 0!==e[b]?b:void 0}function e(a,b){for(var c in b)a.style[d(a,c)||c]=b[c];return a}function f(a){for(var b=1;b<arguments.length;b++){var c=arguments[b];for(var d in c)void 0===a[d]&&(a[d]=c[d])}return a}function g(a,b){return"string"==typeof a?a:a[b%a.length]}function h(a){this.opts=f(a||{},h.defaults,n)}function i(){function c(b,c){return a("<"+b+' xmlns="urn:schemas-microsoft.com:vml" class="spin-vml">',c)}m.addRule(".spin-vml","behavior:url(#default#VML)"),h.prototype.lines=function(a,d){function f(){return e(c("group",{coordsize:k+" "+k,coordorigin:-j+" "+-j}),{width:k,height:k})}function h(a,h,i){b(m,b(e(f(),{rotation:360/d.lines*a+"deg",left:~~h}),b(e(c("roundrect",{arcsize:d.corners}),{width:j,height:d.width,left:d.radius,top:-d.width>>1,filter:i}),c("fill",{color:g(d.color,a),opacity:d.opacity}),c("stroke",{opacity:0}))))}var i,j=d.length+d.width,k=2*j,l=2*-(d.width+d.length)+"px",m=e(f(),{position:"absolute",top:l,left:l});if(d.shadow)for(i=1;i<=d.lines;i++)h(i,-2,"progid:DXImageTransform.Microsoft.Blur(pixelradius=2,makeshadow=1,shadowopacity=.3)");for(i=1;i<=d.lines;i++)h(i);return b(a,m)},h.prototype.opacity=function(a,b,c,d){var e=a.firstChild;d=d.shadow&&d.lines||0,e&&b+d<e.childNodes.length&&(e=e.childNodes[b+d],e=e&&e.firstChild,e=e&&e.firstChild,e&&(e.opacity=c))}}var j,k=["webkit","Moz","ms","O"],l={},m=function(){var c=a("style",{type:"text/css"});return b(document.getElementsByTagName("head")[0],c),c.sheet||c.styleSheet}(),n={lines:12,length:7,width:5,radius:10,rotate:0,corners:1,color:"#000",direction:1,speed:1,trail:100,opacity:.25,fps:20,zIndex:2e9,className:"spinner",top:"50%",left:"50%",position:"absolute"};h.defaults={},f(h.prototype,{spin:function(b){this.stop();{var c=this,d=c.opts,f=c.el=e(a(0,{className:d.className}),{position:d.position,width:0,zIndex:d.zIndex});d.radius+d.length+d.width}if(e(f,{left:d.left,top:d.top}),b&&b.insertBefore(f,b.firstChild||null),f.setAttribute("role","progressbar"),c.lines(f,c.opts),!j){var g,h=0,i=(d.lines-1)*(1-d.direction)/2,k=d.fps,l=k/d.speed,m=(1-d.opacity)/(l*d.trail/100),n=l/d.lines;!function o(){h++;for(var a=0;a<d.lines;a++)g=Math.max(1-(h+(d.lines-a)*n)%l*m,d.opacity),c.opacity(f,a*d.direction+i,g,d);c.timeout=c.el&&setTimeout(o,~~(1e3/k))}()}return c},stop:function(){var a=this.el;return a&&(clearTimeout(this.timeout),a.parentNode&&a.parentNode.removeChild(a),this.el=void 0),this},lines:function(d,f){function h(b,c){return e(a(),{position:"absolute",width:f.length+f.width+"px",height:f.width+"px",background:b,boxShadow:c,transformOrigin:"left",transform:"rotate("+~~(360/f.lines*k+f.rotate)+"deg) translate("+f.radius+"px,0)",borderRadius:(f.corners*f.width>>1)+"px"})}for(var i,k=0,l=(f.lines-1)*(1-f.direction)/2;k<f.lines;k++)i=e(a(),{position:"absolute",top:1+~(f.width/2)+"px",transform:f.hwaccel?"translate3d(0,0,0)":"",opacity:f.opacity,animation:j&&c(f.opacity,f.trail,l+k*f.direction,f.lines)+" "+1/f.speed+"s linear infinite"}),f.shadow&&b(i,e(h("#000","0 0 4px #000"),{top:"2px"})),b(d,b(i,h(g(f.color,k),"0 0 1px rgba(0,0,0,.1)")));return d},opacity:function(a,b,c){b<a.childNodes.length&&(a.childNodes[b].style.opacity=c)}});var o=e(a("group"),{behavior:"url(#default#VML)"});return!d(o,"transform")&&o.adj?i():j=d(o,"animation"),h});
\ No newline at end of file
diff --git a/NewLife.Cube/Content/ace/js/typeahead.jquery.min.js b/NewLife.Cube/Content/ace/js/typeahead.jquery.min.js
deleted file mode 100644
index 86283aeac7..0000000000
--- a/NewLife.Cube/Content/ace/js/typeahead.jquery.min.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/*!
- * typeahead.js 0.10.5
- * https://github.com/twitter/typeahead.js
- * Copyright 2013-2014 Twitter, Inc. and other contributors; Licensed MIT
- */
-!function(a){var b=function(){"use strict";return{isMsie:function(){return/(msie|trident)/i.test(navigator.userAgent)?navigator.userAgent.match(/(msie |rv:)(\d+(.\d+)?)/i)[2]:!1},isBlankString:function(a){return!a||/^\s*$/.test(a)},escapeRegExChars:function(a){return a.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g,"\\$&")},isString:function(a){return"string"==typeof a},isNumber:function(a){return"number"==typeof a},isArray:a.isArray,isFunction:a.isFunction,isObject:a.isPlainObject,isUndefined:function(a){return"undefined"==typeof a},toStr:function(a){return b.isUndefined(a)||null===a?"":a+""},bind:a.proxy,each:function(b,c){function d(a,b){return c(b,a)}a.each(b,d)},map:a.map,filter:a.grep,every:function(b,c){var d=!0;return b?(a.each(b,function(a,e){return(d=c.call(null,e,a,b))?void 0:!1}),!!d):d},some:function(b,c){var d=!1;return b?(a.each(b,function(a,e){return(d=c.call(null,e,a,b))?!1:void 0}),!!d):d},mixin:a.extend,getUniqueId:function(){var a=0;return function(){return a++}}(),templatify:function(b){function c(){return String(b)}return a.isFunction(b)?b:c},defer:function(a){setTimeout(a,0)},debounce:function(a,b,c){var d,e;return function(){var f,g,h=this,i=arguments;return f=function(){d=null,c||(e=a.apply(h,i))},g=c&&!d,clearTimeout(d),d=setTimeout(f,b),g&&(e=a.apply(h,i)),e}},throttle:function(a,b){var c,d,e,f,g,h;return g=0,h=function(){g=new Date,e=null,f=a.apply(c,d)},function(){var i=new Date,j=b-(i-g);return c=this,d=arguments,0>=j?(clearTimeout(e),e=null,g=i,f=a.apply(c,d)):e||(e=setTimeout(h,j)),f}},noop:function(){}}}(),c=function(){return{wrapper:'<span class="twitter-typeahead"></span>',dropdown:'<span class="tt-dropdown-menu"></span>',dataset:'<div class="tt-dataset-%CLASS%"></div>',suggestions:'<span class="tt-suggestions"></span>',suggestion:'<div class="tt-suggestion"></div>'}}(),d=function(){"use strict";var a={wrapper:{position:"relative",display:"inline-block"},hint:{position:"absolute",top:"0",left:"0",borderColor:"transparent",boxShadow:"none",opacity:"1"},input:{position:"relative",verticalAlign:"top",backgroundColor:"transparent"},inputWithNoHint:{position:"relative",verticalAlign:"top"},dropdown:{position:"absolute",top:"100%",left:"0",zIndex:"100",display:"none"},suggestions:{display:"block"},suggestion:{whiteSpace:"nowrap",cursor:"pointer"},suggestionChild:{whiteSpace:"normal"},ltr:{left:"0",right:"auto"},rtl:{left:"auto",right:" 0"}};return b.isMsie()&&b.mixin(a.input,{backgroundImage:"url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)"}),b.isMsie()&&b.isMsie()<=7&&b.mixin(a.input,{marginTop:"-1px"}),a}(),e=function(){"use strict";function c(b){b&&b.el||a.error("EventBus initialized without el"),this.$el=a(b.el)}var d="typeahead:";return b.mixin(c.prototype,{trigger:function(a){var b=[].slice.call(arguments,1);this.$el.trigger(d+a,b)}}),c}(),f=function(){"use strict";function a(a,b,c,d){var e;if(!c)return this;for(b=b.split(i),c=d?h(c,d):c,this._callbacks=this._callbacks||{};e=b.shift();)this._callbacks[e]=this._callbacks[e]||{sync:[],async:[]},this._callbacks[e][a].push(c);return this}function b(b,c,d){return a.call(this,"async",b,c,d)}function c(b,c,d){return a.call(this,"sync",b,c,d)}function d(a){var b;if(!this._callbacks)return this;for(a=a.split(i);b=a.shift();)delete this._callbacks[b];return this}function e(a){var b,c,d,e,g;if(!this._callbacks)return this;for(a=a.split(i),d=[].slice.call(arguments,1);(b=a.shift())&&(c=this._callbacks[b]);)e=f(c.sync,this,[b].concat(d)),g=f(c.async,this,[b].concat(d)),e()&&j(g);return this}function f(a,b,c){function d(){for(var d,e=0,f=a.length;!d&&f>e;e+=1)d=a[e].apply(b,c)===!1;return!d}return d}function g(){var a;return a=window.setImmediate?function(a){setImmediate(function(){a()})}:function(a){setTimeout(function(){a()},0)}}function h(a,b){return a.bind?a.bind(b):function(){a.apply(b,[].slice.call(arguments,0))}}var i=/\s+/,j=g();return{onSync:c,onAsync:b,off:d,trigger:e}}(),g=function(a){"use strict";function c(a,c,d){for(var e,f=[],g=0,h=a.length;h>g;g++)f.push(b.escapeRegExChars(a[g]));return e=d?"\\b("+f.join("|")+")\\b":"("+f.join("|")+")",c?new RegExp(e):new RegExp(e,"i")}var d={node:null,pattern:null,tagName:"strong",className:null,wordsOnly:!1,caseSensitive:!1};return function(e){function f(b){var c,d,f;return(c=h.exec(b.data))&&(f=a.createElement(e.tagName),e.className&&(f.className=e.className),d=b.splitText(c.index),d.splitText(c[0].length),f.appendChild(d.cloneNode(!0)),b.parentNode.replaceChild(f,d)),!!c}function g(a,b){for(var c,d=3,e=0;e<a.childNodes.length;e++)c=a.childNodes[e],c.nodeType===d?e+=b(c)?1:0:g(c,b)}var h;e=b.mixin({},d,e),e.node&&e.pattern&&(e.pattern=b.isArray(e.pattern)?e.pattern:[e.pattern],h=c(e.pattern,e.caseSensitive,e.wordsOnly),g(e.node,f))}}(window.document),h=function(){"use strict";function c(c){var e,f,g,i,j=this;c=c||{},c.input||a.error("input is missing"),e=b.bind(this._onBlur,this),f=b.bind(this._onFocus,this),g=b.bind(this._onKeydown,this),i=b.bind(this._onInput,this),this.$hint=a(c.hint),this.$input=a(c.input).on("blur.tt",e).on("focus.tt",f).on("keydown.tt",g),0===this.$hint.length&&(this.setHint=this.getHint=this.clearHint=this.clearHintIfInvalid=b.noop),b.isMsie()?this.$input.on("keydown.tt keypress.tt cut.tt paste.tt",function(a){h[a.which||a.keyCode]||b.defer(b.bind(j._onInput,j,a))}):this.$input.on("input.tt",i),this.query=this.$input.val(),this.$overflowHelper=d(this.$input)}function d(b){return a('<pre aria-hidden="true"></pre>').css({position:"absolute",visibility:"hidden",whiteSpace:"pre",fontFamily:b.css("font-family"),fontSize:b.css("font-size"),fontStyle:b.css("font-style"),fontVariant:b.css("font-variant"),fontWeight:b.css("font-weight"),wordSpacing:b.css("word-spacing"),letterSpacing:b.css("letter-spacing"),textIndent:b.css("text-indent"),textRendering:b.css("text-rendering"),textTransform:b.css("text-transform")}).insertAfter(b)}function e(a,b){return c.normalizeQuery(a)===c.normalizeQuery(b)}function g(a){return a.altKey||a.ctrlKey||a.metaKey||a.shiftKey}var h;return h={9:"tab",27:"esc",37:"left",39:"right",13:"enter",38:"up",40:"down"},c.normalizeQuery=function(a){return(a||"").replace(/^\s*/g,"").replace(/\s{2,}/g," ")},b.mixin(c.prototype,f,{_onBlur:function(){this.resetInputValue(),this.trigger("blurred")},_onFocus:function(){this.trigger("focused")},_onKeydown:function(a){var b=h[a.which||a.keyCode];this._managePreventDefault(b,a),b&&this._shouldTrigger(b,a)&&this.trigger(b+"Keyed",a)},_onInput:function(){this._checkInputValue()},_managePreventDefault:function(a,b){var c,d,e;switch(a){case"tab":d=this.getHint(),e=this.getInputValue(),c=d&&d!==e&&!g(b);break;case"up":case"down":c=!g(b);break;default:c=!1}c&&b.preventDefault()},_shouldTrigger:function(a,b){var c;switch(a){case"tab":c=!g(b);break;default:c=!0}return c},_checkInputValue:function(){var a,b,c;a=this.getInputValue(),b=e(a,this.query),c=b?this.query.length!==a.length:!1,this.query=a,b?c&&this.trigger("whitespaceChanged",this.query):this.trigger("queryChanged",this.query)},focus:function(){this.$input.focus()},blur:function(){this.$input.blur()},getQuery:function(){return this.query},setQuery:function(a){this.query=a},getInputValue:function(){return this.$input.val()},setInputValue:function(a,b){this.$input.val(a),b?this.clearHint():this._checkInputValue()},resetInputValue:function(){this.setInputValue(this.query,!0)},getHint:function(){return this.$hint.val()},setHint:function(a){this.$hint.val(a)},clearHint:function(){this.setHint("")},clearHintIfInvalid:function(){var a,b,c,d;a=this.getInputValue(),b=this.getHint(),c=a!==b&&0===b.indexOf(a),d=""!==a&&c&&!this.hasOverflow(),!d&&this.clearHint()},getLanguageDirection:function(){return(this.$input.css("direction")||"ltr").toLowerCase()},hasOverflow:function(){var a=this.$input.width()-2;return this.$overflowHelper.text(this.getInputValue()),this.$overflowHelper.width()>=a},isCursorAtEnd:function(){var a,c,d;return a=this.$input.val().length,c=this.$input[0].selectionStart,b.isNumber(c)?c===a:document.selection?(d=document.selection.createRange(),d.moveStart("character",-a),a===d.text.length):!0},destroy:function(){this.$hint.off(".tt"),this.$input.off(".tt"),this.$hint=this.$input=this.$overflowHelper=null}}),c}(),i=function(){"use strict";function e(d){d=d||{},d.templates=d.templates||{},d.source||a.error("missing source"),d.name&&!j(d.name)&&a.error("invalid dataset name: "+d.name),this.query=null,this.highlight=!!d.highlight,this.name=d.name||b.getUniqueId(),this.source=d.source,this.displayFn=h(d.display||d.displayKey),this.templates=i(d.templates,this.displayFn),this.$el=a(c.dataset.replace("%CLASS%",this.name))}function h(a){function c(b){return b[a]}return a=a||"value",b.isFunction(a)?a:c}function i(a,c){function d(a){return"<p>"+c(a)+"</p>"}return{empty:a.empty&&b.templatify(a.empty),header:a.header&&b.templatify(a.header),footer:a.footer&&b.templatify(a.footer),suggestion:a.suggestion||d}}function j(a){return/^[_a-zA-Z0-9-]+$/.test(a)}var k="ttDataset",l="ttValue",m="ttDatum";return e.extractDatasetName=function(b){return a(b).data(k)},e.extractValue=function(b){return a(b).data(l)},e.extractDatum=function(b){return a(b).data(m)},b.mixin(e.prototype,f,{_render:function(e,f){function h(){return p.templates.empty({query:e,isEmpty:!0})}function i(){function h(b){var e;return e=a(c.suggestion).append(p.templates.suggestion(b)).data(k,p.name).data(l,p.displayFn(b)).data(m,b),e.children().each(function(){a(this).css(d.suggestionChild)}),e}var i,j;return i=a(c.suggestions).css(d.suggestions),j=b.map(f,h),i.append.apply(i,j),p.highlight&&g({className:"tt-highlight",node:i[0],pattern:e}),i}function j(){return p.templates.header({query:e,isEmpty:!o})}function n(){return p.templates.footer({query:e,isEmpty:!o})}if(this.$el){var o,p=this;this.$el.empty(),o=f&&f.length,!o&&this.templates.empty?this.$el.html(h()).prepend(p.templates.header?j():null).append(p.templates.footer?n():null):o&&this.$el.html(i()).prepend(p.templates.header?j():null).append(p.templates.footer?n():null),this.trigger("rendered")}},getRoot:function(){return this.$el},update:function(a){function b(b){c.canceled||a!==c.query||c._render(a,b)}var c=this;this.query=a,this.canceled=!1,this.source(a,b)},cancel:function(){this.canceled=!0},clear:function(){this.cancel(),this.$el.empty(),this.trigger("rendered")},isEmpty:function(){return this.$el.is(":empty")},destroy:function(){this.$el=null}}),e}(),j=function(){"use strict";function c(c){var d,f,g,h=this;c=c||{},c.menu||a.error("menu is required"),this.isOpen=!1,this.isEmpty=!0,this.datasets=b.map(c.datasets,e),d=b.bind(this._onSuggestionClick,this),f=b.bind(this._onSuggestionMouseEnter,this),g=b.bind(this._onSuggestionMouseLeave,this),this.$menu=a(c.menu).on("click.tt",".tt-suggestion",d).on("mouseenter.tt",".tt-suggestion",f).on("mouseleave.tt",".tt-suggestion",g),b.each(this.datasets,function(a){h.$menu.append(a.getRoot()),a.onSync("rendered",h._onRendered,h)})}function e(a){return new i(a)}return b.mixin(c.prototype,f,{_onSuggestionClick:function(b){this.trigger("suggestionClicked",a(b.currentTarget))},_onSuggestionMouseEnter:function(b){this._removeCursor(),this._setCursor(a(b.currentTarget),!0)},_onSuggestionMouseLeave:function(){this._removeCursor()},_onRendered:function(){function a(a){return a.isEmpty()}this.isEmpty=b.every(this.datasets,a),this.isEmpty?this._hide():this.isOpen&&this._show(),this.trigger("datasetRendered")},_hide:function(){this.$menu.hide()},_show:function(){this.$menu.css("display","block")},_getSuggestions:function(){return this.$menu.find(".tt-suggestion")},_getCursor:function(){return this.$menu.find(".tt-cursor").first()},_setCursor:function(a,b){a.first().addClass("tt-cursor"),!b&&this.trigger("cursorMoved")},_removeCursor:function(){this._getCursor().removeClass("tt-cursor")},_moveCursor:function(a){var b,c,d,e;if(this.isOpen){if(c=this._getCursor(),b=this._getSuggestions(),this._removeCursor(),d=b.index(c)+a,d=(d+1)%(b.length+1)-1,-1===d)return void this.trigger("cursorRemoved");-1>d&&(d=b.length-1),this._setCursor(e=b.eq(d)),this._ensureVisible(e)}},_ensureVisible:function(a){var b,c,d,e;b=a.position().top,c=b+a.outerHeight(!0),d=this.$menu.scrollTop(),e=this.$menu.height()+parseInt(this.$menu.css("paddingTop"),10)+parseInt(this.$menu.css("paddingBottom"),10),0>b?this.$menu.scrollTop(d+b):c>e&&this.$menu.scrollTop(d+(c-e))},close:function(){this.isOpen&&(this.isOpen=!1,this._removeCursor(),this._hide(),this.trigger("closed"))},open:function(){this.isOpen||(this.isOpen=!0,!this.isEmpty&&this._show(),this.trigger("opened"))},setLanguageDirection:function(a){this.$menu.css("ltr"===a?d.ltr:d.rtl)},moveCursorUp:function(){this._moveCursor(-1)},moveCursorDown:function(){this._moveCursor(1)},getDatumForSuggestion:function(a){var b=null;return a.length&&(b={raw:i.extractDatum(a),value:i.extractValue(a),datasetName:i.extractDatasetName(a)}),b},getDatumForCursor:function(){return this.getDatumForSuggestion(this._getCursor().first())},getDatumForTopSuggestion:function(){return this.getDatumForSuggestion(this._getSuggestions().first())},update:function(a){function c(b){b.update(a)}b.each(this.datasets,c)},empty:function(){function a(a){a.clear()}b.each(this.datasets,a),this.isEmpty=!0},isVisible:function(){return this.isOpen&&!this.isEmpty},destroy:function(){function a(a){a.destroy()}this.$menu.off(".tt"),this.$menu=null,b.each(this.datasets,a)}}),c}(),k=function(){"use strict";function f(c){var d,f,i;c=c||{},c.input||a.error("missing input"),this.isActivated=!1,this.autoselect=!!c.autoselect,this.minLength=b.isNumber(c.minLength)?c.minLength:1,this.$node=g(c.input,c.withHint),d=this.$node.find(".tt-dropdown-menu"),f=this.$node.find(".tt-input"),i=this.$node.find(".tt-hint"),f.on("blur.tt",function(a){var c,e,g;c=document.activeElement,e=d.is(c),g=d.has(c).length>0,b.isMsie()&&(e||g)&&(a.preventDefault(),a.stopImmediatePropagation(),b.defer(function(){f.focus()}))}),d.on("mousedown.tt",function(a){a.preventDefault()}),this.eventBus=c.eventBus||new e({el:f}),this.dropdown=new j({menu:d,datasets:c.datasets}).onSync("suggestionClicked",this._onSuggestionClicked,this).onSync("cursorMoved",this._onCursorMoved,this).onSync("cursorRemoved",this._onCursorRemoved,this).onSync("opened",this._onOpened,this).onSync("closed",this._onClosed,this).onAsync("datasetRendered",this._onDatasetRendered,this),this.input=new h({input:f,hint:i}).onSync("focused",this._onFocused,this).onSync("blurred",this._onBlurred,this).onSync("enterKeyed",this._onEnterKeyed,this).onSync("tabKeyed",this._onTabKeyed,this).onSync("escKeyed",this._onEscKeyed,this).onSync("upKeyed",this._onUpKeyed,this).onSync("downKeyed",this._onDownKeyed,this).onSync("leftKeyed",this._onLeftKeyed,this).onSync("rightKeyed",this._onRightKeyed,this).onSync("queryChanged",this._onQueryChanged,this).onSync("whitespaceChanged",this._onWhitespaceChanged,this),this._setLanguageDirection()}function g(b,e){var f,g,h,j;f=a(b),g=a(c.wrapper).css(d.wrapper),h=a(c.dropdown).css(d.dropdown),j=f.clone().css(d.hint).css(i(f)),j.val("").removeData().addClass("tt-hint").removeAttr("id name placeholder required").prop("readonly",!0).attr({autocomplete:"off",spellcheck:"false",tabindex:-1}),f.data(l,{dir:f.attr("dir"),autocomplete:f.attr("autocomplete"),spellcheck:f.attr("spellcheck"),style:f.attr("style")}),f.addClass("tt-input").attr({autocomplete:"off",spellcheck:!1}).css(e?d.input:d.inputWithNoHint);try{!f.attr("dir")&&f.attr("dir","auto")}catch(k){}return f.wrap(g).parent().prepend(e?j:null).append(h)}function i(a){return{backgroundAttachment:a.css("background-attachment"),backgroundClip:a.css("background-clip"),backgroundColor:a.css("background-color"),backgroundImage:a.css("background-image"),backgroundOrigin:a.css("background-origin"),backgroundPosition:a.css("background-position"),backgroundRepeat:a.css("background-repeat"),backgroundSize:a.css("background-size")}}function k(a){var c=a.find(".tt-input");b.each(c.data(l),function(a,d){b.isUndefined(a)?c.removeAttr(d):c.attr(d,a)}),c.detach().removeData(l).removeClass("tt-input").insertAfter(a),a.remove()}var l="ttAttrs";return b.mixin(f.prototype,{_onSuggestionClicked:function(a,b){var c;(c=this.dropdown.getDatumForSuggestion(b))&&this._select(c)},_onCursorMoved:function(){var a=this.dropdown.getDatumForCursor();this.input.setInputValue(a.value,!0),this.eventBus.trigger("cursorchanged",a.raw,a.datasetName)},_onCursorRemoved:function(){this.input.resetInputValue(),this._updateHint()},_onDatasetRendered:function(){this._updateHint()},_onOpened:function(){this._updateHint(),this.eventBus.trigger("opened")},_onClosed:function(){this.input.clearHint(),this.eventBus.trigger("closed")},_onFocused:function(){this.isActivated=!0,this.dropdown.open()},_onBlurred:function(){this.isActivated=!1,this.dropdown.empty(),this.dropdown.close()},_onEnterKeyed:function(a,b){var c,d;c=this.dropdown.getDatumForCursor(),d=this.dropdown.getDatumForTopSuggestion(),c?(this._select(c),b.preventDefault()):this.autoselect&&d&&(this._select(d),b.preventDefault())},_onTabKeyed:function(a,b){var c;(c=this.dropdown.getDatumForCursor())?(this._select(c),b.preventDefault()):this._autocomplete(!0)},_onEscKeyed:function(){this.dropdown.close(),this.input.resetInputValue()},_onUpKeyed:function(){var a=this.input.getQuery();this.dropdown.isEmpty&&a.length>=this.minLength?this.dropdown.update(a):this.dropdown.moveCursorUp(),this.dropdown.open()},_onDownKeyed:function(){var a=this.input.getQuery();this.dropdown.isEmpty&&a.length>=this.minLength?this.dropdown.update(a):this.dropdown.moveCursorDown(),this.dropdown.open()},_onLeftKeyed:function(){"rtl"===this.dir&&this._autocomplete()},_onRightKeyed:function(){"ltr"===this.dir&&this._autocomplete()},_onQueryChanged:function(a,b){this.input.clearHintIfInvalid(),b.length>=this.minLength?this.dropdown.update(b):this.dropdown.empty(),this.dropdown.open(),this._setLanguageDirection()},_onWhitespaceChanged:function(){this._updateHint(),this.dropdown.open()},_setLanguageDirection:function(){var a;this.dir!==(a=this.input.getLanguageDirection())&&(this.dir=a,this.$node.css("direction",a),this.dropdown.setLanguageDirection(a))},_updateHint:function(){var a,c,d,e,f,g;a=this.dropdown.getDatumForTopSuggestion(),a&&this.dropdown.isVisible()&&!this.input.hasOverflow()?(c=this.input.getInputValue(),d=h.normalizeQuery(c),e=b.escapeRegExChars(d),f=new RegExp("^(?:"+e+")(.+$)","i"),g=f.exec(a.value),g?this.input.setHint(c+g[1]):this.input.clearHint()):this.input.clearHint()},_autocomplete:function(a){var b,c,d,e;b=this.input.getHint(),c=this.input.getQuery(),d=a||this.input.isCursorAtEnd(),b&&c!==b&&d&&(e=this.dropdown.getDatumForTopSuggestion(),e&&this.input.setInputValue(e.value),this.eventBus.trigger("autocompleted",e.raw,e.datasetName))},_select:function(a){this.input.setQuery(a.value),this.input.setInputValue(a.value,!0),this._setLanguageDirection(),this.eventBus.trigger("selected",a.raw,a.datasetName),this.dropdown.close(),b.defer(b.bind(this.dropdown.empty,this.dropdown))},open:function(){this.dropdown.open()},close:function(){this.dropdown.close()},setVal:function(a){a=b.toStr(a),this.isActivated?this.input.setInputValue(a):(this.input.setQuery(a),this.input.setInputValue(a,!0)),this._setLanguageDirection()},getVal:function(){return this.input.getQuery()},destroy:function(){this.input.destroy(),this.dropdown.destroy(),k(this.$node),this.$node=null}}),f}();!function(){"use strict";var c,d,f;c=a.fn.typeahead,d="ttTypeahead",f={initialize:function(c,f){function g(){var g,h,i=a(this);b.each(f,function(a){a.highlight=!!c.highlight}),h=new k({input:i,eventBus:g=new e({el:i}),withHint:b.isUndefined(c.hint)?!0:!!c.hint,minLength:c.minLength,autoselect:c.autoselect,datasets:f}),i.data(d,h)}return f=b.isArray(f)?f:[].slice.call(arguments,1),c=c||{},this.each(g)},open:function(){function b(){var b,c=a(this);(b=c.data(d))&&b.open()}return this.each(b)},close:function(){function b(){var b,c=a(this);(b=c.data(d))&&b.close()}return this.each(b)},val:function(b){function c(){var c,e=a(this);(c=e.data(d))&&c.setVal(b)}function e(a){var b,c;return(b=a.data(d))&&(c=b.getVal()),c}return arguments.length?this.each(c):e(this.first())},destroy:function(){function b(){var b,c=a(this);(b=c.data(d))&&(b.destroy(),c.removeData(d))}return this.each(b)}},a.fn.typeahead=function(b){var c;return f[b]&&"initialize"!==b?(c=this.filter(function(){return!!a(this).data(d)}),f[b].apply(c,[].slice.call(arguments,1))):f.initialize.apply(this,arguments)},a.fn.typeahead.noConflict=function(){return a.fn.typeahead=c,this}}()}(window.jQuery);
\ No newline at end of file
diff --git a/NewLife.Cube/Content/artDialog/css/ui-dialog.css b/NewLife.Cube/Content/artDialog/css/ui-dialog.css
deleted file mode 100644
index b10d5bbf84..0000000000
--- a/NewLife.Cube/Content/artDialog/css/ui-dialog.css
+++ /dev/null
@@ -1,425 +0,0 @@
-/*!
- * ui-dialog.css
- * Date: 2014-07-03
- * https://github.com/aui/artDialog
- * (c) 2009-2014 TangBin, http://www.planeArt.cn
- *
- * This is licensed under the GNU LGPL, version 2.1 or later.
- * For details, see: http://www.gnu.org/licenses/lgpl-2.1.html
- */
-.ui-dialog {
-    *zoom:1;
-    _float: left;
-    position: relative;
-    background-color: #FFF;
-    border: 1px solid #999;
-    border-radius: 6px;
-    outline: 0;
-    background-clip: padding-box;
-    font-family: Helvetica, arial, sans-serif;
-    font-size: 14px;
-    line-height: 1.428571429;
-    color: #333;
-    opacity: 0;
-    -webkit-transform: scale(0);
-    transform: scale(0);
-    -webkit-transition: -webkit-transform .15s ease-in-out, opacity .15s ease-in-out;
-    transition: transform .15s ease-in-out, opacity .15s ease-in-out;
-}
-.ui-popup-show .ui-dialog {
-    opacity: 1;
-    -webkit-transform: scale(1);
-    transform: scale(1);
-}
-.ui-popup-focus .ui-dialog {
-    box-shadow: 0 0 8px rgba(0, 0, 0, 0.1);
-}
-.ui-popup-modal .ui-dialog {
-    box-shadow: 0 0 8px rgba(0, 0, 0, 0.1), 0 0 256px rgba(255, 255, 255, .3);
-}
-.ui-dialog-grid {
-    width: auto;
-    margin: 0;
-    border: 0 none;
-    border-collapse:collapse;
-    border-spacing: 0;
-    background: transparent;
-}
-.ui-dialog-header,
-.ui-dialog-body,
-.ui-dialog-footer {
-    padding: 0;
-    border: 0 none;
-    text-align: left;
-    background: transparent;
-}
-.ui-dialog-header {
-    white-space: nowrap;
-    border-bottom: 1px solid #E5E5E5;
-}
-.ui-dialog-close {
-    position: relative;
-    _position: absolute;
-    float: right;
-    top: 13px;
-    right: 13px;
-    _height: 26px;
-    padding: 0 4px;
-    font-size: 21px;
-    font-weight: bold;
-    line-height: 1;
-    color: #000;
-    text-shadow: 0 1px 0 #FFF;
-    opacity: .2;
-    filter: alpha(opacity=20);
-    cursor: pointer;
-    background: transparent;
-    _background: #FFF;
-    border: 0;
-    -webkit-appearance: none;
-}
-.ui-dialog-close:hover,
-.ui-dialog-close:focus {
-    color: #000000;
-    text-decoration: none;
-    cursor: pointer;
-    outline: 0;
-    opacity: 0.5;
-    filter: alpha(opacity=50);
-}
-.ui-dialog-title {
-    margin: 0;
-    line-height: 1.428571429;
-    min-height: 16.428571429px;
-    padding: 15px;
-    overflow:hidden; 
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    font-weight: bold;
-    cursor: default;
-}
-.ui-dialog-body {
-    padding: 20px;
-    text-align: center;
-}
-.ui-dialog-content {
-    display: inline-block;
-    position: relative;
-    vertical-align: middle;
-    *zoom: 1;
-    *display: inline;
-    text-align: left;
-}
-.ui-dialog-footer {
-    padding: 0 20px 20px 20px;
-}
-.ui-dialog-statusbar {
-    float: left;
-    margin-right: 20px;
-    padding: 6px 0;
-    line-height: 1.428571429;
-    font-size: 14px;
-    color: #888;
-    white-space: nowrap;
-}
-.ui-dialog-statusbar label:hover {
-    color: #333;
-}
-.ui-dialog-statusbar input,
-.ui-dialog-statusbar .label {
-    vertical-align: middle;
-}
-.ui-dialog-button {
-    float: right;
-    white-space: nowrap;
-}
-.ui-dialog-footer button+button {
-    margin-bottom: 0;
-    margin-left: 5px;
-}
-.ui-dialog-footer button {
-    width:auto;
-    overflow:visible;
-    display: inline-block;
-    padding: 6px 12px;
-    _margin-left: 5px;
-    margin-bottom: 0;
-    font-size: 14px;
-    font-weight: normal;
-    line-height: 1.428571429;
-    text-align: center;
-    white-space: nowrap;
-    vertical-align: middle;
-    cursor: pointer;
-    background-image: none;
-    border: 1px solid transparent;
-    border-radius: 4px;
-    -webkit-user-select: none;
-     -moz-user-select: none;
-      -ms-user-select: none;
-       -o-user-select: none;
-          user-select: none;
-}
-
-.ui-dialog-footer button:focus {
-  outline: thin dotted #333;
-  outline: 5px auto -webkit-focus-ring-color;
-  outline-offset: -2px;
-}
-
-.ui-dialog-footer button:hover,
-.ui-dialog-footer button:focus {
-  color: #333333;
-  text-decoration: none;
-}
-
-.ui-dialog-footer button:active {
-  background-image: none;
-  outline: 0;
-  -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
-          box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
-}
-.ui-dialog-footer button[disabled] {
-  pointer-events: none;
-  cursor: not-allowed;
-  opacity: 0.65;
-  filter: alpha(opacity=65);
-  -webkit-box-shadow: none;
-          box-shadow: none;
-}
-
-.ui-dialog-footer button {
-  color: #333333;
-  background-color: #ffffff;
-  border-color: #cccccc;
-}
-
-.ui-dialog-footer button:hover,
-.ui-dialog-footer button:focus,
-.ui-dialog-footer button:active {
-  color: #333333;
-  background-color: #ebebeb;
-  border-color: #adadad;
-}
-
-.ui-dialog-footer button:active{
-  background-image: none;
-}
-
-.ui-dialog-footer button[disabled],
-.ui-dialog-footer button[disabled]:hover,
-.ui-dialog-footer button[disabled]:focus,
-.ui-dialog-footer button[disabled]:active {
-  background-color: #ffffff;
-  border-color: #cccccc;
-}
-
-.ui-dialog-footer button.ui-dialog-autofocus {
-  color: #ffffff;
-  background-color: #428bca;
-  border-color: #357ebd;
-}
-
-.ui-dialog-footer button.ui-dialog-autofocus:hover,
-.ui-dialog-footer button.ui-dialog-autofocus:focus,
-.ui-dialog-footer button.ui-dialog-autofocus:active {
-  color: #ffffff;
-  background-color: #3276b1;
-  border-color: #285e8e;
-}
-
-.ui-dialog-footer button.ui-dialog-autofocus:active {
-  background-image: none;
-}
-.ui-popup-top-left .ui-dialog,
-.ui-popup-top .ui-dialog,
-.ui-popup-top-right .ui-dialog {
-    top: -8px;
-}
-.ui-popup-bottom-left .ui-dialog,
-.ui-popup-bottom .ui-dialog,
-.ui-popup-bottom-right .ui-dialog {
-    top: 8px;
-}
-.ui-popup-left-top .ui-dialog,
-.ui-popup-left .ui-dialog,
-.ui-popup-left-bottom .ui-dialog {
-    left: -8px;
-}
-.ui-popup-right-top .ui-dialog,
-.ui-popup-right .ui-dialog,
-.ui-popup-right-bottom .ui-dialog {
-    left: 8px;
-}
-
-.ui-dialog-arrow-a,
-.ui-dialog-arrow-b {
-    position: absolute;
-    display: none;
-    width: 0;
-    height: 0;
-    overflow:hidden;
-    _color:#FF3FFF;
-    _filter:chroma(color=#FF3FFF);
-    border:8px dashed transparent;
-}
-.ui-popup-follow .ui-dialog-arrow-a,
-.ui-popup-follow .ui-dialog-arrow-b{
-    display: block;
-}
-.ui-popup-top-left .ui-dialog-arrow-a,
-.ui-popup-top .ui-dialog-arrow-a,
-.ui-popup-top-right .ui-dialog-arrow-a {
-    bottom: -16px;
-    border-top:8px solid #7C7C7C;
-}
-.ui-popup-top-left .ui-dialog-arrow-b,
-.ui-popup-top .ui-dialog-arrow-b,
-.ui-popup-top-right .ui-dialog-arrow-b {
-    bottom: -15px;
-    border-top:8px solid #fff;
-}
-.ui-popup-top-left .ui-dialog-arrow-a,
-.ui-popup-top-left .ui-dialog-arrow-b  {
-    left: 15px;
-}
-.ui-popup-top .ui-dialog-arrow-a,
-.ui-popup-top .ui-dialog-arrow-b  {
-    left: 50%;
-    margin-left: -8px;
-}
-.ui-popup-top-right .ui-dialog-arrow-a,
-.ui-popup-top-right .ui-dialog-arrow-b {
-    right: 15px;
-}
-.ui-popup-bottom-left .ui-dialog-arrow-a,
-.ui-popup-bottom .ui-dialog-arrow-a,
-.ui-popup-bottom-right .ui-dialog-arrow-a {
-    top: -16px;
-    border-bottom:8px solid #7C7C7C;
-}
-.ui-popup-bottom-left .ui-dialog-arrow-b,
-.ui-popup-bottom .ui-dialog-arrow-b,
-.ui-popup-bottom-right .ui-dialog-arrow-b {
-    top: -15px;
-    border-bottom:8px solid #fff;
-}
-.ui-popup-bottom-left .ui-dialog-arrow-a,
-.ui-popup-bottom-left .ui-dialog-arrow-b {
-    left: 15px;
-}
-.ui-popup-bottom .ui-dialog-arrow-a,
-.ui-popup-bottom .ui-dialog-arrow-b {
-    margin-left: -8px;
-    left: 50%;
-}
-.ui-popup-bottom-right .ui-dialog-arrow-a,
-.ui-popup-bottom-right .ui-dialog-arrow-b {
-    right: 15px;
-}
-.ui-popup-left-top .ui-dialog-arrow-a,
-.ui-popup-left .ui-dialog-arrow-a,
-.ui-popup-left-bottom .ui-dialog-arrow-a {
-    right: -16px;
-    border-left:8px solid #7C7C7C;
-}
-.ui-popup-left-top .ui-dialog-arrow-b,
-.ui-popup-left .ui-dialog-arrow-b,
-.ui-popup-left-bottom .ui-dialog-arrow-b {
-    right: -15px;
-    border-left:8px solid #fff;
-}
-.ui-popup-left-top .ui-dialog-arrow-a,
-.ui-popup-left-top .ui-dialog-arrow-b {
-    top: 15px;
-}
-.ui-popup-left .ui-dialog-arrow-a,
-.ui-popup-left .ui-dialog-arrow-b {
-    margin-top: -8px;
-    top: 50%;
-}
-.ui-popup-left-bottom .ui-dialog-arrow-a,
-.ui-popup-left-bottom .ui-dialog-arrow-b {
-    bottom: 15px;
-}
-.ui-popup-right-top .ui-dialog-arrow-a,
-.ui-popup-right .ui-dialog-arrow-a,
-.ui-popup-right-bottom .ui-dialog-arrow-a {
-    left: -16px;
-    border-right:8px solid #7C7C7C;
-}
-.ui-popup-right-top .ui-dialog-arrow-b,
-.ui-popup-right .ui-dialog-arrow-b,
-.ui-popup-right-bottom .ui-dialog-arrow-b {
-    left: -15px;
-    border-right:8px solid #fff;
-}
-.ui-popup-right-top .ui-dialog-arrow-a,
-.ui-popup-right-top .ui-dialog-arrow-b {
-    top: 15px;
-}
-.ui-popup-right .ui-dialog-arrow-a,
-.ui-popup-right .ui-dialog-arrow-b {
-    margin-top: -8px;
-    top: 50%;
-}
-.ui-popup-right-bottom .ui-dialog-arrow-a,
-.ui-popup-right-bottom .ui-dialog-arrow-b {
-    bottom: 15px;
-}
-
-
-@-webkit-keyframes ui-dialog-loading {
-    0% {
-        -webkit-transform: rotate(0deg);
-    }
-    100% {
-        -webkit-transform: rotate(360deg);
-    }
-}
-@keyframes ui-dialog-loading {
-    0% {
-        transform: rotate(0deg);
-    }
-    100% {
-        transform: rotate(360deg);
-    }
-}
-
-.ui-dialog-loading {
-    vertical-align: middle;
-    position: relative;
-    display: block;
-    *zoom: 1;
-    *display: inline;
-    overflow: hidden;
-    width: 32px;
-    height: 32px;
-    top: 50%;
-    margin: -16px auto 0 auto;
-    font-size: 0;
-    text-indent: -999em;
-    color: #666;
-}
-.ui-dialog-loading {
-    width: 100%\9;
-    text-indent: 0\9;
-    line-height: 32px\9;
-    text-align: center\9;
-    font-size: 12px\9;
-}
-
-.ui-dialog-loading::after {
-    position: absolute;
-    content: '';
-    width: 3px;
-    height: 3px;
-    margin: 14.5px 0 0 14.5px;
-    border-radius: 100%;
-    box-shadow: 0 -10px 0 1px #ccc, 10px 0px #ccc, 0 10px #ccc, -10px 0 #ccc, -7px -7px 0 0.5px #ccc, 7px -7px 0 1.5px #ccc, 7px 7px #ccc, -7px 7px #ccc;
-    -webkit-transform: rotate(360deg);
-    -webkit-animation: ui-dialog-loading 1.5s infinite linear;
-    transform: rotate(360deg);
-    animation: ui-dialog-loading 1.5s infinite linear;
-    display: none\9;
-}
diff --git a/NewLife.Cube/Content/artDialog/dist/dialog-min.js b/NewLife.Cube/Content/artDialog/dist/dialog-min.js
deleted file mode 100644
index 3408bd94ec..0000000000
--- a/NewLife.Cube/Content/artDialog/dist/dialog-min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! artDialog v6.0.5 | https://github.com/aui/artDialog */
-!function(){function a(b){var d=c[b],e="exports";return"object"==typeof d?d:(d[e]||(d[e]={},d[e]=d.call(d[e],a,d[e],d)||d[e]),d[e])}function b(a,b){c[a]=b}var c={};b("jquery",function(){return jQuery}),b("popup",function(a){function b(){this.destroyed=!1,this.__popup=c("<div />").css({display:"none",position:"absolute",outline:0}).attr("tabindex","-1").html(this.innerHTML).appendTo("body"),this.__backdrop=this.__mask=c("<div />").css({opacity:.7,background:"#000"}),this.node=this.__popup[0],this.backdrop=this.__backdrop[0],d++}var c=a("jquery"),d=0,e=!("minWidth"in c("html")[0].style),f=!e;return c.extend(b.prototype,{node:null,backdrop:null,fixed:!1,destroyed:!0,open:!1,returnValue:"",autofocus:!0,align:"bottom left",innerHTML:"",className:"ui-popup",show:function(a){if(this.destroyed)return this;var d=this.__popup,g=this.__backdrop;if(this.__activeElement=this.__getActive(),this.open=!0,this.follow=a||this.follow,!this.__ready){if(d.addClass(this.className).attr("role",this.modal?"alertdialog":"dialog").css("position",this.fixed?"fixed":"absolute"),e||c(window).on("resize",c.proxy(this.reset,this)),this.modal){var h={position:"fixed",left:0,top:0,width:"100%",height:"100%",overflow:"hidden",userSelect:"none",zIndex:this.zIndex||b.zIndex};d.addClass(this.className+"-modal"),f||c.extend(h,{position:"absolute",width:c(window).width()+"px",height:c(document).height()+"px"}),g.css(h).attr({tabindex:"0"}).on("focus",c.proxy(this.focus,this)),this.__mask=g.clone(!0).attr("style","").insertAfter(d),g.addClass(this.className+"-backdrop").insertBefore(d),this.__ready=!0}d.html()||d.html(this.innerHTML)}return d.addClass(this.className+"-show").show(),g.show(),this.reset().focus(),this.__dispatchEvent("show"),this},showModal:function(){return this.modal=!0,this.show.apply(this,arguments)},close:function(a){return!this.destroyed&&this.open&&(void 0!==a&&(this.returnValue=a),this.__popup.hide().removeClass(this.className+"-show"),this.__backdrop.hide(),this.open=!1,this.blur(),this.__dispatchEvent("close")),this},remove:function(){if(this.destroyed)return this;this.__dispatchEvent("beforeremove"),b.current===this&&(b.current=null),this.__popup.remove(),this.__backdrop.remove(),this.__mask.remove(),e||c(window).off("resize",this.reset),this.__dispatchEvent("remove");for(var a in this)delete this[a];return this},reset:function(){var a=this.follow;return a?this.__follow(a):this.__center(),this.__dispatchEvent("reset"),this},focus:function(){var a=this.node,d=this.__popup,e=b.current,f=this.zIndex=b.zIndex++;if(e&&e!==this&&e.blur(!1),!c.contains(a,this.__getActive())){var g=d.find("[autofocus]")[0];!this._autofocus&&g?this._autofocus=!0:g=a,this.__focus(g)}return d.css("zIndex",f),b.current=this,d.addClass(this.className+"-focus"),this.__dispatchEvent("focus"),this},blur:function(){var a=this.__activeElement,b=arguments[0];return b!==!1&&this.__focus(a),this._autofocus=!1,this.__popup.removeClass(this.className+"-focus"),this.__dispatchEvent("blur"),this},addEventListener:function(a,b){return this.__getEventListener(a).push(b),this},removeEventListener:function(a,b){for(var c=this.__getEventListener(a),d=0;d<c.length;d++)b===c[d]&&c.splice(d--,1);return this},__getEventListener:function(a){var b=this.__listener;return b||(b=this.__listener={}),b[a]||(b[a]=[]),b[a]},__dispatchEvent:function(a){var b=this.__getEventListener(a);this["on"+a]&&this["on"+a]();for(var c=0;c<b.length;c++)b[c].call(this)},__focus:function(a){try{this.autofocus&&!/^iframe$/i.test(a.nodeName)&&a.focus()}catch(b){}},__getActive:function(){try{var a=document.activeElement,b=a.contentDocument,c=b&&b.activeElement||a;return c}catch(d){}},__center:function(){var a=this.__popup,b=c(window),d=c(document),e=this.fixed,f=e?0:d.scrollLeft(),g=e?0:d.scrollTop(),h=b.width(),i=b.height(),j=a.width(),k=a.height(),l=(h-j)/2+f,m=382*(i-k)/1e3+g,n=a[0].style;n.left=Math.max(parseInt(l),f)+"px",n.top=Math.max(parseInt(m),g)+"px"},__follow:function(a){var b=a.parentNode&&c(a),d=this.__popup;if(this.__followSkin&&d.removeClass(this.__followSkin),b){var e=b.offset();if(e.left*e.top<0)return this.__center()}var f=this,g=this.fixed,h=c(window),i=c(document),j=h.width(),k=h.height(),l=i.scrollLeft(),m=i.scrollTop(),n=d.width(),o=d.height(),p=b?b.outerWidth():0,q=b?b.outerHeight():0,r=this.__offset(a),s=r.left,t=r.top,u=g?s-l:s,v=g?t-m:t,w=g?0:l,x=g?0:m,y=w+j-n,z=x+k-o,A={},B=this.align.split(" "),C=this.className+"-",D={top:"bottom",bottom:"top",left:"right",right:"left"},E={top:"top",bottom:"top",left:"left",right:"left"},F=[{top:v-o,bottom:v+q,left:u-n,right:u+p},{top:v,bottom:v-o+q,left:u,right:u-n+p}],G={left:u+p/2-n/2,top:v+q/2-o/2},H={left:[w,y],top:[x,z]};c.each(B,function(a,b){F[a][b]>H[E[b]][1]&&(b=B[a]=D[b]),F[a][b]<H[E[b]][0]&&(B[a]=D[b])}),B[1]||(E[B[1]]="left"===E[B[0]]?"top":"left",F[1][B[1]]=G[E[B[1]]]),C+=B.join("-")+" "+this.className+"-follow",f.__followSkin=C,b&&d.addClass(C),A[E[B[0]]]=parseInt(F[0][B[0]]),A[E[B[1]]]=parseInt(F[1][B[1]]),d.css(A)},__offset:function(a){var b=a.parentNode,d=b?c(a).offset():{left:a.pageX,top:a.pageY};a=b?a:a.target;var e=a.ownerDocument,f=e.defaultView||e.parentWindow;if(f==window)return d;var g=f.frameElement,h=c(e),i=h.scrollLeft(),j=h.scrollTop(),k=c(g).offset(),l=k.left,m=k.top;return{left:d.left+l-i,top:d.top+m-j}}}),b.zIndex=1024,b.current=null,b}),b("dialog-config",{backdropBackground:"#000",backdropOpacity:.7,content:'<span class="ui-dialog-loading">Loading..</span>',title:"",statusbar:"",button:null,ok:null,cancel:null,okValue:"ok",cancelValue:"cancel",cancelDisplay:!0,width:"",height:"",padding:"",skin:"",quickClose:!1,cssUri:"../css/ui-dialog.css",innerHTML:'<div i="dialog" class="ui-dialog"><div class="ui-dialog-arrow-a"></div><div class="ui-dialog-arrow-b"></div><table class="ui-dialog-grid"><tr><td i="header" class="ui-dialog-header"><button i="close" class="ui-dialog-close">&#215;</button><div i="title" class="ui-dialog-title"></div></td></tr><tr><td i="body" class="ui-dialog-body"><div i="content" class="ui-dialog-content"></div></td></tr><tr><td i="footer" class="ui-dialog-footer"><div i="statusbar" class="ui-dialog-statusbar"></div><div i="button" class="ui-dialog-button"></div></td></tr></table></div>'}),b("dialog",function(a){var b=a("jquery"),c=a("popup"),d=a("dialog-config"),e=d.cssUri;if(e){var f=a[a.toUrl?"toUrl":"resolve"];f&&(e=f(e),e='<link rel="stylesheet" href="'+e+'" />',b("base")[0]?b("base").before(e):b("head").append(e))}var g=0,h=new Date-0,i=!("minWidth"in b("html")[0].style),j="createTouch"in document&&!("onmousemove"in document)||/(iPhone|iPad|iPod)/i.test(navigator.userAgent),k=!i&&!j,l=function(a,c,d){var e=a=a||{};("string"==typeof a||1===a.nodeType)&&(a={content:a,fixed:!j}),a=b.extend(!0,{},l.defaults,a),a.original=e;var f=a.id=a.id||h+g,i=l.get(f);return i?i.focus():(k||(a.fixed=!1),a.quickClose&&(a.modal=!0,a.backdropOpacity=0),b.isArray(a.button)||(a.button=[]),void 0!==d&&(a.cancel=d),a.cancel&&a.button.push({id:"cancel",value:a.cancelValue,callback:a.cancel,display:a.cancelDisplay}),void 0!==c&&(a.ok=c),a.ok&&a.button.push({id:"ok",value:a.okValue,callback:a.ok,autofocus:!0}),l.list[f]=new l.create(a))},m=function(){};m.prototype=c.prototype;var n=l.prototype=new m;return l.create=function(a){var d=this;b.extend(this,new c);var e=(a.original,b(this.node).html(a.innerHTML)),f=b(this.backdrop);return this.options=a,this._popup=e,b.each(a,function(a,b){"function"==typeof d[a]?d[a](b):d[a]=b}),a.zIndex&&(c.zIndex=a.zIndex),e.attr({"aria-labelledby":this._$("title").attr("id","title:"+this.id).attr("id"),"aria-describedby":this._$("content").attr("id","content:"+this.id).attr("id")}),this._$("close").css("display",this.cancel===!1?"none":"").attr("title",this.cancelValue).on("click",function(a){d._trigger("cancel"),a.preventDefault()}),this._$("dialog").addClass(this.skin),this._$("body").css("padding",this.padding),a.quickClose&&f.on("onmousedown"in document?"mousedown":"click",function(){return d._trigger("cancel"),!1}),this.addEventListener("show",function(){f.css({opacity:0,background:a.backdropBackground}).animate({opacity:a.backdropOpacity},150)}),this._esc=function(a){var b=a.target,e=b.nodeName,f=/^input|textarea$/i,g=c.current===d,h=a.keyCode;!g||f.test(e)&&"button"!==b.type||27===h&&d._trigger("cancel")},b(document).on("keydown",this._esc),this.addEventListener("remove",function(){b(document).off("keydown",this._esc),delete l.list[this.id]}),g++,l.oncreate(this),this},l.create.prototype=n,b.extend(n,{content:function(a){var c=this._$("content");return"object"==typeof a?(a=b(a),c.empty("").append(a.show()),this.addEventListener("beforeremove",function(){b("body").append(a.hide())})):c.html(a),this.reset()},title:function(a){return this._$("title").text(a),this._$("header")[a?"show":"hide"](),this},width:function(a){return this._$("content").css("width",a),this.reset()},height:function(a){return this._$("content").css("height",a),this.reset()},button:function(a){a=a||[];var c=this,d="",e=0;return this.callbacks={},"string"==typeof a?(d=a,e++):b.each(a,function(a,f){var g=f.id=f.id||f.value,h="";c.callbacks[g]=f.callback,f.display===!1?h=' style="display:none"':e++,d+='<button type="button" i-id="'+g+'"'+h+(f.disabled?" disabled":"")+(f.autofocus?' autofocus class="ui-dialog-autofocus"':"")+">"+f.value+"</button>",c._$("button").on("click","[i-id="+g+"]",function(a){var d=b(this);d.attr("disabled")||c._trigger(g),a.preventDefault()})}),this._$("button").html(d),this._$("footer")[e?"show":"hide"](),this},statusbar:function(a){return this._$("statusbar").html(a)[a?"show":"hide"](),this},_$:function(a){return this._popup.find("[i="+a+"]")},_trigger:function(a){var b=this.callbacks[a];return"function"!=typeof b||b.call(this)!==!1?this.close().remove():this}}),l.oncreate=b.noop,l.getCurrent=function(){return c.current},l.get=function(a){return void 0===a?l.list:l.list[a]},l.list={},l.defaults=d,l}),window.dialog=a("dialog")}();
\ No newline at end of file
diff --git a/NewLife.Cube/Content/artDialog/dist/dialog-plus-min.js b/NewLife.Cube/Content/artDialog/dist/dialog-plus-min.js
deleted file mode 100644
index e84fa9fcdf..0000000000
--- a/NewLife.Cube/Content/artDialog/dist/dialog-plus-min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! artDialog v6.0.5 | https://github.com/aui/artDialog */
-!function(){function a(b){var d=c[b],e="exports";return"object"==typeof d?d:(d[e]||(d[e]={},d[e]=d.call(d[e],a,d[e],d)||d[e]),d[e])}function b(a,b){c[a]=b}var c={};b("jquery",function(){return jQuery}),b("popup",function(a){function b(){this.destroyed=!1,this.__popup=c("<div />").css({display:"none",position:"absolute",outline:0}).attr("tabindex","-1").html(this.innerHTML).appendTo("body"),this.__backdrop=this.__mask=c("<div />").css({opacity:.7,background:"#000"}),this.node=this.__popup[0],this.backdrop=this.__backdrop[0],d++}var c=a("jquery"),d=0,e=!("minWidth"in c("html")[0].style),f=!e;return c.extend(b.prototype,{node:null,backdrop:null,fixed:!1,destroyed:!0,open:!1,returnValue:"",autofocus:!0,align:"bottom left",innerHTML:"",className:"ui-popup",show:function(a){if(this.destroyed)return this;var d=this.__popup,g=this.__backdrop;if(this.__activeElement=this.__getActive(),this.open=!0,this.follow=a||this.follow,!this.__ready){if(d.addClass(this.className).attr("role",this.modal?"alertdialog":"dialog").css("position",this.fixed?"fixed":"absolute"),e||c(window).on("resize",c.proxy(this.reset,this)),this.modal){var h={position:"fixed",left:0,top:0,width:"100%",height:"100%",overflow:"hidden",userSelect:"none",zIndex:this.zIndex||b.zIndex};d.addClass(this.className+"-modal"),f||c.extend(h,{position:"absolute",width:c(window).width()+"px",height:c(document).height()+"px"}),g.css(h).attr({tabindex:"0"}).on("focus",c.proxy(this.focus,this)),this.__mask=g.clone(!0).attr("style","").insertAfter(d),g.addClass(this.className+"-backdrop").insertBefore(d),this.__ready=!0}d.html()||d.html(this.innerHTML)}return d.addClass(this.className+"-show").show(),g.show(),this.reset().focus(),this.__dispatchEvent("show"),this},showModal:function(){return this.modal=!0,this.show.apply(this,arguments)},close:function(a){return!this.destroyed&&this.open&&(void 0!==a&&(this.returnValue=a),this.__popup.hide().removeClass(this.className+"-show"),this.__backdrop.hide(),this.open=!1,this.blur(),this.__dispatchEvent("close")),this},remove:function(){if(this.destroyed)return this;this.__dispatchEvent("beforeremove"),b.current===this&&(b.current=null),this.__popup.remove(),this.__backdrop.remove(),this.__mask.remove(),e||c(window).off("resize",this.reset),this.__dispatchEvent("remove");for(var a in this)delete this[a];return this},reset:function(){var a=this.follow;return a?this.__follow(a):this.__center(),this.__dispatchEvent("reset"),this},focus:function(){var a=this.node,d=this.__popup,e=b.current,f=this.zIndex=b.zIndex++;if(e&&e!==this&&e.blur(!1),!c.contains(a,this.__getActive())){var g=d.find("[autofocus]")[0];!this._autofocus&&g?this._autofocus=!0:g=a,this.__focus(g)}return d.css("zIndex",f),b.current=this,d.addClass(this.className+"-focus"),this.__dispatchEvent("focus"),this},blur:function(){var a=this.__activeElement,b=arguments[0];return b!==!1&&this.__focus(a),this._autofocus=!1,this.__popup.removeClass(this.className+"-focus"),this.__dispatchEvent("blur"),this},addEventListener:function(a,b){return this.__getEventListener(a).push(b),this},removeEventListener:function(a,b){for(var c=this.__getEventListener(a),d=0;d<c.length;d++)b===c[d]&&c.splice(d--,1);return this},__getEventListener:function(a){var b=this.__listener;return b||(b=this.__listener={}),b[a]||(b[a]=[]),b[a]},__dispatchEvent:function(a){var b=this.__getEventListener(a);this["on"+a]&&this["on"+a]();for(var c=0;c<b.length;c++)b[c].call(this)},__focus:function(a){try{this.autofocus&&!/^iframe$/i.test(a.nodeName)&&a.focus()}catch(b){}},__getActive:function(){try{var a=document.activeElement,b=a.contentDocument,c=b&&b.activeElement||a;return c}catch(d){}},__center:function(){var a=this.__popup,b=c(window),d=c(document),e=this.fixed,f=e?0:d.scrollLeft(),g=e?0:d.scrollTop(),h=b.width(),i=b.height(),j=a.width(),k=a.height(),l=(h-j)/2+f,m=382*(i-k)/1e3+g,n=a[0].style;n.left=Math.max(parseInt(l),f)+"px",n.top=Math.max(parseInt(m),g)+"px"},__follow:function(a){var b=a.parentNode&&c(a),d=this.__popup;if(this.__followSkin&&d.removeClass(this.__followSkin),b){var e=b.offset();if(e.left*e.top<0)return this.__center()}var f=this,g=this.fixed,h=c(window),i=c(document),j=h.width(),k=h.height(),l=i.scrollLeft(),m=i.scrollTop(),n=d.width(),o=d.height(),p=b?b.outerWidth():0,q=b?b.outerHeight():0,r=this.__offset(a),s=r.left,t=r.top,u=g?s-l:s,v=g?t-m:t,w=g?0:l,x=g?0:m,y=w+j-n,z=x+k-o,A={},B=this.align.split(" "),C=this.className+"-",D={top:"bottom",bottom:"top",left:"right",right:"left"},E={top:"top",bottom:"top",left:"left",right:"left"},F=[{top:v-o,bottom:v+q,left:u-n,right:u+p},{top:v,bottom:v-o+q,left:u,right:u-n+p}],G={left:u+p/2-n/2,top:v+q/2-o/2},H={left:[w,y],top:[x,z]};c.each(B,function(a,b){F[a][b]>H[E[b]][1]&&(b=B[a]=D[b]),F[a][b]<H[E[b]][0]&&(B[a]=D[b])}),B[1]||(E[B[1]]="left"===E[B[0]]?"top":"left",F[1][B[1]]=G[E[B[1]]]),C+=B.join("-")+" "+this.className+"-follow",f.__followSkin=C,b&&d.addClass(C),A[E[B[0]]]=parseInt(F[0][B[0]]),A[E[B[1]]]=parseInt(F[1][B[1]]),d.css(A)},__offset:function(a){var b=a.parentNode,d=b?c(a).offset():{left:a.pageX,top:a.pageY};a=b?a:a.target;var e=a.ownerDocument,f=e.defaultView||e.parentWindow;if(f==window)return d;var g=f.frameElement,h=c(e),i=h.scrollLeft(),j=h.scrollTop(),k=c(g).offset(),l=k.left,m=k.top;return{left:d.left+l-i,top:d.top+m-j}}}),b.zIndex=1024,b.current=null,b}),b("dialog-config",{backdropBackground:"#000",backdropOpacity:.7,content:'<span class="ui-dialog-loading">Loading..</span>',title:"",statusbar:"",button:null,ok:null,cancel:null,okValue:"ok",cancelValue:"cancel",cancelDisplay:!0,width:"",height:"",padding:"",skin:"",quickClose:!1,cssUri:"../css/ui-dialog.css",innerHTML:'<div i="dialog" class="ui-dialog"><div class="ui-dialog-arrow-a"></div><div class="ui-dialog-arrow-b"></div><table class="ui-dialog-grid"><tr><td i="header" class="ui-dialog-header"><button i="close" class="ui-dialog-close">&#215;</button><div i="title" class="ui-dialog-title"></div></td></tr><tr><td i="body" class="ui-dialog-body"><div i="content" class="ui-dialog-content"></div></td></tr><tr><td i="footer" class="ui-dialog-footer"><div i="statusbar" class="ui-dialog-statusbar"></div><div i="button" class="ui-dialog-button"></div></td></tr></table></div>'}),b("dialog",function(a){var b=a("jquery"),c=a("popup"),d=a("dialog-config"),e=d.cssUri;if(e){var f=a[a.toUrl?"toUrl":"resolve"];f&&(e=f(e),e='<link rel="stylesheet" href="'+e+'" />',b("base")[0]?b("base").before(e):b("head").append(e))}var g=0,h=new Date-0,i=!("minWidth"in b("html")[0].style),j="createTouch"in document&&!("onmousemove"in document)||/(iPhone|iPad|iPod)/i.test(navigator.userAgent),k=!i&&!j,l=function(a,c,d){var e=a=a||{};("string"==typeof a||1===a.nodeType)&&(a={content:a,fixed:!j}),a=b.extend(!0,{},l.defaults,a),a.original=e;var f=a.id=a.id||h+g,i=l.get(f);return i?i.focus():(k||(a.fixed=!1),a.quickClose&&(a.modal=!0,a.backdropOpacity=0),b.isArray(a.button)||(a.button=[]),void 0!==d&&(a.cancel=d),a.cancel&&a.button.push({id:"cancel",value:a.cancelValue,callback:a.cancel,display:a.cancelDisplay}),void 0!==c&&(a.ok=c),a.ok&&a.button.push({id:"ok",value:a.okValue,callback:a.ok,autofocus:!0}),l.list[f]=new l.create(a))},m=function(){};m.prototype=c.prototype;var n=l.prototype=new m;return l.create=function(a){var d=this;b.extend(this,new c);var e=(a.original,b(this.node).html(a.innerHTML)),f=b(this.backdrop);return this.options=a,this._popup=e,b.each(a,function(a,b){"function"==typeof d[a]?d[a](b):d[a]=b}),a.zIndex&&(c.zIndex=a.zIndex),e.attr({"aria-labelledby":this._$("title").attr("id","title:"+this.id).attr("id"),"aria-describedby":this._$("content").attr("id","content:"+this.id).attr("id")}),this._$("close").css("display",this.cancel===!1?"none":"").attr("title",this.cancelValue).on("click",function(a){d._trigger("cancel"),a.preventDefault()}),this._$("dialog").addClass(this.skin),this._$("body").css("padding",this.padding),a.quickClose&&f.on("onmousedown"in document?"mousedown":"click",function(){return d._trigger("cancel"),!1}),this.addEventListener("show",function(){f.css({opacity:0,background:a.backdropBackground}).animate({opacity:a.backdropOpacity},150)}),this._esc=function(a){var b=a.target,e=b.nodeName,f=/^input|textarea$/i,g=c.current===d,h=a.keyCode;!g||f.test(e)&&"button"!==b.type||27===h&&d._trigger("cancel")},b(document).on("keydown",this._esc),this.addEventListener("remove",function(){b(document).off("keydown",this._esc),delete l.list[this.id]}),g++,l.oncreate(this),this},l.create.prototype=n,b.extend(n,{content:function(a){var c=this._$("content");return"object"==typeof a?(a=b(a),c.empty("").append(a.show()),this.addEventListener("beforeremove",function(){b("body").append(a.hide())})):c.html(a),this.reset()},title:function(a){return this._$("title").text(a),this._$("header")[a?"show":"hide"](),this},width:function(a){return this._$("content").css("width",a),this.reset()},height:function(a){return this._$("content").css("height",a),this.reset()},button:function(a){a=a||[];var c=this,d="",e=0;return this.callbacks={},"string"==typeof a?(d=a,e++):b.each(a,function(a,f){var g=f.id=f.id||f.value,h="";c.callbacks[g]=f.callback,f.display===!1?h=' style="display:none"':e++,d+='<button type="button" i-id="'+g+'"'+h+(f.disabled?" disabled":"")+(f.autofocus?' autofocus class="ui-dialog-autofocus"':"")+">"+f.value+"</button>",c._$("button").on("click","[i-id="+g+"]",function(a){var d=b(this);d.attr("disabled")||c._trigger(g),a.preventDefault()})}),this._$("button").html(d),this._$("footer")[e?"show":"hide"](),this},statusbar:function(a){return this._$("statusbar").html(a)[a?"show":"hide"](),this},_$:function(a){return this._popup.find("[i="+a+"]")},_trigger:function(a){var b=this.callbacks[a];return"function"!=typeof b||b.call(this)!==!1?this.close().remove():this}}),l.oncreate=b.noop,l.getCurrent=function(){return c.current},l.get=function(a){return void 0===a?l.list:l.list[a]},l.list={},l.defaults=d,l}),b("drag",function(a){var b=a("jquery"),c=b(window),d=b(document),e="createTouch"in document,f=document.documentElement,g=!("minWidth"in f.style),h=!g&&"onlosecapture"in f,i="setCapture"in f,j={start:e?"touchstart":"mousedown",over:e?"touchmove":"mousemove",end:e?"touchend":"mouseup"},k=e?function(a){return a.touches||(a=a.originalEvent.touches.item(0)),a}:function(a){return a},l=function(){this.start=b.proxy(this.start,this),this.over=b.proxy(this.over,this),this.end=b.proxy(this.end,this),this.onstart=this.onover=this.onend=b.noop};return l.types=j,l.prototype={start:function(a){return a=this.startFix(a),d.on(j.over,this.over).on(j.end,this.end),this.onstart(a),!1},over:function(a){return a=this.overFix(a),this.onover(a),!1},end:function(a){return a=this.endFix(a),d.off(j.over,this.over).off(j.end,this.end),this.onend(a),!1},startFix:function(a){return a=k(a),this.target=b(a.target),this.selectstart=function(){return!1},d.on("selectstart",this.selectstart).on("dblclick",this.end),h?this.target.on("losecapture",this.end):c.on("blur",this.end),i&&this.target[0].setCapture(),a},overFix:function(a){return a=k(a)},endFix:function(a){return a=k(a),d.off("selectstart",this.selectstart).off("dblclick",this.end),h?this.target.off("losecapture",this.end):c.off("blur",this.end),i&&this.target[0].releaseCapture(),a}},l.create=function(a,e){var f,g,h,i,j=b(a),k=new l,m=l.types.start,n=function(){},o=a.className.replace(/^\s|\s.*/g,"")+"-drag-start",p={onstart:n,onover:n,onend:n,off:function(){j.off(m,k.start)}};return k.onstart=function(b){var e="fixed"===j.css("position"),k=d.scrollLeft(),l=d.scrollTop(),m=j.width(),n=j.height();f=0,g=0,h=e?c.width()-m+f:d.width()-m,i=e?c.height()-n+g:d.height()-n;var q=j.offset(),r=this.startLeft=e?q.left-k:q.left,s=this.startTop=e?q.top-l:q.top;this.clientX=b.clientX,this.clientY=b.clientY,j.addClass(o),p.onstart.call(a,b,r,s)},k.onover=function(b){var c=b.clientX-this.clientX+this.startLeft,d=b.clientY-this.clientY+this.startTop,e=j[0].style;c=Math.max(f,Math.min(h,c)),d=Math.max(g,Math.min(i,d)),e.left=c+"px",e.top=d+"px",p.onover.call(a,b,c,d)},k.onend=function(b){var c=j.position(),d=c.left,e=c.top;j.removeClass(o),p.onend.call(a,b,d,e)},k.off=function(){j.off(m,k.start)},e?k.start(e):j.on(m,k.start),p},l}),b("dialog-plus",function(a){var b=a("jquery"),c=a("dialog"),d=a("drag");return c.oncreate=function(a){var c,e=a.options,f=e.original,g=e.url,h=e.oniframeload;if(g&&(this.padding=e.padding=0,c=b("<iframe />"),c.attr({src:g,name:a.id,width:"100%",height:"100%",allowtransparency:"yes",frameborder:"no",scrolling:"no"}).on("load",function(){var b;try{b=c[0].contentWindow.frameElement}catch(d){}b&&(e.width||a.width(c.contents().width()),e.height||a.height(c.contents().height())),h&&h.call(a)}),a.addEventListener("beforeremove",function(){c.attr("src","about:blank").remove()},!1),a.content(c[0]),a.iframeNode=c[0]),!(f instanceof Object))for(var i=function(){a.close().remove()},j=0;j<frames.length;j++)try{if(f instanceof frames[j].Object){b(frames[j]).one("unload",i);break}}catch(k){}b(a.node).on(d.types.start,"[i=title]",function(b){a.follow||(a.focus(),d.create(a.node,b))})},c.get=function(a){if(a&&a.frameElement){var b,d=a.frameElement,e=c.list;for(var f in e)if(b=e[f],b.node.getElementsByTagName("iframe")[0]===d)return b}else if(a)return c.list[a]},c}),window.dialog=a("dialog-plus")}();
\ No newline at end of file
diff --git a/NewLife.Cube/Content/artDialog/dist/dialog.new.life.js b/NewLife.Cube/Content/artDialog/dist/dialog.new.life.js
deleted file mode 100644
index fcc56a9895..0000000000
--- a/NewLife.Cube/Content/artDialog/dist/dialog.new.life.js
+++ /dev/null
@@ -1,210 +0,0 @@
-﻿(function ($, dialog) {
-
-	var dm = document.documentMode;
-	var ie = !-[1, ];
-	var ie6 = ie && !window.XMLHttpRequest;
-	var ie7 = ie && dm == 7;
-	var ie8 = ie && dm == 8;
-	var ie9 = dm;
-
-	window.infoDialog = window.errorDialog = function (title, msg, modal, jumpUrl) {
-
-		var len = arguments.length;
-		if (len == 1) {
-			title = '';
-			msg = title;
-			modal = true;
-			jumpUrl = null;
-		} else if (len == 3) {
-			if ($.type(modal) == 'string') {
-				jumpUrl = modal;
-				modal = true;
-			} else if ($.type(modal) == 'boolean' || $.type(modal) == 'number') {
-				modal = !!modal;
-				jumpUrl = null;
-			}
-		} else if (len == 4) {
-			modal = !!modal;
-			//jumpUrl = jumpUrl;
-		}
-
-		var d = dialog.get('global_error_dialog') || dialog({
-			id: 'global_error_dialog',
-			title: title || '提示',
-			content: '',
-			backdropBackground: '#fff',
-			backdropOpacity: 0.4,
-			okValue: '确定',
-			cancelDisplay: false,
-			cancel: function () {
-				this.ok();
-			},
-			ok: function () {
-
-				if (jumpUrl) {
-					if (jumpUrl == 'close') {
-						window.opener && window.opener.setTimeout('location.reload()', 800);
-						(ie6 || dm) && window.open('', '_self', '');
-						window.close();
-					} else if ($.type(jumpUrl) == 'function') {
-
-					    if (jumpUrl() === false) {
-					        //回调返回flase阻止关闭dialog
-					        return false;
-					    }
-					} else {
-					    if (jumpUrl.indexOf('iframe') > -1) {
-					        var url = jumpUrl.substr(6).split('|'),
-								fid = url[0],
-								url = url[1];
-					        //console.log(fid)
-					        var iframe = $(fid || 'iframe');
-					        if (iframe.length) {
-					            iframe.get('0').src = url;
-					        }
-					    }
-					    else {
-					        window.location.href = jumpUrl;
-					    }
-					}
-				}
-				this.close().remove();
-			}
-		});
-		if ($.type(msg) == 'object') {
-			$.map(msg, function (v, k) {
-				if (typeof d[k] == 'function') {
-					d[k](v || '');
-				}
-			});
-		} else {
-			d.content(msg || '');
-		}
-
-		d[modal ? 'showModal' : 'show']();
-		return d;
-	}
-
-	window.confirmDialog = function (msg, title, callback) {
-		 
-		var len = arguments.length;
-		if (len == 2) {
-			if ($.type(title) == 'function') {
-				callback = title;
-				title = '';
-			}
-		}
-
-		var d = dialog.get('global_confirm_dialog') || dialog({
-			id: 'global_confirm_dialog',
-			title: title || '提示',
-			content: '',
-			backdropBackground: '#fff',
-			backdropOpacity: 0.4,
-			okValue: '确定',
-			cancelValue:'取消',
-			cancelDisplay: true,
-			cancel: function () {
-				this.close().remove();
-			},
-			ok: function () { 
-				callback && callback();
-				this.close().remove();
-			}
-		});
-		if ($.type(msg) == 'object') {
-			$.map(msg, function (v, k) {
-				if (typeof d[k] == 'function') {
-					d[k](v || '');
-				}
-			});
-		} else {
-			d.content(msg || '');
-		}
-		d.showModal();
-
-		return d;
-	};
-
-	window.tips = function (msg, modal, time, jumpUrl) {
-		var len = arguments.length;
-		if (len == 1) {
-			modal = false;
-			time = 2000;
-		} else if (len == 2) {
-			if ($.type(modal) == 'number' && modal >= 1000) {
-				time = modal;
-				modal = false;
-			} else if ($.type(modal) == 'boolean') {
-				modal = !!modal;
-				time = 2000;
-			}
-		} else if (len == 3) {
-			modal = !!modal;
-			time = +time >= 1000 ? time : 0;
-		}
-
-		var d = dialog.get('global_tips_dialog') || dialog({
-			id: 'global_tips_dialog',
-			backdropBackground: '#fff',
-			backdropOpacity: 0.4,
-			content: ''
-		});
-
-		if ($.type(msg) == 'boolean' || msg == '') {
-			d.close().remove();
-			return d;
-		}
-
-		if ($.type(msg) == 'object') {
-			$.map(msg, function (v, k) {
-				if (typeof d[k] == 'function') {
-					d[k](v || '');
-				}
-			});
-		} else {
-			d.content(msg || 'tips');
-		}
-
-		d[modal ? 'showModal' : 'show']();
-
-		if (time > 0) {
-		    setTimeout(function () {
-		        
-				if (jumpUrl) {
-					if (jumpUrl == 'close') {
-						window.opener && window.opener.setTimeout('location.reload()', 800);
-						(ie6 || dm) && window.open('', '_self', '');
-						window.close();
-					} else if ($.type(jumpUrl) == 'function') {
-
-						if (jumpUrl() === false) {
-							//回调返回flase阻止关闭dialog
-							return false;
-						}
-					} else {
-						if (jumpUrl.indexOf('iframe') > -1) {
-							var url = jumpUrl.substr(6).split('|'),
-								fid = url[0] ,
-								url = url[1];
-							//console.log(fid);
-							var iframe = $( fid || 'iframe');
-							if (iframe.length) {
-								iframe.get('0').src = url;
-							}
-						}
-						 else {
-							window.location.href = jumpUrl;
-						}
-					}
-						
-				}
-				d.close().remove();
-			}, time);
-		}
-
-		return d;
-	}
-
-
-})(jQuery, dialog);
diff --git a/NewLife.Cube/Content/bootstrap-switch/bootstrap-switch.min.css b/NewLife.Cube/Content/bootstrap-switch/bootstrap-switch.min.css
deleted file mode 100644
index c63cfe2f96..0000000000
--- a/NewLife.Cube/Content/bootstrap-switch/bootstrap-switch.min.css
+++ /dev/null
@@ -1,22 +0,0 @@
-/* ========================================================================
- * bootstrap-switch - v3.3.2
- * http://www.bootstrap-switch.org
- * ========================================================================
- * Copyright 2012-2013 Mattia Larentis
- *
- * ========================================================================
- * 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.
- * ========================================================================
- */
-
-.bootstrap-switch{display:inline-block;direction:ltr;cursor:pointer;border-radius:4px;border:1px solid #ccc;position:relative;text-align:left;overflow:hidden;line-height:8px;z-index:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;vertical-align:middle;-webkit-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.bootstrap-switch .bootstrap-switch-container{display:inline-block;top:0;border-radius:4px;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}.bootstrap-switch .bootstrap-switch-handle-off,.bootstrap-switch .bootstrap-switch-handle-on,.bootstrap-switch .bootstrap-switch-label{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;cursor:pointer;display:inline-block!important;height:100%;padding:6px 12px;font-size:14px;line-height:20px}.bootstrap-switch .bootstrap-switch-handle-off,.bootstrap-switch .bootstrap-switch-handle-on{text-align:center;z-index:1}.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-primary,.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-primary{color:#fff;background:#337ab7}.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-info,.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-info{color:#fff;background:#5bc0de}.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-success,.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-success{color:#fff;background:#5cb85c}.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-warning,.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-warning{background:#f0ad4e;color:#fff}.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-danger,.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-danger{color:#fff;background:#d9534f}.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-default,.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-default{color:#000;background:#eee}.bootstrap-switch .bootstrap-switch-label{text-align:center;margin-top:-1px;margin-bottom:-1px;z-index:100;color:#333;background:#fff}.bootstrap-switch .bootstrap-switch-handle-on{border-bottom-left-radius:3px;border-top-left-radius:3px}.bootstrap-switch .bootstrap-switch-handle-off{border-bottom-right-radius:3px;border-top-right-radius:3px}.bootstrap-switch input[type=radio],.bootstrap-switch input[type=checkbox]{position:absolute!important;top:0;left:0;margin:0;z-index:-1;opacity:0;filter:alpha(opacity=0)}.bootstrap-switch.bootstrap-switch-mini .bootstrap-switch-handle-off,.bootstrap-switch.bootstrap-switch-mini .bootstrap-switch-handle-on,.bootstrap-switch.bootstrap-switch-mini .bootstrap-switch-label{padding:1px 5px;font-size:12px;line-height:1.5}.bootstrap-switch.bootstrap-switch-small .bootstrap-switch-handle-off,.bootstrap-switch.bootstrap-switch-small .bootstrap-switch-handle-on,.bootstrap-switch.bootstrap-switch-small .bootstrap-switch-label{padding:5px 10px;font-size:12px;line-height:1.5}.bootstrap-switch.bootstrap-switch-large .bootstrap-switch-handle-off,.bootstrap-switch.bootstrap-switch-large .bootstrap-switch-handle-on,.bootstrap-switch.bootstrap-switch-large .bootstrap-switch-label{padding:6px 16px;font-size:18px;line-height:1.3333333}.bootstrap-switch.bootstrap-switch-disabled,.bootstrap-switch.bootstrap-switch-indeterminate,.bootstrap-switch.bootstrap-switch-readonly{cursor:default!important}.bootstrap-switch.bootstrap-switch-disabled .bootstrap-switch-handle-off,.bootstrap-switch.bootstrap-switch-disabled .bootstrap-switch-handle-on,.bootstrap-switch.bootstrap-switch-disabled .bootstrap-switch-label,.bootstrap-switch.bootstrap-switch-indeterminate .bootstrap-switch-handle-off,.bootstrap-switch.bootstrap-switch-indeterminate .bootstrap-switch-handle-on,.bootstrap-switch.bootstrap-switch-indeterminate .bootstrap-switch-label,.bootstrap-switch.bootstrap-switch-readonly .bootstrap-switch-handle-off,.bootstrap-switch.bootstrap-switch-readonly .bootstrap-switch-handle-on,.bootstrap-switch.bootstrap-switch-readonly .bootstrap-switch-label{opacity:.5;filter:alpha(opacity=50);cursor:default!important}.bootstrap-switch.bootstrap-switch-animate .bootstrap-switch-container{-webkit-transition:margin-left .5s;-o-transition:margin-left .5s;transition:margin-left .5s}.bootstrap-switch.bootstrap-switch-inverse .bootstrap-switch-handle-on{border-radius:0 3px 3px 0}.bootstrap-switch.bootstrap-switch-inverse .bootstrap-switch-handle-off{border-radius:3px 0 0 3px}.bootstrap-switch.bootstrap-switch-focused{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)}.bootstrap-switch.bootstrap-switch-inverse.bootstrap-switch-off .bootstrap-switch-label,.bootstrap-switch.bootstrap-switch-on .bootstrap-switch-label{border-bottom-right-radius:3px;border-top-right-radius:3px}.bootstrap-switch.bootstrap-switch-inverse.bootstrap-switch-on .bootstrap-switch-label,.bootstrap-switch.bootstrap-switch-off .bootstrap-switch-label{border-bottom-left-radius:3px;border-top-left-radius:3px}
\ No newline at end of file
diff --git a/NewLife.Cube/Content/bootstrap-switch/bootstrap-switch.min.js b/NewLife.Cube/Content/bootstrap-switch/bootstrap-switch.min.js
deleted file mode 100644
index 9849658bca..0000000000
--- a/NewLife.Cube/Content/bootstrap-switch/bootstrap-switch.min.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/* ========================================================================
- * bootstrap-switch - v3.3.2
- * http://www.bootstrap-switch.org
- * ========================================================================
- * Copyright 2012-2013 Mattia Larentis
- *
- * ========================================================================
- * 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(){var t=[].slice;!function(e,i){"use strict";var n;return n=function(){function t(t,i){null==i&&(i={}),this.$element=e(t),this.options=e.extend({},e.fn.bootstrapSwitch.defaults,{state:this.$element.is(":checked"),size:this.$element.data("size"),animate:this.$element.data("animate"),disabled:this.$element.is(":disabled"),readonly:this.$element.is("[readonly]"),indeterminate:this.$element.data("indeterminate"),inverse:this.$element.data("inverse"),radioAllOff:this.$element.data("radio-all-off"),onColor:this.$element.data("on-color"),offColor:this.$element.data("off-color"),onText:this.$element.data("on-text"),offText:this.$element.data("off-text"),labelText:this.$element.data("label-text"),handleWidth:this.$element.data("handle-width"),labelWidth:this.$element.data("label-width"),baseClass:this.$element.data("base-class"),wrapperClass:this.$element.data("wrapper-class")},i),this.prevOptions={},this.$wrapper=e("<div>",{"class":function(t){return function(){var e;return e=[""+t.options.baseClass].concat(t._getClasses(t.options.wrapperClass)),e.push(t.options.state?t.options.baseClass+"-on":t.options.baseClass+"-off"),null!=t.options.size&&e.push(t.options.baseClass+"-"+t.options.size),t.options.disabled&&e.push(t.options.baseClass+"-disabled"),t.options.readonly&&e.push(t.options.baseClass+"-readonly"),t.options.indeterminate&&e.push(t.options.baseClass+"-indeterminate"),t.options.inverse&&e.push(t.options.baseClass+"-inverse"),t.$element.attr("id")&&e.push(t.options.baseClass+"-id-"+t.$element.attr("id")),e.join(" ")}}(this)()}),this.$container=e("<div>",{"class":this.options.baseClass+"-container"}),this.$on=e("<span>",{html:this.options.onText,"class":this.options.baseClass+"-handle-on "+this.options.baseClass+"-"+this.options.onColor}),this.$off=e("<span>",{html:this.options.offText,"class":this.options.baseClass+"-handle-off "+this.options.baseClass+"-"+this.options.offColor}),this.$label=e("<span>",{html:this.options.labelText,"class":this.options.baseClass+"-label"}),this.$element.on("init.bootstrapSwitch",function(e){return function(){return e.options.onInit.apply(t,arguments)}}(this)),this.$element.on("switchChange.bootstrapSwitch",function(i){return function(n){return!1===i.options.onSwitchChange.apply(t,arguments)?i.$element.is(":radio")?e("[name='"+i.$element.attr("name")+"']").trigger("previousState.bootstrapSwitch",!0):i.$element.trigger("previousState.bootstrapSwitch",!0):void 0}}(this)),this.$container=this.$element.wrap(this.$container).parent(),this.$wrapper=this.$container.wrap(this.$wrapper).parent(),this.$element.before(this.options.inverse?this.$off:this.$on).before(this.$label).before(this.options.inverse?this.$on:this.$off),this.options.indeterminate&&this.$element.prop("indeterminate",!0),this._init(),this._elementHandlers(),this._handleHandlers(),this._labelHandlers(),this._formHandler(),this._externalLabelHandler(),this.$element.trigger("init.bootstrapSwitch",this.options.state)}return t.prototype._constructor=t,t.prototype.setPrevOptions=function(){return this.prevOptions=e.extend(!0,{},this.options)},t.prototype.state=function(t,i){return"undefined"==typeof t?this.options.state:this.options.disabled||this.options.readonly?this.$element:this.options.state&&!this.options.radioAllOff&&this.$element.is(":radio")?this.$element:(this.$element.is(":radio")?e("[name='"+this.$element.attr("name")+"']").trigger("setPreviousOptions.bootstrapSwitch"):this.$element.trigger("setPreviousOptions.bootstrapSwitch"),this.options.indeterminate&&this.indeterminate(!1),t=!!t,this.$element.prop("checked",t).trigger("change.bootstrapSwitch",i),this.$element)},t.prototype.toggleState=function(t){return this.options.disabled||this.options.readonly?this.$element:this.options.indeterminate?(this.indeterminate(!1),this.state(!0)):this.$element.prop("checked",!this.options.state).trigger("change.bootstrapSwitch",t)},t.prototype.size=function(t){return"undefined"==typeof t?this.options.size:(null!=this.options.size&&this.$wrapper.removeClass(this.options.baseClass+"-"+this.options.size),t&&this.$wrapper.addClass(this.options.baseClass+"-"+t),this._width(),this._containerPosition(),this.options.size=t,this.$element)},t.prototype.animate=function(t){return"undefined"==typeof t?this.options.animate:(t=!!t,t===this.options.animate?this.$element:this.toggleAnimate())},t.prototype.toggleAnimate=function(){return this.options.animate=!this.options.animate,this.$wrapper.toggleClass(this.options.baseClass+"-animate"),this.$element},t.prototype.disabled=function(t){return"undefined"==typeof t?this.options.disabled:(t=!!t,t===this.options.disabled?this.$element:this.toggleDisabled())},t.prototype.toggleDisabled=function(){return this.options.disabled=!this.options.disabled,this.$element.prop("disabled",this.options.disabled),this.$wrapper.toggleClass(this.options.baseClass+"-disabled"),this.$element},t.prototype.readonly=function(t){return"undefined"==typeof t?this.options.readonly:(t=!!t,t===this.options.readonly?this.$element:this.toggleReadonly())},t.prototype.toggleReadonly=function(){return this.options.readonly=!this.options.readonly,this.$element.prop("readonly",this.options.readonly),this.$wrapper.toggleClass(this.options.baseClass+"-readonly"),this.$element},t.prototype.indeterminate=function(t){return"undefined"==typeof t?this.options.indeterminate:(t=!!t,t===this.options.indeterminate?this.$element:this.toggleIndeterminate())},t.prototype.toggleIndeterminate=function(){return this.options.indeterminate=!this.options.indeterminate,this.$element.prop("indeterminate",this.options.indeterminate),this.$wrapper.toggleClass(this.options.baseClass+"-indeterminate"),this._containerPosition(),this.$element},t.prototype.inverse=function(t){return"undefined"==typeof t?this.options.inverse:(t=!!t,t===this.options.inverse?this.$element:this.toggleInverse())},t.prototype.toggleInverse=function(){var t,e;return this.$wrapper.toggleClass(this.options.baseClass+"-inverse"),e=this.$on.clone(!0),t=this.$off.clone(!0),this.$on.replaceWith(t),this.$off.replaceWith(e),this.$on=t,this.$off=e,this.options.inverse=!this.options.inverse,this.$element},t.prototype.onColor=function(t){var e;return e=this.options.onColor,"undefined"==typeof t?e:(null!=e&&this.$on.removeClass(this.options.baseClass+"-"+e),this.$on.addClass(this.options.baseClass+"-"+t),this.options.onColor=t,this.$element)},t.prototype.offColor=function(t){var e;return e=this.options.offColor,"undefined"==typeof t?e:(null!=e&&this.$off.removeClass(this.options.baseClass+"-"+e),this.$off.addClass(this.options.baseClass+"-"+t),this.options.offColor=t,this.$element)},t.prototype.onText=function(t){return"undefined"==typeof t?this.options.onText:(this.$on.html(t),this._width(),this._containerPosition(),this.options.onText=t,this.$element)},t.prototype.offText=function(t){return"undefined"==typeof t?this.options.offText:(this.$off.html(t),this._width(),this._containerPosition(),this.options.offText=t,this.$element)},t.prototype.labelText=function(t){return"undefined"==typeof t?this.options.labelText:(this.$label.html(t),this._width(),this.options.labelText=t,this.$element)},t.prototype.handleWidth=function(t){return"undefined"==typeof t?this.options.handleWidth:(this.options.handleWidth=t,this._width(),this._containerPosition(),this.$element)},t.prototype.labelWidth=function(t){return"undefined"==typeof t?this.options.labelWidth:(this.options.labelWidth=t,this._width(),this._containerPosition(),this.$element)},t.prototype.baseClass=function(t){return this.options.baseClass},t.prototype.wrapperClass=function(t){return"undefined"==typeof t?this.options.wrapperClass:(t||(t=e.fn.bootstrapSwitch.defaults.wrapperClass),this.$wrapper.removeClass(this._getClasses(this.options.wrapperClass).join(" ")),this.$wrapper.addClass(this._getClasses(t).join(" ")),this.options.wrapperClass=t,this.$element)},t.prototype.radioAllOff=function(t){return"undefined"==typeof t?this.options.radioAllOff:(t=!!t,t===this.options.radioAllOff?this.$element:(this.options.radioAllOff=t,this.$element))},t.prototype.onInit=function(t){return"undefined"==typeof t?this.options.onInit:(t||(t=e.fn.bootstrapSwitch.defaults.onInit),this.options.onInit=t,this.$element)},t.prototype.onSwitchChange=function(t){return"undefined"==typeof t?this.options.onSwitchChange:(t||(t=e.fn.bootstrapSwitch.defaults.onSwitchChange),this.options.onSwitchChange=t,this.$element)},t.prototype.destroy=function(){var t;return t=this.$element.closest("form"),t.length&&t.off("reset.bootstrapSwitch").removeData("bootstrap-switch"),this.$container.children().not(this.$element).remove(),this.$element.unwrap().unwrap().off(".bootstrapSwitch").removeData("bootstrap-switch"),this.$element},t.prototype._width=function(){var t,e;return t=this.$on.add(this.$off),t.add(this.$label).css("width",""),e="auto"===this.options.handleWidth?Math.max(this.$on.width(),this.$off.width()):this.options.handleWidth,t.width(e),this.$label.width(function(t){return function(i,n){return"auto"!==t.options.labelWidth?t.options.labelWidth:e>n?e:n}}(this)),this._handleWidth=this.$on.outerWidth(),this._labelWidth=this.$label.outerWidth(),this.$container.width(2*this._handleWidth+this._labelWidth),this.$wrapper.width(this._handleWidth+this._labelWidth)},t.prototype._containerPosition=function(t,e){return null==t&&(t=this.options.state),this.$container.css("margin-left",function(e){return function(){var i;return i=[0,"-"+e._handleWidth+"px"],e.options.indeterminate?"-"+e._handleWidth/2+"px":t?e.options.inverse?i[1]:i[0]:e.options.inverse?i[0]:i[1]}}(this)),e?setTimeout(function(){return e()},50):void 0},t.prototype._init=function(){var t,e;return t=function(t){return function(){return t.setPrevOptions(),t._width(),t._containerPosition(null,function(){return t.options.animate?t.$wrapper.addClass(t.options.baseClass+"-animate"):void 0})}}(this),this.$wrapper.is(":visible")?t():e=i.setInterval(function(n){return function(){return n.$wrapper.is(":visible")?(t(),i.clearInterval(e)):void 0}}(this),50)},t.prototype._elementHandlers=function(){return this.$element.on({"setPreviousOptions.bootstrapSwitch":function(t){return function(e){return t.setPrevOptions()}}(this),"previousState.bootstrapSwitch":function(t){return function(e){return t.options=t.prevOptions,t.options.indeterminate&&t.$wrapper.addClass(t.options.baseClass+"-indeterminate"),t.$element.prop("checked",t.options.state).trigger("change.bootstrapSwitch",!0)}}(this),"change.bootstrapSwitch":function(t){return function(i,n){var o;return i.preventDefault(),i.stopImmediatePropagation(),o=t.$element.is(":checked"),t._containerPosition(o),o!==t.options.state?(t.options.state=o,t.$wrapper.toggleClass(t.options.baseClass+"-off").toggleClass(t.options.baseClass+"-on"),n?void 0:(t.$element.is(":radio")&&e("[name='"+t.$element.attr("name")+"']").not(t.$element).prop("checked",!1).trigger("change.bootstrapSwitch",!0),t.$element.trigger("switchChange.bootstrapSwitch",[o]))):void 0}}(this),"focus.bootstrapSwitch":function(t){return function(e){return e.preventDefault(),t.$wrapper.addClass(t.options.baseClass+"-focused")}}(this),"blur.bootstrapSwitch":function(t){return function(e){return e.preventDefault(),t.$wrapper.removeClass(t.options.baseClass+"-focused")}}(this),"keydown.bootstrapSwitch":function(t){return function(e){if(e.which&&!t.options.disabled&&!t.options.readonly)switch(e.which){case 37:return e.preventDefault(),e.stopImmediatePropagation(),t.state(!1);case 39:return e.preventDefault(),e.stopImmediatePropagation(),t.state(!0)}}}(this)})},t.prototype._handleHandlers=function(){return this.$on.on("click.bootstrapSwitch",function(t){return function(e){return e.preventDefault(),e.stopPropagation(),t.state(!1),t.$element.trigger("focus.bootstrapSwitch")}}(this)),this.$off.on("click.bootstrapSwitch",function(t){return function(e){return e.preventDefault(),e.stopPropagation(),t.state(!0),t.$element.trigger("focus.bootstrapSwitch")}}(this))},t.prototype._labelHandlers=function(){return this.$label.on({click:function(t){return t.stopPropagation()},"mousedown.bootstrapSwitch touchstart.bootstrapSwitch":function(t){return function(e){return t._dragStart||t.options.disabled||t.options.readonly?void 0:(e.preventDefault(),e.stopPropagation(),t._dragStart=(e.pageX||e.originalEvent.touches[0].pageX)-parseInt(t.$container.css("margin-left"),10),t.options.animate&&t.$wrapper.removeClass(t.options.baseClass+"-animate"),t.$element.trigger("focus.bootstrapSwitch"))}}(this),"mousemove.bootstrapSwitch touchmove.bootstrapSwitch":function(t){return function(e){var i;if(null!=t._dragStart&&(e.preventDefault(),i=(e.pageX||e.originalEvent.touches[0].pageX)-t._dragStart,!(i<-t._handleWidth||i>0)))return t._dragEnd=i,t.$container.css("margin-left",t._dragEnd+"px")}}(this),"mouseup.bootstrapSwitch touchend.bootstrapSwitch":function(t){return function(e){var i;if(t._dragStart)return e.preventDefault(),t.options.animate&&t.$wrapper.addClass(t.options.baseClass+"-animate"),t._dragEnd?(i=t._dragEnd>-(t._handleWidth/2),t._dragEnd=!1,t.state(t.options.inverse?!i:i)):t.state(!t.options.state),t._dragStart=!1}}(this),"mouseleave.bootstrapSwitch":function(t){return function(e){return t.$label.trigger("mouseup.bootstrapSwitch")}}(this)})},t.prototype._externalLabelHandler=function(){var t;return t=this.$element.closest("label"),t.on("click",function(e){return function(i){return i.preventDefault(),i.stopImmediatePropagation(),i.target===t[0]?e.toggleState():void 0}}(this))},t.prototype._formHandler=function(){var t;return t=this.$element.closest("form"),t.data("bootstrap-switch")?void 0:t.on("reset.bootstrapSwitch",function(){return i.setTimeout(function(){return t.find("input").filter(function(){return e(this).data("bootstrap-switch")}).each(function(){return e(this).bootstrapSwitch("state",this.checked)})},1)}).data("bootstrap-switch",!0)},t.prototype._getClasses=function(t){var i,n,o,s;if(!e.isArray(t))return[this.options.baseClass+"-"+t];for(n=[],o=0,s=t.length;s>o;o++)i=t[o],n.push(this.options.baseClass+"-"+i);return n},t}(),e.fn.bootstrapSwitch=function(){var i,o,s;return o=arguments[0],i=2<=arguments.length?t.call(arguments,1):[],s=this,this.each(function(){var t,a;return t=e(this),a=t.data("bootstrap-switch"),a||t.data("bootstrap-switch",a=new n(this,o)),"string"==typeof o?s=a[o].apply(a,i):void 0}),s},e.fn.bootstrapSwitch.Constructor=n,e.fn.bootstrapSwitch.defaults={state:!0,size:null,animate:!0,disabled:!1,readonly:!1,indeterminate:!1,inverse:!1,radioAllOff:!1,onColor:"primary",offColor:"default",onText:"ON",offText:"OFF",labelText:"&nbsp;",handleWidth:"auto",labelWidth:"auto",baseClass:"bootstrap-switch",wrapperClass:"wrapper",onInit:function(){},onSwitchChange:function(){}}}(window.jQuery,window)}).call(this);
\ No newline at end of file
diff --git a/NewLife.Cube/Content/bootstrap/css/bootstrap-multiselect.css b/NewLife.Cube/Content/bootstrap/css/bootstrap-multiselect.css
deleted file mode 100644
index 6b69d8e1c6..0000000000
--- a/NewLife.Cube/Content/bootstrap/css/bootstrap-multiselect.css
+++ /dev/null
@@ -1 +0,0 @@
-.multiselect-container{position:absolute;list-style-type:none;margin:0;padding:0}.multiselect-container .input-group{margin:5px}.multiselect-container>li{padding:0}.multiselect-container>li>a.multiselect-all label{font-weight:700}.multiselect-container>li.multiselect-group label{margin:0;padding:3px 20px;height:100%;font-weight:700}.multiselect-container>li.multiselect-group-clickable label{cursor:pointer}.multiselect-container>li>a{padding:0}.multiselect-container>li>a>label{margin:0;height:100%;cursor:pointer;font-weight:400;padding:3px 20px 3px 40px}.multiselect-container>li>a>label.radio,.multiselect-container>li>a>label.checkbox{margin:0}.multiselect-container>li>a>label>input[type=checkbox]{margin-bottom:5px}.filter .btn{padding:6px 3px}.btn-group>.btn-group:nth-child(2)>.multiselect.btn{border-top-left-radius:4px;border-bottom-left-radius:4px}.form-inline .multiselect-container label.checkbox,.form-inline .multiselect-container label.radio{padding:3px 20px 3px 40px}.form-inline .multiselect-container li a label.checkbox input[type=checkbox],.form-inline .multiselect-container li a label.radio input[type=radio]{margin-left:-20px;margin-right:0}
\ No newline at end of file
diff --git a/NewLife.Cube/Content/bootstrap/css/bootstrap-responsive.min.css b/NewLife.Cube/Content/bootstrap/css/bootstrap-responsive.min.css
deleted file mode 100644
index 0597860101..0000000000
--- a/NewLife.Cube/Content/bootstrap/css/bootstrap-responsive.min.css
+++ /dev/null
@@ -1,9 +0,0 @@
-/*!
- * Bootstrap Responsive v2.3.0
- *
- * 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;line-height:0;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:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}@-ms-viewport{width:device-width}.hidden{display:none;visibility:hidden}.visible-phone{display:none!important}.visible-tablet{display:none!important}.hidden-desktop{display:none!important}.visible-desktop{display:inherit!important}@media(min-width:768px) and (max-width:979px){.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}.visible-tablet{display:inherit!important}.hidden-tablet{display:none!important}}@media(max-width:767px){.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}.visible-phone{display:inherit!important}.hidden-phone{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:inherit!important}.hidden-print{display:none!important}}@media(min-width:1200px){.row{margin-left:-30px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:30px}.container,.navbar-static-top .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;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.564102564102564%;*margin-left:2.5109110747408616%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.564102564102564%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.45299145299145%;*width:91.39979996362975%}.row-fluid .span10{width:82.90598290598291%;*width:82.8527914166212%}.row-fluid .span9{width:74.35897435897436%;*width:74.30578286961266%}.row-fluid .span8{width:65.81196581196582%;*width:65.75877432260411%}.row-fluid .span7{width:57.26495726495726%;*width:57.21176577559556%}.row-fluid .span6{width:48.717948717948715%;*width:48.664757228587014%}.row-fluid .span5{width:40.17094017094017%;*width:40.11774868157847%}.row-fluid .span4{width:31.623931623931625%;*width:31.570740134569924%}.row-fluid .span3{width:23.076923076923077%;*width:23.023731587561375%}.row-fluid .span2{width:14.52991452991453%;*width:14.476723040552828%}.row-fluid .span1{width:5.982905982905983%;*width:5.929714493544281%}.row-fluid .offset12{margin-left:105.12820512820512%;*margin-left:105.02182214948171%}.row-fluid .offset12:first-child{margin-left:102.56410256410257%;*margin-left:102.45771958537915%}.row-fluid .offset11{margin-left:96.58119658119658%;*margin-left:96.47481360247316%}.row-fluid .offset11:first-child{margin-left:94.01709401709402%;*margin-left:93.91071103837061%}.row-fluid .offset10{margin-left:88.03418803418803%;*margin-left:87.92780505546462%}.row-fluid .offset10:first-child{margin-left:85.47008547008548%;*margin-left:85.36370249136206%}.row-fluid .offset9{margin-left:79.48717948717949%;*margin-left:79.38079650845607%}.row-fluid .offset9:first-child{margin-left:76.92307692307693%;*margin-left:76.81669394435352%}.row-fluid .offset8{margin-left:70.94017094017094%;*margin-left:70.83378796144753%}.row-fluid .offset8:first-child{margin-left:68.37606837606839%;*margin-left:68.26968539734497%}.row-fluid .offset7{margin-left:62.393162393162385%;*margin-left:62.28677941443899%}.row-fluid .offset7:first-child{margin-left:59.82905982905982%;*margin-left:59.72267685033642%}.row-fluid .offset6{margin-left:53.84615384615384%;*margin-left:53.739770867430444%}.row-fluid .offset6:first-child{margin-left:51.28205128205128%;*margin-left:51.175668303327875%}.row-fluid .offset5{margin-left:45.299145299145295%;*margin-left:45.1927623204219%}.row-fluid .offset5:first-child{margin-left:42.73504273504273%;*margin-left:42.62865975631933%}.row-fluid .offset4{margin-left:36.75213675213675%;*margin-left:36.645753773413354%}.row-fluid .offset4:first-child{margin-left:34.18803418803419%;*margin-left:34.081651209310785%}.row-fluid .offset3{margin-left:28.205128205128204%;*margin-left:28.0987452264048%}.row-fluid .offset3:first-child{margin-left:25.641025641025642%;*margin-left:25.53464266230224%}.row-fluid .offset2{margin-left:19.65811965811966%;*margin-left:19.551736679396257%}.row-fluid .offset2:first-child{margin-left:17.094017094017094%;*margin-left:16.98763411529369%}.row-fluid .offset1{margin-left:11.11111111111111%;*margin-left:11.004728132387708%}.row-fluid .offset1:first-child{margin-left:8.547008547008547%;*margin-left:8.440625568285142%}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:30px}input.span12,textarea.span12,.uneditable-input.span12{width:1156px}input.span11,textarea.span11,.uneditable-input.span11{width:1056px}input.span10,textarea.span10,.uneditable-input.span10{width:956px}input.span9,textarea.span9,.uneditable-input.span9{width:856px}input.span8,textarea.span8,.uneditable-input.span8{width:756px}input.span7,textarea.span7,.uneditable-input.span7{width:656px}input.span6,textarea.span6,.uneditable-input.span6{width:556px}input.span5,textarea.span5,.uneditable-input.span5{width:456px}input.span4,textarea.span4,.uneditable-input.span4{width:356px}input.span3,textarea.span3,.uneditable-input.span3{width:256px}input.span2,textarea.span2,.uneditable-input.span2{width:156px}input.span1,textarea.span1,.uneditable-input.span1{width:56px}.thumbnails{margin-left:-30px}.thumbnails>li{margin-left:30px}.row-fluid .thumbnails{margin-left:0}}@media(min-width:768px) and (max-width:979px){.row{margin-left:-20px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:20px}.container,.navbar-static-top .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;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.7624309392265194%;*margin-left:2.709239449864817%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.7624309392265194%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.43646408839778%;*width:91.38327259903608%}.row-fluid .span10{width:82.87292817679558%;*width:82.81973668743387%}.row-fluid .span9{width:74.30939226519337%;*width:74.25620077583166%}.row-fluid .span8{width:65.74585635359117%;*width:65.69266486422946%}.row-fluid .span7{width:57.18232044198895%;*width:57.12912895262725%}.row-fluid .span6{width:48.61878453038674%;*width:48.56559304102504%}.row-fluid .span5{width:40.05524861878453%;*width:40.00205712942283%}.row-fluid .span4{width:31.491712707182323%;*width:31.43852121782062%}.row-fluid .span3{width:22.92817679558011%;*width:22.87498530621841%}.row-fluid .span2{width:14.3646408839779%;*width:14.311449394616199%}.row-fluid .span1{width:5.801104972375691%;*width:5.747913483013988%}.row-fluid .offset12{margin-left:105.52486187845304%;*margin-left:105.41847889972962%}.row-fluid .offset12:first-child{margin-left:102.76243093922652%;*margin-left:102.6560479605031%}.row-fluid .offset11{margin-left:96.96132596685082%;*margin-left:96.8549429881274%}.row-fluid .offset11:first-child{margin-left:94.1988950276243%;*margin-left:94.09251204890089%}.row-fluid .offset10{margin-left:88.39779005524862%;*margin-left:88.2914070765252%}.row-fluid .offset10:first-child{margin-left:85.6353591160221%;*margin-left:85.52897613729868%}.row-fluid .offset9{margin-left:79.8342541436464%;*margin-left:79.72787116492299%}.row-fluid .offset9:first-child{margin-left:77.07182320441989%;*margin-left:76.96544022569647%}.row-fluid .offset8{margin-left:71.2707182320442%;*margin-left:71.16433525332079%}.row-fluid .offset8:first-child{margin-left:68.50828729281768%;*margin-left:68.40190431409427%}.row-fluid .offset7{margin-left:62.70718232044199%;*margin-left:62.600799341718584%}.row-fluid .offset7:first-child{margin-left:59.94475138121547%;*margin-left:59.838368402492065%}.row-fluid .offset6{margin-left:54.14364640883978%;*margin-left:54.037263430116376%}.row-fluid .offset6:first-child{margin-left:51.38121546961326%;*margin-left:51.27483249088986%}.row-fluid .offset5{margin-left:45.58011049723757%;*margin-left:45.47372751851417%}.row-fluid .offset5:first-child{margin-left:42.81767955801105%;*margin-left:42.71129657928765%}.row-fluid .offset4{margin-left:37.01657458563536%;*margin-left:36.91019160691196%}.row-fluid .offset4:first-child{margin-left:34.25414364640884%;*margin-left:34.14776066768544%}.row-fluid .offset3{margin-left:28.45303867403315%;*margin-left:28.346655695309746%}.row-fluid .offset3:first-child{margin-left:25.69060773480663%;*margin-left:25.584224756083227%}.row-fluid .offset2{margin-left:19.88950276243094%;*margin-left:19.783119783707537%}.row-fluid .offset2:first-child{margin-left:17.12707182320442%;*margin-left:17.02068884448102%}.row-fluid .offset1{margin-left:11.32596685082873%;*margin-left:11.219583872105325%}.row-fluid .offset1:first-child{margin-left:8.56353591160221%;*margin-left:8.457152932878806%}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:20px}input.span12,textarea.span12,.uneditable-input.span12{width:710px}input.span11,textarea.span11,.uneditable-input.span11{width:648px}input.span10,textarea.span10,.uneditable-input.span10{width:586px}input.span9,textarea.span9,.uneditable-input.span9{width:524px}input.span8,textarea.span8,.uneditable-input.span8{width:462px}input.span7,textarea.span7,.uneditable-input.span7{width:400px}input.span6,textarea.span6,.uneditable-input.span6{width:338px}input.span5,textarea.span5,.uneditable-input.span5{width:276px}input.span4,textarea.span4,.uneditable-input.span4{width:214px}input.span3,textarea.span3,.uneditable-input.span3{width:152px}input.span2,textarea.span2,.uneditable-input.span2{width:90px}input.span1,textarea.span1,.uneditable-input.span1{width:28px}}@media(max-width:767px){body{padding-right:20px;padding-left:20px}.navbar-fixed-top,.navbar-fixed-bottom,.navbar-static-top{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}.thumbnails>li{float:none;margin-left:0}[class*="span"],.uneditable-input[class*="span"],.row-fluid [class*="span"]{display:block;float:none;width:100%;margin-left:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.span12,.row-fluid .span12{width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="offset"]:first-child{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:30px;-webkit-box-sizing:border-box;-moz-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}.controls-row [class*="span"]+[class*="span"]{margin-left:0}.modal{position:fixed;top:20px;right:20px;left:20px;width:auto;margin:0}.modal.fade{top:-100px}.modal.fade.in{top:20px}}@media(max-width:480px){.nav-collapse{-webkit-transform:translate3d(0,0,0)}.page-header h1 small{display:block;line-height:20px}input[type="checkbox"],input[type="radio"]{border:1px solid #ccc}.form-horizontal .control-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}.media .pull-left,.media .pull-right{display:block;float:none;margin-bottom:10px}.media-object{margin-right:0;margin-left:0}.modal{top:10px;right:10px;left:10px}.modal-header .close{padding:10px;margin:-10px}.carousel-caption{position:static}}@media(max-width:979px){body{padding-top:0}.navbar-fixed-top,.navbar-fixed-bottom{position:static}.navbar-fixed-top{margin-bottom:20px}.navbar-fixed-bottom{margin-top:20px}.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 10px}.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:#777;text-shadow:none}.nav-collapse .nav>li>a,.nav-collapse .dropdown-menu a{padding:9px 15px;font-weight:bold;color:#777;-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 .nav>li>a:focus,.nav-collapse .dropdown-menu a:hover,.nav-collapse .dropdown-menu a:focus{background-color:#f2f2f2}.navbar-inverse .nav-collapse .nav>li>a,.navbar-inverse .nav-collapse .dropdown-menu a{color:#999}.navbar-inverse .nav-collapse .nav>li>a:hover,.navbar-inverse .nav-collapse .nav>li>a:focus,.navbar-inverse .nav-collapse .dropdown-menu a:hover,.navbar-inverse .nav-collapse .dropdown-menu a:focus{background-color:#111}.nav-collapse.in .btn-group{padding:0;margin-top:5px}.nav-collapse .dropdown-menu{position:static;top:auto;left:auto;display:none;float:none;max-width:none;padding:0;margin:0 15px;background-color:transparent;border:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.nav-collapse .open>.dropdown-menu{display:block}.nav-collapse .dropdown-menu:before,.nav-collapse .dropdown-menu:after{display:none}.nav-collapse .dropdown-menu .divider{display:none}.nav-collapse .nav>li>.dropdown-menu:before,.nav-collapse .nav>li>.dropdown-menu:after{display:none}.nav-collapse .navbar-form,.nav-collapse .navbar-search{float:none;padding:10px 15px;margin:10px 0;border-top:1px solid #f2f2f2;border-bottom:1px solid #f2f2f2;-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)}.navbar-inverse .nav-collapse .navbar-form,.navbar-inverse .nav-collapse .navbar-search{border-top-color:#111;border-bottom-color:#111}.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/NewLife.Cube/Content/bootstrap/css/bootstrap-theme.css b/NewLife.Cube/Content/bootstrap/css/bootstrap-theme.css
deleted file mode 100644
index 31d8882661..0000000000
--- a/NewLife.Cube/Content/bootstrap/css/bootstrap-theme.css
+++ /dev/null
@@ -1,587 +0,0 @@
-/*!
- * Bootstrap v3.3.7 (http://getbootstrap.com)
- * Copyright 2011-2016 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */
-.btn-default,
-.btn-primary,
-.btn-success,
-.btn-info,
-.btn-warning,
-.btn-danger {
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, .2);
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075);
-          box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075);
-}
-.btn-default:active,
-.btn-primary:active,
-.btn-success:active,
-.btn-info:active,
-.btn-warning:active,
-.btn-danger:active,
-.btn-default.active,
-.btn-primary.active,
-.btn-success.active,
-.btn-info.active,
-.btn-warning.active,
-.btn-danger.active {
-  -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
-          box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
-}
-.btn-default.disabled,
-.btn-primary.disabled,
-.btn-success.disabled,
-.btn-info.disabled,
-.btn-warning.disabled,
-.btn-danger.disabled,
-.btn-default[disabled],
-.btn-primary[disabled],
-.btn-success[disabled],
-.btn-info[disabled],
-.btn-warning[disabled],
-.btn-danger[disabled],
-fieldset[disabled] .btn-default,
-fieldset[disabled] .btn-primary,
-fieldset[disabled] .btn-success,
-fieldset[disabled] .btn-info,
-fieldset[disabled] .btn-warning,
-fieldset[disabled] .btn-danger {
-  -webkit-box-shadow: none;
-          box-shadow: none;
-}
-.btn-default .badge,
-.btn-primary .badge,
-.btn-success .badge,
-.btn-info .badge,
-.btn-warning .badge,
-.btn-danger .badge {
-  text-shadow: none;
-}
-.btn:active,
-.btn.active {
-  background-image: none;
-}
-.btn-default {
-  text-shadow: 0 1px 0 #fff;
-  background-image: -webkit-linear-gradient(top, #fff 0%, #e0e0e0 100%);
-  background-image:      -o-linear-gradient(top, #fff 0%, #e0e0e0 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#e0e0e0));
-  background-image:         linear-gradient(to bottom, #fff 0%, #e0e0e0 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe0e0e0', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-  border-color: #dbdbdb;
-  border-color: #ccc;
-}
-.btn-default:hover,
-.btn-default:focus {
-  background-color: #e0e0e0;
-  background-position: 0 -15px;
-}
-.btn-default:active,
-.btn-default.active {
-  background-color: #e0e0e0;
-  border-color: #dbdbdb;
-}
-.btn-default.disabled,
-.btn-default[disabled],
-fieldset[disabled] .btn-default,
-.btn-default.disabled:hover,
-.btn-default[disabled]:hover,
-fieldset[disabled] .btn-default:hover,
-.btn-default.disabled:focus,
-.btn-default[disabled]:focus,
-fieldset[disabled] .btn-default:focus,
-.btn-default.disabled.focus,
-.btn-default[disabled].focus,
-fieldset[disabled] .btn-default.focus,
-.btn-default.disabled:active,
-.btn-default[disabled]:active,
-fieldset[disabled] .btn-default:active,
-.btn-default.disabled.active,
-.btn-default[disabled].active,
-fieldset[disabled] .btn-default.active {
-  background-color: #e0e0e0;
-  background-image: none;
-}
-.btn-primary {
-  background-image: -webkit-linear-gradient(top, #337ab7 0%, #265a88 100%);
-  background-image:      -o-linear-gradient(top, #337ab7 0%, #265a88 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#265a88));
-  background-image:         linear-gradient(to bottom, #337ab7 0%, #265a88 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff265a88', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-  border-color: #245580;
-}
-.btn-primary:hover,
-.btn-primary:focus {
-  background-color: #265a88;
-  background-position: 0 -15px;
-}
-.btn-primary:active,
-.btn-primary.active {
-  background-color: #265a88;
-  border-color: #245580;
-}
-.btn-primary.disabled,
-.btn-primary[disabled],
-fieldset[disabled] .btn-primary,
-.btn-primary.disabled:hover,
-.btn-primary[disabled]:hover,
-fieldset[disabled] .btn-primary:hover,
-.btn-primary.disabled:focus,
-.btn-primary[disabled]:focus,
-fieldset[disabled] .btn-primary:focus,
-.btn-primary.disabled.focus,
-.btn-primary[disabled].focus,
-fieldset[disabled] .btn-primary.focus,
-.btn-primary.disabled:active,
-.btn-primary[disabled]:active,
-fieldset[disabled] .btn-primary:active,
-.btn-primary.disabled.active,
-.btn-primary[disabled].active,
-fieldset[disabled] .btn-primary.active {
-  background-color: #265a88;
-  background-image: none;
-}
-.btn-success {
-  background-image: -webkit-linear-gradient(top, #5cb85c 0%, #419641 100%);
-  background-image:      -o-linear-gradient(top, #5cb85c 0%, #419641 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#5cb85c), to(#419641));
-  background-image:         linear-gradient(to bottom, #5cb85c 0%, #419641 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff419641', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-  border-color: #3e8f3e;
-}
-.btn-success:hover,
-.btn-success:focus {
-  background-color: #419641;
-  background-position: 0 -15px;
-}
-.btn-success:active,
-.btn-success.active {
-  background-color: #419641;
-  border-color: #3e8f3e;
-}
-.btn-success.disabled,
-.btn-success[disabled],
-fieldset[disabled] .btn-success,
-.btn-success.disabled:hover,
-.btn-success[disabled]:hover,
-fieldset[disabled] .btn-success:hover,
-.btn-success.disabled:focus,
-.btn-success[disabled]:focus,
-fieldset[disabled] .btn-success:focus,
-.btn-success.disabled.focus,
-.btn-success[disabled].focus,
-fieldset[disabled] .btn-success.focus,
-.btn-success.disabled:active,
-.btn-success[disabled]:active,
-fieldset[disabled] .btn-success:active,
-.btn-success.disabled.active,
-.btn-success[disabled].active,
-fieldset[disabled] .btn-success.active {
-  background-color: #419641;
-  background-image: none;
-}
-.btn-info {
-  background-image: -webkit-linear-gradient(top, #5bc0de 0%, #2aabd2 100%);
-  background-image:      -o-linear-gradient(top, #5bc0de 0%, #2aabd2 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#5bc0de), to(#2aabd2));
-  background-image:         linear-gradient(to bottom, #5bc0de 0%, #2aabd2 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2aabd2', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-  border-color: #28a4c9;
-}
-.btn-info:hover,
-.btn-info:focus {
-  background-color: #2aabd2;
-  background-position: 0 -15px;
-}
-.btn-info:active,
-.btn-info.active {
-  background-color: #2aabd2;
-  border-color: #28a4c9;
-}
-.btn-info.disabled,
-.btn-info[disabled],
-fieldset[disabled] .btn-info,
-.btn-info.disabled:hover,
-.btn-info[disabled]:hover,
-fieldset[disabled] .btn-info:hover,
-.btn-info.disabled:focus,
-.btn-info[disabled]:focus,
-fieldset[disabled] .btn-info:focus,
-.btn-info.disabled.focus,
-.btn-info[disabled].focus,
-fieldset[disabled] .btn-info.focus,
-.btn-info.disabled:active,
-.btn-info[disabled]:active,
-fieldset[disabled] .btn-info:active,
-.btn-info.disabled.active,
-.btn-info[disabled].active,
-fieldset[disabled] .btn-info.active {
-  background-color: #2aabd2;
-  background-image: none;
-}
-.btn-warning {
-  background-image: -webkit-linear-gradient(top, #f0ad4e 0%, #eb9316 100%);
-  background-image:      -o-linear-gradient(top, #f0ad4e 0%, #eb9316 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#f0ad4e), to(#eb9316));
-  background-image:         linear-gradient(to bottom, #f0ad4e 0%, #eb9316 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffeb9316', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-  border-color: #e38d13;
-}
-.btn-warning:hover,
-.btn-warning:focus {
-  background-color: #eb9316;
-  background-position: 0 -15px;
-}
-.btn-warning:active,
-.btn-warning.active {
-  background-color: #eb9316;
-  border-color: #e38d13;
-}
-.btn-warning.disabled,
-.btn-warning[disabled],
-fieldset[disabled] .btn-warning,
-.btn-warning.disabled:hover,
-.btn-warning[disabled]:hover,
-fieldset[disabled] .btn-warning:hover,
-.btn-warning.disabled:focus,
-.btn-warning[disabled]:focus,
-fieldset[disabled] .btn-warning:focus,
-.btn-warning.disabled.focus,
-.btn-warning[disabled].focus,
-fieldset[disabled] .btn-warning.focus,
-.btn-warning.disabled:active,
-.btn-warning[disabled]:active,
-fieldset[disabled] .btn-warning:active,
-.btn-warning.disabled.active,
-.btn-warning[disabled].active,
-fieldset[disabled] .btn-warning.active {
-  background-color: #eb9316;
-  background-image: none;
-}
-.btn-danger {
-  background-image: -webkit-linear-gradient(top, #d9534f 0%, #c12e2a 100%);
-  background-image:      -o-linear-gradient(top, #d9534f 0%, #c12e2a 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#d9534f), to(#c12e2a));
-  background-image:         linear-gradient(to bottom, #d9534f 0%, #c12e2a 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc12e2a', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-  border-color: #b92c28;
-}
-.btn-danger:hover,
-.btn-danger:focus {
-  background-color: #c12e2a;
-  background-position: 0 -15px;
-}
-.btn-danger:active,
-.btn-danger.active {
-  background-color: #c12e2a;
-  border-color: #b92c28;
-}
-.btn-danger.disabled,
-.btn-danger[disabled],
-fieldset[disabled] .btn-danger,
-.btn-danger.disabled:hover,
-.btn-danger[disabled]:hover,
-fieldset[disabled] .btn-danger:hover,
-.btn-danger.disabled:focus,
-.btn-danger[disabled]:focus,
-fieldset[disabled] .btn-danger:focus,
-.btn-danger.disabled.focus,
-.btn-danger[disabled].focus,
-fieldset[disabled] .btn-danger.focus,
-.btn-danger.disabled:active,
-.btn-danger[disabled]:active,
-fieldset[disabled] .btn-danger:active,
-.btn-danger.disabled.active,
-.btn-danger[disabled].active,
-fieldset[disabled] .btn-danger.active {
-  background-color: #c12e2a;
-  background-image: none;
-}
-.thumbnail,
-.img-thumbnail {
-  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
-          box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
-}
-.dropdown-menu > li > a:hover,
-.dropdown-menu > li > a:focus {
-  background-color: #e8e8e8;
-  background-image: -webkit-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
-  background-image:      -o-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#f5f5f5), to(#e8e8e8));
-  background-image:         linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
-  background-repeat: repeat-x;
-}
-.dropdown-menu > .active > a,
-.dropdown-menu > .active > a:hover,
-.dropdown-menu > .active > a:focus {
-  background-color: #2e6da4;
-  background-image: -webkit-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
-  background-image:      -o-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#2e6da4));
-  background-image:         linear-gradient(to bottom, #337ab7 0%, #2e6da4 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);
-  background-repeat: repeat-x;
-}
-.navbar-default {
-  background-image: -webkit-linear-gradient(top, #fff 0%, #f8f8f8 100%);
-  background-image:      -o-linear-gradient(top, #fff 0%, #f8f8f8 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#f8f8f8));
-  background-image:         linear-gradient(to bottom, #fff 0%, #f8f8f8 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff8f8f8', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-  border-radius: 4px;
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 5px rgba(0, 0, 0, .075);
-          box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 5px rgba(0, 0, 0, .075);
-}
-.navbar-default .navbar-nav > .open > a,
-.navbar-default .navbar-nav > .active > a {
-  background-image: -webkit-linear-gradient(top, #dbdbdb 0%, #e2e2e2 100%);
-  background-image:      -o-linear-gradient(top, #dbdbdb 0%, #e2e2e2 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#dbdbdb), to(#e2e2e2));
-  background-image:         linear-gradient(to bottom, #dbdbdb 0%, #e2e2e2 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdbdbdb', endColorstr='#ffe2e2e2', GradientType=0);
-  background-repeat: repeat-x;
-  -webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, .075);
-          box-shadow: inset 0 3px 9px rgba(0, 0, 0, .075);
-}
-.navbar-brand,
-.navbar-nav > li > a {
-  text-shadow: 0 1px 0 rgba(255, 255, 255, .25);
-}
-.navbar-inverse {
-  background-image: -webkit-linear-gradient(top, #3c3c3c 0%, #222 100%);
-  background-image:      -o-linear-gradient(top, #3c3c3c 0%, #222 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#3c3c3c), to(#222));
-  background-image:         linear-gradient(to bottom, #3c3c3c 0%, #222 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-  border-radius: 4px;
-}
-.navbar-inverse .navbar-nav > .open > a,
-.navbar-inverse .navbar-nav > .active > a {
-  background-image: -webkit-linear-gradient(top, #080808 0%, #0f0f0f 100%);
-  background-image:      -o-linear-gradient(top, #080808 0%, #0f0f0f 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#080808), to(#0f0f0f));
-  background-image:         linear-gradient(to bottom, #080808 0%, #0f0f0f 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff080808', endColorstr='#ff0f0f0f', GradientType=0);
-  background-repeat: repeat-x;
-  -webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, .25);
-          box-shadow: inset 0 3px 9px rgba(0, 0, 0, .25);
-}
-.navbar-inverse .navbar-brand,
-.navbar-inverse .navbar-nav > li > a {
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, .25);
-}
-.navbar-static-top,
-.navbar-fixed-top,
-.navbar-fixed-bottom {
-  border-radius: 0;
-}
-@media (max-width: 767px) {
-  .navbar .navbar-nav .open .dropdown-menu > .active > a,
-  .navbar .navbar-nav .open .dropdown-menu > .active > a:hover,
-  .navbar .navbar-nav .open .dropdown-menu > .active > a:focus {
-    color: #fff;
-    background-image: -webkit-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
-    background-image:      -o-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
-    background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#2e6da4));
-    background-image:         linear-gradient(to bottom, #337ab7 0%, #2e6da4 100%);
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);
-    background-repeat: repeat-x;
-  }
-}
-.alert {
-  text-shadow: 0 1px 0 rgba(255, 255, 255, .2);
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .25), 0 1px 2px rgba(0, 0, 0, .05);
-          box-shadow: inset 0 1px 0 rgba(255, 255, 255, .25), 0 1px 2px rgba(0, 0, 0, .05);
-}
-.alert-success {
-  background-image: -webkit-linear-gradient(top, #dff0d8 0%, #c8e5bc 100%);
-  background-image:      -o-linear-gradient(top, #dff0d8 0%, #c8e5bc 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#dff0d8), to(#c8e5bc));
-  background-image:         linear-gradient(to bottom, #dff0d8 0%, #c8e5bc 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffc8e5bc', GradientType=0);
-  background-repeat: repeat-x;
-  border-color: #b2dba1;
-}
-.alert-info {
-  background-image: -webkit-linear-gradient(top, #d9edf7 0%, #b9def0 100%);
-  background-image:      -o-linear-gradient(top, #d9edf7 0%, #b9def0 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#d9edf7), to(#b9def0));
-  background-image:         linear-gradient(to bottom, #d9edf7 0%, #b9def0 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffb9def0', GradientType=0);
-  background-repeat: repeat-x;
-  border-color: #9acfea;
-}
-.alert-warning {
-  background-image: -webkit-linear-gradient(top, #fcf8e3 0%, #f8efc0 100%);
-  background-image:      -o-linear-gradient(top, #fcf8e3 0%, #f8efc0 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#fcf8e3), to(#f8efc0));
-  background-image:         linear-gradient(to bottom, #fcf8e3 0%, #f8efc0 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fff8efc0', GradientType=0);
-  background-repeat: repeat-x;
-  border-color: #f5e79e;
-}
-.alert-danger {
-  background-image: -webkit-linear-gradient(top, #f2dede 0%, #e7c3c3 100%);
-  background-image:      -o-linear-gradient(top, #f2dede 0%, #e7c3c3 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#f2dede), to(#e7c3c3));
-  background-image:         linear-gradient(to bottom, #f2dede 0%, #e7c3c3 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffe7c3c3', GradientType=0);
-  background-repeat: repeat-x;
-  border-color: #dca7a7;
-}
-.progress {
-  background-image: -webkit-linear-gradient(top, #ebebeb 0%, #f5f5f5 100%);
-  background-image:      -o-linear-gradient(top, #ebebeb 0%, #f5f5f5 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#ebebeb), to(#f5f5f5));
-  background-image:         linear-gradient(to bottom, #ebebeb 0%, #f5f5f5 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff5f5f5', GradientType=0);
-  background-repeat: repeat-x;
-}
-.progress-bar {
-  background-image: -webkit-linear-gradient(top, #337ab7 0%, #286090 100%);
-  background-image:      -o-linear-gradient(top, #337ab7 0%, #286090 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#286090));
-  background-image:         linear-gradient(to bottom, #337ab7 0%, #286090 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff286090', GradientType=0);
-  background-repeat: repeat-x;
-}
-.progress-bar-success {
-  background-image: -webkit-linear-gradient(top, #5cb85c 0%, #449d44 100%);
-  background-image:      -o-linear-gradient(top, #5cb85c 0%, #449d44 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#5cb85c), to(#449d44));
-  background-image:         linear-gradient(to bottom, #5cb85c 0%, #449d44 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0);
-  background-repeat: repeat-x;
-}
-.progress-bar-info {
-  background-image: -webkit-linear-gradient(top, #5bc0de 0%, #31b0d5 100%);
-  background-image:      -o-linear-gradient(top, #5bc0de 0%, #31b0d5 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#5bc0de), to(#31b0d5));
-  background-image:         linear-gradient(to bottom, #5bc0de 0%, #31b0d5 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0);
-  background-repeat: repeat-x;
-}
-.progress-bar-warning {
-  background-image: -webkit-linear-gradient(top, #f0ad4e 0%, #ec971f 100%);
-  background-image:      -o-linear-gradient(top, #f0ad4e 0%, #ec971f 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#f0ad4e), to(#ec971f));
-  background-image:         linear-gradient(to bottom, #f0ad4e 0%, #ec971f 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0);
-  background-repeat: repeat-x;
-}
-.progress-bar-danger {
-  background-image: -webkit-linear-gradient(top, #d9534f 0%, #c9302c 100%);
-  background-image:      -o-linear-gradient(top, #d9534f 0%, #c9302c 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#d9534f), to(#c9302c));
-  background-image:         linear-gradient(to bottom, #d9534f 0%, #c9302c 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0);
-  background-repeat: repeat-x;
-}
-.progress-bar-striped {
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-  background-image:      -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-  background-image:         linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-}
-.list-group {
-  border-radius: 4px;
-  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
-          box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
-}
-.list-group-item.active,
-.list-group-item.active:hover,
-.list-group-item.active:focus {
-  text-shadow: 0 -1px 0 #286090;
-  background-image: -webkit-linear-gradient(top, #337ab7 0%, #2b669a 100%);
-  background-image:      -o-linear-gradient(top, #337ab7 0%, #2b669a 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#2b669a));
-  background-image:         linear-gradient(to bottom, #337ab7 0%, #2b669a 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2b669a', GradientType=0);
-  background-repeat: repeat-x;
-  border-color: #2b669a;
-}
-.list-group-item.active .badge,
-.list-group-item.active:hover .badge,
-.list-group-item.active:focus .badge {
-  text-shadow: none;
-}
-.panel {
-  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .05);
-          box-shadow: 0 1px 2px rgba(0, 0, 0, .05);
-}
-.panel-default > .panel-heading {
-  background-image: -webkit-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
-  background-image:      -o-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#f5f5f5), to(#e8e8e8));
-  background-image:         linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
-  background-repeat: repeat-x;
-}
-.panel-primary > .panel-heading {
-  background-image: -webkit-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
-  background-image:      -o-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#2e6da4));
-  background-image:         linear-gradient(to bottom, #337ab7 0%, #2e6da4 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);
-  background-repeat: repeat-x;
-}
-.panel-success > .panel-heading {
-  background-image: -webkit-linear-gradient(top, #dff0d8 0%, #d0e9c6 100%);
-  background-image:      -o-linear-gradient(top, #dff0d8 0%, #d0e9c6 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#dff0d8), to(#d0e9c6));
-  background-image:         linear-gradient(to bottom, #dff0d8 0%, #d0e9c6 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffd0e9c6', GradientType=0);
-  background-repeat: repeat-x;
-}
-.panel-info > .panel-heading {
-  background-image: -webkit-linear-gradient(top, #d9edf7 0%, #c4e3f3 100%);
-  background-image:      -o-linear-gradient(top, #d9edf7 0%, #c4e3f3 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#d9edf7), to(#c4e3f3));
-  background-image:         linear-gradient(to bottom, #d9edf7 0%, #c4e3f3 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffc4e3f3', GradientType=0);
-  background-repeat: repeat-x;
-}
-.panel-warning > .panel-heading {
-  background-image: -webkit-linear-gradient(top, #fcf8e3 0%, #faf2cc 100%);
-  background-image:      -o-linear-gradient(top, #fcf8e3 0%, #faf2cc 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#fcf8e3), to(#faf2cc));
-  background-image:         linear-gradient(to bottom, #fcf8e3 0%, #faf2cc 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fffaf2cc', GradientType=0);
-  background-repeat: repeat-x;
-}
-.panel-danger > .panel-heading {
-  background-image: -webkit-linear-gradient(top, #f2dede 0%, #ebcccc 100%);
-  background-image:      -o-linear-gradient(top, #f2dede 0%, #ebcccc 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#f2dede), to(#ebcccc));
-  background-image:         linear-gradient(to bottom, #f2dede 0%, #ebcccc 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffebcccc', GradientType=0);
-  background-repeat: repeat-x;
-}
-.well {
-  background-image: -webkit-linear-gradient(top, #e8e8e8 0%, #f5f5f5 100%);
-  background-image:      -o-linear-gradient(top, #e8e8e8 0%, #f5f5f5 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e8e8), to(#f5f5f5));
-  background-image:         linear-gradient(to bottom, #e8e8e8 0%, #f5f5f5 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8', endColorstr='#fff5f5f5', GradientType=0);
-  background-repeat: repeat-x;
-  border-color: #dcdcdc;
-  -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, .05), 0 1px 0 rgba(255, 255, 255, .1);
-          box-shadow: inset 0 1px 3px rgba(0, 0, 0, .05), 0 1px 0 rgba(255, 255, 255, .1);
-}
-/*# sourceMappingURL=bootstrap-theme.css.map */
diff --git a/NewLife.Cube/Content/bootstrap/css/bootstrap-theme.min.css b/NewLife.Cube/Content/bootstrap/css/bootstrap-theme.min.css
deleted file mode 100644
index 5e39401957..0000000000
--- a/NewLife.Cube/Content/bootstrap/css/bootstrap-theme.min.css
+++ /dev/null
@@ -1,6 +0,0 @@
-/*!
- * Bootstrap v3.3.7 (http://getbootstrap.com)
- * Copyright 2011-2016 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */.btn-danger,.btn-default,.btn-info,.btn-primary,.btn-success,.btn-warning{text-shadow:0 -1px 0 rgba(0,0,0,.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 1px rgba(0,0,0,.075)}.btn-danger.active,.btn-danger:active,.btn-default.active,.btn-default:active,.btn-info.active,.btn-info:active,.btn-primary.active,.btn-primary:active,.btn-success.active,.btn-success:active,.btn-warning.active,.btn-warning:active{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-danger.disabled,.btn-danger[disabled],.btn-default.disabled,.btn-default[disabled],.btn-info.disabled,.btn-info[disabled],.btn-primary.disabled,.btn-primary[disabled],.btn-success.disabled,.btn-success[disabled],.btn-warning.disabled,.btn-warning[disabled],fieldset[disabled] .btn-danger,fieldset[disabled] .btn-default,fieldset[disabled] .btn-info,fieldset[disabled] .btn-primary,fieldset[disabled] .btn-success,fieldset[disabled] .btn-warning{-webkit-box-shadow:none;box-shadow:none}.btn-danger .badge,.btn-default .badge,.btn-info .badge,.btn-primary .badge,.btn-success .badge,.btn-warning .badge{text-shadow:none}.btn.active,.btn:active{background-image:none}.btn-default{text-shadow:0 1px 0 #fff;background-image:-webkit-linear-gradient(top,#fff 0,#e0e0e0 100%);background-image:-o-linear-gradient(top,#fff 0,#e0e0e0 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#e0e0e0));background-image:linear-gradient(to bottom,#fff 0,#e0e0e0 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe0e0e0', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#dbdbdb;border-color:#ccc}.btn-default:focus,.btn-default:hover{background-color:#e0e0e0;background-position:0 -15px}.btn-default.active,.btn-default:active{background-color:#e0e0e0;border-color:#dbdbdb}.btn-default.disabled,.btn-default.disabled.active,.btn-default.disabled.focus,.btn-default.disabled:active,.btn-default.disabled:focus,.btn-default.disabled:hover,.btn-default[disabled],.btn-default[disabled].active,.btn-default[disabled].focus,.btn-default[disabled]:active,.btn-default[disabled]:focus,.btn-default[disabled]:hover,fieldset[disabled] .btn-default,fieldset[disabled] .btn-default.active,fieldset[disabled] .btn-default.focus,fieldset[disabled] .btn-default:active,fieldset[disabled] .btn-default:focus,fieldset[disabled] .btn-default:hover{background-color:#e0e0e0;background-image:none}.btn-primary{background-image:-webkit-linear-gradient(top,#337ab7 0,#265a88 100%);background-image:-o-linear-gradient(top,#337ab7 0,#265a88 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#265a88));background-image:linear-gradient(to bottom,#337ab7 0,#265a88 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff265a88', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#245580}.btn-primary:focus,.btn-primary:hover{background-color:#265a88;background-position:0 -15px}.btn-primary.active,.btn-primary:active{background-color:#265a88;border-color:#245580}.btn-primary.disabled,.btn-primary.disabled.active,.btn-primary.disabled.focus,.btn-primary.disabled:active,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled],.btn-primary[disabled].active,.btn-primary[disabled].focus,.btn-primary[disabled]:active,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary,fieldset[disabled] .btn-primary.active,fieldset[disabled] .btn-primary.focus,fieldset[disabled] .btn-primary:active,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#265a88;background-image:none}.btn-success{background-image:-webkit-linear-gradient(top,#5cb85c 0,#419641 100%);background-image:-o-linear-gradient(top,#5cb85c 0,#419641 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#5cb85c),to(#419641));background-image:linear-gradient(to bottom,#5cb85c 0,#419641 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff419641', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#3e8f3e}.btn-success:focus,.btn-success:hover{background-color:#419641;background-position:0 -15px}.btn-success.active,.btn-success:active{background-color:#419641;border-color:#3e8f3e}.btn-success.disabled,.btn-success.disabled.active,.btn-success.disabled.focus,.btn-success.disabled:active,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled],.btn-success[disabled].active,.btn-success[disabled].focus,.btn-success[disabled]:active,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success,fieldset[disabled] .btn-success.active,fieldset[disabled] .btn-success.focus,fieldset[disabled] .btn-success:active,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#419641;background-image:none}.btn-info{background-image:-webkit-linear-gradient(top,#5bc0de 0,#2aabd2 100%);background-image:-o-linear-gradient(top,#5bc0de 0,#2aabd2 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#5bc0de),to(#2aabd2));background-image:linear-gradient(to bottom,#5bc0de 0,#2aabd2 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2aabd2', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#28a4c9}.btn-info:focus,.btn-info:hover{background-color:#2aabd2;background-position:0 -15px}.btn-info.active,.btn-info:active{background-color:#2aabd2;border-color:#28a4c9}.btn-info.disabled,.btn-info.disabled.active,.btn-info.disabled.focus,.btn-info.disabled:active,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled],.btn-info[disabled].active,.btn-info[disabled].focus,.btn-info[disabled]:active,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info,fieldset[disabled] .btn-info.active,fieldset[disabled] .btn-info.focus,fieldset[disabled] .btn-info:active,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#2aabd2;background-image:none}.btn-warning{background-image:-webkit-linear-gradient(top,#f0ad4e 0,#eb9316 100%);background-image:-o-linear-gradient(top,#f0ad4e 0,#eb9316 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f0ad4e),to(#eb9316));background-image:linear-gradient(to bottom,#f0ad4e 0,#eb9316 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffeb9316', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#e38d13}.btn-warning:focus,.btn-warning:hover{background-color:#eb9316;background-position:0 -15px}.btn-warning.active,.btn-warning:active{background-color:#eb9316;border-color:#e38d13}.btn-warning.disabled,.btn-warning.disabled.active,.btn-warning.disabled.focus,.btn-warning.disabled:active,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled],.btn-warning[disabled].active,.btn-warning[disabled].focus,.btn-warning[disabled]:active,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning,fieldset[disabled] .btn-warning.active,fieldset[disabled] .btn-warning.focus,fieldset[disabled] .btn-warning:active,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#eb9316;background-image:none}.btn-danger{background-image:-webkit-linear-gradient(top,#d9534f 0,#c12e2a 100%);background-image:-o-linear-gradient(top,#d9534f 0,#c12e2a 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#d9534f),to(#c12e2a));background-image:linear-gradient(to bottom,#d9534f 0,#c12e2a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc12e2a', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#b92c28}.btn-danger:focus,.btn-danger:hover{background-color:#c12e2a;background-position:0 -15px}.btn-danger.active,.btn-danger:active{background-color:#c12e2a;border-color:#b92c28}.btn-danger.disabled,.btn-danger.disabled.active,.btn-danger.disabled.focus,.btn-danger.disabled:active,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled],.btn-danger[disabled].active,.btn-danger[disabled].focus,.btn-danger[disabled]:active,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger,fieldset[disabled] .btn-danger.active,fieldset[disabled] .btn-danger.focus,fieldset[disabled] .btn-danger:active,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#c12e2a;background-image:none}.img-thumbnail,.thumbnail{-webkit-box-shadow:0 1px 2px rgba(0,0,0,.075);box-shadow:0 1px 2px rgba(0,0,0,.075)}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{background-color:#e8e8e8;background-image:-webkit-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:-o-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#e8e8e8));background-image:linear-gradient(to bottom,#f5f5f5 0,#e8e8e8 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);background-repeat:repeat-x}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{background-color:#2e6da4;background-image:-webkit-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-o-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#2e6da4));background-image:linear-gradient(to bottom,#337ab7 0,#2e6da4 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);background-repeat:repeat-x}.navbar-default{background-image:-webkit-linear-gradient(top,#fff 0,#f8f8f8 100%);background-image:-o-linear-gradient(top,#fff 0,#f8f8f8 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#f8f8f8));background-image:linear-gradient(to bottom,#fff 0,#f8f8f8 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff8f8f8', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 5px rgba(0,0,0,.075);box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 5px rgba(0,0,0,.075)}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.open>a{background-image:-webkit-linear-gradient(top,#dbdbdb 0,#e2e2e2 100%);background-image:-o-linear-gradient(top,#dbdbdb 0,#e2e2e2 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#dbdbdb),to(#e2e2e2));background-image:linear-gradient(to bottom,#dbdbdb 0,#e2e2e2 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdbdbdb', endColorstr='#ffe2e2e2', GradientType=0);background-repeat:repeat-x;-webkit-box-shadow:inset 0 3px 9px rgba(0,0,0,.075);box-shadow:inset 0 3px 9px rgba(0,0,0,.075)}.navbar-brand,.navbar-nav>li>a{text-shadow:0 1px 0 rgba(255,255,255,.25)}.navbar-inverse{background-image:-webkit-linear-gradient(top,#3c3c3c 0,#222 100%);background-image:-o-linear-gradient(top,#3c3c3c 0,#222 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#3c3c3c),to(#222));background-image:linear-gradient(to bottom,#3c3c3c 0,#222 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-radius:4px}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.open>a{background-image:-webkit-linear-gradient(top,#080808 0,#0f0f0f 100%);background-image:-o-linear-gradient(top,#080808 0,#0f0f0f 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#080808),to(#0f0f0f));background-image:linear-gradient(to bottom,#080808 0,#0f0f0f 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff080808', endColorstr='#ff0f0f0f', GradientType=0);background-repeat:repeat-x;-webkit-box-shadow:inset 0 3px 9px rgba(0,0,0,.25);box-shadow:inset 0 3px 9px rgba(0,0,0,.25)}.navbar-inverse .navbar-brand,.navbar-inverse .navbar-nav>li>a{text-shadow:0 -1px 0 rgba(0,0,0,.25)}.navbar-fixed-bottom,.navbar-fixed-top,.navbar-static-top{border-radius:0}@media (max-width:767px){.navbar .navbar-nav .open .dropdown-menu>.active>a,.navbar .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar .navbar-nav .open .dropdown-menu>.active>a:hover{color:#fff;background-image:-webkit-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-o-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#2e6da4));background-image:linear-gradient(to bottom,#337ab7 0,#2e6da4 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);background-repeat:repeat-x}}.alert{text-shadow:0 1px 0 rgba(255,255,255,.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 2px rgba(0,0,0,.05)}.alert-success{background-image:-webkit-linear-gradient(top,#dff0d8 0,#c8e5bc 100%);background-image:-o-linear-gradient(top,#dff0d8 0,#c8e5bc 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#dff0d8),to(#c8e5bc));background-image:linear-gradient(to bottom,#dff0d8 0,#c8e5bc 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffc8e5bc', GradientType=0);background-repeat:repeat-x;border-color:#b2dba1}.alert-info{background-image:-webkit-linear-gradient(top,#d9edf7 0,#b9def0 100%);background-image:-o-linear-gradient(top,#d9edf7 0,#b9def0 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#d9edf7),to(#b9def0));background-image:linear-gradient(to bottom,#d9edf7 0,#b9def0 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffb9def0', GradientType=0);background-repeat:repeat-x;border-color:#9acfea}.alert-warning{background-image:-webkit-linear-gradient(top,#fcf8e3 0,#f8efc0 100%);background-image:-o-linear-gradient(top,#fcf8e3 0,#f8efc0 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#fcf8e3),to(#f8efc0));background-image:linear-gradient(to bottom,#fcf8e3 0,#f8efc0 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fff8efc0', GradientType=0);background-repeat:repeat-x;border-color:#f5e79e}.alert-danger{background-image:-webkit-linear-gradient(top,#f2dede 0,#e7c3c3 100%);background-image:-o-linear-gradient(top,#f2dede 0,#e7c3c3 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f2dede),to(#e7c3c3));background-image:linear-gradient(to bottom,#f2dede 0,#e7c3c3 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffe7c3c3', GradientType=0);background-repeat:repeat-x;border-color:#dca7a7}.progress{background-image:-webkit-linear-gradient(top,#ebebeb 0,#f5f5f5 100%);background-image:-o-linear-gradient(top,#ebebeb 0,#f5f5f5 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#ebebeb),to(#f5f5f5));background-image:linear-gradient(to bottom,#ebebeb 0,#f5f5f5 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff5f5f5', GradientType=0);background-repeat:repeat-x}.progress-bar{background-image:-webkit-linear-gradient(top,#337ab7 0,#286090 100%);background-image:-o-linear-gradient(top,#337ab7 0,#286090 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#286090));background-image:linear-gradient(to bottom,#337ab7 0,#286090 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff286090', GradientType=0);background-repeat:repeat-x}.progress-bar-success{background-image:-webkit-linear-gradient(top,#5cb85c 0,#449d44 100%);background-image:-o-linear-gradient(top,#5cb85c 0,#449d44 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#5cb85c),to(#449d44));background-image:linear-gradient(to bottom,#5cb85c 0,#449d44 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0);background-repeat:repeat-x}.progress-bar-info{background-image:-webkit-linear-gradient(top,#5bc0de 0,#31b0d5 100%);background-image:-o-linear-gradient(top,#5bc0de 0,#31b0d5 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#5bc0de),to(#31b0d5));background-image:linear-gradient(to bottom,#5bc0de 0,#31b0d5 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0);background-repeat:repeat-x}.progress-bar-warning{background-image:-webkit-linear-gradient(top,#f0ad4e 0,#ec971f 100%);background-image:-o-linear-gradient(top,#f0ad4e 0,#ec971f 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f0ad4e),to(#ec971f));background-image:linear-gradient(to bottom,#f0ad4e 0,#ec971f 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0);background-repeat:repeat-x}.progress-bar-danger{background-image:-webkit-linear-gradient(top,#d9534f 0,#c9302c 100%);background-image:-o-linear-gradient(top,#d9534f 0,#c9302c 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#d9534f),to(#c9302c));background-image:linear-gradient(to bottom,#d9534f 0,#c9302c 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0);background-repeat:repeat-x}.progress-bar-striped{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.list-group{border-radius:4px;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.075);box-shadow:0 1px 2px rgba(0,0,0,.075)}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{text-shadow:0 -1px 0 #286090;background-image:-webkit-linear-gradient(top,#337ab7 0,#2b669a 100%);background-image:-o-linear-gradient(top,#337ab7 0,#2b669a 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#2b669a));background-image:linear-gradient(to bottom,#337ab7 0,#2b669a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2b669a', GradientType=0);background-repeat:repeat-x;border-color:#2b669a}.list-group-item.active .badge,.list-group-item.active:focus .badge,.list-group-item.active:hover .badge{text-shadow:none}.panel{-webkit-box-shadow:0 1px 2px rgba(0,0,0,.05);box-shadow:0 1px 2px rgba(0,0,0,.05)}.panel-default>.panel-heading{background-image:-webkit-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:-o-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#e8e8e8));background-image:linear-gradient(to bottom,#f5f5f5 0,#e8e8e8 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);background-repeat:repeat-x}.panel-primary>.panel-heading{background-image:-webkit-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-o-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#2e6da4));background-image:linear-gradient(to bottom,#337ab7 0,#2e6da4 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);background-repeat:repeat-x}.panel-success>.panel-heading{background-image:-webkit-linear-gradient(top,#dff0d8 0,#d0e9c6 100%);background-image:-o-linear-gradient(top,#dff0d8 0,#d0e9c6 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#dff0d8),to(#d0e9c6));background-image:linear-gradient(to bottom,#dff0d8 0,#d0e9c6 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffd0e9c6', GradientType=0);background-repeat:repeat-x}.panel-info>.panel-heading{background-image:-webkit-linear-gradient(top,#d9edf7 0,#c4e3f3 100%);background-image:-o-linear-gradient(top,#d9edf7 0,#c4e3f3 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#d9edf7),to(#c4e3f3));background-image:linear-gradient(to bottom,#d9edf7 0,#c4e3f3 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffc4e3f3', GradientType=0);background-repeat:repeat-x}.panel-warning>.panel-heading{background-image:-webkit-linear-gradient(top,#fcf8e3 0,#faf2cc 100%);background-image:-o-linear-gradient(top,#fcf8e3 0,#faf2cc 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#fcf8e3),to(#faf2cc));background-image:linear-gradient(to bottom,#fcf8e3 0,#faf2cc 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fffaf2cc', GradientType=0);background-repeat:repeat-x}.panel-danger>.panel-heading{background-image:-webkit-linear-gradient(top,#f2dede 0,#ebcccc 100%);background-image:-o-linear-gradient(top,#f2dede 0,#ebcccc 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f2dede),to(#ebcccc));background-image:linear-gradient(to bottom,#f2dede 0,#ebcccc 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffebcccc', GradientType=0);background-repeat:repeat-x}.well{background-image:-webkit-linear-gradient(top,#e8e8e8 0,#f5f5f5 100%);background-image:-o-linear-gradient(top,#e8e8e8 0,#f5f5f5 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#e8e8e8),to(#f5f5f5));background-image:linear-gradient(to bottom,#e8e8e8 0,#f5f5f5 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8', endColorstr='#fff5f5f5', GradientType=0);background-repeat:repeat-x;border-color:#dcdcdc;-webkit-box-shadow:inset 0 1px 3px rgba(0,0,0,.05),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 3px rgba(0,0,0,.05),0 1px 0 rgba(255,255,255,.1)}
-/*# sourceMappingURL=bootstrap-theme.min.css.map */
\ No newline at end of file
diff --git a/NewLife.Cube/Content/bootstrap/css/bootstrap.css b/NewLife.Cube/Content/bootstrap/css/bootstrap.css
deleted file mode 100644
index 6167622cec..0000000000
--- a/NewLife.Cube/Content/bootstrap/css/bootstrap.css
+++ /dev/null
@@ -1,6757 +0,0 @@
-/*!
- * Bootstrap v3.3.7 (http://getbootstrap.com)
- * Copyright 2011-2016 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */
-/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */
-html {
-  font-family: sans-serif;
-  -webkit-text-size-adjust: 100%;
-      -ms-text-size-adjust: 100%;
-}
-body {
-  margin: 0;
-}
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-main,
-menu,
-nav,
-section,
-summary {
-  display: block;
-}
-audio,
-canvas,
-progress,
-video {
-  display: inline-block;
-  vertical-align: baseline;
-}
-audio:not([controls]) {
-  display: none;
-  height: 0;
-}
-[hidden],
-template {
-  display: none;
-}
-a {
-  background-color: transparent;
-}
-a:active,
-a:hover {
-  outline: 0;
-}
-abbr[title] {
-  border-bottom: 1px dotted;
-}
-b,
-strong {
-  font-weight: bold;
-}
-dfn {
-  font-style: italic;
-}
-h1 {
-  margin: .67em 0;
-  font-size: 2em;
-}
-mark {
-  color: #000;
-  background: #ff0;
-}
-small {
-  font-size: 80%;
-}
-sub,
-sup {
-  position: relative;
-  font-size: 75%;
-  line-height: 0;
-  vertical-align: baseline;
-}
-sup {
-  top: -.5em;
-}
-sub {
-  bottom: -.25em;
-}
-img {
-  border: 0;
-}
-svg:not(:root) {
-  overflow: hidden;
-}
-figure {
-  margin: 1em 40px;
-}
-hr {
-  height: 0;
-  -webkit-box-sizing: content-box;
-     -moz-box-sizing: content-box;
-          box-sizing: content-box;
-}
-pre {
-  overflow: auto;
-}
-code,
-kbd,
-pre,
-samp {
-  font-family: monospace, monospace;
-  font-size: 1em;
-}
-button,
-input,
-optgroup,
-select,
-textarea {
-  margin: 0;
-  font: inherit;
-  color: inherit;
-}
-button {
-  overflow: visible;
-}
-button,
-select {
-  text-transform: none;
-}
-button,
-html input[type="button"],
-input[type="reset"],
-input[type="submit"] {
-  -webkit-appearance: button;
-  cursor: pointer;
-}
-button[disabled],
-html input[disabled] {
-  cursor: default;
-}
-button::-moz-focus-inner,
-input::-moz-focus-inner {
-  padding: 0;
-  border: 0;
-}
-input {
-  line-height: normal;
-}
-input[type="checkbox"],
-input[type="radio"] {
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
-  padding: 0;
-}
-input[type="number"]::-webkit-inner-spin-button,
-input[type="number"]::-webkit-outer-spin-button {
-  height: auto;
-}
-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-cancel-button,
-input[type="search"]::-webkit-search-decoration {
-  -webkit-appearance: none;
-}
-fieldset {
-  padding: .35em .625em .75em;
-  margin: 0 2px;
-  border: 1px solid #c0c0c0;
-}
-legend {
-  padding: 0;
-  border: 0;
-}
-textarea {
-  overflow: auto;
-}
-optgroup {
-  font-weight: bold;
-}
-table {
-  border-spacing: 0;
-  border-collapse: collapse;
-}
-td,
-th {
-  padding: 0;
-}
-/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */
-@media print {
-  *,
-  *:before,
-  *:after {
-    color: #000 !important;
-    text-shadow: none !important;
-    background: transparent !important;
-    -webkit-box-shadow: none !important;
-            box-shadow: none !important;
-  }
-  a,
-  a:visited {
-    text-decoration: underline;
-  }
-  a[href]:after {
-    content: " (" attr(href) ")";
-  }
-  abbr[title]:after {
-    content: " (" attr(title) ")";
-  }
-  a[href^="#"]:after,
-  a[href^="javascript:"]:after {
-    content: "";
-  }
-  pre,
-  blockquote {
-    border: 1px solid #999;
-
-    page-break-inside: avoid;
-  }
-  thead {
-    display: table-header-group;
-  }
-  tr,
-  img {
-    page-break-inside: avoid;
-  }
-  img {
-    max-width: 100% !important;
-  }
-  p,
-  h2,
-  h3 {
-    orphans: 3;
-    widows: 3;
-  }
-  h2,
-  h3 {
-    page-break-after: avoid;
-  }
-  .navbar {
-    display: none;
-  }
-  .btn > .caret,
-  .dropup > .btn > .caret {
-    border-top-color: #000 !important;
-  }
-  .label {
-    border: 1px solid #000;
-  }
-  .table {
-    border-collapse: collapse !important;
-  }
-  .table td,
-  .table th {
-    background-color: #fff !important;
-  }
-  .table-bordered th,
-  .table-bordered td {
-    border: 1px solid #ddd !important;
-  }
-}
-@font-face {
-  font-family: 'Glyphicons Halflings';
-
-  src: url('../fonts/glyphicons-halflings-regular.eot');
-  src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff2') format('woff2'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
-}
-.glyphicon {
-  position: relative;
-  top: 1px;
-  display: inline-block;
-  font-family: 'Glyphicons Halflings';
-  font-style: normal;
-  font-weight: normal;
-  line-height: 1;
-
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-.glyphicon-asterisk:before {
-  content: "\002a";
-}
-.glyphicon-plus:before {
-  content: "\002b";
-}
-.glyphicon-euro:before,
-.glyphicon-eur:before {
-  content: "\20ac";
-}
-.glyphicon-minus:before {
-  content: "\2212";
-}
-.glyphicon-cloud:before {
-  content: "\2601";
-}
-.glyphicon-envelope:before {
-  content: "\2709";
-}
-.glyphicon-pencil:before {
-  content: "\270f";
-}
-.glyphicon-glass:before {
-  content: "\e001";
-}
-.glyphicon-music:before {
-  content: "\e002";
-}
-.glyphicon-search:before {
-  content: "\e003";
-}
-.glyphicon-heart:before {
-  content: "\e005";
-}
-.glyphicon-star:before {
-  content: "\e006";
-}
-.glyphicon-star-empty:before {
-  content: "\e007";
-}
-.glyphicon-user:before {
-  content: "\e008";
-}
-.glyphicon-film:before {
-  content: "\e009";
-}
-.glyphicon-th-large:before {
-  content: "\e010";
-}
-.glyphicon-th:before {
-  content: "\e011";
-}
-.glyphicon-th-list:before {
-  content: "\e012";
-}
-.glyphicon-ok:before {
-  content: "\e013";
-}
-.glyphicon-remove:before {
-  content: "\e014";
-}
-.glyphicon-zoom-in:before {
-  content: "\e015";
-}
-.glyphicon-zoom-out:before {
-  content: "\e016";
-}
-.glyphicon-off:before {
-  content: "\e017";
-}
-.glyphicon-signal:before {
-  content: "\e018";
-}
-.glyphicon-cog:before {
-  content: "\e019";
-}
-.glyphicon-trash:before {
-  content: "\e020";
-}
-.glyphicon-home:before {
-  content: "\e021";
-}
-.glyphicon-file:before {
-  content: "\e022";
-}
-.glyphicon-time:before {
-  content: "\e023";
-}
-.glyphicon-road:before {
-  content: "\e024";
-}
-.glyphicon-download-alt:before {
-  content: "\e025";
-}
-.glyphicon-download:before {
-  content: "\e026";
-}
-.glyphicon-upload:before {
-  content: "\e027";
-}
-.glyphicon-inbox:before {
-  content: "\e028";
-}
-.glyphicon-play-circle:before {
-  content: "\e029";
-}
-.glyphicon-repeat:before {
-  content: "\e030";
-}
-.glyphicon-refresh:before {
-  content: "\e031";
-}
-.glyphicon-list-alt:before {
-  content: "\e032";
-}
-.glyphicon-lock:before {
-  content: "\e033";
-}
-.glyphicon-flag:before {
-  content: "\e034";
-}
-.glyphicon-headphones:before {
-  content: "\e035";
-}
-.glyphicon-volume-off:before {
-  content: "\e036";
-}
-.glyphicon-volume-down:before {
-  content: "\e037";
-}
-.glyphicon-volume-up:before {
-  content: "\e038";
-}
-.glyphicon-qrcode:before {
-  content: "\e039";
-}
-.glyphicon-barcode:before {
-  content: "\e040";
-}
-.glyphicon-tag:before {
-  content: "\e041";
-}
-.glyphicon-tags:before {
-  content: "\e042";
-}
-.glyphicon-book:before {
-  content: "\e043";
-}
-.glyphicon-bookmark:before {
-  content: "\e044";
-}
-.glyphicon-print:before {
-  content: "\e045";
-}
-.glyphicon-camera:before {
-  content: "\e046";
-}
-.glyphicon-font:before {
-  content: "\e047";
-}
-.glyphicon-bold:before {
-  content: "\e048";
-}
-.glyphicon-italic:before {
-  content: "\e049";
-}
-.glyphicon-text-height:before {
-  content: "\e050";
-}
-.glyphicon-text-width:before {
-  content: "\e051";
-}
-.glyphicon-align-left:before {
-  content: "\e052";
-}
-.glyphicon-align-center:before {
-  content: "\e053";
-}
-.glyphicon-align-right:before {
-  content: "\e054";
-}
-.glyphicon-align-justify:before {
-  content: "\e055";
-}
-.glyphicon-list:before {
-  content: "\e056";
-}
-.glyphicon-indent-left:before {
-  content: "\e057";
-}
-.glyphicon-indent-right:before {
-  content: "\e058";
-}
-.glyphicon-facetime-video:before {
-  content: "\e059";
-}
-.glyphicon-picture:before {
-  content: "\e060";
-}
-.glyphicon-map-marker:before {
-  content: "\e062";
-}
-.glyphicon-adjust:before {
-  content: "\e063";
-}
-.glyphicon-tint:before {
-  content: "\e064";
-}
-.glyphicon-edit:before {
-  content: "\e065";
-}
-.glyphicon-share:before {
-  content: "\e066";
-}
-.glyphicon-check:before {
-  content: "\e067";
-}
-.glyphicon-move:before {
-  content: "\e068";
-}
-.glyphicon-step-backward:before {
-  content: "\e069";
-}
-.glyphicon-fast-backward:before {
-  content: "\e070";
-}
-.glyphicon-backward:before {
-  content: "\e071";
-}
-.glyphicon-play:before {
-  content: "\e072";
-}
-.glyphicon-pause:before {
-  content: "\e073";
-}
-.glyphicon-stop:before {
-  content: "\e074";
-}
-.glyphicon-forward:before {
-  content: "\e075";
-}
-.glyphicon-fast-forward:before {
-  content: "\e076";
-}
-.glyphicon-step-forward:before {
-  content: "\e077";
-}
-.glyphicon-eject:before {
-  content: "\e078";
-}
-.glyphicon-chevron-left:before {
-  content: "\e079";
-}
-.glyphicon-chevron-right:before {
-  content: "\e080";
-}
-.glyphicon-plus-sign:before {
-  content: "\e081";
-}
-.glyphicon-minus-sign:before {
-  content: "\e082";
-}
-.glyphicon-remove-sign:before {
-  content: "\e083";
-}
-.glyphicon-ok-sign:before {
-  content: "\e084";
-}
-.glyphicon-question-sign:before {
-  content: "\e085";
-}
-.glyphicon-info-sign:before {
-  content: "\e086";
-}
-.glyphicon-screenshot:before {
-  content: "\e087";
-}
-.glyphicon-remove-circle:before {
-  content: "\e088";
-}
-.glyphicon-ok-circle:before {
-  content: "\e089";
-}
-.glyphicon-ban-circle:before {
-  content: "\e090";
-}
-.glyphicon-arrow-left:before {
-  content: "\e091";
-}
-.glyphicon-arrow-right:before {
-  content: "\e092";
-}
-.glyphicon-arrow-up:before {
-  content: "\e093";
-}
-.glyphicon-arrow-down:before {
-  content: "\e094";
-}
-.glyphicon-share-alt:before {
-  content: "\e095";
-}
-.glyphicon-resize-full:before {
-  content: "\e096";
-}
-.glyphicon-resize-small:before {
-  content: "\e097";
-}
-.glyphicon-exclamation-sign:before {
-  content: "\e101";
-}
-.glyphicon-gift:before {
-  content: "\e102";
-}
-.glyphicon-leaf:before {
-  content: "\e103";
-}
-.glyphicon-fire:before {
-  content: "\e104";
-}
-.glyphicon-eye-open:before {
-  content: "\e105";
-}
-.glyphicon-eye-close:before {
-  content: "\e106";
-}
-.glyphicon-warning-sign:before {
-  content: "\e107";
-}
-.glyphicon-plane:before {
-  content: "\e108";
-}
-.glyphicon-calendar:before {
-  content: "\e109";
-}
-.glyphicon-random:before {
-  content: "\e110";
-}
-.glyphicon-comment:before {
-  content: "\e111";
-}
-.glyphicon-magnet:before {
-  content: "\e112";
-}
-.glyphicon-chevron-up:before {
-  content: "\e113";
-}
-.glyphicon-chevron-down:before {
-  content: "\e114";
-}
-.glyphicon-retweet:before {
-  content: "\e115";
-}
-.glyphicon-shopping-cart:before {
-  content: "\e116";
-}
-.glyphicon-folder-close:before {
-  content: "\e117";
-}
-.glyphicon-folder-open:before {
-  content: "\e118";
-}
-.glyphicon-resize-vertical:before {
-  content: "\e119";
-}
-.glyphicon-resize-horizontal:before {
-  content: "\e120";
-}
-.glyphicon-hdd:before {
-  content: "\e121";
-}
-.glyphicon-bullhorn:before {
-  content: "\e122";
-}
-.glyphicon-bell:before {
-  content: "\e123";
-}
-.glyphicon-certificate:before {
-  content: "\e124";
-}
-.glyphicon-thumbs-up:before {
-  content: "\e125";
-}
-.glyphicon-thumbs-down:before {
-  content: "\e126";
-}
-.glyphicon-hand-right:before {
-  content: "\e127";
-}
-.glyphicon-hand-left:before {
-  content: "\e128";
-}
-.glyphicon-hand-up:before {
-  content: "\e129";
-}
-.glyphicon-hand-down:before {
-  content: "\e130";
-}
-.glyphicon-circle-arrow-right:before {
-  content: "\e131";
-}
-.glyphicon-circle-arrow-left:before {
-  content: "\e132";
-}
-.glyphicon-circle-arrow-up:before {
-  content: "\e133";
-}
-.glyphicon-circle-arrow-down:before {
-  content: "\e134";
-}
-.glyphicon-globe:before {
-  content: "\e135";
-}
-.glyphicon-wrench:before {
-  content: "\e136";
-}
-.glyphicon-tasks:before {
-  content: "\e137";
-}
-.glyphicon-filter:before {
-  content: "\e138";
-}
-.glyphicon-briefcase:before {
-  content: "\e139";
-}
-.glyphicon-fullscreen:before {
-  content: "\e140";
-}
-.glyphicon-dashboard:before {
-  content: "\e141";
-}
-.glyphicon-paperclip:before {
-  content: "\e142";
-}
-.glyphicon-heart-empty:before {
-  content: "\e143";
-}
-.glyphicon-link:before {
-  content: "\e144";
-}
-.glyphicon-phone:before {
-  content: "\e145";
-}
-.glyphicon-pushpin:before {
-  content: "\e146";
-}
-.glyphicon-usd:before {
-  content: "\e148";
-}
-.glyphicon-gbp:before {
-  content: "\e149";
-}
-.glyphicon-sort:before {
-  content: "\e150";
-}
-.glyphicon-sort-by-alphabet:before {
-  content: "\e151";
-}
-.glyphicon-sort-by-alphabet-alt:before {
-  content: "\e152";
-}
-.glyphicon-sort-by-order:before {
-  content: "\e153";
-}
-.glyphicon-sort-by-order-alt:before {
-  content: "\e154";
-}
-.glyphicon-sort-by-attributes:before {
-  content: "\e155";
-}
-.glyphicon-sort-by-attributes-alt:before {
-  content: "\e156";
-}
-.glyphicon-unchecked:before {
-  content: "\e157";
-}
-.glyphicon-expand:before {
-  content: "\e158";
-}
-.glyphicon-collapse-down:before {
-  content: "\e159";
-}
-.glyphicon-collapse-up:before {
-  content: "\e160";
-}
-.glyphicon-log-in:before {
-  content: "\e161";
-}
-.glyphicon-flash:before {
-  content: "\e162";
-}
-.glyphicon-log-out:before {
-  content: "\e163";
-}
-.glyphicon-new-window:before {
-  content: "\e164";
-}
-.glyphicon-record:before {
-  content: "\e165";
-}
-.glyphicon-save:before {
-  content: "\e166";
-}
-.glyphicon-open:before {
-  content: "\e167";
-}
-.glyphicon-saved:before {
-  content: "\e168";
-}
-.glyphicon-import:before {
-  content: "\e169";
-}
-.glyphicon-export:before {
-  content: "\e170";
-}
-.glyphicon-send:before {
-  content: "\e171";
-}
-.glyphicon-floppy-disk:before {
-  content: "\e172";
-}
-.glyphicon-floppy-saved:before {
-  content: "\e173";
-}
-.glyphicon-floppy-remove:before {
-  content: "\e174";
-}
-.glyphicon-floppy-save:before {
-  content: "\e175";
-}
-.glyphicon-floppy-open:before {
-  content: "\e176";
-}
-.glyphicon-credit-card:before {
-  content: "\e177";
-}
-.glyphicon-transfer:before {
-  content: "\e178";
-}
-.glyphicon-cutlery:before {
-  content: "\e179";
-}
-.glyphicon-header:before {
-  content: "\e180";
-}
-.glyphicon-compressed:before {
-  content: "\e181";
-}
-.glyphicon-earphone:before {
-  content: "\e182";
-}
-.glyphicon-phone-alt:before {
-  content: "\e183";
-}
-.glyphicon-tower:before {
-  content: "\e184";
-}
-.glyphicon-stats:before {
-  content: "\e185";
-}
-.glyphicon-sd-video:before {
-  content: "\e186";
-}
-.glyphicon-hd-video:before {
-  content: "\e187";
-}
-.glyphicon-subtitles:before {
-  content: "\e188";
-}
-.glyphicon-sound-stereo:before {
-  content: "\e189";
-}
-.glyphicon-sound-dolby:before {
-  content: "\e190";
-}
-.glyphicon-sound-5-1:before {
-  content: "\e191";
-}
-.glyphicon-sound-6-1:before {
-  content: "\e192";
-}
-.glyphicon-sound-7-1:before {
-  content: "\e193";
-}
-.glyphicon-copyright-mark:before {
-  content: "\e194";
-}
-.glyphicon-registration-mark:before {
-  content: "\e195";
-}
-.glyphicon-cloud-download:before {
-  content: "\e197";
-}
-.glyphicon-cloud-upload:before {
-  content: "\e198";
-}
-.glyphicon-tree-conifer:before {
-  content: "\e199";
-}
-.glyphicon-tree-deciduous:before {
-  content: "\e200";
-}
-.glyphicon-cd:before {
-  content: "\e201";
-}
-.glyphicon-save-file:before {
-  content: "\e202";
-}
-.glyphicon-open-file:before {
-  content: "\e203";
-}
-.glyphicon-level-up:before {
-  content: "\e204";
-}
-.glyphicon-copy:before {
-  content: "\e205";
-}
-.glyphicon-paste:before {
-  content: "\e206";
-}
-.glyphicon-alert:before {
-  content: "\e209";
-}
-.glyphicon-equalizer:before {
-  content: "\e210";
-}
-.glyphicon-king:before {
-  content: "\e211";
-}
-.glyphicon-queen:before {
-  content: "\e212";
-}
-.glyphicon-pawn:before {
-  content: "\e213";
-}
-.glyphicon-bishop:before {
-  content: "\e214";
-}
-.glyphicon-knight:before {
-  content: "\e215";
-}
-.glyphicon-baby-formula:before {
-  content: "\e216";
-}
-.glyphicon-tent:before {
-  content: "\26fa";
-}
-.glyphicon-blackboard:before {
-  content: "\e218";
-}
-.glyphicon-bed:before {
-  content: "\e219";
-}
-.glyphicon-apple:before {
-  content: "\f8ff";
-}
-.glyphicon-erase:before {
-  content: "\e221";
-}
-.glyphicon-hourglass:before {
-  content: "\231b";
-}
-.glyphicon-lamp:before {
-  content: "\e223";
-}
-.glyphicon-duplicate:before {
-  content: "\e224";
-}
-.glyphicon-piggy-bank:before {
-  content: "\e225";
-}
-.glyphicon-scissors:before {
-  content: "\e226";
-}
-.glyphicon-bitcoin:before {
-  content: "\e227";
-}
-.glyphicon-btc:before {
-  content: "\e227";
-}
-.glyphicon-xbt:before {
-  content: "\e227";
-}
-.glyphicon-yen:before {
-  content: "\00a5";
-}
-.glyphicon-jpy:before {
-  content: "\00a5";
-}
-.glyphicon-ruble:before {
-  content: "\20bd";
-}
-.glyphicon-rub:before {
-  content: "\20bd";
-}
-.glyphicon-scale:before {
-  content: "\e230";
-}
-.glyphicon-ice-lolly:before {
-  content: "\e231";
-}
-.glyphicon-ice-lolly-tasted:before {
-  content: "\e232";
-}
-.glyphicon-education:before {
-  content: "\e233";
-}
-.glyphicon-option-horizontal:before {
-  content: "\e234";
-}
-.glyphicon-option-vertical:before {
-  content: "\e235";
-}
-.glyphicon-menu-hamburger:before {
-  content: "\e236";
-}
-.glyphicon-modal-window:before {
-  content: "\e237";
-}
-.glyphicon-oil:before {
-  content: "\e238";
-}
-.glyphicon-grain:before {
-  content: "\e239";
-}
-.glyphicon-sunglasses:before {
-  content: "\e240";
-}
-.glyphicon-text-size:before {
-  content: "\e241";
-}
-.glyphicon-text-color:before {
-  content: "\e242";
-}
-.glyphicon-text-background:before {
-  content: "\e243";
-}
-.glyphicon-object-align-top:before {
-  content: "\e244";
-}
-.glyphicon-object-align-bottom:before {
-  content: "\e245";
-}
-.glyphicon-object-align-horizontal:before {
-  content: "\e246";
-}
-.glyphicon-object-align-left:before {
-  content: "\e247";
-}
-.glyphicon-object-align-vertical:before {
-  content: "\e248";
-}
-.glyphicon-object-align-right:before {
-  content: "\e249";
-}
-.glyphicon-triangle-right:before {
-  content: "\e250";
-}
-.glyphicon-triangle-left:before {
-  content: "\e251";
-}
-.glyphicon-triangle-bottom:before {
-  content: "\e252";
-}
-.glyphicon-triangle-top:before {
-  content: "\e253";
-}
-.glyphicon-console:before {
-  content: "\e254";
-}
-.glyphicon-superscript:before {
-  content: "\e255";
-}
-.glyphicon-subscript:before {
-  content: "\e256";
-}
-.glyphicon-menu-left:before {
-  content: "\e257";
-}
-.glyphicon-menu-right:before {
-  content: "\e258";
-}
-.glyphicon-menu-down:before {
-  content: "\e259";
-}
-.glyphicon-menu-up:before {
-  content: "\e260";
-}
-* {
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
-}
-*:before,
-*:after {
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
-}
-html {
-  font-size: 10px;
-
-  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-}
-body {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 14px;
-  line-height: 1.42857143;
-  color: #333;
-  background-color: #fff;
-}
-input,
-button,
-select,
-textarea {
-  font-family: inherit;
-  font-size: inherit;
-  line-height: inherit;
-}
-a {
-  color: #337ab7;
-  text-decoration: none;
-}
-a:hover,
-a:focus {
-  color: #23527c;
-  text-decoration: underline;
-}
-a:focus {
-  outline: 5px auto -webkit-focus-ring-color;
-  outline-offset: -2px;
-}
-figure {
-  margin: 0;
-}
-img {
-  vertical-align: middle;
-}
-.img-responsive,
-.thumbnail > img,
-.thumbnail a > img,
-.carousel-inner > .item > img,
-.carousel-inner > .item > a > img {
-  display: block;
-  max-width: 100%;
-  height: auto;
-}
-.img-rounded {
-  border-radius: 6px;
-}
-.img-thumbnail {
-  display: inline-block;
-  max-width: 100%;
-  height: auto;
-  padding: 4px;
-  line-height: 1.42857143;
-  background-color: #fff;
-  border: 1px solid #ddd;
-  border-radius: 4px;
-  -webkit-transition: all .2s ease-in-out;
-       -o-transition: all .2s ease-in-out;
-          transition: all .2s ease-in-out;
-}
-.img-circle {
-  border-radius: 50%;
-}
-hr {
-  margin-top: 20px;
-  margin-bottom: 20px;
-  border: 0;
-  border-top: 1px solid #eee;
-}
-.sr-only {
-  position: absolute;
-  width: 1px;
-  height: 1px;
-  padding: 0;
-  margin: -1px;
-  overflow: hidden;
-  clip: rect(0, 0, 0, 0);
-  border: 0;
-}
-.sr-only-focusable:active,
-.sr-only-focusable:focus {
-  position: static;
-  width: auto;
-  height: auto;
-  margin: 0;
-  overflow: visible;
-  clip: auto;
-}
-[role="button"] {
-  cursor: pointer;
-}
-h1,
-h2,
-h3,
-h4,
-h5,
-h6,
-.h1,
-.h2,
-.h3,
-.h4,
-.h5,
-.h6 {
-  font-family: inherit;
-  font-weight: 500;
-  line-height: 1.1;
-  color: inherit;
-}
-h1 small,
-h2 small,
-h3 small,
-h4 small,
-h5 small,
-h6 small,
-.h1 small,
-.h2 small,
-.h3 small,
-.h4 small,
-.h5 small,
-.h6 small,
-h1 .small,
-h2 .small,
-h3 .small,
-h4 .small,
-h5 .small,
-h6 .small,
-.h1 .small,
-.h2 .small,
-.h3 .small,
-.h4 .small,
-.h5 .small,
-.h6 .small {
-  font-weight: normal;
-  line-height: 1;
-  color: #777;
-}
-h1,
-.h1,
-h2,
-.h2,
-h3,
-.h3 {
-  margin-top: 20px;
-  margin-bottom: 10px;
-}
-h1 small,
-.h1 small,
-h2 small,
-.h2 small,
-h3 small,
-.h3 small,
-h1 .small,
-.h1 .small,
-h2 .small,
-.h2 .small,
-h3 .small,
-.h3 .small {
-  font-size: 65%;
-}
-h4,
-.h4,
-h5,
-.h5,
-h6,
-.h6 {
-  margin-top: 10px;
-  margin-bottom: 10px;
-}
-h4 small,
-.h4 small,
-h5 small,
-.h5 small,
-h6 small,
-.h6 small,
-h4 .small,
-.h4 .small,
-h5 .small,
-.h5 .small,
-h6 .small,
-.h6 .small {
-  font-size: 75%;
-}
-h1,
-.h1 {
-  font-size: 36px;
-}
-h2,
-.h2 {
-  font-size: 30px;
-}
-h3,
-.h3 {
-  font-size: 24px;
-}
-h4,
-.h4 {
-  font-size: 18px;
-}
-h5,
-.h5 {
-  font-size: 14px;
-}
-h6,
-.h6 {
-  font-size: 12px;
-}
-p {
-  margin: 0 0 10px;
-}
-.lead {
-  margin-bottom: 20px;
-  font-size: 16px;
-  font-weight: 300;
-  line-height: 1.4;
-}
-@media (min-width: 768px) {
-  .lead {
-    font-size: 21px;
-  }
-}
-small,
-.small {
-  font-size: 85%;
-}
-mark,
-.mark {
-  padding: .2em;
-  background-color: #fcf8e3;
-}
-.text-left {
-  text-align: left;
-}
-.text-right {
-  text-align: right;
-}
-.text-center {
-  text-align: center;
-}
-.text-justify {
-  text-align: justify;
-}
-.text-nowrap {
-  white-space: nowrap;
-}
-.text-lowercase {
-  text-transform: lowercase;
-}
-.text-uppercase {
-  text-transform: uppercase;
-}
-.text-capitalize {
-  text-transform: capitalize;
-}
-.text-muted {
-  color: #777;
-}
-.text-primary {
-  color: #337ab7;
-}
-a.text-primary:hover,
-a.text-primary:focus {
-  color: #286090;
-}
-.text-success {
-  color: #3c763d;
-}
-a.text-success:hover,
-a.text-success:focus {
-  color: #2b542c;
-}
-.text-info {
-  color: #31708f;
-}
-a.text-info:hover,
-a.text-info:focus {
-  color: #245269;
-}
-.text-warning {
-  color: #8a6d3b;
-}
-a.text-warning:hover,
-a.text-warning:focus {
-  color: #66512c;
-}
-.text-danger {
-  color: #a94442;
-}
-a.text-danger:hover,
-a.text-danger:focus {
-  color: #843534;
-}
-.bg-primary {
-  color: #fff;
-  background-color: #337ab7;
-}
-a.bg-primary:hover,
-a.bg-primary:focus {
-  background-color: #286090;
-}
-.bg-success {
-  background-color: #dff0d8;
-}
-a.bg-success:hover,
-a.bg-success:focus {
-  background-color: #c1e2b3;
-}
-.bg-info {
-  background-color: #d9edf7;
-}
-a.bg-info:hover,
-a.bg-info:focus {
-  background-color: #afd9ee;
-}
-.bg-warning {
-  background-color: #fcf8e3;
-}
-a.bg-warning:hover,
-a.bg-warning:focus {
-  background-color: #f7ecb5;
-}
-.bg-danger {
-  background-color: #f2dede;
-}
-a.bg-danger:hover,
-a.bg-danger:focus {
-  background-color: #e4b9b9;
-}
-.page-header {
-  padding-bottom: 9px;
-  margin: 40px 0 20px;
-  border-bottom: 1px solid #eee;
-}
-ul,
-ol {
-  margin-top: 0;
-  margin-bottom: 10px;
-}
-ul ul,
-ol ul,
-ul ol,
-ol ol {
-  margin-bottom: 0;
-}
-.list-unstyled {
-  padding-left: 0;
-  list-style: none;
-}
-.list-inline {
-  padding-left: 0;
-  margin-left: -5px;
-  list-style: none;
-}
-.list-inline > li {
-  display: inline-block;
-  padding-right: 5px;
-  padding-left: 5px;
-}
-dl {
-  margin-top: 0;
-  margin-bottom: 20px;
-}
-dt,
-dd {
-  line-height: 1.42857143;
-}
-dt {
-  font-weight: bold;
-}
-dd {
-  margin-left: 0;
-}
-@media (min-width: 768px) {
-  .dl-horizontal dt {
-    float: left;
-    width: 160px;
-    overflow: hidden;
-    clear: left;
-    text-align: right;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-  .dl-horizontal dd {
-    margin-left: 180px;
-  }
-}
-abbr[title],
-abbr[data-original-title] {
-  cursor: help;
-  border-bottom: 1px dotted #777;
-}
-.initialism {
-  font-size: 90%;
-  text-transform: uppercase;
-}
-blockquote {
-  padding: 10px 20px;
-  margin: 0 0 20px;
-  font-size: 17.5px;
-  border-left: 5px solid #eee;
-}
-blockquote p:last-child,
-blockquote ul:last-child,
-blockquote ol:last-child {
-  margin-bottom: 0;
-}
-blockquote footer,
-blockquote small,
-blockquote .small {
-  display: block;
-  font-size: 80%;
-  line-height: 1.42857143;
-  color: #777;
-}
-blockquote footer:before,
-blockquote small:before,
-blockquote .small:before {
-  content: '\2014 \00A0';
-}
-.blockquote-reverse,
-blockquote.pull-right {
-  padding-right: 15px;
-  padding-left: 0;
-  text-align: right;
-  border-right: 5px solid #eee;
-  border-left: 0;
-}
-.blockquote-reverse footer:before,
-blockquote.pull-right footer:before,
-.blockquote-reverse small:before,
-blockquote.pull-right small:before,
-.blockquote-reverse .small:before,
-blockquote.pull-right .small:before {
-  content: '';
-}
-.blockquote-reverse footer:after,
-blockquote.pull-right footer:after,
-.blockquote-reverse small:after,
-blockquote.pull-right small:after,
-.blockquote-reverse .small:after,
-blockquote.pull-right .small:after {
-  content: '\00A0 \2014';
-}
-address {
-  margin-bottom: 20px;
-  font-style: normal;
-  line-height: 1.42857143;
-}
-code,
-kbd,
-pre,
-samp {
-  font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
-}
-code {
-  padding: 2px 4px;
-  font-size: 90%;
-  color: #c7254e;
-  background-color: #f9f2f4;
-  border-radius: 4px;
-}
-kbd {
-  padding: 2px 4px;
-  font-size: 90%;
-  color: #fff;
-  background-color: #333;
-  border-radius: 3px;
-  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .25);
-          box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .25);
-}
-kbd kbd {
-  padding: 0;
-  font-size: 100%;
-  font-weight: bold;
-  -webkit-box-shadow: none;
-          box-shadow: none;
-}
-pre {
-  display: block;
-  padding: 9.5px;
-  margin: 0 0 10px;
-  font-size: 13px;
-  line-height: 1.42857143;
-  color: #333;
-  word-break: break-all;
-  word-wrap: break-word;
-  background-color: #f5f5f5;
-  border: 1px solid #ccc;
-  border-radius: 4px;
-}
-pre code {
-  padding: 0;
-  font-size: inherit;
-  color: inherit;
-  white-space: pre-wrap;
-  background-color: transparent;
-  border-radius: 0;
-}
-.pre-scrollable {
-  max-height: 340px;
-  overflow-y: scroll;
-}
-.container {
-  padding-right: 15px;
-  padding-left: 15px;
-  margin-right: auto;
-  margin-left: auto;
-}
-@media (min-width: 768px) {
-  .container {
-    width: 750px;
-  }
-}
-@media (min-width: 992px) {
-  .container {
-    width: 970px;
-  }
-}
-@media (min-width: 1200px) {
-  .container {
-    width: 1170px;
-  }
-}
-.container-fluid {
-  padding-right: 15px;
-  padding-left: 15px;
-  margin-right: auto;
-  margin-left: auto;
-}
-.row {
-  margin-right: -15px;
-  margin-left: -15px;
-}
-.col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 {
-  position: relative;
-  min-height: 1px;
-  padding-right: 15px;
-  padding-left: 15px;
-}
-.col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12 {
-  float: left;
-}
-.col-xs-12 {
-  width: 100%;
-}
-.col-xs-11 {
-  width: 91.66666667%;
-}
-.col-xs-10 {
-  width: 83.33333333%;
-}
-.col-xs-9 {
-  width: 75%;
-}
-.col-xs-8 {
-  width: 66.66666667%;
-}
-.col-xs-7 {
-  width: 58.33333333%;
-}
-.col-xs-6 {
-  width: 50%;
-}
-.col-xs-5 {
-  width: 41.66666667%;
-}
-.col-xs-4 {
-  width: 33.33333333%;
-}
-.col-xs-3 {
-  width: 25%;
-}
-.col-xs-2 {
-  width: 16.66666667%;
-}
-.col-xs-1 {
-  width: 8.33333333%;
-}
-.col-xs-pull-12 {
-  right: 100%;
-}
-.col-xs-pull-11 {
-  right: 91.66666667%;
-}
-.col-xs-pull-10 {
-  right: 83.33333333%;
-}
-.col-xs-pull-9 {
-  right: 75%;
-}
-.col-xs-pull-8 {
-  right: 66.66666667%;
-}
-.col-xs-pull-7 {
-  right: 58.33333333%;
-}
-.col-xs-pull-6 {
-  right: 50%;
-}
-.col-xs-pull-5 {
-  right: 41.66666667%;
-}
-.col-xs-pull-4 {
-  right: 33.33333333%;
-}
-.col-xs-pull-3 {
-  right: 25%;
-}
-.col-xs-pull-2 {
-  right: 16.66666667%;
-}
-.col-xs-pull-1 {
-  right: 8.33333333%;
-}
-.col-xs-pull-0 {
-  right: auto;
-}
-.col-xs-push-12 {
-  left: 100%;
-}
-.col-xs-push-11 {
-  left: 91.66666667%;
-}
-.col-xs-push-10 {
-  left: 83.33333333%;
-}
-.col-xs-push-9 {
-  left: 75%;
-}
-.col-xs-push-8 {
-  left: 66.66666667%;
-}
-.col-xs-push-7 {
-  left: 58.33333333%;
-}
-.col-xs-push-6 {
-  left: 50%;
-}
-.col-xs-push-5 {
-  left: 41.66666667%;
-}
-.col-xs-push-4 {
-  left: 33.33333333%;
-}
-.col-xs-push-3 {
-  left: 25%;
-}
-.col-xs-push-2 {
-  left: 16.66666667%;
-}
-.col-xs-push-1 {
-  left: 8.33333333%;
-}
-.col-xs-push-0 {
-  left: auto;
-}
-.col-xs-offset-12 {
-  margin-left: 100%;
-}
-.col-xs-offset-11 {
-  margin-left: 91.66666667%;
-}
-.col-xs-offset-10 {
-  margin-left: 83.33333333%;
-}
-.col-xs-offset-9 {
-  margin-left: 75%;
-}
-.col-xs-offset-8 {
-  margin-left: 66.66666667%;
-}
-.col-xs-offset-7 {
-  margin-left: 58.33333333%;
-}
-.col-xs-offset-6 {
-  margin-left: 50%;
-}
-.col-xs-offset-5 {
-  margin-left: 41.66666667%;
-}
-.col-xs-offset-4 {
-  margin-left: 33.33333333%;
-}
-.col-xs-offset-3 {
-  margin-left: 25%;
-}
-.col-xs-offset-2 {
-  margin-left: 16.66666667%;
-}
-.col-xs-offset-1 {
-  margin-left: 8.33333333%;
-}
-.col-xs-offset-0 {
-  margin-left: 0;
-}
-@media (min-width: 768px) {
-  .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 {
-    float: left;
-  }
-  .col-sm-12 {
-    width: 100%;
-  }
-  .col-sm-11 {
-    width: 91.66666667%;
-  }
-  .col-sm-10 {
-    width: 83.33333333%;
-  }
-  .col-sm-9 {
-    width: 75%;
-  }
-  .col-sm-8 {
-    width: 66.66666667%;
-  }
-  .col-sm-7 {
-    width: 58.33333333%;
-  }
-  .col-sm-6 {
-    width: 50%;
-  }
-  .col-sm-5 {
-    width: 41.66666667%;
-  }
-  .col-sm-4 {
-    width: 33.33333333%;
-  }
-  .col-sm-3 {
-    width: 25%;
-  }
-  .col-sm-2 {
-    width: 16.66666667%;
-  }
-  .col-sm-1 {
-    width: 8.33333333%;
-  }
-  .col-sm-pull-12 {
-    right: 100%;
-  }
-  .col-sm-pull-11 {
-    right: 91.66666667%;
-  }
-  .col-sm-pull-10 {
-    right: 83.33333333%;
-  }
-  .col-sm-pull-9 {
-    right: 75%;
-  }
-  .col-sm-pull-8 {
-    right: 66.66666667%;
-  }
-  .col-sm-pull-7 {
-    right: 58.33333333%;
-  }
-  .col-sm-pull-6 {
-    right: 50%;
-  }
-  .col-sm-pull-5 {
-    right: 41.66666667%;
-  }
-  .col-sm-pull-4 {
-    right: 33.33333333%;
-  }
-  .col-sm-pull-3 {
-    right: 25%;
-  }
-  .col-sm-pull-2 {
-    right: 16.66666667%;
-  }
-  .col-sm-pull-1 {
-    right: 8.33333333%;
-  }
-  .col-sm-pull-0 {
-    right: auto;
-  }
-  .col-sm-push-12 {
-    left: 100%;
-  }
-  .col-sm-push-11 {
-    left: 91.66666667%;
-  }
-  .col-sm-push-10 {
-    left: 83.33333333%;
-  }
-  .col-sm-push-9 {
-    left: 75%;
-  }
-  .col-sm-push-8 {
-    left: 66.66666667%;
-  }
-  .col-sm-push-7 {
-    left: 58.33333333%;
-  }
-  .col-sm-push-6 {
-    left: 50%;
-  }
-  .col-sm-push-5 {
-    left: 41.66666667%;
-  }
-  .col-sm-push-4 {
-    left: 33.33333333%;
-  }
-  .col-sm-push-3 {
-    left: 25%;
-  }
-  .col-sm-push-2 {
-    left: 16.66666667%;
-  }
-  .col-sm-push-1 {
-    left: 8.33333333%;
-  }
-  .col-sm-push-0 {
-    left: auto;
-  }
-  .col-sm-offset-12 {
-    margin-left: 100%;
-  }
-  .col-sm-offset-11 {
-    margin-left: 91.66666667%;
-  }
-  .col-sm-offset-10 {
-    margin-left: 83.33333333%;
-  }
-  .col-sm-offset-9 {
-    margin-left: 75%;
-  }
-  .col-sm-offset-8 {
-    margin-left: 66.66666667%;
-  }
-  .col-sm-offset-7 {
-    margin-left: 58.33333333%;
-  }
-  .col-sm-offset-6 {
-    margin-left: 50%;
-  }
-  .col-sm-offset-5 {
-    margin-left: 41.66666667%;
-  }
-  .col-sm-offset-4 {
-    margin-left: 33.33333333%;
-  }
-  .col-sm-offset-3 {
-    margin-left: 25%;
-  }
-  .col-sm-offset-2 {
-    margin-left: 16.66666667%;
-  }
-  .col-sm-offset-1 {
-    margin-left: 8.33333333%;
-  }
-  .col-sm-offset-0 {
-    margin-left: 0;
-  }
-}
-@media (min-width: 992px) {
-  .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12 {
-    float: left;
-  }
-  .col-md-12 {
-    width: 100%;
-  }
-  .col-md-11 {
-    width: 91.66666667%;
-  }
-  .col-md-10 {
-    width: 83.33333333%;
-  }
-  .col-md-9 {
-    width: 75%;
-  }
-  .col-md-8 {
-    width: 66.66666667%;
-  }
-  .col-md-7 {
-    width: 58.33333333%;
-  }
-  .col-md-6 {
-    width: 50%;
-  }
-  .col-md-5 {
-    width: 41.66666667%;
-  }
-  .col-md-4 {
-    width: 33.33333333%;
-  }
-  .col-md-3 {
-    width: 25%;
-  }
-  .col-md-2 {
-    width: 16.66666667%;
-  }
-  .col-md-1 {
-    width: 8.33333333%;
-  }
-  .col-md-pull-12 {
-    right: 100%;
-  }
-  .col-md-pull-11 {
-    right: 91.66666667%;
-  }
-  .col-md-pull-10 {
-    right: 83.33333333%;
-  }
-  .col-md-pull-9 {
-    right: 75%;
-  }
-  .col-md-pull-8 {
-    right: 66.66666667%;
-  }
-  .col-md-pull-7 {
-    right: 58.33333333%;
-  }
-  .col-md-pull-6 {
-    right: 50%;
-  }
-  .col-md-pull-5 {
-    right: 41.66666667%;
-  }
-  .col-md-pull-4 {
-    right: 33.33333333%;
-  }
-  .col-md-pull-3 {
-    right: 25%;
-  }
-  .col-md-pull-2 {
-    right: 16.66666667%;
-  }
-  .col-md-pull-1 {
-    right: 8.33333333%;
-  }
-  .col-md-pull-0 {
-    right: auto;
-  }
-  .col-md-push-12 {
-    left: 100%;
-  }
-  .col-md-push-11 {
-    left: 91.66666667%;
-  }
-  .col-md-push-10 {
-    left: 83.33333333%;
-  }
-  .col-md-push-9 {
-    left: 75%;
-  }
-  .col-md-push-8 {
-    left: 66.66666667%;
-  }
-  .col-md-push-7 {
-    left: 58.33333333%;
-  }
-  .col-md-push-6 {
-    left: 50%;
-  }
-  .col-md-push-5 {
-    left: 41.66666667%;
-  }
-  .col-md-push-4 {
-    left: 33.33333333%;
-  }
-  .col-md-push-3 {
-    left: 25%;
-  }
-  .col-md-push-2 {
-    left: 16.66666667%;
-  }
-  .col-md-push-1 {
-    left: 8.33333333%;
-  }
-  .col-md-push-0 {
-    left: auto;
-  }
-  .col-md-offset-12 {
-    margin-left: 100%;
-  }
-  .col-md-offset-11 {
-    margin-left: 91.66666667%;
-  }
-  .col-md-offset-10 {
-    margin-left: 83.33333333%;
-  }
-  .col-md-offset-9 {
-    margin-left: 75%;
-  }
-  .col-md-offset-8 {
-    margin-left: 66.66666667%;
-  }
-  .col-md-offset-7 {
-    margin-left: 58.33333333%;
-  }
-  .col-md-offset-6 {
-    margin-left: 50%;
-  }
-  .col-md-offset-5 {
-    margin-left: 41.66666667%;
-  }
-  .col-md-offset-4 {
-    margin-left: 33.33333333%;
-  }
-  .col-md-offset-3 {
-    margin-left: 25%;
-  }
-  .col-md-offset-2 {
-    margin-left: 16.66666667%;
-  }
-  .col-md-offset-1 {
-    margin-left: 8.33333333%;
-  }
-  .col-md-offset-0 {
-    margin-left: 0;
-  }
-}
-@media (min-width: 1200px) {
-  .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12 {
-    float: left;
-  }
-  .col-lg-12 {
-    width: 100%;
-  }
-  .col-lg-11 {
-    width: 91.66666667%;
-  }
-  .col-lg-10 {
-    width: 83.33333333%;
-  }
-  .col-lg-9 {
-    width: 75%;
-  }
-  .col-lg-8 {
-    width: 66.66666667%;
-  }
-  .col-lg-7 {
-    width: 58.33333333%;
-  }
-  .col-lg-6 {
-    width: 50%;
-  }
-  .col-lg-5 {
-    width: 41.66666667%;
-  }
-  .col-lg-4 {
-    width: 33.33333333%;
-  }
-  .col-lg-3 {
-    width: 25%;
-  }
-  .col-lg-2 {
-    width: 16.66666667%;
-  }
-  .col-lg-1 {
-    width: 8.33333333%;
-  }
-  .col-lg-pull-12 {
-    right: 100%;
-  }
-  .col-lg-pull-11 {
-    right: 91.66666667%;
-  }
-  .col-lg-pull-10 {
-    right: 83.33333333%;
-  }
-  .col-lg-pull-9 {
-    right: 75%;
-  }
-  .col-lg-pull-8 {
-    right: 66.66666667%;
-  }
-  .col-lg-pull-7 {
-    right: 58.33333333%;
-  }
-  .col-lg-pull-6 {
-    right: 50%;
-  }
-  .col-lg-pull-5 {
-    right: 41.66666667%;
-  }
-  .col-lg-pull-4 {
-    right: 33.33333333%;
-  }
-  .col-lg-pull-3 {
-    right: 25%;
-  }
-  .col-lg-pull-2 {
-    right: 16.66666667%;
-  }
-  .col-lg-pull-1 {
-    right: 8.33333333%;
-  }
-  .col-lg-pull-0 {
-    right: auto;
-  }
-  .col-lg-push-12 {
-    left: 100%;
-  }
-  .col-lg-push-11 {
-    left: 91.66666667%;
-  }
-  .col-lg-push-10 {
-    left: 83.33333333%;
-  }
-  .col-lg-push-9 {
-    left: 75%;
-  }
-  .col-lg-push-8 {
-    left: 66.66666667%;
-  }
-  .col-lg-push-7 {
-    left: 58.33333333%;
-  }
-  .col-lg-push-6 {
-    left: 50%;
-  }
-  .col-lg-push-5 {
-    left: 41.66666667%;
-  }
-  .col-lg-push-4 {
-    left: 33.33333333%;
-  }
-  .col-lg-push-3 {
-    left: 25%;
-  }
-  .col-lg-push-2 {
-    left: 16.66666667%;
-  }
-  .col-lg-push-1 {
-    left: 8.33333333%;
-  }
-  .col-lg-push-0 {
-    left: auto;
-  }
-  .col-lg-offset-12 {
-    margin-left: 100%;
-  }
-  .col-lg-offset-11 {
-    margin-left: 91.66666667%;
-  }
-  .col-lg-offset-10 {
-    margin-left: 83.33333333%;
-  }
-  .col-lg-offset-9 {
-    margin-left: 75%;
-  }
-  .col-lg-offset-8 {
-    margin-left: 66.66666667%;
-  }
-  .col-lg-offset-7 {
-    margin-left: 58.33333333%;
-  }
-  .col-lg-offset-6 {
-    margin-left: 50%;
-  }
-  .col-lg-offset-5 {
-    margin-left: 41.66666667%;
-  }
-  .col-lg-offset-4 {
-    margin-left: 33.33333333%;
-  }
-  .col-lg-offset-3 {
-    margin-left: 25%;
-  }
-  .col-lg-offset-2 {
-    margin-left: 16.66666667%;
-  }
-  .col-lg-offset-1 {
-    margin-left: 8.33333333%;
-  }
-  .col-lg-offset-0 {
-    margin-left: 0;
-  }
-}
-table {
-  background-color: transparent;
-}
-caption {
-  padding-top: 8px;
-  padding-bottom: 8px;
-  color: #777;
-  text-align: left;
-}
-th {
-  text-align: left;
-}
-.table {
-  width: 100%;
-  max-width: 100%;
-  margin-bottom: 20px;
-}
-.table > thead > tr > th,
-.table > tbody > tr > th,
-.table > tfoot > tr > th,
-.table > thead > tr > td,
-.table > tbody > tr > td,
-.table > tfoot > tr > td {
-  padding: 8px;
-  line-height: 1.42857143;
-  vertical-align: top;
-  border-top: 1px solid #ddd;
-}
-.table > thead > tr > th {
-  vertical-align: bottom;
-  border-bottom: 2px solid #ddd;
-}
-.table > caption + thead > tr:first-child > th,
-.table > colgroup + thead > tr:first-child > th,
-.table > thead:first-child > tr:first-child > th,
-.table > caption + thead > tr:first-child > td,
-.table > colgroup + thead > tr:first-child > td,
-.table > thead:first-child > tr:first-child > td {
-  border-top: 0;
-}
-.table > tbody + tbody {
-  border-top: 2px solid #ddd;
-}
-.table .table {
-  background-color: #fff;
-}
-.table-condensed > thead > tr > th,
-.table-condensed > tbody > tr > th,
-.table-condensed > tfoot > tr > th,
-.table-condensed > thead > tr > td,
-.table-condensed > tbody > tr > td,
-.table-condensed > tfoot > tr > td {
-  padding: 5px;
-}
-.table-bordered {
-  border: 1px solid #ddd;
-}
-.table-bordered > thead > tr > th,
-.table-bordered > tbody > tr > th,
-.table-bordered > tfoot > tr > th,
-.table-bordered > thead > tr > td,
-.table-bordered > tbody > tr > td,
-.table-bordered > tfoot > tr > td {
-  border: 1px solid #ddd;
-}
-.table-bordered > thead > tr > th,
-.table-bordered > thead > tr > td {
-  border-bottom-width: 2px;
-}
-.table-striped > tbody > tr:nth-of-type(odd) {
-  background-color: #f9f9f9;
-}
-.table-hover > tbody > tr:hover {
-  background-color: #f5f5f5;
-}
-table col[class*="col-"] {
-  position: static;
-  display: table-column;
-  float: none;
-}
-table td[class*="col-"],
-table th[class*="col-"] {
-  position: static;
-  display: table-cell;
-  float: none;
-}
-.table > thead > tr > td.active,
-.table > tbody > tr > td.active,
-.table > tfoot > tr > td.active,
-.table > thead > tr > th.active,
-.table > tbody > tr > th.active,
-.table > tfoot > tr > th.active,
-.table > thead > tr.active > td,
-.table > tbody > tr.active > td,
-.table > tfoot > tr.active > td,
-.table > thead > tr.active > th,
-.table > tbody > tr.active > th,
-.table > tfoot > tr.active > th {
-  background-color: #f5f5f5;
-}
-.table-hover > tbody > tr > td.active:hover,
-.table-hover > tbody > tr > th.active:hover,
-.table-hover > tbody > tr.active:hover > td,
-.table-hover > tbody > tr:hover > .active,
-.table-hover > tbody > tr.active:hover > th {
-  background-color: #e8e8e8;
-}
-.table > thead > tr > td.success,
-.table > tbody > tr > td.success,
-.table > tfoot > tr > td.success,
-.table > thead > tr > th.success,
-.table > tbody > tr > th.success,
-.table > tfoot > tr > th.success,
-.table > thead > tr.success > td,
-.table > tbody > tr.success > td,
-.table > tfoot > tr.success > td,
-.table > thead > tr.success > th,
-.table > tbody > tr.success > th,
-.table > tfoot > tr.success > th {
-  background-color: #dff0d8;
-}
-.table-hover > tbody > tr > td.success:hover,
-.table-hover > tbody > tr > th.success:hover,
-.table-hover > tbody > tr.success:hover > td,
-.table-hover > tbody > tr:hover > .success,
-.table-hover > tbody > tr.success:hover > th {
-  background-color: #d0e9c6;
-}
-.table > thead > tr > td.info,
-.table > tbody > tr > td.info,
-.table > tfoot > tr > td.info,
-.table > thead > tr > th.info,
-.table > tbody > tr > th.info,
-.table > tfoot > tr > th.info,
-.table > thead > tr.info > td,
-.table > tbody > tr.info > td,
-.table > tfoot > tr.info > td,
-.table > thead > tr.info > th,
-.table > tbody > tr.info > th,
-.table > tfoot > tr.info > th {
-  background-color: #d9edf7;
-}
-.table-hover > tbody > tr > td.info:hover,
-.table-hover > tbody > tr > th.info:hover,
-.table-hover > tbody > tr.info:hover > td,
-.table-hover > tbody > tr:hover > .info,
-.table-hover > tbody > tr.info:hover > th {
-  background-color: #c4e3f3;
-}
-.table > thead > tr > td.warning,
-.table > tbody > tr > td.warning,
-.table > tfoot > tr > td.warning,
-.table > thead > tr > th.warning,
-.table > tbody > tr > th.warning,
-.table > tfoot > tr > th.warning,
-.table > thead > tr.warning > td,
-.table > tbody > tr.warning > td,
-.table > tfoot > tr.warning > td,
-.table > thead > tr.warning > th,
-.table > tbody > tr.warning > th,
-.table > tfoot > tr.warning > th {
-  background-color: #fcf8e3;
-}
-.table-hover > tbody > tr > td.warning:hover,
-.table-hover > tbody > tr > th.warning:hover,
-.table-hover > tbody > tr.warning:hover > td,
-.table-hover > tbody > tr:hover > .warning,
-.table-hover > tbody > tr.warning:hover > th {
-  background-color: #faf2cc;
-}
-.table > thead > tr > td.danger,
-.table > tbody > tr > td.danger,
-.table > tfoot > tr > td.danger,
-.table > thead > tr > th.danger,
-.table > tbody > tr > th.danger,
-.table > tfoot > tr > th.danger,
-.table > thead > tr.danger > td,
-.table > tbody > tr.danger > td,
-.table > tfoot > tr.danger > td,
-.table > thead > tr.danger > th,
-.table > tbody > tr.danger > th,
-.table > tfoot > tr.danger > th {
-  background-color: #f2dede;
-}
-.table-hover > tbody > tr > td.danger:hover,
-.table-hover > tbody > tr > th.danger:hover,
-.table-hover > tbody > tr.danger:hover > td,
-.table-hover > tbody > tr:hover > .danger,
-.table-hover > tbody > tr.danger:hover > th {
-  background-color: #ebcccc;
-}
-.table-responsive {
-  min-height: .01%;
-  overflow-x: auto;
-}
-@media screen and (max-width: 767px) {
-  .table-responsive {
-    width: 100%;
-    margin-bottom: 15px;
-    overflow-y: hidden;
-    -ms-overflow-style: -ms-autohiding-scrollbar;
-    border: 1px solid #ddd;
-  }
-  .table-responsive > .table {
-    margin-bottom: 0;
-  }
-  .table-responsive > .table > thead > tr > th,
-  .table-responsive > .table > tbody > tr > th,
-  .table-responsive > .table > tfoot > tr > th,
-  .table-responsive > .table > thead > tr > td,
-  .table-responsive > .table > tbody > tr > td,
-  .table-responsive > .table > tfoot > tr > td {
-    white-space: nowrap;
-  }
-  .table-responsive > .table-bordered {
-    border: 0;
-  }
-  .table-responsive > .table-bordered > thead > tr > th:first-child,
-  .table-responsive > .table-bordered > tbody > tr > th:first-child,
-  .table-responsive > .table-bordered > tfoot > tr > th:first-child,
-  .table-responsive > .table-bordered > thead > tr > td:first-child,
-  .table-responsive > .table-bordered > tbody > tr > td:first-child,
-  .table-responsive > .table-bordered > tfoot > tr > td:first-child {
-    border-left: 0;
-  }
-  .table-responsive > .table-bordered > thead > tr > th:last-child,
-  .table-responsive > .table-bordered > tbody > tr > th:last-child,
-  .table-responsive > .table-bordered > tfoot > tr > th:last-child,
-  .table-responsive > .table-bordered > thead > tr > td:last-child,
-  .table-responsive > .table-bordered > tbody > tr > td:last-child,
-  .table-responsive > .table-bordered > tfoot > tr > td:last-child {
-    border-right: 0;
-  }
-  .table-responsive > .table-bordered > tbody > tr:last-child > th,
-  .table-responsive > .table-bordered > tfoot > tr:last-child > th,
-  .table-responsive > .table-bordered > tbody > tr:last-child > td,
-  .table-responsive > .table-bordered > tfoot > tr:last-child > td {
-    border-bottom: 0;
-  }
-}
-fieldset {
-  min-width: 0;
-  padding: 0;
-  margin: 0;
-  border: 0;
-}
-legend {
-  display: block;
-  width: 100%;
-  padding: 0;
-  margin-bottom: 20px;
-  font-size: 21px;
-  line-height: inherit;
-  color: #333;
-  border: 0;
-  border-bottom: 1px solid #e5e5e5;
-}
-label {
-  display: inline-block;
-  max-width: 100%;
-  margin-bottom: 5px;
-  font-weight: bold;
-}
-input[type="search"] {
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
-}
-input[type="radio"],
-input[type="checkbox"] {
-  margin: 4px 0 0;
-  margin-top: 1px \9;
-  line-height: normal;
-}
-input[type="file"] {
-  display: block;
-}
-input[type="range"] {
-  display: block;
-  width: 100%;
-}
-select[multiple],
-select[size] {
-  height: auto;
-}
-input[type="file"]:focus,
-input[type="radio"]:focus,
-input[type="checkbox"]:focus {
-  outline: 5px auto -webkit-focus-ring-color;
-  outline-offset: -2px;
-}
-output {
-  display: block;
-  padding-top: 7px;
-  font-size: 14px;
-  line-height: 1.42857143;
-  color: #555;
-}
-.form-control {
-  display: block;
-  width: 100%;
-  height: 34px;
-  padding: 6px 12px;
-  font-size: 14px;
-  line-height: 1.42857143;
-  color: #555;
-  background-color: #fff;
-  background-image: none;
-  border: 1px solid #ccc;
-  border-radius: 4px;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
-  -webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
-       -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
-          transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
-}
-.form-control:focus {
-  border-color: #66afe9;
-  outline: 0;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6);
-          box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6);
-}
-.form-control::-moz-placeholder {
-  color: #999;
-  opacity: 1;
-}
-.form-control:-ms-input-placeholder {
-  color: #999;
-}
-.form-control::-webkit-input-placeholder {
-  color: #999;
-}
-.form-control::-ms-expand {
-  background-color: transparent;
-  border: 0;
-}
-.form-control[disabled],
-.form-control[readonly],
-fieldset[disabled] .form-control {
-  background-color: #eee;
-  opacity: 1;
-}
-.form-control[disabled],
-fieldset[disabled] .form-control {
-  cursor: not-allowed;
-}
-textarea.form-control {
-  height: auto;
-}
-input[type="search"] {
-  -webkit-appearance: none;
-}
-@media screen and (-webkit-min-device-pixel-ratio: 0) {
-  input[type="date"].form-control,
-  input[type="time"].form-control,
-  input[type="datetime-local"].form-control,
-  input[type="month"].form-control {
-    line-height: 34px;
-  }
-  input[type="date"].input-sm,
-  input[type="time"].input-sm,
-  input[type="datetime-local"].input-sm,
-  input[type="month"].input-sm,
-  .input-group-sm input[type="date"],
-  .input-group-sm input[type="time"],
-  .input-group-sm input[type="datetime-local"],
-  .input-group-sm input[type="month"] {
-    line-height: 30px;
-  }
-  input[type="date"].input-lg,
-  input[type="time"].input-lg,
-  input[type="datetime-local"].input-lg,
-  input[type="month"].input-lg,
-  .input-group-lg input[type="date"],
-  .input-group-lg input[type="time"],
-  .input-group-lg input[type="datetime-local"],
-  .input-group-lg input[type="month"] {
-    line-height: 46px;
-  }
-}
-.form-group {
-  margin-bottom: 15px;
-}
-.radio,
-.checkbox {
-  position: relative;
-  display: block;
-  margin-top: 10px;
-  margin-bottom: 10px;
-}
-.radio label,
-.checkbox label {
-  min-height: 20px;
-  padding-left: 20px;
-  margin-bottom: 0;
-  font-weight: normal;
-  cursor: pointer;
-}
-.radio input[type="radio"],
-.radio-inline input[type="radio"],
-.checkbox input[type="checkbox"],
-.checkbox-inline input[type="checkbox"] {
-  position: absolute;
-  margin-top: 4px \9;
-  margin-left: -20px;
-}
-.radio + .radio,
-.checkbox + .checkbox {
-  margin-top: -5px;
-}
-.radio-inline,
-.checkbox-inline {
-  position: relative;
-  display: inline-block;
-  padding-left: 20px;
-  margin-bottom: 0;
-  font-weight: normal;
-  vertical-align: middle;
-  cursor: pointer;
-}
-.radio-inline + .radio-inline,
-.checkbox-inline + .checkbox-inline {
-  margin-top: 0;
-  margin-left: 10px;
-}
-input[type="radio"][disabled],
-input[type="checkbox"][disabled],
-input[type="radio"].disabled,
-input[type="checkbox"].disabled,
-fieldset[disabled] input[type="radio"],
-fieldset[disabled] input[type="checkbox"] {
-  cursor: not-allowed;
-}
-.radio-inline.disabled,
-.checkbox-inline.disabled,
-fieldset[disabled] .radio-inline,
-fieldset[disabled] .checkbox-inline {
-  cursor: not-allowed;
-}
-.radio.disabled label,
-.checkbox.disabled label,
-fieldset[disabled] .radio label,
-fieldset[disabled] .checkbox label {
-  cursor: not-allowed;
-}
-.form-control-static {
-  min-height: 34px;
-  padding-top: 7px;
-  padding-bottom: 7px;
-  margin-bottom: 0;
-}
-.form-control-static.input-lg,
-.form-control-static.input-sm {
-  padding-right: 0;
-  padding-left: 0;
-}
-.input-sm {
-  height: 30px;
-  padding: 5px 10px;
-  font-size: 12px;
-  line-height: 1.5;
-  border-radius: 3px;
-}
-select.input-sm {
-  height: 30px;
-  line-height: 30px;
-}
-textarea.input-sm,
-select[multiple].input-sm {
-  height: auto;
-}
-.form-group-sm .form-control {
-  height: 30px;
-  padding: 5px 10px;
-  font-size: 12px;
-  line-height: 1.5;
-  border-radius: 3px;
-}
-.form-group-sm select.form-control {
-  height: 30px;
-  line-height: 30px;
-}
-.form-group-sm textarea.form-control,
-.form-group-sm select[multiple].form-control {
-  height: auto;
-}
-.form-group-sm .form-control-static {
-  height: 30px;
-  min-height: 32px;
-  padding: 6px 10px;
-  font-size: 12px;
-  line-height: 1.5;
-}
-.input-lg {
-  height: 46px;
-  padding: 10px 16px;
-  font-size: 18px;
-  line-height: 1.3333333;
-  border-radius: 6px;
-}
-select.input-lg {
-  height: 46px;
-  line-height: 46px;
-}
-textarea.input-lg,
-select[multiple].input-lg {
-  height: auto;
-}
-.form-group-lg .form-control {
-  height: 46px;
-  padding: 10px 16px;
-  font-size: 18px;
-  line-height: 1.3333333;
-  border-radius: 6px;
-}
-.form-group-lg select.form-control {
-  height: 46px;
-  line-height: 46px;
-}
-.form-group-lg textarea.form-control,
-.form-group-lg select[multiple].form-control {
-  height: auto;
-}
-.form-group-lg .form-control-static {
-  height: 46px;
-  min-height: 38px;
-  padding: 11px 16px;
-  font-size: 18px;
-  line-height: 1.3333333;
-}
-.has-feedback {
-  position: relative;
-}
-.has-feedback .form-control {
-  padding-right: 42.5px;
-}
-.form-control-feedback {
-  position: absolute;
-  top: 0;
-  right: 0;
-  z-index: 2;
-  display: block;
-  width: 34px;
-  height: 34px;
-  line-height: 34px;
-  text-align: center;
-  pointer-events: none;
-}
-.input-lg + .form-control-feedback,
-.input-group-lg + .form-control-feedback,
-.form-group-lg .form-control + .form-control-feedback {
-  width: 46px;
-  height: 46px;
-  line-height: 46px;
-}
-.input-sm + .form-control-feedback,
-.input-group-sm + .form-control-feedback,
-.form-group-sm .form-control + .form-control-feedback {
-  width: 30px;
-  height: 30px;
-  line-height: 30px;
-}
-.has-success .help-block,
-.has-success .control-label,
-.has-success .radio,
-.has-success .checkbox,
-.has-success .radio-inline,
-.has-success .checkbox-inline,
-.has-success.radio label,
-.has-success.checkbox label,
-.has-success.radio-inline label,
-.has-success.checkbox-inline label {
-  color: #3c763d;
-}
-.has-success .form-control {
-  border-color: #3c763d;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
-}
-.has-success .form-control:focus {
-  border-color: #2b542c;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #67b168;
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #67b168;
-}
-.has-success .input-group-addon {
-  color: #3c763d;
-  background-color: #dff0d8;
-  border-color: #3c763d;
-}
-.has-success .form-control-feedback {
-  color: #3c763d;
-}
-.has-warning .help-block,
-.has-warning .control-label,
-.has-warning .radio,
-.has-warning .checkbox,
-.has-warning .radio-inline,
-.has-warning .checkbox-inline,
-.has-warning.radio label,
-.has-warning.checkbox label,
-.has-warning.radio-inline label,
-.has-warning.checkbox-inline label {
-  color: #8a6d3b;
-}
-.has-warning .form-control {
-  border-color: #8a6d3b;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
-}
-.has-warning .form-control:focus {
-  border-color: #66512c;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #c0a16b;
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #c0a16b;
-}
-.has-warning .input-group-addon {
-  color: #8a6d3b;
-  background-color: #fcf8e3;
-  border-color: #8a6d3b;
-}
-.has-warning .form-control-feedback {
-  color: #8a6d3b;
-}
-.has-error .help-block,
-.has-error .control-label,
-.has-error .radio,
-.has-error .checkbox,
-.has-error .radio-inline,
-.has-error .checkbox-inline,
-.has-error.radio label,
-.has-error.checkbox label,
-.has-error.radio-inline label,
-.has-error.checkbox-inline label {
-  color: #a94442;
-}
-.has-error .form-control {
-  border-color: #a94442;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
-}
-.has-error .form-control:focus {
-  border-color: #843534;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #ce8483;
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #ce8483;
-}
-.has-error .input-group-addon {
-  color: #a94442;
-  background-color: #f2dede;
-  border-color: #a94442;
-}
-.has-error .form-control-feedback {
-  color: #a94442;
-}
-.has-feedback label ~ .form-control-feedback {
-  top: 25px;
-}
-.has-feedback label.sr-only ~ .form-control-feedback {
-  top: 0;
-}
-.help-block {
-  display: block;
-  margin-top: 5px;
-  margin-bottom: 10px;
-  color: #737373;
-}
-@media (min-width: 768px) {
-  .form-inline .form-group {
-    display: inline-block;
-    margin-bottom: 0;
-    vertical-align: middle;
-  }
-  .form-inline .form-control {
-    display: inline-block;
-    width: auto;
-    vertical-align: middle;
-  }
-  .form-inline .form-control-static {
-    display: inline-block;
-  }
-  .form-inline .input-group {
-    display: inline-table;
-    vertical-align: middle;
-  }
-  .form-inline .input-group .input-group-addon,
-  .form-inline .input-group .input-group-btn,
-  .form-inline .input-group .form-control {
-    width: auto;
-  }
-  .form-inline .input-group > .form-control {
-    width: 100%;
-  }
-  .form-inline .control-label {
-    margin-bottom: 0;
-    vertical-align: middle;
-  }
-  .form-inline .radio,
-  .form-inline .checkbox {
-    display: inline-block;
-    margin-top: 0;
-    margin-bottom: 0;
-    vertical-align: middle;
-  }
-  .form-inline .radio label,
-  .form-inline .checkbox label {
-    padding-left: 0;
-  }
-  .form-inline .radio input[type="radio"],
-  .form-inline .checkbox input[type="checkbox"] {
-    position: relative;
-    margin-left: 0;
-  }
-  .form-inline .has-feedback .form-control-feedback {
-    top: 0;
-  }
-}
-.form-horizontal .radio,
-.form-horizontal .checkbox,
-.form-horizontal .radio-inline,
-.form-horizontal .checkbox-inline {
-  padding-top: 7px;
-  margin-top: 0;
-  margin-bottom: 0;
-}
-.form-horizontal .radio,
-.form-horizontal .checkbox {
-  min-height: 27px;
-}
-.form-horizontal .form-group {
-  margin-right: -15px;
-  margin-left: -15px;
-}
-@media (min-width: 768px) {
-  .form-horizontal .control-label {
-    padding-top: 7px;
-    margin-bottom: 0;
-    text-align: right;
-  }
-}
-.form-horizontal .has-feedback .form-control-feedback {
-  right: 15px;
-}
-@media (min-width: 768px) {
-  .form-horizontal .form-group-lg .control-label {
-    padding-top: 11px;
-    font-size: 18px;
-  }
-}
-@media (min-width: 768px) {
-  .form-horizontal .form-group-sm .control-label {
-    padding-top: 6px;
-    font-size: 12px;
-  }
-}
-.btn {
-  display: inline-block;
-  padding: 6px 12px;
-  margin-bottom: 0;
-  font-size: 14px;
-  font-weight: normal;
-  line-height: 1.42857143;
-  text-align: center;
-  white-space: nowrap;
-  vertical-align: middle;
-  -ms-touch-action: manipulation;
-      touch-action: manipulation;
-  cursor: pointer;
-  -webkit-user-select: none;
-     -moz-user-select: none;
-      -ms-user-select: none;
-          user-select: none;
-  background-image: none;
-  border: 1px solid transparent;
-  border-radius: 4px;
-}
-.btn:focus,
-.btn:active:focus,
-.btn.active:focus,
-.btn.focus,
-.btn:active.focus,
-.btn.active.focus {
-  outline: 5px auto -webkit-focus-ring-color;
-  outline-offset: -2px;
-}
-.btn:hover,
-.btn:focus,
-.btn.focus {
-  color: #333;
-  text-decoration: none;
-}
-.btn:active,
-.btn.active {
-  background-image: none;
-  outline: 0;
-  -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
-          box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
-}
-.btn.disabled,
-.btn[disabled],
-fieldset[disabled] .btn {
-  cursor: not-allowed;
-  filter: alpha(opacity=65);
-  -webkit-box-shadow: none;
-          box-shadow: none;
-  opacity: .65;
-}
-a.btn.disabled,
-fieldset[disabled] a.btn {
-  pointer-events: none;
-}
-.btn-default {
-  color: #333;
-  background-color: #fff;
-  border-color: #ccc;
-}
-.btn-default:focus,
-.btn-default.focus {
-  color: #333;
-  background-color: #e6e6e6;
-  border-color: #8c8c8c;
-}
-.btn-default:hover {
-  color: #333;
-  background-color: #e6e6e6;
-  border-color: #adadad;
-}
-.btn-default:active,
-.btn-default.active,
-.open > .dropdown-toggle.btn-default {
-  color: #333;
-  background-color: #e6e6e6;
-  border-color: #adadad;
-}
-.btn-default:active:hover,
-.btn-default.active:hover,
-.open > .dropdown-toggle.btn-default:hover,
-.btn-default:active:focus,
-.btn-default.active:focus,
-.open > .dropdown-toggle.btn-default:focus,
-.btn-default:active.focus,
-.btn-default.active.focus,
-.open > .dropdown-toggle.btn-default.focus {
-  color: #333;
-  background-color: #d4d4d4;
-  border-color: #8c8c8c;
-}
-.btn-default:active,
-.btn-default.active,
-.open > .dropdown-toggle.btn-default {
-  background-image: none;
-}
-.btn-default.disabled:hover,
-.btn-default[disabled]:hover,
-fieldset[disabled] .btn-default:hover,
-.btn-default.disabled:focus,
-.btn-default[disabled]:focus,
-fieldset[disabled] .btn-default:focus,
-.btn-default.disabled.focus,
-.btn-default[disabled].focus,
-fieldset[disabled] .btn-default.focus {
-  background-color: #fff;
-  border-color: #ccc;
-}
-.btn-default .badge {
-  color: #fff;
-  background-color: #333;
-}
-.btn-primary {
-  color: #fff;
-  background-color: #337ab7;
-  border-color: #2e6da4;
-}
-.btn-primary:focus,
-.btn-primary.focus {
-  color: #fff;
-  background-color: #286090;
-  border-color: #122b40;
-}
-.btn-primary:hover {
-  color: #fff;
-  background-color: #286090;
-  border-color: #204d74;
-}
-.btn-primary:active,
-.btn-primary.active,
-.open > .dropdown-toggle.btn-primary {
-  color: #fff;
-  background-color: #286090;
-  border-color: #204d74;
-}
-.btn-primary:active:hover,
-.btn-primary.active:hover,
-.open > .dropdown-toggle.btn-primary:hover,
-.btn-primary:active:focus,
-.btn-primary.active:focus,
-.open > .dropdown-toggle.btn-primary:focus,
-.btn-primary:active.focus,
-.btn-primary.active.focus,
-.open > .dropdown-toggle.btn-primary.focus {
-  color: #fff;
-  background-color: #204d74;
-  border-color: #122b40;
-}
-.btn-primary:active,
-.btn-primary.active,
-.open > .dropdown-toggle.btn-primary {
-  background-image: none;
-}
-.btn-primary.disabled:hover,
-.btn-primary[disabled]:hover,
-fieldset[disabled] .btn-primary:hover,
-.btn-primary.disabled:focus,
-.btn-primary[disabled]:focus,
-fieldset[disabled] .btn-primary:focus,
-.btn-primary.disabled.focus,
-.btn-primary[disabled].focus,
-fieldset[disabled] .btn-primary.focus {
-  background-color: #337ab7;
-  border-color: #2e6da4;
-}
-.btn-primary .badge {
-  color: #337ab7;
-  background-color: #fff;
-}
-.btn-success {
-  color: #fff;
-  background-color: #5cb85c;
-  border-color: #4cae4c;
-}
-.btn-success:focus,
-.btn-success.focus {
-  color: #fff;
-  background-color: #449d44;
-  border-color: #255625;
-}
-.btn-success:hover {
-  color: #fff;
-  background-color: #449d44;
-  border-color: #398439;
-}
-.btn-success:active,
-.btn-success.active,
-.open > .dropdown-toggle.btn-success {
-  color: #fff;
-  background-color: #449d44;
-  border-color: #398439;
-}
-.btn-success:active:hover,
-.btn-success.active:hover,
-.open > .dropdown-toggle.btn-success:hover,
-.btn-success:active:focus,
-.btn-success.active:focus,
-.open > .dropdown-toggle.btn-success:focus,
-.btn-success:active.focus,
-.btn-success.active.focus,
-.open > .dropdown-toggle.btn-success.focus {
-  color: #fff;
-  background-color: #398439;
-  border-color: #255625;
-}
-.btn-success:active,
-.btn-success.active,
-.open > .dropdown-toggle.btn-success {
-  background-image: none;
-}
-.btn-success.disabled:hover,
-.btn-success[disabled]:hover,
-fieldset[disabled] .btn-success:hover,
-.btn-success.disabled:focus,
-.btn-success[disabled]:focus,
-fieldset[disabled] .btn-success:focus,
-.btn-success.disabled.focus,
-.btn-success[disabled].focus,
-fieldset[disabled] .btn-success.focus {
-  background-color: #5cb85c;
-  border-color: #4cae4c;
-}
-.btn-success .badge {
-  color: #5cb85c;
-  background-color: #fff;
-}
-.btn-info {
-  color: #fff;
-  background-color: #5bc0de;
-  border-color: #46b8da;
-}
-.btn-info:focus,
-.btn-info.focus {
-  color: #fff;
-  background-color: #31b0d5;
-  border-color: #1b6d85;
-}
-.btn-info:hover {
-  color: #fff;
-  background-color: #31b0d5;
-  border-color: #269abc;
-}
-.btn-info:active,
-.btn-info.active,
-.open > .dropdown-toggle.btn-info {
-  color: #fff;
-  background-color: #31b0d5;
-  border-color: #269abc;
-}
-.btn-info:active:hover,
-.btn-info.active:hover,
-.open > .dropdown-toggle.btn-info:hover,
-.btn-info:active:focus,
-.btn-info.active:focus,
-.open > .dropdown-toggle.btn-info:focus,
-.btn-info:active.focus,
-.btn-info.active.focus,
-.open > .dropdown-toggle.btn-info.focus {
-  color: #fff;
-  background-color: #269abc;
-  border-color: #1b6d85;
-}
-.btn-info:active,
-.btn-info.active,
-.open > .dropdown-toggle.btn-info {
-  background-image: none;
-}
-.btn-info.disabled:hover,
-.btn-info[disabled]:hover,
-fieldset[disabled] .btn-info:hover,
-.btn-info.disabled:focus,
-.btn-info[disabled]:focus,
-fieldset[disabled] .btn-info:focus,
-.btn-info.disabled.focus,
-.btn-info[disabled].focus,
-fieldset[disabled] .btn-info.focus {
-  background-color: #5bc0de;
-  border-color: #46b8da;
-}
-.btn-info .badge {
-  color: #5bc0de;
-  background-color: #fff;
-}
-.btn-warning {
-  color: #fff;
-  background-color: #f0ad4e;
-  border-color: #eea236;
-}
-.btn-warning:focus,
-.btn-warning.focus {
-  color: #fff;
-  background-color: #ec971f;
-  border-color: #985f0d;
-}
-.btn-warning:hover {
-  color: #fff;
-  background-color: #ec971f;
-  border-color: #d58512;
-}
-.btn-warning:active,
-.btn-warning.active,
-.open > .dropdown-toggle.btn-warning {
-  color: #fff;
-  background-color: #ec971f;
-  border-color: #d58512;
-}
-.btn-warning:active:hover,
-.btn-warning.active:hover,
-.open > .dropdown-toggle.btn-warning:hover,
-.btn-warning:active:focus,
-.btn-warning.active:focus,
-.open > .dropdown-toggle.btn-warning:focus,
-.btn-warning:active.focus,
-.btn-warning.active.focus,
-.open > .dropdown-toggle.btn-warning.focus {
-  color: #fff;
-  background-color: #d58512;
-  border-color: #985f0d;
-}
-.btn-warning:active,
-.btn-warning.active,
-.open > .dropdown-toggle.btn-warning {
-  background-image: none;
-}
-.btn-warning.disabled:hover,
-.btn-warning[disabled]:hover,
-fieldset[disabled] .btn-warning:hover,
-.btn-warning.disabled:focus,
-.btn-warning[disabled]:focus,
-fieldset[disabled] .btn-warning:focus,
-.btn-warning.disabled.focus,
-.btn-warning[disabled].focus,
-fieldset[disabled] .btn-warning.focus {
-  background-color: #f0ad4e;
-  border-color: #eea236;
-}
-.btn-warning .badge {
-  color: #f0ad4e;
-  background-color: #fff;
-}
-.btn-danger {
-  color: #fff;
-  background-color: #d9534f;
-  border-color: #d43f3a;
-}
-.btn-danger:focus,
-.btn-danger.focus {
-  color: #fff;
-  background-color: #c9302c;
-  border-color: #761c19;
-}
-.btn-danger:hover {
-  color: #fff;
-  background-color: #c9302c;
-  border-color: #ac2925;
-}
-.btn-danger:active,
-.btn-danger.active,
-.open > .dropdown-toggle.btn-danger {
-  color: #fff;
-  background-color: #c9302c;
-  border-color: #ac2925;
-}
-.btn-danger:active:hover,
-.btn-danger.active:hover,
-.open > .dropdown-toggle.btn-danger:hover,
-.btn-danger:active:focus,
-.btn-danger.active:focus,
-.open > .dropdown-toggle.btn-danger:focus,
-.btn-danger:active.focus,
-.btn-danger.active.focus,
-.open > .dropdown-toggle.btn-danger.focus {
-  color: #fff;
-  background-color: #ac2925;
-  border-color: #761c19;
-}
-.btn-danger:active,
-.btn-danger.active,
-.open > .dropdown-toggle.btn-danger {
-  background-image: none;
-}
-.btn-danger.disabled:hover,
-.btn-danger[disabled]:hover,
-fieldset[disabled] .btn-danger:hover,
-.btn-danger.disabled:focus,
-.btn-danger[disabled]:focus,
-fieldset[disabled] .btn-danger:focus,
-.btn-danger.disabled.focus,
-.btn-danger[disabled].focus,
-fieldset[disabled] .btn-danger.focus {
-  background-color: #d9534f;
-  border-color: #d43f3a;
-}
-.btn-danger .badge {
-  color: #d9534f;
-  background-color: #fff;
-}
-.btn-link {
-  font-weight: normal;
-  color: #337ab7;
-  border-radius: 0;
-}
-.btn-link,
-.btn-link:active,
-.btn-link.active,
-.btn-link[disabled],
-fieldset[disabled] .btn-link {
-  background-color: transparent;
-  -webkit-box-shadow: none;
-          box-shadow: none;
-}
-.btn-link,
-.btn-link:hover,
-.btn-link:focus,
-.btn-link:active {
-  border-color: transparent;
-}
-.btn-link:hover,
-.btn-link:focus {
-  color: #23527c;
-  text-decoration: underline;
-  background-color: transparent;
-}
-.btn-link[disabled]:hover,
-fieldset[disabled] .btn-link:hover,
-.btn-link[disabled]:focus,
-fieldset[disabled] .btn-link:focus {
-  color: #777;
-  text-decoration: none;
-}
-.btn-lg,
-.btn-group-lg > .btn {
-  padding: 10px 16px;
-  font-size: 18px;
-  line-height: 1.3333333;
-  border-radius: 6px;
-}
-.btn-sm,
-.btn-group-sm > .btn {
-  padding: 5px 10px;
-  font-size: 12px;
-  line-height: 1.5;
-  border-radius: 3px;
-}
-.btn-xs,
-.btn-group-xs > .btn {
-  padding: 1px 5px;
-  font-size: 12px;
-  line-height: 1.5;
-  border-radius: 3px;
-}
-.btn-block {
-  display: block;
-  width: 100%;
-}
-.btn-block + .btn-block {
-  margin-top: 5px;
-}
-input[type="submit"].btn-block,
-input[type="reset"].btn-block,
-input[type="button"].btn-block {
-  width: 100%;
-}
-.fade {
-  opacity: 0;
-  -webkit-transition: opacity .15s linear;
-       -o-transition: opacity .15s linear;
-          transition: opacity .15s linear;
-}
-.fade.in {
-  opacity: 1;
-}
-.collapse {
-  display: none;
-}
-.collapse.in {
-  display: block;
-}
-tr.collapse.in {
-  display: table-row;
-}
-tbody.collapse.in {
-  display: table-row-group;
-}
-.collapsing {
-  position: relative;
-  height: 0;
-  overflow: hidden;
-  -webkit-transition-timing-function: ease;
-       -o-transition-timing-function: ease;
-          transition-timing-function: ease;
-  -webkit-transition-duration: .35s;
-       -o-transition-duration: .35s;
-          transition-duration: .35s;
-  -webkit-transition-property: height, visibility;
-       -o-transition-property: height, visibility;
-          transition-property: height, visibility;
-}
-.caret {
-  display: inline-block;
-  width: 0;
-  height: 0;
-  margin-left: 2px;
-  vertical-align: middle;
-  border-top: 4px dashed;
-  border-top: 4px solid \9;
-  border-right: 4px solid transparent;
-  border-left: 4px solid transparent;
-}
-.dropup,
-.dropdown {
-  position: relative;
-}
-.dropdown-toggle:focus {
-  outline: 0;
-}
-.dropdown-menu {
-  position: absolute;
-  top: 100%;
-  left: 0;
-  z-index: 1000;
-  display: none;
-  float: left;
-  min-width: 160px;
-  padding: 5px 0;
-  margin: 2px 0 0;
-  font-size: 14px;
-  text-align: left;
-  list-style: none;
-  background-color: #fff;
-  -webkit-background-clip: padding-box;
-          background-clip: padding-box;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0, 0, 0, .15);
-  border-radius: 4px;
-  -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
-          box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
-}
-.dropdown-menu.pull-right {
-  right: 0;
-  left: auto;
-}
-.dropdown-menu .divider {
-  height: 1px;
-  margin: 9px 0;
-  overflow: hidden;
-  background-color: #e5e5e5;
-}
-.dropdown-menu > li > a {
-  display: block;
-  padding: 3px 20px;
-  clear: both;
-  font-weight: normal;
-  line-height: 1.42857143;
-  color: #333;
-  white-space: nowrap;
-}
-.dropdown-menu > li > a:hover,
-.dropdown-menu > li > a:focus {
-  color: #262626;
-  text-decoration: none;
-  background-color: #f5f5f5;
-}
-.dropdown-menu > .active > a,
-.dropdown-menu > .active > a:hover,
-.dropdown-menu > .active > a:focus {
-  color: #fff;
-  text-decoration: none;
-  background-color: #337ab7;
-  outline: 0;
-}
-.dropdown-menu > .disabled > a,
-.dropdown-menu > .disabled > a:hover,
-.dropdown-menu > .disabled > a:focus {
-  color: #777;
-}
-.dropdown-menu > .disabled > a:hover,
-.dropdown-menu > .disabled > a:focus {
-  text-decoration: none;
-  cursor: not-allowed;
-  background-color: transparent;
-  background-image: none;
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-}
-.open > .dropdown-menu {
-  display: block;
-}
-.open > a {
-  outline: 0;
-}
-.dropdown-menu-right {
-  right: 0;
-  left: auto;
-}
-.dropdown-menu-left {
-  right: auto;
-  left: 0;
-}
-.dropdown-header {
-  display: block;
-  padding: 3px 20px;
-  font-size: 12px;
-  line-height: 1.42857143;
-  color: #777;
-  white-space: nowrap;
-}
-.dropdown-backdrop {
-  position: fixed;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 990;
-}
-.pull-right > .dropdown-menu {
-  right: 0;
-  left: auto;
-}
-.dropup .caret,
-.navbar-fixed-bottom .dropdown .caret {
-  content: "";
-  border-top: 0;
-  border-bottom: 4px dashed;
-  border-bottom: 4px solid \9;
-}
-.dropup .dropdown-menu,
-.navbar-fixed-bottom .dropdown .dropdown-menu {
-  top: auto;
-  bottom: 100%;
-  margin-bottom: 2px;
-}
-@media (min-width: 768px) {
-  .navbar-right .dropdown-menu {
-    right: 0;
-    left: auto;
-  }
-  .navbar-right .dropdown-menu-left {
-    right: auto;
-    left: 0;
-  }
-}
-.btn-group,
-.btn-group-vertical {
-  position: relative;
-  display: inline-block;
-  vertical-align: middle;
-}
-.btn-group > .btn,
-.btn-group-vertical > .btn {
-  position: relative;
-  float: left;
-}
-.btn-group > .btn:hover,
-.btn-group-vertical > .btn:hover,
-.btn-group > .btn:focus,
-.btn-group-vertical > .btn:focus,
-.btn-group > .btn:active,
-.btn-group-vertical > .btn:active,
-.btn-group > .btn.active,
-.btn-group-vertical > .btn.active {
-  z-index: 2;
-}
-.btn-group .btn + .btn,
-.btn-group .btn + .btn-group,
-.btn-group .btn-group + .btn,
-.btn-group .btn-group + .btn-group {
-  margin-left: -1px;
-}
-.btn-toolbar {
-  margin-left: -5px;
-}
-.btn-toolbar .btn,
-.btn-toolbar .btn-group,
-.btn-toolbar .input-group {
-  float: left;
-}
-.btn-toolbar > .btn,
-.btn-toolbar > .btn-group,
-.btn-toolbar > .input-group {
-  margin-left: 5px;
-}
-.btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {
-  border-radius: 0;
-}
-.btn-group > .btn:first-child {
-  margin-left: 0;
-}
-.btn-group > .btn:first-child:not(:last-child):not(.dropdown-toggle) {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-}
-.btn-group > .btn:last-child:not(:first-child),
-.btn-group > .dropdown-toggle:not(:first-child) {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-}
-.btn-group > .btn-group {
-  float: left;
-}
-.btn-group > .btn-group:not(:first-child):not(:last-child) > .btn {
-  border-radius: 0;
-}
-.btn-group > .btn-group:first-child:not(:last-child) > .btn:last-child,
-.btn-group > .btn-group:first-child:not(:last-child) > .dropdown-toggle {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-}
-.btn-group > .btn-group:last-child:not(:first-child) > .btn:first-child {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-}
-.btn-group .dropdown-toggle:active,
-.btn-group.open .dropdown-toggle {
-  outline: 0;
-}
-.btn-group > .btn + .dropdown-toggle {
-  padding-right: 8px;
-  padding-left: 8px;
-}
-.btn-group > .btn-lg + .dropdown-toggle {
-  padding-right: 12px;
-  padding-left: 12px;
-}
-.btn-group.open .dropdown-toggle {
-  -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
-          box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
-}
-.btn-group.open .dropdown-toggle.btn-link {
-  -webkit-box-shadow: none;
-          box-shadow: none;
-}
-.btn .caret {
-  margin-left: 0;
-}
-.btn-lg .caret {
-  border-width: 5px 5px 0;
-  border-bottom-width: 0;
-}
-.dropup .btn-lg .caret {
-  border-width: 0 5px 5px;
-}
-.btn-group-vertical > .btn,
-.btn-group-vertical > .btn-group,
-.btn-group-vertical > .btn-group > .btn {
-  display: block;
-  float: none;
-  width: 100%;
-  max-width: 100%;
-}
-.btn-group-vertical > .btn-group > .btn {
-  float: none;
-}
-.btn-group-vertical > .btn + .btn,
-.btn-group-vertical > .btn + .btn-group,
-.btn-group-vertical > .btn-group + .btn,
-.btn-group-vertical > .btn-group + .btn-group {
-  margin-top: -1px;
-  margin-left: 0;
-}
-.btn-group-vertical > .btn:not(:first-child):not(:last-child) {
-  border-radius: 0;
-}
-.btn-group-vertical > .btn:first-child:not(:last-child) {
-  border-top-left-radius: 4px;
-  border-top-right-radius: 4px;
-  border-bottom-right-radius: 0;
-  border-bottom-left-radius: 0;
-}
-.btn-group-vertical > .btn:last-child:not(:first-child) {
-  border-top-left-radius: 0;
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 4px;
-  border-bottom-left-radius: 4px;
-}
-.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
-  border-radius: 0;
-}
-.btn-group-vertical > .btn-group:first-child:not(:last-child) > .btn:last-child,
-.btn-group-vertical > .btn-group:first-child:not(:last-child) > .dropdown-toggle {
-  border-bottom-right-radius: 0;
-  border-bottom-left-radius: 0;
-}
-.btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child {
-  border-top-left-radius: 0;
-  border-top-right-radius: 0;
-}
-.btn-group-justified {
-  display: table;
-  width: 100%;
-  table-layout: fixed;
-  border-collapse: separate;
-}
-.btn-group-justified > .btn,
-.btn-group-justified > .btn-group {
-  display: table-cell;
-  float: none;
-  width: 1%;
-}
-.btn-group-justified > .btn-group .btn {
-  width: 100%;
-}
-.btn-group-justified > .btn-group .dropdown-menu {
-  left: auto;
-}
-[data-toggle="buttons"] > .btn input[type="radio"],
-[data-toggle="buttons"] > .btn-group > .btn input[type="radio"],
-[data-toggle="buttons"] > .btn input[type="checkbox"],
-[data-toggle="buttons"] > .btn-group > .btn input[type="checkbox"] {
-  position: absolute;
-  clip: rect(0, 0, 0, 0);
-  pointer-events: none;
-}
-.input-group {
-  position: relative;
-  display: table;
-  border-collapse: separate;
-}
-.input-group[class*="col-"] {
-  float: none;
-  padding-right: 0;
-  padding-left: 0;
-}
-.input-group .form-control {
-  position: relative;
-  z-index: 2;
-  float: left;
-  width: 100%;
-  margin-bottom: 0;
-}
-.input-group .form-control:focus {
-  z-index: 3;
-}
-.input-group-lg > .form-control,
-.input-group-lg > .input-group-addon,
-.input-group-lg > .input-group-btn > .btn {
-  height: 46px;
-  padding: 10px 16px;
-  font-size: 18px;
-  line-height: 1.3333333;
-  border-radius: 6px;
-}
-select.input-group-lg > .form-control,
-select.input-group-lg > .input-group-addon,
-select.input-group-lg > .input-group-btn > .btn {
-  height: 46px;
-  line-height: 46px;
-}
-textarea.input-group-lg > .form-control,
-textarea.input-group-lg > .input-group-addon,
-textarea.input-group-lg > .input-group-btn > .btn,
-select[multiple].input-group-lg > .form-control,
-select[multiple].input-group-lg > .input-group-addon,
-select[multiple].input-group-lg > .input-group-btn > .btn {
-  height: auto;
-}
-.input-group-sm > .form-control,
-.input-group-sm > .input-group-addon,
-.input-group-sm > .input-group-btn > .btn {
-  height: 30px;
-  padding: 5px 10px;
-  font-size: 12px;
-  line-height: 1.5;
-  border-radius: 3px;
-}
-select.input-group-sm > .form-control,
-select.input-group-sm > .input-group-addon,
-select.input-group-sm > .input-group-btn > .btn {
-  height: 30px;
-  line-height: 30px;
-}
-textarea.input-group-sm > .form-control,
-textarea.input-group-sm > .input-group-addon,
-textarea.input-group-sm > .input-group-btn > .btn,
-select[multiple].input-group-sm > .form-control,
-select[multiple].input-group-sm > .input-group-addon,
-select[multiple].input-group-sm > .input-group-btn > .btn {
-  height: auto;
-}
-.input-group-addon,
-.input-group-btn,
-.input-group .form-control {
-  display: table-cell;
-}
-.input-group-addon:not(:first-child):not(:last-child),
-.input-group-btn:not(:first-child):not(:last-child),
-.input-group .form-control:not(:first-child):not(:last-child) {
-  border-radius: 0;
-}
-.input-group-addon,
-.input-group-btn {
-  width: 1%;
-  white-space: nowrap;
-  vertical-align: middle;
-}
-.input-group-addon {
-  padding: 6px 12px;
-  font-size: 14px;
-  font-weight: normal;
-  line-height: 1;
-  color: #555;
-  text-align: center;
-  background-color: #eee;
-  border: 1px solid #ccc;
-  border-radius: 4px;
-}
-.input-group-addon.input-sm {
-  padding: 5px 10px;
-  font-size: 12px;
-  border-radius: 3px;
-}
-.input-group-addon.input-lg {
-  padding: 10px 16px;
-  font-size: 18px;
-  border-radius: 6px;
-}
-.input-group-addon input[type="radio"],
-.input-group-addon input[type="checkbox"] {
-  margin-top: 0;
-}
-.input-group .form-control:first-child,
-.input-group-addon:first-child,
-.input-group-btn:first-child > .btn,
-.input-group-btn:first-child > .btn-group > .btn,
-.input-group-btn:first-child > .dropdown-toggle,
-.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle),
-.input-group-btn:last-child > .btn-group:not(:last-child) > .btn {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-}
-.input-group-addon:first-child {
-  border-right: 0;
-}
-.input-group .form-control:last-child,
-.input-group-addon:last-child,
-.input-group-btn:last-child > .btn,
-.input-group-btn:last-child > .btn-group > .btn,
-.input-group-btn:last-child > .dropdown-toggle,
-.input-group-btn:first-child > .btn:not(:first-child),
-.input-group-btn:first-child > .btn-group:not(:first-child) > .btn {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-}
-.input-group-addon:last-child {
-  border-left: 0;
-}
-.input-group-btn {
-  position: relative;
-  font-size: 0;
-  white-space: nowrap;
-}
-.input-group-btn > .btn {
-  position: relative;
-}
-.input-group-btn > .btn + .btn {
-  margin-left: -1px;
-}
-.input-group-btn > .btn:hover,
-.input-group-btn > .btn:focus,
-.input-group-btn > .btn:active {
-  z-index: 2;
-}
-.input-group-btn:first-child > .btn,
-.input-group-btn:first-child > .btn-group {
-  margin-right: -1px;
-}
-.input-group-btn:last-child > .btn,
-.input-group-btn:last-child > .btn-group {
-  z-index: 2;
-  margin-left: -1px;
-}
-.nav {
-  padding-left: 0;
-  margin-bottom: 0;
-  list-style: none;
-}
-.nav > li {
-  position: relative;
-  display: block;
-}
-.nav > li > a {
-  position: relative;
-  display: block;
-  padding: 10px 15px;
-}
-.nav > li > a:hover,
-.nav > li > a:focus {
-  text-decoration: none;
-  background-color: #eee;
-}
-.nav > li.disabled > a {
-  color: #777;
-}
-.nav > li.disabled > a:hover,
-.nav > li.disabled > a:focus {
-  color: #777;
-  text-decoration: none;
-  cursor: not-allowed;
-  background-color: transparent;
-}
-.nav .open > a,
-.nav .open > a:hover,
-.nav .open > a:focus {
-  background-color: #eee;
-  border-color: #337ab7;
-}
-.nav .nav-divider {
-  height: 1px;
-  margin: 9px 0;
-  overflow: hidden;
-  background-color: #e5e5e5;
-}
-.nav > li > a > img {
-  max-width: none;
-}
-.nav-tabs {
-  border-bottom: 1px solid #ddd;
-}
-.nav-tabs > li {
-  float: left;
-  margin-bottom: -1px;
-}
-.nav-tabs > li > a {
-  margin-right: 2px;
-  line-height: 1.42857143;
-  border: 1px solid transparent;
-  border-radius: 4px 4px 0 0;
-}
-.nav-tabs > li > a:hover {
-  border-color: #eee #eee #ddd;
-}
-.nav-tabs > li.active > a,
-.nav-tabs > li.active > a:hover,
-.nav-tabs > li.active > a:focus {
-  color: #555;
-  cursor: default;
-  background-color: #fff;
-  border: 1px solid #ddd;
-  border-bottom-color: transparent;
-}
-.nav-tabs.nav-justified {
-  width: 100%;
-  border-bottom: 0;
-}
-.nav-tabs.nav-justified > li {
-  float: none;
-}
-.nav-tabs.nav-justified > li > a {
-  margin-bottom: 5px;
-  text-align: center;
-}
-.nav-tabs.nav-justified > .dropdown .dropdown-menu {
-  top: auto;
-  left: auto;
-}
-@media (min-width: 768px) {
-  .nav-tabs.nav-justified > li {
-    display: table-cell;
-    width: 1%;
-  }
-  .nav-tabs.nav-justified > li > a {
-    margin-bottom: 0;
-  }
-}
-.nav-tabs.nav-justified > li > a {
-  margin-right: 0;
-  border-radius: 4px;
-}
-.nav-tabs.nav-justified > .active > a,
-.nav-tabs.nav-justified > .active > a:hover,
-.nav-tabs.nav-justified > .active > a:focus {
-  border: 1px solid #ddd;
-}
-@media (min-width: 768px) {
-  .nav-tabs.nav-justified > li > a {
-    border-bottom: 1px solid #ddd;
-    border-radius: 4px 4px 0 0;
-  }
-  .nav-tabs.nav-justified > .active > a,
-  .nav-tabs.nav-justified > .active > a:hover,
-  .nav-tabs.nav-justified > .active > a:focus {
-    border-bottom-color: #fff;
-  }
-}
-.nav-pills > li {
-  float: left;
-}
-.nav-pills > li > a {
-  border-radius: 4px;
-}
-.nav-pills > li + li {
-  margin-left: 2px;
-}
-.nav-pills > li.active > a,
-.nav-pills > li.active > a:hover,
-.nav-pills > li.active > a:focus {
-  color: #fff;
-  background-color: #337ab7;
-}
-.nav-stacked > li {
-  float: none;
-}
-.nav-stacked > li + li {
-  margin-top: 2px;
-  margin-left: 0;
-}
-.nav-justified {
-  width: 100%;
-}
-.nav-justified > li {
-  float: none;
-}
-.nav-justified > li > a {
-  margin-bottom: 5px;
-  text-align: center;
-}
-.nav-justified > .dropdown .dropdown-menu {
-  top: auto;
-  left: auto;
-}
-@media (min-width: 768px) {
-  .nav-justified > li {
-    display: table-cell;
-    width: 1%;
-  }
-  .nav-justified > li > a {
-    margin-bottom: 0;
-  }
-}
-.nav-tabs-justified {
-  border-bottom: 0;
-}
-.nav-tabs-justified > li > a {
-  margin-right: 0;
-  border-radius: 4px;
-}
-.nav-tabs-justified > .active > a,
-.nav-tabs-justified > .active > a:hover,
-.nav-tabs-justified > .active > a:focus {
-  border: 1px solid #ddd;
-}
-@media (min-width: 768px) {
-  .nav-tabs-justified > li > a {
-    border-bottom: 1px solid #ddd;
-    border-radius: 4px 4px 0 0;
-  }
-  .nav-tabs-justified > .active > a,
-  .nav-tabs-justified > .active > a:hover,
-  .nav-tabs-justified > .active > a:focus {
-    border-bottom-color: #fff;
-  }
-}
-.tab-content > .tab-pane {
-  display: none;
-}
-.tab-content > .active {
-  display: block;
-}
-.nav-tabs .dropdown-menu {
-  margin-top: -1px;
-  border-top-left-radius: 0;
-  border-top-right-radius: 0;
-}
-.navbar {
-  position: relative;
-  min-height: 50px;
-  margin-bottom: 20px;
-  border: 1px solid transparent;
-}
-@media (min-width: 768px) {
-  .navbar {
-    border-radius: 4px;
-  }
-}
-@media (min-width: 768px) {
-  .navbar-header {
-    float: left;
-  }
-}
-.navbar-collapse {
-  padding-right: 15px;
-  padding-left: 15px;
-  overflow-x: visible;
-  -webkit-overflow-scrolling: touch;
-  border-top: 1px solid transparent;
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1);
-          box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1);
-}
-.navbar-collapse.in {
-  overflow-y: auto;
-}
-@media (min-width: 768px) {
-  .navbar-collapse {
-    width: auto;
-    border-top: 0;
-    -webkit-box-shadow: none;
-            box-shadow: none;
-  }
-  .navbar-collapse.collapse {
-    display: block !important;
-    height: auto !important;
-    padding-bottom: 0;
-    overflow: visible !important;
-  }
-  .navbar-collapse.in {
-    overflow-y: visible;
-  }
-  .navbar-fixed-top .navbar-collapse,
-  .navbar-static-top .navbar-collapse,
-  .navbar-fixed-bottom .navbar-collapse {
-    padding-right: 0;
-    padding-left: 0;
-  }
-}
-.navbar-fixed-top .navbar-collapse,
-.navbar-fixed-bottom .navbar-collapse {
-  max-height: 340px;
-}
-@media (max-device-width: 480px) and (orientation: landscape) {
-  .navbar-fixed-top .navbar-collapse,
-  .navbar-fixed-bottom .navbar-collapse {
-    max-height: 200px;
-  }
-}
-.container > .navbar-header,
-.container-fluid > .navbar-header,
-.container > .navbar-collapse,
-.container-fluid > .navbar-collapse {
-  margin-right: -15px;
-  margin-left: -15px;
-}
-@media (min-width: 768px) {
-  .container > .navbar-header,
-  .container-fluid > .navbar-header,
-  .container > .navbar-collapse,
-  .container-fluid > .navbar-collapse {
-    margin-right: 0;
-    margin-left: 0;
-  }
-}
-.navbar-static-top {
-  z-index: 1000;
-  border-width: 0 0 1px;
-}
-@media (min-width: 768px) {
-  .navbar-static-top {
-    border-radius: 0;
-  }
-}
-.navbar-fixed-top,
-.navbar-fixed-bottom {
-  position: fixed;
-  right: 0;
-  left: 0;
-  z-index: 1030;
-}
-@media (min-width: 768px) {
-  .navbar-fixed-top,
-  .navbar-fixed-bottom {
-    border-radius: 0;
-  }
-}
-.navbar-fixed-top {
-  top: 0;
-  border-width: 0 0 1px;
-}
-.navbar-fixed-bottom {
-  bottom: 0;
-  margin-bottom: 0;
-  border-width: 1px 0 0;
-}
-.navbar-brand {
-  float: left;
-  height: 50px;
-  padding: 15px 15px;
-  font-size: 18px;
-  line-height: 20px;
-}
-.navbar-brand:hover,
-.navbar-brand:focus {
-  text-decoration: none;
-}
-.navbar-brand > img {
-  display: block;
-}
-@media (min-width: 768px) {
-  .navbar > .container .navbar-brand,
-  .navbar > .container-fluid .navbar-brand {
-    margin-left: -15px;
-  }
-}
-.navbar-toggle {
-  position: relative;
-  float: right;
-  padding: 9px 10px;
-  margin-top: 8px;
-  margin-right: 15px;
-  margin-bottom: 8px;
-  background-color: transparent;
-  background-image: none;
-  border: 1px solid transparent;
-  border-radius: 4px;
-}
-.navbar-toggle:focus {
-  outline: 0;
-}
-.navbar-toggle .icon-bar {
-  display: block;
-  width: 22px;
-  height: 2px;
-  border-radius: 1px;
-}
-.navbar-toggle .icon-bar + .icon-bar {
-  margin-top: 4px;
-}
-@media (min-width: 768px) {
-  .navbar-toggle {
-    display: none;
-  }
-}
-.navbar-nav {
-  margin: 7.5px -15px;
-}
-.navbar-nav > li > a {
-  padding-top: 10px;
-  padding-bottom: 10px;
-  line-height: 20px;
-}
-@media (max-width: 767px) {
-  .navbar-nav .open .dropdown-menu {
-    position: static;
-    float: none;
-    width: auto;
-    margin-top: 0;
-    background-color: transparent;
-    border: 0;
-    -webkit-box-shadow: none;
-            box-shadow: none;
-  }
-  .navbar-nav .open .dropdown-menu > li > a,
-  .navbar-nav .open .dropdown-menu .dropdown-header {
-    padding: 5px 15px 5px 25px;
-  }
-  .navbar-nav .open .dropdown-menu > li > a {
-    line-height: 20px;
-  }
-  .navbar-nav .open .dropdown-menu > li > a:hover,
-  .navbar-nav .open .dropdown-menu > li > a:focus {
-    background-image: none;
-  }
-}
-@media (min-width: 768px) {
-  .navbar-nav {
-    float: left;
-    margin: 0;
-  }
-  .navbar-nav > li {
-    float: left;
-  }
-  .navbar-nav > li > a {
-    padding-top: 15px;
-    padding-bottom: 15px;
-  }
-}
-.navbar-form {
-  padding: 10px 15px;
-  margin-top: 8px;
-  margin-right: -15px;
-  margin-bottom: 8px;
-  margin-left: -15px;
-  border-top: 1px solid transparent;
-  border-bottom: 1px solid transparent;
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1);
-          box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1);
-}
-@media (min-width: 768px) {
-  .navbar-form .form-group {
-    display: inline-block;
-    margin-bottom: 0;
-    vertical-align: middle;
-  }
-  .navbar-form .form-control {
-    display: inline-block;
-    width: auto;
-    vertical-align: middle;
-  }
-  .navbar-form .form-control-static {
-    display: inline-block;
-  }
-  .navbar-form .input-group {
-    display: inline-table;
-    vertical-align: middle;
-  }
-  .navbar-form .input-group .input-group-addon,
-  .navbar-form .input-group .input-group-btn,
-  .navbar-form .input-group .form-control {
-    width: auto;
-  }
-  .navbar-form .input-group > .form-control {
-    width: 100%;
-  }
-  .navbar-form .control-label {
-    margin-bottom: 0;
-    vertical-align: middle;
-  }
-  .navbar-form .radio,
-  .navbar-form .checkbox {
-    display: inline-block;
-    margin-top: 0;
-    margin-bottom: 0;
-    vertical-align: middle;
-  }
-  .navbar-form .radio label,
-  .navbar-form .checkbox label {
-    padding-left: 0;
-  }
-  .navbar-form .radio input[type="radio"],
-  .navbar-form .checkbox input[type="checkbox"] {
-    position: relative;
-    margin-left: 0;
-  }
-  .navbar-form .has-feedback .form-control-feedback {
-    top: 0;
-  }
-}
-@media (max-width: 767px) {
-  .navbar-form .form-group {
-    margin-bottom: 5px;
-  }
-  .navbar-form .form-group:last-child {
-    margin-bottom: 0;
-  }
-}
-@media (min-width: 768px) {
-  .navbar-form {
-    width: auto;
-    padding-top: 0;
-    padding-bottom: 0;
-    margin-right: 0;
-    margin-left: 0;
-    border: 0;
-    -webkit-box-shadow: none;
-            box-shadow: none;
-  }
-}
-.navbar-nav > li > .dropdown-menu {
-  margin-top: 0;
-  border-top-left-radius: 0;
-  border-top-right-radius: 0;
-}
-.navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {
-  margin-bottom: 0;
-  border-top-left-radius: 4px;
-  border-top-right-radius: 4px;
-  border-bottom-right-radius: 0;
-  border-bottom-left-radius: 0;
-}
-.navbar-btn {
-  margin-top: 8px;
-  margin-bottom: 8px;
-}
-.navbar-btn.btn-sm {
-  margin-top: 10px;
-  margin-bottom: 10px;
-}
-.navbar-btn.btn-xs {
-  margin-top: 14px;
-  margin-bottom: 14px;
-}
-.navbar-text {
-  margin-top: 15px;
-  margin-bottom: 15px;
-}
-@media (min-width: 768px) {
-  .navbar-text {
-    float: left;
-    margin-right: 15px;
-    margin-left: 15px;
-  }
-}
-@media (min-width: 768px) {
-  .navbar-left {
-    float: left !important;
-  }
-  .navbar-right {
-    float: right !important;
-    margin-right: -15px;
-  }
-  .navbar-right ~ .navbar-right {
-    margin-right: 0;
-  }
-}
-.navbar-default {
-  background-color: #f8f8f8;
-  border-color: #e7e7e7;
-}
-.navbar-default .navbar-brand {
-  color: #777;
-}
-.navbar-default .navbar-brand:hover,
-.navbar-default .navbar-brand:focus {
-  color: #5e5e5e;
-  background-color: transparent;
-}
-.navbar-default .navbar-text {
-  color: #777;
-}
-.navbar-default .navbar-nav > li > a {
-  color: #777;
-}
-.navbar-default .navbar-nav > li > a:hover,
-.navbar-default .navbar-nav > li > a:focus {
-  color: #333;
-  background-color: transparent;
-}
-.navbar-default .navbar-nav > .active > a,
-.navbar-default .navbar-nav > .active > a:hover,
-.navbar-default .navbar-nav > .active > a:focus {
-  color: #555;
-  background-color: #e7e7e7;
-}
-.navbar-default .navbar-nav > .disabled > a,
-.navbar-default .navbar-nav > .disabled > a:hover,
-.navbar-default .navbar-nav > .disabled > a:focus {
-  color: #ccc;
-  background-color: transparent;
-}
-.navbar-default .navbar-toggle {
-  border-color: #ddd;
-}
-.navbar-default .navbar-toggle:hover,
-.navbar-default .navbar-toggle:focus {
-  background-color: #ddd;
-}
-.navbar-default .navbar-toggle .icon-bar {
-  background-color: #888;
-}
-.navbar-default .navbar-collapse,
-.navbar-default .navbar-form {
-  border-color: #e7e7e7;
-}
-.navbar-default .navbar-nav > .open > a,
-.navbar-default .navbar-nav > .open > a:hover,
-.navbar-default .navbar-nav > .open > a:focus {
-  color: #555;
-  background-color: #e7e7e7;
-}
-@media (max-width: 767px) {
-  .navbar-default .navbar-nav .open .dropdown-menu > li > a {
-    color: #777;
-  }
-  .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover,
-  .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus {
-    color: #333;
-    background-color: transparent;
-  }
-  .navbar-default .navbar-nav .open .dropdown-menu > .active > a,
-  .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover,
-  .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus {
-    color: #555;
-    background-color: #e7e7e7;
-  }
-  .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a,
-  .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:hover,
-  .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:focus {
-    color: #ccc;
-    background-color: transparent;
-  }
-}
-.navbar-default .navbar-link {
-  color: #777;
-}
-.navbar-default .navbar-link:hover {
-  color: #333;
-}
-.navbar-default .btn-link {
-  color: #777;
-}
-.navbar-default .btn-link:hover,
-.navbar-default .btn-link:focus {
-  color: #333;
-}
-.navbar-default .btn-link[disabled]:hover,
-fieldset[disabled] .navbar-default .btn-link:hover,
-.navbar-default .btn-link[disabled]:focus,
-fieldset[disabled] .navbar-default .btn-link:focus {
-  color: #ccc;
-}
-.navbar-inverse {
-  background-color: #222;
-  border-color: #080808;
-}
-.navbar-inverse .navbar-brand {
-  color: #9d9d9d;
-}
-.navbar-inverse .navbar-brand:hover,
-.navbar-inverse .navbar-brand:focus {
-  color: #fff;
-  background-color: transparent;
-}
-.navbar-inverse .navbar-text {
-  color: #9d9d9d;
-}
-.navbar-inverse .navbar-nav > li > a {
-  color: #9d9d9d;
-}
-.navbar-inverse .navbar-nav > li > a:hover,
-.navbar-inverse .navbar-nav > li > a:focus {
-  color: #fff;
-  background-color: transparent;
-}
-.navbar-inverse .navbar-nav > .active > a,
-.navbar-inverse .navbar-nav > .active > a:hover,
-.navbar-inverse .navbar-nav > .active > a:focus {
-  color: #fff;
-  background-color: #080808;
-}
-.navbar-inverse .navbar-nav > .disabled > a,
-.navbar-inverse .navbar-nav > .disabled > a:hover,
-.navbar-inverse .navbar-nav > .disabled > a:focus {
-  color: #444;
-  background-color: transparent;
-}
-.navbar-inverse .navbar-toggle {
-  border-color: #333;
-}
-.navbar-inverse .navbar-toggle:hover,
-.navbar-inverse .navbar-toggle:focus {
-  background-color: #333;
-}
-.navbar-inverse .navbar-toggle .icon-bar {
-  background-color: #fff;
-}
-.navbar-inverse .navbar-collapse,
-.navbar-inverse .navbar-form {
-  border-color: #101010;
-}
-.navbar-inverse .navbar-nav > .open > a,
-.navbar-inverse .navbar-nav > .open > a:hover,
-.navbar-inverse .navbar-nav > .open > a:focus {
-  color: #fff;
-  background-color: #080808;
-}
-@media (max-width: 767px) {
-  .navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header {
-    border-color: #080808;
-  }
-  .navbar-inverse .navbar-nav .open .dropdown-menu .divider {
-    background-color: #080808;
-  }
-  .navbar-inverse .navbar-nav .open .dropdown-menu > li > a {
-    color: #9d9d9d;
-  }
-  .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover,
-  .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus {
-    color: #fff;
-    background-color: transparent;
-  }
-  .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a,
-  .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:hover,
-  .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:focus {
-    color: #fff;
-    background-color: #080808;
-  }
-  .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a,
-  .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:hover,
-  .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:focus {
-    color: #444;
-    background-color: transparent;
-  }
-}
-.navbar-inverse .navbar-link {
-  color: #9d9d9d;
-}
-.navbar-inverse .navbar-link:hover {
-  color: #fff;
-}
-.navbar-inverse .btn-link {
-  color: #9d9d9d;
-}
-.navbar-inverse .btn-link:hover,
-.navbar-inverse .btn-link:focus {
-  color: #fff;
-}
-.navbar-inverse .btn-link[disabled]:hover,
-fieldset[disabled] .navbar-inverse .btn-link:hover,
-.navbar-inverse .btn-link[disabled]:focus,
-fieldset[disabled] .navbar-inverse .btn-link:focus {
-  color: #444;
-}
-.breadcrumb {
-  padding: 8px 15px;
-  margin-bottom: 20px;
-  list-style: none;
-  background-color: #f5f5f5;
-  border-radius: 4px;
-}
-.breadcrumb > li {
-  display: inline-block;
-}
-.breadcrumb > li + li:before {
-  padding: 0 5px;
-  color: #ccc;
-  content: "/\00a0";
-}
-.breadcrumb > .active {
-  color: #777;
-}
-.pagination {
-  display: inline-block;
-  padding-left: 0;
-  margin: 20px 0;
-  border-radius: 4px;
-}
-.pagination > li {
-  display: inline;
-}
-.pagination > li > a,
-.pagination > li > span {
-  position: relative;
-  float: left;
-  padding: 6px 12px;
-  margin-left: -1px;
-  line-height: 1.42857143;
-  color: #337ab7;
-  text-decoration: none;
-  background-color: #fff;
-  border: 1px solid #ddd;
-}
-.pagination > li:first-child > a,
-.pagination > li:first-child > span {
-  margin-left: 0;
-  border-top-left-radius: 4px;
-  border-bottom-left-radius: 4px;
-}
-.pagination > li:last-child > a,
-.pagination > li:last-child > span {
-  border-top-right-radius: 4px;
-  border-bottom-right-radius: 4px;
-}
-.pagination > li > a:hover,
-.pagination > li > span:hover,
-.pagination > li > a:focus,
-.pagination > li > span:focus {
-  z-index: 2;
-  color: #23527c;
-  background-color: #eee;
-  border-color: #ddd;
-}
-.pagination > .active > a,
-.pagination > .active > span,
-.pagination > .active > a:hover,
-.pagination > .active > span:hover,
-.pagination > .active > a:focus,
-.pagination > .active > span:focus {
-  z-index: 3;
-  color: #fff;
-  cursor: default;
-  background-color: #337ab7;
-  border-color: #337ab7;
-}
-.pagination > .disabled > span,
-.pagination > .disabled > span:hover,
-.pagination > .disabled > span:focus,
-.pagination > .disabled > a,
-.pagination > .disabled > a:hover,
-.pagination > .disabled > a:focus {
-  color: #777;
-  cursor: not-allowed;
-  background-color: #fff;
-  border-color: #ddd;
-}
-.pagination-lg > li > a,
-.pagination-lg > li > span {
-  padding: 10px 16px;
-  font-size: 18px;
-  line-height: 1.3333333;
-}
-.pagination-lg > li:first-child > a,
-.pagination-lg > li:first-child > span {
-  border-top-left-radius: 6px;
-  border-bottom-left-radius: 6px;
-}
-.pagination-lg > li:last-child > a,
-.pagination-lg > li:last-child > span {
-  border-top-right-radius: 6px;
-  border-bottom-right-radius: 6px;
-}
-.pagination-sm > li > a,
-.pagination-sm > li > span {
-  padding: 5px 10px;
-  font-size: 12px;
-  line-height: 1.5;
-}
-.pagination-sm > li:first-child > a,
-.pagination-sm > li:first-child > span {
-  border-top-left-radius: 3px;
-  border-bottom-left-radius: 3px;
-}
-.pagination-sm > li:last-child > a,
-.pagination-sm > li:last-child > span {
-  border-top-right-radius: 3px;
-  border-bottom-right-radius: 3px;
-}
-.pager {
-  padding-left: 0;
-  margin: 20px 0;
-  text-align: center;
-  list-style: none;
-}
-.pager li {
-  display: inline;
-}
-.pager li > a,
-.pager li > span {
-  display: inline-block;
-  padding: 5px 14px;
-  background-color: #fff;
-  border: 1px solid #ddd;
-  border-radius: 15px;
-}
-.pager li > a:hover,
-.pager li > a:focus {
-  text-decoration: none;
-  background-color: #eee;
-}
-.pager .next > a,
-.pager .next > span {
-  float: right;
-}
-.pager .previous > a,
-.pager .previous > span {
-  float: left;
-}
-.pager .disabled > a,
-.pager .disabled > a:hover,
-.pager .disabled > a:focus,
-.pager .disabled > span {
-  color: #777;
-  cursor: not-allowed;
-  background-color: #fff;
-}
-.label {
-  display: inline;
-  padding: .2em .6em .3em;
-  font-size: 75%;
-  font-weight: bold;
-  line-height: 1;
-  color: #fff;
-  text-align: center;
-  white-space: nowrap;
-  vertical-align: baseline;
-  border-radius: .25em;
-}
-a.label:hover,
-a.label:focus {
-  color: #fff;
-  text-decoration: none;
-  cursor: pointer;
-}
-.label:empty {
-  display: none;
-}
-.btn .label {
-  position: relative;
-  top: -1px;
-}
-.label-default {
-  background-color: #777;
-}
-.label-default[href]:hover,
-.label-default[href]:focus {
-  background-color: #5e5e5e;
-}
-.label-primary {
-  background-color: #337ab7;
-}
-.label-primary[href]:hover,
-.label-primary[href]:focus {
-  background-color: #286090;
-}
-.label-success {
-  background-color: #5cb85c;
-}
-.label-success[href]:hover,
-.label-success[href]:focus {
-  background-color: #449d44;
-}
-.label-info {
-  background-color: #5bc0de;
-}
-.label-info[href]:hover,
-.label-info[href]:focus {
-  background-color: #31b0d5;
-}
-.label-warning {
-  background-color: #f0ad4e;
-}
-.label-warning[href]:hover,
-.label-warning[href]:focus {
-  background-color: #ec971f;
-}
-.label-danger {
-  background-color: #d9534f;
-}
-.label-danger[href]:hover,
-.label-danger[href]:focus {
-  background-color: #c9302c;
-}
-.badge {
-  display: inline-block;
-  min-width: 10px;
-  padding: 3px 7px;
-  font-size: 12px;
-  font-weight: bold;
-  line-height: 1;
-  color: #fff;
-  text-align: center;
-  white-space: nowrap;
-  vertical-align: middle;
-  background-color: #777;
-  border-radius: 10px;
-}
-.badge:empty {
-  display: none;
-}
-.btn .badge {
-  position: relative;
-  top: -1px;
-}
-.btn-xs .badge,
-.btn-group-xs > .btn .badge {
-  top: 0;
-  padding: 1px 5px;
-}
-a.badge:hover,
-a.badge:focus {
-  color: #fff;
-  text-decoration: none;
-  cursor: pointer;
-}
-.list-group-item.active > .badge,
-.nav-pills > .active > a > .badge {
-  color: #337ab7;
-  background-color: #fff;
-}
-.list-group-item > .badge {
-  float: right;
-}
-.list-group-item > .badge + .badge {
-  margin-right: 5px;
-}
-.nav-pills > li > a > .badge {
-  margin-left: 3px;
-}
-.jumbotron {
-  padding-top: 30px;
-  padding-bottom: 30px;
-  margin-bottom: 30px;
-  color: inherit;
-  background-color: #eee;
-}
-.jumbotron h1,
-.jumbotron .h1 {
-  color: inherit;
-}
-.jumbotron p {
-  margin-bottom: 15px;
-  font-size: 21px;
-  font-weight: 200;
-}
-.jumbotron > hr {
-  border-top-color: #d5d5d5;
-}
-.container .jumbotron,
-.container-fluid .jumbotron {
-  padding-right: 15px;
-  padding-left: 15px;
-  border-radius: 6px;
-}
-.jumbotron .container {
-  max-width: 100%;
-}
-@media screen and (min-width: 768px) {
-  .jumbotron {
-    padding-top: 48px;
-    padding-bottom: 48px;
-  }
-  .container .jumbotron,
-  .container-fluid .jumbotron {
-    padding-right: 60px;
-    padding-left: 60px;
-  }
-  .jumbotron h1,
-  .jumbotron .h1 {
-    font-size: 63px;
-  }
-}
-.thumbnail {
-  display: block;
-  padding: 4px;
-  margin-bottom: 20px;
-  line-height: 1.42857143;
-  background-color: #fff;
-  border: 1px solid #ddd;
-  border-radius: 4px;
-  -webkit-transition: border .2s ease-in-out;
-       -o-transition: border .2s ease-in-out;
-          transition: border .2s ease-in-out;
-}
-.thumbnail > img,
-.thumbnail a > img {
-  margin-right: auto;
-  margin-left: auto;
-}
-a.thumbnail:hover,
-a.thumbnail:focus,
-a.thumbnail.active {
-  border-color: #337ab7;
-}
-.thumbnail .caption {
-  padding: 9px;
-  color: #333;
-}
-.alert {
-  padding: 15px;
-  margin-bottom: 20px;
-  border: 1px solid transparent;
-  border-radius: 4px;
-}
-.alert h4 {
-  margin-top: 0;
-  color: inherit;
-}
-.alert .alert-link {
-  font-weight: bold;
-}
-.alert > p,
-.alert > ul {
-  margin-bottom: 0;
-}
-.alert > p + p {
-  margin-top: 5px;
-}
-.alert-dismissable,
-.alert-dismissible {
-  padding-right: 35px;
-}
-.alert-dismissable .close,
-.alert-dismissible .close {
-  position: relative;
-  top: -2px;
-  right: -21px;
-  color: inherit;
-}
-.alert-success {
-  color: #3c763d;
-  background-color: #dff0d8;
-  border-color: #d6e9c6;
-}
-.alert-success hr {
-  border-top-color: #c9e2b3;
-}
-.alert-success .alert-link {
-  color: #2b542c;
-}
-.alert-info {
-  color: #31708f;
-  background-color: #d9edf7;
-  border-color: #bce8f1;
-}
-.alert-info hr {
-  border-top-color: #a6e1ec;
-}
-.alert-info .alert-link {
-  color: #245269;
-}
-.alert-warning {
-  color: #8a6d3b;
-  background-color: #fcf8e3;
-  border-color: #faebcc;
-}
-.alert-warning hr {
-  border-top-color: #f7e1b5;
-}
-.alert-warning .alert-link {
-  color: #66512c;
-}
-.alert-danger {
-  color: #a94442;
-  background-color: #f2dede;
-  border-color: #ebccd1;
-}
-.alert-danger hr {
-  border-top-color: #e4b9c0;
-}
-.alert-danger .alert-link {
-  color: #843534;
-}
-@-webkit-keyframes progress-bar-stripes {
-  from {
-    background-position: 40px 0;
-  }
-  to {
-    background-position: 0 0;
-  }
-}
-@-o-keyframes progress-bar-stripes {
-  from {
-    background-position: 40px 0;
-  }
-  to {
-    background-position: 0 0;
-  }
-}
-@keyframes progress-bar-stripes {
-  from {
-    background-position: 40px 0;
-  }
-  to {
-    background-position: 0 0;
-  }
-}
-.progress {
-  height: 20px;
-  margin-bottom: 20px;
-  overflow: hidden;
-  background-color: #f5f5f5;
-  border-radius: 4px;
-  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1);
-          box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1);
-}
-.progress-bar {
-  float: left;
-  width: 0;
-  height: 100%;
-  font-size: 12px;
-  line-height: 20px;
-  color: #fff;
-  text-align: center;
-  background-color: #337ab7;
-  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15);
-          box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15);
-  -webkit-transition: width .6s ease;
-       -o-transition: width .6s ease;
-          transition: width .6s ease;
-}
-.progress-striped .progress-bar,
-.progress-bar-striped {
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-  background-image:      -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-  background-image:         linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-  -webkit-background-size: 40px 40px;
-          background-size: 40px 40px;
-}
-.progress.active .progress-bar,
-.progress-bar.active {
-  -webkit-animation: progress-bar-stripes 2s linear infinite;
-       -o-animation: progress-bar-stripes 2s linear infinite;
-          animation: progress-bar-stripes 2s linear infinite;
-}
-.progress-bar-success {
-  background-color: #5cb85c;
-}
-.progress-striped .progress-bar-success {
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-  background-image:      -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-  background-image:         linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-}
-.progress-bar-info {
-  background-color: #5bc0de;
-}
-.progress-striped .progress-bar-info {
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-  background-image:      -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-  background-image:         linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-}
-.progress-bar-warning {
-  background-color: #f0ad4e;
-}
-.progress-striped .progress-bar-warning {
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-  background-image:      -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-  background-image:         linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-}
-.progress-bar-danger {
-  background-color: #d9534f;
-}
-.progress-striped .progress-bar-danger {
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-  background-image:      -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-  background-image:         linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-}
-.media {
-  margin-top: 15px;
-}
-.media:first-child {
-  margin-top: 0;
-}
-.media,
-.media-body {
-  overflow: hidden;
-  zoom: 1;
-}
-.media-body {
-  width: 10000px;
-}
-.media-object {
-  display: block;
-}
-.media-object.img-thumbnail {
-  max-width: none;
-}
-.media-right,
-.media > .pull-right {
-  padding-left: 10px;
-}
-.media-left,
-.media > .pull-left {
-  padding-right: 10px;
-}
-.media-left,
-.media-right,
-.media-body {
-  display: table-cell;
-  vertical-align: top;
-}
-.media-middle {
-  vertical-align: middle;
-}
-.media-bottom {
-  vertical-align: bottom;
-}
-.media-heading {
-  margin-top: 0;
-  margin-bottom: 5px;
-}
-.media-list {
-  padding-left: 0;
-  list-style: none;
-}
-.list-group {
-  padding-left: 0;
-  margin-bottom: 20px;
-}
-.list-group-item {
-  position: relative;
-  display: block;
-  padding: 10px 15px;
-  margin-bottom: -1px;
-  background-color: #fff;
-  border: 1px solid #ddd;
-}
-.list-group-item:first-child {
-  border-top-left-radius: 4px;
-  border-top-right-radius: 4px;
-}
-.list-group-item:last-child {
-  margin-bottom: 0;
-  border-bottom-right-radius: 4px;
-  border-bottom-left-radius: 4px;
-}
-a.list-group-item,
-button.list-group-item {
-  color: #555;
-}
-a.list-group-item .list-group-item-heading,
-button.list-group-item .list-group-item-heading {
-  color: #333;
-}
-a.list-group-item:hover,
-button.list-group-item:hover,
-a.list-group-item:focus,
-button.list-group-item:focus {
-  color: #555;
-  text-decoration: none;
-  background-color: #f5f5f5;
-}
-button.list-group-item {
-  width: 100%;
-  text-align: left;
-}
-.list-group-item.disabled,
-.list-group-item.disabled:hover,
-.list-group-item.disabled:focus {
-  color: #777;
-  cursor: not-allowed;
-  background-color: #eee;
-}
-.list-group-item.disabled .list-group-item-heading,
-.list-group-item.disabled:hover .list-group-item-heading,
-.list-group-item.disabled:focus .list-group-item-heading {
-  color: inherit;
-}
-.list-group-item.disabled .list-group-item-text,
-.list-group-item.disabled:hover .list-group-item-text,
-.list-group-item.disabled:focus .list-group-item-text {
-  color: #777;
-}
-.list-group-item.active,
-.list-group-item.active:hover,
-.list-group-item.active:focus {
-  z-index: 2;
-  color: #fff;
-  background-color: #337ab7;
-  border-color: #337ab7;
-}
-.list-group-item.active .list-group-item-heading,
-.list-group-item.active:hover .list-group-item-heading,
-.list-group-item.active:focus .list-group-item-heading,
-.list-group-item.active .list-group-item-heading > small,
-.list-group-item.active:hover .list-group-item-heading > small,
-.list-group-item.active:focus .list-group-item-heading > small,
-.list-group-item.active .list-group-item-heading > .small,
-.list-group-item.active:hover .list-group-item-heading > .small,
-.list-group-item.active:focus .list-group-item-heading > .small {
-  color: inherit;
-}
-.list-group-item.active .list-group-item-text,
-.list-group-item.active:hover .list-group-item-text,
-.list-group-item.active:focus .list-group-item-text {
-  color: #c7ddef;
-}
-.list-group-item-success {
-  color: #3c763d;
-  background-color: #dff0d8;
-}
-a.list-group-item-success,
-button.list-group-item-success {
-  color: #3c763d;
-}
-a.list-group-item-success .list-group-item-heading,
-button.list-group-item-success .list-group-item-heading {
-  color: inherit;
-}
-a.list-group-item-success:hover,
-button.list-group-item-success:hover,
-a.list-group-item-success:focus,
-button.list-group-item-success:focus {
-  color: #3c763d;
-  background-color: #d0e9c6;
-}
-a.list-group-item-success.active,
-button.list-group-item-success.active,
-a.list-group-item-success.active:hover,
-button.list-group-item-success.active:hover,
-a.list-group-item-success.active:focus,
-button.list-group-item-success.active:focus {
-  color: #fff;
-  background-color: #3c763d;
-  border-color: #3c763d;
-}
-.list-group-item-info {
-  color: #31708f;
-  background-color: #d9edf7;
-}
-a.list-group-item-info,
-button.list-group-item-info {
-  color: #31708f;
-}
-a.list-group-item-info .list-group-item-heading,
-button.list-group-item-info .list-group-item-heading {
-  color: inherit;
-}
-a.list-group-item-info:hover,
-button.list-group-item-info:hover,
-a.list-group-item-info:focus,
-button.list-group-item-info:focus {
-  color: #31708f;
-  background-color: #c4e3f3;
-}
-a.list-group-item-info.active,
-button.list-group-item-info.active,
-a.list-group-item-info.active:hover,
-button.list-group-item-info.active:hover,
-a.list-group-item-info.active:focus,
-button.list-group-item-info.active:focus {
-  color: #fff;
-  background-color: #31708f;
-  border-color: #31708f;
-}
-.list-group-item-warning {
-  color: #8a6d3b;
-  background-color: #fcf8e3;
-}
-a.list-group-item-warning,
-button.list-group-item-warning {
-  color: #8a6d3b;
-}
-a.list-group-item-warning .list-group-item-heading,
-button.list-group-item-warning .list-group-item-heading {
-  color: inherit;
-}
-a.list-group-item-warning:hover,
-button.list-group-item-warning:hover,
-a.list-group-item-warning:focus,
-button.list-group-item-warning:focus {
-  color: #8a6d3b;
-  background-color: #faf2cc;
-}
-a.list-group-item-warning.active,
-button.list-group-item-warning.active,
-a.list-group-item-warning.active:hover,
-button.list-group-item-warning.active:hover,
-a.list-group-item-warning.active:focus,
-button.list-group-item-warning.active:focus {
-  color: #fff;
-  background-color: #8a6d3b;
-  border-color: #8a6d3b;
-}
-.list-group-item-danger {
-  color: #a94442;
-  background-color: #f2dede;
-}
-a.list-group-item-danger,
-button.list-group-item-danger {
-  color: #a94442;
-}
-a.list-group-item-danger .list-group-item-heading,
-button.list-group-item-danger .list-group-item-heading {
-  color: inherit;
-}
-a.list-group-item-danger:hover,
-button.list-group-item-danger:hover,
-a.list-group-item-danger:focus,
-button.list-group-item-danger:focus {
-  color: #a94442;
-  background-color: #ebcccc;
-}
-a.list-group-item-danger.active,
-button.list-group-item-danger.active,
-a.list-group-item-danger.active:hover,
-button.list-group-item-danger.active:hover,
-a.list-group-item-danger.active:focus,
-button.list-group-item-danger.active:focus {
-  color: #fff;
-  background-color: #a94442;
-  border-color: #a94442;
-}
-.list-group-item-heading {
-  margin-top: 0;
-  margin-bottom: 5px;
-}
-.list-group-item-text {
-  margin-bottom: 0;
-  line-height: 1.3;
-}
-.panel {
-  margin-bottom: 20px;
-  background-color: #fff;
-  border: 1px solid transparent;
-  border-radius: 4px;
-  -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, .05);
-          box-shadow: 0 1px 1px rgba(0, 0, 0, .05);
-}
-.panel-body {
-  padding: 15px;
-}
-.panel-heading {
-  padding: 10px 15px;
-  border-bottom: 1px solid transparent;
-  border-top-left-radius: 3px;
-  border-top-right-radius: 3px;
-}
-.panel-heading > .dropdown .dropdown-toggle {
-  color: inherit;
-}
-.panel-title {
-  margin-top: 0;
-  margin-bottom: 0;
-  font-size: 16px;
-  color: inherit;
-}
-.panel-title > a,
-.panel-title > small,
-.panel-title > .small,
-.panel-title > small > a,
-.panel-title > .small > a {
-  color: inherit;
-}
-.panel-footer {
-  padding: 10px 15px;
-  background-color: #f5f5f5;
-  border-top: 1px solid #ddd;
-  border-bottom-right-radius: 3px;
-  border-bottom-left-radius: 3px;
-}
-.panel > .list-group,
-.panel > .panel-collapse > .list-group {
-  margin-bottom: 0;
-}
-.panel > .list-group .list-group-item,
-.panel > .panel-collapse > .list-group .list-group-item {
-  border-width: 1px 0;
-  border-radius: 0;
-}
-.panel > .list-group:first-child .list-group-item:first-child,
-.panel > .panel-collapse > .list-group:first-child .list-group-item:first-child {
-  border-top: 0;
-  border-top-left-radius: 3px;
-  border-top-right-radius: 3px;
-}
-.panel > .list-group:last-child .list-group-item:last-child,
-.panel > .panel-collapse > .list-group:last-child .list-group-item:last-child {
-  border-bottom: 0;
-  border-bottom-right-radius: 3px;
-  border-bottom-left-radius: 3px;
-}
-.panel > .panel-heading + .panel-collapse > .list-group .list-group-item:first-child {
-  border-top-left-radius: 0;
-  border-top-right-radius: 0;
-}
-.panel-heading + .list-group .list-group-item:first-child {
-  border-top-width: 0;
-}
-.list-group + .panel-footer {
-  border-top-width: 0;
-}
-.panel > .table,
-.panel > .table-responsive > .table,
-.panel > .panel-collapse > .table {
-  margin-bottom: 0;
-}
-.panel > .table caption,
-.panel > .table-responsive > .table caption,
-.panel > .panel-collapse > .table caption {
-  padding-right: 15px;
-  padding-left: 15px;
-}
-.panel > .table:first-child,
-.panel > .table-responsive:first-child > .table:first-child {
-  border-top-left-radius: 3px;
-  border-top-right-radius: 3px;
-}
-.panel > .table:first-child > thead:first-child > tr:first-child,
-.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child,
-.panel > .table:first-child > tbody:first-child > tr:first-child,
-.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child {
-  border-top-left-radius: 3px;
-  border-top-right-radius: 3px;
-}
-.panel > .table:first-child > thead:first-child > tr:first-child td:first-child,
-.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:first-child,
-.panel > .table:first-child > tbody:first-child > tr:first-child td:first-child,
-.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:first-child,
-.panel > .table:first-child > thead:first-child > tr:first-child th:first-child,
-.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:first-child,
-.panel > .table:first-child > tbody:first-child > tr:first-child th:first-child,
-.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:first-child {
-  border-top-left-radius: 3px;
-}
-.panel > .table:first-child > thead:first-child > tr:first-child td:last-child,
-.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:last-child,
-.panel > .table:first-child > tbody:first-child > tr:first-child td:last-child,
-.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:last-child,
-.panel > .table:first-child > thead:first-child > tr:first-child th:last-child,
-.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:last-child,
-.panel > .table:first-child > tbody:first-child > tr:first-child th:last-child,
-.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:last-child {
-  border-top-right-radius: 3px;
-}
-.panel > .table:last-child,
-.panel > .table-responsive:last-child > .table:last-child {
-  border-bottom-right-radius: 3px;
-  border-bottom-left-radius: 3px;
-}
-.panel > .table:last-child > tbody:last-child > tr:last-child,
-.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child,
-.panel > .table:last-child > tfoot:last-child > tr:last-child,
-.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child {
-  border-bottom-right-radius: 3px;
-  border-bottom-left-radius: 3px;
-}
-.panel > .table:last-child > tbody:last-child > tr:last-child td:first-child,
-.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:first-child,
-.panel > .table:last-child > tfoot:last-child > tr:last-child td:first-child,
-.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:first-child,
-.panel > .table:last-child > tbody:last-child > tr:last-child th:first-child,
-.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:first-child,
-.panel > .table:last-child > tfoot:last-child > tr:last-child th:first-child,
-.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:first-child {
-  border-bottom-left-radius: 3px;
-}
-.panel > .table:last-child > tbody:last-child > tr:last-child td:last-child,
-.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:last-child,
-.panel > .table:last-child > tfoot:last-child > tr:last-child td:last-child,
-.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:last-child,
-.panel > .table:last-child > tbody:last-child > tr:last-child th:last-child,
-.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:last-child,
-.panel > .table:last-child > tfoot:last-child > tr:last-child th:last-child,
-.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:last-child {
-  border-bottom-right-radius: 3px;
-}
-.panel > .panel-body + .table,
-.panel > .panel-body + .table-responsive,
-.panel > .table + .panel-body,
-.panel > .table-responsive + .panel-body {
-  border-top: 1px solid #ddd;
-}
-.panel > .table > tbody:first-child > tr:first-child th,
-.panel > .table > tbody:first-child > tr:first-child td {
-  border-top: 0;
-}
-.panel > .table-bordered,
-.panel > .table-responsive > .table-bordered {
-  border: 0;
-}
-.panel > .table-bordered > thead > tr > th:first-child,
-.panel > .table-responsive > .table-bordered > thead > tr > th:first-child,
-.panel > .table-bordered > tbody > tr > th:first-child,
-.panel > .table-responsive > .table-bordered > tbody > tr > th:first-child,
-.panel > .table-bordered > tfoot > tr > th:first-child,
-.panel > .table-responsive > .table-bordered > tfoot > tr > th:first-child,
-.panel > .table-bordered > thead > tr > td:first-child,
-.panel > .table-responsive > .table-bordered > thead > tr > td:first-child,
-.panel > .table-bordered > tbody > tr > td:first-child,
-.panel > .table-responsive > .table-bordered > tbody > tr > td:first-child,
-.panel > .table-bordered > tfoot > tr > td:first-child,
-.panel > .table-responsive > .table-bordered > tfoot > tr > td:first-child {
-  border-left: 0;
-}
-.panel > .table-bordered > thead > tr > th:last-child,
-.panel > .table-responsive > .table-bordered > thead > tr > th:last-child,
-.panel > .table-bordered > tbody > tr > th:last-child,
-.panel > .table-responsive > .table-bordered > tbody > tr > th:last-child,
-.panel > .table-bordered > tfoot > tr > th:last-child,
-.panel > .table-responsive > .table-bordered > tfoot > tr > th:last-child,
-.panel > .table-bordered > thead > tr > td:last-child,
-.panel > .table-responsive > .table-bordered > thead > tr > td:last-child,
-.panel > .table-bordered > tbody > tr > td:last-child,
-.panel > .table-responsive > .table-bordered > tbody > tr > td:last-child,
-.panel > .table-bordered > tfoot > tr > td:last-child,
-.panel > .table-responsive > .table-bordered > tfoot > tr > td:last-child {
-  border-right: 0;
-}
-.panel > .table-bordered > thead > tr:first-child > td,
-.panel > .table-responsive > .table-bordered > thead > tr:first-child > td,
-.panel > .table-bordered > tbody > tr:first-child > td,
-.panel > .table-responsive > .table-bordered > tbody > tr:first-child > td,
-.panel > .table-bordered > thead > tr:first-child > th,
-.panel > .table-responsive > .table-bordered > thead > tr:first-child > th,
-.panel > .table-bordered > tbody > tr:first-child > th,
-.panel > .table-responsive > .table-bordered > tbody > tr:first-child > th {
-  border-bottom: 0;
-}
-.panel > .table-bordered > tbody > tr:last-child > td,
-.panel > .table-responsive > .table-bordered > tbody > tr:last-child > td,
-.panel > .table-bordered > tfoot > tr:last-child > td,
-.panel > .table-responsive > .table-bordered > tfoot > tr:last-child > td,
-.panel > .table-bordered > tbody > tr:last-child > th,
-.panel > .table-responsive > .table-bordered > tbody > tr:last-child > th,
-.panel > .table-bordered > tfoot > tr:last-child > th,
-.panel > .table-responsive > .table-bordered > tfoot > tr:last-child > th {
-  border-bottom: 0;
-}
-.panel > .table-responsive {
-  margin-bottom: 0;
-  border: 0;
-}
-.panel-group {
-  margin-bottom: 20px;
-}
-.panel-group .panel {
-  margin-bottom: 0;
-  border-radius: 4px;
-}
-.panel-group .panel + .panel {
-  margin-top: 5px;
-}
-.panel-group .panel-heading {
-  border-bottom: 0;
-}
-.panel-group .panel-heading + .panel-collapse > .panel-body,
-.panel-group .panel-heading + .panel-collapse > .list-group {
-  border-top: 1px solid #ddd;
-}
-.panel-group .panel-footer {
-  border-top: 0;
-}
-.panel-group .panel-footer + .panel-collapse .panel-body {
-  border-bottom: 1px solid #ddd;
-}
-.panel-default {
-  border-color: #ddd;
-}
-.panel-default > .panel-heading {
-  color: #333;
-  background-color: #f5f5f5;
-  border-color: #ddd;
-}
-.panel-default > .panel-heading + .panel-collapse > .panel-body {
-  border-top-color: #ddd;
-}
-.panel-default > .panel-heading .badge {
-  color: #f5f5f5;
-  background-color: #333;
-}
-.panel-default > .panel-footer + .panel-collapse > .panel-body {
-  border-bottom-color: #ddd;
-}
-.panel-primary {
-  border-color: #337ab7;
-}
-.panel-primary > .panel-heading {
-  color: #fff;
-  background-color: #337ab7;
-  border-color: #337ab7;
-}
-.panel-primary > .panel-heading + .panel-collapse > .panel-body {
-  border-top-color: #337ab7;
-}
-.panel-primary > .panel-heading .badge {
-  color: #337ab7;
-  background-color: #fff;
-}
-.panel-primary > .panel-footer + .panel-collapse > .panel-body {
-  border-bottom-color: #337ab7;
-}
-.panel-success {
-  border-color: #d6e9c6;
-}
-.panel-success > .panel-heading {
-  color: #3c763d;
-  background-color: #dff0d8;
-  border-color: #d6e9c6;
-}
-.panel-success > .panel-heading + .panel-collapse > .panel-body {
-  border-top-color: #d6e9c6;
-}
-.panel-success > .panel-heading .badge {
-  color: #dff0d8;
-  background-color: #3c763d;
-}
-.panel-success > .panel-footer + .panel-collapse > .panel-body {
-  border-bottom-color: #d6e9c6;
-}
-.panel-info {
-  border-color: #bce8f1;
-}
-.panel-info > .panel-heading {
-  color: #31708f;
-  background-color: #d9edf7;
-  border-color: #bce8f1;
-}
-.panel-info > .panel-heading + .panel-collapse > .panel-body {
-  border-top-color: #bce8f1;
-}
-.panel-info > .panel-heading .badge {
-  color: #d9edf7;
-  background-color: #31708f;
-}
-.panel-info > .panel-footer + .panel-collapse > .panel-body {
-  border-bottom-color: #bce8f1;
-}
-.panel-warning {
-  border-color: #faebcc;
-}
-.panel-warning > .panel-heading {
-  color: #8a6d3b;
-  background-color: #fcf8e3;
-  border-color: #faebcc;
-}
-.panel-warning > .panel-heading + .panel-collapse > .panel-body {
-  border-top-color: #faebcc;
-}
-.panel-warning > .panel-heading .badge {
-  color: #fcf8e3;
-  background-color: #8a6d3b;
-}
-.panel-warning > .panel-footer + .panel-collapse > .panel-body {
-  border-bottom-color: #faebcc;
-}
-.panel-danger {
-  border-color: #ebccd1;
-}
-.panel-danger > .panel-heading {
-  color: #a94442;
-  background-color: #f2dede;
-  border-color: #ebccd1;
-}
-.panel-danger > .panel-heading + .panel-collapse > .panel-body {
-  border-top-color: #ebccd1;
-}
-.panel-danger > .panel-heading .badge {
-  color: #f2dede;
-  background-color: #a94442;
-}
-.panel-danger > .panel-footer + .panel-collapse > .panel-body {
-  border-bottom-color: #ebccd1;
-}
-.embed-responsive {
-  position: relative;
-  display: block;
-  height: 0;
-  padding: 0;
-  overflow: hidden;
-}
-.embed-responsive .embed-responsive-item,
-.embed-responsive iframe,
-.embed-responsive embed,
-.embed-responsive object,
-.embed-responsive video {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  border: 0;
-}
-.embed-responsive-16by9 {
-  padding-bottom: 56.25%;
-}
-.embed-responsive-4by3 {
-  padding-bottom: 75%;
-}
-.well {
-  min-height: 20px;
-  padding: 19px;
-  margin-bottom: 20px;
-  background-color: #f5f5f5;
-  border: 1px solid #e3e3e3;
-  border-radius: 4px;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05);
-}
-.well blockquote {
-  border-color: #ddd;
-  border-color: rgba(0, 0, 0, .15);
-}
-.well-lg {
-  padding: 24px;
-  border-radius: 6px;
-}
-.well-sm {
-  padding: 9px;
-  border-radius: 3px;
-}
-.close {
-  float: right;
-  font-size: 21px;
-  font-weight: bold;
-  line-height: 1;
-  color: #000;
-  text-shadow: 0 1px 0 #fff;
-  filter: alpha(opacity=20);
-  opacity: .2;
-}
-.close:hover,
-.close:focus {
-  color: #000;
-  text-decoration: none;
-  cursor: pointer;
-  filter: alpha(opacity=50);
-  opacity: .5;
-}
-button.close {
-  -webkit-appearance: none;
-  padding: 0;
-  cursor: pointer;
-  background: transparent;
-  border: 0;
-}
-.modal-open {
-  overflow: hidden;
-}
-.modal {
-  position: fixed;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 1050;
-  display: none;
-  overflow: hidden;
-  -webkit-overflow-scrolling: touch;
-  outline: 0;
-}
-.modal.fade .modal-dialog {
-  -webkit-transition: -webkit-transform .3s ease-out;
-       -o-transition:      -o-transform .3s ease-out;
-          transition:         transform .3s ease-out;
-  -webkit-transform: translate(0, -25%);
-      -ms-transform: translate(0, -25%);
-       -o-transform: translate(0, -25%);
-          transform: translate(0, -25%);
-}
-.modal.in .modal-dialog {
-  -webkit-transform: translate(0, 0);
-      -ms-transform: translate(0, 0);
-       -o-transform: translate(0, 0);
-          transform: translate(0, 0);
-}
-.modal-open .modal {
-  overflow-x: hidden;
-  overflow-y: auto;
-}
-.modal-dialog {
-  position: relative;
-  width: auto;
-  margin: 10px;
-}
-.modal-content {
-  position: relative;
-  background-color: #fff;
-  -webkit-background-clip: padding-box;
-          background-clip: padding-box;
-  border: 1px solid #999;
-  border: 1px solid rgba(0, 0, 0, .2);
-  border-radius: 6px;
-  outline: 0;
-  -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, .5);
-          box-shadow: 0 3px 9px rgba(0, 0, 0, .5);
-}
-.modal-backdrop {
-  position: fixed;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 1040;
-  background-color: #000;
-}
-.modal-backdrop.fade {
-  filter: alpha(opacity=0);
-  opacity: 0;
-}
-.modal-backdrop.in {
-  filter: alpha(opacity=50);
-  opacity: .5;
-}
-.modal-header {
-  padding: 15px;
-  border-bottom: 1px solid #e5e5e5;
-}
-.modal-header .close {
-  margin-top: -2px;
-}
-.modal-title {
-  margin: 0;
-  line-height: 1.42857143;
-}
-.modal-body {
-  position: relative;
-  padding: 15px;
-}
-.modal-footer {
-  padding: 15px;
-  text-align: right;
-  border-top: 1px solid #e5e5e5;
-}
-.modal-footer .btn + .btn {
-  margin-bottom: 0;
-  margin-left: 5px;
-}
-.modal-footer .btn-group .btn + .btn {
-  margin-left: -1px;
-}
-.modal-footer .btn-block + .btn-block {
-  margin-left: 0;
-}
-.modal-scrollbar-measure {
-  position: absolute;
-  top: -9999px;
-  width: 50px;
-  height: 50px;
-  overflow: scroll;
-}
-@media (min-width: 768px) {
-  .modal-dialog {
-    width: 600px;
-    margin: 30px auto;
-  }
-  .modal-content {
-    -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, .5);
-            box-shadow: 0 5px 15px rgba(0, 0, 0, .5);
-  }
-  .modal-sm {
-    width: 300px;
-  }
-}
-@media (min-width: 992px) {
-  .modal-lg {
-    width: 900px;
-  }
-}
-.tooltip {
-  position: absolute;
-  z-index: 1070;
-  display: block;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 12px;
-  font-style: normal;
-  font-weight: normal;
-  line-height: 1.42857143;
-  text-align: left;
-  text-align: start;
-  text-decoration: none;
-  text-shadow: none;
-  text-transform: none;
-  letter-spacing: normal;
-  word-break: normal;
-  word-spacing: normal;
-  word-wrap: normal;
-  white-space: normal;
-  filter: alpha(opacity=0);
-  opacity: 0;
-
-  line-break: auto;
-}
-.tooltip.in {
-  filter: alpha(opacity=90);
-  opacity: .9;
-}
-.tooltip.top {
-  padding: 5px 0;
-  margin-top: -3px;
-}
-.tooltip.right {
-  padding: 0 5px;
-  margin-left: 3px;
-}
-.tooltip.bottom {
-  padding: 5px 0;
-  margin-top: 3px;
-}
-.tooltip.left {
-  padding: 0 5px;
-  margin-left: -3px;
-}
-.tooltip-inner {
-  max-width: 200px;
-  padding: 3px 8px;
-  color: #fff;
-  text-align: center;
-  background-color: #000;
-  border-radius: 4px;
-}
-.tooltip-arrow {
-  position: absolute;
-  width: 0;
-  height: 0;
-  border-color: transparent;
-  border-style: solid;
-}
-.tooltip.top .tooltip-arrow {
-  bottom: 0;
-  left: 50%;
-  margin-left: -5px;
-  border-width: 5px 5px 0;
-  border-top-color: #000;
-}
-.tooltip.top-left .tooltip-arrow {
-  right: 5px;
-  bottom: 0;
-  margin-bottom: -5px;
-  border-width: 5px 5px 0;
-  border-top-color: #000;
-}
-.tooltip.top-right .tooltip-arrow {
-  bottom: 0;
-  left: 5px;
-  margin-bottom: -5px;
-  border-width: 5px 5px 0;
-  border-top-color: #000;
-}
-.tooltip.right .tooltip-arrow {
-  top: 50%;
-  left: 0;
-  margin-top: -5px;
-  border-width: 5px 5px 5px 0;
-  border-right-color: #000;
-}
-.tooltip.left .tooltip-arrow {
-  top: 50%;
-  right: 0;
-  margin-top: -5px;
-  border-width: 5px 0 5px 5px;
-  border-left-color: #000;
-}
-.tooltip.bottom .tooltip-arrow {
-  top: 0;
-  left: 50%;
-  margin-left: -5px;
-  border-width: 0 5px 5px;
-  border-bottom-color: #000;
-}
-.tooltip.bottom-left .tooltip-arrow {
-  top: 0;
-  right: 5px;
-  margin-top: -5px;
-  border-width: 0 5px 5px;
-  border-bottom-color: #000;
-}
-.tooltip.bottom-right .tooltip-arrow {
-  top: 0;
-  left: 5px;
-  margin-top: -5px;
-  border-width: 0 5px 5px;
-  border-bottom-color: #000;
-}
-.popover {
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: 1060;
-  display: none;
-  max-width: 276px;
-  padding: 1px;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 14px;
-  font-style: normal;
-  font-weight: normal;
-  line-height: 1.42857143;
-  text-align: left;
-  text-align: start;
-  text-decoration: none;
-  text-shadow: none;
-  text-transform: none;
-  letter-spacing: normal;
-  word-break: normal;
-  word-spacing: normal;
-  word-wrap: normal;
-  white-space: normal;
-  background-color: #fff;
-  -webkit-background-clip: padding-box;
-          background-clip: padding-box;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0, 0, 0, .2);
-  border-radius: 6px;
-  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, .2);
-          box-shadow: 0 5px 10px rgba(0, 0, 0, .2);
-
-  line-break: auto;
-}
-.popover.top {
-  margin-top: -10px;
-}
-.popover.right {
-  margin-left: 10px;
-}
-.popover.bottom {
-  margin-top: 10px;
-}
-.popover.left {
-  margin-left: -10px;
-}
-.popover-title {
-  padding: 8px 14px;
-  margin: 0;
-  font-size: 14px;
-  background-color: #f7f7f7;
-  border-bottom: 1px solid #ebebeb;
-  border-radius: 5px 5px 0 0;
-}
-.popover-content {
-  padding: 9px 14px;
-}
-.popover > .arrow,
-.popover > .arrow:after {
-  position: absolute;
-  display: block;
-  width: 0;
-  height: 0;
-  border-color: transparent;
-  border-style: solid;
-}
-.popover > .arrow {
-  border-width: 11px;
-}
-.popover > .arrow:after {
-  content: "";
-  border-width: 10px;
-}
-.popover.top > .arrow {
-  bottom: -11px;
-  left: 50%;
-  margin-left: -11px;
-  border-top-color: #999;
-  border-top-color: rgba(0, 0, 0, .25);
-  border-bottom-width: 0;
-}
-.popover.top > .arrow:after {
-  bottom: 1px;
-  margin-left: -10px;
-  content: " ";
-  border-top-color: #fff;
-  border-bottom-width: 0;
-}
-.popover.right > .arrow {
-  top: 50%;
-  left: -11px;
-  margin-top: -11px;
-  border-right-color: #999;
-  border-right-color: rgba(0, 0, 0, .25);
-  border-left-width: 0;
-}
-.popover.right > .arrow:after {
-  bottom: -10px;
-  left: 1px;
-  content: " ";
-  border-right-color: #fff;
-  border-left-width: 0;
-}
-.popover.bottom > .arrow {
-  top: -11px;
-  left: 50%;
-  margin-left: -11px;
-  border-top-width: 0;
-  border-bottom-color: #999;
-  border-bottom-color: rgba(0, 0, 0, .25);
-}
-.popover.bottom > .arrow:after {
-  top: 1px;
-  margin-left: -10px;
-  content: " ";
-  border-top-width: 0;
-  border-bottom-color: #fff;
-}
-.popover.left > .arrow {
-  top: 50%;
-  right: -11px;
-  margin-top: -11px;
-  border-right-width: 0;
-  border-left-color: #999;
-  border-left-color: rgba(0, 0, 0, .25);
-}
-.popover.left > .arrow:after {
-  right: 1px;
-  bottom: -10px;
-  content: " ";
-  border-right-width: 0;
-  border-left-color: #fff;
-}
-.carousel {
-  position: relative;
-}
-.carousel-inner {
-  position: relative;
-  width: 100%;
-  overflow: hidden;
-}
-.carousel-inner > .item {
-  position: relative;
-  display: none;
-  -webkit-transition: .6s ease-in-out left;
-       -o-transition: .6s ease-in-out left;
-          transition: .6s ease-in-out left;
-}
-.carousel-inner > .item > img,
-.carousel-inner > .item > a > img {
-  line-height: 1;
-}
-@media all and (transform-3d), (-webkit-transform-3d) {
-  .carousel-inner > .item {
-    -webkit-transition: -webkit-transform .6s ease-in-out;
-         -o-transition:      -o-transform .6s ease-in-out;
-            transition:         transform .6s ease-in-out;
-
-    -webkit-backface-visibility: hidden;
-            backface-visibility: hidden;
-    -webkit-perspective: 1000px;
-            perspective: 1000px;
-  }
-  .carousel-inner > .item.next,
-  .carousel-inner > .item.active.right {
-    left: 0;
-    -webkit-transform: translate3d(100%, 0, 0);
-            transform: translate3d(100%, 0, 0);
-  }
-  .carousel-inner > .item.prev,
-  .carousel-inner > .item.active.left {
-    left: 0;
-    -webkit-transform: translate3d(-100%, 0, 0);
-            transform: translate3d(-100%, 0, 0);
-  }
-  .carousel-inner > .item.next.left,
-  .carousel-inner > .item.prev.right,
-  .carousel-inner > .item.active {
-    left: 0;
-    -webkit-transform: translate3d(0, 0, 0);
-            transform: translate3d(0, 0, 0);
-  }
-}
-.carousel-inner > .active,
-.carousel-inner > .next,
-.carousel-inner > .prev {
-  display: block;
-}
-.carousel-inner > .active {
-  left: 0;
-}
-.carousel-inner > .next,
-.carousel-inner > .prev {
-  position: absolute;
-  top: 0;
-  width: 100%;
-}
-.carousel-inner > .next {
-  left: 100%;
-}
-.carousel-inner > .prev {
-  left: -100%;
-}
-.carousel-inner > .next.left,
-.carousel-inner > .prev.right {
-  left: 0;
-}
-.carousel-inner > .active.left {
-  left: -100%;
-}
-.carousel-inner > .active.right {
-  left: 100%;
-}
-.carousel-control {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  width: 15%;
-  font-size: 20px;
-  color: #fff;
-  text-align: center;
-  text-shadow: 0 1px 2px rgba(0, 0, 0, .6);
-  background-color: rgba(0, 0, 0, 0);
-  filter: alpha(opacity=50);
-  opacity: .5;
-}
-.carousel-control.left {
-  background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, .5) 0%, rgba(0, 0, 0, .0001) 100%);
-  background-image:      -o-linear-gradient(left, rgba(0, 0, 0, .5) 0%, rgba(0, 0, 0, .0001) 100%);
-  background-image: -webkit-gradient(linear, left top, right top, from(rgba(0, 0, 0, .5)), to(rgba(0, 0, 0, .0001)));
-  background-image:         linear-gradient(to right, rgba(0, 0, 0, .5) 0%, rgba(0, 0, 0, .0001) 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);
-  background-repeat: repeat-x;
-}
-.carousel-control.right {
-  right: 0;
-  left: auto;
-  background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, .0001) 0%, rgba(0, 0, 0, .5) 100%);
-  background-image:      -o-linear-gradient(left, rgba(0, 0, 0, .0001) 0%, rgba(0, 0, 0, .5) 100%);
-  background-image: -webkit-gradient(linear, left top, right top, from(rgba(0, 0, 0, .0001)), to(rgba(0, 0, 0, .5)));
-  background-image:         linear-gradient(to right, rgba(0, 0, 0, .0001) 0%, rgba(0, 0, 0, .5) 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);
-  background-repeat: repeat-x;
-}
-.carousel-control:hover,
-.carousel-control:focus {
-  color: #fff;
-  text-decoration: none;
-  filter: alpha(opacity=90);
-  outline: 0;
-  opacity: .9;
-}
-.carousel-control .icon-prev,
-.carousel-control .icon-next,
-.carousel-control .glyphicon-chevron-left,
-.carousel-control .glyphicon-chevron-right {
-  position: absolute;
-  top: 50%;
-  z-index: 5;
-  display: inline-block;
-  margin-top: -10px;
-}
-.carousel-control .icon-prev,
-.carousel-control .glyphicon-chevron-left {
-  left: 50%;
-  margin-left: -10px;
-}
-.carousel-control .icon-next,
-.carousel-control .glyphicon-chevron-right {
-  right: 50%;
-  margin-right: -10px;
-}
-.carousel-control .icon-prev,
-.carousel-control .icon-next {
-  width: 20px;
-  height: 20px;
-  font-family: serif;
-  line-height: 1;
-}
-.carousel-control .icon-prev:before {
-  content: '\2039';
-}
-.carousel-control .icon-next:before {
-  content: '\203a';
-}
-.carousel-indicators {
-  position: absolute;
-  bottom: 10px;
-  left: 50%;
-  z-index: 15;
-  width: 60%;
-  padding-left: 0;
-  margin-left: -30%;
-  text-align: center;
-  list-style: none;
-}
-.carousel-indicators li {
-  display: inline-block;
-  width: 10px;
-  height: 10px;
-  margin: 1px;
-  text-indent: -999px;
-  cursor: pointer;
-  background-color: #000 \9;
-  background-color: rgba(0, 0, 0, 0);
-  border: 1px solid #fff;
-  border-radius: 10px;
-}
-.carousel-indicators .active {
-  width: 12px;
-  height: 12px;
-  margin: 0;
-  background-color: #fff;
-}
-.carousel-caption {
-  position: absolute;
-  right: 15%;
-  bottom: 20px;
-  left: 15%;
-  z-index: 10;
-  padding-top: 20px;
-  padding-bottom: 20px;
-  color: #fff;
-  text-align: center;
-  text-shadow: 0 1px 2px rgba(0, 0, 0, .6);
-}
-.carousel-caption .btn {
-  text-shadow: none;
-}
-@media screen and (min-width: 768px) {
-  .carousel-control .glyphicon-chevron-left,
-  .carousel-control .glyphicon-chevron-right,
-  .carousel-control .icon-prev,
-  .carousel-control .icon-next {
-    width: 30px;
-    height: 30px;
-    margin-top: -10px;
-    font-size: 30px;
-  }
-  .carousel-control .glyphicon-chevron-left,
-  .carousel-control .icon-prev {
-    margin-left: -10px;
-  }
-  .carousel-control .glyphicon-chevron-right,
-  .carousel-control .icon-next {
-    margin-right: -10px;
-  }
-  .carousel-caption {
-    right: 20%;
-    left: 20%;
-    padding-bottom: 30px;
-  }
-  .carousel-indicators {
-    bottom: 20px;
-  }
-}
-.clearfix:before,
-.clearfix:after,
-.dl-horizontal dd:before,
-.dl-horizontal dd:after,
-.container:before,
-.container:after,
-.container-fluid:before,
-.container-fluid:after,
-.row:before,
-.row:after,
-.form-horizontal .form-group:before,
-.form-horizontal .form-group:after,
-.btn-toolbar:before,
-.btn-toolbar:after,
-.btn-group-vertical > .btn-group:before,
-.btn-group-vertical > .btn-group:after,
-.nav:before,
-.nav:after,
-.navbar:before,
-.navbar:after,
-.navbar-header:before,
-.navbar-header:after,
-.navbar-collapse:before,
-.navbar-collapse:after,
-.pager:before,
-.pager:after,
-.panel-body:before,
-.panel-body:after,
-.modal-header:before,
-.modal-header:after,
-.modal-footer:before,
-.modal-footer:after {
-  display: table;
-  content: " ";
-}
-.clearfix:after,
-.dl-horizontal dd:after,
-.container:after,
-.container-fluid:after,
-.row:after,
-.form-horizontal .form-group:after,
-.btn-toolbar:after,
-.btn-group-vertical > .btn-group:after,
-.nav:after,
-.navbar:after,
-.navbar-header:after,
-.navbar-collapse:after,
-.pager:after,
-.panel-body:after,
-.modal-header:after,
-.modal-footer:after {
-  clear: both;
-}
-.center-block {
-  display: block;
-  margin-right: auto;
-  margin-left: auto;
-}
-.pull-right {
-  float: right !important;
-}
-.pull-left {
-  float: left !important;
-}
-.hide {
-  display: none !important;
-}
-.show {
-  display: block !important;
-}
-.invisible {
-  visibility: hidden;
-}
-.text-hide {
-  font: 0/0 a;
-  color: transparent;
-  text-shadow: none;
-  background-color: transparent;
-  border: 0;
-}
-.hidden {
-  display: none !important;
-}
-.affix {
-  position: fixed;
-}
-@-ms-viewport {
-  width: device-width;
-}
-.visible-xs,
-.visible-sm,
-.visible-md,
-.visible-lg {
-  display: none !important;
-}
-.visible-xs-block,
-.visible-xs-inline,
-.visible-xs-inline-block,
-.visible-sm-block,
-.visible-sm-inline,
-.visible-sm-inline-block,
-.visible-md-block,
-.visible-md-inline,
-.visible-md-inline-block,
-.visible-lg-block,
-.visible-lg-inline,
-.visible-lg-inline-block {
-  display: none !important;
-}
-@media (max-width: 767px) {
-  .visible-xs {
-    display: block !important;
-  }
-  table.visible-xs {
-    display: table !important;
-  }
-  tr.visible-xs {
-    display: table-row !important;
-  }
-  th.visible-xs,
-  td.visible-xs {
-    display: table-cell !important;
-  }
-}
-@media (max-width: 767px) {
-  .visible-xs-block {
-    display: block !important;
-  }
-}
-@media (max-width: 767px) {
-  .visible-xs-inline {
-    display: inline !important;
-  }
-}
-@media (max-width: 767px) {
-  .visible-xs-inline-block {
-    display: inline-block !important;
-  }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-  .visible-sm {
-    display: block !important;
-  }
-  table.visible-sm {
-    display: table !important;
-  }
-  tr.visible-sm {
-    display: table-row !important;
-  }
-  th.visible-sm,
-  td.visible-sm {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-  .visible-sm-block {
-    display: block !important;
-  }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-  .visible-sm-inline {
-    display: inline !important;
-  }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-  .visible-sm-inline-block {
-    display: inline-block !important;
-  }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-  .visible-md {
-    display: block !important;
-  }
-  table.visible-md {
-    display: table !important;
-  }
-  tr.visible-md {
-    display: table-row !important;
-  }
-  th.visible-md,
-  td.visible-md {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-  .visible-md-block {
-    display: block !important;
-  }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-  .visible-md-inline {
-    display: inline !important;
-  }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-  .visible-md-inline-block {
-    display: inline-block !important;
-  }
-}
-@media (min-width: 1200px) {
-  .visible-lg {
-    display: block !important;
-  }
-  table.visible-lg {
-    display: table !important;
-  }
-  tr.visible-lg {
-    display: table-row !important;
-  }
-  th.visible-lg,
-  td.visible-lg {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 1200px) {
-  .visible-lg-block {
-    display: block !important;
-  }
-}
-@media (min-width: 1200px) {
-  .visible-lg-inline {
-    display: inline !important;
-  }
-}
-@media (min-width: 1200px) {
-  .visible-lg-inline-block {
-    display: inline-block !important;
-  }
-}
-@media (max-width: 767px) {
-  .hidden-xs {
-    display: none !important;
-  }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-  .hidden-sm {
-    display: none !important;
-  }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-  .hidden-md {
-    display: none !important;
-  }
-}
-@media (min-width: 1200px) {
-  .hidden-lg {
-    display: none !important;
-  }
-}
-.visible-print {
-  display: none !important;
-}
-@media print {
-  .visible-print {
-    display: block !important;
-  }
-  table.visible-print {
-    display: table !important;
-  }
-  tr.visible-print {
-    display: table-row !important;
-  }
-  th.visible-print,
-  td.visible-print {
-    display: table-cell !important;
-  }
-}
-.visible-print-block {
-  display: none !important;
-}
-@media print {
-  .visible-print-block {
-    display: block !important;
-  }
-}
-.visible-print-inline {
-  display: none !important;
-}
-@media print {
-  .visible-print-inline {
-    display: inline !important;
-  }
-}
-.visible-print-inline-block {
-  display: none !important;
-}
-@media print {
-  .visible-print-inline-block {
-    display: inline-block !important;
-  }
-}
-@media print {
-  .hidden-print {
-    display: none !important;
-  }
-}
-/*# sourceMappingURL=bootstrap.css.map */
diff --git a/NewLife.Cube/Content/bootstrap/css/bootstrap.min.css b/NewLife.Cube/Content/bootstrap/css/bootstrap.min.css
deleted file mode 100644
index ed3905e0e0..0000000000
--- a/NewLife.Cube/Content/bootstrap/css/bootstrap.min.css
+++ /dev/null
@@ -1,6 +0,0 @@
-/*!
- * Bootstrap v3.3.7 (http://getbootstrap.com)
- * Copyright 2011-2016 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- *//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{margin:.67em 0;font-size:2em}mark{color:#000;background:#ff0}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{height:0;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{margin:0;font:inherit;color:inherit}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}input{line-height:normal}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}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-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid silver}legend{padding:0;border:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-spacing:0;border-collapse:collapse}td,th{padding:0}/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */@media print{*,:after,:before{color:#000!important;text-shadow:none!important;background:0 0!important;-webkit-box-shadow:none!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}blockquote,pre{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}img{max-width:100%!important}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}.navbar{display:none}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered td,.table-bordered th{border:1px solid #ddd!important}}@font-face{font-family:'Glyphicons Halflings';src:url(../fonts/glyphicons-halflings-regular.eot);src:url(../fonts/glyphicons-halflings-regular.eot?#iefix) format('embedded-opentype'),url(../fonts/glyphicons-halflings-regular.woff2) format('woff2'),url(../fonts/glyphicons-halflings-regular.woff) format('woff'),url(../fonts/glyphicons-halflings-regular.ttf) format('truetype'),url(../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular) format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\002a"}.glyphicon-plus:before{content:"\002b"}.glyphicon-eur:before,.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.glyphicon-cd:before{content:"\e201"}.glyphicon-save-file:before{content:"\e202"}.glyphicon-open-file:before{content:"\e203"}.glyphicon-level-up:before{content:"\e204"}.glyphicon-copy:before{content:"\e205"}.glyphicon-paste:before{content:"\e206"}.glyphicon-alert:before{content:"\e209"}.glyphicon-equalizer:before{content:"\e210"}.glyphicon-king:before{content:"\e211"}.glyphicon-queen:before{content:"\e212"}.glyphicon-pawn:before{content:"\e213"}.glyphicon-bishop:before{content:"\e214"}.glyphicon-knight:before{content:"\e215"}.glyphicon-baby-formula:before{content:"\e216"}.glyphicon-tent:before{content:"\26fa"}.glyphicon-blackboard:before{content:"\e218"}.glyphicon-bed:before{content:"\e219"}.glyphicon-apple:before{content:"\f8ff"}.glyphicon-erase:before{content:"\e221"}.glyphicon-hourglass:before{content:"\231b"}.glyphicon-lamp:before{content:"\e223"}.glyphicon-duplicate:before{content:"\e224"}.glyphicon-piggy-bank:before{content:"\e225"}.glyphicon-scissors:before{content:"\e226"}.glyphicon-bitcoin:before{content:"\e227"}.glyphicon-btc:before{content:"\e227"}.glyphicon-xbt:before{content:"\e227"}.glyphicon-yen:before{content:"\00a5"}.glyphicon-jpy:before{content:"\00a5"}.glyphicon-ruble:before{content:"\20bd"}.glyphicon-rub:before{content:"\20bd"}.glyphicon-scale:before{content:"\e230"}.glyphicon-ice-lolly:before{content:"\e231"}.glyphicon-ice-lolly-tasted:before{content:"\e232"}.glyphicon-education:before{content:"\e233"}.glyphicon-option-horizontal:before{content:"\e234"}.glyphicon-option-vertical:before{content:"\e235"}.glyphicon-menu-hamburger:before{content:"\e236"}.glyphicon-modal-window:before{content:"\e237"}.glyphicon-oil:before{content:"\e238"}.glyphicon-grain:before{content:"\e239"}.glyphicon-sunglasses:before{content:"\e240"}.glyphicon-text-size:before{content:"\e241"}.glyphicon-text-color:before{content:"\e242"}.glyphicon-text-background:before{content:"\e243"}.glyphicon-object-align-top:before{content:"\e244"}.glyphicon-object-align-bottom:before{content:"\e245"}.glyphicon-object-align-horizontal:before{content:"\e246"}.glyphicon-object-align-left:before{content:"\e247"}.glyphicon-object-align-vertical:before{content:"\e248"}.glyphicon-object-align-right:before{content:"\e249"}.glyphicon-triangle-right:before{content:"\e250"}.glyphicon-triangle-left:before{content:"\e251"}.glyphicon-triangle-bottom:before{content:"\e252"}.glyphicon-triangle-top:before{content:"\e253"}.glyphicon-console:before{content:"\e254"}.glyphicon-superscript:before{content:"\e255"}.glyphicon-subscript:before{content:"\e256"}.glyphicon-menu-left:before{content:"\e257"}.glyphicon-menu-right:before{content:"\e258"}.glyphicon-menu-down:before{content:"\e259"}.glyphicon-menu-up:before{content:"\e260"}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}button,input,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#337ab7;text-decoration:none}a:focus,a:hover{color:#23527c;text-decoration:underline}a:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.carousel-inner>.item>a>img,.carousel-inner>.item>img,.img-responsive,.thumbnail a>img,.thumbnail>img{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{display:inline-block;max-width:100%;height:auto;padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}[role=button]{cursor:pointer}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-weight:400;line-height:1;color:#777}.h1,.h2,.h3,h1,h2,h3{margin-top:20px;margin-bottom:10px}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small{font-size:65%}.h4,.h5,.h6,h4,h5,h6{margin-top:10px;margin-bottom:10px}.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-size:75%}.h1,h1{font-size:36px}.h2,h2{font-size:30px}.h3,h3{font-size:24px}.h4,h4{font-size:18px}.h5,h5{font-size:14px}.h6,h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:300;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}.small,small{font-size:85%}.mark,mark{padding:.2em;background-color:#fcf8e3}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-lowercase{text-transform:lowercase}.text-uppercase{text-transform:uppercase}.text-capitalize{text-transform:capitalize}.text-muted{color:#777}.text-primary{color:#337ab7}a.text-primary:focus,a.text-primary:hover{color:#286090}.text-success{color:#3c763d}a.text-success:focus,a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:focus,a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:focus,a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:focus,a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#337ab7}a.bg-primary:focus,a.bg-primary:hover{background-color:#286090}.bg-success{background-color:#dff0d8}a.bg-success:focus,a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:focus,a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:focus,a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:focus,a.bg-danger:hover{background-color:#e4b9b9}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ol,ul{margin-top:0;margin-bottom:10px}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;margin-left:-5px;list-style:none}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}dl{margin-top:0;margin-bottom:20px}dd,dt{line-height:1.42857143}dt{font-weight:700}dd{margin-left:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}abbr[data-original-title],abbr[title]{cursor:help;border-bottom:1px dotted #777}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote ol:last-child,blockquote p:last-child,blockquote ul:last-child{margin-bottom:0}blockquote .small,blockquote footer,blockquote small{display:block;font-size:80%;line-height:1.42857143;color:#777}blockquote .small:before,blockquote footer:before,blockquote small:before{content:'\2014 \00A0'}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;text-align:right;border-right:5px solid #eee;border-left:0}.blockquote-reverse .small:before,.blockquote-reverse footer:before,.blockquote-reverse small:before,blockquote.pull-right .small:before,blockquote.pull-right footer:before,blockquote.pull-right small:before{content:''}.blockquote-reverse .small:after,.blockquote-reverse footer:after,.blockquote-reverse small:after,blockquote.pull-right .small:after,blockquote.pull-right footer:after,blockquote.pull-right small:after{content:'\00A0 \2014'}address{margin-bottom:20px;font-style:normal;line-height:1.42857143}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;border-radius:4px}kbd{padding:2px 4px;font-size:90%;color:#fff;background-color:#333;border-radius:3px;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.25);box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)}kbd kbd{padding:0;font-size:100%;font-weight:700;-webkit-box-shadow:none;box-shadow:none}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857143;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.row{margin-right:-15px;margin-left:-15px}.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{position:relative;min-height:1px;padding-right:15px;padding-left:15px}.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:auto}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:auto}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:auto}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:auto}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:auto}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:83.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.col-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:auto}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:auto}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg-push-0{left:auto}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0}}table{background-color:transparent}caption{padding-top:8px;padding-bottom:8px;color:#777;text-align:left}th{text-align:left}.table{width:100%;max-width:100%;margin-bottom:20px}.table>tbody>tr>td,.table>tbody>tr>th,.table>tfoot>tr>td,.table>tfoot>tr>th,.table>thead>tr>td,.table>thead>tr>th{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>td,.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>td,.table>thead:first-child>tr:first-child>th{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>tbody>tr>td,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>td,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>thead>tr>th{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>tbody>tr>td,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>td,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border:1px solid #ddd}.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border-bottom-width:2px}.table-striped>tbody>tr:nth-of-type(odd){background-color:#f9f9f9}.table-hover>tbody>tr:hover{background-color:#f5f5f5}table col[class*=col-]{position:static;display:table-column;float:none}table td[class*=col-],table th[class*=col-]{position:static;display:table-cell;float:none}.table>tbody>tr.active>td,.table>tbody>tr.active>th,.table>tbody>tr>td.active,.table>tbody>tr>th.active,.table>tfoot>tr.active>td,.table>tfoot>tr.active>th,.table>tfoot>tr>td.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>thead>tr.active>th,.table>thead>tr>td.active,.table>thead>tr>th.active{background-color:#f5f5f5}.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th,.table-hover>tbody>tr:hover>.active,.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover{background-color:#e8e8e8}.table>tbody>tr.success>td,.table>tbody>tr.success>th,.table>tbody>tr>td.success,.table>tbody>tr>th.success,.table>tfoot>tr.success>td,.table>tfoot>tr.success>th,.table>tfoot>tr>td.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>thead>tr.success>th,.table>thead>tr>td.success,.table>thead>tr>th.success{background-color:#dff0d8}.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th,.table-hover>tbody>tr:hover>.success,.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover{background-color:#d0e9c6}.table>tbody>tr.info>td,.table>tbody>tr.info>th,.table>tbody>tr>td.info,.table>tbody>tr>th.info,.table>tfoot>tr.info>td,.table>tfoot>tr.info>th,.table>tfoot>tr>td.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>thead>tr.info>th,.table>thead>tr>td.info,.table>thead>tr>th.info{background-color:#d9edf7}.table-hover>tbody>tr.info:hover>td,.table-hover>tbody>tr.info:hover>th,.table-hover>tbody>tr:hover>.info,.table-hover>tbody>tr>td.info:hover,.table-hover>tbody>tr>th.info:hover{background-color:#c4e3f3}.table>tbody>tr.warning>td,.table>tbody>tr.warning>th,.table>tbody>tr>td.warning,.table>tbody>tr>th.warning,.table>tfoot>tr.warning>td,.table>tfoot>tr.warning>th,.table>tfoot>tr>td.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>thead>tr.warning>th,.table>thead>tr>td.warning,.table>thead>tr>th.warning{background-color:#fcf8e3}.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th,.table-hover>tbody>tr:hover>.warning,.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover{background-color:#faf2cc}.table>tbody>tr.danger>td,.table>tbody>tr.danger>th,.table>tbody>tr>td.danger,.table>tbody>tr>th.danger,.table>tfoot>tr.danger>td,.table>tfoot>tr.danger>th,.table>tfoot>tr>td.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>thead>tr.danger>th,.table>thead>tr>td.danger,.table>thead>tr>th.danger{background-color:#f2dede}.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th,.table-hover>tbody>tr:hover>.danger,.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover{background-color:#ebcccc}.table-responsive{min-height:.01%;overflow-x:auto}@media screen and (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>td,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>thead>tr>th{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;max-width:100%;margin-bottom:5px;font-weight:700}input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type=checkbox],input[type=radio]{margin:4px 0 0;margin-top:1px\9;line-height:normal}input[type=file]{display:block}input[type=range]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type=file]:focus,input[type=checkbox]:focus,input[type=radio]:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{display:block;padding-top:7px;font-size:14px;line-height:1.42857143;color:#555}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857143;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control::-ms-expand{background-color:transparent;border:0}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{background-color:#eee;opacity:1}.form-control[disabled],fieldset[disabled] .form-control{cursor:not-allowed}textarea.form-control{height:auto}input[type=search]{-webkit-appearance:none}@media screen and (-webkit-min-device-pixel-ratio:0){input[type=date].form-control,input[type=time].form-control,input[type=datetime-local].form-control,input[type=month].form-control{line-height:34px}.input-group-sm input[type=date],.input-group-sm input[type=time],.input-group-sm input[type=datetime-local],.input-group-sm input[type=month],input[type=date].input-sm,input[type=time].input-sm,input[type=datetime-local].input-sm,input[type=month].input-sm{line-height:30px}.input-group-lg input[type=date],.input-group-lg input[type=time],.input-group-lg input[type=datetime-local],.input-group-lg input[type=month],input[type=date].input-lg,input[type=time].input-lg,input[type=datetime-local].input-lg,input[type=month].input-lg{line-height:46px}}.form-group{margin-bottom:15px}.checkbox,.radio{position:relative;display:block;margin-top:10px;margin-bottom:10px}.checkbox label,.radio label{min-height:20px;padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer}.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox],.radio input[type=radio],.radio-inline input[type=radio]{position:absolute;margin-top:4px\9;margin-left:-20px}.checkbox+.checkbox,.radio+.radio{margin-top:-5px}.checkbox-inline,.radio-inline{position:relative;display:inline-block;padding-left:20px;margin-bottom:0;font-weight:400;vertical-align:middle;cursor:pointer}.checkbox-inline+.checkbox-inline,.radio-inline+.radio-inline{margin-top:0;margin-left:10px}fieldset[disabled] input[type=checkbox],fieldset[disabled] input[type=radio],input[type=checkbox].disabled,input[type=checkbox][disabled],input[type=radio].disabled,input[type=radio][disabled]{cursor:not-allowed}.checkbox-inline.disabled,.radio-inline.disabled,fieldset[disabled] .checkbox-inline,fieldset[disabled] .radio-inline{cursor:not-allowed}.checkbox.disabled label,.radio.disabled label,fieldset[disabled] .checkbox label,fieldset[disabled] .radio label{cursor:not-allowed}.form-control-static{min-height:34px;padding-top:7px;padding-bottom:7px;margin-bottom:0}.form-control-static.input-lg,.form-control-static.input-sm{padding-right:0;padding-left:0}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}select[multiple].input-sm,textarea.input-sm{height:auto}.form-group-sm .form-control{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.form-group-sm select.form-control{height:30px;line-height:30px}.form-group-sm select[multiple].form-control,.form-group-sm textarea.form-control{height:auto}.form-group-sm .form-control-static{height:30px;min-height:32px;padding:6px 10px;font-size:12px;line-height:1.5}.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-lg{height:46px;line-height:46px}select[multiple].input-lg,textarea.input-lg{height:auto}.form-group-lg .form-control{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.form-group-lg select.form-control{height:46px;line-height:46px}.form-group-lg select[multiple].form-control,.form-group-lg textarea.form-control{height:auto}.form-group-lg .form-control-static{height:46px;min-height:38px;padding:11px 16px;font-size:18px;line-height:1.3333333}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.form-control-feedback{position:absolute;top:0;right:0;z-index:2;display:block;width:34px;height:34px;line-height:34px;text-align:center;pointer-events:none}.form-group-lg .form-control+.form-control-feedback,.input-group-lg+.form-control-feedback,.input-lg+.form-control-feedback{width:46px;height:46px;line-height:46px}.form-group-sm .form-control+.form-control-feedback,.input-group-sm+.form-control-feedback,.input-sm+.form-control-feedback{width:30px;height:30px;line-height:30px}.has-success .checkbox,.has-success .checkbox-inline,.has-success .control-label,.has-success .help-block,.has-success .radio,.has-success .radio-inline,.has-success.checkbox label,.has-success.checkbox-inline label,.has-success.radio label,.has-success.radio-inline label{color:#3c763d}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;background-color:#dff0d8;border-color:#3c763d}.has-success .form-control-feedback{color:#3c763d}.has-warning .checkbox,.has-warning .checkbox-inline,.has-warning .control-label,.has-warning .help-block,.has-warning .radio,.has-warning .radio-inline,.has-warning.checkbox label,.has-warning.checkbox-inline label,.has-warning.radio label,.has-warning.radio-inline label{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;background-color:#fcf8e3;border-color:#8a6d3b}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .checkbox,.has-error .checkbox-inline,.has-error .control-label,.has-error .help-block,.has-error .radio,.has-error .radio-inline,.has-error.checkbox label,.has-error.checkbox-inline label,.has-error.radio label,.has-error.radio-inline label{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;background-color:#f2dede;border-color:#a94442}.has-error .form-control-feedback{color:#a94442}.has-feedback label~.form-control-feedback{top:25px}.has-feedback label.sr-only~.form-control-feedback{top:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-static{display:inline-block}.form-inline .input-group{display:inline-table;vertical-align:middle}.form-inline .input-group .form-control,.form-inline .input-group .input-group-addon,.form-inline .input-group .input-group-btn{width:auto}.form-inline .input-group>.form-control{width:100%}.form-inline .control-label{margin-bottom:0;vertical-align:middle}.form-inline .checkbox,.form-inline .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.form-inline .checkbox label,.form-inline .radio label{padding-left:0}.form-inline .checkbox input[type=checkbox],.form-inline .radio input[type=radio]{position:relative;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .checkbox,.form-horizontal .checkbox-inline,.form-horizontal .radio,.form-horizontal .radio-inline{padding-top:7px;margin-top:0;margin-bottom:0}.form-horizontal .checkbox,.form-horizontal .radio{min-height:27px}.form-horizontal .form-group{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.form-horizontal .control-label{padding-top:7px;margin-bottom:0;text-align:right}}.form-horizontal .has-feedback .form-control-feedback{right:15px}@media (min-width:768px){.form-horizontal .form-group-lg .control-label{padding-top:11px;font-size:18px}}@media (min-width:768px){.form-horizontal .form-group-sm .control-label{padding-top:6px;font-size:12px}}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:400;line-height:1.42857143;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-image:none;border:1px solid transparent;border-radius:4px}.btn.active.focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn:active:focus,.btn:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.focus,.btn:focus,.btn:hover{color:#333;text-decoration:none}.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{cursor:not-allowed;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none;opacity:.65}a.btn.disabled,fieldset[disabled] a.btn{pointer-events:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default.focus,.btn-default:focus{color:#333;background-color:#e6e6e6;border-color:#8c8c8c}.btn-default:hover{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active.focus,.btn-default.active:focus,.btn-default.active:hover,.btn-default:active.focus,.btn-default:active:focus,.btn-default:active:hover,.open>.dropdown-toggle.btn-default.focus,.open>.dropdown-toggle.btn-default:focus,.open>.dropdown-toggle.btn-default:hover{color:#333;background-color:#d4d4d4;border-color:#8c8c8c}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{background-image:none}.btn-default.disabled.focus,.btn-default.disabled:focus,.btn-default.disabled:hover,.btn-default[disabled].focus,.btn-default[disabled]:focus,.btn-default[disabled]:hover,fieldset[disabled] .btn-default.focus,fieldset[disabled] .btn-default:focus,fieldset[disabled] .btn-default:hover{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#337ab7;border-color:#2e6da4}.btn-primary.focus,.btn-primary:focus{color:#fff;background-color:#286090;border-color:#122b40}.btn-primary:hover{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active.focus,.btn-primary.active:focus,.btn-primary.active:hover,.btn-primary:active.focus,.btn-primary:active:focus,.btn-primary:active:hover,.open>.dropdown-toggle.btn-primary.focus,.open>.dropdown-toggle.btn-primary:focus,.open>.dropdown-toggle.btn-primary:hover{color:#fff;background-color:#204d74;border-color:#122b40}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled.focus,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled].focus,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary.focus,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#337ab7;border-color:#2e6da4}.btn-primary .badge{color:#337ab7;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success.focus,.btn-success:focus{color:#fff;background-color:#449d44;border-color:#255625}.btn-success:hover{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active.focus,.btn-success.active:focus,.btn-success.active:hover,.btn-success:active.focus,.btn-success:active:focus,.btn-success:active:hover,.open>.dropdown-toggle.btn-success.focus,.open>.dropdown-toggle.btn-success:focus,.open>.dropdown-toggle.btn-success:hover{color:#fff;background-color:#398439;border-color:#255625}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{background-image:none}.btn-success.disabled.focus,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled].focus,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success.focus,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info.focus,.btn-info:focus{color:#fff;background-color:#31b0d5;border-color:#1b6d85}.btn-info:hover{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active.focus,.btn-info.active:focus,.btn-info.active:hover,.btn-info:active.focus,.btn-info:active:focus,.btn-info:active:hover,.open>.dropdown-toggle.btn-info.focus,.open>.dropdown-toggle.btn-info:focus,.open>.dropdown-toggle.btn-info:hover{color:#fff;background-color:#269abc;border-color:#1b6d85}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{background-image:none}.btn-info.disabled.focus,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled].focus,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info.focus,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning.focus,.btn-warning:focus{color:#fff;background-color:#ec971f;border-color:#985f0d}.btn-warning:hover{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active.focus,.btn-warning.active:focus,.btn-warning.active:hover,.btn-warning:active.focus,.btn-warning:active:focus,.btn-warning:active:hover,.open>.dropdown-toggle.btn-warning.focus,.open>.dropdown-toggle.btn-warning:focus,.open>.dropdown-toggle.btn-warning:hover{color:#fff;background-color:#d58512;border-color:#985f0d}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled.focus,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled].focus,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning.focus,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger.focus,.btn-danger:focus{color:#fff;background-color:#c9302c;border-color:#761c19}.btn-danger:hover{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active.focus,.btn-danger.active:focus,.btn-danger.active:hover,.btn-danger:active.focus,.btn-danger:active:focus,.btn-danger:active:hover,.open>.dropdown-toggle.btn-danger.focus,.open>.dropdown-toggle.btn-danger:focus,.open>.dropdown-toggle.btn-danger:hover{color:#fff;background-color:#ac2925;border-color:#761c19}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled.focus,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled].focus,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger.focus,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{font-weight:400;color:#337ab7;border-radius:0}.btn-link,.btn-link.active,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:active,.btn-link:focus,.btn-link:hover{border-color:transparent}.btn-link:focus,.btn-link:hover{color:#23527c;text-decoration:underline;background-color:transparent}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#777;text-decoration:none}.btn-group-lg>.btn,.btn-lg{padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.btn-group-sm>.btn,.btn-sm{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-xs>.btn,.btn-xs{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:5px}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}tr.collapse.in{display:table-row}tbody.collapse.in{display:table-row-group}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition-timing-function:ease;-o-transition-timing-function:ease;transition-timing-function:ease;-webkit-transition-duration:.35s;-o-transition-duration:.35s;transition-duration:.35s;-webkit-transition-property:height,visibility;-o-transition-property:height,visibility;transition-property:height,visibility}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px dashed;border-top:4px solid\9;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown,.dropup{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;text-align:left;list-style:none;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;color:#333;white-space:nowrap}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{color:#262626;text-decoration:none;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{color:#fff;text-decoration:none;background-color:#337ab7;outline:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{color:#777}.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-right{right:0;left:auto}.dropdown-menu-left{right:auto;left:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.42857143;color:#777;white-space:nowrap}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{content:"";border-top:0;border-bottom:4px dashed;border-bottom:4px solid\9}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:2px}@media (min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}.navbar-right .dropdown-menu-left{right:auto;left:0}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;float:left}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:2}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar .btn,.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-bottom-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-left-radius:0;border-top-right-radius:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-top-right-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{display:table-cell;float:none;width:1%}.btn-group-justified>.btn-group .btn{width:100%}.btn-group-justified>.btn-group .dropdown-menu{left:auto}[data-toggle=buttons]>.btn input[type=checkbox],[data-toggle=buttons]>.btn input[type=radio],[data-toggle=buttons]>.btn-group>.btn input[type=checkbox],[data-toggle=buttons]>.btn-group>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*=col-]{float:none;padding-right:0;padding-left:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group .form-control:focus{z-index:3}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn,textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn,textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group .form-control,.input-group-addon,.input-group-btn{display:table-cell}.input-group .form-control:not(:first-child):not(:last-child),.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:400;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type=checkbox],.input-group-addon input[type=radio]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn-group:not(:last-child)>.btn,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn-group:not(:first-child)>.btn,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:active,.input-group-btn>.btn:focus,.input-group-btn>.btn:hover{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{z-index:2;margin-left:-1px}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:focus,.nav>li>a:hover{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#777}.nav>li.disabled>a:focus,.nav>li.disabled>a:hover{color:#777;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{background-color:#eee;border-color:#337ab7}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:focus,.nav-tabs>li.active>a:hover{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{color:#fff;background-color:#337ab7}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}@media (min-width:768px){.navbar{border-radius:4px}}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{padding-right:15px;padding-left:15px;overflow-x:visible;-webkit-overflow-scrolling:touch;border-top:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1)}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;-webkit-box-shadow:none;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse{padding-right:0;padding-left:0}}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:340px}@media (max-device-width:480px) and (orientation:landscape){.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:200px}}.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-bottom,.navbar-fixed-top{position:fixed;right:0;left:0;z-index:1030}@media (min-width:768px){.navbar-fixed-bottom,.navbar-fixed-top{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;height:50px;padding:15px 15px;font-size:18px;line-height:20px}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-brand>img{display:block}@media (min-width:768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;padding:9px 10px;margin-top:8px;margin-right:15px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:0}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;-webkit-box-shadow:none;box-shadow:none}.navbar-nav .open .dropdown-menu .dropdown-header,.navbar-nav .open .dropdown-menu>li>a{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:focus,.navbar-nav .open .dropdown-menu>li>a:hover{background-image:none}}@media (min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}.navbar-form{padding:10px 15px;margin-top:8px;margin-right:-15px;margin-bottom:8px;margin-left:-15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1)}@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .form-control-static{display:inline-block}.navbar-form .input-group{display:inline-table;vertical-align:middle}.navbar-form .input-group .form-control,.navbar-form .input-group .input-group-addon,.navbar-form .input-group .input-group-btn{width:auto}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{margin-bottom:0;vertical-align:middle}.navbar-form .checkbox,.navbar-form .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.navbar-form .checkbox label,.navbar-form .radio label{padding-left:0}.navbar-form .checkbox input[type=checkbox],.navbar-form .radio input[type=radio]{position:relative;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}.navbar-form .form-group:last-child{margin-bottom:0}}@media (min-width:768px){.navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-left-radius:0;border-top-right-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{margin-bottom:0;border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){.navbar-text{float:left;margin-right:15px;margin-left:15px}}@media (min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important;margin-right:-15px}.navbar-right~.navbar-right{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:focus,.navbar-default .navbar-brand:hover{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:focus,.navbar-default .navbar-nav>.disabled>a:hover{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover{color:#555;background-color:#e7e7e7}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-default .btn-link{color:#777}.navbar-default .btn-link:focus,.navbar-default .btn-link:hover{color:#333}.navbar-default .btn-link[disabled]:focus,.navbar-default .btn-link[disabled]:hover,fieldset[disabled] .navbar-default .btn-link:focus,fieldset[disabled] .navbar-default .btn-link:hover{color:#ccc}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#9d9d9d}.navbar-inverse .navbar-brand:focus,.navbar-inverse .navbar-brand:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:focus,.navbar-inverse .navbar-nav>.disabled>a:hover{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{color:#fff;background-color:#080808}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#9d9d9d}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-inverse .btn-link{color:#9d9d9d}.navbar-inverse .btn-link:focus,.navbar-inverse .btn-link:hover{color:#fff}.navbar-inverse .btn-link[disabled]:focus,.navbar-inverse .btn-link[disabled]:hover,fieldset[disabled] .navbar-inverse .btn-link:focus,fieldset[disabled] .navbar-inverse .btn-link:hover{color:#444}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"}.breadcrumb>.active{color:#777}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.42857143;color:#337ab7;text-decoration:none;background-color:#fff;border:1px solid #ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-top-left-radius:4px;border-bottom-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>li>a:focus,.pagination>li>a:hover,.pagination>li>span:focus,.pagination>li>span:hover{z-index:2;color:#23527c;background-color:#eee;border-color:#ddd}.pagination>.active>a,.pagination>.active>a:focus,.pagination>.active>a:hover,.pagination>.active>span,.pagination>.active>span:focus,.pagination>.active>span:hover{z-index:3;color:#fff;cursor:default;background-color:#337ab7;border-color:#337ab7}.pagination>.disabled>a,.pagination>.disabled>a:focus,.pagination>.disabled>a:hover,.pagination>.disabled>span,.pagination>.disabled>span:focus,.pagination>.disabled>span:hover{color:#777;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px;line-height:1.3333333}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-top-left-radius:6px;border-bottom-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px;line-height:1.5}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-top-left-radius:3px;border-bottom-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:focus,.pager li>a:hover{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:focus,.pager .disabled>a:hover,.pager .disabled>span{color:#777;cursor:not-allowed;background-color:#fff}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}a.label:focus,a.label:hover{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#777}.label-default[href]:focus,.label-default[href]:hover{background-color:#5e5e5e}.label-primary{background-color:#337ab7}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#286090}.label-success{background-color:#5cb85c}.label-success[href]:focus,.label-success[href]:hover{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:focus,.label-info[href]:hover{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:middle;background-color:#777;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-group-xs>.btn .badge,.btn-xs .badge{top:0;padding:1px 5px}a.badge:focus,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer}.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#337ab7;background-color:#fff}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding-top:30px;padding-bottom:30px;margin-bottom:30px;color:inherit;background-color:#eee}.jumbotron .h1,.jumbotron h1{color:inherit}.jumbotron p{margin-bottom:15px;font-size:21px;font-weight:200}.jumbotron>hr{border-top-color:#d5d5d5}.container .jumbotron,.container-fluid .jumbotron{padding-right:15px;padding-left:15px;border-radius:6px}.jumbotron .container{max-width:100%}@media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron,.container-fluid .jumbotron{padding-right:60px;padding-left:60px}.jumbotron .h1,.jumbotron h1{font-size:63px}}.thumbnail{display:block;padding:4px;margin-bottom:20px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:border .2s ease-in-out;-o-transition:border .2s ease-in-out;transition:border .2s ease-in-out}.thumbnail a>img,.thumbnail>img{margin-right:auto;margin-left:auto}a.thumbnail.active,a.thumbnail:focus,a.thumbnail:hover{border-color:#337ab7}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:700}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable,.alert-dismissible{padding-right:35px}.alert-dismissable .close,.alert-dismissible .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#337ab7;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress-bar-striped,.progress-striped .progress-bar{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;background-size:40px 40px}.progress-bar.active,.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.media{margin-top:15px}.media:first-child{margin-top:0}.media,.media-body{overflow:hidden;zoom:1}.media-body{width:10000px}.media-object{display:block}.media-object.img-thumbnail{max-width:none}.media-right,.media>.pull-right{padding-left:10px}.media-left,.media>.pull-left{padding-right:10px}.media-body,.media-left,.media-right{display:table-cell;vertical-align:top}.media-middle{vertical-align:middle}.media-bottom{vertical-align:bottom}.media-heading{margin-top:0;margin-bottom:5px}.media-list{padding-left:0;list-style:none}.list-group{padding-left:0;margin-bottom:20px}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-left-radius:4px;border-top-right-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}a.list-group-item,button.list-group-item{color:#555}a.list-group-item .list-group-item-heading,button.list-group-item .list-group-item-heading{color:#333}a.list-group-item:focus,a.list-group-item:hover,button.list-group-item:focus,button.list-group-item:hover{color:#555;text-decoration:none;background-color:#f5f5f5}button.list-group-item{width:100%;text-align:left}.list-group-item.disabled,.list-group-item.disabled:focus,.list-group-item.disabled:hover{color:#777;cursor:not-allowed;background-color:#eee}.list-group-item.disabled .list-group-item-heading,.list-group-item.disabled:focus .list-group-item-heading,.list-group-item.disabled:hover .list-group-item-heading{color:inherit}.list-group-item.disabled .list-group-item-text,.list-group-item.disabled:focus .list-group-item-text,.list-group-item.disabled:hover .list-group-item-text{color:#777}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{z-index:2;color:#fff;background-color:#337ab7;border-color:#337ab7}.list-group-item.active .list-group-item-heading,.list-group-item.active .list-group-item-heading>.small,.list-group-item.active .list-group-item-heading>small,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading>.small,.list-group-item.active:focus .list-group-item-heading>small,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading>.small,.list-group-item.active:hover .list-group-item-heading>small{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:focus .list-group-item-text,.list-group-item.active:hover .list-group-item-text{color:#c7ddef}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success,button.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading,button.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:focus,a.list-group-item-success:hover,button.list-group-item-success:focus,button.list-group-item-success:hover{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:focus,a.list-group-item-success.active:hover,button.list-group-item-success.active,button.list-group-item-success.active:focus,button.list-group-item-success.active:hover{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info,button.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading,button.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:focus,a.list-group-item-info:hover,button.list-group-item-info:focus,button.list-group-item-info:hover{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:focus,a.list-group-item-info.active:hover,button.list-group-item-info.active,button.list-group-item-info.active:focus,button.list-group-item-info.active:hover{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning,button.list-group-item-warning{color:#8a6d3b}a.list-group-item-warning .list-group-item-heading,button.list-group-item-warning .list-group-item-heading{color:inherit}a.list-group-item-warning:focus,a.list-group-item-warning:hover,button.list-group-item-warning:focus,button.list-group-item-warning:hover{color:#8a6d3b;background-color:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:focus,a.list-group-item-warning.active:hover,button.list-group-item-warning.active,button.list-group-item-warning.active:focus,button.list-group-item-warning.active:hover{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger,button.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading,button.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:focus,a.list-group-item-danger:hover,button.list-group-item-danger:focus,button.list-group-item-danger:hover{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:focus,a.list-group-item-danger.active:hover,button.list-group-item-danger.active,button.list-group-item-danger.active:focus,button.list-group-item-danger.active:hover{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05)}.panel-body{padding:15px}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-left-radius:3px;border-top-right-radius:3px}.panel-heading>.dropdown .dropdown-toggle{color:inherit}.panel-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}.panel-title>.small,.panel-title>.small>a,.panel-title>a,.panel-title>small,.panel-title>small>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.list-group,.panel>.panel-collapse>.list-group{margin-bottom:0}.panel>.list-group .list-group-item,.panel>.panel-collapse>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group:first-child .list-group-item:first-child,.panel>.panel-collapse>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-left-radius:3px;border-top-right-radius:3px}.panel>.list-group:last-child .list-group-item:last-child,.panel>.panel-collapse>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.panel-heading+.panel-collapse>.list-group .list-group-item:first-child{border-top-left-radius:0;border-top-right-radius:0}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.list-group+.panel-footer{border-top-width:0}.panel>.panel-collapse>.table,.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel>.panel-collapse>.table caption,.panel>.table caption,.panel>.table-responsive>.table caption{padding-right:15px;padding-left:15px}.panel>.table-responsive:first-child>.table:first-child,.panel>.table:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child,.panel>.table:first-child>thead:first-child>tr:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table-responsive:last-child>.table:last-child,.panel>.table:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive,.panel>.table+.panel-body,.panel>.table-responsive+.panel-body{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child td,.panel>.table>tbody:first-child>tr:first-child th{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th{border-bottom:0}.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}.panel>.table-responsive{margin-bottom:0;border:0}.panel-group{margin-bottom:20px}.panel-group .panel{margin-bottom:0;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse>.list-group,.panel-group .panel-heading+.panel-collapse>.panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}.panel-default>.panel-heading .badge{color:#f5f5f5;background-color:#333}.panel-default>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#337ab7}.panel-primary>.panel-heading{color:#fff;background-color:#337ab7;border-color:#337ab7}.panel-primary>.panel-heading+.panel-collapse>.panel-body{border-top-color:#337ab7}.panel-primary>.panel-heading .badge{color:#337ab7;background-color:#fff}.panel-primary>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#337ab7}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse>.panel-body{border-top-color:#d6e9c6}.panel-success>.panel-heading .badge{color:#dff0d8;background-color:#3c763d}.panel-success>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse>.panel-body{border-top-color:#bce8f1}.panel-info>.panel-heading .badge{color:#d9edf7;background-color:#31708f}.panel-info>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse>.panel-body{border-top-color:#faebcc}.panel-warning>.panel-heading .badge{color:#fcf8e3;background-color:#8a6d3b}.panel-warning>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ebccd1}.panel-danger>.panel-heading .badge{color:#f2dede;background-color:#a94442}.panel-danger>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ebccd1}.embed-responsive{position:relative;display:block;height:0;padding:0;overflow:hidden}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}.embed-responsive-16by9{padding-bottom:56.25%}.embed-responsive-4by3{padding-bottom:75%}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;filter:alpha(opacity=20);opacity:.2}.close:focus,.close:hover{color:#000;text-decoration:none;cursor:pointer;filter:alpha(opacity=50);opacity:.5}button.close{-webkit-appearance:none;padding:0;cursor:pointer;background:0 0;border:0}.modal-open{overflow:hidden}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;display:none;overflow:hidden;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transition:-webkit-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out;-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);-o-transform:translate(0,-25%);transform:translate(0,-25%)}.modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);-o-transform:translate(0,0);transform:translate(0,0)}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal-dialog{position:relative;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #999;border:1px solid rgba(0,0,0,.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5)}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{filter:alpha(opacity=0);opacity:0}.modal-backdrop.in{filter:alpha(opacity=50);opacity:.5}.modal-header{padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.42857143}.modal-body{position:relative;padding:15px}.modal-footer{padding:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,.5);box-shadow:0 5px 15px rgba(0,0,0,.5)}.modal-sm{width:300px}}@media (min-width:992px){.modal-lg{width:900px}}.tooltip{position:absolute;z-index:1070;display:block;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:12px;font-style:normal;font-weight:400;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;filter:alpha(opacity=0);opacity:0;line-break:auto}.tooltip.in{filter:alpha(opacity=90);opacity:.9}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-left .tooltip-arrow{right:5px;bottom:0;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-right .tooltip-arrow{bottom:0;left:5px;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-left .tooltip-arrow{top:0;right:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-right .tooltip-arrow{top:0;left:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.popover{position:absolute;top:0;left:0;z-index:1060;display:none;max-width:276px;padding:1px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;font-style:normal;font-weight:400;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2);line-break:auto}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover>.arrow,.popover>.arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover>.arrow{border-width:11px}.popover>.arrow:after{content:"";border-width:10px}.popover.top>.arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,.25);border-bottom-width:0}.popover.top>.arrow:after{bottom:1px;margin-left:-10px;content:" ";border-top-color:#fff;border-bottom-width:0}.popover.right>.arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,.25);border-left-width:0}.popover.right>.arrow:after{bottom:-10px;left:1px;content:" ";border-right-color:#fff;border-left-width:0}.popover.bottom>.arrow{top:-11px;left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,.25)}.popover.bottom>.arrow:after{top:1px;margin-left:-10px;content:" ";border-top-width:0;border-bottom-color:#fff}.popover.left>.arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,.25)}.popover.left>.arrow:after{right:1px;bottom:-10px;content:" ";border-right-width:0;border-left-color:#fff}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>a>img,.carousel-inner>.item>img{line-height:1}@media all and (transform-3d),(-webkit-transform-3d){.carousel-inner>.item{-webkit-transition:-webkit-transform .6s ease-in-out;-o-transition:-o-transform .6s ease-in-out;transition:transform .6s ease-in-out;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-perspective:1000px;perspective:1000px}.carousel-inner>.item.active.right,.carousel-inner>.item.next{left:0;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}.carousel-inner>.item.active.left,.carousel-inner>.item.prev{left:0;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}.carousel-inner>.item.active,.carousel-inner>.item.next.left,.carousel-inner>.item.prev.right{left:0;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;bottom:0;left:0;width:15%;font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6);background-color:rgba(0,0,0,0);filter:alpha(opacity=50);opacity:.5}.carousel-control.left{background-image:-webkit-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,.0001)));background-image:linear-gradient(to right,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);background-repeat:repeat-x}.carousel-control.right{right:0;left:auto;background-image:-webkit-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.0001)),to(rgba(0,0,0,.5)));background-image:linear-gradient(to right,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);background-repeat:repeat-x}.carousel-control:focus,.carousel-control:hover{color:#fff;text-decoration:none;filter:alpha(opacity=90);outline:0;opacity:.9}.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{position:absolute;top:50%;z-index:5;display:inline-block;margin-top:-10px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{left:50%;margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{right:50%;margin-right:-10px}.carousel-control .icon-next,.carousel-control .icon-prev{width:20px;height:20px;font-family:serif;line-height:1}.carousel-control .icon-prev:before{content:'\2039'}.carousel-control .icon-next:before{content:'\203a'}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;padding-left:0;margin-left:-30%;text-align:center;list-style:none}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;cursor:pointer;background-color:#000\9;background-color:rgba(0,0,0,0);border:1px solid #fff;border-radius:10px}.carousel-indicators .active{width:12px;height:12px;margin:0;background-color:#fff}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{width:30px;height:30px;margin-top:-10px;font-size:30px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{margin-right:-10px}.carousel-caption{right:20%;left:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.btn-group-vertical>.btn-group:after,.btn-group-vertical>.btn-group:before,.btn-toolbar:after,.btn-toolbar:before,.clearfix:after,.clearfix:before,.container-fluid:after,.container-fluid:before,.container:after,.container:before,.dl-horizontal dd:after,.dl-horizontal dd:before,.form-horizontal .form-group:after,.form-horizontal .form-group:before,.modal-footer:after,.modal-footer:before,.modal-header:after,.modal-header:before,.nav:after,.nav:before,.navbar-collapse:after,.navbar-collapse:before,.navbar-header:after,.navbar-header:before,.navbar:after,.navbar:before,.pager:after,.pager:before,.panel-body:after,.panel-body:before,.row:after,.row:before{display:table;content:" "}.btn-group-vertical>.btn-group:after,.btn-toolbar:after,.clearfix:after,.container-fluid:after,.container:after,.dl-horizontal dd:after,.form-horizontal .form-group:after,.modal-footer:after,.modal-header:after,.nav:after,.navbar-collapse:after,.navbar-header:after,.navbar:after,.pager:after,.panel-body:after,.row:after{clear:both}.center-block{display:block;margin-right:auto;margin-left:auto}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none!important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-lg,.visible-md,.visible-sm,.visible-xs{display:none!important}.visible-lg-block,.visible-lg-inline,.visible-lg-inline-block,.visible-md-block,.visible-md-inline,.visible-md-inline-block,.visible-sm-block,.visible-sm-inline,.visible-sm-inline-block,.visible-xs-block,.visible-xs-inline,.visible-xs-inline-block{display:none!important}@media (max-width:767px){.visible-xs{display:block!important}table.visible-xs{display:table!important}tr.visible-xs{display:table-row!important}td.visible-xs,th.visible-xs{display:table-cell!important}}@media (max-width:767px){.visible-xs-block{display:block!important}}@media (max-width:767px){.visible-xs-inline{display:inline!important}}@media (max-width:767px){.visible-xs-inline-block{display:inline-block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block!important}table.visible-sm{display:table!important}tr.visible-sm{display:table-row!important}td.visible-sm,th.visible-sm{display:table-cell!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-block{display:block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline{display:inline!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline-block{display:inline-block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md{display:block!important}table.visible-md{display:table!important}tr.visible-md{display:table-row!important}td.visible-md,th.visible-md{display:table-cell!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-block{display:block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline{display:inline!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline-block{display:inline-block!important}}@media (min-width:1200px){.visible-lg{display:block!important}table.visible-lg{display:table!important}tr.visible-lg{display:table-row!important}td.visible-lg,th.visible-lg{display:table-cell!important}}@media (min-width:1200px){.visible-lg-block{display:block!important}}@media (min-width:1200px){.visible-lg-inline{display:inline!important}}@media (min-width:1200px){.visible-lg-inline-block{display:inline-block!important}}@media (max-width:767px){.hidden-xs{display:none!important}}@media (min-width:768px) and (max-width:991px){.hidden-sm{display:none!important}}@media (min-width:992px) and (max-width:1199px){.hidden-md{display:none!important}}@media (min-width:1200px){.hidden-lg{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:block!important}table.visible-print{display:table!important}tr.visible-print{display:table-row!important}td.visible-print,th.visible-print{display:table-cell!important}}.visible-print-block{display:none!important}@media print{.visible-print-block{display:block!important}}.visible-print-inline{display:none!important}@media print{.visible-print-inline{display:inline!important}}.visible-print-inline-block{display:none!important}@media print{.visible-print-inline-block{display:inline-block!important}}@media print{.hidden-print{display:none!important}}
-/*# sourceMappingURL=bootstrap.min.css.map */
\ No newline at end of file
diff --git a/NewLife.Cube/Content/bootstrap/css/font-awesome.min.css b/NewLife.Cube/Content/bootstrap/css/font-awesome.min.css
deleted file mode 100644
index 9f8a3e3489..0000000000
--- a/NewLife.Cube/Content/bootstrap/css/font-awesome.min.css
+++ /dev/null
@@ -1,4 +0,0 @@
-/*!
- *  Font Awesome 4.2.0 by @davegandy - http://fontawesome.io - @fontawesome
- *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
- */@font-face{font-family:FontAwesome;src:url(../fonts/fontawesome-webfont.eot?v=4.2.0);src:url(../fonts/fontawesome-webfont.eot?#iefix&v=4.2.0) format('embedded-opentype'),url(../fonts/fontawesome-webfont.woff?v=4.2.0) format('woff'),url(../fonts/fontawesome-webfont.ttf?v=4.2.0) format('truetype'),url(../fonts/fontawesome-webfont.svg?v=4.2.0#fontawesomeregular) format('svg');font-weight:400;font-style:normal}.fa{display:inline-block;font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571429em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14285714em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14285714em;width:2.14285714em;top:.14285714em;text-align:center}.fa-li.fa-lg{left:-1.85714286em}.fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.fa.pull-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);-webkit-transform:scale(-1,1);-ms-transform:scale(-1,1);transform:scale(-1,1)}.fa-flip-vertical{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1);-webkit-transform:scale(1,-1);-ms-transform:scale(1,-1);transform:scale(1,-1)}:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-flip-horizontal,:root .fa-flip-vertical{filter:none}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:"\f000"}.fa-music:before{content:"\f001"}.fa-search:before{content:"\f002"}.fa-envelope-o:before{content:"\f003"}.fa-heart:before{content:"\f004"}.fa-star:before{content:"\f005"}.fa-star-o:before{content:"\f006"}.fa-user:before{content:"\f007"}.fa-film:before{content:"\f008"}.fa-th-large:before{content:"\f009"}.fa-th:before{content:"\f00a"}.fa-th-list:before{content:"\f00b"}.fa-check:before{content:"\f00c"}.fa-remove:before,.fa-close:before,.fa-times:before{content:"\f00d"}.fa-search-plus:before{content:"\f00e"}.fa-search-minus:before{content:"\f010"}.fa-power-off:before{content:"\f011"}.fa-signal:before{content:"\f012"}.fa-gear:before,.fa-cog:before{content:"\f013"}.fa-trash-o:before{content:"\f014"}.fa-home:before{content:"\f015"}.fa-file-o:before{content:"\f016"}.fa-clock-o:before{content:"\f017"}.fa-road:before{content:"\f018"}.fa-download:before{content:"\f019"}.fa-arrow-circle-o-down:before{content:"\f01a"}.fa-arrow-circle-o-up:before{content:"\f01b"}.fa-inbox:before{content:"\f01c"}.fa-play-circle-o:before{content:"\f01d"}.fa-rotate-right:before,.fa-repeat:before{content:"\f01e"}.fa-refresh:before{content:"\f021"}.fa-list-alt:before{content:"\f022"}.fa-lock:before{content:"\f023"}.fa-flag:before{content:"\f024"}.fa-headphones:before{content:"\f025"}.fa-volume-off:before{content:"\f026"}.fa-volume-down:before{content:"\f027"}.fa-volume-up:before{content:"\f028"}.fa-qrcode:before{content:"\f029"}.fa-barcode:before{content:"\f02a"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-book:before{content:"\f02d"}.fa-bookmark:before{content:"\f02e"}.fa-print:before{content:"\f02f"}.fa-camera:before{content:"\f030"}.fa-font:before{content:"\f031"}.fa-bold:before{content:"\f032"}.fa-italic:before{content:"\f033"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-align-left:before{content:"\f036"}.fa-align-center:before{content:"\f037"}.fa-align-right:before{content:"\f038"}.fa-align-justify:before{content:"\f039"}.fa-list:before{content:"\f03a"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-indent:before{content:"\f03c"}.fa-video-camera:before{content:"\f03d"}.fa-photo:before,.fa-image:before,.fa-picture-o:before{content:"\f03e"}.fa-pencil:before{content:"\f040"}.fa-map-marker:before{content:"\f041"}.fa-adjust:before{content:"\f042"}.fa-tint:before{content:"\f043"}.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}.fa-share-square-o:before{content:"\f045"}.fa-check-square-o:before{content:"\f046"}.fa-arrows:before{content:"\f047"}.fa-step-backward:before{content:"\f048"}.fa-fast-backward:before{content:"\f049"}.fa-backward:before{content:"\f04a"}.fa-play:before{content:"\f04b"}.fa-pause:before{content:"\f04c"}.fa-stop:before{content:"\f04d"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before{content:"\f050"}.fa-step-forward:before{content:"\f051"}.fa-eject:before{content:"\f052"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-plus-circle:before{content:"\f055"}.fa-minus-circle:before{content:"\f056"}.fa-times-circle:before{content:"\f057"}.fa-check-circle:before{content:"\f058"}.fa-question-circle:before{content:"\f059"}.fa-info-circle:before{content:"\f05a"}.fa-crosshairs:before{content:"\f05b"}.fa-times-circle-o:before{content:"\f05c"}.fa-check-circle-o:before{content:"\f05d"}.fa-ban:before{content:"\f05e"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-down:before{content:"\f063"}.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-expand:before{content:"\f065"}.fa-compress:before{content:"\f066"}.fa-plus:before{content:"\f067"}.fa-minus:before{content:"\f068"}.fa-asterisk:before{content:"\f069"}.fa-exclamation-circle:before{content:"\f06a"}.fa-gift:before{content:"\f06b"}.fa-leaf:before{content:"\f06c"}.fa-fire:before{content:"\f06d"}.fa-eye:before{content:"\f06e"}.fa-eye-slash:before{content:"\f070"}.fa-warning:before,.fa-exclamation-triangle:before{content:"\f071"}.fa-plane:before{content:"\f072"}.fa-calendar:before{content:"\f073"}.fa-random:before{content:"\f074"}.fa-comment:before{content:"\f075"}.fa-magnet:before{content:"\f076"}.fa-chevron-up:before{content:"\f077"}.fa-chevron-down:before{content:"\f078"}.fa-retweet:before{content:"\f079"}.fa-shopping-cart:before{content:"\f07a"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-arrows-v:before{content:"\f07d"}.fa-arrows-h:before{content:"\f07e"}.fa-bar-chart-o:before,.fa-bar-chart:before{content:"\f080"}.fa-twitter-square:before{content:"\f081"}.fa-facebook-square:before{content:"\f082"}.fa-camera-retro:before{content:"\f083"}.fa-key:before{content:"\f084"}.fa-gears:before,.fa-cogs:before{content:"\f085"}.fa-comments:before{content:"\f086"}.fa-thumbs-o-up:before{content:"\f087"}.fa-thumbs-o-down:before{content:"\f088"}.fa-star-half:before{content:"\f089"}.fa-heart-o:before{content:"\f08a"}.fa-sign-out:before{content:"\f08b"}.fa-linkedin-square:before{content:"\f08c"}.fa-thumb-tack:before{content:"\f08d"}.fa-external-link:before{content:"\f08e"}.fa-sign-in:before{content:"\f090"}.fa-trophy:before{content:"\f091"}.fa-github-square:before{content:"\f092"}.fa-upload:before{content:"\f093"}.fa-lemon-o:before{content:"\f094"}.fa-phone:before{content:"\f095"}.fa-square-o:before{content:"\f096"}.fa-bookmark-o:before{content:"\f097"}.fa-phone-square:before{content:"\f098"}.fa-twitter:before{content:"\f099"}.fa-facebook:before{content:"\f09a"}.fa-github:before{content:"\f09b"}.fa-unlock:before{content:"\f09c"}.fa-credit-card:before{content:"\f09d"}.fa-rss:before{content:"\f09e"}.fa-hdd-o:before{content:"\f0a0"}.fa-bullhorn:before{content:"\f0a1"}.fa-bell:before{content:"\f0f3"}.fa-certificate:before{content:"\f0a3"}.fa-hand-o-right:before{content:"\f0a4"}.fa-hand-o-left:before{content:"\f0a5"}.fa-hand-o-up:before{content:"\f0a6"}.fa-hand-o-down:before{content:"\f0a7"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-globe:before{content:"\f0ac"}.fa-wrench:before{content:"\f0ad"}.fa-tasks:before{content:"\f0ae"}.fa-filter:before{content:"\f0b0"}.fa-briefcase:before{content:"\f0b1"}.fa-arrows-alt:before{content:"\f0b2"}.fa-group:before,.fa-users:before{content:"\f0c0"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-cloud:before{content:"\f0c2"}.fa-flask:before{content:"\f0c3"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-copy:before,.fa-files-o:before{content:"\f0c5"}.fa-paperclip:before{content:"\f0c6"}.fa-save:before,.fa-floppy-o:before{content:"\f0c7"}.fa-square:before{content:"\f0c8"}.fa-navicon:before,.fa-reorder:before,.fa-bars:before{content:"\f0c9"}.fa-list-ul:before{content:"\f0ca"}.fa-list-ol:before{content:"\f0cb"}.fa-strikethrough:before{content:"\f0cc"}.fa-underline:before{content:"\f0cd"}.fa-table:before{content:"\f0ce"}.fa-magic:before{content:"\f0d0"}.fa-truck:before{content:"\f0d1"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-plus:before{content:"\f0d5"}.fa-money:before{content:"\f0d6"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-columns:before{content:"\f0db"}.fa-unsorted:before,.fa-sort:before{content:"\f0dc"}.fa-sort-down:before,.fa-sort-desc:before{content:"\f0dd"}.fa-sort-up:before,.fa-sort-asc:before{content:"\f0de"}.fa-envelope:before{content:"\f0e0"}.fa-linkedin:before{content:"\f0e1"}.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-legal:before,.fa-gavel:before{content:"\f0e3"}.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}.fa-comment-o:before{content:"\f0e5"}.fa-comments-o:before{content:"\f0e6"}.fa-flash:before,.fa-bolt:before{content:"\f0e7"}.fa-sitemap:before{content:"\f0e8"}.fa-umbrella:before{content:"\f0e9"}.fa-paste:before,.fa-clipboard:before{content:"\f0ea"}.fa-lightbulb-o:before{content:"\f0eb"}.fa-exchange:before{content:"\f0ec"}.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-upload:before{content:"\f0ee"}.fa-user-md:before{content:"\f0f0"}.fa-stethoscope:before{content:"\f0f1"}.fa-suitcase:before{content:"\f0f2"}.fa-bell-o:before{content:"\f0a2"}.fa-coffee:before{content:"\f0f4"}.fa-cutlery:before{content:"\f0f5"}.fa-file-text-o:before{content:"\f0f6"}.fa-building-o:before{content:"\f0f7"}.fa-hospital-o:before{content:"\f0f8"}.fa-ambulance:before{content:"\f0f9"}.fa-medkit:before{content:"\f0fa"}.fa-fighter-jet:before{content:"\f0fb"}.fa-beer:before{content:"\f0fc"}.fa-h-square:before{content:"\f0fd"}.fa-plus-square:before{content:"\f0fe"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-down:before{content:"\f107"}.fa-desktop:before{content:"\f108"}.fa-laptop:before{content:"\f109"}.fa-tablet:before{content:"\f10a"}.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}.fa-circle-o:before{content:"\f10c"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-spinner:before{content:"\f110"}.fa-circle:before{content:"\f111"}.fa-mail-reply:before,.fa-reply:before{content:"\f112"}.fa-github-alt:before{content:"\f113"}.fa-folder-o:before{content:"\f114"}.fa-folder-open-o:before{content:"\f115"}.fa-smile-o:before{content:"\f118"}.fa-frown-o:before{content:"\f119"}.fa-meh-o:before{content:"\f11a"}.fa-gamepad:before{content:"\f11b"}.fa-keyboard-o:before{content:"\f11c"}.fa-flag-o:before{content:"\f11d"}.fa-flag-checkered:before{content:"\f11e"}.fa-terminal:before{content:"\f120"}.fa-code:before{content:"\f121"}.fa-mail-reply-all:before,.fa-reply-all:before{content:"\f122"}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}.fa-location-arrow:before{content:"\f124"}.fa-crop:before{content:"\f125"}.fa-code-fork:before{content:"\f126"}.fa-unlink:before,.fa-chain-broken:before{content:"\f127"}.fa-question:before{content:"\f128"}.fa-info:before{content:"\f129"}.fa-exclamation:before{content:"\f12a"}.fa-superscript:before{content:"\f12b"}.fa-subscript:before{content:"\f12c"}.fa-eraser:before{content:"\f12d"}.fa-puzzle-piece:before{content:"\f12e"}.fa-microphone:before{content:"\f130"}.fa-microphone-slash:before{content:"\f131"}.fa-shield:before{content:"\f132"}.fa-calendar-o:before{content:"\f133"}.fa-fire-extinguisher:before{content:"\f134"}.fa-rocket:before{content:"\f135"}.fa-maxcdn:before{content:"\f136"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-html5:before{content:"\f13b"}.fa-css3:before{content:"\f13c"}.fa-anchor:before{content:"\f13d"}.fa-unlock-alt:before{content:"\f13e"}.fa-bullseye:before{content:"\f140"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-rss-square:before{content:"\f143"}.fa-play-circle:before{content:"\f144"}.fa-ticket:before{content:"\f145"}.fa-minus-square:before{content:"\f146"}.fa-minus-square-o:before{content:"\f147"}.fa-level-up:before{content:"\f148"}.fa-level-down:before{content:"\f149"}.fa-check-square:before{content:"\f14a"}.fa-pencil-square:before{content:"\f14b"}.fa-external-link-square:before{content:"\f14c"}.fa-share-square:before{content:"\f14d"}.fa-compass:before{content:"\f14e"}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:"\f150"}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:"\f151"}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:"\f152"}.fa-euro:before,.fa-eur:before{content:"\f153"}.fa-gbp:before{content:"\f154"}.fa-dollar:before,.fa-usd:before{content:"\f155"}.fa-rupee:before,.fa-inr:before{content:"\f156"}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:"\f157"}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:"\f158"}.fa-won:before,.fa-krw:before{content:"\f159"}.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}.fa-file:before{content:"\f15b"}.fa-file-text:before{content:"\f15c"}.fa-sort-alpha-asc:before{content:"\f15d"}.fa-sort-alpha-desc:before{content:"\f15e"}.fa-sort-amount-asc:before{content:"\f160"}.fa-sort-amount-desc:before{content:"\f161"}.fa-sort-numeric-asc:before{content:"\f162"}.fa-sort-numeric-desc:before{content:"\f163"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbs-down:before{content:"\f165"}.fa-youtube-square:before{content:"\f166"}.fa-youtube:before{content:"\f167"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-youtube-play:before{content:"\f16a"}.fa-dropbox:before{content:"\f16b"}.fa-stack-overflow:before{content:"\f16c"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-adn:before{content:"\f170"}.fa-bitbucket:before{content:"\f171"}.fa-bitbucket-square:before{content:"\f172"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-long-arrow-down:before{content:"\f175"}.fa-long-arrow-up:before{content:"\f176"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-apple:before{content:"\f179"}.fa-windows:before{content:"\f17a"}.fa-android:before{content:"\f17b"}.fa-linux:before{content:"\f17c"}.fa-dribbble:before{content:"\f17d"}.fa-skype:before{content:"\f17e"}.fa-foursquare:before{content:"\f180"}.fa-trello:before{content:"\f181"}.fa-female:before{content:"\f182"}.fa-male:before{content:"\f183"}.fa-gittip:before{content:"\f184"}.fa-sun-o:before{content:"\f185"}.fa-moon-o:before{content:"\f186"}.fa-archive:before{content:"\f187"}.fa-bug:before{content:"\f188"}.fa-vk:before{content:"\f189"}.fa-weibo:before{content:"\f18a"}.fa-renren:before{content:"\f18b"}.fa-pagelines:before{content:"\f18c"}.fa-stack-exchange:before{content:"\f18d"}.fa-arrow-circle-o-right:before{content:"\f18e"}.fa-arrow-circle-o-left:before{content:"\f190"}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:"\f191"}.fa-dot-circle-o:before{content:"\f192"}.fa-wheelchair:before{content:"\f193"}.fa-vimeo-square:before{content:"\f194"}.fa-turkish-lira:before,.fa-try:before{content:"\f195"}.fa-plus-square-o:before{content:"\f196"}.fa-space-shuttle:before{content:"\f197"}.fa-slack:before{content:"\f198"}.fa-envelope-square:before{content:"\f199"}.fa-wordpress:before{content:"\f19a"}.fa-openid:before{content:"\f19b"}.fa-institution:before,.fa-bank:before,.fa-university:before{content:"\f19c"}.fa-mortar-board:before,.fa-graduation-cap:before{content:"\f19d"}.fa-yahoo:before{content:"\f19e"}.fa-google:before{content:"\f1a0"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-square:before{content:"\f1a2"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-stumbleupon:before{content:"\f1a4"}.fa-delicious:before{content:"\f1a5"}.fa-digg:before{content:"\f1a6"}.fa-pied-piper:before{content:"\f1a7"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-drupal:before{content:"\f1a9"}.fa-joomla:before{content:"\f1aa"}.fa-language:before{content:"\f1ab"}.fa-fax:before{content:"\f1ac"}.fa-building:before{content:"\f1ad"}.fa-child:before{content:"\f1ae"}.fa-paw:before{content:"\f1b0"}.fa-spoon:before{content:"\f1b1"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-recycle:before{content:"\f1b8"}.fa-automobile:before,.fa-car:before{content:"\f1b9"}.fa-cab:before,.fa-taxi:before{content:"\f1ba"}.fa-tree:before{content:"\f1bb"}.fa-spotify:before{content:"\f1bc"}.fa-deviantart:before{content:"\f1bd"}.fa-soundcloud:before{content:"\f1be"}.fa-database:before{content:"\f1c0"}.fa-file-pdf-o:before{content:"\f1c1"}.fa-file-word-o:before{content:"\f1c2"}.fa-file-excel-o:before{content:"\f1c3"}.fa-file-powerpoint-o:before{content:"\f1c4"}.fa-file-photo-o:before,.fa-file-picture-o:before,.fa-file-image-o:before{content:"\f1c5"}.fa-file-zip-o:before,.fa-file-archive-o:before{content:"\f1c6"}.fa-file-sound-o:before,.fa-file-audio-o:before{content:"\f1c7"}.fa-file-movie-o:before,.fa-file-video-o:before{content:"\f1c8"}.fa-file-code-o:before{content:"\f1c9"}.fa-vine:before{content:"\f1ca"}.fa-codepen:before{content:"\f1cb"}.fa-jsfiddle:before{content:"\f1cc"}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-saver:before,.fa-support:before,.fa-life-ring:before{content:"\f1cd"}.fa-circle-o-notch:before{content:"\f1ce"}.fa-ra:before,.fa-rebel:before{content:"\f1d0"}.fa-ge:before,.fa-empire:before{content:"\f1d1"}.fa-git-square:before{content:"\f1d2"}.fa-git:before{content:"\f1d3"}.fa-hacker-news:before{content:"\f1d4"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-qq:before{content:"\f1d6"}.fa-wechat:before,.fa-weixin:before{content:"\f1d7"}.fa-send:before,.fa-paper-plane:before{content:"\f1d8"}.fa-send-o:before,.fa-paper-plane-o:before{content:"\f1d9"}.fa-history:before{content:"\f1da"}.fa-circle-thin:before{content:"\f1db"}.fa-header:before{content:"\f1dc"}.fa-paragraph:before{content:"\f1dd"}.fa-sliders:before{content:"\f1de"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-bomb:before{content:"\f1e2"}.fa-soccer-ball-o:before,.fa-futbol-o:before{content:"\f1e3"}.fa-tty:before{content:"\f1e4"}.fa-binoculars:before{content:"\f1e5"}.fa-plug:before{content:"\f1e6"}.fa-slideshare:before{content:"\f1e7"}.fa-twitch:before{content:"\f1e8"}.fa-yelp:before{content:"\f1e9"}.fa-newspaper-o:before{content:"\f1ea"}.fa-wifi:before{content:"\f1eb"}.fa-calculator:before{content:"\f1ec"}.fa-paypal:before{content:"\f1ed"}.fa-google-wallet:before{content:"\f1ee"}.fa-cc-visa:before{content:"\f1f0"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-bell-slash:before{content:"\f1f6"}.fa-bell-slash-o:before{content:"\f1f7"}.fa-trash:before{content:"\f1f8"}.fa-copyright:before{content:"\f1f9"}.fa-at:before{content:"\f1fa"}.fa-eyedropper:before{content:"\f1fb"}.fa-paint-brush:before{content:"\f1fc"}.fa-birthday-cake:before{content:"\f1fd"}.fa-area-chart:before{content:"\f1fe"}.fa-pie-chart:before{content:"\f200"}.fa-line-chart:before{content:"\f201"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-bicycle:before{content:"\f206"}.fa-bus:before{content:"\f207"}.fa-ioxhost:before{content:"\f208"}.fa-angellist:before{content:"\f209"}.fa-cc:before{content:"\f20a"}.fa-shekel:before,.fa-sheqel:before,.fa-ils:before{content:"\f20b"}.fa-meanpath:before{content:"\f20c"}
\ No newline at end of file
diff --git a/NewLife.Cube/Content/bootstrap/fonts/FontAwesome.otf b/NewLife.Cube/Content/bootstrap/fonts/FontAwesome.otf
deleted file mode 100644
index 81c9ad949b..0000000000
Binary files a/NewLife.Cube/Content/bootstrap/fonts/FontAwesome.otf and /dev/null differ
diff --git a/NewLife.Cube/Content/bootstrap/fonts/fontawesome-webfont.eot b/NewLife.Cube/Content/bootstrap/fonts/fontawesome-webfont.eot
deleted file mode 100644
index 84677bc0c5..0000000000
Binary files a/NewLife.Cube/Content/bootstrap/fonts/fontawesome-webfont.eot and /dev/null differ
diff --git a/NewLife.Cube/Content/bootstrap/fonts/fontawesome-webfont.svg b/NewLife.Cube/Content/bootstrap/fonts/fontawesome-webfont.svg
deleted file mode 100644
index d907b25ae6..0000000000
--- a/NewLife.Cube/Content/bootstrap/fonts/fontawesome-webfont.svg
+++ /dev/null
@@ -1,520 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata></metadata>
-<defs>
-<font id="fontawesomeregular" horiz-adv-x="1536" >
-<font-face units-per-em="1792" ascent="1536" descent="-256" />
-<missing-glyph horiz-adv-x="448" />
-<glyph unicode=" "  horiz-adv-x="448" />
-<glyph unicode="&#x09;" horiz-adv-x="448" />
-<glyph unicode="&#xa0;" horiz-adv-x="448" />
-<glyph unicode="&#xa8;" horiz-adv-x="1792" />
-<glyph unicode="&#xa9;" horiz-adv-x="1792" />
-<glyph unicode="&#xae;" horiz-adv-x="1792" />
-<glyph unicode="&#xb4;" horiz-adv-x="1792" />
-<glyph unicode="&#xc6;" horiz-adv-x="1792" />
-<glyph unicode="&#xd8;" horiz-adv-x="1792" />
-<glyph unicode="&#x2000;" horiz-adv-x="768" />
-<glyph unicode="&#x2001;" horiz-adv-x="1537" />
-<glyph unicode="&#x2002;" horiz-adv-x="768" />
-<glyph unicode="&#x2003;" horiz-adv-x="1537" />
-<glyph unicode="&#x2004;" horiz-adv-x="512" />
-<glyph unicode="&#x2005;" horiz-adv-x="384" />
-<glyph unicode="&#x2006;" horiz-adv-x="256" />
-<glyph unicode="&#x2007;" horiz-adv-x="256" />
-<glyph unicode="&#x2008;" horiz-adv-x="192" />
-<glyph unicode="&#x2009;" horiz-adv-x="307" />
-<glyph unicode="&#x200a;" horiz-adv-x="85" />
-<glyph unicode="&#x202f;" horiz-adv-x="307" />
-<glyph unicode="&#x205f;" horiz-adv-x="384" />
-<glyph unicode="&#x2122;" horiz-adv-x="1792" />
-<glyph unicode="&#x221e;" horiz-adv-x="1792" />
-<glyph unicode="&#x2260;" horiz-adv-x="1792" />
-<glyph unicode="&#x25fc;" horiz-adv-x="500" d="M0 0z" />
-<glyph unicode="&#xf000;" horiz-adv-x="1792" d="M1699 1350q0 -35 -43 -78l-632 -632v-768h320q26 0 45 -19t19 -45t-19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45t45 19h320v768l-632 632q-43 43 -43 78q0 23 18 36.5t38 17.5t43 4h1408q23 0 43 -4t38 -17.5t18 -36.5z" />
-<glyph unicode="&#xf001;" d="M1536 1312v-1120q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v537l-768 -237v-709q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89 t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v967q0 31 19 56.5t49 35.5l832 256q12 4 28 4q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf002;" horiz-adv-x="1664" d="M1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -52 -38 -90t-90 -38q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5 t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
-<glyph unicode="&#xf003;" horiz-adv-x="1792" d="M1664 32v768q-32 -36 -69 -66q-268 -206 -426 -338q-51 -43 -83 -67t-86.5 -48.5t-102.5 -24.5h-1h-1q-48 0 -102.5 24.5t-86.5 48.5t-83 67q-158 132 -426 338q-37 30 -69 66v-768q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1664 1083v11v13.5t-0.5 13 t-3 12.5t-5.5 9t-9 7.5t-14 2.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5q0 -168 147 -284q193 -152 401 -317q6 -5 35 -29.5t46 -37.5t44.5 -31.5t50.5 -27.5t43 -9h1h1q20 0 43 9t50.5 27.5t44.5 31.5t46 37.5t35 29.5q208 165 401 317q54 43 100.5 115.5t46.5 131.5z M1792 1120v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf004;" horiz-adv-x="1792" d="M896 -128q-26 0 -44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124t127 -344q0 -221 -229 -450l-623 -600 q-18 -18 -44 -18z" />
-<glyph unicode="&#xf005;" horiz-adv-x="1664" d="M1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -21 -10.5 -35.5t-30.5 -14.5q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455 l502 -73q56 -9 56 -46z" />
-<glyph unicode="&#xf006;" horiz-adv-x="1664" d="M1137 532l306 297l-422 62l-189 382l-189 -382l-422 -62l306 -297l-73 -421l378 199l377 -199zM1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -50 -41 -50q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500 l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455l502 -73q56 -9 56 -46z" />
-<glyph unicode="&#xf007;" horiz-adv-x="1408" d="M1408 131q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5t43 97.5t62 81t85.5 53.5t111.5 20q9 0 42 -21.5t74.5 -48t108 -48t133.5 -21.5t133.5 21.5t108 48t74.5 48t42 21.5q61 0 111.5 -20t85.5 -53.5t62 -81 t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" />
-<glyph unicode="&#xf008;" horiz-adv-x="1920" d="M384 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 320v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 704v128q0 26 -19 45t-45 19h-128 q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 -64v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM384 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45 t45 -19h128q26 0 45 19t19 45zM1792 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 704v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1792 320v128 q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 704v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19 t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1920 1248v-1344q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1344q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf009;" horiz-adv-x="1664" d="M768 512v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM768 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 512v-384q0 -52 -38 -90t-90 -38 h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf00a;" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 288v-192q0 -40 -28 -68t-68 -28h-320 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28 h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf00b;" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-960 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28 h960q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf00c;" horiz-adv-x="1792" d="M1671 970q0 -40 -28 -68l-724 -724l-136 -136q-28 -28 -68 -28t-68 28l-136 136l-362 362q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -295l656 657q28 28 68 28t68 -28l136 -136q28 -28 28 -68z" />
-<glyph unicode="&#xf00d;" horiz-adv-x="1408" d="M1298 214q0 -40 -28 -68l-136 -136q-28 -28 -68 -28t-68 28l-294 294l-294 -294q-28 -28 -68 -28t-68 28l-136 136q-28 28 -28 68t28 68l294 294l-294 294q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -294l294 294q28 28 68 28t68 -28l136 -136q28 -28 28 -68 t-28 -68l-294 -294l294 -294q28 -28 28 -68z" />
-<glyph unicode="&#xf00e;" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-224q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v224h-224q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h224v224q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5v-224h224 q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5 t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
-<glyph unicode="&#xf010;" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-576q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h576q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5z M1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z " />
-<glyph unicode="&#xf011;" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61t-298 61t-245 164t-164 245t-61 298q0 182 80.5 343t226.5 270q43 32 95.5 25t83.5 -50q32 -42 24.5 -94.5t-49.5 -84.5q-98 -74 -151.5 -181t-53.5 -228q0 -104 40.5 -198.5t109.5 -163.5t163.5 -109.5 t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5q0 121 -53.5 228t-151.5 181q-42 32 -49.5 84.5t24.5 94.5q31 43 84 50t95 -25q146 -109 226.5 -270t80.5 -343zM896 1408v-640q0 -52 -38 -90t-90 -38t-90 38t-38 90v640q0 52 38 90t90 38t90 -38t38 -90z" />
-<glyph unicode="&#xf012;" horiz-adv-x="1792" d="M256 96v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 224v-320q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 480v-576q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23 v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1408 864v-960q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1376v-1472q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1472q0 14 9 23t23 9h192q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf013;" d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1536 749v-222q0 -12 -8 -23t-20 -13l-185 -28q-19 -54 -39 -91q35 -50 107 -138q10 -12 10 -25t-9 -23q-27 -37 -99 -108t-94 -71q-12 0 -26 9l-138 108q-44 -23 -91 -38 q-16 -136 -29 -186q-7 -28 -36 -28h-222q-14 0 -24.5 8.5t-11.5 21.5l-28 184q-49 16 -90 37l-141 -107q-10 -9 -25 -9q-14 0 -25 11q-126 114 -165 168q-7 10 -7 23q0 12 8 23q15 21 51 66.5t54 70.5q-27 50 -41 99l-183 27q-13 2 -21 12.5t-8 23.5v222q0 12 8 23t19 13 l186 28q14 46 39 92q-40 57 -107 138q-10 12 -10 24q0 10 9 23q26 36 98.5 107.5t94.5 71.5q13 0 26 -10l138 -107q44 23 91 38q16 136 29 186q7 28 36 28h222q14 0 24.5 -8.5t11.5 -21.5l28 -184q49 -16 90 -37l142 107q9 9 24 9q13 0 25 -10q129 -119 165 -170q7 -8 7 -22 q0 -12 -8 -23q-15 -21 -51 -66.5t-54 -70.5q26 -50 41 -98l183 -28q13 -2 21 -12.5t8 -23.5z" />
-<glyph unicode="&#xf014;" horiz-adv-x="1408" d="M512 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM768 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1024 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1152 76v948h-896v-948q0 -22 7 -40.5t14.5 -27t10.5 -8.5h832q3 0 10.5 8.5t14.5 27t7 40.5zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832 q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf015;" horiz-adv-x="1664" d="M1408 544v-480q0 -26 -19 -45t-45 -19h-384v384h-256v-384h-384q-26 0 -45 19t-19 45v480q0 1 0.5 3t0.5 3l575 474l575 -474q1 -2 1 -6zM1631 613l-62 -74q-8 -9 -21 -11h-3q-13 0 -21 7l-692 577l-692 -577q-12 -8 -24 -7q-13 2 -21 11l-62 74q-8 10 -7 23.5t11 21.5 l719 599q32 26 76 26t76 -26l244 -204v195q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-408l219 -182q10 -8 11 -21.5t-7 -23.5z" />
-<glyph unicode="&#xf016;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z " />
-<glyph unicode="&#xf017;" d="M896 992v-448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf018;" horiz-adv-x="1920" d="M1111 540v4l-24 320q-1 13 -11 22.5t-23 9.5h-186q-13 0 -23 -9.5t-11 -22.5l-24 -320v-4q-1 -12 8 -20t21 -8h244q12 0 21 8t8 20zM1870 73q0 -73 -46 -73h-704q13 0 22 9.5t8 22.5l-20 256q-1 13 -11 22.5t-23 9.5h-272q-13 0 -23 -9.5t-11 -22.5l-20 -256 q-1 -13 8 -22.5t22 -9.5h-704q-46 0 -46 73q0 54 26 116l417 1044q8 19 26 33t38 14h339q-13 0 -23 -9.5t-11 -22.5l-15 -192q-1 -14 8 -23t22 -9h166q13 0 22 9t8 23l-15 192q-1 13 -11 22.5t-23 9.5h339q20 0 38 -14t26 -33l417 -1044q26 -62 26 -116z" />
-<glyph unicode="&#xf019;" horiz-adv-x="1664" d="M1280 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 416v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h465l135 -136 q58 -56 136 -56t136 56l136 136h464q40 0 68 -28t28 -68zM1339 985q17 -41 -14 -70l-448 -448q-18 -19 -45 -19t-45 19l-448 448q-31 29 -14 70q17 39 59 39h256v448q0 26 19 45t45 19h256q26 0 45 -19t19 -45v-448h256q42 0 59 -39z" />
-<glyph unicode="&#xf01a;" d="M1120 608q0 -12 -10 -24l-319 -319q-11 -9 -23 -9t-23 9l-320 320q-15 16 -7 35q8 20 30 20h192v352q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-352h192q14 0 23 -9t9 -23zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273 t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf01b;" d="M1118 660q-8 -20 -30 -20h-192v-352q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v352h-192q-14 0 -23 9t-9 23q0 12 10 24l319 319q11 9 23 9t23 -9l320 -320q15 -16 7 -35zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198 t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf01c;" d="M1023 576h316q-1 3 -2.5 8t-2.5 8l-212 496h-708l-212 -496q-1 -2 -2.5 -8t-2.5 -8h316l95 -192h320zM1536 546v-482q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v482q0 62 25 123l238 552q10 25 36.5 42t52.5 17h832q26 0 52.5 -17t36.5 -42l238 -552 q25 -61 25 -123z" />
-<glyph unicode="&#xf01d;" d="M1184 640q0 -37 -32 -55l-544 -320q-15 -9 -32 -9q-16 0 -32 8q-32 19 -32 56v640q0 37 32 56q33 18 64 -1l544 -320q32 -18 32 -55zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf01e;" d="M1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l138 138q-148 137 -349 137q-104 0 -198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5q119 0 225 52t179 147q7 10 23 12q14 0 25 -9 l137 -138q9 -8 9.5 -20.5t-7.5 -22.5q-109 -132 -264 -204.5t-327 -72.5q-156 0 -298 61t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q147 0 284.5 -55.5t244.5 -156.5l130 129q29 31 70 14q39 -17 39 -59z" />
-<glyph unicode="&#xf021;" d="M1511 480q0 -5 -1 -7q-64 -268 -268 -434.5t-478 -166.5q-146 0 -282.5 55t-243.5 157l-129 -129q-19 -19 -45 -19t-45 19t-19 45v448q0 26 19 45t45 19h448q26 0 45 -19t19 -45t-19 -45l-137 -137q71 -66 161 -102t187 -36q134 0 250 65t186 179q11 17 53 117 q8 23 30 23h192q13 0 22.5 -9.5t9.5 -22.5zM1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-26 0 -45 19t-19 45t19 45l138 138q-148 137 -349 137q-134 0 -250 -65t-186 -179q-11 -17 -53 -117q-8 -23 -30 -23h-199q-13 0 -22.5 9.5t-9.5 22.5v7q65 268 270 434.5t480 166.5 q146 0 284 -55.5t245 -156.5l130 129q19 19 45 19t45 -19t19 -45z" />
-<glyph unicode="&#xf022;" horiz-adv-x="1792" d="M384 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M384 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1536 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5z M1536 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5zM1536 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5 t9.5 -22.5zM1664 160v832q0 13 -9.5 22.5t-22.5 9.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1792 1248v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47 t47 -113z" />
-<glyph unicode="&#xf023;" horiz-adv-x="1152" d="M320 768h512v192q0 106 -75 181t-181 75t-181 -75t-75 -181v-192zM1152 672v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v192q0 184 132 316t316 132t316 -132t132 -316v-192h32q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf024;" horiz-adv-x="1792" d="M320 1280q0 -72 -64 -110v-1266q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v1266q-64 38 -64 110q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -25 -12.5 -38.5t-39.5 -27.5q-215 -116 -369 -116q-61 0 -123.5 22t-108.5 48 t-115.5 48t-142.5 22q-192 0 -464 -146q-17 -9 -33 -9q-26 0 -45 19t-19 45v742q0 32 31 55q21 14 79 43q236 120 421 120q107 0 200 -29t219 -88q38 -19 88 -19q54 0 117.5 21t110 47t88 47t54.5 21q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf025;" horiz-adv-x="1664" d="M1664 650q0 -166 -60 -314l-20 -49l-185 -33q-22 -83 -90.5 -136.5t-156.5 -53.5v-32q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-32q71 0 130 -35.5t93 -95.5l68 12q29 95 29 193q0 148 -88 279t-236.5 209t-315.5 78 t-315.5 -78t-236.5 -209t-88 -279q0 -98 29 -193l68 -12q34 60 93 95.5t130 35.5v32q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v32q-88 0 -156.5 53.5t-90.5 136.5l-185 33l-20 49q-60 148 -60 314q0 151 67 291t179 242.5 t266 163.5t320 61t320 -61t266 -163.5t179 -242.5t67 -291z" />
-<glyph unicode="&#xf026;" horiz-adv-x="768" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45z" />
-<glyph unicode="&#xf027;" horiz-adv-x="1152" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142z" />
-<glyph unicode="&#xf028;" horiz-adv-x="1664" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142zM1408 640q0 -153 -85 -282.5t-225 -188.5q-13 -5 -25 -5q-27 0 -46 19t-19 45q0 39 39 59q56 29 76 44q74 54 115.5 135.5t41.5 173.5t-41.5 173.5 t-115.5 135.5q-20 15 -76 44q-39 20 -39 59q0 26 19 45t45 19q13 0 26 -5q140 -59 225 -188.5t85 -282.5zM1664 640q0 -230 -127 -422.5t-338 -283.5q-13 -5 -26 -5q-26 0 -45 19t-19 45q0 36 39 59q7 4 22.5 10.5t22.5 10.5q46 25 82 51q123 91 192 227t69 289t-69 289 t-192 227q-36 26 -82 51q-7 4 -22.5 10.5t-22.5 10.5q-39 23 -39 59q0 26 19 45t45 19q13 0 26 -5q211 -91 338 -283.5t127 -422.5z" />
-<glyph unicode="&#xf029;" horiz-adv-x="1408" d="M384 384v-128h-128v128h128zM384 1152v-128h-128v128h128zM1152 1152v-128h-128v128h128zM128 129h384v383h-384v-383zM128 896h384v384h-384v-384zM896 896h384v384h-384v-384zM640 640v-640h-640v640h640zM1152 128v-128h-128v128h128zM1408 128v-128h-128v128h128z M1408 640v-384h-384v128h-128v-384h-128v640h384v-128h128v128h128zM640 1408v-640h-640v640h640zM1408 1408v-640h-640v640h640z" />
-<glyph unicode="&#xf02a;" horiz-adv-x="1792" d="M63 0h-63v1408h63v-1408zM126 1h-32v1407h32v-1407zM220 1h-31v1407h31v-1407zM377 1h-31v1407h31v-1407zM534 1h-62v1407h62v-1407zM660 1h-31v1407h31v-1407zM723 1h-31v1407h31v-1407zM786 1h-31v1407h31v-1407zM943 1h-63v1407h63v-1407zM1100 1h-63v1407h63v-1407z M1226 1h-63v1407h63v-1407zM1352 1h-63v1407h63v-1407zM1446 1h-63v1407h63v-1407zM1635 1h-94v1407h94v-1407zM1698 1h-32v1407h32v-1407zM1792 0h-63v1408h63v-1408z" />
-<glyph unicode="&#xf02b;" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91z" />
-<glyph unicode="&#xf02c;" horiz-adv-x="1920" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91zM1899 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-36 0 -59 14t-53 45l470 470q37 37 37 90q0 52 -37 91l-715 714q-38 38 -102 64.5t-117 26.5h224q53 0 117 -26.5t102 -64.5l715 -714q37 -39 37 -91z" />
-<glyph unicode="&#xf02d;" horiz-adv-x="1664" d="M1639 1058q40 -57 18 -129l-275 -906q-19 -64 -76.5 -107.5t-122.5 -43.5h-923q-77 0 -148.5 53.5t-99.5 131.5q-24 67 -2 127q0 4 3 27t4 37q1 8 -3 21.5t-3 19.5q2 11 8 21t16.5 23.5t16.5 23.5q23 38 45 91.5t30 91.5q3 10 0.5 30t-0.5 28q3 11 17 28t17 23 q21 36 42 92t25 90q1 9 -2.5 32t0.5 28q4 13 22 30.5t22 22.5q19 26 42.5 84.5t27.5 96.5q1 8 -3 25.5t-2 26.5q2 8 9 18t18 23t17 21q8 12 16.5 30.5t15 35t16 36t19.5 32t26.5 23.5t36 11.5t47.5 -5.5l-1 -3q38 9 51 9h761q74 0 114 -56t18 -130l-274 -906 q-36 -119 -71.5 -153.5t-128.5 -34.5h-869q-27 0 -38 -15q-11 -16 -1 -43q24 -70 144 -70h923q29 0 56 15.5t35 41.5l300 987q7 22 5 57q38 -15 59 -43zM575 1056q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5 t-16.5 -22.5zM492 800q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5t-16.5 -22.5z" />
-<glyph unicode="&#xf02e;" horiz-adv-x="1280" d="M1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
-<glyph unicode="&#xf02f;" horiz-adv-x="1664" d="M384 0h896v256h-896v-256zM384 640h896v384h-160q-40 0 -68 28t-28 68v160h-640v-640zM1536 576q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 576v-416q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-160q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68 v160h-224q-13 0 -22.5 9.5t-9.5 22.5v416q0 79 56.5 135.5t135.5 56.5h64v544q0 40 28 68t68 28h672q40 0 88 -20t76 -48l152 -152q28 -28 48 -76t20 -88v-256h64q79 0 135.5 -56.5t56.5 -135.5z" />
-<glyph unicode="&#xf030;" horiz-adv-x="1920" d="M960 864q119 0 203.5 -84.5t84.5 -203.5t-84.5 -203.5t-203.5 -84.5t-203.5 84.5t-84.5 203.5t84.5 203.5t203.5 84.5zM1664 1280q106 0 181 -75t75 -181v-896q0 -106 -75 -181t-181 -75h-1408q-106 0 -181 75t-75 181v896q0 106 75 181t181 75h224l51 136 q19 49 69.5 84.5t103.5 35.5h512q53 0 103.5 -35.5t69.5 -84.5l51 -136h224zM960 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
-<glyph unicode="&#xf031;" horiz-adv-x="1664" d="M725 977l-170 -450q33 0 136.5 -2t160.5 -2q19 0 57 2q-87 253 -184 452zM0 -128l2 79q23 7 56 12.5t57 10.5t49.5 14.5t44.5 29t31 50.5l237 616l280 724h75h53q8 -14 11 -21l205 -480q33 -78 106 -257.5t114 -274.5q15 -34 58 -144.5t72 -168.5q20 -45 35 -57 q19 -15 88 -29.5t84 -20.5q6 -38 6 -57q0 -4 -0.5 -13t-0.5 -13q-63 0 -190 8t-191 8q-76 0 -215 -7t-178 -8q0 43 4 78l131 28q1 0 12.5 2.5t15.5 3.5t14.5 4.5t15 6.5t11 8t9 11t2.5 14q0 16 -31 96.5t-72 177.5t-42 100l-450 2q-26 -58 -76.5 -195.5t-50.5 -162.5 q0 -22 14 -37.5t43.5 -24.5t48.5 -13.5t57 -8.5t41 -4q1 -19 1 -58q0 -9 -2 -27q-58 0 -174.5 10t-174.5 10q-8 0 -26.5 -4t-21.5 -4q-80 -14 -188 -14z" />
-<glyph unicode="&#xf032;" horiz-adv-x="1408" d="M555 15q74 -32 140 -32q376 0 376 335q0 114 -41 180q-27 44 -61.5 74t-67.5 46.5t-80.5 25t-84 10.5t-94.5 2q-73 0 -101 -10q0 -53 -0.5 -159t-0.5 -158q0 -8 -1 -67.5t-0.5 -96.5t4.5 -83.5t12 -66.5zM541 761q42 -7 109 -7q82 0 143 13t110 44.5t74.5 89.5t25.5 142 q0 70 -29 122.5t-79 82t-108 43.5t-124 14q-50 0 -130 -13q0 -50 4 -151t4 -152q0 -27 -0.5 -80t-0.5 -79q0 -46 1 -69zM0 -128l2 94q15 4 85 16t106 27q7 12 12.5 27t8.5 33.5t5.5 32.5t3 37.5t0.5 34v35.5v30q0 982 -22 1025q-4 8 -22 14.5t-44.5 11t-49.5 7t-48.5 4.5 t-30.5 3l-4 83q98 2 340 11.5t373 9.5q23 0 68.5 -0.5t67.5 -0.5q70 0 136.5 -13t128.5 -42t108 -71t74 -104.5t28 -137.5q0 -52 -16.5 -95.5t-39 -72t-64.5 -57.5t-73 -45t-84 -40q154 -35 256.5 -134t102.5 -248q0 -100 -35 -179.5t-93.5 -130.5t-138 -85.5t-163.5 -48.5 t-176 -14q-44 0 -132 3t-132 3q-106 0 -307 -11t-231 -12z" />
-<glyph unicode="&#xf033;" horiz-adv-x="1024" d="M0 -126l17 85q6 2 81.5 21.5t111.5 37.5q28 35 41 101q1 7 62 289t114 543.5t52 296.5v25q-24 13 -54.5 18.5t-69.5 8t-58 5.5l19 103q33 -2 120 -6.5t149.5 -7t120.5 -2.5q48 0 98.5 2.5t121 7t98.5 6.5q-5 -39 -19 -89q-30 -10 -101.5 -28.5t-108.5 -33.5 q-8 -19 -14 -42.5t-9 -40t-7.5 -45.5t-6.5 -42q-27 -148 -87.5 -419.5t-77.5 -355.5q-2 -9 -13 -58t-20 -90t-16 -83.5t-6 -57.5l1 -18q17 -4 185 -31q-3 -44 -16 -99q-11 0 -32.5 -1.5t-32.5 -1.5q-29 0 -87 10t-86 10q-138 2 -206 2q-51 0 -143 -9t-121 -11z" />
-<glyph unicode="&#xf034;" horiz-adv-x="1792" d="M1744 128q33 0 42 -18.5t-11 -44.5l-126 -162q-20 -26 -49 -26t-49 26l-126 162q-20 26 -11 44.5t42 18.5h80v1024h-80q-33 0 -42 18.5t11 44.5l126 162q20 26 49 26t49 -26l126 -162q20 -26 11 -44.5t-42 -18.5h-80v-1024h80zM81 1407l54 -27q12 -5 211 -5q44 0 132 2 t132 2q36 0 107.5 -0.5t107.5 -0.5h293q6 0 21 -0.5t20.5 0t16 3t17.5 9t15 17.5l42 1q4 0 14 -0.5t14 -0.5q2 -112 2 -336q0 -80 -5 -109q-39 -14 -68 -18q-25 44 -54 128q-3 9 -11 48t-14.5 73.5t-7.5 35.5q-6 8 -12 12.5t-15.5 6t-13 2.5t-18 0.5t-16.5 -0.5 q-17 0 -66.5 0.5t-74.5 0.5t-64 -2t-71 -6q-9 -81 -8 -136q0 -94 2 -388t2 -455q0 -16 -2.5 -71.5t0 -91.5t12.5 -69q40 -21 124 -42.5t120 -37.5q5 -40 5 -50q0 -14 -3 -29l-34 -1q-76 -2 -218 8t-207 10q-50 0 -151 -9t-152 -9q-3 51 -3 52v9q17 27 61.5 43t98.5 29t78 27 q19 42 19 383q0 101 -3 303t-3 303v117q0 2 0.5 15.5t0.5 25t-1 25.5t-3 24t-5 14q-11 12 -162 12q-33 0 -93 -12t-80 -26q-19 -13 -34 -72.5t-31.5 -111t-42.5 -53.5q-42 26 -56 44v383z" />
-<glyph unicode="&#xf035;" d="M81 1407l54 -27q12 -5 211 -5q44 0 132 2t132 2q70 0 246.5 1t304.5 0.5t247 -4.5q33 -1 56 31l42 1q4 0 14 -0.5t14 -0.5q2 -112 2 -336q0 -80 -5 -109q-39 -14 -68 -18q-25 44 -54 128q-3 9 -11 47.5t-15 73.5t-7 36q-10 13 -27 19q-5 2 -66 2q-30 0 -93 1t-103 1 t-94 -2t-96 -7q-9 -81 -8 -136l1 -152v52q0 -55 1 -154t1.5 -180t0.5 -153q0 -16 -2.5 -71.5t0 -91.5t12.5 -69q40 -21 124 -42.5t120 -37.5q5 -40 5 -50q0 -14 -3 -29l-34 -1q-76 -2 -218 8t-207 10q-50 0 -151 -9t-152 -9q-3 51 -3 52v9q17 27 61.5 43t98.5 29t78 27 q7 16 11.5 74t6 145.5t1.5 155t-0.5 153.5t-0.5 89q0 7 -2.5 21.5t-2.5 22.5q0 7 0.5 44t1 73t0 76.5t-3 67.5t-6.5 32q-11 12 -162 12q-41 0 -163 -13.5t-138 -24.5q-19 -12 -34 -71.5t-31.5 -111.5t-42.5 -54q-42 26 -56 44v383zM1310 125q12 0 42 -19.5t57.5 -41.5 t59.5 -49t36 -30q26 -21 26 -49t-26 -49q-4 -3 -36 -30t-59.5 -49t-57.5 -41.5t-42 -19.5q-13 0 -20.5 10.5t-10 28.5t-2.5 33.5t1.5 33t1.5 19.5h-1024q0 -2 1.5 -19.5t1.5 -33t-2.5 -33.5t-10 -28.5t-20.5 -10.5q-12 0 -42 19.5t-57.5 41.5t-59.5 49t-36 30q-26 21 -26 49 t26 49q4 3 36 30t59.5 49t57.5 41.5t42 19.5q13 0 20.5 -10.5t10 -28.5t2.5 -33.5t-1.5 -33t-1.5 -19.5h1024q0 2 -1.5 19.5t-1.5 33t2.5 33.5t10 28.5t20.5 10.5z" />
-<glyph unicode="&#xf036;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf037;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h896q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45t-45 -19 h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h640q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf038;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf039;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf03a;" horiz-adv-x="1792" d="M256 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM256 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5 t9.5 -22.5zM256 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344 q13 0 22.5 -9.5t9.5 -22.5zM256 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192 q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf03b;" horiz-adv-x="1792" d="M384 992v-576q0 -13 -9.5 -22.5t-22.5 -9.5q-14 0 -23 9l-288 288q-9 9 -9 23t9 23l288 288q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088 q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf03c;" horiz-adv-x="1792" d="M352 704q0 -14 -9 -23l-288 -288q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v576q0 13 9.5 22.5t22.5 9.5q14 0 23 -9l288 -288q9 -9 9 -23zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088 q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf03d;" horiz-adv-x="1792" d="M1792 1184v-1088q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-403 403v-166q0 -119 -84.5 -203.5t-203.5 -84.5h-704q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h704q119 0 203.5 -84.5t84.5 -203.5v-165l403 402q18 19 45 19q12 0 25 -5 q39 -17 39 -59z" />
-<glyph unicode="&#xf03e;" horiz-adv-x="1920" d="M640 960q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 576v-448h-1408v192l320 320l160 -160l512 512zM1760 1280h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5v1216 q0 13 -9.5 22.5t-22.5 9.5zM1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf040;" d="M363 0l91 91l-235 235l-91 -91v-107h128v-128h107zM886 928q0 22 -22 22q-10 0 -17 -7l-542 -542q-7 -7 -7 -17q0 -22 22 -22q10 0 17 7l542 542q7 7 7 17zM832 1120l416 -416l-832 -832h-416v416zM1515 1024q0 -53 -37 -90l-166 -166l-416 416l166 165q36 38 90 38 q53 0 91 -38l235 -234q37 -39 37 -91z" />
-<glyph unicode="&#xf041;" horiz-adv-x="1024" d="M768 896q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1024 896q0 -109 -33 -179l-364 -774q-16 -33 -47.5 -52t-67.5 -19t-67.5 19t-46.5 52l-365 774q-33 70 -33 179q0 212 150 362t362 150t362 -150t150 -362z" />
-<glyph unicode="&#xf042;" d="M768 96v1088q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf043;" horiz-adv-x="1024" d="M512 384q0 36 -20 69q-1 1 -15.5 22.5t-25.5 38t-25 44t-21 50.5q-4 16 -21 16t-21 -16q-7 -23 -21 -50.5t-25 -44t-25.5 -38t-15.5 -22.5q-20 -33 -20 -69q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 512q0 -212 -150 -362t-362 -150t-362 150t-150 362 q0 145 81 275q6 9 62.5 90.5t101 151t99.5 178t83 201.5q9 30 34 47t51 17t51.5 -17t33.5 -47q28 -93 83 -201.5t99.5 -178t101 -151t62.5 -90.5q81 -127 81 -275z" />
-<glyph unicode="&#xf044;" horiz-adv-x="1792" d="M888 352l116 116l-152 152l-116 -116v-56h96v-96h56zM1328 1072q-16 16 -33 -1l-350 -350q-17 -17 -1 -33t33 1l350 350q17 17 1 33zM1408 478v-190q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-14 -14 -32 -8q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v126q0 13 9 22l64 64q15 15 35 7t20 -29zM1312 1216l288 -288l-672 -672h-288v288zM1756 1084l-92 -92 l-288 288l92 92q28 28 68 28t68 -28l152 -152q28 -28 28 -68t-28 -68z" />
-<glyph unicode="&#xf045;" horiz-adv-x="1664" d="M1408 547v-259q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h255v0q13 0 22.5 -9.5t9.5 -22.5q0 -27 -26 -32q-77 -26 -133 -60q-10 -4 -16 -4h-112q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832 q66 0 113 47t47 113v214q0 19 18 29q28 13 54 37q16 16 35 8q21 -9 21 -29zM1645 1043l-384 -384q-18 -19 -45 -19q-12 0 -25 5q-39 17 -39 59v192h-160q-323 0 -438 -131q-119 -137 -74 -473q3 -23 -20 -34q-8 -2 -12 -2q-16 0 -26 13q-10 14 -21 31t-39.5 68.5t-49.5 99.5 t-38.5 114t-17.5 122q0 49 3.5 91t14 90t28 88t47 81.5t68.5 74t94.5 61.5t124.5 48.5t159.5 30.5t196.5 11h160v192q0 42 39 59q13 5 25 5q26 0 45 -19l384 -384q19 -19 19 -45t-19 -45z" />
-<glyph unicode="&#xf046;" horiz-adv-x="1664" d="M1408 606v-318q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-10 -10 -23 -10q-3 0 -9 2q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832 q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v254q0 13 9 22l64 64q10 10 23 10q6 0 12 -3q20 -8 20 -29zM1639 1095l-814 -814q-24 -24 -57 -24t-57 24l-430 430q-24 24 -24 57t24 57l110 110q24 24 57 24t57 -24l263 -263l647 647q24 24 57 24t57 -24l110 -110 q24 -24 24 -57t-24 -57z" />
-<glyph unicode="&#xf047;" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-384v-384h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v384h-384v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45 t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h384v384h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45t-19 -45t-45 -19h-128v-384h384v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
-<glyph unicode="&#xf048;" horiz-adv-x="1024" d="M979 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19z" />
-<glyph unicode="&#xf049;" horiz-adv-x="1792" d="M1747 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19l710 710 q19 19 32 13t13 -32v-710q4 11 13 19z" />
-<glyph unicode="&#xf04a;" horiz-adv-x="1664" d="M1619 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-8 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-19 19 -19 45t19 45l710 710q19 19 32 13t13 -32v-710q5 11 13 19z" />
-<glyph unicode="&#xf04b;" horiz-adv-x="1408" d="M1384 609l-1328 -738q-23 -13 -39.5 -3t-16.5 36v1472q0 26 16.5 36t39.5 -3l1328 -738q23 -13 23 -31t-23 -31z" />
-<glyph unicode="&#xf04c;" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45zM640 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf04d;" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf04e;" horiz-adv-x="1664" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q19 -19 19 -45t-19 -45l-710 -710q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" />
-<glyph unicode="&#xf050;" horiz-adv-x="1792" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19l-710 -710 q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" />
-<glyph unicode="&#xf051;" horiz-adv-x="1024" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19z" />
-<glyph unicode="&#xf052;" horiz-adv-x="1538" d="M14 557l710 710q19 19 45 19t45 -19l710 -710q19 -19 13 -32t-32 -13h-1472q-26 0 -32 13t13 32zM1473 0h-1408q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1408q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19z" />
-<glyph unicode="&#xf053;" horiz-adv-x="1280" d="M1171 1235l-531 -531l531 -531q19 -19 19 -45t-19 -45l-166 -166q-19 -19 -45 -19t-45 19l-742 742q-19 19 -19 45t19 45l742 742q19 19 45 19t45 -19l166 -166q19 -19 19 -45t-19 -45z" />
-<glyph unicode="&#xf054;" horiz-adv-x="1280" d="M1107 659l-742 -742q-19 -19 -45 -19t-45 19l-166 166q-19 19 -19 45t19 45l531 531l-531 531q-19 19 -19 45t19 45l166 166q19 19 45 19t45 -19l742 -742q19 -19 19 -45t-19 -45z" />
-<glyph unicode="&#xf055;" d="M1216 576v128q0 26 -19 45t-45 19h-256v256q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-256h-256q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h256v-256q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v256h256q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5 t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf056;" d="M1216 576v128q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5 t103 -385.5z" />
-<glyph unicode="&#xf057;" d="M1149 414q0 26 -19 45l-181 181l181 181q19 19 19 45q0 27 -19 46l-90 90q-19 19 -46 19q-26 0 -45 -19l-181 -181l-181 181q-19 19 -45 19q-27 0 -46 -19l-90 -90q-19 -19 -19 -46q0 -26 19 -45l181 -181l-181 -181q-19 -19 -19 -45q0 -27 19 -46l90 -90q19 -19 46 -19 q26 0 45 19l181 181l181 -181q19 -19 45 -19q27 0 46 19l90 90q19 19 19 46zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf058;" d="M1284 802q0 28 -18 46l-91 90q-19 19 -45 19t-45 -19l-408 -407l-226 226q-19 19 -45 19t-45 -19l-91 -90q-18 -18 -18 -46q0 -27 18 -45l362 -362q19 -19 45 -19q27 0 46 19l543 543q18 18 18 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf059;" d="M896 160v192q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h192q14 0 23 9t9 23zM1152 832q0 88 -55.5 163t-138.5 116t-170 41q-243 0 -371 -213q-15 -24 8 -42l132 -100q7 -6 19 -6q16 0 25 12q53 68 86 92q34 24 86 24q48 0 85.5 -26t37.5 -59 q0 -38 -20 -61t-68 -45q-63 -28 -115.5 -86.5t-52.5 -125.5v-36q0 -14 9 -23t23 -9h192q14 0 23 9t9 23q0 19 21.5 49.5t54.5 49.5q32 18 49 28.5t46 35t44.5 48t28 60.5t12.5 81zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf05a;" d="M1024 160v160q0 14 -9 23t-23 9h-96v512q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h96v-320h-96q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h448q14 0 23 9t9 23zM896 1056v160q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23 t23 -9h192q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf05b;" d="M1197 512h-109q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h109q-32 108 -112.5 188.5t-188.5 112.5v-109q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v109q-108 -32 -188.5 -112.5t-112.5 -188.5h109q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-109 q32 -108 112.5 -188.5t188.5 -112.5v109q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-109q108 32 188.5 112.5t112.5 188.5zM1536 704v-128q0 -26 -19 -45t-45 -19h-143q-37 -161 -154.5 -278.5t-278.5 -154.5v-143q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v143 q-161 37 -278.5 154.5t-154.5 278.5h-143q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h143q37 161 154.5 278.5t278.5 154.5v143q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-143q161 -37 278.5 -154.5t154.5 -278.5h143q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf05c;" d="M1097 457l-146 -146q-10 -10 -23 -10t-23 10l-137 137l-137 -137q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l137 137l-137 137q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l137 -137l137 137q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23 l-137 -137l137 -137q10 -10 10 -23t-10 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5 t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf05d;" d="M1171 723l-422 -422q-19 -19 -45 -19t-45 19l-294 294q-19 19 -19 45t19 45l102 102q19 19 45 19t45 -19l147 -147l275 275q19 19 45 19t45 -19l102 -102q19 -19 19 -45t-19 -45zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198 t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf05e;" d="M1312 643q0 161 -87 295l-754 -753q137 -89 297 -89q111 0 211.5 43.5t173.5 116.5t116 174.5t43 212.5zM313 344l755 754q-135 91 -300 91q-148 0 -273 -73t-198 -199t-73 -274q0 -162 89 -299zM1536 643q0 -157 -61 -300t-163.5 -246t-245 -164t-298.5 -61t-298.5 61 t-245 164t-163.5 246t-61 300t61 299.5t163.5 245.5t245 164t298.5 61t298.5 -61t245 -164t163.5 -245.5t61 -299.5z" />
-<glyph unicode="&#xf060;" d="M1536 640v-128q0 -53 -32.5 -90.5t-84.5 -37.5h-704l293 -294q38 -36 38 -90t-38 -90l-75 -76q-37 -37 -90 -37q-52 0 -91 37l-651 652q-37 37 -37 90q0 52 37 91l651 650q38 38 91 38q52 0 90 -38l75 -74q38 -38 38 -91t-38 -91l-293 -293h704q52 0 84.5 -37.5 t32.5 -90.5z" />
-<glyph unicode="&#xf061;" d="M1472 576q0 -54 -37 -91l-651 -651q-39 -37 -91 -37q-51 0 -90 37l-75 75q-38 38 -38 91t38 91l293 293h-704q-52 0 -84.5 37.5t-32.5 90.5v128q0 53 32.5 90.5t84.5 37.5h704l-293 294q-38 36 -38 90t38 90l75 75q38 38 90 38q53 0 91 -38l651 -651q37 -35 37 -90z" />
-<glyph unicode="&#xf062;" horiz-adv-x="1664" d="M1611 565q0 -51 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-294 293v-704q0 -52 -37.5 -84.5t-90.5 -32.5h-128q-53 0 -90.5 32.5t-37.5 84.5v704l-294 -293q-36 -38 -90 -38t-90 38l-75 75q-38 38 -38 90q0 53 38 91l651 651q35 37 90 37q54 0 91 -37l651 -651 q37 -39 37 -91z" />
-<glyph unicode="&#xf063;" horiz-adv-x="1664" d="M1611 704q0 -53 -37 -90l-651 -652q-39 -37 -91 -37q-53 0 -90 37l-651 652q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l294 -294v704q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-704l294 294q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" />
-<glyph unicode="&#xf064;" horiz-adv-x="1792" d="M1792 896q0 -26 -19 -45l-512 -512q-19 -19 -45 -19t-45 19t-19 45v256h-224q-98 0 -175.5 -6t-154 -21.5t-133 -42.5t-105.5 -69.5t-80 -101t-48.5 -138.5t-17.5 -181q0 -55 5 -123q0 -6 2.5 -23.5t2.5 -26.5q0 -15 -8.5 -25t-23.5 -10q-16 0 -28 17q-7 9 -13 22 t-13.5 30t-10.5 24q-127 285 -127 451q0 199 53 333q162 403 875 403h224v256q0 26 19 45t45 19t45 -19l512 -512q19 -19 19 -45z" />
-<glyph unicode="&#xf065;" d="M755 480q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23zM1536 1344v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332 q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf066;" d="M768 576v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45zM1523 1248q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45 t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23z" />
-<glyph unicode="&#xf067;" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-416v-416q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v416h-416q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h416v416q0 40 28 68t68 28h192q40 0 68 -28t28 -68v-416h416q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf068;" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-1216q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h1216q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf069;" horiz-adv-x="1664" d="M1482 486q46 -26 59.5 -77.5t-12.5 -97.5l-64 -110q-26 -46 -77.5 -59.5t-97.5 12.5l-266 153v-307q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v307l-266 -153q-46 -26 -97.5 -12.5t-77.5 59.5l-64 110q-26 46 -12.5 97.5t59.5 77.5l266 154l-266 154 q-46 26 -59.5 77.5t12.5 97.5l64 110q26 46 77.5 59.5t97.5 -12.5l266 -153v307q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-307l266 153q46 26 97.5 12.5t77.5 -59.5l64 -110q26 -46 12.5 -97.5t-59.5 -77.5l-266 -154z" />
-<glyph unicode="&#xf06a;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM896 161v190q0 14 -9 23.5t-22 9.5h-192q-13 0 -23 -10t-10 -23v-190q0 -13 10 -23t23 -10h192 q13 0 22 9.5t9 23.5zM894 505l18 621q0 12 -10 18q-10 8 -24 8h-220q-14 0 -24 -8q-10 -6 -10 -18l17 -621q0 -10 10 -17.5t24 -7.5h185q14 0 23.5 7.5t10.5 17.5z" />
-<glyph unicode="&#xf06b;" d="M928 180v56v468v192h-320v-192v-468v-56q0 -25 18 -38.5t46 -13.5h192q28 0 46 13.5t18 38.5zM472 1024h195l-126 161q-26 31 -69 31q-40 0 -68 -28t-28 -68t28 -68t68 -28zM1160 1120q0 40 -28 68t-68 28q-43 0 -69 -31l-125 -161h194q40 0 68 28t28 68zM1536 864v-320 q0 -14 -9 -23t-23 -9h-96v-416q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v416h-96q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h440q-93 0 -158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5q107 0 168 -77l128 -165l128 165q61 77 168 77q93 0 158.5 -65.5t65.5 -158.5 t-65.5 -158.5t-158.5 -65.5h440q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf06c;" horiz-adv-x="1792" d="M1280 832q0 26 -19 45t-45 19q-172 0 -318 -49.5t-259.5 -134t-235.5 -219.5q-19 -21 -19 -45q0 -26 19 -45t45 -19q24 0 45 19q27 24 74 71t67 66q137 124 268.5 176t313.5 52q26 0 45 19t19 45zM1792 1030q0 -95 -20 -193q-46 -224 -184.5 -383t-357.5 -268 q-214 -108 -438 -108q-148 0 -286 47q-15 5 -88 42t-96 37q-16 0 -39.5 -32t-45 -70t-52.5 -70t-60 -32q-30 0 -51 11t-31 24t-27 42q-2 4 -6 11t-5.5 10t-3 9.5t-1.5 13.5q0 35 31 73.5t68 65.5t68 56t31 48q0 4 -14 38t-16 44q-9 51 -9 104q0 115 43.5 220t119 184.5 t170.5 139t204 95.5q55 18 145 25.5t179.5 9t178.5 6t163.5 24t113.5 56.5l29.5 29.5t29.5 28t27 20t36.5 16t43.5 4.5q39 0 70.5 -46t47.5 -112t24 -124t8 -96z" />
-<glyph unicode="&#xf06d;" horiz-adv-x="1408" d="M1408 -160v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1152 896q0 -78 -24.5 -144t-64 -112.5t-87.5 -88t-96 -77.5t-87.5 -72t-64 -81.5t-24.5 -96.5q0 -96 67 -224l-4 1l1 -1 q-90 41 -160 83t-138.5 100t-113.5 122.5t-72.5 150.5t-27.5 184q0 78 24.5 144t64 112.5t87.5 88t96 77.5t87.5 72t64 81.5t24.5 96.5q0 94 -66 224l3 -1l-1 1q90 -41 160 -83t138.5 -100t113.5 -122.5t72.5 -150.5t27.5 -184z" />
-<glyph unicode="&#xf06e;" horiz-adv-x="1792" d="M1664 576q-152 236 -381 353q61 -104 61 -225q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 121 61 225q-229 -117 -381 -353q133 -205 333.5 -326.5t434.5 -121.5t434.5 121.5t333.5 326.5zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5 t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1792 576q0 -34 -20 -69q-140 -230 -376.5 -368.5t-499.5 -138.5t-499.5 139t-376.5 368q-20 35 -20 69t20 69q140 229 376.5 368t499.5 139t499.5 -139t376.5 -368q20 -35 20 -69z" />
-<glyph unicode="&#xf070;" horiz-adv-x="1792" d="M555 201l78 141q-87 63 -136 159t-49 203q0 121 61 225q-229 -117 -381 -353q167 -258 427 -375zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1307 1151q0 -7 -1 -9 q-105 -188 -315 -566t-316 -567l-49 -89q-10 -16 -28 -16q-12 0 -134 70q-16 10 -16 28q0 12 44 87q-143 65 -263.5 173t-208.5 245q-20 31 -20 69t20 69q153 235 380 371t496 136q89 0 180 -17l54 97q10 16 28 16q5 0 18 -6t31 -15.5t33 -18.5t31.5 -18.5t19.5 -11.5 q16 -10 16 -27zM1344 704q0 -139 -79 -253.5t-209 -164.5l280 502q8 -45 8 -84zM1792 576q0 -35 -20 -69q-39 -64 -109 -145q-150 -172 -347.5 -267t-419.5 -95l74 132q212 18 392.5 137t301.5 307q-115 179 -282 294l63 112q95 -64 182.5 -153t144.5 -184q20 -34 20 -69z " />
-<glyph unicode="&#xf071;" horiz-adv-x="1792" d="M1024 161v190q0 14 -9.5 23.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -23.5v-190q0 -14 9.5 -23.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 23.5zM1022 535l18 459q0 12 -10 19q-13 11 -24 11h-220q-11 0 -24 -11q-10 -7 -10 -21l17 -457q0 -10 10 -16.5t24 -6.5h185 q14 0 23.5 6.5t10.5 16.5zM1008 1469l768 -1408q35 -63 -2 -126q-17 -29 -46.5 -46t-63.5 -17h-1536q-34 0 -63.5 17t-46.5 46q-37 63 -2 126l768 1408q17 31 47 49t65 18t65 -18t47 -49z" />
-<glyph unicode="&#xf072;" horiz-adv-x="1408" d="M1376 1376q44 -52 12 -148t-108 -172l-161 -161l160 -696q5 -19 -12 -33l-128 -96q-7 -6 -19 -6q-4 0 -7 1q-15 3 -21 16l-279 508l-259 -259l53 -194q5 -17 -8 -31l-96 -96q-9 -9 -23 -9h-2q-15 2 -24 13l-189 252l-252 189q-11 7 -13 23q-1 13 9 25l96 97q9 9 23 9 q6 0 8 -1l194 -53l259 259l-508 279q-14 8 -17 24q-2 16 9 27l128 128q14 13 30 8l665 -159l160 160q76 76 172 108t148 -12z" />
-<glyph unicode="&#xf073;" horiz-adv-x="1664" d="M128 -128h288v288h-288v-288zM480 -128h320v288h-320v-288zM128 224h288v320h-288v-320zM480 224h320v320h-320v-320zM128 608h288v288h-288v-288zM864 -128h320v288h-320v-288zM480 608h320v288h-320v-288zM1248 -128h288v288h-288v-288zM864 224h320v320h-320v-320z M512 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1248 224h288v320h-288v-320zM864 608h320v288h-320v-288zM1248 608h288v288h-288v-288zM1280 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64 q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47 h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf074;" horiz-adv-x="1792" d="M666 1055q-60 -92 -137 -273q-22 45 -37 72.5t-40.5 63.5t-51 56.5t-63 35t-81.5 14.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q250 0 410 -225zM1792 256q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192q-32 0 -85 -0.5t-81 -1t-73 1 t-71 5t-64 10.5t-63 18.5t-58 28.5t-59 40t-55 53.5t-56 69.5q59 93 136 273q22 -45 37 -72.5t40.5 -63.5t51 -56.5t63 -35t81.5 -14.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1792 1152q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5 v192h-256q-48 0 -87 -15t-69 -45t-51 -61.5t-45 -77.5q-32 -62 -78 -171q-29 -66 -49.5 -111t-54 -105t-64 -100t-74 -83t-90 -68.5t-106.5 -42t-128 -16.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q48 0 87 15t69 45t51 61.5t45 77.5q32 62 78 171q29 66 49.5 111 t54 105t64 100t74 83t90 68.5t106.5 42t128 16.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
-<glyph unicode="&#xf075;" horiz-adv-x="1792" d="M1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22q-17 -2 -30.5 9t-17.5 29v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281 q0 130 71 248.5t191 204.5t286 136.5t348 50.5q244 0 450 -85.5t326 -233t120 -321.5z" />
-<glyph unicode="&#xf076;" d="M1536 704v-128q0 -201 -98.5 -362t-274 -251.5t-395.5 -90.5t-395.5 90.5t-274 251.5t-98.5 362v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-128q0 -52 23.5 -90t53.5 -57t71 -30t64 -13t44 -2t44 2t64 13t71 30t53.5 57t23.5 90v128q0 26 19 45t45 19h384 q26 0 45 -19t19 -45zM512 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45zM1536 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf077;" horiz-adv-x="1792" d="M1683 205l-166 -165q-19 -19 -45 -19t-45 19l-531 531l-531 -531q-19 -19 -45 -19t-45 19l-166 165q-19 19 -19 45.5t19 45.5l742 741q19 19 45 19t45 -19l742 -741q19 -19 19 -45.5t-19 -45.5z" />
-<glyph unicode="&#xf078;" horiz-adv-x="1792" d="M1683 728l-742 -741q-19 -19 -45 -19t-45 19l-742 741q-19 19 -19 45.5t19 45.5l166 165q19 19 45 19t45 -19l531 -531l531 531q19 19 45 19t45 -19l166 -165q19 -19 19 -45.5t-19 -45.5z" />
-<glyph unicode="&#xf079;" horiz-adv-x="1920" d="M1280 32q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-8 0 -13.5 2t-9 7t-5.5 8t-3 11.5t-1 11.5v13v11v160v416h-192q-26 0 -45 19t-19 45q0 24 15 41l320 384q19 22 49 22t49 -22l320 -384q15 -17 15 -41q0 -26 -19 -45t-45 -19h-192v-384h576q16 0 25 -11l160 -192q7 -11 7 -21 zM1920 448q0 -24 -15 -41l-320 -384q-20 -23 -49 -23t-49 23l-320 384q-15 17 -15 41q0 26 19 45t45 19h192v384h-576q-16 0 -25 12l-160 192q-7 9 -7 20q0 13 9.5 22.5t22.5 9.5h960q8 0 13.5 -2t9 -7t5.5 -8t3 -11.5t1 -11.5v-13v-11v-160v-416h192q26 0 45 -19t19 -45z " />
-<glyph unicode="&#xf07a;" horiz-adv-x="1664" d="M640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5 l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5 t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf07b;" horiz-adv-x="1664" d="M1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
-<glyph unicode="&#xf07c;" horiz-adv-x="1920" d="M1879 584q0 -31 -31 -66l-336 -396q-43 -51 -120.5 -86.5t-143.5 -35.5h-1088q-34 0 -60.5 13t-26.5 43q0 31 31 66l336 396q43 51 120.5 86.5t143.5 35.5h1088q34 0 60.5 -13t26.5 -43zM1536 928v-160h-832q-94 0 -197 -47.5t-164 -119.5l-337 -396l-5 -6q0 4 -0.5 12.5 t-0.5 12.5v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158z" />
-<glyph unicode="&#xf07d;" horiz-adv-x="768" d="M704 1216q0 -26 -19 -45t-45 -19h-128v-1024h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v1024h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45z" />
-<glyph unicode="&#xf07e;" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-1024v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h1024v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
-<glyph unicode="&#xf080;" horiz-adv-x="2048" d="M640 640v-512h-256v512h256zM1024 1152v-1024h-256v1024h256zM2048 0v-128h-2048v1536h128v-1408h1920zM1408 896v-768h-256v768h256zM1792 1280v-1152h-256v1152h256z" />
-<glyph unicode="&#xf081;" d="M1280 926q-56 -25 -121 -34q68 40 93 117q-65 -38 -134 -51q-61 66 -153 66q-87 0 -148.5 -61.5t-61.5 -148.5q0 -29 5 -48q-129 7 -242 65t-192 155q-29 -50 -29 -106q0 -114 91 -175q-47 1 -100 26v-2q0 -75 50 -133.5t123 -72.5q-29 -8 -51 -8q-13 0 -39 4 q21 -63 74.5 -104t121.5 -42q-116 -90 -261 -90q-26 0 -50 3q148 -94 322 -94q112 0 210 35.5t168 95t120.5 137t75 162t24.5 168.5q0 18 -1 27q63 45 105 109zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5 t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf082;" d="M1536 160q0 -119 -84.5 -203.5t-203.5 -84.5h-192v608h203l30 224h-233v143q0 54 28 83t96 29l132 1v207q-96 9 -180 9q-136 0 -218 -80.5t-82 -225.5v-166h-224v-224h224v-608h-544q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960 q119 0 203.5 -84.5t84.5 -203.5v-960z" />
-<glyph unicode="&#xf083;" horiz-adv-x="1792" d="M928 704q0 14 -9 23t-23 9q-66 0 -113 -47t-47 -113q0 -14 9 -23t23 -9t23 9t9 23q0 40 28 68t68 28q14 0 23 9t9 23zM1152 574q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM128 0h1536v128h-1536v-128zM1280 574q0 159 -112.5 271.5 t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM256 1216h384v128h-384v-128zM128 1024h1536v118v138h-828l-64 -128h-644v-128zM1792 1280v-1280q0 -53 -37.5 -90.5t-90.5 -37.5h-1536q-53 0 -90.5 37.5t-37.5 90.5v1280 q0 53 37.5 90.5t90.5 37.5h1536q53 0 90.5 -37.5t37.5 -90.5z" />
-<glyph unicode="&#xf084;" horiz-adv-x="1792" d="M832 1024q0 80 -56 136t-136 56t-136 -56t-56 -136q0 -42 19 -83q-41 19 -83 19q-80 0 -136 -56t-56 -136t56 -136t136 -56t136 56t56 136q0 42 -19 83q41 -19 83 -19q80 0 136 56t56 136zM1683 320q0 -17 -49 -66t-66 -49q-9 0 -28.5 16t-36.5 33t-38.5 40t-24.5 26 l-96 -96l220 -220q28 -28 28 -68q0 -42 -39 -81t-81 -39q-40 0 -68 28l-671 671q-176 -131 -365 -131q-163 0 -265.5 102.5t-102.5 265.5q0 160 95 313t248 248t313 95q163 0 265.5 -102.5t102.5 -265.5q0 -189 -131 -365l355 -355l96 96q-3 3 -26 24.5t-40 38.5t-33 36.5 t-16 28.5q0 17 49 66t66 49q13 0 23 -10q6 -6 46 -44.5t82 -79.5t86.5 -86t73 -78t28.5 -41z" />
-<glyph unicode="&#xf085;" horiz-adv-x="1920" d="M896 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1664 128q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1152q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1280 731v-185q0 -10 -7 -19.5t-16 -10.5l-155 -24q-11 -35 -32 -76q34 -48 90 -115q7 -10 7 -20q0 -12 -7 -19q-23 -30 -82.5 -89.5t-78.5 -59.5q-11 0 -21 7l-115 90q-37 -19 -77 -31q-11 -108 -23 -155q-7 -24 -30 -24h-186q-11 0 -20 7.5t-10 17.5 l-23 153q-34 10 -75 31l-118 -89q-7 -7 -20 -7q-11 0 -21 8q-144 133 -144 160q0 9 7 19q10 14 41 53t47 61q-23 44 -35 82l-152 24q-10 1 -17 9.5t-7 19.5v185q0 10 7 19.5t16 10.5l155 24q11 35 32 76q-34 48 -90 115q-7 11 -7 20q0 12 7 20q22 30 82 89t79 59q11 0 21 -7 l115 -90q34 18 77 32q11 108 23 154q7 24 30 24h186q11 0 20 -7.5t10 -17.5l23 -153q34 -10 75 -31l118 89q8 7 20 7q11 0 21 -8q144 -133 144 -160q0 -9 -7 -19q-12 -16 -42 -54t-45 -60q23 -48 34 -82l152 -23q10 -2 17 -10.5t7 -19.5zM1920 198v-140q0 -16 -149 -31 q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20 t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31zM1920 1222v-140q0 -16 -149 -31q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68 q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70 q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31z" />
-<glyph unicode="&#xf086;" horiz-adv-x="1792" d="M1408 768q0 -139 -94 -257t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224 q0 139 94 257t256.5 186.5t353.5 68.5t353.5 -68.5t256.5 -186.5t94 -257zM1792 512q0 -120 -71 -224.5t-195 -176.5q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7 q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230z" />
-<glyph unicode="&#xf087;" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 768q0 51 -39 89.5t-89 38.5h-352q0 58 48 159.5t48 160.5q0 98 -32 145t-128 47q-26 -26 -38 -85t-30.5 -125.5t-59.5 -109.5q-22 -23 -77 -91q-4 -5 -23 -30t-31.5 -41t-34.5 -42.5 t-40 -44t-38.5 -35.5t-40 -27t-35.5 -9h-32v-640h32q13 0 31.5 -3t33 -6.5t38 -11t35 -11.5t35.5 -12.5t29 -10.5q211 -73 342 -73h121q192 0 192 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5q32 1 53.5 47t21.5 81zM1536 769 q0 -89 -49 -163q9 -33 9 -69q0 -77 -38 -144q3 -21 3 -43q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5h-36h-93q-96 0 -189.5 22.5t-216.5 65.5q-116 40 -138 40h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h274q36 24 137 155q58 75 107 128 q24 25 35.5 85.5t30.5 126.5t62 108q39 37 90 37q84 0 151 -32.5t102 -101.5t35 -186q0 -93 -48 -192h176q104 0 180 -76t76 -179z" />
-<glyph unicode="&#xf088;" d="M256 1088q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 512q0 35 -21.5 81t-53.5 47q15 17 25 47.5t10 55.5q0 69 -53 119q18 32 18 69t-17.5 73.5t-47.5 52.5q5 30 5 56q0 85 -49 126t-136 41h-128q-131 0 -342 -73q-5 -2 -29 -10.5 t-35.5 -12.5t-35 -11.5t-38 -11t-33 -6.5t-31.5 -3h-32v-640h32q16 0 35.5 -9t40 -27t38.5 -35.5t40 -44t34.5 -42.5t31.5 -41t23 -30q55 -68 77 -91q41 -43 59.5 -109.5t30.5 -125.5t38 -85q96 0 128 47t32 145q0 59 -48 160.5t-48 159.5h352q50 0 89 38.5t39 89.5z M1536 511q0 -103 -76 -179t-180 -76h-176q48 -99 48 -192q0 -118 -35 -186q-35 -69 -102 -101.5t-151 -32.5q-51 0 -90 37q-34 33 -54 82t-25.5 90.5t-17.5 84.5t-31 64q-48 50 -107 127q-101 131 -137 155h-274q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5 h288q22 0 138 40q128 44 223 66t200 22h112q140 0 226.5 -79t85.5 -216v-5q60 -77 60 -178q0 -22 -3 -43q38 -67 38 -144q0 -36 -9 -69q49 -74 49 -163z" />
-<glyph unicode="&#xf089;" horiz-adv-x="896" d="M832 1504v-1339l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41z" />
-<glyph unicode="&#xf08a;" horiz-adv-x="1792" d="M1664 940q0 81 -21.5 143t-55 98.5t-81.5 59.5t-94 31t-98 8t-112 -25.5t-110.5 -64t-86.5 -72t-60 -61.5q-18 -22 -49 -22t-49 22q-24 28 -60 61.5t-86.5 72t-110.5 64t-112 25.5t-98 -8t-94 -31t-81.5 -59.5t-55 -98.5t-21.5 -143q0 -168 187 -355l581 -560l580 559 q188 188 188 356zM1792 940q0 -221 -229 -450l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5 q224 0 351 -124t127 -344z" />
-<glyph unicode="&#xf08b;" horiz-adv-x="1664" d="M640 96q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h320q13 0 22.5 -9.5t9.5 -22.5q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-66 0 -113 -47t-47 -113v-704 q0 -66 47 -113t113 -47h288h11h13t11.5 -1t11.5 -3t8 -5.5t7 -9t2 -13.5zM1568 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45z" />
-<glyph unicode="&#xf08c;" d="M237 122h231v694h-231v-694zM483 1030q-1 52 -36 86t-93 34t-94.5 -34t-36.5 -86q0 -51 35.5 -85.5t92.5 -34.5h1q59 0 95 34.5t36 85.5zM1068 122h231v398q0 154 -73 233t-193 79q-136 0 -209 -117h2v101h-231q3 -66 0 -694h231v388q0 38 7 56q15 35 45 59.5t74 24.5 q116 0 116 -157v-371zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf08d;" horiz-adv-x="1152" d="M480 672v448q0 14 -9 23t-23 9t-23 -9t-9 -23v-448q0 -14 9 -23t23 -9t23 9t9 23zM1152 320q0 -26 -19 -45t-45 -19h-429l-51 -483q-2 -12 -10.5 -20.5t-20.5 -8.5h-1q-27 0 -32 27l-76 485h-404q-26 0 -45 19t-19 45q0 123 78.5 221.5t177.5 98.5v512q-52 0 -90 38 t-38 90t38 90t90 38h640q52 0 90 -38t38 -90t-38 -90t-90 -38v-512q99 0 177.5 -98.5t78.5 -221.5z" />
-<glyph unicode="&#xf08e;" horiz-adv-x="1792" d="M1408 608v-320q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v320 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1792 1472v-512q0 -26 -19 -45t-45 -19t-45 19l-176 176l-652 -652q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l652 652l-176 176q-19 19 -19 45t19 45t45 19h512q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf090;" d="M1184 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45zM1536 992v-704q0 -119 -84.5 -203.5t-203.5 -84.5h-320q-13 0 -22.5 9.5t-9.5 22.5 q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q66 0 113 47t47 113v704q0 66 -47 113t-113 47h-288h-11h-13t-11.5 1t-11.5 3t-8 5.5t-7 9t-2 13.5q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf091;" horiz-adv-x="1664" d="M458 653q-74 162 -74 371h-256v-96q0 -78 94.5 -162t235.5 -113zM1536 928v96h-256q0 -209 -74 -371q141 29 235.5 113t94.5 162zM1664 1056v-128q0 -71 -41.5 -143t-112 -130t-173 -97.5t-215.5 -44.5q-42 -54 -95 -95q-38 -34 -52.5 -72.5t-14.5 -89.5q0 -54 30.5 -91 t97.5 -37q75 0 133.5 -45.5t58.5 -114.5v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 69 58.5 114.5t133.5 45.5q67 0 97.5 37t30.5 91q0 51 -14.5 89.5t-52.5 72.5q-53 41 -95 95q-113 5 -215.5 44.5t-173 97.5t-112 130t-41.5 143v128q0 40 28 68t68 28h288v96 q0 66 47 113t113 47h576q66 0 113 -47t47 -113v-96h288q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf092;" d="M394 184q-8 -9 -20 3q-13 11 -4 19q8 9 20 -3q12 -11 4 -19zM352 245q9 -12 0 -19q-8 -6 -17 7t0 18q9 7 17 -6zM291 305q-5 -7 -13 -2q-10 5 -7 12q3 5 13 2q10 -5 7 -12zM322 271q-6 -7 -16 3q-9 11 -2 16q6 6 16 -3q9 -11 2 -16zM451 159q-4 -12 -19 -6q-17 4 -13 15 t19 7q16 -5 13 -16zM514 154q0 -11 -16 -11q-17 -2 -17 11q0 11 16 11q17 2 17 -11zM572 164q2 -10 -14 -14t-18 8t14 15q16 2 18 -9zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-224q-16 0 -24.5 1t-19.5 5t-16 14.5t-5 27.5v239q0 97 -52 142q57 6 102.5 18t94 39 t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103 q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -103t0.5 -68q0 -22 -11 -33.5t-22 -13t-33 -1.5 h-224q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf093;" horiz-adv-x="1664" d="M1280 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 288v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h427q21 -56 70.5 -92 t110.5 -36h256q61 0 110.5 36t70.5 92h427q40 0 68 -28t28 -68zM1339 936q-17 -40 -59 -40h-256v-448q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v448h-256q-42 0 -59 40q-17 39 14 69l448 448q18 19 45 19t45 -19l448 -448q31 -30 14 -69z" />
-<glyph unicode="&#xf094;" d="M1407 710q0 44 -7 113.5t-18 96.5q-12 30 -17 44t-9 36.5t-4 48.5q0 23 5 68.5t5 67.5q0 37 -10 55q-4 1 -13 1q-19 0 -58 -4.5t-59 -4.5q-60 0 -176 24t-175 24q-43 0 -94.5 -11.5t-85 -23.5t-89.5 -34q-137 -54 -202 -103q-96 -73 -159.5 -189.5t-88 -236t-24.5 -248.5 q0 -40 12.5 -120t12.5 -121q0 -23 -11 -66.5t-11 -65.5t12 -36.5t34 -14.5q24 0 72.5 11t73.5 11q57 0 169.5 -15.5t169.5 -15.5q181 0 284 36q129 45 235.5 152.5t166 245.5t59.5 275zM1535 712q0 -165 -70 -327.5t-196 -288t-281 -180.5q-124 -44 -326 -44 q-57 0 -170 14.5t-169 14.5q-24 0 -72.5 -14.5t-73.5 -14.5q-73 0 -123.5 55.5t-50.5 128.5q0 24 11 68t11 67q0 40 -12.5 120.5t-12.5 121.5q0 111 18 217.5t54.5 209.5t100.5 194t150 156q78 59 232 120q194 78 316 78q60 0 175.5 -24t173.5 -24q19 0 57 5t58 5 q81 0 118 -50.5t37 -134.5q0 -23 -5 -68t-5 -68q0 -10 1 -18.5t3 -17t4 -13.5t6.5 -16t6.5 -17q16 -40 25 -118.5t9 -136.5z" />
-<glyph unicode="&#xf095;" horiz-adv-x="1408" d="M1408 296q0 -27 -10 -70.5t-21 -68.5q-21 -50 -122 -106q-94 -51 -186 -51q-27 0 -52.5 3.5t-57.5 12.5t-47.5 14.5t-55.5 20.5t-49 18q-98 35 -175 83q-128 79 -264.5 215.5t-215.5 264.5q-48 77 -83 175q-3 9 -18 49t-20.5 55.5t-14.5 47.5t-12.5 57.5t-3.5 52.5 q0 92 51 186q56 101 106 122q25 11 68.5 21t70.5 10q14 0 21 -3q18 -6 53 -76q11 -19 30 -54t35 -63.5t31 -53.5q3 -4 17.5 -25t21.5 -35.5t7 -28.5q0 -20 -28.5 -50t-62 -55t-62 -53t-28.5 -46q0 -9 5 -22.5t8.5 -20.5t14 -24t11.5 -19q76 -137 174 -235t235 -174 q2 -1 19 -11.5t24 -14t20.5 -8.5t22.5 -5q18 0 46 28.5t53 62t55 62t50 28.5q14 0 28.5 -7t35.5 -21.5t25 -17.5q25 -15 53.5 -31t63.5 -35t54 -30q70 -35 76 -53q3 -7 3 -21z" />
-<glyph unicode="&#xf096;" horiz-adv-x="1408" d="M1120 1280h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v832q0 66 -47 113t-113 47zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf097;" horiz-adv-x="1280" d="M1152 1280h-1024v-1242l423 406l89 85l89 -85l423 -406v1242zM1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289 q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
-<glyph unicode="&#xf098;" d="M1280 343q0 11 -2 16q-3 8 -38.5 29.5t-88.5 49.5l-53 29q-5 3 -19 13t-25 15t-21 5q-18 0 -47 -32.5t-57 -65.5t-44 -33q-7 0 -16.5 3.5t-15.5 6.5t-17 9.5t-14 8.5q-99 55 -170.5 126.5t-126.5 170.5q-2 3 -8.5 14t-9.5 17t-6.5 15.5t-3.5 16.5q0 13 20.5 33.5t45 38.5 t45 39.5t20.5 36.5q0 10 -5 21t-15 25t-13 19q-3 6 -15 28.5t-25 45.5t-26.5 47.5t-25 40.5t-16.5 18t-16 2q-48 0 -101 -22q-46 -21 -80 -94.5t-34 -130.5q0 -16 2.5 -34t5 -30.5t9 -33t10 -29.5t12.5 -33t11 -30q60 -164 216.5 -320.5t320.5 -216.5q6 -2 30 -11t33 -12.5 t29.5 -10t33 -9t30.5 -5t34 -2.5q57 0 130.5 34t94.5 80q22 53 22 101zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf099;" horiz-adv-x="1664" d="M1620 1128q-67 -98 -162 -167q1 -14 1 -42q0 -130 -38 -259.5t-115.5 -248.5t-184.5 -210.5t-258 -146t-323 -54.5q-271 0 -496 145q35 -4 78 -4q225 0 401 138q-105 2 -188 64.5t-114 159.5q33 -5 61 -5q43 0 85 11q-112 23 -185.5 111.5t-73.5 205.5v4q68 -38 146 -41 q-66 44 -105 115t-39 154q0 88 44 163q121 -149 294.5 -238.5t371.5 -99.5q-8 38 -8 74q0 134 94.5 228.5t228.5 94.5q140 0 236 -102q109 21 205 78q-37 -115 -142 -178q93 10 186 50z" />
-<glyph unicode="&#xf09a;" horiz-adv-x="1024" d="M959 1524v-264h-157q-86 0 -116 -36t-30 -108v-189h293l-39 -296h-254v-759h-306v759h-255v296h255v218q0 186 104 288.5t277 102.5q147 0 228 -12z" />
-<glyph unicode="&#xf09b;" d="M1536 640q0 -251 -146.5 -451.5t-378.5 -277.5q-27 -5 -39.5 7t-12.5 30v211q0 97 -52 142q57 6 102.5 18t94 39t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5 q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23 q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -89t0.5 -54q0 -18 -13 -30t-40 -7q-232 77 -378.5 277.5t-146.5 451.5q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf09c;" horiz-adv-x="1664" d="M1664 960v-256q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-192h96q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h672v192q0 185 131.5 316.5t316.5 131.5 t316.5 -131.5t131.5 -316.5z" />
-<glyph unicode="&#xf09d;" horiz-adv-x="1920" d="M1760 1408q66 0 113 -47t47 -113v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600zM160 1280q-13 0 -22.5 -9.5t-9.5 -22.5v-224h1664v224q0 13 -9.5 22.5t-22.5 9.5h-1600zM1760 0q13 0 22.5 9.5t9.5 22.5v608h-1664v-608 q0 -13 9.5 -22.5t22.5 -9.5h1600zM256 128v128h256v-128h-256zM640 128v128h384v-128h-384z" />
-<glyph unicode="&#xf09e;" horiz-adv-x="1408" d="M384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 69q2 -28 -17 -48q-18 -21 -47 -21h-135q-25 0 -43 16.5t-20 41.5q-22 229 -184.5 391.5t-391.5 184.5q-25 2 -41.5 20t-16.5 43v135q0 29 21 47q17 17 43 17h5q160 -13 306 -80.5 t259 -181.5q114 -113 181.5 -259t80.5 -306zM1408 67q2 -27 -18 -47q-18 -20 -46 -20h-143q-26 0 -44.5 17.5t-19.5 42.5q-12 215 -101 408.5t-231.5 336t-336 231.5t-408.5 102q-25 1 -42.5 19.5t-17.5 43.5v143q0 28 20 46q18 18 44 18h3q262 -13 501.5 -120t425.5 -294 q187 -186 294 -425.5t120 -501.5z" />
-<glyph unicode="&#xf0a0;" d="M1040 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1296 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1408 160v320q0 13 -9.5 22.5t-22.5 9.5 h-1216q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5zM178 640h1180l-157 482q-4 13 -16 21.5t-26 8.5h-782q-14 0 -26 -8.5t-16 -21.5zM1536 480v-320q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v320q0 25 16 75 l197 606q17 53 63 86t101 33h782q55 0 101 -33t63 -86l197 -606q16 -50 16 -75z" />
-<glyph unicode="&#xf0a1;" horiz-adv-x="1792" d="M1664 896q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5v-384q0 -52 -38 -90t-90 -38q-417 347 -812 380q-58 -19 -91 -66t-31 -100.5t40 -92.5q-20 -33 -23 -65.5t6 -58t33.5 -55t48 -50t61.5 -50.5q-29 -58 -111.5 -83t-168.5 -11.5t-132 55.5q-7 23 -29.5 87.5 t-32 94.5t-23 89t-15 101t3.5 98.5t22 110.5h-122q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h480q435 0 896 384q52 0 90 -38t38 -90v-384zM1536 292v954q-394 -302 -768 -343v-270q377 -42 768 -341z" />
-<glyph unicode="&#xf0a2;" horiz-adv-x="1792" d="M912 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM246 128h1300q-266 300 -266 832q0 51 -24 105t-69 103t-121.5 80.5t-169.5 31.5t-169.5 -31.5t-121.5 -80.5t-69 -103t-24 -105q0 -532 -266 -832z M1728 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q190 -28 307 -158.5 t117 -282.5q0 -139 19.5 -260t50 -206t74.5 -158.5t85 -119.5t91 -88z" />
-<glyph unicode="&#xf0a3;" d="M1376 640l138 -135q30 -28 20 -70q-12 -41 -52 -51l-188 -48l53 -186q12 -41 -19 -70q-29 -31 -70 -19l-186 53l-48 -188q-10 -40 -51 -52q-12 -2 -19 -2q-31 0 -51 22l-135 138l-135 -138q-28 -30 -70 -20q-41 11 -51 52l-48 188l-186 -53q-41 -12 -70 19q-31 29 -19 70 l53 186l-188 48q-40 10 -52 51q-10 42 20 70l138 135l-138 135q-30 28 -20 70q12 41 52 51l188 48l-53 186q-12 41 19 70q29 31 70 19l186 -53l48 188q10 41 51 51q41 12 70 -19l135 -139l135 139q29 30 70 19q41 -10 51 -51l48 -188l186 53q41 12 70 -19q31 -29 19 -70 l-53 -186l188 -48q40 -10 52 -51q10 -42 -20 -70z" />
-<glyph unicode="&#xf0a4;" horiz-adv-x="1792" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 768q0 51 -39 89.5t-89 38.5h-576q0 20 15 48.5t33 55t33 68t15 84.5q0 67 -44.5 97.5t-115.5 30.5q-24 0 -90 -139q-24 -44 -37 -65q-40 -64 -112 -145q-71 -81 -101 -106 q-69 -57 -140 -57h-32v-640h32q72 0 167 -32t193.5 -64t179.5 -32q189 0 189 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5h331q52 0 90 38t38 90zM1792 769q0 -105 -75.5 -181t-180.5 -76h-169q-4 -62 -37 -119q3 -21 3 -43 q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5q-133 0 -322 69q-164 59 -223 59h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h288q10 0 21.5 4.5t23.5 14t22.5 18t24 22.5t20.5 21.5t19 21.5t14 17q65 74 100 129q13 21 33 62t37 72t40.5 63t55 49.5 t69.5 17.5q125 0 206.5 -67t81.5 -189q0 -68 -22 -128h374q104 0 180 -76t76 -179z" />
-<glyph unicode="&#xf0a5;" horiz-adv-x="1792" d="M1376 128h32v640h-32q-35 0 -67.5 12t-62.5 37t-50 46t-49 54q-2 3 -3.5 4.5t-4 4.5t-4.5 5q-72 81 -112 145q-14 22 -38 68q-1 3 -10.5 22.5t-18.5 36t-20 35.5t-21.5 30.5t-18.5 11.5q-71 0 -115.5 -30.5t-44.5 -97.5q0 -43 15 -84.5t33 -68t33 -55t15 -48.5h-576 q-50 0 -89 -38.5t-39 -89.5q0 -52 38 -90t90 -38h331q-15 -17 -25 -47.5t-10 -55.5q0 -69 53 -119q-18 -32 -18 -69t17.5 -73.5t47.5 -52.5q-4 -24 -4 -56q0 -85 48.5 -126t135.5 -41q84 0 183 32t194 64t167 32zM1664 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45 t45 -19t45 19t19 45zM1792 768v-640q0 -53 -37.5 -90.5t-90.5 -37.5h-288q-59 0 -223 -59q-190 -69 -317 -69q-142 0 -230 77.5t-87 217.5l1 5q-61 76 -61 178q0 22 3 43q-33 57 -37 119h-169q-105 0 -180.5 76t-75.5 181q0 103 76 179t180 76h374q-22 60 -22 128 q0 122 81.5 189t206.5 67q38 0 69.5 -17.5t55 -49.5t40.5 -63t37 -72t33 -62q35 -55 100 -129q2 -3 14 -17t19 -21.5t20.5 -21.5t24 -22.5t22.5 -18t23.5 -14t21.5 -4.5h288q53 0 90.5 -37.5t37.5 -90.5z" />
-<glyph unicode="&#xf0a6;" d="M1280 -64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 700q0 189 -167 189q-26 0 -56 -5q-16 30 -52.5 47.5t-73.5 17.5t-69 -18q-50 53 -119 53q-25 0 -55.5 -10t-47.5 -25v331q0 52 -38 90t-90 38q-51 0 -89.5 -39t-38.5 -89v-576 q-20 0 -48.5 15t-55 33t-68 33t-84.5 15q-67 0 -97.5 -44.5t-30.5 -115.5q0 -24 139 -90q44 -24 65 -37q64 -40 145 -112q81 -71 106 -101q57 -69 57 -140v-32h640v32q0 72 32 167t64 193.5t32 179.5zM1536 705q0 -133 -69 -322q-59 -164 -59 -223v-288q0 -53 -37.5 -90.5 t-90.5 -37.5h-640q-53 0 -90.5 37.5t-37.5 90.5v288q0 10 -4.5 21.5t-14 23.5t-18 22.5t-22.5 24t-21.5 20.5t-21.5 19t-17 14q-74 65 -129 100q-21 13 -62 33t-72 37t-63 40.5t-49.5 55t-17.5 69.5q0 125 67 206.5t189 81.5q68 0 128 -22v374q0 104 76 180t179 76 q105 0 181 -75.5t76 -180.5v-169q62 -4 119 -37q21 3 43 3q101 0 178 -60q139 1 219.5 -85t80.5 -227z" />
-<glyph unicode="&#xf0a7;" d="M1408 576q0 84 -32 183t-64 194t-32 167v32h-640v-32q0 -35 -12 -67.5t-37 -62.5t-46 -50t-54 -49q-9 -8 -14 -12q-81 -72 -145 -112q-22 -14 -68 -38q-3 -1 -22.5 -10.5t-36 -18.5t-35.5 -20t-30.5 -21.5t-11.5 -18.5q0 -71 30.5 -115.5t97.5 -44.5q43 0 84.5 15t68 33 t55 33t48.5 15v-576q0 -50 38.5 -89t89.5 -39q52 0 90 38t38 90v331q46 -35 103 -35q69 0 119 53q32 -18 69 -18t73.5 17.5t52.5 47.5q24 -4 56 -4q85 0 126 48.5t41 135.5zM1280 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 580 q0 -142 -77.5 -230t-217.5 -87l-5 1q-76 -61 -178 -61q-22 0 -43 3q-54 -30 -119 -37v-169q0 -105 -76 -180.5t-181 -75.5q-103 0 -179 76t-76 180v374q-54 -22 -128 -22q-121 0 -188.5 81.5t-67.5 206.5q0 38 17.5 69.5t49.5 55t63 40.5t72 37t62 33q55 35 129 100 q3 2 17 14t21.5 19t21.5 20.5t22.5 24t18 22.5t14 23.5t4.5 21.5v288q0 53 37.5 90.5t90.5 37.5h640q53 0 90.5 -37.5t37.5 -90.5v-288q0 -59 59 -223q69 -190 69 -317z" />
-<glyph unicode="&#xf0a8;" d="M1280 576v128q0 26 -19 45t-45 19h-502l189 189q19 19 19 45t-19 45l-91 91q-18 18 -45 18t-45 -18l-362 -362l-91 -91q-18 -18 -18 -45t18 -45l91 -91l362 -362q18 -18 45 -18t45 18l91 91q18 18 18 45t-18 45l-189 189h502q26 0 45 19t19 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0a9;" d="M1285 640q0 27 -18 45l-91 91l-362 362q-18 18 -45 18t-45 -18l-91 -91q-18 -18 -18 -45t18 -45l189 -189h-502q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h502l-189 -189q-19 -19 -19 -45t19 -45l91 -91q18 -18 45 -18t45 18l362 362l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0aa;" d="M1284 641q0 27 -18 45l-362 362l-91 91q-18 18 -45 18t-45 -18l-91 -91l-362 -362q-18 -18 -18 -45t18 -45l91 -91q18 -18 45 -18t45 18l189 189v-502q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v502l189 -189q19 -19 45 -19t45 19l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0ab;" d="M1284 639q0 27 -18 45l-91 91q-18 18 -45 18t-45 -18l-189 -189v502q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-502l-189 189q-19 19 -45 19t-45 -19l-91 -91q-18 -18 -18 -45t18 -45l362 -362l91 -91q18 -18 45 -18t45 18l91 91l362 362q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0ac;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1042 887q-2 -1 -9.5 -9.5t-13.5 -9.5q2 0 4.5 5t5 11t3.5 7q6 7 22 15q14 6 52 12q34 8 51 -11 q-2 2 9.5 13t14.5 12q3 2 15 4.5t15 7.5l2 22q-12 -1 -17.5 7t-6.5 21q0 -2 -6 -8q0 7 -4.5 8t-11.5 -1t-9 -1q-10 3 -15 7.5t-8 16.5t-4 15q-2 5 -9.5 10.5t-9.5 10.5q-1 2 -2.5 5.5t-3 6.5t-4 5.5t-5.5 2.5t-7 -5t-7.5 -10t-4.5 -5q-3 2 -6 1.5t-4.5 -1t-4.5 -3t-5 -3.5 q-3 -2 -8.5 -3t-8.5 -2q15 5 -1 11q-10 4 -16 3q9 4 7.5 12t-8.5 14h5q-1 4 -8.5 8.5t-17.5 8.5t-13 6q-8 5 -34 9.5t-33 0.5q-5 -6 -4.5 -10.5t4 -14t3.5 -12.5q1 -6 -5.5 -13t-6.5 -12q0 -7 14 -15.5t10 -21.5q-3 -8 -16 -16t-16 -12q-5 -8 -1.5 -18.5t10.5 -16.5 q2 -2 1.5 -4t-3.5 -4.5t-5.5 -4t-6.5 -3.5l-3 -2q-11 -5 -20.5 6t-13.5 26q-7 25 -16 30q-23 8 -29 -1q-5 13 -41 26q-25 9 -58 4q6 1 0 15q-7 15 -19 12q3 6 4 17.5t1 13.5q3 13 12 23q1 1 7 8.5t9.5 13.5t0.5 6q35 -4 50 11q5 5 11.5 17t10.5 17q9 6 14 5.5t14.5 -5.5 t14.5 -5q14 -1 15.5 11t-7.5 20q12 -1 3 17q-5 7 -8 9q-12 4 -27 -5q-8 -4 2 -8q-1 1 -9.5 -10.5t-16.5 -17.5t-16 5q-1 1 -5.5 13.5t-9.5 13.5q-8 0 -16 -15q3 8 -11 15t-24 8q19 12 -8 27q-7 4 -20.5 5t-19.5 -4q-5 -7 -5.5 -11.5t5 -8t10.5 -5.5t11.5 -4t8.5 -3 q14 -10 8 -14q-2 -1 -8.5 -3.5t-11.5 -4.5t-6 -4q-3 -4 0 -14t-2 -14q-5 5 -9 17.5t-7 16.5q7 -9 -25 -6l-10 1q-4 0 -16 -2t-20.5 -1t-13.5 8q-4 8 0 20q1 4 4 2q-4 3 -11 9.5t-10 8.5q-46 -15 -94 -41q6 -1 12 1q5 2 13 6.5t10 5.5q34 14 42 7l5 5q14 -16 20 -25 q-7 4 -30 1q-20 -6 -22 -12q7 -12 5 -18q-4 3 -11.5 10t-14.5 11t-15 5q-16 0 -22 -1q-146 -80 -235 -222q7 -7 12 -8q4 -1 5 -9t2.5 -11t11.5 3q9 -8 3 -19q1 1 44 -27q19 -17 21 -21q3 -11 -10 -18q-1 2 -9 9t-9 4q-3 -5 0.5 -18.5t10.5 -12.5q-7 0 -9.5 -16t-2.5 -35.5 t-1 -23.5l2 -1q-3 -12 5.5 -34.5t21.5 -19.5q-13 -3 20 -43q6 -8 8 -9q3 -2 12 -7.5t15 -10t10 -10.5q4 -5 10 -22.5t14 -23.5q-2 -6 9.5 -20t10.5 -23q-1 0 -2.5 -1t-2.5 -1q3 -7 15.5 -14t15.5 -13q1 -3 2 -10t3 -11t8 -2q2 20 -24 62q-15 25 -17 29q-3 5 -5.5 15.5 t-4.5 14.5q2 0 6 -1.5t8.5 -3.5t7.5 -4t2 -3q-3 -7 2 -17.5t12 -18.5t17 -19t12 -13q6 -6 14 -19.5t0 -13.5q9 0 20 -10t17 -20q5 -8 8 -26t5 -24q2 -7 8.5 -13.5t12.5 -9.5l16 -8t13 -7q5 -2 18.5 -10.5t21.5 -11.5q10 -4 16 -4t14.5 2.5t13.5 3.5q15 2 29 -15t21 -21 q36 -19 55 -11q-2 -1 0.5 -7.5t8 -15.5t9 -14.5t5.5 -8.5q5 -6 18 -15t18 -15q6 4 7 9q-3 -8 7 -20t18 -10q14 3 14 32q-31 -15 -49 18q0 1 -2.5 5.5t-4 8.5t-2.5 8.5t0 7.5t5 3q9 0 10 3.5t-2 12.5t-4 13q-1 8 -11 20t-12 15q-5 -9 -16 -8t-16 9q0 -1 -1.5 -5.5t-1.5 -6.5 q-13 0 -15 1q1 3 2.5 17.5t3.5 22.5q1 4 5.5 12t7.5 14.5t4 12.5t-4.5 9.5t-17.5 2.5q-19 -1 -26 -20q-1 -3 -3 -10.5t-5 -11.5t-9 -7q-7 -3 -24 -2t-24 5q-13 8 -22.5 29t-9.5 37q0 10 2.5 26.5t3 25t-5.5 24.5q3 2 9 9.5t10 10.5q2 1 4.5 1.5t4.5 0t4 1.5t3 6q-1 1 -4 3 q-3 3 -4 3q7 -3 28.5 1.5t27.5 -1.5q15 -11 22 2q0 1 -2.5 9.5t-0.5 13.5q5 -27 29 -9q3 -3 15.5 -5t17.5 -5q3 -2 7 -5.5t5.5 -4.5t5 0.5t8.5 6.5q10 -14 12 -24q11 -40 19 -44q7 -3 11 -2t4.5 9.5t0 14t-1.5 12.5l-1 8v18l-1 8q-15 3 -18.5 12t1.5 18.5t15 18.5q1 1 8 3.5 t15.5 6.5t12.5 8q21 19 15 35q7 0 11 9q-1 0 -5 3t-7.5 5t-4.5 2q9 5 2 16q5 3 7.5 11t7.5 10q9 -12 21 -2q7 8 1 16q5 7 20.5 10.5t18.5 9.5q7 -2 8 2t1 12t3 12q4 5 15 9t13 5l17 11q3 4 0 4q18 -2 31 11q10 11 -6 20q3 6 -3 9.5t-15 5.5q3 1 11.5 0.5t10.5 1.5 q15 10 -7 16q-17 5 -43 -12zM879 10q206 36 351 189q-3 3 -12.5 4.5t-12.5 3.5q-18 7 -24 8q1 7 -2.5 13t-8 9t-12.5 8t-11 7q-2 2 -7 6t-7 5.5t-7.5 4.5t-8.5 2t-10 -1l-3 -1q-3 -1 -5.5 -2.5t-5.5 -3t-4 -3t0 -2.5q-21 17 -36 22q-5 1 -11 5.5t-10.5 7t-10 1.5t-11.5 -7 q-5 -5 -6 -15t-2 -13q-7 5 0 17.5t2 18.5q-3 6 -10.5 4.5t-12 -4.5t-11.5 -8.5t-9 -6.5t-8.5 -5.5t-8.5 -7.5q-3 -4 -6 -12t-5 -11q-2 4 -11.5 6.5t-9.5 5.5q2 -10 4 -35t5 -38q7 -31 -12 -48q-27 -25 -29 -40q-4 -22 12 -26q0 -7 -8 -20.5t-7 -21.5q0 -6 2 -16z" />
-<glyph unicode="&#xf0ad;" horiz-adv-x="1664" d="M384 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1028 484l-682 -682q-37 -37 -90 -37q-52 0 -91 37l-106 108q-38 36 -38 90q0 53 38 91l681 681q39 -98 114.5 -173.5t173.5 -114.5zM1662 919q0 -39 -23 -106q-47 -134 -164.5 -217.5 t-258.5 -83.5q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q58 0 121.5 -16.5t107.5 -46.5q16 -11 16 -28t-16 -28l-293 -169v-224l193 -107q5 3 79 48.5t135.5 81t70.5 35.5q15 0 23.5 -10t8.5 -25z" />
-<glyph unicode="&#xf0ae;" horiz-adv-x="1792" d="M1024 128h640v128h-640v-128zM640 640h1024v128h-1024v-128zM1280 1152h384v128h-384v-128zM1792 320v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 832v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19 t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0b0;" horiz-adv-x="1408" d="M1403 1241q17 -41 -14 -70l-493 -493v-742q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-256 256q-19 19 -19 45v486l-493 493q-31 29 -14 70q17 39 59 39h1280q42 0 59 -39z" />
-<glyph unicode="&#xf0b1;" horiz-adv-x="1792" d="M640 1280h512v128h-512v-128zM1792 640v-480q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v480h672v-160q0 -26 19 -45t45 -19h320q26 0 45 19t19 45v160h672zM1024 640v-128h-256v128h256zM1792 1120v-384h-1792v384q0 66 47 113t113 47h352v160q0 40 28 68 t68 28h576q40 0 68 -28t28 -68v-160h352q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf0b2;" d="M1283 995l-355 -355l355 -355l144 144q29 31 70 14q39 -17 39 -59v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l144 144l-355 355l-355 -355l144 -144q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l144 -144 l355 355l-355 355l-144 -144q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v448q0 26 19 45t45 19h448q42 0 59 -40q17 -39 -14 -69l-144 -144l355 -355l355 355l-144 144q-31 30 -14 69q17 40 59 40h448q26 0 45 -19t19 -45v-448q0 -42 -39 -59q-13 -5 -25 -5q-26 0 -45 19z " />
-<glyph unicode="&#xf0c0;" horiz-adv-x="1920" d="M593 640q-162 -5 -265 -128h-134q-82 0 -138 40.5t-56 118.5q0 353 124 353q6 0 43.5 -21t97.5 -42.5t119 -21.5q67 0 133 23q-5 -37 -5 -66q0 -139 81 -256zM1664 3q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5 t43 97.5t62 81t85.5 53.5t111.5 20q10 0 43 -21.5t73 -48t107 -48t135 -21.5t135 21.5t107 48t73 48t43 21.5q61 0 111.5 -20t85.5 -53.5t62 -81t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM640 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75 t75 -181zM1344 896q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5zM1920 671q0 -78 -56 -118.5t-138 -40.5h-134q-103 123 -265 128q81 117 81 256q0 29 -5 66q66 -23 133 -23q59 0 119 21.5t97.5 42.5 t43.5 21q124 0 124 -353zM1792 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181z" />
-<glyph unicode="&#xf0c1;" horiz-adv-x="1664" d="M1456 320q0 40 -28 68l-208 208q-28 28 -68 28q-42 0 -72 -32q3 -3 19 -18.5t21.5 -21.5t15 -19t13 -25.5t3.5 -27.5q0 -40 -28 -68t-68 -28q-15 0 -27.5 3.5t-25.5 13t-19 15t-21.5 21.5t-18.5 19q-33 -31 -33 -73q0 -40 28 -68l206 -207q27 -27 68 -27q40 0 68 26 l147 146q28 28 28 67zM753 1025q0 40 -28 68l-206 207q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l208 -208q27 -27 68 -27q42 0 72 31q-3 3 -19 18.5t-21.5 21.5t-15 19t-13 25.5t-3.5 27.5q0 40 28 68t68 28q15 0 27.5 -3.5t25.5 -13t19 -15 t21.5 -21.5t18.5 -19q33 31 33 73zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-206 207q-83 83 -83 203q0 123 88 209l-88 88q-86 -88 -208 -88q-120 0 -204 84l-208 208q-84 84 -84 204t85 203l147 146q83 83 203 83q121 0 204 -85l206 -207 q83 -83 83 -203q0 -123 -88 -209l88 -88q86 88 208 88q120 0 204 -84l208 -208q84 -84 84 -204z" />
-<glyph unicode="&#xf0c2;" horiz-adv-x="1920" d="M1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088q-185 0 -316.5 131.5t-131.5 316.5q0 132 71 241.5t187 163.5q-2 28 -2 43q0 212 150 362t362 150q158 0 286.5 -88t187.5 -230q70 62 166 62q106 0 181 -75t75 -181q0 -75 -41 -138q129 -30 213 -134.5t84 -239.5z " />
-<glyph unicode="&#xf0c3;" horiz-adv-x="1664" d="M1527 88q56 -89 21.5 -152.5t-140.5 -63.5h-1152q-106 0 -140.5 63.5t21.5 152.5l503 793v399h-64q-26 0 -45 19t-19 45t19 45t45 19h512q26 0 45 -19t19 -45t-19 -45t-45 -19h-64v-399zM748 813l-272 -429h712l-272 429l-20 31v37v399h-128v-399v-37z" />
-<glyph unicode="&#xf0c4;" horiz-adv-x="1792" d="M960 640q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1260 576l507 -398q28 -20 25 -56q-5 -35 -35 -51l-128 -64q-13 -7 -29 -7q-17 0 -31 8l-690 387l-110 -66q-8 -4 -12 -5q14 -49 10 -97q-7 -77 -56 -147.5t-132 -123.5q-132 -84 -277 -84 q-136 0 -222 78q-90 84 -79 207q7 76 56 147t131 124q132 84 278 84q83 0 151 -31q9 13 22 22l122 73l-122 73q-13 9 -22 22q-68 -31 -151 -31q-146 0 -278 84q-82 53 -131 124t-56 147q-5 59 15.5 113t63.5 93q85 79 222 79q145 0 277 -84q83 -52 132 -123t56 -148 q4 -48 -10 -97q4 -1 12 -5l110 -66l690 387q14 8 31 8q16 0 29 -7l128 -64q30 -16 35 -51q3 -36 -25 -56zM579 836q46 42 21 108t-106 117q-92 59 -192 59q-74 0 -113 -36q-46 -42 -21 -108t106 -117q92 -59 192 -59q74 0 113 36zM494 91q81 51 106 117t-21 108 q-39 36 -113 36q-100 0 -192 -59q-81 -51 -106 -117t21 -108q39 -36 113 -36q100 0 192 59zM672 704l96 -58v11q0 36 33 56l14 8l-79 47l-26 -26q-3 -3 -10 -11t-12 -12q-2 -2 -4 -3.5t-3 -2.5zM896 480l96 -32l736 576l-128 64l-768 -431v-113l-160 -96l9 -8q2 -2 7 -6 q4 -4 11 -12t11 -12l26 -26zM1600 64l128 64l-520 408l-177 -138q-2 -3 -13 -7z" />
-<glyph unicode="&#xf0c5;" horiz-adv-x="1792" d="M1696 1152q40 0 68 -28t28 -68v-1216q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v288h-544q-40 0 -68 28t-28 68v672q0 40 20 88t48 76l408 408q28 28 76 48t88 20h416q40 0 68 -28t28 -68v-328q68 40 128 40h416zM1152 939l-299 -299h299v299zM512 1323l-299 -299 h299v299zM708 676l316 316v416h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h512v256q0 40 20 88t48 76zM1664 -128v1152h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h896z" />
-<glyph unicode="&#xf0c6;" horiz-adv-x="1408" d="M1404 151q0 -117 -79 -196t-196 -79q-135 0 -235 100l-777 776q-113 115 -113 271q0 159 110 270t269 111q158 0 273 -113l605 -606q10 -10 10 -22q0 -16 -30.5 -46.5t-46.5 -30.5q-13 0 -23 10l-606 607q-79 77 -181 77q-106 0 -179 -75t-73 -181q0 -105 76 -181 l776 -777q63 -63 145 -63q64 0 106 42t42 106q0 82 -63 145l-581 581q-26 24 -60 24q-29 0 -48 -19t-19 -48q0 -32 25 -59l410 -410q10 -10 10 -22q0 -16 -31 -47t-47 -31q-12 0 -22 10l-410 410q-63 61 -63 149q0 82 57 139t139 57q88 0 149 -63l581 -581q100 -98 100 -235 z" />
-<glyph unicode="&#xf0c7;" d="M384 0h768v384h-768v-384zM1280 0h128v896q0 14 -10 38.5t-20 34.5l-281 281q-10 10 -34 20t-39 10v-416q0 -40 -28 -68t-68 -28h-576q-40 0 -68 28t-28 68v416h-128v-1280h128v416q0 40 28 68t68 28h832q40 0 68 -28t28 -68v-416zM896 928v320q0 13 -9.5 22.5t-22.5 9.5 h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5zM1536 896v-928q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h928q40 0 88 -20t76 -48l280 -280q28 -28 48 -76t20 -88z" />
-<glyph unicode="&#xf0c8;" d="M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf0c9;" d="M1536 192v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 704v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 1216v-128q0 -26 -19 -45 t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0ca;" horiz-adv-x="1792" d="M384 128q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 640q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1152q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z M1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf0cb;" horiz-adv-x="1792" d="M381 -84q0 -80 -54.5 -126t-135.5 -46q-106 0 -172 66l57 88q49 -45 106 -45q29 0 50.5 14.5t21.5 42.5q0 64 -105 56l-26 56q8 10 32.5 43.5t42.5 54t37 38.5v1q-16 0 -48.5 -1t-48.5 -1v-53h-106v152h333v-88l-95 -115q51 -12 81 -49t30 -88zM383 543v-159h-362 q-6 36 -6 54q0 51 23.5 93t56.5 68t66 47.5t56.5 43.5t23.5 45q0 25 -14.5 38.5t-39.5 13.5q-46 0 -81 -58l-85 59q24 51 71.5 79.5t105.5 28.5q73 0 123 -41.5t50 -112.5q0 -50 -34 -91.5t-75 -64.5t-75.5 -50.5t-35.5 -52.5h127v60h105zM1792 224v-192q0 -13 -9.5 -22.5 t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1123v-99h-335v99h107q0 41 0.5 122t0.5 121v12h-2q-8 -17 -50 -54l-71 76l136 127h106v-404h108zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5 t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf0cc;" horiz-adv-x="1792" d="M1760 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1728q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h1728zM483 704q-28 35 -51 80q-48 97 -48 188q0 181 134 309q133 127 393 127q50 0 167 -19q66 -12 177 -48q10 -38 21 -118q14 -123 14 -183q0 -18 -5 -45l-12 -3l-84 6 l-14 2q-50 149 -103 205q-88 91 -210 91q-114 0 -182 -59q-67 -58 -67 -146q0 -73 66 -140t279 -129q69 -20 173 -66q58 -28 95 -52h-743zM990 448h411q7 -39 7 -92q0 -111 -41 -212q-23 -55 -71 -104q-37 -35 -109 -81q-80 -48 -153 -66q-80 -21 -203 -21q-114 0 -195 23 l-140 40q-57 16 -72 28q-8 8 -8 22v13q0 108 -2 156q-1 30 0 68l2 37v44l102 2q15 -34 30 -71t22.5 -56t12.5 -27q35 -57 80 -94q43 -36 105 -57q59 -22 132 -22q64 0 139 27q77 26 122 86q47 61 47 129q0 84 -81 157q-34 29 -137 71z" />
-<glyph unicode="&#xf0cd;" d="M48 1313q-37 2 -45 4l-3 88q13 1 40 1q60 0 112 -4q132 -7 166 -7q86 0 168 3q116 4 146 5q56 0 86 2l-1 -14l2 -64v-9q-60 -9 -124 -9q-60 0 -79 -25q-13 -14 -13 -132q0 -13 0.5 -32.5t0.5 -25.5l1 -229l14 -280q6 -124 51 -202q35 -59 96 -92q88 -47 177 -47 q104 0 191 28q56 18 99 51q48 36 65 64q36 56 53 114q21 73 21 229q0 79 -3.5 128t-11 122.5t-13.5 159.5l-4 59q-5 67 -24 88q-34 35 -77 34l-100 -2l-14 3l2 86h84l205 -10q76 -3 196 10l18 -2q6 -38 6 -51q0 -7 -4 -31q-45 -12 -84 -13q-73 -11 -79 -17q-15 -15 -15 -41 q0 -7 1.5 -27t1.5 -31q8 -19 22 -396q6 -195 -15 -304q-15 -76 -41 -122q-38 -65 -112 -123q-75 -57 -182 -89q-109 -33 -255 -33q-167 0 -284 46q-119 47 -179 122q-61 76 -83 195q-16 80 -16 237v333q0 188 -17 213q-25 36 -147 39zM1536 -96v64q0 14 -9 23t-23 9h-1472 q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h1472q14 0 23 9t9 23z" />
-<glyph unicode="&#xf0ce;" horiz-adv-x="1664" d="M512 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23 v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 160v192 q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192 q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1664 1248v-1088q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1344q66 0 113 -47t47 -113 z" />
-<glyph unicode="&#xf0d0;" horiz-adv-x="1664" d="M1190 955l293 293l-107 107l-293 -293zM1637 1248q0 -27 -18 -45l-1286 -1286q-18 -18 -45 -18t-45 18l-198 198q-18 18 -18 45t18 45l1286 1286q18 18 45 18t45 -18l198 -198q18 -18 18 -45zM286 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM636 1276 l196 -60l-196 -60l-60 -196l-60 196l-196 60l196 60l60 196zM1566 798l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM926 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98z" />
-<glyph unicode="&#xf0d1;" horiz-adv-x="1792" d="M640 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM256 640h384v256h-158q-13 0 -22 -9l-195 -195q-9 -9 -9 -22v-30zM1536 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1792 1216v-1024q0 -15 -4 -26.5t-13.5 -18.5 t-16.5 -11.5t-23.5 -6t-22.5 -2t-25.5 0t-22.5 0.5q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-64q-3 0 -22.5 -0.5t-25.5 0t-22.5 2t-23.5 6t-16.5 11.5t-13.5 18.5t-4 26.5q0 26 19 45t45 19v320q0 8 -0.5 35t0 38 t2.5 34.5t6.5 37t14 30.5t22.5 30l198 198q19 19 50.5 32t58.5 13h160v192q0 26 19 45t45 19h1024q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0d2;" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103q-111 0 -218 32q59 93 78 164q9 34 54 211q20 -39 73 -67.5t114 -28.5q121 0 216 68.5t147 188.5t52 270q0 114 -59.5 214t-172.5 163t-255 63q-105 0 -196 -29t-154.5 -77t-109 -110.5t-67 -129.5t-21.5 -134 q0 -104 40 -183t117 -111q30 -12 38 20q2 7 8 31t8 30q6 23 -11 43q-51 61 -51 151q0 151 104.5 259.5t273.5 108.5q151 0 235.5 -82t84.5 -213q0 -170 -68.5 -289t-175.5 -119q-61 0 -98 43.5t-23 104.5q8 35 26.5 93.5t30 103t11.5 75.5q0 50 -27 83t-77 33 q-62 0 -105 -57t-43 -142q0 -73 25 -122l-99 -418q-17 -70 -13 -177q-206 91 -333 281t-127 423q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0d3;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-725q85 122 108 210q9 34 53 209q21 -39 73.5 -67t112.5 -28q181 0 295.5 147.5t114.5 373.5q0 84 -35 162.5t-96.5 139t-152.5 97t-197 36.5q-104 0 -194.5 -28.5t-153 -76.5 t-107.5 -109.5t-66.5 -128t-21.5 -132.5q0 -102 39.5 -180t116.5 -110q13 -5 23.5 0t14.5 19q10 44 15 61q6 23 -11 42q-50 62 -50 150q0 150 103.5 256.5t270.5 106.5q149 0 232.5 -81t83.5 -210q0 -168 -67.5 -286t-173.5 -118q-60 0 -97 43.5t-23 103.5q8 34 26.5 92.5 t29.5 102t11 74.5q0 49 -26.5 81.5t-75.5 32.5q-61 0 -103.5 -56.5t-42.5 -139.5q0 -72 24 -121l-98 -414q-24 -100 -7 -254h-183q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960z" />
-<glyph unicode="&#xf0d4;" d="M829 318q0 -76 -58.5 -112.5t-139.5 -36.5q-41 0 -80.5 9.5t-75.5 28.5t-58 53t-22 78q0 46 25 80t65.5 51.5t82 25t84.5 7.5q20 0 31 -2q2 -1 23 -16.5t26 -19t23 -18t24.5 -22t19 -22.5t17 -26t9 -26.5t4.5 -31.5zM755 863q0 -60 -33 -99.5t-92 -39.5q-53 0 -93 42.5 t-57.5 96.5t-17.5 106q0 61 32 104t92 43q53 0 93.5 -45t58 -101t17.5 -107zM861 1120l88 64h-265q-85 0 -161 -32t-127.5 -98t-51.5 -153q0 -93 64.5 -154.5t158.5 -61.5q22 0 43 3q-13 -29 -13 -54q0 -44 40 -94q-175 -12 -257 -63q-47 -29 -75.5 -73t-28.5 -95 q0 -43 18.5 -77.5t48.5 -56.5t69 -37t77.5 -21t76.5 -6q60 0 120.5 15.5t113.5 46t86 82.5t33 117q0 49 -20 89.5t-49 66.5t-58 47.5t-49 44t-20 44.5t15.5 42.5t37.5 39.5t44 42t37.5 59.5t15.5 82.5q0 60 -22.5 99.5t-72.5 90.5h83zM1152 672h128v64h-128v128h-64v-128 h-128v-64h128v-160h64v160zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf0d5;" horiz-adv-x="1664" d="M735 740q0 -36 32 -70.5t77.5 -68t90.5 -73.5t77 -104t32 -142q0 -90 -48 -173q-72 -122 -211 -179.5t-298 -57.5q-132 0 -246.5 41.5t-171.5 137.5q-37 60 -37 131q0 81 44.5 150t118.5 115q131 82 404 100q-32 42 -47.5 74t-15.5 73q0 36 21 85q-46 -4 -68 -4 q-148 0 -249.5 96.5t-101.5 244.5q0 82 36 159t99 131q77 66 182.5 98t217.5 32h418l-138 -88h-131q74 -63 112 -133t38 -160q0 -72 -24.5 -129.5t-59 -93t-69.5 -65t-59.5 -61.5t-24.5 -66zM589 836q38 0 78 16.5t66 43.5q53 57 53 159q0 58 -17 125t-48.5 129.5 t-84.5 103.5t-117 41q-42 0 -82.5 -19.5t-65.5 -52.5q-47 -59 -47 -160q0 -46 10 -97.5t31.5 -103t52 -92.5t75 -67t96.5 -26zM591 -37q58 0 111.5 13t99 39t73 73t27.5 109q0 25 -7 49t-14.5 42t-27 41.5t-29.5 35t-38.5 34.5t-36.5 29t-41.5 30t-36.5 26q-16 2 -48 2 q-53 0 -105 -7t-107.5 -25t-97 -46t-68.5 -74.5t-27 -105.5q0 -70 35 -123.5t91.5 -83t119 -44t127.5 -14.5zM1401 839h213v-108h-213v-219h-105v219h-212v108h212v217h105v-217z" />
-<glyph unicode="&#xf0d6;" horiz-adv-x="1920" d="M768 384h384v96h-128v448h-114l-148 -137l77 -80q42 37 55 57h2v-288h-128v-96zM1280 640q0 -70 -21 -142t-59.5 -134t-101.5 -101t-138 -39t-138 39t-101.5 101t-59.5 134t-21 142t21 142t59.5 134t101.5 101t138 39t138 -39t101.5 -101t59.5 -134t21 -142zM1792 384 v512q-106 0 -181 75t-75 181h-1152q0 -106 -75 -181t-181 -75v-512q106 0 181 -75t75 -181h1152q0 106 75 181t181 75zM1920 1216v-1152q0 -26 -19 -45t-45 -19h-1792q-26 0 -45 19t-19 45v1152q0 26 19 45t45 19h1792q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0d7;" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0d8;" horiz-adv-x="1024" d="M1024 320q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="&#xf0d9;" horiz-adv-x="640" d="M640 1088v-896q0 -26 -19 -45t-45 -19t-45 19l-448 448q-19 19 -19 45t19 45l448 448q19 19 45 19t45 -19t19 -45z" />
-<glyph unicode="&#xf0da;" horiz-adv-x="640" d="M576 640q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19t-19 45v896q0 26 19 45t45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="&#xf0db;" horiz-adv-x="1664" d="M160 0h608v1152h-640v-1120q0 -13 9.5 -22.5t22.5 -9.5zM1536 32v1120h-640v-1152h608q13 0 22.5 9.5t9.5 22.5zM1664 1248v-1216q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1344q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf0dc;" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45zM1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="&#xf0dd;" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0de;" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="&#xf0e0;" horiz-adv-x="1792" d="M1792 826v-794q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v794q44 -49 101 -87q362 -246 497 -345q57 -42 92.5 -65.5t94.5 -48t110 -24.5h1h1q51 0 110 24.5t94.5 48t92.5 65.5q170 123 498 345q57 39 100 87zM1792 1120q0 -79 -49 -151t-122 -123 q-376 -261 -468 -325q-10 -7 -42.5 -30.5t-54 -38t-52 -32.5t-57.5 -27t-50 -9h-1h-1q-23 0 -50 9t-57.5 27t-52 32.5t-54 38t-42.5 30.5q-91 64 -262 182.5t-205 142.5q-62 42 -117 115.5t-55 136.5q0 78 41.5 130t118.5 52h1472q65 0 112.5 -47t47.5 -113z" />
-<glyph unicode="&#xf0e1;" d="M349 911v-991h-330v991h330zM370 1217q1 -73 -50.5 -122t-135.5 -49h-2q-82 0 -132 49t-50 122q0 74 51.5 122.5t134.5 48.5t133 -48.5t51 -122.5zM1536 488v-568h-329v530q0 105 -40.5 164.5t-126.5 59.5q-63 0 -105.5 -34.5t-63.5 -85.5q-11 -30 -11 -81v-553h-329 q2 399 2 647t-1 296l-1 48h329v-144h-2q20 32 41 56t56.5 52t87 43.5t114.5 15.5q171 0 275 -113.5t104 -332.5z" />
-<glyph unicode="&#xf0e2;" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5 t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298z" />
-<glyph unicode="&#xf0e3;" horiz-adv-x="1792" d="M1771 0q0 -53 -37 -90l-107 -108q-39 -37 -91 -37q-53 0 -90 37l-363 364q-38 36 -38 90q0 53 43 96l-256 256l-126 -126q-14 -14 -34 -14t-34 14q2 -2 12.5 -12t12.5 -13t10 -11.5t10 -13.5t6 -13.5t5.5 -16.5t1.5 -18q0 -38 -28 -68q-3 -3 -16.5 -18t-19 -20.5 t-18.5 -16.5t-22 -15.5t-22 -9t-26 -4.5q-40 0 -68 28l-408 408q-28 28 -28 68q0 13 4.5 26t9 22t15.5 22t16.5 18.5t20.5 19t18 16.5q30 28 68 28q10 0 18 -1.5t16.5 -5.5t13.5 -6t13.5 -10t11.5 -10t13 -12.5t12 -12.5q-14 14 -14 34t14 34l348 348q14 14 34 14t34 -14 q-2 2 -12.5 12t-12.5 13t-10 11.5t-10 13.5t-6 13.5t-5.5 16.5t-1.5 18q0 38 28 68q3 3 16.5 18t19 20.5t18.5 16.5t22 15.5t22 9t26 4.5q40 0 68 -28l408 -408q28 -28 28 -68q0 -13 -4.5 -26t-9 -22t-15.5 -22t-16.5 -18.5t-20.5 -19t-18 -16.5q-30 -28 -68 -28 q-10 0 -18 1.5t-16.5 5.5t-13.5 6t-13.5 10t-11.5 10t-13 12.5t-12 12.5q14 -14 14 -34t-14 -34l-126 -126l256 -256q43 43 96 43q52 0 91 -37l363 -363q37 -39 37 -91z" />
-<glyph unicode="&#xf0e4;" horiz-adv-x="1792" d="M384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM576 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1004 351l101 382q6 26 -7.5 48.5t-38.5 29.5 t-48 -6.5t-30 -39.5l-101 -382q-60 -5 -107 -43.5t-63 -98.5q-20 -77 20 -146t117 -89t146 20t89 117q16 60 -6 117t-72 91zM1664 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 1024q0 53 -37.5 90.5 t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1472 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1792 384q0 -261 -141 -483q-19 -29 -54 -29h-1402q-35 0 -54 29 q-141 221 -141 483q0 182 71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-<glyph unicode="&#xf0e5;" horiz-adv-x="1792" d="M896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640 q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22h-5q-15 0 -27 10.5t-16 27.5v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281q0 174 120 321.5 t326 233t450 85.5t450 -85.5t326 -233t120 -321.5z" />
-<glyph unicode="&#xf0e6;" horiz-adv-x="1792" d="M704 1152q-153 0 -286 -52t-211.5 -141t-78.5 -191q0 -82 53 -158t149 -132l97 -56l-35 -84q34 20 62 39l44 31l53 -10q78 -14 153 -14q153 0 286 52t211.5 141t78.5 191t-78.5 191t-211.5 141t-286 52zM704 1280q191 0 353.5 -68.5t256.5 -186.5t94 -257t-94 -257 t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224q0 139 94 257t256.5 186.5 t353.5 68.5zM1526 111q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129 q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230q0 -120 -71 -224.5t-195 -176.5z" />
-<glyph unicode="&#xf0e7;" horiz-adv-x="896" d="M885 970q18 -20 7 -44l-540 -1157q-13 -25 -42 -25q-4 0 -14 2q-17 5 -25.5 19t-4.5 30l197 808l-406 -101q-4 -1 -12 -1q-18 0 -31 11q-18 15 -13 39l201 825q4 14 16 23t28 9h328q19 0 32 -12.5t13 -29.5q0 -8 -5 -18l-171 -463l396 98q8 2 12 2q19 0 34 -15z" />
-<glyph unicode="&#xf0e8;" horiz-adv-x="1792" d="M1792 288v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192q0 52 38 90t90 38h512v192h-96q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h320q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-96v-192h512q52 0 90 -38t38 -90v-192h96q40 0 68 -28t28 -68 z" />
-<glyph unicode="&#xf0e9;" horiz-adv-x="1664" d="M896 708v-580q0 -104 -76 -180t-180 -76t-180 76t-76 180q0 26 19 45t45 19t45 -19t19 -45q0 -50 39 -89t89 -39t89 39t39 89v580q33 11 64 11t64 -11zM1664 681q0 -13 -9.5 -22.5t-22.5 -9.5q-11 0 -23 10q-49 46 -93 69t-102 23q-68 0 -128 -37t-103 -97 q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -28 -17q-18 0 -29 17q-4 6 -14.5 24t-17.5 28q-43 60 -102.5 97t-127.5 37t-127.5 -37t-102.5 -97q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -29 -17q-17 0 -28 17q-4 6 -14.5 24t-17.5 28q-43 60 -103 97t-128 37q-58 0 -102 -23t-93 -69 q-12 -10 -23 -10q-13 0 -22.5 9.5t-9.5 22.5q0 5 1 7q45 183 172.5 319.5t298 204.5t360.5 68q140 0 274.5 -40t246.5 -113.5t194.5 -187t115.5 -251.5q1 -2 1 -7zM896 1408v-98q-42 2 -64 2t-64 -2v98q0 26 19 45t45 19t45 -19t19 -45z" />
-<glyph unicode="&#xf0ea;" horiz-adv-x="1792" d="M768 -128h896v640h-416q-40 0 -68 28t-28 68v416h-384v-1152zM1024 1312v64q0 13 -9.5 22.5t-22.5 9.5h-704q-13 0 -22.5 -9.5t-9.5 -22.5v-64q0 -13 9.5 -22.5t22.5 -9.5h704q13 0 22.5 9.5t9.5 22.5zM1280 640h299l-299 299v-299zM1792 512v-672q0 -40 -28 -68t-68 -28 h-960q-40 0 -68 28t-28 68v160h-544q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1088q40 0 68 -28t28 -68v-328q21 -13 36 -28l408 -408q28 -28 48 -76t20 -88z" />
-<glyph unicode="&#xf0eb;" horiz-adv-x="1024" d="M736 960q0 -13 -9.5 -22.5t-22.5 -9.5t-22.5 9.5t-9.5 22.5q0 46 -54 71t-106 25q-13 0 -22.5 9.5t-9.5 22.5t9.5 22.5t22.5 9.5q50 0 99.5 -16t87 -54t37.5 -90zM896 960q0 72 -34.5 134t-90 101.5t-123 62t-136.5 22.5t-136.5 -22.5t-123 -62t-90 -101.5t-34.5 -134 q0 -101 68 -180q10 -11 30.5 -33t30.5 -33q128 -153 141 -298h228q13 145 141 298q10 11 30.5 33t30.5 33q68 79 68 180zM1024 960q0 -155 -103 -268q-45 -49 -74.5 -87t-59.5 -95.5t-34 -107.5q47 -28 47 -82q0 -37 -25 -64q25 -27 25 -64q0 -52 -45 -81q13 -23 13 -47 q0 -46 -31.5 -71t-77.5 -25q-20 -44 -60 -70t-87 -26t-87 26t-60 70q-46 0 -77.5 25t-31.5 71q0 24 13 47q-45 29 -45 81q0 37 25 64q-25 27 -25 64q0 54 47 82q-4 50 -34 107.5t-59.5 95.5t-74.5 87q-103 113 -103 268q0 99 44.5 184.5t117 142t164 89t186.5 32.5 t186.5 -32.5t164 -89t117 -142t44.5 -184.5z" />
-<glyph unicode="&#xf0ec;" horiz-adv-x="1792" d="M1792 352v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5q-12 0 -24 10l-319 320q-9 9 -9 22q0 14 9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h1376q13 0 22.5 -9.5t9.5 -22.5zM1792 896q0 -14 -9 -23l-320 -320q-9 -9 -23 -9 q-13 0 -22.5 9.5t-9.5 22.5v192h-1376q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1376v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
-<glyph unicode="&#xf0ed;" horiz-adv-x="1920" d="M1280 608q0 14 -9 23t-23 9h-224v352q0 13 -9.5 22.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-352h-224q-13 0 -22.5 -9.5t-9.5 -22.5q0 -14 9 -23l352 -352q9 -9 23 -9t23 9l351 351q10 12 10 24zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
-<glyph unicode="&#xf0ee;" horiz-adv-x="1920" d="M1280 672q0 14 -9 23l-352 352q-9 9 -23 9t-23 -9l-351 -351q-10 -12 -10 -24q0 -14 9 -23t23 -9h224v-352q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5v352h224q13 0 22.5 9.5t9.5 22.5zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
-<glyph unicode="&#xf0f0;" horiz-adv-x="1408" d="M384 192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 68 5.5 131t24 138t47.5 132.5t81 103t120 60.5q-22 -52 -22 -120v-203q-58 -20 -93 -70t-35 -111q0 -80 56 -136t136 -56 t136 56t56 136q0 61 -35.5 111t-92.5 70v203q0 62 25 93q132 -104 295 -104t295 104q25 -31 25 -93v-64q-106 0 -181 -75t-75 -181v-89q-32 -29 -32 -71q0 -40 28 -68t68 -28t68 28t28 68q0 42 -32 71v89q0 52 38 90t90 38t90 -38t38 -90v-89q-32 -29 -32 -71q0 -40 28 -68 t68 -28t68 28t28 68q0 42 -32 71v89q0 68 -34.5 127.5t-93.5 93.5q0 10 0.5 42.5t0 48t-2.5 41.5t-7 47t-13 40q68 -15 120 -60.5t81 -103t47.5 -132.5t24 -138t5.5 -131zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5 t271.5 -112.5t112.5 -271.5z" />
-<glyph unicode="&#xf0f1;" horiz-adv-x="1408" d="M1280 832q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 832q0 -62 -35.5 -111t-92.5 -70v-395q0 -159 -131.5 -271.5t-316.5 -112.5t-316.5 112.5t-131.5 271.5v132q-164 20 -274 128t-110 252v512q0 26 19 45t45 19q6 0 16 -2q17 30 47 48 t65 18q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5q-33 0 -64 18v-402q0 -106 94 -181t226 -75t226 75t94 181v402q-31 -18 -64 -18q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5q35 0 65 -18t47 -48q10 2 16 2q26 0 45 -19t19 -45v-512q0 -144 -110 -252 t-274 -128v-132q0 -106 94 -181t226 -75t226 75t94 181v395q-57 21 -92.5 70t-35.5 111q0 80 56 136t136 56t136 -56t56 -136z" />
-<glyph unicode="&#xf0f2;" horiz-adv-x="1792" d="M640 1152h512v128h-512v-128zM288 1152v-1280h-64q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h64zM1408 1152v-1280h-1024v1280h128v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h128zM1792 928v-832q0 -92 -66 -158t-158 -66h-64v1280h64q92 0 158 -66 t66 -158z" />
-<glyph unicode="&#xf0f3;" horiz-adv-x="1792" d="M912 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM1728 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q50 42 91 88t85 119.5t74.5 158.5 t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q190 -28 307 -158.5t117 -282.5q0 -139 19.5 -260t50 -206t74.5 -158.5t85 -119.5t91 -88z" />
-<glyph unicode="&#xf0f4;" horiz-adv-x="1920" d="M1664 896q0 80 -56 136t-136 56h-64v-384h64q80 0 136 56t56 136zM0 128h1792q0 -106 -75 -181t-181 -75h-1280q-106 0 -181 75t-75 181zM1856 896q0 -159 -112.5 -271.5t-271.5 -112.5h-64v-32q0 -92 -66 -158t-158 -66h-704q-92 0 -158 66t-66 158v736q0 26 19 45 t45 19h1152q159 0 271.5 -112.5t112.5 -271.5z" />
-<glyph unicode="&#xf0f5;" horiz-adv-x="1408" d="M640 1472v-640q0 -61 -35.5 -111t-92.5 -70v-779q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v779q-57 20 -92.5 70t-35.5 111v640q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45 t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45zM1408 1472v-1600q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v512h-224q-13 0 -22.5 9.5t-9.5 22.5v800q0 132 94 226t226 94h256q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0f6;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M384 736q0 14 9 23t23 9h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64zM1120 512q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704zM1120 256q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704 q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704z" />
-<glyph unicode="&#xf0f7;" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1536h-1152v-1536h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM1408 1472v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0f8;" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1152h-256v-32q0 -40 -28 -68t-68 -28h-448q-40 0 -68 28t-28 68v32h-256v-1152h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM896 1056v320q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-96h-128v96q0 13 -9.5 22.5 t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5v96h128v-96q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1408 1088v-1280q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1280q0 26 19 45t45 19h320 v288q0 40 28 68t68 28h448q40 0 68 -28t28 -68v-288h320q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0f9;" horiz-adv-x="1920" d="M640 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM256 640h384v256h-158q-14 -2 -22 -9l-195 -195q-7 -12 -9 -22v-30zM1536 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1664 800v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM1920 1344v-1152 q0 -26 -19 -45t-45 -19h-192q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-128q-26 0 -45 19t-19 45t19 45t45 19v416q0 26 13 58t32 51l198 198q19 19 51 32t58 13h160v320q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0fa;" horiz-adv-x="1792" d="M1280 416v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM640 1152h512v128h-512v-128zM256 1152v-1280h-32 q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h32zM1440 1152v-1280h-1088v1280h160v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h160zM1792 928v-832q0 -92 -66 -158t-158 -66h-32v1280h32q92 0 158 -66t66 -158z" />
-<glyph unicode="&#xf0fb;" horiz-adv-x="1920" d="M1920 576q-1 -32 -288 -96l-352 -32l-224 -64h-64l-293 -352h69q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-96h-160h-64v32h64v416h-160l-192 -224h-96l-32 32v192h32v32h128v8l-192 24v128l192 24v8h-128v32h-32v192l32 32h96l192 -224h160v416h-64v32h64h160h96 q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-69l293 -352h64l224 -64l352 -32q261 -58 287 -93z" />
-<glyph unicode="&#xf0fc;" horiz-adv-x="1664" d="M640 640v384h-256v-256q0 -53 37.5 -90.5t90.5 -37.5h128zM1664 192v-192h-1152v192l128 192h-128q-159 0 -271.5 112.5t-112.5 271.5v320l-64 64l32 128h480l32 128h960l32 -192l-64 -32v-800z" />
-<glyph unicode="&#xf0fd;" d="M1280 192v896q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-512v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-896q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h512v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf0fe;" d="M1280 576v128q0 26 -19 45t-45 19h-320v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-320q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h320v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h320q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf100;" horiz-adv-x="1024" d="M627 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23zM1011 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23z" />
-<glyph unicode="&#xf101;" horiz-adv-x="1024" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM979 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23 l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="&#xf102;" horiz-adv-x="1152" d="M1075 224q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM1075 608q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393 q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="&#xf103;" horiz-adv-x="1152" d="M1075 672q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23zM1075 1056q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-<glyph unicode="&#xf104;" horiz-adv-x="640" d="M627 992q0 -13 -10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-<glyph unicode="&#xf105;" horiz-adv-x="640" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="&#xf106;" horiz-adv-x="1152" d="M1075 352q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="&#xf107;" horiz-adv-x="1152" d="M1075 800q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-<glyph unicode="&#xf108;" horiz-adv-x="1920" d="M1792 544v832q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1376v-1088q0 -66 -47 -113t-113 -47h-544q0 -37 16 -77.5t32 -71t16 -43.5q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19 t-19 45q0 14 16 44t32 70t16 78h-544q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf109;" horiz-adv-x="1920" d="M416 256q-66 0 -113 47t-47 113v704q0 66 47 113t113 47h1088q66 0 113 -47t47 -113v-704q0 -66 -47 -113t-113 -47h-1088zM384 1120v-704q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5v704q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5z M1760 192h160v-96q0 -40 -47 -68t-113 -28h-1600q-66 0 -113 28t-47 68v96h160h1600zM1040 96q16 0 16 16t-16 16h-160q-16 0 -16 -16t16 -16h160z" />
-<glyph unicode="&#xf10a;" horiz-adv-x="1152" d="M640 128q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1024 288v960q0 13 -9.5 22.5t-22.5 9.5h-832q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h832q13 0 22.5 9.5t9.5 22.5zM1152 1248v-1088q0 -66 -47 -113t-113 -47h-832 q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h832q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf10b;" horiz-adv-x="768" d="M464 128q0 33 -23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5t56.5 23.5t23.5 56.5zM672 288v704q0 13 -9.5 22.5t-22.5 9.5h-512q-13 0 -22.5 -9.5t-9.5 -22.5v-704q0 -13 9.5 -22.5t22.5 -9.5h512q13 0 22.5 9.5t9.5 22.5zM480 1136 q0 16 -16 16h-160q-16 0 -16 -16t16 -16h160q16 0 16 16zM768 1152v-1024q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v1024q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf10c;" d="M768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103 t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf10d;" horiz-adv-x="1664" d="M768 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z M1664 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z" />
-<glyph unicode="&#xf10e;" horiz-adv-x="1664" d="M768 1216v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136zM1664 1216 v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136z" />
-<glyph unicode="&#xf110;" horiz-adv-x="1568" d="M496 192q0 -60 -42.5 -102t-101.5 -42q-60 0 -102 42t-42 102t42 102t102 42q59 0 101.5 -42t42.5 -102zM928 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM320 640q0 -66 -47 -113t-113 -47t-113 47t-47 113 t47 113t113 47t113 -47t47 -113zM1360 192q0 -46 -33 -79t-79 -33t-79 33t-33 79t33 79t79 33t79 -33t33 -79zM528 1088q0 -73 -51.5 -124.5t-124.5 -51.5t-124.5 51.5t-51.5 124.5t51.5 124.5t124.5 51.5t124.5 -51.5t51.5 -124.5zM992 1280q0 -80 -56 -136t-136 -56 t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1536 640q0 -40 -28 -68t-68 -28t-68 28t-28 68t28 68t68 28t68 -28t28 -68zM1328 1088q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5z" />
-<glyph unicode="&#xf111;" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf112;" horiz-adv-x="1792" d="M1792 416q0 -166 -127 -451q-3 -7 -10.5 -24t-13.5 -30t-13 -22q-12 -17 -28 -17q-15 0 -23.5 10t-8.5 25q0 9 2.5 26.5t2.5 23.5q5 68 5 123q0 101 -17.5 181t-48.5 138.5t-80 101t-105.5 69.5t-133 42.5t-154 21.5t-175.5 6h-224v-256q0 -26 -19 -45t-45 -19t-45 19 l-512 512q-19 19 -19 45t19 45l512 512q19 19 45 19t45 -19t19 -45v-256h224q713 0 875 -403q53 -134 53 -333z" />
-<glyph unicode="&#xf113;" horiz-adv-x="1664" d="M640 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1280 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1440 320 q0 120 -69 204t-187 84q-41 0 -195 -21q-71 -11 -157 -11t-157 11q-152 21 -195 21q-118 0 -187 -84t-69 -204q0 -88 32 -153.5t81 -103t122 -60t140 -29.5t149 -7h168q82 0 149 7t140 29.5t122 60t81 103t32 153.5zM1664 496q0 -207 -61 -331q-38 -77 -105.5 -133t-141 -86 t-170 -47.5t-171.5 -22t-167 -4.5q-78 0 -142 3t-147.5 12.5t-152.5 30t-137 51.5t-121 81t-86 115q-62 123 -62 331q0 237 136 396q-27 82 -27 170q0 116 51 218q108 0 190 -39.5t189 -123.5q147 35 309 35q148 0 280 -32q105 82 187 121t189 39q51 -102 51 -218 q0 -87 -27 -168q136 -160 136 -398z" />
-<glyph unicode="&#xf114;" horiz-adv-x="1664" d="M1536 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68v-960q0 -40 28 -68t68 -28h1216q40 0 68 28t28 68zM1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320 q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
-<glyph unicode="&#xf115;" horiz-adv-x="1920" d="M1781 605q0 35 -53 35h-1088q-40 0 -85.5 -21.5t-71.5 -52.5l-294 -363q-18 -24 -18 -40q0 -35 53 -35h1088q40 0 86 22t71 53l294 363q18 22 18 39zM640 768h768v160q0 40 -28 68t-68 28h-576q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68 v-853l256 315q44 53 116 87.5t140 34.5zM1909 605q0 -62 -46 -120l-295 -363q-43 -53 -116 -87.5t-140 -34.5h-1088q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158v-160h192q54 0 99 -24.5t67 -70.5q15 -32 15 -68z " />
-<glyph unicode="&#xf116;" horiz-adv-x="1792" />
-<glyph unicode="&#xf117;" horiz-adv-x="1792" />
-<glyph unicode="&#xf118;" d="M1134 461q-37 -121 -138 -195t-228 -74t-228 74t-138 195q-8 25 4 48.5t38 31.5q25 8 48.5 -4t31.5 -38q25 -80 92.5 -129.5t151.5 -49.5t151.5 49.5t92.5 129.5q8 26 32 38t49 4t37 -31.5t4 -48.5zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5 t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5 t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf119;" d="M1134 307q8 -25 -4 -48.5t-37 -31.5t-49 4t-32 38q-25 80 -92.5 129.5t-151.5 49.5t-151.5 -49.5t-92.5 -129.5q-8 -26 -31.5 -38t-48.5 -4q-26 8 -38 31.5t-4 48.5q37 121 138 195t228 74t228 -74t138 -195zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204 t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf11a;" d="M1152 448q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h640q26 0 45 -19t19 -45zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf11b;" horiz-adv-x="1920" d="M832 448v128q0 14 -9 23t-23 9h-192v192q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-192h-192q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h192v-192q0 -14 9 -23t23 -9h128q14 0 23 9t9 23v192h192q14 0 23 9t9 23zM1408 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5 t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1920 512q0 -212 -150 -362t-362 -150q-192 0 -338 128h-220q-146 -128 -338 -128q-212 0 -362 150 t-150 362t150 362t362 150h896q212 0 362 -150t150 -362z" />
-<glyph unicode="&#xf11c;" horiz-adv-x="1920" d="M384 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM512 624v-96q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h224q16 0 16 -16zM384 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 368v-96q0 -16 -16 -16 h-864q-16 0 -16 16v96q0 16 16 16h864q16 0 16 -16zM768 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM640 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1024 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16 h96q16 0 16 -16zM896 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1280 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1152 880v-96 q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 880v-352q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h112v240q0 16 16 16h96q16 0 16 -16zM1792 128v896h-1664v-896 h1664zM1920 1024v-896q0 -53 -37.5 -90.5t-90.5 -37.5h-1664q-53 0 -90.5 37.5t-37.5 90.5v896q0 53 37.5 90.5t90.5 37.5h1664q53 0 90.5 -37.5t37.5 -90.5z" />
-<glyph unicode="&#xf11d;" horiz-adv-x="1792" d="M1664 491v616q-169 -91 -306 -91q-82 0 -145 32q-100 49 -184 76.5t-178 27.5q-173 0 -403 -127v-599q245 113 433 113q55 0 103.5 -7.5t98 -26t77 -31t82.5 -39.5l28 -14q44 -22 101 -22q120 0 293 92zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9 h-64q-14 0 -23 9t-9 23v1266q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102 q-15 -9 -33 -9q-16 0 -32 8q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
-<glyph unicode="&#xf11e;" horiz-adv-x="1792" d="M832 536v192q-181 -16 -384 -117v-185q205 96 384 110zM832 954v197q-172 -8 -384 -126v-189q215 111 384 118zM1664 491v184q-235 -116 -384 -71v224q-20 6 -39 15q-5 3 -33 17t-34.5 17t-31.5 15t-34.5 15.5t-32.5 13t-36 12.5t-35 8.5t-39.5 7.5t-39.5 4t-44 2 q-23 0 -49 -3v-222h19q102 0 192.5 -29t197.5 -82q19 -9 39 -15v-188q42 -17 91 -17q120 0 293 92zM1664 918v189q-169 -91 -306 -91q-45 0 -78 8v-196q148 -42 384 90zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v1266 q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102q-15 -9 -33 -9q-16 0 -32 8 q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
-<glyph unicode="&#xf120;" horiz-adv-x="1664" d="M585 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23zM1664 96v-64q0 -14 -9 -23t-23 -9h-960q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h960q14 0 23 -9 t9 -23z" />
-<glyph unicode="&#xf121;" horiz-adv-x="1920" d="M617 137l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23zM1208 1204l-373 -1291q-4 -13 -15.5 -19.5t-23.5 -2.5l-62 17q-13 4 -19.5 15.5t-2.5 24.5 l373 1291q4 13 15.5 19.5t23.5 2.5l62 -17q13 -4 19.5 -15.5t2.5 -24.5zM1865 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23z" />
-<glyph unicode="&#xf122;" horiz-adv-x="1792" d="M640 454v-70q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-69l-397 -398q-19 -19 -19 -45t19 -45zM1792 416q0 -58 -17 -133.5t-38.5 -138t-48 -125t-40.5 -90.5l-20 -40q-8 -17 -28 -17q-6 0 -9 1 q-25 8 -23 34q43 400 -106 565q-64 71 -170.5 110.5t-267.5 52.5v-251q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-262q411 -28 599 -221q169 -173 169 -509z" />
-<glyph unicode="&#xf123;" horiz-adv-x="1664" d="M1186 579l257 250l-356 52l-66 10l-30 60l-159 322v-963l59 -31l318 -168l-60 355l-12 66zM1638 841l-363 -354l86 -500q5 -33 -6 -51.5t-34 -18.5q-17 0 -40 12l-449 236l-449 -236q-23 -12 -40 -12q-23 0 -34 18.5t-6 51.5l86 500l-364 354q-32 32 -23 59.5t54 34.5 l502 73l225 455q20 41 49 41q28 0 49 -41l225 -455l502 -73q45 -7 54 -34.5t-24 -59.5z" />
-<glyph unicode="&#xf124;" horiz-adv-x="1408" d="M1401 1187l-640 -1280q-17 -35 -57 -35q-5 0 -15 2q-22 5 -35.5 22.5t-13.5 39.5v576h-576q-22 0 -39.5 13.5t-22.5 35.5t4 42t29 30l1280 640q13 7 29 7q27 0 45 -19q15 -14 18.5 -34.5t-6.5 -39.5z" />
-<glyph unicode="&#xf125;" horiz-adv-x="1664" d="M557 256h595v595zM512 301l595 595h-595v-595zM1664 224v-192q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v224h-864q-14 0 -23 9t-9 23v864h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224v224q0 14 9 23t23 9h192q14 0 23 -9t9 -23 v-224h851l246 247q10 9 23 9t23 -9q9 -10 9 -23t-9 -23l-247 -246v-851h224q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf126;" horiz-adv-x="1024" d="M288 64q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM288 1216q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM928 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1024 1088q0 -52 -26 -96.5t-70 -69.5 q-2 -287 -226 -414q-68 -38 -203 -81q-128 -40 -169.5 -71t-41.5 -100v-26q44 -25 70 -69.5t26 -96.5q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 52 26 96.5t70 69.5v820q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136q0 -52 -26 -96.5t-70 -69.5v-497 q54 26 154 57q55 17 87.5 29.5t70.5 31t59 39.5t40.5 51t28 69.5t8.5 91.5q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136z" />
-<glyph unicode="&#xf127;" horiz-adv-x="1664" d="M439 265l-256 -256q-10 -9 -23 -9q-12 0 -23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23zM608 224v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM384 448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23t9 23t23 9h320 q14 0 23 -9t9 -23zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-334 335q-21 21 -42 56l239 18l273 -274q27 -27 68 -27.5t68 26.5l147 146q28 28 28 67q0 40 -28 68l-274 275l18 239q35 -21 56 -42l336 -336q84 -86 84 -204zM1031 1044l-239 -18 l-273 274q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l274 -274l-18 -240q-35 21 -56 42l-336 336q-84 86 -84 204q0 120 85 203l147 146q83 83 203 83q121 0 204 -85l334 -335q21 -21 42 -56zM1664 960q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9 t-9 23t9 23t23 9h320q14 0 23 -9t9 -23zM1120 1504v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM1527 1353l-256 -256q-11 -9 -23 -9t-23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />
-<glyph unicode="&#xf128;" horiz-adv-x="1024" d="M704 280v-240q0 -16 -12 -28t-28 -12h-240q-16 0 -28 12t-12 28v240q0 16 12 28t28 12h240q16 0 28 -12t12 -28zM1020 880q0 -54 -15.5 -101t-35 -76.5t-55 -59.5t-57.5 -43.5t-61 -35.5q-41 -23 -68.5 -65t-27.5 -67q0 -17 -12 -32.5t-28 -15.5h-240q-15 0 -25.5 18.5 t-10.5 37.5v45q0 83 65 156.5t143 108.5q59 27 84 56t25 76q0 42 -46.5 74t-107.5 32q-65 0 -108 -29q-35 -25 -107 -115q-13 -16 -31 -16q-12 0 -25 8l-164 125q-13 10 -15.5 25t5.5 28q160 266 464 266q80 0 161 -31t146 -83t106 -127.5t41 -158.5z" />
-<glyph unicode="&#xf129;" horiz-adv-x="640" d="M640 192v-128q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64v384h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-576h64q26 0 45 -19t19 -45zM512 1344v-192q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v192 q0 26 19 45t45 19h256q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf12a;" horiz-adv-x="640" d="M512 288v-224q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v224q0 26 19 45t45 19h256q26 0 45 -19t19 -45zM542 1344l-28 -768q-1 -26 -20.5 -45t-45.5 -19h-256q-26 0 -45.5 19t-20.5 45l-28 768q-1 26 17.5 45t44.5 19h320q26 0 44.5 -19t17.5 -45z" />
-<glyph unicode="&#xf12b;" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1534 846v-206h-514l-3 27 q-4 28 -4 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q83 65 188 65q110 0 178 -59.5t68 -158.5q0 -56 -24.5 -103t-62 -76.5t-81.5 -58.5t-82 -50.5t-65.5 -51.5t-30.5 -63h232v80 h126z" />
-<glyph unicode="&#xf12c;" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1536 -50v-206h-514l-4 27 q-3 45 -3 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q80 65 188 65q110 0 178 -59.5t68 -158.5q0 -66 -34.5 -118.5t-84 -86t-99.5 -62.5t-87 -63t-41 -73h232v80h126z" />
-<glyph unicode="&#xf12d;" horiz-adv-x="1920" d="M896 128l336 384h-768l-336 -384h768zM1909 1205q15 -34 9.5 -71.5t-30.5 -65.5l-896 -1024q-38 -44 -96 -44h-768q-38 0 -69.5 20.5t-47.5 54.5q-15 34 -9.5 71.5t30.5 65.5l896 1024q38 44 96 44h768q38 0 69.5 -20.5t47.5 -54.5z" />
-<glyph unicode="&#xf12e;" horiz-adv-x="1664" d="M1664 438q0 -81 -44.5 -135t-123.5 -54q-41 0 -77.5 17.5t-59 38t-56.5 38t-71 17.5q-110 0 -110 -124q0 -39 16 -115t15 -115v-5q-22 0 -33 -1q-34 -3 -97.5 -11.5t-115.5 -13.5t-98 -5q-61 0 -103 26.5t-42 83.5q0 37 17.5 71t38 56.5t38 59t17.5 77.5q0 79 -54 123.5 t-135 44.5q-84 0 -143 -45.5t-59 -127.5q0 -43 15 -83t33.5 -64.5t33.5 -53t15 -50.5q0 -45 -46 -89q-37 -35 -117 -35q-95 0 -245 24q-9 2 -27.5 4t-27.5 4l-13 2q-1 0 -3 1q-2 0 -2 1v1024q2 -1 17.5 -3.5t34 -5t21.5 -3.5q150 -24 245 -24q80 0 117 35q46 44 46 89 q0 22 -15 50.5t-33.5 53t-33.5 64.5t-15 83q0 82 59 127.5t144 45.5q80 0 134 -44.5t54 -123.5q0 -41 -17.5 -77.5t-38 -59t-38 -56.5t-17.5 -71q0 -57 42 -83.5t103 -26.5q64 0 180 15t163 17v-2q-1 -2 -3.5 -17.5t-5 -34t-3.5 -21.5q-24 -150 -24 -245q0 -80 35 -117 q44 -46 89 -46q22 0 50.5 15t53 33.5t64.5 33.5t83 15q82 0 127.5 -59t45.5 -143z" />
-<glyph unicode="&#xf130;" horiz-adv-x="1152" d="M1152 832v-128q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-217 24 -364.5 187.5t-147.5 384.5v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -185 131.5 -316.5t316.5 -131.5 t316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45zM896 1216v-512q0 -132 -94 -226t-226 -94t-226 94t-94 226v512q0 132 94 226t226 94t226 -94t94 -226z" />
-<glyph unicode="&#xf131;" horiz-adv-x="1408" d="M271 591l-101 -101q-42 103 -42 214v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -53 15 -113zM1385 1193l-361 -361v-128q0 -132 -94 -226t-226 -94q-55 0 -109 19l-96 -96q97 -51 205 -51q185 0 316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45v-128 q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-125 13 -235 81l-254 -254q-10 -10 -23 -10t-23 10l-82 82q-10 10 -10 23t10 23l1234 1234q10 10 23 10t23 -10l82 -82q10 -10 10 -23 t-10 -23zM1005 1325l-621 -621v512q0 132 94 226t226 94q102 0 184.5 -59t116.5 -152z" />
-<glyph unicode="&#xf132;" horiz-adv-x="1280" d="M1088 576v640h-448v-1137q119 63 213 137q235 184 235 360zM1280 1344v-768q0 -86 -33.5 -170.5t-83 -150t-118 -127.5t-126.5 -103t-121 -77.5t-89.5 -49.5t-42.5 -20q-12 -6 -26 -6t-26 6q-16 7 -42.5 20t-89.5 49.5t-121 77.5t-126.5 103t-118 127.5t-83 150 t-33.5 170.5v768q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf133;" horiz-adv-x="1664" d="M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280 q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf134;" horiz-adv-x="1408" d="M512 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 1376v-320q0 -16 -12 -25q-8 -7 -20 -7q-4 0 -7 1l-448 96q-11 2 -18 11t-7 20h-256v-102q111 -23 183.5 -111t72.5 -203v-800q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v800 q0 106 62.5 190.5t161.5 114.5v111h-32q-59 0 -115 -23.5t-91.5 -53t-66 -66.5t-40.5 -53.5t-14 -24.5q-17 -35 -57 -35q-16 0 -29 7q-23 12 -31.5 37t3.5 49q5 10 14.5 26t37.5 53.5t60.5 70t85 67t108.5 52.5q-25 42 -25 86q0 66 47 113t113 47t113 -47t47 -113 q0 -33 -14 -64h302q0 11 7 20t18 11l448 96q3 1 7 1q12 0 20 -7q12 -9 12 -25z" />
-<glyph unicode="&#xf135;" horiz-adv-x="1664" d="M1440 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1664 1376q0 -249 -75.5 -430.5t-253.5 -360.5q-81 -80 -195 -176l-20 -379q-2 -16 -16 -26l-384 -224q-7 -4 -16 -4q-12 0 -23 9l-64 64q-13 14 -8 32l85 276l-281 281l-276 -85q-3 -1 -9 -1 q-14 0 -23 9l-64 64q-17 19 -5 39l224 384q10 14 26 16l379 20q96 114 176 195q188 187 358 258t431 71q14 0 24 -9.5t10 -22.5z" />
-<glyph unicode="&#xf136;" horiz-adv-x="1792" d="M1745 763l-164 -763h-334l178 832q13 56 -15 88q-27 33 -83 33h-169l-204 -953h-334l204 953h-286l-204 -953h-334l204 953l-153 327h1276q101 0 189.5 -40.5t147.5 -113.5q60 -73 81 -168.5t0 -194.5z" />
-<glyph unicode="&#xf137;" d="M909 141l102 102q19 19 19 45t-19 45l-307 307l307 307q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf138;" d="M717 141l454 454q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l307 -307l-307 -307q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf139;" d="M1165 397l102 102q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l307 307l307 -307q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf13a;" d="M813 237l454 454q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-307 -307l-307 307q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf13b;" horiz-adv-x="1408" d="M1130 939l16 175h-884l47 -534h612l-22 -228l-197 -53l-196 53l-13 140h-175l22 -278l362 -100h4v1l359 99l50 544h-644l-15 181h674zM0 1408h1408l-128 -1438l-578 -162l-574 162z" />
-<glyph unicode="&#xf13c;" horiz-adv-x="1792" d="M275 1408h1505l-266 -1333l-804 -267l-698 267l71 356h297l-29 -147l422 -161l486 161l68 339h-1208l58 297h1209l38 191h-1208z" />
-<glyph unicode="&#xf13d;" horiz-adv-x="1792" d="M960 1280q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1792 352v-352q0 -22 -20 -30q-8 -2 -12 -2q-13 0 -23 9l-93 93q-119 -143 -318.5 -226.5t-429.5 -83.5t-429.5 83.5t-318.5 226.5l-93 -93q-9 -9 -23 -9q-4 0 -12 2q-20 8 -20 30v352 q0 14 9 23t23 9h352q22 0 30 -20q8 -19 -7 -35l-100 -100q67 -91 189.5 -153.5t271.5 -82.5v647h-192q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h192v163q-58 34 -93 92.5t-35 128.5q0 106 75 181t181 75t181 -75t75 -181q0 -70 -35 -128.5t-93 -92.5v-163h192q26 0 45 -19 t19 -45v-128q0 -26 -19 -45t-45 -19h-192v-647q149 20 271.5 82.5t189.5 153.5l-100 100q-15 16 -7 35q8 20 30 20h352q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf13e;" horiz-adv-x="1152" d="M1056 768q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v320q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45q0 106 -75 181t-181 75t-181 -75t-75 -181 v-320h736z" />
-<glyph unicode="&#xf140;" d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM1152 640q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1280 640q0 -212 -150 -362t-362 -150t-362 150 t-150 362t150 362t362 150t362 -150t150 -362zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf141;" horiz-adv-x="1408" d="M384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM896 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM1408 800v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf142;" horiz-adv-x="384" d="M384 288v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 1312v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf143;" d="M512 256q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM863 162q-13 232 -177 396t-396 177q-14 1 -24 -9t-10 -23v-128q0 -13 8.5 -22t21.5 -10q154 -11 264 -121t121 -264q1 -13 10 -21.5t22 -8.5h128q13 0 23 10 t9 24zM1247 161q-5 154 -56 297.5t-139.5 260t-205 205t-260 139.5t-297.5 56q-14 1 -23 -9q-10 -10 -10 -23v-128q0 -13 9 -22t22 -10q204 -7 378 -111.5t278.5 -278.5t111.5 -378q1 -13 10 -22t22 -9h128q13 0 23 10q11 9 9 23zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf144;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1152 585q32 18 32 55t-32 55l-544 320q-31 19 -64 1q-32 -19 -32 -56v-640q0 -37 32 -56 q16 -8 32 -8q17 0 32 9z" />
-<glyph unicode="&#xf145;" horiz-adv-x="1792" d="M1024 1084l316 -316l-572 -572l-316 316zM813 105l618 618q19 19 19 45t-19 45l-362 362q-18 18 -45 18t-45 -18l-618 -618q-19 -19 -19 -45t19 -45l362 -362q18 -18 45 -18t45 18zM1702 742l-907 -908q-37 -37 -90.5 -37t-90.5 37l-126 126q56 56 56 136t-56 136 t-136 56t-136 -56l-125 126q-37 37 -37 90.5t37 90.5l907 906q37 37 90.5 37t90.5 -37l125 -125q-56 -56 -56 -136t56 -136t136 -56t136 56l126 -125q37 -37 37 -90.5t-37 -90.5z" />
-<glyph unicode="&#xf146;" d="M1280 576v128q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h896q26 0 45 19t19 45zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5 t84.5 -203.5z" />
-<glyph unicode="&#xf147;" horiz-adv-x="1408" d="M1152 736v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h832q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5 t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf148;" horiz-adv-x="1024" d="M1018 933q-18 -37 -58 -37h-192v-864q0 -14 -9 -23t-23 -9h-704q-21 0 -29 18q-8 20 4 35l160 192q9 11 25 11h320v640h-192q-40 0 -58 37q-17 37 9 68l320 384q18 22 49 22t49 -22l320 -384q27 -32 9 -68z" />
-<glyph unicode="&#xf149;" horiz-adv-x="1024" d="M32 1280h704q13 0 22.5 -9.5t9.5 -23.5v-863h192q40 0 58 -37t-9 -69l-320 -384q-18 -22 -49 -22t-49 22l-320 384q-26 31 -9 69q18 37 58 37h192v640h-320q-14 0 -25 11l-160 192q-13 14 -4 34q9 19 29 19z" />
-<glyph unicode="&#xf14a;" d="M685 237l614 614q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-467 -467l-211 211q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l358 -358q19 -19 45 -19t45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5 t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf14b;" d="M404 428l152 -152l-52 -52h-56v96h-96v56zM818 818q14 -13 -3 -30l-291 -291q-17 -17 -30 -3q-14 13 3 30l291 291q17 17 30 3zM544 128l544 544l-288 288l-544 -544v-288h288zM1152 736l92 92q28 28 28 68t-28 68l-152 152q-28 28 -68 28t-68 -28l-92 -92zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf14c;" d="M1280 608v480q0 26 -19 45t-45 19h-480q-42 0 -59 -39q-17 -41 14 -70l144 -144l-534 -534q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l534 534l144 -144q18 -19 45 -19q12 0 25 5q39 17 39 59zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf14d;" d="M1005 435l352 352q19 19 19 45t-19 45l-352 352q-30 31 -69 14q-40 -17 -40 -59v-160q-119 0 -216 -19.5t-162.5 -51t-114 -79t-76.5 -95.5t-44.5 -109t-21.5 -111.5t-5 -110.5q0 -181 167 -404q10 -12 25 -12q7 0 13 3q22 9 19 33q-44 354 62 473q46 52 130 75.5 t224 23.5v-160q0 -42 40 -59q12 -5 24 -5q26 0 45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf14e;" d="M640 448l256 128l-256 128v-256zM1024 1039v-542l-512 -256v542zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf150;" d="M1145 861q18 -35 -5 -66l-320 -448q-19 -27 -52 -27t-52 27l-320 448q-23 31 -5 66q17 35 57 35h640q40 0 57 -35zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf151;" d="M1145 419q-17 -35 -57 -35h-640q-40 0 -57 35q-18 35 5 66l320 448q19 27 52 27t52 -27l320 -448q23 -31 5 -66zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf152;" d="M1088 640q0 -33 -27 -52l-448 -320q-31 -23 -66 -5q-35 17 -35 57v640q0 40 35 57q35 18 66 -5l448 -320q27 -19 27 -52zM1280 160v960q0 14 -9 23t-23 9h-960q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h960q14 0 23 9t9 23zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf153;" horiz-adv-x="1024" d="M976 229l35 -159q3 -12 -3 -22.5t-17 -14.5l-5 -1q-4 -2 -10.5 -3.5t-16 -4.5t-21.5 -5.5t-25.5 -5t-30 -5t-33.5 -4.5t-36.5 -3t-38.5 -1q-234 0 -409 130.5t-238 351.5h-95q-13 0 -22.5 9.5t-9.5 22.5v113q0 13 9.5 22.5t22.5 9.5h66q-2 57 1 105h-67q-14 0 -23 9 t-9 23v114q0 14 9 23t23 9h98q67 210 243.5 338t400.5 128q102 0 194 -23q11 -3 20 -15q6 -11 3 -24l-43 -159q-3 -13 -14 -19.5t-24 -2.5l-4 1q-4 1 -11.5 2.5l-17.5 3.5t-22.5 3.5t-26 3t-29 2.5t-29.5 1q-126 0 -226 -64t-150 -176h468q16 0 25 -12q10 -12 7 -26 l-24 -114q-5 -26 -32 -26h-488q-3 -37 0 -105h459q15 0 25 -12q9 -12 6 -27l-24 -112q-2 -11 -11 -18.5t-20 -7.5h-387q48 -117 149.5 -185.5t228.5 -68.5q18 0 36 1.5t33.5 3.5t29.5 4.5t24.5 5t18.5 4.5l12 3l5 2q13 5 26 -2q12 -7 15 -21z" />
-<glyph unicode="&#xf154;" horiz-adv-x="1024" d="M1020 399v-367q0 -14 -9 -23t-23 -9h-956q-14 0 -23 9t-9 23v150q0 13 9.5 22.5t22.5 9.5h97v383h-95q-14 0 -23 9.5t-9 22.5v131q0 14 9 23t23 9h95v223q0 171 123.5 282t314.5 111q185 0 335 -125q9 -8 10 -20.5t-7 -22.5l-103 -127q-9 -11 -22 -12q-13 -2 -23 7 q-5 5 -26 19t-69 32t-93 18q-85 0 -137 -47t-52 -123v-215h305q13 0 22.5 -9t9.5 -23v-131q0 -13 -9.5 -22.5t-22.5 -9.5h-305v-379h414v181q0 13 9 22.5t23 9.5h162q14 0 23 -9.5t9 -22.5z" />
-<glyph unicode="&#xf155;" horiz-adv-x="1024" d="M978 351q0 -153 -99.5 -263.5t-258.5 -136.5v-175q0 -14 -9 -23t-23 -9h-135q-13 0 -22.5 9.5t-9.5 22.5v175q-66 9 -127.5 31t-101.5 44.5t-74 48t-46.5 37.5t-17.5 18q-17 21 -2 41l103 135q7 10 23 12q15 2 24 -9l2 -2q113 -99 243 -125q37 -8 74 -8q81 0 142.5 43 t61.5 122q0 28 -15 53t-33.5 42t-58.5 37.5t-66 32t-80 32.5q-39 16 -61.5 25t-61.5 26.5t-62.5 31t-56.5 35.5t-53.5 42.5t-43.5 49t-35.5 58t-21 66.5t-8.5 78q0 138 98 242t255 134v180q0 13 9.5 22.5t22.5 9.5h135q14 0 23 -9t9 -23v-176q57 -6 110.5 -23t87 -33.5 t63.5 -37.5t39 -29t15 -14q17 -18 5 -38l-81 -146q-8 -15 -23 -16q-14 -3 -27 7q-3 3 -14.5 12t-39 26.5t-58.5 32t-74.5 26t-85.5 11.5q-95 0 -155 -43t-60 -111q0 -26 8.5 -48t29.5 -41.5t39.5 -33t56 -31t60.5 -27t70 -27.5q53 -20 81 -31.5t76 -35t75.5 -42.5t62 -50 t53 -63.5t31.5 -76.5t13 -94z" />
-<glyph unicode="&#xf156;" horiz-adv-x="898" d="M898 1066v-102q0 -14 -9 -23t-23 -9h-168q-23 -144 -129 -234t-276 -110q167 -178 459 -536q14 -16 4 -34q-8 -18 -29 -18h-195q-16 0 -25 12q-306 367 -498 571q-9 9 -9 22v127q0 13 9.5 22.5t22.5 9.5h112q132 0 212.5 43t102.5 125h-427q-14 0 -23 9t-9 23v102 q0 14 9 23t23 9h413q-57 113 -268 113h-145q-13 0 -22.5 9.5t-9.5 22.5v133q0 14 9 23t23 9h832q14 0 23 -9t9 -23v-102q0 -14 -9 -23t-23 -9h-233q47 -61 64 -144h171q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf157;" horiz-adv-x="1027" d="M603 0h-172q-13 0 -22.5 9t-9.5 23v330h-288q-13 0 -22.5 9t-9.5 23v103q0 13 9.5 22.5t22.5 9.5h288v85h-288q-13 0 -22.5 9t-9.5 23v104q0 13 9.5 22.5t22.5 9.5h214l-321 578q-8 16 0 32q10 16 28 16h194q19 0 29 -18l215 -425q19 -38 56 -125q10 24 30.5 68t27.5 61 l191 420q8 19 29 19h191q17 0 27 -16q9 -14 1 -31l-313 -579h215q13 0 22.5 -9.5t9.5 -22.5v-104q0 -14 -9.5 -23t-22.5 -9h-290v-85h290q13 0 22.5 -9.5t9.5 -22.5v-103q0 -14 -9.5 -23t-22.5 -9h-290v-330q0 -13 -9.5 -22.5t-22.5 -9.5z" />
-<glyph unicode="&#xf158;" horiz-adv-x="1280" d="M1043 971q0 100 -65 162t-171 62h-320v-448h320q106 0 171 62t65 162zM1280 971q0 -193 -126.5 -315t-326.5 -122h-340v-118h505q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9h-505v-192q0 -14 -9.5 -23t-22.5 -9h-167q-14 0 -23 9t-9 23v192h-224q-14 0 -23 9t-9 23v128 q0 14 9 23t23 9h224v118h-224q-14 0 -23 9t-9 23v149q0 13 9 22.5t23 9.5h224v629q0 14 9 23t23 9h539q200 0 326.5 -122t126.5 -315z" />
-<glyph unicode="&#xf159;" horiz-adv-x="1792" d="M514 341l81 299h-159l75 -300q1 -1 1 -3t1 -3q0 1 0.5 3.5t0.5 3.5zM630 768l35 128h-292l32 -128h225zM822 768h139l-35 128h-70zM1271 340l78 300h-162l81 -299q0 -1 0.5 -3.5t1.5 -3.5q0 1 0.5 3t0.5 3zM1382 768l33 128h-297l34 -128h230zM1792 736v-64q0 -14 -9 -23 t-23 -9h-213l-164 -616q-7 -24 -31 -24h-159q-24 0 -31 24l-166 616h-209l-167 -616q-7 -24 -31 -24h-159q-11 0 -19.5 7t-10.5 17l-160 616h-208q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h175l-33 128h-142q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h109l-89 344q-5 15 5 28 q10 12 26 12h137q26 0 31 -24l90 -360h359l97 360q7 24 31 24h126q24 0 31 -24l98 -360h365l93 360q5 24 31 24h137q16 0 26 -12q10 -13 5 -28l-91 -344h111q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-145l-34 -128h179q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf15a;" horiz-adv-x="1280" d="M1167 896q18 -182 -131 -258q117 -28 175 -103t45 -214q-7 -71 -32.5 -125t-64.5 -89t-97 -58.5t-121.5 -34.5t-145.5 -15v-255h-154v251q-80 0 -122 1v-252h-154v255q-18 0 -54 0.5t-55 0.5h-200l31 183h111q50 0 58 51v402h16q-6 1 -16 1v287q-13 68 -89 68h-111v164 l212 -1q64 0 97 1v252h154v-247q82 2 122 2v245h154v-252q79 -7 140 -22.5t113 -45t82.5 -78t36.5 -114.5zM952 351q0 36 -15 64t-37 46t-57.5 30.5t-65.5 18.5t-74 9t-69 3t-64.5 -1t-47.5 -1v-338q8 0 37 -0.5t48 -0.5t53 1.5t58.5 4t57 8.5t55.5 14t47.5 21t39.5 30 t24.5 40t9.5 51zM881 827q0 33 -12.5 58.5t-30.5 42t-48 28t-55 16.5t-61.5 8t-58 2.5t-54 -1t-39.5 -0.5v-307q5 0 34.5 -0.5t46.5 0t50 2t55 5.5t51.5 11t48.5 18.5t37 27t27 38.5t9 51z" />
-<glyph unicode="&#xf15b;" d="M1024 1024v472q22 -14 36 -28l408 -408q14 -14 28 -36h-472zM896 992q0 -40 28 -68t68 -28h544v-1056q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h800v-544z" />
-<glyph unicode="&#xf15c;" d="M1468 1060q14 -14 28 -36h-472v472q22 -14 36 -28zM992 896h544v-1056q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h800v-544q0 -40 28 -68t68 -28zM1152 160v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704 q14 0 23 9t9 23zM1152 416v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1152 672v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23z" />
-<glyph unicode="&#xf15d;" horiz-adv-x="1664" d="M1191 1128h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1572 -23 v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -11v-2l14 2q9 2 30 2h248v119h121zM1661 874v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162 l230 -662h70z" />
-<glyph unicode="&#xf15e;" horiz-adv-x="1664" d="M1191 104h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1661 -150 v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162l230 -662h70zM1572 1001v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -10v-3l14 3q9 1 30 1h248 v119h121z" />
-<glyph unicode="&#xf160;" horiz-adv-x="1792" d="M736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1792 -32v-192q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832 q14 0 23 -9t9 -23zM1600 480v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1408 992v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1216 1504v-192q0 -14 -9 -23t-23 -9h-256 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf161;" horiz-adv-x="1792" d="M1216 -32v-192q0 -14 -9 -23t-23 -9h-256q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192 q14 0 23 -9t9 -23zM1408 480v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1600 992v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1792 1504v-192q0 -14 -9 -23t-23 -9h-832 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf162;" d="M1346 223q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23 zM1486 165q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5 t82 -252.5zM1456 882v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165z" />
-<glyph unicode="&#xf163;" d="M1346 1247q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9 t9 -23zM1456 -142v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165zM1486 1189q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13 q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5t82 -252.5z" />
-<glyph unicode="&#xf164;" horiz-adv-x="1664" d="M256 192q0 26 -19 45t-45 19q-27 0 -45.5 -19t-18.5 -45q0 -27 18.5 -45.5t45.5 -18.5q26 0 45 18.5t19 45.5zM416 704v-640q0 -26 -19 -45t-45 -19h-288q-26 0 -45 19t-19 45v640q0 26 19 45t45 19h288q26 0 45 -19t19 -45zM1600 704q0 -86 -55 -149q15 -44 15 -76 q3 -76 -43 -137q17 -56 0 -117q-15 -57 -54 -94q9 -112 -49 -181q-64 -76 -197 -78h-36h-76h-17q-66 0 -144 15.5t-121.5 29t-120.5 39.5q-123 43 -158 44q-26 1 -45 19.5t-19 44.5v641q0 25 18 43.5t43 20.5q24 2 76 59t101 121q68 87 101 120q18 18 31 48t17.5 48.5 t13.5 60.5q7 39 12.5 61t19.5 52t34 50q19 19 45 19q46 0 82.5 -10.5t60 -26t40 -40.5t24 -45t12 -50t5 -45t0.5 -39q0 -38 -9.5 -76t-19 -60t-27.5 -56q-3 -6 -10 -18t-11 -22t-8 -24h277q78 0 135 -57t57 -135z" />
-<glyph unicode="&#xf165;" horiz-adv-x="1664" d="M256 960q0 -26 -19 -45t-45 -19q-27 0 -45.5 19t-18.5 45q0 27 18.5 45.5t45.5 18.5q26 0 45 -18.5t19 -45.5zM416 448v640q0 26 -19 45t-45 19h-288q-26 0 -45 -19t-19 -45v-640q0 -26 19 -45t45 -19h288q26 0 45 19t19 45zM1545 597q55 -61 55 -149q-1 -78 -57.5 -135 t-134.5 -57h-277q4 -14 8 -24t11 -22t10 -18q18 -37 27 -57t19 -58.5t10 -76.5q0 -24 -0.5 -39t-5 -45t-12 -50t-24 -45t-40 -40.5t-60 -26t-82.5 -10.5q-26 0 -45 19q-20 20 -34 50t-19.5 52t-12.5 61q-9 42 -13.5 60.5t-17.5 48.5t-31 48q-33 33 -101 120q-49 64 -101 121 t-76 59q-25 2 -43 20.5t-18 43.5v641q0 26 19 44.5t45 19.5q35 1 158 44q77 26 120.5 39.5t121.5 29t144 15.5h17h76h36q133 -2 197 -78q58 -69 49 -181q39 -37 54 -94q17 -61 0 -117q46 -61 43 -137q0 -32 -15 -76z" />
-<glyph unicode="&#xf166;" d="M919 233v157q0 50 -29 50q-17 0 -33 -16v-224q16 -16 33 -16q29 0 29 49zM1103 355h66v34q0 51 -33 51t-33 -51v-34zM532 621v-70h-80v-423h-74v423h-78v70h232zM733 495v-367h-67v40q-39 -45 -76 -45q-33 0 -42 28q-6 16 -6 54v290h66v-270q0 -24 1 -26q1 -15 15 -15 q20 0 42 31v280h67zM985 384v-146q0 -52 -7 -73q-12 -42 -53 -42q-35 0 -68 41v-36h-67v493h67v-161q32 40 68 40q41 0 53 -42q7 -21 7 -74zM1236 255v-9q0 -29 -2 -43q-3 -22 -15 -40q-27 -40 -80 -40q-52 0 -81 38q-21 27 -21 86v129q0 59 20 86q29 38 80 38t78 -38 q21 -28 21 -86v-76h-133v-65q0 -51 34 -51q24 0 30 26q0 1 0.5 7t0.5 16.5v21.5h68zM785 1079v-156q0 -51 -32 -51t-32 51v156q0 52 32 52t32 -52zM1318 366q0 177 -19 260q-10 44 -43 73.5t-76 34.5q-136 15 -412 15q-275 0 -411 -15q-44 -5 -76.5 -34.5t-42.5 -73.5 q-20 -87 -20 -260q0 -176 20 -260q10 -43 42.5 -73t75.5 -35q137 -15 412 -15t412 15q43 5 75.5 35t42.5 73q20 84 20 260zM563 1017l90 296h-75l-51 -195l-53 195h-78l24 -69t23 -69q35 -103 46 -158v-201h74v201zM852 936v130q0 58 -21 87q-29 38 -78 38q-51 0 -78 -38 q-21 -29 -21 -87v-130q0 -58 21 -87q27 -38 78 -38q49 0 78 38q21 27 21 87zM1033 816h67v370h-67v-283q-22 -31 -42 -31q-15 0 -16 16q-1 2 -1 26v272h-67v-293q0 -37 6 -55q11 -27 43 -27q36 0 77 45v-40zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf167;" d="M971 292v-211q0 -67 -39 -67q-23 0 -45 22v301q22 22 45 22q39 0 39 -67zM1309 291v-46h-90v46q0 68 45 68t45 -68zM343 509h107v94h-312v-94h105v-569h100v569zM631 -60h89v494h-89v-378q-30 -42 -57 -42q-18 0 -21 21q-1 3 -1 35v364h-89v-391q0 -49 8 -73 q12 -37 58 -37q48 0 102 61v-54zM1060 88v197q0 73 -9 99q-17 56 -71 56q-50 0 -93 -54v217h-89v-663h89v48q45 -55 93 -55q54 0 71 55q9 27 9 100zM1398 98v13h-91q0 -51 -2 -61q-7 -36 -40 -36q-46 0 -46 69v87h179v103q0 79 -27 116q-39 51 -106 51q-68 0 -107 -51 q-28 -37 -28 -116v-173q0 -79 29 -116q39 -51 108 -51q72 0 108 53q18 27 21 54q2 9 2 58zM790 1011v210q0 69 -43 69t-43 -69v-210q0 -70 43 -70t43 70zM1509 260q0 -234 -26 -350q-14 -59 -58 -99t-102 -46q-184 -21 -555 -21t-555 21q-58 6 -102.5 46t-57.5 99 q-26 112 -26 350q0 234 26 350q14 59 58 99t103 47q183 20 554 20t555 -20q58 -7 102.5 -47t57.5 -99q26 -112 26 -350zM511 1536h102l-121 -399v-271h-100v271q-14 74 -61 212q-37 103 -65 187h106l71 -263zM881 1203v-175q0 -81 -28 -118q-37 -51 -106 -51q-67 0 -105 51 q-28 38 -28 118v175q0 80 28 117q38 51 105 51q69 0 106 -51q28 -37 28 -117zM1216 1365v-499h-91v55q-53 -62 -103 -62q-46 0 -59 37q-8 24 -8 75v394h91v-367q0 -33 1 -35q3 -22 21 -22q27 0 57 43v381h91z" />
-<glyph unicode="&#xf168;" horiz-adv-x="1408" d="M597 869q-10 -18 -257 -456q-27 -46 -65 -46h-239q-21 0 -31 17t0 36l253 448q1 0 0 1l-161 279q-12 22 -1 37q9 15 32 15h239q40 0 66 -45zM1403 1511q11 -16 0 -37l-528 -934v-1l336 -615q11 -20 1 -37q-10 -15 -32 -15h-239q-42 0 -66 45l-339 622q18 32 531 942 q25 45 64 45h241q22 0 31 -15z" />
-<glyph unicode="&#xf169;" d="M685 771q0 1 -126 222q-21 34 -52 34h-184q-18 0 -26 -11q-7 -12 1 -29l125 -216v-1l-196 -346q-9 -14 0 -28q8 -13 24 -13h185q31 0 50 36zM1309 1268q-7 12 -24 12h-187q-30 0 -49 -35l-411 -729q1 -2 262 -481q20 -35 52 -35h184q18 0 25 12q8 13 -1 28l-260 476v1 l409 723q8 16 0 28zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf16a;" horiz-adv-x="1792" d="M1280 640q0 37 -30 54l-512 320q-31 20 -65 2q-33 -18 -33 -56v-640q0 -38 33 -56q16 -8 31 -8q20 0 34 10l512 320q30 17 30 54zM1792 640q0 -96 -1 -150t-8.5 -136.5t-22.5 -147.5q-16 -73 -69 -123t-124 -58q-222 -25 -671 -25t-671 25q-71 8 -124.5 58t-69.5 123 q-14 65 -21.5 147.5t-8.5 136.5t-1 150t1 150t8.5 136.5t22.5 147.5q16 73 69 123t124 58q222 25 671 25t671 -25q71 -8 124.5 -58t69.5 -123q14 -65 21.5 -147.5t8.5 -136.5t1 -150z" />
-<glyph unicode="&#xf16b;" horiz-adv-x="1792" d="M402 829l494 -305l-342 -285l-490 319zM1388 274v-108l-490 -293v-1l-1 1l-1 -1v1l-489 293v108l147 -96l342 284v2l1 -1l1 1v-2l343 -284zM554 1418l342 -285l-494 -304l-338 270zM1390 829l338 -271l-489 -319l-343 285zM1239 1418l489 -319l-338 -270l-494 304z" />
-<glyph unicode="&#xf16c;" horiz-adv-x="1408" d="M928 135v-151l-707 -1v151zM1169 481v-701l-1 -35v-1h-1132l-35 1h-1v736h121v-618h928v618h120zM241 393l704 -65l-13 -150l-705 65zM309 709l683 -183l-39 -146l-683 183zM472 1058l609 -360l-77 -130l-609 360zM832 1389l398 -585l-124 -85l-399 584zM1285 1536 l121 -697l-149 -26l-121 697z" />
-<glyph unicode="&#xf16d;" d="M1362 110v648h-135q20 -63 20 -131q0 -126 -64 -232.5t-174 -168.5t-240 -62q-197 0 -337 135.5t-140 327.5q0 68 20 131h-141v-648q0 -26 17.5 -43.5t43.5 -17.5h1069q25 0 43 17.5t18 43.5zM1078 643q0 124 -90.5 211.5t-218.5 87.5q-127 0 -217.5 -87.5t-90.5 -211.5 t90.5 -211.5t217.5 -87.5q128 0 218.5 87.5t90.5 211.5zM1362 1003v165q0 28 -20 48.5t-49 20.5h-174q-29 0 -49 -20.5t-20 -48.5v-165q0 -29 20 -49t49 -20h174q29 0 49 20t20 49zM1536 1211v-1142q0 -81 -58 -139t-139 -58h-1142q-81 0 -139 58t-58 139v1142q0 81 58 139 t139 58h1142q81 0 139 -58t58 -139z" />
-<glyph unicode="&#xf16e;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM698 640q0 88 -62 150t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150zM1262 640q0 88 -62 150 t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150z" />
-<glyph unicode="&#xf170;" d="M768 914l201 -306h-402zM1133 384h94l-459 691l-459 -691h94l104 160h522zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf171;" horiz-adv-x="1408" d="M815 677q8 -63 -50.5 -101t-111.5 -6q-39 17 -53.5 58t-0.5 82t52 58q36 18 72.5 12t64 -35.5t27.5 -67.5zM926 698q-14 107 -113 164t-197 13q-63 -28 -100.5 -88.5t-34.5 -129.5q4 -91 77.5 -155t165.5 -56q91 8 152 84t50 168zM1165 1240q-20 27 -56 44.5t-58 22 t-71 12.5q-291 47 -566 -2q-43 -7 -66 -12t-55 -22t-50 -43q30 -28 76 -45.5t73.5 -22t87.5 -11.5q228 -29 448 -1q63 8 89.5 12t72.5 21.5t75 46.5zM1222 205q-8 -26 -15.5 -76.5t-14 -84t-28.5 -70t-58 -56.5q-86 -48 -189.5 -71.5t-202 -22t-201.5 18.5q-46 8 -81.5 18 t-76.5 27t-73 43.5t-52 61.5q-25 96 -57 292l6 16l18 9q223 -148 506.5 -148t507.5 148q21 -6 24 -23t-5 -45t-8 -37zM1403 1166q-26 -167 -111 -655q-5 -30 -27 -56t-43.5 -40t-54.5 -31q-252 -126 -610 -88q-248 27 -394 139q-15 12 -25.5 26.5t-17 35t-9 34t-6 39.5 t-5.5 35q-9 50 -26.5 150t-28 161.5t-23.5 147.5t-22 158q3 26 17.5 48.5t31.5 37.5t45 30t46 22.5t48 18.5q125 46 313 64q379 37 676 -50q155 -46 215 -122q16 -20 16.5 -51t-5.5 -54z" />
-<glyph unicode="&#xf172;" d="M848 666q0 43 -41 66t-77 1q-43 -20 -42.5 -72.5t43.5 -70.5q39 -23 81 4t36 72zM928 682q8 -66 -36 -121t-110 -61t-119 40t-56 113q-2 49 25.5 93t72.5 64q70 31 141.5 -10t81.5 -118zM1100 1073q-20 -21 -53.5 -34t-53 -16t-63.5 -8q-155 -20 -324 0q-44 6 -63 9.5 t-52.5 16t-54.5 32.5q13 19 36 31t40 15.5t47 8.5q198 35 408 1q33 -5 51 -8.5t43 -16t39 -31.5zM1142 327q0 7 5.5 26.5t3 32t-17.5 16.5q-161 -106 -365 -106t-366 106l-12 -6l-5 -12q26 -154 41 -210q47 -81 204 -108q249 -46 428 53q34 19 49 51.5t22.5 85.5t12.5 71z M1272 1020q9 53 -8 75q-43 55 -155 88q-216 63 -487 36q-132 -12 -226 -46q-38 -15 -59.5 -25t-47 -34t-29.5 -54q8 -68 19 -138t29 -171t24 -137q1 -5 5 -31t7 -36t12 -27t22 -28q105 -80 284 -100q259 -28 440 63q24 13 39.5 23t31 29t19.5 40q48 267 80 473zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf173;" horiz-adv-x="1024" d="M944 207l80 -237q-23 -35 -111 -66t-177 -32q-104 -2 -190.5 26t-142.5 74t-95 106t-55.5 120t-16.5 118v544h-168v215q72 26 129 69.5t91 90t58 102t34 99t15 88.5q1 5 4.5 8.5t7.5 3.5h244v-424h333v-252h-334v-518q0 -30 6.5 -56t22.5 -52.5t49.5 -41.5t81.5 -14 q78 2 134 29z" />
-<glyph unicode="&#xf174;" d="M1136 75l-62 183q-44 -22 -103 -22q-36 -1 -62 10.5t-38.5 31.5t-17.5 40.5t-5 43.5v398h257v194h-256v326h-188q-8 0 -9 -10q-5 -44 -17.5 -87t-39 -95t-77 -95t-118.5 -68v-165h130v-418q0 -57 21.5 -115t65 -111t121 -85.5t176.5 -30.5q69 1 136.5 25t85.5 50z M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf175;" horiz-adv-x="768" d="M765 237q8 -19 -5 -35l-350 -384q-10 -10 -23 -10q-14 0 -24 10l-355 384q-13 16 -5 35q9 19 29 19h224v1248q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1248h224q21 0 29 -19z" />
-<glyph unicode="&#xf176;" horiz-adv-x="768" d="M765 1043q-9 -19 -29 -19h-224v-1248q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1248h-224q-21 0 -29 19t5 35l350 384q10 10 23 10q14 0 24 -10l355 -384q13 -16 5 -35z" />
-<glyph unicode="&#xf177;" horiz-adv-x="1792" d="M1792 736v-192q0 -14 -9 -23t-23 -9h-1248v-224q0 -21 -19 -29t-35 5l-384 350q-10 10 -10 23q0 14 10 24l384 354q16 14 35 6q19 -9 19 -29v-224h1248q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf178;" horiz-adv-x="1792" d="M1728 643q0 -14 -10 -24l-384 -354q-16 -14 -35 -6q-19 9 -19 29v224h-1248q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h1248v224q0 21 19 29t35 -5l384 -350q10 -10 10 -23z" />
-<glyph unicode="&#xf179;" horiz-adv-x="1408" d="M1393 321q-39 -125 -123 -250q-129 -196 -257 -196q-49 0 -140 32q-86 32 -151 32q-61 0 -142 -33q-81 -34 -132 -34q-152 0 -301 259q-147 261 -147 503q0 228 113 374q112 144 284 144q72 0 177 -30q104 -30 138 -30q45 0 143 34q102 34 173 34q119 0 213 -65 q52 -36 104 -100q-79 -67 -114 -118q-65 -94 -65 -207q0 -124 69 -223t158 -126zM1017 1494q0 -61 -29 -136q-30 -75 -93 -138q-54 -54 -108 -72q-37 -11 -104 -17q3 149 78 257q74 107 250 148q1 -3 2.5 -11t2.5 -11q0 -4 0.5 -10t0.5 -10z" />
-<glyph unicode="&#xf17a;" horiz-adv-x="1664" d="M682 530v-651l-682 94v557h682zM682 1273v-659h-682v565zM1664 530v-786l-907 125v661h907zM1664 1408v-794h-907v669z" />
-<glyph unicode="&#xf17b;" horiz-adv-x="1408" d="M493 1053q16 0 27.5 11.5t11.5 27.5t-11.5 27.5t-27.5 11.5t-27 -11.5t-11 -27.5t11 -27.5t27 -11.5zM915 1053q16 0 27 11.5t11 27.5t-11 27.5t-27 11.5t-27.5 -11.5t-11.5 -27.5t11.5 -27.5t27.5 -11.5zM103 869q42 0 72 -30t30 -72v-430q0 -43 -29.5 -73t-72.5 -30 t-73 30t-30 73v430q0 42 30 72t73 30zM1163 850v-666q0 -46 -32 -78t-77 -32h-75v-227q0 -43 -30 -73t-73 -30t-73 30t-30 73v227h-138v-227q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73l-1 227h-74q-46 0 -78 32t-32 78v666h918zM931 1255q107 -55 171 -153.5t64 -215.5 h-925q0 117 64 215.5t172 153.5l-71 131q-7 13 5 20q13 6 20 -6l72 -132q95 42 201 42t201 -42l72 132q7 12 20 6q12 -7 5 -20zM1408 767v-430q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73v430q0 43 30 72.5t72 29.5q43 0 73 -29.5t30 -72.5z" />
-<glyph unicode="&#xf17c;" d="M663 1125q-11 -1 -15.5 -10.5t-8.5 -9.5q-5 -1 -5 5q0 12 19 15h10zM750 1111q-4 -1 -11.5 6.5t-17.5 4.5q24 11 32 -2q3 -6 -3 -9zM399 684q-4 1 -6 -3t-4.5 -12.5t-5.5 -13.5t-10 -13q-7 -10 -1 -12q4 -1 12.5 7t12.5 18q1 3 2 7t2 6t1.5 4.5t0.5 4v3t-1 2.5t-3 2z M1254 325q0 18 -55 42q4 15 7.5 27.5t5 26t3 21.5t0.5 22.5t-1 19.5t-3.5 22t-4 20.5t-5 25t-5.5 26.5q-10 48 -47 103t-72 75q24 -20 57 -83q87 -162 54 -278q-11 -40 -50 -42q-31 -4 -38.5 18.5t-8 83.5t-11.5 107q-9 39 -19.5 69t-19.5 45.5t-15.5 24.5t-13 15t-7.5 7 q-14 62 -31 103t-29.5 56t-23.5 33t-15 40q-4 21 6 53.5t4.5 49.5t-44.5 25q-15 3 -44.5 18t-35.5 16q-8 1 -11 26t8 51t36 27q37 3 51 -30t4 -58q-11 -19 -2 -26.5t30 -0.5q13 4 13 36v37q-5 30 -13.5 50t-21 30.5t-23.5 15t-27 7.5q-107 -8 -89 -134q0 -15 -1 -15 q-9 9 -29.5 10.5t-33 -0.5t-15.5 5q1 57 -16 90t-45 34q-27 1 -41.5 -27.5t-16.5 -59.5q-1 -15 3.5 -37t13 -37.5t15.5 -13.5q10 3 16 14q4 9 -7 8q-7 0 -15.5 14.5t-9.5 33.5q-1 22 9 37t34 14q17 0 27 -21t9.5 -39t-1.5 -22q-22 -15 -31 -29q-8 -12 -27.5 -23.5 t-20.5 -12.5q-13 -14 -15.5 -27t7.5 -18q14 -8 25 -19.5t16 -19t18.5 -13t35.5 -6.5q47 -2 102 15q2 1 23 7t34.5 10.5t29.5 13t21 17.5q9 14 20 8q5 -3 6.5 -8.5t-3 -12t-16.5 -9.5q-20 -6 -56.5 -21.5t-45.5 -19.5q-44 -19 -70 -23q-25 -5 -79 2q-10 2 -9 -2t17 -19 q25 -23 67 -22q17 1 36 7t36 14t33.5 17.5t30 17t24.5 12t17.5 2.5t8.5 -11q0 -2 -1 -4.5t-4 -5t-6 -4.5t-8.5 -5t-9 -4.5t-10 -5t-9.5 -4.5q-28 -14 -67.5 -44t-66.5 -43t-49 -1q-21 11 -63 73q-22 31 -25 22q-1 -3 -1 -10q0 -25 -15 -56.5t-29.5 -55.5t-21 -58t11.5 -63 q-23 -6 -62.5 -90t-47.5 -141q-2 -18 -1.5 -69t-5.5 -59q-8 -24 -29 -3q-32 31 -36 94q-2 28 4 56q4 19 -1 18l-4 -5q-36 -65 10 -166q5 -12 25 -28t24 -20q20 -23 104 -90.5t93 -76.5q16 -15 17.5 -38t-14 -43t-45.5 -23q8 -15 29 -44.5t28 -54t7 -70.5q46 24 7 92 q-4 8 -10.5 16t-9.5 12t-2 6q3 5 13 9.5t20 -2.5q46 -52 166 -36q133 15 177 87q23 38 34 30q12 -6 10 -52q-1 -25 -23 -92q-9 -23 -6 -37.5t24 -15.5q3 19 14.5 77t13.5 90q2 21 -6.5 73.5t-7.5 97t23 70.5q15 18 51 18q1 37 34.5 53t72.5 10.5t60 -22.5zM626 1152 q3 17 -2.5 30t-11.5 15q-9 2 -9 -7q2 -5 5 -6q10 0 7 -15q-3 -20 8 -20q3 0 3 3zM1045 955q-2 8 -6.5 11.5t-13 5t-14.5 5.5q-5 3 -9.5 8t-7 8t-5.5 6.5t-4 4t-4 -1.5q-14 -16 7 -43.5t39 -31.5q9 -1 14.5 8t3.5 20zM867 1168q0 11 -5 19.5t-11 12.5t-9 3q-14 -1 -7 -7l4 -2 q14 -4 18 -31q0 -3 8 2zM921 1401q0 2 -2.5 5t-9 7t-9.5 6q-15 15 -24 15q-9 -1 -11.5 -7.5t-1 -13t-0.5 -12.5q-1 -4 -6 -10.5t-6 -9t3 -8.5q4 -3 8 0t11 9t15 9q1 1 9 1t15 2t9 7zM1486 60q20 -12 31 -24.5t12 -24t-2.5 -22.5t-15.5 -22t-23.5 -19.5t-30 -18.5 t-31.5 -16.5t-32 -15.5t-27 -13q-38 -19 -85.5 -56t-75.5 -64q-17 -16 -68 -19.5t-89 14.5q-18 9 -29.5 23.5t-16.5 25.5t-22 19.5t-47 9.5q-44 1 -130 1q-19 0 -57 -1.5t-58 -2.5q-44 -1 -79.5 -15t-53.5 -30t-43.5 -28.5t-53.5 -11.5q-29 1 -111 31t-146 43q-19 4 -51 9.5 t-50 9t-39.5 9.5t-33.5 14.5t-17 19.5q-10 23 7 66.5t18 54.5q1 16 -4 40t-10 42.5t-4.5 36.5t10.5 27q14 12 57 14t60 12q30 18 42 35t12 51q21 -73 -32 -106q-32 -20 -83 -15q-34 3 -43 -10q-13 -15 5 -57q2 -6 8 -18t8.5 -18t4.5 -17t1 -22q0 -15 -17 -49t-14 -48 q3 -17 37 -26q20 -6 84.5 -18.5t99.5 -20.5q24 -6 74 -22t82.5 -23t55.5 -4q43 6 64.5 28t23 48t-7.5 58.5t-19 52t-20 36.5q-121 190 -169 242q-68 74 -113 40q-11 -9 -15 15q-3 16 -2 38q1 29 10 52t24 47t22 42q8 21 26.5 72t29.5 78t30 61t39 54q110 143 124 195 q-12 112 -16 310q-2 90 24 151.5t106 104.5q39 21 104 21q53 1 106 -13.5t89 -41.5q57 -42 91.5 -121.5t29.5 -147.5q-5 -95 30 -214q34 -113 133 -218q55 -59 99.5 -163t59.5 -191q8 -49 5 -84.5t-12 -55.5t-20 -22q-10 -2 -23.5 -19t-27 -35.5t-40.5 -33.5t-61 -14 q-18 1 -31.5 5t-22.5 13.5t-13.5 15.5t-11.5 20.5t-9 19.5q-22 37 -41 30t-28 -49t7 -97q20 -70 1 -195q-10 -65 18 -100.5t73 -33t85 35.5q59 49 89.5 66.5t103.5 42.5q53 18 77 36.5t18.5 34.5t-25 28.5t-51.5 23.5q-33 11 -49.5 48t-15 72.5t15.5 47.5q1 -31 8 -56.5 t14.5 -40.5t20.5 -28.5t21 -19t21.5 -13t16.5 -9.5z" />
-<glyph unicode="&#xf17d;" d="M1024 36q-42 241 -140 498h-2l-2 -1q-16 -6 -43 -16.5t-101 -49t-137 -82t-131 -114.5t-103 -148l-15 11q184 -150 418 -150q132 0 256 52zM839 643q-21 49 -53 111q-311 -93 -673 -93q-1 -7 -1 -21q0 -124 44 -236.5t124 -201.5q50 89 123.5 166.5t142.5 124.5t130.5 81 t99.5 48l37 13q4 1 13 3.5t13 4.5zM732 855q-120 213 -244 378q-138 -65 -234 -186t-128 -272q302 0 606 80zM1416 536q-210 60 -409 29q87 -239 128 -469q111 75 185 189.5t96 250.5zM611 1277q-1 0 -2 -1q1 1 2 1zM1201 1132q-185 164 -433 164q-76 0 -155 -19 q131 -170 246 -382q69 26 130 60.5t96.5 61.5t65.5 57t37.5 40.5zM1424 647q-3 232 -149 410l-1 -1q-9 -12 -19 -24.5t-43.5 -44.5t-71 -60.5t-100 -65t-131.5 -64.5q25 -53 44 -95q2 -6 6.5 -17.5t7.5 -16.5q36 5 74.5 7t73.5 2t69 -1.5t64 -4t56.5 -5.5t48 -6.5t36.5 -6 t25 -4.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf17e;" d="M1173 473q0 50 -19.5 91.5t-48.5 68.5t-73 49t-82.5 34t-87.5 23l-104 24q-30 7 -44 10.5t-35 11.5t-30 16t-16.5 21t-7.5 30q0 77 144 77q43 0 77 -12t54 -28.5t38 -33.5t40 -29t48 -12q47 0 75.5 32t28.5 77q0 55 -56 99.5t-142 67.5t-182 23q-68 0 -132 -15.5 t-119.5 -47t-89 -87t-33.5 -128.5q0 -61 19 -106.5t56 -75.5t80 -48.5t103 -32.5l146 -36q90 -22 112 -36q32 -20 32 -60q0 -39 -40 -64.5t-105 -25.5q-51 0 -91.5 16t-65 38.5t-45.5 45t-46 38.5t-54 16q-50 0 -75.5 -30t-25.5 -75q0 -92 122 -157.5t291 -65.5 q73 0 140 18.5t122.5 53.5t88.5 93.5t33 131.5zM1536 256q0 -159 -112.5 -271.5t-271.5 -112.5q-130 0 -234 80q-77 -16 -150 -16q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5q0 73 16 150q-80 104 -80 234q0 159 112.5 271.5t271.5 112.5q130 0 234 -80 q77 16 150 16q143 0 273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -73 -16 -150q80 -104 80 -234z" />
-<glyph unicode="&#xf180;" horiz-adv-x="1280" d="M1000 1102l37 194q5 23 -9 40t-35 17h-712q-23 0 -38.5 -17t-15.5 -37v-1101q0 -7 6 -1l291 352q23 26 38 33.5t48 7.5h239q22 0 37 14.5t18 29.5q24 130 37 191q4 21 -11.5 40t-36.5 19h-294q-29 0 -48 19t-19 48v42q0 29 19 47.5t48 18.5h346q18 0 35 13.5t20 29.5z M1227 1324q-15 -73 -53.5 -266.5t-69.5 -350t-35 -173.5q-6 -22 -9 -32.5t-14 -32.5t-24.5 -33t-38.5 -21t-58 -10h-271q-13 0 -22 -10q-8 -9 -426 -494q-22 -25 -58.5 -28.5t-48.5 5.5q-55 22 -55 98v1410q0 55 38 102.5t120 47.5h888q95 0 127 -53t10 -159zM1227 1324 l-158 -790q4 17 35 173.5t69.5 350t53.5 266.5z" />
-<glyph unicode="&#xf181;" d="M704 192v1024q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-1024q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1376 576v640q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-640q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408 q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf182;" horiz-adv-x="1280" d="M1280 480q0 -40 -28 -68t-68 -28q-51 0 -80 43l-227 341h-45v-132l247 -411q9 -15 9 -33q0 -26 -19 -45t-45 -19h-192v-272q0 -46 -33 -79t-79 -33h-160q-46 0 -79 33t-33 79v272h-192q-26 0 -45 19t-19 45q0 18 9 33l247 411v132h-45l-227 -341q-29 -43 -80 -43 q-40 0 -68 28t-28 68q0 29 16 53l256 384q73 107 176 107h384q103 0 176 -107l256 -384q16 -24 16 -53zM864 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
-<glyph unicode="&#xf183;" horiz-adv-x="1024" d="M1024 832v-416q0 -40 -28 -68t-68 -28t-68 28t-28 68v352h-64v-912q0 -46 -33 -79t-79 -33t-79 33t-33 79v464h-64v-464q0 -46 -33 -79t-79 -33t-79 33t-33 79v912h-64v-352q0 -40 -28 -68t-68 -28t-68 28t-28 68v416q0 80 56 136t136 56h640q80 0 136 -56t56 -136z M736 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
-<glyph unicode="&#xf184;" d="M773 234l350 473q16 22 24.5 59t-6 85t-61.5 79q-40 26 -83 25.5t-73.5 -17.5t-54.5 -45q-36 -40 -96 -40q-59 0 -95 40q-24 28 -54.5 45t-73.5 17.5t-84 -25.5q-46 -31 -60.5 -79t-6 -85t24.5 -59zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf185;" horiz-adv-x="1792" d="M1472 640q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5t-223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5t45.5 -223.5t123 -184t184 -123t223.5 -45.5t223.5 45.5t184 123t123 184t45.5 223.5zM1748 363q-4 -15 -20 -20l-292 -96v-306q0 -16 -13 -26q-15 -10 -29 -4 l-292 94l-180 -248q-10 -13 -26 -13t-26 13l-180 248l-292 -94q-14 -6 -29 4q-13 10 -13 26v306l-292 96q-16 5 -20 20q-5 17 4 29l180 248l-180 248q-9 13 -4 29q4 15 20 20l292 96v306q0 16 13 26q15 10 29 4l292 -94l180 248q9 12 26 12t26 -12l180 -248l292 94 q14 6 29 -4q13 -10 13 -26v-306l292 -96q16 -5 20 -20q5 -16 -4 -29l-180 -248l180 -248q9 -12 4 -29z" />
-<glyph unicode="&#xf186;" d="M1262 233q-54 -9 -110 -9q-182 0 -337 90t-245 245t-90 337q0 192 104 357q-201 -60 -328.5 -229t-127.5 -384q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51q144 0 273.5 61.5t220.5 171.5zM1465 318q-94 -203 -283.5 -324.5t-413.5 -121.5q-156 0 -298 61 t-245 164t-164 245t-61 298q0 153 57.5 292.5t156 241.5t235.5 164.5t290 68.5q44 2 61 -39q18 -41 -15 -72q-86 -78 -131.5 -181.5t-45.5 -218.5q0 -148 73 -273t198 -198t273 -73q118 0 228 51q41 18 72 -13q14 -14 17.5 -34t-4.5 -38z" />
-<glyph unicode="&#xf187;" horiz-adv-x="1792" d="M1088 704q0 26 -19 45t-45 19h-256q-26 0 -45 -19t-19 -45t19 -45t45 -19h256q26 0 45 19t19 45zM1664 896v-960q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v960q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1728 1344v-256q0 -26 -19 -45t-45 -19h-1536 q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1536q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf188;" horiz-adv-x="1664" d="M1632 576q0 -26 -19 -45t-45 -19h-224q0 -171 -67 -290l208 -209q19 -19 19 -45t-19 -45q-18 -19 -45 -19t-45 19l-198 197q-5 -5 -15 -13t-42 -28.5t-65 -36.5t-82 -29t-97 -13v896h-128v-896q-51 0 -101.5 13.5t-87 33t-66 39t-43.5 32.5l-15 14l-183 -207 q-20 -21 -48 -21q-24 0 -43 16q-19 18 -20.5 44.5t15.5 46.5l202 227q-58 114 -58 274h-224q-26 0 -45 19t-19 45t19 45t45 19h224v294l-173 173q-19 19 -19 45t19 45t45 19t45 -19l173 -173h844l173 173q19 19 45 19t45 -19t19 -45t-19 -45l-173 -173v-294h224q26 0 45 -19 t19 -45zM1152 1152h-640q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5z" />
-<glyph unicode="&#xf189;" horiz-adv-x="1920" d="M1917 1016q23 -64 -150 -294q-24 -32 -65 -85q-78 -100 -90 -131q-17 -41 14 -81q17 -21 81 -82h1l1 -1l1 -1l2 -2q141 -131 191 -221q3 -5 6.5 -12.5t7 -26.5t-0.5 -34t-25 -27.5t-59 -12.5l-256 -4q-24 -5 -56 5t-52 22l-20 12q-30 21 -70 64t-68.5 77.5t-61 58 t-56.5 15.5q-3 -1 -8 -3.5t-17 -14.5t-21.5 -29.5t-17 -52t-6.5 -77.5q0 -15 -3.5 -27.5t-7.5 -18.5l-4 -5q-18 -19 -53 -22h-115q-71 -4 -146 16.5t-131.5 53t-103 66t-70.5 57.5l-25 24q-10 10 -27.5 30t-71.5 91t-106 151t-122.5 211t-130.5 272q-6 16 -6 27t3 16l4 6 q15 19 57 19l274 2q12 -2 23 -6.5t16 -8.5l5 -3q16 -11 24 -32q20 -50 46 -103.5t41 -81.5l16 -29q29 -60 56 -104t48.5 -68.5t41.5 -38.5t34 -14t27 5q2 1 5 5t12 22t13.5 47t9.5 81t0 125q-2 40 -9 73t-14 46l-6 12q-25 34 -85 43q-13 2 5 24q17 19 38 30q53 26 239 24 q82 -1 135 -13q20 -5 33.5 -13.5t20.5 -24t10.5 -32t3.5 -45.5t-1 -55t-2.5 -70.5t-1.5 -82.5q0 -11 -1 -42t-0.5 -48t3.5 -40.5t11.5 -39t22.5 -24.5q8 -2 17 -4t26 11t38 34.5t52 67t68 107.5q60 104 107 225q4 10 10 17.5t11 10.5l4 3l5 2.5t13 3t20 0.5l288 2 q39 5 64 -2.5t31 -16.5z" />
-<glyph unicode="&#xf18a;" horiz-adv-x="1792" d="M675 252q21 34 11 69t-45 50q-34 14 -73 1t-60 -46q-22 -34 -13 -68.5t43 -50.5t74.5 -2.5t62.5 47.5zM769 373q8 13 3.5 26.5t-17.5 18.5q-14 5 -28.5 -0.5t-21.5 -18.5q-17 -31 13 -45q14 -5 29 0.5t22 18.5zM943 266q-45 -102 -158 -150t-224 -12 q-107 34 -147.5 126.5t6.5 187.5q47 93 151.5 139t210.5 19q111 -29 158.5 -119.5t2.5 -190.5zM1255 426q-9 96 -89 170t-208.5 109t-274.5 21q-223 -23 -369.5 -141.5t-132.5 -264.5q9 -96 89 -170t208.5 -109t274.5 -21q223 23 369.5 141.5t132.5 264.5zM1563 422 q0 -68 -37 -139.5t-109 -137t-168.5 -117.5t-226 -83t-270.5 -31t-275 33.5t-240.5 93t-171.5 151t-65 199.5q0 115 69.5 245t197.5 258q169 169 341.5 236t246.5 -7q65 -64 20 -209q-4 -14 -1 -20t10 -7t14.5 0.5t13.5 3.5l6 2q139 59 246 59t153 -61q45 -63 0 -178 q-2 -13 -4.5 -20t4.5 -12.5t12 -7.5t17 -6q57 -18 103 -47t80 -81.5t34 -116.5zM1489 1046q42 -47 54.5 -108.5t-6.5 -117.5q-8 -23 -29.5 -34t-44.5 -4q-23 8 -34 29.5t-4 44.5q20 63 -24 111t-107 35q-24 -5 -45 8t-25 37q-5 24 8 44.5t37 25.5q60 13 119 -5.5t101 -65.5z M1670 1209q87 -96 112.5 -222.5t-13.5 -241.5q-9 -27 -34 -40t-52 -4t-40 34t-5 52q28 82 10 172t-80 158q-62 69 -148 95.5t-173 8.5q-28 -6 -52 9.5t-30 43.5t9.5 51.5t43.5 29.5q123 26 244 -11.5t208 -134.5z" />
-<glyph unicode="&#xf18b;" d="M1133 -34q-171 -94 -368 -94q-196 0 -367 94q138 87 235.5 211t131.5 268q35 -144 132.5 -268t235.5 -211zM638 1394v-485q0 -252 -126.5 -459.5t-330.5 -306.5q-181 215 -181 495q0 187 83.5 349.5t229.5 269.5t325 137zM1536 638q0 -280 -181 -495 q-204 99 -330.5 306.5t-126.5 459.5v485q179 -30 325 -137t229.5 -269.5t83.5 -349.5z" />
-<glyph unicode="&#xf18c;" horiz-adv-x="1408" d="M1402 433q-32 -80 -76 -138t-91 -88.5t-99 -46.5t-101.5 -14.5t-96.5 8.5t-86.5 22t-69.5 27.5t-46 22.5l-17 10q-113 -228 -289.5 -359.5t-384.5 -132.5q-19 0 -32 13t-13 32t13 31.5t32 12.5q173 1 322.5 107.5t251.5 294.5q-36 -14 -72 -23t-83 -13t-91 2.5t-93 28.5 t-92 59t-84.5 100t-74.5 146q114 47 214 57t167.5 -7.5t124.5 -56.5t88.5 -77t56.5 -82q53 131 79 291q-7 -1 -18 -2.5t-46.5 -2.5t-69.5 0.5t-81.5 10t-88.5 23t-84 42.5t-75 65t-54.5 94.5t-28.5 127.5q70 28 133.5 36.5t112.5 -1t92 -30t73.5 -50t56 -61t42 -63t27.5 -56 t16 -39.5l4 -16q12 122 12 195q-8 6 -21.5 16t-49 44.5t-63.5 71.5t-54 93t-33 112.5t12 127t70 138.5q73 -25 127.5 -61.5t84.5 -76.5t48 -85t20.5 -89t-0.5 -85.5t-13 -76.5t-19 -62t-17 -42l-7 -15q1 -5 1 -50.5t-1 -71.5q3 7 10 18.5t30.5 43t50.5 58t71 55.5t91.5 44.5 t112 14.5t132.5 -24q-2 -78 -21.5 -141.5t-50 -104.5t-69.5 -71.5t-81.5 -45.5t-84.5 -24t-80 -9.5t-67.5 1t-46.5 4.5l-17 3q-23 -147 -73 -283q6 7 18 18.5t49.5 41t77.5 52.5t99.5 42t117.5 20t129 -23.5t137 -77.5z" />
-<glyph unicode="&#xf18d;" horiz-adv-x="1280" d="M1259 283v-66q0 -85 -57.5 -144.5t-138.5 -59.5h-57l-260 -269v269h-529q-81 0 -138.5 59.5t-57.5 144.5v66h1238zM1259 609v-255h-1238v255h1238zM1259 937v-255h-1238v255h1238zM1259 1077v-67h-1238v67q0 84 57.5 143.5t138.5 59.5h846q81 0 138.5 -59.5t57.5 -143.5z " />
-<glyph unicode="&#xf18e;" d="M1152 640q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192h-352q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h352v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198 t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf190;" d="M1152 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-352v-192q0 -14 -9 -23t-23 -9q-12 0 -24 10l-319 319q-9 9 -9 23t9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h352q13 0 22.5 -9.5t9.5 -22.5zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198 t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf191;" d="M1024 960v-640q0 -26 -19 -45t-45 -19q-20 0 -37 12l-448 320q-27 19 -27 52t27 52l448 320q17 12 37 12q26 0 45 -19t19 -45zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5z M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf192;" d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5 t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf193;" horiz-adv-x="1664" d="M1023 349l102 -204q-58 -179 -210 -290t-339 -111q-156 0 -288.5 77.5t-210 210t-77.5 288.5q0 181 104.5 330t274.5 211l17 -131q-122 -54 -195 -165.5t-73 -244.5q0 -185 131.5 -316.5t316.5 -131.5q126 0 232.5 65t165 175.5t49.5 236.5zM1571 249l58 -114l-256 -128 q-13 -7 -29 -7q-40 0 -57 35l-239 477h-472q-24 0 -42.5 16.5t-21.5 40.5l-96 779q-2 16 6 42q14 51 57 82.5t97 31.5q66 0 113 -47t47 -113q0 -69 -52 -117.5t-120 -41.5l37 -289h423v-128h-407l16 -128h455q40 0 57 -35l228 -455z" />
-<glyph unicode="&#xf194;" d="M1254 899q16 85 -21 132q-52 65 -187 45q-17 -3 -41 -12.5t-57.5 -30.5t-64.5 -48.5t-59.5 -70t-44.5 -91.5q80 7 113.5 -16t26.5 -99q-5 -52 -52 -143q-43 -78 -71 -99q-44 -32 -87 14q-23 24 -37.5 64.5t-19 73t-10 84t-8.5 71.5q-23 129 -34 164q-12 37 -35.5 69 t-50.5 40q-57 16 -127 -25q-54 -32 -136.5 -106t-122.5 -102v-7q16 -8 25.5 -26t21.5 -20q21 -3 54.5 8.5t58 10.5t41.5 -30q11 -18 18.5 -38.5t15 -48t12.5 -40.5q17 -46 53 -187q36 -146 57 -197q42 -99 103 -125q43 -12 85 -1.5t76 31.5q131 77 250 237 q104 139 172.5 292.5t82.5 226.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf195;" horiz-adv-x="1152" d="M1152 704q0 -191 -94.5 -353t-256.5 -256.5t-353 -94.5h-160q-14 0 -23 9t-9 23v611l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v93l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v250q0 14 9 23t23 9h160 q14 0 23 -9t9 -23v-181l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-93l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-487q188 13 318 151t130 328q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf196;" horiz-adv-x="1408" d="M1152 736v-64q0 -14 -9 -23t-23 -9h-352v-352q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v352h-352q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h352v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-352h352q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832 q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf197;" horiz-adv-x="2176" d="M620 416q-110 -64 -268 -64h-128v64h-64q-13 0 -22.5 23.5t-9.5 56.5q0 24 7 49q-58 2 -96.5 10.5t-38.5 20.5t38.5 20.5t96.5 10.5q-7 25 -7 49q0 33 9.5 56.5t22.5 23.5h64v64h128q158 0 268 -64h1113q42 -7 106.5 -18t80.5 -14q89 -15 150 -40.5t83.5 -47.5t22.5 -40 t-22.5 -40t-83.5 -47.5t-150 -40.5q-16 -3 -80.5 -14t-106.5 -18h-1113zM1739 668q53 -36 53 -92t-53 -92l81 -30q68 48 68 122t-68 122zM625 400h1015q-217 -38 -456 -80q-57 0 -113 -24t-83 -48l-28 -24l-288 -288q-26 -26 -70.5 -45t-89.5 -19h-96l-93 464h29 q157 0 273 64zM352 816h-29l93 464h96q46 0 90 -19t70 -45l288 -288q4 -4 11 -10.5t30.5 -23t48.5 -29t61.5 -23t72.5 -10.5l456 -80h-1015q-116 64 -273 64z" />
-<glyph unicode="&#xf198;" horiz-adv-x="1664" d="M1519 760q62 0 103.5 -40.5t41.5 -101.5q0 -97 -93 -130l-172 -59l56 -167q7 -21 7 -47q0 -59 -42 -102t-101 -43q-47 0 -85.5 27t-53.5 72l-55 165l-310 -106l55 -164q8 -24 8 -47q0 -59 -42 -102t-102 -43q-47 0 -85 27t-53 72l-55 163l-153 -53q-29 -9 -50 -9 q-61 0 -101.5 40t-40.5 101q0 47 27.5 85t71.5 53l156 53l-105 313l-156 -54q-26 -8 -48 -8q-60 0 -101 40.5t-41 100.5q0 47 27.5 85t71.5 53l157 53l-53 159q-8 24 -8 47q0 60 42 102.5t102 42.5q47 0 85 -27t53 -72l54 -160l310 105l-54 160q-8 24 -8 47q0 59 42.5 102 t101.5 43q47 0 85.5 -27.5t53.5 -71.5l53 -161l162 55q21 6 43 6q60 0 102.5 -39.5t42.5 -98.5q0 -45 -30 -81.5t-74 -51.5l-157 -54l105 -316l164 56q24 8 46 8zM725 498l310 105l-105 315l-310 -107z" />
-<glyph unicode="&#xf199;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM1280 352v436q-31 -35 -64 -55q-34 -22 -132.5 -85t-151.5 -99q-98 -69 -164 -69v0v0q-66 0 -164 69 q-46 32 -141.5 92.5t-142.5 92.5q-12 8 -33 27t-31 27v-436q0 -40 28 -68t68 -28h832q40 0 68 28t28 68zM1280 925q0 41 -27.5 70t-68.5 29h-832q-40 0 -68 -28t-28 -68q0 -37 30.5 -76.5t67.5 -64.5q47 -32 137.5 -89t129.5 -83q3 -2 17 -11.5t21 -14t21 -13t23.5 -13 t21.5 -9.5t22.5 -7.5t20.5 -2.5t20.5 2.5t22.5 7.5t21.5 9.5t23.5 13t21 13t21 14t17 11.5l267 174q35 23 66.5 62.5t31.5 73.5z" />
-<glyph unicode="&#xf19a;" horiz-adv-x="1792" d="M127 640q0 163 67 313l367 -1005q-196 95 -315 281t-119 411zM1415 679q0 -19 -2.5 -38.5t-10 -49.5t-11.5 -44t-17.5 -59t-17.5 -58l-76 -256l-278 826q46 3 88 8q19 2 26 18.5t-2.5 31t-28.5 13.5l-205 -10q-75 1 -202 10q-12 1 -20.5 -5t-11.5 -15t-1.5 -18.5t9 -16.5 t19.5 -8l80 -8l120 -328l-168 -504l-280 832q46 3 88 8q19 2 26 18.5t-2.5 31t-28.5 13.5l-205 -10q-7 0 -23 0.5t-26 0.5q105 160 274.5 253.5t367.5 93.5q147 0 280.5 -53t238.5 -149h-10q-55 0 -92 -40.5t-37 -95.5q0 -12 2 -24t4 -21.5t8 -23t9 -21t12 -22.5t12.5 -21 t14.5 -24t14 -23q63 -107 63 -212zM909 573l237 -647q1 -6 5 -11q-126 -44 -255 -44q-112 0 -217 32zM1570 1009q95 -174 95 -369q0 -209 -104 -385.5t-279 -278.5l235 678q59 169 59 276q0 42 -6 79zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286 t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM896 -215q173 0 331.5 68t273 182.5t182.5 273t68 331.5t-68 331.5t-182.5 273t-273 182.5t-331.5 68t-331.5 -68t-273 -182.5t-182.5 -273t-68 -331.5t68 -331.5t182.5 -273 t273 -182.5t331.5 -68z" />
-<glyph unicode="&#xf19b;" horiz-adv-x="1792" d="M1086 1536v-1536l-272 -128q-228 20 -414 102t-293 208.5t-107 272.5q0 140 100.5 263.5t275 205.5t391.5 108v-172q-217 -38 -356.5 -150t-139.5 -255q0 -152 154.5 -267t388.5 -145v1360zM1755 954l37 -390l-525 114l147 83q-119 70 -280 99v172q277 -33 481 -157z" />
-<glyph unicode="&#xf19c;" horiz-adv-x="2048" d="M960 1536l960 -384v-128h-128q0 -26 -20.5 -45t-48.5 -19h-1526q-28 0 -48.5 19t-20.5 45h-128v128zM256 896h256v-768h128v768h256v-768h128v768h256v-768h128v768h256v-768h59q28 0 48.5 -19t20.5 -45v-64h-1664v64q0 26 20.5 45t48.5 19h59v768zM1851 -64 q28 0 48.5 -19t20.5 -45v-128h-1920v128q0 26 20.5 45t48.5 19h1782z" />
-<glyph unicode="&#xf19d;" horiz-adv-x="2304" d="M1774 700l18 -316q4 -69 -82 -128t-235 -93.5t-323 -34.5t-323 34.5t-235 93.5t-82 128l18 316l574 -181q22 -7 48 -7t48 7zM2304 1024q0 -23 -22 -31l-1120 -352q-4 -1 -10 -1t-10 1l-652 206q-43 -34 -71 -111.5t-34 -178.5q63 -36 63 -109q0 -69 -58 -107l58 -433 q2 -14 -8 -25q-9 -11 -24 -11h-192q-15 0 -24 11q-10 11 -8 25l58 433q-58 38 -58 107q0 73 65 111q11 207 98 330l-333 104q-22 8 -22 31t22 31l1120 352q4 1 10 1t10 -1l1120 -352q22 -8 22 -31z" />
-<glyph unicode="&#xf19e;" d="M859 579l13 -707q-62 11 -105 11q-41 0 -105 -11l13 707q-40 69 -168.5 295.5t-216.5 374.5t-181 287q58 -15 108 -15q43 0 111 15q63 -111 133.5 -229.5t167 -276.5t138.5 -227q37 61 109.5 177.5t117.5 190t105 176t107 189.5q54 -14 107 -14q56 0 114 14v0 q-28 -39 -60 -88.5t-49.5 -78.5t-56.5 -96t-49 -84q-146 -248 -353 -610z" />
-<glyph unicode="&#xf1a0;" horiz-adv-x="1280" d="M981 197q0 25 -7 49t-14.5 42t-27 41.5t-29.5 35t-38.5 34.5t-36.5 29t-41.5 30t-36.5 26q-16 2 -49 2q-53 0 -104.5 -7t-107 -25t-97 -46t-68.5 -74.5t-27 -105.5q0 -56 23.5 -102t61 -75.5t87 -50t100 -29t101.5 -8.5q58 0 111.5 13t99 39t73 73t27.5 109zM864 1055 q0 59 -17 125.5t-48 129t-84 103.5t-117 41q-42 0 -82.5 -19.5t-66.5 -52.5q-46 -59 -46 -160q0 -46 10 -97.5t31.5 -103t52 -92.5t75 -67t96.5 -26q37 0 77.5 16.5t65.5 43.5q53 56 53 159zM752 1536h417l-137 -88h-132q75 -63 113 -133t38 -160q0 -72 -24.5 -129.5 t-59.5 -93t-69.5 -65t-59 -61.5t-24.5 -66q0 -36 32 -70.5t77 -68t90.5 -73.5t77.5 -104t32 -142q0 -91 -49 -173q-71 -122 -209.5 -179.5t-298.5 -57.5q-132 0 -246.5 41.5t-172.5 137.5q-36 59 -36 131q0 81 44.5 150t118.5 115q131 82 404 100q-32 41 -47.5 73.5 t-15.5 73.5q0 40 21 85q-46 -4 -68 -4q-148 0 -249.5 96.5t-101.5 244.5q0 82 36 159t99 131q76 66 182 98t218 32z" />
-<glyph unicode="&#xf1a1;" horiz-adv-x="1984" d="M831 572q0 -56 -40.5 -96t-96.5 -40q-57 0 -98 40t-41 96q0 57 41.5 98t97.5 41t96.5 -41t40.5 -98zM1292 711q56 0 96.5 -41t40.5 -98q0 -56 -40.5 -96t-96.5 -40q-57 0 -98 40t-41 96q0 57 41.5 98t97.5 41zM1984 722q0 -62 -31 -114t-83 -82q5 -33 5 -61 q0 -121 -68.5 -230.5t-197.5 -193.5q-125 -82 -285.5 -125.5t-335.5 -43.5q-176 0 -336.5 43.5t-284.5 125.5q-129 84 -197.5 193t-68.5 231q0 29 5 66q-48 31 -77 81.5t-29 109.5q0 94 66 160t160 66q83 0 148 -55q248 158 592 164l134 423q4 14 17.5 21.5t28.5 4.5 l347 -82q22 50 68.5 81t102.5 31q77 0 131.5 -54.5t54.5 -131.5t-54.5 -132t-131.5 -55q-76 0 -130.5 54t-55.5 131l-315 74l-116 -366q327 -14 560 -166q64 58 151 58q94 0 160 -66t66 -160zM1664 1459q-45 0 -77 -32t-32 -77t32 -77t77 -32t77 32t32 77t-32 77t-77 32z M77 722q0 -67 51 -111q49 131 180 235q-36 25 -82 25q-62 0 -105.5 -43.5t-43.5 -105.5zM1567 105q112 73 171.5 166t59.5 194t-59.5 193.5t-171.5 165.5q-116 75 -265.5 115.5t-313.5 40.5t-313.5 -40.5t-265.5 -115.5q-112 -73 -171.5 -165.5t-59.5 -193.5t59.5 -194 t171.5 -166q116 -75 265.5 -115.5t313.5 -40.5t313.5 40.5t265.5 115.5zM1850 605q57 46 57 117q0 62 -43.5 105.5t-105.5 43.5q-49 0 -86 -28q131 -105 178 -238zM1258 237q11 11 27 11t27 -11t11 -27.5t-11 -27.5q-99 -99 -319 -99h-2q-220 0 -319 99q-11 11 -11 27.5 t11 27.5t27 11t27 -11q77 -77 265 -77h2q188 0 265 77z" />
-<glyph unicode="&#xf1a2;" d="M950 393q7 7 17.5 7t17.5 -7t7 -18t-7 -18q-65 -64 -208 -64h-1h-1q-143 0 -207 64q-8 7 -8 18t8 18q7 7 17.5 7t17.5 -7q49 -51 172 -51h1h1q122 0 173 51zM671 613q0 -37 -26 -64t-63 -27t-63 27t-26 64t26 63t63 26t63 -26t26 -63zM1214 1049q-29 0 -50 21t-21 50 q0 30 21 51t50 21q30 0 51 -21t21 -51q0 -29 -21 -50t-51 -21zM1216 1408q132 0 226 -94t94 -227v-894q0 -133 -94 -227t-226 -94h-896q-132 0 -226 94t-94 227v894q0 133 94 227t226 94h896zM1321 596q35 14 57 45.5t22 70.5q0 51 -36 87.5t-87 36.5q-60 0 -98 -48 q-151 107 -375 115l83 265l206 -49q1 -50 36.5 -85t84.5 -35q50 0 86 35.5t36 85.5t-36 86t-86 36q-36 0 -66 -20.5t-45 -53.5l-227 54q-9 2 -17.5 -2.5t-11.5 -14.5l-95 -302q-224 -4 -381 -113q-36 43 -93 43q-51 0 -87 -36.5t-36 -87.5q0 -37 19.5 -67.5t52.5 -45.5 q-7 -25 -7 -54q0 -98 74 -181.5t201.5 -132t278.5 -48.5q150 0 277.5 48.5t201.5 132t74 181.5q0 27 -6 54zM971 702q37 0 63 -26t26 -63t-26 -64t-63 -27t-63 27t-26 64t26 63t63 26z" />
-<glyph unicode="&#xf1a3;" d="M866 697l90 27v62q0 79 -58 135t-138 56t-138 -55.5t-58 -134.5v-283q0 -20 -14 -33.5t-33 -13.5t-32.5 13.5t-13.5 33.5v120h-151v-122q0 -82 57.5 -139t139.5 -57q81 0 138.5 56.5t57.5 136.5v280q0 19 13.5 33t33.5 14q19 0 32.5 -14t13.5 -33v-54zM1199 502v122h-150 v-126q0 -20 -13.5 -33.5t-33.5 -13.5q-19 0 -32.5 14t-13.5 33v123l-90 -26l-60 28v-123q0 -80 58 -137t139 -57t138.5 57t57.5 139zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103 t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf1a4;" horiz-adv-x="1920" d="M1062 824v118q0 42 -30 72t-72 30t-72 -30t-30 -72v-612q0 -175 -126 -299t-303 -124q-178 0 -303.5 125.5t-125.5 303.5v266h328v-262q0 -43 30 -72.5t72 -29.5t72 29.5t30 72.5v620q0 171 126.5 292t301.5 121q176 0 302 -122t126 -294v-136l-195 -58zM1592 602h328 v-266q0 -178 -125.5 -303.5t-303.5 -125.5q-177 0 -303 124.5t-126 300.5v268l131 -61l195 58v-270q0 -42 30 -71.5t72 -29.5t72 29.5t30 71.5v275z" />
-<glyph unicode="&#xf1a5;" d="M1472 160v480h-704v704h-480q-93 0 -158.5 -65.5t-65.5 -158.5v-480h704v-704h480q93 0 158.5 65.5t65.5 158.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5 t84.5 -203.5z" />
-<glyph unicode="&#xf1a6;" horiz-adv-x="2048" d="M328 1254h204v-983h-532v697h328v286zM328 435v369h-123v-369h123zM614 968v-697h205v697h-205zM614 1254v-204h205v204h-205zM901 968h533v-942h-533v163h328v82h-328v697zM1229 435v369h-123v-369h123zM1516 968h532v-942h-532v163h327v82h-327v697zM1843 435v369h-123 v-369h123z" />
-<glyph unicode="&#xf1a7;" d="M1046 516q0 -64 -38 -109t-91 -45q-43 0 -70 15v277q28 17 70 17q53 0 91 -45.5t38 -109.5zM703 944q0 -64 -38 -109.5t-91 -45.5q-43 0 -70 15v277q28 17 70 17q53 0 91 -45t38 -109zM1265 513q0 134 -88 229t-213 95q-20 0 -39 -3q-23 -78 -78 -136q-87 -95 -211 -101 v-636l211 41v206q51 -19 117 -19q125 0 213 95t88 229zM922 940q0 134 -88.5 229t-213.5 95q-74 0 -141 -36h-186v-840l211 41v206q55 -19 116 -19q125 0 213.5 95t88.5 229zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960 q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf1a8;" horiz-adv-x="2038" d="M1222 607q75 3 143.5 -20.5t118 -58.5t101 -94.5t84 -108t75.5 -120.5q33 -56 78.5 -109t75.5 -80.5t99 -88.5q-48 -30 -108.5 -57.5t-138.5 -59t-114 -47.5q-44 37 -74 115t-43.5 164.5t-33 180.5t-42.5 168.5t-72.5 123t-122.5 48.5l-10 -2l-6 -4q4 -5 13 -14 q6 -5 28 -23.5t25.5 -22t19 -18t18 -20.5t11.5 -21t10.5 -27.5t4.5 -31t4 -40.5l1 -33q1 -26 -2.5 -57.5t-7.5 -52t-12.5 -58.5t-11.5 -53q-35 1 -101 -9.5t-98 -10.5q-39 0 -72 10q-2 16 -2 47q0 74 3 96q2 13 31.5 41.5t57 59t26.5 51.5q-24 2 -43 -24 q-36 -53 -111.5 -99.5t-136.5 -46.5q-25 0 -75.5 63t-106.5 139.5t-84 96.5q-6 4 -27 30q-482 -112 -513 -112q-16 0 -28 11t-12 27q0 15 8.5 26.5t22.5 14.5l486 106q-8 14 -8 25t5.5 17.5t16 11.5t20 7t23 4.5t18.5 4.5q4 1 15.5 7.5t17.5 6.5q15 0 28 -16t20 -33 q163 37 172 37q17 0 29.5 -11t12.5 -28q0 -15 -8.5 -26t-23.5 -14l-182 -40l-1 -16q-1 -26 81.5 -117.5t104.5 -91.5q47 0 119 80t72 129q0 36 -23.5 53t-51 18.5t-51 11.5t-23.5 34q0 16 10 34l-68 19q43 44 43 117q0 26 -5 58q82 16 144 16q44 0 71.5 -1.5t48.5 -8.5 t31 -13.5t20.5 -24.5t15.5 -33.5t17 -47.5t24 -60l50 25q-3 -40 -23 -60t-42.5 -21t-40 -6.5t-16.5 -20.5zM1282 842q-5 5 -13.5 15.5t-12 14.5t-10.5 11.5t-10 10.5l-8 8t-8.5 7.5t-8 5t-8.5 4.5q-7 3 -14.5 5t-20.5 2.5t-22 0.5h-32.5h-37.5q-126 0 -217 -43 q16 30 36 46.5t54 29.5t65.5 36t46 36.5t50 55t43.5 50.5q12 -9 28 -31.5t32 -36.5t38 -13l12 1v-76l22 -1q247 95 371 190q28 21 50 39t42.5 37.5t33 31t29.5 34t24 31t24.5 37t23 38t27 47.5t29.5 53l7 9q-2 -53 -43 -139q-79 -165 -205 -264t-306 -142q-14 -3 -42 -7.5 t-50 -9.5t-39 -14q3 -19 24.5 -46t21.5 -34q0 -11 -26 -30zM1061 -79q39 26 131.5 47.5t146.5 21.5q9 0 22.5 -15.5t28 -42.5t26 -50t24 -51t14.5 -33q-121 -45 -244 -45q-61 0 -125 11zM822 568l48 12l109 -177l-73 -48zM1323 51q3 -15 3 -16q0 -7 -17.5 -14.5t-46 -13 t-54 -9.5t-53.5 -7.5t-32 -4.5l-7 43q21 2 60.5 8.5t72 10t60.5 3.5h14zM866 679l-96 -20l-6 17q10 1 32.5 7t34.5 6q19 0 35 -10zM1061 45h31l10 -83l-41 -12v95zM1950 1535v1v-1zM1950 1535l-1 -5l-2 -2l1 3zM1950 1535l1 1z" />
-<glyph unicode="&#xf1a9;" d="M1167 -50q-5 19 -24 5q-30 -22 -87 -39t-131 -17q-129 0 -193 49q-5 4 -13 4q-11 0 -26 -12q-7 -6 -7.5 -16t7.5 -20q34 -32 87.5 -46t102.5 -12.5t99 4.5q41 4 84.5 20.5t65 30t28.5 20.5q12 12 7 29zM1128 65q-19 47 -39 61q-23 15 -76 15q-47 0 -71 -10 q-29 -12 -78 -56q-26 -24 -12 -44q9 -8 17.5 -4.5t31.5 23.5q3 2 10.5 8.5t10.5 8.5t10 7t11.5 7t12.5 5t15 4.5t16.5 2.5t20.5 1q27 0 44.5 -7.5t23 -14.5t13.5 -22q10 -17 12.5 -20t12.5 1q23 12 14 34zM1483 346q0 22 -5 44.5t-16.5 45t-34 36.5t-52.5 14 q-33 0 -97 -41.5t-129 -83.5t-101 -42q-27 -1 -63.5 19t-76 49t-83.5 58t-100 49t-111 19q-115 -1 -197 -78.5t-84 -178.5q-2 -112 74 -164q29 -20 62.5 -28.5t103.5 -8.5q57 0 132 32.5t134 71t120 70.5t93 31q26 -1 65 -31.5t71.5 -67t68 -67.5t55.5 -32q35 -3 58.5 14 t55.5 63q28 41 42.5 101t14.5 106zM1536 506q0 -164 -62 -304.5t-166 -236t-242.5 -149.5t-290.5 -54t-293 57.5t-247.5 157t-170.5 241.5t-64 302q0 89 19.5 172.5t49 145.5t70.5 118.5t78.5 94t78.5 69.5t64.5 46.5t42.5 24.5q14 8 51 26.5t54.5 28.5t48 30t60.5 44 q36 28 58 72.5t30 125.5q129 -155 186 -193q44 -29 130 -68t129 -66q21 -13 39 -25t60.5 -46.5t76 -70.5t75 -95t69 -122t47 -148.5t19.5 -177.5z" />
-<glyph unicode="&#xf1aa;" d="M1070 463l-160 -160l-151 -152l-30 -30q-65 -64 -151.5 -87t-171.5 -2q-16 -70 -72 -115t-129 -45q-85 0 -145 60.5t-60 145.5q0 72 44.5 128t113.5 72q-22 86 1 173t88 152l12 12l151 -152l-11 -11q-37 -37 -37 -89t37 -90q37 -37 89 -37t89 37l30 30l151 152l161 160z M729 1145l12 -12l-152 -152l-12 12q-37 37 -89 37t-89 -37t-37 -89.5t37 -89.5l29 -29l152 -152l160 -160l-151 -152l-161 160l-151 152l-30 30q-68 67 -90 159.5t5 179.5q-70 15 -115 71t-45 129q0 85 60 145.5t145 60.5q76 0 133.5 -49t69.5 -123q84 20 169.5 -3.5 t149.5 -87.5zM1536 78q0 -85 -60 -145.5t-145 -60.5q-74 0 -131 47t-71 118q-86 -28 -179.5 -6t-161.5 90l-11 12l151 152l12 -12q37 -37 89 -37t89 37t37 89t-37 89l-30 30l-152 152l-160 160l152 152l160 -160l152 -152l29 -30q64 -64 87.5 -150.5t2.5 -171.5 q76 -11 126.5 -68.5t50.5 -134.5zM1534 1202q0 -77 -51 -135t-127 -69q26 -85 3 -176.5t-90 -158.5l-12 -12l-151 152l12 12q37 37 37 89t-37 89t-89 37t-89 -37l-30 -30l-152 -152l-160 -160l-152 152l161 160l152 152l29 30q67 67 159 89.5t178 -3.5q11 75 68.5 126 t135.5 51q85 0 145 -60.5t60 -145.5z" />
-<glyph unicode="&#xf1ab;" d="M654 458q-1 -3 -12.5 0.5t-31.5 11.5l-20 9q-44 20 -87 49q-7 5 -41 31.5t-38 28.5q-67 -103 -134 -181q-81 -95 -105 -110q-4 -2 -19.5 -4t-18.5 0q6 4 82 92q21 24 85.5 115t78.5 118q17 30 51 98.5t36 77.5q-8 1 -110 -33q-8 -2 -27.5 -7.5t-34.5 -9.5t-17 -5 q-2 -2 -2 -10.5t-1 -9.5q-5 -10 -31 -15q-23 -7 -47 0q-18 4 -28 21q-4 6 -5 23q6 2 24.5 5t29.5 6q58 16 105 32q100 35 102 35q10 2 43 19.5t44 21.5q9 3 21.5 8t14.5 5.5t6 -0.5q2 -12 -1 -33q0 -2 -12.5 -27t-26.5 -53.5t-17 -33.5q-25 -50 -77 -131l64 -28 q12 -6 74.5 -32t67.5 -28q4 -1 10.5 -25.5t4.5 -30.5zM449 944q3 -15 -4 -28q-12 -23 -50 -38q-30 -12 -60 -12q-26 3 -49 26q-14 15 -18 41l1 3q3 -3 19.5 -5t26.5 0t58 16q36 12 55 14q17 0 21 -17zM1147 815l63 -227l-139 42zM39 15l694 232v1032l-694 -233v-1031z M1280 332l102 -31l-181 657l-100 31l-216 -536l102 -31l45 110l211 -65zM777 1294l573 -184v380zM1088 -29l158 -13l-54 -160l-40 66q-130 -83 -276 -108q-58 -12 -91 -12h-84q-79 0 -199.5 39t-183.5 85q-8 7 -8 16q0 8 5 13.5t13 5.5q4 0 18 -7.5t30.5 -16.5t20.5 -11 q73 -37 159.5 -61.5t157.5 -24.5q95 0 167 14.5t157 50.5q15 7 30.5 15.5t34 19t28.5 16.5zM1536 1050v-1079l-774 246q-14 -6 -375 -127.5t-368 -121.5q-13 0 -18 13q0 1 -1 3v1078q3 9 4 10q5 6 20 11q106 35 149 50v384l558 -198q2 0 160.5 55t316 108.5t161.5 53.5 q20 0 20 -21v-418z" />
-<glyph unicode="&#xf1ac;" horiz-adv-x="1792" d="M288 1152q66 0 113 -47t47 -113v-1088q0 -66 -47 -113t-113 -47h-128q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h128zM1664 989q58 -34 93 -93t35 -128v-768q0 -106 -75 -181t-181 -75h-864q-66 0 -113 47t-47 113v1536q0 40 28 68t68 28h672q40 0 88 -20t76 -48 l152 -152q28 -28 48 -76t20 -88v-163zM928 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM928 256v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM928 512v128q0 14 -9 23 t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1184 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1184 256v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128 q14 0 23 9t9 23zM1184 512v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 256v128q0 14 -9 23t-23 9h-128 q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 512v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1536 896v256h-160q-40 0 -68 28t-28 68v160h-640v-512h896z" />
-<glyph unicode="&#xf1ad;" d="M1344 1536q26 0 45 -19t19 -45v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280zM512 1248v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 992v-64q0 -14 9 -23t23 -9h64q14 0 23 9 t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 736v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 480v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM384 160v64 q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64 q14 0 23 9t9 23zM384 928v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 -96v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9 t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM896 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 928v64 q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 160v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64 q14 0 23 9t9 23zM1152 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 928v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9 t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23z" />
-<glyph unicode="&#xf1ae;" horiz-adv-x="1280" d="M1188 988l-292 -292v-824q0 -46 -33 -79t-79 -33t-79 33t-33 79v384h-64v-384q0 -46 -33 -79t-79 -33t-79 33t-33 79v824l-292 292q-28 28 -28 68t28 68t68 28t68 -28l228 -228h368l228 228q28 28 68 28t68 -28t28 -68t-28 -68zM864 1152q0 -93 -65.5 -158.5 t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
-<glyph unicode="&#xf1b0;" horiz-adv-x="1664" d="M780 1064q0 -60 -19 -113.5t-63 -92.5t-105 -39q-76 0 -138 57.5t-92 135.5t-30 151q0 60 19 113.5t63 92.5t105 39q77 0 138.5 -57.5t91.5 -135t30 -151.5zM438 581q0 -80 -42 -139t-119 -59q-76 0 -141.5 55.5t-100.5 133.5t-35 152q0 80 42 139.5t119 59.5 q76 0 141.5 -55.5t100.5 -134t35 -152.5zM832 608q118 0 255 -97.5t229 -237t92 -254.5q0 -46 -17 -76.5t-48.5 -45t-64.5 -20t-76 -5.5q-68 0 -187.5 45t-182.5 45q-66 0 -192.5 -44.5t-200.5 -44.5q-183 0 -183 146q0 86 56 191.5t139.5 192.5t187.5 146t193 59zM1071 819 q-61 0 -105 39t-63 92.5t-19 113.5q0 74 30 151.5t91.5 135t138.5 57.5q61 0 105 -39t63 -92.5t19 -113.5q0 -73 -30 -151t-92 -135.5t-138 -57.5zM1503 923q77 0 119 -59.5t42 -139.5q0 -74 -35 -152t-100.5 -133.5t-141.5 -55.5q-77 0 -119 59t-42 139q0 74 35 152.5 t100.5 134t141.5 55.5z" />
-<glyph unicode="&#xf1b1;" horiz-adv-x="768" d="M704 1008q0 -145 -57 -243.5t-152 -135.5l45 -821q2 -26 -16 -45t-44 -19h-192q-26 0 -44 19t-16 45l45 821q-95 37 -152 135.5t-57 243.5q0 128 42.5 249.5t117.5 200t160 78.5t160 -78.5t117.5 -200t42.5 -249.5z" />
-<glyph unicode="&#xf1b2;" horiz-adv-x="1792" d="M896 -93l640 349v636l-640 -233v-752zM832 772l698 254l-698 254l-698 -254zM1664 1024v-768q0 -35 -18 -65t-49 -47l-704 -384q-28 -16 -61 -16t-61 16l-704 384q-31 17 -49 47t-18 65v768q0 40 23 73t61 47l704 256q22 8 44 8t44 -8l704 -256q38 -14 61 -47t23 -73z " />
-<glyph unicode="&#xf1b3;" horiz-adv-x="2304" d="M640 -96l384 192v314l-384 -164v-342zM576 358l404 173l-404 173l-404 -173zM1664 -96l384 192v314l-384 -164v-342zM1600 358l404 173l-404 173l-404 -173zM1152 651l384 165v266l-384 -164v-267zM1088 1030l441 189l-441 189l-441 -189zM2176 512v-416q0 -36 -19 -67 t-52 -47l-448 -224q-25 -14 -57 -14t-57 14l-448 224q-5 2 -7 4q-2 -2 -7 -4l-448 -224q-25 -14 -57 -14t-57 14l-448 224q-33 16 -52 47t-19 67v416q0 38 21.5 70t56.5 48l434 186v400q0 38 21.5 70t56.5 48l448 192q23 10 50 10t50 -10l448 -192q35 -16 56.5 -48t21.5 -70 v-400l434 -186q36 -16 57 -48t21 -70z" />
-<glyph unicode="&#xf1b4;" horiz-adv-x="2048" d="M1848 1197h-511v-124h511v124zM1596 771q-90 0 -146 -52.5t-62 -142.5h408q-18 195 -200 195zM1612 186q63 0 122 32t76 87h221q-100 -307 -427 -307q-214 0 -340.5 132t-126.5 347q0 208 130.5 345.5t336.5 137.5q138 0 240.5 -68t153 -179t50.5 -248q0 -17 -2 -47h-658 q0 -111 57.5 -171.5t166.5 -60.5zM277 236h296q205 0 205 167q0 180 -199 180h-302v-347zM277 773h281q78 0 123.5 36.5t45.5 113.5q0 144 -190 144h-260v-294zM0 1282h594q87 0 155 -14t126.5 -47.5t90 -96.5t31.5 -154q0 -181 -172 -263q114 -32 172 -115t58 -204 q0 -75 -24.5 -136.5t-66 -103.5t-98.5 -71t-121 -42t-134 -13h-611v1260z" />
-<glyph unicode="&#xf1b5;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM499 1041h-371v-787h382q117 0 197 57.5t80 170.5q0 158 -143 200q107 52 107 164q0 57 -19.5 96.5 t-56.5 60.5t-79 29.5t-97 8.5zM477 723h-176v184h163q119 0 119 -90q0 -94 -106 -94zM486 388h-185v217h189q124 0 124 -113q0 -104 -128 -104zM1136 356q-68 0 -104 38t-36 107h411q1 10 1 30q0 132 -74.5 220.5t-203.5 88.5q-128 0 -210 -86t-82 -216q0 -135 79 -217 t213 -82q205 0 267 191h-138q-11 -34 -47.5 -54t-75.5 -20zM1126 722q113 0 124 -122h-254q4 56 39 89t91 33zM964 988h319v-77h-319v77z" />
-<glyph unicode="&#xf1b6;" horiz-adv-x="1792" d="M1582 954q0 -101 -71.5 -172.5t-172.5 -71.5t-172.5 71.5t-71.5 172.5t71.5 172.5t172.5 71.5t172.5 -71.5t71.5 -172.5zM812 212q0 104 -73 177t-177 73q-27 0 -54 -6l104 -42q77 -31 109.5 -106.5t1.5 -151.5q-31 -77 -107 -109t-152 -1q-21 8 -62 24.5t-61 24.5 q32 -60 91 -96.5t130 -36.5q104 0 177 73t73 177zM1642 953q0 126 -89.5 215.5t-215.5 89.5q-127 0 -216.5 -89.5t-89.5 -215.5q0 -127 89.5 -216t216.5 -89q126 0 215.5 89t89.5 216zM1792 953q0 -189 -133.5 -322t-321.5 -133l-437 -319q-12 -129 -109 -218t-229 -89 q-121 0 -214 76t-118 192l-230 92v429l389 -157q79 48 173 48q13 0 35 -2l284 407q2 187 135.5 319t320.5 132q188 0 321.5 -133.5t133.5 -321.5z" />
-<glyph unicode="&#xf1b7;" d="M1242 889q0 80 -57 136.5t-137 56.5t-136.5 -57t-56.5 -136q0 -80 56.5 -136.5t136.5 -56.5t137 56.5t57 136.5zM632 301q0 -83 -58 -140.5t-140 -57.5q-56 0 -103 29t-72 77q52 -20 98 -40q60 -24 120 1.5t85 86.5q24 60 -1.5 120t-86.5 84l-82 33q22 5 42 5 q82 0 140 -57.5t58 -140.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v153l172 -69q20 -92 93.5 -152t168.5 -60q104 0 181 70t87 173l345 252q150 0 255.5 105.5t105.5 254.5q0 150 -105.5 255.5t-255.5 105.5 q-148 0 -253 -104.5t-107 -252.5l-225 -322q-9 1 -28 1q-75 0 -137 -37l-297 119v468q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5zM1289 887q0 -100 -71 -170.5t-171 -70.5t-170.5 70.5t-70.5 170.5t70.5 171t170.5 71q101 0 171.5 -70.5t70.5 -171.5z " />
-<glyph unicode="&#xf1b8;" horiz-adv-x="1792" d="M836 367l-15 -368l-2 -22l-420 29q-36 3 -67 31.5t-47 65.5q-11 27 -14.5 55t4 65t12 55t21.5 64t19 53q78 -12 509 -28zM449 953l180 -379l-147 92q-63 -72 -111.5 -144.5t-72.5 -125t-39.5 -94.5t-18.5 -63l-4 -21l-190 357q-17 26 -18 56t6 47l8 18q35 63 114 188 l-140 86zM1680 436l-188 -359q-12 -29 -36.5 -46.5t-43.5 -20.5l-18 -4q-71 -7 -219 -12l8 -164l-230 367l211 362l7 -173q170 -16 283 -5t170 33zM895 1360q-47 -63 -265 -435l-317 187l-19 12l225 356q20 31 60 45t80 10q24 -2 48.5 -12t42 -21t41.5 -33t36 -34.5 t36 -39.5t32 -35zM1550 1053l212 -363q18 -37 12.5 -76t-27.5 -74q-13 -20 -33 -37t-38 -28t-48.5 -22t-47 -16t-51.5 -14t-46 -12q-34 72 -265 436l313 195zM1407 1279l142 83l-220 -373l-419 20l151 86q-34 89 -75 166t-75.5 123.5t-64.5 80t-47 46.5l-17 13l405 -1 q31 3 58 -10.5t39 -28.5l11 -15q39 -61 112 -190z" />
-<glyph unicode="&#xf1b9;" horiz-adv-x="2048" d="M480 448q0 66 -47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47t113 47t47 113zM516 768h1016l-89 357q-2 8 -14 17.5t-21 9.5h-768q-9 0 -21 -9.5t-14 -17.5zM1888 448q0 66 -47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47t113 47t47 113zM2048 544v-384 q0 -14 -9 -23t-23 -9h-96v-128q0 -80 -56 -136t-136 -56t-136 56t-56 136v128h-1024v-128q0 -80 -56 -136t-136 -56t-136 56t-56 136v128h-96q-14 0 -23 9t-9 23v384q0 93 65.5 158.5t158.5 65.5h28l105 419q23 94 104 157.5t179 63.5h768q98 0 179 -63.5t104 -157.5 l105 -419h28q93 0 158.5 -65.5t65.5 -158.5z" />
-<glyph unicode="&#xf1ba;" horiz-adv-x="2048" d="M1824 640q93 0 158.5 -65.5t65.5 -158.5v-384q0 -14 -9 -23t-23 -9h-96v-64q0 -80 -56 -136t-136 -56t-136 56t-56 136v64h-1024v-64q0 -80 -56 -136t-136 -56t-136 56t-56 136v64h-96q-14 0 -23 9t-9 23v384q0 93 65.5 158.5t158.5 65.5h28l105 419q23 94 104 157.5 t179 63.5h128v224q0 14 9 23t23 9h448q14 0 23 -9t9 -23v-224h128q98 0 179 -63.5t104 -157.5l105 -419h28zM320 160q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47zM516 640h1016l-89 357q-2 8 -14 17.5t-21 9.5h-768q-9 0 -21 -9.5t-14 -17.5z M1728 160q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47z" />
-<glyph unicode="&#xf1bb;" d="M1504 64q0 -26 -19 -45t-45 -19h-462q1 -17 6 -87.5t5 -108.5q0 -25 -18 -42.5t-43 -17.5h-320q-25 0 -43 17.5t-18 42.5q0 38 5 108.5t6 87.5h-462q-26 0 -45 19t-19 45t19 45l402 403h-229q-26 0 -45 19t-19 45t19 45l402 403h-197q-26 0 -45 19t-19 45t19 45l384 384 q19 19 45 19t45 -19l384 -384q19 -19 19 -45t-19 -45t-45 -19h-197l402 -403q19 -19 19 -45t-19 -45t-45 -19h-229l402 -403q19 -19 19 -45z" />
-<glyph unicode="&#xf1bc;" d="M1127 326q0 32 -30 51q-193 115 -447 115q-133 0 -287 -34q-42 -9 -42 -52q0 -20 13.5 -34.5t35.5 -14.5q5 0 37 8q132 27 243 27q226 0 397 -103q19 -11 33 -11q19 0 33 13.5t14 34.5zM1223 541q0 40 -35 61q-237 141 -548 141q-153 0 -303 -42q-48 -13 -48 -64 q0 -25 17.5 -42.5t42.5 -17.5q7 0 37 8q122 33 251 33q279 0 488 -124q24 -13 38 -13q25 0 42.5 17.5t17.5 42.5zM1331 789q0 47 -40 70q-126 73 -293 110.5t-343 37.5q-204 0 -364 -47q-23 -7 -38.5 -25.5t-15.5 -48.5q0 -31 20.5 -52t51.5 -21q11 0 40 8q133 37 307 37 q159 0 309.5 -34t253.5 -95q21 -12 40 -12q29 0 50.5 20.5t21.5 51.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf1bd;" d="M1397 1408q58 0 98.5 -40.5t40.5 -98.5v-1258q0 -58 -40.5 -98.5t-98.5 -40.5h-1258q-58 0 -98.5 40.5t-40.5 98.5v1258q0 58 40.5 98.5t98.5 40.5h1258zM1465 11v1258q0 28 -20 48t-48 20h-1258q-28 0 -48 -20t-20 -48v-1258q0 -28 20 -48t48 -20h1258q28 0 48 20t20 48 zM694 749l188 -387l533 145v-496q0 -7 -5.5 -12.5t-12.5 -5.5h-1258q-7 0 -12.5 5.5t-5.5 12.5v141l711 195l-212 439q4 1 12 2.5t12 1.5q170 32 303.5 21.5t221 -46t143.5 -94.5q27 -28 -25 -42q-64 -16 -256 -62l-97 198q-111 7 -240 -16zM1397 1287q7 0 12.5 -5.5 t5.5 -12.5v-428q-85 30 -188 52q-294 64 -645 12l-18 -3l-65 134h-233l85 -190q-132 -51 -230 -137v560q0 7 5.5 12.5t12.5 5.5h1258zM286 387q-14 -3 -26 4.5t-14 21.5q-24 203 166 305l129 -270z" />
-<glyph unicode="&#xf1be;" horiz-adv-x="2304" d="M784 164l16 241l-16 523q-1 10 -7.5 17t-16.5 7q-9 0 -16 -7t-7 -17l-14 -523l14 -241q1 -10 7.5 -16.5t15.5 -6.5q22 0 24 23zM1080 193l11 211l-12 586q0 16 -13 24q-8 5 -16 5t-16 -5q-13 -8 -13 -24l-1 -6l-10 -579q0 -1 11 -236v-1q0 -10 6 -17q9 -11 23 -11 q11 0 20 9q9 7 9 20zM35 533l20 -128l-20 -126q-2 -9 -9 -9t-9 9l-17 126l17 128q2 9 9 9t9 -9zM121 612l26 -207l-26 -203q-2 -9 -10 -9q-9 0 -9 10l-23 202l23 207q0 9 9 9q8 0 10 -9zM401 159zM213 650l25 -245l-25 -237q0 -11 -11 -11q-10 0 -12 11l-21 237l21 245 q2 12 12 12q11 0 11 -12zM307 657l23 -252l-23 -244q-2 -13 -14 -13q-13 0 -13 13l-21 244l21 252q0 13 13 13q12 0 14 -13zM401 639l21 -234l-21 -246q-2 -16 -16 -16q-6 0 -10.5 4.5t-4.5 11.5l-20 246l20 234q0 6 4.5 10.5t10.5 4.5q14 0 16 -15zM784 164zM495 785 l21 -380l-21 -246q0 -7 -5 -12.5t-12 -5.5q-16 0 -18 18l-18 246l18 380q2 18 18 18q7 0 12 -5.5t5 -12.5zM589 871l19 -468l-19 -244q0 -8 -5.5 -13.5t-13.5 -5.5q-18 0 -20 19l-16 244l16 468q2 19 20 19q8 0 13.5 -5.5t5.5 -13.5zM687 911l18 -506l-18 -242 q-2 -21 -22 -21q-19 0 -21 21l-16 242l16 506q0 9 6.5 15.5t14.5 6.5q9 0 15 -6.5t7 -15.5zM1079 169v0v0zM881 915l15 -510l-15 -239q0 -10 -7.5 -17.5t-17.5 -7.5t-17 7t-8 18l-14 239l14 510q0 11 7.5 18t17.5 7t17.5 -7t7.5 -18zM980 896l14 -492l-14 -236q0 -11 -8 -19 t-19 -8t-19 8t-9 19l-12 236l12 492q1 12 9 20t19 8t18.5 -8t8.5 -20zM1192 404l-14 -231v0q0 -13 -9 -22t-22 -9t-22 9t-10 22l-6 114l-6 117l12 636v3q2 15 12 24q9 7 20 7q8 0 15 -5q14 -8 16 -26zM2304 423q0 -117 -83 -199.5t-200 -82.5h-786q-13 2 -22 11t-9 22v899 q0 23 28 33q85 34 181 34q195 0 338 -131.5t160 -323.5q53 22 110 22q117 0 200 -83t83 -201z" />
-<glyph unicode="&#xf1c0;" d="M768 768q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127t443 -43zM768 0q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127 t443 -43zM768 384q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127t443 -43zM768 1536q208 0 385 -34.5t280 -93.5t103 -128v-128q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5 t-103 128v128q0 69 103 128t280 93.5t385 34.5z" />
-<glyph unicode="&#xf1c1;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M894 465q33 -26 84 -56q59 7 117 7q147 0 177 -49q16 -22 2 -52q0 -1 -1 -2l-2 -2v-1q-6 -38 -71 -38q-48 0 -115 20t-130 53q-221 -24 -392 -83q-153 -262 -242 -262q-15 0 -28 7l-24 12q-1 1 -6 5q-10 10 -6 36q9 40 56 91.5t132 96.5q14 9 23 -6q2 -2 2 -4q52 85 107 197 q68 136 104 262q-24 82 -30.5 159.5t6.5 127.5q11 40 42 40h21h1q23 0 35 -15q18 -21 9 -68q-2 -6 -4 -8q1 -3 1 -8v-30q-2 -123 -14 -192q55 -164 146 -238zM318 54q52 24 137 158q-51 -40 -87.5 -84t-49.5 -74zM716 974q-15 -42 -2 -132q1 7 7 44q0 3 7 43q1 4 4 8 q-1 1 -1 2t-0.5 1.5t-0.5 1.5q-1 22 -13 36q0 -1 -1 -2v-2zM592 313q135 54 284 81q-2 1 -13 9.5t-16 13.5q-76 67 -127 176q-27 -86 -83 -197q-30 -56 -45 -83zM1238 329q-24 24 -140 24q76 -28 124 -28q14 0 18 1q0 1 -2 3z" />
-<glyph unicode="&#xf1c2;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M233 768v-107h70l164 -661h159l128 485q7 20 10 46q2 16 2 24h4l3 -24q1 -3 3.5 -20t5.5 -26l128 -485h159l164 661h70v107h-300v-107h90l-99 -438q-5 -20 -7 -46l-2 -21h-4l-3 21q-1 5 -4 21t-5 25l-144 545h-114l-144 -545q-2 -9 -4.5 -24.5t-3.5 -21.5l-4 -21h-4l-2 21 q-2 26 -7 46l-99 438h90v107h-300z" />
-<glyph unicode="&#xf1c3;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M429 106v-106h281v106h-75l103 161q5 7 10 16.5t7.5 13.5t3.5 4h2q1 -4 5 -10q2 -4 4.5 -7.5t6 -8t6.5 -8.5l107 -161h-76v-106h291v106h-68l-192 273l195 282h67v107h-279v-107h74l-103 -159q-4 -7 -10 -16.5t-9 -13.5l-2 -3h-2q-1 4 -5 10q-6 11 -17 23l-106 159h76v107 h-290v-107h68l189 -272l-194 -283h-68z" />
-<glyph unicode="&#xf1c4;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M416 106v-106h327v106h-93v167h137q76 0 118 15q67 23 106.5 87t39.5 146q0 81 -37 141t-100 87q-48 19 -130 19h-368v-107h92v-555h-92zM769 386h-119v268h120q52 0 83 -18q56 -33 56 -115q0 -89 -62 -120q-31 -15 -78 -15z" />
-<glyph unicode="&#xf1c5;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M1280 320v-320h-1024v192l192 192l128 -128l384 384zM448 512q-80 0 -136 56t-56 136t56 136t136 56t136 -56t56 -136t-56 -136t-136 -56z" />
-<glyph unicode="&#xf1c6;" d="M640 1152v128h-128v-128h128zM768 1024v128h-128v-128h128zM640 896v128h-128v-128h128zM768 768v128h-128v-128h128zM1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400 v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-128v-128h-128v128h-512v-1536h1280zM781 593l107 -349q8 -27 8 -52q0 -83 -72.5 -137.5t-183.5 -54.5t-183.5 54.5t-72.5 137.5q0 25 8 52q21 63 120 396v128h128v-128h79 q22 0 39 -13t23 -34zM640 128q53 0 90.5 19t37.5 45t-37.5 45t-90.5 19t-90.5 -19t-37.5 -45t37.5 -45t90.5 -19z" />
-<glyph unicode="&#xf1c7;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M620 686q20 -8 20 -30v-544q0 -22 -20 -30q-8 -2 -12 -2q-12 0 -23 9l-166 167h-131q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h131l166 167q16 15 35 7zM1037 -3q31 0 50 24q129 159 129 363t-129 363q-16 21 -43 24t-47 -14q-21 -17 -23.5 -43.5t14.5 -47.5 q100 -123 100 -282t-100 -282q-17 -21 -14.5 -47.5t23.5 -42.5q18 -15 40 -15zM826 145q27 0 47 20q87 93 87 219t-87 219q-18 19 -45 20t-46 -17t-20 -44.5t18 -46.5q52 -57 52 -131t-52 -131q-19 -20 -18 -46.5t20 -44.5q20 -17 44 -17z" />
-<glyph unicode="&#xf1c8;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M768 768q52 0 90 -38t38 -90v-384q0 -52 -38 -90t-90 -38h-384q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h384zM1260 766q20 -8 20 -30v-576q0 -22 -20 -30q-8 -2 -12 -2q-14 0 -23 9l-265 266v90l265 266q9 9 23 9q4 0 12 -2z" />
-<glyph unicode="&#xf1c9;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M480 768q8 11 21 12.5t24 -6.5l51 -38q11 -8 12.5 -21t-6.5 -24l-182 -243l182 -243q8 -11 6.5 -24t-12.5 -21l-51 -38q-11 -8 -24 -6.5t-21 12.5l-226 301q-14 19 0 38zM1282 467q14 -19 0 -38l-226 -301q-8 -11 -21 -12.5t-24 6.5l-51 38q-11 8 -12.5 21t6.5 24l182 243 l-182 243q-8 11 -6.5 24t12.5 21l51 38q11 8 24 6.5t21 -12.5zM662 6q-13 2 -20.5 13t-5.5 24l138 831q2 13 13 20.5t24 5.5l63 -10q13 -2 20.5 -13t5.5 -24l-138 -831q-2 -13 -13 -20.5t-24 -5.5z" />
-<glyph unicode="&#xf1ca;" d="M1497 709v-198q-101 -23 -198 -23q-65 -136 -165.5 -271t-181.5 -215.5t-128 -106.5q-80 -45 -162 3q-28 17 -60.5 43.5t-85 83.5t-102.5 128.5t-107.5 184t-105.5 244t-91.5 314.5t-70.5 390h283q26 -218 70 -398.5t104.5 -317t121.5 -235.5t140 -195q169 169 287 406 q-142 72 -223 220t-81 333q0 192 104 314.5t284 122.5q178 0 273 -105.5t95 -297.5q0 -159 -58 -286q-7 -1 -19.5 -3t-46 -2t-63 6t-62 25.5t-50.5 51.5q31 103 31 184q0 87 -29 132t-79 45q-53 0 -85 -49.5t-32 -140.5q0 -186 105 -293.5t267 -107.5q62 0 121 14z" />
-<glyph unicode="&#xf1cb;" horiz-adv-x="1792" d="M216 367l603 -402v359l-334 223zM154 511l193 129l-193 129v-258zM973 -35l603 402l-269 180l-334 -223v-359zM896 458l272 182l-272 182l-272 -182zM485 733l334 223v359l-603 -402zM1445 640l193 -129v258zM1307 733l269 180l-603 402v-359zM1792 913v-546 q0 -41 -34 -64l-819 -546q-21 -13 -43 -13t-43 13l-819 546q-34 23 -34 64v546q0 41 34 64l819 546q21 13 43 13t43 -13l819 -546q34 -23 34 -64z" />
-<glyph unicode="&#xf1cc;" horiz-adv-x="2048" d="M1800 764q111 -46 179.5 -145.5t68.5 -221.5q0 -164 -118 -280.5t-285 -116.5q-4 0 -11.5 0.5t-10.5 0.5h-1209h-1h-2h-5q-170 10 -288 125.5t-118 280.5q0 110 55 203t147 147q-12 39 -12 82q0 115 82 196t199 81q95 0 172 -58q75 154 222.5 248t326.5 94 q166 0 306 -80.5t221.5 -218.5t81.5 -301q0 -6 -0.5 -18t-0.5 -18zM468 498q0 -122 84 -193t208 -71q137 0 240 99q-16 20 -47.5 56.5t-43.5 50.5q-67 -65 -144 -65q-55 0 -93.5 33.5t-38.5 87.5q0 53 38.5 87t91.5 34q44 0 84.5 -21t73 -55t65 -75t69 -82t77 -75t97 -55 t121.5 -21q121 0 204.5 71.5t83.5 190.5q0 121 -84 192t-207 71q-143 0 -241 -97q14 -16 29.5 -34t34.5 -40t29 -34q66 64 142 64q52 0 92 -33t40 -84q0 -57 -37 -91.5t-94 -34.5q-43 0 -82.5 21t-72 55t-65.5 75t-69.5 82t-77.5 75t-96.5 55t-118.5 21q-122 0 -207 -70.5 t-85 -189.5z" />
-<glyph unicode="&#xf1cd;" horiz-adv-x="1792" d="M896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM896 1408q-190 0 -361 -90l194 -194q82 28 167 28t167 -28l194 194q-171 90 -361 90zM218 279l194 194 q-28 82 -28 167t28 167l-194 194q-90 -171 -90 -361t90 -361zM896 -128q190 0 361 90l-194 194q-82 -28 -167 -28t-167 28l-194 -194q171 -90 361 -90zM896 256q159 0 271.5 112.5t112.5 271.5t-112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5 t271.5 -112.5zM1380 473l194 -194q90 171 90 361t-90 361l-194 -194q28 -82 28 -167t-28 -167z" />
-<glyph unicode="&#xf1ce;" horiz-adv-x="1792" d="M1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348q0 222 101 414.5t276.5 317t390.5 155.5v-260q-221 -45 -366.5 -221t-145.5 -406q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5 q0 230 -145.5 406t-366.5 221v260q215 -31 390.5 -155.5t276.5 -317t101 -414.5z" />
-<glyph unicode="&#xf1d0;" horiz-adv-x="1792" d="M19 662q8 217 116 406t305 318h5q0 -1 -1 -3q-8 -8 -28 -33.5t-52 -76.5t-60 -110.5t-44.5 -135.5t-14 -150.5t39 -157.5t108.5 -154q50 -50 102 -69.5t90.5 -11.5t69.5 23.5t47 32.5l16 16q39 51 53 116.5t6.5 122.5t-21 107t-26.5 80l-14 29q-10 25 -30.5 49.5t-43 41 t-43.5 29.5t-35 19l-13 6l104 115q39 -17 78 -52t59 -61l19 -27q1 48 -18.5 103.5t-40.5 87.5l-20 31l161 183l160 -181q-33 -46 -52.5 -102.5t-22.5 -90.5l-4 -33q22 37 61.5 72.5t67.5 52.5l28 17l103 -115q-44 -14 -85 -50t-60 -65l-19 -29q-31 -56 -48 -133.5t-7 -170 t57 -156.5q33 -45 77.5 -60.5t85 -5.5t76 26.5t57.5 33.5l21 16q60 53 96.5 115t48.5 121.5t10 121.5t-18 118t-37 107.5t-45.5 93t-45 72t-34.5 47.5l-13 17q-14 13 -7 13l10 -3q40 -29 62.5 -46t62 -50t64 -58t58.5 -65t55.5 -77t45.5 -88t38 -103t23.5 -117t10.5 -136 q3 -259 -108 -465t-312 -321t-456 -115q-185 0 -351 74t-283.5 198t-184 293t-60.5 353z" />
-<glyph unicode="&#xf1d1;" horiz-adv-x="1792" d="M874 -102v-66q-208 6 -385 109.5t-283 275.5l58 34q29 -49 73 -99l65 57q148 -168 368 -212l-17 -86q65 -12 121 -13zM276 428l-83 -28q22 -60 49 -112l-57 -33q-98 180 -98 385t98 385l57 -33q-30 -56 -49 -112l82 -28q-35 -100 -35 -212q0 -109 36 -212zM1528 251 l58 -34q-106 -172 -283 -275.5t-385 -109.5v66q56 1 121 13l-17 86q220 44 368 212l65 -57q44 50 73 99zM1377 805l-233 -80q14 -42 14 -85t-14 -85l232 -80q-31 -92 -98 -169l-185 162q-57 -67 -147 -85l48 -241q-52 -10 -98 -10t-98 10l48 241q-90 18 -147 85l-185 -162 q-67 77 -98 169l232 80q-14 42 -14 85t14 85l-233 80q33 93 99 169l185 -162q59 68 147 86l-48 240q44 10 98 10t98 -10l-48 -240q88 -18 147 -86l185 162q66 -76 99 -169zM874 1448v-66q-65 -2 -121 -13l17 -86q-220 -42 -368 -211l-65 56q-38 -42 -73 -98l-57 33 q106 172 282 275.5t385 109.5zM1705 640q0 -205 -98 -385l-57 33q27 52 49 112l-83 28q36 103 36 212q0 112 -35 212l82 28q-19 56 -49 112l57 33q98 -180 98 -385zM1585 1063l-57 -33q-35 56 -73 98l-65 -56q-148 169 -368 211l17 86q-56 11 -121 13v66q209 -6 385 -109.5 t282 -275.5zM1748 640q0 173 -67.5 331t-181.5 272t-272 181.5t-331 67.5t-331 -67.5t-272 -181.5t-181.5 -272t-67.5 -331t67.5 -331t181.5 -272t272 -181.5t331 -67.5t331 67.5t272 181.5t181.5 272t67.5 331zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71 t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-<glyph unicode="&#xf1d2;" d="M582 228q0 -66 -93 -66q-107 0 -107 63q0 64 98 64q102 0 102 -61zM546 694q0 -85 -74 -85q-77 0 -77 84q0 90 77 90q36 0 55 -25.5t19 -63.5zM712 769v125q-78 -29 -135 -29q-50 29 -110 29q-86 0 -145 -57t-59 -143q0 -50 29.5 -102t73.5 -67v-3q-38 -17 -38 -85 q0 -53 41 -77v-3q-113 -37 -113 -139q0 -45 20 -78.5t54 -51t72 -25.5t81 -8q224 0 224 188q0 67 -48 99t-126 46q-27 5 -51.5 20.5t-24.5 39.5q0 44 49 52q77 15 122 70t45 134q0 24 -10 52q37 9 49 13zM771 350h137q-2 27 -2 82v387q0 46 2 69h-137q3 -23 3 -71v-392 q0 -50 -3 -75zM1280 366v121q-30 -21 -68 -21q-53 0 -53 82v225h52q9 0 26.5 -1t26.5 -1v117h-105q0 82 3 102h-140q4 -24 4 -55v-47h-60v-117q36 3 37 3q3 0 11 -0.5t12 -0.5v-2h-2v-217q0 -37 2.5 -64t11.5 -56.5t24.5 -48.5t43.5 -31t66 -12q64 0 108 24zM924 1072 q0 36 -24 63.5t-60 27.5t-60.5 -27t-24.5 -64q0 -36 25 -62.5t60 -26.5t59.5 27t24.5 62zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf1d3;" horiz-adv-x="1792" d="M595 22q0 100 -165 100q-158 0 -158 -104q0 -101 172 -101q151 0 151 105zM536 777q0 61 -30 102t-89 41q-124 0 -124 -145q0 -135 124 -135q119 0 119 137zM805 1101v-202q-36 -12 -79 -22q16 -43 16 -84q0 -127 -73 -216.5t-197 -112.5q-40 -8 -59.5 -27t-19.5 -58 q0 -31 22.5 -51.5t58 -32t78.5 -22t86 -25.5t78.5 -37.5t58 -64t22.5 -98.5q0 -304 -363 -304q-69 0 -130 12.5t-116 41t-87.5 82t-32.5 127.5q0 165 182 225v4q-67 41 -67 126q0 109 63 137v4q-72 24 -119.5 108.5t-47.5 165.5q0 139 95 231.5t235 92.5q96 0 178 -47 q98 0 218 47zM1123 220h-222q4 45 4 134v609q0 94 -4 128h222q-4 -33 -4 -124v-613q0 -89 4 -134zM1724 442v-196q-71 -39 -174 -39q-62 0 -107 20t-70 50t-39.5 78t-18.5 92t-4 103v351h2v4q-7 0 -19 1t-18 1q-21 0 -59 -6v190h96v76q0 54 -6 89h227q-6 -41 -6 -165h171 v-190q-15 0 -43.5 2t-42.5 2h-85v-365q0 -131 87 -131q61 0 109 33zM1148 1389q0 -58 -39 -101.5t-96 -43.5q-58 0 -98 43.5t-40 101.5q0 59 39.5 103t98.5 44q58 0 96.5 -44.5t38.5 -102.5z" />
-<glyph unicode="&#xf1d4;" d="M825 547l343 588h-150q-21 -39 -63.5 -118.5t-68 -128.5t-59.5 -118.5t-60 -128.5h-3q-21 48 -44.5 97t-52 105.5t-46.5 92t-54 104.5t-49 95h-150l323 -589v-435h134v436zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960 q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf1d5;" horiz-adv-x="1280" d="M842 964q0 -80 -57 -136.5t-136 -56.5q-60 0 -111 35q-62 -67 -115 -146q-247 -371 -202 -859q1 -22 -12.5 -38.5t-34.5 -18.5h-5q-20 0 -35 13.5t-17 33.5q-14 126 -3.5 247.5t29.5 217t54 186t69 155.5t74 125q61 90 132 165q-16 35 -16 77q0 80 56.5 136.5t136.5 56.5 t136.5 -56.5t56.5 -136.5zM1223 953q0 -158 -78 -292t-212.5 -212t-292.5 -78q-64 0 -131 14q-21 5 -32.5 23.5t-6.5 39.5q5 20 23 31.5t39 7.5q51 -13 108 -13q97 0 186 38t153 102t102 153t38 186t-38 186t-102 153t-153 102t-186 38t-186 -38t-153 -102t-102 -153 t-38 -186q0 -114 52 -218q10 -20 3.5 -40t-25.5 -30t-39.5 -3t-30.5 26q-64 123 -64 265q0 119 46.5 227t124.5 186t186 124t226 46q158 0 292.5 -78t212.5 -212.5t78 -292.5z" />
-<glyph unicode="&#xf1d6;" horiz-adv-x="1792" d="M270 730q-8 19 -8 52q0 20 11 49t24 45q-1 22 7.5 53t22.5 43q0 139 92.5 288.5t217.5 209.5q139 66 324 66q133 0 266 -55q49 -21 90 -48t71 -56t55 -68t42 -74t32.5 -84.5t25.5 -89.5t22 -98l1 -5q55 -83 55 -150q0 -14 -9 -40t-9 -38q0 -1 1.5 -3.5t3.5 -5t2 -3.5 q77 -114 120.5 -214.5t43.5 -208.5q0 -43 -19.5 -100t-55.5 -57q-9 0 -19.5 7.5t-19 17.5t-19 26t-16 26.5t-13.5 26t-9 17.5q-1 1 -3 1l-5 -4q-59 -154 -132 -223q20 -20 61.5 -38.5t69 -41.5t35.5 -65q-2 -4 -4 -16t-7 -18q-64 -97 -302 -97q-53 0 -110.5 9t-98 20 t-104.5 30q-15 5 -23 7q-14 4 -46 4.5t-40 1.5q-41 -45 -127.5 -65t-168.5 -20q-35 0 -69 1.5t-93 9t-101 20.5t-74.5 40t-32.5 64q0 40 10 59.5t41 48.5q11 2 40.5 13t49.5 12q4 0 14 2q2 2 2 4l-2 3q-48 11 -108 105.5t-73 156.5l-5 3q-4 0 -12 -20q-18 -41 -54.5 -74.5 t-77.5 -37.5h-1q-4 0 -6 4.5t-5 5.5q-23 54 -23 100q0 275 252 466z" />
-<glyph unicode="&#xf1d7;" horiz-adv-x="2048" d="M580 1075q0 41 -25 66t-66 25q-43 0 -76 -25.5t-33 -65.5q0 -39 33 -64.5t76 -25.5q41 0 66 24.5t25 65.5zM1323 568q0 28 -25.5 50t-65.5 22q-27 0 -49.5 -22.5t-22.5 -49.5q0 -28 22.5 -50.5t49.5 -22.5q40 0 65.5 22t25.5 51zM1087 1075q0 41 -24.5 66t-65.5 25 q-43 0 -76 -25.5t-33 -65.5q0 -39 33 -64.5t76 -25.5q41 0 65.5 24.5t24.5 65.5zM1722 568q0 28 -26 50t-65 22q-27 0 -49.5 -22.5t-22.5 -49.5q0 -28 22.5 -50.5t49.5 -22.5q39 0 65 22t26 51zM1456 965q-31 4 -70 4q-169 0 -311 -77t-223.5 -208.5t-81.5 -287.5 q0 -78 23 -152q-35 -3 -68 -3q-26 0 -50 1.5t-55 6.5t-44.5 7t-54.5 10.5t-50 10.5l-253 -127l72 218q-290 203 -290 490q0 169 97.5 311t264 223.5t363.5 81.5q176 0 332.5 -66t262 -182.5t136.5 -260.5zM2048 404q0 -117 -68.5 -223.5t-185.5 -193.5l55 -181l-199 109 q-150 -37 -218 -37q-169 0 -311 70.5t-223.5 191.5t-81.5 264t81.5 264t223.5 191.5t311 70.5q161 0 303 -70.5t227.5 -192t85.5 -263.5z" />
-<glyph unicode="&#xf1d8;" horiz-adv-x="1792" d="M1764 1525q33 -24 27 -64l-256 -1536q-5 -29 -32 -45q-14 -8 -31 -8q-11 0 -24 5l-453 185l-242 -295q-18 -23 -49 -23q-13 0 -22 4q-19 7 -30.5 23.5t-11.5 36.5v349l864 1059l-1069 -925l-395 162q-37 14 -40 55q-2 40 32 59l1664 960q15 9 32 9q20 0 36 -11z" />
-<glyph unicode="&#xf1d9;" horiz-adv-x="1792" d="M1764 1525q33 -24 27 -64l-256 -1536q-5 -29 -32 -45q-14 -8 -31 -8q-11 0 -24 5l-527 215l-298 -327q-18 -21 -47 -21q-14 0 -23 4q-19 7 -30 23.5t-11 36.5v452l-472 193q-37 14 -40 55q-3 39 32 59l1664 960q35 21 68 -2zM1422 26l221 1323l-1434 -827l336 -137 l863 639l-478 -797z" />
-<glyph unicode="&#xf1da;" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5 t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298zM896 928v-448q0 -14 -9 -23 t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf1db;" d="M768 1280q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf1dc;" horiz-adv-x="1792" d="M1682 -128q-44 0 -132.5 3.5t-133.5 3.5q-44 0 -132 -3.5t-132 -3.5q-24 0 -37 20.5t-13 45.5q0 31 17 46t39 17t51 7t45 15q33 21 33 140l-1 391q0 21 -1 31q-13 4 -50 4h-675q-38 0 -51 -4q-1 -10 -1 -31l-1 -371q0 -142 37 -164q16 -10 48 -13t57 -3.5t45 -15 t20 -45.5q0 -26 -12.5 -48t-36.5 -22q-47 0 -139.5 3.5t-138.5 3.5q-43 0 -128 -3.5t-127 -3.5q-23 0 -35.5 21t-12.5 45q0 30 15.5 45t36 17.5t47.5 7.5t42 15q33 23 33 143l-1 57v813q0 3 0.5 26t0 36.5t-1.5 38.5t-3.5 42t-6.5 36.5t-11 31.5t-16 18q-15 10 -45 12t-53 2 t-41 14t-18 45q0 26 12 48t36 22q46 0 138.5 -3.5t138.5 -3.5q42 0 126.5 3.5t126.5 3.5q25 0 37.5 -22t12.5 -48q0 -30 -17 -43.5t-38.5 -14.5t-49.5 -4t-43 -13q-35 -21 -35 -160l1 -320q0 -21 1 -32q13 -3 39 -3h699q25 0 38 3q1 11 1 32l1 320q0 139 -35 160 q-18 11 -58.5 12.5t-66 13t-25.5 49.5q0 26 12.5 48t37.5 22q44 0 132 -3.5t132 -3.5q43 0 129 3.5t129 3.5q25 0 37.5 -22t12.5 -48q0 -30 -17.5 -44t-40 -14.5t-51.5 -3t-44 -12.5q-35 -23 -35 -161l1 -943q0 -119 34 -140q16 -10 46 -13.5t53.5 -4.5t41.5 -15.5t18 -44.5 q0 -26 -12 -48t-36 -22z" />
-<glyph unicode="&#xf1dd;" horiz-adv-x="1280" d="M1278 1347v-73q0 -29 -18.5 -61t-42.5 -32q-50 0 -54 -1q-26 -6 -32 -31q-3 -11 -3 -64v-1152q0 -25 -18 -43t-43 -18h-108q-25 0 -43 18t-18 43v1218h-143v-1218q0 -25 -17.5 -43t-43.5 -18h-108q-26 0 -43.5 18t-17.5 43v496q-147 12 -245 59q-126 58 -192 179 q-64 117 -64 259q0 166 88 286q88 118 209 159q111 37 417 37h479q25 0 43 -18t18 -43z" />
-<glyph unicode="&#xf1de;" d="M352 128v-128h-352v128h352zM704 256q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM864 640v-128h-864v128h864zM224 1152v-128h-224v128h224zM1536 128v-128h-736v128h736zM576 1280q26 0 45 -19t19 -45v-256 q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM1216 768q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM1536 640v-128h-224v128h224zM1536 1152v-128h-864v128h864z" />
-<glyph unicode="&#xf1e0;" d="M1216 512q133 0 226.5 -93.5t93.5 -226.5t-93.5 -226.5t-226.5 -93.5t-226.5 93.5t-93.5 226.5q0 12 2 34l-360 180q-92 -86 -218 -86q-133 0 -226.5 93.5t-93.5 226.5t93.5 226.5t226.5 93.5q126 0 218 -86l360 180q-2 22 -2 34q0 133 93.5 226.5t226.5 93.5 t226.5 -93.5t93.5 -226.5t-93.5 -226.5t-226.5 -93.5q-126 0 -218 86l-360 -180q2 -22 2 -34t-2 -34l360 -180q92 86 218 86z" />
-<glyph unicode="&#xf1e1;" d="M1280 341q0 88 -62.5 151t-150.5 63q-84 0 -145 -58l-241 120q2 16 2 23t-2 23l241 120q61 -58 145 -58q88 0 150.5 63t62.5 151t-62.5 150.5t-150.5 62.5t-151 -62.5t-63 -150.5q0 -7 2 -23l-241 -120q-62 57 -145 57q-88 0 -150.5 -62.5t-62.5 -150.5t62.5 -150.5 t150.5 -62.5q83 0 145 57l241 -120q-2 -16 -2 -23q0 -88 63 -150.5t151 -62.5t150.5 62.5t62.5 150.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf1e2;" horiz-adv-x="1792" d="M571 947q-10 25 -34 35t-49 0q-108 -44 -191 -127t-127 -191q-10 -25 0 -49t35 -34q13 -5 24 -5q42 0 60 40q34 84 98.5 148.5t148.5 98.5q25 11 35 35t0 49zM1513 1303l46 -46l-244 -243l68 -68q19 -19 19 -45.5t-19 -45.5l-64 -64q89 -161 89 -343q0 -143 -55.5 -273.5 t-150 -225t-225 -150t-273.5 -55.5t-273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5q182 0 343 -89l64 64q19 19 45.5 19t45.5 -19l68 -68zM1521 1359q-10 -10 -22 -10q-13 0 -23 10l-91 90q-9 10 -9 23t9 23q10 9 23 9t23 -9l90 -91 q10 -9 10 -22.5t-10 -22.5zM1751 1129q-11 -9 -23 -9t-23 9l-90 91q-10 9 -10 22.5t10 22.5q9 10 22.5 10t22.5 -10l91 -90q9 -10 9 -23t-9 -23zM1792 1312q0 -14 -9 -23t-23 -9h-96q-14 0 -23 9t-9 23t9 23t23 9h96q14 0 23 -9t9 -23zM1600 1504v-96q0 -14 -9 -23t-23 -9 t-23 9t-9 23v96q0 14 9 23t23 9t23 -9t9 -23zM1751 1449l-91 -90q-10 -10 -22 -10q-13 0 -23 10q-10 9 -10 22.5t10 22.5l90 91q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />
-<glyph unicode="&#xf1e3;" horiz-adv-x="1792" d="M609 720l287 208l287 -208l-109 -336h-355zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM1515 186q149 203 149 454v3l-102 -89l-240 224l63 323 l134 -12q-150 206 -389 282l53 -124l-287 -159l-287 159l53 124q-239 -76 -389 -282l135 12l62 -323l-240 -224l-102 89v-3q0 -251 149 -454l30 132l326 -40l139 -298l-116 -69q117 -39 240 -39t240 39l-116 69l139 298l326 40z" />
-<glyph unicode="&#xf1e4;" horiz-adv-x="1792" d="M448 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM256 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM832 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23 v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM66 768q-28 0 -47 19t-19 46v129h514v-129q0 -27 -19 -46t-46 -19h-383zM1216 224v-192q0 -14 -9 -23t-23 -9h-192 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1600 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23 zM1408 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1016v-13h-514v10q0 104 -382 102q-382 -1 -382 -102v-10h-514v13q0 17 8.5 43t34 64t65.5 75.5t110.5 76t160 67.5t224 47.5t293.5 18.5t293 -18.5t224 -47.5 t160.5 -67.5t110.5 -76t65.5 -75.5t34 -64t8.5 -43zM1792 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 962v-129q0 -27 -19 -46t-46 -19h-384q-27 0 -46 19t-19 46v129h514z" />
-<glyph unicode="&#xf1e5;" horiz-adv-x="1792" d="M704 1216v-768q0 -26 -19 -45t-45 -19v-576q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v512l249 873q7 23 31 23h424zM1024 1216v-704h-256v704h256zM1792 320v-512q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v576q-26 0 -45 19t-19 45v768h424q24 0 31 -23z M736 1504v-224h-352v224q0 14 9 23t23 9h288q14 0 23 -9t9 -23zM1408 1504v-224h-352v224q0 14 9 23t23 9h288q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf1e6;" horiz-adv-x="1792" d="M1755 1083q37 -37 37 -90t-37 -91l-401 -400l150 -150l-160 -160q-163 -163 -389.5 -186.5t-411.5 100.5l-362 -362h-181v181l362 362q-124 185 -100.5 411.5t186.5 389.5l160 160l150 -150l400 401q38 37 91 37t90 -37t37 -90.5t-37 -90.5l-400 -401l234 -234l401 400 q38 37 91 37t90 -37z" />
-<glyph unicode="&#xf1e7;" horiz-adv-x="1792" d="M873 796q0 -83 -63.5 -142.5t-152.5 -59.5t-152.5 59.5t-63.5 142.5q0 84 63.5 143t152.5 59t152.5 -59t63.5 -143zM1375 796q0 -83 -63 -142.5t-153 -59.5q-89 0 -152.5 59.5t-63.5 142.5q0 84 63.5 143t152.5 59q90 0 153 -59t63 -143zM1600 616v667q0 87 -32 123.5 t-111 36.5h-1112q-83 0 -112.5 -34t-29.5 -126v-673q43 -23 88.5 -40t81 -28t81 -18.5t71 -11t70 -4t58.5 -0.5t56.5 2t44.5 2q68 1 95 -27q6 -6 10 -9q26 -25 61 -51q7 91 118 87q5 0 36.5 -1.5t43 -2t45.5 -1t53 1t54.5 4.5t61 8.5t62 13.5t67 19.5t67.5 27t72 34.5z M1763 621q-121 -149 -372 -252q84 -285 -23 -465q-66 -113 -183 -148q-104 -32 -182 15q-86 51 -82 164l-1 326v1q-8 2 -24.5 6t-23.5 5l-1 -338q4 -114 -83 -164q-79 -47 -183 -15q-117 36 -182 150q-105 180 -22 463q-251 103 -372 252q-25 37 -4 63t60 -1q3 -2 11 -7 t11 -8v694q0 72 47 123t114 51h1257q67 0 114 -51t47 -123v-694l21 15q39 27 60 1t-4 -63z" />
-<glyph unicode="&#xf1e8;" horiz-adv-x="1792" d="M896 1102v-434h-145v434h145zM1294 1102v-434h-145v434h145zM1294 342l253 254v795h-1194v-1049h326v-217l217 217h398zM1692 1536v-1013l-434 -434h-326l-217 -217h-217v217h-398v1158l109 289h1483z" />
-<glyph unicode="&#xf1e9;" d="M773 217v-127q-1 -292 -6 -305q-12 -32 -51 -40q-54 -9 -181.5 38t-162.5 89q-13 15 -17 36q-1 12 4 26q4 10 34 47t181 216q1 0 60 70q15 19 39.5 24.5t49.5 -3.5q24 -10 37.5 -29t12.5 -42zM624 468q-3 -55 -52 -70l-120 -39q-275 -88 -292 -88q-35 2 -54 36 q-12 25 -17 75q-8 76 1 166.5t30 124.5t56 32q13 0 202 -77q70 -29 115 -47l84 -34q23 -9 35.5 -30.5t11.5 -48.5zM1450 171q-7 -54 -91.5 -161t-135.5 -127q-37 -14 -63 7q-14 10 -184 287l-47 77q-14 21 -11.5 46t19.5 46q35 43 83 26q1 -1 119 -40q203 -66 242 -79.5 t47 -20.5q28 -22 22 -61zM778 803q5 -102 -54 -122q-58 -17 -114 71l-378 598q-8 35 19 62q41 43 207.5 89.5t224.5 31.5q40 -10 49 -45q3 -18 22 -305.5t24 -379.5zM1440 695q3 -39 -26 -59q-15 -10 -329 -86q-67 -15 -91 -23l1 2q-23 -6 -46 4t-37 32q-30 47 0 87 q1 1 75 102q125 171 150 204t34 39q28 19 65 2q48 -23 123 -133.5t81 -167.5v-3z" />
-<glyph unicode="&#xf1ea;" horiz-adv-x="2048" d="M1024 1024h-384v-384h384v384zM1152 384v-128h-640v128h640zM1152 1152v-640h-640v640h640zM1792 384v-128h-512v128h512zM1792 640v-128h-512v128h512zM1792 896v-128h-512v128h512zM1792 1152v-128h-512v128h512zM256 192v960h-128v-960q0 -26 19 -45t45 -19t45 19 t19 45zM1920 192v1088h-1536v-1088q0 -33 -11 -64h1483q26 0 45 19t19 45zM2048 1408v-1216q0 -80 -56 -136t-136 -56h-1664q-80 0 -136 56t-56 136v1088h256v128h1792z" />
-<glyph unicode="&#xf1eb;" horiz-adv-x="2048" d="M1024 13q-20 0 -93 73.5t-73 93.5q0 32 62.5 54t103.5 22t103.5 -22t62.5 -54q0 -20 -73 -93.5t-93 -73.5zM1294 284q-2 0 -40 25t-101.5 50t-128.5 25t-128.5 -25t-101 -50t-40.5 -25q-18 0 -93.5 75t-75.5 93q0 13 10 23q78 77 196 121t233 44t233 -44t196 -121 q10 -10 10 -23q0 -18 -75.5 -93t-93.5 -75zM1567 556q-11 0 -23 8q-136 105 -252 154.5t-268 49.5q-85 0 -170.5 -22t-149 -53t-113.5 -62t-79 -53t-31 -22q-17 0 -92 75t-75 93q0 12 10 22q132 132 320 205t380 73t380 -73t320 -205q10 -10 10 -22q0 -18 -75 -93t-92 -75z M1838 827q-11 0 -22 9q-179 157 -371.5 236.5t-420.5 79.5t-420.5 -79.5t-371.5 -236.5q-11 -9 -22 -9q-17 0 -92.5 75t-75.5 93q0 13 10 23q187 186 445 288t527 102t527 -102t445 -288q10 -10 10 -23q0 -18 -75.5 -93t-92.5 -75z" />
-<glyph unicode="&#xf1ec;" horiz-adv-x="1792" d="M384 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5 t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1152 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5 t37.5 90.5zM384 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1152 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 768q0 53 -37.5 90.5t-90.5 37.5 t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1536 0v384q0 52 -38 90t-90 38t-90 -38t-38 -90v-384q0 -52 38 -90t90 -38t90 38t38 90zM1152 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5z M1536 1088v256q0 26 -19 45t-45 19h-1280q-26 0 -45 -19t-19 -45v-256q0 -26 19 -45t45 -19h1280q26 0 45 19t19 45zM1536 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1408v-1536q0 -52 -38 -90t-90 -38 h-1408q-52 0 -90 38t-38 90v1536q0 52 38 90t90 38h1408q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf1ed;" horiz-adv-x="1792" d="M1112 1090q0 159 -237 159h-70q-32 0 -59.5 -21.5t-34.5 -52.5l-63 -276q-2 -5 -2 -16q0 -24 17 -39.5t41 -15.5h53q69 0 128.5 13t112.5 41t83.5 81.5t30.5 126.5zM1716 938q0 -265 -220 -428q-219 -161 -612 -161h-61q-32 0 -59 -21.5t-34 -52.5l-73 -316 q-8 -36 -40.5 -61.5t-69.5 -25.5h-213q-31 0 -53 20t-22 51q0 10 13 65h151q34 0 64 23.5t38 56.5l73 316q8 33 37.5 57t63.5 24h61q390 0 607 160t217 421q0 129 -51 207q183 -92 183 -335zM1533 1123q0 -264 -221 -428q-218 -161 -612 -161h-60q-32 0 -59.5 -22t-34.5 -53 l-73 -315q-8 -36 -40 -61.5t-69 -25.5h-214q-31 0 -52.5 19.5t-21.5 51.5q0 8 2 20l300 1301q8 36 40.5 61.5t69.5 25.5h444q68 0 125 -4t120.5 -15t113.5 -30t96.5 -50.5t77.5 -74t49.5 -103.5t18.5 -136z" />
-<glyph unicode="&#xf1ee;" horiz-adv-x="1792" d="M602 949q19 -61 31 -123.5t17 -141.5t-14 -159t-62 -145q-21 81 -67 157t-95.5 127t-99 90.5t-78.5 57.5t-33 19q-62 34 -81.5 100t14.5 128t101 81.5t129 -14.5q138 -83 238 -177zM927 1236q11 -25 20.5 -46t36.5 -100.5t42.5 -150.5t25.5 -179.5t0 -205.5t-47.5 -209.5 t-105.5 -208.5q-51 -72 -138 -72q-54 0 -98 31q-57 40 -69 109t28 127q60 85 81 195t13 199.5t-32 180.5t-39 128t-22 52q-31 63 -8.5 129.5t85.5 97.5q34 17 75 17q47 0 88.5 -25t63.5 -69zM1248 567q-17 -160 -72 -311q-17 131 -63 246q25 174 -5 361q-27 178 -94 342 q114 -90 212 -211q9 -37 15 -80q26 -179 7 -347zM1520 1440q9 -17 23.5 -49.5t43.5 -117.5t50.5 -178t34 -227.5t5 -269t-47 -300t-112.5 -323.5q-22 -48 -66 -75.5t-95 -27.5q-39 0 -74 16q-67 31 -92.5 100t4.5 136q58 126 90 257.5t37.5 239.5t-3.5 213.5t-26.5 180.5 t-38.5 138.5t-32.5 90t-15.5 32.5q-34 65 -11.5 135.5t87.5 104.5q37 20 81 20q49 0 91.5 -25.5t66.5 -70.5z" />
-<glyph unicode="&#xf1f0;" horiz-adv-x="2304" d="M1975 546h-138q14 37 66 179l3 9q4 10 10 26t9 26l12 -55zM531 611l-58 295q-11 54 -75 54h-268l-2 -13q311 -79 403 -336zM710 960l-162 -438l-17 89q-26 70 -85 129.5t-131 88.5l135 -510h175l261 641h-176zM849 318h166l104 642h-166zM1617 944q-69 27 -149 27 q-123 0 -201 -59t-79 -153q-1 -102 145 -174q48 -23 67 -41t19 -39q0 -30 -30 -46t-69 -16q-86 0 -156 33l-22 11l-23 -144q74 -34 185 -34q130 -1 208.5 59t80.5 160q0 106 -140 174q-49 25 -71 42t-22 38q0 22 24.5 38.5t70.5 16.5q70 1 124 -24l15 -8zM2042 960h-128 q-65 0 -87 -54l-246 -588h174l35 96h212q5 -22 20 -96h154zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf1f1;" horiz-adv-x="2304" d="M671 603h-13q-47 0 -47 -32q0 -22 20 -22q17 0 28 15t12 39zM1066 639h62v3q1 4 0.5 6.5t-1 7t-2 8t-4.5 6.5t-7.5 5t-11.5 2q-28 0 -36 -38zM1606 603h-12q-48 0 -48 -32q0 -22 20 -22q17 0 28 15t12 39zM1925 629q0 41 -30 41q-19 0 -31 -20t-12 -51q0 -42 28 -42 q20 0 32.5 20t12.5 52zM480 770h87l-44 -262h-56l32 201l-71 -201h-39l-4 200l-34 -200h-53l44 262h81l2 -163zM733 663q0 -6 -4 -42q-16 -101 -17 -113h-47l1 22q-20 -26 -58 -26q-23 0 -37.5 16t-14.5 42q0 39 26 60.5t73 21.5q14 0 23 -1q0 3 0.5 5.5t1 4.5t0.5 3 q0 20 -36 20q-29 0 -59 -10q0 4 7 48q38 11 67 11q74 0 74 -62zM889 721l-8 -49q-22 3 -41 3q-27 0 -27 -17q0 -8 4.5 -12t21.5 -11q40 -19 40 -60q0 -72 -87 -71q-34 0 -58 6q0 2 7 49q29 -8 51 -8q32 0 32 19q0 7 -4.5 11.5t-21.5 12.5q-43 20 -43 59q0 72 84 72 q30 0 50 -4zM977 721h28l-7 -52h-29q-2 -17 -6.5 -40.5t-7 -38.5t-2.5 -18q0 -16 19 -16q8 0 16 2l-8 -47q-21 -7 -40 -7q-43 0 -45 47q0 12 8 56q3 20 25 146h55zM1180 648q0 -23 -7 -52h-111q-3 -22 10 -33t38 -11q30 0 58 14l-9 -54q-30 -8 -57 -8q-95 0 -95 95 q0 55 27.5 90.5t69.5 35.5q35 0 55.5 -21t20.5 -56zM1319 722q-13 -23 -22 -62q-22 2 -31 -24t-25 -128h-56l3 14q22 130 29 199h51l-3 -33q14 21 25.5 29.5t28.5 4.5zM1506 763l-9 -57q-28 14 -50 14q-31 0 -51 -27.5t-20 -70.5q0 -30 13.5 -47t38.5 -17q21 0 48 13 l-10 -59q-28 -8 -50 -8q-45 0 -71.5 30.5t-26.5 82.5q0 70 35.5 114.5t91.5 44.5q26 0 61 -13zM1668 663q0 -18 -4 -42q-13 -79 -17 -113h-46l1 22q-20 -26 -59 -26q-23 0 -37 16t-14 42q0 39 25.5 60.5t72.5 21.5q15 0 23 -1q2 7 2 13q0 20 -36 20q-29 0 -59 -10q0 4 8 48 q38 11 67 11q73 0 73 -62zM1809 722q-14 -24 -21 -62q-23 2 -31.5 -23t-25.5 -129h-56l3 14q19 104 29 199h52q0 -11 -4 -33q15 21 26.5 29.5t27.5 4.5zM1950 770h56l-43 -262h-53l3 19q-23 -23 -52 -23q-31 0 -49.5 24t-18.5 64q0 53 27.5 92t64.5 39q31 0 53 -29z M2061 640q0 148 -72.5 273t-198 198t-273.5 73q-181 0 -328 -110q127 -116 171 -284h-50q-44 150 -158 253q-114 -103 -158 -253h-50q44 168 171 284q-147 110 -328 110q-148 0 -273.5 -73t-198 -198t-72.5 -273t72.5 -273t198 -198t273.5 -73q181 0 328 110 q-120 111 -165 264h50q46 -138 152 -233q106 95 152 233h50q-45 -153 -165 -264q147 -110 328 -110q148 0 273.5 73t198 198t72.5 273zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf1f2;" horiz-adv-x="2304" d="M313 759q0 -51 -36 -84q-29 -26 -89 -26h-17v220h17q61 0 89 -27q36 -31 36 -83zM2089 824q0 -52 -64 -52h-19v101h20q63 0 63 -49zM380 759q0 74 -50 120.5t-129 46.5h-95v-333h95q74 0 119 38q60 51 60 128zM410 593h65v333h-65v-333zM730 694q0 40 -20.5 62t-75.5 42 q-29 10 -39.5 19t-10.5 23q0 16 13.5 26.5t34.5 10.5q29 0 53 -27l34 44q-41 37 -98 37q-44 0 -74 -27.5t-30 -67.5q0 -35 18 -55.5t64 -36.5q37 -13 45 -19q19 -12 19 -34q0 -20 -14 -33.5t-36 -13.5q-48 0 -71 44l-42 -40q44 -64 115 -64q51 0 83 30.5t32 79.5zM1008 604 v77q-37 -37 -78 -37q-49 0 -80.5 32.5t-31.5 82.5q0 48 31.5 81.5t77.5 33.5q43 0 81 -38v77q-40 20 -80 20q-74 0 -125.5 -50.5t-51.5 -123.5t51 -123.5t125 -50.5q42 0 81 19zM2240 0v527q-65 -40 -144.5 -84t-237.5 -117t-329.5 -137.5t-417.5 -134.5t-504 -118h1569 q26 0 45 19t19 45zM1389 757q0 75 -53 128t-128 53t-128 -53t-53 -128t53 -128t128 -53t128 53t53 128zM1541 584l144 342h-71l-90 -224l-89 224h-71l142 -342h35zM1714 593h184v56h-119v90h115v56h-115v74h119v57h-184v-333zM2105 593h80l-105 140q76 16 76 94q0 47 -31 73 t-87 26h-97v-333h65v133h9zM2304 1274v-1268q0 -56 -38.5 -95t-93.5 -39h-2040q-55 0 -93.5 39t-38.5 95v1268q0 56 38.5 95t93.5 39h2040q55 0 93.5 -39t38.5 -95z" />
-<glyph unicode="&#xf1f3;" horiz-adv-x="2304" d="M119 854h89l-45 108zM740 328l74 79l-70 79h-163v-49h142v-55h-142v-54h159zM898 406l99 -110v217zM1186 453q0 33 -40 33h-84v-69h83q41 0 41 36zM1475 457q0 29 -42 29h-82v-61h81q43 0 43 32zM1197 923q0 29 -42 29h-82v-60h81q43 0 43 31zM1656 854h89l-44 108z M699 1009v-271h-66v212l-94 -212h-57l-94 212v-212h-132l-25 60h-135l-25 -60h-70l116 271h96l110 -257v257h106l85 -184l77 184h108zM1255 453q0 -20 -5.5 -35t-14 -25t-22.5 -16.5t-26 -10t-31.5 -4.5t-31.5 -1t-32.5 0.5t-29.5 0.5v-91h-126l-80 90l-83 -90h-256v271h260 l80 -89l82 89h207q109 0 109 -89zM964 794v-56h-217v271h217v-57h-152v-49h148v-55h-148v-54h152zM2304 235v-229q0 -55 -38.5 -94.5t-93.5 -39.5h-2040q-55 0 -93.5 39.5t-38.5 94.5v678h111l25 61h55l25 -61h218v46l19 -46h113l20 47v-47h541v99l10 1q10 0 10 -14v-86h279 v23q23 -12 55 -18t52.5 -6.5t63 0.5t51.5 1l25 61h56l25 -61h227v58l34 -58h182v378h-180v-44l-25 44h-185v-44l-23 44h-249q-69 0 -109 -22v22h-172v-22q-24 22 -73 22h-628l-43 -97l-43 97h-198v-44l-22 44h-169l-78 -179v391q0 55 38.5 94.5t93.5 39.5h2040 q55 0 93.5 -39.5t38.5 -94.5v-678h-120q-51 0 -81 -22v22h-177q-55 0 -78 -22v22h-316v-22q-31 22 -87 22h-209v-22q-23 22 -91 22h-234l-54 -58l-50 58h-349v-378h343l55 59l52 -59h211v89h21q59 0 90 13v-102h174v99h8q8 0 10 -2t2 -10v-87h529q57 0 88 24v-24h168 q60 0 95 17zM1546 469q0 -23 -12 -43t-34 -29q25 -9 34 -26t9 -46v-54h-65v45q0 33 -12 43.5t-46 10.5h-69v-99h-65v271h154q48 0 77 -15t29 -58zM1269 936q0 -24 -12.5 -44t-33.5 -29q26 -9 34.5 -25.5t8.5 -46.5v-53h-65q0 9 0.5 26.5t0 25t-3 18.5t-8.5 16t-17.5 8.5 t-29.5 3.5h-70v-98h-64v271l153 -1q49 0 78 -14.5t29 -57.5zM1798 327v-56h-216v271h216v-56h-151v-49h148v-55h-148v-54zM1372 1009v-271h-66v271h66zM2065 357q0 -86 -102 -86h-126v58h126q34 0 34 25q0 16 -17 21t-41.5 5t-49.5 3.5t-42 22.5t-17 55q0 39 26 60t66 21 h130v-57h-119q-36 0 -36 -25q0 -16 17.5 -20.5t42 -4t49 -2.5t42 -21.5t17.5 -54.5zM2304 407v-101q-24 -35 -88 -35h-125v58h125q33 0 33 25q0 13 -12.5 19t-31 5.5t-40 2t-40 8t-31 24t-12.5 48.5q0 39 26.5 60t66.5 21h129v-57h-118q-36 0 -36 -25q0 -20 29 -22t68.5 -5 t56.5 -26zM2139 1008v-270h-92l-122 203v-203h-132l-26 60h-134l-25 -60h-75q-129 0 -129 133q0 138 133 138h63v-59q-7 0 -28 1t-28.5 0.5t-23 -2t-21.5 -6.5t-14.5 -13.5t-11.5 -23t-3 -33.5q0 -38 13.5 -58t49.5 -20h29l92 213h97l109 -256v256h99l114 -188v188h66z" />
-<glyph unicode="&#xf1f4;" horiz-adv-x="2304" d="M322 689h-15q-19 0 -19 18q0 28 19 85q5 15 15 19.5t28 4.5q77 0 77 -49q0 -41 -30.5 -59.5t-74.5 -18.5zM664 528q-47 0 -47 29q0 62 123 62l3 -3q-5 -88 -79 -88zM1438 687h-15q-19 0 -19 19q0 28 19 85q5 15 14.5 19t28.5 4q77 0 77 -49q0 -41 -30.5 -59.5 t-74.5 -18.5zM1780 527q-47 0 -47 30q0 62 123 62l3 -3q-5 -89 -79 -89zM373 894h-128q-8 0 -14.5 -4t-8.5 -7.5t-7 -12.5q-3 -7 -45 -190t-42 -192q0 -7 5.5 -12.5t13.5 -5.5h62q25 0 32.5 34.5l15 69t32.5 34.5q47 0 87.5 7.5t80.5 24.5t63.5 52.5t23.5 84.5 q0 36 -14.5 61t-41 36.5t-53.5 15.5t-62 4zM719 798q-38 0 -74 -6q-2 0 -8.5 -1t-9 -1.5l-7.5 -1.5t-7.5 -2t-6.5 -3t-6.5 -4t-5 -5t-4.5 -7t-4 -9q-9 -29 -9 -39t9 -10q5 0 21.5 5t19.5 6q30 8 58 8q74 0 74 -36q0 -11 -10 -14q-8 -2 -18 -3t-21.5 -1.5t-17.5 -1.5 q-38 -4 -64.5 -10t-56.5 -19.5t-45.5 -39t-15.5 -62.5q0 -38 26 -59.5t64 -21.5q24 0 45.5 6.5t33 13t38.5 23.5q-3 -7 -3 -15t5.5 -13.5t12.5 -5.5h56q1 1 7 3.5t7.5 3.5t5 3.5t5 5.5t2.5 8l45 194q4 13 4 30q0 81 -145 81zM1247 793h-74q-22 0 -39 -23q-5 -7 -29.5 -51 t-46.5 -81.5t-26 -38.5l-5 4q0 77 -27 166q-1 5 -3.5 8.5t-6 6.5t-6.5 5t-8.5 3t-8.5 1.5t-9.5 1t-9 0.5h-10h-8.5q-38 0 -38 -21l1 -5q5 -53 25 -151t25 -143q2 -16 2 -24q0 -19 -30.5 -61.5t-30.5 -58.5q0 -13 40 -13q61 0 76 25l245 415q10 20 10 26q0 9 -8 9zM1489 892 h-129q-18 0 -29 -23q-6 -13 -46.5 -191.5t-40.5 -190.5q0 -20 43 -20h7.5h9h9t9.5 1t8.5 2t8.5 3t6.5 4.5t5.5 6t3 8.5l21 91q2 10 10.5 17t19.5 7q47 0 87.5 7t80.5 24.5t63.5 52.5t23.5 84q0 36 -14.5 61t-41 36.5t-53.5 15.5t-62 4zM1835 798q-26 0 -74 -6 q-38 -6 -48 -16q-7 -8 -11 -19q-8 -24 -8 -39q0 -10 8 -10q1 0 41 12q30 8 58 8q74 0 74 -36q0 -12 -10 -14q-4 -1 -57 -7q-38 -4 -64.5 -10t-56.5 -19.5t-45.5 -39t-15.5 -62.5t26 -58.5t64 -21.5q24 0 45 6t34 13t38 24q-3 -15 -3 -16q0 -5 2 -8.5t6.5 -5.5t8 -3.5 t10.5 -2t9.5 -0.5h9.5h8q42 0 48 25l45 194q3 15 3 31q0 81 -145 81zM2157 889h-55q-25 0 -33 -40q-10 -44 -36.5 -167t-42.5 -190v-5q0 -16 16 -18h1h57q10 0 18.5 6.5t10.5 16.5l83 374h-1l1 5q0 7 -5.5 12.5t-13.5 5.5zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048 q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf1f5;" horiz-adv-x="2304" d="M1597 633q0 -69 -21 -106q-19 -35 -52 -35q-23 0 -41 9v224q29 30 57 30q57 0 57 -122zM2035 669h-110q6 98 56 98q51 0 54 -98zM476 534q0 59 -33 91.5t-101 57.5q-36 13 -52 24t-16 25q0 26 38 26q58 0 124 -33l18 112q-67 32 -149 32q-77 0 -123 -38q-48 -39 -48 -109 q0 -58 32.5 -90.5t99.5 -56.5q39 -14 54.5 -25.5t15.5 -27.5q0 -31 -48 -31q-29 0 -70 12.5t-72 30.5l-18 -113q72 -41 168 -41q81 0 129 37q51 41 51 117zM771 749l19 111h-96v135l-129 -21l-18 -114l-46 -8l-17 -103h62v-219q0 -84 44 -120q38 -30 111 -30q32 0 79 11v118 q-32 -7 -44 -7q-42 0 -42 50v197h77zM1087 724v139q-15 3 -28 3q-32 0 -55.5 -16t-33.5 -46l-10 56h-131v-471h150v306q26 31 82 31q16 0 26 -2zM1124 389h150v471h-150v-471zM1746 638q0 122 -45 179q-40 52 -111 52q-64 0 -117 -56l-8 47h-132v-645l150 25v151 q36 -11 68 -11q83 0 134 56q61 65 61 202zM1278 986q0 33 -23 56t-56 23t-56 -23t-23 -56t23 -56.5t56 -23.5t56 23.5t23 56.5zM2176 629q0 113 -48 176q-50 64 -144 64q-96 0 -151.5 -66t-55.5 -180q0 -128 63 -188q55 -55 161 -55q101 0 160 40l-16 103q-57 -31 -128 -31 q-43 0 -63 19q-23 19 -28 66h248q2 14 2 52zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf1f6;" horiz-adv-x="2048" d="M1558 684q61 -356 298 -556q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-180.5 74.5t-75.5 180.5zM1024 -176q16 0 16 16t-16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5zM2026 1424q8 -10 7.5 -23.5t-10.5 -22.5 l-1872 -1622q-10 -8 -23.5 -7t-21.5 11l-84 96q-8 10 -7.5 23.5t10.5 21.5l186 161q-19 32 -19 66q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q124 -18 219 -82.5t148 -157.5 l418 363q10 8 23.5 7t21.5 -11z" />
-<glyph unicode="&#xf1f7;" horiz-adv-x="2048" d="M1040 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM503 315l877 760q-42 88 -132.5 146.5t-223.5 58.5q-93 0 -169.5 -31.5t-121.5 -80.5t-69 -103t-24 -105q0 -384 -137 -645zM1856 128 q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-180.5 74.5t-75.5 180.5l149 129h757q-166 187 -227 459l111 97q61 -356 298 -556zM1942 1520l84 -96q8 -10 7.5 -23.5t-10.5 -22.5l-1872 -1622q-10 -8 -23.5 -7t-21.5 11l-84 96q-8 10 -7.5 23.5t10.5 21.5l186 161 q-19 32 -19 66q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q124 -18 219 -82.5t148 -157.5l418 363q10 8 23.5 7t21.5 -11z" />
-<glyph unicode="&#xf1f8;" horiz-adv-x="1408" d="M512 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM768 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1024 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704 q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167 q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf1f9;" d="M1150 462v-109q0 -50 -36.5 -89t-94 -60.5t-118 -32.5t-117.5 -11q-205 0 -342.5 139t-137.5 346q0 203 136 339t339 136q34 0 75.5 -4.5t93 -18t92.5 -34t69 -56.5t28 -81v-109q0 -16 -16 -16h-118q-16 0 -16 16v70q0 43 -65.5 67.5t-137.5 24.5q-140 0 -228.5 -91.5 t-88.5 -237.5q0 -151 91.5 -249.5t233.5 -98.5q68 0 138 24t70 66v70q0 7 4.5 11.5t10.5 4.5h119q6 0 11 -4.5t5 -11.5zM768 1280q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5 t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf1fa;" d="M972 761q0 108 -53.5 169t-147.5 61q-63 0 -124 -30.5t-110 -84.5t-79.5 -137t-30.5 -180q0 -112 53.5 -173t150.5 -61q96 0 176 66.5t122.5 166t42.5 203.5zM1536 640q0 -111 -37 -197t-98.5 -135t-131.5 -74.5t-145 -27.5q-6 0 -15.5 -0.5t-16.5 -0.5q-95 0 -142 53 q-28 33 -33 83q-52 -66 -131.5 -110t-173.5 -44q-161 0 -249.5 95.5t-88.5 269.5q0 157 66 290t179 210.5t246 77.5q87 0 155 -35.5t106 -99.5l2 19l11 56q1 6 5.5 12t9.5 6h118q5 0 13 -11q5 -5 3 -16l-120 -614q-5 -24 -5 -48q0 -39 12.5 -52t44.5 -13q28 1 57 5.5t73 24 t77 50t57 89.5t24 137q0 292 -174 466t-466 174q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51q228 0 405 144q11 9 24 8t21 -12l41 -49q8 -12 7 -24q-2 -13 -12 -22q-102 -83 -227.5 -128t-258.5 -45q-156 0 -298 61 t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q344 0 556 -212t212 -556z" />
-<glyph unicode="&#xf1fb;" horiz-adv-x="1792" d="M1698 1442q94 -94 94 -226.5t-94 -225.5l-225 -223l104 -104q10 -10 10 -23t-10 -23l-210 -210q-10 -10 -23 -10t-23 10l-105 105l-603 -603q-37 -37 -90 -37h-203l-256 -128l-64 64l128 256v203q0 53 37 90l603 603l-105 105q-10 10 -10 23t10 23l210 210q10 10 23 10 t23 -10l104 -104l223 225q93 94 225.5 94t226.5 -94zM512 64l576 576l-192 192l-576 -576v-192h192z" />
-<glyph unicode="&#xf1fc;" horiz-adv-x="1792" d="M1615 1536q70 0 122.5 -46.5t52.5 -116.5q0 -63 -45 -151q-332 -629 -465 -752q-97 -91 -218 -91q-126 0 -216.5 92.5t-90.5 219.5q0 128 92 212l638 579q59 54 130 54zM706 502q39 -76 106.5 -130t150.5 -76l1 -71q4 -213 -129.5 -347t-348.5 -134q-123 0 -218 46.5 t-152.5 127.5t-86.5 183t-29 220q7 -5 41 -30t62 -44.5t59 -36.5t46 -17q41 0 55 37q25 66 57.5 112.5t69.5 76t88 47.5t103 25.5t125 10.5z" />
-<glyph unicode="&#xf1fd;" horiz-adv-x="1792" d="M1792 128v-384h-1792v384q45 0 85 14t59 27.5t47 37.5q30 27 51.5 38t56.5 11t55.5 -11t52.5 -38q29 -25 47 -38t58 -27t86 -14q45 0 85 14.5t58 27t48 37.5q21 19 32.5 27t31 15t43.5 7q35 0 56.5 -11t51.5 -38q28 -24 47 -37.5t59 -27.5t85 -14t85 14t59 27.5t47 37.5 q30 27 51.5 38t56.5 11q34 0 55.5 -11t51.5 -38q28 -24 47 -37.5t59 -27.5t85 -14zM1792 448v-192q-35 0 -55.5 11t-52.5 38q-29 25 -47 38t-58 27t-85 14q-46 0 -86 -14t-58 -27t-47 -38q-22 -19 -33 -27t-31 -15t-44 -7q-35 0 -56.5 11t-51.5 38q-29 25 -47 38t-58 27 t-86 14q-45 0 -85 -14.5t-58 -27t-48 -37.5q-21 -19 -32.5 -27t-31 -15t-43.5 -7q-35 0 -56.5 11t-51.5 38q-28 24 -47 37.5t-59 27.5t-85 14q-46 0 -86 -14t-58 -27t-47 -38q-30 -27 -51.5 -38t-56.5 -11v192q0 80 56 136t136 56h64v448h256v-448h256v448h256v-448h256v448 h256v-448h64q80 0 136 -56t56 -136zM512 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150zM1024 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51 t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150zM1536 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150z" />
-<glyph unicode="&#xf1fe;" horiz-adv-x="2048" d="M2048 0v-128h-2048v1536h128v-1408h1920zM1664 1024l256 -896h-1664v576l448 576l576 -576z" />
-<glyph unicode="&#xf200;" horiz-adv-x="1792" d="M768 646l546 -546q-106 -108 -247.5 -168t-298.5 -60q-209 0 -385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103v-762zM955 640h773q0 -157 -60 -298.5t-168 -247.5zM1664 768h-768v768q209 0 385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf201;" horiz-adv-x="2048" d="M2048 0v-128h-2048v1536h128v-1408h1920zM1920 1248v-435q0 -21 -19.5 -29.5t-35.5 7.5l-121 121l-633 -633q-10 -10 -23 -10t-23 10l-233 233l-416 -416l-192 192l585 585q10 10 23 10t23 -10l233 -233l464 464l-121 121q-16 16 -7.5 35.5t29.5 19.5h435q14 0 23 -9 t9 -23z" />
-<glyph unicode="&#xf202;" horiz-adv-x="1792" d="M1292 832q0 -6 10 -41q10 -29 25 -49.5t41 -34t44 -20t55 -16.5q325 -91 325 -332q0 -146 -105.5 -242.5t-254.5 -96.5q-59 0 -111.5 18.5t-91.5 45.5t-77 74.5t-63 87.5t-53.5 103.5t-43.5 103t-39.5 106.5t-35.5 95q-32 81 -61.5 133.5t-73.5 96.5t-104 64t-142 20 q-96 0 -183 -55.5t-138 -144.5t-51 -185q0 -160 106.5 -279.5t263.5 -119.5q177 0 258 95q56 63 83 116l84 -152q-15 -34 -44 -70l1 -1q-131 -152 -388 -152q-147 0 -269.5 79t-190.5 207.5t-68 274.5q0 105 43.5 206t116 176.5t172 121.5t204.5 46q87 0 159 -19t123.5 -50 t95 -80t72.5 -99t58.5 -117t50.5 -124.5t50 -130.5t55 -127q96 -200 233 -200q81 0 138.5 48.5t57.5 128.5q0 42 -19 72t-50.5 46t-72.5 31.5t-84.5 27t-87.5 34t-81 52t-65 82t-39 122.5q-3 16 -3 33q0 110 87.5 192t198.5 78q78 -3 120.5 -14.5t90.5 -53.5h-1 q12 -11 23 -24.5t26 -36t19 -27.5l-129 -99q-26 49 -54 70v1q-23 21 -97 21q-49 0 -84 -33t-35 -83z" />
-<glyph unicode="&#xf203;" d="M1432 484q0 173 -234 239q-35 10 -53 16.5t-38 25t-29 46.5q0 2 -2 8.5t-3 12t-1 7.5q0 36 24.5 59.5t60.5 23.5q54 0 71 -15h-1q20 -15 39 -51l93 71q-39 54 -49 64q-33 29 -67.5 39t-85.5 10q-80 0 -142 -57.5t-62 -137.5q0 -7 2 -23q16 -96 64.5 -140t148.5 -73 q29 -8 49 -15.5t45 -21.5t38.5 -34.5t13.5 -46.5v-5q1 -58 -40.5 -93t-100.5 -35q-97 0 -167 144q-23 47 -51.5 121.5t-48 125.5t-54 110.5t-74 95.5t-103.5 60.5t-147 24.5q-101 0 -192 -56t-144 -148t-50 -192v-1q4 -108 50.5 -199t133.5 -147.5t196 -56.5q186 0 279 110 q20 27 31 51l-60 109q-42 -80 -99 -116t-146 -36q-115 0 -191 87t-76 204q0 105 82 189t186 84q112 0 170 -53.5t104 -172.5q8 -21 25.5 -68.5t28.5 -76.5t31.5 -74.5t38.5 -74t45.5 -62.5t55.5 -53.5t66 -33t80 -13.5q107 0 183 69.5t76 174.5zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf204;" horiz-adv-x="2048" d="M1152 640q0 104 -40.5 198.5t-109.5 163.5t-163.5 109.5t-198.5 40.5t-198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5zM1920 640q0 104 -40.5 198.5 t-109.5 163.5t-163.5 109.5t-198.5 40.5h-386q119 -90 188.5 -224t69.5 -288t-69.5 -288t-188.5 -224h386q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5zM2048 640q0 -130 -51 -248.5t-136.5 -204t-204 -136.5t-248.5 -51h-768q-130 0 -248.5 51t-204 136.5 t-136.5 204t-51 248.5t51 248.5t136.5 204t204 136.5t248.5 51h768q130 0 248.5 -51t204 -136.5t136.5 -204t51 -248.5z" />
-<glyph unicode="&#xf205;" horiz-adv-x="2048" d="M0 640q0 130 51 248.5t136.5 204t204 136.5t248.5 51h768q130 0 248.5 -51t204 -136.5t136.5 -204t51 -248.5t-51 -248.5t-136.5 -204t-204 -136.5t-248.5 -51h-768q-130 0 -248.5 51t-204 136.5t-136.5 204t-51 248.5zM1408 128q104 0 198.5 40.5t163.5 109.5 t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5t-163.5 109.5t-198.5 40.5t-198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5z" />
-<glyph unicode="&#xf206;" horiz-adv-x="2304" d="M762 384h-314q-40 0 -57.5 35t6.5 67l188 251q-65 31 -137 31q-132 0 -226 -94t-94 -226t94 -226t226 -94q115 0 203 72.5t111 183.5zM576 512h186q-18 85 -75 148zM1056 512l288 384h-480l-99 -132q105 -103 126 -252h165zM2176 448q0 132 -94 226t-226 94 q-60 0 -121 -24l174 -260q15 -23 10 -49t-27 -40q-15 -11 -36 -11q-35 0 -53 29l-174 260q-93 -95 -93 -225q0 -132 94 -226t226 -94t226 94t94 226zM2304 448q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 97 39.5 183.5t109.5 149.5l-65 98l-353 -469 q-18 -26 -51 -26h-197q-23 -164 -149 -274t-294 -110q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q114 0 215 -55l137 183h-224q-26 0 -45 19t-19 45t19 45t45 19h384v-128h435l-85 128h-222q-26 0 -45 19t-19 45t19 45t45 19h256q33 0 53 -28l267 -400 q91 44 192 44q185 0 316.5 -131.5t131.5 -316.5z" />
-<glyph unicode="&#xf207;" d="M384 320q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1408 320q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1362 716l-72 384q-5 23 -22.5 37.5t-40.5 14.5 h-918q-23 0 -40.5 -14.5t-22.5 -37.5l-72 -384q-5 -30 14 -53t49 -23h1062q30 0 49 23t14 53zM1136 1328q0 20 -14 34t-34 14h-640q-20 0 -34 -14t-14 -34t14 -34t34 -14h640q20 0 34 14t14 34zM1536 603v-603h-128v-128q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5v128h-768v-128q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5v128h-128v603q0 112 25 223l103 454q9 78 97.5 137t230 89t312.5 30t312.5 -30t230 -89t97.5 -137l105 -454q23 -102 23 -223z" />
-<glyph unicode="&#xf208;" horiz-adv-x="2048" d="M1463 704q0 -35 -25 -60.5t-61 -25.5h-702q-36 0 -61 25.5t-25 60.5t25 60.5t61 25.5h702q36 0 61 -25.5t25 -60.5zM1677 704q0 86 -23 170h-982q-36 0 -61 25t-25 60q0 36 25 61t61 25h908q-88 143 -235 227t-320 84q-177 0 -327.5 -87.5t-238 -237.5t-87.5 -327 q0 -86 23 -170h982q36 0 61 -25t25 -60q0 -36 -25 -61t-61 -25h-908q88 -143 235.5 -227t320.5 -84q132 0 253 51.5t208 139t139 208t52 253.5zM2048 959q0 -35 -25 -60t-61 -25h-131q17 -85 17 -170q0 -167 -65.5 -319.5t-175.5 -263t-262.5 -176t-319.5 -65.5 q-246 0 -448.5 133t-301.5 350h-189q-36 0 -61 25t-25 61q0 35 25 60t61 25h132q-17 85 -17 170q0 167 65.5 319.5t175.5 263t262.5 176t320.5 65.5q245 0 447.5 -133t301.5 -350h188q36 0 61 -25t25 -61z" />
-<glyph unicode="&#xf209;" horiz-adv-x="1280" d="M953 1158l-114 -328l117 -21q165 451 165 518q0 56 -38 56q-57 0 -130 -225zM654 471l33 -88q37 42 71 67l-33 5.5t-38.5 7t-32.5 8.5zM362 1367q0 -98 159 -521q18 10 49 10q15 0 75 -5l-121 351q-75 220 -123 220q-19 0 -29 -17.5t-10 -37.5zM283 608q0 -36 51.5 -119 t117.5 -153t100 -70q14 0 25.5 13t11.5 27q0 24 -32 102q-13 32 -32 72t-47.5 89t-61.5 81t-62 32q-20 0 -45.5 -27t-25.5 -47zM125 273q0 -41 25 -104q59 -145 183.5 -227t281.5 -82q227 0 382 170q152 169 152 427q0 43 -1 67t-11.5 62t-30.5 56q-56 49 -211.5 75.5 t-270.5 26.5q-37 0 -49 -11q-12 -5 -12 -35q0 -34 21.5 -60t55.5 -40t77.5 -23.5t87.5 -11.5t85 -4t70 0h23q24 0 40 -19q15 -19 19 -55q-28 -28 -96 -54q-61 -22 -93 -46q-64 -46 -108.5 -114t-44.5 -137q0 -31 18.5 -88.5t18.5 -87.5l-3 -12q-4 -12 -4 -14 q-137 10 -146 216q-8 -2 -41 -2q2 -7 2 -21q0 -53 -40.5 -89.5t-94.5 -36.5q-82 0 -166.5 78t-84.5 159q0 34 33 67q52 -64 60 -76q77 -104 133 -104q12 0 26.5 8.5t14.5 20.5q0 34 -87.5 145t-116.5 111q-43 0 -70 -44.5t-27 -90.5zM11 264q0 101 42.5 163t136.5 88 q-28 74 -28 104q0 62 61 123t122 61q29 0 70 -15q-163 462 -163 567q0 80 41 130.5t119 50.5q131 0 325 -581q6 -17 8 -23q6 16 29 79.5t43.5 118.5t54 127.5t64.5 123t70.5 86.5t76.5 36q71 0 112 -49t41 -122q0 -108 -159 -550q61 -15 100.5 -46t58.5 -78t26 -93.5 t7 -110.5q0 -150 -47 -280t-132 -225t-211 -150t-278 -55q-111 0 -223 42q-149 57 -258 191.5t-109 286.5z" />
-<glyph unicode="&#xf20a;" horiz-adv-x="2048" d="M785 528h207q-14 -158 -98.5 -248.5t-214.5 -90.5q-162 0 -254.5 116t-92.5 316q0 194 93 311.5t233 117.5q148 0 232 -87t97 -247h-203q-5 64 -35.5 99t-81.5 35q-57 0 -88.5 -60.5t-31.5 -177.5q0 -48 5 -84t18 -69.5t40 -51.5t66 -18q95 0 109 139zM1497 528h206 q-14 -158 -98 -248.5t-214 -90.5q-162 0 -254.5 116t-92.5 316q0 194 93 311.5t233 117.5q148 0 232 -87t97 -247h-204q-4 64 -35 99t-81 35q-57 0 -88.5 -60.5t-31.5 -177.5q0 -48 5 -84t18 -69.5t39.5 -51.5t65.5 -18q49 0 76.5 38t33.5 101zM1856 647q0 207 -15.5 307 t-60.5 161q-6 8 -13.5 14t-21.5 15t-16 11q-86 63 -697 63q-625 0 -710 -63q-5 -4 -17.5 -11.5t-21 -14t-14.5 -14.5q-45 -60 -60 -159.5t-15 -308.5q0 -208 15 -307.5t60 -160.5q6 -8 15 -15t20.5 -14t17.5 -12q44 -33 239.5 -49t470.5 -16q610 0 697 65q5 4 17 11t20.5 14 t13.5 16q46 60 61 159t15 309zM2048 1408v-1536h-2048v1536h2048z" />
-<glyph unicode="&#xf20b;" d="M992 912v-496q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v496q0 112 -80 192t-192 80h-272v-1152q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v1344q0 14 9 23t23 9h464q135 0 249 -66.5t180.5 -180.5t66.5 -249zM1376 1376v-880q0 -135 -66.5 -249t-180.5 -180.5 t-249 -66.5h-464q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h160q14 0 23 -9t9 -23v-768h272q112 0 192 80t80 192v880q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf20c;" d="M1311 694v-114q0 -24 -13.5 -38t-37.5 -14h-202q-24 0 -38 14t-14 38v114q0 24 14 38t38 14h202q24 0 37.5 -14t13.5 -38zM821 464v250q0 53 -32.5 85.5t-85.5 32.5h-133q-68 0 -96 -52q-28 52 -96 52h-130q-53 0 -85.5 -32.5t-32.5 -85.5v-250q0 -22 21 -22h55 q22 0 22 22v230q0 24 13.5 38t38.5 14h94q24 0 38 -14t14 -38v-230q0 -22 21 -22h54q22 0 22 22v230q0 24 14 38t38 14h97q24 0 37.5 -14t13.5 -38v-230q0 -22 22 -22h55q21 0 21 22zM1410 560v154q0 53 -33 85.5t-86 32.5h-264q-53 0 -86 -32.5t-33 -85.5v-410 q0 -21 22 -21h55q21 0 21 21v180q31 -42 94 -42h191q53 0 86 32.5t33 85.5zM1536 1176v-1072q0 -96 -68 -164t-164 -68h-1072q-96 0 -164 68t-68 164v1072q0 96 68 164t164 68h1072q96 0 164 -68t68 -164z" />
-<glyph unicode="&#xf20d;" horiz-adv-x="1792" />
-<glyph unicode="&#xf20e;" horiz-adv-x="1792" />
-<glyph unicode="&#xf500;" horiz-adv-x="1792" />
-</font>
-</defs></svg> 
\ No newline at end of file
diff --git a/NewLife.Cube/Content/bootstrap/fonts/fontawesome-webfont.ttf b/NewLife.Cube/Content/bootstrap/fonts/fontawesome-webfont.ttf
deleted file mode 100644
index 96a3639cdd..0000000000
Binary files a/NewLife.Cube/Content/bootstrap/fonts/fontawesome-webfont.ttf and /dev/null differ
diff --git a/NewLife.Cube/Content/bootstrap/fonts/fontawesome-webfont.woff b/NewLife.Cube/Content/bootstrap/fonts/fontawesome-webfont.woff
deleted file mode 100644
index 628b6a52a8..0000000000
Binary files a/NewLife.Cube/Content/bootstrap/fonts/fontawesome-webfont.woff and /dev/null differ
diff --git a/NewLife.Cube/Content/bootstrap/fonts/glyphicons-halflings-regular.eot b/NewLife.Cube/Content/bootstrap/fonts/glyphicons-halflings-regular.eot
deleted file mode 100644
index b93a4953ff..0000000000
Binary files a/NewLife.Cube/Content/bootstrap/fonts/glyphicons-halflings-regular.eot and /dev/null differ
diff --git a/NewLife.Cube/Content/bootstrap/fonts/glyphicons-halflings-regular.svg b/NewLife.Cube/Content/bootstrap/fonts/glyphicons-halflings-regular.svg
deleted file mode 100644
index 94fb5490a2..0000000000
--- a/NewLife.Cube/Content/bootstrap/fonts/glyphicons-halflings-regular.svg
+++ /dev/null
@@ -1,288 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata></metadata>
-<defs>
-<font id="glyphicons_halflingsregular" horiz-adv-x="1200" >
-<font-face units-per-em="1200" ascent="960" descent="-240" />
-<missing-glyph horiz-adv-x="500" />
-<glyph horiz-adv-x="0" />
-<glyph horiz-adv-x="400" />
-<glyph unicode=" " />
-<glyph unicode="*" d="M600 1100q15 0 34 -1.5t30 -3.5l11 -1q10 -2 17.5 -10.5t7.5 -18.5v-224l158 158q7 7 18 8t19 -6l106 -106q7 -8 6 -19t-8 -18l-158 -158h224q10 0 18.5 -7.5t10.5 -17.5q6 -41 6 -75q0 -15 -1.5 -34t-3.5 -30l-1 -11q-2 -10 -10.5 -17.5t-18.5 -7.5h-224l158 -158 q7 -7 8 -18t-6 -19l-106 -106q-8 -7 -19 -6t-18 8l-158 158v-224q0 -10 -7.5 -18.5t-17.5 -10.5q-41 -6 -75 -6q-15 0 -34 1.5t-30 3.5l-11 1q-10 2 -17.5 10.5t-7.5 18.5v224l-158 -158q-7 -7 -18 -8t-19 6l-106 106q-7 8 -6 19t8 18l158 158h-224q-10 0 -18.5 7.5 t-10.5 17.5q-6 41 -6 75q0 15 1.5 34t3.5 30l1 11q2 10 10.5 17.5t18.5 7.5h224l-158 158q-7 7 -8 18t6 19l106 106q8 7 19 6t18 -8l158 -158v224q0 10 7.5 18.5t17.5 10.5q41 6 75 6z" />
-<glyph unicode="+" d="M450 1100h200q21 0 35.5 -14.5t14.5 -35.5v-350h350q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-350v-350q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v350h-350q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5 h350v350q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xa0;" />
-<glyph unicode="&#xa5;" d="M825 1100h250q10 0 12.5 -5t-5.5 -13l-364 -364q-6 -6 -11 -18h268q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-125v-100h275q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-125v-174q0 -11 -7.5 -18.5t-18.5 -7.5h-148q-11 0 -18.5 7.5t-7.5 18.5v174 h-275q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h125v100h-275q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h118q-5 12 -11 18l-364 364q-8 8 -5.5 13t12.5 5h250q25 0 43 -18l164 -164q8 -8 18 -8t18 8l164 164q18 18 43 18z" />
-<glyph unicode="&#x2000;" horiz-adv-x="650" />
-<glyph unicode="&#x2001;" horiz-adv-x="1300" />
-<glyph unicode="&#x2002;" horiz-adv-x="650" />
-<glyph unicode="&#x2003;" horiz-adv-x="1300" />
-<glyph unicode="&#x2004;" horiz-adv-x="433" />
-<glyph unicode="&#x2005;" horiz-adv-x="325" />
-<glyph unicode="&#x2006;" horiz-adv-x="216" />
-<glyph unicode="&#x2007;" horiz-adv-x="216" />
-<glyph unicode="&#x2008;" horiz-adv-x="162" />
-<glyph unicode="&#x2009;" horiz-adv-x="260" />
-<glyph unicode="&#x200a;" horiz-adv-x="72" />
-<glyph unicode="&#x202f;" horiz-adv-x="260" />
-<glyph unicode="&#x205f;" horiz-adv-x="325" />
-<glyph unicode="&#x20ac;" d="M744 1198q242 0 354 -189q60 -104 66 -209h-181q0 45 -17.5 82.5t-43.5 61.5t-58 40.5t-60.5 24t-51.5 7.5q-19 0 -40.5 -5.5t-49.5 -20.5t-53 -38t-49 -62.5t-39 -89.5h379l-100 -100h-300q-6 -50 -6 -100h406l-100 -100h-300q9 -74 33 -132t52.5 -91t61.5 -54.5t59 -29 t47 -7.5q22 0 50.5 7.5t60.5 24.5t58 41t43.5 61t17.5 80h174q-30 -171 -128 -278q-107 -117 -274 -117q-206 0 -324 158q-36 48 -69 133t-45 204h-217l100 100h112q1 47 6 100h-218l100 100h134q20 87 51 153.5t62 103.5q117 141 297 141z" />
-<glyph unicode="&#x20bd;" d="M428 1200h350q67 0 120 -13t86 -31t57 -49.5t35 -56.5t17 -64.5t6.5 -60.5t0.5 -57v-16.5v-16.5q0 -36 -0.5 -57t-6.5 -61t-17 -65t-35 -57t-57 -50.5t-86 -31.5t-120 -13h-178l-2 -100h288q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-138v-175q0 -11 -5.5 -18 t-15.5 -7h-149q-10 0 -17.5 7.5t-7.5 17.5v175h-267q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h117v100h-267q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h117v475q0 10 7.5 17.5t17.5 7.5zM600 1000v-300h203q64 0 86.5 33t22.5 119q0 84 -22.5 116t-86.5 32h-203z" />
-<glyph unicode="&#x2212;" d="M250 700h800q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#x231b;" d="M1000 1200v-150q0 -21 -14.5 -35.5t-35.5 -14.5h-50v-100q0 -91 -49.5 -165.5t-130.5 -109.5q81 -35 130.5 -109.5t49.5 -165.5v-150h50q21 0 35.5 -14.5t14.5 -35.5v-150h-800v150q0 21 14.5 35.5t35.5 14.5h50v150q0 91 49.5 165.5t130.5 109.5q-81 35 -130.5 109.5 t-49.5 165.5v100h-50q-21 0 -35.5 14.5t-14.5 35.5v150h800zM400 1000v-100q0 -60 32.5 -109.5t87.5 -73.5q28 -12 44 -37t16 -55t-16 -55t-44 -37q-55 -24 -87.5 -73.5t-32.5 -109.5v-150h400v150q0 60 -32.5 109.5t-87.5 73.5q-28 12 -44 37t-16 55t16 55t44 37 q55 24 87.5 73.5t32.5 109.5v100h-400z" />
-<glyph unicode="&#x25fc;" horiz-adv-x="500" d="M0 0z" />
-<glyph unicode="&#x2601;" d="M503 1089q110 0 200.5 -59.5t134.5 -156.5q44 14 90 14q120 0 205 -86.5t85 -206.5q0 -121 -85 -207.5t-205 -86.5h-750q-79 0 -135.5 57t-56.5 137q0 69 42.5 122.5t108.5 67.5q-2 12 -2 37q0 153 108 260.5t260 107.5z" />
-<glyph unicode="&#x26fa;" d="M774 1193.5q16 -9.5 20.5 -27t-5.5 -33.5l-136 -187l467 -746h30q20 0 35 -18.5t15 -39.5v-42h-1200v42q0 21 15 39.5t35 18.5h30l468 746l-135 183q-10 16 -5.5 34t20.5 28t34 5.5t28 -20.5l111 -148l112 150q9 16 27 20.5t34 -5zM600 200h377l-182 112l-195 534v-646z " />
-<glyph unicode="&#x2709;" d="M25 1100h1150q10 0 12.5 -5t-5.5 -13l-564 -567q-8 -8 -18 -8t-18 8l-564 567q-8 8 -5.5 13t12.5 5zM18 882l264 -264q8 -8 8 -18t-8 -18l-264 -264q-8 -8 -13 -5.5t-5 12.5v550q0 10 5 12.5t13 -5.5zM918 618l264 264q8 8 13 5.5t5 -12.5v-550q0 -10 -5 -12.5t-13 5.5 l-264 264q-8 8 -8 18t8 18zM818 482l364 -364q8 -8 5.5 -13t-12.5 -5h-1150q-10 0 -12.5 5t5.5 13l364 364q8 8 18 8t18 -8l164 -164q8 -8 18 -8t18 8l164 164q8 8 18 8t18 -8z" />
-<glyph unicode="&#x270f;" d="M1011 1210q19 0 33 -13l153 -153q13 -14 13 -33t-13 -33l-99 -92l-214 214l95 96q13 14 32 14zM1013 800l-615 -614l-214 214l614 614zM317 96l-333 -112l110 335z" />
-<glyph unicode="&#xe001;" d="M700 650v-550h250q21 0 35.5 -14.5t14.5 -35.5v-50h-800v50q0 21 14.5 35.5t35.5 14.5h250v550l-500 550h1200z" />
-<glyph unicode="&#xe002;" d="M368 1017l645 163q39 15 63 0t24 -49v-831q0 -55 -41.5 -95.5t-111.5 -63.5q-79 -25 -147 -4.5t-86 75t25.5 111.5t122.5 82q72 24 138 8v521l-600 -155v-606q0 -42 -44 -90t-109 -69q-79 -26 -147 -5.5t-86 75.5t25.5 111.5t122.5 82.5q72 24 138 7v639q0 38 14.5 59 t53.5 34z" />
-<glyph unicode="&#xe003;" d="M500 1191q100 0 191 -39t156.5 -104.5t104.5 -156.5t39 -191l-1 -2l1 -5q0 -141 -78 -262l275 -274q23 -26 22.5 -44.5t-22.5 -42.5l-59 -58q-26 -20 -46.5 -20t-39.5 20l-275 274q-119 -77 -261 -77l-5 1l-2 -1q-100 0 -191 39t-156.5 104.5t-104.5 156.5t-39 191 t39 191t104.5 156.5t156.5 104.5t191 39zM500 1022q-88 0 -162 -43t-117 -117t-43 -162t43 -162t117 -117t162 -43t162 43t117 117t43 162t-43 162t-117 117t-162 43z" />
-<glyph unicode="&#xe005;" d="M649 949q48 68 109.5 104t121.5 38.5t118.5 -20t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-150 152.5t-126.5 127.5t-93.5 124.5t-33.5 117.5q0 64 28 123t73 100.5t104 64t119 20 t120.5 -38.5t104.5 -104z" />
-<glyph unicode="&#xe006;" d="M407 800l131 353q7 19 17.5 19t17.5 -19l129 -353h421q21 0 24 -8.5t-14 -20.5l-342 -249l130 -401q7 -20 -0.5 -25.5t-24.5 6.5l-343 246l-342 -247q-17 -12 -24.5 -6.5t-0.5 25.5l130 400l-347 251q-17 12 -14 20.5t23 8.5h429z" />
-<glyph unicode="&#xe007;" d="M407 800l131 353q7 19 17.5 19t17.5 -19l129 -353h421q21 0 24 -8.5t-14 -20.5l-342 -249l130 -401q7 -20 -0.5 -25.5t-24.5 6.5l-343 246l-342 -247q-17 -12 -24.5 -6.5t-0.5 25.5l130 400l-347 251q-17 12 -14 20.5t23 8.5h429zM477 700h-240l197 -142l-74 -226 l193 139l195 -140l-74 229l192 140h-234l-78 211z" />
-<glyph unicode="&#xe008;" d="M600 1200q124 0 212 -88t88 -212v-250q0 -46 -31 -98t-69 -52v-75q0 -10 6 -21.5t15 -17.5l358 -230q9 -5 15 -16.5t6 -21.5v-93q0 -10 -7.5 -17.5t-17.5 -7.5h-1150q-10 0 -17.5 7.5t-7.5 17.5v93q0 10 6 21.5t15 16.5l358 230q9 6 15 17.5t6 21.5v75q-38 0 -69 52 t-31 98v250q0 124 88 212t212 88z" />
-<glyph unicode="&#xe009;" d="M25 1100h1150q10 0 17.5 -7.5t7.5 -17.5v-1050q0 -10 -7.5 -17.5t-17.5 -7.5h-1150q-10 0 -17.5 7.5t-7.5 17.5v1050q0 10 7.5 17.5t17.5 7.5zM100 1000v-100h100v100h-100zM875 1000h-550q-10 0 -17.5 -7.5t-7.5 -17.5v-350q0 -10 7.5 -17.5t17.5 -7.5h550 q10 0 17.5 7.5t7.5 17.5v350q0 10 -7.5 17.5t-17.5 7.5zM1000 1000v-100h100v100h-100zM100 800v-100h100v100h-100zM1000 800v-100h100v100h-100zM100 600v-100h100v100h-100zM1000 600v-100h100v100h-100zM875 500h-550q-10 0 -17.5 -7.5t-7.5 -17.5v-350q0 -10 7.5 -17.5 t17.5 -7.5h550q10 0 17.5 7.5t7.5 17.5v350q0 10 -7.5 17.5t-17.5 7.5zM100 400v-100h100v100h-100zM1000 400v-100h100v100h-100zM100 200v-100h100v100h-100zM1000 200v-100h100v100h-100z" />
-<glyph unicode="&#xe010;" d="M50 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM650 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400 q0 21 14.5 35.5t35.5 14.5zM50 500h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM650 500h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe011;" d="M50 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200 q0 21 14.5 35.5t35.5 14.5zM850 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200 q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM850 700h200q21 0 35.5 -14.5t14.5 -35.5v-200 q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 300h200 q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM850 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5 t35.5 14.5z" />
-<glyph unicode="&#xe012;" d="M50 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 1100h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v200 q0 21 14.5 35.5t35.5 14.5zM50 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 700h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700 q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 300h700q21 0 35.5 -14.5t14.5 -35.5v-200 q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe013;" d="M465 477l571 571q8 8 18 8t17 -8l177 -177q8 -7 8 -17t-8 -18l-783 -784q-7 -8 -17.5 -8t-17.5 8l-384 384q-8 8 -8 18t8 17l177 177q7 8 17 8t18 -8l171 -171q7 -7 18 -7t18 7z" />
-<glyph unicode="&#xe014;" d="M904 1083l178 -179q8 -8 8 -18.5t-8 -17.5l-267 -268l267 -268q8 -7 8 -17.5t-8 -18.5l-178 -178q-8 -8 -18.5 -8t-17.5 8l-268 267l-268 -267q-7 -8 -17.5 -8t-18.5 8l-178 178q-8 8 -8 18.5t8 17.5l267 268l-267 268q-8 7 -8 17.5t8 18.5l178 178q8 8 18.5 8t17.5 -8 l268 -267l268 268q7 7 17.5 7t18.5 -7z" />
-<glyph unicode="&#xe015;" d="M507 1177q98 0 187.5 -38.5t154.5 -103.5t103.5 -154.5t38.5 -187.5q0 -141 -78 -262l300 -299q8 -8 8 -18.5t-8 -18.5l-109 -108q-7 -8 -17.5 -8t-18.5 8l-300 299q-119 -77 -261 -77q-98 0 -188 38.5t-154.5 103t-103 154.5t-38.5 188t38.5 187.5t103 154.5 t154.5 103.5t188 38.5zM506.5 1023q-89.5 0 -165.5 -44t-120 -120.5t-44 -166t44 -165.5t120 -120t165.5 -44t166 44t120.5 120t44 165.5t-44 166t-120.5 120.5t-166 44zM425 900h150q10 0 17.5 -7.5t7.5 -17.5v-75h75q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5 t-17.5 -7.5h-75v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-75q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h75v75q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="&#xe016;" d="M507 1177q98 0 187.5 -38.5t154.5 -103.5t103.5 -154.5t38.5 -187.5q0 -141 -78 -262l300 -299q8 -8 8 -18.5t-8 -18.5l-109 -108q-7 -8 -17.5 -8t-18.5 8l-300 299q-119 -77 -261 -77q-98 0 -188 38.5t-154.5 103t-103 154.5t-38.5 188t38.5 187.5t103 154.5 t154.5 103.5t188 38.5zM506.5 1023q-89.5 0 -165.5 -44t-120 -120.5t-44 -166t44 -165.5t120 -120t165.5 -44t166 44t120.5 120t44 165.5t-44 166t-120.5 120.5t-166 44zM325 800h350q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-350q-10 0 -17.5 7.5 t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="&#xe017;" d="M550 1200h100q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM800 975v166q167 -62 272 -209.5t105 -331.5q0 -117 -45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5 t-184.5 123t-123 184.5t-45.5 224q0 184 105 331.5t272 209.5v-166q-103 -55 -165 -155t-62 -220q0 -116 57 -214.5t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5q0 120 -62 220t-165 155z" />
-<glyph unicode="&#xe018;" d="M1025 1200h150q10 0 17.5 -7.5t7.5 -17.5v-1150q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v1150q0 10 7.5 17.5t17.5 7.5zM725 800h150q10 0 17.5 -7.5t7.5 -17.5v-750q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v750 q0 10 7.5 17.5t17.5 7.5zM425 500h150q10 0 17.5 -7.5t7.5 -17.5v-450q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v450q0 10 7.5 17.5t17.5 7.5zM125 300h150q10 0 17.5 -7.5t7.5 -17.5v-250q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5 v250q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="&#xe019;" d="M600 1174q33 0 74 -5l38 -152l5 -1q49 -14 94 -39l5 -2l134 80q61 -48 104 -105l-80 -134l3 -5q25 -44 39 -93l1 -6l152 -38q5 -43 5 -73q0 -34 -5 -74l-152 -38l-1 -6q-15 -49 -39 -93l-3 -5l80 -134q-48 -61 -104 -105l-134 81l-5 -3q-44 -25 -94 -39l-5 -2l-38 -151 q-43 -5 -74 -5q-33 0 -74 5l-38 151l-5 2q-49 14 -94 39l-5 3l-134 -81q-60 48 -104 105l80 134l-3 5q-25 45 -38 93l-2 6l-151 38q-6 42 -6 74q0 33 6 73l151 38l2 6q13 48 38 93l3 5l-80 134q47 61 105 105l133 -80l5 2q45 25 94 39l5 1l38 152q43 5 74 5zM600 815 q-89 0 -152 -63t-63 -151.5t63 -151.5t152 -63t152 63t63 151.5t-63 151.5t-152 63z" />
-<glyph unicode="&#xe020;" d="M500 1300h300q41 0 70.5 -29.5t29.5 -70.5v-100h275q10 0 17.5 -7.5t7.5 -17.5v-75h-1100v75q0 10 7.5 17.5t17.5 7.5h275v100q0 41 29.5 70.5t70.5 29.5zM500 1200v-100h300v100h-300zM1100 900v-800q0 -41 -29.5 -70.5t-70.5 -29.5h-700q-41 0 -70.5 29.5t-29.5 70.5 v800h900zM300 800v-700h100v700h-100zM500 800v-700h100v700h-100zM700 800v-700h100v700h-100zM900 800v-700h100v700h-100z" />
-<glyph unicode="&#xe021;" d="M18 618l620 608q8 7 18.5 7t17.5 -7l608 -608q8 -8 5.5 -13t-12.5 -5h-175v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v375h-300v-375q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v575h-175q-10 0 -12.5 5t5.5 13z" />
-<glyph unicode="&#xe022;" d="M600 1200v-400q0 -41 29.5 -70.5t70.5 -29.5h300v-650q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v1100q0 21 14.5 35.5t35.5 14.5h450zM1000 800h-250q-21 0 -35.5 14.5t-14.5 35.5v250z" />
-<glyph unicode="&#xe023;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM525 900h50q10 0 17.5 -7.5t7.5 -17.5v-275h175q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="&#xe024;" d="M1300 0h-538l-41 400h-242l-41 -400h-538l431 1200h209l-21 -300h162l-20 300h208zM515 800l-27 -300h224l-27 300h-170z" />
-<glyph unicode="&#xe025;" d="M550 1200h200q21 0 35.5 -14.5t14.5 -35.5v-450h191q20 0 25.5 -11.5t-7.5 -27.5l-327 -400q-13 -16 -32 -16t-32 16l-327 400q-13 16 -7.5 27.5t25.5 11.5h191v450q0 21 14.5 35.5t35.5 14.5zM1125 400h50q10 0 17.5 -7.5t7.5 -17.5v-350q0 -10 -7.5 -17.5t-17.5 -7.5 h-1050q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h50q10 0 17.5 -7.5t7.5 -17.5v-175h900v175q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="&#xe026;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM525 900h150q10 0 17.5 -7.5t7.5 -17.5v-275h137q21 0 26 -11.5t-8 -27.5l-223 -275q-13 -16 -32 -16t-32 16l-223 275q-13 16 -8 27.5t26 11.5h137v275q0 10 7.5 17.5t17.5 7.5z " />
-<glyph unicode="&#xe027;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM632 914l223 -275q13 -16 8 -27.5t-26 -11.5h-137v-275q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v275h-137q-21 0 -26 11.5t8 27.5l223 275q13 16 32 16 t32 -16z" />
-<glyph unicode="&#xe028;" d="M225 1200h750q10 0 19.5 -7t12.5 -17l186 -652q7 -24 7 -49v-425q0 -12 -4 -27t-9 -17q-12 -6 -37 -6h-1100q-12 0 -27 4t-17 8q-6 13 -6 38l1 425q0 25 7 49l185 652q3 10 12.5 17t19.5 7zM878 1000h-556q-10 0 -19 -7t-11 -18l-87 -450q-2 -11 4 -18t16 -7h150 q10 0 19.5 -7t11.5 -17l38 -152q2 -10 11.5 -17t19.5 -7h250q10 0 19.5 7t11.5 17l38 152q2 10 11.5 17t19.5 7h150q10 0 16 7t4 18l-87 450q-2 11 -11 18t-19 7z" />
-<glyph unicode="&#xe029;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM540 820l253 -190q17 -12 17 -30t-17 -30l-253 -190q-16 -12 -28 -6.5t-12 26.5v400q0 21 12 26.5t28 -6.5z" />
-<glyph unicode="&#xe030;" d="M947 1060l135 135q7 7 12.5 5t5.5 -13v-362q0 -10 -7.5 -17.5t-17.5 -7.5h-362q-11 0 -13 5.5t5 12.5l133 133q-109 76 -238 76q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5h150q0 -117 -45.5 -224 t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5q192 0 347 -117z" />
-<glyph unicode="&#xe031;" d="M947 1060l135 135q7 7 12.5 5t5.5 -13v-361q0 -11 -7.5 -18.5t-18.5 -7.5h-361q-11 0 -13 5.5t5 12.5l134 134q-110 75 -239 75q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5h-150q0 117 45.5 224t123 184.5t184.5 123t224 45.5q192 0 347 -117zM1027 600h150 q0 -117 -45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5q-192 0 -348 118l-134 -134q-7 -8 -12.5 -5.5t-5.5 12.5v360q0 11 7.5 18.5t18.5 7.5h360q10 0 12.5 -5.5t-5.5 -12.5l-133 -133q110 -76 240 -76q116 0 214.5 57t155.5 155.5t57 214.5z" />
-<glyph unicode="&#xe032;" d="M125 1200h1050q10 0 17.5 -7.5t7.5 -17.5v-1150q0 -10 -7.5 -17.5t-17.5 -7.5h-1050q-10 0 -17.5 7.5t-7.5 17.5v1150q0 10 7.5 17.5t17.5 7.5zM1075 1000h-850q-10 0 -17.5 -7.5t-7.5 -17.5v-850q0 -10 7.5 -17.5t17.5 -7.5h850q10 0 17.5 7.5t7.5 17.5v850 q0 10 -7.5 17.5t-17.5 7.5zM325 900h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 900h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 700h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 700h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 500h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 500h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 300h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 300h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="&#xe033;" d="M900 800v200q0 83 -58.5 141.5t-141.5 58.5h-300q-82 0 -141 -59t-59 -141v-200h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-600q0 -41 29.5 -70.5t70.5 -29.5h900q41 0 70.5 29.5t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5h-100zM400 800v150q0 21 15 35.5t35 14.5h200 q20 0 35 -14.5t15 -35.5v-150h-300z" />
-<glyph unicode="&#xe034;" d="M125 1100h50q10 0 17.5 -7.5t7.5 -17.5v-1075h-100v1075q0 10 7.5 17.5t17.5 7.5zM1075 1052q4 0 9 -2q16 -6 16 -23v-421q0 -6 -3 -12q-33 -59 -66.5 -99t-65.5 -58t-56.5 -24.5t-52.5 -6.5q-26 0 -57.5 6.5t-52.5 13.5t-60 21q-41 15 -63 22.5t-57.5 15t-65.5 7.5 q-85 0 -160 -57q-7 -5 -15 -5q-6 0 -11 3q-14 7 -14 22v438q22 55 82 98.5t119 46.5q23 2 43 0.5t43 -7t32.5 -8.5t38 -13t32.5 -11q41 -14 63.5 -21t57 -14t63.5 -7q103 0 183 87q7 8 18 8z" />
-<glyph unicode="&#xe035;" d="M600 1175q116 0 227 -49.5t192.5 -131t131 -192.5t49.5 -227v-300q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v300q0 127 -70.5 231.5t-184.5 161.5t-245 57t-245 -57t-184.5 -161.5t-70.5 -231.5v-300q0 -10 -7.5 -17.5t-17.5 -7.5h-50 q-10 0 -17.5 7.5t-7.5 17.5v300q0 116 49.5 227t131 192.5t192.5 131t227 49.5zM220 500h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14v460q0 8 6 14t14 6zM820 500h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14v460 q0 8 6 14t14 6z" />
-<glyph unicode="&#xe036;" d="M321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM900 668l120 120q7 7 17 7t17 -7l34 -34q7 -7 7 -17t-7 -17l-120 -120l120 -120q7 -7 7 -17 t-7 -17l-34 -34q-7 -7 -17 -7t-17 7l-120 119l-120 -119q-7 -7 -17 -7t-17 7l-34 34q-7 7 -7 17t7 17l119 120l-119 120q-7 7 -7 17t7 17l34 34q7 8 17 8t17 -8z" />
-<glyph unicode="&#xe037;" d="M321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM766 900h4q10 -1 16 -10q96 -129 96 -290q0 -154 -90 -281q-6 -9 -17 -10l-3 -1q-9 0 -16 6 l-29 23q-7 7 -8.5 16.5t4.5 17.5q72 103 72 229q0 132 -78 238q-6 8 -4.5 18t9.5 17l29 22q7 5 15 5z" />
-<glyph unicode="&#xe038;" d="M967 1004h3q11 -1 17 -10q135 -179 135 -396q0 -105 -34 -206.5t-98 -185.5q-7 -9 -17 -10h-3q-9 0 -16 6l-42 34q-8 6 -9 16t5 18q111 150 111 328q0 90 -29.5 176t-84.5 157q-6 9 -5 19t10 16l42 33q7 5 15 5zM321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5 t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM766 900h4q10 -1 16 -10q96 -129 96 -290q0 -154 -90 -281q-6 -9 -17 -10l-3 -1q-9 0 -16 6l-29 23q-7 7 -8.5 16.5t4.5 17.5q72 103 72 229q0 132 -78 238 q-6 8 -4.5 18.5t9.5 16.5l29 22q7 5 15 5z" />
-<glyph unicode="&#xe039;" d="M500 900h100v-100h-100v-100h-400v-100h-100v600h500v-300zM1200 700h-200v-100h200v-200h-300v300h-200v300h-100v200h600v-500zM100 1100v-300h300v300h-300zM800 1100v-300h300v300h-300zM300 900h-100v100h100v-100zM1000 900h-100v100h100v-100zM300 500h200v-500 h-500v500h200v100h100v-100zM800 300h200v-100h-100v-100h-200v100h-100v100h100v200h-200v100h300v-300zM100 400v-300h300v300h-300zM300 200h-100v100h100v-100zM1200 200h-100v100h100v-100zM700 0h-100v100h100v-100zM1200 0h-300v100h300v-100z" />
-<glyph unicode="&#xe040;" d="M100 200h-100v1000h100v-1000zM300 200h-100v1000h100v-1000zM700 200h-200v1000h200v-1000zM900 200h-100v1000h100v-1000zM1200 200h-200v1000h200v-1000zM400 0h-300v100h300v-100zM600 0h-100v91h100v-91zM800 0h-100v91h100v-91zM1100 0h-200v91h200v-91z" />
-<glyph unicode="&#xe041;" d="M500 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-682 682l1 475q0 10 7.5 17.5t17.5 7.5h474zM319.5 1024.5q-29.5 29.5 -71 29.5t-71 -29.5t-29.5 -71.5t29.5 -71.5t71 -29.5t71 29.5t29.5 71.5t-29.5 71.5z" />
-<glyph unicode="&#xe042;" d="M500 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-682 682l1 475q0 10 7.5 17.5t17.5 7.5h474zM800 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-56 56l424 426l-700 700h150zM319.5 1024.5q-29.5 29.5 -71 29.5t-71 -29.5 t-29.5 -71.5t29.5 -71.5t71 -29.5t71 29.5t29.5 71.5t-29.5 71.5z" />
-<glyph unicode="&#xe043;" d="M300 1200h825q75 0 75 -75v-900q0 -25 -18 -43l-64 -64q-8 -8 -13 -5.5t-5 12.5v950q0 10 -7.5 17.5t-17.5 7.5h-700q-25 0 -43 -18l-64 -64q-8 -8 -5.5 -13t12.5 -5h700q10 0 17.5 -7.5t7.5 -17.5v-950q0 -10 -7.5 -17.5t-17.5 -7.5h-850q-10 0 -17.5 7.5t-7.5 17.5v975 q0 25 18 43l139 139q18 18 43 18z" />
-<glyph unicode="&#xe044;" d="M250 1200h800q21 0 35.5 -14.5t14.5 -35.5v-1150l-450 444l-450 -445v1151q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe045;" d="M822 1200h-444q-11 0 -19 -7.5t-9 -17.5l-78 -301q-7 -24 7 -45l57 -108q6 -9 17.5 -15t21.5 -6h450q10 0 21.5 6t17.5 15l62 108q14 21 7 45l-83 301q-1 10 -9 17.5t-19 7.5zM1175 800h-150q-10 0 -21 -6.5t-15 -15.5l-78 -156q-4 -9 -15 -15.5t-21 -6.5h-550 q-10 0 -21 6.5t-15 15.5l-78 156q-4 9 -15 15.5t-21 6.5h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-650q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h750q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5 t7.5 17.5v650q0 10 -7.5 17.5t-17.5 7.5zM850 200h-500q-10 0 -19.5 -7t-11.5 -17l-38 -152q-2 -10 3.5 -17t15.5 -7h600q10 0 15.5 7t3.5 17l-38 152q-2 10 -11.5 17t-19.5 7z" />
-<glyph unicode="&#xe046;" d="M500 1100h200q56 0 102.5 -20.5t72.5 -50t44 -59t25 -50.5l6 -20h150q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v600q0 41 29.5 70.5t70.5 29.5h150q2 8 6.5 21.5t24 48t45 61t72 48t102.5 21.5zM900 800v-100 h100v100h-100zM600 730q-95 0 -162.5 -67.5t-67.5 -162.5t67.5 -162.5t162.5 -67.5t162.5 67.5t67.5 162.5t-67.5 162.5t-162.5 67.5zM600 603q43 0 73 -30t30 -73t-30 -73t-73 -30t-73 30t-30 73t30 73t73 30z" />
-<glyph unicode="&#xe047;" d="M681 1199l385 -998q20 -50 60 -92q18 -19 36.5 -29.5t27.5 -11.5l10 -2v-66h-417v66q53 0 75 43.5t5 88.5l-82 222h-391q-58 -145 -92 -234q-11 -34 -6.5 -57t25.5 -37t46 -20t55 -6v-66h-365v66q56 24 84 52q12 12 25 30.5t20 31.5l7 13l399 1006h93zM416 521h340 l-162 457z" />
-<glyph unicode="&#xe048;" d="M753 641q5 -1 14.5 -4.5t36 -15.5t50.5 -26.5t53.5 -40t50.5 -54.5t35.5 -70t14.5 -87q0 -67 -27.5 -125.5t-71.5 -97.5t-98.5 -66.5t-108.5 -40.5t-102 -13h-500v89q41 7 70.5 32.5t29.5 65.5v827q0 24 -0.5 34t-3.5 24t-8.5 19.5t-17 13.5t-28 12.5t-42.5 11.5v71 l471 -1q57 0 115.5 -20.5t108 -57t80.5 -94t31 -124.5q0 -51 -15.5 -96.5t-38 -74.5t-45 -50.5t-38.5 -30.5zM400 700h139q78 0 130.5 48.5t52.5 122.5q0 41 -8.5 70.5t-29.5 55.5t-62.5 39.5t-103.5 13.5h-118v-350zM400 200h216q80 0 121 50.5t41 130.5q0 90 -62.5 154.5 t-156.5 64.5h-159v-400z" />
-<glyph unicode="&#xe049;" d="M877 1200l2 -57q-83 -19 -116 -45.5t-40 -66.5l-132 -839q-9 -49 13 -69t96 -26v-97h-500v97q186 16 200 98l173 832q3 17 3 30t-1.5 22.5t-9 17.5t-13.5 12.5t-21.5 10t-26 8.5t-33.5 10q-13 3 -19 5v57h425z" />
-<glyph unicode="&#xe050;" d="M1300 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-850q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v850h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM175 1000h-75v-800h75l-125 -167l-125 167h75v800h-75l125 167z" />
-<glyph unicode="&#xe051;" d="M1100 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-650q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v650h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM1167 50l-167 -125v75h-800v-75l-167 125l167 125v-75h800v75z" />
-<glyph unicode="&#xe052;" d="M50 1100h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 500h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe053;" d="M250 1100h700q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM250 500h700q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe054;" d="M500 950v100q0 21 14.5 35.5t35.5 14.5h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5zM100 650v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000 q-21 0 -35.5 14.5t-14.5 35.5zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5zM0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100 q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe055;" d="M50 1100h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 500h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe056;" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 1100h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 800h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 500h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 500h800q21 0 35.5 -14.5t14.5 -35.5v-100 q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 200h800 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe057;" d="M400 0h-100v1100h100v-1100zM550 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM550 800h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM267 550l-167 -125v75h-200v100h200v75zM550 500h300q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM550 200h600 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe058;" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM900 0h-100v1100h100v-1100zM50 800h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM1100 600h200v-100h-200v-75l-167 125l167 125v-75zM50 500h300q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h600 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe059;" d="M75 1000h750q31 0 53 -22t22 -53v-650q0 -31 -22 -53t-53 -22h-750q-31 0 -53 22t-22 53v650q0 31 22 53t53 22zM1200 300l-300 300l300 300v-600z" />
-<glyph unicode="&#xe060;" d="M44 1100h1112q18 0 31 -13t13 -31v-1012q0 -18 -13 -31t-31 -13h-1112q-18 0 -31 13t-13 31v1012q0 18 13 31t31 13zM100 1000v-737l247 182l298 -131l-74 156l293 318l236 -288v500h-1000zM342 884q56 0 95 -39t39 -94.5t-39 -95t-95 -39.5t-95 39.5t-39 95t39 94.5 t95 39z" />
-<glyph unicode="&#xe062;" d="M648 1169q117 0 216 -60t156.5 -161t57.5 -218q0 -115 -70 -258q-69 -109 -158 -225.5t-143 -179.5l-54 -62q-9 8 -25.5 24.5t-63.5 67.5t-91 103t-98.5 128t-95.5 148q-60 132 -60 249q0 88 34 169.5t91.5 142t137 96.5t166.5 36zM652.5 974q-91.5 0 -156.5 -65 t-65 -157t65 -156.5t156.5 -64.5t156.5 64.5t65 156.5t-65 157t-156.5 65z" />
-<glyph unicode="&#xe063;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 173v854q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57z" />
-<glyph unicode="&#xe064;" d="M554 1295q21 -72 57.5 -143.5t76 -130t83 -118t82.5 -117t70 -116t49.5 -126t18.5 -136.5q0 -71 -25.5 -135t-68.5 -111t-99 -82t-118.5 -54t-125.5 -23q-84 5 -161.5 34t-139.5 78.5t-99 125t-37 164.5q0 69 18 136.5t49.5 126.5t69.5 116.5t81.5 117.5t83.5 119 t76.5 131t58.5 143zM344 710q-23 -33 -43.5 -70.5t-40.5 -102.5t-17 -123q1 -37 14.5 -69.5t30 -52t41 -37t38.5 -24.5t33 -15q21 -7 32 -1t13 22l6 34q2 10 -2.5 22t-13.5 19q-5 4 -14 12t-29.5 40.5t-32.5 73.5q-26 89 6 271q2 11 -6 11q-8 1 -15 -10z" />
-<glyph unicode="&#xe065;" d="M1000 1013l108 115q2 1 5 2t13 2t20.5 -1t25 -9.5t28.5 -21.5q22 -22 27 -43t0 -32l-6 -10l-108 -115zM350 1100h400q50 0 105 -13l-187 -187h-368q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v182l200 200v-332 q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5zM1009 803l-362 -362l-161 -50l55 170l355 355z" />
-<glyph unicode="&#xe066;" d="M350 1100h361q-164 -146 -216 -200h-195q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5l200 153v-103q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5z M824 1073l339 -301q8 -7 8 -17.5t-8 -17.5l-340 -306q-7 -6 -12.5 -4t-6.5 11v203q-26 1 -54.5 0t-78.5 -7.5t-92 -17.5t-86 -35t-70 -57q10 59 33 108t51.5 81.5t65 58.5t68.5 40.5t67 24.5t56 13.5t40 4.5v210q1 10 6.5 12.5t13.5 -4.5z" />
-<glyph unicode="&#xe067;" d="M350 1100h350q60 0 127 -23l-178 -177h-349q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v69l200 200v-219q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5z M643 639l395 395q7 7 17.5 7t17.5 -7l101 -101q7 -7 7 -17.5t-7 -17.5l-531 -532q-7 -7 -17.5 -7t-17.5 7l-248 248q-7 7 -7 17.5t7 17.5l101 101q7 7 17.5 7t17.5 -7l111 -111q8 -7 18 -7t18 7z" />
-<glyph unicode="&#xe068;" d="M318 918l264 264q8 8 18 8t18 -8l260 -264q7 -8 4.5 -13t-12.5 -5h-170v-200h200v173q0 10 5 12t13 -5l264 -260q8 -7 8 -17.5t-8 -17.5l-264 -265q-8 -7 -13 -5t-5 12v173h-200v-200h170q10 0 12.5 -5t-4.5 -13l-260 -264q-8 -8 -18 -8t-18 8l-264 264q-8 8 -5.5 13 t12.5 5h175v200h-200v-173q0 -10 -5 -12t-13 5l-264 265q-8 7 -8 17.5t8 17.5l264 260q8 7 13 5t5 -12v-173h200v200h-175q-10 0 -12.5 5t5.5 13z" />
-<glyph unicode="&#xe069;" d="M250 1100h100q21 0 35.5 -14.5t14.5 -35.5v-438l464 453q15 14 25.5 10t10.5 -25v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v1000q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe070;" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-438l464 453q15 14 25.5 10t10.5 -25v-438l464 453q15 14 25.5 10t10.5 -25v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5 t-14.5 35.5v1000q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe071;" d="M1200 1050v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -10.5 -25t-25.5 10l-492 480q-15 14 -15 35t15 35l492 480q15 14 25.5 10t10.5 -25v-438l464 453q15 14 25.5 10t10.5 -25z" />
-<glyph unicode="&#xe072;" d="M243 1074l814 -498q18 -11 18 -26t-18 -26l-814 -498q-18 -11 -30.5 -4t-12.5 28v1000q0 21 12.5 28t30.5 -4z" />
-<glyph unicode="&#xe073;" d="M250 1000h200q21 0 35.5 -14.5t14.5 -35.5v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5zM650 1000h200q21 0 35.5 -14.5t14.5 -35.5v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v800 q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe074;" d="M1100 950v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5z" />
-<glyph unicode="&#xe075;" d="M500 612v438q0 21 10.5 25t25.5 -10l492 -480q15 -14 15 -35t-15 -35l-492 -480q-15 -14 -25.5 -10t-10.5 25v438l-464 -453q-15 -14 -25.5 -10t-10.5 25v1000q0 21 10.5 25t25.5 -10z" />
-<glyph unicode="&#xe076;" d="M1048 1102l100 1q20 0 35 -14.5t15 -35.5l5 -1000q0 -21 -14.5 -35.5t-35.5 -14.5l-100 -1q-21 0 -35.5 14.5t-14.5 35.5l-2 437l-463 -454q-14 -15 -24.5 -10.5t-10.5 25.5l-2 437l-462 -455q-15 -14 -25.5 -9.5t-10.5 24.5l-5 1000q0 21 10.5 25.5t25.5 -10.5l466 -450 l-2 438q0 20 10.5 24.5t25.5 -9.5l466 -451l-2 438q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe077;" d="M850 1100h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438l-464 -453q-15 -14 -25.5 -10t-10.5 25v1000q0 21 10.5 25t25.5 -10l464 -453v438q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe078;" d="M686 1081l501 -540q15 -15 10.5 -26t-26.5 -11h-1042q-22 0 -26.5 11t10.5 26l501 540q15 15 36 15t36 -15zM150 400h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe079;" d="M885 900l-352 -353l352 -353l-197 -198l-552 552l552 550z" />
-<glyph unicode="&#xe080;" d="M1064 547l-551 -551l-198 198l353 353l-353 353l198 198z" />
-<glyph unicode="&#xe081;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM650 900h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-150h-150 q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5t35.5 -14.5h150v-150q0 -21 14.5 -35.5t35.5 -14.5h100q21 0 35.5 14.5t14.5 35.5v150h150q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5h-150v150q0 21 -14.5 35.5t-35.5 14.5z" />
-<glyph unicode="&#xe082;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM850 700h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5 t35.5 -14.5h500q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5z" />
-<glyph unicode="&#xe083;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM741.5 913q-12.5 0 -21.5 -9l-120 -120l-120 120q-9 9 -21.5 9 t-21.5 -9l-141 -141q-9 -9 -9 -21.5t9 -21.5l120 -120l-120 -120q-9 -9 -9 -21.5t9 -21.5l141 -141q9 -9 21.5 -9t21.5 9l120 120l120 -120q9 -9 21.5 -9t21.5 9l141 141q9 9 9 21.5t-9 21.5l-120 120l120 120q9 9 9 21.5t-9 21.5l-141 141q-9 9 -21.5 9z" />
-<glyph unicode="&#xe084;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM546 623l-84 85q-7 7 -17.5 7t-18.5 -7l-139 -139q-7 -8 -7 -18t7 -18 l242 -241q7 -8 17.5 -8t17.5 8l375 375q7 7 7 17.5t-7 18.5l-139 139q-7 7 -17.5 7t-17.5 -7z" />
-<glyph unicode="&#xe085;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM588 941q-29 0 -59 -5.5t-63 -20.5t-58 -38.5t-41.5 -63t-16.5 -89.5 q0 -25 20 -25h131q30 -5 35 11q6 20 20.5 28t45.5 8q20 0 31.5 -10.5t11.5 -28.5q0 -23 -7 -34t-26 -18q-1 0 -13.5 -4t-19.5 -7.5t-20 -10.5t-22 -17t-18.5 -24t-15.5 -35t-8 -46q-1 -8 5.5 -16.5t20.5 -8.5h173q7 0 22 8t35 28t37.5 48t29.5 74t12 100q0 47 -17 83 t-42.5 57t-59.5 34.5t-64 18t-59 4.5zM675 400h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5z" />
-<glyph unicode="&#xe086;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM675 1000h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5 t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5zM675 700h-250q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h75v-200h-75q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h350q10 0 17.5 7.5t7.5 17.5v50q0 10 -7.5 17.5 t-17.5 7.5h-75v275q0 10 -7.5 17.5t-17.5 7.5z" />
-<glyph unicode="&#xe087;" d="M525 1200h150q10 0 17.5 -7.5t7.5 -17.5v-194q103 -27 178.5 -102.5t102.5 -178.5h194q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-194q-27 -103 -102.5 -178.5t-178.5 -102.5v-194q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v194 q-103 27 -178.5 102.5t-102.5 178.5h-194q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h194q27 103 102.5 178.5t178.5 102.5v194q0 10 7.5 17.5t17.5 7.5zM700 893v-168q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v168q-68 -23 -119 -74 t-74 -119h168q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-168q23 -68 74 -119t119 -74v168q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-168q68 23 119 74t74 119h-168q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h168 q-23 68 -74 119t-119 74z" />
-<glyph unicode="&#xe088;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM759 823l64 -64q7 -7 7 -17.5t-7 -17.5l-124 -124l124 -124q7 -7 7 -17.5t-7 -17.5l-64 -64q-7 -7 -17.5 -7t-17.5 7l-124 124l-124 -124q-7 -7 -17.5 -7t-17.5 7l-64 64 q-7 7 -7 17.5t7 17.5l124 124l-124 124q-7 7 -7 17.5t7 17.5l64 64q7 7 17.5 7t17.5 -7l124 -124l124 124q7 7 17.5 7t17.5 -7z" />
-<glyph unicode="&#xe089;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM782 788l106 -106q7 -7 7 -17.5t-7 -17.5l-320 -321q-8 -7 -18 -7t-18 7l-202 203q-8 7 -8 17.5t8 17.5l106 106q7 8 17.5 8t17.5 -8l79 -79l197 197q7 7 17.5 7t17.5 -7z" />
-<glyph unicode="&#xe090;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5q0 -120 65 -225 l587 587q-105 65 -225 65zM965 819l-584 -584q104 -62 219 -62q116 0 214.5 57t155.5 155.5t57 214.5q0 115 -62 219z" />
-<glyph unicode="&#xe091;" d="M39 582l522 427q16 13 27.5 8t11.5 -26v-291h550q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-550v-291q0 -21 -11.5 -26t-27.5 8l-522 427q-16 13 -16 32t16 32z" />
-<glyph unicode="&#xe092;" d="M639 1009l522 -427q16 -13 16 -32t-16 -32l-522 -427q-16 -13 -27.5 -8t-11.5 26v291h-550q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h550v291q0 21 11.5 26t27.5 -8z" />
-<glyph unicode="&#xe093;" d="M682 1161l427 -522q13 -16 8 -27.5t-26 -11.5h-291v-550q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v550h-291q-21 0 -26 11.5t8 27.5l427 522q13 16 32 16t32 -16z" />
-<glyph unicode="&#xe094;" d="M550 1200h200q21 0 35.5 -14.5t14.5 -35.5v-550h291q21 0 26 -11.5t-8 -27.5l-427 -522q-13 -16 -32 -16t-32 16l-427 522q-13 16 -8 27.5t26 11.5h291v550q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe095;" d="M639 1109l522 -427q16 -13 16 -32t-16 -32l-522 -427q-16 -13 -27.5 -8t-11.5 26v291q-94 -2 -182 -20t-170.5 -52t-147 -92.5t-100.5 -135.5q5 105 27 193.5t67.5 167t113 135t167 91.5t225.5 42v262q0 21 11.5 26t27.5 -8z" />
-<glyph unicode="&#xe096;" d="M850 1200h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94l-249 -249q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l249 249l-94 94q-14 14 -10 24.5t25 10.5zM350 0h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l249 249 q8 7 18 7t18 -7l106 -106q7 -8 7 -18t-7 -18l-249 -249l94 -94q14 -14 10 -24.5t-25 -10.5z" />
-<glyph unicode="&#xe097;" d="M1014 1120l106 -106q7 -8 7 -18t-7 -18l-249 -249l94 -94q14 -14 10 -24.5t-25 -10.5h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l249 249q8 7 18 7t18 -7zM250 600h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94 l-249 -249q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l249 249l-94 94q-14 14 -10 24.5t25 10.5z" />
-<glyph unicode="&#xe101;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM704 900h-208q-20 0 -32 -14.5t-8 -34.5l58 -302q4 -20 21.5 -34.5 t37.5 -14.5h54q20 0 37.5 14.5t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5zM675 400h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5z" />
-<glyph unicode="&#xe102;" d="M260 1200q9 0 19 -2t15 -4l5 -2q22 -10 44 -23l196 -118q21 -13 36 -24q29 -21 37 -12q11 13 49 35l196 118q22 13 45 23q17 7 38 7q23 0 47 -16.5t37 -33.5l13 -16q14 -21 18 -45l25 -123l8 -44q1 -9 8.5 -14.5t17.5 -5.5h61q10 0 17.5 -7.5t7.5 -17.5v-50 q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 -7.5t-7.5 -17.5v-175h-400v300h-200v-300h-400v175q0 10 -7.5 17.5t-17.5 7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5h61q11 0 18 3t7 8q0 4 9 52l25 128q5 25 19 45q2 3 5 7t13.5 15t21.5 19.5t26.5 15.5 t29.5 7zM915 1079l-166 -162q-7 -7 -5 -12t12 -5h219q10 0 15 7t2 17l-51 149q-3 10 -11 12t-15 -6zM463 917l-177 157q-8 7 -16 5t-11 -12l-51 -143q-3 -10 2 -17t15 -7h231q11 0 12.5 5t-5.5 12zM500 0h-375q-10 0 -17.5 7.5t-7.5 17.5v375h400v-400zM1100 400v-375 q0 -10 -7.5 -17.5t-17.5 -7.5h-375v400h400z" />
-<glyph unicode="&#xe103;" d="M1165 1190q8 3 21 -6.5t13 -17.5q-2 -178 -24.5 -323.5t-55.5 -245.5t-87 -174.5t-102.5 -118.5t-118 -68.5t-118.5 -33t-120 -4.5t-105 9.5t-90 16.5q-61 12 -78 11q-4 1 -12.5 0t-34 -14.5t-52.5 -40.5l-153 -153q-26 -24 -37 -14.5t-11 43.5q0 64 42 102q8 8 50.5 45 t66.5 58q19 17 35 47t13 61q-9 55 -10 102.5t7 111t37 130t78 129.5q39 51 80 88t89.5 63.5t94.5 45t113.5 36t129 31t157.5 37t182 47.5zM1116 1098q-8 9 -22.5 -3t-45.5 -50q-38 -47 -119 -103.5t-142 -89.5l-62 -33q-56 -30 -102 -57t-104 -68t-102.5 -80.5t-85.5 -91 t-64 -104.5q-24 -56 -31 -86t2 -32t31.5 17.5t55.5 59.5q25 30 94 75.5t125.5 77.5t147.5 81q70 37 118.5 69t102 79.5t99 111t86.5 148.5q22 50 24 60t-6 19z" />
-<glyph unicode="&#xe104;" d="M653 1231q-39 -67 -54.5 -131t-10.5 -114.5t24.5 -96.5t47.5 -80t63.5 -62.5t68.5 -46.5t65 -30q-4 7 -17.5 35t-18.5 39.5t-17 39.5t-17 43t-13 42t-9.5 44.5t-2 42t4 43t13.5 39t23 38.5q96 -42 165 -107.5t105 -138t52 -156t13 -159t-19 -149.5q-13 -55 -44 -106.5 t-68 -87t-78.5 -64.5t-72.5 -45t-53 -22q-72 -22 -127 -11q-31 6 -13 19q6 3 17 7q13 5 32.5 21t41 44t38.5 63.5t21.5 81.5t-6.5 94.5t-50 107t-104 115.5q10 -104 -0.5 -189t-37 -140.5t-65 -93t-84 -52t-93.5 -11t-95 24.5q-80 36 -131.5 114t-53.5 171q-2 23 0 49.5 t4.5 52.5t13.5 56t27.5 60t46 64.5t69.5 68.5q-8 -53 -5 -102.5t17.5 -90t34 -68.5t44.5 -39t49 -2q31 13 38.5 36t-4.5 55t-29 64.5t-36 75t-26 75.5q-15 85 2 161.5t53.5 128.5t85.5 92.5t93.5 61t81.5 25.5z" />
-<glyph unicode="&#xe105;" d="M600 1094q82 0 160.5 -22.5t140 -59t116.5 -82.5t94.5 -95t68 -95t42.5 -82.5t14 -57.5t-14 -57.5t-43 -82.5t-68.5 -95t-94.5 -95t-116.5 -82.5t-140 -59t-159.5 -22.5t-159.5 22.5t-140 59t-116.5 82.5t-94.5 95t-68.5 95t-43 82.5t-14 57.5t14 57.5t42.5 82.5t68 95 t94.5 95t116.5 82.5t140 59t160.5 22.5zM888 829q-15 15 -18 12t5 -22q25 -57 25 -119q0 -124 -88 -212t-212 -88t-212 88t-88 212q0 59 23 114q8 19 4.5 22t-17.5 -12q-70 -69 -160 -184q-13 -16 -15 -40.5t9 -42.5q22 -36 47 -71t70 -82t92.5 -81t113 -58.5t133.5 -24.5 t133.5 24t113 58.5t92.5 81.5t70 81.5t47 70.5q11 18 9 42.5t-14 41.5q-90 117 -163 189zM448 727l-35 -36q-15 -15 -19.5 -38.5t4.5 -41.5q37 -68 93 -116q16 -13 38.5 -11t36.5 17l35 34q14 15 12.5 33.5t-16.5 33.5q-44 44 -89 117q-11 18 -28 20t-32 -12z" />
-<glyph unicode="&#xe106;" d="M592 0h-148l31 120q-91 20 -175.5 68.5t-143.5 106.5t-103.5 119t-66.5 110t-22 76q0 21 14 57.5t42.5 82.5t68 95t94.5 95t116.5 82.5t140 59t160.5 22.5q61 0 126 -15l32 121h148zM944 770l47 181q108 -85 176.5 -192t68.5 -159q0 -26 -19.5 -71t-59.5 -102t-93 -112 t-129 -104.5t-158 -75.5l46 173q77 49 136 117t97 131q11 18 9 42.5t-14 41.5q-54 70 -107 130zM310 824q-70 -69 -160 -184q-13 -16 -15 -40.5t9 -42.5q18 -30 39 -60t57 -70.5t74 -73t90 -61t105 -41.5l41 154q-107 18 -178.5 101.5t-71.5 193.5q0 59 23 114q8 19 4.5 22 t-17.5 -12zM448 727l-35 -36q-15 -15 -19.5 -38.5t4.5 -41.5q37 -68 93 -116q16 -13 38.5 -11t36.5 17l12 11l22 86l-3 4q-44 44 -89 117q-11 18 -28 20t-32 -12z" />
-<glyph unicode="&#xe107;" d="M-90 100l642 1066q20 31 48 28.5t48 -35.5l642 -1056q21 -32 7.5 -67.5t-50.5 -35.5h-1294q-37 0 -50.5 34t7.5 66zM155 200h345v75q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-75h345l-445 723zM496 700h208q20 0 32 -14.5t8 -34.5l-58 -252 q-4 -20 -21.5 -34.5t-37.5 -14.5h-54q-20 0 -37.5 14.5t-21.5 34.5l-58 252q-4 20 8 34.5t32 14.5z" />
-<glyph unicode="&#xe108;" d="M650 1200q62 0 106 -44t44 -106v-339l363 -325q15 -14 26 -38.5t11 -44.5v-41q0 -20 -12 -26.5t-29 5.5l-359 249v-263q100 -93 100 -113v-64q0 -21 -13 -29t-32 1l-205 128l-205 -128q-19 -9 -32 -1t-13 29v64q0 20 100 113v263l-359 -249q-17 -12 -29 -5.5t-12 26.5v41 q0 20 11 44.5t26 38.5l363 325v339q0 62 44 106t106 44z" />
-<glyph unicode="&#xe109;" d="M850 1200h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-150h-1100v150q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-50h500v50q0 21 14.5 35.5t35.5 14.5zM1100 800v-750q0 -21 -14.5 -35.5 t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v750h1100zM100 600v-100h100v100h-100zM300 600v-100h100v100h-100zM500 600v-100h100v100h-100zM700 600v-100h100v100h-100zM900 600v-100h100v100h-100zM100 400v-100h100v100h-100zM300 400v-100h100v100h-100zM500 400 v-100h100v100h-100zM700 400v-100h100v100h-100zM900 400v-100h100v100h-100zM100 200v-100h100v100h-100zM300 200v-100h100v100h-100zM500 200v-100h100v100h-100zM700 200v-100h100v100h-100zM900 200v-100h100v100h-100z" />
-<glyph unicode="&#xe110;" d="M1135 1165l249 -230q15 -14 15 -35t-15 -35l-249 -230q-14 -14 -24.5 -10t-10.5 25v150h-159l-600 -600h-291q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h209l600 600h241v150q0 21 10.5 25t24.5 -10zM522 819l-141 -141l-122 122h-209q-21 0 -35.5 14.5 t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h291zM1135 565l249 -230q15 -14 15 -35t-15 -35l-249 -230q-14 -14 -24.5 -10t-10.5 25v150h-241l-181 181l141 141l122 -122h159v150q0 21 10.5 25t24.5 -10z" />
-<glyph unicode="&#xe111;" d="M100 1100h1000q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-596l-304 -300v300h-100q-41 0 -70.5 29.5t-29.5 70.5v600q0 41 29.5 70.5t70.5 29.5z" />
-<glyph unicode="&#xe112;" d="M150 1200h200q21 0 35.5 -14.5t14.5 -35.5v-250h-300v250q0 21 14.5 35.5t35.5 14.5zM850 1200h200q21 0 35.5 -14.5t14.5 -35.5v-250h-300v250q0 21 14.5 35.5t35.5 14.5zM1100 800v-300q0 -41 -3 -77.5t-15 -89.5t-32 -96t-58 -89t-89 -77t-129 -51t-174 -20t-174 20 t-129 51t-89 77t-58 89t-32 96t-15 89.5t-3 77.5v300h300v-250v-27v-42.5t1.5 -41t5 -38t10 -35t16.5 -30t25.5 -24.5t35 -19t46.5 -12t60 -4t60 4.5t46.5 12.5t35 19.5t25 25.5t17 30.5t10 35t5 38t2 40.5t-0.5 42v25v250h300z" />
-<glyph unicode="&#xe113;" d="M1100 411l-198 -199l-353 353l-353 -353l-197 199l551 551z" />
-<glyph unicode="&#xe114;" d="M1101 789l-550 -551l-551 551l198 199l353 -353l353 353z" />
-<glyph unicode="&#xe115;" d="M404 1000h746q21 0 35.5 -14.5t14.5 -35.5v-551h150q21 0 25 -10.5t-10 -24.5l-230 -249q-14 -15 -35 -15t-35 15l-230 249q-14 14 -10 24.5t25 10.5h150v401h-381zM135 984l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-400h385l215 -200h-750q-21 0 -35.5 14.5 t-14.5 35.5v550h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
-<glyph unicode="&#xe116;" d="M56 1200h94q17 0 31 -11t18 -27l38 -162h896q24 0 39 -18.5t10 -42.5l-100 -475q-5 -21 -27 -42.5t-55 -21.5h-633l48 -200h535q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-50q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v50h-300v-50 q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v50h-31q-18 0 -32.5 10t-20.5 19l-5 10l-201 961h-54q-20 0 -35 14.5t-15 35.5t15 35.5t35 14.5z" />
-<glyph unicode="&#xe117;" d="M1200 1000v-100h-1200v100h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500zM0 800h1200v-800h-1200v800z" />
-<glyph unicode="&#xe118;" d="M200 800l-200 -400v600h200q0 41 29.5 70.5t70.5 29.5h300q42 0 71 -29.5t29 -70.5h500v-200h-1000zM1500 700l-300 -700h-1200l300 700h1200z" />
-<glyph unicode="&#xe119;" d="M635 1184l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-601h150q21 0 25 -10.5t-10 -24.5l-230 -249q-14 -15 -35 -15t-35 15l-230 249q-14 14 -10 24.5t25 10.5h150v601h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
-<glyph unicode="&#xe120;" d="M936 864l249 -229q14 -15 14 -35.5t-14 -35.5l-249 -229q-15 -15 -25.5 -10.5t-10.5 24.5v151h-600v-151q0 -20 -10.5 -24.5t-25.5 10.5l-249 229q-14 15 -14 35.5t14 35.5l249 229q15 15 25.5 10.5t10.5 -25.5v-149h600v149q0 21 10.5 25.5t25.5 -10.5z" />
-<glyph unicode="&#xe121;" d="M1169 400l-172 732q-5 23 -23 45.5t-38 22.5h-672q-20 0 -38 -20t-23 -41l-172 -739h1138zM1100 300h-1000q-41 0 -70.5 -29.5t-29.5 -70.5v-100q0 -41 29.5 -70.5t70.5 -29.5h1000q41 0 70.5 29.5t29.5 70.5v100q0 41 -29.5 70.5t-70.5 29.5zM800 100v100h100v-100h-100 zM1000 100v100h100v-100h-100z" />
-<glyph unicode="&#xe122;" d="M1150 1100q21 0 35.5 -14.5t14.5 -35.5v-850q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v850q0 21 14.5 35.5t35.5 14.5zM1000 200l-675 200h-38l47 -276q3 -16 -5.5 -20t-29.5 -4h-7h-84q-20 0 -34.5 14t-18.5 35q-55 337 -55 351v250v6q0 16 1 23.5t6.5 14 t17.5 6.5h200l675 250v-850zM0 750v-250q-4 0 -11 0.5t-24 6t-30 15t-24 30t-11 48.5v50q0 26 10.5 46t25 30t29 16t25.5 7z" />
-<glyph unicode="&#xe123;" d="M553 1200h94q20 0 29 -10.5t3 -29.5l-18 -37q83 -19 144 -82.5t76 -140.5l63 -327l118 -173h17q19 0 33 -14.5t14 -35t-13 -40.5t-31 -27q-8 -4 -23 -9.5t-65 -19.5t-103 -25t-132.5 -20t-158.5 -9q-57 0 -115 5t-104 12t-88.5 15.5t-73.5 17.5t-54.5 16t-35.5 12l-11 4 q-18 8 -31 28t-13 40.5t14 35t33 14.5h17l118 173l63 327q15 77 76 140t144 83l-18 32q-6 19 3.5 32t28.5 13zM498 110q50 -6 102 -6q53 0 102 6q-12 -49 -39.5 -79.5t-62.5 -30.5t-63 30.5t-39 79.5z" />
-<glyph unicode="&#xe124;" d="M800 946l224 78l-78 -224l234 -45l-180 -155l180 -155l-234 -45l78 -224l-224 78l-45 -234l-155 180l-155 -180l-45 234l-224 -78l78 224l-234 45l180 155l-180 155l234 45l-78 224l224 -78l45 234l155 -180l155 180z" />
-<glyph unicode="&#xe125;" d="M650 1200h50q40 0 70 -40.5t30 -84.5v-150l-28 -125h328q40 0 70 -40.5t30 -84.5v-100q0 -45 -29 -74l-238 -344q-16 -24 -38 -40.5t-45 -16.5h-250q-7 0 -42 25t-66 50l-31 25h-61q-45 0 -72.5 18t-27.5 57v400q0 36 20 63l145 196l96 198q13 28 37.5 48t51.5 20z M650 1100l-100 -212l-150 -213v-375h100l136 -100h214l250 375v125h-450l50 225v175h-50zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe126;" d="M600 1100h250q23 0 45 -16.5t38 -40.5l238 -344q29 -29 29 -74v-100q0 -44 -30 -84.5t-70 -40.5h-328q28 -118 28 -125v-150q0 -44 -30 -84.5t-70 -40.5h-50q-27 0 -51.5 20t-37.5 48l-96 198l-145 196q-20 27 -20 63v400q0 39 27.5 57t72.5 18h61q124 100 139 100z M50 1000h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5zM636 1000l-136 -100h-100v-375l150 -213l100 -212h50v175l-50 225h450v125l-250 375h-214z" />
-<glyph unicode="&#xe127;" d="M356 873l363 230q31 16 53 -6l110 -112q13 -13 13.5 -32t-11.5 -34l-84 -121h302q84 0 138 -38t54 -110t-55 -111t-139 -39h-106l-131 -339q-6 -21 -19.5 -41t-28.5 -20h-342q-7 0 -90 81t-83 94v525q0 17 14 35.5t28 28.5zM400 792v-503l100 -89h293l131 339 q6 21 19.5 41t28.5 20h203q21 0 30.5 25t0.5 50t-31 25h-456h-7h-6h-5.5t-6 0.5t-5 1.5t-5 2t-4 2.5t-4 4t-2.5 4.5q-12 25 5 47l146 183l-86 83zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500 q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe128;" d="M475 1103l366 -230q2 -1 6 -3.5t14 -10.5t18 -16.5t14.5 -20t6.5 -22.5v-525q0 -13 -86 -94t-93 -81h-342q-15 0 -28.5 20t-19.5 41l-131 339h-106q-85 0 -139.5 39t-54.5 111t54 110t138 38h302l-85 121q-11 15 -10.5 34t13.5 32l110 112q22 22 53 6zM370 945l146 -183 q17 -22 5 -47q-2 -2 -3.5 -4.5t-4 -4t-4 -2.5t-5 -2t-5 -1.5t-6 -0.5h-6h-6.5h-6h-475v-100h221q15 0 29 -20t20 -41l130 -339h294l106 89v503l-342 236zM1050 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5 v500q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe129;" d="M550 1294q72 0 111 -55t39 -139v-106l339 -131q21 -6 41 -19.5t20 -28.5v-342q0 -7 -81 -90t-94 -83h-525q-17 0 -35.5 14t-28.5 28l-9 14l-230 363q-16 31 6 53l112 110q13 13 32 13.5t34 -11.5l121 -84v302q0 84 38 138t110 54zM600 972v203q0 21 -25 30.5t-50 0.5 t-25 -31v-456v-7v-6v-5.5t-0.5 -6t-1.5 -5t-2 -5t-2.5 -4t-4 -4t-4.5 -2.5q-25 -12 -47 5l-183 146l-83 -86l236 -339h503l89 100v293l-339 131q-21 6 -41 19.5t-20 28.5zM450 200h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe130;" d="M350 1100h500q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5t35.5 -14.5zM600 306v-106q0 -84 -39 -139t-111 -55t-110 54t-38 138v302l-121 -84q-15 -12 -34 -11.5t-32 13.5l-112 110 q-22 22 -6 53l230 363q1 2 3.5 6t10.5 13.5t16.5 17t20 13.5t22.5 6h525q13 0 94 -83t81 -90v-342q0 -15 -20 -28.5t-41 -19.5zM308 900l-236 -339l83 -86l183 146q22 17 47 5q2 -1 4.5 -2.5t4 -4t2.5 -4t2 -5t1.5 -5t0.5 -6v-5.5v-6v-7v-456q0 -22 25 -31t50 0.5t25 30.5 v203q0 15 20 28.5t41 19.5l339 131v293l-89 100h-503z" />
-<glyph unicode="&#xe131;" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM914 632l-275 223q-16 13 -27.5 8t-11.5 -26v-137h-275 q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h275v-137q0 -21 11.5 -26t27.5 8l275 223q16 13 16 32t-16 32z" />
-<glyph unicode="&#xe132;" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM561 855l-275 -223q-16 -13 -16 -32t16 -32l275 -223q16 -13 27.5 -8 t11.5 26v137h275q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5h-275v137q0 21 -11.5 26t-27.5 -8z" />
-<glyph unicode="&#xe133;" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM855 639l-223 275q-13 16 -32 16t-32 -16l-223 -275q-13 -16 -8 -27.5 t26 -11.5h137v-275q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v275h137q21 0 26 11.5t-8 27.5z" />
-<glyph unicode="&#xe134;" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM675 900h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-275h-137q-21 0 -26 -11.5 t8 -27.5l223 -275q13 -16 32 -16t32 16l223 275q13 16 8 27.5t-26 11.5h-137v275q0 10 -7.5 17.5t-17.5 7.5z" />
-<glyph unicode="&#xe135;" d="M600 1176q116 0 222.5 -46t184 -123.5t123.5 -184t46 -222.5t-46 -222.5t-123.5 -184t-184 -123.5t-222.5 -46t-222.5 46t-184 123.5t-123.5 184t-46 222.5t46 222.5t123.5 184t184 123.5t222.5 46zM627 1101q-15 -12 -36.5 -20.5t-35.5 -12t-43 -8t-39 -6.5 q-15 -3 -45.5 0t-45.5 -2q-20 -7 -51.5 -26.5t-34.5 -34.5q-3 -11 6.5 -22.5t8.5 -18.5q-3 -34 -27.5 -91t-29.5 -79q-9 -34 5 -93t8 -87q0 -9 17 -44.5t16 -59.5q12 0 23 -5t23.5 -15t19.5 -14q16 -8 33 -15t40.5 -15t34.5 -12q21 -9 52.5 -32t60 -38t57.5 -11 q7 -15 -3 -34t-22.5 -40t-9.5 -38q13 -21 23 -34.5t27.5 -27.5t36.5 -18q0 -7 -3.5 -16t-3.5 -14t5 -17q104 -2 221 112q30 29 46.5 47t34.5 49t21 63q-13 8 -37 8.5t-36 7.5q-15 7 -49.5 15t-51.5 19q-18 0 -41 -0.5t-43 -1.5t-42 -6.5t-38 -16.5q-51 -35 -66 -12 q-4 1 -3.5 25.5t0.5 25.5q-6 13 -26.5 17.5t-24.5 6.5q1 15 -0.5 30.5t-7 28t-18.5 11.5t-31 -21q-23 -25 -42 4q-19 28 -8 58q6 16 22 22q6 -1 26 -1.5t33.5 -4t19.5 -13.5q7 -12 18 -24t21.5 -20.5t20 -15t15.5 -10.5l5 -3q2 12 7.5 30.5t8 34.5t-0.5 32q-3 18 3.5 29 t18 22.5t15.5 24.5q6 14 10.5 35t8 31t15.5 22.5t34 22.5q-6 18 10 36q8 0 24 -1.5t24.5 -1.5t20 4.5t20.5 15.5q-10 23 -31 42.5t-37.5 29.5t-49 27t-43.5 23q0 1 2 8t3 11.5t1.5 10.5t-1 9.5t-4.5 4.5q31 -13 58.5 -14.5t38.5 2.5l12 5q5 28 -9.5 46t-36.5 24t-50 15 t-41 20q-18 -4 -37 0zM613 994q0 -17 8 -42t17 -45t9 -23q-8 1 -39.5 5.5t-52.5 10t-37 16.5q3 11 16 29.5t16 25.5q10 -10 19 -10t14 6t13.5 14.5t16.5 12.5z" />
-<glyph unicode="&#xe136;" d="M756 1157q164 92 306 -9l-259 -138l145 -232l251 126q6 -89 -34 -156.5t-117 -110.5q-60 -34 -127 -39.5t-126 16.5l-596 -596q-15 -16 -36.5 -16t-36.5 16l-111 110q-15 15 -15 36.5t15 37.5l600 599q-34 101 5.5 201.5t135.5 154.5z" />
-<glyph unicode="&#xe137;" horiz-adv-x="1220" d="M100 1196h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 1096h-200v-100h200v100zM100 796h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 696h-500v-100h500v100zM100 396h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 296h-300v-100h300v100z " />
-<glyph unicode="&#xe138;" d="M150 1200h900q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM700 500v-300l-200 -200v500l-350 500h900z" />
-<glyph unicode="&#xe139;" d="M500 1200h200q41 0 70.5 -29.5t29.5 -70.5v-100h300q41 0 70.5 -29.5t29.5 -70.5v-400h-500v100h-200v-100h-500v400q0 41 29.5 70.5t70.5 29.5h300v100q0 41 29.5 70.5t70.5 29.5zM500 1100v-100h200v100h-200zM1200 400v-200q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5v200h1200z" />
-<glyph unicode="&#xe140;" d="M50 1200h300q21 0 25 -10.5t-10 -24.5l-94 -94l199 -199q7 -8 7 -18t-7 -18l-106 -106q-8 -7 -18 -7t-18 7l-199 199l-94 -94q-14 -14 -24.5 -10t-10.5 25v300q0 21 14.5 35.5t35.5 14.5zM850 1200h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94 l-199 -199q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l199 199l-94 94q-14 14 -10 24.5t25 10.5zM364 470l106 -106q7 -8 7 -18t-7 -18l-199 -199l94 -94q14 -14 10 -24.5t-25 -10.5h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l199 199 q8 7 18 7t18 -7zM1071 271l94 94q14 14 24.5 10t10.5 -25v-300q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -25 10.5t10 24.5l94 94l-199 199q-7 8 -7 18t7 18l106 106q8 7 18 7t18 -7z" />
-<glyph unicode="&#xe141;" d="M596 1192q121 0 231.5 -47.5t190 -127t127 -190t47.5 -231.5t-47.5 -231.5t-127 -190.5t-190 -127t-231.5 -47t-231.5 47t-190.5 127t-127 190.5t-47 231.5t47 231.5t127 190t190.5 127t231.5 47.5zM596 1010q-112 0 -207.5 -55.5t-151 -151t-55.5 -207.5t55.5 -207.5 t151 -151t207.5 -55.5t207.5 55.5t151 151t55.5 207.5t-55.5 207.5t-151 151t-207.5 55.5zM454.5 905q22.5 0 38.5 -16t16 -38.5t-16 -39t-38.5 -16.5t-38.5 16.5t-16 39t16 38.5t38.5 16zM754.5 905q22.5 0 38.5 -16t16 -38.5t-16 -39t-38 -16.5q-14 0 -29 10l-55 -145 q17 -23 17 -51q0 -36 -25.5 -61.5t-61.5 -25.5t-61.5 25.5t-25.5 61.5q0 32 20.5 56.5t51.5 29.5l122 126l1 1q-9 14 -9 28q0 23 16 39t38.5 16zM345.5 709q22.5 0 38.5 -16t16 -38.5t-16 -38.5t-38.5 -16t-38.5 16t-16 38.5t16 38.5t38.5 16zM854.5 709q22.5 0 38.5 -16 t16 -38.5t-16 -38.5t-38.5 -16t-38.5 16t-16 38.5t16 38.5t38.5 16z" />
-<glyph unicode="&#xe142;" d="M546 173l469 470q91 91 99 192q7 98 -52 175.5t-154 94.5q-22 4 -47 4q-34 0 -66.5 -10t-56.5 -23t-55.5 -38t-48 -41.5t-48.5 -47.5q-376 -375 -391 -390q-30 -27 -45 -41.5t-37.5 -41t-32 -46.5t-16 -47.5t-1.5 -56.5q9 -62 53.5 -95t99.5 -33q74 0 125 51l548 548 q36 36 20 75q-7 16 -21.5 26t-32.5 10q-26 0 -50 -23q-13 -12 -39 -38l-341 -338q-15 -15 -35.5 -15.5t-34.5 13.5t-14 34.5t14 34.5q327 333 361 367q35 35 67.5 51.5t78.5 16.5q14 0 29 -1q44 -8 74.5 -35.5t43.5 -68.5q14 -47 2 -96.5t-47 -84.5q-12 -11 -32 -32 t-79.5 -81t-114.5 -115t-124.5 -123.5t-123 -119.5t-96.5 -89t-57 -45q-56 -27 -120 -27q-70 0 -129 32t-93 89q-48 78 -35 173t81 163l511 511q71 72 111 96q91 55 198 55q80 0 152 -33q78 -36 129.5 -103t66.5 -154q17 -93 -11 -183.5t-94 -156.5l-482 -476 q-15 -15 -36 -16t-37 14t-17.5 34t14.5 35z" />
-<glyph unicode="&#xe143;" d="M649 949q48 68 109.5 104t121.5 38.5t118.5 -20t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-150 152.5t-126.5 127.5t-93.5 124.5t-33.5 117.5q0 64 28 123t73 100.5t104 64t119 20 t120.5 -38.5t104.5 -104zM896 972q-33 0 -64.5 -19t-56.5 -46t-47.5 -53.5t-43.5 -45.5t-37.5 -19t-36 19t-40 45.5t-43 53.5t-54 46t-65.5 19q-67 0 -122.5 -55.5t-55.5 -132.5q0 -23 13.5 -51t46 -65t57.5 -63t76 -75l22 -22q15 -14 44 -44t50.5 -51t46 -44t41 -35t23 -12 t23.5 12t42.5 36t46 44t52.5 52t44 43q4 4 12 13q43 41 63.5 62t52 55t46 55t26 46t11.5 44q0 79 -53 133.5t-120 54.5z" />
-<glyph unicode="&#xe144;" d="M776.5 1214q93.5 0 159.5 -66l141 -141q66 -66 66 -160q0 -42 -28 -95.5t-62 -87.5l-29 -29q-31 53 -77 99l-18 18l95 95l-247 248l-389 -389l212 -212l-105 -106l-19 18l-141 141q-66 66 -66 159t66 159l283 283q65 66 158.5 66zM600 706l105 105q10 -8 19 -17l141 -141 q66 -66 66 -159t-66 -159l-283 -283q-66 -66 -159 -66t-159 66l-141 141q-66 66 -66 159.5t66 159.5l55 55q29 -55 75 -102l18 -17l-95 -95l247 -248l389 389z" />
-<glyph unicode="&#xe145;" d="M603 1200q85 0 162 -15t127 -38t79 -48t29 -46v-953q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-41 0 -70.5 29.5t-29.5 70.5v953q0 21 30 46.5t81 48t129 37.5t163 15zM300 1000v-700h600v700h-600zM600 254q-43 0 -73.5 -30.5t-30.5 -73.5t30.5 -73.5t73.5 -30.5t73.5 30.5 t30.5 73.5t-30.5 73.5t-73.5 30.5z" />
-<glyph unicode="&#xe146;" d="M902 1185l283 -282q15 -15 15 -36t-14.5 -35.5t-35.5 -14.5t-35 15l-36 35l-279 -267v-300l-212 210l-308 -307l-280 -203l203 280l307 308l-210 212h300l267 279l-35 36q-15 14 -15 35t14.5 35.5t35.5 14.5t35 -15z" />
-<glyph unicode="&#xe148;" d="M700 1248v-78q38 -5 72.5 -14.5t75.5 -31.5t71 -53.5t52 -84t24 -118.5h-159q-4 36 -10.5 59t-21 45t-40 35.5t-64.5 20.5v-307l64 -13q34 -7 64 -16.5t70 -32t67.5 -52.5t47.5 -80t20 -112q0 -139 -89 -224t-244 -97v-77h-100v79q-150 16 -237 103q-40 40 -52.5 93.5 t-15.5 139.5h139q5 -77 48.5 -126t117.5 -65v335l-27 8q-46 14 -79 26.5t-72 36t-63 52t-40 72.5t-16 98q0 70 25 126t67.5 92t94.5 57t110 27v77h100zM600 754v274q-29 -4 -50 -11t-42 -21.5t-31.5 -41.5t-10.5 -65q0 -29 7 -50.5t16.5 -34t28.5 -22.5t31.5 -14t37.5 -10 q9 -3 13 -4zM700 547v-310q22 2 42.5 6.5t45 15.5t41.5 27t29 42t12 59.5t-12.5 59.5t-38 44.5t-53 31t-66.5 24.5z" />
-<glyph unicode="&#xe149;" d="M561 1197q84 0 160.5 -40t123.5 -109.5t47 -147.5h-153q0 40 -19.5 71.5t-49.5 48.5t-59.5 26t-55.5 9q-37 0 -79 -14.5t-62 -35.5q-41 -44 -41 -101q0 -26 13.5 -63t26.5 -61t37 -66q6 -9 9 -14h241v-100h-197q8 -50 -2.5 -115t-31.5 -95q-45 -62 -99 -112 q34 10 83 17.5t71 7.5q32 1 102 -16t104 -17q83 0 136 30l50 -147q-31 -19 -58 -30.5t-55 -15.5t-42 -4.5t-46 -0.5q-23 0 -76 17t-111 32.5t-96 11.5q-39 -3 -82 -16t-67 -25l-23 -11l-55 145q4 3 16 11t15.5 10.5t13 9t15.5 12t14.5 14t17.5 18.5q48 55 54 126.5 t-30 142.5h-221v100h166q-23 47 -44 104q-7 20 -12 41.5t-6 55.5t6 66.5t29.5 70.5t58.5 71q97 88 263 88z" />
-<glyph unicode="&#xe150;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM935 1184l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-900h-200v900h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
-<glyph unicode="&#xe151;" d="M1000 700h-100v100h-100v-100h-100v500h300v-500zM400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM801 1100v-200h100v200h-100zM1000 350l-200 -250h200v-100h-300v150l200 250h-200v100h300v-150z " />
-<glyph unicode="&#xe152;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1000 1050l-200 -250h200v-100h-300v150l200 250h-200v100h300v-150zM1000 0h-100v100h-100v-100h-100v500h300v-500zM801 400v-200h100v200h-100z " />
-<glyph unicode="&#xe153;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1000 700h-100v400h-100v100h200v-500zM1100 0h-100v100h-200v400h300v-500zM901 400v-200h100v200h-100z" />
-<glyph unicode="&#xe154;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1100 700h-100v100h-200v400h300v-500zM901 1100v-200h100v200h-100zM1000 0h-100v400h-100v100h200v-500z" />
-<glyph unicode="&#xe155;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM900 1000h-200v200h200v-200zM1000 700h-300v200h300v-200zM1100 400h-400v200h400v-200zM1200 100h-500v200h500v-200z" />
-<glyph unicode="&#xe156;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1200 1000h-500v200h500v-200zM1100 700h-400v200h400v-200zM1000 400h-300v200h300v-200zM900 100h-200v200h200v-200z" />
-<glyph unicode="&#xe157;" d="M350 1100h400q162 0 256 -93.5t94 -256.5v-400q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5z" />
-<glyph unicode="&#xe158;" d="M350 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-163 0 -256.5 92.5t-93.5 257.5v400q0 163 94 256.5t256 93.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM440 770l253 -190q17 -12 17 -30t-17 -30l-253 -190q-16 -12 -28 -6.5t-12 26.5v400q0 21 12 26.5t28 -6.5z" />
-<glyph unicode="&#xe159;" d="M350 1100h400q163 0 256.5 -94t93.5 -256v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 163 92.5 256.5t257.5 93.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM350 700h400q21 0 26.5 -12t-6.5 -28l-190 -253q-12 -17 -30 -17t-30 17l-190 253q-12 16 -6.5 28t26.5 12z" />
-<glyph unicode="&#xe160;" d="M350 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -163 -92.5 -256.5t-257.5 -93.5h-400q-163 0 -256.5 94t-93.5 256v400q0 165 92.5 257.5t257.5 92.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM580 693l190 -253q12 -16 6.5 -28t-26.5 -12h-400q-21 0 -26.5 12t6.5 28l190 253q12 17 30 17t30 -17z" />
-<glyph unicode="&#xe161;" d="M550 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h450q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-450q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM338 867l324 -284q16 -14 16 -33t-16 -33l-324 -284q-16 -14 -27 -9t-11 26v150h-250q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h250v150q0 21 11 26t27 -9z" />
-<glyph unicode="&#xe162;" d="M793 1182l9 -9q8 -10 5 -27q-3 -11 -79 -225.5t-78 -221.5l300 1q24 0 32.5 -17.5t-5.5 -35.5q-1 0 -133.5 -155t-267 -312.5t-138.5 -162.5q-12 -15 -26 -15h-9l-9 8q-9 11 -4 32q2 9 42 123.5t79 224.5l39 110h-302q-23 0 -31 19q-10 21 6 41q75 86 209.5 237.5 t228 257t98.5 111.5q9 16 25 16h9z" />
-<glyph unicode="&#xe163;" d="M350 1100h400q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-450q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h450q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400 q0 165 92.5 257.5t257.5 92.5zM938 867l324 -284q16 -14 16 -33t-16 -33l-324 -284q-16 -14 -27 -9t-11 26v150h-250q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h250v150q0 21 11 26t27 -9z" />
-<glyph unicode="&#xe164;" d="M750 1200h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -10.5 -25t-24.5 10l-109 109l-312 -312q-15 -15 -35.5 -15t-35.5 15l-141 141q-15 15 -15 35.5t15 35.5l312 312l-109 109q-14 14 -10 24.5t25 10.5zM456 900h-156q-41 0 -70.5 -29.5t-29.5 -70.5v-500 q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v148l200 200v-298q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5h300z" />
-<glyph unicode="&#xe165;" d="M600 1186q119 0 227.5 -46.5t187 -125t125 -187t46.5 -227.5t-46.5 -227.5t-125 -187t-187 -125t-227.5 -46.5t-227.5 46.5t-187 125t-125 187t-46.5 227.5t46.5 227.5t125 187t187 125t227.5 46.5zM600 1022q-115 0 -212 -56.5t-153.5 -153.5t-56.5 -212t56.5 -212 t153.5 -153.5t212 -56.5t212 56.5t153.5 153.5t56.5 212t-56.5 212t-153.5 153.5t-212 56.5zM600 794q80 0 137 -57t57 -137t-57 -137t-137 -57t-137 57t-57 137t57 137t137 57z" />
-<glyph unicode="&#xe166;" d="M450 1200h200q21 0 35.5 -14.5t14.5 -35.5v-350h245q20 0 25 -11t-9 -26l-383 -426q-14 -15 -33.5 -15t-32.5 15l-379 426q-13 15 -8.5 26t25.5 11h250v350q0 21 14.5 35.5t35.5 14.5zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5z M900 200v-50h100v50h-100z" />
-<glyph unicode="&#xe167;" d="M583 1182l378 -435q14 -15 9 -31t-26 -16h-244v-250q0 -20 -17 -35t-39 -15h-200q-20 0 -32 14.5t-12 35.5v250h-250q-20 0 -25.5 16.5t8.5 31.5l383 431q14 16 33.5 17t33.5 -14zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5z M900 200v-50h100v50h-100z" />
-<glyph unicode="&#xe168;" d="M396 723l369 369q7 7 17.5 7t17.5 -7l139 -139q7 -8 7 -18.5t-7 -17.5l-525 -525q-7 -8 -17.5 -8t-17.5 8l-292 291q-7 8 -7 18t7 18l139 139q8 7 18.5 7t17.5 -7zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50 h-100z" />
-<glyph unicode="&#xe169;" d="M135 1023l142 142q14 14 35 14t35 -14l77 -77l-212 -212l-77 76q-14 15 -14 36t14 35zM655 855l210 210q14 14 24.5 10t10.5 -25l-2 -599q-1 -20 -15.5 -35t-35.5 -15l-597 -1q-21 0 -25 10.5t10 24.5l208 208l-154 155l212 212zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5 v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50h-100z" />
-<glyph unicode="&#xe170;" d="M350 1200l599 -2q20 -1 35 -15.5t15 -35.5l1 -597q0 -21 -10.5 -25t-24.5 10l-208 208l-155 -154l-212 212l155 154l-210 210q-14 14 -10 24.5t25 10.5zM524 512l-76 -77q-15 -14 -36 -14t-35 14l-142 142q-14 14 -14 35t14 35l77 77zM50 300h1000q21 0 35.5 -14.5 t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50h-100z" />
-<glyph unicode="&#xe171;" d="M1200 103l-483 276l-314 -399v423h-399l1196 796v-1096zM483 424v-230l683 953z" />
-<glyph unicode="&#xe172;" d="M1100 1000v-850q0 -21 -14.5 -35.5t-35.5 -14.5h-150v400h-700v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200z" />
-<glyph unicode="&#xe173;" d="M1100 1000l-2 -149l-299 -299l-95 95q-9 9 -21.5 9t-21.5 -9l-149 -147h-312v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM1132 638l106 -106q7 -7 7 -17.5t-7 -17.5l-420 -421q-8 -7 -18 -7 t-18 7l-202 203q-8 7 -8 17.5t8 17.5l106 106q7 8 17.5 8t17.5 -8l79 -79l297 297q7 7 17.5 7t17.5 -7z" />
-<glyph unicode="&#xe174;" d="M1100 1000v-269l-103 -103l-134 134q-15 15 -33.5 16.5t-34.5 -12.5l-266 -266h-329v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM1202 572l70 -70q15 -15 15 -35.5t-15 -35.5l-131 -131 l131 -131q15 -15 15 -35.5t-15 -35.5l-70 -70q-15 -15 -35.5 -15t-35.5 15l-131 131l-131 -131q-15 -15 -35.5 -15t-35.5 15l-70 70q-15 15 -15 35.5t15 35.5l131 131l-131 131q-15 15 -15 35.5t15 35.5l70 70q15 15 35.5 15t35.5 -15l131 -131l131 131q15 15 35.5 15 t35.5 -15z" />
-<glyph unicode="&#xe175;" d="M1100 1000v-300h-350q-21 0 -35.5 -14.5t-14.5 -35.5v-150h-500v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM850 600h100q21 0 35.5 -14.5t14.5 -35.5v-250h150q21 0 25 -10.5t-10 -24.5 l-230 -230q-14 -14 -35 -14t-35 14l-230 230q-14 14 -10 24.5t25 10.5h150v250q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe176;" d="M1100 1000v-400l-165 165q-14 15 -35 15t-35 -15l-263 -265h-402v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM935 565l230 -229q14 -15 10 -25.5t-25 -10.5h-150v-250q0 -20 -14.5 -35 t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35v250h-150q-21 0 -25 10.5t10 25.5l230 229q14 15 35 15t35 -15z" />
-<glyph unicode="&#xe177;" d="M50 1100h1100q21 0 35.5 -14.5t14.5 -35.5v-150h-1200v150q0 21 14.5 35.5t35.5 14.5zM1200 800v-550q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v550h1200zM100 500v-200h400v200h-400z" />
-<glyph unicode="&#xe178;" d="M935 1165l248 -230q14 -14 14 -35t-14 -35l-248 -230q-14 -14 -24.5 -10t-10.5 25v150h-400v200h400v150q0 21 10.5 25t24.5 -10zM200 800h-50q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v-200zM400 800h-100v200h100v-200zM18 435l247 230 q14 14 24.5 10t10.5 -25v-150h400v-200h-400v-150q0 -21 -10.5 -25t-24.5 10l-247 230q-15 14 -15 35t15 35zM900 300h-100v200h100v-200zM1000 500h51q20 0 34.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-34.5 -14.5h-51v200z" />
-<glyph unicode="&#xe179;" d="M862 1073l276 116q25 18 43.5 8t18.5 -41v-1106q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v397q-4 1 -11 5t-24 17.5t-30 29t-24 42t-11 56.5v359q0 31 18.5 65t43.5 52zM550 1200q22 0 34.5 -12.5t14.5 -24.5l1 -13v-450q0 -28 -10.5 -59.5 t-25 -56t-29 -45t-25.5 -31.5l-10 -11v-447q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v447q-4 4 -11 11.5t-24 30.5t-30 46t-24 55t-11 60v450q0 2 0.5 5.5t4 12t8.5 15t14.5 12t22.5 5.5q20 0 32.5 -12.5t14.5 -24.5l3 -13v-350h100v350v5.5t2.5 12 t7 15t15 12t25.5 5.5q23 0 35.5 -12.5t13.5 -24.5l1 -13v-350h100v350q0 2 0.5 5.5t3 12t7 15t15 12t24.5 5.5z" />
-<glyph unicode="&#xe180;" d="M1200 1100v-56q-4 0 -11 -0.5t-24 -3t-30 -7.5t-24 -15t-11 -24v-888q0 -22 25 -34.5t50 -13.5l25 -2v-56h-400v56q75 0 87.5 6.5t12.5 43.5v394h-500v-394q0 -37 12.5 -43.5t87.5 -6.5v-56h-400v56q4 0 11 0.5t24 3t30 7.5t24 15t11 24v888q0 22 -25 34.5t-50 13.5 l-25 2v56h400v-56q-75 0 -87.5 -6.5t-12.5 -43.5v-394h500v394q0 37 -12.5 43.5t-87.5 6.5v56h400z" />
-<glyph unicode="&#xe181;" d="M675 1000h375q21 0 35.5 -14.5t14.5 -35.5v-150h-105l-295 -98v98l-200 200h-400l100 100h375zM100 900h300q41 0 70.5 -29.5t29.5 -70.5v-500q0 -41 -29.5 -70.5t-70.5 -29.5h-300q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5zM100 800v-200h300v200 h-300zM1100 535l-400 -133v163l400 133v-163zM100 500v-200h300v200h-300zM1100 398v-248q0 -21 -14.5 -35.5t-35.5 -14.5h-375l-100 -100h-375l-100 100h400l200 200h105z" />
-<glyph unicode="&#xe182;" d="M17 1007l162 162q17 17 40 14t37 -22l139 -194q14 -20 11 -44.5t-20 -41.5l-119 -118q102 -142 228 -268t267 -227l119 118q17 17 42.5 19t44.5 -12l192 -136q19 -14 22.5 -37.5t-13.5 -40.5l-163 -162q-3 -1 -9.5 -1t-29.5 2t-47.5 6t-62.5 14.5t-77.5 26.5t-90 42.5 t-101.5 60t-111 83t-119 108.5q-74 74 -133.5 150.5t-94.5 138.5t-60 119.5t-34.5 100t-15 74.5t-4.5 48z" />
-<glyph unicode="&#xe183;" d="M600 1100q92 0 175 -10.5t141.5 -27t108.5 -36.5t81.5 -40t53.5 -37t31 -27l9 -10v-200q0 -21 -14.5 -33t-34.5 -9l-202 34q-20 3 -34.5 20t-14.5 38v146q-141 24 -300 24t-300 -24v-146q0 -21 -14.5 -38t-34.5 -20l-202 -34q-20 -3 -34.5 9t-14.5 33v200q3 4 9.5 10.5 t31 26t54 37.5t80.5 39.5t109 37.5t141 26.5t175 10.5zM600 795q56 0 97 -9.5t60 -23.5t30 -28t12 -24l1 -10v-50l365 -303q14 -15 24.5 -40t10.5 -45v-212q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v212q0 20 10.5 45t24.5 40l365 303v50 q0 4 1 10.5t12 23t30 29t60 22.5t97 10z" />
-<glyph unicode="&#xe184;" d="M1100 700l-200 -200h-600l-200 200v500h200v-200h200v200h200v-200h200v200h200v-500zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-12l137 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5 t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe185;" d="M700 1100h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-1000h300v1000q0 41 -29.5 70.5t-70.5 29.5zM1100 800h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-700h300v700q0 41 -29.5 70.5t-70.5 29.5zM400 0h-300v400q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-400z " />
-<glyph unicode="&#xe186;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-100h200v-300h-300v100h200v100h-200v300h300v-100zM900 700v-300l-100 -100h-200v500h200z M700 700v-300h100v300h-100z" />
-<glyph unicode="&#xe187;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 300h-100v200h-100v-200h-100v500h100v-200h100v200h100v-500zM900 700v-300l-100 -100h-200v500h200z M700 700v-300h100v300h-100z" />
-<glyph unicode="&#xe188;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-300h200v-100h-300v500h300v-100zM900 700h-200v-300h200v-100h-300v500h300v-100z" />
-<glyph unicode="&#xe189;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 400l-300 150l300 150v-300zM900 550l-300 -150v300z" />
-<glyph unicode="&#xe190;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM900 300h-700v500h700v-500zM800 700h-130q-38 0 -66.5 -43t-28.5 -108t27 -107t68 -42h130v300zM300 700v-300 h130q41 0 68 42t27 107t-28.5 108t-66.5 43h-130z" />
-<glyph unicode="&#xe191;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-100h200v-300h-300v100h200v100h-200v300h300v-100zM900 300h-100v400h-100v100h200v-500z M700 300h-100v100h100v-100z" />
-<glyph unicode="&#xe192;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM300 700h200v-400h-300v500h100v-100zM900 300h-100v400h-100v100h200v-500zM300 600v-200h100v200h-100z M700 300h-100v100h100v-100z" />
-<glyph unicode="&#xe193;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 500l-199 -200h-100v50l199 200v150h-200v100h300v-300zM900 300h-100v400h-100v100h200v-500zM701 300h-100 v100h100v-100z" />
-<glyph unicode="&#xe194;" d="M600 1191q120 0 229.5 -47t188.5 -126t126 -188.5t47 -229.5t-47 -229.5t-126 -188.5t-188.5 -126t-229.5 -47t-229.5 47t-188.5 126t-126 188.5t-47 229.5t47 229.5t126 188.5t188.5 126t229.5 47zM600 1021q-114 0 -211 -56.5t-153.5 -153.5t-56.5 -211t56.5 -211 t153.5 -153.5t211 -56.5t211 56.5t153.5 153.5t56.5 211t-56.5 211t-153.5 153.5t-211 56.5zM800 700h-300v-200h300v-100h-300l-100 100v200l100 100h300v-100z" />
-<glyph unicode="&#xe195;" d="M600 1191q120 0 229.5 -47t188.5 -126t126 -188.5t47 -229.5t-47 -229.5t-126 -188.5t-188.5 -126t-229.5 -47t-229.5 47t-188.5 126t-126 188.5t-47 229.5t47 229.5t126 188.5t188.5 126t229.5 47zM600 1021q-114 0 -211 -56.5t-153.5 -153.5t-56.5 -211t56.5 -211 t153.5 -153.5t211 -56.5t211 56.5t153.5 153.5t56.5 211t-56.5 211t-153.5 153.5t-211 56.5zM800 700v-100l-50 -50l100 -100v-50h-100l-100 100h-150v-100h-100v400h300zM500 700v-100h200v100h-200z" />
-<glyph unicode="&#xe197;" d="M503 1089q110 0 200.5 -59.5t134.5 -156.5q44 14 90 14q120 0 205 -86.5t85 -207t-85 -207t-205 -86.5h-128v250q0 21 -14.5 35.5t-35.5 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-250h-222q-80 0 -136 57.5t-56 136.5q0 69 43 122.5t108 67.5q-2 19 -2 37q0 100 49 185 t134 134t185 49zM525 500h150q10 0 17.5 -7.5t7.5 -17.5v-275h137q21 0 26 -11.5t-8 -27.5l-223 -244q-13 -16 -32 -16t-32 16l-223 244q-13 16 -8 27.5t26 11.5h137v275q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="&#xe198;" d="M502 1089q110 0 201 -59.5t135 -156.5q43 15 89 15q121 0 206 -86.5t86 -206.5q0 -99 -60 -181t-150 -110l-378 360q-13 16 -31.5 16t-31.5 -16l-381 -365h-9q-79 0 -135.5 57.5t-56.5 136.5q0 69 43 122.5t108 67.5q-2 19 -2 38q0 100 49 184.5t133.5 134t184.5 49.5z M632 467l223 -228q13 -16 8 -27.5t-26 -11.5h-137v-275q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v275h-137q-21 0 -26 11.5t8 27.5q199 204 223 228q19 19 31.5 19t32.5 -19z" />
-<glyph unicode="&#xe199;" d="M700 100v100h400l-270 300h170l-270 300h170l-300 333l-300 -333h170l-270 -300h170l-270 -300h400v-100h-50q-21 0 -35.5 -14.5t-14.5 -35.5v-50h400v50q0 21 -14.5 35.5t-35.5 14.5h-50z" />
-<glyph unicode="&#xe200;" d="M600 1179q94 0 167.5 -56.5t99.5 -145.5q89 -6 150.5 -71.5t61.5 -155.5q0 -61 -29.5 -112.5t-79.5 -82.5q9 -29 9 -55q0 -74 -52.5 -126.5t-126.5 -52.5q-55 0 -100 30v-251q21 0 35.5 -14.5t14.5 -35.5v-50h-300v50q0 21 14.5 35.5t35.5 14.5v251q-45 -30 -100 -30 q-74 0 -126.5 52.5t-52.5 126.5q0 18 4 38q-47 21 -75.5 65t-28.5 97q0 74 52.5 126.5t126.5 52.5q5 0 23 -2q0 2 -1 10t-1 13q0 116 81.5 197.5t197.5 81.5z" />
-<glyph unicode="&#xe201;" d="M1010 1010q111 -111 150.5 -260.5t0 -299t-150.5 -260.5q-83 -83 -191.5 -126.5t-218.5 -43.5t-218.5 43.5t-191.5 126.5q-111 111 -150.5 260.5t0 299t150.5 260.5q83 83 191.5 126.5t218.5 43.5t218.5 -43.5t191.5 -126.5zM476 1065q-4 0 -8 -1q-121 -34 -209.5 -122.5 t-122.5 -209.5q-4 -12 2.5 -23t18.5 -14l36 -9q3 -1 7 -1q23 0 29 22q27 96 98 166q70 71 166 98q11 3 17.5 13.5t3.5 22.5l-9 35q-3 13 -14 19q-7 4 -15 4zM512 920q-4 0 -9 -2q-80 -24 -138.5 -82.5t-82.5 -138.5q-4 -13 2 -24t19 -14l34 -9q4 -1 8 -1q22 0 28 21 q18 58 58.5 98.5t97.5 58.5q12 3 18 13.5t3 21.5l-9 35q-3 12 -14 19q-7 4 -15 4zM719.5 719.5q-49.5 49.5 -119.5 49.5t-119.5 -49.5t-49.5 -119.5t49.5 -119.5t119.5 -49.5t119.5 49.5t49.5 119.5t-49.5 119.5zM855 551q-22 0 -28 -21q-18 -58 -58.5 -98.5t-98.5 -57.5 q-11 -4 -17 -14.5t-3 -21.5l9 -35q3 -12 14 -19q7 -4 15 -4q4 0 9 2q80 24 138.5 82.5t82.5 138.5q4 13 -2.5 24t-18.5 14l-34 9q-4 1 -8 1zM1000 515q-23 0 -29 -22q-27 -96 -98 -166q-70 -71 -166 -98q-11 -3 -17.5 -13.5t-3.5 -22.5l9 -35q3 -13 14 -19q7 -4 15 -4 q4 0 8 1q121 34 209.5 122.5t122.5 209.5q4 12 -2.5 23t-18.5 14l-36 9q-3 1 -7 1z" />
-<glyph unicode="&#xe202;" d="M700 800h300v-380h-180v200h-340v-200h-380v755q0 10 7.5 17.5t17.5 7.5h575v-400zM1000 900h-200v200zM700 300h162l-212 -212l-212 212h162v200h100v-200zM520 0h-395q-10 0 -17.5 7.5t-7.5 17.5v395zM1000 220v-195q0 -10 -7.5 -17.5t-17.5 -7.5h-195z" />
-<glyph unicode="&#xe203;" d="M700 800h300v-520l-350 350l-550 -550v1095q0 10 7.5 17.5t17.5 7.5h575v-400zM1000 900h-200v200zM862 200h-162v-200h-100v200h-162l212 212zM480 0h-355q-10 0 -17.5 7.5t-7.5 17.5v55h380v-80zM1000 80v-55q0 -10 -7.5 -17.5t-17.5 -7.5h-155v80h180z" />
-<glyph unicode="&#xe204;" d="M1162 800h-162v-200h100l100 -100h-300v300h-162l212 212zM200 800h200q27 0 40 -2t29.5 -10.5t23.5 -30t7 -57.5h300v-100h-600l-200 -350v450h100q0 36 7 57.5t23.5 30t29.5 10.5t40 2zM800 400h240l-240 -400h-800l300 500h500v-100z" />
-<glyph unicode="&#xe205;" d="M650 1100h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5zM1000 850v150q41 0 70.5 -29.5t29.5 -70.5v-800 q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-1 0 -20 4l246 246l-326 326v324q0 41 29.5 70.5t70.5 29.5v-150q0 -62 44 -106t106 -44h300q62 0 106 44t44 106zM412 250l-212 -212v162h-200v100h200v162z" />
-<glyph unicode="&#xe206;" d="M450 1100h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5zM800 850v150q41 0 70.5 -29.5t29.5 -70.5v-500 h-200v-300h200q0 -36 -7 -57.5t-23.5 -30t-29.5 -10.5t-40 -2h-600q-41 0 -70.5 29.5t-29.5 70.5v800q0 41 29.5 70.5t70.5 29.5v-150q0 -62 44 -106t106 -44h300q62 0 106 44t44 106zM1212 250l-212 -212v162h-200v100h200v162z" />
-<glyph unicode="&#xe209;" d="M658 1197l637 -1104q23 -38 7 -65.5t-60 -27.5h-1276q-44 0 -60 27.5t7 65.5l637 1104q22 39 54 39t54 -39zM704 800h-208q-20 0 -32 -14.5t-8 -34.5l58 -302q4 -20 21.5 -34.5t37.5 -14.5h54q20 0 37.5 14.5t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5zM500 300v-100h200 v100h-200z" />
-<glyph unicode="&#xe210;" d="M425 1100h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM425 800h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5 t17.5 7.5zM825 800h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM25 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150 q0 10 7.5 17.5t17.5 7.5zM425 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM825 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5 v150q0 10 7.5 17.5t17.5 7.5zM25 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM425 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5 t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM825 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="&#xe211;" d="M700 1200h100v-200h-100v-100h350q62 0 86.5 -39.5t-3.5 -94.5l-66 -132q-41 -83 -81 -134h-772q-40 51 -81 134l-66 132q-28 55 -3.5 94.5t86.5 39.5h350v100h-100v200h100v100h200v-100zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-12l137 -100 h-950l138 100h-13q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe212;" d="M600 1300q40 0 68.5 -29.5t28.5 -70.5h-194q0 41 28.5 70.5t68.5 29.5zM443 1100h314q18 -37 18 -75q0 -8 -3 -25h328q41 0 44.5 -16.5t-30.5 -38.5l-175 -145h-678l-178 145q-34 22 -29 38.5t46 16.5h328q-3 17 -3 25q0 38 18 75zM250 700h700q21 0 35.5 -14.5 t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-150v-200l275 -200h-950l275 200v200h-150q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe213;" d="M600 1181q75 0 128 -53t53 -128t-53 -128t-128 -53t-128 53t-53 128t53 128t128 53zM602 798h46q34 0 55.5 -28.5t21.5 -86.5q0 -76 39 -183h-324q39 107 39 183q0 58 21.5 86.5t56.5 28.5h45zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13 l138 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe214;" d="M600 1300q47 0 92.5 -53.5t71 -123t25.5 -123.5q0 -78 -55.5 -133.5t-133.5 -55.5t-133.5 55.5t-55.5 133.5q0 62 34 143l144 -143l111 111l-163 163q34 26 63 26zM602 798h46q34 0 55.5 -28.5t21.5 -86.5q0 -76 39 -183h-324q39 107 39 183q0 58 21.5 86.5t56.5 28.5h45 zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13l138 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe215;" d="M600 1200l300 -161v-139h-300q0 -57 18.5 -108t50 -91.5t63 -72t70 -67.5t57.5 -61h-530q-60 83 -90.5 177.5t-30.5 178.5t33 164.5t87.5 139.5t126 96.5t145.5 41.5v-98zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13l138 -100h-950l137 100 h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe216;" d="M600 1300q41 0 70.5 -29.5t29.5 -70.5v-78q46 -26 73 -72t27 -100v-50h-400v50q0 54 27 100t73 72v78q0 41 29.5 70.5t70.5 29.5zM400 800h400q54 0 100 -27t72 -73h-172v-100h200v-100h-200v-100h200v-100h-200v-100h200q0 -83 -58.5 -141.5t-141.5 -58.5h-400 q-83 0 -141.5 58.5t-58.5 141.5v400q0 83 58.5 141.5t141.5 58.5z" />
-<glyph unicode="&#xe218;" d="M150 1100h900q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5zM125 400h950q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-283l224 -224q13 -13 13 -31.5t-13 -32 t-31.5 -13.5t-31.5 13l-88 88h-524l-87 -88q-13 -13 -32 -13t-32 13.5t-13 32t13 31.5l224 224h-289q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM541 300l-100 -100h324l-100 100h-124z" />
-<glyph unicode="&#xe219;" d="M200 1100h800q83 0 141.5 -58.5t58.5 -141.5v-200h-100q0 41 -29.5 70.5t-70.5 29.5h-250q-41 0 -70.5 -29.5t-29.5 -70.5h-100q0 41 -29.5 70.5t-70.5 29.5h-250q-41 0 -70.5 -29.5t-29.5 -70.5h-100v200q0 83 58.5 141.5t141.5 58.5zM100 600h1000q41 0 70.5 -29.5 t29.5 -70.5v-300h-1200v300q0 41 29.5 70.5t70.5 29.5zM300 100v-50q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v50h200zM1100 100v-50q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v50h200z" />
-<glyph unicode="&#xe221;" d="M480 1165l682 -683q31 -31 31 -75.5t-31 -75.5l-131 -131h-481l-517 518q-32 31 -32 75.5t32 75.5l295 296q31 31 75.5 31t76.5 -31zM108 794l342 -342l303 304l-341 341zM250 100h800q21 0 35.5 -14.5t14.5 -35.5v-50h-900v50q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe223;" d="M1057 647l-189 506q-8 19 -27.5 33t-40.5 14h-400q-21 0 -40.5 -14t-27.5 -33l-189 -506q-8 -19 1.5 -33t30.5 -14h625v-150q0 -21 14.5 -35.5t35.5 -14.5t35.5 14.5t14.5 35.5v150h125q21 0 30.5 14t1.5 33zM897 0h-595v50q0 21 14.5 35.5t35.5 14.5h50v50 q0 21 14.5 35.5t35.5 14.5h48v300h200v-300h47q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-50z" />
-<glyph unicode="&#xe224;" d="M900 800h300v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-375v591l-300 300v84q0 10 7.5 17.5t17.5 7.5h375v-400zM1200 900h-200v200zM400 600h300v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-650q-10 0 -17.5 7.5t-7.5 17.5v950q0 10 7.5 17.5t17.5 7.5h375v-400zM700 700h-200v200z " />
-<glyph unicode="&#xe225;" d="M484 1095h195q75 0 146 -32.5t124 -86t89.5 -122.5t48.5 -142q18 -14 35 -20q31 -10 64.5 6.5t43.5 48.5q10 34 -15 71q-19 27 -9 43q5 8 12.5 11t19 -1t23.5 -16q41 -44 39 -105q-3 -63 -46 -106.5t-104 -43.5h-62q-7 -55 -35 -117t-56 -100l-39 -234q-3 -20 -20 -34.5 t-38 -14.5h-100q-21 0 -33 14.5t-9 34.5l12 70q-49 -14 -91 -14h-195q-24 0 -65 8l-11 -64q-3 -20 -20 -34.5t-38 -14.5h-100q-21 0 -33 14.5t-9 34.5l26 157q-84 74 -128 175l-159 53q-19 7 -33 26t-14 40v50q0 21 14.5 35.5t35.5 14.5h124q11 87 56 166l-111 95 q-16 14 -12.5 23.5t24.5 9.5h203q116 101 250 101zM675 1000h-250q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h250q10 0 17.5 7.5t7.5 17.5v50q0 10 -7.5 17.5t-17.5 7.5z" />
-<glyph unicode="&#xe226;" d="M641 900l423 247q19 8 42 2.5t37 -21.5l32 -38q14 -15 12.5 -36t-17.5 -34l-139 -120h-390zM50 1100h106q67 0 103 -17t66 -71l102 -212h823q21 0 35.5 -14.5t14.5 -35.5v-50q0 -21 -14 -40t-33 -26l-737 -132q-23 -4 -40 6t-26 25q-42 67 -100 67h-300q-62 0 -106 44 t-44 106v200q0 62 44 106t106 44zM173 928h-80q-19 0 -28 -14t-9 -35v-56q0 -51 42 -51h134q16 0 21.5 8t5.5 24q0 11 -16 45t-27 51q-18 28 -43 28zM550 727q-32 0 -54.5 -22.5t-22.5 -54.5t22.5 -54.5t54.5 -22.5t54.5 22.5t22.5 54.5t-22.5 54.5t-54.5 22.5zM130 389 l152 130q18 19 34 24t31 -3.5t24.5 -17.5t25.5 -28q28 -35 50.5 -51t48.5 -13l63 5l48 -179q13 -61 -3.5 -97.5t-67.5 -79.5l-80 -69q-47 -40 -109 -35.5t-103 51.5l-130 151q-40 47 -35.5 109.5t51.5 102.5zM380 377l-102 -88q-31 -27 2 -65l37 -43q13 -15 27.5 -19.5 t31.5 6.5l61 53q19 16 14 49q-2 20 -12 56t-17 45q-11 12 -19 14t-23 -8z" />
-<glyph unicode="&#xe227;" d="M625 1200h150q10 0 17.5 -7.5t7.5 -17.5v-109q79 -33 131 -87.5t53 -128.5q1 -46 -15 -84.5t-39 -61t-46 -38t-39 -21.5l-17 -6q6 0 15 -1.5t35 -9t50 -17.5t53 -30t50 -45t35.5 -64t14.5 -84q0 -59 -11.5 -105.5t-28.5 -76.5t-44 -51t-49.5 -31.5t-54.5 -16t-49.5 -6.5 t-43.5 -1v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-100v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-175q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h75v600h-75q-10 0 -17.5 7.5t-7.5 17.5v150 q0 10 7.5 17.5t17.5 7.5h175v75q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-75h100v75q0 10 7.5 17.5t17.5 7.5zM400 900v-200h263q28 0 48.5 10.5t30 25t15 29t5.5 25.5l1 10q0 4 -0.5 11t-6 24t-15 30t-30 24t-48.5 11h-263zM400 500v-200h363q28 0 48.5 10.5 t30 25t15 29t5.5 25.5l1 10q0 4 -0.5 11t-6 24t-15 30t-30 24t-48.5 11h-363z" />
-<glyph unicode="&#xe230;" d="M212 1198h780q86 0 147 -61t61 -147v-416q0 -51 -18 -142.5t-36 -157.5l-18 -66q-29 -87 -93.5 -146.5t-146.5 -59.5h-572q-82 0 -147 59t-93 147q-8 28 -20 73t-32 143.5t-20 149.5v416q0 86 61 147t147 61zM600 1045q-70 0 -132.5 -11.5t-105.5 -30.5t-78.5 -41.5 t-57 -45t-36 -41t-20.5 -30.5l-6 -12l156 -243h560l156 243q-2 5 -6 12.5t-20 29.5t-36.5 42t-57 44.5t-79 42t-105 29.5t-132.5 12zM762 703h-157l195 261z" />
-<glyph unicode="&#xe231;" d="M475 1300h150q103 0 189 -86t86 -189v-500q0 -41 -42 -83t-83 -42h-450q-41 0 -83 42t-42 83v500q0 103 86 189t189 86zM700 300v-225q0 -21 -27 -48t-48 -27h-150q-21 0 -48 27t-27 48v225h300z" />
-<glyph unicode="&#xe232;" d="M475 1300h96q0 -150 89.5 -239.5t239.5 -89.5v-446q0 -41 -42 -83t-83 -42h-450q-41 0 -83 42t-42 83v500q0 103 86 189t189 86zM700 300v-225q0 -21 -27 -48t-48 -27h-150q-21 0 -48 27t-27 48v225h300z" />
-<glyph unicode="&#xe233;" d="M1294 767l-638 -283l-378 170l-78 -60v-224l100 -150v-199l-150 148l-150 -149v200l100 150v250q0 4 -0.5 10.5t0 9.5t1 8t3 8t6.5 6l47 40l-147 65l642 283zM1000 380l-350 -166l-350 166v147l350 -165l350 165v-147z" />
-<glyph unicode="&#xe234;" d="M250 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM650 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM1050 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44z" />
-<glyph unicode="&#xe235;" d="M550 1100q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM550 700q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM550 300q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44z" />
-<glyph unicode="&#xe236;" d="M125 1100h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM125 700h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5 t17.5 7.5zM125 300h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="&#xe237;" d="M350 1200h500q162 0 256 -93.5t94 -256.5v-500q0 -165 -93.5 -257.5t-256.5 -92.5h-500q-165 0 -257.5 92.5t-92.5 257.5v500q0 165 92.5 257.5t257.5 92.5zM900 1000h-600q-41 0 -70.5 -29.5t-29.5 -70.5v-600q0 -41 29.5 -70.5t70.5 -29.5h600q41 0 70.5 29.5 t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5zM350 900h500q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -14.5 -35.5t-35.5 -14.5h-500q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 14.5 35.5t35.5 14.5zM400 800v-200h400v200h-400z" />
-<glyph unicode="&#xe238;" d="M150 1100h1000q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5 t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe239;" d="M650 1187q87 -67 118.5 -156t0 -178t-118.5 -155q-87 66 -118.5 155t0 178t118.5 156zM300 800q124 0 212 -88t88 -212q-124 0 -212 88t-88 212zM1000 800q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM300 500q124 0 212 -88t88 -212q-124 0 -212 88t-88 212z M1000 500q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM700 199v-144q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v142q40 -4 43 -4q17 0 57 6z" />
-<glyph unicode="&#xe240;" d="M745 878l69 19q25 6 45 -12l298 -295q11 -11 15 -26.5t-2 -30.5q-5 -14 -18 -23.5t-28 -9.5h-8q1 0 1 -13q0 -29 -2 -56t-8.5 -62t-20 -63t-33 -53t-51 -39t-72.5 -14h-146q-184 0 -184 288q0 24 10 47q-20 4 -62 4t-63 -4q11 -24 11 -47q0 -288 -184 -288h-142 q-48 0 -84.5 21t-56 51t-32 71.5t-16 75t-3.5 68.5q0 13 2 13h-7q-15 0 -27.5 9.5t-18.5 23.5q-6 15 -2 30.5t15 25.5l298 296q20 18 46 11l76 -19q20 -5 30.5 -22.5t5.5 -37.5t-22.5 -31t-37.5 -5l-51 12l-182 -193h891l-182 193l-44 -12q-20 -5 -37.5 6t-22.5 31t6 37.5 t31 22.5z" />
-<glyph unicode="&#xe241;" d="M1200 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-850q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v850h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM500 450h-25q0 15 -4 24.5t-9 14.5t-17 7.5t-20 3t-25 0.5h-100v-425q0 -11 12.5 -17.5t25.5 -7.5h12v-50h-200v50q50 0 50 25v425h-100q-17 0 -25 -0.5t-20 -3t-17 -7.5t-9 -14.5t-4 -24.5h-25v150h500v-150z" />
-<glyph unicode="&#xe242;" d="M1000 300v50q-25 0 -55 32q-14 14 -25 31t-16 27l-4 11l-289 747h-69l-300 -754q-18 -35 -39 -56q-9 -9 -24.5 -18.5t-26.5 -14.5l-11 -5v-50h273v50q-49 0 -78.5 21.5t-11.5 67.5l69 176h293l61 -166q13 -34 -3.5 -66.5t-55.5 -32.5v-50h312zM412 691l134 342l121 -342 h-255zM1100 150v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5z" />
-<glyph unicode="&#xe243;" d="M50 1200h1100q21 0 35.5 -14.5t14.5 -35.5v-1100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v1100q0 21 14.5 35.5t35.5 14.5zM611 1118h-70q-13 0 -18 -12l-299 -753q-17 -32 -35 -51q-18 -18 -56 -34q-12 -5 -12 -18v-50q0 -8 5.5 -14t14.5 -6 h273q8 0 14 6t6 14v50q0 8 -6 14t-14 6q-55 0 -71 23q-10 14 0 39l63 163h266l57 -153q11 -31 -6 -55q-12 -17 -36 -17q-8 0 -14 -6t-6 -14v-50q0 -8 6 -14t14 -6h313q8 0 14 6t6 14v50q0 7 -5.5 13t-13.5 7q-17 0 -42 25q-25 27 -40 63h-1l-288 748q-5 12 -19 12zM639 611 h-197l103 264z" />
-<glyph unicode="&#xe244;" d="M1200 1100h-1200v100h1200v-100zM50 1000h400q21 0 35.5 -14.5t14.5 -35.5v-900q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v900q0 21 14.5 35.5t35.5 14.5zM650 1000h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM700 900v-300h300v300h-300z" />
-<glyph unicode="&#xe245;" d="M50 1200h400q21 0 35.5 -14.5t14.5 -35.5v-900q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v900q0 21 14.5 35.5t35.5 14.5zM650 700h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400 q0 21 14.5 35.5t35.5 14.5zM700 600v-300h300v300h-300zM1200 0h-1200v100h1200v-100z" />
-<glyph unicode="&#xe246;" d="M50 1000h400q21 0 35.5 -14.5t14.5 -35.5v-350h100v150q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-150h100v-100h-100v-150q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v150h-100v-350q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5zM700 700v-300h300v300h-300z" />
-<glyph unicode="&#xe247;" d="M100 0h-100v1200h100v-1200zM250 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM300 1000v-300h300v300h-300zM250 500h900q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe248;" d="M600 1100h150q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-150v-100h450q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5h350v100h-150q-21 0 -35.5 14.5 t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5h150v100h100v-100zM400 1000v-300h300v300h-300z" />
-<glyph unicode="&#xe249;" d="M1200 0h-100v1200h100v-1200zM550 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM600 1000v-300h300v300h-300zM50 500h900q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe250;" d="M865 565l-494 -494q-23 -23 -41 -23q-14 0 -22 13.5t-8 38.5v1000q0 25 8 38.5t22 13.5q18 0 41 -23l494 -494q14 -14 14 -35t-14 -35z" />
-<glyph unicode="&#xe251;" d="M335 635l494 494q29 29 50 20.5t21 -49.5v-1000q0 -41 -21 -49.5t-50 20.5l-494 494q-14 14 -14 35t14 35z" />
-<glyph unicode="&#xe252;" d="M100 900h1000q41 0 49.5 -21t-20.5 -50l-494 -494q-14 -14 -35 -14t-35 14l-494 494q-29 29 -20.5 50t49.5 21z" />
-<glyph unicode="&#xe253;" d="M635 865l494 -494q29 -29 20.5 -50t-49.5 -21h-1000q-41 0 -49.5 21t20.5 50l494 494q14 14 35 14t35 -14z" />
-<glyph unicode="&#xe254;" d="M700 741v-182l-692 -323v221l413 193l-413 193v221zM1200 0h-800v200h800v-200z" />
-<glyph unicode="&#xe255;" d="M1200 900h-200v-100h200v-100h-300v300h200v100h-200v100h300v-300zM0 700h50q0 21 4 37t9.5 26.5t18 17.5t22 11t28.5 5.5t31 2t37 0.5h100v-550q0 -22 -25 -34.5t-50 -13.5l-25 -2v-100h400v100q-4 0 -11 0.5t-24 3t-30 7t-24 15t-11 24.5v550h100q25 0 37 -0.5t31 -2 t28.5 -5.5t22 -11t18 -17.5t9.5 -26.5t4 -37h50v300h-800v-300z" />
-<glyph unicode="&#xe256;" d="M800 700h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-100v-550q0 -22 25 -34.5t50 -14.5l25 -1v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v550h-100q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h800v-300zM1100 200h-200v-100h200v-100h-300v300h200v100h-200v100h300v-300z" />
-<glyph unicode="&#xe257;" d="M701 1098h160q16 0 21 -11t-7 -23l-464 -464l464 -464q12 -12 7 -23t-21 -11h-160q-13 0 -23 9l-471 471q-7 8 -7 18t7 18l471 471q10 9 23 9z" />
-<glyph unicode="&#xe258;" d="M339 1098h160q13 0 23 -9l471 -471q7 -8 7 -18t-7 -18l-471 -471q-10 -9 -23 -9h-160q-16 0 -21 11t7 23l464 464l-464 464q-12 12 -7 23t21 11z" />
-<glyph unicode="&#xe259;" d="M1087 882q11 -5 11 -21v-160q0 -13 -9 -23l-471 -471q-8 -7 -18 -7t-18 7l-471 471q-9 10 -9 23v160q0 16 11 21t23 -7l464 -464l464 464q12 12 23 7z" />
-<glyph unicode="&#xe260;" d="M618 993l471 -471q9 -10 9 -23v-160q0 -16 -11 -21t-23 7l-464 464l-464 -464q-12 -12 -23 -7t-11 21v160q0 13 9 23l471 471q8 7 18 7t18 -7z" />
-<glyph unicode="&#xf8ff;" d="M1000 1200q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM450 1000h100q21 0 40 -14t26 -33l79 -194q5 1 16 3q34 6 54 9.5t60 7t65.5 1t61 -10t56.5 -23t42.5 -42t29 -64t5 -92t-19.5 -121.5q-1 -7 -3 -19.5t-11 -50t-20.5 -73t-32.5 -81.5t-46.5 -83t-64 -70 t-82.5 -50q-13 -5 -42 -5t-65.5 2.5t-47.5 2.5q-14 0 -49.5 -3.5t-63 -3.5t-43.5 7q-57 25 -104.5 78.5t-75 111.5t-46.5 112t-26 90l-7 35q-15 63 -18 115t4.5 88.5t26 64t39.5 43.5t52 25.5t58.5 13t62.5 2t59.5 -4.5t55.5 -8l-147 192q-12 18 -5.5 30t27.5 12z" />
-<glyph unicode="&#x1f511;" d="M250 1200h600q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-150v-500l-255 -178q-19 -9 -32 -1t-13 29v650h-150q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM400 1100v-100h300v100h-300z" />
-<glyph unicode="&#x1f6aa;" d="M250 1200h750q39 0 69.5 -40.5t30.5 -84.5v-933l-700 -117v950l600 125h-700v-1000h-100v1025q0 23 15.5 49t34.5 26zM500 525v-100l100 20v100z" />
-</font>
-</defs></svg> 
\ No newline at end of file
diff --git a/NewLife.Cube/Content/bootstrap/fonts/glyphicons-halflings-regular.ttf b/NewLife.Cube/Content/bootstrap/fonts/glyphicons-halflings-regular.ttf
deleted file mode 100644
index 1413fc609a..0000000000
Binary files a/NewLife.Cube/Content/bootstrap/fonts/glyphicons-halflings-regular.ttf and /dev/null differ
diff --git a/NewLife.Cube/Content/bootstrap/fonts/glyphicons-halflings-regular.woff b/NewLife.Cube/Content/bootstrap/fonts/glyphicons-halflings-regular.woff
deleted file mode 100644
index 9e612858f8..0000000000
Binary files a/NewLife.Cube/Content/bootstrap/fonts/glyphicons-halflings-regular.woff and /dev/null differ
diff --git a/NewLife.Cube/Content/bootstrap/fonts/glyphicons-halflings-regular.woff2 b/NewLife.Cube/Content/bootstrap/fonts/glyphicons-halflings-regular.woff2
deleted file mode 100644
index 64539b54c3..0000000000
Binary files a/NewLife.Cube/Content/bootstrap/fonts/glyphicons-halflings-regular.woff2 and /dev/null differ
diff --git a/NewLife.Cube/Content/bootstrap/js/bootstrap-colorpicker.min.js b/NewLife.Cube/Content/bootstrap/js/bootstrap-colorpicker.min.js
deleted file mode 100644
index b13c121c77..0000000000
--- a/NewLife.Cube/Content/bootstrap/js/bootstrap-colorpicker.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(a){var b=function(a){this.value={h:1,s:1,b:1,a:1},this.setColor(a)};b.prototype={constructor:b,setColor:function(b){b=b.toLowerCase();var c=this;a.each(d.stringParsers,function(a,e){var f=e.re.exec(b),g=f&&e.parse(f),h=e.space||"rgba";return g?(c.value="hsla"===h?d.RGBtoHSB.apply(null,d.HSLtoRGB.apply(null,g)):d.RGBtoHSB.apply(null,g),!1):void 0})},setHue:function(a){this.value.h=1-a},setSaturation:function(a){this.value.s=a},setLightness:function(a){this.value.b=1-a},setAlpha:function(a){this.value.a=parseInt(100*(1-a),10)/100},toRGB:function(a,b,c,d){a||(a=this.value.h,b=this.value.s,c=this.value.b),a*=360;var e,f,g,h,i;return a=a%360/60,i=c*b,h=i*(1-Math.abs(a%2-1)),e=f=g=c-i,a=~~a,e+=[i,h,0,0,h,i][a],f+=[h,i,i,h,0,0][a],g+=[0,0,h,i,i,h][a],{r:Math.round(255*e),g:Math.round(255*f),b:Math.round(255*g),a:d||this.value.a}},toHex:function(a,b,c,d){var e=this.toRGB(a,b,c,d);return"#"+(1<<24|parseInt(e.r)<<16|parseInt(e.g)<<8|parseInt(e.b)).toString(16).substr(1)},toHSL:function(a,b,c,d){a||(a=this.value.h,b=this.value.s,c=this.value.b);var e=a,f=(2-b)*c,g=b*c;return g/=f>0&&1>=f?f:2-f,f/=2,g>1&&(g=1),{h:e,s:g,l:f,a:d||this.value.a}}};var c=function(b,c){this.element=a(b);var e=c.format||this.element.data("color-format")||"hex";this.format=d.translateFormats[e],this.isInput=this.element.is("input"),this.component=this.element.is(".color")?this.element.find(".add-on"):!1,this.picker=a(d.template).appendTo("body").on("mousedown",a.proxy(this.mousedown,this)),this.isInput?this.element.on({focus:a.proxy(this.show,this),keyup:a.proxy(this.update,this)}):this.component?this.component.on({click:a.proxy(this.show,this)}):this.element.on({click:a.proxy(this.show,this)}),("rgba"===e||"hsla"===e)&&(this.picker.addClass("alpha"),this.alpha=this.picker.find(".colorpicker-alpha")[0].style),this.component?(this.picker.find(".colorpicker-color").hide(),this.preview=this.element.find("i")[0].style):this.preview=this.picker.find("div:last")[0].style,this.base=this.picker.find("div:first")[0].style,this.update()};c.prototype={constructor:c,show:function(b){this.picker.show(),this.height=this.component?this.component.outerHeight():this.element.outerHeight(),this.place(),a(window).on("resize",a.proxy(this.place,this)),this.isInput||b&&(b.stopPropagation(),b.preventDefault()),a(document).on({mousedown:a.proxy(this.hide,this)}),this.element.trigger({type:"show",color:this.color})},update:function(){this.color=new b(this.isInput?this.element.prop("value"):this.element.data("color")),this.picker.find("i").eq(0).css({left:100*this.color.value.s,top:100-100*this.color.value.b}).end().eq(1).css("top",100*(1-this.color.value.h)).end().eq(2).css("top",100*(1-this.color.value.a)),this.previewColor()},setValue:function(a){this.color=new b(a),this.picker.find("i").eq(0).css({left:100*this.color.value.s,top:100-100*this.color.value.b}).end().eq(1).css("top",100*(1-this.color.value.h)).end().eq(2).css("top",100*(1-this.color.value.a)),this.previewColor(),this.element.trigger({type:"changeColor",color:this.color})},hide:function(){this.picker.hide(),a(window).off("resize",this.place),this.isInput?this.element.prop("value",this.format.call(this)):(a(document).off({mousedown:this.hide}),this.component&&this.element.find("input").prop("value",this.format.call(this)),this.element.data("color",this.format.call(this))),this.element.trigger({type:"hide",color:this.color})},place:function(){var a=this.component?this.component.offset():this.element.offset();this.picker.css({top:a.top+this.height,left:a.left})},previewColor:function(){try{this.preview.backgroundColor=this.format.call(this)}catch(a){this.preview.backgroundColor=this.color.toHex()}this.base.backgroundColor=this.color.toHex(this.color.value.h,1,1,1),this.alpha&&(this.alpha.backgroundColor=this.color.toHex())},pointer:null,slider:null,mousedown:function(b){b.stopPropagation(),b.preventDefault();var c=a(b.target),e=c.closest("div");if(!e.is(".colorpicker")){if(e.is(".colorpicker-saturation"))this.slider=a.extend({},d.sliders.saturation);else if(e.is(".colorpicker-hue"))this.slider=a.extend({},d.sliders.hue);else{if(!e.is(".colorpicker-alpha"))return!1;this.slider=a.extend({},d.sliders.alpha)}var f=e.offset();this.slider.knob=e.find("i")[0].style,this.slider.left=b.pageX-f.left,this.slider.top=b.pageY-f.top,this.pointer={left:b.pageX,top:b.pageY},a(document).on({mousemove:a.proxy(this.mousemove,this),mouseup:a.proxy(this.mouseup,this)}).trigger("mousemove")}return!1},mousemove:function(a){a.stopPropagation(),a.preventDefault();var b=Math.max(0,Math.min(this.slider.maxLeft,this.slider.left+((a.pageX||this.pointer.left)-this.pointer.left))),c=Math.max(0,Math.min(this.slider.maxTop,this.slider.top+((a.pageY||this.pointer.top)-this.pointer.top)));return this.slider.knob.left=b+"px",this.slider.knob.top=c+"px",this.slider.callLeft&&this.color[this.slider.callLeft].call(this.color,b/100),this.slider.callTop&&this.color[this.slider.callTop].call(this.color,c/100),this.previewColor(),this.element.trigger({type:"changeColor",color:this.color}),!1},mouseup:function(b){return b.stopPropagation(),b.preventDefault(),a(document).off({mousemove:this.mousemove,mouseup:this.mouseup}),!1}},a.fn.colorpicker=function(b,d){return this.each(function(){var e=a(this),f=e.data("colorpicker"),g="object"==typeof b&&b;f||e.data("colorpicker",f=new c(this,a.extend({},a.fn.colorpicker.defaults,g))),"string"==typeof b&&f[b](d)})},a.fn.colorpicker.defaults={},a.fn.colorpicker.Constructor=c;var d={translateFormats:{rgb:function(){var a=this.color.toRGB();return"rgb("+a.r+","+a.g+","+a.b+")"},rgba:function(){var a=this.color.toRGB();return"rgba("+a.r+","+a.g+","+a.b+","+a.a+")"},hsl:function(){var a=this.color.toHSL();return"hsl("+Math.round(360*a.h)+","+Math.round(100*a.s)+"%,"+Math.round(100*a.l)+"%)"},hsla:function(){var a=this.color.toHSL();return"hsla("+Math.round(360*a.h)+","+Math.round(100*a.s)+"%,"+Math.round(100*a.l)+"%,"+a.a+")"},hex:function(){return this.color.toHex()}},sliders:{saturation:{maxLeft:100,maxTop:100,callLeft:"setSaturation",callTop:"setLightness"},hue:{maxLeft:0,maxTop:100,callLeft:!1,callTop:"setHue"},alpha:{maxLeft:0,maxTop:100,callLeft:!1,callTop:"setAlpha"}},RGBtoHSB:function(a,b,c,d){a/=255,b/=255,c/=255;var e,f,g,h;return g=Math.max(a,b,c),h=g-Math.min(a,b,c),e=0===h?null:g==a?(b-c)/h:g==b?(c-a)/h+2:(a-b)/h+4,e=(e+360)%6*60/360,f=0===h?0:h/g,{h:e||1,s:f,b:g,a:d||1}},HueToRGB:function(a,b,c){return 0>c?c+=1:c>1&&(c-=1),1>6*c?a+(b-a)*c*6:1>2*c?b:2>3*c?a+(b-a)*(2/3-c)*6:a},HSLtoRGB:function(a,b,c,e){0>b&&(b=0);var f;f=.5>=c?c*(1+b):c+b-c*b;var g=2*c-f,h=a+1/3,i=a,j=a-1/3,k=Math.round(255*d.HueToRGB(g,f,h)),l=Math.round(255*d.HueToRGB(g,f,i)),m=Math.round(255*d.HueToRGB(g,f,j));return[k,l,m,e||1]},stringParsers:[{re:/rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d+(?:\.\d+)?)\s*)?\)/,parse:function(a){return[a[1],a[2],a[3],a[4]]}},{re:/rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d+(?:\.\d+)?)\s*)?\)/,parse:function(a){return[2.55*a[1],2.55*a[2],2.55*a[3],a[4]]}},{re:/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/,parse:function(a){return[parseInt(a[1],16),parseInt(a[2],16),parseInt(a[3],16)]}},{re:/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/,parse:function(a){return[parseInt(a[1]+a[1],16),parseInt(a[2]+a[2],16),parseInt(a[3]+a[3],16)]}},{re:/hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d+(?:\.\d+)?)\s*)?\)/,space:"hsla",parse:function(a){return[a[1]/360,a[2]/100,a[3]/100,a[4]]}}],template:'<div class="colorpicker dropdown-menu"><div class="colorpicker-saturation"><i><b></b></i></div><div class="colorpicker-hue"><i></i></div><div class="colorpicker-alpha"><i></i></div><div class="colorpicker-color"><div /></div></div>'}}(window.jQuery);
\ No newline at end of file
diff --git a/NewLife.Cube/Content/bootstrap/js/bootstrap-multiselect.min.js b/NewLife.Cube/Content/bootstrap/js/bootstrap-multiselect.min.js
deleted file mode 100644
index 014ee8f551..0000000000
--- a/NewLife.Cube/Content/bootstrap/js/bootstrap-multiselect.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(a){"use strict";function b(a){return ko.isObservable(a)&&!(void 0===a.destroyAll)}function c(a,b){for(var c=0;c<a.length;++c)b(a[c])}function d(b,c){this.$select=a(b),this.options=this.mergeOptions(a.extend({},c,this.$select.data())),this.originalOptions=this.$select.clone()[0].options,this.query="",this.searchTimeout=null,this.options.multiple="multiple"===this.$select.attr("multiple"),this.options.onChange=a.proxy(this.options.onChange,this),this.options.onDropdownShow=a.proxy(this.options.onDropdownShow,this),this.options.onDropdownHide=a.proxy(this.options.onDropdownHide,this),this.options.onDropdownShown=a.proxy(this.options.onDropdownShown,this),this.options.onDropdownHidden=a.proxy(this.options.onDropdownHidden,this),this.buildContainer(),this.buildButton(),this.buildDropdown(),this.buildSelectAll(),this.buildDropdownOptions(),this.buildFilter(),this.updateButtonText(),this.updateSelectAll(),this.options.disableIfEmpty&&a("option",this.$select).length<=0&&this.disable(),this.$select.hide().after(this.$container)}"undefined"!=typeof ko&&ko.bindingHandlers&&!ko.bindingHandlers.multiselect&&(ko.bindingHandlers.multiselect={init:function(d,e,f){var g=f().selectedOptions,h=ko.utils.unwrapObservable(e());a(d).multiselect(h),b(g)&&(a(d).multiselect("select",ko.utils.unwrapObservable(g)),g.subscribe(function(b){var e=[],f=[];c(b,function(a){switch(a.status){case"added":e.push(a.value);break;case"deleted":f.push(a.value)}}),e.length>0&&a(d).multiselect("select",e),f.length>0&&a(d).multiselect("deselect",f)},null,"arrayChange"))},update:function(c,d,e){var f=e().options,g=a(c).data("multiselect"),h=ko.utils.unwrapObservable(d());b(f)&&f.subscribe(function(){a(c).multiselect("rebuild")}),g?g.updateOriginalOptions():a(c).multiselect(h)}}),d.prototype={defaults:{buttonText:function(b,c){if(0===b.length)return this.nonSelectedText+' <b class="fa fa-caret-down"></b>';if(b.length==a("option",a(c)).length)return this.allSelectedText+' <b class="fa fa-caret-down"></b>';if(b.length>this.numberDisplayed)return b.length+" "+this.nSelectedText+' <b class="fa fa-caret-down"></b>';var d="";return b.each(function(){var b=void 0!==a(this).attr("label")?a(this).attr("label"):a(this).html();d+=b+", "}),d.substr(0,d.length-2)+' <b class="fa fa-caret-down"></b>'},buttonTitle:function(b){if(0===b.length)return this.nonSelectedText;var c="";return b.each(function(){c+=a(this).text()+", "}),c.substr(0,c.length-2)},label:function(b){return a(b).attr("label")||a(b).html()},onChange:function(){},onDropdownShow:function(){},onDropdownHide:function(){},onDropdownShown:function(){},onDropdownHidden:function(){},buttonClass:"btn btn-default",buttonWidth:"auto",buttonContainer:'<div class="btn-group" />',dropRight:!1,selectedClass:"active",maxHeight:!1,checkboxName:!1,includeSelectAllOption:!1,includeSelectAllIfMoreThan:0,selectAllText:" Select all",selectAllValue:"multiselect-all",selectAllName:!1,enableFiltering:!1,enableCaseInsensitiveFiltering:!1,enableClickableOptGroups:!1,filterPlaceholder:"Search",filterBehavior:"text",includeFilterClearBtn:!0,preventInputChangeEvent:!1,nonSelectedText:"None selected",nSelectedText:"selected",allSelectedText:"All selected",numberDisplayed:3,disableIfEmpty:!1,templates:{button:'<button type="button" class="multiselect dropdown-toggle" data-toggle="dropdown"></button>',ul:'<ul class="multiselect-container dropdown-menu"></ul>',filter:'<li class="multiselect-item filter"><div class="input-group"><span class="input-group-addon"><i class="glyphicon glyphicon-search"></i></span><input class="form-control multiselect-search" type="text"></div></li>',filterClearBtn:'<span class="input-group-btn"><button class="btn btn-default multiselect-clear-filter" type="button"><i class="glyphicon glyphicon-remove-circle"></i></button></span>',li:'<li><a href="javascript:void(0);"><label></label></a></li>',divider:'<li class="multiselect-item divider"></li>',liGroup:'<li class="multiselect-item multiselect-group"><label></label></li>'}},constructor:d,buildContainer:function(){this.$container=a(this.options.buttonContainer),this.$container.on("show.bs.dropdown",this.options.onDropdownShow),this.$container.on("hide.bs.dropdown",this.options.onDropdownHide),this.$container.on("shown.bs.dropdown",this.options.onDropdownShown),this.$container.on("hidden.bs.dropdown",this.options.onDropdownHidden)},buildButton:function(){this.$button=a(this.options.templates.button).addClass(this.options.buttonClass),this.$select.prop("disabled")?this.disable():this.enable(),this.options.buttonWidth&&"auto"!==this.options.buttonWidth&&(this.$button.css({width:this.options.buttonWidth}),this.$container.css({width:this.options.buttonWidth}));var b=this.$select.attr("tabindex");b&&this.$button.attr("tabindex",b),this.$container.prepend(this.$button)},buildDropdown:function(){this.$ul=a(this.options.templates.ul),this.options.dropRight&&this.$ul.addClass("pull-right"),this.options.maxHeight&&this.$ul.css({"max-height":this.options.maxHeight+"px","overflow-y":"auto","overflow-x":"hidden"}),this.$container.append(this.$ul)},buildDropdownOptions:function(){this.$select.children().each(a.proxy(function(b,c){var d=a(c),e=d.prop("tagName").toLowerCase();d.prop("value")!==this.options.selectAllValue&&("optgroup"===e?this.createOptgroup(c):"option"===e&&("divider"===d.data("role")?this.createDivider():this.createOptionValue(c)))},this)),a("li input",this.$ul).on("change",a.proxy(function(b){var c=a(b.target),d=c.prop("checked")||!1,e=c.val()===this.options.selectAllValue;this.options.selectedClass&&(d?c.closest("li").addClass(this.options.selectedClass):c.closest("li").removeClass(this.options.selectedClass));var f=c.val(),g=this.getOptionByValue(f),h=a("option",this.$select).not(g),i=a("input",this.$container).not(c);return e&&(d?this.selectAll():this.deselectAll()),e||(d?(g.prop("selected",!0),this.options.multiple?g.prop("selected",!0):(this.options.selectedClass&&a(i).closest("li").removeClass(this.options.selectedClass),a(i).prop("checked",!1),h.prop("selected",!1),this.$button.click()),"active"===this.options.selectedClass&&h.closest("a").css("outline","")):g.prop("selected",!1)),this.$select.change(),this.updateButtonText(),this.updateSelectAll(),this.options.onChange(g,d),this.options.preventInputChangeEvent?!1:void 0},this)),a("li a",this.$ul).on("touchstart click",function(b){b.stopPropagation();var c=a(b.target);try{if("Range"===document.getSelection().type){var d=a(this).find("input:first");d.prop("checked",!d.prop("checked")).trigger("change")}}catch(e){}if(b.shiftKey){var f=c.prop("checked")||!1;if(f){var g=c.closest("li").siblings('li[class="active"]:first'),h=c.closest("li").index(),i=g.index();h>i?c.closest("li").prevUntil(g).each(function(){a(this).find("input:first").prop("checked",!0).trigger("change")}):c.closest("li").nextUntil(g).each(function(){a(this).find("input:first").prop("checked",!0).trigger("change")})}}c.blur()}),this.$container.off("keydown.multiselect").on("keydown.multiselect",a.proxy(function(b){if(!a('input[type="text"]',this.$container).is(":focus"))if(9===b.keyCode&&this.$container.hasClass("open"))this.$button.click();else{var c=a(this.$container).find("li:not(.divider):not(.disabled) a").filter(":visible");if(!c.length)return;var d=c.index(c.filter(":focus"));38===b.keyCode&&d>0?d--:40===b.keyCode&&d<c.length-1?d++:~d||(d=0);var e=c.eq(d);if(e.focus(),32===b.keyCode||13===b.keyCode){var f=e.find("input");f.prop("checked",!f.prop("checked")),f.change()}b.stopPropagation(),b.preventDefault()}},this)),this.options.enableClickableOptGroups&&this.options.multiple&&a("li.multiselect-group",this.$ul).on("click",a.proxy(function(b){b.stopPropagation();var c=a(b.target).parent(),d=c.nextUntil("li.multiselect-group"),e=!0,f=d.find("input");f.each(function(){e=e&&a(this).prop("checked")}),f.prop("checked",!e).trigger("change")},this))},createOptionValue:function(b){var c=a(b);c.is(":selected")&&c.prop("selected",!0);var d=this.options.label(b),e=c.val(),f=this.options.multiple?"checkbox":"radio",g=a(this.options.templates.li),h=a("label",g);h.addClass(f);var i=a("<input/>").attr("type",f).addClass("ace");this.options.checkboxName&&i.attr("name",this.options.checkboxName),h.append(i),i.after('<span class="lbl" />');var j=c.prop("selected")||!1;i.val(e),e===this.options.selectAllValue&&(g.addClass("multiselect-item multiselect-all"),i.parent().parent().addClass("multiselect-all")),h.append(" "+d),h.attr("title",c.attr("title")),this.$ul.append(g),c.is(":disabled")&&i.attr("disabled","disabled").prop("disabled",!0).closest("a").attr("tabindex","-1").closest("li").addClass("disabled"),i.prop("checked",j),j&&this.options.selectedClass&&i.closest("li").addClass(this.options.selectedClass)},createDivider:function(){var b=a(this.options.templates.divider);this.$ul.append(b)},createOptgroup:function(b){var c=a(b).prop("label"),d=a(this.options.templates.liGroup);a("label",d).text(c),this.options.enableClickableOptGroups&&d.addClass("multiselect-group-clickable"),this.$ul.append(d),a(b).is(":disabled")&&d.addClass("disabled"),a("option",b).each(a.proxy(function(a,b){this.createOptionValue(b)},this))},buildSelectAll:function(){"number"==typeof this.options.selectAllValue&&(this.options.selectAllValue=this.options.selectAllValue.toString());var b=this.hasSelectAll();if(!b&&this.options.includeSelectAllOption&&this.options.multiple&&a("option",this.$select).length>this.options.includeSelectAllIfMoreThan){this.options.includeSelectAllDivider&&this.$ul.prepend(a(this.options.templates.divider));var c=a(this.options.templates.li);a("label",c).addClass("checkbox"),a("label",c).append(this.options.selectAllName?'<input type="checkbox" name="'+this.options.selectAllName+'" />':'<input type="checkbox" />');var d=a("input",c);d.val(this.options.selectAllValue),c.addClass("multiselect-item multiselect-all"),d.parent().parent().addClass("multiselect-all"),a("label",c).append(" "+this.options.selectAllText),this.$ul.prepend(c),d.prop("checked",!1)}},buildFilter:function(){if(this.options.enableFiltering||this.options.enableCaseInsensitiveFiltering){var b=Math.max(this.options.enableFiltering,this.options.enableCaseInsensitiveFiltering);if(this.$select.find("option").length>=b){if(this.$filter=a(this.options.templates.filter),a("input",this.$filter).attr("placeholder",this.options.filterPlaceholder),this.options.includeFilterClearBtn){var c=a(this.options.templates.filterClearBtn);c.on("click",a.proxy(function(){clearTimeout(this.searchTimeout),this.$filter.find(".multiselect-search").val(""),a("li",this.$ul).show().removeClass("filter-hidden"),this.updateSelectAll()},this)),this.$filter.find(".input-group").append(c)}this.$ul.prepend(this.$filter),this.$filter.val(this.query).on("click",function(a){a.stopPropagation()}).on("input keydown",a.proxy(function(b){13===b.which&&b.preventDefault(),clearTimeout(this.searchTimeout),this.searchTimeout=this.asyncFunction(a.proxy(function(){if(this.query!==b.target.value){this.query=b.target.value;var c,d;a.each(a("li",this.$ul),a.proxy(function(b,e){var f=a("input",e).val(),g=a("label",e).text(),h="";if("text"===this.options.filterBehavior?h=g:"value"===this.options.filterBehavior?h=f:"both"===this.options.filterBehavior&&(h=g+"\n"+f),f!==this.options.selectAllValue&&g){var i=!1;this.options.enableCaseInsensitiveFiltering&&h.toLowerCase().indexOf(this.query.toLowerCase())>-1?i=!0:h.indexOf(this.query)>-1&&(i=!0),a(e).toggle(i).toggleClass("filter-hidden",!i),a(e).hasClass("multiselect-group")?(c=e,d=i):(i&&a(c).show().removeClass("filter-hidden"),!i&&d&&a(e).show().removeClass("filter-hidden"))}},this))}this.updateSelectAll()},this),300,this)},this))}}},destroy:function(){this.$container.remove(),this.$select.show(),this.$select.data("multiselect",null)},refresh:function(){a("option",this.$select).each(a.proxy(function(b,c){var d=a("li input",this.$ul).filter(function(){return a(this).val()===a(c).val()});a(c).is(":selected")?(d.prop("checked",!0),this.options.selectedClass&&d.closest("li").addClass(this.options.selectedClass)):(d.prop("checked",!1),this.options.selectedClass&&d.closest("li").removeClass(this.options.selectedClass)),a(c).is(":disabled")?d.attr("disabled","disabled").prop("disabled",!0).closest("li").addClass("disabled"):d.prop("disabled",!1).closest("li").removeClass("disabled")},this)),this.updateButtonText(),this.updateSelectAll()},select:function(b,c){a.isArray(b)||(b=[b]);for(var d=0;d<b.length;d++){var e=b[d];if(null!==e&&void 0!==e){var f=this.getOptionByValue(e),g=this.getInputByValue(e);void 0!==f&&void 0!==g&&(this.options.multiple||this.deselectAll(!1),this.options.selectedClass&&g.closest("li").addClass(this.options.selectedClass),g.prop("checked",!0),f.prop("selected",!0))}}this.updateButtonText(),this.updateSelectAll(),c&&1===b.length&&this.options.onChange(f,!0)},clearSelection:function(){this.deselectAll(!1),this.updateButtonText(),this.updateSelectAll()},deselect:function(b,c){a.isArray(b)||(b=[b]);for(var d=0;d<b.length;d++){var e=b[d];if(null!==e&&void 0!==e){var f=this.getOptionByValue(e),g=this.getInputByValue(e);void 0!==f&&void 0!==g&&(this.options.selectedClass&&g.closest("li").removeClass(this.options.selectedClass),g.prop("checked",!1),f.prop("selected",!1))}}this.updateButtonText(),this.updateSelectAll(),c&&1===b.length&&this.options.onChange(f,!1)},selectAll:function(b){var b="undefined"==typeof b?!0:b,c=a("li input[type='checkbox']:enabled",this.$ul),d=c.filter(":visible"),e=c.length,f=d.length;if(b?(d.prop("checked",!0),a("li:not(.divider):not(.disabled)",this.$ul).filter(":visible").addClass(this.options.selectedClass)):(c.prop("checked",!0),a("li:not(.divider):not(.disabled)",this.$ul).addClass(this.options.selectedClass)),e===f||b===!1)a("option:enabled",this.$select).prop("selected",!0);else{var g=d.map(function(){return a(this).val()}).get();a("option:enabled",this.$select).filter(function(){return-1!==a.inArray(a(this).val(),g)}).prop("selected",!0)}},deselectAll:function(b){var b="undefined"==typeof b?!0:b;if(b){var c=a("li input[type='checkbox']:enabled",this.$ul).filter(":visible");c.prop("checked",!1);var d=c.map(function(){return a(this).val()}).get();a("option:enabled",this.$select).filter(function(){return-1!==a.inArray(a(this).val(),d)}).prop("selected",!1),this.options.selectedClass&&a("li:not(.divider):not(.disabled)",this.$ul).filter(":visible").removeClass(this.options.selectedClass)}else a("li input[type='checkbox']:enabled",this.$ul).prop("checked",!1),a("option:enabled",this.$select).prop("selected",!1),this.options.selectedClass&&a("li:not(.divider):not(.disabled)",this.$ul).removeClass(this.options.selectedClass)},rebuild:function(){this.$ul.html(""),this.options.multiple="multiple"===this.$select.attr("multiple"),this.buildSelectAll(),this.buildDropdownOptions(),this.buildFilter(),this.updateButtonText(),this.updateSelectAll(),this.options.disableIfEmpty&&a("option",this.$select).length<=0&&this.disable(),this.options.dropRight&&this.$ul.addClass("pull-right")},dataprovider:function(b){var d="",e=0,f=a("");a.each(b,function(b,g){var h;a.isArray(g.children)?(e++,h=a("<optgroup/>").attr({label:g.label||"Group "+e}),c(g.children,function(b){h.append(a("<option/>").attr({value:b.value,label:b.label||b.value,title:b.title,selected:!!b.selected}))}),d+="</optgroup>"):h=a("<option/>").attr({value:g.value,label:g.label||g.value,title:g.title,selected:!!g.selected}),f=f.add(h)}),this.$select.empty().append(f),this.rebuild()},enable:function(){this.$select.prop("disabled",!1),this.$button.prop("disabled",!1).removeClass("disabled")},disable:function(){this.$select.prop("disabled",!0),this.$button.prop("disabled",!0).addClass("disabled")},setOptions:function(a){this.options=this.mergeOptions(a)},mergeOptions:function(b){return a.extend(!0,{},this.defaults,b)},hasSelectAll:function(){return a("li."+this.options.selectAllValue,this.$ul).length>0},updateSelectAll:function(){if(this.hasSelectAll()){var b=a("li:not(.multiselect-item):not(.filter-hidden) input:enabled",this.$ul),c=b.length,d=b.filter(":checked").length,e=a("li."+this.options.selectAllValue,this.$ul),f=e.find("input");d>0&&d===c?(f.prop("checked",!0),e.addClass(this.options.selectedClass)):(f.prop("checked",!1),e.removeClass(this.options.selectedClass))}},updateButtonText:function(){var b=this.getSelected();a(".multiselect",this.$container).html(this.options.buttonText(b,this.$select)),a(".multiselect",this.$container).attr("title",this.options.buttonTitle(b,this.$select))},getSelected:function(){return a("option",this.$select).filter(":selected")},getOptionByValue:function(b){for(var c=a("option",this.$select),d=b.toString(),e=0;e<c.length;e+=1){var f=c[e];if(f.value===d)return a(f)}},getInputByValue:function(b){for(var c=a("li input",this.$ul),d=b.toString(),e=0;e<c.length;e+=1){var f=c[e];if(f.value===d)return a(f)}},updateOriginalOptions:function(){this.originalOptions=this.$select.clone()[0].options},asyncFunction:function(a,b,c){var d=Array.prototype.slice.call(arguments,3);return setTimeout(function(){a.apply(c||window,d)},b)}},a.fn.multiselect=function(b,c,e){return this.each(function(){var f=a(this).data("multiselect"),g="object"==typeof b&&b;f||(f=new d(this,g),a(this).data("multiselect",f)),"string"==typeof b&&(f[b](c,e),"destroy"===b&&a(this).data("multiselect",!1))})},a.fn.multiselect.Constructor=d,a(function(){a("select[data-role=multiselect]").multiselect()})}(window.jQuery);
\ No newline at end of file
diff --git a/NewLife.Cube/Content/bootstrap/js/bootstrap-tag.min.js b/NewLife.Cube/Content/bootstrap/js/bootstrap-tag.min.js
deleted file mode 100644
index 290601fd81..0000000000
--- a/NewLife.Cube/Content/bootstrap/js/bootstrap-tag.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(a){"use strict";var b=function(b,c){this.element=a(b),this.options=a.extend(!0,{},a.fn.tag.defaults,c),this.values=a.grep(a.map(this.element.val().split(","),a.trim),function(a){return a.length>0}),this.show()};b.prototype={constructor:b,show:function(){var b=this;b.element.parent().prepend(b.element.detach().hide()),b.element.wrap(a('<div class="tags">')).parent().on("click",function(){b.input.focus()}),b.values.length&&a.each(b.values,function(){b.createBadge(this)}),b.input=a('<input type="text">').attr("placeholder",b.options.placeholder).insertAfter(b.element).on("focus",function(){b.element.parent().addClass("tags-hover")}).on("blur",function(){b.skip||(b.process(),b.element.parent().removeClass("tags-hover"),b.element.siblings(".tag").removeClass("tag-important")),b.skip=!1}).on("keydown",function(c){if(188==c.keyCode||13==c.keyCode||9==c.keyCode)!a.trim(a(this).val())||b.element.siblings(".typeahead").length&&!b.element.siblings(".typeahead").is(":hidden")?188==c.keyCode&&(!b.element.siblings(".typeahead").length||b.element.siblings(".typeahead").is(":hidden")?c.preventDefault():(b.input.data("typeahead").select(),c.stopPropagation(),c.preventDefault())):(9!=c.keyCode&&c.preventDefault(),b.process());else if(a.trim(a(this).val())||8!=c.keyCode)b.element.siblings(".tag").removeClass("tag-important");else{var d=b.element.siblings(".tag").length;if(d){var e=b.element.siblings(".tag:eq("+(d-1)+")");e.hasClass("tag-important")?b.remove(d-1):e.addClass("tag-important")}}}).bs_typeahead({source:b.options.source,matcher:function(a){return~a.toLowerCase().indexOf(this.query.toLowerCase())&&(-1==b.inValues(a)||b.options.allowDuplicates)},updater:a.proxy(b.add,b)}),a(b.input.data("bs_typeahead").$menu).on("mousedown",function(){b.skip=!0}),this.element.trigger("shown")},inValues:function(b){if(this.options.caseInsensitive){var c=-1;return a.each(this.values,function(a,d){return d.toLowerCase()==b.toLowerCase()?(c=a,!1):void 0}),c}return a.inArray(b,this.values)},createBadge:function(b){var c=this;a("<span/>",{"class":"tag"}).text(b).append(a('<button type="button" class="close">&times;</button>').on("click",function(){c.remove(c.element.siblings(".tag").index(a(this).closest(".tag")))})).insertBefore(c.element)},add:function(b){var c=this;if(!c.options.allowDuplicates){var d=c.inValues(b);if(-1!=d){var e=c.element.siblings(".tag:eq("+d+")");return e.addClass("tag-warning"),void setTimeout(function(){a(e).removeClass("tag-warning")},500)}}this.values.push(b),this.createBadge(b),this.element.val(this.values.join(", ")),this.element.trigger("added",[b])},remove:function(a){if(a>=0){var b=this.values.splice(a,1);this.element.siblings(".tag:eq("+a+")").remove(),this.element.val(this.values.join(", ")),this.element.trigger("removed",[b])}},process:function(){var b=a.grep(a.map(this.input.val().split(","),a.trim),function(a){return a.length>0}),c=this;a.each(b,function(){c.add(this)}),this.input.val("")},skip:!1};var c=a.fn.tag;a.fn.tag=function(c){return this.each(function(){var d=a(this),e=d.data("tag"),f="object"==typeof c&&c;e||d.data("tag",e=new b(this,f)),"string"==typeof c&&e[c]()})},a.fn.tag.defaults={allowDuplicates:!1,caseInsensitive:!0,placeholder:"",source:[]},a.fn.tag.Constructor=b,a.fn.tag.noConflict=function(){return a.fn.tag=c,this},a(window).on("load",function(){a('[data-provide="tag"]').each(function(){var b=a(this);b.data("tag")||b.tag(b.data())})})}(window.jQuery);
\ No newline at end of file
diff --git a/NewLife.Cube/Content/bootstrap/js/bootstrap-wysiwyg.min.js b/NewLife.Cube/Content/bootstrap/js/bootstrap-wysiwyg.min.js
deleted file mode 100644
index 0b0cdd5629..0000000000
--- a/NewLife.Cube/Content/bootstrap/js/bootstrap-wysiwyg.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(a){"use strict";var b=function(b){var c=a.Deferred(),d=new FileReader;return d.onload=function(a){c.resolve(a.target.result)},d.onerror=c.reject,d.onprogress=c.notify,d.readAsDataURL(b),c.promise()};a.fn.cleanHtml=function(){var b=a(this).html();return b&&b.replace(/(<br>|\s|<div><br><\/div>|&nbsp;)*$/,"")},a.fn.wysiwyg=function(c){var d,e,f,g=this,h=function(){e.activeToolbarClass&&a(e.toolbarSelector).find(f).each(function(){try{var b=a(this).data(e.commandRole);document.queryCommandState(b)?a(this).addClass(e.activeToolbarClass):a(this).removeClass(e.activeToolbarClass)}catch(c){}})},i=function(a,b){var c=a.split(" "),d=c.shift(),e=c.join(" ")+(b||"");document.execCommand(d,0,e),h()},j=function(b){a.each(b,function(a,b){g.keydown(a,function(a){g.attr("contenteditable")&&g.is(":visible")&&(a.preventDefault(),a.stopPropagation(),i(b))}).keyup(a,function(a){g.attr("contenteditable")&&g.is(":visible")&&(a.preventDefault(),a.stopPropagation())})})},k=function(){try{var a=window.getSelection();if(a.getRangeAt&&a.rangeCount)return a.getRangeAt(0)}catch(b){}},l=function(){d=k()},m=function(){try{var a=window.getSelection();if(d){try{a.removeAllRanges()}catch(b){document.body.createTextRange().select(),document.selection.empty()}a.addRange(d)}}catch(c){}},n=function(c){g.focus(),a.each(c,function(c,d){/^image\//.test(d.type)?a.when(b(d)).done(function(a){i("insertimage",a)}).fail(function(a){e.fileUploadError("file-reader",a)}):e.fileUploadError("unsupported-file-type",d.type)})},o=function(a,b){m(),document.queryCommandSupported("hiliteColor")&&document.execCommand("hiliteColor",0,b||"transparent"),l(),a.data(e.selectionMarker,b)},p=function(b,c){b.find(f).click(function(){m(),g.focus(),i(a(this).data(c.commandRole)),l()}),b.find("[data-toggle=dropdown]").click(m);var d=!!window.navigator.msPointerEnabled||!!document.all&&!!document.addEventListener;b.find("input[type=text][data-"+c.commandRole+"]").on("webkitspeechchange change",function(){var b=this.value;this.value="",m(),b&&(g.focus(),i(a(this).data(c.commandRole),b)),l()}).on("focus",function(){if(!d){var b=a(this);b.data(c.selectionMarker)||(o(b,c.selectionColor),b.focus())}}).on("blur",function(){if(!d){var b=a(this);b.data(c.selectionMarker)&&o(b,!1)}}),b.find("input[type=file][data-"+c.commandRole+"]").change(function(){m(),"file"===this.type&&this.files&&this.files.length>0&&n(this.files),l(),this.value=""})},q=function(){g.on("dragenter dragover",!1).on("drop",function(a){var b=a.originalEvent.dataTransfer;a.stopPropagation(),a.preventDefault(),b&&b.files&&b.files.length>0&&n(b.files)})};return e=a.extend({},a.fn.wysiwyg.defaults,c),f="a[data-"+e.commandRole+"],button[data-"+e.commandRole+"],input[type=button][data-"+e.commandRole+"]",j(e.hotKeys),e.dragAndDropImages&&q(),p(a(e.toolbarSelector),e),g.attr("contenteditable",!0).on("mouseup keyup mouseout",function(){l(),h()}),a(window).bind("touchend",function(a){var b=g.is(a.target)||g.has(a.target).length>0,c=k(),d=c&&c.startContainer===c.endContainer&&c.startOffset===c.endOffset;(!d||b)&&(l(),h())}),this},a.fn.wysiwyg.defaults={hotKeys:{"ctrl+b meta+b":"bold","ctrl+i meta+i":"italic","ctrl+u meta+u":"underline","ctrl+z meta+z":"undo","ctrl+y meta+y meta+shift+z":"redo","ctrl+l meta+l":"justifyleft","ctrl+r meta+r":"justifyright","ctrl+e meta+e":"justifycenter","ctrl+j meta+j":"justifyfull","shift+tab":"outdent",tab:"indent"},toolbarSelector:"[data-role=editor-toolbar]",commandRole:"edit",activeToolbarClass:"btn-info",selectionMarker:"edit-focus-marker",selectionColor:"darkgrey",dragAndDropImages:!0,fileUploadError:function(a,b){console.log("File upload error",a,b)}}}(window.jQuery);
\ No newline at end of file
diff --git a/NewLife.Cube/Content/bootstrap/js/bootstrap.js b/NewLife.Cube/Content/bootstrap/js/bootstrap.js
deleted file mode 100644
index c8003e79d8..0000000000
--- a/NewLife.Cube/Content/bootstrap/js/bootstrap.js
+++ /dev/null
@@ -1,2031 +0,0 @@
-/* NUGET: BEGIN LICENSE TEXT
- *
- * Microsoft grants you the right to use these script files for the sole
- * purpose of either: (i) interacting through your browser with the Microsoft
- * website or online service, subject to the applicable licensing or use
- * terms; or (ii) using the files as included with a Microsoft product subject
- * to that product's license terms. Microsoft reserves all other rights to the
- * files not expressly granted by Microsoft, whether by implication, estoppel
- * or otherwise. Insofar as a script file is dual licensed under GPL,
- * Microsoft neither took the code under GPL nor distributes it thereunder but
- * under the terms set out in this paragraph. All notices and licenses
- * below are for informational purposes only.
- *
- * NUGET: END LICENSE TEXT */
-
-/**
-* bootstrap.js v3.0.0 by @fat and @mdo
-* Copyright 2013 Twitter Inc.
-* http://www.apache.org/licenses/LICENSE-2.0
-*/
-if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
-
-/* ========================================================================
- * Bootstrap: transition.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#transitions
- * ========================================================================
- * Copyright 2013 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";
-
-    // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/)
-    // ============================================================
-
-    function transitionEnd() {
-        var el = document.createElement('bootstrap')
-
-        var transEndEventNames = {
-            'WebkitTransition': 'webkitTransitionEnd'
-            , 'MozTransition': 'transitionend'
-            , 'OTransition': 'oTransitionEnd otransitionend'
-            , 'transition': 'transitionend'
-        }
-
-        for (var name in transEndEventNames) {
-            if (el.style[name] !== undefined) {
-                return { end: transEndEventNames[name] }
-            }
-        }
-    }
-
-    // http://blog.alexmaccaw.com/css-transitions
-    $.fn.emulateTransitionEnd = function (duration) {
-        var called = false, $el = this
-        $(this).one($.support.transition.end, function () { called = true })
-        var callback = function () { if (!called) $($el).trigger($.support.transition.end) }
-        setTimeout(callback, duration)
-        return this
-    }
-
-    $(function () {
-        $.support.transition = transitionEnd()
-    })
-
-}(window.jQuery);
-
-/* ========================================================================
- * Bootstrap: alert.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#alerts
- * ========================================================================
- * Copyright 2013 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";
-
-    // ALERT CLASS DEFINITION
-    // ======================
-
-    var dismiss = '[data-dismiss="alert"]'
-    var Alert = function (el) {
-        $(el).on('click', dismiss, this.close)
-    }
-
-    Alert.prototype.close = function (e) {
-        var $this = $(this)
-        var selector = $this.attr('data-target')
-
-        if (!selector) {
-            selector = $this.attr('href')
-            selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
-        }
-
-        var $parent = $(selector)
-
-        if (e) e.preventDefault()
-
-        if (!$parent.length) {
-            $parent = $this.hasClass('alert') ? $this : $this.parent()
-        }
-
-        $parent.trigger(e = $.Event('close.bs.alert'))
-
-        if (e.isDefaultPrevented()) return
-
-        $parent.removeClass('in')
-
-        function removeElement() {
-            $parent.trigger('closed.bs.alert').remove()
-        }
-
-        $.support.transition && $parent.hasClass('fade') ?
-            $parent
-                .one($.support.transition.end, removeElement)
-                .emulateTransitionEnd(150) :
-            removeElement()
-    }
-
-
-    // ALERT PLUGIN DEFINITION
-    // =======================
-
-    var old = $.fn.alert
-
-    $.fn.alert = function (option) {
-        return this.each(function () {
-            var $this = $(this)
-            var data = $this.data('bs.alert')
-
-            if (!data) $this.data('bs.alert', (data = new Alert(this)))
-            if (typeof option == 'string') data[option].call($this)
-        })
-    }
-
-    $.fn.alert.Constructor = Alert
-
-
-    // ALERT NO CONFLICT
-    // =================
-
-    $.fn.alert.noConflict = function () {
-        $.fn.alert = old
-        return this
-    }
-
-
-    // ALERT DATA-API
-    // ==============
-
-    $(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close)
-
-}(window.jQuery);
-
-/* ========================================================================
- * Bootstrap: button.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#buttons
- * ========================================================================
- * Copyright 2013 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";
-
-    // BUTTON PUBLIC CLASS DEFINITION
-    // ==============================
-
-    var Button = function (element, options) {
-        this.$element = $(element)
-        this.options = $.extend({}, Button.DEFAULTS, options)
-    }
-
-    Button.DEFAULTS = {
-        loadingText: 'loading...'
-    }
-
-    Button.prototype.setState = function (state) {
-        var d = 'disabled'
-        var $el = this.$element
-        var val = $el.is('input') ? 'val' : 'html'
-        var data = $el.data()
-
-        state = state + 'Text'
-
-        if (!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.closest('[data-toggle="buttons"]')
-
-        if ($parent.length) {
-            var $input = this.$element.find('input')
-                .prop('checked', !this.$element.hasClass('active'))
-                .trigger('change')
-            if ($input.prop('type') === 'radio') $parent.find('.active').removeClass('active')
-        }
-
-        this.$element.toggleClass('active')
-    }
-
-
-    // BUTTON PLUGIN DEFINITION
-    // ========================
-
-    var old = $.fn.button
-
-    $.fn.button = function (option) {
-        return this.each(function () {
-            var $this = $(this)
-            var data = $this.data('bs.button')
-            var options = typeof option == 'object' && option
-
-            if (!data) $this.data('bs.button', (data = new Button(this, options)))
-
-            if (option == 'toggle') data.toggle()
-            else if (option) data.setState(option)
-        })
-    }
-
-    $.fn.button.Constructor = Button
-
-
-    // BUTTON NO CONFLICT
-    // ==================
-
-    $.fn.button.noConflict = function () {
-        $.fn.button = old
-        return this
-    }
-
-
-    // BUTTON DATA-API
-    // ===============
-
-    $(document).on('click.bs.button.data-api', '[data-toggle^=button]', function (e) {
-        var $btn = $(e.target)
-        if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
-        $btn.button('toggle')
-        e.preventDefault()
-    })
-
-}(window.jQuery);
-
-/* ========================================================================
- * Bootstrap: carousel.js v3.0.0
- * http://twbs.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";
-
-    // CAROUSEL CLASS DEFINITION
-    // =========================
-
-    var Carousel = function (element, options) {
-        this.$element = $(element)
-        this.$indicators = this.$element.find('.carousel-indicators')
-        this.options = options
-        this.paused =
-            this.sliding =
-            this.interval =
-            this.$active =
-            this.$items = null
-
-        this.options.pause == 'hover' && this.$element
-            .on('mouseenter', $.proxy(this.pause, this))
-            .on('mouseleave', $.proxy(this.cycle, this))
-    }
-
-    Carousel.DEFAULTS = {
-        interval: 5000
-        , pause: 'hover'
-        , wrap: true
-    }
-
-    Carousel.prototype.cycle = function (e) {
-        e || (this.paused = false)
-
-        this.interval && clearInterval(this.interval)
-
-        this.options.interval
-            && !this.paused
-            && (this.interval = setInterval($.proxy(this.next, this), this.options.interval))
-
-        return this
-    }
-
-    Carousel.prototype.getActiveIndex = function () {
-        this.$active = this.$element.find('.item.active')
-        this.$items = this.$active.parent().children()
-
-        return this.$items.index(this.$active)
-    }
-
-    Carousel.prototype.to = function (pos) {
-        var that = this
-        var activeIndex = this.getActiveIndex()
-
-        if (pos > (this.$items.length - 1) || pos < 0) return
-
-        if (this.sliding) return this.$element.one('slid', function () { that.to(pos) })
-        if (activeIndex == pos) return this.pause().cycle()
-
-        return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos]))
-    }
-
-    Carousel.prototype.pause = function (e) {
-        e || (this.paused = true)
-
-        if (this.$element.find('.next, .prev').length && $.support.transition.end) {
-            this.$element.trigger($.support.transition.end)
-            this.cycle(true)
-        }
-
-        this.interval = clearInterval(this.interval)
-
-        return this
-    }
-
-    Carousel.prototype.next = function () {
-        if (this.sliding) return
-        return this.slide('next')
-    }
-
-    Carousel.prototype.prev = function () {
-        if (this.sliding) return
-        return this.slide('prev')
-    }
-
-    Carousel.prototype.slide = function (type, next) {
-        var $active = this.$element.find('.item.active')
-        var $next = next || $active[type]()
-        var isCycling = this.interval
-        var direction = type == 'next' ? 'left' : 'right'
-        var fallback = type == 'next' ? 'first' : 'last'
-        var that = this
-
-        if (!$next.length) {
-            if (!this.options.wrap) return
-            $next = this.$element.find('.item')[fallback]()
-        }
-
-        this.sliding = true
-
-        isCycling && this.pause()
-
-        var e = $.Event('slide.bs.carousel', { relatedTarget: $next[0], direction: direction })
-
-        if ($next.hasClass('active')) return
-
-        if (this.$indicators.length) {
-            this.$indicators.find('.active').removeClass('active')
-            this.$element.one('slid', function () {
-                var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()])
-                $nextIndicator && $nextIndicator.addClass('active')
-            })
-        }
-
-        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)
-            $active
-                .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)
-                })
-                .emulateTransitionEnd(600)
-        } 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
-    // ==========================
-
-    var old = $.fn.carousel
-
-    $.fn.carousel = function (option) {
-        return this.each(function () {
-            var $this = $(this)
-            var data = $this.data('bs.carousel')
-            var options = $.extend({}, Carousel.DEFAULTS, $this.data(), typeof option == 'object' && option)
-            var action = typeof option == 'string' ? option : options.slide
-
-            if (!data) $this.data('bs.carousel', (data = new Carousel(this, options)))
-            if (typeof option == 'number') data.to(option)
-            else if (action) data[action]()
-            else if (options.interval) data.pause().cycle()
-        })
-    }
-
-    $.fn.carousel.Constructor = Carousel
-
-
-    // CAROUSEL NO CONFLICT
-    // ====================
-
-    $.fn.carousel.noConflict = function () {
-        $.fn.carousel = old
-        return this
-    }
-
-
-    // CAROUSEL DATA-API
-    // =================
-
-    $(document).on('click.bs.carousel.data-api', '[data-slide], [data-slide-to]', function (e) {
-        var $this = $(this), href
-        var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
-        var options = $.extend({}, $target.data(), $this.data())
-        var slideIndex = $this.attr('data-slide-to')
-        if (slideIndex) options.interval = false
-
-        $target.carousel(options)
-
-        if (slideIndex = $this.attr('data-slide-to')) {
-            $target.data('bs.carousel').to(slideIndex)
-        }
-
-        e.preventDefault()
-    })
-
-    $(window).on('load', function () {
-        $('[data-ride="carousel"]').each(function () {
-            var $carousel = $(this)
-            $carousel.carousel($carousel.data())
-        })
-    })
-
-}(window.jQuery);
-
-/* ========================================================================
- * Bootstrap: collapse.js v3.0.0
- * http://twbs.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";
-
-    // COLLAPSE PUBLIC CLASS DEFINITION
-    // ================================
-
-    var Collapse = function (element, options) {
-        this.$element = $(element)
-        this.options = $.extend({}, Collapse.DEFAULTS, options)
-        this.transitioning = null
-
-        if (this.options.parent) this.$parent = $(this.options.parent)
-        if (this.options.toggle) this.toggle()
-    }
-
-    Collapse.DEFAULTS = {
-        toggle: true
-    }
-
-    Collapse.prototype.dimension = function () {
-        var hasWidth = this.$element.hasClass('width')
-        return hasWidth ? 'width' : 'height'
-    }
-
-    Collapse.prototype.show = function () {
-        if (this.transitioning || this.$element.hasClass('in')) return
-
-        var startEvent = $.Event('show.bs.collapse')
-        this.$element.trigger(startEvent)
-        if (startEvent.isDefaultPrevented()) return
-
-        var actives = this.$parent && this.$parent.find('> .panel > .in')
-
-        if (actives && actives.length) {
-            var hasData = actives.data('bs.collapse')
-            if (hasData && hasData.transitioning) return
-            actives.collapse('hide')
-            hasData || actives.data('bs.collapse', null)
-        }
-
-        var dimension = this.dimension()
-
-        this.$element
-            .removeClass('collapse')
-            .addClass('collapsing')
-        [dimension](0)
-
-        this.transitioning = 1
-
-        var complete = function () {
-            this.$element
-                .removeClass('collapsing')
-                .addClass('in')
-            [dimension]('auto')
-            this.transitioning = 0
-            this.$element.trigger('shown.bs.collapse')
-        }
-
-        if (!$.support.transition) return complete.call(this)
-
-        var scrollSize = $.camelCase(['scroll', dimension].join('-'))
-
-        this.$element
-            .one($.support.transition.end, $.proxy(complete, this))
-            .emulateTransitionEnd(350)
-        [dimension](this.$element[0][scrollSize])
-    }
-
-    Collapse.prototype.hide = function () {
-        if (this.transitioning || !this.$element.hasClass('in')) return
-
-        var startEvent = $.Event('hide.bs.collapse')
-        this.$element.trigger(startEvent)
-        if (startEvent.isDefaultPrevented()) return
-
-        var dimension = this.dimension()
-
-        this.$element
-        [dimension](this.$element[dimension]())
-        [0].offsetHeight
-
-        this.$element
-            .addClass('collapsing')
-            .removeClass('collapse')
-            .removeClass('in')
-
-        this.transitioning = 1
-
-        var complete = function () {
-            this.transitioning = 0
-            this.$element
-                .trigger('hidden.bs.collapse')
-                .removeClass('collapsing')
-                .addClass('collapse')
-        }
-
-        if (!$.support.transition) return complete.call(this)
-
-        this.$element
-        [dimension](0)
-            .one($.support.transition.end, $.proxy(complete, this))
-            .emulateTransitionEnd(350)
-    }
-
-    Collapse.prototype.toggle = function () {
-        this[this.$element.hasClass('in') ? 'hide' : 'show']()
-    }
-
-
-    // COLLAPSE PLUGIN DEFINITION
-    // ==========================
-
-    var old = $.fn.collapse
-
-    $.fn.collapse = function (option) {
-        return this.each(function () {
-            var $this = $(this)
-            var data = $this.data('bs.collapse')
-            var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option)
-
-            if (!data) $this.data('bs.collapse', (data = new Collapse(this, options)))
-            if (typeof option == 'string') data[option]()
-        })
-    }
-
-    $.fn.collapse.Constructor = Collapse
-
-
-    // COLLAPSE NO CONFLICT
-    // ====================
-
-    $.fn.collapse.noConflict = function () {
-        $.fn.collapse = old
-        return this
-    }
-
-
-    // COLLAPSE DATA-API
-    // =================
-
-    $(document).on('click.bs.collapse.data-api', '[data-toggle=collapse]', function (e) {
-        var $this = $(this), href
-        var target = $this.attr('data-target')
-            || e.preventDefault()
-            || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7
-        var $target = $(target)
-        var data = $target.data('bs.collapse')
-        var option = data ? 'toggle' : $this.data()
-        var parent = $this.attr('data-parent')
-        var $parent = parent && $(parent)
-
-        if (!data || !data.transitioning) {
-            if ($parent) $parent.find('[data-toggle=collapse][data-parent="' + parent + '"]').not($this).addClass('collapsed')
-            $this[$target.hasClass('in') ? 'addClass' : 'removeClass']('collapsed')
-        }
-
-        $target.collapse(option)
-    })
-
-}(window.jQuery);
-
-/* ========================================================================
- * Bootstrap: dropdown.js v3.0.0
- * http://twbs.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";
-
-    // DROPDOWN CLASS DEFINITION
-    // =========================
-
-    var backdrop = '.dropdown-backdrop'
-    var toggle = '[data-toggle=dropdown]'
-    var Dropdown = function (element) {
-        var $el = $(element).on('click.bs.dropdown', this.toggle)
-    }
-
-    Dropdown.prototype.toggle = function (e) {
-        var $this = $(this)
-
-        if ($this.is('.disabled, :disabled')) return
-
-        var $parent = getParent($this)
-        var isActive = $parent.hasClass('open')
-
-        clearMenus()
-
-        if (!isActive) {
-            if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) {
-                // if mobile we we use a backdrop because click events don't delegate
-                $('<div class="dropdown-backdrop"/>').insertAfter($(this)).on('click', clearMenus)
-            }
-
-            $parent.trigger(e = $.Event('show.bs.dropdown'))
-
-            if (e.isDefaultPrevented()) return
-
-            $parent
-                .toggleClass('open')
-                .trigger('shown.bs.dropdown')
-
-            $this.focus()
-        }
-
-        return false
-    }
-
-    Dropdown.prototype.keydown = function (e) {
-        if (!/(38|40|27)/.test(e.keyCode)) return
-
-        var $this = $(this)
-
-        e.preventDefault()
-        e.stopPropagation()
-
-        if ($this.is('.disabled, :disabled')) return
-
-        var $parent = getParent($this)
-        var isActive = $parent.hasClass('open')
-
-        if (!isActive || (isActive && e.keyCode == 27)) {
-            if (e.which == 27) $parent.find(toggle).focus()
-            return $this.click()
-        }
-
-        var $items = $('[role=menu] li:not(.divider):visible a', $parent)
-
-        if (!$items.length) return
-
-        var index = $items.index($items.filter(':focus'))
-
-        if (e.keyCode == 38 && index > 0) index--                        // up
-        if (e.keyCode == 40 && index < $items.length - 1) index++                        // down
-        if (!~index) index = 0
-
-        $items.eq(index).focus()
-    }
-
-    function clearMenus() {
-        $(backdrop).remove()
-        $(toggle).each(function (e) {
-            var $parent = getParent($(this))
-            if (!$parent.hasClass('open')) return
-            $parent.trigger(e = $.Event('hide.bs.dropdown'))
-            if (e.isDefaultPrevented()) return
-            $parent.removeClass('open').trigger('hidden.bs.dropdown')
-        })
-    }
-
-    function getParent($this) {
-        var selector = $this.attr('data-target')
-
-        if (!selector) {
-            selector = $this.attr('href')
-            selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
-        }
-
-        var $parent = selector && $(selector)
-
-        return $parent && $parent.length ? $parent : $this.parent()
-    }
-
-
-    // DROPDOWN PLUGIN DEFINITION
-    // ==========================
-
-    var old = $.fn.dropdown
-
-    $.fn.dropdown = function (option) {
-        return this.each(function () {
-            var $this = $(this)
-            var 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
-
-
-    // DROPDOWN NO CONFLICT
-    // ====================
-
-    $.fn.dropdown.noConflict = function () {
-        $.fn.dropdown = old
-        return this
-    }
-
-
-    // APPLY TO STANDARD DROPDOWN ELEMENTS
-    // ===================================
-
-    $(document)
-        .on('click.bs.dropdown.data-api', clearMenus)
-        .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
-        .on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle)
-        .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]', Dropdown.prototype.keydown)
-
-}(window.jQuery);
-
-/* ========================================================================
- * Bootstrap: modal.js v3.0.0
- * http://twbs.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";
-
-    // MODAL CLASS DEFINITION
-    // ======================
-
-    var Modal = function (element, options) {
-        this.options = options
-        this.$element = $(element)
-        this.$backdrop =
-            this.isShown = null
-
-        if (this.options.remote) this.$element.load(this.options.remote)
-    }
-
-    Modal.DEFAULTS = {
-        backdrop: true
-        , keyboard: true
-        , show: true
-    }
-
-    Modal.prototype.toggle = function (_relatedTarget) {
-        return this[!this.isShown ? 'show' : 'hide'](_relatedTarget)
-    }
-
-    Modal.prototype.show = function (_relatedTarget) {
-        var that = this
-        var e = $.Event('show.bs.modal', { relatedTarget: _relatedTarget })
-
-        this.$element.trigger(e)
-
-        if (this.isShown || e.isDefaultPrevented()) return
-
-        this.isShown = true
-
-        this.escape()
-
-        this.$element.on('click.dismiss.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this))
-
-        this.backdrop(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')
-                .attr('aria-hidden', false)
-
-            that.enforceFocus()
-
-            var e = $.Event('shown.bs.modal', { relatedTarget: _relatedTarget })
-
-            transition ?
-                that.$element.find('.modal-dialog') // wait for modal to slide in
-                    .one($.support.transition.end, function () {
-                        that.$element.focus().trigger(e)
-                    })
-                    .emulateTransitionEnd(300) :
-                that.$element.focus().trigger(e)
-        })
-    }
-
-    Modal.prototype.hide = function (e) {
-        if (e) e.preventDefault()
-
-        e = $.Event('hide.bs.modal')
-
-        this.$element.trigger(e)
-
-        if (!this.isShown || e.isDefaultPrevented()) return
-
-        this.isShown = false
-
-        this.escape()
-
-        $(document).off('focusin.bs.modal')
-
-        this.$element
-            .removeClass('in')
-            .attr('aria-hidden', true)
-            .off('click.dismiss.modal')
-
-        $.support.transition && this.$element.hasClass('fade') ?
-            this.$element
-                .one($.support.transition.end, $.proxy(this.hideModal, this))
-                .emulateTransitionEnd(300) :
-            this.hideModal()
-    }
-
-    Modal.prototype.enforceFocus = function () {
-        $(document)
-            .off('focusin.bs.modal') // guard against infinite focus loop
-            .on('focusin.bs.modal', $.proxy(function (e) {
-                if (this.$element[0] !== e.target && !this.$element.has(e.target).length) {
-                    this.$element.focus()
-                }
-            }, this))
-    }
-
-    Modal.prototype.escape = function () {
-        if (this.isShown && this.options.keyboard) {
-            this.$element.on('keyup.dismiss.bs.modal', $.proxy(function (e) {
-                e.which == 27 && this.hide()
-            }, this))
-        } else if (!this.isShown) {
-            this.$element.off('keyup.dismiss.bs.modal')
-        }
-    }
-
-    Modal.prototype.hideModal = function () {
-        var that = this
-        this.$element.hide()
-        this.backdrop(function () {
-            that.removeBackdrop()
-            that.$element.trigger('hidden.bs.modal')
-        })
-    }
-
-    Modal.prototype.removeBackdrop = function () {
-        this.$backdrop && this.$backdrop.remove()
-        this.$backdrop = null
-    }
-
-    Modal.prototype.backdrop = function (callback) {
-        var that = this
-        var animate = this.$element.hasClass('fade') ? 'fade' : ''
-
-        if (this.isShown && this.options.backdrop) {
-            var doAnimate = $.support.transition && animate
-
-            this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
-                .appendTo(document.body)
-
-            this.$element.on('click.dismiss.modal', $.proxy(function (e) {
-                if (e.target !== e.currentTarget) return
-                this.options.backdrop == 'static'
-                    ? this.$element[0].focus.call(this.$element[0])
-                    : this.hide.call(this)
-            }, this))
-
-            if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
-
-            this.$backdrop.addClass('in')
-
-            if (!callback) return
-
-            doAnimate ?
-                this.$backdrop
-                    .one($.support.transition.end, callback)
-                    .emulateTransitionEnd(150) :
-                callback()
-
-        } else if (!this.isShown && this.$backdrop) {
-            this.$backdrop.removeClass('in')
-
-            $.support.transition && this.$element.hasClass('fade') ?
-                this.$backdrop
-                    .one($.support.transition.end, callback)
-                    .emulateTransitionEnd(150) :
-                callback()
-
-        } else if (callback) {
-            callback()
-        }
-    }
-
-
-    // MODAL PLUGIN DEFINITION
-    // =======================
-
-    var old = $.fn.modal
-
-    $.fn.modal = function (option, _relatedTarget) {
-        return this.each(function () {
-            var $this = $(this)
-            var data = $this.data('bs.modal')
-            var options = $.extend({}, Modal.DEFAULTS, $this.data(), typeof option == 'object' && option)
-
-            if (!data) $this.data('bs.modal', (data = new Modal(this, options)))
-            if (typeof option == 'string') data[option](_relatedTarget)
-            else if (options.show) data.show(_relatedTarget)
-        })
-    }
-
-    $.fn.modal.Constructor = Modal
-
-
-    // MODAL NO CONFLICT
-    // =================
-
-    $.fn.modal.noConflict = function () {
-        $.fn.modal = old
-        return this
-    }
-
-
-    // MODAL DATA-API
-    // ==============
-
-    $(document).on('click.bs.modal.data-api', '[data-toggle="modal"]', function (e) {
-        var $this = $(this)
-        var href = $this.attr('href')
-        var $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7
-        var option = $target.data('modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data())
-
-        e.preventDefault()
-
-        $target
-            .modal(option, this)
-            .one('hide', function () {
-                $this.is(':visible') && $this.focus()
-            })
-    })
-
-    $(document)
-        .on('show.bs.modal', '.modal', function () { $(document.body).addClass('modal-open') })
-        .on('hidden.bs.modal', '.modal', function () { $(document.body).removeClass('modal-open') })
-
-}(window.jQuery);
-
-/* ========================================================================
- * Bootstrap: tooltip.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#tooltip
- * 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";
-
-    // TOOLTIP PUBLIC CLASS DEFINITION
-    // ===============================
-
-    var Tooltip = function (element, options) {
-        this.type =
-            this.options =
-            this.enabled =
-            this.timeout =
-            this.hoverState =
-            this.$element = null
-
-        this.init('tooltip', element, options)
-    }
-
-    Tooltip.DEFAULTS = {
-        animation: true
-        , placement: 'top'
-        , selector: false
-        , template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
-        , trigger: 'hover focus'
-        , title: ''
-        , delay: 0
-        , html: false
-        , container: false
-    }
-
-    Tooltip.prototype.init = function (type, element, options) {
-        this.enabled = true
-        this.type = type
-        this.$element = $(element)
-        this.options = this.getOptions(options)
-
-        var triggers = this.options.trigger.split(' ')
-
-        for (var i = triggers.length; i--;) {
-            var trigger = triggers[i]
-
-            if (trigger == 'click') {
-                this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this))
-            } else if (trigger != 'manual') {
-                var eventIn = trigger == 'hover' ? 'mouseenter' : 'focus'
-                var eventOut = trigger == 'hover' ? 'mouseleave' : 'blur'
-
-                this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this))
-                this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this))
-            }
-        }
-
-        this.options.selector ?
-            (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) :
-            this.fixTitle()
-    }
-
-    Tooltip.prototype.getDefaults = function () {
-        return Tooltip.DEFAULTS
-    }
-
-    Tooltip.prototype.getOptions = function (options) {
-        options = $.extend({}, this.getDefaults(), this.$element.data(), options)
-
-        if (options.delay && typeof options.delay == 'number') {
-            options.delay = {
-                show: options.delay
-                , hide: options.delay
-            }
-        }
-
-        return options
-    }
-
-    Tooltip.prototype.getDelegateOptions = function () {
-        var options = {}
-        var defaults = this.getDefaults()
-
-        this._options && $.each(this._options, function (key, value) {
-            if (defaults[key] != value) options[key] = value
-        })
-
-        return options
-    }
-
-    Tooltip.prototype.enter = function (obj) {
-        var self = obj instanceof this.constructor ?
-            obj : $(obj.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type)
-
-        clearTimeout(self.timeout)
-
-        self.hoverState = 'in'
-
-        if (!self.options.delay || !self.options.delay.show) return self.show()
-
-        self.timeout = setTimeout(function () {
-            if (self.hoverState == 'in') self.show()
-        }, self.options.delay.show)
-    }
-
-    Tooltip.prototype.leave = function (obj) {
-        var self = obj instanceof this.constructor ?
-            obj : $(obj.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type)
-
-        clearTimeout(self.timeout)
-
-        self.hoverState = 'out'
-
-        if (!self.options.delay || !self.options.delay.hide) return self.hide()
-
-        self.timeout = setTimeout(function () {
-            if (self.hoverState == 'out') self.hide()
-        }, self.options.delay.hide)
-    }
-
-    Tooltip.prototype.show = function () {
-        var e = $.Event('show.bs.' + this.type)
-
-        if (this.hasContent() && this.enabled) {
-            this.$element.trigger(e)
-
-            if (e.isDefaultPrevented()) return
-
-            var $tip = this.tip()
-
-            this.setContent()
-
-            if (this.options.animation) $tip.addClass('fade')
-
-            var placement = typeof this.options.placement == 'function' ?
-                this.options.placement.call(this, $tip[0], this.$element[0]) :
-                this.options.placement
-
-            var autoToken = /\s?auto?\s?/i
-            var autoPlace = autoToken.test(placement)
-            if (autoPlace) placement = placement.replace(autoToken, '') || 'top'
-
-            $tip
-                .detach()
-                .css({ top: 0, left: 0, display: 'block' })
-                .addClass(placement)
-
-            this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element)
-
-            var pos = this.getPosition()
-            var actualWidth = $tip[0].offsetWidth
-            var actualHeight = $tip[0].offsetHeight
-
-            if (autoPlace) {
-                var $parent = this.$element.parent()
-
-                var orgPlacement = placement
-                var docScroll = document.documentElement.scrollTop || document.body.scrollTop
-                var parentWidth = this.options.container == 'body' ? window.innerWidth : $parent.outerWidth()
-                var parentHeight = this.options.container == 'body' ? window.innerHeight : $parent.outerHeight()
-                var parentLeft = this.options.container == 'body' ? 0 : $parent.offset().left
-
-                placement = placement == 'bottom' && pos.top + pos.height + actualHeight - docScroll > parentHeight ? 'top' :
-                    placement == 'top' && pos.top - docScroll - actualHeight < 0 ? 'bottom' :
-                        placement == 'right' && pos.right + actualWidth > parentWidth ? 'left' :
-                            placement == 'left' && pos.left - actualWidth < parentLeft ? 'right' :
-                                placement
-
-                $tip
-                    .removeClass(orgPlacement)
-                    .addClass(placement)
-            }
-
-            var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight)
-
-            this.applyPlacement(calculatedOffset, placement)
-            this.$element.trigger('shown.bs.' + this.type)
-        }
-    }
-
-    Tooltip.prototype.applyPlacement = function (offset, placement) {
-        var replace
-        var $tip = this.tip()
-        var width = $tip[0].offsetWidth
-        var height = $tip[0].offsetHeight
-
-        // manually read margins because getBoundingClientRect includes difference
-        var marginTop = parseInt($tip.css('margin-top'), 10)
-        var marginLeft = parseInt($tip.css('margin-left'), 10)
-
-        // we must check for NaN for ie 8/9
-        if (isNaN(marginTop)) marginTop = 0
-        if (isNaN(marginLeft)) marginLeft = 0
-
-        offset.top = offset.top + marginTop
-        offset.left = offset.left + marginLeft
-
-        $tip
-            .offset(offset)
-            .addClass('in')
-
-        // check to see if placing tip in new offset caused the tip to resize itself
-        var actualWidth = $tip[0].offsetWidth
-        var actualHeight = $tip[0].offsetHeight
-
-        if (placement == 'top' && actualHeight != height) {
-            replace = true
-            offset.top = offset.top + height - actualHeight
-        }
-
-        if (/bottom|top/.test(placement)) {
-            var delta = 0
-
-            if (offset.left < 0) {
-                delta = offset.left * -2
-                offset.left = 0
-
-                $tip.offset(offset)
-
-                actualWidth = $tip[0].offsetWidth
-                actualHeight = $tip[0].offsetHeight
-            }
-
-            this.replaceArrow(delta - width + actualWidth, actualWidth, 'left')
-        } else {
-            this.replaceArrow(actualHeight - height, actualHeight, 'top')
-        }
-
-        if (replace) $tip.offset(offset)
-    }
-
-    Tooltip.prototype.replaceArrow = function (delta, dimension, position) {
-        this.arrow().css(position, delta ? (50 * (1 - delta / dimension) + "%") : '')
-    }
-
-    Tooltip.prototype.setContent = function () {
-        var $tip = this.tip()
-        var title = this.getTitle()
-
-        $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title)
-        $tip.removeClass('fade in top bottom left right')
-    }
-
-    Tooltip.prototype.hide = function () {
-        var that = this
-        var $tip = this.tip()
-        var e = $.Event('hide.bs.' + this.type)
-
-        function complete() {
-            if (that.hoverState != 'in') $tip.detach()
-        }
-
-        this.$element.trigger(e)
-
-        if (e.isDefaultPrevented()) return
-
-        $tip.removeClass('in')
-
-        $.support.transition && this.$tip.hasClass('fade') ?
-            $tip
-                .one($.support.transition.end, complete)
-                .emulateTransitionEnd(150) :
-            complete()
-
-        this.$element.trigger('hidden.bs.' + this.type)
-
-        return this
-    }
-
-    Tooltip.prototype.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') || '').attr('title', '')
-        }
-    }
-
-    Tooltip.prototype.hasContent = function () {
-        return this.getTitle()
-    }
-
-    Tooltip.prototype.getPosition = function () {
-        var el = this.$element[0]
-        return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : {
-            width: el.offsetWidth
-            , height: el.offsetHeight
-        }, this.$element.offset())
-    }
-
-    Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) {
-        return placement == 'bottom' ? { top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2 } :
-            placement == 'top' ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2 } :
-                placement == 'left' ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } :
-        /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width }
-    }
-
-    Tooltip.prototype.getTitle = function () {
-        var title
-        var $e = this.$element
-        var o = this.options
-
-        title = $e.attr('data-original-title')
-            || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title)
-
-        return title
-    }
-
-    Tooltip.prototype.tip = function () {
-        return this.$tip = this.$tip || $(this.options.template)
-    }
-
-    Tooltip.prototype.arrow = function () {
-        return this.$arrow = this.$arrow || this.tip().find('.tooltip-arrow')
-    }
-
-    Tooltip.prototype.validate = function () {
-        if (!this.$element[0].parentNode) {
-            this.hide()
-            this.$element = null
-            this.options = null
-        }
-    }
-
-    Tooltip.prototype.enable = function () {
-        this.enabled = true
-    }
-
-    Tooltip.prototype.disable = function () {
-        this.enabled = false
-    }
-
-    Tooltip.prototype.toggleEnabled = function () {
-        this.enabled = !this.enabled
-    }
-
-    Tooltip.prototype.toggle = function (e) {
-        var self = e ? $(e.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type) : this
-        self.tip().hasClass('in') ? self.leave(self) : self.enter(self)
-    }
-
-    Tooltip.prototype.destroy = function () {
-        this.hide().$element.off('.' + this.type).removeData('bs.' + this.type)
-    }
-
-
-    // TOOLTIP PLUGIN DEFINITION
-    // =========================
-
-    var old = $.fn.tooltip
-
-    $.fn.tooltip = function (option) {
-        return this.each(function () {
-            var $this = $(this)
-            var data = $this.data('bs.tooltip')
-            var options = typeof option == 'object' && option
-
-            if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options)))
-            if (typeof option == 'string') data[option]()
-        })
-    }
-
-    $.fn.tooltip.Constructor = Tooltip
-
-
-    // TOOLTIP NO CONFLICT
-    // ===================
-
-    $.fn.tooltip.noConflict = function () {
-        $.fn.tooltip = old
-        return this
-    }
-
-}(window.jQuery);
-
-/* ========================================================================
- * Bootstrap: popover.js v3.0.0
- * http://twbs.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";
-
-    // POPOVER PUBLIC CLASS DEFINITION
-    // ===============================
-
-    var Popover = function (element, options) {
-        this.init('popover', element, options)
-    }
-
-    if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')
-
-    Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
-        placement: 'right'
-        , trigger: 'click'
-        , content: ''
-        , template: '<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'
-    })
-
-
-    // NOTE: POPOVER EXTENDS tooltip.js
-    // ================================
-
-    Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype)
-
-    Popover.prototype.constructor = Popover
-
-    Popover.prototype.getDefaults = function () {
-        return Popover.DEFAULTS
-    }
-
-    Popover.prototype.setContent = function () {
-        var $tip = this.tip()
-        var title = this.getTitle()
-        var content = this.getContent()
-
-        $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
-        $tip.find('.popover-content')[this.options.html ? 'html' : 'text'](content)
-
-        $tip.removeClass('fade top bottom left right in')
-
-        // IE8 doesn't accept hiding via the `:empty` pseudo selector, we have to do
-        // this manually by checking the contents.
-        if (!$tip.find('.popover-title').html()) $tip.find('.popover-title').hide()
-    }
-
-    Popover.prototype.hasContent = function () {
-        return this.getTitle() || this.getContent()
-    }
-
-    Popover.prototype.getContent = function () {
-        var $e = this.$element
-        var o = this.options
-
-        return $e.attr('data-content')
-            || (typeof o.content == 'function' ?
-                o.content.call($e[0]) :
-                o.content)
-    }
-
-    Popover.prototype.arrow = function () {
-        return this.$arrow = this.$arrow || this.tip().find('.arrow')
-    }
-
-    Popover.prototype.tip = function () {
-        if (!this.$tip) this.$tip = $(this.options.template)
-        return this.$tip
-    }
-
-
-    // POPOVER PLUGIN DEFINITION
-    // =========================
-
-    var old = $.fn.popover
-
-    $.fn.popover = function (option) {
-        return this.each(function () {
-            var $this = $(this)
-            var data = $this.data('bs.popover')
-            var options = typeof option == 'object' && option
-
-            if (!data) $this.data('bs.popover', (data = new Popover(this, options)))
-            if (typeof option == 'string') data[option]()
-        })
-    }
-
-    $.fn.popover.Constructor = Popover
-
-
-    // POPOVER NO CONFLICT
-    // ===================
-
-    $.fn.popover.noConflict = function () {
-        $.fn.popover = old
-        return this
-    }
-
-}(window.jQuery);
-
-/* ========================================================================
- * Bootstrap: scrollspy.js v3.0.0
- * http://twbs.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";
-
-    // SCROLLSPY CLASS DEFINITION
-    // ==========================
-
-    function ScrollSpy(element, options) {
-        var href
-        var process = $.proxy(this.process, this)
-
-        this.$element = $(element).is('body') ? $(window) : $(element)
-        this.$body = $('body')
-        this.$scrollElement = this.$element.on('scroll.bs.scroll-spy.data-api', process)
-        this.options = $.extend({}, ScrollSpy.DEFAULTS, options)
-        this.selector = (this.options.target
-            || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
-            || '') + ' .nav li > a'
-        this.offsets = $([])
-        this.targets = $([])
-        this.activeTarget = null
-
-        this.refresh()
-        this.process()
-    }
-
-    ScrollSpy.DEFAULTS = {
-        offset: 10
-    }
-
-    ScrollSpy.prototype.refresh = function () {
-        var offsetMethod = this.$element[0] == window ? 'offset' : 'position'
-
-        this.offsets = $([])
-        this.targets = $([])
-
-        var self = this
-        var $targets = this.$body
-            .find(this.selector)
-            .map(function () {
-                var $el = $(this)
-                var href = $el.data('target') || $el.attr('href')
-                var $href = /^#\w/.test(href) && $(href)
-
-                return ($href
-                    && $href.length
-                    && [[$href[offsetMethod]().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href]]) || null
-            })
-            .sort(function (a, b) { return a[0] - b[0] })
-            .each(function () {
-                self.offsets.push(this[0])
-                self.targets.push(this[1])
-            })
-    }
-
-    ScrollSpy.prototype.process = function () {
-        var scrollTop = this.$scrollElement.scrollTop() + this.options.offset
-        var scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight
-        var maxScroll = scrollHeight - this.$scrollElement.height()
-        var offsets = this.offsets
-        var targets = this.targets
-        var activeTarget = this.activeTarget
-        var 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])
-        }
-
-        if (activeTarget == null) {
-            activeTarget == targets[0];
-        }
-
-    }
-
-    ScrollSpy.prototype.activate = function (target) {
-        this.activeTarget = target
-
-        $(this.selector)
-            .parents('.active')
-            .removeClass('active')
-
-        var selector = this.selector
-            + '[data-target="' + target + '"],'
-            + this.selector + '[href="' + target + '"]'
-
-        var active = $(selector)
-            .parents('li')
-            .addClass('active')
-
-        if (active.parent('.dropdown-menu').length) {
-            active = active
-                .closest('li.dropdown')
-                .addClass('active')
-        }
-
-        active.trigger('activate')
-    }
-
-
-    // SCROLLSPY PLUGIN DEFINITION
-    // ===========================
-
-    var old = $.fn.scrollspy
-
-    $.fn.scrollspy = function (option) {
-        return this.each(function () {
-            var $this = $(this)
-            var data = $this.data('bs.scrollspy')
-            var options = typeof option == 'object' && option
-
-            if (!data) $this.data('bs.scrollspy', (data = new ScrollSpy(this, options)))
-            if (typeof option == 'string') data[option]()
-        })
-    }
-
-    $.fn.scrollspy.Constructor = ScrollSpy
-
-
-    // SCROLLSPY NO CONFLICT
-    // =====================
-
-    $.fn.scrollspy.noConflict = function () {
-        $.fn.scrollspy = old
-        return this
-    }
-
-
-    // SCROLLSPY DATA-API
-    // ==================
-
-    $(window).on('load', function () {
-        $('[data-spy="scroll"]').each(function () {
-            var $spy = $(this)
-            $spy.scrollspy($spy.data())
-        })
-    })
-
-}(window.jQuery);
-
-/* ========================================================================
- * Bootstrap: tab.js v3.0.0
- * http://twbs.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";
-
-    // TAB CLASS DEFINITION
-    // ====================
-
-    var Tab = function (element) {
-        this.element = $(element)
-    }
-
-    Tab.prototype.show = function () {
-        var $this = this.element
-        var $ul = $this.closest('ul:not(.dropdown-menu)')
-        var selector = $this.attr('data-target')
-
-        if (!selector) {
-            selector = $this.attr('href')
-            selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
-        }
-
-        if ($this.parent('li').hasClass('active')) return
-
-        var previous = $ul.find('.active:last a')[0]
-        var e = $.Event('show.bs.tab', {
-            relatedTarget: previous
-        })
-
-        $this.trigger(e)
-
-        if (e.isDefaultPrevented()) return
-
-        var $target = $(selector)
-
-        this.activate($this.parent('li'), $ul)
-        this.activate($target, $target.parent(), function () {
-            $this.trigger({
-                type: 'shown.bs.tab'
-                , relatedTarget: previous
-            })
-        })
-    }
-
-    Tab.prototype.activate = function (element, container, callback) {
-        var $active = container.find('> .active')
-        var 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)
-                .emulateTransitionEnd(150) :
-            next()
-
-        $active.removeClass('in')
-    }
-
-
-    // TAB PLUGIN DEFINITION
-    // =====================
-
-    var old = $.fn.tab
-
-    $.fn.tab = function (option) {
-        return this.each(function () {
-            var $this = $(this)
-            var data = $this.data('bs.tab')
-
-            if (!data) $this.data('bs.tab', (data = new Tab(this)))
-            if (typeof option == 'string') data[option]()
-        })
-    }
-
-    $.fn.tab.Constructor = Tab
-
-
-    // TAB NO CONFLICT
-    // ===============
-
-    $.fn.tab.noConflict = function () {
-        $.fn.tab = old
-        return this
-    }
-
-
-    // TAB DATA-API
-    // ============
-
-    $(document).on('click.bs.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
-        e.preventDefault()
-        $(this).tab('show')
-    })
-
-}(window.jQuery);
-
-/* ========================================================================
- * Bootstrap: affix.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#affix
- * ========================================================================
- * 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";
-
-    // AFFIX CLASS DEFINITION
-    // ======================
-
-    var Affix = function (element, options) {
-        this.options = $.extend({}, Affix.DEFAULTS, options)
-        this.$window = $(window)
-            .on('scroll.bs.affix.data-api', $.proxy(this.checkPosition, this))
-            .on('click.bs.affix.data-api', $.proxy(this.checkPositionWithEventLoop, this))
-
-        this.$element = $(element)
-        this.affixed =
-            this.unpin = null
-
-        this.checkPosition()
-    }
-
-    Affix.RESET = 'affix affix-top affix-bottom'
-
-    Affix.DEFAULTS = {
-        offset: 0
-    }
-
-    Affix.prototype.checkPositionWithEventLoop = function () {
-        setTimeout($.proxy(this.checkPosition, this), 1)
-    }
-
-    Affix.prototype.checkPosition = function () {
-        if (!this.$element.is(':visible')) return
-
-        var scrollHeight = $(document).height()
-        var scrollTop = this.$window.scrollTop()
-        var position = this.$element.offset()
-        var offset = this.options.offset
-        var offsetTop = offset.top
-        var offsetBottom = offset.bottom
-
-        if (typeof offset != 'object') offsetBottom = offsetTop = offset
-        if (typeof offsetTop == 'function') offsetTop = offset.top()
-        if (typeof offsetBottom == 'function') offsetBottom = offset.bottom()
-
-        var affix = this.unpin != null && (scrollTop + this.unpin <= position.top) ? false :
-            offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ? 'bottom' :
-                offsetTop != null && (scrollTop <= offsetTop) ? 'top' : false
-
-        if (this.affixed === affix) return
-        if (this.unpin) this.$element.css('top', '')
-
-        this.affixed = affix
-        this.unpin = affix == 'bottom' ? position.top - scrollTop : null
-
-        this.$element.removeClass(Affix.RESET).addClass('affix' + (affix ? '-' + affix : ''))
-
-        if (affix == 'bottom') {
-            this.$element.offset({ top: document.body.offsetHeight - offsetBottom - this.$element.height() })
-        }
-    }
-
-
-    // AFFIX PLUGIN DEFINITION
-    // =======================
-
-    var old = $.fn.affix
-
-    $.fn.affix = function (option) {
-        return this.each(function () {
-            var $this = $(this)
-            var data = $this.data('bs.affix')
-            var options = typeof option == 'object' && option
-
-            if (!data) $this.data('bs.affix', (data = new Affix(this, options)))
-            if (typeof option == 'string') data[option]()
-        })
-    }
-
-    $.fn.affix.Constructor = Affix
-
-
-    // AFFIX NO CONFLICT
-    // =================
-
-    $.fn.affix.noConflict = function () {
-        $.fn.affix = old
-        return this
-    }
-
-
-    // AFFIX DATA-API
-    // ==============
-
-    $(window).on('load', function () {
-        $('[data-spy="affix"]').each(function () {
-            var $spy = $(this)
-            var data = $spy.data()
-
-            data.offset = data.offset || {}
-
-            if (data.offsetBottom) data.offset.bottom = data.offsetBottom
-            if (data.offsetTop) data.offset.top = data.offsetTop
-
-            $spy.affix(data)
-        })
-    })
-
-}(window.jQuery);
diff --git a/NewLife.Cube/Content/bootstrap/js/bootstrap.min.js b/NewLife.Cube/Content/bootstrap/js/bootstrap.min.js
deleted file mode 100644
index 9bcd2fccae..0000000000
--- a/NewLife.Cube/Content/bootstrap/js/bootstrap.min.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/*!
- * Bootstrap v3.3.7 (http://getbootstrap.com)
- * Copyright 2011-2016 Twitter, Inc.
- * Licensed under the MIT license
- */
-if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");+function(a){"use strict";var b=a.fn.jquery.split(" ")[0].split(".");if(b[0]<2&&b[1]<9||1==b[0]&&9==b[1]&&b[2]<1||b[0]>3)throw new Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher, but lower than version 4")}(jQuery),+function(a){"use strict";function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var c in b)if(void 0!==a.style[c])return{end:b[c]};return!1}a.fn.emulateTransitionEnd=function(b){var c=!1,d=this;a(this).one("bsTransitionEnd",function(){c=!0});var e=function(){c||a(d).trigger(a.support.transition.end)};return setTimeout(e,b),this},a(function(){a.support.transition=b(),a.support.transition&&(a.event.special.bsTransitionEnd={bindType:a.support.transition.end,delegateType:a.support.transition.end,handle:function(b){if(a(b.target).is(this))return b.handleObj.handler.apply(this,arguments)}})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var c=a(this),e=c.data("bs.alert");e||c.data("bs.alert",e=new d(this)),"string"==typeof b&&e[b].call(c)})}var c='[data-dismiss="alert"]',d=function(b){a(b).on("click",c,this.close)};d.VERSION="3.3.7",d.TRANSITION_DURATION=150,d.prototype.close=function(b){function c(){g.detach().trigger("closed.bs.alert").remove()}var e=a(this),f=e.attr("data-target");f||(f=e.attr("href"),f=f&&f.replace(/.*(?=#[^\s]*$)/,""));var g=a("#"===f?[]:f);b&&b.preventDefault(),g.length||(g=e.closest(".alert")),g.trigger(b=a.Event("close.bs.alert")),b.isDefaultPrevented()||(g.removeClass("in"),a.support.transition&&g.hasClass("fade")?g.one("bsTransitionEnd",c).emulateTransitionEnd(d.TRANSITION_DURATION):c())};var e=a.fn.alert;a.fn.alert=b,a.fn.alert.Constructor=d,a.fn.alert.noConflict=function(){return a.fn.alert=e,this},a(document).on("click.bs.alert.data-api",c,d.prototype.close)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.button"),f="object"==typeof b&&b;e||d.data("bs.button",e=new c(this,f)),"toggle"==b?e.toggle():b&&e.setState(b)})}var c=function(b,d){this.$element=a(b),this.options=a.extend({},c.DEFAULTS,d),this.isLoading=!1};c.VERSION="3.3.7",c.DEFAULTS={loadingText:"loading..."},c.prototype.setState=function(b){var c="disabled",d=this.$element,e=d.is("input")?"val":"html",f=d.data();b+="Text",null==f.resetText&&d.data("resetText",d[e]()),setTimeout(a.proxy(function(){d[e](null==f[b]?this.options[b]:f[b]),"loadingText"==b?(this.isLoading=!0,d.addClass(c).attr(c,c).prop(c,!0)):this.isLoading&&(this.isLoading=!1,d.removeClass(c).removeAttr(c).prop(c,!1))},this),0)},c.prototype.toggle=function(){var a=!0,b=this.$element.closest('[data-toggle="buttons"]');if(b.length){var c=this.$element.find("input");"radio"==c.prop("type")?(c.prop("checked")&&(a=!1),b.find(".active").removeClass("active"),this.$element.addClass("active")):"checkbox"==c.prop("type")&&(c.prop("checked")!==this.$element.hasClass("active")&&(a=!1),this.$element.toggleClass("active")),c.prop("checked",this.$element.hasClass("active")),a&&c.trigger("change")}else this.$element.attr("aria-pressed",!this.$element.hasClass("active")),this.$element.toggleClass("active")};var d=a.fn.button;a.fn.button=b,a.fn.button.Constructor=c,a.fn.button.noConflict=function(){return a.fn.button=d,this},a(document).on("click.bs.button.data-api",'[data-toggle^="button"]',function(c){var d=a(c.target).closest(".btn");b.call(d,"toggle"),a(c.target).is('input[type="radio"], input[type="checkbox"]')||(c.preventDefault(),d.is("input,button")?d.trigger("focus"):d.find("input:visible,button:visible").first().trigger("focus"))}).on("focus.bs.button.data-api blur.bs.button.data-api",'[data-toggle^="button"]',function(b){a(b.target).closest(".btn").toggleClass("focus",/^focus(in)?$/.test(b.type))})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.carousel"),f=a.extend({},c.DEFAULTS,d.data(),"object"==typeof b&&b),g="string"==typeof b?b:f.slide;e||d.data("bs.carousel",e=new c(this,f)),"number"==typeof b?e.to(b):g?e[g]():f.interval&&e.pause().cycle()})}var c=function(b,c){this.$element=a(b),this.$indicators=this.$element.find(".carousel-indicators"),this.options=c,this.paused=null,this.sliding=null,this.interval=null,this.$active=null,this.$items=null,this.options.keyboard&&this.$element.on("keydown.bs.carousel",a.proxy(this.keydown,this)),"hover"==this.options.pause&&!("ontouchstart"in document.documentElement)&&this.$element.on("mouseenter.bs.carousel",a.proxy(this.pause,this)).on("mouseleave.bs.carousel",a.proxy(this.cycle,this))};c.VERSION="3.3.7",c.TRANSITION_DURATION=600,c.DEFAULTS={interval:5e3,pause:"hover",wrap:!0,keyboard:!0},c.prototype.keydown=function(a){if(!/input|textarea/i.test(a.target.tagName)){switch(a.which){case 37:this.prev();break;case 39:this.next();break;default:return}a.preventDefault()}},c.prototype.cycle=function(b){return b||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},c.prototype.getItemIndex=function(a){return this.$items=a.parent().children(".item"),this.$items.index(a||this.$active)},c.prototype.getItemForDirection=function(a,b){var c=this.getItemIndex(b),d="prev"==a&&0===c||"next"==a&&c==this.$items.length-1;if(d&&!this.options.wrap)return b;var e="prev"==a?-1:1,f=(c+e)%this.$items.length;return this.$items.eq(f)},c.prototype.to=function(a){var b=this,c=this.getItemIndex(this.$active=this.$element.find(".item.active"));if(!(a>this.$items.length-1||a<0))return this.sliding?this.$element.one("slid.bs.carousel",function(){b.to(a)}):c==a?this.pause().cycle():this.slide(a>c?"next":"prev",this.$items.eq(a))},c.prototype.pause=function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition&&(this.$element.trigger(a.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},c.prototype.next=function(){if(!this.sliding)return this.slide("next")},c.prototype.prev=function(){if(!this.sliding)return this.slide("prev")},c.prototype.slide=function(b,d){var e=this.$element.find(".item.active"),f=d||this.getItemForDirection(b,e),g=this.interval,h="next"==b?"left":"right",i=this;if(f.hasClass("active"))return this.sliding=!1;var j=f[0],k=a.Event("slide.bs.carousel",{relatedTarget:j,direction:h});if(this.$element.trigger(k),!k.isDefaultPrevented()){if(this.sliding=!0,g&&this.pause(),this.$indicators.length){this.$indicators.find(".active").removeClass("active");var l=a(this.$indicators.children()[this.getItemIndex(f)]);l&&l.addClass("active")}var m=a.Event("slid.bs.carousel",{relatedTarget:j,direction:h});return a.support.transition&&this.$element.hasClass("slide")?(f.addClass(b),f[0].offsetWidth,e.addClass(h),f.addClass(h),e.one("bsTransitionEnd",function(){f.removeClass([b,h].join(" ")).addClass("active"),e.removeClass(["active",h].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger(m)},0)}).emulateTransitionEnd(c.TRANSITION_DURATION)):(e.removeClass("active"),f.addClass("active"),this.sliding=!1,this.$element.trigger(m)),g&&this.cycle(),this}};var d=a.fn.carousel;a.fn.carousel=b,a.fn.carousel.Constructor=c,a.fn.carousel.noConflict=function(){return a.fn.carousel=d,this};var e=function(c){var d,e=a(this),f=a(e.attr("data-target")||(d=e.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""));if(f.hasClass("carousel")){var g=a.extend({},f.data(),e.data()),h=e.attr("data-slide-to");h&&(g.interval=!1),b.call(f,g),h&&f.data("bs.carousel").to(h),c.preventDefault()}};a(document).on("click.bs.carousel.data-api","[data-slide]",e).on("click.bs.carousel.data-api","[data-slide-to]",e),a(window).on("load",function(){a('[data-ride="carousel"]').each(function(){var c=a(this);b.call(c,c.data())})})}(jQuery),+function(a){"use strict";function b(b){var c,d=b.attr("data-target")||(c=b.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,"");return a(d)}function c(b){return this.each(function(){var c=a(this),e=c.data("bs.collapse"),f=a.extend({},d.DEFAULTS,c.data(),"object"==typeof b&&b);!e&&f.toggle&&/show|hide/.test(b)&&(f.toggle=!1),e||c.data("bs.collapse",e=new d(this,f)),"string"==typeof b&&e[b]()})}var d=function(b,c){this.$element=a(b),this.options=a.extend({},d.DEFAULTS,c),this.$trigger=a('[data-toggle="collapse"][href="#'+b.id+'"],[data-toggle="collapse"][data-target="#'+b.id+'"]'),this.transitioning=null,this.options.parent?this.$parent=this.getParent():this.addAriaAndCollapsedClass(this.$element,this.$trigger),this.options.toggle&&this.toggle()};d.VERSION="3.3.7",d.TRANSITION_DURATION=350,d.DEFAULTS={toggle:!0},d.prototype.dimension=function(){var a=this.$element.hasClass("width");return a?"width":"height"},d.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var b,e=this.$parent&&this.$parent.children(".panel").children(".in, .collapsing");if(!(e&&e.length&&(b=e.data("bs.collapse"),b&&b.transitioning))){var f=a.Event("show.bs.collapse");if(this.$element.trigger(f),!f.isDefaultPrevented()){e&&e.length&&(c.call(e,"hide"),b||e.data("bs.collapse",null));var g=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[g](0).attr("aria-expanded",!0),this.$trigger.removeClass("collapsed").attr("aria-expanded",!0),this.transitioning=1;var h=function(){this.$element.removeClass("collapsing").addClass("collapse in")[g](""),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!a.support.transition)return h.call(this);var i=a.camelCase(["scroll",g].join("-"));this.$element.one("bsTransitionEnd",a.proxy(h,this)).emulateTransitionEnd(d.TRANSITION_DURATION)[g](this.$element[0][i])}}}},d.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var b=a.Event("hide.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.dimension();this.$element[c](this.$element[c]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse in").attr("aria-expanded",!1),this.$trigger.addClass("collapsed").attr("aria-expanded",!1),this.transitioning=1;var e=function(){this.transitioning=0,this.$element.removeClass("collapsing").addClass("collapse").trigger("hidden.bs.collapse")};return a.support.transition?void this.$element[c](0).one("bsTransitionEnd",a.proxy(e,this)).emulateTransitionEnd(d.TRANSITION_DURATION):e.call(this)}}},d.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()},d.prototype.getParent=function(){return a(this.options.parent).find('[data-toggle="collapse"][data-parent="'+this.options.parent+'"]').each(a.proxy(function(c,d){var e=a(d);this.addAriaAndCollapsedClass(b(e),e)},this)).end()},d.prototype.addAriaAndCollapsedClass=function(a,b){var c=a.hasClass("in");a.attr("aria-expanded",c),b.toggleClass("collapsed",!c).attr("aria-expanded",c)};var e=a.fn.collapse;a.fn.collapse=c,a.fn.collapse.Constructor=d,a.fn.collapse.noConflict=function(){return a.fn.collapse=e,this},a(document).on("click.bs.collapse.data-api",'[data-toggle="collapse"]',function(d){var e=a(this);e.attr("data-target")||d.preventDefault();var f=b(e),g=f.data("bs.collapse"),h=g?"toggle":e.data();c.call(f,h)})}(jQuery),+function(a){"use strict";function b(b){var c=b.attr("data-target");c||(c=b.attr("href"),c=c&&/#[A-Za-z]/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,""));var d=c&&a(c);return d&&d.length?d:b.parent()}function c(c){c&&3===c.which||(a(e).remove(),a(f).each(function(){var d=a(this),e=b(d),f={relatedTarget:this};e.hasClass("open")&&(c&&"click"==c.type&&/input|textarea/i.test(c.target.tagName)&&a.contains(e[0],c.target)||(e.trigger(c=a.Event("hide.bs.dropdown",f)),c.isDefaultPrevented()||(d.attr("aria-expanded","false"),e.removeClass("open").trigger(a.Event("hidden.bs.dropdown",f)))))}))}function d(b){return this.each(function(){var c=a(this),d=c.data("bs.dropdown");d||c.data("bs.dropdown",d=new g(this)),"string"==typeof b&&d[b].call(c)})}var e=".dropdown-backdrop",f='[data-toggle="dropdown"]',g=function(b){a(b).on("click.bs.dropdown",this.toggle)};g.VERSION="3.3.7",g.prototype.toggle=function(d){var e=a(this);if(!e.is(".disabled, :disabled")){var f=b(e),g=f.hasClass("open");if(c(),!g){"ontouchstart"in document.documentElement&&!f.closest(".navbar-nav").length&&a(document.createElement("div")).addClass("dropdown-backdrop").insertAfter(a(this)).on("click",c);var h={relatedTarget:this};if(f.trigger(d=a.Event("show.bs.dropdown",h)),d.isDefaultPrevented())return;e.trigger("focus").attr("aria-expanded","true"),f.toggleClass("open").trigger(a.Event("shown.bs.dropdown",h))}return!1}},g.prototype.keydown=function(c){if(/(38|40|27|32)/.test(c.which)&&!/input|textarea/i.test(c.target.tagName)){var d=a(this);if(c.preventDefault(),c.stopPropagation(),!d.is(".disabled, :disabled")){var e=b(d),g=e.hasClass("open");if(!g&&27!=c.which||g&&27==c.which)return 27==c.which&&e.find(f).trigger("focus"),d.trigger("click");var h=" li:not(.disabled):visible a",i=e.find(".dropdown-menu"+h);if(i.length){var j=i.index(c.target);38==c.which&&j>0&&j--,40==c.which&&j<i.length-1&&j++,~j||(j=0),i.eq(j).trigger("focus")}}}};var h=a.fn.dropdown;a.fn.dropdown=d,a.fn.dropdown.Constructor=g,a.fn.dropdown.noConflict=function(){return a.fn.dropdown=h,this},a(document).on("click.bs.dropdown.data-api",c).on("click.bs.dropdown.data-api",".dropdown form",function(a){a.stopPropagation()}).on("click.bs.dropdown.data-api",f,g.prototype.toggle).on("keydown.bs.dropdown.data-api",f,g.prototype.keydown).on("keydown.bs.dropdown.data-api",".dropdown-menu",g.prototype.keydown)}(jQuery),+function(a){"use strict";function b(b,d){return this.each(function(){var e=a(this),f=e.data("bs.modal"),g=a.extend({},c.DEFAULTS,e.data(),"object"==typeof b&&b);f||e.data("bs.modal",f=new c(this,g)),"string"==typeof b?f[b](d):g.show&&f.show(d)})}var c=function(b,c){this.options=c,this.$body=a(document.body),this.$element=a(b),this.$dialog=this.$element.find(".modal-dialog"),this.$backdrop=null,this.isShown=null,this.originalBodyPad=null,this.scrollbarWidth=0,this.ignoreBackdropClick=!1,this.options.remote&&this.$element.find(".modal-content").load(this.options.remote,a.proxy(function(){this.$element.trigger("loaded.bs.modal")},this))};c.VERSION="3.3.7",c.TRANSITION_DURATION=300,c.BACKDROP_TRANSITION_DURATION=150,c.DEFAULTS={backdrop:!0,keyboard:!0,show:!0},c.prototype.toggle=function(a){return this.isShown?this.hide():this.show(a)},c.prototype.show=function(b){var d=this,e=a.Event("show.bs.modal",{relatedTarget:b});this.$element.trigger(e),this.isShown||e.isDefaultPrevented()||(this.isShown=!0,this.checkScrollbar(),this.setScrollbar(),this.$body.addClass("modal-open"),this.escape(),this.resize(),this.$element.on("click.dismiss.bs.modal",'[data-dismiss="modal"]',a.proxy(this.hide,this)),this.$dialog.on("mousedown.dismiss.bs.modal",function(){d.$element.one("mouseup.dismiss.bs.modal",function(b){a(b.target).is(d.$element)&&(d.ignoreBackdropClick=!0)})}),this.backdrop(function(){var e=a.support.transition&&d.$element.hasClass("fade");d.$element.parent().length||d.$element.appendTo(d.$body),d.$element.show().scrollTop(0),d.adjustDialog(),e&&d.$element[0].offsetWidth,d.$element.addClass("in"),d.enforceFocus();var f=a.Event("shown.bs.modal",{relatedTarget:b});e?d.$dialog.one("bsTransitionEnd",function(){d.$element.trigger("focus").trigger(f)}).emulateTransitionEnd(c.TRANSITION_DURATION):d.$element.trigger("focus").trigger(f)}))},c.prototype.hide=function(b){b&&b.preventDefault(),b=a.Event("hide.bs.modal"),this.$element.trigger(b),this.isShown&&!b.isDefaultPrevented()&&(this.isShown=!1,this.escape(),this.resize(),a(document).off("focusin.bs.modal"),this.$element.removeClass("in").off("click.dismiss.bs.modal").off("mouseup.dismiss.bs.modal"),this.$dialog.off("mousedown.dismiss.bs.modal"),a.support.transition&&this.$element.hasClass("fade")?this.$element.one("bsTransitionEnd",a.proxy(this.hideModal,this)).emulateTransitionEnd(c.TRANSITION_DURATION):this.hideModal())},c.prototype.enforceFocus=function(){a(document).off("focusin.bs.modal").on("focusin.bs.modal",a.proxy(function(a){document===a.target||this.$element[0]===a.target||this.$element.has(a.target).length||this.$element.trigger("focus")},this))},c.prototype.escape=function(){this.isShown&&this.options.keyboard?this.$element.on("keydown.dismiss.bs.modal",a.proxy(function(a){27==a.which&&this.hide()},this)):this.isShown||this.$element.off("keydown.dismiss.bs.modal")},c.prototype.resize=function(){this.isShown?a(window).on("resize.bs.modal",a.proxy(this.handleUpdate,this)):a(window).off("resize.bs.modal")},c.prototype.hideModal=function(){var a=this;this.$element.hide(),this.backdrop(function(){a.$body.removeClass("modal-open"),a.resetAdjustments(),a.resetScrollbar(),a.$element.trigger("hidden.bs.modal")})},c.prototype.removeBackdrop=function(){this.$backdrop&&this.$backdrop.remove(),this.$backdrop=null},c.prototype.backdrop=function(b){var d=this,e=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var f=a.support.transition&&e;if(this.$backdrop=a(document.createElement("div")).addClass("modal-backdrop "+e).appendTo(this.$body),this.$element.on("click.dismiss.bs.modal",a.proxy(function(a){return this.ignoreBackdropClick?void(this.ignoreBackdropClick=!1):void(a.target===a.currentTarget&&("static"==this.options.backdrop?this.$element[0].focus():this.hide()))},this)),f&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),!b)return;f?this.$backdrop.one("bsTransitionEnd",b).emulateTransitionEnd(c.BACKDROP_TRANSITION_DURATION):b()}else if(!this.isShown&&this.$backdrop){this.$backdrop.removeClass("in");var g=function(){d.removeBackdrop(),b&&b()};a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one("bsTransitionEnd",g).emulateTransitionEnd(c.BACKDROP_TRANSITION_DURATION):g()}else b&&b()},c.prototype.handleUpdate=function(){this.adjustDialog()},c.prototype.adjustDialog=function(){var a=this.$element[0].scrollHeight>document.documentElement.clientHeight;this.$element.css({paddingLeft:!this.bodyIsOverflowing&&a?this.scrollbarWidth:"",paddingRight:this.bodyIsOverflowing&&!a?this.scrollbarWidth:""})},c.prototype.resetAdjustments=function(){this.$element.css({paddingLeft:"",paddingRight:""})},c.prototype.checkScrollbar=function(){var a=window.innerWidth;if(!a){var b=document.documentElement.getBoundingClientRect();a=b.right-Math.abs(b.left)}this.bodyIsOverflowing=document.body.clientWidth<a,this.scrollbarWidth=this.measureScrollbar()},c.prototype.setScrollbar=function(){var a=parseInt(this.$body.css("padding-right")||0,10);this.originalBodyPad=document.body.style.paddingRight||"",this.bodyIsOverflowing&&this.$body.css("padding-right",a+this.scrollbarWidth)},c.prototype.resetScrollbar=function(){this.$body.css("padding-right",this.originalBodyPad)},c.prototype.measureScrollbar=function(){var a=document.createElement("div");a.className="modal-scrollbar-measure",this.$body.append(a);var b=a.offsetWidth-a.clientWidth;return this.$body[0].removeChild(a),b};var d=a.fn.modal;a.fn.modal=b,a.fn.modal.Constructor=c,a.fn.modal.noConflict=function(){return a.fn.modal=d,this},a(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(c){var d=a(this),e=d.attr("href"),f=a(d.attr("data-target")||e&&e.replace(/.*(?=#[^\s]+$)/,"")),g=f.data("bs.modal")?"toggle":a.extend({remote:!/#/.test(e)&&e},f.data(),d.data());d.is("a")&&c.preventDefault(),f.one("show.bs.modal",function(a){a.isDefaultPrevented()||f.one("hidden.bs.modal",function(){d.is(":visible")&&d.trigger("focus")})}),b.call(f,g,this)})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.tooltip"),f="object"==typeof b&&b;!e&&/destroy|hide/.test(b)||(e||d.data("bs.tooltip",e=new c(this,f)),"string"==typeof b&&e[b]())})}var c=function(a,b){this.type=null,this.options=null,this.enabled=null,this.timeout=null,this.hoverState=null,this.$element=null,this.inState=null,this.init("tooltip",a,b)};c.VERSION="3.3.7",c.TRANSITION_DURATION=150,c.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!1,container:!1,viewport:{selector:"body",padding:0}},c.prototype.init=function(b,c,d){if(this.enabled=!0,this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.$viewport=this.options.viewport&&a(a.isFunction(this.options.viewport)?this.options.viewport.call(this,this.$element):this.options.viewport.selector||this.options.viewport),this.inState={click:!1,hover:!1,focus:!1},this.$element[0]instanceof document.constructor&&!this.options.selector)throw new Error("`selector` option must be specified when initializing "+this.type+" on the window.document object!");for(var e=this.options.trigger.split(" "),f=e.length;f--;){var g=e[f];if("click"==g)this.$element.on("click."+this.type,this.options.selector,a.proxy(this.toggle,this));else if("manual"!=g){var h="hover"==g?"mouseenter":"focusin",i="hover"==g?"mouseleave":"focusout";this.$element.on(h+"."+this.type,this.options.selector,a.proxy(this.enter,this)),this.$element.on(i+"."+this.type,this.options.selector,a.proxy(this.leave,this))}}this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.getOptions=function(b){return b=a.extend({},this.getDefaults(),this.$element.data(),b),b.delay&&"number"==typeof b.delay&&(b.delay={show:b.delay,hide:b.delay}),b},c.prototype.getDelegateOptions=function(){var b={},c=this.getDefaults();return this._options&&a.each(this._options,function(a,d){c[a]!=d&&(b[a]=d)}),b},c.prototype.enter=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),b instanceof a.Event&&(c.inState["focusin"==b.type?"focus":"hover"]=!0),c.tip().hasClass("in")||"in"==c.hoverState?void(c.hoverState="in"):(clearTimeout(c.timeout),c.hoverState="in",c.options.delay&&c.options.delay.show?void(c.timeout=setTimeout(function(){"in"==c.hoverState&&c.show()},c.options.delay.show)):c.show())},c.prototype.isInStateTrue=function(){for(var a in this.inState)if(this.inState[a])return!0;return!1},c.prototype.leave=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);if(c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),b instanceof a.Event&&(c.inState["focusout"==b.type?"focus":"hover"]=!1),!c.isInStateTrue())return clearTimeout(c.timeout),c.hoverState="out",c.options.delay&&c.options.delay.hide?void(c.timeout=setTimeout(function(){"out"==c.hoverState&&c.hide()},c.options.delay.hide)):c.hide()},c.prototype.show=function(){var b=a.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(b);var d=a.contains(this.$element[0].ownerDocument.documentElement,this.$element[0]);if(b.isDefaultPrevented()||!d)return;var e=this,f=this.tip(),g=this.getUID(this.type);this.setContent(),f.attr("id",g),this.$element.attr("aria-describedby",g),this.options.animation&&f.addClass("fade");var h="function"==typeof this.options.placement?this.options.placement.call(this,f[0],this.$element[0]):this.options.placement,i=/\s?auto?\s?/i,j=i.test(h);j&&(h=h.replace(i,"")||"top"),f.detach().css({top:0,left:0,display:"block"}).addClass(h).data("bs."+this.type,this),this.options.container?f.appendTo(this.options.container):f.insertAfter(this.$element),this.$element.trigger("inserted.bs."+this.type);var k=this.getPosition(),l=f[0].offsetWidth,m=f[0].offsetHeight;if(j){var n=h,o=this.getPosition(this.$viewport);h="bottom"==h&&k.bottom+m>o.bottom?"top":"top"==h&&k.top-m<o.top?"bottom":"right"==h&&k.right+l>o.width?"left":"left"==h&&k.left-l<o.left?"right":h,f.removeClass(n).addClass(h)}var p=this.getCalculatedOffset(h,k,l,m);this.applyPlacement(p,h);var q=function(){var a=e.hoverState;e.$element.trigger("shown.bs."+e.type),e.hoverState=null,"out"==a&&e.leave(e)};a.support.transition&&this.$tip.hasClass("fade")?f.one("bsTransitionEnd",q).emulateTransitionEnd(c.TRANSITION_DURATION):q()}},c.prototype.applyPlacement=function(b,c){var d=this.tip(),e=d[0].offsetWidth,f=d[0].offsetHeight,g=parseInt(d.css("margin-top"),10),h=parseInt(d.css("margin-left"),10);isNaN(g)&&(g=0),isNaN(h)&&(h=0),b.top+=g,b.left+=h,a.offset.setOffset(d[0],a.extend({using:function(a){d.css({top:Math.round(a.top),left:Math.round(a.left)})}},b),0),d.addClass("in");var i=d[0].offsetWidth,j=d[0].offsetHeight;"top"==c&&j!=f&&(b.top=b.top+f-j);var k=this.getViewportAdjustedDelta(c,b,i,j);k.left?b.left+=k.left:b.top+=k.top;var l=/top|bottom/.test(c),m=l?2*k.left-e+i:2*k.top-f+j,n=l?"offsetWidth":"offsetHeight";d.offset(b),this.replaceArrow(m,d[0][n],l)},c.prototype.replaceArrow=function(a,b,c){this.arrow().css(c?"left":"top",50*(1-a/b)+"%").css(c?"top":"left","")},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle();a.find(".tooltip-inner")[this.options.html?"html":"text"](b),a.removeClass("fade in top bottom left right")},c.prototype.hide=function(b){function d(){"in"!=e.hoverState&&f.detach(),e.$element&&e.$element.removeAttr("aria-describedby").trigger("hidden.bs."+e.type),b&&b()}var e=this,f=a(this.$tip),g=a.Event("hide.bs."+this.type);if(this.$element.trigger(g),!g.isDefaultPrevented())return f.removeClass("in"),a.support.transition&&f.hasClass("fade")?f.one("bsTransitionEnd",d).emulateTransitionEnd(c.TRANSITION_DURATION):d(),this.hoverState=null,this},c.prototype.fixTitle=function(){var a=this.$element;(a.attr("title")||"string"!=typeof a.attr("data-original-title"))&&a.attr("data-original-title",a.attr("title")||"").attr("title","")},c.prototype.hasContent=function(){return this.getTitle()},c.prototype.getPosition=function(b){b=b||this.$element;var c=b[0],d="BODY"==c.tagName,e=c.getBoundingClientRect();null==e.width&&(e=a.extend({},e,{width:e.right-e.left,height:e.bottom-e.top}));var f=window.SVGElement&&c instanceof window.SVGElement,g=d?{top:0,left:0}:f?null:b.offset(),h={scroll:d?document.documentElement.scrollTop||document.body.scrollTop:b.scrollTop()},i=d?{width:a(window).width(),height:a(window).height()}:null;return a.extend({},e,h,i,g)},c.prototype.getCalculatedOffset=function(a,b,c,d){return"bottom"==a?{top:b.top+b.height,left:b.left+b.width/2-c/2}:"top"==a?{top:b.top-d,left:b.left+b.width/2-c/2}:"left"==a?{top:b.top+b.height/2-d/2,left:b.left-c}:{top:b.top+b.height/2-d/2,left:b.left+b.width}},c.prototype.getViewportAdjustedDelta=function(a,b,c,d){var e={top:0,left:0};if(!this.$viewport)return e;var f=this.options.viewport&&this.options.viewport.padding||0,g=this.getPosition(this.$viewport);if(/right|left/.test(a)){var h=b.top-f-g.scroll,i=b.top+f-g.scroll+d;h<g.top?e.top=g.top-h:i>g.top+g.height&&(e.top=g.top+g.height-i)}else{var j=b.left-f,k=b.left+f+c;j<g.left?e.left=g.left-j:k>g.right&&(e.left=g.left+g.width-k)}return e},c.prototype.getTitle=function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||("function"==typeof c.title?c.title.call(b[0]):c.title)},c.prototype.getUID=function(a){do a+=~~(1e6*Math.random());while(document.getElementById(a));return a},c.prototype.tip=function(){if(!this.$tip&&(this.$tip=a(this.options.template),1!=this.$tip.length))throw new Error(this.type+" `template` option must consist of exactly 1 top-level element!");return this.$tip},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},c.prototype.enable=function(){this.enabled=!0},c.prototype.disable=function(){this.enabled=!1},c.prototype.toggleEnabled=function(){this.enabled=!this.enabled},c.prototype.toggle=function(b){var c=this;b&&(c=a(b.currentTarget).data("bs."+this.type),c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c))),b?(c.inState.click=!c.inState.click,c.isInStateTrue()?c.enter(c):c.leave(c)):c.tip().hasClass("in")?c.leave(c):c.enter(c)},c.prototype.destroy=function(){var a=this;clearTimeout(this.timeout),this.hide(function(){a.$element.off("."+a.type).removeData("bs."+a.type),a.$tip&&a.$tip.detach(),a.$tip=null,a.$arrow=null,a.$viewport=null,a.$element=null})};var d=a.fn.tooltip;a.fn.tooltip=b,a.fn.tooltip.Constructor=c,a.fn.tooltip.noConflict=function(){return a.fn.tooltip=d,this}}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.popover"),f="object"==typeof b&&b;!e&&/destroy|hide/.test(b)||(e||d.data("bs.popover",e=new c(this,f)),"string"==typeof b&&e[b]())})}var c=function(a,b){this.init("popover",a,b)};if(!a.fn.tooltip)throw new Error("Popover requires tooltip.js");c.VERSION="3.3.7",c.DEFAULTS=a.extend({},a.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:'<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'}),c.prototype=a.extend({},a.fn.tooltip.Constructor.prototype),c.prototype.constructor=c,c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.options.html?"html":"text"](b),a.find(".popover-content").children().detach().end()[this.options.html?"string"==typeof c?"html":"append":"text"](c),a.removeClass("fade top bottom left right in"),a.find(".popover-title").html()||a.find(".popover-title").hide()},c.prototype.hasContent=function(){return this.getTitle()||this.getContent()},c.prototype.getContent=function(){var a=this.$element,b=this.options;return a.attr("data-content")||("function"==typeof b.content?b.content.call(a[0]):b.content)},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")};var d=a.fn.popover;a.fn.popover=b,a.fn.popover.Constructor=c,a.fn.popover.noConflict=function(){return a.fn.popover=d,this}}(jQuery),+function(a){"use strict";function b(c,d){this.$body=a(document.body),this.$scrollElement=a(a(c).is(document.body)?window:c),this.options=a.extend({},b.DEFAULTS,d),this.selector=(this.options.target||"")+" .nav li > a",this.offsets=[],this.targets=[],this.activeTarget=null,this.scrollHeight=0,this.$scrollElement.on("scroll.bs.scrollspy",a.proxy(this.process,this)),this.refresh(),this.process()}function c(c){return this.each(function(){var d=a(this),e=d.data("bs.scrollspy"),f="object"==typeof c&&c;e||d.data("bs.scrollspy",e=new b(this,f)),"string"==typeof c&&e[c]()})}b.VERSION="3.3.7",b.DEFAULTS={offset:10},b.prototype.getScrollHeight=function(){return this.$scrollElement[0].scrollHeight||Math.max(this.$body[0].scrollHeight,document.documentElement.scrollHeight)},b.prototype.refresh=function(){var b=this,c="offset",d=0;this.offsets=[],this.targets=[],this.scrollHeight=this.getScrollHeight(),a.isWindow(this.$scrollElement[0])||(c="position",d=this.$scrollElement.scrollTop()),this.$body.find(this.selector).map(function(){var b=a(this),e=b.data("target")||b.attr("href"),f=/^#./.test(e)&&a(e);return f&&f.length&&f.is(":visible")&&[[f[c]().top+d,e]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){b.offsets.push(this[0]),b.targets.push(this[1])})},b.prototype.process=function(){var a,b=this.$scrollElement.scrollTop()+this.options.offset,c=this.getScrollHeight(),d=this.options.offset+c-this.$scrollElement.height(),e=this.offsets,f=this.targets,g=this.activeTarget;if(this.scrollHeight!=c&&this.refresh(),b>=d)return g!=(a=f[f.length-1])&&this.activate(a);if(g&&b<e[0])return this.activeTarget=null,this.clear();for(a=e.length;a--;)g!=f[a]&&b>=e[a]&&(void 0===e[a+1]||b<e[a+1])&&this.activate(f[a])},b.prototype.activate=function(b){
-this.activeTarget=b,this.clear();var c=this.selector+'[data-target="'+b+'"],'+this.selector+'[href="'+b+'"]',d=a(c).parents("li").addClass("active");d.parent(".dropdown-menu").length&&(d=d.closest("li.dropdown").addClass("active")),d.trigger("activate.bs.scrollspy")},b.prototype.clear=function(){a(this.selector).parentsUntil(this.options.target,".active").removeClass("active")};var d=a.fn.scrollspy;a.fn.scrollspy=c,a.fn.scrollspy.Constructor=b,a.fn.scrollspy.noConflict=function(){return a.fn.scrollspy=d,this},a(window).on("load.bs.scrollspy.data-api",function(){a('[data-spy="scroll"]').each(function(){var b=a(this);c.call(b,b.data())})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.tab");e||d.data("bs.tab",e=new c(this)),"string"==typeof b&&e[b]()})}var c=function(b){this.element=a(b)};c.VERSION="3.3.7",c.TRANSITION_DURATION=150,c.prototype.show=function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.data("target");if(d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),!b.parent("li").hasClass("active")){var e=c.find(".active:last a"),f=a.Event("hide.bs.tab",{relatedTarget:b[0]}),g=a.Event("show.bs.tab",{relatedTarget:e[0]});if(e.trigger(f),b.trigger(g),!g.isDefaultPrevented()&&!f.isDefaultPrevented()){var h=a(d);this.activate(b.closest("li"),c),this.activate(h,h.parent(),function(){e.trigger({type:"hidden.bs.tab",relatedTarget:b[0]}),b.trigger({type:"shown.bs.tab",relatedTarget:e[0]})})}}},c.prototype.activate=function(b,d,e){function f(){g.removeClass("active").find("> .dropdown-menu > .active").removeClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!1),b.addClass("active").find('[data-toggle="tab"]').attr("aria-expanded",!0),h?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu").length&&b.closest("li.dropdown").addClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!0),e&&e()}var g=d.find("> .active"),h=e&&a.support.transition&&(g.length&&g.hasClass("fade")||!!d.find("> .fade").length);g.length&&h?g.one("bsTransitionEnd",f).emulateTransitionEnd(c.TRANSITION_DURATION):f(),g.removeClass("in")};var d=a.fn.tab;a.fn.tab=b,a.fn.tab.Constructor=c,a.fn.tab.noConflict=function(){return a.fn.tab=d,this};var e=function(c){c.preventDefault(),b.call(a(this),"show")};a(document).on("click.bs.tab.data-api",'[data-toggle="tab"]',e).on("click.bs.tab.data-api",'[data-toggle="pill"]',e)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.affix"),f="object"==typeof b&&b;e||d.data("bs.affix",e=new c(this,f)),"string"==typeof b&&e[b]()})}var c=function(b,d){this.options=a.extend({},c.DEFAULTS,d),this.$target=a(this.options.target).on("scroll.bs.affix.data-api",a.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",a.proxy(this.checkPositionWithEventLoop,this)),this.$element=a(b),this.affixed=null,this.unpin=null,this.pinnedOffset=null,this.checkPosition()};c.VERSION="3.3.7",c.RESET="affix affix-top affix-bottom",c.DEFAULTS={offset:0,target:window},c.prototype.getState=function(a,b,c,d){var e=this.$target.scrollTop(),f=this.$element.offset(),g=this.$target.height();if(null!=c&&"top"==this.affixed)return e<c&&"top";if("bottom"==this.affixed)return null!=c?!(e+this.unpin<=f.top)&&"bottom":!(e+g<=a-d)&&"bottom";var h=null==this.affixed,i=h?e:f.top,j=h?g:b;return null!=c&&e<=c?"top":null!=d&&i+j>=a-d&&"bottom"},c.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset;this.$element.removeClass(c.RESET).addClass("affix");var a=this.$target.scrollTop(),b=this.$element.offset();return this.pinnedOffset=b.top-a},c.prototype.checkPositionWithEventLoop=function(){setTimeout(a.proxy(this.checkPosition,this),1)},c.prototype.checkPosition=function(){if(this.$element.is(":visible")){var b=this.$element.height(),d=this.options.offset,e=d.top,f=d.bottom,g=Math.max(a(document).height(),a(document.body).height());"object"!=typeof d&&(f=e=d),"function"==typeof e&&(e=d.top(this.$element)),"function"==typeof f&&(f=d.bottom(this.$element));var h=this.getState(g,b,e,f);if(this.affixed!=h){null!=this.unpin&&this.$element.css("top","");var i="affix"+(h?"-"+h:""),j=a.Event(i+".bs.affix");if(this.$element.trigger(j),j.isDefaultPrevented())return;this.affixed=h,this.unpin="bottom"==h?this.getPinnedOffset():null,this.$element.removeClass(c.RESET).addClass(i).trigger(i.replace("affix","affixed")+".bs.affix")}"bottom"==h&&this.$element.offset({top:g-b-f})}};var d=a.fn.affix;a.fn.affix=b,a.fn.affix.Constructor=c,a.fn.affix.noConflict=function(){return a.fn.affix=d,this},a(window).on("load",function(){a('[data-spy="affix"]').each(function(){var c=a(this),d=c.data();d.offset=d.offset||{},null!=d.offsetBottom&&(d.offset.bottom=d.offsetBottom),null!=d.offsetTop&&(d.offset.top=d.offsetTop),b.call(c,d)})})}(jQuery);
\ No newline at end of file
diff --git a/NewLife.Cube/Content/images/logo/Alipay.png b/NewLife.Cube/Content/images/logo/Alipay.png
deleted file mode 100644
index 082702bd03..0000000000
Binary files a/NewLife.Cube/Content/images/logo/Alipay.png and /dev/null differ
diff --git a/NewLife.Cube/Content/images/logo/Baidu.png b/NewLife.Cube/Content/images/logo/Baidu.png
deleted file mode 100644
index a4036d918b..0000000000
Binary files a/NewLife.Cube/Content/images/logo/Baidu.png and /dev/null differ
diff --git a/NewLife.Cube/Content/images/logo/Github.png b/NewLife.Cube/Content/images/logo/Github.png
deleted file mode 100644
index 58ffe8d947..0000000000
Binary files a/NewLife.Cube/Content/images/logo/Github.png and /dev/null differ
diff --git a/NewLife.Cube/Content/images/logo/NewLife.png b/NewLife.Cube/Content/images/logo/NewLife.png
deleted file mode 100644
index 1976b83d37..0000000000
Binary files a/NewLife.Cube/Content/images/logo/NewLife.png and /dev/null differ
diff --git a/NewLife.Cube/Content/images/logo/QQ.png b/NewLife.Cube/Content/images/logo/QQ.png
deleted file mode 100644
index c9bdacc722..0000000000
Binary files a/NewLife.Cube/Content/images/logo/QQ.png and /dev/null differ
diff --git a/NewLife.Cube/Content/images/logo/Taobao.png b/NewLife.Cube/Content/images/logo/Taobao.png
deleted file mode 100644
index 5506eb33d7..0000000000
Binary files a/NewLife.Cube/Content/images/logo/Taobao.png and /dev/null differ
diff --git a/NewLife.Cube/Content/images/logo/Weibo.png b/NewLife.Cube/Content/images/logo/Weibo.png
deleted file mode 100644
index 65ded4cb42..0000000000
Binary files a/NewLife.Cube/Content/images/logo/Weibo.png and /dev/null differ
diff --git a/NewLife.Cube/Content/images/logo/Weixin.png b/NewLife.Cube/Content/images/logo/Weixin.png
deleted file mode 100644
index a508cd2dd6..0000000000
Binary files a/NewLife.Cube/Content/images/logo/Weixin.png and /dev/null differ
diff --git a/NewLife.Cube/Content/js/html5shiv.min.js b/NewLife.Cube/Content/js/html5shiv.min.js
deleted file mode 100644
index 5559790bad..0000000000
--- a/NewLife.Cube/Content/js/html5shiv.min.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
-* @preserve HTML5 Shiv 3.7.2 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
-*/
-!function(a,b){function c(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x<style>"+b+"</style>",d.insertBefore(c.lastChild,d.firstChild)}function d(){var a=t.elements;return"string"==typeof a?a.split(" "):a}function e(a,b){var c=t.elements;"string"!=typeof c&&(c=c.join(" ")),"string"!=typeof a&&(a=a.join(" ")),t.elements=c+" "+a,j(b)}function f(a){var b=s[a[q]];return b||(b={},r++,a[q]=r,s[r]=b),b}function g(a,c,d){if(c||(c=b),l)return c.createElement(a);d||(d=f(c));var e;return e=d.cache[a]?d.cache[a].cloneNode():p.test(a)?(d.cache[a]=d.createElem(a)).cloneNode():d.createElem(a),!e.canHaveChildren||o.test(a)||e.tagUrn?e:d.frag.appendChild(e)}function h(a,c){if(a||(a=b),l)return a.createDocumentFragment();c=c||f(a);for(var e=c.frag.cloneNode(),g=0,h=d(),i=h.length;i>g;g++)e.createElement(h[g]);return e}function i(a,b){b.cache||(b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag()),a.createElement=function(c){return t.shivMethods?g(c,a,b):b.createElem(c)},a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+d().join().replace(/[\w\-:]+/g,function(a){return b.createElem(a),b.frag.createElement(a),'c("'+a+'")'})+");return n}")(t,b.frag)}function j(a){a||(a=b);var d=f(a);return!t.shivCSS||k||d.hasCSS||(d.hasCSS=!!c(a,"article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}template{display:none}")),l||i(a,d),a}var k,l,m="3.7.2",n=a.html5||{},o=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,p=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,q="_html5shiv",r=0,s={};!function(){try{var a=b.createElement("a");a.innerHTML="<xyz></xyz>",k="hidden"in a,l=1==a.childNodes.length||function(){b.createElement("a");var a=b.createDocumentFragment();return"undefined"==typeof a.cloneNode||"undefined"==typeof a.createDocumentFragment||"undefined"==typeof a.createElement}()}catch(c){k=!0,l=!0}}();var t={elements:n.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output picture progress section summary template time video",version:m,shivCSS:n.shivCSS!==!1,supportsUnknownElements:l,shivMethods:n.shivMethods!==!1,type:"default",shivDocument:j,createElement:g,createDocumentFragment:h,addElements:e};a.html5=t,j(b)}(this,document),Function.prototype.bind||(Function.prototype.bind=function(a){if("function"!=typeof this)throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable");var b=Array.prototype.slice.call(arguments,1),c=this,d=function(){},e=function(){return c.apply(this instanceof d&&a?this:a,b.concat(Array.prototype.slice.call(arguments)))};return d.prototype=this.prototype,e.prototype=new d,e});
\ No newline at end of file
diff --git a/NewLife.Cube/Content/js/jquery-2.1.3.min.js b/NewLife.Cube/Content/js/jquery-2.1.3.min.js
deleted file mode 100644
index 25714ed29a..0000000000
--- a/NewLife.Cube/Content/js/jquery-2.1.3.min.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/*! jQuery v2.1.3 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */
-!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l=a.document,m="2.1.3",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return n.each(this,a,b)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(a=arguments[h]))for(b in a)c=g[b],d=a[b],g!==d&&(j&&d&&(n.isPlainObject(d)||(e=n.isArray(d)))?(e?(e=!1,f=c&&n.isArray(c)?c:[]):f=c&&n.isPlainObject(c)?c:{},g[b]=n.extend(j,f,d)):void 0!==d&&(g[b]=d));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray,isWindow:function(a){return null!=a&&a===a.window},isNumeric:function(a){return!n.isArray(a)&&a-parseFloat(a)+1>=0},isPlainObject:function(a){return"object"!==n.type(a)||a.nodeType||n.isWindow(a)?!1:a.constructor&&!j.call(a.constructor.prototype,"isPrototypeOf")?!1:!0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(a){var b,c=eval;a=n.trim(a),a&&(1===a.indexOf("use strict")?(b=l.createElement("script"),b.text=a,l.head.appendChild(b).parentNode.removeChild(b)):c(a))},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=s(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:g.call(b,a,c)},merge:function(a,b){for(var c=+b.length,d=0,e=a.length;c>d;d++)a[e++]=b[d];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=s(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(c=a[b],b=a,a=c),n.isFunction(a)?(e=d.call(arguments,2),f=function(){return a.apply(b||this,e.concat(d.call(arguments)))},f.guid=a.guid=a.guid||n.guid++,f):void 0},now:Date.now,support:k}),n.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=hb(),z=hb(),A=hb(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",L="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",N=M.replace("w","w#"),O="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+N+"))|)"+L+"*\\]",P=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+O+")*)|.*)\\)|)",Q=new RegExp(L+"+","g"),R=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),S=new RegExp("^"+L+"*,"+L+"*"),T=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),U=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),V=new RegExp(P),W=new RegExp("^"+N+"$"),X={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M.replace("w","w*")+")"),ATTR:new RegExp("^"+O),PSEUDO:new RegExp("^"+P),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+L+"*(even|odd|(([+-]|)(\\d*)n|)"+L+"*(?:([+-]|)"+L+"*(\\d+)|))"+L+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+L+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+L+"*((?:-\\d)?\\d*)"+L+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ab=/[+~]/,bb=/'|\\/g,cb=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),db=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},eb=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(fb){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function gb(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],k=b.nodeType,"string"!=typeof a||!a||1!==k&&9!==k&&11!==k)return d;if(!e&&p){if(11!==k&&(f=_.exec(a)))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return H.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName)return H.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=1!==k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(bb,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+rb(o[l]);w=ab.test(a)&&pb(b.parentNode)||b,x=o.join(",")}if(x)try{return H.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function hb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ib(a){return a[u]=!0,a}function jb(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function kb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function lb(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function mb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function nb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function ob(a){return ib(function(b){return b=+b,ib(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function pb(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=gb.support={},f=gb.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=gb.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=g.documentElement,e=g.defaultView,e&&e!==e.top&&(e.addEventListener?e.addEventListener("unload",eb,!1):e.attachEvent&&e.attachEvent("onunload",eb)),p=!f(g),c.attributes=jb(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=jb(function(a){return a.appendChild(g.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(g.getElementsByClassName),c.getById=jb(function(a){return o.appendChild(a).id=u,!g.getElementsByName||!g.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(g.querySelectorAll))&&(jb(function(a){o.appendChild(a).innerHTML="<a id='"+u+"'></a><select id='"+u+"-\f]' msallowcapture=''><option selected=''></option></select>",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+L+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+L+"*(?:value|"+K+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),jb(function(a){var b=g.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+L+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&jb(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",P)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===g||a.ownerDocument===v&&t(v,a)?-1:b===g||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,h=[a],i=[b];if(!e||!f)return a===g?-1:b===g?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return lb(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?lb(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},g):n},gb.matches=function(a,b){return gb(a,null,null,b)},gb.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return gb(b,n,null,[a]).length>0},gb.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},gb.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},gb.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},gb.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=gb.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=gb.selectors={cacheLength:50,createPseudo:ib,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(cb,db),a[3]=(a[3]||a[4]||a[5]||"").replace(cb,db),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||gb.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&gb.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(cb,db).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+L+")"+a+"("+L+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=gb.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(Q," ")+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||gb.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ib(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ib(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?ib(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ib(function(a){return function(b){return gb(a,b).length>0}}),contains:ib(function(a){return a=a.replace(cb,db),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ib(function(a){return W.test(a||"")||gb.error("unsupported lang: "+a),a=a.replace(cb,db).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:ob(function(){return[0]}),last:ob(function(a,b){return[b-1]}),eq:ob(function(a,b,c){return[0>c?c+b:c]}),even:ob(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:ob(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:ob(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:ob(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=mb(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=nb(b);function qb(){}qb.prototype=d.filters=d.pseudos,d.setFilters=new qb,g=gb.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){(!c||(e=S.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=T.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(R," ")}),h=h.slice(c.length));for(g in d.filter)!(e=X[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?gb.error(a):z(a,i).slice(0)};function rb(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function sb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function tb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ub(a,b,c){for(var d=0,e=b.length;e>d;d++)gb(a,b[d],c);return c}function vb(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function wb(a,b,c,d,e,f){return d&&!d[u]&&(d=wb(d)),e&&!e[u]&&(e=wb(e,f)),ib(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ub(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:vb(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=vb(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=vb(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function xb(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=sb(function(a){return a===b},h,!0),l=sb(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[sb(tb(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return wb(i>1&&tb(m),i>1&&rb(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&xb(a.slice(i,e)),f>e&&xb(a=a.slice(e)),f>e&&rb(a))}m.push(c)}return tb(m)}function yb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=F.call(i));s=vb(s)}H.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&gb.uniqueSort(i)}return k&&(w=v,j=t),r};return c?ib(f):f}return h=gb.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=xb(b[c]),f[u]?d.push(f):e.push(f);f=A(a,yb(e,d)),f.selector=a}return f},i=gb.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(cb,db),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(cb,db),ab.test(j[0].type)&&pb(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&rb(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,ab.test(a)&&pb(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=jb(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),jb(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||kb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&jb(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||kb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),jb(function(a){return null==a.getAttribute("disabled")})||kb(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),gb}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=n.expr.match.needsContext,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^.[^:#\[\.,]*$/;function x(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(w.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return g.call(b,a)>=0!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=this.length,d=[],e=this;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;c>b;b++)if(n.contains(e[b],this))return!0}));for(b=0;c>b;b++)n.find(a,e[b],d);return d=this.pushStack(c>1?n.unique(d):d),d.selector=this.selector?this.selector+" "+a:a,d},filter:function(a){return this.pushStack(x(this,a||[],!1))},not:function(a){return this.pushStack(x(this,a||[],!0))},is:function(a){return!!x(this,"string"==typeof a&&u.test(a)?n(a):a||[],!1).length}});var y,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=n.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||y).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:l,!0)),v.test(c[1])&&n.isPlainObject(b))for(c in b)n.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}return d=l.getElementById(c[2]),d&&d.parentNode&&(this.length=1,this[0]=d),this.context=l,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?"undefined"!=typeof y.ready?y.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};A.prototype=n.fn,y=n(l);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};n.extend({dir:function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&n(a).is(c))break;d.push(a)}return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),n.fn.extend({has:function(a){var b=n(a,this),c=b.length;return this.filter(function(){for(var a=0;c>a;a++)if(n.contains(this,b[a]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=u.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.unique(f):f)},index:function(a){return a?"string"==typeof a?g.call(n(a),this[0]):g.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.unique(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){while((a=a[b])&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return n.dir(a,"parentNode")},parentsUntil:function(a,b,c){return n.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return n.dir(a,"nextSibling")},prevAll:function(a){return n.dir(a,"previousSibling")},nextUntil:function(a,b,c){return n.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return n.dir(a,"previousSibling",c)},siblings:function(a){return n.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return n.sibling(a.firstChild)},contents:function(a){return a.contentDocument||n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(C[a]||n.unique(e),B.test(a)&&e.reverse()),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return n.each(a.match(E)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):n.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(b=a.memory&&l,c=!0,g=e||0,e=0,f=h.length,d=!0;h&&f>g;g++)if(h[g].apply(l[0],l[1])===!1&&a.stopOnFalse){b=!1;break}d=!1,h&&(i?i.length&&j(i.shift()):b?h=[]:k.disable())},k={add:function(){if(h){var c=h.length;!function g(b){n.each(b,function(b,c){var d=n.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&g(c)})}(arguments),d?f=h.length:b&&(e=c,j(b))}return this},remove:function(){return h&&n.each(arguments,function(a,b){var c;while((c=n.inArray(b,h,c))>-1)h.splice(c,1),d&&(f>=c&&f--,g>=c&&g--)}),this},has:function(a){return a?n.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],f=0,this},disable:function(){return h=i=b=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,b||k.disable(),this},locked:function(){return!i},fireWith:function(a,b){return!h||c&&!i||(b=b||[],b=[a,b.slice?b.slice():b],d?i.push(b):j(b)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!c}};return k},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&n.isFunction(a.promise)?e:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){(a===!0?--n.readyWait:n.isReady)||(n.isReady=!0,a!==!0&&--n.readyWait>0||(H.resolveWith(l,[n]),n.fn.triggerHandler&&(n(l).triggerHandler("ready"),n(l).off("ready"))))}});function I(){l.removeEventListener("DOMContentLoaded",I,!1),a.removeEventListener("load",I,!1),n.ready()}n.ready.promise=function(b){return H||(H=n.Deferred(),"complete"===l.readyState?setTimeout(n.ready):(l.addEventListener("DOMContentLoaded",I,!1),a.addEventListener("load",I,!1))),H.promise(b)},n.ready.promise();var J=n.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===n.type(c)){e=!0;for(h in c)n.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,n.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(n(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f};n.acceptData=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function K(){Object.defineProperty(this.cache={},0,{get:function(){return{}}}),this.expando=n.expando+K.uid++}K.uid=1,K.accepts=n.acceptData,K.prototype={key:function(a){if(!K.accepts(a))return 0;var b={},c=a[this.expando];if(!c){c=K.uid++;try{b[this.expando]={value:c},Object.defineProperties(a,b)}catch(d){b[this.expando]=c,n.extend(a,b)}}return this.cache[c]||(this.cache[c]={}),c},set:function(a,b,c){var d,e=this.key(a),f=this.cache[e];if("string"==typeof b)f[b]=c;else if(n.isEmptyObject(f))n.extend(this.cache[e],b);else for(d in b)f[d]=b[d];return f},get:function(a,b){var c=this.cache[this.key(a)];return void 0===b?c:c[b]},access:function(a,b,c){var d;return void 0===b||b&&"string"==typeof b&&void 0===c?(d=this.get(a,b),void 0!==d?d:this.get(a,n.camelCase(b))):(this.set(a,b,c),void 0!==c?c:b)},remove:function(a,b){var c,d,e,f=this.key(a),g=this.cache[f];if(void 0===b)this.cache[f]={};else{n.isArray(b)?d=b.concat(b.map(n.camelCase)):(e=n.camelCase(b),b in g?d=[b,e]:(d=e,d=d in g?[d]:d.match(E)||[])),c=d.length;while(c--)delete g[d[c]]}},hasData:function(a){return!n.isEmptyObject(this.cache[a[this.expando]]||{})},discard:function(a){a[this.expando]&&delete this.cache[a[this.expando]]}};var L=new K,M=new K,N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(O,"-$1").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}M.set(a,b,c)}else c=void 0;return c}n.extend({hasData:function(a){return M.hasData(a)||L.hasData(a)},data:function(a,b,c){return M.access(a,b,c)
-},removeData:function(a,b){M.remove(a,b)},_data:function(a,b,c){return L.access(a,b,c)},_removeData:function(a,b){L.remove(a,b)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=M.get(f),1===f.nodeType&&!L.get(f,"hasDataAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d])));L.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){M.set(this,a)}):J(this,function(b){var c,d=n.camelCase(a);if(f&&void 0===b){if(c=M.get(f,a),void 0!==c)return c;if(c=M.get(f,d),void 0!==c)return c;if(c=P(f,d,void 0),void 0!==c)return c}else this.each(function(){var c=M.get(this,d);M.set(this,d,b),-1!==a.indexOf("-")&&void 0!==c&&M.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){M.remove(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=L.get(a,b),c&&(!d||n.isArray(c)?d=L.access(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return L.get(a,c)||L.access(a,c,{empty:n.Callbacks("once memory").add(function(){L.remove(a,[b+"queue",c])})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?n.queue(this[0],a):void 0===b?this:this.each(function(){var c=n.queue(this,a,b);n._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&n.dequeue(this,a)})},dequeue:function(a){return this.each(function(){n.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=n.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=L.get(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var Q=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,R=["Top","Right","Bottom","Left"],S=function(a,b){return a=b||a,"none"===n.css(a,"display")||!n.contains(a.ownerDocument,a)},T=/^(?:checkbox|radio)$/i;!function(){var a=l.createDocumentFragment(),b=a.appendChild(l.createElement("div")),c=l.createElement("input");c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),b.appendChild(c),k.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,b.innerHTML="<textarea>x</textarea>",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var U="undefined";k.focusinBubbles="onfocusin"in a;var V=/^key/,W=/^(?:mouse|pointer|contextmenu)|click/,X=/^(?:focusinfocus|focusoutblur)$/,Y=/^([^.]*)(?:\.(.+)|)$/;function Z(){return!0}function $(){return!1}function _(){try{return l.activeElement}catch(a){}}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=L.get(a);if(r){c.handler&&(f=c,c=f.handler,e=f.selector),c.guid||(c.guid=n.guid++),(i=r.events)||(i=r.events={}),(g=r.handle)||(g=r.handle=function(b){return typeof n!==U&&n.event.triggered!==b.type?n.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(E)||[""],j=b.length;while(j--)h=Y.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o&&(l=n.event.special[o]||{},o=(e?l.delegateType:l.bindType)||o,l=n.event.special[o]||{},k=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},f),(m=i[o])||(m=i[o]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,p,g)!==!1||a.addEventListener&&a.addEventListener(o,g,!1)),l.add&&(l.add.call(a,k),k.handler.guid||(k.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,k):m.push(k),n.event.global[o]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=L.hasData(a)&&L.get(a);if(r&&(i=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=Y.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=i[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;while(f--)k=m[f],!e&&q!==k.origType||c&&c.guid!==k.guid||h&&!h.test(k.namespace)||d&&d!==k.selector&&("**"!==d||!k.selector)||(m.splice(f,1),k.selector&&m.delegateCount--,l.remove&&l.remove.call(a,k));g&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete i[o])}else for(o in i)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(i)&&(delete r.handle,L.remove(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,m,o,p=[d||l],q=j.call(b,"type")?b.type:b,r=j.call(b,"namespace")?b.namespace.split("."):[];if(g=h=d=d||l,3!==d.nodeType&&8!==d.nodeType&&!X.test(q+n.event.triggered)&&(q.indexOf(".")>=0&&(r=q.split("."),q=r.shift(),r.sort()),k=q.indexOf(":")<0&&"on"+q,b=b[n.expando]?b:new n.Event(q,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=r.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:n.makeArray(c,[b]),o=n.event.special[q]||{},e||!o.trigger||o.trigger.apply(d,c)!==!1)){if(!e&&!o.noBubble&&!n.isWindow(d)){for(i=o.delegateType||q,X.test(i+q)||(g=g.parentNode);g;g=g.parentNode)p.push(g),h=g;h===(d.ownerDocument||l)&&p.push(h.defaultView||h.parentWindow||a)}f=0;while((g=p[f++])&&!b.isPropagationStopped())b.type=f>1?i:o.bindType||q,m=(L.get(g,"events")||{})[b.type]&&L.get(g,"handle"),m&&m.apply(g,c),m=k&&g[k],m&&m.apply&&n.acceptData(g)&&(b.result=m.apply(g,c),b.result===!1&&b.preventDefault());return b.type=q,e||b.isDefaultPrevented()||o._default&&o._default.apply(p.pop(),c)!==!1||!n.acceptData(d)||k&&n.isFunction(d[q])&&!n.isWindow(d)&&(h=d[k],h&&(d[k]=null),n.event.triggered=q,d[q](),n.event.triggered=void 0,h&&(d[k]=h)),b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(L.get(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,c=0;while((g=f.handlers[c++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(g.namespace))&&(a.handleObj=g,a.data=g.data,e=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==e&&(a.result=e)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!==this;i=i.parentNode||this)if(i.disabled!==!0||"click"!==a.type){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?n(e,this).index(i)>=0:n.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,d,e,f=b.button;return null==a.pageX&&null!=b.clientX&&(c=a.target.ownerDocument||l,d=c.documentElement,e=c.body,a.pageX=b.clientX+(d&&d.scrollLeft||e&&e.scrollLeft||0)-(d&&d.clientLeft||e&&e.clientLeft||0),a.pageY=b.clientY+(d&&d.scrollTop||e&&e.scrollTop||0)-(d&&d.clientTop||e&&e.clientTop||0)),a.which||void 0===f||(a.which=1&f?1:2&f?3:4&f?2:0),a}},fix:function(a){if(a[n.expando])return a;var b,c,d,e=a.type,f=a,g=this.fixHooks[e];g||(this.fixHooks[e]=g=W.test(e)?this.mouseHooks:V.test(e)?this.keyHooks:{}),d=g.props?this.props.concat(g.props):this.props,a=new n.Event(f),b=d.length;while(b--)c=d[b],a[c]=f[c];return a.target||(a.target=l),3===a.target.nodeType&&(a.target=a.target.parentNode),g.filter?g.filter(a,f):a},special:{load:{noBubble:!0},focus:{trigger:function(){return this!==_()&&this.focus?(this.focus(),!1):void 0},delegateType:"focusin"},blur:{trigger:function(){return this===_()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return"checkbox"===this.type&&this.click&&n.nodeName(this,"input")?(this.click(),!1):void 0},_default:function(a){return n.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c,d){var e=n.extend(new n.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?n.event.trigger(e,null,b):n.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},n.removeEvent=function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)},n.Event=function(a,b){return this instanceof n.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?Z:$):this.type=a,b&&n.extend(this,b),this.timeStamp=a&&a.timeStamp||n.now(),void(this[n.expando]=!0)):new n.Event(a,b)},n.Event.prototype={isDefaultPrevented:$,isPropagationStopped:$,isImmediatePropagationStopped:$,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=Z,a&&a.preventDefault&&a.preventDefault()},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=Z,a&&a.stopPropagation&&a.stopPropagation()},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=Z,a&&a.stopImmediatePropagation&&a.stopImmediatePropagation(),this.stopPropagation()}},n.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){n.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return(!e||e!==d&&!n.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),k.focusinBubbles||n.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){n.event.simulate(b,a.target,n.event.fix(a),!0)};n.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=L.access(d,b);e||d.addEventListener(a,c,!0),L.access(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=L.access(d,b)-1;e?L.access(d,b,e):(d.removeEventListener(a,c,!0),L.remove(d,b))}}}),n.fn.extend({on:function(a,b,c,d,e){var f,g;if("object"==typeof a){"string"!=typeof b&&(c=c||b,b=void 0);for(g in a)this.on(g,b,c,a[g],e);return this}if(null==c&&null==d?(d=b,c=b=void 0):null==d&&("string"==typeof b?(d=c,c=void 0):(d=c,c=b,b=void 0)),d===!1)d=$;else if(!d)return this;return 1===e&&(f=d,d=function(a){return n().off(a),f.apply(this,arguments)},d.guid=f.guid||(f.guid=n.guid++)),this.each(function(){n.event.add(this,a,d,c,b)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,n(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return(b===!1||"function"==typeof b)&&(c=b,b=void 0),c===!1&&(c=$),this.each(function(){n.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){n.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?n.event.trigger(a,b,c,!0):void 0}});var ab=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bb=/<([\w:]+)/,cb=/<|&#?\w+;/,db=/<(?:script|style|link)/i,eb=/checked\s*(?:[^=]|=\s*.checked.)/i,fb=/^$|\/(?:java|ecma)script/i,gb=/^true\/(.*)/,hb=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,ib={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};ib.optgroup=ib.option,ib.tbody=ib.tfoot=ib.colgroup=ib.caption=ib.thead,ib.th=ib.td;function jb(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function kb(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function lb(a){var b=gb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function mb(a,b){for(var c=0,d=a.length;d>c;c++)L.set(a[c],"globalEval",!b||L.get(b[c],"globalEval"))}function nb(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(L.hasData(a)&&(f=L.access(a),g=L.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;d>c;c++)n.event.add(b,e,j[e][c])}M.hasData(a)&&(h=M.access(a),i=n.extend({},h),M.set(b,i))}}function ob(a,b){var c=a.getElementsByTagName?a.getElementsByTagName(b||"*"):a.querySelectorAll?a.querySelectorAll(b||"*"):[];return void 0===b||b&&n.nodeName(a,b)?n.merge([a],c):c}function pb(a,b){var c=b.nodeName.toLowerCase();"input"===c&&T.test(a.type)?b.checked=a.checked:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}n.extend({clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=n.contains(a.ownerDocument,a);if(!(k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(g=ob(h),f=ob(a),d=0,e=f.length;e>d;d++)pb(f[d],g[d]);if(b)if(c)for(f=f||ob(a),g=g||ob(h),d=0,e=f.length;e>d;d++)nb(f[d],g[d]);else nb(a,h);return g=ob(h,"script"),g.length>0&&mb(g,!i&&ob(a,"script")),h},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,k=b.createDocumentFragment(),l=[],m=0,o=a.length;o>m;m++)if(e=a[m],e||0===e)if("object"===n.type(e))n.merge(l,e.nodeType?[e]:e);else if(cb.test(e)){f=f||k.appendChild(b.createElement("div")),g=(bb.exec(e)||["",""])[1].toLowerCase(),h=ib[g]||ib._default,f.innerHTML=h[1]+e.replace(ab,"<$1></$2>")+h[2],j=h[0];while(j--)f=f.lastChild;n.merge(l,f.childNodes),f=k.firstChild,f.textContent=""}else l.push(b.createTextNode(e));k.textContent="",m=0;while(e=l[m++])if((!d||-1===n.inArray(e,d))&&(i=n.contains(e.ownerDocument,e),f=ob(k.appendChild(e),"script"),i&&mb(f),c)){j=0;while(e=f[j++])fb.test(e.type||"")&&c.push(e)}return k},cleanData:function(a){for(var b,c,d,e,f=n.event.special,g=0;void 0!==(c=a[g]);g++){if(n.acceptData(c)&&(e=c[L.expando],e&&(b=L.cache[e]))){if(b.events)for(d in b.events)f[d]?n.event.remove(c,d):n.removeEvent(c,d,b.handle);L.cache[e]&&delete L.cache[e]}delete M.cache[c[M.expando]]}}}),n.fn.extend({text:function(a){return J(this,function(a){return void 0===a?n.text(this):this.empty().each(function(){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&(this.textContent=a)})},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=jb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=jb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?n.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||n.cleanData(ob(c)),c.parentNode&&(b&&n.contains(c.ownerDocument,c)&&mb(ob(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(n.cleanData(ob(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return J(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a&&1===b.nodeType)return b.innerHTML;if("string"==typeof a&&!db.test(a)&&!ib[(bb.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(ab,"<$1></$2>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(ob(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,n.cleanData(ob(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,m=this,o=l-1,p=a[0],q=n.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&eb.test(p))return this.each(function(c){var d=m.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(c=n.buildFragment(a,this[0].ownerDocument,!1,this),d=c.firstChild,1===c.childNodes.length&&(c=d),d)){for(f=n.map(ob(c,"script"),kb),g=f.length;l>j;j++)h=c,j!==o&&(h=n.clone(h,!0,!0),g&&n.merge(f,ob(h,"script"))),b.call(this[j],h,j);if(g)for(i=f[f.length-1].ownerDocument,n.map(f,lb),j=0;g>j;j++)h=f[j],fb.test(h.type||"")&&!L.access(h,"globalEval")&&n.contains(i,h)&&(h.src?n._evalUrl&&n._evalUrl(h.src):n.globalEval(h.textContent.replace(hb,"")))}return this}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=[],e=n(a),g=e.length-1,h=0;g>=h;h++)c=h===g?this:this.clone(!0),n(e[h])[b](c),f.apply(d,c.get());return this.pushStack(d)}});var qb,rb={};function sb(b,c){var d,e=n(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:n.css(e[0],"display");return e.detach(),f}function tb(a){var b=l,c=rb[a];return c||(c=sb(a,b),"none"!==c&&c||(qb=(qb||n("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=qb[0].contentDocument,b.write(),b.close(),c=sb(a,b),qb.detach()),rb[a]=c),c}var ub=/^margin/,vb=new RegExp("^("+Q+")(?!px)[a-z%]+$","i"),wb=function(b){return b.ownerDocument.defaultView.opener?b.ownerDocument.defaultView.getComputedStyle(b,null):a.getComputedStyle(b,null)};function xb(a,b,c){var d,e,f,g,h=a.style;return c=c||wb(a),c&&(g=c.getPropertyValue(b)||c[b]),c&&(""!==g||n.contains(a.ownerDocument,a)||(g=n.style(a,b)),vb.test(g)&&ub.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0!==g?g+"":g}function yb(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}!function(){var b,c,d=l.documentElement,e=l.createElement("div"),f=l.createElement("div");if(f.style){f.style.backgroundClip="content-box",f.cloneNode(!0).style.backgroundClip="",k.clearCloneStyle="content-box"===f.style.backgroundClip,e.style.cssText="border:0;width:0;height:0;top:0;left:-9999px;margin-top:1px;position:absolute",e.appendChild(f);function g(){f.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;display:block;margin-top:1%;top:1%;border:1px;padding:1px;width:4px;position:absolute",f.innerHTML="",d.appendChild(e);var g=a.getComputedStyle(f,null);b="1%"!==g.top,c="4px"===g.width,d.removeChild(e)}a.getComputedStyle&&n.extend(k,{pixelPosition:function(){return g(),b},boxSizingReliable:function(){return null==c&&g(),c},reliableMarginRight:function(){var b,c=f.appendChild(l.createElement("div"));return c.style.cssText=f.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",c.style.marginRight=c.style.width="0",f.style.width="1px",d.appendChild(e),b=!parseFloat(a.getComputedStyle(c,null).marginRight),d.removeChild(e),f.removeChild(c),b}})}}(),n.swap=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};var zb=/^(none|table(?!-c[ea]).+)/,Ab=new RegExp("^("+Q+")(.*)$","i"),Bb=new RegExp("^([+-])=("+Q+")","i"),Cb={position:"absolute",visibility:"hidden",display:"block"},Db={letterSpacing:"0",fontWeight:"400"},Eb=["Webkit","O","Moz","ms"];function Fb(a,b){if(b in a)return b;var c=b[0].toUpperCase()+b.slice(1),d=b,e=Eb.length;while(e--)if(b=Eb[e]+c,b in a)return b;return d}function Gb(a,b,c){var d=Ab.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function Hb(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=n.css(a,c+R[f],!0,e)),d?("content"===c&&(g-=n.css(a,"padding"+R[f],!0,e)),"margin"!==c&&(g-=n.css(a,"border"+R[f]+"Width",!0,e))):(g+=n.css(a,"padding"+R[f],!0,e),"padding"!==c&&(g+=n.css(a,"border"+R[f]+"Width",!0,e)));return g}function Ib(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=wb(a),g="border-box"===n.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=xb(a,b,f),(0>e||null==e)&&(e=a.style[b]),vb.test(e))return e;d=g&&(k.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Hb(a,b,c||(g?"border":"content"),d,f)+"px"}function Jb(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=L.get(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&S(d)&&(f[g]=L.access(d,"olddisplay",tb(d.nodeName)))):(e=S(d),"none"===c&&e||L.set(d,"olddisplay",e?c:n.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}n.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=xb(a,"opacity");return""===c?"1":c}}}},cssNumber:{columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":"cssFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=n.camelCase(b),i=a.style;return b=n.cssProps[h]||(n.cssProps[h]=Fb(i,h)),g=n.cssHooks[b]||n.cssHooks[h],void 0===c?g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b]:(f=typeof c,"string"===f&&(e=Bb.exec(c))&&(c=(e[1]+1)*e[2]+parseFloat(n.css(a,b)),f="number"),null!=c&&c===c&&("number"!==f||n.cssNumber[h]||(c+="px"),k.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),g&&"set"in g&&void 0===(c=g.set(a,c,d))||(i[b]=c)),void 0)}},css:function(a,b,c,d){var e,f,g,h=n.camelCase(b);return b=n.cssProps[h]||(n.cssProps[h]=Fb(a.style,h)),g=n.cssHooks[b]||n.cssHooks[h],g&&"get"in g&&(e=g.get(a,!0,c)),void 0===e&&(e=xb(a,b,d)),"normal"===e&&b in Db&&(e=Db[b]),""===c||c?(f=parseFloat(e),c===!0||n.isNumeric(f)?f||0:e):e}}),n.each(["height","width"],function(a,b){n.cssHooks[b]={get:function(a,c,d){return c?zb.test(n.css(a,"display"))&&0===a.offsetWidth?n.swap(a,Cb,function(){return Ib(a,b,d)}):Ib(a,b,d):void 0},set:function(a,c,d){var e=d&&wb(a);return Gb(a,c,d?Hb(a,b,d,"border-box"===n.css(a,"boxSizing",!1,e),e):0)}}}),n.cssHooks.marginRight=yb(k.reliableMarginRight,function(a,b){return b?n.swap(a,{display:"inline-block"},xb,[a,"marginRight"]):void 0}),n.each({margin:"",padding:"",border:"Width"},function(a,b){n.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+R[d]+b]=f[d]||f[d-2]||f[0];return e}},ub.test(a)||(n.cssHooks[a+b].set=Gb)}),n.fn.extend({css:function(a,b){return J(this,function(a,b,c){var d,e,f={},g=0;if(n.isArray(b)){for(d=wb(a),e=b.length;e>g;g++)f[b[g]]=n.css(a,b[g],!1,d);return f}return void 0!==c?n.style(a,b,c):n.css(a,b)},a,b,arguments.length>1)},show:function(){return Jb(this,!0)},hide:function(){return Jb(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){S(this)?n(this).show():n(this).hide()})}});function Kb(a,b,c,d,e){return new Kb.prototype.init(a,b,c,d,e)}n.Tween=Kb,Kb.prototype={constructor:Kb,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(n.cssNumber[c]?"":"px")},cur:function(){var a=Kb.propHooks[this.prop];return a&&a.get?a.get(this):Kb.propHooks._default.get(this)},run:function(a){var b,c=Kb.propHooks[this.prop];return this.pos=b=this.options.duration?n.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Kb.propHooks._default.set(this),this}},Kb.prototype.init.prototype=Kb.prototype,Kb.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=n.css(a.elem,a.prop,""),b&&"auto"!==b?b:0):a.elem[a.prop]},set:function(a){n.fx.step[a.prop]?n.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[n.cssProps[a.prop]]||n.cssHooks[a.prop])?n.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},Kb.propHooks.scrollTop=Kb.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},n.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},n.fx=Kb.prototype.init,n.fx.step={};var Lb,Mb,Nb=/^(?:toggle|show|hide)$/,Ob=new RegExp("^(?:([+-])=|)("+Q+")([a-z%]*)$","i"),Pb=/queueHooks$/,Qb=[Vb],Rb={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=Ob.exec(b),f=e&&e[3]||(n.cssNumber[a]?"":"px"),g=(n.cssNumber[a]||"px"!==f&&+d)&&Ob.exec(n.css(c.elem,a)),h=1,i=20;if(g&&g[3]!==f){f=f||g[3],e=e||[],g=+d||1;do h=h||".5",g/=h,n.style(c.elem,a,g+f);while(h!==(h=c.cur()/d)&&1!==h&&--i)}return e&&(g=c.start=+g||+d||0,c.unit=f,c.end=e[1]?g+(e[1]+1)*e[2]:+e[2]),c}]};function Sb(){return setTimeout(function(){Lb=void 0}),Lb=n.now()}function Tb(a,b){var c,d=0,e={height:a};for(b=b?1:0;4>d;d+=2-b)c=R[d],e["margin"+c]=e["padding"+c]=a;return b&&(e.opacity=e.width=a),e}function Ub(a,b,c){for(var d,e=(Rb[b]||[]).concat(Rb["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function Vb(a,b,c){var d,e,f,g,h,i,j,k,l=this,m={},o=a.style,p=a.nodeType&&S(a),q=L.get(a,"fxshow");c.queue||(h=n._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,l.always(function(){l.always(function(){h.unqueued--,n.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[o.overflow,o.overflowX,o.overflowY],j=n.css(a,"display"),k="none"===j?L.get(a,"olddisplay")||tb(a.nodeName):j,"inline"===k&&"none"===n.css(a,"float")&&(o.display="inline-block")),c.overflow&&(o.overflow="hidden",l.always(function(){o.overflow=c.overflow[0],o.overflowX=c.overflow[1],o.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],Nb.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(p?"hide":"show")){if("show"!==e||!q||void 0===q[d])continue;p=!0}m[d]=q&&q[d]||n.style(a,d)}else j=void 0;if(n.isEmptyObject(m))"inline"===("none"===j?tb(a.nodeName):j)&&(o.display=j);else{q?"hidden"in q&&(p=q.hidden):q=L.access(a,"fxshow",{}),f&&(q.hidden=!p),p?n(a).show():l.done(function(){n(a).hide()}),l.done(function(){var b;L.remove(a,"fxshow");for(b in m)n.style(a,b,m[b])});for(d in m)g=Ub(p?q[d]:0,d,l),d in q||(q[d]=g.start,p&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function Wb(a,b){var c,d,e,f,g;for(c in a)if(d=n.camelCase(c),e=b[d],f=a[c],n.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=n.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function Xb(a,b,c){var d,e,f=0,g=Qb.length,h=n.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=Lb||Sb(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:n.extend({},b),opts:n.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:Lb||Sb(),duration:c.duration,tweens:[],createTween:function(b,c){var d=n.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;for(Wb(k,j.opts.specialEasing);g>f;f++)if(d=Qb[f].call(j,a,k,j.opts))return d;return n.map(k,Ub,j),n.isFunction(j.opts.start)&&j.opts.start.call(a,j),n.fx.timer(n.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}n.Animation=n.extend(Xb,{tweener:function(a,b){n.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");for(var c,d=0,e=a.length;e>d;d++)c=a[d],Rb[c]=Rb[c]||[],Rb[c].unshift(b)},prefilter:function(a,b){b?Qb.unshift(a):Qb.push(a)}}),n.speed=function(a,b,c){var d=a&&"object"==typeof a?n.extend({},a):{complete:c||!c&&b||n.isFunction(a)&&a,duration:a,easing:c&&b||b&&!n.isFunction(b)&&b};return d.duration=n.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in n.fx.speeds?n.fx.speeds[d.duration]:n.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){n.isFunction(d.old)&&d.old.call(this),d.queue&&n.dequeue(this,d.queue)},d},n.fn.extend({fadeTo:function(a,b,c,d){return this.filter(S).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=n.isEmptyObject(a),f=n.speed(b,c,d),g=function(){var b=Xb(this,n.extend({},a),f);(e||L.get(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=n.timers,g=L.get(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&Pb.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&n.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=L.get(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=n.timers,g=d?d.length:0;for(c.finish=!0,n.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),n.each(["toggle","show","hide"],function(a,b){var c=n.fn[b];n.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(Tb(b,!0),a,d,e)}}),n.each({slideDown:Tb("show"),slideUp:Tb("hide"),slideToggle:Tb("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){n.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),n.timers=[],n.fx.tick=function(){var a,b=0,c=n.timers;for(Lb=n.now();b<c.length;b++)a=c[b],a()||c[b]!==a||c.splice(b--,1);c.length||n.fx.stop(),Lb=void 0},n.fx.timer=function(a){n.timers.push(a),a()?n.fx.start():n.timers.pop()},n.fx.interval=13,n.fx.start=function(){Mb||(Mb=setInterval(n.fx.tick,n.fx.interval))},n.fx.stop=function(){clearInterval(Mb),Mb=null},n.fx.speeds={slow:600,fast:200,_default:400},n.fn.delay=function(a,b){return a=n.fx?n.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},function(){var a=l.createElement("input"),b=l.createElement("select"),c=b.appendChild(l.createElement("option"));a.type="checkbox",k.checkOn=""!==a.value,k.optSelected=c.selected,b.disabled=!0,k.optDisabled=!c.disabled,a=l.createElement("input"),a.value="t",a.type="radio",k.radioValue="t"===a.value}();var Yb,Zb,$b=n.expr.attrHandle;n.fn.extend({attr:function(a,b){return J(this,n.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){n.removeAttr(this,a)})}}),n.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(a&&3!==f&&8!==f&&2!==f)return typeof a.getAttribute===U?n.prop(a,b,c):(1===f&&n.isXMLDoc(a)||(b=b.toLowerCase(),d=n.attrHooks[b]||(n.expr.match.bool.test(b)?Zb:Yb)),void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=n.find.attr(a,b),null==e?void 0:e):null!==c?d&&"set"in d&&void 0!==(e=d.set(a,c,b))?e:(a.setAttribute(b,c+""),c):void n.removeAttr(a,b))
-},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(E);if(f&&1===a.nodeType)while(c=f[e++])d=n.propFix[c]||c,n.expr.match.bool.test(c)&&(a[d]=!1),a.removeAttribute(c)},attrHooks:{type:{set:function(a,b){if(!k.radioValue&&"radio"===b&&n.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}}}),Zb={set:function(a,b,c){return b===!1?n.removeAttr(a,c):a.setAttribute(c,c),c}},n.each(n.expr.match.bool.source.match(/\w+/g),function(a,b){var c=$b[b]||n.find.attr;$b[b]=function(a,b,d){var e,f;return d||(f=$b[b],$b[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,$b[b]=f),e}});var _b=/^(?:input|select|textarea|button)$/i;n.fn.extend({prop:function(a,b){return J(this,n.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[n.propFix[a]||a]})}}),n.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(a,b,c){var d,e,f,g=a.nodeType;if(a&&3!==g&&8!==g&&2!==g)return f=1!==g||!n.isXMLDoc(a),f&&(b=n.propFix[b]||b,e=n.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){return a.hasAttribute("tabindex")||_b.test(a.nodeName)||a.href?a.tabIndex:-1}}}}),k.optSelected||(n.propHooks.selected={get:function(a){var b=a.parentNode;return b&&b.parentNode&&b.parentNode.selectedIndex,null}}),n.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){n.propFix[this.toLowerCase()]=this});var ac=/[\t\r\n\f]/g;n.fn.extend({addClass:function(a){var b,c,d,e,f,g,h="string"==typeof a&&a,i=0,j=this.length;if(n.isFunction(a))return this.each(function(b){n(this).addClass(a.call(this,b,this.className))});if(h)for(b=(a||"").match(E)||[];j>i;i++)if(c=this[i],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ac," "):" ")){f=0;while(e=b[f++])d.indexOf(" "+e+" ")<0&&(d+=e+" ");g=n.trim(d),c.className!==g&&(c.className=g)}return this},removeClass:function(a){var b,c,d,e,f,g,h=0===arguments.length||"string"==typeof a&&a,i=0,j=this.length;if(n.isFunction(a))return this.each(function(b){n(this).removeClass(a.call(this,b,this.className))});if(h)for(b=(a||"").match(E)||[];j>i;i++)if(c=this[i],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ac," "):"")){f=0;while(e=b[f++])while(d.indexOf(" "+e+" ")>=0)d=d.replace(" "+e+" "," ");g=a?n.trim(d):"",c.className!==g&&(c.className=g)}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):this.each(n.isFunction(a)?function(c){n(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c){var b,d=0,e=n(this),f=a.match(E)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(c===U||"boolean"===c)&&(this.className&&L.set(this,"__className__",this.className),this.className=this.className||a===!1?"":L.get(this,"__className__")||"")})},hasClass:function(a){for(var b=" "+a+" ",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(" "+this[c].className+" ").replace(ac," ").indexOf(b)>=0)return!0;return!1}});var bc=/\r/g;n.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=n.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,n(this).val()):a,null==e?e="":"number"==typeof e?e+="":n.isArray(e)&&(e=n.map(e,function(a){return null==a?"":a+""})),b=n.valHooks[this.type]||n.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=n.valHooks[e.type]||n.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(bc,""):null==c?"":c)}}}),n.extend({valHooks:{option:{get:function(a){var b=n.find.attr(a,"value");return null!=b?b:n.trim(n.text(a))}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||(k.optDisabled?c.disabled:null!==c.getAttribute("disabled"))||c.parentNode.disabled&&n.nodeName(c.parentNode,"optgroup"))){if(b=n(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=n.makeArray(b),g=e.length;while(g--)d=e[g],(d.selected=n.inArray(d.value,f)>=0)&&(c=!0);return c||(a.selectedIndex=-1),f}}}}),n.each(["radio","checkbox"],function(){n.valHooks[this]={set:function(a,b){return n.isArray(b)?a.checked=n.inArray(n(a).val(),b)>=0:void 0}},k.checkOn||(n.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})}),n.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(a,b){n.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),n.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}});var cc=n.now(),dc=/\?/;n.parseJSON=function(a){return JSON.parse(a+"")},n.parseXML=function(a){var b,c;if(!a||"string"!=typeof a)return null;try{c=new DOMParser,b=c.parseFromString(a,"text/xml")}catch(d){b=void 0}return(!b||b.getElementsByTagName("parsererror").length)&&n.error("Invalid XML: "+a),b};var ec=/#.*$/,fc=/([?&])_=[^&]*/,gc=/^(.*?):[ \t]*([^\r\n]*)$/gm,hc=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,ic=/^(?:GET|HEAD)$/,jc=/^\/\//,kc=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,lc={},mc={},nc="*/".concat("*"),oc=a.location.href,pc=kc.exec(oc.toLowerCase())||[];function qc(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(E)||[];if(n.isFunction(c))while(d=f[e++])"+"===d[0]?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function rc(a,b,c,d){var e={},f=a===mc;function g(h){var i;return e[h]=!0,n.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function sc(a,b){var c,d,e=n.ajaxSettings.flatOptions||{};for(c in b)void 0!==b[c]&&((e[c]?a:d||(d={}))[c]=b[c]);return d&&n.extend(!0,a,d),a}function tc(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===d&&(d=a.mimeType||b.getResponseHeader("Content-Type"));if(d)for(e in h)if(h[e]&&h[e].test(d)){i.unshift(e);break}if(i[0]in c)f=i[0];else{for(e in c){if(!i[0]||a.converters[e+" "+i[0]]){f=e;break}g||(g=e)}f=f||g}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function uc(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}n.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:oc,type:"GET",isLocal:hc.test(pc[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":nc,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":n.parseJSON,"text xml":n.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?sc(sc(a,n.ajaxSettings),b):sc(n.ajaxSettings,a)},ajaxPrefilter:qc(lc),ajaxTransport:qc(mc),ajax:function(a,b){"object"==typeof a&&(b=a,a=void 0),b=b||{};var c,d,e,f,g,h,i,j,k=n.ajaxSetup({},b),l=k.context||k,m=k.context&&(l.nodeType||l.jquery)?n(l):n.event,o=n.Deferred(),p=n.Callbacks("once memory"),q=k.statusCode||{},r={},s={},t=0,u="canceled",v={readyState:0,getResponseHeader:function(a){var b;if(2===t){if(!f){f={};while(b=gc.exec(e))f[b[1].toLowerCase()]=b[2]}b=f[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===t?e:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return t||(a=s[c]=s[c]||a,r[a]=b),this},overrideMimeType:function(a){return t||(k.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>t)for(b in a)q[b]=[q[b],a[b]];else v.always(a[v.status]);return this},abort:function(a){var b=a||u;return c&&c.abort(b),x(0,b),this}};if(o.promise(v).complete=p.add,v.success=v.done,v.error=v.fail,k.url=((a||k.url||oc)+"").replace(ec,"").replace(jc,pc[1]+"//"),k.type=b.method||b.type||k.method||k.type,k.dataTypes=n.trim(k.dataType||"*").toLowerCase().match(E)||[""],null==k.crossDomain&&(h=kc.exec(k.url.toLowerCase()),k.crossDomain=!(!h||h[1]===pc[1]&&h[2]===pc[2]&&(h[3]||("http:"===h[1]?"80":"443"))===(pc[3]||("http:"===pc[1]?"80":"443")))),k.data&&k.processData&&"string"!=typeof k.data&&(k.data=n.param(k.data,k.traditional)),rc(lc,k,b,v),2===t)return v;i=n.event&&k.global,i&&0===n.active++&&n.event.trigger("ajaxStart"),k.type=k.type.toUpperCase(),k.hasContent=!ic.test(k.type),d=k.url,k.hasContent||(k.data&&(d=k.url+=(dc.test(d)?"&":"?")+k.data,delete k.data),k.cache===!1&&(k.url=fc.test(d)?d.replace(fc,"$1_="+cc++):d+(dc.test(d)?"&":"?")+"_="+cc++)),k.ifModified&&(n.lastModified[d]&&v.setRequestHeader("If-Modified-Since",n.lastModified[d]),n.etag[d]&&v.setRequestHeader("If-None-Match",n.etag[d])),(k.data&&k.hasContent&&k.contentType!==!1||b.contentType)&&v.setRequestHeader("Content-Type",k.contentType),v.setRequestHeader("Accept",k.dataTypes[0]&&k.accepts[k.dataTypes[0]]?k.accepts[k.dataTypes[0]]+("*"!==k.dataTypes[0]?", "+nc+"; q=0.01":""):k.accepts["*"]);for(j in k.headers)v.setRequestHeader(j,k.headers[j]);if(k.beforeSend&&(k.beforeSend.call(l,v,k)===!1||2===t))return v.abort();u="abort";for(j in{success:1,error:1,complete:1})v[j](k[j]);if(c=rc(mc,k,b,v)){v.readyState=1,i&&m.trigger("ajaxSend",[v,k]),k.async&&k.timeout>0&&(g=setTimeout(function(){v.abort("timeout")},k.timeout));try{t=1,c.send(r,x)}catch(w){if(!(2>t))throw w;x(-1,w)}}else x(-1,"No Transport");function x(a,b,f,h){var j,r,s,u,w,x=b;2!==t&&(t=2,g&&clearTimeout(g),c=void 0,e=h||"",v.readyState=a>0?4:0,j=a>=200&&300>a||304===a,f&&(u=tc(k,v,f)),u=uc(k,u,v,j),j?(k.ifModified&&(w=v.getResponseHeader("Last-Modified"),w&&(n.lastModified[d]=w),w=v.getResponseHeader("etag"),w&&(n.etag[d]=w)),204===a||"HEAD"===k.type?x="nocontent":304===a?x="notmodified":(x=u.state,r=u.data,s=u.error,j=!s)):(s=x,(a||!x)&&(x="error",0>a&&(a=0))),v.status=a,v.statusText=(b||x)+"",j?o.resolveWith(l,[r,x,v]):o.rejectWith(l,[v,x,s]),v.statusCode(q),q=void 0,i&&m.trigger(j?"ajaxSuccess":"ajaxError",[v,k,j?r:s]),p.fireWith(l,[v,x]),i&&(m.trigger("ajaxComplete",[v,k]),--n.active||n.event.trigger("ajaxStop")))}return v},getJSON:function(a,b,c){return n.get(a,b,c,"json")},getScript:function(a,b){return n.get(a,void 0,b,"script")}}),n.each(["get","post"],function(a,b){n[b]=function(a,c,d,e){return n.isFunction(c)&&(e=e||d,d=c,c=void 0),n.ajax({url:a,type:b,dataType:e,data:c,success:d})}}),n._evalUrl=function(a){return n.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},n.fn.extend({wrapAll:function(a){var b;return n.isFunction(a)?this.each(function(b){n(this).wrapAll(a.call(this,b))}):(this[0]&&(b=n(a,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstElementChild)a=a.firstElementChild;return a}).append(this)),this)},wrapInner:function(a){return this.each(n.isFunction(a)?function(b){n(this).wrapInner(a.call(this,b))}:function(){var b=n(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=n.isFunction(a);return this.each(function(c){n(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){n.nodeName(this,"body")||n(this).replaceWith(this.childNodes)}).end()}}),n.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0},n.expr.filters.visible=function(a){return!n.expr.filters.hidden(a)};var vc=/%20/g,wc=/\[\]$/,xc=/\r?\n/g,yc=/^(?:submit|button|image|reset|file)$/i,zc=/^(?:input|select|textarea|keygen)/i;function Ac(a,b,c,d){var e;if(n.isArray(b))n.each(b,function(b,e){c||wc.test(a)?d(a,e):Ac(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==n.type(b))d(a,b);else for(e in b)Ac(a+"["+e+"]",b[e],c,d)}n.param=function(a,b){var c,d=[],e=function(a,b){b=n.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=n.ajaxSettings&&n.ajaxSettings.traditional),n.isArray(a)||a.jquery&&!n.isPlainObject(a))n.each(a,function(){e(this.name,this.value)});else for(c in a)Ac(c,a[c],b,e);return d.join("&").replace(vc,"+")},n.fn.extend({serialize:function(){return n.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=n.prop(this,"elements");return a?n.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!n(this).is(":disabled")&&zc.test(this.nodeName)&&!yc.test(a)&&(this.checked||!T.test(a))}).map(function(a,b){var c=n(this).val();return null==c?null:n.isArray(c)?n.map(c,function(a){return{name:b.name,value:a.replace(xc,"\r\n")}}):{name:b.name,value:c.replace(xc,"\r\n")}}).get()}}),n.ajaxSettings.xhr=function(){try{return new XMLHttpRequest}catch(a){}};var Bc=0,Cc={},Dc={0:200,1223:204},Ec=n.ajaxSettings.xhr();a.attachEvent&&a.attachEvent("onunload",function(){for(var a in Cc)Cc[a]()}),k.cors=!!Ec&&"withCredentials"in Ec,k.ajax=Ec=!!Ec,n.ajaxTransport(function(a){var b;return k.cors||Ec&&!a.crossDomain?{send:function(c,d){var e,f=a.xhr(),g=++Bc;if(f.open(a.type,a.url,a.async,a.username,a.password),a.xhrFields)for(e in a.xhrFields)f[e]=a.xhrFields[e];a.mimeType&&f.overrideMimeType&&f.overrideMimeType(a.mimeType),a.crossDomain||c["X-Requested-With"]||(c["X-Requested-With"]="XMLHttpRequest");for(e in c)f.setRequestHeader(e,c[e]);b=function(a){return function(){b&&(delete Cc[g],b=f.onload=f.onerror=null,"abort"===a?f.abort():"error"===a?d(f.status,f.statusText):d(Dc[f.status]||f.status,f.statusText,"string"==typeof f.responseText?{text:f.responseText}:void 0,f.getAllResponseHeaders()))}},f.onload=b(),f.onerror=b("error"),b=Cc[g]=b("abort");try{f.send(a.hasContent&&a.data||null)}catch(h){if(b)throw h}},abort:function(){b&&b()}}:void 0}),n.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(a){return n.globalEval(a),a}}}),n.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET")}),n.ajaxTransport("script",function(a){if(a.crossDomain){var b,c;return{send:function(d,e){b=n("<script>").prop({async:!0,charset:a.scriptCharset,src:a.url}).on("load error",c=function(a){b.remove(),c=null,a&&e("error"===a.type?404:200,a.type)}),l.head.appendChild(b[0])},abort:function(){c&&c()}}}});var Fc=[],Gc=/(=)\?(?=&|$)|\?\?/;n.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=Fc.pop()||n.expando+"_"+cc++;return this[a]=!0,a}}),n.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(Gc.test(b.url)?"url":"string"==typeof b.data&&!(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&Gc.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=n.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(Gc,"$1"+e):b.jsonp!==!1&&(b.url+=(dc.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||n.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,Fc.push(e)),g&&n.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),n.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||l;var d=v.exec(a),e=!c&&[];return d?[b.createElement(d[1])]:(d=n.buildFragment([a],b,e),e&&e.length&&n(e).remove(),n.merge([],d.childNodes))};var Hc=n.fn.load;n.fn.load=function(a,b,c){if("string"!=typeof a&&Hc)return Hc.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>=0&&(d=n.trim(a.slice(h)),a=a.slice(0,h)),n.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(e="POST"),g.length>0&&n.ajax({url:a,type:e,dataType:"html",data:b}).done(function(a){f=arguments,g.html(d?n("<div>").append(n.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,f||[a.responseText,b,a])}),this},n.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){n.fn[b]=function(a){return this.on(b,a)}}),n.expr.filters.animated=function(a){return n.grep(n.timers,function(b){return a===b.elem}).length};var Ic=a.document.documentElement;function Jc(a){return n.isWindow(a)?a:9===a.nodeType&&a.defaultView}n.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=n.css(a,"position"),l=n(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=n.css(a,"top"),i=n.css(a,"left"),j=("absolute"===k||"fixed"===k)&&(f+i).indexOf("auto")>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),n.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},n.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){n.offset.setOffset(this,a,b)});var b,c,d=this[0],e={top:0,left:0},f=d&&d.ownerDocument;if(f)return b=f.documentElement,n.contains(b,d)?(typeof d.getBoundingClientRect!==U&&(e=d.getBoundingClientRect()),c=Jc(f),{top:e.top+c.pageYOffset-b.clientTop,left:e.left+c.pageXOffset-b.clientLeft}):e},position:function(){if(this[0]){var a,b,c=this[0],d={top:0,left:0};return"fixed"===n.css(c,"position")?b=c.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),n.nodeName(a[0],"html")||(d=a.offset()),d.top+=n.css(a[0],"borderTopWidth",!0),d.left+=n.css(a[0],"borderLeftWidth",!0)),{top:b.top-d.top-n.css(c,"marginTop",!0),left:b.left-d.left-n.css(c,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||Ic;while(a&&!n.nodeName(a,"html")&&"static"===n.css(a,"position"))a=a.offsetParent;return a||Ic})}}),n.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(b,c){var d="pageYOffset"===c;n.fn[b]=function(e){return J(this,function(b,e,f){var g=Jc(b);return void 0===f?g?g[c]:b[e]:void(g?g.scrollTo(d?a.pageXOffset:f,d?f:a.pageYOffset):b[e]=f)},b,e,arguments.length,null)}}),n.each(["top","left"],function(a,b){n.cssHooks[b]=yb(k.pixelPosition,function(a,c){return c?(c=xb(a,b),vb.test(c)?n(a).position()[b]+"px":c):void 0})}),n.each({Height:"height",Width:"width"},function(a,b){n.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){n.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return J(this,function(b,c,d){var e;return n.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?n.css(b,c,g):n.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),n.fn.size=function(){return this.length},n.fn.andSelf=n.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return n});var Kc=a.jQuery,Lc=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=Lc),b&&a.jQuery===n&&(a.jQuery=Kc),n},typeof b===U&&(a.jQuery=a.$=n),n});
diff --git a/NewLife.Cube/Content/js/jquery-ui.custom.min.js b/NewLife.Cube/Content/js/jquery-ui.custom.min.js
deleted file mode 100644
index 80e311cb21..0000000000
--- a/NewLife.Cube/Content/js/jquery-ui.custom.min.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/*! jQuery UI - v1.11.2 - 2014-10-28
-* http://jqueryui.com
-* Includes: core.js, widget.js, mouse.js, position.js, draggable.js, droppable.js, resizable.js, selectable.js, sortable.js, slider.js
-* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
-!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):a(jQuery)}(function(a){function b(b,d){var e,f,g,h=b.nodeName.toLowerCase();return"area"===h?(e=b.parentNode,f=e.name,b.href&&f&&"map"===e.nodeName.toLowerCase()?(g=a("img[usemap='#"+f+"']")[0],!!g&&c(g)):!1):(/input|select|textarea|button|object/.test(h)?!b.disabled:"a"===h?b.href||d:d)&&c(b)}function c(b){return a.expr.filters.visible(b)&&!a(b).parents().addBack().filter(function(){return"hidden"===a.css(this,"visibility")}).length}/*!
- * jQuery UI Core 1.11.2
- * http://jqueryui.com
- *
- * Copyright 2014 jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/category/ui-core/
- */
-a.ui=a.ui||{},a.extend(a.ui,{version:"1.11.2",keyCode:{BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38}}),a.fn.extend({scrollParent:function(b){var c=this.css("position"),d="absolute"===c,e=b?/(auto|scroll|hidden)/:/(auto|scroll)/,f=this.parents().filter(function(){var b=a(this);return d&&"static"===b.css("position")?!1:e.test(b.css("overflow")+b.css("overflow-y")+b.css("overflow-x"))}).eq(0);return"fixed"!==c&&f.length?f:a(this[0].ownerDocument||document)},uniqueId:function(){var a=0;return function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++a)})}}(),removeUniqueId:function(){return this.each(function(){/^ui-id-\d+$/.test(this.id)&&a(this).removeAttr("id")})}}),a.extend(a.expr[":"],{data:a.expr.createPseudo?a.expr.createPseudo(function(b){return function(c){return!!a.data(c,b)}}):function(b,c,d){return!!a.data(b,d[3])},focusable:function(c){return b(c,!isNaN(a.attr(c,"tabindex")))},tabbable:function(c){var d=a.attr(c,"tabindex"),e=isNaN(d);return(e||d>=0)&&b(c,!e)}}),a("<a>").outerWidth(1).jquery||a.each(["Width","Height"],function(b,c){function d(b,c,d,f){return a.each(e,function(){c-=parseFloat(a.css(b,"padding"+this))||0,d&&(c-=parseFloat(a.css(b,"border"+this+"Width"))||0),f&&(c-=parseFloat(a.css(b,"margin"+this))||0)}),c}var e="Width"===c?["Left","Right"]:["Top","Bottom"],f=c.toLowerCase(),g={innerWidth:a.fn.innerWidth,innerHeight:a.fn.innerHeight,outerWidth:a.fn.outerWidth,outerHeight:a.fn.outerHeight};a.fn["inner"+c]=function(b){return void 0===b?g["inner"+c].call(this):this.each(function(){a(this).css(f,d(this,b)+"px")})},a.fn["outer"+c]=function(b,e){return"number"!=typeof b?g["outer"+c].call(this,b):this.each(function(){a(this).css(f,d(this,b,!0,e)+"px")})}}),a.fn.addBack||(a.fn.addBack=function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}),a("<a>").data("a-b","a").removeData("a-b").data("a-b")&&(a.fn.removeData=function(b){return function(c){return arguments.length?b.call(this,a.camelCase(c)):b.call(this)}}(a.fn.removeData)),a.ui.ie=!!/msie [\w.]+/.exec(navigator.userAgent.toLowerCase()),a.fn.extend({focus:function(b){return function(c,d){return"number"==typeof c?this.each(function(){var b=this;setTimeout(function(){a(b).focus(),d&&d.call(b)},c)}):b.apply(this,arguments)}}(a.fn.focus),disableSelection:function(){var a="onselectstart"in document.createElement("div")?"selectstart":"mousedown";return function(){return this.bind(a+".ui-disableSelection",function(a){a.preventDefault()})}}(),enableSelection:function(){return this.unbind(".ui-disableSelection")},zIndex:function(b){if(void 0!==b)return this.css("zIndex",b);if(this.length)for(var c,d,e=a(this[0]);e.length&&e[0]!==document;){if(c=e.css("position"),("absolute"===c||"relative"===c||"fixed"===c)&&(d=parseInt(e.css("zIndex"),10),!isNaN(d)&&0!==d))return d;e=e.parent()}return 0}}),a.ui.plugin={add:function(b,c,d){var e,f=a.ui[b].prototype;for(e in d)f.plugins[e]=f.plugins[e]||[],f.plugins[e].push([c,d[e]])},call:function(a,b,c,d){var e,f=a.plugins[b];if(f&&(d||a.element[0].parentNode&&11!==a.element[0].parentNode.nodeType))for(e=0;e<f.length;e++)a.options[f[e][0]]&&f[e][1].apply(a.element,c)}};/*!
- * jQuery UI Widget 1.11.2
- * http://jqueryui.com
- *
- * Copyright 2014 jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/jQuery.widget/
- */
-var d=0,e=Array.prototype.slice;a.cleanData=function(b){return function(c){var d,e,f;for(f=0;null!=(e=c[f]);f++)try{d=a._data(e,"events"),d&&d.remove&&a(e).triggerHandler("remove")}catch(g){}b(c)}}(a.cleanData),a.widget=function(b,c,d){var e,f,g,h,i={},j=b.split(".")[0];return b=b.split(".")[1],e=j+"-"+b,d||(d=c,c=a.Widget),a.expr[":"][e.toLowerCase()]=function(b){return!!a.data(b,e)},a[j]=a[j]||{},f=a[j][b],g=a[j][b]=function(a,b){return this._createWidget?void(arguments.length&&this._createWidget(a,b)):new g(a,b)},a.extend(g,f,{version:d.version,_proto:a.extend({},d),_childConstructors:[]}),h=new c,h.options=a.widget.extend({},h.options),a.each(d,function(b,d){return a.isFunction(d)?void(i[b]=function(){var a=function(){return c.prototype[b].apply(this,arguments)},e=function(a){return c.prototype[b].apply(this,a)};return function(){var b,c=this._super,f=this._superApply;return this._super=a,this._superApply=e,b=d.apply(this,arguments),this._super=c,this._superApply=f,b}}()):void(i[b]=d)}),g.prototype=a.widget.extend(h,{widgetEventPrefix:f?h.widgetEventPrefix||b:b},i,{constructor:g,namespace:j,widgetName:b,widgetFullName:e}),f?(a.each(f._childConstructors,function(b,c){var d=c.prototype;a.widget(d.namespace+"."+d.widgetName,g,c._proto)}),delete f._childConstructors):c._childConstructors.push(g),a.widget.bridge(b,g),g},a.widget.extend=function(b){for(var c,d,f=e.call(arguments,1),g=0,h=f.length;h>g;g++)for(c in f[g])d=f[g][c],f[g].hasOwnProperty(c)&&void 0!==d&&(b[c]=a.isPlainObject(d)?a.isPlainObject(b[c])?a.widget.extend({},b[c],d):a.widget.extend({},d):d);return b},a.widget.bridge=function(b,c){var d=c.prototype.widgetFullName||b;a.fn[b]=function(f){var g="string"==typeof f,h=e.call(arguments,1),i=this;return f=!g&&h.length?a.widget.extend.apply(null,[f].concat(h)):f,this.each(g?function(){var c,e=a.data(this,d);return"instance"===f?(i=e,!1):e?a.isFunction(e[f])&&"_"!==f.charAt(0)?(c=e[f].apply(e,h),c!==e&&void 0!==c?(i=c&&c.jquery?i.pushStack(c.get()):c,!1):void 0):a.error("no such method '"+f+"' for "+b+" widget instance"):a.error("cannot call methods on "+b+" prior to initialization; attempted to call method '"+f+"'")}:function(){var b=a.data(this,d);b?(b.option(f||{}),b._init&&b._init()):a.data(this,d,new c(f,this))}),i}},a.Widget=function(){},a.Widget._childConstructors=[],a.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{disabled:!1,create:null},_createWidget:function(b,c){c=a(c||this.defaultElement||this)[0],this.element=a(c),this.uuid=d++,this.eventNamespace="."+this.widgetName+this.uuid,this.bindings=a(),this.hoverable=a(),this.focusable=a(),c!==this&&(a.data(c,this.widgetFullName,this),this._on(!0,this.element,{remove:function(a){a.target===c&&this.destroy()}}),this.document=a(c.style?c.ownerDocument:c.document||c),this.window=a(this.document[0].defaultView||this.document[0].parentWindow)),this.options=a.widget.extend({},this.options,this._getCreateOptions(),b),this._create(),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:a.noop,_getCreateEventData:a.noop,_create:a.noop,_init:a.noop,destroy:function(){this._destroy(),this.element.unbind(this.eventNamespace).removeData(this.widgetFullName).removeData(a.camelCase(this.widgetFullName)),this.widget().unbind(this.eventNamespace).removeAttr("aria-disabled").removeClass(this.widgetFullName+"-disabled ui-state-disabled"),this.bindings.unbind(this.eventNamespace),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")},_destroy:a.noop,widget:function(){return this.element},option:function(b,c){var d,e,f,g=b;if(0===arguments.length)return a.widget.extend({},this.options);if("string"==typeof b)if(g={},d=b.split("."),b=d.shift(),d.length){for(e=g[b]=a.widget.extend({},this.options[b]),f=0;f<d.length-1;f++)e[d[f]]=e[d[f]]||{},e=e[d[f]];if(b=d.pop(),1===arguments.length)return void 0===e[b]?null:e[b];e[b]=c}else{if(1===arguments.length)return void 0===this.options[b]?null:this.options[b];g[b]=c}return this._setOptions(g),this},_setOptions:function(a){var b;for(b in a)this._setOption(b,a[b]);return this},_setOption:function(a,b){return this.options[a]=b,"disabled"===a&&(this.widget().toggleClass(this.widgetFullName+"-disabled",!!b),b&&(this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus"))),this},enable:function(){return this._setOptions({disabled:!1})},disable:function(){return this._setOptions({disabled:!0})},_on:function(b,c,d){var e,f=this;"boolean"!=typeof b&&(d=c,c=b,b=!1),d?(c=e=a(c),this.bindings=this.bindings.add(c)):(d=c,c=this.element,e=this.widget()),a.each(d,function(d,g){function h(){return b||f.options.disabled!==!0&&!a(this).hasClass("ui-state-disabled")?("string"==typeof g?f[g]:g).apply(f,arguments):void 0}"string"!=typeof g&&(h.guid=g.guid=g.guid||h.guid||a.guid++);var i=d.match(/^([\w:-]*)\s*(.*)$/),j=i[1]+f.eventNamespace,k=i[2];k?e.delegate(k,j,h):c.bind(j,h)})},_off:function(b,c){c=(c||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,b.unbind(c).undelegate(c),this.bindings=a(this.bindings.not(b).get()),this.focusable=a(this.focusable.not(b).get()),this.hoverable=a(this.hoverable.not(b).get())},_delay:function(a,b){function c(){return("string"==typeof a?d[a]:a).apply(d,arguments)}var d=this;return setTimeout(c,b||0)},_hoverable:function(b){this.hoverable=this.hoverable.add(b),this._on(b,{mouseenter:function(b){a(b.currentTarget).addClass("ui-state-hover")},mouseleave:function(b){a(b.currentTarget).removeClass("ui-state-hover")}})},_focusable:function(b){this.focusable=this.focusable.add(b),this._on(b,{focusin:function(b){a(b.currentTarget).addClass("ui-state-focus")},focusout:function(b){a(b.currentTarget).removeClass("ui-state-focus")}})},_trigger:function(b,c,d){var e,f,g=this.options[b];if(d=d||{},c=a.Event(c),c.type=(b===this.widgetEventPrefix?b:this.widgetEventPrefix+b).toLowerCase(),c.target=this.element[0],f=c.originalEvent)for(e in f)e in c||(c[e]=f[e]);return this.element.trigger(c,d),!(a.isFunction(g)&&g.apply(this.element[0],[c].concat(d))===!1||c.isDefaultPrevented())}},a.each({show:"fadeIn",hide:"fadeOut"},function(b,c){a.Widget.prototype["_"+b]=function(d,e,f){"string"==typeof e&&(e={effect:e});var g,h=e?e===!0||"number"==typeof e?c:e.effect||c:b;e=e||{},"number"==typeof e&&(e={duration:e}),g=!a.isEmptyObject(e),e.complete=f,e.delay&&d.delay(e.delay),g&&a.effects&&a.effects.effect[h]?d[b](e):h!==b&&d[h]?d[h](e.duration,e.easing,f):d.queue(function(c){a(this)[b](),f&&f.call(d[0]),c()})}});var f=(a.widget,!1);a(document).mouseup(function(){f=!1});a.widget("ui.mouse",{version:"1.11.2",options:{cancel:"input,textarea,button,select,option",distance:1,delay:0},_mouseInit:function(){var b=this;this.element.bind("mousedown."+this.widgetName,function(a){return b._mouseDown(a)}).bind("click."+this.widgetName,function(c){return!0===a.data(c.target,b.widgetName+".preventClickEvent")?(a.removeData(c.target,b.widgetName+".preventClickEvent"),c.stopImmediatePropagation(),!1):void 0}),this.started=!1},_mouseDestroy:function(){this.element.unbind("."+this.widgetName),this._mouseMoveDelegate&&this.document.unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(b){if(!f){this._mouseMoved=!1,this._mouseStarted&&this._mouseUp(b),this._mouseDownEvent=b;var c=this,d=1===b.which,e="string"==typeof this.options.cancel&&b.target.nodeName?a(b.target).closest(this.options.cancel).length:!1;return d&&!e&&this._mouseCapture(b)?(this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){c.mouseDelayMet=!0},this.options.delay)),this._mouseDistanceMet(b)&&this._mouseDelayMet(b)&&(this._mouseStarted=this._mouseStart(b)!==!1,!this._mouseStarted)?(b.preventDefault(),!0):(!0===a.data(b.target,this.widgetName+".preventClickEvent")&&a.removeData(b.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(a){return c._mouseMove(a)},this._mouseUpDelegate=function(a){return c._mouseUp(a)},this.document.bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate),b.preventDefault(),f=!0,!0)):!0}},_mouseMove:function(b){if(this._mouseMoved){if(a.ui.ie&&(!document.documentMode||document.documentMode<9)&&!b.button)return this._mouseUp(b);if(!b.which)return this._mouseUp(b)}return(b.which||b.button)&&(this._mouseMoved=!0),this._mouseStarted?(this._mouseDrag(b),b.preventDefault()):(this._mouseDistanceMet(b)&&this._mouseDelayMet(b)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,b)!==!1,this._mouseStarted?this._mouseDrag(b):this._mouseUp(b)),!this._mouseStarted)},_mouseUp:function(b){return this.document.unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,b.target===this._mouseDownEvent.target&&a.data(b.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(b)),f=!1,!1},_mouseDistanceMet:function(a){return Math.max(Math.abs(this._mouseDownEvent.pageX-a.pageX),Math.abs(this._mouseDownEvent.pageY-a.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return!0}});/*!
- * jQuery UI Position 1.11.2
- * http://jqueryui.com
- *
- * Copyright 2014 jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/position/
- */
-!function(){function b(a,b,c){return[parseFloat(a[0])*(n.test(a[0])?b/100:1),parseFloat(a[1])*(n.test(a[1])?c/100:1)]}function c(b,c){return parseInt(a.css(b,c),10)||0}function d(b){var c=b[0];return 9===c.nodeType?{width:b.width(),height:b.height(),offset:{top:0,left:0}}:a.isWindow(c)?{width:b.width(),height:b.height(),offset:{top:b.scrollTop(),left:b.scrollLeft()}}:c.preventDefault?{width:0,height:0,offset:{top:c.pageY,left:c.pageX}}:{width:b.outerWidth(),height:b.outerHeight(),offset:b.offset()}}a.ui=a.ui||{};var e,f,g=Math.max,h=Math.abs,i=Math.round,j=/left|center|right/,k=/top|center|bottom/,l=/[\+\-]\d+(\.[\d]+)?%?/,m=/^\w+/,n=/%$/,o=a.fn.position;a.position={scrollbarWidth:function(){if(void 0!==e)return e;var b,c,d=a("<div style='display:block;position:absolute;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>"),f=d.children()[0];return a("body").append(d),b=f.offsetWidth,d.css("overflow","scroll"),c=f.offsetWidth,b===c&&(c=d[0].clientWidth),d.remove(),e=b-c},getScrollInfo:function(b){var c=b.isWindow||b.isDocument?"":b.element.css("overflow-x"),d=b.isWindow||b.isDocument?"":b.element.css("overflow-y"),e="scroll"===c||"auto"===c&&b.width<b.element[0].scrollWidth,f="scroll"===d||"auto"===d&&b.height<b.element[0].scrollHeight;return{width:f?a.position.scrollbarWidth():0,height:e?a.position.scrollbarWidth():0}},getWithinInfo:function(b){var c=a(b||window),d=a.isWindow(c[0]),e=!!c[0]&&9===c[0].nodeType;return{element:c,isWindow:d,isDocument:e,offset:c.offset()||{left:0,top:0},scrollLeft:c.scrollLeft(),scrollTop:c.scrollTop(),width:d||e?c.width():c.outerWidth(),height:d||e?c.height():c.outerHeight()}}},a.fn.position=function(e){if(!e||!e.of)return o.apply(this,arguments);e=a.extend({},e);var n,p,q,r,s,t,u=a(e.of),v=a.position.getWithinInfo(e.within),w=a.position.getScrollInfo(v),x=(e.collision||"flip").split(" "),y={};return t=d(u),u[0].preventDefault&&(e.at="left top"),p=t.width,q=t.height,r=t.offset,s=a.extend({},r),a.each(["my","at"],function(){var a,b,c=(e[this]||"").split(" ");1===c.length&&(c=j.test(c[0])?c.concat(["center"]):k.test(c[0])?["center"].concat(c):["center","center"]),c[0]=j.test(c[0])?c[0]:"center",c[1]=k.test(c[1])?c[1]:"center",a=l.exec(c[0]),b=l.exec(c[1]),y[this]=[a?a[0]:0,b?b[0]:0],e[this]=[m.exec(c[0])[0],m.exec(c[1])[0]]}),1===x.length&&(x[1]=x[0]),"right"===e.at[0]?s.left+=p:"center"===e.at[0]&&(s.left+=p/2),"bottom"===e.at[1]?s.top+=q:"center"===e.at[1]&&(s.top+=q/2),n=b(y.at,p,q),s.left+=n[0],s.top+=n[1],this.each(function(){var d,j,k=a(this),l=k.outerWidth(),m=k.outerHeight(),o=c(this,"marginLeft"),t=c(this,"marginTop"),z=l+o+c(this,"marginRight")+w.width,A=m+t+c(this,"marginBottom")+w.height,B=a.extend({},s),C=b(y.my,k.outerWidth(),k.outerHeight());"right"===e.my[0]?B.left-=l:"center"===e.my[0]&&(B.left-=l/2),"bottom"===e.my[1]?B.top-=m:"center"===e.my[1]&&(B.top-=m/2),B.left+=C[0],B.top+=C[1],f||(B.left=i(B.left),B.top=i(B.top)),d={marginLeft:o,marginTop:t},a.each(["left","top"],function(b,c){a.ui.position[x[b]]&&a.ui.position[x[b]][c](B,{targetWidth:p,targetHeight:q,elemWidth:l,elemHeight:m,collisionPosition:d,collisionWidth:z,collisionHeight:A,offset:[n[0]+C[0],n[1]+C[1]],my:e.my,at:e.at,within:v,elem:k})}),e.using&&(j=function(a){var b=r.left-B.left,c=b+p-l,d=r.top-B.top,f=d+q-m,i={target:{element:u,left:r.left,top:r.top,width:p,height:q},element:{element:k,left:B.left,top:B.top,width:l,height:m},horizontal:0>c?"left":b>0?"right":"center",vertical:0>f?"top":d>0?"bottom":"middle"};l>p&&h(b+c)<p&&(i.horizontal="center"),m>q&&h(d+f)<q&&(i.vertical="middle"),i.important=g(h(b),h(c))>g(h(d),h(f))?"horizontal":"vertical",e.using.call(this,a,i)}),k.offset(a.extend(B,{using:j}))})},a.ui.position={fit:{left:function(a,b){var c,d=b.within,e=d.isWindow?d.scrollLeft:d.offset.left,f=d.width,h=a.left-b.collisionPosition.marginLeft,i=e-h,j=h+b.collisionWidth-f-e;b.collisionWidth>f?i>0&&0>=j?(c=a.left+i+b.collisionWidth-f-e,a.left+=i-c):a.left=j>0&&0>=i?e:i>j?e+f-b.collisionWidth:e:i>0?a.left+=i:j>0?a.left-=j:a.left=g(a.left-h,a.left)},top:function(a,b){var c,d=b.within,e=d.isWindow?d.scrollTop:d.offset.top,f=b.within.height,h=a.top-b.collisionPosition.marginTop,i=e-h,j=h+b.collisionHeight-f-e;b.collisionHeight>f?i>0&&0>=j?(c=a.top+i+b.collisionHeight-f-e,a.top+=i-c):a.top=j>0&&0>=i?e:i>j?e+f-b.collisionHeight:e:i>0?a.top+=i:j>0?a.top-=j:a.top=g(a.top-h,a.top)}},flip:{left:function(a,b){var c,d,e=b.within,f=e.offset.left+e.scrollLeft,g=e.width,i=e.isWindow?e.scrollLeft:e.offset.left,j=a.left-b.collisionPosition.marginLeft,k=j-i,l=j+b.collisionWidth-g-i,m="left"===b.my[0]?-b.elemWidth:"right"===b.my[0]?b.elemWidth:0,n="left"===b.at[0]?b.targetWidth:"right"===b.at[0]?-b.targetWidth:0,o=-2*b.offset[0];0>k?(c=a.left+m+n+o+b.collisionWidth-g-f,(0>c||c<h(k))&&(a.left+=m+n+o)):l>0&&(d=a.left-b.collisionPosition.marginLeft+m+n+o-i,(d>0||h(d)<l)&&(a.left+=m+n+o))},top:function(a,b){var c,d,e=b.within,f=e.offset.top+e.scrollTop,g=e.height,i=e.isWindow?e.scrollTop:e.offset.top,j=a.top-b.collisionPosition.marginTop,k=j-i,l=j+b.collisionHeight-g-i,m="top"===b.my[1],n=m?-b.elemHeight:"bottom"===b.my[1]?b.elemHeight:0,o="top"===b.at[1]?b.targetHeight:"bottom"===b.at[1]?-b.targetHeight:0,p=-2*b.offset[1];0>k?(d=a.top+n+o+p+b.collisionHeight-g-f,a.top+n+o+p>k&&(0>d||d<h(k))&&(a.top+=n+o+p)):l>0&&(c=a.top-b.collisionPosition.marginTop+n+o+p-i,a.top+n+o+p>l&&(c>0||h(c)<l)&&(a.top+=n+o+p))}},flipfit:{left:function(){a.ui.position.flip.left.apply(this,arguments),a.ui.position.fit.left.apply(this,arguments)},top:function(){a.ui.position.flip.top.apply(this,arguments),a.ui.position.fit.top.apply(this,arguments)}}},function(){var b,c,d,e,g,h=document.getElementsByTagName("body")[0],i=document.createElement("div");b=document.createElement(h?"div":"body"),d={visibility:"hidden",width:0,height:0,border:0,margin:0,background:"none"},h&&a.extend(d,{position:"absolute",left:"-1000px",top:"-1000px"});for(g in d)b.style[g]=d[g];b.appendChild(i),c=h||document.documentElement,c.insertBefore(b,c.firstChild),i.style.cssText="position: absolute; left: 10.7432222px;",e=a(i).offset().left,f=e>10&&11>e,b.innerHTML="",c.removeChild(b)}()}();a.ui.position;/*!
- * jQuery UI Draggable 1.11.2
- * http://jqueryui.com
- *
- * Copyright 2014 jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/draggable/
- */
-a.widget("ui.draggable",a.ui.mouse,{version:"1.11.2",widgetEventPrefix:"drag",options:{addClasses:!0,appendTo:"parent",axis:!1,connectToSortable:!1,containment:!1,cursor:"auto",cursorAt:!1,grid:!1,handle:!1,helper:"original",iframeFix:!1,opacity:!1,refreshPositions:!1,revert:!1,revertDuration:500,scope:"default",scroll:!0,scrollSensitivity:20,scrollSpeed:20,snap:!1,snapMode:"both",snapTolerance:20,stack:!1,zIndex:!1,drag:null,start:null,stop:null},_create:function(){"original"===this.options.helper&&this._setPositionRelative(),this.options.addClasses&&this.element.addClass("ui-draggable"),this.options.disabled&&this.element.addClass("ui-draggable-disabled"),this._setHandleClassName(),this._mouseInit()},_setOption:function(a,b){this._super(a,b),"handle"===a&&(this._removeHandleClassName(),this._setHandleClassName())},_destroy:function(){return(this.helper||this.element).is(".ui-draggable-dragging")?void(this.destroyOnClear=!0):(this.element.removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled"),this._removeHandleClassName(),void this._mouseDestroy())},_mouseCapture:function(b){var c=this.options;return this._blurActiveElement(b),this.helper||c.disabled||a(b.target).closest(".ui-resizable-handle").length>0?!1:(this.handle=this._getHandle(b),this.handle?(this._blockFrames(c.iframeFix===!0?"iframe":c.iframeFix),!0):!1)},_blockFrames:function(b){this.iframeBlocks=this.document.find(b).map(function(){var b=a(this);return a("<div>").css("position","absolute").appendTo(b.parent()).outerWidth(b.outerWidth()).outerHeight(b.outerHeight()).offset(b.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_blurActiveElement:function(b){var c=this.document[0];if(this.handleElement.is(b.target))try{c.activeElement&&"body"!==c.activeElement.nodeName.toLowerCase()&&a(c.activeElement).blur()}catch(d){}},_mouseStart:function(b){var c=this.options;return this.helper=this._createHelper(b),this.helper.addClass("ui-draggable-dragging"),this._cacheHelperProportions(),a.ui.ddmanager&&(a.ui.ddmanager.current=this),this._cacheMargins(),this.cssPosition=this.helper.css("position"),this.scrollParent=this.helper.scrollParent(!0),this.offsetParent=this.helper.offsetParent(),this.hasFixedAncestor=this.helper.parents().filter(function(){return"fixed"===a(this).css("position")}).length>0,this.positionAbs=this.element.offset(),this._refreshOffsets(b),this.originalPosition=this.position=this._generatePosition(b,!1),this.originalPageX=b.pageX,this.originalPageY=b.pageY,c.cursorAt&&this._adjustOffsetFromHelper(c.cursorAt),this._setContainment(),this._trigger("start",b)===!1?(this._clear(),!1):(this._cacheHelperProportions(),a.ui.ddmanager&&!c.dropBehaviour&&a.ui.ddmanager.prepareOffsets(this,b),this._normalizeRightBottom(),this._mouseDrag(b,!0),a.ui.ddmanager&&a.ui.ddmanager.dragStart(this,b),!0)},_refreshOffsets:function(a){this.offset={top:this.positionAbs.top-this.margins.top,left:this.positionAbs.left-this.margins.left,scroll:!1,parent:this._getParentOffset(),relative:this._getRelativeOffset()},this.offset.click={left:a.pageX-this.offset.left,top:a.pageY-this.offset.top}},_mouseDrag:function(b,c){if(this.hasFixedAncestor&&(this.offset.parent=this._getParentOffset()),this.position=this._generatePosition(b,!0),this.positionAbs=this._convertPositionTo("absolute"),!c){var d=this._uiHash();if(this._trigger("drag",b,d)===!1)return this._mouseUp({}),!1;this.position=d.position}return this.helper[0].style.left=this.position.left+"px",this.helper[0].style.top=this.position.top+"px",a.ui.ddmanager&&a.ui.ddmanager.drag(this,b),!1},_mouseStop:function(b){var c=this,d=!1;return a.ui.ddmanager&&!this.options.dropBehaviour&&(d=a.ui.ddmanager.drop(this,b)),this.dropped&&(d=this.dropped,this.dropped=!1),"invalid"===this.options.revert&&!d||"valid"===this.options.revert&&d||this.options.revert===!0||a.isFunction(this.options.revert)&&this.options.revert.call(this.element,d)?a(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){c._trigger("stop",b)!==!1&&c._clear()}):this._trigger("stop",b)!==!1&&this._clear(),!1},_mouseUp:function(b){return this._unblockFrames(),a.ui.ddmanager&&a.ui.ddmanager.dragStop(this,b),this.handleElement.is(b.target)&&this.element.focus(),a.ui.mouse.prototype._mouseUp.call(this,b)},cancel:function(){return this.helper.is(".ui-draggable-dragging")?this._mouseUp({}):this._clear(),this},_getHandle:function(b){return this.options.handle?!!a(b.target).closest(this.element.find(this.options.handle)).length:!0},_setHandleClassName:function(){this.handleElement=this.options.handle?this.element.find(this.options.handle):this.element,this.handleElement.addClass("ui-draggable-handle")},_removeHandleClassName:function(){this.handleElement.removeClass("ui-draggable-handle")},_createHelper:function(b){var c=this.options,d=a.isFunction(c.helper),e=d?a(c.helper.apply(this.element[0],[b])):"clone"===c.helper?this.element.clone().removeAttr("id"):this.element;return e.parents("body").length||e.appendTo("parent"===c.appendTo?this.element[0].parentNode:c.appendTo),d&&e[0]===this.element[0]&&this._setPositionRelative(),e[0]===this.element[0]||/(fixed|absolute)/.test(e.css("position"))||e.css("position","absolute"),e},_setPositionRelative:function(){/^(?:r|a|f)/.test(this.element.css("position"))||(this.element[0].style.position="relative")},_adjustOffsetFromHelper:function(b){"string"==typeof b&&(b=b.split(" ")),a.isArray(b)&&(b={left:+b[0],top:+b[1]||0}),"left"in b&&(this.offset.click.left=b.left+this.margins.left),"right"in b&&(this.offset.click.left=this.helperProportions.width-b.right+this.margins.left),"top"in b&&(this.offset.click.top=b.top+this.margins.top),"bottom"in b&&(this.offset.click.top=this.helperProportions.height-b.bottom+this.margins.top)},_isRootNode:function(a){return/(html|body)/i.test(a.tagName)||a===this.document[0]},_getParentOffset:function(){var b=this.offsetParent.offset(),c=this.document[0];return"absolute"===this.cssPosition&&this.scrollParent[0]!==c&&a.contains(this.scrollParent[0],this.offsetParent[0])&&(b.left+=this.scrollParent.scrollLeft(),b.top+=this.scrollParent.scrollTop()),this._isRootNode(this.offsetParent[0])&&(b={top:0,left:0}),{top:b.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:b.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"!==this.cssPosition)return{top:0,left:0};var a=this.element.position(),b=this._isRootNode(this.scrollParent[0]);return{top:a.top-(parseInt(this.helper.css("top"),10)||0)+(b?0:this.scrollParent.scrollTop()),left:a.left-(parseInt(this.helper.css("left"),10)||0)+(b?0:this.scrollParent.scrollLeft())}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var b,c,d,e=this.options,f=this.document[0];return this.relativeContainer=null,e.containment?"window"===e.containment?void(this.containment=[a(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,a(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,a(window).scrollLeft()+a(window).width()-this.helperProportions.width-this.margins.left,a(window).scrollTop()+(a(window).height()||f.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]):"document"===e.containment?void(this.containment=[0,0,a(f).width()-this.helperProportions.width-this.margins.left,(a(f).height()||f.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]):e.containment.constructor===Array?void(this.containment=e.containment):("parent"===e.containment&&(e.containment=this.helper[0].parentNode),c=a(e.containment),d=c[0],void(d&&(b=/(scroll|auto)/.test(c.css("overflow")),this.containment=[(parseInt(c.css("borderLeftWidth"),10)||0)+(parseInt(c.css("paddingLeft"),10)||0),(parseInt(c.css("borderTopWidth"),10)||0)+(parseInt(c.css("paddingTop"),10)||0),(b?Math.max(d.scrollWidth,d.offsetWidth):d.offsetWidth)-(parseInt(c.css("borderRightWidth"),10)||0)-(parseInt(c.css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(b?Math.max(d.scrollHeight,d.offsetHeight):d.offsetHeight)-(parseInt(c.css("borderBottomWidth"),10)||0)-(parseInt(c.css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom],this.relativeContainer=c))):void(this.containment=null)},_convertPositionTo:function(a,b){b||(b=this.position);var c="absolute"===a?1:-1,d=this._isRootNode(this.scrollParent[0]);return{top:b.top+this.offset.relative.top*c+this.offset.parent.top*c-("fixed"===this.cssPosition?-this.offset.scroll.top:d?0:this.offset.scroll.top)*c,left:b.left+this.offset.relative.left*c+this.offset.parent.left*c-("fixed"===this.cssPosition?-this.offset.scroll.left:d?0:this.offset.scroll.left)*c}},_generatePosition:function(a,b){var c,d,e,f,g=this.options,h=this._isRootNode(this.scrollParent[0]),i=a.pageX,j=a.pageY;return h&&this.offset.scroll||(this.offset.scroll={top:this.scrollParent.scrollTop(),left:this.scrollParent.scrollLeft()}),b&&(this.containment&&(this.relativeContainer?(d=this.relativeContainer.offset(),c=[this.containment[0]+d.left,this.containment[1]+d.top,this.containment[2]+d.left,this.containment[3]+d.top]):c=this.containment,a.pageX-this.offset.click.left<c[0]&&(i=c[0]+this.offset.click.left),a.pageY-this.offset.click.top<c[1]&&(j=c[1]+this.offset.click.top),a.pageX-this.offset.click.left>c[2]&&(i=c[2]+this.offset.click.left),a.pageY-this.offset.click.top>c[3]&&(j=c[3]+this.offset.click.top)),g.grid&&(e=g.grid[1]?this.originalPageY+Math.round((j-this.originalPageY)/g.grid[1])*g.grid[1]:this.originalPageY,j=c?e-this.offset.click.top>=c[1]||e-this.offset.click.top>c[3]?e:e-this.offset.click.top>=c[1]?e-g.grid[1]:e+g.grid[1]:e,f=g.grid[0]?this.originalPageX+Math.round((i-this.originalPageX)/g.grid[0])*g.grid[0]:this.originalPageX,i=c?f-this.offset.click.left>=c[0]||f-this.offset.click.left>c[2]?f:f-this.offset.click.left>=c[0]?f-g.grid[0]:f+g.grid[0]:f),"y"===g.axis&&(i=this.originalPageX),"x"===g.axis&&(j=this.originalPageY)),{top:j-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.offset.scroll.top:h?0:this.offset.scroll.top),left:i-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.offset.scroll.left:h?0:this.offset.scroll.left)}},_clear:function(){this.helper.removeClass("ui-draggable-dragging"),this.helper[0]===this.element[0]||this.cancelHelperRemoval||this.helper.remove(),this.helper=null,this.cancelHelperRemoval=!1,this.destroyOnClear&&this.destroy()},_normalizeRightBottom:function(){"y"!==this.options.axis&&"auto"!==this.helper.css("right")&&(this.helper.width(this.helper.width()),this.helper.css("right","auto")),"x"!==this.options.axis&&"auto"!==this.helper.css("bottom")&&(this.helper.height(this.helper.height()),this.helper.css("bottom","auto"))},_trigger:function(b,c,d){return d=d||this._uiHash(),a.ui.plugin.call(this,b,[c,d,this],!0),/^(drag|start|stop)/.test(b)&&(this.positionAbs=this._convertPositionTo("absolute"),d.offset=this.positionAbs),a.Widget.prototype._trigger.call(this,b,c,d)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}}),a.ui.plugin.add("draggable","connectToSortable",{start:function(b,c,d){var e=a.extend({},c,{item:d.element});d.sortables=[],a(d.options.connectToSortable).each(function(){var c=a(this).sortable("instance");c&&!c.options.disabled&&(d.sortables.push(c),c.refreshPositions(),c._trigger("activate",b,e))})},stop:function(b,c,d){var e=a.extend({},c,{item:d.element});d.cancelHelperRemoval=!1,a.each(d.sortables,function(){var a=this;a.isOver?(a.isOver=0,d.cancelHelperRemoval=!0,a.cancelHelperRemoval=!1,a._storedCSS={position:a.placeholder.css("position"),top:a.placeholder.css("top"),left:a.placeholder.css("left")},a._mouseStop(b),a.options.helper=a.options._helper):(a.cancelHelperRemoval=!0,a._trigger("deactivate",b,e))})},drag:function(b,c,d){a.each(d.sortables,function(){var e=!1,f=this;f.positionAbs=d.positionAbs,f.helperProportions=d.helperProportions,f.offset.click=d.offset.click,f._intersectsWith(f.containerCache)&&(e=!0,a.each(d.sortables,function(){return this.positionAbs=d.positionAbs,this.helperProportions=d.helperProportions,this.offset.click=d.offset.click,this!==f&&this._intersectsWith(this.containerCache)&&a.contains(f.element[0],this.element[0])&&(e=!1),e})),e?(f.isOver||(f.isOver=1,f.currentItem=c.helper.appendTo(f.element).data("ui-sortable-item",!0),f.options._helper=f.options.helper,f.options.helper=function(){return c.helper[0]},b.target=f.currentItem[0],f._mouseCapture(b,!0),f._mouseStart(b,!0,!0),f.offset.click.top=d.offset.click.top,f.offset.click.left=d.offset.click.left,f.offset.parent.left-=d.offset.parent.left-f.offset.parent.left,f.offset.parent.top-=d.offset.parent.top-f.offset.parent.top,d._trigger("toSortable",b),d.dropped=f.element,a.each(d.sortables,function(){this.refreshPositions()}),d.currentItem=d.element,f.fromOutside=d),f.currentItem&&(f._mouseDrag(b),c.position=f.position)):f.isOver&&(f.isOver=0,f.cancelHelperRemoval=!0,f.options._revert=f.options.revert,f.options.revert=!1,f._trigger("out",b,f._uiHash(f)),f._mouseStop(b,!0),f.options.revert=f.options._revert,f.options.helper=f.options._helper,f.placeholder&&f.placeholder.remove(),d._refreshOffsets(b),c.position=d._generatePosition(b,!0),d._trigger("fromSortable",b),d.dropped=!1,a.each(d.sortables,function(){this.refreshPositions()}))})}}),a.ui.plugin.add("draggable","cursor",{start:function(b,c,d){var e=a("body"),f=d.options;e.css("cursor")&&(f._cursor=e.css("cursor")),e.css("cursor",f.cursor)},stop:function(b,c,d){var e=d.options;e._cursor&&a("body").css("cursor",e._cursor)}}),a.ui.plugin.add("draggable","opacity",{start:function(b,c,d){var e=a(c.helper),f=d.options;e.css("opacity")&&(f._opacity=e.css("opacity")),e.css("opacity",f.opacity)},stop:function(b,c,d){var e=d.options;e._opacity&&a(c.helper).css("opacity",e._opacity)}}),a.ui.plugin.add("draggable","scroll",{start:function(a,b,c){c.scrollParentNotHidden||(c.scrollParentNotHidden=c.helper.scrollParent(!1)),c.scrollParentNotHidden[0]!==c.document[0]&&"HTML"!==c.scrollParentNotHidden[0].tagName&&(c.overflowOffset=c.scrollParentNotHidden.offset())},drag:function(b,c,d){var e=d.options,f=!1,g=d.scrollParentNotHidden[0],h=d.document[0];g!==h&&"HTML"!==g.tagName?(e.axis&&"x"===e.axis||(d.overflowOffset.top+g.offsetHeight-b.pageY<e.scrollSensitivity?g.scrollTop=f=g.scrollTop+e.scrollSpeed:b.pageY-d.overflowOffset.top<e.scrollSensitivity&&(g.scrollTop=f=g.scrollTop-e.scrollSpeed)),e.axis&&"y"===e.axis||(d.overflowOffset.left+g.offsetWidth-b.pageX<e.scrollSensitivity?g.scrollLeft=f=g.scrollLeft+e.scrollSpeed:b.pageX-d.overflowOffset.left<e.scrollSensitivity&&(g.scrollLeft=f=g.scrollLeft-e.scrollSpeed))):(e.axis&&"x"===e.axis||(b.pageY-a(h).scrollTop()<e.scrollSensitivity?f=a(h).scrollTop(a(h).scrollTop()-e.scrollSpeed):a(window).height()-(b.pageY-a(h).scrollTop())<e.scrollSensitivity&&(f=a(h).scrollTop(a(h).scrollTop()+e.scrollSpeed))),e.axis&&"y"===e.axis||(b.pageX-a(h).scrollLeft()<e.scrollSensitivity?f=a(h).scrollLeft(a(h).scrollLeft()-e.scrollSpeed):a(window).width()-(b.pageX-a(h).scrollLeft())<e.scrollSensitivity&&(f=a(h).scrollLeft(a(h).scrollLeft()+e.scrollSpeed)))),f!==!1&&a.ui.ddmanager&&!e.dropBehaviour&&a.ui.ddmanager.prepareOffsets(d,b)}}),a.ui.plugin.add("draggable","snap",{start:function(b,c,d){var e=d.options;d.snapElements=[],a(e.snap.constructor!==String?e.snap.items||":data(ui-draggable)":e.snap).each(function(){var b=a(this),c=b.offset();this!==d.element[0]&&d.snapElements.push({item:this,width:b.outerWidth(),height:b.outerHeight(),top:c.top,left:c.left})})},drag:function(b,c,d){var e,f,g,h,i,j,k,l,m,n,o=d.options,p=o.snapTolerance,q=c.offset.left,r=q+d.helperProportions.width,s=c.offset.top,t=s+d.helperProportions.height;for(m=d.snapElements.length-1;m>=0;m--)i=d.snapElements[m].left-d.margins.left,j=i+d.snapElements[m].width,k=d.snapElements[m].top-d.margins.top,l=k+d.snapElements[m].height,i-p>r||q>j+p||k-p>t||s>l+p||!a.contains(d.snapElements[m].item.ownerDocument,d.snapElements[m].item)?(d.snapElements[m].snapping&&d.options.snap.release&&d.options.snap.release.call(d.element,b,a.extend(d._uiHash(),{snapItem:d.snapElements[m].item})),d.snapElements[m].snapping=!1):("inner"!==o.snapMode&&(e=Math.abs(k-t)<=p,f=Math.abs(l-s)<=p,g=Math.abs(i-r)<=p,h=Math.abs(j-q)<=p,e&&(c.position.top=d._convertPositionTo("relative",{top:k-d.helperProportions.height,left:0}).top),f&&(c.position.top=d._convertPositionTo("relative",{top:l,left:0}).top),g&&(c.position.left=d._convertPositionTo("relative",{top:0,left:i-d.helperProportions.width}).left),h&&(c.position.left=d._convertPositionTo("relative",{top:0,left:j}).left)),n=e||f||g||h,"outer"!==o.snapMode&&(e=Math.abs(k-s)<=p,f=Math.abs(l-t)<=p,g=Math.abs(i-q)<=p,h=Math.abs(j-r)<=p,e&&(c.position.top=d._convertPositionTo("relative",{top:k,left:0}).top),f&&(c.position.top=d._convertPositionTo("relative",{top:l-d.helperProportions.height,left:0}).top),g&&(c.position.left=d._convertPositionTo("relative",{top:0,left:i}).left),h&&(c.position.left=d._convertPositionTo("relative",{top:0,left:j-d.helperProportions.width}).left)),!d.snapElements[m].snapping&&(e||f||g||h||n)&&d.options.snap.snap&&d.options.snap.snap.call(d.element,b,a.extend(d._uiHash(),{snapItem:d.snapElements[m].item})),d.snapElements[m].snapping=e||f||g||h||n)}}),a.ui.plugin.add("draggable","stack",{start:function(b,c,d){var e,f=d.options,g=a.makeArray(a(f.stack)).sort(function(b,c){return(parseInt(a(b).css("zIndex"),10)||0)-(parseInt(a(c).css("zIndex"),10)||0)});g.length&&(e=parseInt(a(g[0]).css("zIndex"),10)||0,a(g).each(function(b){a(this).css("zIndex",e+b)}),this.css("zIndex",e+g.length))}}),a.ui.plugin.add("draggable","zIndex",{start:function(b,c,d){var e=a(c.helper),f=d.options;e.css("zIndex")&&(f._zIndex=e.css("zIndex")),e.css("zIndex",f.zIndex)},stop:function(b,c,d){var e=d.options;e._zIndex&&a(c.helper).css("zIndex",e._zIndex)}});a.ui.draggable;/*!
- * jQuery UI Droppable 1.11.2
- * http://jqueryui.com
- *
- * Copyright 2014 jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/droppable/
- */
-a.widget("ui.droppable",{version:"1.11.2",widgetEventPrefix:"drop",options:{accept:"*",activeClass:!1,addClasses:!0,greedy:!1,hoverClass:!1,scope:"default",tolerance:"intersect",activate:null,deactivate:null,drop:null,out:null,over:null},_create:function(){var b,c=this.options,d=c.accept;this.isover=!1,this.isout=!0,this.accept=a.isFunction(d)?d:function(a){return a.is(d)},this.proportions=function(){return arguments.length?void(b=arguments[0]):b?b:b={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight}},this._addToManager(c.scope),c.addClasses&&this.element.addClass("ui-droppable")},_addToManager:function(b){a.ui.ddmanager.droppables[b]=a.ui.ddmanager.droppables[b]||[],a.ui.ddmanager.droppables[b].push(this)},_splice:function(a){for(var b=0;b<a.length;b++)a[b]===this&&a.splice(b,1)},_destroy:function(){var b=a.ui.ddmanager.droppables[this.options.scope];this._splice(b),this.element.removeClass("ui-droppable ui-droppable-disabled")},_setOption:function(b,c){if("accept"===b)this.accept=a.isFunction(c)?c:function(a){return a.is(c)};else if("scope"===b){var d=a.ui.ddmanager.droppables[this.options.scope];this._splice(d),this._addToManager(c)}this._super(b,c)},_activate:function(b){var c=a.ui.ddmanager.current;this.options.activeClass&&this.element.addClass(this.options.activeClass),c&&this._trigger("activate",b,this.ui(c))},_deactivate:function(b){var c=a.ui.ddmanager.current;this.options.activeClass&&this.element.removeClass(this.options.activeClass),c&&this._trigger("deactivate",b,this.ui(c))},_over:function(b){var c=a.ui.ddmanager.current;c&&(c.currentItem||c.element)[0]!==this.element[0]&&this.accept.call(this.element[0],c.currentItem||c.element)&&(this.options.hoverClass&&this.element.addClass(this.options.hoverClass),this._trigger("over",b,this.ui(c)))},_out:function(b){var c=a.ui.ddmanager.current;c&&(c.currentItem||c.element)[0]!==this.element[0]&&this.accept.call(this.element[0],c.currentItem||c.element)&&(this.options.hoverClass&&this.element.removeClass(this.options.hoverClass),this._trigger("out",b,this.ui(c)))},_drop:function(b,c){var d=c||a.ui.ddmanager.current,e=!1;return d&&(d.currentItem||d.element)[0]!==this.element[0]?(this.element.find(":data(ui-droppable)").not(".ui-draggable-dragging").each(function(){var c=a(this).droppable("instance");return c.options.greedy&&!c.options.disabled&&c.options.scope===d.options.scope&&c.accept.call(c.element[0],d.currentItem||d.element)&&a.ui.intersect(d,a.extend(c,{offset:c.element.offset()}),c.options.tolerance,b)?(e=!0,!1):void 0}),e?!1:this.accept.call(this.element[0],d.currentItem||d.element)?(this.options.activeClass&&this.element.removeClass(this.options.activeClass),this.options.hoverClass&&this.element.removeClass(this.options.hoverClass),this._trigger("drop",b,this.ui(d)),this.element):!1):!1},ui:function(a){return{draggable:a.currentItem||a.element,helper:a.helper,position:a.position,offset:a.positionAbs}}}),a.ui.intersect=function(){function a(a,b,c){return a>=b&&b+c>a}return function(b,c,d,e){if(!c.offset)return!1;var f=(b.positionAbs||b.position.absolute).left+b.margins.left,g=(b.positionAbs||b.position.absolute).top+b.margins.top,h=f+b.helperProportions.width,i=g+b.helperProportions.height,j=c.offset.left,k=c.offset.top,l=j+c.proportions().width,m=k+c.proportions().height;switch(d){case"fit":return f>=j&&l>=h&&g>=k&&m>=i;case"intersect":return j<f+b.helperProportions.width/2&&h-b.helperProportions.width/2<l&&k<g+b.helperProportions.height/2&&i-b.helperProportions.height/2<m;case"pointer":return a(e.pageY,k,c.proportions().height)&&a(e.pageX,j,c.proportions().width);case"touch":return(g>=k&&m>=g||i>=k&&m>=i||k>g&&i>m)&&(f>=j&&l>=f||h>=j&&l>=h||j>f&&h>l);default:return!1}}}(),a.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(b,c){var d,e,f=a.ui.ddmanager.droppables[b.options.scope]||[],g=c?c.type:null,h=(b.currentItem||b.element).find(":data(ui-droppable)").addBack();a:for(d=0;d<f.length;d++)if(!(f[d].options.disabled||b&&!f[d].accept.call(f[d].element[0],b.currentItem||b.element))){for(e=0;e<h.length;e++)if(h[e]===f[d].element[0]){f[d].proportions().height=0;continue a}f[d].visible="none"!==f[d].element.css("display"),f[d].visible&&("mousedown"===g&&f[d]._activate.call(f[d],c),f[d].offset=f[d].element.offset(),f[d].proportions({width:f[d].element[0].offsetWidth,height:f[d].element[0].offsetHeight}))}},drop:function(b,c){var d=!1;return a.each((a.ui.ddmanager.droppables[b.options.scope]||[]).slice(),function(){this.options&&(!this.options.disabled&&this.visible&&a.ui.intersect(b,this,this.options.tolerance,c)&&(d=this._drop.call(this,c)||d),!this.options.disabled&&this.visible&&this.accept.call(this.element[0],b.currentItem||b.element)&&(this.isout=!0,this.isover=!1,this._deactivate.call(this,c)))}),d},dragStart:function(b,c){b.element.parentsUntil("body").bind("scroll.droppable",function(){b.options.refreshPositions||a.ui.ddmanager.prepareOffsets(b,c)})},drag:function(b,c){b.options.refreshPositions&&a.ui.ddmanager.prepareOffsets(b,c),a.each(a.ui.ddmanager.droppables[b.options.scope]||[],function(){if(!this.options.disabled&&!this.greedyChild&&this.visible){var d,e,f,g=a.ui.intersect(b,this,this.options.tolerance,c),h=!g&&this.isover?"isout":g&&!this.isover?"isover":null;h&&(this.options.greedy&&(e=this.options.scope,f=this.element.parents(":data(ui-droppable)").filter(function(){return a(this).droppable("instance").options.scope===e}),f.length&&(d=a(f[0]).droppable("instance"),d.greedyChild="isover"===h)),d&&"isover"===h&&(d.isover=!1,d.isout=!0,d._out.call(d,c)),this[h]=!0,this["isout"===h?"isover":"isout"]=!1,this["isover"===h?"_over":"_out"].call(this,c),d&&"isout"===h&&(d.isout=!1,d.isover=!0,d._over.call(d,c)))}})},dragStop:function(b,c){b.element.parentsUntil("body").unbind("scroll.droppable"),b.options.refreshPositions||a.ui.ddmanager.prepareOffsets(b,c)}};a.ui.droppable;/*!
- * jQuery UI Resizable 1.11.2
- * http://jqueryui.com
- *
- * Copyright 2014 jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/resizable/
- */
-a.widget("ui.resizable",a.ui.mouse,{version:"1.11.2",widgetEventPrefix:"resize",options:{alsoResize:!1,animate:!1,animateDuration:"slow",animateEasing:"swing",aspectRatio:!1,autoHide:!1,containment:!1,ghost:!1,grid:!1,handles:"e,s,se",helper:!1,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:90,resize:null,start:null,stop:null},_num:function(a){return parseInt(a,10)||0},_isNumber:function(a){return!isNaN(parseInt(a,10))},_hasScroll:function(b,c){if("hidden"===a(b).css("overflow"))return!1;var d=c&&"left"===c?"scrollLeft":"scrollTop",e=!1;return b[d]>0?!0:(b[d]=1,e=b[d]>0,b[d]=0,e)},_create:function(){var b,c,d,e,f,g=this,h=this.options;if(this.element.addClass("ui-resizable"),a.extend(this,{_aspectRatio:!!h.aspectRatio,aspectRatio:h.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:h.helper||h.ghost||h.animate?h.helper||"ui-resizable-helper":null}),this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)&&(this.element.wrap(a("<div class='ui-wrapper' style='overflow: hidden;'></div>").css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")})),this.element=this.element.parent().data("ui-resizable",this.element.resizable("instance")),this.elementIsWrapper=!0,this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")}),this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0}),this.originalResizeStyle=this.originalElement.css("resize"),this.originalElement.css("resize","none"),this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"})),this.originalElement.css({margin:this.originalElement.css("margin")}),this._proportionallyResize()),this.handles=h.handles||(a(".ui-resizable-handle",this.element).length?{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}:"e,s,se"),this.handles.constructor===String)for("all"===this.handles&&(this.handles="n,e,s,w,se,sw,ne,nw"),b=this.handles.split(","),this.handles={},c=0;c<b.length;c++)d=a.trim(b[c]),f="ui-resizable-"+d,e=a("<div class='ui-resizable-handle "+f+"'></div>"),e.css({zIndex:h.zIndex}),"se"===d&&e.addClass("ui-icon ui-icon-gripsmall-diagonal-se"),this.handles[d]=".ui-resizable-"+d,this.element.append(e);this._renderAxis=function(b){var c,d,e,f;b=b||this.element;for(c in this.handles)this.handles[c].constructor===String&&(this.handles[c]=this.element.children(this.handles[c]).first().show()),this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)&&(d=a(this.handles[c],this.element),f=/sw|ne|nw|se|n|s/.test(c)?d.outerHeight():d.outerWidth(),e=["padding",/ne|nw|n/.test(c)?"Top":/se|sw|s/.test(c)?"Bottom":/^e$/.test(c)?"Right":"Left"].join(""),b.css(e,f),this._proportionallyResize()),a(this.handles[c]).length},this._renderAxis(this.element),this._handles=a(".ui-resizable-handle",this.element).disableSelection(),this._handles.mouseover(function(){g.resizing||(this.className&&(e=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)),g.axis=e&&e[1]?e[1]:"se")}),h.autoHide&&(this._handles.hide(),a(this.element).addClass("ui-resizable-autohide").mouseenter(function(){h.disabled||(a(this).removeClass("ui-resizable-autohide"),g._handles.show())}).mouseleave(function(){h.disabled||g.resizing||(a(this).addClass("ui-resizable-autohide"),g._handles.hide())})),this._mouseInit()},_destroy:function(){this._mouseDestroy();var b,c=function(b){a(b).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").removeData("ui-resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};return this.elementIsWrapper&&(c(this.element),b=this.element,this.originalElement.css({position:b.css("position"),width:b.outerWidth(),height:b.outerHeight(),top:b.css("top"),left:b.css("left")}).insertAfter(b),b.remove()),this.originalElement.css("resize",this.originalResizeStyle),c(this.originalElement),this},_mouseCapture:function(b){var c,d,e=!1;for(c in this.handles)d=a(this.handles[c])[0],(d===b.target||a.contains(d,b.target))&&(e=!0);return!this.options.disabled&&e},_mouseStart:function(b){var c,d,e,f=this.options,g=this.element;return this.resizing=!0,this._renderProxy(),c=this._num(this.helper.css("left")),d=this._num(this.helper.css("top")),f.containment&&(c+=a(f.containment).scrollLeft()||0,d+=a(f.containment).scrollTop()||0),this.offset=this.helper.offset(),this.position={left:c,top:d},this.size=this._helper?{width:this.helper.width(),height:this.helper.height()}:{width:g.width(),height:g.height()},this.originalSize=this._helper?{width:g.outerWidth(),height:g.outerHeight()}:{width:g.width(),height:g.height()},this.sizeDiff={width:g.outerWidth()-g.width(),height:g.outerHeight()-g.height()},this.originalPosition={left:c,top:d},this.originalMousePosition={left:b.pageX,top:b.pageY},this.aspectRatio="number"==typeof f.aspectRatio?f.aspectRatio:this.originalSize.width/this.originalSize.height||1,e=a(".ui-resizable-"+this.axis).css("cursor"),a("body").css("cursor","auto"===e?this.axis+"-resize":e),g.addClass("ui-resizable-resizing"),this._propagate("start",b),!0},_mouseDrag:function(b){var c,d,e=this.originalMousePosition,f=this.axis,g=b.pageX-e.left||0,h=b.pageY-e.top||0,i=this._change[f];return this._updatePrevProperties(),i?(c=i.apply(this,[b,g,h]),this._updateVirtualBoundaries(b.shiftKey),(this._aspectRatio||b.shiftKey)&&(c=this._updateRatio(c,b)),c=this._respectSize(c,b),this._updateCache(c),this._propagate("resize",b),d=this._applyChanges(),!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize(),a.isEmptyObject(d)||(this._updatePrevProperties(),this._trigger("resize",b,this.ui()),this._applyChanges()),!1):!1},_mouseStop:function(b){this.resizing=!1;var c,d,e,f,g,h,i,j=this.options,k=this;return this._helper&&(c=this._proportionallyResizeElements,d=c.length&&/textarea/i.test(c[0].nodeName),e=d&&this._hasScroll(c[0],"left")?0:k.sizeDiff.height,f=d?0:k.sizeDiff.width,g={width:k.helper.width()-f,height:k.helper.height()-e},h=parseInt(k.element.css("left"),10)+(k.position.left-k.originalPosition.left)||null,i=parseInt(k.element.css("top"),10)+(k.position.top-k.originalPosition.top)||null,j.animate||this.element.css(a.extend(g,{top:i,left:h})),k.helper.height(k.size.height),k.helper.width(k.size.width),this._helper&&!j.animate&&this._proportionallyResize()),a("body").css("cursor","auto"),this.element.removeClass("ui-resizable-resizing"),this._propagate("stop",b),this._helper&&this.helper.remove(),!1},_updatePrevProperties:function(){this.prevPosition={top:this.position.top,left:this.position.left},this.prevSize={width:this.size.width,height:this.size.height}},_applyChanges:function(){var a={};return this.position.top!==this.prevPosition.top&&(a.top=this.position.top+"px"),this.position.left!==this.prevPosition.left&&(a.left=this.position.left+"px"),this.size.width!==this.prevSize.width&&(a.width=this.size.width+"px"),this.size.height!==this.prevSize.height&&(a.height=this.size.height+"px"),this.helper.css(a),a},_updateVirtualBoundaries:function(a){var b,c,d,e,f,g=this.options;f={minWidth:this._isNumber(g.minWidth)?g.minWidth:0,maxWidth:this._isNumber(g.maxWidth)?g.maxWidth:1/0,minHeight:this._isNumber(g.minHeight)?g.minHeight:0,maxHeight:this._isNumber(g.maxHeight)?g.maxHeight:1/0},(this._aspectRatio||a)&&(b=f.minHeight*this.aspectRatio,d=f.minWidth/this.aspectRatio,c=f.maxHeight*this.aspectRatio,e=f.maxWidth/this.aspectRatio,b>f.minWidth&&(f.minWidth=b),d>f.minHeight&&(f.minHeight=d),c<f.maxWidth&&(f.maxWidth=c),e<f.maxHeight&&(f.maxHeight=e)),this._vBoundaries=f},_updateCache:function(a){this.offset=this.helper.offset(),this._isNumber(a.left)&&(this.position.left=a.left),this._isNumber(a.top)&&(this.position.top=a.top),this._isNumber(a.height)&&(this.size.height=a.height),this._isNumber(a.width)&&(this.size.width=a.width)},_updateRatio:function(a){var b=this.position,c=this.size,d=this.axis;return this._isNumber(a.height)?a.width=a.height*this.aspectRatio:this._isNumber(a.width)&&(a.height=a.width/this.aspectRatio),"sw"===d&&(a.left=b.left+(c.width-a.width),a.top=null),"nw"===d&&(a.top=b.top+(c.height-a.height),a.left=b.left+(c.width-a.width)),a},_respectSize:function(a){var b=this._vBoundaries,c=this.axis,d=this._isNumber(a.width)&&b.maxWidth&&b.maxWidth<a.width,e=this._isNumber(a.height)&&b.maxHeight&&b.maxHeight<a.height,f=this._isNumber(a.width)&&b.minWidth&&b.minWidth>a.width,g=this._isNumber(a.height)&&b.minHeight&&b.minHeight>a.height,h=this.originalPosition.left+this.originalSize.width,i=this.position.top+this.size.height,j=/sw|nw|w/.test(c),k=/nw|ne|n/.test(c);return f&&(a.width=b.minWidth),g&&(a.height=b.minHeight),d&&(a.width=b.maxWidth),e&&(a.height=b.maxHeight),f&&j&&(a.left=h-b.minWidth),d&&j&&(a.left=h-b.maxWidth),g&&k&&(a.top=i-b.minHeight),e&&k&&(a.top=i-b.maxHeight),a.width||a.height||a.left||!a.top?a.width||a.height||a.top||!a.left||(a.left=null):a.top=null,a},_getPaddingPlusBorderDimensions:function(a){for(var b=0,c=[],d=[a.css("borderTopWidth"),a.css("borderRightWidth"),a.css("borderBottomWidth"),a.css("borderLeftWidth")],e=[a.css("paddingTop"),a.css("paddingRight"),a.css("paddingBottom"),a.css("paddingLeft")];4>b;b++)c[b]=parseInt(d[b],10)||0,c[b]+=parseInt(e[b],10)||0;return{height:c[0]+c[2],width:c[1]+c[3]}},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var a,b=0,c=this.helper||this.element;b<this._proportionallyResizeElements.length;b++)a=this._proportionallyResizeElements[b],this.outerDimensions||(this.outerDimensions=this._getPaddingPlusBorderDimensions(a)),a.css({height:c.height()-this.outerDimensions.height||0,width:c.width()-this.outerDimensions.width||0})},_renderProxy:function(){var b=this.element,c=this.options;this.elementOffset=b.offset(),this._helper?(this.helper=this.helper||a("<div style='overflow:hidden;'></div>"),this.helper.addClass(this._helper).css({width:this.element.outerWidth()-1,height:this.element.outerHeight()-1,position:"absolute",left:this.elementOffset.left+"px",top:this.elementOffset.top+"px",zIndex:++c.zIndex}),this.helper.appendTo("body").disableSelection()):this.helper=this.element},_change:{e:function(a,b){return{width:this.originalSize.width+b}},w:function(a,b){var c=this.originalSize,d=this.originalPosition;return{left:d.left+b,width:c.width-b}},n:function(a,b,c){var d=this.originalSize,e=this.originalPosition;return{top:e.top+c,height:d.height-c}},s:function(a,b,c){return{height:this.originalSize.height+c}},se:function(b,c,d){return a.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[b,c,d]))},sw:function(b,c,d){return a.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[b,c,d]))},ne:function(b,c,d){return a.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[b,c,d]))},nw:function(b,c,d){return a.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[b,c,d]))}},_propagate:function(b,c){a.ui.plugin.call(this,b,[c,this.ui()]),"resize"!==b&&this._trigger(b,c,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}),a.ui.plugin.add("resizable","animate",{stop:function(b){var c=a(this).resizable("instance"),d=c.options,e=c._proportionallyResizeElements,f=e.length&&/textarea/i.test(e[0].nodeName),g=f&&c._hasScroll(e[0],"left")?0:c.sizeDiff.height,h=f?0:c.sizeDiff.width,i={width:c.size.width-h,height:c.size.height-g},j=parseInt(c.element.css("left"),10)+(c.position.left-c.originalPosition.left)||null,k=parseInt(c.element.css("top"),10)+(c.position.top-c.originalPosition.top)||null;c.element.animate(a.extend(i,k&&j?{top:k,left:j}:{}),{duration:d.animateDuration,easing:d.animateEasing,step:function(){var d={width:parseInt(c.element.css("width"),10),height:parseInt(c.element.css("height"),10),top:parseInt(c.element.css("top"),10),left:parseInt(c.element.css("left"),10)};e&&e.length&&a(e[0]).css({width:d.width,height:d.height}),c._updateCache(d),c._propagate("resize",b)}})}}),a.ui.plugin.add("resizable","containment",{start:function(){var b,c,d,e,f,g,h,i=a(this).resizable("instance"),j=i.options,k=i.element,l=j.containment,m=l instanceof a?l.get(0):/parent/.test(l)?k.parent().get(0):l;m&&(i.containerElement=a(m),/document/.test(l)||l===document?(i.containerOffset={left:0,top:0},i.containerPosition={left:0,top:0},i.parentData={element:a(document),left:0,top:0,width:a(document).width(),height:a(document).height()||document.body.parentNode.scrollHeight}):(b=a(m),c=[],a(["Top","Right","Left","Bottom"]).each(function(a,d){c[a]=i._num(b.css("padding"+d))}),i.containerOffset=b.offset(),i.containerPosition=b.position(),i.containerSize={height:b.innerHeight()-c[3],width:b.innerWidth()-c[1]},d=i.containerOffset,e=i.containerSize.height,f=i.containerSize.width,g=i._hasScroll(m,"left")?m.scrollWidth:f,h=i._hasScroll(m)?m.scrollHeight:e,i.parentData={element:m,left:d.left,top:d.top,width:g,height:h}))},resize:function(b){var c,d,e,f,g=a(this).resizable("instance"),h=g.options,i=g.containerOffset,j=g.position,k=g._aspectRatio||b.shiftKey,l={top:0,left:0},m=g.containerElement,n=!0;m[0]!==document&&/static/.test(m.css("position"))&&(l=i),j.left<(g._helper?i.left:0)&&(g.size.width=g.size.width+(g._helper?g.position.left-i.left:g.position.left-l.left),k&&(g.size.height=g.size.width/g.aspectRatio,n=!1),g.position.left=h.helper?i.left:0),j.top<(g._helper?i.top:0)&&(g.size.height=g.size.height+(g._helper?g.position.top-i.top:g.position.top),k&&(g.size.width=g.size.height*g.aspectRatio,n=!1),g.position.top=g._helper?i.top:0),e=g.containerElement.get(0)===g.element.parent().get(0),f=/relative|absolute/.test(g.containerElement.css("position")),e&&f?(g.offset.left=g.parentData.left+g.position.left,g.offset.top=g.parentData.top+g.position.top):(g.offset.left=g.element.offset().left,g.offset.top=g.element.offset().top),c=Math.abs(g.sizeDiff.width+(g._helper?g.offset.left-l.left:g.offset.left-i.left)),d=Math.abs(g.sizeDiff.height+(g._helper?g.offset.top-l.top:g.offset.top-i.top)),c+g.size.width>=g.parentData.width&&(g.size.width=g.parentData.width-c,k&&(g.size.height=g.size.width/g.aspectRatio,n=!1)),d+g.size.height>=g.parentData.height&&(g.size.height=g.parentData.height-d,k&&(g.size.width=g.size.height*g.aspectRatio,n=!1)),n||(g.position.left=g.prevPosition.left,g.position.top=g.prevPosition.top,g.size.width=g.prevSize.width,g.size.height=g.prevSize.height)},stop:function(){var b=a(this).resizable("instance"),c=b.options,d=b.containerOffset,e=b.containerPosition,f=b.containerElement,g=a(b.helper),h=g.offset(),i=g.outerWidth()-b.sizeDiff.width,j=g.outerHeight()-b.sizeDiff.height;b._helper&&!c.animate&&/relative/.test(f.css("position"))&&a(this).css({left:h.left-e.left-d.left,width:i,height:j}),b._helper&&!c.animate&&/static/.test(f.css("position"))&&a(this).css({left:h.left-e.left-d.left,width:i,height:j})}}),a.ui.plugin.add("resizable","alsoResize",{start:function(){var b=a(this).resizable("instance"),c=b.options,d=function(b){a(b).each(function(){var b=a(this);b.data("ui-resizable-alsoresize",{width:parseInt(b.width(),10),height:parseInt(b.height(),10),left:parseInt(b.css("left"),10),top:parseInt(b.css("top"),10)})})};"object"!=typeof c.alsoResize||c.alsoResize.parentNode?d(c.alsoResize):c.alsoResize.length?(c.alsoResize=c.alsoResize[0],d(c.alsoResize)):a.each(c.alsoResize,function(a){d(a)})},resize:function(b,c){var d=a(this).resizable("instance"),e=d.options,f=d.originalSize,g=d.originalPosition,h={height:d.size.height-f.height||0,width:d.size.width-f.width||0,top:d.position.top-g.top||0,left:d.position.left-g.left||0},i=function(b,d){a(b).each(function(){var b=a(this),e=a(this).data("ui-resizable-alsoresize"),f={},g=d&&d.length?d:b.parents(c.originalElement[0]).length?["width","height"]:["width","height","top","left"];a.each(g,function(a,b){var c=(e[b]||0)+(h[b]||0);c&&c>=0&&(f[b]=c||null)}),b.css(f)})};"object"!=typeof e.alsoResize||e.alsoResize.nodeType?i(e.alsoResize):a.each(e.alsoResize,function(a,b){i(a,b)})},stop:function(){a(this).removeData("resizable-alsoresize")}}),a.ui.plugin.add("resizable","ghost",{start:function(){var b=a(this).resizable("instance"),c=b.options,d=b.size;b.ghost=b.originalElement.clone(),b.ghost.css({opacity:.25,display:"block",position:"relative",height:d.height,width:d.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass("string"==typeof c.ghost?c.ghost:""),b.ghost.appendTo(b.helper)},resize:function(){var b=a(this).resizable("instance");b.ghost&&b.ghost.css({position:"relative",height:b.size.height,width:b.size.width})},stop:function(){var b=a(this).resizable("instance");b.ghost&&b.helper&&b.helper.get(0).removeChild(b.ghost.get(0))}}),a.ui.plugin.add("resizable","grid",{resize:function(){var b,c=a(this).resizable("instance"),d=c.options,e=c.size,f=c.originalSize,g=c.originalPosition,h=c.axis,i="number"==typeof d.grid?[d.grid,d.grid]:d.grid,j=i[0]||1,k=i[1]||1,l=Math.round((e.width-f.width)/j)*j,m=Math.round((e.height-f.height)/k)*k,n=f.width+l,o=f.height+m,p=d.maxWidth&&d.maxWidth<n,q=d.maxHeight&&d.maxHeight<o,r=d.minWidth&&d.minWidth>n,s=d.minHeight&&d.minHeight>o;d.grid=i,r&&(n+=j),s&&(o+=k),p&&(n-=j),q&&(o-=k),/^(se|s|e)$/.test(h)?(c.size.width=n,c.size.height=o):/^(ne)$/.test(h)?(c.size.width=n,c.size.height=o,c.position.top=g.top-m):/^(sw)$/.test(h)?(c.size.width=n,c.size.height=o,c.position.left=g.left-l):((0>=o-k||0>=n-j)&&(b=c._getPaddingPlusBorderDimensions(this)),o-k>0?(c.size.height=o,c.position.top=g.top-m):(o=k-b.height,c.size.height=o,c.position.top=g.top+f.height-o),n-j>0?(c.size.width=n,c.position.left=g.left-l):(n=k-b.height,c.size.width=n,c.position.left=g.left+f.width-n))}});a.ui.resizable,a.widget("ui.selectable",a.ui.mouse,{version:"1.11.2",options:{appendTo:"body",autoRefresh:!0,distance:0,filter:"*",tolerance:"touch",selected:null,selecting:null,start:null,stop:null,unselected:null,unselecting:null},_create:function(){var b,c=this;this.element.addClass("ui-selectable"),this.dragged=!1,this.refresh=function(){b=a(c.options.filter,c.element[0]),b.addClass("ui-selectee"),b.each(function(){var b=a(this),c=b.offset();a.data(this,"selectable-item",{element:this,$element:b,left:c.left,top:c.top,right:c.left+b.outerWidth(),bottom:c.top+b.outerHeight(),startselected:!1,selected:b.hasClass("ui-selected"),selecting:b.hasClass("ui-selecting"),unselecting:b.hasClass("ui-unselecting")})})},this.refresh(),this.selectees=b.addClass("ui-selectee"),this._mouseInit(),this.helper=a("<div class='ui-selectable-helper'></div>")},_destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item"),this.element.removeClass("ui-selectable ui-selectable-disabled"),this._mouseDestroy()},_mouseStart:function(b){var c=this,d=this.options;this.opos=[b.pageX,b.pageY],this.options.disabled||(this.selectees=a(d.filter,this.element[0]),this._trigger("start",b),a(d.appendTo).append(this.helper),this.helper.css({left:b.pageX,top:b.pageY,width:0,height:0}),d.autoRefresh&&this.refresh(),this.selectees.filter(".ui-selected").each(function(){var d=a.data(this,"selectable-item");d.startselected=!0,b.metaKey||b.ctrlKey||(d.$element.removeClass("ui-selected"),d.selected=!1,d.$element.addClass("ui-unselecting"),d.unselecting=!0,c._trigger("unselecting",b,{unselecting:d.element}))}),a(b.target).parents().addBack().each(function(){var d,e=a.data(this,"selectable-item");return e?(d=!b.metaKey&&!b.ctrlKey||!e.$element.hasClass("ui-selected"),e.$element.removeClass(d?"ui-unselecting":"ui-selected").addClass(d?"ui-selecting":"ui-unselecting"),e.unselecting=!d,e.selecting=d,e.selected=d,d?c._trigger("selecting",b,{selecting:e.element}):c._trigger("unselecting",b,{unselecting:e.element}),!1):void 0}))},_mouseDrag:function(b){if(this.dragged=!0,!this.options.disabled){var c,d=this,e=this.options,f=this.opos[0],g=this.opos[1],h=b.pageX,i=b.pageY;return f>h&&(c=h,h=f,f=c),g>i&&(c=i,i=g,g=c),this.helper.css({left:f,top:g,width:h-f,height:i-g}),this.selectees.each(function(){var c=a.data(this,"selectable-item"),j=!1;c&&c.element!==d.element[0]&&("touch"===e.tolerance?j=!(c.left>h||c.right<f||c.top>i||c.bottom<g):"fit"===e.tolerance&&(j=c.left>f&&c.right<h&&c.top>g&&c.bottom<i),j?(c.selected&&(c.$element.removeClass("ui-selected"),c.selected=!1),c.unselecting&&(c.$element.removeClass("ui-unselecting"),c.unselecting=!1),c.selecting||(c.$element.addClass("ui-selecting"),c.selecting=!0,d._trigger("selecting",b,{selecting:c.element}))):(c.selecting&&((b.metaKey||b.ctrlKey)&&c.startselected?(c.$element.removeClass("ui-selecting"),c.selecting=!1,c.$element.addClass("ui-selected"),c.selected=!0):(c.$element.removeClass("ui-selecting"),c.selecting=!1,c.startselected&&(c.$element.addClass("ui-unselecting"),c.unselecting=!0),d._trigger("unselecting",b,{unselecting:c.element}))),c.selected&&(b.metaKey||b.ctrlKey||c.startselected||(c.$element.removeClass("ui-selected"),c.selected=!1,c.$element.addClass("ui-unselecting"),c.unselecting=!0,d._trigger("unselecting",b,{unselecting:c.element})))))}),!1}},_mouseStop:function(b){var c=this;return this.dragged=!1,a(".ui-unselecting",this.element[0]).each(function(){var d=a.data(this,"selectable-item");d.$element.removeClass("ui-unselecting"),d.unselecting=!1,d.startselected=!1,c._trigger("unselected",b,{unselected:d.element})}),a(".ui-selecting",this.element[0]).each(function(){var d=a.data(this,"selectable-item");d.$element.removeClass("ui-selecting").addClass("ui-selected"),d.selecting=!1,d.selected=!0,d.startselected=!0,c._trigger("selected",b,{selected:d.element})}),this._trigger("stop",b),this.helper.remove(),!1}}),a.widget("ui.sortable",a.ui.mouse,{version:"1.11.2",widgetEventPrefix:"sort",ready:!1,options:{appendTo:"parent",axis:!1,connectWith:!1,containment:!1,cursor:"auto",cursorAt:!1,dropOnEmpty:!0,forcePlaceholderSize:!1,forceHelperSize:!1,grid:!1,handle:!1,helper:"original",items:"> *",opacity:!1,placeholder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1e3,activate:null,beforeStop:null,change:null,deactivate:null,out:null,over:null,receive:null,remove:null,sort:null,start:null,stop:null,update:null},_isOverAxis:function(a,b,c){return a>=b&&b+c>a},_isFloating:function(a){return/left|right/.test(a.css("float"))||/inline|table-cell/.test(a.css("display"))},_create:function(){var a=this.options;this.containerCache={},this.element.addClass("ui-sortable"),this.refresh(),this.floating=this.items.length?"x"===a.axis||this._isFloating(this.items[0].item):!1,this.offset=this.element.offset(),this._mouseInit(),this._setHandleClassName(),this.ready=!0},_setOption:function(a,b){this._super(a,b),"handle"===a&&this._setHandleClassName()},_setHandleClassName:function(){this.element.find(".ui-sortable-handle").removeClass("ui-sortable-handle"),a.each(this.items,function(){(this.instance.options.handle?this.item.find(this.instance.options.handle):this.item).addClass("ui-sortable-handle")})},_destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled").find(".ui-sortable-handle").removeClass("ui-sortable-handle"),this._mouseDestroy();for(var a=this.items.length-1;a>=0;a--)this.items[a].item.removeData(this.widgetName+"-item");return this},_mouseCapture:function(b,c){var d=null,e=!1,f=this;return this.reverting?!1:this.options.disabled||"static"===this.options.type?!1:(this._refreshItems(b),a(b.target).parents().each(function(){return a.data(this,f.widgetName+"-item")===f?(d=a(this),!1):void 0}),a.data(b.target,f.widgetName+"-item")===f&&(d=a(b.target)),d&&(!this.options.handle||c||(a(this.options.handle,d).find("*").addBack().each(function(){this===b.target&&(e=!0)}),e))?(this.currentItem=d,this._removeCurrentsFromItems(),!0):!1)},_mouseStart:function(b,c,d){var e,f,g=this.options;if(this.currentContainer=this,this.refreshPositions(),this.helper=this._createHelper(b),this._cacheHelperProportions(),this._cacheMargins(),this.scrollParent=this.helper.scrollParent(),this.offset=this.currentItem.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},a.extend(this.offset,{click:{left:b.pageX-this.offset.left,top:b.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.helper.css("position","absolute"),this.cssPosition=this.helper.css("position"),this.originalPosition=this._generatePosition(b),this.originalPageX=b.pageX,this.originalPageY=b.pageY,g.cursorAt&&this._adjustOffsetFromHelper(g.cursorAt),this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]},this.helper[0]!==this.currentItem[0]&&this.currentItem.hide(),this._createPlaceholder(),g.containment&&this._setContainment(),g.cursor&&"auto"!==g.cursor&&(f=this.document.find("body"),this.storedCursor=f.css("cursor"),f.css("cursor",g.cursor),this.storedStylesheet=a("<style>*{ cursor: "+g.cursor+" !important; }</style>").appendTo(f)),g.opacity&&(this.helper.css("opacity")&&(this._storedOpacity=this.helper.css("opacity")),this.helper.css("opacity",g.opacity)),g.zIndex&&(this.helper.css("zIndex")&&(this._storedZIndex=this.helper.css("zIndex")),this.helper.css("zIndex",g.zIndex)),this.scrollParent[0]!==document&&"HTML"!==this.scrollParent[0].tagName&&(this.overflowOffset=this.scrollParent.offset()),this._trigger("start",b,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProportions(),!d)for(e=this.containers.length-1;e>=0;e--)this.containers[e]._trigger("activate",b,this._uiHash(this));return a.ui.ddmanager&&(a.ui.ddmanager.current=this),a.ui.ddmanager&&!g.dropBehaviour&&a.ui.ddmanager.prepareOffsets(this,b),this.dragging=!0,this.helper.addClass("ui-sortable-helper"),this._mouseDrag(b),!0},_mouseDrag:function(b){var c,d,e,f,g=this.options,h=!1;for(this.position=this._generatePosition(b),this.positionAbs=this._convertPositionTo("absolute"),this.lastPositionAbs||(this.lastPositionAbs=this.positionAbs),this.options.scroll&&(this.scrollParent[0]!==document&&"HTML"!==this.scrollParent[0].tagName?(this.overflowOffset.top+this.scrollParent[0].offsetHeight-b.pageY<g.scrollSensitivity?this.scrollParent[0].scrollTop=h=this.scrollParent[0].scrollTop+g.scrollSpeed:b.pageY-this.overflowOffset.top<g.scrollSensitivity&&(this.scrollParent[0].scrollTop=h=this.scrollParent[0].scrollTop-g.scrollSpeed),this.overflowOffset.left+this.scrollParent[0].offsetWidth-b.pageX<g.scrollSensitivity?this.scrollParent[0].scrollLeft=h=this.scrollParent[0].scrollLeft+g.scrollSpeed:b.pageX-this.overflowOffset.left<g.scrollSensitivity&&(this.scrollParent[0].scrollLeft=h=this.scrollParent[0].scrollLeft-g.scrollSpeed)):(b.pageY-a(document).scrollTop()<g.scrollSensitivity?h=a(document).scrollTop(a(document).scrollTop()-g.scrollSpeed):a(window).height()-(b.pageY-a(document).scrollTop())<g.scrollSensitivity&&(h=a(document).scrollTop(a(document).scrollTop()+g.scrollSpeed)),b.pageX-a(document).scrollLeft()<g.scrollSensitivity?h=a(document).scrollLeft(a(document).scrollLeft()-g.scrollSpeed):a(window).width()-(b.pageX-a(document).scrollLeft())<g.scrollSensitivity&&(h=a(document).scrollLeft(a(document).scrollLeft()+g.scrollSpeed))),h!==!1&&a.ui.ddmanager&&!g.dropBehaviour&&a.ui.ddmanager.prepareOffsets(this,b)),this.positionAbs=this._convertPositionTo("absolute"),this.options.axis&&"y"===this.options.axis||(this.helper[0].style.left=this.position.left+"px"),this.options.axis&&"x"===this.options.axis||(this.helper[0].style.top=this.position.top+"px"),c=this.items.length-1;c>=0;c--)if(d=this.items[c],e=d.item[0],f=this._intersectsWithPointer(d),f&&d.instance===this.currentContainer&&e!==this.currentItem[0]&&this.placeholder[1===f?"next":"prev"]()[0]!==e&&!a.contains(this.placeholder[0],e)&&("semi-dynamic"===this.options.type?!a.contains(this.element[0],e):!0)){if(this.direction=1===f?"down":"up","pointer"!==this.options.tolerance&&!this._intersectsWithSides(d))break;this._rearrange(b,d),this._trigger("change",b,this._uiHash());break}return this._contactContainers(b),a.ui.ddmanager&&a.ui.ddmanager.drag(this,b),this._trigger("sort",b,this._uiHash()),this.lastPositionAbs=this.positionAbs,!1},_mouseStop:function(b,c){if(b){if(a.ui.ddmanager&&!this.options.dropBehaviour&&a.ui.ddmanager.drop(this,b),this.options.revert){var d=this,e=this.placeholder.offset(),f=this.options.axis,g={};f&&"x"!==f||(g.left=e.left-this.offset.parent.left-this.margins.left+(this.offsetParent[0]===document.body?0:this.offsetParent[0].scrollLeft)),f&&"y"!==f||(g.top=e.top-this.offset.parent.top-this.margins.top+(this.offsetParent[0]===document.body?0:this.offsetParent[0].scrollTop)),this.reverting=!0,a(this.helper).animate(g,parseInt(this.options.revert,10)||500,function(){d._clear(b)})}else this._clear(b,c);return!1}},cancel:function(){if(this.dragging){this._mouseUp({target:null}),"original"===this.options.helper?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"):this.currentItem.show();for(var b=this.containers.length-1;b>=0;b--)this.containers[b]._trigger("deactivate",null,this._uiHash(this)),this.containers[b].containerCache.over&&(this.containers[b]._trigger("out",null,this._uiHash(this)),this.containers[b].containerCache.over=0)}return this.placeholder&&(this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]),"original"!==this.options.helper&&this.helper&&this.helper[0].parentNode&&this.helper.remove(),a.extend(this,{helper:null,dragging:!1,reverting:!1,_noFinalSort:null}),this.domPosition.prev?a(this.domPosition.prev).after(this.currentItem):a(this.domPosition.parent).prepend(this.currentItem)),this},serialize:function(b){var c=this._getItemsAsjQuery(b&&b.connected),d=[];return b=b||{},a(c).each(function(){var c=(a(b.item||this).attr(b.attribute||"id")||"").match(b.expression||/(.+)[\-=_](.+)/);c&&d.push((b.key||c[1]+"[]")+"="+(b.key&&b.expression?c[1]:c[2]))}),!d.length&&b.key&&d.push(b.key+"="),d.join("&")},toArray:function(b){var c=this._getItemsAsjQuery(b&&b.connected),d=[];return b=b||{},c.each(function(){d.push(a(b.item||this).attr(b.attribute||"id")||"")}),d},_intersectsWith:function(a){var b=this.positionAbs.left,c=b+this.helperProportions.width,d=this.positionAbs.top,e=d+this.helperProportions.height,f=a.left,g=f+a.width,h=a.top,i=h+a.height,j=this.offset.click.top,k=this.offset.click.left,l="x"===this.options.axis||d+j>h&&i>d+j,m="y"===this.options.axis||b+k>f&&g>b+k,n=l&&m;return"pointer"===this.options.tolerance||this.options.forcePointerForContainers||"pointer"!==this.options.tolerance&&this.helperProportions[this.floating?"width":"height"]>a[this.floating?"width":"height"]?n:f<b+this.helperProportions.width/2&&c-this.helperProportions.width/2<g&&h<d+this.helperProportions.height/2&&e-this.helperProportions.height/2<i},_intersectsWithPointer:function(a){var b="x"===this.options.axis||this._isOverAxis(this.positionAbs.top+this.offset.click.top,a.top,a.height),c="y"===this.options.axis||this._isOverAxis(this.positionAbs.left+this.offset.click.left,a.left,a.width),d=b&&c,e=this._getDragVerticalDirection(),f=this._getDragHorizontalDirection();return d?this.floating?f&&"right"===f||"down"===e?2:1:e&&("down"===e?2:1):!1},_intersectsWithSides:function(a){var b=this._isOverAxis(this.positionAbs.top+this.offset.click.top,a.top+a.height/2,a.height),c=this._isOverAxis(this.positionAbs.left+this.offset.click.left,a.left+a.width/2,a.width),d=this._getDragVerticalDirection(),e=this._getDragHorizontalDirection();return this.floating&&e?"right"===e&&c||"left"===e&&!c:d&&("down"===d&&b||"up"===d&&!b)},_getDragVerticalDirection:function(){var a=this.positionAbs.top-this.lastPositionAbs.top;
-return 0!==a&&(a>0?"down":"up")},_getDragHorizontalDirection:function(){var a=this.positionAbs.left-this.lastPositionAbs.left;return 0!==a&&(a>0?"right":"left")},refresh:function(a){return this._refreshItems(a),this._setHandleClassName(),this.refreshPositions(),this},_connectWith:function(){var a=this.options;return a.connectWith.constructor===String?[a.connectWith]:a.connectWith},_getItemsAsjQuery:function(b){function c(){h.push(this)}var d,e,f,g,h=[],i=[],j=this._connectWith();if(j&&b)for(d=j.length-1;d>=0;d--)for(f=a(j[d]),e=f.length-1;e>=0;e--)g=a.data(f[e],this.widgetFullName),g&&g!==this&&!g.options.disabled&&i.push([a.isFunction(g.options.items)?g.options.items.call(g.element):a(g.options.items,g.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),g]);for(i.push([a.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):a(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]),d=i.length-1;d>=0;d--)i[d][0].each(c);return a(h)},_removeCurrentsFromItems:function(){var b=this.currentItem.find(":data("+this.widgetName+"-item)");this.items=a.grep(this.items,function(a){for(var c=0;c<b.length;c++)if(b[c]===a.item[0])return!1;return!0})},_refreshItems:function(b){this.items=[],this.containers=[this];var c,d,e,f,g,h,i,j,k=this.items,l=[[a.isFunction(this.options.items)?this.options.items.call(this.element[0],b,{item:this.currentItem}):a(this.options.items,this.element),this]],m=this._connectWith();if(m&&this.ready)for(c=m.length-1;c>=0;c--)for(e=a(m[c]),d=e.length-1;d>=0;d--)f=a.data(e[d],this.widgetFullName),f&&f!==this&&!f.options.disabled&&(l.push([a.isFunction(f.options.items)?f.options.items.call(f.element[0],b,{item:this.currentItem}):a(f.options.items,f.element),f]),this.containers.push(f));for(c=l.length-1;c>=0;c--)for(g=l[c][1],h=l[c][0],d=0,j=h.length;j>d;d++)i=a(h[d]),i.data(this.widgetName+"-item",g),k.push({item:i,instance:g,width:0,height:0,left:0,top:0})},refreshPositions:function(b){this.offsetParent&&this.helper&&(this.offset.parent=this._getParentOffset());var c,d,e,f;for(c=this.items.length-1;c>=0;c--)d=this.items[c],d.instance!==this.currentContainer&&this.currentContainer&&d.item[0]!==this.currentItem[0]||(e=this.options.toleranceElement?a(this.options.toleranceElement,d.item):d.item,b||(d.width=e.outerWidth(),d.height=e.outerHeight()),f=e.offset(),d.left=f.left,d.top=f.top);if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(c=this.containers.length-1;c>=0;c--)f=this.containers[c].element.offset(),this.containers[c].containerCache.left=f.left,this.containers[c].containerCache.top=f.top,this.containers[c].containerCache.width=this.containers[c].element.outerWidth(),this.containers[c].containerCache.height=this.containers[c].element.outerHeight();return this},_createPlaceholder:function(b){b=b||this;var c,d=b.options;d.placeholder&&d.placeholder.constructor!==String||(c=d.placeholder,d.placeholder={element:function(){var d=b.currentItem[0].nodeName.toLowerCase(),e=a("<"+d+">",b.document[0]).addClass(c||b.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper");return"tr"===d?b.currentItem.children().each(function(){a("<td>&#160;</td>",b.document[0]).attr("colspan",a(this).attr("colspan")||1).appendTo(e)}):"img"===d&&e.attr("src",b.currentItem.attr("src")),c||e.css("visibility","hidden"),e},update:function(a,e){(!c||d.forcePlaceholderSize)&&(e.height()||e.height(b.currentItem.innerHeight()-parseInt(b.currentItem.css("paddingTop")||0,10)-parseInt(b.currentItem.css("paddingBottom")||0,10)),e.width()||e.width(b.currentItem.innerWidth()-parseInt(b.currentItem.css("paddingLeft")||0,10)-parseInt(b.currentItem.css("paddingRight")||0,10)))}}),b.placeholder=a(d.placeholder.element.call(b.element,b.currentItem)),b.currentItem.after(b.placeholder),d.placeholder.update(b,b.placeholder)},_contactContainers:function(b){var c,d,e,f,g,h,i,j,k,l,m=null,n=null;for(c=this.containers.length-1;c>=0;c--)if(!a.contains(this.currentItem[0],this.containers[c].element[0]))if(this._intersectsWith(this.containers[c].containerCache)){if(m&&a.contains(this.containers[c].element[0],m.element[0]))continue;m=this.containers[c],n=c}else this.containers[c].containerCache.over&&(this.containers[c]._trigger("out",b,this._uiHash(this)),this.containers[c].containerCache.over=0);if(m)if(1===this.containers.length)this.containers[n].containerCache.over||(this.containers[n]._trigger("over",b,this._uiHash(this)),this.containers[n].containerCache.over=1);else{for(e=1e4,f=null,k=m.floating||this._isFloating(this.currentItem),g=k?"left":"top",h=k?"width":"height",l=k?"clientX":"clientY",d=this.items.length-1;d>=0;d--)a.contains(this.containers[n].element[0],this.items[d].item[0])&&this.items[d].item[0]!==this.currentItem[0]&&(i=this.items[d].item.offset()[g],j=!1,b[l]-i>this.items[d][h]/2&&(j=!0),Math.abs(b[l]-i)<e&&(e=Math.abs(b[l]-i),f=this.items[d],this.direction=j?"up":"down"));if(!f&&!this.options.dropOnEmpty)return;if(this.currentContainer===this.containers[n])return void(this.currentContainer.containerCache.over||(this.containers[n]._trigger("over",b,this._uiHash()),this.currentContainer.containerCache.over=1));f?this._rearrange(b,f,null,!0):this._rearrange(b,null,this.containers[n].element,!0),this._trigger("change",b,this._uiHash()),this.containers[n]._trigger("change",b,this._uiHash(this)),this.currentContainer=this.containers[n],this.options.placeholder.update(this.currentContainer,this.placeholder),this.containers[n]._trigger("over",b,this._uiHash(this)),this.containers[n].containerCache.over=1}},_createHelper:function(b){var c=this.options,d=a.isFunction(c.helper)?a(c.helper.apply(this.element[0],[b,this.currentItem])):"clone"===c.helper?this.currentItem.clone():this.currentItem;return d.parents("body").length||a("parent"!==c.appendTo?c.appendTo:this.currentItem[0].parentNode)[0].appendChild(d[0]),d[0]===this.currentItem[0]&&(this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}),(!d[0].style.width||c.forceHelperSize)&&d.width(this.currentItem.width()),(!d[0].style.height||c.forceHelperSize)&&d.height(this.currentItem.height()),d},_adjustOffsetFromHelper:function(b){"string"==typeof b&&(b=b.split(" ")),a.isArray(b)&&(b={left:+b[0],top:+b[1]||0}),"left"in b&&(this.offset.click.left=b.left+this.margins.left),"right"in b&&(this.offset.click.left=this.helperProportions.width-b.right+this.margins.left),"top"in b&&(this.offset.click.top=b.top+this.margins.top),"bottom"in b&&(this.offset.click.top=this.helperProportions.height-b.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var b=this.offsetParent.offset();return"absolute"===this.cssPosition&&this.scrollParent[0]!==document&&a.contains(this.scrollParent[0],this.offsetParent[0])&&(b.left+=this.scrollParent.scrollLeft(),b.top+=this.scrollParent.scrollTop()),(this.offsetParent[0]===document.body||this.offsetParent[0].tagName&&"html"===this.offsetParent[0].tagName.toLowerCase()&&a.ui.ie)&&(b={top:0,left:0}),{top:b.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:b.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"===this.cssPosition){var a=this.currentItem.position();return{top:a.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:a.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var b,c,d,e=this.options;"parent"===e.containment&&(e.containment=this.helper[0].parentNode),("document"===e.containment||"window"===e.containment)&&(this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,a("document"===e.containment?document:window).width()-this.helperProportions.width-this.margins.left,(a("document"===e.containment?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]),/^(document|window|parent)$/.test(e.containment)||(b=a(e.containment)[0],c=a(e.containment).offset(),d="hidden"!==a(b).css("overflow"),this.containment=[c.left+(parseInt(a(b).css("borderLeftWidth"),10)||0)+(parseInt(a(b).css("paddingLeft"),10)||0)-this.margins.left,c.top+(parseInt(a(b).css("borderTopWidth"),10)||0)+(parseInt(a(b).css("paddingTop"),10)||0)-this.margins.top,c.left+(d?Math.max(b.scrollWidth,b.offsetWidth):b.offsetWidth)-(parseInt(a(b).css("borderLeftWidth"),10)||0)-(parseInt(a(b).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,c.top+(d?Math.max(b.scrollHeight,b.offsetHeight):b.offsetHeight)-(parseInt(a(b).css("borderTopWidth"),10)||0)-(parseInt(a(b).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top])},_convertPositionTo:function(b,c){c||(c=this.position);var d="absolute"===b?1:-1,e="absolute"!==this.cssPosition||this.scrollParent[0]!==document&&a.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,f=/(html|body)/i.test(e[0].tagName);return{top:c.top+this.offset.relative.top*d+this.offset.parent.top*d-("fixed"===this.cssPosition?-this.scrollParent.scrollTop():f?0:e.scrollTop())*d,left:c.left+this.offset.relative.left*d+this.offset.parent.left*d-("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():f?0:e.scrollLeft())*d}},_generatePosition:function(b){var c,d,e=this.options,f=b.pageX,g=b.pageY,h="absolute"!==this.cssPosition||this.scrollParent[0]!==document&&a.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,i=/(html|body)/i.test(h[0].tagName);return"relative"!==this.cssPosition||this.scrollParent[0]!==document&&this.scrollParent[0]!==this.offsetParent[0]||(this.offset.relative=this._getRelativeOffset()),this.originalPosition&&(this.containment&&(b.pageX-this.offset.click.left<this.containment[0]&&(f=this.containment[0]+this.offset.click.left),b.pageY-this.offset.click.top<this.containment[1]&&(g=this.containment[1]+this.offset.click.top),b.pageX-this.offset.click.left>this.containment[2]&&(f=this.containment[2]+this.offset.click.left),b.pageY-this.offset.click.top>this.containment[3]&&(g=this.containment[3]+this.offset.click.top)),e.grid&&(c=this.originalPageY+Math.round((g-this.originalPageY)/e.grid[1])*e.grid[1],g=this.containment?c-this.offset.click.top>=this.containment[1]&&c-this.offset.click.top<=this.containment[3]?c:c-this.offset.click.top>=this.containment[1]?c-e.grid[1]:c+e.grid[1]:c,d=this.originalPageX+Math.round((f-this.originalPageX)/e.grid[0])*e.grid[0],f=this.containment?d-this.offset.click.left>=this.containment[0]&&d-this.offset.click.left<=this.containment[2]?d:d-this.offset.click.left>=this.containment[0]?d-e.grid[0]:d+e.grid[0]:d)),{top:g-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.scrollParent.scrollTop():i?0:h.scrollTop()),left:f-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():i?0:h.scrollLeft())}},_rearrange:function(a,b,c,d){c?c[0].appendChild(this.placeholder[0]):b.item[0].parentNode.insertBefore(this.placeholder[0],"down"===this.direction?b.item[0]:b.item[0].nextSibling),this.counter=this.counter?++this.counter:1;var e=this.counter;this._delay(function(){e===this.counter&&this.refreshPositions(!d)})},_clear:function(a,b){function c(a,b,c){return function(d){c._trigger(a,d,b._uiHash(b))}}this.reverting=!1;var d,e=[];if(!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem),this._noFinalSort=null,this.helper[0]===this.currentItem[0]){for(d in this._storedCSS)("auto"===this._storedCSS[d]||"static"===this._storedCSS[d])&&(this._storedCSS[d]="");this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.currentItem.show();for(this.fromOutside&&!b&&e.push(function(a){this._trigger("receive",a,this._uiHash(this.fromOutside))}),!this.fromOutside&&this.domPosition.prev===this.currentItem.prev().not(".ui-sortable-helper")[0]&&this.domPosition.parent===this.currentItem.parent()[0]||b||e.push(function(a){this._trigger("update",a,this._uiHash())}),this!==this.currentContainer&&(b||(e.push(function(a){this._trigger("remove",a,this._uiHash())}),e.push(function(a){return function(b){a._trigger("receive",b,this._uiHash(this))}}.call(this,this.currentContainer)),e.push(function(a){return function(b){a._trigger("update",b,this._uiHash(this))}}.call(this,this.currentContainer)))),d=this.containers.length-1;d>=0;d--)b||e.push(c("deactivate",this,this.containers[d])),this.containers[d].containerCache.over&&(e.push(c("out",this,this.containers[d])),this.containers[d].containerCache.over=0);if(this.storedCursor&&(this.document.find("body").css("cursor",this.storedCursor),this.storedStylesheet.remove()),this._storedOpacity&&this.helper.css("opacity",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex","auto"===this._storedZIndex?"":this._storedZIndex),this.dragging=!1,b||this._trigger("beforeStop",a,this._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.cancelHelperRemoval||(this.helper[0]!==this.currentItem[0]&&this.helper.remove(),this.helper=null),!b){for(d=0;d<e.length;d++)e[d].call(this,a);this._trigger("stop",a,this._uiHash())}return this.fromOutside=!1,!this.cancelHelperRemoval},_trigger:function(){a.Widget.prototype._trigger.apply(this,arguments)===!1&&this.cancel()},_uiHash:function(b){var c=b||this;return{helper:c.helper,placeholder:c.placeholder||a([]),position:c.position,originalPosition:c.originalPosition,offset:c.positionAbs,item:c.currentItem,sender:b?b.element:null}}}),a.widget("ui.slider",a.ui.mouse,{version:"1.11.2",widgetEventPrefix:"slide",options:{animate:!1,distance:0,max:100,min:0,orientation:"horizontal",range:!1,step:1,value:0,values:null,change:null,slide:null,start:null,stop:null},numPages:5,_create:function(){this._keySliding=!1,this._mouseSliding=!1,this._animateOff=!0,this._handleIndex=null,this._detectOrientation(),this._mouseInit(),this._calculateNewMax(),this.element.addClass("ui-slider ui-slider-"+this.orientation+" ui-widget ui-widget-content ui-corner-all"),this._refresh(),this._setOption("disabled",this.options.disabled),this._animateOff=!1},_refresh:function(){this._createRange(),this._createHandles(),this._setupEvents(),this._refreshValue()},_createHandles:function(){var b,c,d=this.options,e=this.element.find(".ui-slider-handle").addClass("ui-state-default ui-corner-all"),f="<span class='ui-slider-handle ui-state-default ui-corner-all' tabindex='0'></span>",g=[];for(c=d.values&&d.values.length||1,e.length>c&&(e.slice(c).remove(),e=e.slice(0,c)),b=e.length;c>b;b++)g.push(f);this.handles=e.add(a(g.join("")).appendTo(this.element)),this.handle=this.handles.eq(0),this.handles.each(function(b){a(this).data("ui-slider-handle-index",b)})},_createRange:function(){var b=this.options,c="";b.range?(b.range===!0&&(b.values?b.values.length&&2!==b.values.length?b.values=[b.values[0],b.values[0]]:a.isArray(b.values)&&(b.values=b.values.slice(0)):b.values=[this._valueMin(),this._valueMin()]),this.range&&this.range.length?this.range.removeClass("ui-slider-range-min ui-slider-range-max").css({left:"",bottom:""}):(this.range=a("<div></div>").appendTo(this.element),c="ui-slider-range ui-widget-header ui-corner-all"),this.range.addClass(c+("min"===b.range||"max"===b.range?" ui-slider-range-"+b.range:""))):(this.range&&this.range.remove(),this.range=null)},_setupEvents:function(){this._off(this.handles),this._on(this.handles,this._handleEvents),this._hoverable(this.handles),this._focusable(this.handles)},_destroy:function(){this.handles.remove(),this.range&&this.range.remove(),this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-widget ui-widget-content ui-corner-all"),this._mouseDestroy()},_mouseCapture:function(b){var c,d,e,f,g,h,i,j,k=this,l=this.options;return l.disabled?!1:(this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()},this.elementOffset=this.element.offset(),c={x:b.pageX,y:b.pageY},d=this._normValueFromMouse(c),e=this._valueMax()-this._valueMin()+1,this.handles.each(function(b){var c=Math.abs(d-k.values(b));(e>c||e===c&&(b===k._lastChangedValue||k.values(b)===l.min))&&(e=c,f=a(this),g=b)}),h=this._start(b,g),h===!1?!1:(this._mouseSliding=!0,this._handleIndex=g,f.addClass("ui-state-active").focus(),i=f.offset(),j=!a(b.target).parents().addBack().is(".ui-slider-handle"),this._clickOffset=j?{left:0,top:0}:{left:b.pageX-i.left-f.width()/2,top:b.pageY-i.top-f.height()/2-(parseInt(f.css("borderTopWidth"),10)||0)-(parseInt(f.css("borderBottomWidth"),10)||0)+(parseInt(f.css("marginTop"),10)||0)},this.handles.hasClass("ui-state-hover")||this._slide(b,g,d),this._animateOff=!0,!0))},_mouseStart:function(){return!0},_mouseDrag:function(a){var b={x:a.pageX,y:a.pageY},c=this._normValueFromMouse(b);return this._slide(a,this._handleIndex,c),!1},_mouseStop:function(a){return this.handles.removeClass("ui-state-active"),this._mouseSliding=!1,this._stop(a,this._handleIndex),this._change(a,this._handleIndex),this._handleIndex=null,this._clickOffset=null,this._animateOff=!1,!1},_detectOrientation:function(){this.orientation="vertical"===this.options.orientation?"vertical":"horizontal"},_normValueFromMouse:function(a){var b,c,d,e,f;return"horizontal"===this.orientation?(b=this.elementSize.width,c=a.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)):(b=this.elementSize.height,c=a.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)),d=c/b,d>1&&(d=1),0>d&&(d=0),"vertical"===this.orientation&&(d=1-d),e=this._valueMax()-this._valueMin(),f=this._valueMin()+d*e,this._trimAlignValue(f)},_start:function(a,b){var c={handle:this.handles[b],value:this.value()};return this.options.values&&this.options.values.length&&(c.value=this.values(b),c.values=this.values()),this._trigger("start",a,c)},_slide:function(a,b,c){var d,e,f;this.options.values&&this.options.values.length?(d=this.values(b?0:1),2===this.options.values.length&&this.options.range===!0&&(0===b&&c>d||1===b&&d>c)&&(c=d),c!==this.values(b)&&(e=this.values(),e[b]=c,f=this._trigger("slide",a,{handle:this.handles[b],value:c,values:e}),d=this.values(b?0:1),f!==!1&&this.values(b,c))):c!==this.value()&&(f=this._trigger("slide",a,{handle:this.handles[b],value:c}),f!==!1&&this.value(c))},_stop:function(a,b){var c={handle:this.handles[b],value:this.value()};this.options.values&&this.options.values.length&&(c.value=this.values(b),c.values=this.values()),this._trigger("stop",a,c)},_change:function(a,b){if(!this._keySliding&&!this._mouseSliding){var c={handle:this.handles[b],value:this.value()};this.options.values&&this.options.values.length&&(c.value=this.values(b),c.values=this.values()),this._lastChangedValue=b,this._trigger("change",a,c)}},value:function(a){return arguments.length?(this.options.value=this._trimAlignValue(a),this._refreshValue(),void this._change(null,0)):this._value()},values:function(b,c){var d,e,f;if(arguments.length>1)return this.options.values[b]=this._trimAlignValue(c),this._refreshValue(),void this._change(null,b);if(!arguments.length)return this._values();if(!a.isArray(arguments[0]))return this.options.values&&this.options.values.length?this._values(b):this.value();for(d=this.options.values,e=arguments[0],f=0;f<d.length;f+=1)d[f]=this._trimAlignValue(e[f]),this._change(null,f);this._refreshValue()},_setOption:function(b,c){var d,e=0;switch("range"===b&&this.options.range===!0&&("min"===c?(this.options.value=this._values(0),this.options.values=null):"max"===c&&(this.options.value=this._values(this.options.values.length-1),this.options.values=null)),a.isArray(this.options.values)&&(e=this.options.values.length),"disabled"===b&&this.element.toggleClass("ui-state-disabled",!!c),this._super(b,c),b){case"orientation":this._detectOrientation(),this.element.removeClass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.orientation),this._refreshValue(),this.handles.css("horizontal"===c?"bottom":"left","");break;case"value":this._animateOff=!0,this._refreshValue(),this._change(null,0),this._animateOff=!1;break;case"values":for(this._animateOff=!0,this._refreshValue(),d=0;e>d;d+=1)this._change(null,d);this._animateOff=!1;break;case"step":case"min":case"max":this._animateOff=!0,this._calculateNewMax(),this._refreshValue(),this._animateOff=!1;break;case"range":this._animateOff=!0,this._refresh(),this._animateOff=!1}},_value:function(){var a=this.options.value;return a=this._trimAlignValue(a)},_values:function(a){var b,c,d;if(arguments.length)return b=this.options.values[a],b=this._trimAlignValue(b);if(this.options.values&&this.options.values.length){for(c=this.options.values.slice(),d=0;d<c.length;d+=1)c[d]=this._trimAlignValue(c[d]);return c}return[]},_trimAlignValue:function(a){if(a<=this._valueMin())return this._valueMin();if(a>=this._valueMax())return this._valueMax();var b=this.options.step>0?this.options.step:1,c=(a-this._valueMin())%b,d=a-c;return 2*Math.abs(c)>=b&&(d+=c>0?b:-b),parseFloat(d.toFixed(5))},_calculateNewMax:function(){var a=(this.options.max-this._valueMin())%this.options.step;this.max=this.options.max-a},_valueMin:function(){return this.options.min},_valueMax:function(){return this.max},_refreshValue:function(){var b,c,d,e,f,g=this.options.range,h=this.options,i=this,j=this._animateOff?!1:h.animate,k={};this.options.values&&this.options.values.length?this.handles.each(function(d){c=(i.values(d)-i._valueMin())/(i._valueMax()-i._valueMin())*100,k["horizontal"===i.orientation?"left":"bottom"]=c+"%",a(this).stop(1,1)[j?"animate":"css"](k,h.animate),i.options.range===!0&&("horizontal"===i.orientation?(0===d&&i.range.stop(1,1)[j?"animate":"css"]({left:c+"%"},h.animate),1===d&&i.range[j?"animate":"css"]({width:c-b+"%"},{queue:!1,duration:h.animate})):(0===d&&i.range.stop(1,1)[j?"animate":"css"]({bottom:c+"%"},h.animate),1===d&&i.range[j?"animate":"css"]({height:c-b+"%"},{queue:!1,duration:h.animate}))),b=c}):(d=this.value(),e=this._valueMin(),f=this._valueMax(),c=f!==e?(d-e)/(f-e)*100:0,k["horizontal"===this.orientation?"left":"bottom"]=c+"%",this.handle.stop(1,1)[j?"animate":"css"](k,h.animate),"min"===g&&"horizontal"===this.orientation&&this.range.stop(1,1)[j?"animate":"css"]({width:c+"%"},h.animate),"max"===g&&"horizontal"===this.orientation&&this.range[j?"animate":"css"]({width:100-c+"%"},{queue:!1,duration:h.animate}),"min"===g&&"vertical"===this.orientation&&this.range.stop(1,1)[j?"animate":"css"]({height:c+"%"},h.animate),"max"===g&&"vertical"===this.orientation&&this.range[j?"animate":"css"]({height:100-c+"%"},{queue:!1,duration:h.animate}))},_handleEvents:{keydown:function(b){var c,d,e,f,g=a(b.target).data("ui-slider-handle-index");switch(b.keyCode){case a.ui.keyCode.HOME:case a.ui.keyCode.END:case a.ui.keyCode.PAGE_UP:case a.ui.keyCode.PAGE_DOWN:case a.ui.keyCode.UP:case a.ui.keyCode.RIGHT:case a.ui.keyCode.DOWN:case a.ui.keyCode.LEFT:if(b.preventDefault(),!this._keySliding&&(this._keySliding=!0,a(b.target).addClass("ui-state-active"),c=this._start(b,g),c===!1))return}switch(f=this.options.step,d=e=this.options.values&&this.options.values.length?this.values(g):this.value(),b.keyCode){case a.ui.keyCode.HOME:e=this._valueMin();break;case a.ui.keyCode.END:e=this._valueMax();break;case a.ui.keyCode.PAGE_UP:e=this._trimAlignValue(d+(this._valueMax()-this._valueMin())/this.numPages);break;case a.ui.keyCode.PAGE_DOWN:e=this._trimAlignValue(d-(this._valueMax()-this._valueMin())/this.numPages);break;case a.ui.keyCode.UP:case a.ui.keyCode.RIGHT:if(d===this._valueMax())return;e=this._trimAlignValue(d+f);break;case a.ui.keyCode.DOWN:case a.ui.keyCode.LEFT:if(d===this._valueMin())return;e=this._trimAlignValue(d-f)}this._slide(b,g,e)},keyup:function(b){var c=a(b.target).data("ui-slider-handle-index");this._keySliding&&(this._keySliding=!1,this._stop(b,c),this._change(b,c),a(b.target).removeClass("ui-state-active"))}}})});
\ No newline at end of file
diff --git a/NewLife.Cube/Content/js/jquery-ui.min.js b/NewLife.Cube/Content/js/jquery-ui.min.js
deleted file mode 100644
index 323b4a1b13..0000000000
--- a/NewLife.Cube/Content/js/jquery-ui.min.js
+++ /dev/null
@@ -1,108 +0,0 @@
-/*! jQuery UI - v1.11.2 - 2014-10-26
-* http://jqueryui.com
-* Includes: core.js, widget.js, mouse.js, position.js, draggable.js, droppable.js, resizable.js, selectable.js, sortable.js, accordion.js, autocomplete.js, button.js, datepicker.js, dialog.js, menu.js, progressbar.js, selectmenu.js, slider.js, spinner.js, tabs.js, tooltip.js, effect.js, effect-blind.js, effect-bounce.js, effect-clip.js, effect-drop.js, effect-explode.js, effect-fade.js, effect-fold.js, effect-highlight.js, effect-puff.js, effect-pulsate.js, effect-scale.js, effect-shake.js, effect-size.js, effect-slide.js, effect-transfer.js
-* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
-!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):a(jQuery)}(function(a){function b(b,d){var e,f,g,h=b.nodeName.toLowerCase();return"area"===h?(e=b.parentNode,f=e.name,b.href&&f&&"map"===e.nodeName.toLowerCase()?(g=a("img[usemap='#"+f+"']")[0],!!g&&c(g)):!1):(/input|select|textarea|button|object/.test(h)?!b.disabled:"a"===h?b.href||d:d)&&c(b)}function c(b){return a.expr.filters.visible(b)&&!a(b).parents().addBack().filter(function(){return"hidden"===a.css(this,"visibility")}).length}function d(a){for(var b,c;a.length&&a[0]!==document;){if(b=a.css("position"),("absolute"===b||"relative"===b||"fixed"===b)&&(c=parseInt(a.css("zIndex"),10),!isNaN(c)&&0!==c))return c;a=a.parent()}return 0}function e(){this._curInst=null,this._keyEvent=!1,this._disabledInputs=[],this._datepickerShowing=!1,this._inDialog=!1,this._mainDivId="ui-datepicker-div",this._inlineClass="ui-datepicker-inline",this._appendClass="ui-datepicker-append",this._triggerClass="ui-datepicker-trigger",this._dialogClass="ui-datepicker-dialog",this._disableClass="ui-datepicker-disabled",this._unselectableClass="ui-datepicker-unselectable",this._currentClass="ui-datepicker-current-day",this._dayOverClass="ui-datepicker-days-cell-over",this.regional=[],this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""},this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:!1,hideIfNoPrevNext:!1,navigationAsDateFormat:!1,gotoCurrent:!1,changeMonth:!1,changeYear:!1,yearRange:"c-10:c+10",showOtherMonths:!1,selectOtherMonths:!1,showWeek:!1,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:!0,showButtonPanel:!1,autoSize:!1,disabled:!1},a.extend(this._defaults,this.regional[""]),this.regional.en=a.extend(!0,{},this.regional[""]),this.regional["en-US"]=a.extend(!0,{},this.regional.en),this.dpDiv=f(a("<div id='"+this._mainDivId+"' class='ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>"))}function f(b){var c="button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";return b.delegate(c,"mouseout",function(){a(this).removeClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&a(this).removeClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&a(this).removeClass("ui-datepicker-next-hover")}).delegate(c,"mouseover",g)}function g(){a.datepicker._isDisabledDatepicker(r.inline?r.dpDiv.parent()[0]:r.input[0])||(a(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover"),a(this).addClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&a(this).addClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&a(this).addClass("ui-datepicker-next-hover"))}function h(b,c){a.extend(b,c);for(var d in c)null==c[d]&&(b[d]=c[d]);return b}/*!
- * jQuery UI Spinner 1.11.2
- * http://jqueryui.com
- *
- * Copyright 2014 jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/spinner/
- */
-function i(a){return function(){var b=this.element.val();a.apply(this,arguments),this._refresh(),b!==this.element.val()&&this._trigger("change")}}/*!
- * jQuery UI Core 1.11.2
- * http://jqueryui.com
- *
- * Copyright 2014 jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/category/ui-core/
- */
-a.ui=a.ui||{},a.extend(a.ui,{version:"1.11.2",keyCode:{BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38}}),a.fn.extend({scrollParent:function(b){var c=this.css("position"),d="absolute"===c,e=b?/(auto|scroll|hidden)/:/(auto|scroll)/,f=this.parents().filter(function(){var b=a(this);return d&&"static"===b.css("position")?!1:e.test(b.css("overflow")+b.css("overflow-y")+b.css("overflow-x"))}).eq(0);return"fixed"!==c&&f.length?f:a(this[0].ownerDocument||document)},uniqueId:function(){var a=0;return function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++a)})}}(),removeUniqueId:function(){return this.each(function(){/^ui-id-\d+$/.test(this.id)&&a(this).removeAttr("id")})}}),a.extend(a.expr[":"],{data:a.expr.createPseudo?a.expr.createPseudo(function(b){return function(c){return!!a.data(c,b)}}):function(b,c,d){return!!a.data(b,d[3])},focusable:function(c){return b(c,!isNaN(a.attr(c,"tabindex")))},tabbable:function(c){var d=a.attr(c,"tabindex"),e=isNaN(d);return(e||d>=0)&&b(c,!e)}}),a("<a>").outerWidth(1).jquery||a.each(["Width","Height"],function(b,c){function d(b,c,d,f){return a.each(e,function(){c-=parseFloat(a.css(b,"padding"+this))||0,d&&(c-=parseFloat(a.css(b,"border"+this+"Width"))||0),f&&(c-=parseFloat(a.css(b,"margin"+this))||0)}),c}var e="Width"===c?["Left","Right"]:["Top","Bottom"],f=c.toLowerCase(),g={innerWidth:a.fn.innerWidth,innerHeight:a.fn.innerHeight,outerWidth:a.fn.outerWidth,outerHeight:a.fn.outerHeight};a.fn["inner"+c]=function(b){return void 0===b?g["inner"+c].call(this):this.each(function(){a(this).css(f,d(this,b)+"px")})},a.fn["outer"+c]=function(b,e){return"number"!=typeof b?g["outer"+c].call(this,b):this.each(function(){a(this).css(f,d(this,b,!0,e)+"px")})}}),a.fn.addBack||(a.fn.addBack=function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}),a("<a>").data("a-b","a").removeData("a-b").data("a-b")&&(a.fn.removeData=function(b){return function(c){return arguments.length?b.call(this,a.camelCase(c)):b.call(this)}}(a.fn.removeData)),a.ui.ie=!!/msie [\w.]+/.exec(navigator.userAgent.toLowerCase()),a.fn.extend({focus:function(b){return function(c,d){return"number"==typeof c?this.each(function(){var b=this;setTimeout(function(){a(b).focus(),d&&d.call(b)},c)}):b.apply(this,arguments)}}(a.fn.focus),disableSelection:function(){var a="onselectstart"in document.createElement("div")?"selectstart":"mousedown";return function(){return this.bind(a+".ui-disableSelection",function(a){a.preventDefault()})}}(),enableSelection:function(){return this.unbind(".ui-disableSelection")},zIndex:function(b){if(void 0!==b)return this.css("zIndex",b);if(this.length)for(var c,d,e=a(this[0]);e.length&&e[0]!==document;){if(c=e.css("position"),("absolute"===c||"relative"===c||"fixed"===c)&&(d=parseInt(e.css("zIndex"),10),!isNaN(d)&&0!==d))return d;e=e.parent()}return 0}}),a.ui.plugin={add:function(b,c,d){var e,f=a.ui[b].prototype;for(e in d)f.plugins[e]=f.plugins[e]||[],f.plugins[e].push([c,d[e]])},call:function(a,b,c,d){var e,f=a.plugins[b];if(f&&(d||a.element[0].parentNode&&11!==a.element[0].parentNode.nodeType))for(e=0;e<f.length;e++)a.options[f[e][0]]&&f[e][1].apply(a.element,c)}};/*!
- * jQuery UI Widget 1.11.2
- * http://jqueryui.com
- *
- * Copyright 2014 jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/jQuery.widget/
- */
-var j=0,k=Array.prototype.slice;a.cleanData=function(b){return function(c){var d,e,f;for(f=0;null!=(e=c[f]);f++)try{d=a._data(e,"events"),d&&d.remove&&a(e).triggerHandler("remove")}catch(g){}b(c)}}(a.cleanData),a.widget=function(b,c,d){var e,f,g,h,i={},j=b.split(".")[0];return b=b.split(".")[1],e=j+"-"+b,d||(d=c,c=a.Widget),a.expr[":"][e.toLowerCase()]=function(b){return!!a.data(b,e)},a[j]=a[j]||{},f=a[j][b],g=a[j][b]=function(a,b){return this._createWidget?void(arguments.length&&this._createWidget(a,b)):new g(a,b)},a.extend(g,f,{version:d.version,_proto:a.extend({},d),_childConstructors:[]}),h=new c,h.options=a.widget.extend({},h.options),a.each(d,function(b,d){return a.isFunction(d)?void(i[b]=function(){var a=function(){return c.prototype[b].apply(this,arguments)},e=function(a){return c.prototype[b].apply(this,a)};return function(){var b,c=this._super,f=this._superApply;return this._super=a,this._superApply=e,b=d.apply(this,arguments),this._super=c,this._superApply=f,b}}()):void(i[b]=d)}),g.prototype=a.widget.extend(h,{widgetEventPrefix:f?h.widgetEventPrefix||b:b},i,{constructor:g,namespace:j,widgetName:b,widgetFullName:e}),f?(a.each(f._childConstructors,function(b,c){var d=c.prototype;a.widget(d.namespace+"."+d.widgetName,g,c._proto)}),delete f._childConstructors):c._childConstructors.push(g),a.widget.bridge(b,g),g},a.widget.extend=function(b){for(var c,d,e=k.call(arguments,1),f=0,g=e.length;g>f;f++)for(c in e[f])d=e[f][c],e[f].hasOwnProperty(c)&&void 0!==d&&(b[c]=a.isPlainObject(d)?a.isPlainObject(b[c])?a.widget.extend({},b[c],d):a.widget.extend({},d):d);return b},a.widget.bridge=function(b,c){var d=c.prototype.widgetFullName||b;a.fn[b]=function(e){var f="string"==typeof e,g=k.call(arguments,1),h=this;return e=!f&&g.length?a.widget.extend.apply(null,[e].concat(g)):e,this.each(f?function(){var c,f=a.data(this,d);return"instance"===e?(h=f,!1):f?a.isFunction(f[e])&&"_"!==e.charAt(0)?(c=f[e].apply(f,g),c!==f&&void 0!==c?(h=c&&c.jquery?h.pushStack(c.get()):c,!1):void 0):a.error("no such method '"+e+"' for "+b+" widget instance"):a.error("cannot call methods on "+b+" prior to initialization; attempted to call method '"+e+"'")}:function(){var b=a.data(this,d);b?(b.option(e||{}),b._init&&b._init()):a.data(this,d,new c(e,this))}),h}},a.Widget=function(){},a.Widget._childConstructors=[],a.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{disabled:!1,create:null},_createWidget:function(b,c){c=a(c||this.defaultElement||this)[0],this.element=a(c),this.uuid=j++,this.eventNamespace="."+this.widgetName+this.uuid,this.bindings=a(),this.hoverable=a(),this.focusable=a(),c!==this&&(a.data(c,this.widgetFullName,this),this._on(!0,this.element,{remove:function(a){a.target===c&&this.destroy()}}),this.document=a(c.style?c.ownerDocument:c.document||c),this.window=a(this.document[0].defaultView||this.document[0].parentWindow)),this.options=a.widget.extend({},this.options,this._getCreateOptions(),b),this._create(),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:a.noop,_getCreateEventData:a.noop,_create:a.noop,_init:a.noop,destroy:function(){this._destroy(),this.element.unbind(this.eventNamespace).removeData(this.widgetFullName).removeData(a.camelCase(this.widgetFullName)),this.widget().unbind(this.eventNamespace).removeAttr("aria-disabled").removeClass(this.widgetFullName+"-disabled ui-state-disabled"),this.bindings.unbind(this.eventNamespace),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")},_destroy:a.noop,widget:function(){return this.element},option:function(b,c){var d,e,f,g=b;if(0===arguments.length)return a.widget.extend({},this.options);if("string"==typeof b)if(g={},d=b.split("."),b=d.shift(),d.length){for(e=g[b]=a.widget.extend({},this.options[b]),f=0;f<d.length-1;f++)e[d[f]]=e[d[f]]||{},e=e[d[f]];if(b=d.pop(),1===arguments.length)return void 0===e[b]?null:e[b];e[b]=c}else{if(1===arguments.length)return void 0===this.options[b]?null:this.options[b];g[b]=c}return this._setOptions(g),this},_setOptions:function(a){var b;for(b in a)this._setOption(b,a[b]);return this},_setOption:function(a,b){return this.options[a]=b,"disabled"===a&&(this.widget().toggleClass(this.widgetFullName+"-disabled",!!b),b&&(this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus"))),this},enable:function(){return this._setOptions({disabled:!1})},disable:function(){return this._setOptions({disabled:!0})},_on:function(b,c,d){var e,f=this;"boolean"!=typeof b&&(d=c,c=b,b=!1),d?(c=e=a(c),this.bindings=this.bindings.add(c)):(d=c,c=this.element,e=this.widget()),a.each(d,function(d,g){function h(){return b||f.options.disabled!==!0&&!a(this).hasClass("ui-state-disabled")?("string"==typeof g?f[g]:g).apply(f,arguments):void 0}"string"!=typeof g&&(h.guid=g.guid=g.guid||h.guid||a.guid++);var i=d.match(/^([\w:-]*)\s*(.*)$/),j=i[1]+f.eventNamespace,k=i[2];k?e.delegate(k,j,h):c.bind(j,h)})},_off:function(b,c){c=(c||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,b.unbind(c).undelegate(c),this.bindings=a(this.bindings.not(b).get()),this.focusable=a(this.focusable.not(b).get()),this.hoverable=a(this.hoverable.not(b).get())},_delay:function(a,b){function c(){return("string"==typeof a?d[a]:a).apply(d,arguments)}var d=this;return setTimeout(c,b||0)},_hoverable:function(b){this.hoverable=this.hoverable.add(b),this._on(b,{mouseenter:function(b){a(b.currentTarget).addClass("ui-state-hover")},mouseleave:function(b){a(b.currentTarget).removeClass("ui-state-hover")}})},_focusable:function(b){this.focusable=this.focusable.add(b),this._on(b,{focusin:function(b){a(b.currentTarget).addClass("ui-state-focus")},focusout:function(b){a(b.currentTarget).removeClass("ui-state-focus")}})},_trigger:function(b,c,d){var e,f,g=this.options[b];if(d=d||{},c=a.Event(c),c.type=(b===this.widgetEventPrefix?b:this.widgetEventPrefix+b).toLowerCase(),c.target=this.element[0],f=c.originalEvent)for(e in f)e in c||(c[e]=f[e]);return this.element.trigger(c,d),!(a.isFunction(g)&&g.apply(this.element[0],[c].concat(d))===!1||c.isDefaultPrevented())}},a.each({show:"fadeIn",hide:"fadeOut"},function(b,c){a.Widget.prototype["_"+b]=function(d,e,f){"string"==typeof e&&(e={effect:e});var g,h=e?e===!0||"number"==typeof e?c:e.effect||c:b;e=e||{},"number"==typeof e&&(e={duration:e}),g=!a.isEmptyObject(e),e.complete=f,e.delay&&d.delay(e.delay),g&&a.effects&&a.effects.effect[h]?d[b](e):h!==b&&d[h]?d[h](e.duration,e.easing,f):d.queue(function(c){a(this)[b](),f&&f.call(d[0]),c()})}});var l=(a.widget,!1);a(document).mouseup(function(){l=!1});a.widget("ui.mouse",{version:"1.11.2",options:{cancel:"input,textarea,button,select,option",distance:1,delay:0},_mouseInit:function(){var b=this;this.element.bind("mousedown."+this.widgetName,function(a){return b._mouseDown(a)}).bind("click."+this.widgetName,function(c){return!0===a.data(c.target,b.widgetName+".preventClickEvent")?(a.removeData(c.target,b.widgetName+".preventClickEvent"),c.stopImmediatePropagation(),!1):void 0}),this.started=!1},_mouseDestroy:function(){this.element.unbind("."+this.widgetName),this._mouseMoveDelegate&&this.document.unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(b){if(!l){this._mouseMoved=!1,this._mouseStarted&&this._mouseUp(b),this._mouseDownEvent=b;var c=this,d=1===b.which,e="string"==typeof this.options.cancel&&b.target.nodeName?a(b.target).closest(this.options.cancel).length:!1;return d&&!e&&this._mouseCapture(b)?(this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){c.mouseDelayMet=!0},this.options.delay)),this._mouseDistanceMet(b)&&this._mouseDelayMet(b)&&(this._mouseStarted=this._mouseStart(b)!==!1,!this._mouseStarted)?(b.preventDefault(),!0):(!0===a.data(b.target,this.widgetName+".preventClickEvent")&&a.removeData(b.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(a){return c._mouseMove(a)},this._mouseUpDelegate=function(a){return c._mouseUp(a)},this.document.bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate),b.preventDefault(),l=!0,!0)):!0}},_mouseMove:function(b){if(this._mouseMoved){if(a.ui.ie&&(!document.documentMode||document.documentMode<9)&&!b.button)return this._mouseUp(b);if(!b.which)return this._mouseUp(b)}return(b.which||b.button)&&(this._mouseMoved=!0),this._mouseStarted?(this._mouseDrag(b),b.preventDefault()):(this._mouseDistanceMet(b)&&this._mouseDelayMet(b)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,b)!==!1,this._mouseStarted?this._mouseDrag(b):this._mouseUp(b)),!this._mouseStarted)},_mouseUp:function(b){return this.document.unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,b.target===this._mouseDownEvent.target&&a.data(b.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(b)),l=!1,!1},_mouseDistanceMet:function(a){return Math.max(Math.abs(this._mouseDownEvent.pageX-a.pageX),Math.abs(this._mouseDownEvent.pageY-a.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return!0}});/*!
- * jQuery UI Position 1.11.2
- * http://jqueryui.com
- *
- * Copyright 2014 jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/position/
- */
-!function(){function b(a,b,c){return[parseFloat(a[0])*(n.test(a[0])?b/100:1),parseFloat(a[1])*(n.test(a[1])?c/100:1)]}function c(b,c){return parseInt(a.css(b,c),10)||0}function d(b){var c=b[0];return 9===c.nodeType?{width:b.width(),height:b.height(),offset:{top:0,left:0}}:a.isWindow(c)?{width:b.width(),height:b.height(),offset:{top:b.scrollTop(),left:b.scrollLeft()}}:c.preventDefault?{width:0,height:0,offset:{top:c.pageY,left:c.pageX}}:{width:b.outerWidth(),height:b.outerHeight(),offset:b.offset()}}a.ui=a.ui||{};var e,f,g=Math.max,h=Math.abs,i=Math.round,j=/left|center|right/,k=/top|center|bottom/,l=/[\+\-]\d+(\.[\d]+)?%?/,m=/^\w+/,n=/%$/,o=a.fn.position;a.position={scrollbarWidth:function(){if(void 0!==e)return e;var b,c,d=a("<div style='display:block;position:absolute;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>"),f=d.children()[0];return a("body").append(d),b=f.offsetWidth,d.css("overflow","scroll"),c=f.offsetWidth,b===c&&(c=d[0].clientWidth),d.remove(),e=b-c},getScrollInfo:function(b){var c=b.isWindow||b.isDocument?"":b.element.css("overflow-x"),d=b.isWindow||b.isDocument?"":b.element.css("overflow-y"),e="scroll"===c||"auto"===c&&b.width<b.element[0].scrollWidth,f="scroll"===d||"auto"===d&&b.height<b.element[0].scrollHeight;return{width:f?a.position.scrollbarWidth():0,height:e?a.position.scrollbarWidth():0}},getWithinInfo:function(b){var c=a(b||window),d=a.isWindow(c[0]),e=!!c[0]&&9===c[0].nodeType;return{element:c,isWindow:d,isDocument:e,offset:c.offset()||{left:0,top:0},scrollLeft:c.scrollLeft(),scrollTop:c.scrollTop(),width:d||e?c.width():c.outerWidth(),height:d||e?c.height():c.outerHeight()}}},a.fn.position=function(e){if(!e||!e.of)return o.apply(this,arguments);e=a.extend({},e);var n,p,q,r,s,t,u=a(e.of),v=a.position.getWithinInfo(e.within),w=a.position.getScrollInfo(v),x=(e.collision||"flip").split(" "),y={};return t=d(u),u[0].preventDefault&&(e.at="left top"),p=t.width,q=t.height,r=t.offset,s=a.extend({},r),a.each(["my","at"],function(){var a,b,c=(e[this]||"").split(" ");1===c.length&&(c=j.test(c[0])?c.concat(["center"]):k.test(c[0])?["center"].concat(c):["center","center"]),c[0]=j.test(c[0])?c[0]:"center",c[1]=k.test(c[1])?c[1]:"center",a=l.exec(c[0]),b=l.exec(c[1]),y[this]=[a?a[0]:0,b?b[0]:0],e[this]=[m.exec(c[0])[0],m.exec(c[1])[0]]}),1===x.length&&(x[1]=x[0]),"right"===e.at[0]?s.left+=p:"center"===e.at[0]&&(s.left+=p/2),"bottom"===e.at[1]?s.top+=q:"center"===e.at[1]&&(s.top+=q/2),n=b(y.at,p,q),s.left+=n[0],s.top+=n[1],this.each(function(){var d,j,k=a(this),l=k.outerWidth(),m=k.outerHeight(),o=c(this,"marginLeft"),t=c(this,"marginTop"),z=l+o+c(this,"marginRight")+w.width,A=m+t+c(this,"marginBottom")+w.height,B=a.extend({},s),C=b(y.my,k.outerWidth(),k.outerHeight());"right"===e.my[0]?B.left-=l:"center"===e.my[0]&&(B.left-=l/2),"bottom"===e.my[1]?B.top-=m:"center"===e.my[1]&&(B.top-=m/2),B.left+=C[0],B.top+=C[1],f||(B.left=i(B.left),B.top=i(B.top)),d={marginLeft:o,marginTop:t},a.each(["left","top"],function(b,c){a.ui.position[x[b]]&&a.ui.position[x[b]][c](B,{targetWidth:p,targetHeight:q,elemWidth:l,elemHeight:m,collisionPosition:d,collisionWidth:z,collisionHeight:A,offset:[n[0]+C[0],n[1]+C[1]],my:e.my,at:e.at,within:v,elem:k})}),e.using&&(j=function(a){var b=r.left-B.left,c=b+p-l,d=r.top-B.top,f=d+q-m,i={target:{element:u,left:r.left,top:r.top,width:p,height:q},element:{element:k,left:B.left,top:B.top,width:l,height:m},horizontal:0>c?"left":b>0?"right":"center",vertical:0>f?"top":d>0?"bottom":"middle"};l>p&&h(b+c)<p&&(i.horizontal="center"),m>q&&h(d+f)<q&&(i.vertical="middle"),i.important=g(h(b),h(c))>g(h(d),h(f))?"horizontal":"vertical",e.using.call(this,a,i)}),k.offset(a.extend(B,{using:j}))})},a.ui.position={fit:{left:function(a,b){var c,d=b.within,e=d.isWindow?d.scrollLeft:d.offset.left,f=d.width,h=a.left-b.collisionPosition.marginLeft,i=e-h,j=h+b.collisionWidth-f-e;b.collisionWidth>f?i>0&&0>=j?(c=a.left+i+b.collisionWidth-f-e,a.left+=i-c):a.left=j>0&&0>=i?e:i>j?e+f-b.collisionWidth:e:i>0?a.left+=i:j>0?a.left-=j:a.left=g(a.left-h,a.left)},top:function(a,b){var c,d=b.within,e=d.isWindow?d.scrollTop:d.offset.top,f=b.within.height,h=a.top-b.collisionPosition.marginTop,i=e-h,j=h+b.collisionHeight-f-e;b.collisionHeight>f?i>0&&0>=j?(c=a.top+i+b.collisionHeight-f-e,a.top+=i-c):a.top=j>0&&0>=i?e:i>j?e+f-b.collisionHeight:e:i>0?a.top+=i:j>0?a.top-=j:a.top=g(a.top-h,a.top)}},flip:{left:function(a,b){var c,d,e=b.within,f=e.offset.left+e.scrollLeft,g=e.width,i=e.isWindow?e.scrollLeft:e.offset.left,j=a.left-b.collisionPosition.marginLeft,k=j-i,l=j+b.collisionWidth-g-i,m="left"===b.my[0]?-b.elemWidth:"right"===b.my[0]?b.elemWidth:0,n="left"===b.at[0]?b.targetWidth:"right"===b.at[0]?-b.targetWidth:0,o=-2*b.offset[0];0>k?(c=a.left+m+n+o+b.collisionWidth-g-f,(0>c||c<h(k))&&(a.left+=m+n+o)):l>0&&(d=a.left-b.collisionPosition.marginLeft+m+n+o-i,(d>0||h(d)<l)&&(a.left+=m+n+o))},top:function(a,b){var c,d,e=b.within,f=e.offset.top+e.scrollTop,g=e.height,i=e.isWindow?e.scrollTop:e.offset.top,j=a.top-b.collisionPosition.marginTop,k=j-i,l=j+b.collisionHeight-g-i,m="top"===b.my[1],n=m?-b.elemHeight:"bottom"===b.my[1]?b.elemHeight:0,o="top"===b.at[1]?b.targetHeight:"bottom"===b.at[1]?-b.targetHeight:0,p=-2*b.offset[1];0>k?(d=a.top+n+o+p+b.collisionHeight-g-f,a.top+n+o+p>k&&(0>d||d<h(k))&&(a.top+=n+o+p)):l>0&&(c=a.top-b.collisionPosition.marginTop+n+o+p-i,a.top+n+o+p>l&&(c>0||h(c)<l)&&(a.top+=n+o+p))}},flipfit:{left:function(){a.ui.position.flip.left.apply(this,arguments),a.ui.position.fit.left.apply(this,arguments)},top:function(){a.ui.position.flip.top.apply(this,arguments),a.ui.position.fit.top.apply(this,arguments)}}},function(){var b,c,d,e,g,h=document.getElementsByTagName("body")[0],i=document.createElement("div");b=document.createElement(h?"div":"body"),d={visibility:"hidden",width:0,height:0,border:0,margin:0,background:"none"},h&&a.extend(d,{position:"absolute",left:"-1000px",top:"-1000px"});for(g in d)b.style[g]=d[g];b.appendChild(i),c=h||document.documentElement,c.insertBefore(b,c.firstChild),i.style.cssText="position: absolute; left: 10.7432222px;",e=a(i).offset().left,f=e>10&&11>e,b.innerHTML="",c.removeChild(b)}()}();a.ui.position;/*!
- * jQuery UI Draggable 1.11.2
- * http://jqueryui.com
- *
- * Copyright 2014 jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/draggable/
- */
-a.widget("ui.draggable",a.ui.mouse,{version:"1.11.2",widgetEventPrefix:"drag",options:{addClasses:!0,appendTo:"parent",axis:!1,connectToSortable:!1,containment:!1,cursor:"auto",cursorAt:!1,grid:!1,handle:!1,helper:"original",iframeFix:!1,opacity:!1,refreshPositions:!1,revert:!1,revertDuration:500,scope:"default",scroll:!0,scrollSensitivity:20,scrollSpeed:20,snap:!1,snapMode:"both",snapTolerance:20,stack:!1,zIndex:!1,drag:null,start:null,stop:null},_create:function(){"original"===this.options.helper&&this._setPositionRelative(),this.options.addClasses&&this.element.addClass("ui-draggable"),this.options.disabled&&this.element.addClass("ui-draggable-disabled"),this._setHandleClassName(),this._mouseInit()},_setOption:function(a,b){this._super(a,b),"handle"===a&&(this._removeHandleClassName(),this._setHandleClassName())},_destroy:function(){return(this.helper||this.element).is(".ui-draggable-dragging")?void(this.destroyOnClear=!0):(this.element.removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled"),this._removeHandleClassName(),void this._mouseDestroy())},_mouseCapture:function(b){var c=this.options;return this._blurActiveElement(b),this.helper||c.disabled||a(b.target).closest(".ui-resizable-handle").length>0?!1:(this.handle=this._getHandle(b),this.handle?(this._blockFrames(c.iframeFix===!0?"iframe":c.iframeFix),!0):!1)},_blockFrames:function(b){this.iframeBlocks=this.document.find(b).map(function(){var b=a(this);return a("<div>").css("position","absolute").appendTo(b.parent()).outerWidth(b.outerWidth()).outerHeight(b.outerHeight()).offset(b.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_blurActiveElement:function(b){var c=this.document[0];if(this.handleElement.is(b.target))try{c.activeElement&&"body"!==c.activeElement.nodeName.toLowerCase()&&a(c.activeElement).blur()}catch(d){}},_mouseStart:function(b){var c=this.options;return this.helper=this._createHelper(b),this.helper.addClass("ui-draggable-dragging"),this._cacheHelperProportions(),a.ui.ddmanager&&(a.ui.ddmanager.current=this),this._cacheMargins(),this.cssPosition=this.helper.css("position"),this.scrollParent=this.helper.scrollParent(!0),this.offsetParent=this.helper.offsetParent(),this.hasFixedAncestor=this.helper.parents().filter(function(){return"fixed"===a(this).css("position")}).length>0,this.positionAbs=this.element.offset(),this._refreshOffsets(b),this.originalPosition=this.position=this._generatePosition(b,!1),this.originalPageX=b.pageX,this.originalPageY=b.pageY,c.cursorAt&&this._adjustOffsetFromHelper(c.cursorAt),this._setContainment(),this._trigger("start",b)===!1?(this._clear(),!1):(this._cacheHelperProportions(),a.ui.ddmanager&&!c.dropBehaviour&&a.ui.ddmanager.prepareOffsets(this,b),this._normalizeRightBottom(),this._mouseDrag(b,!0),a.ui.ddmanager&&a.ui.ddmanager.dragStart(this,b),!0)},_refreshOffsets:function(a){this.offset={top:this.positionAbs.top-this.margins.top,left:this.positionAbs.left-this.margins.left,scroll:!1,parent:this._getParentOffset(),relative:this._getRelativeOffset()},this.offset.click={left:a.pageX-this.offset.left,top:a.pageY-this.offset.top}},_mouseDrag:function(b,c){if(this.hasFixedAncestor&&(this.offset.parent=this._getParentOffset()),this.position=this._generatePosition(b,!0),this.positionAbs=this._convertPositionTo("absolute"),!c){var d=this._uiHash();if(this._trigger("drag",b,d)===!1)return this._mouseUp({}),!1;this.position=d.position}return this.helper[0].style.left=this.position.left+"px",this.helper[0].style.top=this.position.top+"px",a.ui.ddmanager&&a.ui.ddmanager.drag(this,b),!1},_mouseStop:function(b){var c=this,d=!1;return a.ui.ddmanager&&!this.options.dropBehaviour&&(d=a.ui.ddmanager.drop(this,b)),this.dropped&&(d=this.dropped,this.dropped=!1),"invalid"===this.options.revert&&!d||"valid"===this.options.revert&&d||this.options.revert===!0||a.isFunction(this.options.revert)&&this.options.revert.call(this.element,d)?a(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){c._trigger("stop",b)!==!1&&c._clear()}):this._trigger("stop",b)!==!1&&this._clear(),!1},_mouseUp:function(b){return this._unblockFrames(),a.ui.ddmanager&&a.ui.ddmanager.dragStop(this,b),this.handleElement.is(b.target)&&this.element.focus(),a.ui.mouse.prototype._mouseUp.call(this,b)},cancel:function(){return this.helper.is(".ui-draggable-dragging")?this._mouseUp({}):this._clear(),this},_getHandle:function(b){return this.options.handle?!!a(b.target).closest(this.element.find(this.options.handle)).length:!0},_setHandleClassName:function(){this.handleElement=this.options.handle?this.element.find(this.options.handle):this.element,this.handleElement.addClass("ui-draggable-handle")},_removeHandleClassName:function(){this.handleElement.removeClass("ui-draggable-handle")},_createHelper:function(b){var c=this.options,d=a.isFunction(c.helper),e=d?a(c.helper.apply(this.element[0],[b])):"clone"===c.helper?this.element.clone().removeAttr("id"):this.element;return e.parents("body").length||e.appendTo("parent"===c.appendTo?this.element[0].parentNode:c.appendTo),d&&e[0]===this.element[0]&&this._setPositionRelative(),e[0]===this.element[0]||/(fixed|absolute)/.test(e.css("position"))||e.css("position","absolute"),e},_setPositionRelative:function(){/^(?:r|a|f)/.test(this.element.css("position"))||(this.element[0].style.position="relative")},_adjustOffsetFromHelper:function(b){"string"==typeof b&&(b=b.split(" ")),a.isArray(b)&&(b={left:+b[0],top:+b[1]||0}),"left"in b&&(this.offset.click.left=b.left+this.margins.left),"right"in b&&(this.offset.click.left=this.helperProportions.width-b.right+this.margins.left),"top"in b&&(this.offset.click.top=b.top+this.margins.top),"bottom"in b&&(this.offset.click.top=this.helperProportions.height-b.bottom+this.margins.top)},_isRootNode:function(a){return/(html|body)/i.test(a.tagName)||a===this.document[0]},_getParentOffset:function(){var b=this.offsetParent.offset(),c=this.document[0];return"absolute"===this.cssPosition&&this.scrollParent[0]!==c&&a.contains(this.scrollParent[0],this.offsetParent[0])&&(b.left+=this.scrollParent.scrollLeft(),b.top+=this.scrollParent.scrollTop()),this._isRootNode(this.offsetParent[0])&&(b={top:0,left:0}),{top:b.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:b.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"!==this.cssPosition)return{top:0,left:0};var a=this.element.position(),b=this._isRootNode(this.scrollParent[0]);return{top:a.top-(parseInt(this.helper.css("top"),10)||0)+(b?0:this.scrollParent.scrollTop()),left:a.left-(parseInt(this.helper.css("left"),10)||0)+(b?0:this.scrollParent.scrollLeft())}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var b,c,d,e=this.options,f=this.document[0];return this.relativeContainer=null,e.containment?"window"===e.containment?void(this.containment=[a(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,a(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,a(window).scrollLeft()+a(window).width()-this.helperProportions.width-this.margins.left,a(window).scrollTop()+(a(window).height()||f.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]):"document"===e.containment?void(this.containment=[0,0,a(f).width()-this.helperProportions.width-this.margins.left,(a(f).height()||f.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]):e.containment.constructor===Array?void(this.containment=e.containment):("parent"===e.containment&&(e.containment=this.helper[0].parentNode),c=a(e.containment),d=c[0],void(d&&(b=/(scroll|auto)/.test(c.css("overflow")),this.containment=[(parseInt(c.css("borderLeftWidth"),10)||0)+(parseInt(c.css("paddingLeft"),10)||0),(parseInt(c.css("borderTopWidth"),10)||0)+(parseInt(c.css("paddingTop"),10)||0),(b?Math.max(d.scrollWidth,d.offsetWidth):d.offsetWidth)-(parseInt(c.css("borderRightWidth"),10)||0)-(parseInt(c.css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(b?Math.max(d.scrollHeight,d.offsetHeight):d.offsetHeight)-(parseInt(c.css("borderBottomWidth"),10)||0)-(parseInt(c.css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom],this.relativeContainer=c))):void(this.containment=null)},_convertPositionTo:function(a,b){b||(b=this.position);var c="absolute"===a?1:-1,d=this._isRootNode(this.scrollParent[0]);return{top:b.top+this.offset.relative.top*c+this.offset.parent.top*c-("fixed"===this.cssPosition?-this.offset.scroll.top:d?0:this.offset.scroll.top)*c,left:b.left+this.offset.relative.left*c+this.offset.parent.left*c-("fixed"===this.cssPosition?-this.offset.scroll.left:d?0:this.offset.scroll.left)*c}},_generatePosition:function(a,b){var c,d,e,f,g=this.options,h=this._isRootNode(this.scrollParent[0]),i=a.pageX,j=a.pageY;return h&&this.offset.scroll||(this.offset.scroll={top:this.scrollParent.scrollTop(),left:this.scrollParent.scrollLeft()}),b&&(this.containment&&(this.relativeContainer?(d=this.relativeContainer.offset(),c=[this.containment[0]+d.left,this.containment[1]+d.top,this.containment[2]+d.left,this.containment[3]+d.top]):c=this.containment,a.pageX-this.offset.click.left<c[0]&&(i=c[0]+this.offset.click.left),a.pageY-this.offset.click.top<c[1]&&(j=c[1]+this.offset.click.top),a.pageX-this.offset.click.left>c[2]&&(i=c[2]+this.offset.click.left),a.pageY-this.offset.click.top>c[3]&&(j=c[3]+this.offset.click.top)),g.grid&&(e=g.grid[1]?this.originalPageY+Math.round((j-this.originalPageY)/g.grid[1])*g.grid[1]:this.originalPageY,j=c?e-this.offset.click.top>=c[1]||e-this.offset.click.top>c[3]?e:e-this.offset.click.top>=c[1]?e-g.grid[1]:e+g.grid[1]:e,f=g.grid[0]?this.originalPageX+Math.round((i-this.originalPageX)/g.grid[0])*g.grid[0]:this.originalPageX,i=c?f-this.offset.click.left>=c[0]||f-this.offset.click.left>c[2]?f:f-this.offset.click.left>=c[0]?f-g.grid[0]:f+g.grid[0]:f),"y"===g.axis&&(i=this.originalPageX),"x"===g.axis&&(j=this.originalPageY)),{top:j-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.offset.scroll.top:h?0:this.offset.scroll.top),left:i-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.offset.scroll.left:h?0:this.offset.scroll.left)}},_clear:function(){this.helper.removeClass("ui-draggable-dragging"),this.helper[0]===this.element[0]||this.cancelHelperRemoval||this.helper.remove(),this.helper=null,this.cancelHelperRemoval=!1,this.destroyOnClear&&this.destroy()},_normalizeRightBottom:function(){"y"!==this.options.axis&&"auto"!==this.helper.css("right")&&(this.helper.width(this.helper.width()),this.helper.css("right","auto")),"x"!==this.options.axis&&"auto"!==this.helper.css("bottom")&&(this.helper.height(this.helper.height()),this.helper.css("bottom","auto"))},_trigger:function(b,c,d){return d=d||this._uiHash(),a.ui.plugin.call(this,b,[c,d,this],!0),/^(drag|start|stop)/.test(b)&&(this.positionAbs=this._convertPositionTo("absolute"),d.offset=this.positionAbs),a.Widget.prototype._trigger.call(this,b,c,d)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}}),a.ui.plugin.add("draggable","connectToSortable",{start:function(b,c,d){var e=a.extend({},c,{item:d.element});d.sortables=[],a(d.options.connectToSortable).each(function(){var c=a(this).sortable("instance");c&&!c.options.disabled&&(d.sortables.push(c),c.refreshPositions(),c._trigger("activate",b,e))})},stop:function(b,c,d){var e=a.extend({},c,{item:d.element});d.cancelHelperRemoval=!1,a.each(d.sortables,function(){var a=this;a.isOver?(a.isOver=0,d.cancelHelperRemoval=!0,a.cancelHelperRemoval=!1,a._storedCSS={position:a.placeholder.css("position"),top:a.placeholder.css("top"),left:a.placeholder.css("left")},a._mouseStop(b),a.options.helper=a.options._helper):(a.cancelHelperRemoval=!0,a._trigger("deactivate",b,e))})},drag:function(b,c,d){a.each(d.sortables,function(){var e=!1,f=this;f.positionAbs=d.positionAbs,f.helperProportions=d.helperProportions,f.offset.click=d.offset.click,f._intersectsWith(f.containerCache)&&(e=!0,a.each(d.sortables,function(){return this.positionAbs=d.positionAbs,this.helperProportions=d.helperProportions,this.offset.click=d.offset.click,this!==f&&this._intersectsWith(this.containerCache)&&a.contains(f.element[0],this.element[0])&&(e=!1),e})),e?(f.isOver||(f.isOver=1,f.currentItem=c.helper.appendTo(f.element).data("ui-sortable-item",!0),f.options._helper=f.options.helper,f.options.helper=function(){return c.helper[0]},b.target=f.currentItem[0],f._mouseCapture(b,!0),f._mouseStart(b,!0,!0),f.offset.click.top=d.offset.click.top,f.offset.click.left=d.offset.click.left,f.offset.parent.left-=d.offset.parent.left-f.offset.parent.left,f.offset.parent.top-=d.offset.parent.top-f.offset.parent.top,d._trigger("toSortable",b),d.dropped=f.element,a.each(d.sortables,function(){this.refreshPositions()}),d.currentItem=d.element,f.fromOutside=d),f.currentItem&&(f._mouseDrag(b),c.position=f.position)):f.isOver&&(f.isOver=0,f.cancelHelperRemoval=!0,f.options._revert=f.options.revert,f.options.revert=!1,f._trigger("out",b,f._uiHash(f)),f._mouseStop(b,!0),f.options.revert=f.options._revert,f.options.helper=f.options._helper,f.placeholder&&f.placeholder.remove(),d._refreshOffsets(b),c.position=d._generatePosition(b,!0),d._trigger("fromSortable",b),d.dropped=!1,a.each(d.sortables,function(){this.refreshPositions()}))})}}),a.ui.plugin.add("draggable","cursor",{start:function(b,c,d){var e=a("body"),f=d.options;e.css("cursor")&&(f._cursor=e.css("cursor")),e.css("cursor",f.cursor)},stop:function(b,c,d){var e=d.options;e._cursor&&a("body").css("cursor",e._cursor)}}),a.ui.plugin.add("draggable","opacity",{start:function(b,c,d){var e=a(c.helper),f=d.options;e.css("opacity")&&(f._opacity=e.css("opacity")),e.css("opacity",f.opacity)},stop:function(b,c,d){var e=d.options;e._opacity&&a(c.helper).css("opacity",e._opacity)}}),a.ui.plugin.add("draggable","scroll",{start:function(a,b,c){c.scrollParentNotHidden||(c.scrollParentNotHidden=c.helper.scrollParent(!1)),c.scrollParentNotHidden[0]!==c.document[0]&&"HTML"!==c.scrollParentNotHidden[0].tagName&&(c.overflowOffset=c.scrollParentNotHidden.offset())},drag:function(b,c,d){var e=d.options,f=!1,g=d.scrollParentNotHidden[0],h=d.document[0];g!==h&&"HTML"!==g.tagName?(e.axis&&"x"===e.axis||(d.overflowOffset.top+g.offsetHeight-b.pageY<e.scrollSensitivity?g.scrollTop=f=g.scrollTop+e.scrollSpeed:b.pageY-d.overflowOffset.top<e.scrollSensitivity&&(g.scrollTop=f=g.scrollTop-e.scrollSpeed)),e.axis&&"y"===e.axis||(d.overflowOffset.left+g.offsetWidth-b.pageX<e.scrollSensitivity?g.scrollLeft=f=g.scrollLeft+e.scrollSpeed:b.pageX-d.overflowOffset.left<e.scrollSensitivity&&(g.scrollLeft=f=g.scrollLeft-e.scrollSpeed))):(e.axis&&"x"===e.axis||(b.pageY-a(h).scrollTop()<e.scrollSensitivity?f=a(h).scrollTop(a(h).scrollTop()-e.scrollSpeed):a(window).height()-(b.pageY-a(h).scrollTop())<e.scrollSensitivity&&(f=a(h).scrollTop(a(h).scrollTop()+e.scrollSpeed))),e.axis&&"y"===e.axis||(b.pageX-a(h).scrollLeft()<e.scrollSensitivity?f=a(h).scrollLeft(a(h).scrollLeft()-e.scrollSpeed):a(window).width()-(b.pageX-a(h).scrollLeft())<e.scrollSensitivity&&(f=a(h).scrollLeft(a(h).scrollLeft()+e.scrollSpeed)))),f!==!1&&a.ui.ddmanager&&!e.dropBehaviour&&a.ui.ddmanager.prepareOffsets(d,b)}}),a.ui.plugin.add("draggable","snap",{start:function(b,c,d){var e=d.options;d.snapElements=[],a(e.snap.constructor!==String?e.snap.items||":data(ui-draggable)":e.snap).each(function(){var b=a(this),c=b.offset();this!==d.element[0]&&d.snapElements.push({item:this,width:b.outerWidth(),height:b.outerHeight(),top:c.top,left:c.left})})},drag:function(b,c,d){var e,f,g,h,i,j,k,l,m,n,o=d.options,p=o.snapTolerance,q=c.offset.left,r=q+d.helperProportions.width,s=c.offset.top,t=s+d.helperProportions.height;for(m=d.snapElements.length-1;m>=0;m--)i=d.snapElements[m].left-d.margins.left,j=i+d.snapElements[m].width,k=d.snapElements[m].top-d.margins.top,l=k+d.snapElements[m].height,i-p>r||q>j+p||k-p>t||s>l+p||!a.contains(d.snapElements[m].item.ownerDocument,d.snapElements[m].item)?(d.snapElements[m].snapping&&d.options.snap.release&&d.options.snap.release.call(d.element,b,a.extend(d._uiHash(),{snapItem:d.snapElements[m].item})),d.snapElements[m].snapping=!1):("inner"!==o.snapMode&&(e=Math.abs(k-t)<=p,f=Math.abs(l-s)<=p,g=Math.abs(i-r)<=p,h=Math.abs(j-q)<=p,e&&(c.position.top=d._convertPositionTo("relative",{top:k-d.helperProportions.height,left:0}).top),f&&(c.position.top=d._convertPositionTo("relative",{top:l,left:0}).top),g&&(c.position.left=d._convertPositionTo("relative",{top:0,left:i-d.helperProportions.width}).left),h&&(c.position.left=d._convertPositionTo("relative",{top:0,left:j}).left)),n=e||f||g||h,"outer"!==o.snapMode&&(e=Math.abs(k-s)<=p,f=Math.abs(l-t)<=p,g=Math.abs(i-q)<=p,h=Math.abs(j-r)<=p,e&&(c.position.top=d._convertPositionTo("relative",{top:k,left:0}).top),f&&(c.position.top=d._convertPositionTo("relative",{top:l-d.helperProportions.height,left:0}).top),g&&(c.position.left=d._convertPositionTo("relative",{top:0,left:i}).left),h&&(c.position.left=d._convertPositionTo("relative",{top:0,left:j-d.helperProportions.width}).left)),!d.snapElements[m].snapping&&(e||f||g||h||n)&&d.options.snap.snap&&d.options.snap.snap.call(d.element,b,a.extend(d._uiHash(),{snapItem:d.snapElements[m].item})),d.snapElements[m].snapping=e||f||g||h||n)}}),a.ui.plugin.add("draggable","stack",{start:function(b,c,d){var e,f=d.options,g=a.makeArray(a(f.stack)).sort(function(b,c){return(parseInt(a(b).css("zIndex"),10)||0)-(parseInt(a(c).css("zIndex"),10)||0)});g.length&&(e=parseInt(a(g[0]).css("zIndex"),10)||0,a(g).each(function(b){a(this).css("zIndex",e+b)}),this.css("zIndex",e+g.length))}}),a.ui.plugin.add("draggable","zIndex",{start:function(b,c,d){var e=a(c.helper),f=d.options;e.css("zIndex")&&(f._zIndex=e.css("zIndex")),e.css("zIndex",f.zIndex)},stop:function(b,c,d){var e=d.options;e._zIndex&&a(c.helper).css("zIndex",e._zIndex)}});a.ui.draggable;/*!
- * jQuery UI Droppable 1.11.2
- * http://jqueryui.com
- *
- * Copyright 2014 jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/droppable/
- */
-a.widget("ui.droppable",{version:"1.11.2",widgetEventPrefix:"drop",options:{accept:"*",activeClass:!1,addClasses:!0,greedy:!1,hoverClass:!1,scope:"default",tolerance:"intersect",activate:null,deactivate:null,drop:null,out:null,over:null},_create:function(){var b,c=this.options,d=c.accept;this.isover=!1,this.isout=!0,this.accept=a.isFunction(d)?d:function(a){return a.is(d)},this.proportions=function(){return arguments.length?void(b=arguments[0]):b?b:b={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight}},this._addToManager(c.scope),c.addClasses&&this.element.addClass("ui-droppable")},_addToManager:function(b){a.ui.ddmanager.droppables[b]=a.ui.ddmanager.droppables[b]||[],a.ui.ddmanager.droppables[b].push(this)},_splice:function(a){for(var b=0;b<a.length;b++)a[b]===this&&a.splice(b,1)},_destroy:function(){var b=a.ui.ddmanager.droppables[this.options.scope];this._splice(b),this.element.removeClass("ui-droppable ui-droppable-disabled")},_setOption:function(b,c){if("accept"===b)this.accept=a.isFunction(c)?c:function(a){return a.is(c)};else if("scope"===b){var d=a.ui.ddmanager.droppables[this.options.scope];this._splice(d),this._addToManager(c)}this._super(b,c)},_activate:function(b){var c=a.ui.ddmanager.current;this.options.activeClass&&this.element.addClass(this.options.activeClass),c&&this._trigger("activate",b,this.ui(c))},_deactivate:function(b){var c=a.ui.ddmanager.current;this.options.activeClass&&this.element.removeClass(this.options.activeClass),c&&this._trigger("deactivate",b,this.ui(c))},_over:function(b){var c=a.ui.ddmanager.current;c&&(c.currentItem||c.element)[0]!==this.element[0]&&this.accept.call(this.element[0],c.currentItem||c.element)&&(this.options.hoverClass&&this.element.addClass(this.options.hoverClass),this._trigger("over",b,this.ui(c)))},_out:function(b){var c=a.ui.ddmanager.current;c&&(c.currentItem||c.element)[0]!==this.element[0]&&this.accept.call(this.element[0],c.currentItem||c.element)&&(this.options.hoverClass&&this.element.removeClass(this.options.hoverClass),this._trigger("out",b,this.ui(c)))},_drop:function(b,c){var d=c||a.ui.ddmanager.current,e=!1;return d&&(d.currentItem||d.element)[0]!==this.element[0]?(this.element.find(":data(ui-droppable)").not(".ui-draggable-dragging").each(function(){var c=a(this).droppable("instance");return c.options.greedy&&!c.options.disabled&&c.options.scope===d.options.scope&&c.accept.call(c.element[0],d.currentItem||d.element)&&a.ui.intersect(d,a.extend(c,{offset:c.element.offset()}),c.options.tolerance,b)?(e=!0,!1):void 0}),e?!1:this.accept.call(this.element[0],d.currentItem||d.element)?(this.options.activeClass&&this.element.removeClass(this.options.activeClass),this.options.hoverClass&&this.element.removeClass(this.options.hoverClass),this._trigger("drop",b,this.ui(d)),this.element):!1):!1},ui:function(a){return{draggable:a.currentItem||a.element,helper:a.helper,position:a.position,offset:a.positionAbs}}}),a.ui.intersect=function(){function a(a,b,c){return a>=b&&b+c>a}return function(b,c,d,e){if(!c.offset)return!1;var f=(b.positionAbs||b.position.absolute).left+b.margins.left,g=(b.positionAbs||b.position.absolute).top+b.margins.top,h=f+b.helperProportions.width,i=g+b.helperProportions.height,j=c.offset.left,k=c.offset.top,l=j+c.proportions().width,m=k+c.proportions().height;switch(d){case"fit":return f>=j&&l>=h&&g>=k&&m>=i;case"intersect":return j<f+b.helperProportions.width/2&&h-b.helperProportions.width/2<l&&k<g+b.helperProportions.height/2&&i-b.helperProportions.height/2<m;case"pointer":return a(e.pageY,k,c.proportions().height)&&a(e.pageX,j,c.proportions().width);case"touch":return(g>=k&&m>=g||i>=k&&m>=i||k>g&&i>m)&&(f>=j&&l>=f||h>=j&&l>=h||j>f&&h>l);default:return!1}}}(),a.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(b,c){var d,e,f=a.ui.ddmanager.droppables[b.options.scope]||[],g=c?c.type:null,h=(b.currentItem||b.element).find(":data(ui-droppable)").addBack();a:for(d=0;d<f.length;d++)if(!(f[d].options.disabled||b&&!f[d].accept.call(f[d].element[0],b.currentItem||b.element))){for(e=0;e<h.length;e++)if(h[e]===f[d].element[0]){f[d].proportions().height=0;continue a}f[d].visible="none"!==f[d].element.css("display"),f[d].visible&&("mousedown"===g&&f[d]._activate.call(f[d],c),f[d].offset=f[d].element.offset(),f[d].proportions({width:f[d].element[0].offsetWidth,height:f[d].element[0].offsetHeight}))}},drop:function(b,c){var d=!1;return a.each((a.ui.ddmanager.droppables[b.options.scope]||[]).slice(),function(){this.options&&(!this.options.disabled&&this.visible&&a.ui.intersect(b,this,this.options.tolerance,c)&&(d=this._drop.call(this,c)||d),!this.options.disabled&&this.visible&&this.accept.call(this.element[0],b.currentItem||b.element)&&(this.isout=!0,this.isover=!1,this._deactivate.call(this,c)))}),d},dragStart:function(b,c){b.element.parentsUntil("body").bind("scroll.droppable",function(){b.options.refreshPositions||a.ui.ddmanager.prepareOffsets(b,c)})},drag:function(b,c){b.options.refreshPositions&&a.ui.ddmanager.prepareOffsets(b,c),a.each(a.ui.ddmanager.droppables[b.options.scope]||[],function(){if(!this.options.disabled&&!this.greedyChild&&this.visible){var d,e,f,g=a.ui.intersect(b,this,this.options.tolerance,c),h=!g&&this.isover?"isout":g&&!this.isover?"isover":null;h&&(this.options.greedy&&(e=this.options.scope,f=this.element.parents(":data(ui-droppable)").filter(function(){return a(this).droppable("instance").options.scope===e}),f.length&&(d=a(f[0]).droppable("instance"),d.greedyChild="isover"===h)),d&&"isover"===h&&(d.isover=!1,d.isout=!0,d._out.call(d,c)),this[h]=!0,this["isout"===h?"isover":"isout"]=!1,this["isover"===h?"_over":"_out"].call(this,c),d&&"isout"===h&&(d.isout=!1,d.isover=!0,d._over.call(d,c)))}})},dragStop:function(b,c){b.element.parentsUntil("body").unbind("scroll.droppable"),b.options.refreshPositions||a.ui.ddmanager.prepareOffsets(b,c)}};a.ui.droppable;/*!
- * jQuery UI Resizable 1.11.2
- * http://jqueryui.com
- *
- * Copyright 2014 jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/resizable/
- */
-a.widget("ui.resizable",a.ui.mouse,{version:"1.11.2",widgetEventPrefix:"resize",options:{alsoResize:!1,animate:!1,animateDuration:"slow",animateEasing:"swing",aspectRatio:!1,autoHide:!1,containment:!1,ghost:!1,grid:!1,handles:"e,s,se",helper:!1,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:90,resize:null,start:null,stop:null},_num:function(a){return parseInt(a,10)||0},_isNumber:function(a){return!isNaN(parseInt(a,10))},_hasScroll:function(b,c){if("hidden"===a(b).css("overflow"))return!1;var d=c&&"left"===c?"scrollLeft":"scrollTop",e=!1;return b[d]>0?!0:(b[d]=1,e=b[d]>0,b[d]=0,e)},_create:function(){var b,c,d,e,f,g=this,h=this.options;if(this.element.addClass("ui-resizable"),a.extend(this,{_aspectRatio:!!h.aspectRatio,aspectRatio:h.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:h.helper||h.ghost||h.animate?h.helper||"ui-resizable-helper":null}),this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)&&(this.element.wrap(a("<div class='ui-wrapper' style='overflow: hidden;'></div>").css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")})),this.element=this.element.parent().data("ui-resizable",this.element.resizable("instance")),this.elementIsWrapper=!0,this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")}),this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0}),this.originalResizeStyle=this.originalElement.css("resize"),this.originalElement.css("resize","none"),this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"})),this.originalElement.css({margin:this.originalElement.css("margin")}),this._proportionallyResize()),this.handles=h.handles||(a(".ui-resizable-handle",this.element).length?{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}:"e,s,se"),this.handles.constructor===String)for("all"===this.handles&&(this.handles="n,e,s,w,se,sw,ne,nw"),b=this.handles.split(","),this.handles={},c=0;c<b.length;c++)d=a.trim(b[c]),f="ui-resizable-"+d,e=a("<div class='ui-resizable-handle "+f+"'></div>"),e.css({zIndex:h.zIndex}),"se"===d&&e.addClass("ui-icon ui-icon-gripsmall-diagonal-se"),this.handles[d]=".ui-resizable-"+d,this.element.append(e);this._renderAxis=function(b){var c,d,e,f;b=b||this.element;for(c in this.handles)this.handles[c].constructor===String&&(this.handles[c]=this.element.children(this.handles[c]).first().show()),this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)&&(d=a(this.handles[c],this.element),f=/sw|ne|nw|se|n|s/.test(c)?d.outerHeight():d.outerWidth(),e=["padding",/ne|nw|n/.test(c)?"Top":/se|sw|s/.test(c)?"Bottom":/^e$/.test(c)?"Right":"Left"].join(""),b.css(e,f),this._proportionallyResize()),a(this.handles[c]).length},this._renderAxis(this.element),this._handles=a(".ui-resizable-handle",this.element).disableSelection(),this._handles.mouseover(function(){g.resizing||(this.className&&(e=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)),g.axis=e&&e[1]?e[1]:"se")}),h.autoHide&&(this._handles.hide(),a(this.element).addClass("ui-resizable-autohide").mouseenter(function(){h.disabled||(a(this).removeClass("ui-resizable-autohide"),g._handles.show())}).mouseleave(function(){h.disabled||g.resizing||(a(this).addClass("ui-resizable-autohide"),g._handles.hide())})),this._mouseInit()},_destroy:function(){this._mouseDestroy();var b,c=function(b){a(b).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").removeData("ui-resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};return this.elementIsWrapper&&(c(this.element),b=this.element,this.originalElement.css({position:b.css("position"),width:b.outerWidth(),height:b.outerHeight(),top:b.css("top"),left:b.css("left")}).insertAfter(b),b.remove()),this.originalElement.css("resize",this.originalResizeStyle),c(this.originalElement),this},_mouseCapture:function(b){var c,d,e=!1;for(c in this.handles)d=a(this.handles[c])[0],(d===b.target||a.contains(d,b.target))&&(e=!0);return!this.options.disabled&&e},_mouseStart:function(b){var c,d,e,f=this.options,g=this.element;return this.resizing=!0,this._renderProxy(),c=this._num(this.helper.css("left")),d=this._num(this.helper.css("top")),f.containment&&(c+=a(f.containment).scrollLeft()||0,d+=a(f.containment).scrollTop()||0),this.offset=this.helper.offset(),this.position={left:c,top:d},this.size=this._helper?{width:this.helper.width(),height:this.helper.height()}:{width:g.width(),height:g.height()},this.originalSize=this._helper?{width:g.outerWidth(),height:g.outerHeight()}:{width:g.width(),height:g.height()},this.sizeDiff={width:g.outerWidth()-g.width(),height:g.outerHeight()-g.height()},this.originalPosition={left:c,top:d},this.originalMousePosition={left:b.pageX,top:b.pageY},this.aspectRatio="number"==typeof f.aspectRatio?f.aspectRatio:this.originalSize.width/this.originalSize.height||1,e=a(".ui-resizable-"+this.axis).css("cursor"),a("body").css("cursor","auto"===e?this.axis+"-resize":e),g.addClass("ui-resizable-resizing"),this._propagate("start",b),!0},_mouseDrag:function(b){var c,d,e=this.originalMousePosition,f=this.axis,g=b.pageX-e.left||0,h=b.pageY-e.top||0,i=this._change[f];return this._updatePrevProperties(),i?(c=i.apply(this,[b,g,h]),this._updateVirtualBoundaries(b.shiftKey),(this._aspectRatio||b.shiftKey)&&(c=this._updateRatio(c,b)),c=this._respectSize(c,b),this._updateCache(c),this._propagate("resize",b),d=this._applyChanges(),!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize(),a.isEmptyObject(d)||(this._updatePrevProperties(),this._trigger("resize",b,this.ui()),this._applyChanges()),!1):!1},_mouseStop:function(b){this.resizing=!1;var c,d,e,f,g,h,i,j=this.options,k=this;return this._helper&&(c=this._proportionallyResizeElements,d=c.length&&/textarea/i.test(c[0].nodeName),e=d&&this._hasScroll(c[0],"left")?0:k.sizeDiff.height,f=d?0:k.sizeDiff.width,g={width:k.helper.width()-f,height:k.helper.height()-e},h=parseInt(k.element.css("left"),10)+(k.position.left-k.originalPosition.left)||null,i=parseInt(k.element.css("top"),10)+(k.position.top-k.originalPosition.top)||null,j.animate||this.element.css(a.extend(g,{top:i,left:h})),k.helper.height(k.size.height),k.helper.width(k.size.width),this._helper&&!j.animate&&this._proportionallyResize()),a("body").css("cursor","auto"),this.element.removeClass("ui-resizable-resizing"),this._propagate("stop",b),this._helper&&this.helper.remove(),!1},_updatePrevProperties:function(){this.prevPosition={top:this.position.top,left:this.position.left},this.prevSize={width:this.size.width,height:this.size.height}},_applyChanges:function(){var a={};return this.position.top!==this.prevPosition.top&&(a.top=this.position.top+"px"),this.position.left!==this.prevPosition.left&&(a.left=this.position.left+"px"),this.size.width!==this.prevSize.width&&(a.width=this.size.width+"px"),this.size.height!==this.prevSize.height&&(a.height=this.size.height+"px"),this.helper.css(a),a},_updateVirtualBoundaries:function(a){var b,c,d,e,f,g=this.options;f={minWidth:this._isNumber(g.minWidth)?g.minWidth:0,maxWidth:this._isNumber(g.maxWidth)?g.maxWidth:1/0,minHeight:this._isNumber(g.minHeight)?g.minHeight:0,maxHeight:this._isNumber(g.maxHeight)?g.maxHeight:1/0},(this._aspectRatio||a)&&(b=f.minHeight*this.aspectRatio,d=f.minWidth/this.aspectRatio,c=f.maxHeight*this.aspectRatio,e=f.maxWidth/this.aspectRatio,b>f.minWidth&&(f.minWidth=b),d>f.minHeight&&(f.minHeight=d),c<f.maxWidth&&(f.maxWidth=c),e<f.maxHeight&&(f.maxHeight=e)),this._vBoundaries=f},_updateCache:function(a){this.offset=this.helper.offset(),this._isNumber(a.left)&&(this.position.left=a.left),this._isNumber(a.top)&&(this.position.top=a.top),this._isNumber(a.height)&&(this.size.height=a.height),this._isNumber(a.width)&&(this.size.width=a.width)},_updateRatio:function(a){var b=this.position,c=this.size,d=this.axis;return this._isNumber(a.height)?a.width=a.height*this.aspectRatio:this._isNumber(a.width)&&(a.height=a.width/this.aspectRatio),"sw"===d&&(a.left=b.left+(c.width-a.width),a.top=null),"nw"===d&&(a.top=b.top+(c.height-a.height),a.left=b.left+(c.width-a.width)),a},_respectSize:function(a){var b=this._vBoundaries,c=this.axis,d=this._isNumber(a.width)&&b.maxWidth&&b.maxWidth<a.width,e=this._isNumber(a.height)&&b.maxHeight&&b.maxHeight<a.height,f=this._isNumber(a.width)&&b.minWidth&&b.minWidth>a.width,g=this._isNumber(a.height)&&b.minHeight&&b.minHeight>a.height,h=this.originalPosition.left+this.originalSize.width,i=this.position.top+this.size.height,j=/sw|nw|w/.test(c),k=/nw|ne|n/.test(c);return f&&(a.width=b.minWidth),g&&(a.height=b.minHeight),d&&(a.width=b.maxWidth),e&&(a.height=b.maxHeight),f&&j&&(a.left=h-b.minWidth),d&&j&&(a.left=h-b.maxWidth),g&&k&&(a.top=i-b.minHeight),e&&k&&(a.top=i-b.maxHeight),a.width||a.height||a.left||!a.top?a.width||a.height||a.top||!a.left||(a.left=null):a.top=null,a},_getPaddingPlusBorderDimensions:function(a){for(var b=0,c=[],d=[a.css("borderTopWidth"),a.css("borderRightWidth"),a.css("borderBottomWidth"),a.css("borderLeftWidth")],e=[a.css("paddingTop"),a.css("paddingRight"),a.css("paddingBottom"),a.css("paddingLeft")];4>b;b++)c[b]=parseInt(d[b],10)||0,c[b]+=parseInt(e[b],10)||0;return{height:c[0]+c[2],width:c[1]+c[3]}},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var a,b=0,c=this.helper||this.element;b<this._proportionallyResizeElements.length;b++)a=this._proportionallyResizeElements[b],this.outerDimensions||(this.outerDimensions=this._getPaddingPlusBorderDimensions(a)),a.css({height:c.height()-this.outerDimensions.height||0,width:c.width()-this.outerDimensions.width||0})},_renderProxy:function(){var b=this.element,c=this.options;this.elementOffset=b.offset(),this._helper?(this.helper=this.helper||a("<div style='overflow:hidden;'></div>"),this.helper.addClass(this._helper).css({width:this.element.outerWidth()-1,height:this.element.outerHeight()-1,position:"absolute",left:this.elementOffset.left+"px",top:this.elementOffset.top+"px",zIndex:++c.zIndex}),this.helper.appendTo("body").disableSelection()):this.helper=this.element},_change:{e:function(a,b){return{width:this.originalSize.width+b}},w:function(a,b){var c=this.originalSize,d=this.originalPosition;return{left:d.left+b,width:c.width-b}},n:function(a,b,c){var d=this.originalSize,e=this.originalPosition;return{top:e.top+c,height:d.height-c}},s:function(a,b,c){return{height:this.originalSize.height+c}},se:function(b,c,d){return a.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[b,c,d]))},sw:function(b,c,d){return a.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[b,c,d]))},ne:function(b,c,d){return a.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[b,c,d]))},nw:function(b,c,d){return a.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[b,c,d]))}},_propagate:function(b,c){a.ui.plugin.call(this,b,[c,this.ui()]),"resize"!==b&&this._trigger(b,c,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}),a.ui.plugin.add("resizable","animate",{stop:function(b){var c=a(this).resizable("instance"),d=c.options,e=c._proportionallyResizeElements,f=e.length&&/textarea/i.test(e[0].nodeName),g=f&&c._hasScroll(e[0],"left")?0:c.sizeDiff.height,h=f?0:c.sizeDiff.width,i={width:c.size.width-h,height:c.size.height-g},j=parseInt(c.element.css("left"),10)+(c.position.left-c.originalPosition.left)||null,k=parseInt(c.element.css("top"),10)+(c.position.top-c.originalPosition.top)||null;c.element.animate(a.extend(i,k&&j?{top:k,left:j}:{}),{duration:d.animateDuration,easing:d.animateEasing,step:function(){var d={width:parseInt(c.element.css("width"),10),height:parseInt(c.element.css("height"),10),top:parseInt(c.element.css("top"),10),left:parseInt(c.element.css("left"),10)};e&&e.length&&a(e[0]).css({width:d.width,height:d.height}),c._updateCache(d),c._propagate("resize",b)}})}}),a.ui.plugin.add("resizable","containment",{start:function(){var b,c,d,e,f,g,h,i=a(this).resizable("instance"),j=i.options,k=i.element,l=j.containment,m=l instanceof a?l.get(0):/parent/.test(l)?k.parent().get(0):l;m&&(i.containerElement=a(m),/document/.test(l)||l===document?(i.containerOffset={left:0,top:0},i.containerPosition={left:0,top:0},i.parentData={element:a(document),left:0,top:0,width:a(document).width(),height:a(document).height()||document.body.parentNode.scrollHeight}):(b=a(m),c=[],a(["Top","Right","Left","Bottom"]).each(function(a,d){c[a]=i._num(b.css("padding"+d))}),i.containerOffset=b.offset(),i.containerPosition=b.position(),i.containerSize={height:b.innerHeight()-c[3],width:b.innerWidth()-c[1]},d=i.containerOffset,e=i.containerSize.height,f=i.containerSize.width,g=i._hasScroll(m,"left")?m.scrollWidth:f,h=i._hasScroll(m)?m.scrollHeight:e,i.parentData={element:m,left:d.left,top:d.top,width:g,height:h}))},resize:function(b){var c,d,e,f,g=a(this).resizable("instance"),h=g.options,i=g.containerOffset,j=g.position,k=g._aspectRatio||b.shiftKey,l={top:0,left:0},m=g.containerElement,n=!0;m[0]!==document&&/static/.test(m.css("position"))&&(l=i),j.left<(g._helper?i.left:0)&&(g.size.width=g.size.width+(g._helper?g.position.left-i.left:g.position.left-l.left),k&&(g.size.height=g.size.width/g.aspectRatio,n=!1),g.position.left=h.helper?i.left:0),j.top<(g._helper?i.top:0)&&(g.size.height=g.size.height+(g._helper?g.position.top-i.top:g.position.top),k&&(g.size.width=g.size.height*g.aspectRatio,n=!1),g.position.top=g._helper?i.top:0),e=g.containerElement.get(0)===g.element.parent().get(0),f=/relative|absolute/.test(g.containerElement.css("position")),e&&f?(g.offset.left=g.parentData.left+g.position.left,g.offset.top=g.parentData.top+g.position.top):(g.offset.left=g.element.offset().left,g.offset.top=g.element.offset().top),c=Math.abs(g.sizeDiff.width+(g._helper?g.offset.left-l.left:g.offset.left-i.left)),d=Math.abs(g.sizeDiff.height+(g._helper?g.offset.top-l.top:g.offset.top-i.top)),c+g.size.width>=g.parentData.width&&(g.size.width=g.parentData.width-c,k&&(g.size.height=g.size.width/g.aspectRatio,n=!1)),d+g.size.height>=g.parentData.height&&(g.size.height=g.parentData.height-d,k&&(g.size.width=g.size.height*g.aspectRatio,n=!1)),n||(g.position.left=g.prevPosition.left,g.position.top=g.prevPosition.top,g.size.width=g.prevSize.width,g.size.height=g.prevSize.height)},stop:function(){var b=a(this).resizable("instance"),c=b.options,d=b.containerOffset,e=b.containerPosition,f=b.containerElement,g=a(b.helper),h=g.offset(),i=g.outerWidth()-b.sizeDiff.width,j=g.outerHeight()-b.sizeDiff.height;b._helper&&!c.animate&&/relative/.test(f.css("position"))&&a(this).css({left:h.left-e.left-d.left,width:i,height:j}),b._helper&&!c.animate&&/static/.test(f.css("position"))&&a(this).css({left:h.left-e.left-d.left,width:i,height:j})}}),a.ui.plugin.add("resizable","alsoResize",{start:function(){var b=a(this).resizable("instance"),c=b.options,d=function(b){a(b).each(function(){var b=a(this);b.data("ui-resizable-alsoresize",{width:parseInt(b.width(),10),height:parseInt(b.height(),10),left:parseInt(b.css("left"),10),top:parseInt(b.css("top"),10)})})};"object"!=typeof c.alsoResize||c.alsoResize.parentNode?d(c.alsoResize):c.alsoResize.length?(c.alsoResize=c.alsoResize[0],d(c.alsoResize)):a.each(c.alsoResize,function(a){d(a)})},resize:function(b,c){var d=a(this).resizable("instance"),e=d.options,f=d.originalSize,g=d.originalPosition,h={height:d.size.height-f.height||0,width:d.size.width-f.width||0,top:d.position.top-g.top||0,left:d.position.left-g.left||0},i=function(b,d){a(b).each(function(){var b=a(this),e=a(this).data("ui-resizable-alsoresize"),f={},g=d&&d.length?d:b.parents(c.originalElement[0]).length?["width","height"]:["width","height","top","left"];a.each(g,function(a,b){var c=(e[b]||0)+(h[b]||0);c&&c>=0&&(f[b]=c||null)}),b.css(f)})};"object"!=typeof e.alsoResize||e.alsoResize.nodeType?i(e.alsoResize):a.each(e.alsoResize,function(a,b){i(a,b)})},stop:function(){a(this).removeData("resizable-alsoresize")}}),a.ui.plugin.add("resizable","ghost",{start:function(){var b=a(this).resizable("instance"),c=b.options,d=b.size;b.ghost=b.originalElement.clone(),b.ghost.css({opacity:.25,display:"block",position:"relative",height:d.height,width:d.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass("string"==typeof c.ghost?c.ghost:""),b.ghost.appendTo(b.helper)},resize:function(){var b=a(this).resizable("instance");b.ghost&&b.ghost.css({position:"relative",height:b.size.height,width:b.size.width})},stop:function(){var b=a(this).resizable("instance");b.ghost&&b.helper&&b.helper.get(0).removeChild(b.ghost.get(0))}}),a.ui.plugin.add("resizable","grid",{resize:function(){var b,c=a(this).resizable("instance"),d=c.options,e=c.size,f=c.originalSize,g=c.originalPosition,h=c.axis,i="number"==typeof d.grid?[d.grid,d.grid]:d.grid,j=i[0]||1,k=i[1]||1,l=Math.round((e.width-f.width)/j)*j,m=Math.round((e.height-f.height)/k)*k,n=f.width+l,o=f.height+m,p=d.maxWidth&&d.maxWidth<n,q=d.maxHeight&&d.maxHeight<o,r=d.minWidth&&d.minWidth>n,s=d.minHeight&&d.minHeight>o;d.grid=i,r&&(n+=j),s&&(o+=k),p&&(n-=j),q&&(o-=k),/^(se|s|e)$/.test(h)?(c.size.width=n,c.size.height=o):/^(ne)$/.test(h)?(c.size.width=n,c.size.height=o,c.position.top=g.top-m):/^(sw)$/.test(h)?(c.size.width=n,c.size.height=o,c.position.left=g.left-l):((0>=o-k||0>=n-j)&&(b=c._getPaddingPlusBorderDimensions(this)),o-k>0?(c.size.height=o,c.position.top=g.top-m):(o=k-b.height,c.size.height=o,c.position.top=g.top+f.height-o),n-j>0?(c.size.width=n,c.position.left=g.left-l):(n=k-b.height,c.size.width=n,c.position.left=g.left+f.width-n))}});a.ui.resizable,a.widget("ui.selectable",a.ui.mouse,{version:"1.11.2",options:{appendTo:"body",autoRefresh:!0,distance:0,filter:"*",tolerance:"touch",selected:null,selecting:null,start:null,stop:null,unselected:null,unselecting:null},_create:function(){var b,c=this;this.element.addClass("ui-selectable"),this.dragged=!1,this.refresh=function(){b=a(c.options.filter,c.element[0]),b.addClass("ui-selectee"),b.each(function(){var b=a(this),c=b.offset();a.data(this,"selectable-item",{element:this,$element:b,left:c.left,top:c.top,right:c.left+b.outerWidth(),bottom:c.top+b.outerHeight(),startselected:!1,selected:b.hasClass("ui-selected"),selecting:b.hasClass("ui-selecting"),unselecting:b.hasClass("ui-unselecting")})})},this.refresh(),this.selectees=b.addClass("ui-selectee"),this._mouseInit(),this.helper=a("<div class='ui-selectable-helper'></div>")},_destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item"),this.element.removeClass("ui-selectable ui-selectable-disabled"),this._mouseDestroy()},_mouseStart:function(b){var c=this,d=this.options;this.opos=[b.pageX,b.pageY],this.options.disabled||(this.selectees=a(d.filter,this.element[0]),this._trigger("start",b),a(d.appendTo).append(this.helper),this.helper.css({left:b.pageX,top:b.pageY,width:0,height:0}),d.autoRefresh&&this.refresh(),this.selectees.filter(".ui-selected").each(function(){var d=a.data(this,"selectable-item");d.startselected=!0,b.metaKey||b.ctrlKey||(d.$element.removeClass("ui-selected"),d.selected=!1,d.$element.addClass("ui-unselecting"),d.unselecting=!0,c._trigger("unselecting",b,{unselecting:d.element}))}),a(b.target).parents().addBack().each(function(){var d,e=a.data(this,"selectable-item");return e?(d=!b.metaKey&&!b.ctrlKey||!e.$element.hasClass("ui-selected"),e.$element.removeClass(d?"ui-unselecting":"ui-selected").addClass(d?"ui-selecting":"ui-unselecting"),e.unselecting=!d,e.selecting=d,e.selected=d,d?c._trigger("selecting",b,{selecting:e.element}):c._trigger("unselecting",b,{unselecting:e.element}),!1):void 0}))},_mouseDrag:function(b){if(this.dragged=!0,!this.options.disabled){var c,d=this,e=this.options,f=this.opos[0],g=this.opos[1],h=b.pageX,i=b.pageY;return f>h&&(c=h,h=f,f=c),g>i&&(c=i,i=g,g=c),this.helper.css({left:f,top:g,width:h-f,height:i-g}),this.selectees.each(function(){var c=a.data(this,"selectable-item"),j=!1;c&&c.element!==d.element[0]&&("touch"===e.tolerance?j=!(c.left>h||c.right<f||c.top>i||c.bottom<g):"fit"===e.tolerance&&(j=c.left>f&&c.right<h&&c.top>g&&c.bottom<i),j?(c.selected&&(c.$element.removeClass("ui-selected"),c.selected=!1),c.unselecting&&(c.$element.removeClass("ui-unselecting"),c.unselecting=!1),c.selecting||(c.$element.addClass("ui-selecting"),c.selecting=!0,d._trigger("selecting",b,{selecting:c.element}))):(c.selecting&&((b.metaKey||b.ctrlKey)&&c.startselected?(c.$element.removeClass("ui-selecting"),c.selecting=!1,c.$element.addClass("ui-selected"),c.selected=!0):(c.$element.removeClass("ui-selecting"),c.selecting=!1,c.startselected&&(c.$element.addClass("ui-unselecting"),c.unselecting=!0),d._trigger("unselecting",b,{unselecting:c.element}))),c.selected&&(b.metaKey||b.ctrlKey||c.startselected||(c.$element.removeClass("ui-selected"),c.selected=!1,c.$element.addClass("ui-unselecting"),c.unselecting=!0,d._trigger("unselecting",b,{unselecting:c.element})))))}),!1}},_mouseStop:function(b){var c=this;return this.dragged=!1,a(".ui-unselecting",this.element[0]).each(function(){var d=a.data(this,"selectable-item");d.$element.removeClass("ui-unselecting"),d.unselecting=!1,d.startselected=!1,c._trigger("unselected",b,{unselected:d.element})}),a(".ui-selecting",this.element[0]).each(function(){var d=a.data(this,"selectable-item");d.$element.removeClass("ui-selecting").addClass("ui-selected"),d.selecting=!1,d.selected=!0,d.startselected=!0,c._trigger("selected",b,{selected:d.element})}),this._trigger("stop",b),this.helper.remove(),!1}}),a.widget("ui.sortable",a.ui.mouse,{version:"1.11.2",widgetEventPrefix:"sort",ready:!1,options:{appendTo:"parent",axis:!1,connectWith:!1,containment:!1,cursor:"auto",cursorAt:!1,dropOnEmpty:!0,forcePlaceholderSize:!1,forceHelperSize:!1,grid:!1,handle:!1,helper:"original",items:"> *",opacity:!1,placeholder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1e3,activate:null,beforeStop:null,change:null,deactivate:null,out:null,over:null,receive:null,remove:null,sort:null,start:null,stop:null,update:null},_isOverAxis:function(a,b,c){return a>=b&&b+c>a},_isFloating:function(a){return/left|right/.test(a.css("float"))||/inline|table-cell/.test(a.css("display"))},_create:function(){var a=this.options;this.containerCache={},this.element.addClass("ui-sortable"),this.refresh(),this.floating=this.items.length?"x"===a.axis||this._isFloating(this.items[0].item):!1,this.offset=this.element.offset(),this._mouseInit(),this._setHandleClassName(),this.ready=!0},_setOption:function(a,b){this._super(a,b),"handle"===a&&this._setHandleClassName()},_setHandleClassName:function(){this.element.find(".ui-sortable-handle").removeClass("ui-sortable-handle"),a.each(this.items,function(){(this.instance.options.handle?this.item.find(this.instance.options.handle):this.item).addClass("ui-sortable-handle")})},_destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled").find(".ui-sortable-handle").removeClass("ui-sortable-handle"),this._mouseDestroy();for(var a=this.items.length-1;a>=0;a--)this.items[a].item.removeData(this.widgetName+"-item");return this},_mouseCapture:function(b,c){var d=null,e=!1,f=this;return this.reverting?!1:this.options.disabled||"static"===this.options.type?!1:(this._refreshItems(b),a(b.target).parents().each(function(){return a.data(this,f.widgetName+"-item")===f?(d=a(this),!1):void 0}),a.data(b.target,f.widgetName+"-item")===f&&(d=a(b.target)),d&&(!this.options.handle||c||(a(this.options.handle,d).find("*").addBack().each(function(){this===b.target&&(e=!0)}),e))?(this.currentItem=d,this._removeCurrentsFromItems(),!0):!1)},_mouseStart:function(b,c,d){var e,f,g=this.options;if(this.currentContainer=this,this.refreshPositions(),this.helper=this._createHelper(b),this._cacheHelperProportions(),this._cacheMargins(),this.scrollParent=this.helper.scrollParent(),this.offset=this.currentItem.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},a.extend(this.offset,{click:{left:b.pageX-this.offset.left,top:b.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.helper.css("position","absolute"),this.cssPosition=this.helper.css("position"),this.originalPosition=this._generatePosition(b),this.originalPageX=b.pageX,this.originalPageY=b.pageY,g.cursorAt&&this._adjustOffsetFromHelper(g.cursorAt),this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]},this.helper[0]!==this.currentItem[0]&&this.currentItem.hide(),this._createPlaceholder(),g.containment&&this._setContainment(),g.cursor&&"auto"!==g.cursor&&(f=this.document.find("body"),this.storedCursor=f.css("cursor"),f.css("cursor",g.cursor),this.storedStylesheet=a("<style>*{ cursor: "+g.cursor+" !important; }</style>").appendTo(f)),g.opacity&&(this.helper.css("opacity")&&(this._storedOpacity=this.helper.css("opacity")),this.helper.css("opacity",g.opacity)),g.zIndex&&(this.helper.css("zIndex")&&(this._storedZIndex=this.helper.css("zIndex")),this.helper.css("zIndex",g.zIndex)),this.scrollParent[0]!==document&&"HTML"!==this.scrollParent[0].tagName&&(this.overflowOffset=this.scrollParent.offset()),this._trigger("start",b,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProportions(),!d)for(e=this.containers.length-1;e>=0;e--)this.containers[e]._trigger("activate",b,this._uiHash(this));return a.ui.ddmanager&&(a.ui.ddmanager.current=this),a.ui.ddmanager&&!g.dropBehaviour&&a.ui.ddmanager.prepareOffsets(this,b),this.dragging=!0,this.helper.addClass("ui-sortable-helper"),this._mouseDrag(b),!0},_mouseDrag:function(b){var c,d,e,f,g=this.options,h=!1;for(this.position=this._generatePosition(b),this.positionAbs=this._convertPositionTo("absolute"),this.lastPositionAbs||(this.lastPositionAbs=this.positionAbs),this.options.scroll&&(this.scrollParent[0]!==document&&"HTML"!==this.scrollParent[0].tagName?(this.overflowOffset.top+this.scrollParent[0].offsetHeight-b.pageY<g.scrollSensitivity?this.scrollParent[0].scrollTop=h=this.scrollParent[0].scrollTop+g.scrollSpeed:b.pageY-this.overflowOffset.top<g.scrollSensitivity&&(this.scrollParent[0].scrollTop=h=this.scrollParent[0].scrollTop-g.scrollSpeed),this.overflowOffset.left+this.scrollParent[0].offsetWidth-b.pageX<g.scrollSensitivity?this.scrollParent[0].scrollLeft=h=this.scrollParent[0].scrollLeft+g.scrollSpeed:b.pageX-this.overflowOffset.left<g.scrollSensitivity&&(this.scrollParent[0].scrollLeft=h=this.scrollParent[0].scrollLeft-g.scrollSpeed)):(b.pageY-a(document).scrollTop()<g.scrollSensitivity?h=a(document).scrollTop(a(document).scrollTop()-g.scrollSpeed):a(window).height()-(b.pageY-a(document).scrollTop())<g.scrollSensitivity&&(h=a(document).scrollTop(a(document).scrollTop()+g.scrollSpeed)),b.pageX-a(document).scrollLeft()<g.scrollSensitivity?h=a(document).scrollLeft(a(document).scrollLeft()-g.scrollSpeed):a(window).width()-(b.pageX-a(document).scrollLeft())<g.scrollSensitivity&&(h=a(document).scrollLeft(a(document).scrollLeft()+g.scrollSpeed))),h!==!1&&a.ui.ddmanager&&!g.dropBehaviour&&a.ui.ddmanager.prepareOffsets(this,b)),this.positionAbs=this._convertPositionTo("absolute"),this.options.axis&&"y"===this.options.axis||(this.helper[0].style.left=this.position.left+"px"),this.options.axis&&"x"===this.options.axis||(this.helper[0].style.top=this.position.top+"px"),c=this.items.length-1;c>=0;c--)if(d=this.items[c],e=d.item[0],f=this._intersectsWithPointer(d),f&&d.instance===this.currentContainer&&e!==this.currentItem[0]&&this.placeholder[1===f?"next":"prev"]()[0]!==e&&!a.contains(this.placeholder[0],e)&&("semi-dynamic"===this.options.type?!a.contains(this.element[0],e):!0)){if(this.direction=1===f?"down":"up","pointer"!==this.options.tolerance&&!this._intersectsWithSides(d))break;this._rearrange(b,d),this._trigger("change",b,this._uiHash());break}return this._contactContainers(b),a.ui.ddmanager&&a.ui.ddmanager.drag(this,b),this._trigger("sort",b,this._uiHash()),this.lastPositionAbs=this.positionAbs,!1},_mouseStop:function(b,c){if(b){if(a.ui.ddmanager&&!this.options.dropBehaviour&&a.ui.ddmanager.drop(this,b),this.options.revert){var d=this,e=this.placeholder.offset(),f=this.options.axis,g={};f&&"x"!==f||(g.left=e.left-this.offset.parent.left-this.margins.left+(this.offsetParent[0]===document.body?0:this.offsetParent[0].scrollLeft)),f&&"y"!==f||(g.top=e.top-this.offset.parent.top-this.margins.top+(this.offsetParent[0]===document.body?0:this.offsetParent[0].scrollTop)),this.reverting=!0,a(this.helper).animate(g,parseInt(this.options.revert,10)||500,function(){d._clear(b)})}else this._clear(b,c);return!1}},cancel:function(){if(this.dragging){this._mouseUp({target:null}),"original"===this.options.helper?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"):this.currentItem.show();for(var b=this.containers.length-1;b>=0;b--)this.containers[b]._trigger("deactivate",null,this._uiHash(this)),this.containers[b].containerCache.over&&(this.containers[b]._trigger("out",null,this._uiHash(this)),this.containers[b].containerCache.over=0)}return this.placeholder&&(this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]),"original"!==this.options.helper&&this.helper&&this.helper[0].parentNode&&this.helper.remove(),a.extend(this,{helper:null,dragging:!1,reverting:!1,_noFinalSort:null}),this.domPosition.prev?a(this.domPosition.prev).after(this.currentItem):a(this.domPosition.parent).prepend(this.currentItem)),this},serialize:function(b){var c=this._getItemsAsjQuery(b&&b.connected),d=[];return b=b||{},a(c).each(function(){var c=(a(b.item||this).attr(b.attribute||"id")||"").match(b.expression||/(.+)[\-=_](.+)/);c&&d.push((b.key||c[1]+"[]")+"="+(b.key&&b.expression?c[1]:c[2]))}),!d.length&&b.key&&d.push(b.key+"="),d.join("&")},toArray:function(b){var c=this._getItemsAsjQuery(b&&b.connected),d=[];return b=b||{},c.each(function(){d.push(a(b.item||this).attr(b.attribute||"id")||"")}),d},_intersectsWith:function(a){var b=this.positionAbs.left,c=b+this.helperProportions.width,d=this.positionAbs.top,e=d+this.helperProportions.height,f=a.left,g=f+a.width,h=a.top,i=h+a.height,j=this.offset.click.top,k=this.offset.click.left,l="x"===this.options.axis||d+j>h&&i>d+j,m="y"===this.options.axis||b+k>f&&g>b+k,n=l&&m;return"pointer"===this.options.tolerance||this.options.forcePointerForContainers||"pointer"!==this.options.tolerance&&this.helperProportions[this.floating?"width":"height"]>a[this.floating?"width":"height"]?n:f<b+this.helperProportions.width/2&&c-this.helperProportions.width/2<g&&h<d+this.helperProportions.height/2&&e-this.helperProportions.height/2<i},_intersectsWithPointer:function(a){var b="x"===this.options.axis||this._isOverAxis(this.positionAbs.top+this.offset.click.top,a.top,a.height),c="y"===this.options.axis||this._isOverAxis(this.positionAbs.left+this.offset.click.left,a.left,a.width),d=b&&c,e=this._getDragVerticalDirection(),f=this._getDragHorizontalDirection();return d?this.floating?f&&"right"===f||"down"===e?2:1:e&&("down"===e?2:1):!1},_intersectsWithSides:function(a){var b=this._isOverAxis(this.positionAbs.top+this.offset.click.top,a.top+a.height/2,a.height),c=this._isOverAxis(this.positionAbs.left+this.offset.click.left,a.left+a.width/2,a.width),d=this._getDragVerticalDirection(),e=this._getDragHorizontalDirection();return this.floating&&e?"right"===e&&c||"left"===e&&!c:d&&("down"===d&&b||"up"===d&&!b)},_getDragVerticalDirection:function(){var a=this.positionAbs.top-this.lastPositionAbs.top;
-return 0!==a&&(a>0?"down":"up")},_getDragHorizontalDirection:function(){var a=this.positionAbs.left-this.lastPositionAbs.left;return 0!==a&&(a>0?"right":"left")},refresh:function(a){return this._refreshItems(a),this._setHandleClassName(),this.refreshPositions(),this},_connectWith:function(){var a=this.options;return a.connectWith.constructor===String?[a.connectWith]:a.connectWith},_getItemsAsjQuery:function(b){function c(){h.push(this)}var d,e,f,g,h=[],i=[],j=this._connectWith();if(j&&b)for(d=j.length-1;d>=0;d--)for(f=a(j[d]),e=f.length-1;e>=0;e--)g=a.data(f[e],this.widgetFullName),g&&g!==this&&!g.options.disabled&&i.push([a.isFunction(g.options.items)?g.options.items.call(g.element):a(g.options.items,g.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),g]);for(i.push([a.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):a(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]),d=i.length-1;d>=0;d--)i[d][0].each(c);return a(h)},_removeCurrentsFromItems:function(){var b=this.currentItem.find(":data("+this.widgetName+"-item)");this.items=a.grep(this.items,function(a){for(var c=0;c<b.length;c++)if(b[c]===a.item[0])return!1;return!0})},_refreshItems:function(b){this.items=[],this.containers=[this];var c,d,e,f,g,h,i,j,k=this.items,l=[[a.isFunction(this.options.items)?this.options.items.call(this.element[0],b,{item:this.currentItem}):a(this.options.items,this.element),this]],m=this._connectWith();if(m&&this.ready)for(c=m.length-1;c>=0;c--)for(e=a(m[c]),d=e.length-1;d>=0;d--)f=a.data(e[d],this.widgetFullName),f&&f!==this&&!f.options.disabled&&(l.push([a.isFunction(f.options.items)?f.options.items.call(f.element[0],b,{item:this.currentItem}):a(f.options.items,f.element),f]),this.containers.push(f));for(c=l.length-1;c>=0;c--)for(g=l[c][1],h=l[c][0],d=0,j=h.length;j>d;d++)i=a(h[d]),i.data(this.widgetName+"-item",g),k.push({item:i,instance:g,width:0,height:0,left:0,top:0})},refreshPositions:function(b){this.offsetParent&&this.helper&&(this.offset.parent=this._getParentOffset());var c,d,e,f;for(c=this.items.length-1;c>=0;c--)d=this.items[c],d.instance!==this.currentContainer&&this.currentContainer&&d.item[0]!==this.currentItem[0]||(e=this.options.toleranceElement?a(this.options.toleranceElement,d.item):d.item,b||(d.width=e.outerWidth(),d.height=e.outerHeight()),f=e.offset(),d.left=f.left,d.top=f.top);if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(c=this.containers.length-1;c>=0;c--)f=this.containers[c].element.offset(),this.containers[c].containerCache.left=f.left,this.containers[c].containerCache.top=f.top,this.containers[c].containerCache.width=this.containers[c].element.outerWidth(),this.containers[c].containerCache.height=this.containers[c].element.outerHeight();return this},_createPlaceholder:function(b){b=b||this;var c,d=b.options;d.placeholder&&d.placeholder.constructor!==String||(c=d.placeholder,d.placeholder={element:function(){var d=b.currentItem[0].nodeName.toLowerCase(),e=a("<"+d+">",b.document[0]).addClass(c||b.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper");return"tr"===d?b.currentItem.children().each(function(){a("<td>&#160;</td>",b.document[0]).attr("colspan",a(this).attr("colspan")||1).appendTo(e)}):"img"===d&&e.attr("src",b.currentItem.attr("src")),c||e.css("visibility","hidden"),e},update:function(a,e){(!c||d.forcePlaceholderSize)&&(e.height()||e.height(b.currentItem.innerHeight()-parseInt(b.currentItem.css("paddingTop")||0,10)-parseInt(b.currentItem.css("paddingBottom")||0,10)),e.width()||e.width(b.currentItem.innerWidth()-parseInt(b.currentItem.css("paddingLeft")||0,10)-parseInt(b.currentItem.css("paddingRight")||0,10)))}}),b.placeholder=a(d.placeholder.element.call(b.element,b.currentItem)),b.currentItem.after(b.placeholder),d.placeholder.update(b,b.placeholder)},_contactContainers:function(b){var c,d,e,f,g,h,i,j,k,l,m=null,n=null;for(c=this.containers.length-1;c>=0;c--)if(!a.contains(this.currentItem[0],this.containers[c].element[0]))if(this._intersectsWith(this.containers[c].containerCache)){if(m&&a.contains(this.containers[c].element[0],m.element[0]))continue;m=this.containers[c],n=c}else this.containers[c].containerCache.over&&(this.containers[c]._trigger("out",b,this._uiHash(this)),this.containers[c].containerCache.over=0);if(m)if(1===this.containers.length)this.containers[n].containerCache.over||(this.containers[n]._trigger("over",b,this._uiHash(this)),this.containers[n].containerCache.over=1);else{for(e=1e4,f=null,k=m.floating||this._isFloating(this.currentItem),g=k?"left":"top",h=k?"width":"height",l=k?"clientX":"clientY",d=this.items.length-1;d>=0;d--)a.contains(this.containers[n].element[0],this.items[d].item[0])&&this.items[d].item[0]!==this.currentItem[0]&&(i=this.items[d].item.offset()[g],j=!1,b[l]-i>this.items[d][h]/2&&(j=!0),Math.abs(b[l]-i)<e&&(e=Math.abs(b[l]-i),f=this.items[d],this.direction=j?"up":"down"));if(!f&&!this.options.dropOnEmpty)return;if(this.currentContainer===this.containers[n])return void(this.currentContainer.containerCache.over||(this.containers[n]._trigger("over",b,this._uiHash()),this.currentContainer.containerCache.over=1));f?this._rearrange(b,f,null,!0):this._rearrange(b,null,this.containers[n].element,!0),this._trigger("change",b,this._uiHash()),this.containers[n]._trigger("change",b,this._uiHash(this)),this.currentContainer=this.containers[n],this.options.placeholder.update(this.currentContainer,this.placeholder),this.containers[n]._trigger("over",b,this._uiHash(this)),this.containers[n].containerCache.over=1}},_createHelper:function(b){var c=this.options,d=a.isFunction(c.helper)?a(c.helper.apply(this.element[0],[b,this.currentItem])):"clone"===c.helper?this.currentItem.clone():this.currentItem;return d.parents("body").length||a("parent"!==c.appendTo?c.appendTo:this.currentItem[0].parentNode)[0].appendChild(d[0]),d[0]===this.currentItem[0]&&(this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}),(!d[0].style.width||c.forceHelperSize)&&d.width(this.currentItem.width()),(!d[0].style.height||c.forceHelperSize)&&d.height(this.currentItem.height()),d},_adjustOffsetFromHelper:function(b){"string"==typeof b&&(b=b.split(" ")),a.isArray(b)&&(b={left:+b[0],top:+b[1]||0}),"left"in b&&(this.offset.click.left=b.left+this.margins.left),"right"in b&&(this.offset.click.left=this.helperProportions.width-b.right+this.margins.left),"top"in b&&(this.offset.click.top=b.top+this.margins.top),"bottom"in b&&(this.offset.click.top=this.helperProportions.height-b.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var b=this.offsetParent.offset();return"absolute"===this.cssPosition&&this.scrollParent[0]!==document&&a.contains(this.scrollParent[0],this.offsetParent[0])&&(b.left+=this.scrollParent.scrollLeft(),b.top+=this.scrollParent.scrollTop()),(this.offsetParent[0]===document.body||this.offsetParent[0].tagName&&"html"===this.offsetParent[0].tagName.toLowerCase()&&a.ui.ie)&&(b={top:0,left:0}),{top:b.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:b.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"===this.cssPosition){var a=this.currentItem.position();return{top:a.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:a.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var b,c,d,e=this.options;"parent"===e.containment&&(e.containment=this.helper[0].parentNode),("document"===e.containment||"window"===e.containment)&&(this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,a("document"===e.containment?document:window).width()-this.helperProportions.width-this.margins.left,(a("document"===e.containment?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]),/^(document|window|parent)$/.test(e.containment)||(b=a(e.containment)[0],c=a(e.containment).offset(),d="hidden"!==a(b).css("overflow"),this.containment=[c.left+(parseInt(a(b).css("borderLeftWidth"),10)||0)+(parseInt(a(b).css("paddingLeft"),10)||0)-this.margins.left,c.top+(parseInt(a(b).css("borderTopWidth"),10)||0)+(parseInt(a(b).css("paddingTop"),10)||0)-this.margins.top,c.left+(d?Math.max(b.scrollWidth,b.offsetWidth):b.offsetWidth)-(parseInt(a(b).css("borderLeftWidth"),10)||0)-(parseInt(a(b).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,c.top+(d?Math.max(b.scrollHeight,b.offsetHeight):b.offsetHeight)-(parseInt(a(b).css("borderTopWidth"),10)||0)-(parseInt(a(b).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top])},_convertPositionTo:function(b,c){c||(c=this.position);var d="absolute"===b?1:-1,e="absolute"!==this.cssPosition||this.scrollParent[0]!==document&&a.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,f=/(html|body)/i.test(e[0].tagName);return{top:c.top+this.offset.relative.top*d+this.offset.parent.top*d-("fixed"===this.cssPosition?-this.scrollParent.scrollTop():f?0:e.scrollTop())*d,left:c.left+this.offset.relative.left*d+this.offset.parent.left*d-("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():f?0:e.scrollLeft())*d}},_generatePosition:function(b){var c,d,e=this.options,f=b.pageX,g=b.pageY,h="absolute"!==this.cssPosition||this.scrollParent[0]!==document&&a.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,i=/(html|body)/i.test(h[0].tagName);return"relative"!==this.cssPosition||this.scrollParent[0]!==document&&this.scrollParent[0]!==this.offsetParent[0]||(this.offset.relative=this._getRelativeOffset()),this.originalPosition&&(this.containment&&(b.pageX-this.offset.click.left<this.containment[0]&&(f=this.containment[0]+this.offset.click.left),b.pageY-this.offset.click.top<this.containment[1]&&(g=this.containment[1]+this.offset.click.top),b.pageX-this.offset.click.left>this.containment[2]&&(f=this.containment[2]+this.offset.click.left),b.pageY-this.offset.click.top>this.containment[3]&&(g=this.containment[3]+this.offset.click.top)),e.grid&&(c=this.originalPageY+Math.round((g-this.originalPageY)/e.grid[1])*e.grid[1],g=this.containment?c-this.offset.click.top>=this.containment[1]&&c-this.offset.click.top<=this.containment[3]?c:c-this.offset.click.top>=this.containment[1]?c-e.grid[1]:c+e.grid[1]:c,d=this.originalPageX+Math.round((f-this.originalPageX)/e.grid[0])*e.grid[0],f=this.containment?d-this.offset.click.left>=this.containment[0]&&d-this.offset.click.left<=this.containment[2]?d:d-this.offset.click.left>=this.containment[0]?d-e.grid[0]:d+e.grid[0]:d)),{top:g-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.scrollParent.scrollTop():i?0:h.scrollTop()),left:f-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():i?0:h.scrollLeft())}},_rearrange:function(a,b,c,d){c?c[0].appendChild(this.placeholder[0]):b.item[0].parentNode.insertBefore(this.placeholder[0],"down"===this.direction?b.item[0]:b.item[0].nextSibling),this.counter=this.counter?++this.counter:1;var e=this.counter;this._delay(function(){e===this.counter&&this.refreshPositions(!d)})},_clear:function(a,b){function c(a,b,c){return function(d){c._trigger(a,d,b._uiHash(b))}}this.reverting=!1;var d,e=[];if(!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem),this._noFinalSort=null,this.helper[0]===this.currentItem[0]){for(d in this._storedCSS)("auto"===this._storedCSS[d]||"static"===this._storedCSS[d])&&(this._storedCSS[d]="");this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.currentItem.show();for(this.fromOutside&&!b&&e.push(function(a){this._trigger("receive",a,this._uiHash(this.fromOutside))}),!this.fromOutside&&this.domPosition.prev===this.currentItem.prev().not(".ui-sortable-helper")[0]&&this.domPosition.parent===this.currentItem.parent()[0]||b||e.push(function(a){this._trigger("update",a,this._uiHash())}),this!==this.currentContainer&&(b||(e.push(function(a){this._trigger("remove",a,this._uiHash())}),e.push(function(a){return function(b){a._trigger("receive",b,this._uiHash(this))}}.call(this,this.currentContainer)),e.push(function(a){return function(b){a._trigger("update",b,this._uiHash(this))}}.call(this,this.currentContainer)))),d=this.containers.length-1;d>=0;d--)b||e.push(c("deactivate",this,this.containers[d])),this.containers[d].containerCache.over&&(e.push(c("out",this,this.containers[d])),this.containers[d].containerCache.over=0);if(this.storedCursor&&(this.document.find("body").css("cursor",this.storedCursor),this.storedStylesheet.remove()),this._storedOpacity&&this.helper.css("opacity",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex","auto"===this._storedZIndex?"":this._storedZIndex),this.dragging=!1,b||this._trigger("beforeStop",a,this._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.cancelHelperRemoval||(this.helper[0]!==this.currentItem[0]&&this.helper.remove(),this.helper=null),!b){for(d=0;d<e.length;d++)e[d].call(this,a);this._trigger("stop",a,this._uiHash())}return this.fromOutside=!1,!this.cancelHelperRemoval},_trigger:function(){a.Widget.prototype._trigger.apply(this,arguments)===!1&&this.cancel()},_uiHash:function(b){var c=b||this;return{helper:c.helper,placeholder:c.placeholder||a([]),position:c.position,originalPosition:c.originalPosition,offset:c.positionAbs,item:c.currentItem,sender:b?b.element:null}}}),a.widget("ui.accordion",{version:"1.11.2",options:{active:0,animate:{},collapsible:!1,event:"click",header:"> li > :first-child,> :not(li):even",heightStyle:"auto",icons:{activeHeader:"ui-icon-triangle-1-s",header:"ui-icon-triangle-1-e"},activate:null,beforeActivate:null},hideProps:{borderTopWidth:"hide",borderBottomWidth:"hide",paddingTop:"hide",paddingBottom:"hide",height:"hide"},showProps:{borderTopWidth:"show",borderBottomWidth:"show",paddingTop:"show",paddingBottom:"show",height:"show"},_create:function(){var b=this.options;this.prevShow=this.prevHide=a(),this.element.addClass("ui-accordion ui-widget ui-helper-reset").attr("role","tablist"),b.collapsible||b.active!==!1&&null!=b.active||(b.active=0),this._processPanels(),b.active<0&&(b.active+=this.headers.length),this._refresh()},_getCreateEventData:function(){return{header:this.active,panel:this.active.length?this.active.next():a()}},_createIcons:function(){var b=this.options.icons;b&&(a("<span>").addClass("ui-accordion-header-icon ui-icon "+b.header).prependTo(this.headers),this.active.children(".ui-accordion-header-icon").removeClass(b.header).addClass(b.activeHeader),this.headers.addClass("ui-accordion-icons"))},_destroyIcons:function(){this.headers.removeClass("ui-accordion-icons").children(".ui-accordion-header-icon").remove()},_destroy:function(){var a;this.element.removeClass("ui-accordion ui-widget ui-helper-reset").removeAttr("role"),this.headers.removeClass("ui-accordion-header ui-accordion-header-active ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top").removeAttr("role").removeAttr("aria-expanded").removeAttr("aria-selected").removeAttr("aria-controls").removeAttr("tabIndex").removeUniqueId(),this._destroyIcons(),a=this.headers.next().removeClass("ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-state-disabled").css("display","").removeAttr("role").removeAttr("aria-hidden").removeAttr("aria-labelledby").removeUniqueId(),"content"!==this.options.heightStyle&&a.css("height","")},_setOption:function(a,b){return"active"===a?void this._activate(b):("event"===a&&(this.options.event&&this._off(this.headers,this.options.event),this._setupEvents(b)),this._super(a,b),"collapsible"!==a||b||this.options.active!==!1||this._activate(0),"icons"===a&&(this._destroyIcons(),b&&this._createIcons()),void("disabled"===a&&(this.element.toggleClass("ui-state-disabled",!!b).attr("aria-disabled",b),this.headers.add(this.headers.next()).toggleClass("ui-state-disabled",!!b))))},_keydown:function(b){if(!b.altKey&&!b.ctrlKey){var c=a.ui.keyCode,d=this.headers.length,e=this.headers.index(b.target),f=!1;switch(b.keyCode){case c.RIGHT:case c.DOWN:f=this.headers[(e+1)%d];break;case c.LEFT:case c.UP:f=this.headers[(e-1+d)%d];break;case c.SPACE:case c.ENTER:this._eventHandler(b);break;case c.HOME:f=this.headers[0];break;case c.END:f=this.headers[d-1]}f&&(a(b.target).attr("tabIndex",-1),a(f).attr("tabIndex",0),f.focus(),b.preventDefault())}},_panelKeyDown:function(b){b.keyCode===a.ui.keyCode.UP&&b.ctrlKey&&a(b.currentTarget).prev().focus()},refresh:function(){var b=this.options;this._processPanels(),b.active===!1&&b.collapsible===!0||!this.headers.length?(b.active=!1,this.active=a()):b.active===!1?this._activate(0):this.active.length&&!a.contains(this.element[0],this.active[0])?this.headers.length===this.headers.find(".ui-state-disabled").length?(b.active=!1,this.active=a()):this._activate(Math.max(0,b.active-1)):b.active=this.headers.index(this.active),this._destroyIcons(),this._refresh()},_processPanels:function(){var a=this.headers,b=this.panels;this.headers=this.element.find(this.options.header).addClass("ui-accordion-header ui-state-default ui-corner-all"),this.panels=this.headers.next().addClass("ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom").filter(":not(.ui-accordion-content-active)").hide(),b&&(this._off(a.not(this.headers)),this._off(b.not(this.panels)))},_refresh:function(){var b,c=this.options,d=c.heightStyle,e=this.element.parent();this.active=this._findActive(c.active).addClass("ui-accordion-header-active ui-state-active ui-corner-top").removeClass("ui-corner-all"),this.active.next().addClass("ui-accordion-content-active").show(),this.headers.attr("role","tab").each(function(){var b=a(this),c=b.uniqueId().attr("id"),d=b.next(),e=d.uniqueId().attr("id");b.attr("aria-controls",e),d.attr("aria-labelledby",c)}).next().attr("role","tabpanel"),this.headers.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}).next().attr({"aria-hidden":"true"}).hide(),this.active.length?this.active.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}).next().attr({"aria-hidden":"false"}):this.headers.eq(0).attr("tabIndex",0),this._createIcons(),this._setupEvents(c.event),"fill"===d?(b=e.height(),this.element.siblings(":visible").each(function(){var c=a(this),d=c.css("position");"absolute"!==d&&"fixed"!==d&&(b-=c.outerHeight(!0))}),this.headers.each(function(){b-=a(this).outerHeight(!0)}),this.headers.next().each(function(){a(this).height(Math.max(0,b-a(this).innerHeight()+a(this).height()))}).css("overflow","auto")):"auto"===d&&(b=0,this.headers.next().each(function(){b=Math.max(b,a(this).css("height","").height())}).height(b))},_activate:function(b){var c=this._findActive(b)[0];c!==this.active[0]&&(c=c||this.active[0],this._eventHandler({target:c,currentTarget:c,preventDefault:a.noop}))},_findActive:function(b){return"number"==typeof b?this.headers.eq(b):a()},_setupEvents:function(b){var c={keydown:"_keydown"};b&&a.each(b.split(" "),function(a,b){c[b]="_eventHandler"}),this._off(this.headers.add(this.headers.next())),this._on(this.headers,c),this._on(this.headers.next(),{keydown:"_panelKeyDown"}),this._hoverable(this.headers),this._focusable(this.headers)},_eventHandler:function(b){var c=this.options,d=this.active,e=a(b.currentTarget),f=e[0]===d[0],g=f&&c.collapsible,h=g?a():e.next(),i=d.next(),j={oldHeader:d,oldPanel:i,newHeader:g?a():e,newPanel:h};b.preventDefault(),f&&!c.collapsible||this._trigger("beforeActivate",b,j)===!1||(c.active=g?!1:this.headers.index(e),this.active=f?a():e,this._toggle(j),d.removeClass("ui-accordion-header-active ui-state-active"),c.icons&&d.children(".ui-accordion-header-icon").removeClass(c.icons.activeHeader).addClass(c.icons.header),f||(e.removeClass("ui-corner-all").addClass("ui-accordion-header-active ui-state-active ui-corner-top"),c.icons&&e.children(".ui-accordion-header-icon").removeClass(c.icons.header).addClass(c.icons.activeHeader),e.next().addClass("ui-accordion-content-active")))},_toggle:function(b){var c=b.newPanel,d=this.prevShow.length?this.prevShow:b.oldPanel;this.prevShow.add(this.prevHide).stop(!0,!0),this.prevShow=c,this.prevHide=d,this.options.animate?this._animate(c,d,b):(d.hide(),c.show(),this._toggleComplete(b)),d.attr({"aria-hidden":"true"}),d.prev().attr("aria-selected","false"),c.length&&d.length?d.prev().attr({tabIndex:-1,"aria-expanded":"false"}):c.length&&this.headers.filter(function(){return 0===a(this).attr("tabIndex")}).attr("tabIndex",-1),c.attr("aria-hidden","false").prev().attr({"aria-selected":"true",tabIndex:0,"aria-expanded":"true"})},_animate:function(a,b,c){var d,e,f,g=this,h=0,i=a.length&&(!b.length||a.index()<b.index()),j=this.options.animate||{},k=i&&j.down||j,l=function(){g._toggleComplete(c)};return"number"==typeof k&&(f=k),"string"==typeof k&&(e=k),e=e||k.easing||j.easing,f=f||k.duration||j.duration,b.length?a.length?(d=a.show().outerHeight(),b.animate(this.hideProps,{duration:f,easing:e,step:function(a,b){b.now=Math.round(a)}}),void a.hide().animate(this.showProps,{duration:f,easing:e,complete:l,step:function(a,c){c.now=Math.round(a),"height"!==c.prop?h+=c.now:"content"!==g.options.heightStyle&&(c.now=Math.round(d-b.outerHeight()-h),h=0)}})):b.animate(this.hideProps,f,e,l):a.animate(this.showProps,f,e,l)},_toggleComplete:function(a){var b=a.oldPanel;b.removeClass("ui-accordion-content-active").prev().removeClass("ui-corner-top").addClass("ui-corner-all"),b.length&&(b.parent()[0].className=b.parent()[0].className),this._trigger("activate",null,a)}}),a.widget("ui.menu",{version:"1.11.2",defaultElement:"<ul>",delay:300,options:{icons:{submenu:"ui-icon-carat-1-e"},items:"> *",menus:"ul",position:{my:"left-1 top",at:"right top"},role:"menu",blur:null,focus:null,select:null},_create:function(){this.activeMenu=this.element,this.mouseHandled=!1,this.element.uniqueId().addClass("ui-menu ui-widget ui-widget-content").toggleClass("ui-menu-icons",!!this.element.find(".ui-icon").length).attr({role:this.options.role,tabIndex:0}),this.options.disabled&&this.element.addClass("ui-state-disabled").attr("aria-disabled","true"),this._on({"mousedown .ui-menu-item":function(a){a.preventDefault()},"click .ui-menu-item":function(b){var c=a(b.target);!this.mouseHandled&&c.not(".ui-state-disabled").length&&(this.select(b),b.isPropagationStopped()||(this.mouseHandled=!0),c.has(".ui-menu").length?this.expand(b):!this.element.is(":focus")&&a(this.document[0].activeElement).closest(".ui-menu").length&&(this.element.trigger("focus",[!0]),this.active&&1===this.active.parents(".ui-menu").length&&clearTimeout(this.timer)))},"mouseenter .ui-menu-item":function(b){if(!this.previousFilter){var c=a(b.currentTarget);c.siblings(".ui-state-active").removeClass("ui-state-active"),this.focus(b,c)}},mouseleave:"collapseAll","mouseleave .ui-menu":"collapseAll",focus:function(a,b){var c=this.active||this.element.find(this.options.items).eq(0);b||this.focus(a,c)},blur:function(b){this._delay(function(){a.contains(this.element[0],this.document[0].activeElement)||this.collapseAll(b)})},keydown:"_keydown"}),this.refresh(),this._on(this.document,{click:function(a){this._closeOnDocumentClick(a)&&this.collapseAll(a),this.mouseHandled=!1}})},_destroy:function(){this.element.removeAttr("aria-activedescendant").find(".ui-menu").addBack().removeClass("ui-menu ui-widget ui-widget-content ui-menu-icons ui-front").removeAttr("role").removeAttr("tabIndex").removeAttr("aria-labelledby").removeAttr("aria-expanded").removeAttr("aria-hidden").removeAttr("aria-disabled").removeUniqueId().show(),this.element.find(".ui-menu-item").removeClass("ui-menu-item").removeAttr("role").removeAttr("aria-disabled").removeUniqueId().removeClass("ui-state-hover").removeAttr("tabIndex").removeAttr("role").removeAttr("aria-haspopup").children().each(function(){var b=a(this);b.data("ui-menu-submenu-carat")&&b.remove()}),this.element.find(".ui-menu-divider").removeClass("ui-menu-divider ui-widget-content")},_keydown:function(b){var c,d,e,f,g=!0;switch(b.keyCode){case a.ui.keyCode.PAGE_UP:this.previousPage(b);break;case a.ui.keyCode.PAGE_DOWN:this.nextPage(b);break;case a.ui.keyCode.HOME:this._move("first","first",b);break;case a.ui.keyCode.END:this._move("last","last",b);break;case a.ui.keyCode.UP:this.previous(b);break;case a.ui.keyCode.DOWN:this.next(b);break;case a.ui.keyCode.LEFT:this.collapse(b);break;case a.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(b);break;case a.ui.keyCode.ENTER:case a.ui.keyCode.SPACE:this._activate(b);break;case a.ui.keyCode.ESCAPE:this.collapse(b);break;default:g=!1,d=this.previousFilter||"",e=String.fromCharCode(b.keyCode),f=!1,clearTimeout(this.filterTimer),e===d?f=!0:e=d+e,c=this._filterMenuItems(e),c=f&&-1!==c.index(this.active.next())?this.active.nextAll(".ui-menu-item"):c,c.length||(e=String.fromCharCode(b.keyCode),c=this._filterMenuItems(e)),c.length?(this.focus(b,c),this.previousFilter=e,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter}g&&b.preventDefault()},_activate:function(a){this.active.is(".ui-state-disabled")||(this.active.is("[aria-haspopup='true']")?this.expand(a):this.select(a))},refresh:function(){var b,c,d=this,e=this.options.icons.submenu,f=this.element.find(this.options.menus);this.element.toggleClass("ui-menu-icons",!!this.element.find(".ui-icon").length),f.filter(":not(.ui-menu)").addClass("ui-menu ui-widget ui-widget-content ui-front").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var b=a(this),c=b.parent(),d=a("<span>").addClass("ui-menu-icon ui-icon "+e).data("ui-menu-submenu-carat",!0);c.attr("aria-haspopup","true").prepend(d),b.attr("aria-labelledby",c.attr("id"))}),b=f.add(this.element),c=b.find(this.options.items),c.not(".ui-menu-item").each(function(){var b=a(this);d._isDivider(b)&&b.addClass("ui-widget-content ui-menu-divider")}),c.not(".ui-menu-item, .ui-menu-divider").addClass("ui-menu-item").uniqueId().attr({tabIndex:-1,role:this._itemRole()}),c.filter(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!a.contains(this.element[0],this.active[0])&&this.blur()},_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},_setOption:function(a,b){"icons"===a&&this.element.find(".ui-menu-icon").removeClass(this.options.icons.submenu).addClass(b.submenu),"disabled"===a&&this.element.toggleClass("ui-state-disabled",!!b).attr("aria-disabled",b),this._super(a,b)},focus:function(a,b){var c,d;this.blur(a,a&&"focus"===a.type),this._scrollIntoView(b),this.active=b.first(),d=this.active.addClass("ui-state-focus").removeClass("ui-state-active"),this.options.role&&this.element.attr("aria-activedescendant",d.attr("id")),this.active.parent().closest(".ui-menu-item").addClass("ui-state-active"),a&&"keydown"===a.type?this._close():this.timer=this._delay(function(){this._close()},this.delay),c=b.children(".ui-menu"),c.length&&a&&/^mouse/.test(a.type)&&this._startOpening(c),this.activeMenu=b.parent(),this._trigger("focus",a,{item:b})},_scrollIntoView:function(b){var c,d,e,f,g,h;this._hasScroll()&&(c=parseFloat(a.css(this.activeMenu[0],"borderTopWidth"))||0,d=parseFloat(a.css(this.activeMenu[0],"paddingTop"))||0,e=b.offset().top-this.activeMenu.offset().top-c-d,f=this.activeMenu.scrollTop(),g=this.activeMenu.height(),h=b.outerHeight(),0>e?this.activeMenu.scrollTop(f+e):e+h>g&&this.activeMenu.scrollTop(f+e-g+h))},blur:function(a,b){b||clearTimeout(this.timer),this.active&&(this.active.removeClass("ui-state-focus"),this.active=null,this._trigger("blur",a,{item:this.active}))},_startOpening:function(a){clearTimeout(this.timer),"true"===a.attr("aria-hidden")&&(this.timer=this._delay(function(){this._close(),this._open(a)},this.delay))},_open:function(b){var c=a.extend({of:this.active},this.options.position);clearTimeout(this.timer),this.element.find(".ui-menu").not(b.parents(".ui-menu")).hide().attr("aria-hidden","true"),b.show().removeAttr("aria-hidden").attr("aria-expanded","true").position(c)},collapseAll:function(b,c){clearTimeout(this.timer),this.timer=this._delay(function(){var d=c?this.element:a(b&&b.target).closest(this.element.find(".ui-menu"));d.length||(d=this.element),this._close(d),this.blur(b),this.activeMenu=d},this.delay)},_close:function(a){a||(a=this.active?this.active.parent():this.element),a.find(".ui-menu").hide().attr("aria-hidden","true").attr("aria-expanded","false").end().find(".ui-state-active").not(".ui-state-focus").removeClass("ui-state-active")},_closeOnDocumentClick:function(b){return!a(b.target).closest(".ui-menu").length},_isDivider:function(a){return!/[^\-\u2014\u2013\s]/.test(a.text())},collapse:function(a){var b=this.active&&this.active.parent().closest(".ui-menu-item",this.element);b&&b.length&&(this._close(),this.focus(a,b))},expand:function(a){var b=this.active&&this.active.children(".ui-menu ").find(this.options.items).first();b&&b.length&&(this._open(b.parent()),this._delay(function(){this.focus(a,b)}))},next:function(a){this._move("next","first",a)},previous:function(a){this._move("prev","last",a)},isFirstItem:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},isLastItem:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},_move:function(a,b,c){var d;this.active&&(d="first"===a||"last"===a?this.active["first"===a?"prevAll":"nextAll"](".ui-menu-item").eq(-1):this.active[a+"All"](".ui-menu-item").eq(0)),d&&d.length&&this.active||(d=this.activeMenu.find(this.options.items)[b]()),this.focus(c,d)},nextPage:function(b){var c,d,e;return this.active?void(this.isLastItem()||(this._hasScroll()?(d=this.active.offset().top,e=this.element.height(),this.active.nextAll(".ui-menu-item").each(function(){return c=a(this),c.offset().top-d-e<0}),this.focus(b,c)):this.focus(b,this.activeMenu.find(this.options.items)[this.active?"last":"first"]()))):void this.next(b)},previousPage:function(b){var c,d,e;return this.active?void(this.isFirstItem()||(this._hasScroll()?(d=this.active.offset().top,e=this.element.height(),this.active.prevAll(".ui-menu-item").each(function(){return c=a(this),c.offset().top-d+e>0}),this.focus(b,c)):this.focus(b,this.activeMenu.find(this.options.items).first()))):void this.next(b)},_hasScroll:function(){return this.element.outerHeight()<this.element.prop("scrollHeight")},select:function(b){this.active=this.active||a(b.target).closest(".ui-menu-item");var c={item:this.active};this.active.has(".ui-menu").length||this.collapseAll(b,!0),this._trigger("select",b,c)},_filterMenuItems:function(b){var c=b.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&"),d=new RegExp("^"+c,"i");return this.activeMenu.find(this.options.items).filter(".ui-menu-item").filter(function(){return d.test(a.trim(a(this).text()))})}});/*!
- * jQuery UI Autocomplete 1.11.2
- * http://jqueryui.com
- *
- * Copyright 2014 jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/autocomplete/
- */
-a.widget("ui.autocomplete",{version:"1.11.2",defaultElement:"<input>",options:{appendTo:null,autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null,change:null,close:null,focus:null,open:null,response:null,search:null,select:null},requestIndex:0,pending:0,_create:function(){var b,c,d,e=this.element[0].nodeName.toLowerCase(),f="textarea"===e,g="input"===e;this.isMultiLine=f?!0:g?!1:this.element.prop("isContentEditable"),this.valueMethod=this.element[f||g?"val":"text"],this.isNewMenu=!0,this.element.addClass("ui-autocomplete-input").attr("autocomplete","off"),this._on(this.element,{keydown:function(e){if(this.element.prop("readOnly"))return b=!0,d=!0,void(c=!0);b=!1,d=!1,c=!1;var f=a.ui.keyCode;switch(e.keyCode){case f.PAGE_UP:b=!0,this._move("previousPage",e);break;case f.PAGE_DOWN:b=!0,this._move("nextPage",e);break;case f.UP:b=!0,this._keyEvent("previous",e);break;case f.DOWN:b=!0,this._keyEvent("next",e);break;case f.ENTER:this.menu.active&&(b=!0,e.preventDefault(),this.menu.select(e));break;case f.TAB:this.menu.active&&this.menu.select(e);break;case f.ESCAPE:this.menu.element.is(":visible")&&(this.isMultiLine||this._value(this.term),this.close(e),e.preventDefault());break;default:c=!0,this._searchTimeout(e)}},keypress:function(d){if(b)return b=!1,void((!this.isMultiLine||this.menu.element.is(":visible"))&&d.preventDefault());if(!c){var e=a.ui.keyCode;switch(d.keyCode){case e.PAGE_UP:this._move("previousPage",d);break;case e.PAGE_DOWN:this._move("nextPage",d);break;case e.UP:this._keyEvent("previous",d);break;case e.DOWN:this._keyEvent("next",d)}}},input:function(a){return d?(d=!1,void a.preventDefault()):void this._searchTimeout(a)},focus:function(){this.selectedItem=null,this.previous=this._value()},blur:function(a){return this.cancelBlur?void delete this.cancelBlur:(clearTimeout(this.searching),this.close(a),void this._change(a))}}),this._initSource(),this.menu=a("<ul>").addClass("ui-autocomplete ui-front").appendTo(this._appendTo()).menu({role:null}).hide().menu("instance"),this._on(this.menu.element,{mousedown:function(b){b.preventDefault(),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur});var c=this.menu.element[0];a(b.target).closest(".ui-menu-item").length||this._delay(function(){var b=this;this.document.one("mousedown",function(d){d.target===b.element[0]||d.target===c||a.contains(c,d.target)||b.close()})})},menufocus:function(b,c){var d,e;return this.isNewMenu&&(this.isNewMenu=!1,b.originalEvent&&/^mouse/.test(b.originalEvent.type))?(this.menu.blur(),void this.document.one("mousemove",function(){a(b.target).trigger(b.originalEvent)})):(e=c.item.data("ui-autocomplete-item"),!1!==this._trigger("focus",b,{item:e})&&b.originalEvent&&/^key/.test(b.originalEvent.type)&&this._value(e.value),d=c.item.attr("aria-label")||e.value,void(d&&a.trim(d).length&&(this.liveRegion.children().hide(),a("<div>").text(d).appendTo(this.liveRegion))))},menuselect:function(a,b){var c=b.item.data("ui-autocomplete-item"),d=this.previous;this.element[0]!==this.document[0].activeElement&&(this.element.focus(),this.previous=d,this._delay(function(){this.previous=d,this.selectedItem=c})),!1!==this._trigger("select",a,{item:c})&&this._value(c.value),this.term=this._value(),this.close(a),this.selectedItem=c}}),this.liveRegion=a("<span>",{role:"status","aria-live":"assertive","aria-relevant":"additions"}).addClass("ui-helper-hidden-accessible").appendTo(this.document[0].body),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_destroy:function(){clearTimeout(this.searching),this.element.removeClass("ui-autocomplete-input").removeAttr("autocomplete"),this.menu.element.remove(),this.liveRegion.remove()},_setOption:function(a,b){this._super(a,b),"source"===a&&this._initSource(),"appendTo"===a&&this.menu.element.appendTo(this._appendTo()),"disabled"===a&&b&&this.xhr&&this.xhr.abort()},_appendTo:function(){var b=this.options.appendTo;return b&&(b=b.jquery||b.nodeType?a(b):this.document.find(b).eq(0)),b&&b[0]||(b=this.element.closest(".ui-front")),b.length||(b=this.document[0].body),b},_initSource:function(){var b,c,d=this;a.isArray(this.options.source)?(b=this.options.source,this.source=function(c,d){d(a.ui.autocomplete.filter(b,c.term))}):"string"==typeof this.options.source?(c=this.options.source,this.source=function(b,e){d.xhr&&d.xhr.abort(),d.xhr=a.ajax({url:c,data:b,dataType:"json",success:function(a){e(a)},error:function(){e([])}})}):this.source=this.options.source},_searchTimeout:function(a){clearTimeout(this.searching),this.searching=this._delay(function(){var b=this.term===this._value(),c=this.menu.element.is(":visible"),d=a.altKey||a.ctrlKey||a.metaKey||a.shiftKey;(!b||b&&!c&&!d)&&(this.selectedItem=null,this.search(null,a))},this.options.delay)},search:function(a,b){return a=null!=a?a:this._value(),this.term=this._value(),a.length<this.options.minLength?this.close(b):this._trigger("search",b)!==!1?this._search(a):void 0},_search:function(a){this.pending++,this.element.addClass("ui-autocomplete-loading"),this.cancelSearch=!1,this.source({term:a},this._response())},_response:function(){var b=++this.requestIndex;return a.proxy(function(a){b===this.requestIndex&&this.__response(a),this.pending--,this.pending||this.element.removeClass("ui-autocomplete-loading")},this)},__response:function(a){a&&(a=this._normalize(a)),this._trigger("response",null,{content:a}),!this.options.disabled&&a&&a.length&&!this.cancelSearch?(this._suggest(a),this._trigger("open")):this._close()},close:function(a){this.cancelSearch=!0,this._close(a)},_close:function(a){this.menu.element.is(":visible")&&(this.menu.element.hide(),this.menu.blur(),this.isNewMenu=!0,this._trigger("close",a))},_change:function(a){this.previous!==this._value()&&this._trigger("change",a,{item:this.selectedItem})},_normalize:function(b){return b.length&&b[0].label&&b[0].value?b:a.map(b,function(b){return"string"==typeof b?{label:b,value:b}:a.extend({},b,{label:b.label||b.value,value:b.value||b.label})})},_suggest:function(b){var c=this.menu.element.empty();this._renderMenu(c,b),this.isNewMenu=!0,this.menu.refresh(),c.show(),this._resizeMenu(),c.position(a.extend({of:this.element},this.options.position)),this.options.autoFocus&&this.menu.next()},_resizeMenu:function(){var a=this.menu.element;a.outerWidth(Math.max(a.width("").outerWidth()+1,this.element.outerWidth()))},_renderMenu:function(b,c){var d=this;a.each(c,function(a,c){d._renderItemData(b,c)})},_renderItemData:function(a,b){return this._renderItem(a,b).data("ui-autocomplete-item",b)},_renderItem:function(b,c){return a("<li>").text(c.label).appendTo(b)},_move:function(a,b){return this.menu.element.is(":visible")?this.menu.isFirstItem()&&/^previous/.test(a)||this.menu.isLastItem()&&/^next/.test(a)?(this.isMultiLine||this._value(this.term),void this.menu.blur()):void this.menu[a](b):void this.search(null,b)},widget:function(){return this.menu.element},_value:function(){return this.valueMethod.apply(this.element,arguments)},_keyEvent:function(a,b){(!this.isMultiLine||this.menu.element.is(":visible"))&&(this._move(a,b),b.preventDefault())}}),a.extend(a.ui.autocomplete,{escapeRegex:function(a){return a.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")},filter:function(b,c){var d=new RegExp(a.ui.autocomplete.escapeRegex(c),"i");return a.grep(b,function(a){return d.test(a.label||a.value||a)})}}),a.widget("ui.autocomplete",a.ui.autocomplete,{options:{messages:{noResults:"No search results.",results:function(a){return a+(a>1?" results are":" result is")+" available, use up and down arrow keys to navigate."}}},__response:function(b){var c;this._superApply(arguments),this.options.disabled||this.cancelSearch||(c=b&&b.length?this.options.messages.results(b.length):this.options.messages.noResults,this.liveRegion.children().hide(),a("<div>").text(c).appendTo(this.liveRegion))}});var m,n=(a.ui.autocomplete,"ui-button ui-widget ui-state-default ui-corner-all"),o="ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only",p=function(){var b=a(this);setTimeout(function(){b.find(":ui-button").button("refresh")},1)},q=function(b){var c=b.name,d=b.form,e=a([]);return c&&(c=c.replace(/'/g,"\\'"),e=d?a(d).find("[name='"+c+"'][type=radio]"):a("[name='"+c+"'][type=radio]",b.ownerDocument).filter(function(){return!this.form})),e};a.widget("ui.button",{version:"1.11.2",defaultElement:"<button>",options:{disabled:null,text:!0,label:null,icons:{primary:null,secondary:null}},_create:function(){this.element.closest("form").unbind("reset"+this.eventNamespace).bind("reset"+this.eventNamespace,p),"boolean"!=typeof this.options.disabled?this.options.disabled=!!this.element.prop("disabled"):this.element.prop("disabled",this.options.disabled),this._determineButtonType(),this.hasTitle=!!this.buttonElement.attr("title");var b=this,c=this.options,d="checkbox"===this.type||"radio"===this.type,e=d?"":"ui-state-active";null===c.label&&(c.label="input"===this.type?this.buttonElement.val():this.buttonElement.html()),this._hoverable(this.buttonElement),this.buttonElement.addClass(n).attr("role","button").bind("mouseenter"+this.eventNamespace,function(){c.disabled||this===m&&a(this).addClass("ui-state-active")}).bind("mouseleave"+this.eventNamespace,function(){c.disabled||a(this).removeClass(e)}).bind("click"+this.eventNamespace,function(a){c.disabled&&(a.preventDefault(),a.stopImmediatePropagation())}),this._on({focus:function(){this.buttonElement.addClass("ui-state-focus")},blur:function(){this.buttonElement.removeClass("ui-state-focus")}}),d&&this.element.bind("change"+this.eventNamespace,function(){b.refresh()}),"checkbox"===this.type?this.buttonElement.bind("click"+this.eventNamespace,function(){return c.disabled?!1:void 0}):"radio"===this.type?this.buttonElement.bind("click"+this.eventNamespace,function(){if(c.disabled)return!1;a(this).addClass("ui-state-active"),b.buttonElement.attr("aria-pressed","true");var d=b.element[0];q(d).not(d).map(function(){return a(this).button("widget")[0]}).removeClass("ui-state-active").attr("aria-pressed","false")}):(this.buttonElement.bind("mousedown"+this.eventNamespace,function(){return c.disabled?!1:(a(this).addClass("ui-state-active"),m=this,void b.document.one("mouseup",function(){m=null}))}).bind("mouseup"+this.eventNamespace,function(){return c.disabled?!1:void a(this).removeClass("ui-state-active")}).bind("keydown"+this.eventNamespace,function(b){return c.disabled?!1:void((b.keyCode===a.ui.keyCode.SPACE||b.keyCode===a.ui.keyCode.ENTER)&&a(this).addClass("ui-state-active"))}).bind("keyup"+this.eventNamespace+" blur"+this.eventNamespace,function(){a(this).removeClass("ui-state-active")}),this.buttonElement.is("a")&&this.buttonElement.keyup(function(b){b.keyCode===a.ui.keyCode.SPACE&&a(this).click()})),this._setOption("disabled",c.disabled),this._resetButton()},_determineButtonType:function(){var a,b,c;this.type=this.element.is("[type=checkbox]")?"checkbox":this.element.is("[type=radio]")?"radio":this.element.is("input")?"input":"button","checkbox"===this.type||"radio"===this.type?(a=this.element.parents().last(),b="label[for='"+this.element.attr("id")+"']",this.buttonElement=a.find(b),this.buttonElement.length||(a=a.length?a.siblings():this.element.siblings(),this.buttonElement=a.filter(b),this.buttonElement.length||(this.buttonElement=a.find(b))),this.element.addClass("ui-helper-hidden-accessible"),c=this.element.is(":checked"),c&&this.buttonElement.addClass("ui-state-active"),this.buttonElement.prop("aria-pressed",c)):this.buttonElement=this.element},widget:function(){return this.buttonElement},_destroy:function(){this.element.removeClass("ui-helper-hidden-accessible"),this.buttonElement.removeClass(n+" ui-state-active "+o).removeAttr("role").removeAttr("aria-pressed").html(this.buttonElement.find(".ui-button-text").html()),this.hasTitle||this.buttonElement.removeAttr("title")},_setOption:function(a,b){return this._super(a,b),"disabled"===a?(this.widget().toggleClass("ui-state-disabled",!!b),this.element.prop("disabled",!!b),void(b&&this.buttonElement.removeClass("checkbox"===this.type||"radio"===this.type?"ui-state-focus":"ui-state-focus ui-state-active"))):void this._resetButton()},refresh:function(){var b=this.element.is("input, button")?this.element.is(":disabled"):this.element.hasClass("ui-button-disabled");b!==this.options.disabled&&this._setOption("disabled",b),"radio"===this.type?q(this.element[0]).each(function(){a(this).is(":checked")?a(this).button("widget").addClass("ui-state-active").attr("aria-pressed","true"):a(this).button("widget").removeClass("ui-state-active").attr("aria-pressed","false")}):"checkbox"===this.type&&(this.element.is(":checked")?this.buttonElement.addClass("ui-state-active").attr("aria-pressed","true"):this.buttonElement.removeClass("ui-state-active").attr("aria-pressed","false"))},_resetButton:function(){if("input"===this.type)return void(this.options.label&&this.element.val(this.options.label));var b=this.buttonElement.removeClass(o),c=a("<span></span>",this.document[0]).addClass("ui-button-text").html(this.options.label).appendTo(b.empty()).text(),d=this.options.icons,e=d.primary&&d.secondary,f=[];d.primary||d.secondary?(this.options.text&&f.push("ui-button-text-icon"+(e?"s":d.primary?"-primary":"-secondary")),d.primary&&b.prepend("<span class='ui-button-icon-primary ui-icon "+d.primary+"'></span>"),d.secondary&&b.append("<span class='ui-button-icon-secondary ui-icon "+d.secondary+"'></span>"),this.options.text||(f.push(e?"ui-button-icons-only":"ui-button-icon-only"),this.hasTitle||b.attr("title",a.trim(c)))):f.push("ui-button-text-only"),b.addClass(f.join(" "))}}),a.widget("ui.buttonset",{version:"1.11.2",options:{items:"button, input[type=button], input[type=submit], input[type=reset], input[type=checkbox], input[type=radio], a, :data(ui-button)"},_create:function(){this.element.addClass("ui-buttonset")},_init:function(){this.refresh()},_setOption:function(a,b){"disabled"===a&&this.buttons.button("option",a,b),this._super(a,b)},refresh:function(){var b="rtl"===this.element.css("direction"),c=this.element.find(this.options.items),d=c.filter(":ui-button");c.not(":ui-button").button(),d.button("refresh"),this.buttons=c.map(function(){return a(this).button("widget")[0]}).removeClass("ui-corner-all ui-corner-left ui-corner-right").filter(":first").addClass(b?"ui-corner-right":"ui-corner-left").end().filter(":last").addClass(b?"ui-corner-left":"ui-corner-right").end().end()},_destroy:function(){this.element.removeClass("ui-buttonset"),this.buttons.map(function(){return a(this).button("widget")[0]}).removeClass("ui-corner-left ui-corner-right").end().button("destroy")}});a.ui.button;/*!
- * jQuery UI Datepicker 1.11.2
- * http://jqueryui.com
- *
- * Copyright 2014 jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/datepicker/
- */
-a.extend(a.ui,{datepicker:{version:"1.11.2"}});var r;a.extend(e.prototype,{markerClassName:"hasDatepicker",maxRows:4,_widgetDatepicker:function(){return this.dpDiv},setDefaults:function(a){return h(this._defaults,a||{}),this},_attachDatepicker:function(b,c){var d,e,f;d=b.nodeName.toLowerCase(),e="div"===d||"span"===d,b.id||(this.uuid+=1,b.id="dp"+this.uuid),f=this._newInst(a(b),e),f.settings=a.extend({},c||{}),"input"===d?this._connectDatepicker(b,f):e&&this._inlineDatepicker(b,f)},_newInst:function(b,c){var d=b[0].id.replace(/([^A-Za-z0-9_\-])/g,"\\\\$1");return{id:d,input:b,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:c,dpDiv:c?f(a("<div class='"+this._inlineClass+" ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>")):this.dpDiv}},_connectDatepicker:function(b,c){var d=a(b);c.append=a([]),c.trigger=a([]),d.hasClass(this.markerClassName)||(this._attachments(d,c),d.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).keyup(this._doKeyUp),this._autoSize(c),a.data(b,"datepicker",c),c.settings.disabled&&this._disableDatepicker(b))},_attachments:function(b,c){var d,e,f,g=this._get(c,"appendText"),h=this._get(c,"isRTL");c.append&&c.append.remove(),g&&(c.append=a("<span class='"+this._appendClass+"'>"+g+"</span>"),b[h?"before":"after"](c.append)),b.unbind("focus",this._showDatepicker),c.trigger&&c.trigger.remove(),d=this._get(c,"showOn"),("focus"===d||"both"===d)&&b.focus(this._showDatepicker),("button"===d||"both"===d)&&(e=this._get(c,"buttonText"),f=this._get(c,"buttonImage"),c.trigger=a(this._get(c,"buttonImageOnly")?a("<img/>").addClass(this._triggerClass).attr({src:f,alt:e,title:e}):a("<button type='button'></button>").addClass(this._triggerClass).html(f?a("<img/>").attr({src:f,alt:e,title:e}):e)),b[h?"before":"after"](c.trigger),c.trigger.click(function(){return a.datepicker._datepickerShowing&&a.datepicker._lastInput===b[0]?a.datepicker._hideDatepicker():a.datepicker._datepickerShowing&&a.datepicker._lastInput!==b[0]?(a.datepicker._hideDatepicker(),a.datepicker._showDatepicker(b[0])):a.datepicker._showDatepicker(b[0]),!1}))},_autoSize:function(a){if(this._get(a,"autoSize")&&!a.inline){var b,c,d,e,f=new Date(2009,11,20),g=this._get(a,"dateFormat");g.match(/[DM]/)&&(b=function(a){for(c=0,d=0,e=0;e<a.length;e++)a[e].length>c&&(c=a[e].length,d=e);return d},f.setMonth(b(this._get(a,g.match(/MM/)?"monthNames":"monthNamesShort"))),f.setDate(b(this._get(a,g.match(/DD/)?"dayNames":"dayNamesShort"))+20-f.getDay())),a.input.attr("size",this._formatDate(a,f).length)}},_inlineDatepicker:function(b,c){var d=a(b);d.hasClass(this.markerClassName)||(d.addClass(this.markerClassName).append(c.dpDiv),a.data(b,"datepicker",c),this._setDate(c,this._getDefaultDate(c),!0),this._updateDatepicker(c),this._updateAlternate(c),c.settings.disabled&&this._disableDatepicker(b),c.dpDiv.css("display","block"))},_dialogDatepicker:function(b,c,d,e,f){var g,i,j,k,l,m=this._dialogInst;return m||(this.uuid+=1,g="dp"+this.uuid,this._dialogInput=a("<input type='text' id='"+g+"' style='position: absolute; top: -100px; width: 0px;'/>"),this._dialogInput.keydown(this._doKeyDown),a("body").append(this._dialogInput),m=this._dialogInst=this._newInst(this._dialogInput,!1),m.settings={},a.data(this._dialogInput[0],"datepicker",m)),h(m.settings,e||{}),c=c&&c.constructor===Date?this._formatDate(m,c):c,this._dialogInput.val(c),this._pos=f?f.length?f:[f.pageX,f.pageY]:null,this._pos||(i=document.documentElement.clientWidth,j=document.documentElement.clientHeight,k=document.documentElement.scrollLeft||document.body.scrollLeft,l=document.documentElement.scrollTop||document.body.scrollTop,this._pos=[i/2-100+k,j/2-150+l]),this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px"),m.settings.onSelect=d,this._inDialog=!0,this.dpDiv.addClass(this._dialogClass),this._showDatepicker(this._dialogInput[0]),a.blockUI&&a.blockUI(this.dpDiv),a.data(this._dialogInput[0],"datepicker",m),this},_destroyDatepicker:function(b){var c,d=a(b),e=a.data(b,"datepicker");d.hasClass(this.markerClassName)&&(c=b.nodeName.toLowerCase(),a.removeData(b,"datepicker"),"input"===c?(e.append.remove(),e.trigger.remove(),d.removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",this._doKeyUp)):("div"===c||"span"===c)&&d.removeClass(this.markerClassName).empty())},_enableDatepicker:function(b){var c,d,e=a(b),f=a.data(b,"datepicker");e.hasClass(this.markerClassName)&&(c=b.nodeName.toLowerCase(),"input"===c?(b.disabled=!1,f.trigger.filter("button").each(function(){this.disabled=!1}).end().filter("img").css({opacity:"1.0",cursor:""})):("div"===c||"span"===c)&&(d=e.children("."+this._inlineClass),d.children().removeClass("ui-state-disabled"),d.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!1)),this._disabledInputs=a.map(this._disabledInputs,function(a){return a===b?null:a}))},_disableDatepicker:function(b){var c,d,e=a(b),f=a.data(b,"datepicker");e.hasClass(this.markerClassName)&&(c=b.nodeName.toLowerCase(),"input"===c?(b.disabled=!0,f.trigger.filter("button").each(function(){this.disabled=!0}).end().filter("img").css({opacity:"0.5",cursor:"default"})):("div"===c||"span"===c)&&(d=e.children("."+this._inlineClass),d.children().addClass("ui-state-disabled"),d.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!0)),this._disabledInputs=a.map(this._disabledInputs,function(a){return a===b?null:a}),this._disabledInputs[this._disabledInputs.length]=b)},_isDisabledDatepicker:function(a){if(!a)return!1;for(var b=0;b<this._disabledInputs.length;b++)if(this._disabledInputs[b]===a)return!0;return!1},_getInst:function(b){try{return a.data(b,"datepicker")}catch(c){throw"Missing instance data for this datepicker"}},_optionDatepicker:function(b,c,d){var e,f,g,i,j=this._getInst(b);return 2===arguments.length&&"string"==typeof c?"defaults"===c?a.extend({},a.datepicker._defaults):j?"all"===c?a.extend({},j.settings):this._get(j,c):null:(e=c||{},"string"==typeof c&&(e={},e[c]=d),void(j&&(this._curInst===j&&this._hideDatepicker(),f=this._getDateDatepicker(b,!0),g=this._getMinMaxDate(j,"min"),i=this._getMinMaxDate(j,"max"),h(j.settings,e),null!==g&&void 0!==e.dateFormat&&void 0===e.minDate&&(j.settings.minDate=this._formatDate(j,g)),null!==i&&void 0!==e.dateFormat&&void 0===e.maxDate&&(j.settings.maxDate=this._formatDate(j,i)),"disabled"in e&&(e.disabled?this._disableDatepicker(b):this._enableDatepicker(b)),this._attachments(a(b),j),this._autoSize(j),this._setDate(j,f),this._updateAlternate(j),this._updateDatepicker(j))))},_changeDatepicker:function(a,b,c){this._optionDatepicker(a,b,c)},_refreshDatepicker:function(a){var b=this._getInst(a);b&&this._updateDatepicker(b)},_setDateDatepicker:function(a,b){var c=this._getInst(a);c&&(this._setDate(c,b),this._updateDatepicker(c),this._updateAlternate(c))},_getDateDatepicker:function(a,b){var c=this._getInst(a);return c&&!c.inline&&this._setDateFromField(c,b),c?this._getDate(c):null},_doKeyDown:function(b){var c,d,e,f=a.datepicker._getInst(b.target),g=!0,h=f.dpDiv.is(".ui-datepicker-rtl");if(f._keyEvent=!0,a.datepicker._datepickerShowing)switch(b.keyCode){case 9:a.datepicker._hideDatepicker(),g=!1;break;case 13:return e=a("td."+a.datepicker._dayOverClass+":not(."+a.datepicker._currentClass+")",f.dpDiv),e[0]&&a.datepicker._selectDay(b.target,f.selectedMonth,f.selectedYear,e[0]),c=a.datepicker._get(f,"onSelect"),c?(d=a.datepicker._formatDate(f),c.apply(f.input?f.input[0]:null,[d,f])):a.datepicker._hideDatepicker(),!1;case 27:a.datepicker._hideDatepicker();break;case 33:a.datepicker._adjustDate(b.target,b.ctrlKey?-a.datepicker._get(f,"stepBigMonths"):-a.datepicker._get(f,"stepMonths"),"M");break;case 34:a.datepicker._adjustDate(b.target,b.ctrlKey?+a.datepicker._get(f,"stepBigMonths"):+a.datepicker._get(f,"stepMonths"),"M");break;case 35:(b.ctrlKey||b.metaKey)&&a.datepicker._clearDate(b.target),g=b.ctrlKey||b.metaKey;break;case 36:(b.ctrlKey||b.metaKey)&&a.datepicker._gotoToday(b.target),g=b.ctrlKey||b.metaKey;break;case 37:(b.ctrlKey||b.metaKey)&&a.datepicker._adjustDate(b.target,h?1:-1,"D"),g=b.ctrlKey||b.metaKey,b.originalEvent.altKey&&a.datepicker._adjustDate(b.target,b.ctrlKey?-a.datepicker._get(f,"stepBigMonths"):-a.datepicker._get(f,"stepMonths"),"M");break;case 38:(b.ctrlKey||b.metaKey)&&a.datepicker._adjustDate(b.target,-7,"D"),g=b.ctrlKey||b.metaKey;break;case 39:(b.ctrlKey||b.metaKey)&&a.datepicker._adjustDate(b.target,h?-1:1,"D"),g=b.ctrlKey||b.metaKey,b.originalEvent.altKey&&a.datepicker._adjustDate(b.target,b.ctrlKey?+a.datepicker._get(f,"stepBigMonths"):+a.datepicker._get(f,"stepMonths"),"M");break;case 40:(b.ctrlKey||b.metaKey)&&a.datepicker._adjustDate(b.target,7,"D"),g=b.ctrlKey||b.metaKey;break;default:g=!1}else 36===b.keyCode&&b.ctrlKey?a.datepicker._showDatepicker(this):g=!1;g&&(b.preventDefault(),b.stopPropagation())},_doKeyPress:function(b){var c,d,e=a.datepicker._getInst(b.target);return a.datepicker._get(e,"constrainInput")?(c=a.datepicker._possibleChars(a.datepicker._get(e,"dateFormat")),d=String.fromCharCode(null==b.charCode?b.keyCode:b.charCode),b.ctrlKey||b.metaKey||" ">d||!c||c.indexOf(d)>-1):void 0},_doKeyUp:function(b){var c,d=a.datepicker._getInst(b.target);if(d.input.val()!==d.lastVal)try{c=a.datepicker.parseDate(a.datepicker._get(d,"dateFormat"),d.input?d.input.val():null,a.datepicker._getFormatConfig(d)),c&&(a.datepicker._setDateFromField(d),a.datepicker._updateAlternate(d),a.datepicker._updateDatepicker(d))}catch(e){}return!0},_showDatepicker:function(b){if(b=b.target||b,"input"!==b.nodeName.toLowerCase()&&(b=a("input",b.parentNode)[0]),!a.datepicker._isDisabledDatepicker(b)&&a.datepicker._lastInput!==b){var c,e,f,g,i,j,k;c=a.datepicker._getInst(b),a.datepicker._curInst&&a.datepicker._curInst!==c&&(a.datepicker._curInst.dpDiv.stop(!0,!0),c&&a.datepicker._datepickerShowing&&a.datepicker._hideDatepicker(a.datepicker._curInst.input[0])),e=a.datepicker._get(c,"beforeShow"),f=e?e.apply(b,[b,c]):{},f!==!1&&(h(c.settings,f),c.lastVal=null,a.datepicker._lastInput=b,a.datepicker._setDateFromField(c),a.datepicker._inDialog&&(b.value=""),a.datepicker._pos||(a.datepicker._pos=a.datepicker._findPos(b),a.datepicker._pos[1]+=b.offsetHeight),g=!1,a(b).parents().each(function(){return g|="fixed"===a(this).css("position"),!g}),i={left:a.datepicker._pos[0],top:a.datepicker._pos[1]},a.datepicker._pos=null,c.dpDiv.empty(),c.dpDiv.css({position:"absolute",display:"block",top:"-1000px"}),a.datepicker._updateDatepicker(c),i=a.datepicker._checkOffset(c,i,g),c.dpDiv.css({position:a.datepicker._inDialog&&a.blockUI?"static":g?"fixed":"absolute",display:"none",left:i.left+"px",top:i.top+"px"}),c.inline||(j=a.datepicker._get(c,"showAnim"),k=a.datepicker._get(c,"duration"),c.dpDiv.css("z-index",d(a(b))+1),a.datepicker._datepickerShowing=!0,a.effects&&a.effects.effect[j]?c.dpDiv.show(j,a.datepicker._get(c,"showOptions"),k):c.dpDiv[j||"show"](j?k:null),a.datepicker._shouldFocusInput(c)&&c.input.focus(),a.datepicker._curInst=c))}},_updateDatepicker:function(b){this.maxRows=4,r=b,b.dpDiv.empty().append(this._generateHTML(b)),this._attachHandlers(b);var c,d=this._getNumberOfMonths(b),e=d[1],f=17,h=b.dpDiv.find("."+this._dayOverClass+" a");h.length>0&&g.apply(h.get(0)),b.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width(""),e>1&&b.dpDiv.addClass("ui-datepicker-multi-"+e).css("width",f*e+"em"),b.dpDiv[(1!==d[0]||1!==d[1]?"add":"remove")+"Class"]("ui-datepicker-multi"),b.dpDiv[(this._get(b,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl"),b===a.datepicker._curInst&&a.datepicker._datepickerShowing&&a.datepicker._shouldFocusInput(b)&&b.input.focus(),b.yearshtml&&(c=b.yearshtml,setTimeout(function(){c===b.yearshtml&&b.yearshtml&&b.dpDiv.find("select.ui-datepicker-year:first").replaceWith(b.yearshtml),c=b.yearshtml=null},0))},_shouldFocusInput:function(a){return a.input&&a.input.is(":visible")&&!a.input.is(":disabled")&&!a.input.is(":focus")},_checkOffset:function(b,c,d){var e=b.dpDiv.outerWidth(),f=b.dpDiv.outerHeight(),g=b.input?b.input.outerWidth():0,h=b.input?b.input.outerHeight():0,i=document.documentElement.clientWidth+(d?0:a(document).scrollLeft()),j=document.documentElement.clientHeight+(d?0:a(document).scrollTop());return c.left-=this._get(b,"isRTL")?e-g:0,c.left-=d&&c.left===b.input.offset().left?a(document).scrollLeft():0,c.top-=d&&c.top===b.input.offset().top+h?a(document).scrollTop():0,c.left-=Math.min(c.left,c.left+e>i&&i>e?Math.abs(c.left+e-i):0),c.top-=Math.min(c.top,c.top+f>j&&j>f?Math.abs(f+h):0),c},_findPos:function(b){for(var c,d=this._getInst(b),e=this._get(d,"isRTL");b&&("hidden"===b.type||1!==b.nodeType||a.expr.filters.hidden(b));)b=b[e?"previousSibling":"nextSibling"];return c=a(b).offset(),[c.left,c.top]},_hideDatepicker:function(b){var c,d,e,f,g=this._curInst;!g||b&&g!==a.data(b,"datepicker")||this._datepickerShowing&&(c=this._get(g,"showAnim"),d=this._get(g,"duration"),e=function(){a.datepicker._tidyDialog(g)},a.effects&&(a.effects.effect[c]||a.effects[c])?g.dpDiv.hide(c,a.datepicker._get(g,"showOptions"),d,e):g.dpDiv["slideDown"===c?"slideUp":"fadeIn"===c?"fadeOut":"hide"](c?d:null,e),c||e(),this._datepickerShowing=!1,f=this._get(g,"onClose"),f&&f.apply(g.input?g.input[0]:null,[g.input?g.input.val():"",g]),this._lastInput=null,this._inDialog&&(this._dialogInput.css({position:"absolute",left:"0",top:"-100px"}),a.blockUI&&(a.unblockUI(),a("body").append(this.dpDiv))),this._inDialog=!1)},_tidyDialog:function(a){a.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")},_checkExternalClick:function(b){if(a.datepicker._curInst){var c=a(b.target),d=a.datepicker._getInst(c[0]);(c[0].id!==a.datepicker._mainDivId&&0===c.parents("#"+a.datepicker._mainDivId).length&&!c.hasClass(a.datepicker.markerClassName)&&!c.closest("."+a.datepicker._triggerClass).length&&a.datepicker._datepickerShowing&&(!a.datepicker._inDialog||!a.blockUI)||c.hasClass(a.datepicker.markerClassName)&&a.datepicker._curInst!==d)&&a.datepicker._hideDatepicker()}},_adjustDate:function(b,c,d){var e=a(b),f=this._getInst(e[0]);this._isDisabledDatepicker(e[0])||(this._adjustInstDate(f,c+("M"===d?this._get(f,"showCurrentAtPos"):0),d),this._updateDatepicker(f))},_gotoToday:function(b){var c,d=a(b),e=this._getInst(d[0]);this._get(e,"gotoCurrent")&&e.currentDay?(e.selectedDay=e.currentDay,e.drawMonth=e.selectedMonth=e.currentMonth,e.drawYear=e.selectedYear=e.currentYear):(c=new Date,e.selectedDay=c.getDate(),e.drawMonth=e.selectedMonth=c.getMonth(),e.drawYear=e.selectedYear=c.getFullYear()),this._notifyChange(e),this._adjustDate(d)},_selectMonthYear:function(b,c,d){var e=a(b),f=this._getInst(e[0]);f["selected"+("M"===d?"Month":"Year")]=f["draw"+("M"===d?"Month":"Year")]=parseInt(c.options[c.selectedIndex].value,10),this._notifyChange(f),this._adjustDate(e)},_selectDay:function(b,c,d,e){var f,g=a(b);a(e).hasClass(this._unselectableClass)||this._isDisabledDatepicker(g[0])||(f=this._getInst(g[0]),f.selectedDay=f.currentDay=a("a",e).html(),f.selectedMonth=f.currentMonth=c,f.selectedYear=f.currentYear=d,this._selectDate(b,this._formatDate(f,f.currentDay,f.currentMonth,f.currentYear)))},_clearDate:function(b){var c=a(b);this._selectDate(c,"")},_selectDate:function(b,c){var d,e=a(b),f=this._getInst(e[0]);c=null!=c?c:this._formatDate(f),f.input&&f.input.val(c),this._updateAlternate(f),d=this._get(f,"onSelect"),d?d.apply(f.input?f.input[0]:null,[c,f]):f.input&&f.input.trigger("change"),f.inline?this._updateDatepicker(f):(this._hideDatepicker(),this._lastInput=f.input[0],"object"!=typeof f.input[0]&&f.input.focus(),this._lastInput=null)},_updateAlternate:function(b){var c,d,e,f=this._get(b,"altField");f&&(c=this._get(b,"altFormat")||this._get(b,"dateFormat"),d=this._getDate(b),e=this.formatDate(c,d,this._getFormatConfig(b)),a(f).each(function(){a(this).val(e)}))},noWeekends:function(a){var b=a.getDay();return[b>0&&6>b,""]},iso8601Week:function(a){var b,c=new Date(a.getTime());return c.setDate(c.getDate()+4-(c.getDay()||7)),b=c.getTime(),c.setMonth(0),c.setDate(1),Math.floor(Math.round((b-c)/864e5)/7)+1},parseDate:function(b,c,d){if(null==b||null==c)throw"Invalid arguments";if(c="object"==typeof c?c.toString():c+"",""===c)return null;var e,f,g,h,i=0,j=(d?d.shortYearCutoff:null)||this._defaults.shortYearCutoff,k="string"!=typeof j?j:(new Date).getFullYear()%100+parseInt(j,10),l=(d?d.dayNamesShort:null)||this._defaults.dayNamesShort,m=(d?d.dayNames:null)||this._defaults.dayNames,n=(d?d.monthNamesShort:null)||this._defaults.monthNamesShort,o=(d?d.monthNames:null)||this._defaults.monthNames,p=-1,q=-1,r=-1,s=-1,t=!1,u=function(a){var c=e+1<b.length&&b.charAt(e+1)===a;return c&&e++,c},v=function(a){var b=u(a),d="@"===a?14:"!"===a?20:"y"===a&&b?4:"o"===a?3:2,e="y"===a?d:1,f=new RegExp("^\\d{"+e+","+d+"}"),g=c.substring(i).match(f);if(!g)throw"Missing number at position "+i;return i+=g[0].length,parseInt(g[0],10)},w=function(b,d,e){var f=-1,g=a.map(u(b)?e:d,function(a,b){return[[b,a]]}).sort(function(a,b){return-(a[1].length-b[1].length)});if(a.each(g,function(a,b){var d=b[1];return c.substr(i,d.length).toLowerCase()===d.toLowerCase()?(f=b[0],i+=d.length,!1):void 0}),-1!==f)return f+1;throw"Unknown name at position "+i},x=function(){if(c.charAt(i)!==b.charAt(e))throw"Unexpected literal at position "+i;i++};for(e=0;e<b.length;e++)if(t)"'"!==b.charAt(e)||u("'")?x():t=!1;else switch(b.charAt(e)){case"d":r=v("d");break;case"D":w("D",l,m);break;case"o":s=v("o");break;case"m":q=v("m");break;case"M":q=w("M",n,o);break;case"y":p=v("y");break;case"@":h=new Date(v("@")),p=h.getFullYear(),q=h.getMonth()+1,r=h.getDate();break;case"!":h=new Date((v("!")-this._ticksTo1970)/1e4),p=h.getFullYear(),q=h.getMonth()+1,r=h.getDate();break;case"'":u("'")?x():t=!0;break;default:x()}if(i<c.length&&(g=c.substr(i),!/^\s+/.test(g)))throw"Extra/unparsed characters found in date: "+g;if(-1===p?p=(new Date).getFullYear():100>p&&(p+=(new Date).getFullYear()-(new Date).getFullYear()%100+(k>=p?0:-100)),s>-1)for(q=1,r=s;;){if(f=this._getDaysInMonth(p,q-1),f>=r)break;q++,r-=f}if(h=this._daylightSavingAdjust(new Date(p,q-1,r)),h.getFullYear()!==p||h.getMonth()+1!==q||h.getDate()!==r)throw"Invalid date";return h},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:24*(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925))*60*60*1e7,formatDate:function(a,b,c){if(!b)return"";var d,e=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,f=(c?c.dayNames:null)||this._defaults.dayNames,g=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort,h=(c?c.monthNames:null)||this._defaults.monthNames,i=function(b){var c=d+1<a.length&&a.charAt(d+1)===b;return c&&d++,c},j=function(a,b,c){var d=""+b;if(i(a))for(;d.length<c;)d="0"+d;return d},k=function(a,b,c,d){return i(a)?d[b]:c[b]},l="",m=!1;if(b)for(d=0;d<a.length;d++)if(m)"'"!==a.charAt(d)||i("'")?l+=a.charAt(d):m=!1;else switch(a.charAt(d)){case"d":l+=j("d",b.getDate(),2);break;case"D":l+=k("D",b.getDay(),e,f);break;case"o":l+=j("o",Math.round((new Date(b.getFullYear(),b.getMonth(),b.getDate()).getTime()-new Date(b.getFullYear(),0,0).getTime())/864e5),3);break;case"m":l+=j("m",b.getMonth()+1,2);break;case"M":l+=k("M",b.getMonth(),g,h);break;case"y":l+=i("y")?b.getFullYear():(b.getYear()%100<10?"0":"")+b.getYear()%100;break;case"@":l+=b.getTime();break;case"!":l+=1e4*b.getTime()+this._ticksTo1970;break;case"'":i("'")?l+="'":m=!0;break;default:l+=a.charAt(d)}return l},_possibleChars:function(a){var b,c="",d=!1,e=function(c){var d=b+1<a.length&&a.charAt(b+1)===c;return d&&b++,d};for(b=0;b<a.length;b++)if(d)"'"!==a.charAt(b)||e("'")?c+=a.charAt(b):d=!1;else switch(a.charAt(b)){case"d":case"m":case"y":case"@":c+="0123456789";break;case"D":case"M":return null;case"'":e("'")?c+="'":d=!0;break;default:c+=a.charAt(b)}return c},_get:function(a,b){return void 0!==a.settings[b]?a.settings[b]:this._defaults[b]},_setDateFromField:function(a,b){if(a.input.val()!==a.lastVal){var c=this._get(a,"dateFormat"),d=a.lastVal=a.input?a.input.val():null,e=this._getDefaultDate(a),f=e,g=this._getFormatConfig(a);try{f=this.parseDate(c,d,g)||e}catch(h){d=b?"":d}a.selectedDay=f.getDate(),a.drawMonth=a.selectedMonth=f.getMonth(),a.drawYear=a.selectedYear=f.getFullYear(),a.currentDay=d?f.getDate():0,a.currentMonth=d?f.getMonth():0,a.currentYear=d?f.getFullYear():0,this._adjustInstDate(a)}},_getDefaultDate:function(a){return this._restrictMinMax(a,this._determineDate(a,this._get(a,"defaultDate"),new Date))},_determineDate:function(b,c,d){var e=function(a){var b=new Date;return b.setDate(b.getDate()+a),b},f=function(c){try{return a.datepicker.parseDate(a.datepicker._get(b,"dateFormat"),c,a.datepicker._getFormatConfig(b))}catch(d){}for(var e=(c.toLowerCase().match(/^c/)?a.datepicker._getDate(b):null)||new Date,f=e.getFullYear(),g=e.getMonth(),h=e.getDate(),i=/([+\-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,j=i.exec(c);j;){switch(j[2]||"d"){case"d":case"D":h+=parseInt(j[1],10);break;case"w":case"W":h+=7*parseInt(j[1],10);break;case"m":case"M":g+=parseInt(j[1],10),h=Math.min(h,a.datepicker._getDaysInMonth(f,g));break;case"y":case"Y":f+=parseInt(j[1],10),h=Math.min(h,a.datepicker._getDaysInMonth(f,g))}j=i.exec(c)}return new Date(f,g,h)},g=null==c||""===c?d:"string"==typeof c?f(c):"number"==typeof c?isNaN(c)?d:e(c):new Date(c.getTime());return g=g&&"Invalid Date"===g.toString()?d:g,g&&(g.setHours(0),g.setMinutes(0),g.setSeconds(0),g.setMilliseconds(0)),this._daylightSavingAdjust(g)},_daylightSavingAdjust:function(a){return a?(a.setHours(a.getHours()>12?a.getHours()+2:0),a):null},_setDate:function(a,b,c){var d=!b,e=a.selectedMonth,f=a.selectedYear,g=this._restrictMinMax(a,this._determineDate(a,b,new Date));a.selectedDay=a.currentDay=g.getDate(),a.drawMonth=a.selectedMonth=a.currentMonth=g.getMonth(),a.drawYear=a.selectedYear=a.currentYear=g.getFullYear(),e===a.selectedMonth&&f===a.selectedYear||c||this._notifyChange(a),this._adjustInstDate(a),a.input&&a.input.val(d?"":this._formatDate(a))},_getDate:function(a){var b=!a.currentYear||a.input&&""===a.input.val()?null:this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay));return b},_attachHandlers:function(b){var c=this._get(b,"stepMonths"),d="#"+b.id.replace(/\\\\/g,"\\");b.dpDiv.find("[data-handler]").map(function(){var b={prev:function(){a.datepicker._adjustDate(d,-c,"M")},next:function(){a.datepicker._adjustDate(d,+c,"M")},hide:function(){a.datepicker._hideDatepicker()},today:function(){a.datepicker._gotoToday(d)},selectDay:function(){return a.datepicker._selectDay(d,+this.getAttribute("data-month"),+this.getAttribute("data-year"),this),!1},selectMonth:function(){return a.datepicker._selectMonthYear(d,this,"M"),!1},selectYear:function(){return a.datepicker._selectMonthYear(d,this,"Y"),!1}};a(this).bind(this.getAttribute("data-event"),b[this.getAttribute("data-handler")])})},_generateHTML:function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C,D,E,F,G,H,I,J,K,L,M,N,O=new Date,P=this._daylightSavingAdjust(new Date(O.getFullYear(),O.getMonth(),O.getDate())),Q=this._get(a,"isRTL"),R=this._get(a,"showButtonPanel"),S=this._get(a,"hideIfNoPrevNext"),T=this._get(a,"navigationAsDateFormat"),U=this._getNumberOfMonths(a),V=this._get(a,"showCurrentAtPos"),W=this._get(a,"stepMonths"),X=1!==U[0]||1!==U[1],Y=this._daylightSavingAdjust(a.currentDay?new Date(a.currentYear,a.currentMonth,a.currentDay):new Date(9999,9,9)),Z=this._getMinMaxDate(a,"min"),$=this._getMinMaxDate(a,"max"),_=a.drawMonth-V,ab=a.drawYear;if(0>_&&(_+=12,ab--),$)for(b=this._daylightSavingAdjust(new Date($.getFullYear(),$.getMonth()-U[0]*U[1]+1,$.getDate())),b=Z&&Z>b?Z:b;this._daylightSavingAdjust(new Date(ab,_,1))>b;)_--,0>_&&(_=11,ab--);for(a.drawMonth=_,a.drawYear=ab,c=this._get(a,"prevText"),c=T?this.formatDate(c,this._daylightSavingAdjust(new Date(ab,_-W,1)),this._getFormatConfig(a)):c,d=this._canAdjustMonth(a,-1,ab,_)?"<a class='ui-datepicker-prev ui-corner-all' data-handler='prev' data-event='click' title='"+c+"'><span class='ui-icon ui-icon-circle-triangle-"+(Q?"e":"w")+"'>"+c+"</span></a>":S?"":"<a class='ui-datepicker-prev ui-corner-all ui-state-disabled' title='"+c+"'><span class='ui-icon ui-icon-circle-triangle-"+(Q?"e":"w")+"'>"+c+"</span></a>",e=this._get(a,"nextText"),e=T?this.formatDate(e,this._daylightSavingAdjust(new Date(ab,_+W,1)),this._getFormatConfig(a)):e,f=this._canAdjustMonth(a,1,ab,_)?"<a class='ui-datepicker-next ui-corner-all' data-handler='next' data-event='click' title='"+e+"'><span class='ui-icon ui-icon-circle-triangle-"+(Q?"w":"e")+"'>"+e+"</span></a>":S?"":"<a class='ui-datepicker-next ui-corner-all ui-state-disabled' title='"+e+"'><span class='ui-icon ui-icon-circle-triangle-"+(Q?"w":"e")+"'>"+e+"</span></a>",g=this._get(a,"currentText"),h=this._get(a,"gotoCurrent")&&a.currentDay?Y:P,g=T?this.formatDate(g,h,this._getFormatConfig(a)):g,i=a.inline?"":"<button type='button' class='ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all' data-handler='hide' data-event='click'>"+this._get(a,"closeText")+"</button>",j=R?"<div class='ui-datepicker-buttonpane ui-widget-content'>"+(Q?i:"")+(this._isInRange(a,h)?"<button type='button' class='ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all' data-handler='today' data-event='click'>"+g+"</button>":"")+(Q?"":i)+"</div>":"",k=parseInt(this._get(a,"firstDay"),10),k=isNaN(k)?0:k,l=this._get(a,"showWeek"),m=this._get(a,"dayNames"),n=this._get(a,"dayNamesMin"),o=this._get(a,"monthNames"),p=this._get(a,"monthNamesShort"),q=this._get(a,"beforeShowDay"),r=this._get(a,"showOtherMonths"),s=this._get(a,"selectOtherMonths"),t=this._getDefaultDate(a),u="",w=0;w<U[0];w++){for(x="",this.maxRows=4,y=0;y<U[1];y++){if(z=this._daylightSavingAdjust(new Date(ab,_,a.selectedDay)),A=" ui-corner-all",B="",X){if(B+="<div class='ui-datepicker-group",U[1]>1)switch(y){case 0:B+=" ui-datepicker-group-first",A=" ui-corner-"+(Q?"right":"left");break;case U[1]-1:B+=" ui-datepicker-group-last",A=" ui-corner-"+(Q?"left":"right");break;default:B+=" ui-datepicker-group-middle",A=""}B+="'>"}for(B+="<div class='ui-datepicker-header ui-widget-header ui-helper-clearfix"+A+"'>"+(/all|left/.test(A)&&0===w?Q?f:d:"")+(/all|right/.test(A)&&0===w?Q?d:f:"")+this._generateMonthYearHeader(a,_,ab,Z,$,w>0||y>0,o,p)+"</div><table class='ui-datepicker-calendar'><thead><tr>",C=l?"<th class='ui-datepicker-week-col'>"+this._get(a,"weekHeader")+"</th>":"",v=0;7>v;v++)D=(v+k)%7,C+="<th scope='col'"+((v+k+6)%7>=5?" class='ui-datepicker-week-end'":"")+"><span title='"+m[D]+"'>"+n[D]+"</span></th>";for(B+=C+"</tr></thead><tbody>",E=this._getDaysInMonth(ab,_),ab===a.selectedYear&&_===a.selectedMonth&&(a.selectedDay=Math.min(a.selectedDay,E)),F=(this._getFirstDayOfMonth(ab,_)-k+7)%7,G=Math.ceil((F+E)/7),H=X&&this.maxRows>G?this.maxRows:G,this.maxRows=H,I=this._daylightSavingAdjust(new Date(ab,_,1-F)),J=0;H>J;J++){for(B+="<tr>",K=l?"<td class='ui-datepicker-week-col'>"+this._get(a,"calculateWeek")(I)+"</td>":"",v=0;7>v;v++)L=q?q.apply(a.input?a.input[0]:null,[I]):[!0,""],M=I.getMonth()!==_,N=M&&!s||!L[0]||Z&&Z>I||$&&I>$,K+="<td class='"+((v+k+6)%7>=5?" ui-datepicker-week-end":"")+(M?" ui-datepicker-other-month":"")+(I.getTime()===z.getTime()&&_===a.selectedMonth&&a._keyEvent||t.getTime()===I.getTime()&&t.getTime()===z.getTime()?" "+this._dayOverClass:"")+(N?" "+this._unselectableClass+" ui-state-disabled":"")+(M&&!r?"":" "+L[1]+(I.getTime()===Y.getTime()?" "+this._currentClass:"")+(I.getTime()===P.getTime()?" ui-datepicker-today":""))+"'"+(M&&!r||!L[2]?"":" title='"+L[2].replace(/'/g,"&#39;")+"'")+(N?"":" data-handler='selectDay' data-event='click' data-month='"+I.getMonth()+"' data-year='"+I.getFullYear()+"'")+">"+(M&&!r?"&#xa0;":N?"<span class='ui-state-default'>"+I.getDate()+"</span>":"<a class='ui-state-default"+(I.getTime()===P.getTime()?" ui-state-highlight":"")+(I.getTime()===Y.getTime()?" ui-state-active":"")+(M?" ui-priority-secondary":"")+"' href='#'>"+I.getDate()+"</a>")+"</td>",I.setDate(I.getDate()+1),I=this._daylightSavingAdjust(I);B+=K+"</tr>"}_++,_>11&&(_=0,ab++),B+="</tbody></table>"+(X?"</div>"+(U[0]>0&&y===U[1]-1?"<div class='ui-datepicker-row-break'></div>":""):""),x+=B}u+=x}return u+=j,a._keyEvent=!1,u},_generateMonthYearHeader:function(a,b,c,d,e,f,g,h){var i,j,k,l,m,n,o,p,q=this._get(a,"changeMonth"),r=this._get(a,"changeYear"),s=this._get(a,"showMonthAfterYear"),t="<div class='ui-datepicker-title'>",u="";if(f||!q)u+="<span class='ui-datepicker-month'>"+g[b]+"</span>";else{for(i=d&&d.getFullYear()===c,j=e&&e.getFullYear()===c,u+="<select class='ui-datepicker-month' data-handler='selectMonth' data-event='change'>",k=0;12>k;k++)(!i||k>=d.getMonth())&&(!j||k<=e.getMonth())&&(u+="<option value='"+k+"'"+(k===b?" selected='selected'":"")+">"+h[k]+"</option>");u+="</select>"}if(s||(t+=u+(!f&&q&&r?"":"&#xa0;")),!a.yearshtml)if(a.yearshtml="",f||!r)t+="<span class='ui-datepicker-year'>"+c+"</span>";else{for(l=this._get(a,"yearRange").split(":"),m=(new Date).getFullYear(),n=function(a){var b=a.match(/c[+\-].*/)?c+parseInt(a.substring(1),10):a.match(/[+\-].*/)?m+parseInt(a,10):parseInt(a,10);return isNaN(b)?m:b},o=n(l[0]),p=Math.max(o,n(l[1]||"")),o=d?Math.max(o,d.getFullYear()):o,p=e?Math.min(p,e.getFullYear()):p,a.yearshtml+="<select class='ui-datepicker-year' data-handler='selectYear' data-event='change'>";p>=o;o++)a.yearshtml+="<option value='"+o+"'"+(o===c?" selected='selected'":"")+">"+o+"</option>";a.yearshtml+="</select>",t+=a.yearshtml,a.yearshtml=null}return t+=this._get(a,"yearSuffix"),s&&(t+=(!f&&q&&r?"":"&#xa0;")+u),t+="</div>"},_adjustInstDate:function(a,b,c){var d=a.drawYear+("Y"===c?b:0),e=a.drawMonth+("M"===c?b:0),f=Math.min(a.selectedDay,this._getDaysInMonth(d,e))+("D"===c?b:0),g=this._restrictMinMax(a,this._daylightSavingAdjust(new Date(d,e,f)));a.selectedDay=g.getDate(),a.drawMonth=a.selectedMonth=g.getMonth(),a.drawYear=a.selectedYear=g.getFullYear(),("M"===c||"Y"===c)&&this._notifyChange(a)},_restrictMinMax:function(a,b){var c=this._getMinMaxDate(a,"min"),d=this._getMinMaxDate(a,"max"),e=c&&c>b?c:b;return d&&e>d?d:e},_notifyChange:function(a){var b=this._get(a,"onChangeMonthYear");b&&b.apply(a.input?a.input[0]:null,[a.selectedYear,a.selectedMonth+1,a])},_getNumberOfMonths:function(a){var b=this._get(a,"numberOfMonths");return null==b?[1,1]:"number"==typeof b?[1,b]:b},_getMinMaxDate:function(a,b){return this._determineDate(a,this._get(a,b+"Date"),null)},_getDaysInMonth:function(a,b){return 32-this._daylightSavingAdjust(new Date(a,b,32)).getDate()},_getFirstDayOfMonth:function(a,b){return new Date(a,b,1).getDay()},_canAdjustMonth:function(a,b,c,d){var e=this._getNumberOfMonths(a),f=this._daylightSavingAdjust(new Date(c,d+(0>b?b:e[0]*e[1]),1));return 0>b&&f.setDate(this._getDaysInMonth(f.getFullYear(),f.getMonth())),this._isInRange(a,f)},_isInRange:function(a,b){var c,d,e=this._getMinMaxDate(a,"min"),f=this._getMinMaxDate(a,"max"),g=null,h=null,i=this._get(a,"yearRange");return i&&(c=i.split(":"),d=(new Date).getFullYear(),g=parseInt(c[0],10),h=parseInt(c[1],10),c[0].match(/[+\-].*/)&&(g+=d),c[1].match(/[+\-].*/)&&(h+=d)),(!e||b.getTime()>=e.getTime())&&(!f||b.getTime()<=f.getTime())&&(!g||b.getFullYear()>=g)&&(!h||b.getFullYear()<=h)},_getFormatConfig:function(a){var b=this._get(a,"shortYearCutoff");return b="string"!=typeof b?b:(new Date).getFullYear()%100+parseInt(b,10),{shortYearCutoff:b,dayNamesShort:this._get(a,"dayNamesShort"),dayNames:this._get(a,"dayNames"),monthNamesShort:this._get(a,"monthNamesShort"),monthNames:this._get(a,"monthNames")}},_formatDate:function(a,b,c,d){b||(a.currentDay=a.selectedDay,a.currentMonth=a.selectedMonth,a.currentYear=a.selectedYear);var e=b?"object"==typeof b?b:this._daylightSavingAdjust(new Date(d,c,b)):this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay));
-return this.formatDate(this._get(a,"dateFormat"),e,this._getFormatConfig(a))}}),a.fn.datepicker=function(b){if(!this.length)return this;a.datepicker.initialized||(a(document).mousedown(a.datepicker._checkExternalClick),a.datepicker.initialized=!0),0===a("#"+a.datepicker._mainDivId).length&&a("body").append(a.datepicker.dpDiv);var c=Array.prototype.slice.call(arguments,1);return"string"!=typeof b||"isDisabled"!==b&&"getDate"!==b&&"widget"!==b?"option"===b&&2===arguments.length&&"string"==typeof arguments[1]?a.datepicker["_"+b+"Datepicker"].apply(a.datepicker,[this[0]].concat(c)):this.each(function(){"string"==typeof b?a.datepicker["_"+b+"Datepicker"].apply(a.datepicker,[this].concat(c)):a.datepicker._attachDatepicker(this,b)}):a.datepicker["_"+b+"Datepicker"].apply(a.datepicker,[this[0]].concat(c))},a.datepicker=new e,a.datepicker.initialized=!1,a.datepicker.uuid=(new Date).getTime(),a.datepicker.version="1.11.2";var s=(a.datepicker,a.widget("ui.dialog",{version:"1.11.2",options:{appendTo:"body",autoOpen:!0,buttons:[],closeOnEscape:!0,closeText:"Close",dialogClass:"",draggable:!0,hide:null,height:"auto",maxHeight:null,maxWidth:null,minHeight:150,minWidth:150,modal:!1,position:{my:"center",at:"center",of:window,collision:"fit",using:function(b){var c=a(this).css(b).offset().top;0>c&&a(this).css("top",b.top-c)}},resizable:!0,show:null,title:null,width:300,beforeClose:null,close:null,drag:null,dragStart:null,dragStop:null,focus:null,open:null,resize:null,resizeStart:null,resizeStop:null},sizeRelatedOptions:{buttons:!0,height:!0,maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0,width:!0},resizableRelatedOptions:{maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0},_create:function(){this.originalCss={display:this.element[0].style.display,width:this.element[0].style.width,minHeight:this.element[0].style.minHeight,maxHeight:this.element[0].style.maxHeight,height:this.element[0].style.height},this.originalPosition={parent:this.element.parent(),index:this.element.parent().children().index(this.element)},this.originalTitle=this.element.attr("title"),this.options.title=this.options.title||this.originalTitle,this._createWrapper(),this.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(this.uiDialog),this._createTitlebar(),this._createButtonPane(),this.options.draggable&&a.fn.draggable&&this._makeDraggable(),this.options.resizable&&a.fn.resizable&&this._makeResizable(),this._isOpen=!1,this._trackFocus()},_init:function(){this.options.autoOpen&&this.open()},_appendTo:function(){var b=this.options.appendTo;return b&&(b.jquery||b.nodeType)?a(b):this.document.find(b||"body").eq(0)},_destroy:function(){var a,b=this.originalPosition;this._destroyOverlay(),this.element.removeUniqueId().removeClass("ui-dialog-content ui-widget-content").css(this.originalCss).detach(),this.uiDialog.stop(!0,!0).remove(),this.originalTitle&&this.element.attr("title",this.originalTitle),a=b.parent.children().eq(b.index),a.length&&a[0]!==this.element[0]?a.before(this.element):b.parent.append(this.element)},widget:function(){return this.uiDialog},disable:a.noop,enable:a.noop,close:function(b){var c,d=this;if(this._isOpen&&this._trigger("beforeClose",b)!==!1){if(this._isOpen=!1,this._focusedElement=null,this._destroyOverlay(),this._untrackInstance(),!this.opener.filter(":focusable").focus().length)try{c=this.document[0].activeElement,c&&"body"!==c.nodeName.toLowerCase()&&a(c).blur()}catch(e){}this._hide(this.uiDialog,this.options.hide,function(){d._trigger("close",b)})}},isOpen:function(){return this._isOpen},moveToTop:function(){this._moveToTop()},_moveToTop:function(b,c){var d=!1,e=this.uiDialog.siblings(".ui-front:visible").map(function(){return+a(this).css("z-index")}).get(),f=Math.max.apply(null,e);return f>=+this.uiDialog.css("z-index")&&(this.uiDialog.css("z-index",f+1),d=!0),d&&!c&&this._trigger("focus",b),d},open:function(){var b=this;return this._isOpen?void(this._moveToTop()&&this._focusTabbable()):(this._isOpen=!0,this.opener=a(this.document[0].activeElement),this._size(),this._position(),this._createOverlay(),this._moveToTop(null,!0),this.overlay&&this.overlay.css("z-index",this.uiDialog.css("z-index")-1),this._show(this.uiDialog,this.options.show,function(){b._focusTabbable(),b._trigger("focus")}),this._makeFocusTarget(),void this._trigger("open"))},_focusTabbable:function(){var a=this._focusedElement;a||(a=this.element.find("[autofocus]")),a.length||(a=this.element.find(":tabbable")),a.length||(a=this.uiDialogButtonPane.find(":tabbable")),a.length||(a=this.uiDialogTitlebarClose.filter(":tabbable")),a.length||(a=this.uiDialog),a.eq(0).focus()},_keepFocus:function(b){function c(){var b=this.document[0].activeElement,c=this.uiDialog[0]===b||a.contains(this.uiDialog[0],b);c||this._focusTabbable()}b.preventDefault(),c.call(this),this._delay(c)},_createWrapper:function(){this.uiDialog=a("<div>").addClass("ui-dialog ui-widget ui-widget-content ui-corner-all ui-front "+this.options.dialogClass).hide().attr({tabIndex:-1,role:"dialog"}).appendTo(this._appendTo()),this._on(this.uiDialog,{keydown:function(b){if(this.options.closeOnEscape&&!b.isDefaultPrevented()&&b.keyCode&&b.keyCode===a.ui.keyCode.ESCAPE)return b.preventDefault(),void this.close(b);if(b.keyCode===a.ui.keyCode.TAB&&!b.isDefaultPrevented()){var c=this.uiDialog.find(":tabbable"),d=c.filter(":first"),e=c.filter(":last");b.target!==e[0]&&b.target!==this.uiDialog[0]||b.shiftKey?b.target!==d[0]&&b.target!==this.uiDialog[0]||!b.shiftKey||(this._delay(function(){e.focus()}),b.preventDefault()):(this._delay(function(){d.focus()}),b.preventDefault())}},mousedown:function(a){this._moveToTop(a)&&this._focusTabbable()}}),this.element.find("[aria-describedby]").length||this.uiDialog.attr({"aria-describedby":this.element.uniqueId().attr("id")})},_createTitlebar:function(){var b;this.uiDialogTitlebar=a("<div>").addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix").prependTo(this.uiDialog),this._on(this.uiDialogTitlebar,{mousedown:function(b){a(b.target).closest(".ui-dialog-titlebar-close")||this.uiDialog.focus()}}),this.uiDialogTitlebarClose=a("<button type='button'></button>").button({label:this.options.closeText,icons:{primary:"ui-icon-closethick"},text:!1}).addClass("ui-dialog-titlebar-close").appendTo(this.uiDialogTitlebar),this._on(this.uiDialogTitlebarClose,{click:function(a){a.preventDefault(),this.close(a)}}),b=a("<span>").uniqueId().addClass("ui-dialog-title").prependTo(this.uiDialogTitlebar),this._title(b),this.uiDialog.attr({"aria-labelledby":b.attr("id")})},_title:function(a){this.options.title||a.html("&#160;"),a.text(this.options.title)},_createButtonPane:function(){this.uiDialogButtonPane=a("<div>").addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"),this.uiButtonSet=a("<div>").addClass("ui-dialog-buttonset").appendTo(this.uiDialogButtonPane),this._createButtons()},_createButtons:function(){var b=this,c=this.options.buttons;return this.uiDialogButtonPane.remove(),this.uiButtonSet.empty(),a.isEmptyObject(c)||a.isArray(c)&&!c.length?void this.uiDialog.removeClass("ui-dialog-buttons"):(a.each(c,function(c,d){var e,f;d=a.isFunction(d)?{click:d,text:c}:d,d=a.extend({type:"button"},d),e=d.click,d.click=function(){e.apply(b.element[0],arguments)},f={icons:d.icons,text:d.showText},delete d.icons,delete d.showText,a("<button></button>",d).button(f).appendTo(b.uiButtonSet)}),this.uiDialog.addClass("ui-dialog-buttons"),void this.uiDialogButtonPane.appendTo(this.uiDialog))},_makeDraggable:function(){function b(a){return{position:a.position,offset:a.offset}}var c=this,d=this.options;this.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(d,e){a(this).addClass("ui-dialog-dragging"),c._blockFrames(),c._trigger("dragStart",d,b(e))},drag:function(a,d){c._trigger("drag",a,b(d))},stop:function(e,f){var g=f.offset.left-c.document.scrollLeft(),h=f.offset.top-c.document.scrollTop();d.position={my:"left top",at:"left"+(g>=0?"+":"")+g+" top"+(h>=0?"+":"")+h,of:c.window},a(this).removeClass("ui-dialog-dragging"),c._unblockFrames(),c._trigger("dragStop",e,b(f))}})},_makeResizable:function(){function b(a){return{originalPosition:a.originalPosition,originalSize:a.originalSize,position:a.position,size:a.size}}var c=this,d=this.options,e=d.resizable,f=this.uiDialog.css("position"),g="string"==typeof e?e:"n,e,s,w,se,sw,ne,nw";this.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:this.element,maxWidth:d.maxWidth,maxHeight:d.maxHeight,minWidth:d.minWidth,minHeight:this._minHeight(),handles:g,start:function(d,e){a(this).addClass("ui-dialog-resizing"),c._blockFrames(),c._trigger("resizeStart",d,b(e))},resize:function(a,d){c._trigger("resize",a,b(d))},stop:function(e,f){var g=c.uiDialog.offset(),h=g.left-c.document.scrollLeft(),i=g.top-c.document.scrollTop();d.height=c.uiDialog.height(),d.width=c.uiDialog.width(),d.position={my:"left top",at:"left"+(h>=0?"+":"")+h+" top"+(i>=0?"+":"")+i,of:c.window},a(this).removeClass("ui-dialog-resizing"),c._unblockFrames(),c._trigger("resizeStop",e,b(f))}}).css("position",f)},_trackFocus:function(){this._on(this.widget(),{focusin:function(b){this._makeFocusTarget(),this._focusedElement=a(b.target)}})},_makeFocusTarget:function(){this._untrackInstance(),this._trackingInstances().unshift(this)},_untrackInstance:function(){var b=this._trackingInstances(),c=a.inArray(this,b);-1!==c&&b.splice(c,1)},_trackingInstances:function(){var a=this.document.data("ui-dialog-instances");return a||(a=[],this.document.data("ui-dialog-instances",a)),a},_minHeight:function(){var a=this.options;return"auto"===a.height?a.minHeight:Math.min(a.minHeight,a.height)},_position:function(){var a=this.uiDialog.is(":visible");a||this.uiDialog.show(),this.uiDialog.position(this.options.position),a||this.uiDialog.hide()},_setOptions:function(b){var c=this,d=!1,e={};a.each(b,function(a,b){c._setOption(a,b),a in c.sizeRelatedOptions&&(d=!0),a in c.resizableRelatedOptions&&(e[a]=b)}),d&&(this._size(),this._position()),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option",e)},_setOption:function(a,b){var c,d,e=this.uiDialog;"dialogClass"===a&&e.removeClass(this.options.dialogClass).addClass(b),"disabled"!==a&&(this._super(a,b),"appendTo"===a&&this.uiDialog.appendTo(this._appendTo()),"buttons"===a&&this._createButtons(),"closeText"===a&&this.uiDialogTitlebarClose.button({label:""+b}),"draggable"===a&&(c=e.is(":data(ui-draggable)"),c&&!b&&e.draggable("destroy"),!c&&b&&this._makeDraggable()),"position"===a&&this._position(),"resizable"===a&&(d=e.is(":data(ui-resizable)"),d&&!b&&e.resizable("destroy"),d&&"string"==typeof b&&e.resizable("option","handles",b),d||b===!1||this._makeResizable()),"title"===a&&this._title(this.uiDialogTitlebar.find(".ui-dialog-title")))},_size:function(){var a,b,c,d=this.options;this.element.show().css({width:"auto",minHeight:0,maxHeight:"none",height:0}),d.minWidth>d.width&&(d.width=d.minWidth),a=this.uiDialog.css({height:"auto",width:d.width}).outerHeight(),b=Math.max(0,d.minHeight-a),c="number"==typeof d.maxHeight?Math.max(0,d.maxHeight-a):"none","auto"===d.height?this.element.css({minHeight:b,maxHeight:c,height:"auto"}):this.element.height(Math.max(0,d.height-a)),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())},_blockFrames:function(){this.iframeBlocks=this.document.find("iframe").map(function(){var b=a(this);return a("<div>").css({position:"absolute",width:b.outerWidth(),height:b.outerHeight()}).appendTo(b.parent()).offset(b.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_allowInteraction:function(b){return a(b.target).closest(".ui-dialog").length?!0:!!a(b.target).closest(".ui-datepicker").length},_createOverlay:function(){if(this.options.modal){var b=!0;this._delay(function(){b=!1}),this.document.data("ui-dialog-overlays")||this._on(this.document,{focusin:function(a){b||this._allowInteraction(a)||(a.preventDefault(),this._trackingInstances()[0]._focusTabbable())}}),this.overlay=a("<div>").addClass("ui-widget-overlay ui-front").appendTo(this._appendTo()),this._on(this.overlay,{mousedown:"_keepFocus"}),this.document.data("ui-dialog-overlays",(this.document.data("ui-dialog-overlays")||0)+1)}},_destroyOverlay:function(){if(this.options.modal&&this.overlay){var a=this.document.data("ui-dialog-overlays")-1;a?this.document.data("ui-dialog-overlays",a):this.document.unbind("focusin").removeData("ui-dialog-overlays"),this.overlay.remove(),this.overlay=null}}}),a.widget("ui.progressbar",{version:"1.11.2",options:{max:100,value:0,change:null,complete:null},min:0,_create:function(){this.oldValue=this.options.value=this._constrainedValue(),this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this.min}),this.valueDiv=a("<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>").appendTo(this.element),this._refreshValue()},_destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"),this.valueDiv.remove()},value:function(a){return void 0===a?this.options.value:(this.options.value=this._constrainedValue(a),void this._refreshValue())},_constrainedValue:function(a){return void 0===a&&(a=this.options.value),this.indeterminate=a===!1,"number"!=typeof a&&(a=0),this.indeterminate?!1:Math.min(this.options.max,Math.max(this.min,a))},_setOptions:function(a){var b=a.value;delete a.value,this._super(a),this.options.value=this._constrainedValue(b),this._refreshValue()},_setOption:function(a,b){"max"===a&&(b=Math.max(this.min,b)),"disabled"===a&&this.element.toggleClass("ui-state-disabled",!!b).attr("aria-disabled",b),this._super(a,b)},_percentage:function(){return this.indeterminate?100:100*(this.options.value-this.min)/(this.options.max-this.min)},_refreshValue:function(){var b=this.options.value,c=this._percentage();this.valueDiv.toggle(this.indeterminate||b>this.min).toggleClass("ui-corner-right",b===this.options.max).width(c.toFixed(0)+"%"),this.element.toggleClass("ui-progressbar-indeterminate",this.indeterminate),this.indeterminate?(this.element.removeAttr("aria-valuenow"),this.overlayDiv||(this.overlayDiv=a("<div class='ui-progressbar-overlay'></div>").appendTo(this.valueDiv))):(this.element.attr({"aria-valuemax":this.options.max,"aria-valuenow":b}),this.overlayDiv&&(this.overlayDiv.remove(),this.overlayDiv=null)),this.oldValue!==b&&(this.oldValue=b,this._trigger("change")),b===this.options.max&&this._trigger("complete")}}),a.widget("ui.selectmenu",{version:"1.11.2",defaultElement:"<select>",options:{appendTo:null,disabled:null,icons:{button:"ui-icon-triangle-1-s"},position:{my:"left top",at:"left bottom",collision:"none"},width:null,change:null,close:null,focus:null,open:null,select:null},_create:function(){var a=this.element.uniqueId().attr("id");this.ids={element:a,button:a+"-button",menu:a+"-menu"},this._drawButton(),this._drawMenu(),this.options.disabled&&this.disable()},_drawButton:function(){var b=this,c=this.element.attr("tabindex");this.label=a("label[for='"+this.ids.element+"']").attr("for",this.ids.button),this._on(this.label,{click:function(a){this.button.focus(),a.preventDefault()}}),this.element.hide(),this.button=a("<span>",{"class":"ui-selectmenu-button ui-widget ui-state-default ui-corner-all",tabindex:c||this.options.disabled?-1:0,id:this.ids.button,role:"combobox","aria-expanded":"false","aria-autocomplete":"list","aria-owns":this.ids.menu,"aria-haspopup":"true"}).insertAfter(this.element),a("<span>",{"class":"ui-icon "+this.options.icons.button}).prependTo(this.button),this.buttonText=a("<span>",{"class":"ui-selectmenu-text"}).appendTo(this.button),this._setText(this.buttonText,this.element.find("option:selected").text()),this._resizeButton(),this._on(this.button,this._buttonEvents),this.button.one("focusin",function(){b.menuItems||b._refreshMenu()}),this._hoverable(this.button),this._focusable(this.button)},_drawMenu:function(){var b=this;this.menu=a("<ul>",{"aria-hidden":"true","aria-labelledby":this.ids.button,id:this.ids.menu}),this.menuWrap=a("<div>",{"class":"ui-selectmenu-menu ui-front"}).append(this.menu).appendTo(this._appendTo()),this.menuInstance=this.menu.menu({role:"listbox",select:function(a,c){a.preventDefault(),b._setSelection(),b._select(c.item.data("ui-selectmenu-item"),a)},focus:function(a,c){var d=c.item.data("ui-selectmenu-item");null!=b.focusIndex&&d.index!==b.focusIndex&&(b._trigger("focus",a,{item:d}),b.isOpen||b._select(d,a)),b.focusIndex=d.index,b.button.attr("aria-activedescendant",b.menuItems.eq(d.index).attr("id"))}}).menu("instance"),this.menu.addClass("ui-corner-bottom").removeClass("ui-corner-all"),this.menuInstance._off(this.menu,"mouseleave"),this.menuInstance._closeOnDocumentClick=function(){return!1},this.menuInstance._isDivider=function(){return!1}},refresh:function(){this._refreshMenu(),this._setText(this.buttonText,this._getSelectedItem().text()),this.options.width||this._resizeButton()},_refreshMenu:function(){this.menu.empty();var a,b=this.element.find("option");b.length&&(this._parseOptions(b),this._renderMenu(this.menu,this.items),this.menuInstance.refresh(),this.menuItems=this.menu.find("li").not(".ui-selectmenu-optgroup"),a=this._getSelectedItem(),this.menuInstance.focus(null,a),this._setAria(a.data("ui-selectmenu-item")),this._setOption("disabled",this.element.prop("disabled")))},open:function(a){this.options.disabled||(this.menuItems?(this.menu.find(".ui-state-focus").removeClass("ui-state-focus"),this.menuInstance.focus(null,this._getSelectedItem())):this._refreshMenu(),this.isOpen=!0,this._toggleAttr(),this._resizeMenu(),this._position(),this._on(this.document,this._documentClick),this._trigger("open",a))},_position:function(){this.menuWrap.position(a.extend({of:this.button},this.options.position))},close:function(a){this.isOpen&&(this.isOpen=!1,this._toggleAttr(),this.range=null,this._off(this.document),this._trigger("close",a))},widget:function(){return this.button},menuWidget:function(){return this.menu},_renderMenu:function(b,c){var d=this,e="";a.each(c,function(c,f){f.optgroup!==e&&(a("<li>",{"class":"ui-selectmenu-optgroup ui-menu-divider"+(f.element.parent("optgroup").prop("disabled")?" ui-state-disabled":""),text:f.optgroup}).appendTo(b),e=f.optgroup),d._renderItemData(b,f)})},_renderItemData:function(a,b){return this._renderItem(a,b).data("ui-selectmenu-item",b)},_renderItem:function(b,c){var d=a("<li>");return c.disabled&&d.addClass("ui-state-disabled"),this._setText(d,c.label),d.appendTo(b)},_setText:function(a,b){b?a.text(b):a.html("&#160;")},_move:function(a,b){var c,d,e=".ui-menu-item";this.isOpen?c=this.menuItems.eq(this.focusIndex):(c=this.menuItems.eq(this.element[0].selectedIndex),e+=":not(.ui-state-disabled)"),d="first"===a||"last"===a?c["first"===a?"prevAll":"nextAll"](e).eq(-1):c[a+"All"](e).eq(0),d.length&&this.menuInstance.focus(b,d)},_getSelectedItem:function(){return this.menuItems.eq(this.element[0].selectedIndex)},_toggle:function(a){this[this.isOpen?"close":"open"](a)},_setSelection:function(){var a;this.range&&(window.getSelection?(a=window.getSelection(),a.removeAllRanges(),a.addRange(this.range)):this.range.select(),this.button.focus())},_documentClick:{mousedown:function(b){this.isOpen&&(a(b.target).closest(".ui-selectmenu-menu, #"+this.ids.button).length||this.close(b))}},_buttonEvents:{mousedown:function(){var a;window.getSelection?(a=window.getSelection(),a.rangeCount&&(this.range=a.getRangeAt(0))):this.range=document.selection.createRange()},click:function(a){this._setSelection(),this._toggle(a)},keydown:function(b){var c=!0;switch(b.keyCode){case a.ui.keyCode.TAB:case a.ui.keyCode.ESCAPE:this.close(b),c=!1;break;case a.ui.keyCode.ENTER:this.isOpen&&this._selectFocusedItem(b);break;case a.ui.keyCode.UP:b.altKey?this._toggle(b):this._move("prev",b);break;case a.ui.keyCode.DOWN:b.altKey?this._toggle(b):this._move("next",b);break;case a.ui.keyCode.SPACE:this.isOpen?this._selectFocusedItem(b):this._toggle(b);break;case a.ui.keyCode.LEFT:this._move("prev",b);break;case a.ui.keyCode.RIGHT:this._move("next",b);break;case a.ui.keyCode.HOME:case a.ui.keyCode.PAGE_UP:this._move("first",b);break;case a.ui.keyCode.END:case a.ui.keyCode.PAGE_DOWN:this._move("last",b);break;default:this.menu.trigger(b),c=!1}c&&b.preventDefault()}},_selectFocusedItem:function(a){var b=this.menuItems.eq(this.focusIndex);b.hasClass("ui-state-disabled")||this._select(b.data("ui-selectmenu-item"),a)},_select:function(a,b){var c=this.element[0].selectedIndex;this.element[0].selectedIndex=a.index,this._setText(this.buttonText,a.label),this._setAria(a),this._trigger("select",b,{item:a}),a.index!==c&&this._trigger("change",b,{item:a}),this.close(b)},_setAria:function(a){var b=this.menuItems.eq(a.index).attr("id");this.button.attr({"aria-labelledby":b,"aria-activedescendant":b}),this.menu.attr("aria-activedescendant",b)},_setOption:function(a,b){"icons"===a&&this.button.find("span.ui-icon").removeClass(this.options.icons.button).addClass(b.button),this._super(a,b),"appendTo"===a&&this.menuWrap.appendTo(this._appendTo()),"disabled"===a&&(this.menuInstance.option("disabled",b),this.button.toggleClass("ui-state-disabled",b).attr("aria-disabled",b),this.element.prop("disabled",b),b?(this.button.attr("tabindex",-1),this.close()):this.button.attr("tabindex",0)),"width"===a&&this._resizeButton()},_appendTo:function(){var b=this.options.appendTo;return b&&(b=b.jquery||b.nodeType?a(b):this.document.find(b).eq(0)),b&&b[0]||(b=this.element.closest(".ui-front")),b.length||(b=this.document[0].body),b},_toggleAttr:function(){this.button.toggleClass("ui-corner-top",this.isOpen).toggleClass("ui-corner-all",!this.isOpen).attr("aria-expanded",this.isOpen),this.menuWrap.toggleClass("ui-selectmenu-open",this.isOpen),this.menu.attr("aria-hidden",!this.isOpen)},_resizeButton:function(){var a=this.options.width;a||(a=this.element.show().outerWidth(),this.element.hide()),this.button.outerWidth(a)},_resizeMenu:function(){this.menu.outerWidth(Math.max(this.button.outerWidth(),this.menu.width("").outerWidth()+1))},_getCreateOptions:function(){return{disabled:this.element.prop("disabled")}},_parseOptions:function(b){var c=[];b.each(function(b,d){var e=a(d),f=e.parent("optgroup");c.push({element:e,index:b,value:e.attr("value"),label:e.text(),optgroup:f.attr("label")||"",disabled:f.prop("disabled")||e.prop("disabled")})}),this.items=c},_destroy:function(){this.menuWrap.remove(),this.button.remove(),this.element.show(),this.element.removeUniqueId(),this.label.attr("for",this.ids.element)}}),a.widget("ui.slider",a.ui.mouse,{version:"1.11.2",widgetEventPrefix:"slide",options:{animate:!1,distance:0,max:100,min:0,orientation:"horizontal",range:!1,step:1,value:0,values:null,change:null,slide:null,start:null,stop:null},numPages:5,_create:function(){this._keySliding=!1,this._mouseSliding=!1,this._animateOff=!0,this._handleIndex=null,this._detectOrientation(),this._mouseInit(),this._calculateNewMax(),this.element.addClass("ui-slider ui-slider-"+this.orientation+" ui-widget ui-widget-content ui-corner-all"),this._refresh(),this._setOption("disabled",this.options.disabled),this._animateOff=!1},_refresh:function(){this._createRange(),this._createHandles(),this._setupEvents(),this._refreshValue()},_createHandles:function(){var b,c,d=this.options,e=this.element.find(".ui-slider-handle").addClass("ui-state-default ui-corner-all"),f="<span class='ui-slider-handle ui-state-default ui-corner-all' tabindex='0'></span>",g=[];for(c=d.values&&d.values.length||1,e.length>c&&(e.slice(c).remove(),e=e.slice(0,c)),b=e.length;c>b;b++)g.push(f);this.handles=e.add(a(g.join("")).appendTo(this.element)),this.handle=this.handles.eq(0),this.handles.each(function(b){a(this).data("ui-slider-handle-index",b)})},_createRange:function(){var b=this.options,c="";b.range?(b.range===!0&&(b.values?b.values.length&&2!==b.values.length?b.values=[b.values[0],b.values[0]]:a.isArray(b.values)&&(b.values=b.values.slice(0)):b.values=[this._valueMin(),this._valueMin()]),this.range&&this.range.length?this.range.removeClass("ui-slider-range-min ui-slider-range-max").css({left:"",bottom:""}):(this.range=a("<div></div>").appendTo(this.element),c="ui-slider-range ui-widget-header ui-corner-all"),this.range.addClass(c+("min"===b.range||"max"===b.range?" ui-slider-range-"+b.range:""))):(this.range&&this.range.remove(),this.range=null)},_setupEvents:function(){this._off(this.handles),this._on(this.handles,this._handleEvents),this._hoverable(this.handles),this._focusable(this.handles)},_destroy:function(){this.handles.remove(),this.range&&this.range.remove(),this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-widget ui-widget-content ui-corner-all"),this._mouseDestroy()},_mouseCapture:function(b){var c,d,e,f,g,h,i,j,k=this,l=this.options;return l.disabled?!1:(this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()},this.elementOffset=this.element.offset(),c={x:b.pageX,y:b.pageY},d=this._normValueFromMouse(c),e=this._valueMax()-this._valueMin()+1,this.handles.each(function(b){var c=Math.abs(d-k.values(b));(e>c||e===c&&(b===k._lastChangedValue||k.values(b)===l.min))&&(e=c,f=a(this),g=b)}),h=this._start(b,g),h===!1?!1:(this._mouseSliding=!0,this._handleIndex=g,f.addClass("ui-state-active").focus(),i=f.offset(),j=!a(b.target).parents().addBack().is(".ui-slider-handle"),this._clickOffset=j?{left:0,top:0}:{left:b.pageX-i.left-f.width()/2,top:b.pageY-i.top-f.height()/2-(parseInt(f.css("borderTopWidth"),10)||0)-(parseInt(f.css("borderBottomWidth"),10)||0)+(parseInt(f.css("marginTop"),10)||0)},this.handles.hasClass("ui-state-hover")||this._slide(b,g,d),this._animateOff=!0,!0))},_mouseStart:function(){return!0},_mouseDrag:function(a){var b={x:a.pageX,y:a.pageY},c=this._normValueFromMouse(b);return this._slide(a,this._handleIndex,c),!1},_mouseStop:function(a){return this.handles.removeClass("ui-state-active"),this._mouseSliding=!1,this._stop(a,this._handleIndex),this._change(a,this._handleIndex),this._handleIndex=null,this._clickOffset=null,this._animateOff=!1,!1},_detectOrientation:function(){this.orientation="vertical"===this.options.orientation?"vertical":"horizontal"},_normValueFromMouse:function(a){var b,c,d,e,f;return"horizontal"===this.orientation?(b=this.elementSize.width,c=a.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)):(b=this.elementSize.height,c=a.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)),d=c/b,d>1&&(d=1),0>d&&(d=0),"vertical"===this.orientation&&(d=1-d),e=this._valueMax()-this._valueMin(),f=this._valueMin()+d*e,this._trimAlignValue(f)},_start:function(a,b){var c={handle:this.handles[b],value:this.value()};return this.options.values&&this.options.values.length&&(c.value=this.values(b),c.values=this.values()),this._trigger("start",a,c)},_slide:function(a,b,c){var d,e,f;this.options.values&&this.options.values.length?(d=this.values(b?0:1),2===this.options.values.length&&this.options.range===!0&&(0===b&&c>d||1===b&&d>c)&&(c=d),c!==this.values(b)&&(e=this.values(),e[b]=c,f=this._trigger("slide",a,{handle:this.handles[b],value:c,values:e}),d=this.values(b?0:1),f!==!1&&this.values(b,c))):c!==this.value()&&(f=this._trigger("slide",a,{handle:this.handles[b],value:c}),f!==!1&&this.value(c))},_stop:function(a,b){var c={handle:this.handles[b],value:this.value()};this.options.values&&this.options.values.length&&(c.value=this.values(b),c.values=this.values()),this._trigger("stop",a,c)},_change:function(a,b){if(!this._keySliding&&!this._mouseSliding){var c={handle:this.handles[b],value:this.value()};this.options.values&&this.options.values.length&&(c.value=this.values(b),c.values=this.values()),this._lastChangedValue=b,this._trigger("change",a,c)}},value:function(a){return arguments.length?(this.options.value=this._trimAlignValue(a),this._refreshValue(),void this._change(null,0)):this._value()},values:function(b,c){var d,e,f;if(arguments.length>1)return this.options.values[b]=this._trimAlignValue(c),this._refreshValue(),void this._change(null,b);if(!arguments.length)return this._values();if(!a.isArray(arguments[0]))return this.options.values&&this.options.values.length?this._values(b):this.value();for(d=this.options.values,e=arguments[0],f=0;f<d.length;f+=1)d[f]=this._trimAlignValue(e[f]),this._change(null,f);this._refreshValue()},_setOption:function(b,c){var d,e=0;switch("range"===b&&this.options.range===!0&&("min"===c?(this.options.value=this._values(0),this.options.values=null):"max"===c&&(this.options.value=this._values(this.options.values.length-1),this.options.values=null)),a.isArray(this.options.values)&&(e=this.options.values.length),"disabled"===b&&this.element.toggleClass("ui-state-disabled",!!c),this._super(b,c),b){case"orientation":this._detectOrientation(),this.element.removeClass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.orientation),this._refreshValue(),this.handles.css("horizontal"===c?"bottom":"left","");break;case"value":this._animateOff=!0,this._refreshValue(),this._change(null,0),this._animateOff=!1;break;case"values":for(this._animateOff=!0,this._refreshValue(),d=0;e>d;d+=1)this._change(null,d);this._animateOff=!1;break;case"step":case"min":case"max":this._animateOff=!0,this._calculateNewMax(),this._refreshValue(),this._animateOff=!1;break;case"range":this._animateOff=!0,this._refresh(),this._animateOff=!1}},_value:function(){var a=this.options.value;return a=this._trimAlignValue(a)},_values:function(a){var b,c,d;if(arguments.length)return b=this.options.values[a],b=this._trimAlignValue(b);if(this.options.values&&this.options.values.length){for(c=this.options.values.slice(),d=0;d<c.length;d+=1)c[d]=this._trimAlignValue(c[d]);return c}return[]},_trimAlignValue:function(a){if(a<=this._valueMin())return this._valueMin();if(a>=this._valueMax())return this._valueMax();var b=this.options.step>0?this.options.step:1,c=(a-this._valueMin())%b,d=a-c;return 2*Math.abs(c)>=b&&(d+=c>0?b:-b),parseFloat(d.toFixed(5))},_calculateNewMax:function(){var a=(this.options.max-this._valueMin())%this.options.step;this.max=this.options.max-a},_valueMin:function(){return this.options.min},_valueMax:function(){return this.max},_refreshValue:function(){var b,c,d,e,f,g=this.options.range,h=this.options,i=this,j=this._animateOff?!1:h.animate,k={};this.options.values&&this.options.values.length?this.handles.each(function(d){c=(i.values(d)-i._valueMin())/(i._valueMax()-i._valueMin())*100,k["horizontal"===i.orientation?"left":"bottom"]=c+"%",a(this).stop(1,1)[j?"animate":"css"](k,h.animate),i.options.range===!0&&("horizontal"===i.orientation?(0===d&&i.range.stop(1,1)[j?"animate":"css"]({left:c+"%"},h.animate),1===d&&i.range[j?"animate":"css"]({width:c-b+"%"},{queue:!1,duration:h.animate})):(0===d&&i.range.stop(1,1)[j?"animate":"css"]({bottom:c+"%"},h.animate),1===d&&i.range[j?"animate":"css"]({height:c-b+"%"},{queue:!1,duration:h.animate}))),b=c}):(d=this.value(),e=this._valueMin(),f=this._valueMax(),c=f!==e?(d-e)/(f-e)*100:0,k["horizontal"===this.orientation?"left":"bottom"]=c+"%",this.handle.stop(1,1)[j?"animate":"css"](k,h.animate),"min"===g&&"horizontal"===this.orientation&&this.range.stop(1,1)[j?"animate":"css"]({width:c+"%"},h.animate),"max"===g&&"horizontal"===this.orientation&&this.range[j?"animate":"css"]({width:100-c+"%"},{queue:!1,duration:h.animate}),"min"===g&&"vertical"===this.orientation&&this.range.stop(1,1)[j?"animate":"css"]({height:c+"%"},h.animate),"max"===g&&"vertical"===this.orientation&&this.range[j?"animate":"css"]({height:100-c+"%"},{queue:!1,duration:h.animate}))},_handleEvents:{keydown:function(b){var c,d,e,f,g=a(b.target).data("ui-slider-handle-index");switch(b.keyCode){case a.ui.keyCode.HOME:case a.ui.keyCode.END:case a.ui.keyCode.PAGE_UP:case a.ui.keyCode.PAGE_DOWN:case a.ui.keyCode.UP:case a.ui.keyCode.RIGHT:case a.ui.keyCode.DOWN:case a.ui.keyCode.LEFT:if(b.preventDefault(),!this._keySliding&&(this._keySliding=!0,a(b.target).addClass("ui-state-active"),c=this._start(b,g),c===!1))return
-}switch(f=this.options.step,d=e=this.options.values&&this.options.values.length?this.values(g):this.value(),b.keyCode){case a.ui.keyCode.HOME:e=this._valueMin();break;case a.ui.keyCode.END:e=this._valueMax();break;case a.ui.keyCode.PAGE_UP:e=this._trimAlignValue(d+(this._valueMax()-this._valueMin())/this.numPages);break;case a.ui.keyCode.PAGE_DOWN:e=this._trimAlignValue(d-(this._valueMax()-this._valueMin())/this.numPages);break;case a.ui.keyCode.UP:case a.ui.keyCode.RIGHT:if(d===this._valueMax())return;e=this._trimAlignValue(d+f);break;case a.ui.keyCode.DOWN:case a.ui.keyCode.LEFT:if(d===this._valueMin())return;e=this._trimAlignValue(d-f)}this._slide(b,g,e)},keyup:function(b){var c=a(b.target).data("ui-slider-handle-index");this._keySliding&&(this._keySliding=!1,this._stop(b,c),this._change(b,c),a(b.target).removeClass("ui-state-active"))}}}),a.widget("ui.spinner",{version:"1.11.2",defaultElement:"<input>",widgetEventPrefix:"spin",options:{culture:null,icons:{down:"ui-icon-triangle-1-s",up:"ui-icon-triangle-1-n"},incremental:!0,max:null,min:null,numberFormat:null,page:10,step:1,change:null,spin:null,start:null,stop:null},_create:function(){this._setOption("max",this.options.max),this._setOption("min",this.options.min),this._setOption("step",this.options.step),""!==this.value()&&this._value(this.element.val(),!0),this._draw(),this._on(this._events),this._refresh(),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_getCreateOptions:function(){var b={},c=this.element;return a.each(["min","max","step"],function(a,d){var e=c.attr(d);void 0!==e&&e.length&&(b[d]=e)}),b},_events:{keydown:function(a){this._start(a)&&this._keydown(a)&&a.preventDefault()},keyup:"_stop",focus:function(){this.previous=this.element.val()},blur:function(a){return this.cancelBlur?void delete this.cancelBlur:(this._stop(),this._refresh(),void(this.previous!==this.element.val()&&this._trigger("change",a)))},mousewheel:function(a,b){if(b){if(!this.spinning&&!this._start(a))return!1;this._spin((b>0?1:-1)*this.options.step,a),clearTimeout(this.mousewheelTimer),this.mousewheelTimer=this._delay(function(){this.spinning&&this._stop(a)},100),a.preventDefault()}},"mousedown .ui-spinner-button":function(b){function c(){var a=this.element[0]===this.document[0].activeElement;a||(this.element.focus(),this.previous=d,this._delay(function(){this.previous=d}))}var d;d=this.element[0]===this.document[0].activeElement?this.previous:this.element.val(),b.preventDefault(),c.call(this),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur,c.call(this)}),this._start(b)!==!1&&this._repeat(null,a(b.currentTarget).hasClass("ui-spinner-up")?1:-1,b)},"mouseup .ui-spinner-button":"_stop","mouseenter .ui-spinner-button":function(b){return a(b.currentTarget).hasClass("ui-state-active")?this._start(b)===!1?!1:void this._repeat(null,a(b.currentTarget).hasClass("ui-spinner-up")?1:-1,b):void 0},"mouseleave .ui-spinner-button":"_stop"},_draw:function(){var a=this.uiSpinner=this.element.addClass("ui-spinner-input").attr("autocomplete","off").wrap(this._uiSpinnerHtml()).parent().append(this._buttonHtml());this.element.attr("role","spinbutton"),this.buttons=a.find(".ui-spinner-button").attr("tabIndex",-1).button().removeClass("ui-corner-all"),this.buttons.height()>Math.ceil(.5*a.height())&&a.height()>0&&a.height(a.height()),this.options.disabled&&this.disable()},_keydown:function(b){var c=this.options,d=a.ui.keyCode;switch(b.keyCode){case d.UP:return this._repeat(null,1,b),!0;case d.DOWN:return this._repeat(null,-1,b),!0;case d.PAGE_UP:return this._repeat(null,c.page,b),!0;case d.PAGE_DOWN:return this._repeat(null,-c.page,b),!0}return!1},_uiSpinnerHtml:function(){return"<span class='ui-spinner ui-widget ui-widget-content ui-corner-all'></span>"},_buttonHtml:function(){return"<a class='ui-spinner-button ui-spinner-up ui-corner-tr'><span class='ui-icon "+this.options.icons.up+"'>&#9650;</span></a><a class='ui-spinner-button ui-spinner-down ui-corner-br'><span class='ui-icon "+this.options.icons.down+"'>&#9660;</span></a>"},_start:function(a){return this.spinning||this._trigger("start",a)!==!1?(this.counter||(this.counter=1),this.spinning=!0,!0):!1},_repeat:function(a,b,c){a=a||500,clearTimeout(this.timer),this.timer=this._delay(function(){this._repeat(40,b,c)},a),this._spin(b*this.options.step,c)},_spin:function(a,b){var c=this.value()||0;this.counter||(this.counter=1),c=this._adjustValue(c+a*this._increment(this.counter)),this.spinning&&this._trigger("spin",b,{value:c})===!1||(this._value(c),this.counter++)},_increment:function(b){var c=this.options.incremental;return c?a.isFunction(c)?c(b):Math.floor(b*b*b/5e4-b*b/500+17*b/200+1):1},_precision:function(){var a=this._precisionOf(this.options.step);return null!==this.options.min&&(a=Math.max(a,this._precisionOf(this.options.min))),a},_precisionOf:function(a){var b=a.toString(),c=b.indexOf(".");return-1===c?0:b.length-c-1},_adjustValue:function(a){var b,c,d=this.options;return b=null!==d.min?d.min:0,c=a-b,c=Math.round(c/d.step)*d.step,a=b+c,a=parseFloat(a.toFixed(this._precision())),null!==d.max&&a>d.max?d.max:null!==d.min&&a<d.min?d.min:a},_stop:function(a){this.spinning&&(clearTimeout(this.timer),clearTimeout(this.mousewheelTimer),this.counter=0,this.spinning=!1,this._trigger("stop",a))},_setOption:function(a,b){if("culture"===a||"numberFormat"===a){var c=this._parse(this.element.val());return this.options[a]=b,void this.element.val(this._format(c))}("max"===a||"min"===a||"step"===a)&&"string"==typeof b&&(b=this._parse(b)),"icons"===a&&(this.buttons.first().find(".ui-icon").removeClass(this.options.icons.up).addClass(b.up),this.buttons.last().find(".ui-icon").removeClass(this.options.icons.down).addClass(b.down)),this._super(a,b),"disabled"===a&&(this.widget().toggleClass("ui-state-disabled",!!b),this.element.prop("disabled",!!b),this.buttons.button(b?"disable":"enable"))},_setOptions:i(function(a){this._super(a)}),_parse:function(a){return"string"==typeof a&&""!==a&&(a=window.Globalize&&this.options.numberFormat?Globalize.parseFloat(a,10,this.options.culture):+a),""===a||isNaN(a)?null:a},_format:function(a){return""===a?"":window.Globalize&&this.options.numberFormat?Globalize.format(a,this.options.numberFormat,this.options.culture):a},_refresh:function(){this.element.attr({"aria-valuemin":this.options.min,"aria-valuemax":this.options.max,"aria-valuenow":this._parse(this.element.val())})},isValid:function(){var a=this.value();return null===a?!1:a===this._adjustValue(a)},_value:function(a,b){var c;""!==a&&(c=this._parse(a),null!==c&&(b||(c=this._adjustValue(c)),a=this._format(c))),this.element.val(a),this._refresh()},_destroy:function(){this.element.removeClass("ui-spinner-input").prop("disabled",!1).removeAttr("autocomplete").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"),this.uiSpinner.replaceWith(this.element)},stepUp:i(function(a){this._stepUp(a)}),_stepUp:function(a){this._start()&&(this._spin((a||1)*this.options.step),this._stop())},stepDown:i(function(a){this._stepDown(a)}),_stepDown:function(a){this._start()&&(this._spin((a||1)*-this.options.step),this._stop())},pageUp:i(function(a){this._stepUp((a||1)*this.options.page)}),pageDown:i(function(a){this._stepDown((a||1)*this.options.page)}),value:function(a){return arguments.length?void i(this._value).call(this,a):this._parse(this.element.val())},widget:function(){return this.uiSpinner}}),a.widget("ui.tabs",{version:"1.11.2",delay:300,options:{active:null,collapsible:!1,event:"click",heightStyle:"content",hide:null,show:null,activate:null,beforeActivate:null,beforeLoad:null,load:null},_isLocal:function(){var a=/#.*$/;return function(b){var c,d;b=b.cloneNode(!1),c=b.href.replace(a,""),d=location.href.replace(a,"");try{c=decodeURIComponent(c)}catch(e){}try{d=decodeURIComponent(d)}catch(e){}return b.hash.length>1&&c===d}}(),_create:function(){var b=this,c=this.options;this.running=!1,this.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all").toggleClass("ui-tabs-collapsible",c.collapsible),this._processTabs(),c.active=this._initialActive(),a.isArray(c.disabled)&&(c.disabled=a.unique(c.disabled.concat(a.map(this.tabs.filter(".ui-state-disabled"),function(a){return b.tabs.index(a)}))).sort()),this.active=this.options.active!==!1&&this.anchors.length?this._findActive(c.active):a(),this._refresh(),this.active.length&&this.load(c.active)},_initialActive:function(){var b=this.options.active,c=this.options.collapsible,d=location.hash.substring(1);return null===b&&(d&&this.tabs.each(function(c,e){return a(e).attr("aria-controls")===d?(b=c,!1):void 0}),null===b&&(b=this.tabs.index(this.tabs.filter(".ui-tabs-active"))),(null===b||-1===b)&&(b=this.tabs.length?0:!1)),b!==!1&&(b=this.tabs.index(this.tabs.eq(b)),-1===b&&(b=c?!1:0)),!c&&b===!1&&this.anchors.length&&(b=0),b},_getCreateEventData:function(){return{tab:this.active,panel:this.active.length?this._getPanelForTab(this.active):a()}},_tabKeydown:function(b){var c=a(this.document[0].activeElement).closest("li"),d=this.tabs.index(c),e=!0;if(!this._handlePageNav(b)){switch(b.keyCode){case a.ui.keyCode.RIGHT:case a.ui.keyCode.DOWN:d++;break;case a.ui.keyCode.UP:case a.ui.keyCode.LEFT:e=!1,d--;break;case a.ui.keyCode.END:d=this.anchors.length-1;break;case a.ui.keyCode.HOME:d=0;break;case a.ui.keyCode.SPACE:return b.preventDefault(),clearTimeout(this.activating),void this._activate(d);case a.ui.keyCode.ENTER:return b.preventDefault(),clearTimeout(this.activating),void this._activate(d===this.options.active?!1:d);default:return}b.preventDefault(),clearTimeout(this.activating),d=this._focusNextTab(d,e),b.ctrlKey||(c.attr("aria-selected","false"),this.tabs.eq(d).attr("aria-selected","true"),this.activating=this._delay(function(){this.option("active",d)},this.delay))}},_panelKeydown:function(b){this._handlePageNav(b)||b.ctrlKey&&b.keyCode===a.ui.keyCode.UP&&(b.preventDefault(),this.active.focus())},_handlePageNav:function(b){return b.altKey&&b.keyCode===a.ui.keyCode.PAGE_UP?(this._activate(this._focusNextTab(this.options.active-1,!1)),!0):b.altKey&&b.keyCode===a.ui.keyCode.PAGE_DOWN?(this._activate(this._focusNextTab(this.options.active+1,!0)),!0):void 0},_findNextTab:function(b,c){function d(){return b>e&&(b=0),0>b&&(b=e),b}for(var e=this.tabs.length-1;-1!==a.inArray(d(),this.options.disabled);)b=c?b+1:b-1;return b},_focusNextTab:function(a,b){return a=this._findNextTab(a,b),this.tabs.eq(a).focus(),a},_setOption:function(a,b){return"active"===a?void this._activate(b):"disabled"===a?void this._setupDisabled(b):(this._super(a,b),"collapsible"===a&&(this.element.toggleClass("ui-tabs-collapsible",b),b||this.options.active!==!1||this._activate(0)),"event"===a&&this._setupEvents(b),void("heightStyle"===a&&this._setupHeightStyle(b)))},_sanitizeSelector:function(a){return a?a.replace(/[!"$%&'()*+,.\/:;<=>?@\[\]\^`{|}~]/g,"\\$&"):""},refresh:function(){var b=this.options,c=this.tablist.children(":has(a[href])");b.disabled=a.map(c.filter(".ui-state-disabled"),function(a){return c.index(a)}),this._processTabs(),b.active!==!1&&this.anchors.length?this.active.length&&!a.contains(this.tablist[0],this.active[0])?this.tabs.length===b.disabled.length?(b.active=!1,this.active=a()):this._activate(this._findNextTab(Math.max(0,b.active-1),!1)):b.active=this.tabs.index(this.active):(b.active=!1,this.active=a()),this._refresh()},_refresh:function(){this._setupDisabled(this.options.disabled),this._setupEvents(this.options.event),this._setupHeightStyle(this.options.heightStyle),this.tabs.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}),this.panels.not(this._getPanelForTab(this.active)).hide().attr({"aria-hidden":"true"}),this.active.length?(this.active.addClass("ui-tabs-active ui-state-active").attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}),this._getPanelForTab(this.active).show().attr({"aria-hidden":"false"})):this.tabs.eq(0).attr("tabIndex",0)},_processTabs:function(){var b=this,c=this.tabs,d=this.anchors,e=this.panels;this.tablist=this._getList().addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all").attr("role","tablist").delegate("> li","mousedown"+this.eventNamespace,function(b){a(this).is(".ui-state-disabled")&&b.preventDefault()}).delegate(".ui-tabs-anchor","focus"+this.eventNamespace,function(){a(this).closest("li").is(".ui-state-disabled")&&this.blur()}),this.tabs=this.tablist.find("> li:has(a[href])").addClass("ui-state-default ui-corner-top").attr({role:"tab",tabIndex:-1}),this.anchors=this.tabs.map(function(){return a("a",this)[0]}).addClass("ui-tabs-anchor").attr({role:"presentation",tabIndex:-1}),this.panels=a(),this.anchors.each(function(c,d){var e,f,g,h=a(d).uniqueId().attr("id"),i=a(d).closest("li"),j=i.attr("aria-controls");b._isLocal(d)?(e=d.hash,g=e.substring(1),f=b.element.find(b._sanitizeSelector(e))):(g=i.attr("aria-controls")||a({}).uniqueId()[0].id,e="#"+g,f=b.element.find(e),f.length||(f=b._createPanel(g),f.insertAfter(b.panels[c-1]||b.tablist)),f.attr("aria-live","polite")),f.length&&(b.panels=b.panels.add(f)),j&&i.data("ui-tabs-aria-controls",j),i.attr({"aria-controls":g,"aria-labelledby":h}),f.attr("aria-labelledby",h)}),this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").attr("role","tabpanel"),c&&(this._off(c.not(this.tabs)),this._off(d.not(this.anchors)),this._off(e.not(this.panels)))},_getList:function(){return this.tablist||this.element.find("ol,ul").eq(0)},_createPanel:function(b){return a("<div>").attr("id",b).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").data("ui-tabs-destroy",!0)},_setupDisabled:function(b){a.isArray(b)&&(b.length?b.length===this.anchors.length&&(b=!0):b=!1);for(var c,d=0;c=this.tabs[d];d++)b===!0||-1!==a.inArray(d,b)?a(c).addClass("ui-state-disabled").attr("aria-disabled","true"):a(c).removeClass("ui-state-disabled").removeAttr("aria-disabled");this.options.disabled=b},_setupEvents:function(b){var c={};b&&a.each(b.split(" "),function(a,b){c[b]="_eventHandler"}),this._off(this.anchors.add(this.tabs).add(this.panels)),this._on(!0,this.anchors,{click:function(a){a.preventDefault()}}),this._on(this.anchors,c),this._on(this.tabs,{keydown:"_tabKeydown"}),this._on(this.panels,{keydown:"_panelKeydown"}),this._focusable(this.tabs),this._hoverable(this.tabs)},_setupHeightStyle:function(b){var c,d=this.element.parent();"fill"===b?(c=d.height(),c-=this.element.outerHeight()-this.element.height(),this.element.siblings(":visible").each(function(){var b=a(this),d=b.css("position");"absolute"!==d&&"fixed"!==d&&(c-=b.outerHeight(!0))}),this.element.children().not(this.panels).each(function(){c-=a(this).outerHeight(!0)}),this.panels.each(function(){a(this).height(Math.max(0,c-a(this).innerHeight()+a(this).height()))}).css("overflow","auto")):"auto"===b&&(c=0,this.panels.each(function(){c=Math.max(c,a(this).height("").height())}).height(c))},_eventHandler:function(b){var c=this.options,d=this.active,e=a(b.currentTarget),f=e.closest("li"),g=f[0]===d[0],h=g&&c.collapsible,i=h?a():this._getPanelForTab(f),j=d.length?this._getPanelForTab(d):a(),k={oldTab:d,oldPanel:j,newTab:h?a():f,newPanel:i};b.preventDefault(),f.hasClass("ui-state-disabled")||f.hasClass("ui-tabs-loading")||this.running||g&&!c.collapsible||this._trigger("beforeActivate",b,k)===!1||(c.active=h?!1:this.tabs.index(f),this.active=g?a():f,this.xhr&&this.xhr.abort(),j.length||i.length||a.error("jQuery UI Tabs: Mismatching fragment identifier."),i.length&&this.load(this.tabs.index(f),b),this._toggle(b,k))},_toggle:function(b,c){function d(){f.running=!1,f._trigger("activate",b,c)}function e(){c.newTab.closest("li").addClass("ui-tabs-active ui-state-active"),g.length&&f.options.show?f._show(g,f.options.show,d):(g.show(),d())}var f=this,g=c.newPanel,h=c.oldPanel;this.running=!0,h.length&&this.options.hide?this._hide(h,this.options.hide,function(){c.oldTab.closest("li").removeClass("ui-tabs-active ui-state-active"),e()}):(c.oldTab.closest("li").removeClass("ui-tabs-active ui-state-active"),h.hide(),e()),h.attr("aria-hidden","true"),c.oldTab.attr({"aria-selected":"false","aria-expanded":"false"}),g.length&&h.length?c.oldTab.attr("tabIndex",-1):g.length&&this.tabs.filter(function(){return 0===a(this).attr("tabIndex")}).attr("tabIndex",-1),g.attr("aria-hidden","false"),c.newTab.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0})},_activate:function(b){var c,d=this._findActive(b);d[0]!==this.active[0]&&(d.length||(d=this.active),c=d.find(".ui-tabs-anchor")[0],this._eventHandler({target:c,currentTarget:c,preventDefault:a.noop}))},_findActive:function(b){return b===!1?a():this.tabs.eq(b)},_getIndex:function(a){return"string"==typeof a&&(a=this.anchors.index(this.anchors.filter("[href$='"+a+"']"))),a},_destroy:function(){this.xhr&&this.xhr.abort(),this.element.removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible"),this.tablist.removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all").removeAttr("role"),this.anchors.removeClass("ui-tabs-anchor").removeAttr("role").removeAttr("tabIndex").removeUniqueId(),this.tablist.unbind(this.eventNamespace),this.tabs.add(this.panels).each(function(){a.data(this,"ui-tabs-destroy")?a(this).remove():a(this).removeClass("ui-state-default ui-state-active ui-state-disabled ui-corner-top ui-corner-bottom ui-widget-content ui-tabs-active ui-tabs-panel").removeAttr("tabIndex").removeAttr("aria-live").removeAttr("aria-busy").removeAttr("aria-selected").removeAttr("aria-labelledby").removeAttr("aria-hidden").removeAttr("aria-expanded").removeAttr("role")}),this.tabs.each(function(){var b=a(this),c=b.data("ui-tabs-aria-controls");c?b.attr("aria-controls",c).removeData("ui-tabs-aria-controls"):b.removeAttr("aria-controls")}),this.panels.show(),"content"!==this.options.heightStyle&&this.panels.css("height","")},enable:function(b){var c=this.options.disabled;c!==!1&&(void 0===b?c=!1:(b=this._getIndex(b),c=a.isArray(c)?a.map(c,function(a){return a!==b?a:null}):a.map(this.tabs,function(a,c){return c!==b?c:null})),this._setupDisabled(c))},disable:function(b){var c=this.options.disabled;if(c!==!0){if(void 0===b)c=!0;else{if(b=this._getIndex(b),-1!==a.inArray(b,c))return;c=a.isArray(c)?a.merge([b],c).sort():[b]}this._setupDisabled(c)}},load:function(b,c){b=this._getIndex(b);var d=this,e=this.tabs.eq(b),f=e.find(".ui-tabs-anchor"),g=this._getPanelForTab(e),h={tab:e,panel:g};this._isLocal(f[0])||(this.xhr=a.ajax(this._ajaxSettings(f,c,h)),this.xhr&&"canceled"!==this.xhr.statusText&&(e.addClass("ui-tabs-loading"),g.attr("aria-busy","true"),this.xhr.success(function(a){setTimeout(function(){g.html(a),d._trigger("load",c,h)},1)}).complete(function(a,b){setTimeout(function(){"abort"===b&&d.panels.stop(!1,!0),e.removeClass("ui-tabs-loading"),g.removeAttr("aria-busy"),a===d.xhr&&delete d.xhr},1)})))},_ajaxSettings:function(b,c,d){var e=this;return{url:b.attr("href"),beforeSend:function(b,f){return e._trigger("beforeLoad",c,a.extend({jqXHR:b,ajaxSettings:f},d))}}},_getPanelForTab:function(b){var c=a(b).attr("aria-controls");return this.element.find(this._sanitizeSelector("#"+c))}}),a.widget("ui.tooltip",{version:"1.11.2",options:{content:function(){var b=a(this).attr("title")||"";return a("<a>").text(b).html()},hide:!0,items:"[title]:not([disabled])",position:{my:"left top+15",at:"left bottom",collision:"flipfit flip"},show:!0,tooltipClass:null,track:!1,close:null,open:null},_addDescribedBy:function(b,c){var d=(b.attr("aria-describedby")||"").split(/\s+/);d.push(c),b.data("ui-tooltip-id",c).attr("aria-describedby",a.trim(d.join(" ")))},_removeDescribedBy:function(b){var c=b.data("ui-tooltip-id"),d=(b.attr("aria-describedby")||"").split(/\s+/),e=a.inArray(c,d);-1!==e&&d.splice(e,1),b.removeData("ui-tooltip-id"),d=a.trim(d.join(" ")),d?b.attr("aria-describedby",d):b.removeAttr("aria-describedby")},_create:function(){this._on({mouseover:"open",focusin:"open"}),this.tooltips={},this.parents={},this.options.disabled&&this._disable(),this.liveRegion=a("<div>").attr({role:"log","aria-live":"assertive","aria-relevant":"additions"}).addClass("ui-helper-hidden-accessible").appendTo(this.document[0].body)},_setOption:function(b,c){var d=this;return"disabled"===b?(this[c?"_disable":"_enable"](),void(this.options[b]=c)):(this._super(b,c),void("content"===b&&a.each(this.tooltips,function(a,b){d._updateContent(b.element)})))},_disable:function(){var b=this;a.each(this.tooltips,function(c,d){var e=a.Event("blur");e.target=e.currentTarget=d.element[0],b.close(e,!0)}),this.element.find(this.options.items).addBack().each(function(){var b=a(this);b.is("[title]")&&b.data("ui-tooltip-title",b.attr("title")).removeAttr("title")})},_enable:function(){this.element.find(this.options.items).addBack().each(function(){var b=a(this);b.data("ui-tooltip-title")&&b.attr("title",b.data("ui-tooltip-title"))})},open:function(b){var c=this,d=a(b?b.target:this.element).closest(this.options.items);d.length&&!d.data("ui-tooltip-id")&&(d.attr("title")&&d.data("ui-tooltip-title",d.attr("title")),d.data("ui-tooltip-open",!0),b&&"mouseover"===b.type&&d.parents().each(function(){var b,d=a(this);d.data("ui-tooltip-open")&&(b=a.Event("blur"),b.target=b.currentTarget=this,c.close(b,!0)),d.attr("title")&&(d.uniqueId(),c.parents[this.id]={element:this,title:d.attr("title")},d.attr("title",""))}),this._updateContent(d,b))},_updateContent:function(a,b){var c,d=this.options.content,e=this,f=b?b.type:null;return"string"==typeof d?this._open(b,a,d):(c=d.call(a[0],function(c){a.data("ui-tooltip-open")&&e._delay(function(){b&&(b.type=f),this._open(b,a,c)})}),void(c&&this._open(b,a,c)))},_open:function(b,c,d){function e(a){k.of=a,g.is(":hidden")||g.position(k)}var f,g,h,i,j,k=a.extend({},this.options.position);if(d){if(f=this._find(c))return void f.tooltip.find(".ui-tooltip-content").html(d);c.is("[title]")&&(b&&"mouseover"===b.type?c.attr("title",""):c.removeAttr("title")),f=this._tooltip(c),g=f.tooltip,this._addDescribedBy(c,g.attr("id")),g.find(".ui-tooltip-content").html(d),this.liveRegion.children().hide(),d.clone?(j=d.clone(),j.removeAttr("id").find("[id]").removeAttr("id")):j=d,a("<div>").html(j).appendTo(this.liveRegion),this.options.track&&b&&/^mouse/.test(b.type)?(this._on(this.document,{mousemove:e}),e(b)):g.position(a.extend({of:c},this.options.position)),g.hide(),this._show(g,this.options.show),this.options.show&&this.options.show.delay&&(i=this.delayedShow=setInterval(function(){g.is(":visible")&&(e(k.of),clearInterval(i))},a.fx.interval)),this._trigger("open",b,{tooltip:g}),h={keyup:function(b){if(b.keyCode===a.ui.keyCode.ESCAPE){var d=a.Event(b);d.currentTarget=c[0],this.close(d,!0)}}},c[0]!==this.element[0]&&(h.remove=function(){this._removeTooltip(g)}),b&&"mouseover"!==b.type||(h.mouseleave="close"),b&&"focusin"!==b.type||(h.focusout="close"),this._on(!0,c,h)}},close:function(b){var c,d=this,e=a(b?b.currentTarget:this.element),f=this._find(e);f&&(c=f.tooltip,f.closing||(clearInterval(this.delayedShow),e.data("ui-tooltip-title")&&!e.attr("title")&&e.attr("title",e.data("ui-tooltip-title")),this._removeDescribedBy(e),f.hiding=!0,c.stop(!0),this._hide(c,this.options.hide,function(){d._removeTooltip(a(this))}),e.removeData("ui-tooltip-open"),this._off(e,"mouseleave focusout keyup"),e[0]!==this.element[0]&&this._off(e,"remove"),this._off(this.document,"mousemove"),b&&"mouseleave"===b.type&&a.each(this.parents,function(b,c){a(c.element).attr("title",c.title),delete d.parents[b]}),f.closing=!0,this._trigger("close",b,{tooltip:c}),f.hiding||(f.closing=!1)))},_tooltip:function(b){var c=a("<div>").attr("role","tooltip").addClass("ui-tooltip ui-widget ui-corner-all ui-widget-content "+(this.options.tooltipClass||"")),d=c.uniqueId().attr("id");return a("<div>").addClass("ui-tooltip-content").appendTo(c),c.appendTo(this.document[0].body),this.tooltips[d]={element:b,tooltip:c}},_find:function(a){var b=a.data("ui-tooltip-id");return b?this.tooltips[b]:null},_removeTooltip:function(a){a.remove(),delete this.tooltips[a.attr("id")]},_destroy:function(){var b=this;a.each(this.tooltips,function(c,d){var e=a.Event("blur"),f=d.element;e.target=e.currentTarget=f[0],b.close(e,!0),a("#"+c).remove(),f.data("ui-tooltip-title")&&(f.attr("title")||f.attr("title",f.data("ui-tooltip-title")),f.removeData("ui-tooltip-title"))}),this.liveRegion.remove()}}),"ui-effects-"),t=a;a.effects={effect:{}},/*!
- * jQuery Color Animations v2.1.2
- * https://github.com/jquery/jquery-color
- *
- * Copyright 2014 jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * Date: Wed Jan 16 08:47:09 2013 -0600
- */
-function(a,b){function c(a,b,c){var d=l[b.type]||{};return null==a?c||!b.def?null:b.def:(a=d.floor?~~a:parseFloat(a),isNaN(a)?b.def:d.mod?(a+d.mod)%d.mod:0>a?0:d.max<a?d.max:a)}function d(b){var c=j(),d=c._rgba=[];return b=b.toLowerCase(),o(i,function(a,e){var f,g=e.re.exec(b),h=g&&e.parse(g),i=e.space||"rgba";return h?(f=c[i](h),c[k[i].cache]=f[k[i].cache],d=c._rgba=f._rgba,!1):void 0}),d.length?("0,0,0,0"===d.join()&&a.extend(d,f.transparent),c):f[b]}function e(a,b,c){return c=(c+1)%1,1>6*c?a+(b-a)*c*6:1>2*c?b:2>3*c?a+(b-a)*(2/3-c)*6:a}var f,g="backgroundColor borderBottomColor borderLeftColor borderRightColor borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor",h=/^([\-+])=\s*(\d+\.?\d*)/,i=[{re:/rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(a){return[a[1],a[2],a[3],a[4]]}},{re:/rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(a){return[2.55*a[1],2.55*a[2],2.55*a[3],a[4]]}},{re:/#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})/,parse:function(a){return[parseInt(a[1],16),parseInt(a[2],16),parseInt(a[3],16)]}},{re:/#([a-f0-9])([a-f0-9])([a-f0-9])/,parse:function(a){return[parseInt(a[1]+a[1],16),parseInt(a[2]+a[2],16),parseInt(a[3]+a[3],16)]}},{re:/hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,space:"hsla",parse:function(a){return[a[1],a[2]/100,a[3]/100,a[4]]}}],j=a.Color=function(b,c,d,e){return new a.Color.fn.parse(b,c,d,e)},k={rgba:{props:{red:{idx:0,type:"byte"},green:{idx:1,type:"byte"},blue:{idx:2,type:"byte"}}},hsla:{props:{hue:{idx:0,type:"degrees"},saturation:{idx:1,type:"percent"},lightness:{idx:2,type:"percent"}}}},l={"byte":{floor:!0,max:255},percent:{max:1},degrees:{mod:360,floor:!0}},m=j.support={},n=a("<p>")[0],o=a.each;n.style.cssText="background-color:rgba(1,1,1,.5)",m.rgba=n.style.backgroundColor.indexOf("rgba")>-1,o(k,function(a,b){b.cache="_"+a,b.props.alpha={idx:3,type:"percent",def:1}}),j.fn=a.extend(j.prototype,{parse:function(e,g,h,i){if(e===b)return this._rgba=[null,null,null,null],this;(e.jquery||e.nodeType)&&(e=a(e).css(g),g=b);var l=this,m=a.type(e),n=this._rgba=[];return g!==b&&(e=[e,g,h,i],m="array"),"string"===m?this.parse(d(e)||f._default):"array"===m?(o(k.rgba.props,function(a,b){n[b.idx]=c(e[b.idx],b)}),this):"object"===m?(e instanceof j?o(k,function(a,b){e[b.cache]&&(l[b.cache]=e[b.cache].slice())}):o(k,function(b,d){var f=d.cache;o(d.props,function(a,b){if(!l[f]&&d.to){if("alpha"===a||null==e[a])return;l[f]=d.to(l._rgba)}l[f][b.idx]=c(e[a],b,!0)}),l[f]&&a.inArray(null,l[f].slice(0,3))<0&&(l[f][3]=1,d.from&&(l._rgba=d.from(l[f])))}),this):void 0},is:function(a){var b=j(a),c=!0,d=this;return o(k,function(a,e){var f,g=b[e.cache];return g&&(f=d[e.cache]||e.to&&e.to(d._rgba)||[],o(e.props,function(a,b){return null!=g[b.idx]?c=g[b.idx]===f[b.idx]:void 0})),c}),c},_space:function(){var a=[],b=this;return o(k,function(c,d){b[d.cache]&&a.push(c)}),a.pop()},transition:function(a,b){var d=j(a),e=d._space(),f=k[e],g=0===this.alpha()?j("transparent"):this,h=g[f.cache]||f.to(g._rgba),i=h.slice();return d=d[f.cache],o(f.props,function(a,e){var f=e.idx,g=h[f],j=d[f],k=l[e.type]||{};null!==j&&(null===g?i[f]=j:(k.mod&&(j-g>k.mod/2?g+=k.mod:g-j>k.mod/2&&(g-=k.mod)),i[f]=c((j-g)*b+g,e)))}),this[e](i)},blend:function(b){if(1===this._rgba[3])return this;var c=this._rgba.slice(),d=c.pop(),e=j(b)._rgba;return j(a.map(c,function(a,b){return(1-d)*e[b]+d*a}))},toRgbaString:function(){var b="rgba(",c=a.map(this._rgba,function(a,b){return null==a?b>2?1:0:a});return 1===c[3]&&(c.pop(),b="rgb("),b+c.join()+")"},toHslaString:function(){var b="hsla(",c=a.map(this.hsla(),function(a,b){return null==a&&(a=b>2?1:0),b&&3>b&&(a=Math.round(100*a)+"%"),a});return 1===c[3]&&(c.pop(),b="hsl("),b+c.join()+")"},toHexString:function(b){var c=this._rgba.slice(),d=c.pop();return b&&c.push(~~(255*d)),"#"+a.map(c,function(a){return a=(a||0).toString(16),1===a.length?"0"+a:a}).join("")},toString:function(){return 0===this._rgba[3]?"transparent":this.toRgbaString()}}),j.fn.parse.prototype=j.fn,k.hsla.to=function(a){if(null==a[0]||null==a[1]||null==a[2])return[null,null,null,a[3]];var b,c,d=a[0]/255,e=a[1]/255,f=a[2]/255,g=a[3],h=Math.max(d,e,f),i=Math.min(d,e,f),j=h-i,k=h+i,l=.5*k;return b=i===h?0:d===h?60*(e-f)/j+360:e===h?60*(f-d)/j+120:60*(d-e)/j+240,c=0===j?0:.5>=l?j/k:j/(2-k),[Math.round(b)%360,c,l,null==g?1:g]},k.hsla.from=function(a){if(null==a[0]||null==a[1]||null==a[2])return[null,null,null,a[3]];var b=a[0]/360,c=a[1],d=a[2],f=a[3],g=.5>=d?d*(1+c):d+c-d*c,h=2*d-g;return[Math.round(255*e(h,g,b+1/3)),Math.round(255*e(h,g,b)),Math.round(255*e(h,g,b-1/3)),f]},o(k,function(d,e){var f=e.props,g=e.cache,i=e.to,k=e.from;j.fn[d]=function(d){if(i&&!this[g]&&(this[g]=i(this._rgba)),d===b)return this[g].slice();var e,h=a.type(d),l="array"===h||"object"===h?d:arguments,m=this[g].slice();return o(f,function(a,b){var d=l["object"===h?a:b.idx];null==d&&(d=m[b.idx]),m[b.idx]=c(d,b)}),k?(e=j(k(m)),e[g]=m,e):j(m)},o(f,function(b,c){j.fn[b]||(j.fn[b]=function(e){var f,g=a.type(e),i="alpha"===b?this._hsla?"hsla":"rgba":d,j=this[i](),k=j[c.idx];return"undefined"===g?k:("function"===g&&(e=e.call(this,k),g=a.type(e)),null==e&&c.empty?this:("string"===g&&(f=h.exec(e),f&&(e=k+parseFloat(f[2])*("+"===f[1]?1:-1))),j[c.idx]=e,this[i](j)))})})}),j.hook=function(b){var c=b.split(" ");o(c,function(b,c){a.cssHooks[c]={set:function(b,e){var f,g,h="";if("transparent"!==e&&("string"!==a.type(e)||(f=d(e)))){if(e=j(f||e),!m.rgba&&1!==e._rgba[3]){for(g="backgroundColor"===c?b.parentNode:b;(""===h||"transparent"===h)&&g&&g.style;)try{h=a.css(g,"backgroundColor"),g=g.parentNode}catch(i){}e=e.blend(h&&"transparent"!==h?h:"_default")}e=e.toRgbaString()}try{b.style[c]=e}catch(i){}}},a.fx.step[c]=function(b){b.colorInit||(b.start=j(b.elem,c),b.end=j(b.end),b.colorInit=!0),a.cssHooks[c].set(b.elem,b.start.transition(b.end,b.pos))}})},j.hook(g),a.cssHooks.borderColor={expand:function(a){var b={};return o(["Top","Right","Bottom","Left"],function(c,d){b["border"+d+"Color"]=a}),b}},f=a.Color.names={aqua:"#00ffff",black:"#000000",blue:"#0000ff",fuchsia:"#ff00ff",gray:"#808080",green:"#008000",lime:"#00ff00",maroon:"#800000",navy:"#000080",olive:"#808000",purple:"#800080",red:"#ff0000",silver:"#c0c0c0",teal:"#008080",white:"#ffffff",yellow:"#ffff00",transparent:[null,null,null,0],_default:"#ffffff"}}(t),function(){function b(b){var c,d,e=b.ownerDocument.defaultView?b.ownerDocument.defaultView.getComputedStyle(b,null):b.currentStyle,f={};if(e&&e.length&&e[0]&&e[e[0]])for(d=e.length;d--;)c=e[d],"string"==typeof e[c]&&(f[a.camelCase(c)]=e[c]);else for(c in e)"string"==typeof e[c]&&(f[c]=e[c]);return f}function c(b,c){var d,f,g={};for(d in c)f=c[d],b[d]!==f&&(e[d]||(a.fx.step[d]||!isNaN(parseFloat(f)))&&(g[d]=f));return g}var d=["add","remove","toggle"],e={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};a.each(["borderLeftStyle","borderRightStyle","borderBottomStyle","borderTopStyle"],function(b,c){a.fx.step[c]=function(a){("none"!==a.end&&!a.setAttr||1===a.pos&&!a.setAttr)&&(t.style(a.elem,c,a.end),a.setAttr=!0)}}),a.fn.addBack||(a.fn.addBack=function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}),a.effects.animateClass=function(e,f,g,h){var i=a.speed(f,g,h);return this.queue(function(){var f,g=a(this),h=g.attr("class")||"",j=i.children?g.find("*").addBack():g;j=j.map(function(){var c=a(this);return{el:c,start:b(this)}}),f=function(){a.each(d,function(a,b){e[b]&&g[b+"Class"](e[b])})},f(),j=j.map(function(){return this.end=b(this.el[0]),this.diff=c(this.start,this.end),this}),g.attr("class",h),j=j.map(function(){var b=this,c=a.Deferred(),d=a.extend({},i,{queue:!1,complete:function(){c.resolve(b)}});return this.el.animate(this.diff,d),c.promise()}),a.when.apply(a,j.get()).done(function(){f(),a.each(arguments,function(){var b=this.el;a.each(this.diff,function(a){b.css(a,"")})}),i.complete.call(g[0])})})},a.fn.extend({addClass:function(b){return function(c,d,e,f){return d?a.effects.animateClass.call(this,{add:c},d,e,f):b.apply(this,arguments)}}(a.fn.addClass),removeClass:function(b){return function(c,d,e,f){return arguments.length>1?a.effects.animateClass.call(this,{remove:c},d,e,f):b.apply(this,arguments)}}(a.fn.removeClass),toggleClass:function(b){return function(c,d,e,f,g){return"boolean"==typeof d||void 0===d?e?a.effects.animateClass.call(this,d?{add:c}:{remove:c},e,f,g):b.apply(this,arguments):a.effects.animateClass.call(this,{toggle:c},d,e,f)}}(a.fn.toggleClass),switchClass:function(b,c,d,e,f){return a.effects.animateClass.call(this,{add:c,remove:b},d,e,f)}})}(),function(){function b(b,c,d,e){return a.isPlainObject(b)&&(c=b,b=b.effect),b={effect:b},null==c&&(c={}),a.isFunction(c)&&(e=c,d=null,c={}),("number"==typeof c||a.fx.speeds[c])&&(e=d,d=c,c={}),a.isFunction(d)&&(e=d,d=null),c&&a.extend(b,c),d=d||c.duration,b.duration=a.fx.off?0:"number"==typeof d?d:d in a.fx.speeds?a.fx.speeds[d]:a.fx.speeds._default,b.complete=e||c.complete,b}function c(b){return!b||"number"==typeof b||a.fx.speeds[b]?!0:"string"!=typeof b||a.effects.effect[b]?a.isFunction(b)?!0:"object"!=typeof b||b.effect?!1:!0:!0}a.extend(a.effects,{version:"1.11.2",save:function(a,b){for(var c=0;c<b.length;c++)null!==b[c]&&a.data(s+b[c],a[0].style[b[c]])},restore:function(a,b){var c,d;for(d=0;d<b.length;d++)null!==b[d]&&(c=a.data(s+b[d]),void 0===c&&(c=""),a.css(b[d],c))},setMode:function(a,b){return"toggle"===b&&(b=a.is(":hidden")?"show":"hide"),b},getBaseline:function(a,b){var c,d;switch(a[0]){case"top":c=0;break;case"middle":c=.5;break;case"bottom":c=1;break;default:c=a[0]/b.height}switch(a[1]){case"left":d=0;break;case"center":d=.5;break;case"right":d=1;break;default:d=a[1]/b.width}return{x:d,y:c}},createWrapper:function(b){if(b.parent().is(".ui-effects-wrapper"))return b.parent();var c={width:b.outerWidth(!0),height:b.outerHeight(!0),"float":b.css("float")},d=a("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),e={width:b.width(),height:b.height()},f=document.activeElement;try{f.id}catch(g){f=document.body}return b.wrap(d),(b[0]===f||a.contains(b[0],f))&&a(f).focus(),d=b.parent(),"static"===b.css("position")?(d.css({position:"relative"}),b.css({position:"relative"})):(a.extend(c,{position:b.css("position"),zIndex:b.css("z-index")}),a.each(["top","left","bottom","right"],function(a,d){c[d]=b.css(d),isNaN(parseInt(c[d],10))&&(c[d]="auto")}),b.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})),b.css(e),d.css(c).show()},removeWrapper:function(b){var c=document.activeElement;return b.parent().is(".ui-effects-wrapper")&&(b.parent().replaceWith(b),(b[0]===c||a.contains(b[0],c))&&a(c).focus()),b},setTransition:function(b,c,d,e){return e=e||{},a.each(c,function(a,c){var f=b.cssUnit(c);f[0]>0&&(e[c]=f[0]*d+f[1])}),e}}),a.fn.extend({effect:function(){function c(b){function c(){a.isFunction(f)&&f.call(e[0]),a.isFunction(b)&&b()}var e=a(this),f=d.complete,h=d.mode;(e.is(":hidden")?"hide"===h:"show"===h)?(e[h](),c()):g.call(e[0],d,c)}var d=b.apply(this,arguments),e=d.mode,f=d.queue,g=a.effects.effect[d.effect];return a.fx.off||!g?e?this[e](d.duration,d.complete):this.each(function(){d.complete&&d.complete.call(this)}):f===!1?this.each(c):this.queue(f||"fx",c)},show:function(a){return function(d){if(c(d))return a.apply(this,arguments);var e=b.apply(this,arguments);return e.mode="show",this.effect.call(this,e)}}(a.fn.show),hide:function(a){return function(d){if(c(d))return a.apply(this,arguments);var e=b.apply(this,arguments);return e.mode="hide",this.effect.call(this,e)}}(a.fn.hide),toggle:function(a){return function(d){if(c(d)||"boolean"==typeof d)return a.apply(this,arguments);var e=b.apply(this,arguments);return e.mode="toggle",this.effect.call(this,e)}}(a.fn.toggle),cssUnit:function(b){var c=this.css(b),d=[];return a.each(["em","px","%","pt"],function(a,b){c.indexOf(b)>0&&(d=[parseFloat(c),b])}),d}})}(),function(){var b={};a.each(["Quad","Cubic","Quart","Quint","Expo"],function(a,c){b[c]=function(b){return Math.pow(b,a+2)}}),a.extend(b,{Sine:function(a){return 1-Math.cos(a*Math.PI/2)},Circ:function(a){return 1-Math.sqrt(1-a*a)},Elastic:function(a){return 0===a||1===a?a:-Math.pow(2,8*(a-1))*Math.sin((80*(a-1)-7.5)*Math.PI/15)},Back:function(a){return a*a*(3*a-2)},Bounce:function(a){for(var b,c=4;a<((b=Math.pow(2,--c))-1)/11;);return 1/Math.pow(4,3-c)-7.5625*Math.pow((3*b-2)/22-a,2)}}),a.each(b,function(b,c){a.easing["easeIn"+b]=c,a.easing["easeOut"+b]=function(a){return 1-c(1-a)},a.easing["easeInOut"+b]=function(a){return.5>a?c(2*a)/2:1-c(-2*a+2)/2}})}();a.effects,a.effects.effect.blind=function(b,c){var d,e,f,g=a(this),h=/up|down|vertical/,i=/up|left|vertical|horizontal/,j=["position","top","bottom","left","right","height","width"],k=a.effects.setMode(g,b.mode||"hide"),l=b.direction||"up",m=h.test(l),n=m?"height":"width",o=m?"top":"left",p=i.test(l),q={},r="show"===k;g.parent().is(".ui-effects-wrapper")?a.effects.save(g.parent(),j):a.effects.save(g,j),g.show(),d=a.effects.createWrapper(g).css({overflow:"hidden"}),e=d[n](),f=parseFloat(d.css(o))||0,q[n]=r?e:0,p||(g.css(m?"bottom":"right",0).css(m?"top":"left","auto").css({position:"absolute"}),q[o]=r?f:e+f),r&&(d.css(n,0),p||d.css(o,f+e)),d.animate(q,{duration:b.duration,easing:b.easing,queue:!1,complete:function(){"hide"===k&&g.hide(),a.effects.restore(g,j),a.effects.removeWrapper(g),c()}})},a.effects.effect.bounce=function(b,c){var d,e,f,g=a(this),h=["position","top","bottom","left","right","height","width"],i=a.effects.setMode(g,b.mode||"effect"),j="hide"===i,k="show"===i,l=b.direction||"up",m=b.distance,n=b.times||5,o=2*n+(k||j?1:0),p=b.duration/o,q=b.easing,r="up"===l||"down"===l?"top":"left",s="up"===l||"left"===l,t=g.queue(),u=t.length;for((k||j)&&h.push("opacity"),a.effects.save(g,h),g.show(),a.effects.createWrapper(g),m||(m=g["top"===r?"outerHeight":"outerWidth"]()/3),k&&(f={opacity:1},f[r]=0,g.css("opacity",0).css(r,s?2*-m:2*m).animate(f,p,q)),j&&(m/=Math.pow(2,n-1)),f={},f[r]=0,d=0;n>d;d++)e={},e[r]=(s?"-=":"+=")+m,g.animate(e,p,q).animate(f,p,q),m=j?2*m:m/2;j&&(e={opacity:0},e[r]=(s?"-=":"+=")+m,g.animate(e,p,q)),g.queue(function(){j&&g.hide(),a.effects.restore(g,h),a.effects.removeWrapper(g),c()}),u>1&&t.splice.apply(t,[1,0].concat(t.splice(u,o+1))),g.dequeue()},a.effects.effect.clip=function(b,c){var d,e,f,g=a(this),h=["position","top","bottom","left","right","height","width"],i=a.effects.setMode(g,b.mode||"hide"),j="show"===i,k=b.direction||"vertical",l="vertical"===k,m=l?"height":"width",n=l?"top":"left",o={};a.effects.save(g,h),g.show(),d=a.effects.createWrapper(g).css({overflow:"hidden"}),e="IMG"===g[0].tagName?d:g,f=e[m](),j&&(e.css(m,0),e.css(n,f/2)),o[m]=j?f:0,o[n]=j?0:f/2,e.animate(o,{queue:!1,duration:b.duration,easing:b.easing,complete:function(){j||g.hide(),a.effects.restore(g,h),a.effects.removeWrapper(g),c()}})},a.effects.effect.drop=function(b,c){var d,e=a(this),f=["position","top","bottom","left","right","opacity","height","width"],g=a.effects.setMode(e,b.mode||"hide"),h="show"===g,i=b.direction||"left",j="up"===i||"down"===i?"top":"left",k="up"===i||"left"===i?"pos":"neg",l={opacity:h?1:0};a.effects.save(e,f),e.show(),a.effects.createWrapper(e),d=b.distance||e["top"===j?"outerHeight":"outerWidth"](!0)/2,h&&e.css("opacity",0).css(j,"pos"===k?-d:d),l[j]=(h?"pos"===k?"+=":"-=":"pos"===k?"-=":"+=")+d,e.animate(l,{queue:!1,duration:b.duration,easing:b.easing,complete:function(){"hide"===g&&e.hide(),a.effects.restore(e,f),a.effects.removeWrapper(e),c()}})},a.effects.effect.explode=function(b,c){function d(){t.push(this),t.length===l*m&&e()}function e(){n.css({visibility:"visible"}),a(t).remove(),p||n.hide(),c()}var f,g,h,i,j,k,l=b.pieces?Math.round(Math.sqrt(b.pieces)):3,m=l,n=a(this),o=a.effects.setMode(n,b.mode||"hide"),p="show"===o,q=n.show().css("visibility","hidden").offset(),r=Math.ceil(n.outerWidth()/m),s=Math.ceil(n.outerHeight()/l),t=[];for(f=0;l>f;f++)for(i=q.top+f*s,k=f-(l-1)/2,g=0;m>g;g++)h=q.left+g*r,j=g-(m-1)/2,n.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-g*r,top:-f*s}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:r,height:s,left:h+(p?j*r:0),top:i+(p?k*s:0),opacity:p?0:1}).animate({left:h+(p?0:j*r),top:i+(p?0:k*s),opacity:p?1:0},b.duration||500,b.easing,d)},a.effects.effect.fade=function(b,c){var d=a(this),e=a.effects.setMode(d,b.mode||"toggle");d.animate({opacity:e},{queue:!1,duration:b.duration,easing:b.easing,complete:c})},a.effects.effect.fold=function(b,c){var d,e,f=a(this),g=["position","top","bottom","left","right","height","width"],h=a.effects.setMode(f,b.mode||"hide"),i="show"===h,j="hide"===h,k=b.size||15,l=/([0-9]+)%/.exec(k),m=!!b.horizFirst,n=i!==m,o=n?["width","height"]:["height","width"],p=b.duration/2,q={},r={};a.effects.save(f,g),f.show(),d=a.effects.createWrapper(f).css({overflow:"hidden"}),e=n?[d.width(),d.height()]:[d.height(),d.width()],l&&(k=parseInt(l[1],10)/100*e[j?0:1]),i&&d.css(m?{height:0,width:k}:{height:k,width:0}),q[o[0]]=i?e[0]:k,r[o[1]]=i?e[1]:0,d.animate(q,p,b.easing).animate(r,p,b.easing,function(){j&&f.hide(),a.effects.restore(f,g),a.effects.removeWrapper(f),c()})},a.effects.effect.highlight=function(b,c){var d=a(this),e=["backgroundImage","backgroundColor","opacity"],f=a.effects.setMode(d,b.mode||"show"),g={backgroundColor:d.css("backgroundColor")};"hide"===f&&(g.opacity=0),a.effects.save(d,e),d.show().css({backgroundImage:"none",backgroundColor:b.color||"#ffff99"}).animate(g,{queue:!1,duration:b.duration,easing:b.easing,complete:function(){"hide"===f&&d.hide(),a.effects.restore(d,e),c()}})},a.effects.effect.size=function(b,c){var d,e,f,g=a(this),h=["position","top","bottom","left","right","width","height","overflow","opacity"],i=["position","top","bottom","left","right","overflow","opacity"],j=["width","height","overflow"],k=["fontSize"],l=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],m=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],n=a.effects.setMode(g,b.mode||"effect"),o=b.restore||"effect"!==n,p=b.scale||"both",q=b.origin||["middle","center"],r=g.css("position"),s=o?h:i,t={height:0,width:0,outerHeight:0,outerWidth:0};"show"===n&&g.show(),d={height:g.height(),width:g.width(),outerHeight:g.outerHeight(),outerWidth:g.outerWidth()},"toggle"===b.mode&&"show"===n?(g.from=b.to||t,g.to=b.from||d):(g.from=b.from||("show"===n?t:d),g.to=b.to||("hide"===n?t:d)),f={from:{y:g.from.height/d.height,x:g.from.width/d.width},to:{y:g.to.height/d.height,x:g.to.width/d.width}},("box"===p||"both"===p)&&(f.from.y!==f.to.y&&(s=s.concat(l),g.from=a.effects.setTransition(g,l,f.from.y,g.from),g.to=a.effects.setTransition(g,l,f.to.y,g.to)),f.from.x!==f.to.x&&(s=s.concat(m),g.from=a.effects.setTransition(g,m,f.from.x,g.from),g.to=a.effects.setTransition(g,m,f.to.x,g.to))),("content"===p||"both"===p)&&f.from.y!==f.to.y&&(s=s.concat(k).concat(j),g.from=a.effects.setTransition(g,k,f.from.y,g.from),g.to=a.effects.setTransition(g,k,f.to.y,g.to)),a.effects.save(g,s),g.show(),a.effects.createWrapper(g),g.css("overflow","hidden").css(g.from),q&&(e=a.effects.getBaseline(q,d),g.from.top=(d.outerHeight-g.outerHeight())*e.y,g.from.left=(d.outerWidth-g.outerWidth())*e.x,g.to.top=(d.outerHeight-g.to.outerHeight)*e.y,g.to.left=(d.outerWidth-g.to.outerWidth)*e.x),g.css(g.from),("content"===p||"both"===p)&&(l=l.concat(["marginTop","marginBottom"]).concat(k),m=m.concat(["marginLeft","marginRight"]),j=h.concat(l).concat(m),g.find("*[width]").each(function(){var c=a(this),d={height:c.height(),width:c.width(),outerHeight:c.outerHeight(),outerWidth:c.outerWidth()};o&&a.effects.save(c,j),c.from={height:d.height*f.from.y,width:d.width*f.from.x,outerHeight:d.outerHeight*f.from.y,outerWidth:d.outerWidth*f.from.x},c.to={height:d.height*f.to.y,width:d.width*f.to.x,outerHeight:d.height*f.to.y,outerWidth:d.width*f.to.x},f.from.y!==f.to.y&&(c.from=a.effects.setTransition(c,l,f.from.y,c.from),c.to=a.effects.setTransition(c,l,f.to.y,c.to)),f.from.x!==f.to.x&&(c.from=a.effects.setTransition(c,m,f.from.x,c.from),c.to=a.effects.setTransition(c,m,f.to.x,c.to)),c.css(c.from),c.animate(c.to,b.duration,b.easing,function(){o&&a.effects.restore(c,j)})})),g.animate(g.to,{queue:!1,duration:b.duration,easing:b.easing,complete:function(){0===g.to.opacity&&g.css("opacity",g.from.opacity),"hide"===n&&g.hide(),a.effects.restore(g,s),o||("static"===r?g.css({position:"relative",top:g.to.top,left:g.to.left}):a.each(["top","left"],function(a,b){g.css(b,function(b,c){var d=parseInt(c,10),e=a?g.to.left:g.to.top;return"auto"===c?e+"px":d+e+"px"})})),a.effects.removeWrapper(g),c()}})},a.effects.effect.scale=function(b,c){var d=a(this),e=a.extend(!0,{},b),f=a.effects.setMode(d,b.mode||"effect"),g=parseInt(b.percent,10)||(0===parseInt(b.percent,10)?0:"hide"===f?0:100),h=b.direction||"both",i=b.origin,j={height:d.height(),width:d.width(),outerHeight:d.outerHeight(),outerWidth:d.outerWidth()},k={y:"horizontal"!==h?g/100:1,x:"vertical"!==h?g/100:1};e.effect="size",e.queue=!1,e.complete=c,"effect"!==f&&(e.origin=i||["middle","center"],e.restore=!0),e.from=b.from||("show"===f?{height:0,width:0,outerHeight:0,outerWidth:0}:j),e.to={height:j.height*k.y,width:j.width*k.x,outerHeight:j.outerHeight*k.y,outerWidth:j.outerWidth*k.x},e.fade&&("show"===f&&(e.from.opacity=0,e.to.opacity=1),"hide"===f&&(e.from.opacity=1,e.to.opacity=0)),d.effect(e)},a.effects.effect.puff=function(b,c){var d=a(this),e=a.effects.setMode(d,b.mode||"hide"),f="hide"===e,g=parseInt(b.percent,10)||150,h=g/100,i={height:d.height(),width:d.width(),outerHeight:d.outerHeight(),outerWidth:d.outerWidth()};a.extend(b,{effect:"scale",queue:!1,fade:!0,mode:e,complete:c,percent:f?g:100,from:f?i:{height:i.height*h,width:i.width*h,outerHeight:i.outerHeight*h,outerWidth:i.outerWidth*h}}),d.effect(b)},a.effects.effect.pulsate=function(b,c){var d,e=a(this),f=a.effects.setMode(e,b.mode||"show"),g="show"===f,h="hide"===f,i=g||"hide"===f,j=2*(b.times||5)+(i?1:0),k=b.duration/j,l=0,m=e.queue(),n=m.length;for((g||!e.is(":visible"))&&(e.css("opacity",0).show(),l=1),d=1;j>d;d++)e.animate({opacity:l},k,b.easing),l=1-l;e.animate({opacity:l},k,b.easing),e.queue(function(){h&&e.hide(),c()}),n>1&&m.splice.apply(m,[1,0].concat(m.splice(n,j+1))),e.dequeue()},a.effects.effect.shake=function(b,c){var d,e=a(this),f=["position","top","bottom","left","right","height","width"],g=a.effects.setMode(e,b.mode||"effect"),h=b.direction||"left",i=b.distance||20,j=b.times||3,k=2*j+1,l=Math.round(b.duration/k),m="up"===h||"down"===h?"top":"left",n="up"===h||"left"===h,o={},p={},q={},r=e.queue(),s=r.length;for(a.effects.save(e,f),e.show(),a.effects.createWrapper(e),o[m]=(n?"-=":"+=")+i,p[m]=(n?"+=":"-=")+2*i,q[m]=(n?"-=":"+=")+2*i,e.animate(o,l,b.easing),d=1;j>d;d++)e.animate(p,l,b.easing).animate(q,l,b.easing);e.animate(p,l,b.easing).animate(o,l/2,b.easing).queue(function(){"hide"===g&&e.hide(),a.effects.restore(e,f),a.effects.removeWrapper(e),c()}),s>1&&r.splice.apply(r,[1,0].concat(r.splice(s,k+1))),e.dequeue()},a.effects.effect.slide=function(b,c){var d,e=a(this),f=["position","top","bottom","left","right","width","height"],g=a.effects.setMode(e,b.mode||"show"),h="show"===g,i=b.direction||"left",j="up"===i||"down"===i?"top":"left",k="up"===i||"left"===i,l={};a.effects.save(e,f),e.show(),d=b.distance||e["top"===j?"outerHeight":"outerWidth"](!0),a.effects.createWrapper(e).css({overflow:"hidden"}),h&&e.css(j,k?isNaN(d)?"-"+d:-d:d),l[j]=(h?k?"+=":"-=":k?"-=":"+=")+d,e.animate(l,{queue:!1,duration:b.duration,easing:b.easing,complete:function(){"hide"===g&&e.hide(),a.effects.restore(e,f),a.effects.removeWrapper(e),c()}})},a.effects.effect.transfer=function(b,c){var d=a(this),e=a(b.to),f="fixed"===e.css("position"),g=a("body"),h=f?g.scrollTop():0,i=f?g.scrollLeft():0,j=e.offset(),k={top:j.top-h,left:j.left-i,height:e.innerHeight(),width:e.innerWidth()},l=d.offset(),m=a("<div class='ui-effects-transfer'></div>").appendTo(document.body).addClass(b.className).css({top:l.top-h,left:l.left-i,height:d.innerHeight(),width:d.innerWidth(),position:f?"fixed":"absolute"}).animate(k,b.duration,b.easing,function(){m.remove(),c()})}});
\ No newline at end of file
diff --git a/NewLife.Cube/Content/js/jquery.autosize.min.js b/NewLife.Cube/Content/js/jquery.autosize.min.js
deleted file mode 100644
index fe877cf6c0..0000000000
--- a/NewLife.Cube/Content/js/jquery.autosize.min.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/*!
-	Autosize 1.18.15
-	license: MIT
-	http://www.jacklmoore.com/autosize
-*/
-!function(a){var b,c={className:"autosizejs",id:"autosizejs",append:"\n",callback:!1,resizeDelay:10,placeholder:!0},d='<textarea tabindex="-1" style="position:absolute; top:-999px; left:0; right:auto; bottom:auto; border:0; padding: 0; -moz-box-sizing:content-box; -webkit-box-sizing:content-box; box-sizing:content-box; word-wrap:break-word; height:0 !important; min-height:0 !important; overflow:hidden; transition:none; -webkit-transition:none; -moz-transition:none;"/>',e=["fontFamily","fontSize","fontWeight","fontStyle","letterSpacing","textTransform","wordSpacing","textIndent","whiteSpace"],f=a(d).data("autosize",!0)[0];f.style.lineHeight="99px","99px"===a(f).css("lineHeight")&&e.push("lineHeight"),f.style.lineHeight="",a.fn.autosize=function(d){return this.length?(d=a.extend({},c,d||{}),f.parentNode!==document.body&&a(document.body).append(f),this.each(function(){function c(){var b,c=window.getComputedStyle?window.getComputedStyle(m,null):!1;c?(b=m.getBoundingClientRect().width,(0===b||"number"!=typeof b)&&(b=parseFloat(c.width)),a.each(["paddingLeft","paddingRight","borderLeftWidth","borderRightWidth"],function(a,d){b-=parseFloat(c[d])})):b=n.width(),f.style.width=Math.max(b,0)+"px"}function g(){var g={};if(b=m,f.className=d.className,f.id=d.id,j=parseFloat(n.css("maxHeight")),a.each(e,function(a,b){g[b]=n.css(b)}),a(f).css(g).attr("wrap",n.attr("wrap")),c(),window.chrome){var h=m.style.width;m.style.width="0px";{m.offsetWidth}m.style.width=h}}function h(){var a,e;b!==m?g():c(),f.value=!m.value&&d.placeholder?n.attr("placeholder")||"":m.value,f.value+=d.append||"",f.style.overflowY=m.style.overflowY,e=parseFloat(m.style.height),f.scrollTop=0,f.scrollTop=9e4,a=f.scrollTop,j&&a>j?(m.style.overflowY="scroll",a=j):(m.style.overflowY="hidden",k>a&&(a=k)),a+=o,e!==a&&(m.style.height=a+"px",f.className=f.className,p&&d.callback.call(m,m),n.trigger("autosize.resized"))}function i(){clearTimeout(l),l=setTimeout(function(){var a=n.width();a!==r&&(r=a,h())},parseInt(d.resizeDelay,10))}var j,k,l,m=this,n=a(m),o=0,p=a.isFunction(d.callback),q={height:m.style.height,overflow:m.style.overflow,overflowY:m.style.overflowY,wordWrap:m.style.wordWrap,resize:m.style.resize},r=n.width(),s=n.css("resize");n.data("autosize")||(n.data("autosize",!0),("border-box"===n.css("box-sizing")||"border-box"===n.css("-moz-box-sizing")||"border-box"===n.css("-webkit-box-sizing"))&&(o=n.outerHeight()-n.height()),k=Math.max(parseFloat(n.css("minHeight"))-o||0,n.height()),n.css({overflow:"hidden",overflowY:"hidden",wordWrap:"break-word"}),"vertical"===s?n.css("resize","none"):"both"===s&&n.css("resize","horizontal"),"onpropertychange"in m?"oninput"in m?n.on("input.autosize keyup.autosize",h):n.on("propertychange.autosize",function(){"value"===event.propertyName&&h()}):n.on("input.autosize",h),d.resizeDelay!==!1&&a(window).on("resize.autosize",i),n.on("autosize.resize",h),n.on("autosize.resizeIncludeStyle",function(){b=null,h()}),n.on("autosize.destroy",function(){b=null,clearTimeout(l),a(window).off("resize",i),n.off("autosize").off(".autosize").css(q).removeData("autosize")}),h())})):this}}(jQuery||$);
\ No newline at end of file
diff --git a/NewLife.Cube/Content/js/jquery.bootstrap-duallistbox.min.js b/NewLife.Cube/Content/js/jquery.bootstrap-duallistbox.min.js
deleted file mode 100644
index 24bafde7d1..0000000000
--- a/NewLife.Cube/Content/js/jquery.bootstrap-duallistbox.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(a,b,c,d){function e(b,c){this.element=a(b),this.settings=a.extend({},v,c),this._defaults=v,this._name=u,this.init()}function f(a){a.element.trigger("change")}function g(b){b.element.find("option").each(function(c,d){var e=a(d);"undefined"==typeof e.data("original-index")&&e.data("original-index",b.elementCount++),"undefined"==typeof e.data("_selected")&&e.data("_selected",!1)})}function h(b,c,d){b.element.find("option").each(function(b,e){var f=a(e);f.data("original-index")===c&&f.prop("selected",d)})}function i(a,b){return a.replace(/\{(\d+)\}/g,function(a,c){return"undefined"!=typeof b[c]?b[c]:a})}function j(a){if(a.settings.infoText){var b=a.elements.select1.find("option").length,c=a.elements.select2.find("option").length,d=a.element.find("option").length-a.selectedElements,e=a.selectedElements,f="";f=0===d?a.settings.infoTextEmpty:b===d?i(a.settings.infoText,[b,d]):i(a.settings.infoTextFiltered,[b,d]),a.elements.info1.html(f),a.elements.box1.toggleClass("filtered",!(b===d||0===d)),f=0===e?a.settings.infoTextEmpty:c===e?i(a.settings.infoText,[c,e]):i(a.settings.infoTextFiltered,[c,e]),a.elements.info2.html(f),a.elements.box2.toggleClass("filtered",!(c===e||0===e))}}function k(b){b.selectedElements=0,b.elements.select1.empty(),b.elements.select2.empty(),b.element.find("option").each(function(c,d){var e=a(d);e.prop("selected")?(b.selectedElements++,b.elements.select2.append(e.clone(!0).prop("selected",e.data("_selected")))):b.elements.select1.append(e.clone(!0).prop("selected",e.data("_selected")))}),b.settings.showFilterInputs&&(l(b,1),l(b,2)),j(b)}function l(b,c){if(b.settings.showFilterInputs){m(b,c),b.elements["select"+c].empty().scrollTop(0);var d=new RegExp(a.trim(b.elements["filterInput"+c].val()),"gi"),e=b.element;e=1===c?e.find("option").not(":selected"):e.find("option:selected"),e.each(function(e,f){var g=a(f),h=!0;(f.text.match(d)||b.settings.filterOnValues&&g.attr("value").match(d))&&(h=!1,b.elements["select"+c].append(g.clone(!0).prop("selected",g.data("_selected")))),b.element.find("option").eq(g.data("original-index")).data("filtered"+c,h)}),j(b)}}function m(b,c){b.elements["select"+c].find("option").each(function(c,d){var e=a(d);b.element.find("option").eq(e.data("original-index")).data("_selected",e.prop("selected"))})}function n(b){b.find("option").sort(function(b,c){return a(b).data("original-index")>a(c).data("original-index")?1:-1}).appendTo(b)}function o(a){a.elements.select1.find("option").each(function(){a.element.find("option").data("_selected",!1)})}function p(b){"all"!==b.settings.preserveSelectionOnMove||b.settings.moveOnSelect?"moved"!==b.settings.preserveSelectionOnMove||b.settings.moveOnSelect||m(b,1):(m(b,1),m(b,2)),b.elements.select1.find("option:selected").each(function(c,d){var e=a(d);e.data("filtered1")||h(b,e.data("original-index"),!0)}),k(b),f(b),n(b.elements.select2)}function q(b){"all"!==b.settings.preserveSelectionOnMove||b.settings.moveOnSelect?"moved"!==b.settings.preserveSelectionOnMove||b.settings.moveOnSelect||m(b,2):(m(b,1),m(b,2)),b.elements.select2.find("option:selected").each(function(c,d){var e=a(d);e.data("filtered2")||h(b,e.data("original-index"),!1)}),k(b),f(b),n(b.elements.select1)}function r(b){"all"!==b.settings.preserveSelectionOnMove||b.settings.moveOnSelect?"moved"!==b.settings.preserveSelectionOnMove||b.settings.moveOnSelect||m(b,1):(m(b,1),m(b,2)),b.element.find("option").each(function(b,c){var d=a(c);d.data("filtered1")||d.prop("selected",!0)}),k(b),f(b)}function s(b){"all"!==b.settings.preserveSelectionOnMove||b.settings.moveOnSelect?"moved"!==b.settings.preserveSelectionOnMove||b.settings.moveOnSelect||m(b,2):(m(b,1),m(b,2)),b.element.find("option").each(function(b,c){var d=a(c);d.data("filtered2")||d.prop("selected",!1)}),k(b),f(b)}function t(a){a.elements.form.submit(function(b){a.elements.filterInput1.is(":focus")?(b.preventDefault(),a.elements.filterInput1.focusout()):a.elements.filterInput2.is(":focus")&&(b.preventDefault(),a.elements.filterInput2.focusout())}),a.element.on("bootstrapDualListbox.refresh",function(b,c){a.refresh(c)}),a.elements.filterClear1.on("click",function(){a.setNonSelectedFilter("",!0)}),a.elements.filterClear2.on("click",function(){a.setSelectedFilter("",!0)}),a.elements.moveButton.on("click",function(){p(a)}),a.elements.moveAllButton.on("click",function(){r(a)}),a.elements.removeButton.on("click",function(){q(a)}),a.elements.removeAllButton.on("click",function(){s(a)}),a.elements.filterInput1.on("change keyup",function(){l(a,1)}),a.elements.filterInput2.on("change keyup",function(){l(a,2)})}var u="bootstrapDualListbox",v={bootstrap2Compatible:!1,filterTextClear:"show all",filterPlaceHolder:"Filter",moveSelectedLabel:"Move selected",moveAllLabel:"Move all",removeSelectedLabel:"Remove selected",removeAllLabel:"Remove all",moveOnSelect:!0,preserveSelectionOnMove:!1,selectedListLabel:!1,nonSelectedListLabel:!1,helperSelectNamePostfix:"_helper",selectorMinimalHeight:100,showFilterInputs:!0,nonSelectedFilter:"",selectedFilter:"",infoText:"Showing all {0}",infoTextFiltered:'<span class="label label-warning">Filtered</span> {0} from {1}',infoTextEmpty:"Empty list",filterOnValues:!1,buttonClass:"btn-white btn-bold"},w=/android/i.test(navigator.userAgent.toLowerCase());e.prototype={init:function(){this.container=a('<div class="bootstrap-duallistbox-container"> <div class="box1">   <label></label>   <span class="info-container">     <span class="info"></span>     <button type="button" class="btn clear1 pull-right"></button>   </span>   <input class="filter" type="text">   <div class="btn-group buttons">     <button type="button" class="btn moveall">       <i></i>       <i></i>     </button>     <button type="button" class="btn move">       <i></i>     </button>   </div>   <select multiple="multiple"></select> </div> <div class="box2">   <label></label>   <span class="info-container">     <span class="info"></span>     <button type="button" class="btn clear2 pull-right"></button>   </span>   <input class="filter" type="text">   <div class="btn-group buttons">     <button type="button" class="btn remove">       <i></i>     </button>     <button type="button" class="btn removeall">       <i></i>       <i></i>     </button>   </div>   <select multiple="multiple"></select> </div></div>').insertBefore(this.element),this.elements={originalSelect:this.element,box1:a(".box1",this.container),box2:a(".box2",this.container),filterInput1:a(".box1 .filter",this.container),filterInput2:a(".box2 .filter",this.container),filterClear1:a(".box1 .clear1",this.container),filterClear2:a(".box2 .clear2",this.container),label1:a(".box1 > label",this.container),label2:a(".box2 > label",this.container),info1:a(".box1 .info",this.container),info2:a(".box2 .info",this.container),select1:a(".box1 select",this.container),select2:a(".box2 select",this.container),moveButton:a(".box1 .move",this.container),removeButton:a(".box2 .remove",this.container),moveAllButton:a(".box1 .moveall",this.container),removeAllButton:a(".box2 .removeall",this.container),form:a(a(".box1 .filter",this.container)[0].form)},this.originalSelectName=this.element.attr("name")||"";var b="bootstrap-duallistbox-nonselected-list_"+this.originalSelectName,c="bootstrap-duallistbox-selected-list_"+this.originalSelectName;return this.elements.select1.attr("id",b),this.elements.select2.attr("id",c),this.elements.label1.attr("for",b),this.elements.label2.attr("for",c),this.selectedElements=0,this.elementCount=0,this.setBootstrap2Compatible(this.settings.bootstrap2Compatible),this.setFilterTextClear(this.settings.filterTextClear),this.setFilterPlaceHolder(this.settings.filterPlaceHolder),this.setMoveSelectedLabel(this.settings.moveSelectedLabel),this.setMoveAllLabel(this.settings.moveAllLabel),this.setRemoveSelectedLabel(this.settings.removeSelectedLabel),this.setRemoveAllLabel(this.settings.removeAllLabel),this.setMoveOnSelect(this.settings.moveOnSelect),this.setPreserveSelectionOnMove(this.settings.preserveSelectionOnMove),this.setSelectedListLabel(this.settings.selectedListLabel),this.setNonSelectedListLabel(this.settings.nonSelectedListLabel),this.setHelperSelectNamePostfix(this.settings.helperSelectNamePostfix),this.setSelectOrMinimalHeight(this.settings.selectorMinimalHeight),g(this),this.setShowFilterInputs(this.settings.showFilterInputs),this.setNonSelectedFilter(this.settings.nonSelectedFilter),this.setSelectedFilter(this.settings.selectedFilter),this.setInfoText(this.settings.infoText),this.setInfoTextFiltered(this.settings.infoTextFiltered),this.setInfoTextEmpty(this.settings.infoTextEmpty),this.setFilterOnValues(this.settings.filterOnValues),this.element.hide(),t(this),k(this),this.element},setBootstrap2Compatible:function(a,b){return this.settings.bootstrap2Compatible=a,a?(this.container.removeClass("row").addClass("row-fluid bs2compatible"),this.container.find(".box1, .box2").removeClass("col-md-6").addClass("span6"),this.container.find(".clear1, .clear2").removeClass("btn-default btn-xs").addClass("btn-mini"),this.container.find("input, select").removeClass("form-control"),this.container.find(".btn").removeClass("btn-default"),this.container.find(".moveall > i, .move > i").removeClass("glyphicon glyphicon-arrow-right").addClass("icon-arrow-right"),this.container.find(".removeall > i, .remove > i").removeClass("glyphicon glyphicon-arrow-left").addClass("icon-arrow-left")):(this.container.removeClass("row-fluid bs2compatible").addClass("row"),this.container.find(".box1, .box2").removeClass("span6").addClass("col-md-6"),this.container.find(".clear1, .clear2").removeClass("btn-mini").addClass("btn-default btn-xs"),this.container.find("input, select").addClass("form-control"),this.container.find(".btn").addClass(this.settings.buttonClass),this.container.find(".moveall > i, .move > i").removeClass("icon-arrow-right").addClass("glyphicon glyphicon-arrow-right"),this.container.find(".removeall > i, .remove > i").removeClass("icon-arrow-left").addClass("glyphicon glyphicon-arrow-left")),b&&k(this),this.element},setFilterTextClear:function(a,b){return this.settings.filterTextClear=a,this.elements.filterClear1.html(a),this.elements.filterClear2.html(a),b&&k(this),this.element},setFilterPlaceHolder:function(a,b){return this.settings.filterPlaceHolder=a,this.elements.filterInput1.attr("placeholder",a),this.elements.filterInput2.attr("placeholder",a),b&&k(this),this.element},setMoveSelectedLabel:function(a,b){return this.settings.moveSelectedLabel=a,this.elements.moveButton.attr("title",a),b&&k(this),this.element},setMoveAllLabel:function(a,b){return this.settings.moveAllLabel=a,this.elements.moveAllButton.attr("title",a),b&&k(this),this.element},setRemoveSelectedLabel:function(a,b){return this.settings.removeSelectedLabel=a,this.elements.removeButton.attr("title",a),b&&k(this),this.element},setRemoveAllLabel:function(a,b){return this.settings.removeAllLabel=a,this.elements.removeAllButton.attr("title",a),b&&k(this),this.element},setMoveOnSelect:function(a,b){if(w&&(a=!0),this.settings.moveOnSelect=a,this.settings.moveOnSelect){this.container.addClass("moveonselect");var c=this;this.elements.select1.on("change",function(){p(c)}),this.elements.select2.on("change",function(){q(c)})}else this.container.removeClass("moveonselect"),this.elements.select1.off("change"),this.elements.select2.off("change");return b&&k(this),this.element},setPreserveSelectionOnMove:function(a,b){return w&&(a=!1),this.settings.preserveSelectionOnMove=a,b&&k(this),this.element},setSelectedListLabel:function(a,b){return this.settings.selectedListLabel=a,a?this.elements.label2.show().html(a):this.elements.label2.hide().html(a),b&&k(this),this.element},setNonSelectedListLabel:function(a,b){return this.settings.nonSelectedListLabel=a,a?this.elements.label1.show().html(a):this.elements.label1.hide().html(a),b&&k(this),this.element},setHelperSelectNamePostfix:function(a,b){return this.settings.helperSelectNamePostfix=a,a?(this.elements.select1.attr("name",this.originalSelectName+a+"1"),this.elements.select2.attr("name",this.originalSelectName+a+"2")):(this.elements.select1.removeAttr("name"),this.elements.select2.removeAttr("name")),b&&k(this),this.element},setSelectOrMinimalHeight:function(a,b){this.settings.selectorMinimalHeight=a;var c=this.element.height();return this.element.height()<a&&(c=a),this.elements.select1.height(c),this.elements.select2.height(c),b&&k(this),this.element},setShowFilterInputs:function(a,b){return a?(this.elements.filterInput1.show(),this.elements.filterInput2.show()):(this.setNonSelectedFilter(""),this.setSelectedFilter(""),k(this),this.elements.filterInput1.hide(),this.elements.filterInput2.hide()),this.settings.showFilterInputs=a,b&&k(this),this.element},setNonSelectedFilter:function(a,b){return this.settings.showFilterInputs?(this.settings.nonSelectedFilter=a,this.elements.filterInput1.val(a),b&&k(this),this.element):void 0},setSelectedFilter:function(a,b){return this.settings.showFilterInputs?(this.settings.selectedFilter=a,this.elements.filterInput2.val(a),b&&k(this),this.element):void 0},setInfoText:function(a,b){return this.settings.infoText=a,b&&k(this),this.element},setInfoTextFiltered:function(a,b){return this.settings.infoTextFiltered=a,b&&k(this),this.element},setInfoTextEmpty:function(a,b){return this.settings.infoTextEmpty=a,b&&k(this),this.element},setFilterOnValues:function(a,b){return this.settings.filterOnValues=a,b&&k(this),this.element},getContainer:function(){return this.container},refresh:function(a){g(this),a?o(this):(m(this,1),m(this,2)),k(this)},destroy:function(){return this.container.remove(),this.element.show(),a.data(this,"plugin_"+u,null),this.element}},a.fn[u]=function(b){var c=arguments;if(b===d||"object"==typeof b)return this.each(function(){a(this).is("select")?a.data(this,"plugin_"+u)||a.data(this,"plugin_"+u,new e(this,b)):a(this).find("select").each(function(c,d){a(d).bootstrapDualListbox(b)})});if("string"==typeof b&&"_"!==b[0]&&"init"!==b){var f;return this.each(function(){var d=a.data(this,"plugin_"+u);d instanceof e&&"function"==typeof d[b]&&(f=d[b].apply(d,Array.prototype.slice.call(c,1)))}),f!==d?f:this}}}(jQuery,window,document);
\ No newline at end of file
diff --git a/NewLife.Cube/Content/js/jquery.colorbox.min.js b/NewLife.Cube/Content/js/jquery.colorbox.min.js
deleted file mode 100644
index 725dc26c77..0000000000
--- a/NewLife.Cube/Content/js/jquery.colorbox.min.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/*!
-	Colorbox 1.5.14
-	license: MIT
-	http://www.jacklmoore.com/colorbox
-*/
-!function(a,b,c){function d(c,d,e){var f=b.createElement(c);return d&&(f.id=_+d),e&&(f.style.cssText=e),a(f)}function e(){return c.innerHeight?c.innerHeight:a(c).height()}function f(b,c){c!==Object(c)&&(c={}),this.cache={},this.el=b,this.value=function(b){var d;return void 0===this.cache[b]&&(d=a(this.el).attr("data-cbox-"+b),void 0!==d?this.cache[b]=d:void 0!==c[b]?this.cache[b]=c[b]:void 0!==Z[b]&&(this.cache[b]=Z[b])),this.cache[b]},this.get=function(b){var c=this.value(b);return a.isFunction(c)?c.call(this.el,this):c}}function g(a){var b=A.length,c=(R+a)%b;return 0>c?b+c:c}function h(a,b){return Math.round((/%/.test(a)?("x"===b?B.width():e())/100:1)*parseInt(a,10))}function i(a,b){return a.get("photo")||a.get("photoRegex").test(b)}function j(a,b){return a.get("retinaUrl")&&c.devicePixelRatio>1?b.replace(a.get("photoRegex"),a.get("retinaSuffix")):b}function k(a){"contains"in t[0]&&!t[0].contains(a.target)&&a.target!==s[0]&&(a.stopPropagation(),t.focus())}function l(a){l.str!==a&&(t.add(s).removeClass(l.str).addClass(a),l.str=a)}function m(b){R=0,b&&b!==!1&&"nofollow"!==b?(A=a("."+ab).filter(function(){var c=a.data(this,$),d=new f(this,c);return d.get("rel")===b}),R=A.index(M.el),-1===R&&(A=A.add(M.el),R=A.length-1)):A=a(M.el)}function n(c){a(b).trigger(c),hb.triggerHandler(c)}function o(c){var e;if(!V){if(e=a(c).data($),M=new f(c,e),m(M.get("rel")),!T){T=U=!0,l(M.get("className")),t.css({visibility:"hidden",display:"block",opacity:""}),C=d(ib,"LoadedContent","width:0; height:0; overflow:hidden; visibility:hidden"),v.css({width:"",height:""}).append(C),N=w.height()+z.height()+v.outerHeight(!0)-v.height(),O=x.width()+y.width()+v.outerWidth(!0)-v.width(),P=C.outerHeight(!0),Q=C.outerWidth(!0);var g=h(M.get("initialWidth"),"x"),i=h(M.get("initialHeight"),"y"),j=M.get("maxWidth"),o=M.get("maxHeight");M.w=(j!==!1?Math.min(g,h(j,"x")):g)-Q-O,M.h=(o!==!1?Math.min(i,h(o,"y")):i)-P-N,C.css({width:"",height:M.h}),X.position(),n(bb),M.get("onOpen"),L.add(F).hide(),t.focus(),M.get("trapFocus")&&b.addEventListener&&(b.addEventListener("focus",k,!0),hb.one(fb,function(){b.removeEventListener("focus",k,!0)})),M.get("returnFocus")&&hb.one(fb,function(){a(M.el).focus()})}var p=parseFloat(M.get("opacity"));s.css({opacity:p===p?p:"",cursor:M.get("overlayClose")?"pointer":"",visibility:"visible"}).show(),M.get("closeButton")?K.html(M.get("close")).appendTo(v):K.appendTo("<div/>"),r()}}function p(){t||(Y=!1,B=a(c),t=d(ib).attr({id:$,"class":a.support.opacity===!1?_+"IE":"",role:"dialog",tabindex:"-1"}).hide(),s=d(ib,"Overlay").hide(),E=a([d(ib,"LoadingOverlay")[0],d(ib,"LoadingGraphic")[0]]),u=d(ib,"Wrapper"),v=d(ib,"Content").append(F=d(ib,"Title"),G=d(ib,"Current"),J=a('<button type="button"/>').attr({id:_+"Previous"}),I=a('<button type="button"/>').attr({id:_+"Next"}),H=d("button","Slideshow"),E),K=a('<button type="button"/>').attr({id:_+"Close"}),u.append(d(ib).append(d(ib,"TopLeft"),w=d(ib,"TopCenter"),d(ib,"TopRight")),d(ib,!1,"clear:left").append(x=d(ib,"MiddleLeft"),v,y=d(ib,"MiddleRight")),d(ib,!1,"clear:left").append(d(ib,"BottomLeft"),z=d(ib,"BottomCenter"),d(ib,"BottomRight"))).find("div div").css({"float":"left"}),D=d(ib,!1,"position:absolute; width:9999px; visibility:hidden; display:none; max-width:none;"),L=I.add(J).add(G).add(H)),b.body&&!t.parent().length&&a(b.body).append(s,t.append(u,D))}function q(){function c(a){a.which>1||a.shiftKey||a.altKey||a.metaKey||a.ctrlKey||(a.preventDefault(),o(this))}return t?(Y||(Y=!0,I.click(function(){X.next()}),J.click(function(){X.prev()}),K.click(function(){X.close()}),s.click(function(){M.get("overlayClose")&&X.close()}),a(b).bind("keydown."+_,function(a){var b=a.keyCode;T&&M.get("escKey")&&27===b&&(a.preventDefault(),X.close()),T&&M.get("arrowKey")&&A[1]&&!a.altKey&&(37===b?(a.preventDefault(),J.click()):39===b&&(a.preventDefault(),I.click()))}),a.isFunction(a.fn.on)?a(b).on("click."+_,"."+ab,c):a("."+ab).live("click."+_,c)),!0):!1}function r(){var b,e,f,g=X.prep,k=++jb;if(U=!0,S=!1,n(gb),n(cb),M.get("onLoad"),M.h=M.get("height")?h(M.get("height"),"y")-P-N:M.get("innerHeight")&&h(M.get("innerHeight"),"y"),M.w=M.get("width")?h(M.get("width"),"x")-Q-O:M.get("innerWidth")&&h(M.get("innerWidth"),"x"),M.mw=M.w,M.mh=M.h,M.get("maxWidth")&&(M.mw=h(M.get("maxWidth"),"x")-Q-O,M.mw=M.w&&M.w<M.mw?M.w:M.mw),M.get("maxHeight")&&(M.mh=h(M.get("maxHeight"),"y")-P-N,M.mh=M.h&&M.h<M.mh?M.h:M.mh),b=M.get("href"),W=setTimeout(function(){E.show()},100),M.get("inline")){var l=a(b);f=a("<div>").hide().insertBefore(l),hb.one(gb,function(){f.replaceWith(l)}),g(l)}else M.get("iframe")?g(" "):M.get("html")?g(M.get("html")):i(M,b)?(b=j(M,b),S=new Image,a(S).addClass(_+"Photo").bind("error",function(){g(d(ib,"Error").html(M.get("imgError")))}).one("load",function(){k===jb&&setTimeout(function(){var b;a.each(["alt","longdesc","aria-describedby"],function(b,c){var d=a(M.el).attr(c)||a(M.el).attr("data-"+c);d&&S.setAttribute(c,d)}),M.get("retinaImage")&&c.devicePixelRatio>1&&(S.height=S.height/c.devicePixelRatio,S.width=S.width/c.devicePixelRatio),M.get("scalePhotos")&&(e=function(){S.height-=S.height*b,S.width-=S.width*b},M.mw&&S.width>M.mw&&(b=(S.width-M.mw)/S.width,e()),M.mh&&S.height>M.mh&&(b=(S.height-M.mh)/S.height,e())),M.h&&(S.style.marginTop=Math.max(M.mh-S.height,0)/2+"px"),A[1]&&(M.get("loop")||A[R+1])&&(S.style.cursor="pointer",S.onclick=function(){X.next()}),S.style.width=S.width+"px",S.style.height=S.height+"px",g(S)},1)}),S.src=b):b&&D.load(b,M.get("data"),function(b,c){k===jb&&g("error"===c?d(ib,"Error").html(M.get("xhrError")):a(this).contents())})}var s,t,u,v,w,x,y,z,A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z={html:!1,photo:!1,iframe:!1,inline:!1,transition:"elastic",speed:300,fadeOut:300,width:!1,initialWidth:"600",innerWidth:!1,maxWidth:!1,height:!1,initialHeight:"450",innerHeight:!1,maxHeight:!1,scalePhotos:!0,scrolling:!0,opacity:.9,preloading:!0,className:!1,overlayClose:!0,escKey:!0,arrowKey:!0,top:!1,bottom:!1,left:!1,right:!1,fixed:!1,data:void 0,closeButton:!0,fastIframe:!0,open:!1,reposition:!0,loop:!0,slideshow:!1,slideshowAuto:!0,slideshowSpeed:2500,slideshowStart:"start slideshow",slideshowStop:"stop slideshow",photoRegex:/\.(gif|png|jp(e|g|eg)|bmp|ico|webp|jxr|svg)((#|\?).*)?$/i,retinaImage:!1,retinaUrl:!1,retinaSuffix:"@2x.$1",current:"image {current} of {total}",previous:"previous",next:"next",close:"close",xhrError:"This content failed to load.",imgError:"This image failed to load.",returnFocus:!0,trapFocus:!0,onOpen:!1,onLoad:!1,onComplete:!1,onCleanup:!1,onClosed:!1,rel:function(){return this.rel},href:function(){return a(this).attr("href")},title:function(){return this.title}},$="colorbox",_="cbox",ab=_+"Element",bb=_+"_open",cb=_+"_load",db=_+"_complete",eb=_+"_cleanup",fb=_+"_closed",gb=_+"_purge",hb=a("<a/>"),ib="div",jb=0,kb={},lb=function(){function a(){clearTimeout(g)}function b(){(M.get("loop")||A[R+1])&&(a(),g=setTimeout(X.next,M.get("slideshowSpeed")))}function c(){H.html(M.get("slideshowStop")).unbind(i).one(i,d),hb.bind(db,b).bind(cb,a),t.removeClass(h+"off").addClass(h+"on")}function d(){a(),hb.unbind(db,b).unbind(cb,a),H.html(M.get("slideshowStart")).unbind(i).one(i,function(){X.next(),c()}),t.removeClass(h+"on").addClass(h+"off")}function e(){f=!1,H.hide(),a(),hb.unbind(db,b).unbind(cb,a),t.removeClass(h+"off "+h+"on")}var f,g,h=_+"Slideshow_",i="click."+_;return function(){f?M.get("slideshow")||(hb.unbind(eb,e),e()):M.get("slideshow")&&A[1]&&(f=!0,hb.one(eb,e),M.get("slideshowAuto")?c():d(),H.show())}}();a[$]||(a(p),X=a.fn[$]=a[$]=function(b,c){var d,e=this;if(b=b||{},a.isFunction(e))e=a("<a/>"),b.open=!0;else if(!e[0])return e;return e[0]?(p(),q()&&(c&&(b.onComplete=c),e.each(function(){var c=a.data(this,$)||{};a.data(this,$,a.extend(c,b))}).addClass(ab),d=new f(e[0],b),d.get("open")&&o(e[0])),e):e},X.position=function(b,c){function d(){w[0].style.width=z[0].style.width=v[0].style.width=parseInt(t[0].style.width,10)-O+"px",v[0].style.height=x[0].style.height=y[0].style.height=parseInt(t[0].style.height,10)-N+"px"}var f,g,i,j=0,k=0,l=t.offset();if(B.unbind("resize."+_),t.css({top:-9e4,left:-9e4}),g=B.scrollTop(),i=B.scrollLeft(),M.get("fixed")?(l.top-=g,l.left-=i,t.css({position:"fixed"})):(j=g,k=i,t.css({position:"absolute"})),k+=M.get("right")!==!1?Math.max(B.width()-M.w-Q-O-h(M.get("right"),"x"),0):M.get("left")!==!1?h(M.get("left"),"x"):Math.round(Math.max(B.width()-M.w-Q-O,0)/2),j+=M.get("bottom")!==!1?Math.max(e()-M.h-P-N-h(M.get("bottom"),"y"),0):M.get("top")!==!1?h(M.get("top"),"y"):Math.round(Math.max(e()-M.h-P-N,0)/2),t.css({top:l.top,left:l.left,visibility:"visible"}),u[0].style.width=u[0].style.height="9999px",f={width:M.w+Q+O,height:M.h+P+N,top:j,left:k},b){var m=0;a.each(f,function(a){return f[a]!==kb[a]?void(m=b):void 0}),b=m}kb=f,b||t.css(f),t.dequeue().animate(f,{duration:b||0,complete:function(){d(),U=!1,u[0].style.width=M.w+Q+O+"px",u[0].style.height=M.h+P+N+"px",M.get("reposition")&&setTimeout(function(){B.bind("resize."+_,X.position)},1),a.isFunction(c)&&c()},step:d})},X.resize=function(a){var b;T&&(a=a||{},a.width&&(M.w=h(a.width,"x")-Q-O),a.innerWidth&&(M.w=h(a.innerWidth,"x")),C.css({width:M.w}),a.height&&(M.h=h(a.height,"y")-P-N),a.innerHeight&&(M.h=h(a.innerHeight,"y")),a.innerHeight||a.height||(b=C.scrollTop(),C.css({height:"auto"}),M.h=C.height()),C.css({height:M.h}),b&&C.scrollTop(b),X.position("none"===M.get("transition")?0:M.get("speed")))},X.prep=function(c){function e(){return M.w=M.w||C.width(),M.w=M.mw&&M.mw<M.w?M.mw:M.w,M.w}function h(){return M.h=M.h||C.height(),M.h=M.mh&&M.mh<M.h?M.mh:M.h,M.h}if(T){var k,m="none"===M.get("transition")?0:M.get("speed");C.remove(),C=d(ib,"LoadedContent").append(c),C.hide().appendTo(D.show()).css({width:e(),overflow:M.get("scrolling")?"auto":"hidden"}).css({height:h()}).prependTo(v),D.hide(),a(S).css({"float":"none"}),l(M.get("className")),k=function(){function c(){a.support.opacity===!1&&t[0].style.removeAttribute("filter")}var d,e,h=A.length;T&&(e=function(){clearTimeout(W),E.hide(),n(db),M.get("onComplete")},F.html(M.get("title")).show(),C.show(),h>1?("string"==typeof M.get("current")&&G.html(M.get("current").replace("{current}",R+1).replace("{total}",h)).show(),I[M.get("loop")||h-1>R?"show":"hide"]().html(M.get("next")),J[M.get("loop")||R?"show":"hide"]().html(M.get("previous")),lb(),M.get("preloading")&&a.each([g(-1),g(1)],function(){var c,d=A[this],e=new f(d,a.data(d,$)),g=e.get("href");g&&i(e,g)&&(g=j(e,g),c=b.createElement("img"),c.src=g)})):L.hide(),M.get("iframe")?(d=b.createElement("iframe"),"frameBorder"in d&&(d.frameBorder=0),"allowTransparency"in d&&(d.allowTransparency="true"),M.get("scrolling")||(d.scrolling="no"),a(d).attr({src:M.get("href"),name:(new Date).getTime(),"class":_+"Iframe",allowFullScreen:!0}).one("load",e).appendTo(C),hb.one(gb,function(){d.src="//about:blank"}),M.get("fastIframe")&&a(d).trigger("load")):e(),"fade"===M.get("transition")?t.fadeTo(m,1,c):c())},"fade"===M.get("transition")?t.fadeTo(m,0,function(){X.position(0,k)}):X.position(m,k)}},X.next=function(){!U&&A[1]&&(M.get("loop")||A[R+1])&&(R=g(1),o(A[R]))},X.prev=function(){!U&&A[1]&&(M.get("loop")||R)&&(R=g(-1),o(A[R]))},X.close=function(){T&&!V&&(V=!0,T=!1,n(eb),M.get("onCleanup"),B.unbind("."+_),s.fadeTo(M.get("fadeOut")||0,0),t.stop().fadeTo(M.get("fadeOut")||0,0,function(){t.hide(),s.hide(),n(gb),C.remove(),setTimeout(function(){V=!1,n(fb),M.get("onClosed")},1)}))},X.remove=function(){t&&(t.stop(),a[$].close(),t.stop(!1,!0).remove(),s.remove(),V=!1,t=null,a("."+ab).removeData($).removeClass(ab),a(b).unbind("click."+_).unbind("keydown."+_))},X.element=function(){return a(M.el)},X.settings=Z)}(jQuery,document,window);
\ No newline at end of file
diff --git a/NewLife.Cube/Content/js/jquery.easypiechart.min.js b/NewLife.Cube/Content/js/jquery.easypiechart.min.js
deleted file mode 100644
index 0ca778fa3b..0000000000
--- a/NewLife.Cube/Content/js/jquery.easypiechart.min.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/**!
- * easyPieChart
- * Lightweight plugin to render simple, animated and retina optimized pie charts
- *
- * @license 
- * @author Robert Fleischmann <rendro87@gmail.com> (http://robert-fleischmann.de)
- * @version 2.1.5
- **/
-!function(a,b){"object"==typeof exports?module.exports=b(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],b):b(a.jQuery)}(this,function(a){var b=function(a,b){var c,d=document.createElement("canvas");a.appendChild(d),"undefined"!=typeof G_vmlCanvasManager&&G_vmlCanvasManager.initElement(d);var e=d.getContext("2d");d.width=d.height=b.size;var f=1;window.devicePixelRatio>1&&(f=window.devicePixelRatio,d.style.width=d.style.height=[b.size,"px"].join(""),d.width=d.height=b.size*f,e.scale(f,f)),e.translate(b.size/2,b.size/2),e.rotate((-0.5+b.rotate/180)*Math.PI);var g=(b.size-b.lineWidth)/2;b.scaleColor&&b.scaleLength&&(g-=b.scaleLength+2),Date.now=Date.now||function(){return+new Date};var h=function(a,b,c){c=Math.min(Math.max(-1,c||0),1);var d=0>=c?!0:!1;e.beginPath(),e.arc(0,0,g,0,2*Math.PI*c,d),e.strokeStyle=a,e.lineWidth=b,e.stroke()},i=function(){var a,c;e.lineWidth=1,e.fillStyle=b.scaleColor,e.save();for(var d=24;d>0;--d)d%6===0?(c=b.scaleLength,a=0):(c=.6*b.scaleLength,a=b.scaleLength-c),e.fillRect(-b.size/2+a,0,c,1),e.rotate(Math.PI/12);e.restore()},j=function(){return window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||function(a){window.setTimeout(a,1e3/60)}}(),k=function(){b.scaleColor&&i(),b.trackColor&&h(b.trackColor,b.lineWidth,1)};this.getCanvas=function(){return d},this.getCtx=function(){return e},this.clear=function(){e.clearRect(b.size/-2,b.size/-2,b.size,b.size)},this.draw=function(a){b.scaleColor||b.trackColor?e.getImageData&&e.putImageData?c?e.putImageData(c,0,0):(k(),c=e.getImageData(0,0,b.size*f,b.size*f)):(this.clear(),k()):this.clear(),e.lineCap=b.lineCap;var d;d="function"==typeof b.barColor?b.barColor(a):b.barColor,h(d,b.lineWidth,a/100)}.bind(this),this.animate=function(a,c){var d=Date.now();b.onStart(a,c);var e=function(){var f=Math.min(Date.now()-d,b.animate.duration),g=b.easing(this,f,a,c-a,b.animate.duration);this.draw(g),b.onStep(a,c,g),f>=b.animate.duration?b.onStop(a,c):j(e)}.bind(this);j(e)}.bind(this)},c=function(a,c){var d={barColor:"#ef1e25",trackColor:"#f9f9f9",scaleColor:"#dfe0e0",scaleLength:5,lineCap:"round",lineWidth:3,size:110,rotate:0,animate:{duration:1e3,enabled:!0},easing:function(a,b,c,d,e){return b/=e/2,1>b?d/2*b*b+c:-d/2*(--b*(b-2)-1)+c},onStart:function(){},onStep:function(){},onStop:function(){}};if("undefined"!=typeof b)d.renderer=b;else{if("undefined"==typeof SVGRenderer)throw new Error("Please load either the SVG- or the CanvasRenderer");d.renderer=SVGRenderer}var e={},f=0,g=function(){this.el=a,this.options=e;for(var b in d)d.hasOwnProperty(b)&&(e[b]=c&&"undefined"!=typeof c[b]?c[b]:d[b],"function"==typeof e[b]&&(e[b]=e[b].bind(this)));e.easing="string"==typeof e.easing&&"undefined"!=typeof jQuery&&jQuery.isFunction(jQuery.easing[e.easing])?jQuery.easing[e.easing]:d.easing,"number"==typeof e.animate&&(e.animate={duration:e.animate,enabled:!0}),"boolean"!=typeof e.animate||e.animate||(e.animate={duration:1e3,enabled:e.animate}),this.renderer=new e.renderer(a,e),this.renderer.draw(f),a.dataset&&a.dataset.percent?this.update(parseFloat(a.dataset.percent)):a.getAttribute&&a.getAttribute("data-percent")&&this.update(parseFloat(a.getAttribute("data-percent"))),a.style.width=a.style.height=e.size+"px",a.style.lineHeight=e.size-1+"px"}.bind(this);this.update=function(a){return a=parseFloat(a),e.animate.enabled?this.renderer.animate(f,a):this.renderer.draw(a),f=a,this}.bind(this),this.disableAnimation=function(){return e.animate.enabled=!1,this},this.enableAnimation=function(){return e.animate.enabled=!0,this},g()};a.fn.easyPieChart=function(b){return this.each(function(){var d;a.data(this,"easyPieChart")||(d=a.extend({},b,a(this).data()),a.data(this,"easyPieChart",new c(this,d)))})}});
\ No newline at end of file
diff --git a/NewLife.Cube/Content/js/jquery.gritter.min.js b/NewLife.Cube/Content/js/jquery.gritter.min.js
deleted file mode 100644
index e5119d6f12..0000000000
--- a/NewLife.Cube/Content/js/jquery.gritter.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(a){a.gritter={},a.gritter.options={position:"",class_name:"",fade_in_speed:"medium",fade_out_speed:1e3,time:6e3},a.gritter.add=function(a){try{return b.add(a||{})}catch(c){var d="Gritter Error: "+c;"undefined"!=typeof console&&console.error?console.error(d,a):alert(d)}},a.gritter.remove=function(a,c){b.removeSpecific(a,c||{})},a.gritter.removeAll=function(a){b.stop(a||{})};var b={position:"",fade_in_speed:"",fade_out_speed:"",time:"",_custom_timer:0,_item_count:0,_is_setup:0,_tpl_close:'<div class="gritter-close"></div>',_tpl_title:'<span class="gritter-title">[[title]]</span>',_tpl_item:'<div id="gritter-item-[[number]]" class="gritter-item-wrapper [[item_class]]" style="display:none"><div class="gritter-top"></div><div class="gritter-item">[[close]][[image]]<div class="[[class_name]]">[[title]]<p>[[text]]</p></div><div style="clear:both"></div></div><div class="gritter-bottom"></div></div>',_tpl_wrap:'<div id="gritter-notice-wrapper"></div>',add:function(c){if("string"==typeof c&&(c={text:c}),null===c.text)throw'You must supply "text" parameter.';this._is_setup||this._runSetup();var d=c.title,e=c.text,f=c.image||"",g=c.sticky||!1,h=c.class_name||a.gritter.options.class_name,i=a.gritter.options.position,j=c.time||"";this._verifyWrapper(),this._item_count++;var k=this._item_count,l=this._tpl_item;a(["before_open","after_open","before_close","after_close"]).each(function(d,e){b["_"+e+"_"+k]=a.isFunction(c[e])?c[e]:function(){}}),this._custom_timer=0,j&&(this._custom_timer=j);var m=""!=f?'<img src="'+f+'" class="gritter-image" />':"",n=""!=f?"gritter-with-image":"gritter-without-image";if(d=d?this._str_replace("[[title]]",d,this._tpl_title):"",l=this._str_replace(["[[title]]","[[text]]","[[close]]","[[image]]","[[number]]","[[class_name]]","[[item_class]]"],[d,e,this._tpl_close,m,this._item_count,n,h],l),this["_before_open_"+k]()===!1)return!1;a("#gritter-notice-wrapper").addClass(i).append(l);var o=a("#gritter-item-"+this._item_count);return o.fadeIn(this.fade_in_speed,function(){b["_after_open_"+k](a(this))}),g||this._setFadeTimer(o,k),a(o).bind("mouseenter mouseleave",function(c){"mouseenter"==c.type?g||b._restoreItemIfFading(a(this),k):g||b._setFadeTimer(a(this),k),b._hoverState(a(this),c.type)}),a(o).find(".gritter-close").click(function(){b.removeSpecific(k,{},null,!0)}),k},_countRemoveWrapper:function(b,c,d){c.remove(),this["_after_close_"+b](c,d),0==a(".gritter-item-wrapper").length&&a("#gritter-notice-wrapper").remove()},_fade:function(a,c,d,e){var d=d||{},f="undefined"!=typeof d.fade?d.fade:!0,g=d.speed||this.fade_out_speed,h=e;this["_before_close_"+c](a,h),e&&a.unbind("mouseenter mouseleave"),f?a.animate({opacity:0},g,function(){a.animate({height:0},300,function(){b._countRemoveWrapper(c,a,h)})}):this._countRemoveWrapper(c,a)},_hoverState:function(a,b){"mouseenter"==b?(a.addClass("hover"),a.find(".gritter-close").show()):(a.removeClass("hover"),a.find(".gritter-close").hide())},removeSpecific:function(b,c,d,e){if(!d)var d=a("#gritter-item-"+b);this._fade(d,b,c||{},e)},_restoreItemIfFading:function(a,b){clearTimeout(this["_int_id_"+b]),a.stop().css({opacity:"",height:""})},_runSetup:function(){for(opt in a.gritter.options)this[opt]=a.gritter.options[opt];this._is_setup=1},_setFadeTimer:function(a,c){var d=this._custom_timer?this._custom_timer:this.time;this["_int_id_"+c]=setTimeout(function(){b._fade(a,c)},d)},stop:function(b){var c=a.isFunction(b.before_close)?b.before_close:function(){},d=a.isFunction(b.after_close)?b.after_close:function(){},e=a("#gritter-notice-wrapper");c(e),e.fadeOut(function(){a(this).remove(),d()})},_str_replace:function(a,b,c,d){var e=0,f=0,g="",h="",i=0,j=0,k=[].concat(a),l=[].concat(b),m=c,n=l instanceof Array,o=m instanceof Array;for(m=[].concat(m),d&&(this.window[d]=0),e=0,i=m.length;i>e;e++)if(""!==m[e])for(f=0,j=k.length;j>f;f++)g=m[e]+"",h=n?void 0!==l[f]?l[f]:"":l[0],m[e]=g.split(k[f]).join(h),d&&m[e]!==g&&(this.window[d]+=(g.length-m[e].length)/k[f].length);return o?m:m[0]},_verifyWrapper:function(){0==a("#gritter-notice-wrapper").length&&a("body").append(this._tpl_wrap)}}}(jQuery);
\ No newline at end of file
diff --git a/NewLife.Cube/Content/js/jquery.hotkeys.min.js b/NewLife.Cube/Content/js/jquery.hotkeys.min.js
deleted file mode 100644
index 0308b2ade0..0000000000
--- a/NewLife.Cube/Content/js/jquery.hotkeys.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(a){function b(b){if("string"==typeof b.data&&(b.data={keys:b.data}),b.data&&b.data.keys&&"string"==typeof b.data.keys){var c=b.handler,d=b.data.keys.toLowerCase().split(" ");b.handler=function(b){if(this===b.target||!(/textarea|select/i.test(b.target.nodeName)||a.hotkeys.options.filterTextInputs&&a.inArray(b.target.type,a.hotkeys.textAcceptingInputTypes)>-1)){var e="keypress"!==b.type&&a.hotkeys.specialKeys[b.which],f=String.fromCharCode(b.which).toLowerCase(),g="",h={};a.each(["alt","ctrl","shift"],function(a,c){b[c+"Key"]&&e!==c&&(g+=c+"+")}),b.metaKey&&!b.ctrlKey&&"meta"!==e&&(g+="meta+"),b.metaKey&&"meta"!==e&&g.indexOf("alt+ctrl+shift+")>-1&&(g=g.replace("alt+ctrl+shift+","hyper+")),e?h[g+e]=!0:(h[g+f]=!0,h[g+a.hotkeys.shiftNums[f]]=!0,"shift+"===g&&(h[a.hotkeys.shiftNums[f]]=!0));for(var i=0,j=d.length;j>i;i++)if(h[d[i]])return c.apply(this,arguments)}}}}a.hotkeys={version:"0.8",specialKeys:{8:"backspace",9:"tab",10:"return",13:"return",16:"shift",17:"ctrl",18:"alt",19:"pause",20:"capslock",27:"esc",32:"space",33:"pageup",34:"pagedown",35:"end",36:"home",37:"left",38:"up",39:"right",40:"down",45:"insert",46:"del",59:";",61:"=",96:"0",97:"1",98:"2",99:"3",100:"4",101:"5",102:"6",103:"7",104:"8",105:"9",106:"*",107:"+",109:"-",110:".",111:"/",112:"f1",113:"f2",114:"f3",115:"f4",116:"f5",117:"f6",118:"f7",119:"f8",120:"f9",121:"f10",122:"f11",123:"f12",144:"numlock",145:"scroll",173:"-",186:";",187:"=",188:",",189:"-",190:".",191:"/",192:"`",219:"[",220:"\\",221:"]",222:"'"},shiftNums:{"`":"~",1:"!",2:"@",3:"#",4:"$",5:"%",6:"^",7:"&",8:"*",9:"(",0:")","-":"_","=":"+",";":": ","'":'"',",":"<",".":">","/":"?","\\":"|"},textAcceptingInputTypes:["text","password","number","email","url","range","date","month","week","time","datetime","datetime-local","search","color","tel"],options:{filterTextInputs:!0}},a.each(["keydown","keyup","keypress"],function(){a.event.special[this]={add:b}})}(jQuery||this.jQuery||window.jQuery);
\ No newline at end of file
diff --git a/NewLife.Cube/Content/js/jquery.inputlimiter.1.3.1.min.js b/NewLife.Cube/Content/js/jquery.inputlimiter.1.3.1.min.js
deleted file mode 100644
index f1c36f0cbe..0000000000
--- a/NewLife.Cube/Content/js/jquery.inputlimiter.1.3.1.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(a){a.fn.inputlimiter=function(b){{var c=a.extend({},a.fn.inputlimiter.defaults,b);a(this)}c.boxAttach&&!a("#"+c.boxId).length&&(a("<div/>").appendTo("body").attr({id:c.boxId,"class":c.boxClass}).css({position:"absolute"}).hide(),a.fn.bgiframe&&a("#"+c.boxId).bgiframe());var d=function(){var b=a(this),d=g(b.val());!c.allowExceed&&d>c.limit&&b.val(h(b.val())),c.boxAttach&&a("#"+c.boxId).css({width:b.outerWidth()-(a("#"+c.boxId).outerWidth()-a("#"+c.boxId).width())+"px",left:b.offset().left+"px",top:b.offset().top+b.outerHeight()-1+"px","z-index":2e3});var e=c.limit-d>0?c.limit-d:0,f=c.remTextFilter(c,e),i=c.limitTextFilter(c);if(c.limitTextShow){a("#"+c.boxId).html(f+" "+i);var j=a("<span/>").appendTo("body").attr({id:"19cc9195583bfae1fad88e19d443be7a","class":c.boxClass}).html(f+" "+i).innerWidth();a("#19cc9195583bfae1fad88e19d443be7a").remove(),j>a("#"+c.boxId).innerWidth()&&a("#"+c.boxId).html(f+"<br />"+i),a("#"+c.boxId).show()}else a("#"+c.boxId).html(f).show()},e=function(b){var d=g(a(this).val());if(!c.allowExceed&&d>c.limit){var e=b.ctrlKey||b.altKey||b.metaKey;if(!e&&b.which>=32&&b.which<=122&&this.selectionStart===this.selectionEnd)return!1}},f=function(){var b=a(this);if(count=g(b.val()),!c.allowExceed&&count>c.limit&&b.val(h(b.val())),c.boxAttach)a("#"+c.boxId).fadeOut("fast");else if(c.remTextHideOnBlur){var d=c.limitText;d=d.replace(/\%n/g,c.limit),d=d.replace(/\%s/g,1===c.limit?"":"s"),a("#"+c.boxId).html(d)}},g=function(b){if("words"===c.limitBy.toLowerCase())return b.length>0?a.trim(b).replace(/\ +(?= )/g,"").split(" ").length:0;var d=b.length,e=b.match(/\n/g);return e&&c.lineReturnCount>1&&(d+=e.length*(c.lineReturnCount-1)),d},h=function(b){return"words"===c.limitBy.toLowerCase()?a.trim(b).replace(/\ +(?= )/g,"").split(" ").splice(0,c.limit).join(" ")+" ":b.substring(0,c.limit)};a(this).each(function(){var g=a(this);(!b||!b.limit)&&c.useMaxlength&&parseInt(g.attr("maxlength"))>0&&parseInt(g.attr("maxlength"))!=c.limit?g.inputlimiter(a.extend({},c,{limit:parseInt(g.attr("maxlength"))})):(!c.allowExceed&&c.useMaxlength&&"characters"===c.limitBy.toLowerCase()&&g.attr("maxlength",c.limit),g.unbind(".inputlimiter"),g.bind("keyup.inputlimiter",d),g.bind("keypress.inputlimiter",e),g.bind("blur.inputlimiter",f))})},a.fn.inputlimiter.remtextfilter=function(a,b){var c=a.remText;return 0===b&&null!==a.remFullText&&(c=a.remFullText),c=c.replace(/\%n/g,b),c=c.replace(/\%s/g,a.zeroPlural?1===b?"":"s":1>=b?"":"s")},a.fn.inputlimiter.limittextfilter=function(a){var b=a.limitText;return b=b.replace(/\%n/g,a.limit),b=b.replace(/\%s/g,a.limit<=1?"":"s")},a.fn.inputlimiter.defaults={limit:255,boxAttach:!0,boxId:"limiterBox",boxClass:"limiterBox",remText:"%n character%s remaining.",remTextFilter:a.fn.inputlimiter.remtextfilter,remTextHideOnBlur:!0,remFullText:null,limitTextShow:!0,limitText:"Field limited to %n character%s.",limitTextFilter:a.fn.inputlimiter.limittextfilter,zeroPlural:!0,allowExceed:!1,useMaxlength:!0,limitBy:"characters",lineReturnCount:1}}(jQuery);
\ No newline at end of file
diff --git a/NewLife.Cube/Content/js/jquery.knob.min.js b/NewLife.Cube/Content/js/jquery.knob.min.js
deleted file mode 100644
index f4c8cd0ef4..0000000000
--- a/NewLife.Cube/Content/js/jquery.knob.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*!jQuery Knob*/
-!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):a(jQuery)}(function(a){"use strict";var b={},c=Math.max,d=Math.min;b.c={},b.c.d=a(document),b.c.t=function(a){return a.originalEvent.touches.length-1},b.o=function(){var c=this;this.o=null,this.$=null,this.i=null,this.g=null,this.v=null,this.cv=null,this.x=0,this.y=0,this.w=0,this.h=0,this.$c=null,this.c=null,this.t=0,this.isInit=!1,this.fgColor=null,this.pColor=null,this.dH=null,this.cH=null,this.eH=null,this.rH=null,this.scale=1,this.relative=!1,this.relativeWidth=!1,this.relativeHeight=!1,this.$div=null,this.run=function(){var b=function(a,b){var d;for(d in b)c.o[d]=b[d];c._carve().init(),c._configure()._draw()};if(!this.$.data("kontroled")){if(this.$.data("kontroled",!0),this.extend(),this.o=a.extend({min:void 0!==this.$.data("min")?this.$.data("min"):0,max:void 0!==this.$.data("max")?this.$.data("max"):100,stopper:!0,readOnly:this.$.data("readonly")||"readonly"===this.$.attr("readonly"),cursor:this.$.data("cursor")===!0&&30||this.$.data("cursor")||0,thickness:this.$.data("thickness")&&Math.max(Math.min(this.$.data("thickness"),1),.01)||.35,lineCap:this.$.data("linecap")||"butt",width:this.$.data("width")||200,height:this.$.data("height")||200,displayInput:null==this.$.data("displayinput")||this.$.data("displayinput"),displayPrevious:this.$.data("displayprevious"),fgColor:this.$.data("fgcolor")||"#87CEEB",inputColor:this.$.data("inputcolor"),font:this.$.data("font")||"Arial",fontWeight:this.$.data("font-weight")||"bold",inline:!1,step:this.$.data("step")||1,rotation:this.$.data("rotation"),draw:null,change:null,cancel:null,release:null,format:function(a){return a},parse:function(a){return parseFloat(a)}},this.o),this.o.flip="anticlockwise"===this.o.rotation||"acw"===this.o.rotation,this.o.inputColor||(this.o.inputColor=this.o.fgColor),this.$.is("fieldset")?(this.v={},this.i=this.$.find("input"),this.i.each(function(b){var d=a(this);c.i[b]=d,c.v[b]=c.o.parse(d.val()),d.bind("change blur",function(){var a={};a[b]=d.val(),c.val(c._validate(a))})}),this.$.find("legend").remove()):(this.i=this.$,this.v=this.o.parse(this.$.val()),""===this.v&&(this.v=this.o.min),this.$.bind("change blur",function(){c.val(c._validate(c.o.parse(c.$.val())))})),!this.o.displayInput&&this.$.hide(),this.$c=a(document.createElement("canvas")).attr({width:this.o.width,height:this.o.height}),this.$div=a('<div style="'+(this.o.inline?"display:inline;":"")+"width:"+this.o.width+"px;height:"+this.o.height+'px;"></div>'),this.$.wrap(this.$div).before(this.$c),this.$div=this.$.parent(),"undefined"!=typeof G_vmlCanvasManager&&G_vmlCanvasManager.initElement(this.$c[0]),this.c=this.$c[0].getContext?this.$c[0].getContext("2d"):null,!this.c)throw{name:"CanvasNotSupportedException",message:"Canvas not supported. Please use excanvas on IE8.0.",toString:function(){return this.name+": "+this.message}};return this.scale=(window.devicePixelRatio||1)/(this.c.webkitBackingStorePixelRatio||this.c.mozBackingStorePixelRatio||this.c.msBackingStorePixelRatio||this.c.oBackingStorePixelRatio||this.c.backingStorePixelRatio||1),this.relativeWidth=this.o.width%1!==0&&this.o.width.indexOf("%"),this.relativeHeight=this.o.height%1!==0&&this.o.height.indexOf("%"),this.relative=this.relativeWidth||this.relativeHeight,this._carve(),this.v instanceof Object?(this.cv={},this.copy(this.v,this.cv)):this.cv=this.v,this.$.bind("configure",b).parent().bind("configure",b),this._listen()._configure()._xy().init(),this.isInit=!0,this.$.val(this.o.format(this.v)),this._draw(),this}},this._carve=function(){if(this.relative){var a=this.relativeWidth?this.$div.parent().width()*parseInt(this.o.width)/100:this.$div.parent().width(),b=this.relativeHeight?this.$div.parent().height()*parseInt(this.o.height)/100:this.$div.parent().height();this.w=this.h=Math.min(a,b)}else this.w=this.o.width,this.h=this.o.height;return this.$div.css({width:this.w+"px",height:this.h+"px"}),this.$c.attr({width:this.w,height:this.h}),1!==this.scale&&(this.$c[0].width=this.$c[0].width*this.scale,this.$c[0].height=this.$c[0].height*this.scale,this.$c.width(this.w),this.$c.height(this.h)),this},this._draw=function(){var a=!0;c.g=c.c,c.clear(),c.dH&&(a=c.dH()),a!==!1&&c.draw()},this._touch=function(a){var d=function(a){var b=c.xy2val(a.originalEvent.touches[c.t].pageX,a.originalEvent.touches[c.t].pageY);b!=c.cv&&(c.cH&&c.cH(b)===!1||(c.change(c._validate(b)),c._draw()))};return this.t=b.c.t(a),d(a),b.c.d.bind("touchmove.k",d).bind("touchend.k",function(){b.c.d.unbind("touchmove.k touchend.k"),c.val(c.cv)}),this},this._mouse=function(a){var d=function(a){var b=c.xy2val(a.pageX,a.pageY);b!=c.cv&&(c.cH&&c.cH(b)===!1||(c.change(c._validate(b)),c._draw()))};return d(a),b.c.d.bind("mousemove.k",d).bind("keyup.k",function(a){if(27===a.keyCode){if(b.c.d.unbind("mouseup.k mousemove.k keyup.k"),c.eH&&c.eH()===!1)return;c.cancel()}}).bind("mouseup.k",function(){b.c.d.unbind("mousemove.k mouseup.k keyup.k"),c.val(c.cv)}),this},this._xy=function(){var a=this.$c.offset();return this.x=a.left,this.y=a.top,this},this._listen=function(){return this.o.readOnly?this.$.attr("readonly","readonly"):(this.$c.bind("mousedown",function(a){a.preventDefault(),c._xy()._mouse(a)}).bind("touchstart",function(a){a.preventDefault(),c._xy()._touch(a)}),this.listen()),this.relative&&a(window).resize(function(){c._carve().init(),c._draw()}),this},this._configure=function(){return this.o.draw&&(this.dH=this.o.draw),this.o.change&&(this.cH=this.o.change),this.o.cancel&&(this.eH=this.o.cancel),this.o.release&&(this.rH=this.o.release),this.o.displayPrevious?(this.pColor=this.h2rgba(this.o.fgColor,"0.4"),this.fgColor=this.h2rgba(this.o.fgColor,"0.6")):this.fgColor=this.o.fgColor,this},this._clear=function(){this.$c[0].width=this.$c[0].width},this._validate=function(a){var b=~~((0>a?-.5:.5)+a/this.o.step)*this.o.step;return Math.round(100*b)/100},this.listen=function(){},this.extend=function(){},this.init=function(){},this.change=function(){},this.val=function(){},this.xy2val=function(){},this.draw=function(){},this.clear=function(){this._clear()},this.h2rgba=function(a,b){var c;return a=a.substring(1,7),c=[parseInt(a.substring(0,2),16),parseInt(a.substring(2,4),16),parseInt(a.substring(4,6),16)],"rgba("+c[0]+","+c[1]+","+c[2]+","+b+")"},this.copy=function(a,b){for(var c in a)b[c]=a[c]}},b.Dial=function(){b.o.call(this),this.startAngle=null,this.xy=null,this.radius=null,this.lineWidth=null,this.cursorExt=null,this.w2=null,this.PI2=2*Math.PI,this.extend=function(){this.o=a.extend({bgColor:this.$.data("bgcolor")||"#EEEEEE",angleOffset:this.$.data("angleoffset")||0,angleArc:this.$.data("anglearc")||360,inline:!0},this.o)},this.val=function(a,b){return null==a?this.v:(a=this.o.parse(a),void(b!==!1&&a!=this.v&&this.rH&&this.rH(a)===!1||(this.cv=this.o.stopper?c(d(a,this.o.max),this.o.min):a,this.v=this.cv,this.$.val(this.o.format(this.v)),this._draw())))},this.xy2val=function(a,b){var e,f;return e=Math.atan2(a-(this.x+this.w2),-(b-this.y-this.w2))-this.angleOffset,this.o.flip&&(e=this.angleArc-e-this.PI2),this.angleArc!=this.PI2&&0>e&&e>-.5?e=0:0>e&&(e+=this.PI2),f=e*(this.o.max-this.o.min)/this.angleArc+this.o.min,this.o.stopper&&(f=c(d(f,this.o.max),this.o.min)),f},this.listen=function(){var b,e,f,g,h=this,i=function(a){a.preventDefault();var f=a.originalEvent,g=f.detail||f.wheelDeltaX,i=f.detail||f.wheelDeltaY,j=h._validate(h.o.parse(h.$.val()))+(g>0||i>0?h.o.step:0>g||0>i?-h.o.step:0);j=c(d(j,h.o.max),h.o.min),h.val(j,!1),h.rH&&(clearTimeout(b),b=setTimeout(function(){h.rH(j),b=null},100),e||(e=setTimeout(function(){b&&h.rH(j),e=null},200)))},j=1,k={37:-h.o.step,38:h.o.step,39:h.o.step,40:-h.o.step};this.$.bind("keydown",function(b){var e=b.keyCode;if(e>=96&&105>=e&&(e=b.keyCode=e-48),f=parseInt(String.fromCharCode(e)),isNaN(f)&&(13!==e&&8!==e&&9!==e&&189!==e&&(190!==e||h.$.val().match(/\./))&&b.preventDefault(),a.inArray(e,[37,38,39,40])>-1)){b.preventDefault();var i=h.o.parse(h.$.val())+k[e]*j;h.o.stopper&&(i=c(d(i,h.o.max),h.o.min)),h.change(h._validate(i)),h._draw(),g=window.setTimeout(function(){j*=2},30)}}).bind("keyup",function(){isNaN(f)?g&&(window.clearTimeout(g),g=null,j=1,h.val(h.$.val())):h.$.val()>h.o.max&&h.$.val(h.o.max)||h.$.val()<h.o.min&&h.$.val(h.o.min)}),this.$c.bind("mousewheel DOMMouseScroll",i),this.$.bind("mousewheel DOMMouseScroll",i)},this.init=function(){(this.v<this.o.min||this.v>this.o.max)&&(this.v=this.o.min),this.$.val(this.v),this.w2=this.w/2,this.cursorExt=this.o.cursor/100,this.xy=this.w2*this.scale,this.lineWidth=this.xy*this.o.thickness,this.lineCap=this.o.lineCap,this.radius=this.xy-this.lineWidth/2,this.o.angleOffset&&(this.o.angleOffset=isNaN(this.o.angleOffset)?0:this.o.angleOffset),this.o.angleArc&&(this.o.angleArc=isNaN(this.o.angleArc)?this.PI2:this.o.angleArc),this.angleOffset=this.o.angleOffset*Math.PI/180,this.angleArc=this.o.angleArc*Math.PI/180,this.startAngle=1.5*Math.PI+this.angleOffset,this.endAngle=1.5*Math.PI+this.angleOffset+this.angleArc;var a=c(String(Math.abs(this.o.max)).length,String(Math.abs(this.o.min)).length,2)+2;this.o.displayInput&&this.i.css({width:(this.w/2+4>>0)+"px",height:(this.w/3>>0)+"px",position:"absolute","vertical-align":"middle","margin-top":(this.w/3>>0)+"px","margin-left":"-"+(3*this.w/4+2>>0)+"px",border:0,background:"none",font:this.o.fontWeight+" "+(this.w/a>>0)+"px "+this.o.font,"text-align":"center",color:this.o.inputColor||this.o.fgColor,padding:"0px","-webkit-appearance":"none"})||this.i.css({width:"0px",visibility:"hidden"})},this.change=function(a){this.cv=a,this.$.val(this.o.format(a))},this.angle=function(a){return(a-this.o.min)*this.angleArc/(this.o.max-this.o.min)},this.arc=function(a){var b,c;return a=this.angle(a),this.o.flip?(b=this.endAngle+1e-5,c=b-a-1e-5):(b=this.startAngle-1e-5,c=b+a+1e-5),this.o.cursor&&(b=c-this.cursorExt)&&(c+=this.cursorExt),{s:b,e:c,d:this.o.flip&&!this.o.cursor}},this.draw=function(){var a,b=this.g,c=this.arc(this.cv),d=1;b.lineWidth=this.lineWidth,b.lineCap=this.lineCap,"none"!==this.o.bgColor&&(b.beginPath(),b.strokeStyle=this.o.bgColor,b.arc(this.xy,this.xy,this.radius,this.endAngle-1e-5,this.startAngle+1e-5,!0),b.stroke()),this.o.displayPrevious&&(a=this.arc(this.v),b.beginPath(),b.strokeStyle=this.pColor,b.arc(this.xy,this.xy,this.radius,a.s,a.e,a.d),b.stroke(),d=this.cv==this.v),b.beginPath(),b.strokeStyle=d?this.o.fgColor:this.fgColor,b.arc(this.xy,this.xy,this.radius,c.s,c.e,c.d),b.stroke()},this.cancel=function(){this.val(this.v)}},a.fn.dial=a.fn.knob=function(c){return this.each(function(){var d=new b.Dial;d.o=c,d.$=a(this),d.run()}).parent()}});
\ No newline at end of file
diff --git a/NewLife.Cube/Content/js/jquery.maskedinput.min.js b/NewLife.Cube/Content/js/jquery.maskedinput.min.js
deleted file mode 100644
index 0ec389f53f..0000000000
--- a/NewLife.Cube/Content/js/jquery.maskedinput.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):a("object"==typeof exports?require("jquery"):jQuery)}(function(a){var b,c=navigator.userAgent,d=/iphone/i.test(c),e=/chrome/i.test(c),f=/android/i.test(c);a.mask={definitions:{9:"[0-9]",a:"[A-Za-z]","*":"[A-Za-z0-9]"},autoclear:!0,dataName:"rawMaskFn",placeholder:"_"},a.fn.extend({caret:function(a,b){var c;return 0===this.length||this.is(":hidden")?void 0:"number"==typeof a?(b="number"==typeof b?b:a,this.each(function(){this.setSelectionRange?this.setSelectionRange(a,b):this.createTextRange&&(c=this.createTextRange(),c.collapse(!0),c.moveEnd("character",b),c.moveStart("character",a),c.select())})):(this[0].setSelectionRange?(a=this[0].selectionStart,b=this[0].selectionEnd):document.selection&&document.selection.createRange&&(c=document.selection.createRange(),a=0-c.duplicate().moveStart("character",-1e5),b=a+c.text.length),{begin:a,end:b})},unmask:function(){return this.trigger("unmask")},mask:function(c,g){var h,i,j,k,l,m,n,o;if(!c&&this.length>0){h=a(this[0]);var p=h.data(a.mask.dataName);return p?p():void 0}return g=a.extend({autoclear:a.mask.autoclear,placeholder:a.mask.placeholder,completed:null},g),i=a.mask.definitions,j=[],k=n=c.length,l=null,a.each(c.split(""),function(a,b){"?"==b?(n--,k=a):i[b]?(j.push(new RegExp(i[b])),null===l&&(l=j.length-1),k>a&&(m=j.length-1)):j.push(null)}),this.trigger("unmask").each(function(){function h(){if(g.completed){for(var a=l;m>=a;a++)if(j[a]&&C[a]===p(a))return;g.completed.call(B)}}function p(a){return g.placeholder.charAt(a<g.placeholder.length?a:0)}function q(a){for(;++a<n&&!j[a];);return a}function r(a){for(;--a>=0&&!j[a];);return a}function s(a,b){var c,d;if(!(0>a)){for(c=a,d=q(b);n>c;c++)if(j[c]){if(!(n>d&&j[c].test(C[d])))break;C[c]=C[d],C[d]=p(d),d=q(d)}z(),B.caret(Math.max(l,a))}}function t(a){var b,c,d,e;for(b=a,c=p(a);n>b;b++)if(j[b]){if(d=q(b),e=C[b],C[b]=c,!(n>d&&j[d].test(e)))break;c=e}}function u(){var a=B.val(),b=B.caret();if(a.length<o.length){for(A(!0);b.begin>0&&!j[b.begin-1];)b.begin--;if(0===b.begin)for(;b.begin<l&&!j[b.begin];)b.begin++;B.caret(b.begin,b.begin)}else{for(A(!0);b.begin<n&&!j[b.begin];)b.begin++;B.caret(b.begin,b.begin)}h()}function v(){A(),B.val()!=E&&B.change()}function w(a){if(!B.prop("readonly")){var b,c,e,f=a.which||a.keyCode;o=B.val(),8===f||46===f||d&&127===f?(b=B.caret(),c=b.begin,e=b.end,e-c===0&&(c=46!==f?r(c):e=q(c-1),e=46===f?q(e):e),y(c,e),s(c,e-1),a.preventDefault()):13===f?v.call(this,a):27===f&&(B.val(E),B.caret(0,A()),a.preventDefault())}}function x(b){if(!B.prop("readonly")){var c,d,e,g=b.which||b.keyCode,i=B.caret();if(!(b.ctrlKey||b.altKey||b.metaKey||32>g)&&g&&13!==g){if(i.end-i.begin!==0&&(y(i.begin,i.end),s(i.begin,i.end-1)),c=q(i.begin-1),n>c&&(d=String.fromCharCode(g),j[c].test(d))){if(t(c),C[c]=d,z(),e=q(c),f){var k=function(){a.proxy(a.fn.caret,B,e)()};setTimeout(k,0)}else B.caret(e);i.begin<=m&&h()}b.preventDefault()}}}function y(a,b){var c;for(c=a;b>c&&n>c;c++)j[c]&&(C[c]=p(c))}function z(){B.val(C.join(""))}function A(a){var b,c,d,e=B.val(),f=-1;for(b=0,d=0;n>b;b++)if(j[b]){for(C[b]=p(b);d++<e.length;)if(c=e.charAt(d-1),j[b].test(c)){C[b]=c,f=b;break}if(d>e.length){y(b+1,n);break}}else C[b]===e.charAt(d)&&d++,k>b&&(f=b);return a?z():k>f+1?g.autoclear||C.join("")===D?(B.val()&&B.val(""),y(0,n)):z():(z(),B.val(B.val().substring(0,f+1))),k?b:l}var B=a(this),C=a.map(c.split(""),function(a,b){return"?"!=a?i[a]?p(b):a:void 0}),D=C.join(""),E=B.val();B.data(a.mask.dataName,function(){return a.map(C,function(a,b){return j[b]&&a!=p(b)?a:null}).join("")}),B.one("unmask",function(){B.off(".mask").removeData(a.mask.dataName)}).on("focus.mask",function(){if(!B.prop("readonly")){clearTimeout(b);var a;E=B.val(),a=A(),b=setTimeout(function(){z(),a==c.replace("?","").length?B.caret(0,a):B.caret(a)},10)}}).on("blur.mask",v).on("keydown.mask",w).on("keypress.mask",x).on("input.mask paste.mask",function(){B.prop("readonly")||setTimeout(function(){var a=A(!0);B.caret(a),h()},0)}),e&&f&&B.off("input.mask").on("input.mask",u),A()})}})});
\ No newline at end of file
diff --git a/NewLife.Cube/Content/js/jquery.min.js b/NewLife.Cube/Content/js/jquery.min.js
deleted file mode 100644
index 9320c89e7c..0000000000
--- a/NewLife.Cube/Content/js/jquery.min.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/*!
- * jQuery JavaScript Library v2.1.1
- * http://jquery.com/
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- *
- * Copyright 2005, 2014 jQuery Foundation, Inc. and other contributors
- * Released under the MIT license
- * http://jquery.org/license
- *
- * Date: 2014-05-01T17:11Z
- */
-!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){function c(a){var b=a.length,c=_.type(a);return"function"===c||_.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}function d(a,b,c){if(_.isFunction(b))return _.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return _.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(hb.test(b))return _.filter(b,a,c);b=_.filter(b,a)}return _.grep(a,function(a){return U.call(b,a)>=0!==c})}function e(a,b){for(;(a=a[b])&&1!==a.nodeType;);return a}function f(a){var b=ob[a]={};return _.each(a.match(nb)||[],function(a,c){b[c]=!0}),b}function g(){Z.removeEventListener("DOMContentLoaded",g,!1),a.removeEventListener("load",g,!1),_.ready()}function h(){Object.defineProperty(this.cache={},0,{get:function(){return{}}}),this.expando=_.expando+Math.random()}function i(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(ub,"-$1").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:tb.test(c)?_.parseJSON(c):c}catch(e){}sb.set(a,b,c)}else c=void 0;return c}function j(){return!0}function k(){return!1}function l(){try{return Z.activeElement}catch(a){}}function m(a,b){return _.nodeName(a,"table")&&_.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function n(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function o(a){var b=Kb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function p(a,b){for(var c=0,d=a.length;d>c;c++)rb.set(a[c],"globalEval",!b||rb.get(b[c],"globalEval"))}function q(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(rb.hasData(a)&&(f=rb.access(a),g=rb.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;d>c;c++)_.event.add(b,e,j[e][c])}sb.hasData(a)&&(h=sb.access(a),i=_.extend({},h),sb.set(b,i))}}function r(a,b){var c=a.getElementsByTagName?a.getElementsByTagName(b||"*"):a.querySelectorAll?a.querySelectorAll(b||"*"):[];return void 0===b||b&&_.nodeName(a,b)?_.merge([a],c):c}function s(a,b){var c=b.nodeName.toLowerCase();"input"===c&&yb.test(a.type)?b.checked=a.checked:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}function t(b,c){var d,e=_(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:_.css(e[0],"display");return e.detach(),f}function u(a){var b=Z,c=Ob[a];return c||(c=t(a,b),"none"!==c&&c||(Nb=(Nb||_("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=Nb[0].contentDocument,b.write(),b.close(),c=t(a,b),Nb.detach()),Ob[a]=c),c}function v(a,b,c){var d,e,f,g,h=a.style;return c=c||Rb(a),c&&(g=c.getPropertyValue(b)||c[b]),c&&(""!==g||_.contains(a.ownerDocument,a)||(g=_.style(a,b)),Qb.test(g)&&Pb.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0!==g?g+"":g}function w(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}function x(a,b){if(b in a)return b;for(var c=b[0].toUpperCase()+b.slice(1),d=b,e=Xb.length;e--;)if(b=Xb[e]+c,b in a)return b;return d}function y(a,b,c){var d=Tb.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function z(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=_.css(a,c+wb[f],!0,e)),d?("content"===c&&(g-=_.css(a,"padding"+wb[f],!0,e)),"margin"!==c&&(g-=_.css(a,"border"+wb[f]+"Width",!0,e))):(g+=_.css(a,"padding"+wb[f],!0,e),"padding"!==c&&(g+=_.css(a,"border"+wb[f]+"Width",!0,e)));return g}function A(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=Rb(a),g="border-box"===_.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=v(a,b,f),(0>e||null==e)&&(e=a.style[b]),Qb.test(e))return e;d=g&&(Y.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+z(a,b,c||(g?"border":"content"),d,f)+"px"}function B(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=rb.get(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&xb(d)&&(f[g]=rb.access(d,"olddisplay",u(d.nodeName)))):(e=xb(d),"none"===c&&e||rb.set(d,"olddisplay",e?c:_.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}function C(a,b,c,d,e){return new C.prototype.init(a,b,c,d,e)}function D(){return setTimeout(function(){Yb=void 0}),Yb=_.now()}function E(a,b){var c,d=0,e={height:a};for(b=b?1:0;4>d;d+=2-b)c=wb[d],e["margin"+c]=e["padding"+c]=a;return b&&(e.opacity=e.width=a),e}function F(a,b,c){for(var d,e=(cc[b]||[]).concat(cc["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function G(a,b,c){var d,e,f,g,h,i,j,k,l=this,m={},n=a.style,o=a.nodeType&&xb(a),p=rb.get(a,"fxshow");c.queue||(h=_._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,l.always(function(){l.always(function(){h.unqueued--,_.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[n.overflow,n.overflowX,n.overflowY],j=_.css(a,"display"),k="none"===j?rb.get(a,"olddisplay")||u(a.nodeName):j,"inline"===k&&"none"===_.css(a,"float")&&(n.display="inline-block")),c.overflow&&(n.overflow="hidden",l.always(function(){n.overflow=c.overflow[0],n.overflowX=c.overflow[1],n.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],$b.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(o?"hide":"show")){if("show"!==e||!p||void 0===p[d])continue;o=!0}m[d]=p&&p[d]||_.style(a,d)}else j=void 0;if(_.isEmptyObject(m))"inline"===("none"===j?u(a.nodeName):j)&&(n.display=j);else{p?"hidden"in p&&(o=p.hidden):p=rb.access(a,"fxshow",{}),f&&(p.hidden=!o),o?_(a).show():l.done(function(){_(a).hide()}),l.done(function(){var b;rb.remove(a,"fxshow");for(b in m)_.style(a,b,m[b])});for(d in m)g=F(o?p[d]:0,d,l),d in p||(p[d]=g.start,o&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function H(a,b){var c,d,e,f,g;for(c in a)if(d=_.camelCase(c),e=b[d],f=a[c],_.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=_.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function I(a,b,c){var d,e,f=0,g=bc.length,h=_.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=Yb||D(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:_.extend({},b),opts:_.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:Yb||D(),duration:c.duration,tweens:[],createTween:function(b,c){var d=_.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;for(H(k,j.opts.specialEasing);g>f;f++)if(d=bc[f].call(j,a,k,j.opts))return d;return _.map(k,F,j),_.isFunction(j.opts.start)&&j.opts.start.call(a,j),_.fx.timer(_.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}function J(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(nb)||[];if(_.isFunction(c))for(;d=f[e++];)"+"===d[0]?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function K(a,b,c,d){function e(h){var i;return f[h]=!0,_.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||g||f[j]?g?!(i=j):void 0:(b.dataTypes.unshift(j),e(j),!1)}),i}var f={},g=a===vc;return e(b.dataTypes[0])||!f["*"]&&e("*")}function L(a,b){var c,d,e=_.ajaxSettings.flatOptions||{};for(c in b)void 0!==b[c]&&((e[c]?a:d||(d={}))[c]=b[c]);return d&&_.extend(!0,a,d),a}function M(a,b,c){for(var d,e,f,g,h=a.contents,i=a.dataTypes;"*"===i[0];)i.shift(),void 0===d&&(d=a.mimeType||b.getResponseHeader("Content-Type"));if(d)for(e in h)if(h[e]&&h[e].test(d)){i.unshift(e);break}if(i[0]in c)f=i[0];else{for(e in c){if(!i[0]||a.converters[e+" "+i[0]]){f=e;break}g||(g=e)}f=f||g}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function N(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];for(f=k.shift();f;)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}function O(a,b,c,d){var e;if(_.isArray(b))_.each(b,function(b,e){c||zc.test(a)?d(a,e):O(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==_.type(b))d(a,b);else for(e in b)O(a+"["+e+"]",b[e],c,d)}function P(a){return _.isWindow(a)?a:9===a.nodeType&&a.defaultView}var Q=[],R=Q.slice,S=Q.concat,T=Q.push,U=Q.indexOf,V={},W=V.toString,X=V.hasOwnProperty,Y={},Z=a.document,$="2.1.1",_=function(a,b){return new _.fn.init(a,b)},ab=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,bb=/^-ms-/,cb=/-([\da-z])/gi,db=function(a,b){return b.toUpperCase()};_.fn=_.prototype={jquery:$,constructor:_,selector:"",length:0,toArray:function(){return R.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:R.call(this)},pushStack:function(a){var b=_.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return _.each(this,a,b)},map:function(a){return this.pushStack(_.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(R.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:T,sort:Q.sort,splice:Q.splice},_.extend=_.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||_.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(a=arguments[h]))for(b in a)c=g[b],d=a[b],g!==d&&(j&&d&&(_.isPlainObject(d)||(e=_.isArray(d)))?(e?(e=!1,f=c&&_.isArray(c)?c:[]):f=c&&_.isPlainObject(c)?c:{},g[b]=_.extend(j,f,d)):void 0!==d&&(g[b]=d));return g},_.extend({expando:"jQuery"+($+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===_.type(a)},isArray:Array.isArray,isWindow:function(a){return null!=a&&a===a.window},isNumeric:function(a){return!_.isArray(a)&&a-parseFloat(a)>=0},isPlainObject:function(a){return"object"!==_.type(a)||a.nodeType||_.isWindow(a)?!1:a.constructor&&!X.call(a.constructor.prototype,"isPrototypeOf")?!1:!0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?V[W.call(a)]||"object":typeof a},globalEval:function(a){var b,c=eval;a=_.trim(a),a&&(1===a.indexOf("use strict")?(b=Z.createElement("script"),b.text=a,Z.head.appendChild(b).parentNode.removeChild(b)):c(a))},camelCase:function(a){return a.replace(bb,"ms-").replace(cb,db)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,d){var e,f=0,g=a.length,h=c(a);if(d){if(h)for(;g>f&&(e=b.apply(a[f],d),e!==!1);f++);else for(f in a)if(e=b.apply(a[f],d),e===!1)break}else if(h)for(;g>f&&(e=b.call(a[f],f,a[f]),e!==!1);f++);else for(f in a)if(e=b.call(a[f],f,a[f]),e===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(ab,"")},makeArray:function(a,b){var d=b||[];return null!=a&&(c(Object(a))?_.merge(d,"string"==typeof a?[a]:a):T.call(d,a)),d},inArray:function(a,b,c){return null==b?-1:U.call(b,a,c)},merge:function(a,b){for(var c=+b.length,d=0,e=a.length;c>d;d++)a[e++]=b[d];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,d){var e,f=0,g=a.length,h=c(a),i=[];if(h)for(;g>f;f++)e=b(a[f],f,d),null!=e&&i.push(e);else for(f in a)e=b(a[f],f,d),null!=e&&i.push(e);return S.apply([],i)},guid:1,proxy:function(a,b){var c,d,e;return"string"==typeof b&&(c=a[b],b=a,a=c),_.isFunction(a)?(d=R.call(arguments,2),e=function(){return a.apply(b||this,d.concat(R.call(arguments)))},e.guid=a.guid=a.guid||_.guid++,e):void 0},now:Date.now,support:Y}),_.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){V["[object "+b+"]"]=b.toLowerCase()});var eb=/*!
- * Sizzle CSS Selector Engine v1.10.19
- * http://sizzlejs.com/
- *
- * Copyright 2013 jQuery Foundation, Inc. and other contributors
- * Released under the MIT license
- * http://jquery.org/license
- *
- * Date: 2014-04-18
- */
-function(a){function b(a,b,c,d){var e,f,g,h,i,j,l,n,o,p;if((b?b.ownerDocument||b:O)!==G&&F(b),b=b||G,c=c||[],!a||"string"!=typeof a)return c;if(1!==(h=b.nodeType)&&9!==h)return[];if(I&&!d){if(e=sb.exec(a))if(g=e[1]){if(9===h){if(f=b.getElementById(g),!f||!f.parentNode)return c;if(f.id===g)return c.push(f),c}else if(b.ownerDocument&&(f=b.ownerDocument.getElementById(g))&&M(b,f)&&f.id===g)return c.push(f),c}else{if(e[2])return _.apply(c,b.getElementsByTagName(a)),c;if((g=e[3])&&v.getElementsByClassName&&b.getElementsByClassName)return _.apply(c,b.getElementsByClassName(g)),c}if(v.qsa&&(!J||!J.test(a))){if(n=l=N,o=b,p=9===h&&a,1===h&&"object"!==b.nodeName.toLowerCase()){for(j=z(a),(l=b.getAttribute("id"))?n=l.replace(ub,"\\$&"):b.setAttribute("id",n),n="[id='"+n+"'] ",i=j.length;i--;)j[i]=n+m(j[i]);o=tb.test(a)&&k(b.parentNode)||b,p=j.join(",")}if(p)try{return _.apply(c,o.querySelectorAll(p)),c}catch(q){}finally{l||b.removeAttribute("id")}}}return B(a.replace(ib,"$1"),b,c,d)}function c(){function a(c,d){return b.push(c+" ")>w.cacheLength&&delete a[b.shift()],a[c+" "]=d}var b=[];return a}function d(a){return a[N]=!0,a}function e(a){var b=G.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function f(a,b){for(var c=a.split("|"),d=a.length;d--;)w.attrHandle[c[d]]=b}function g(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||W)-(~a.sourceIndex||W);if(d)return d;if(c)for(;c=c.nextSibling;)if(c===b)return-1;return a?1:-1}function h(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function i(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function j(a){return d(function(b){return b=+b,d(function(c,d){for(var e,f=a([],c.length,b),g=f.length;g--;)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function k(a){return a&&typeof a.getElementsByTagName!==V&&a}function l(){}function m(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function n(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=Q++;return b.first?function(b,c,f){for(;b=b[d];)if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[P,f];if(g){for(;b=b[d];)if((1===b.nodeType||e)&&a(b,c,g))return!0}else for(;b=b[d];)if(1===b.nodeType||e){if(i=b[N]||(b[N]={}),(h=i[d])&&h[0]===P&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function o(a){return a.length>1?function(b,c,d){for(var e=a.length;e--;)if(!a[e](b,c,d))return!1;return!0}:a[0]}function p(a,c,d){for(var e=0,f=c.length;f>e;e++)b(a,c[e],d);return d}function q(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function r(a,b,c,e,f,g){return e&&!e[N]&&(e=r(e)),f&&!f[N]&&(f=r(f,g)),d(function(d,g,h,i){var j,k,l,m=[],n=[],o=g.length,r=d||p(b||"*",h.nodeType?[h]:h,[]),s=!a||!d&&b?r:q(r,m,a,h,i),t=c?f||(d?a:o||e)?[]:g:s;if(c&&c(s,t,h,i),e)for(j=q(t,n),e(j,[],h,i),k=j.length;k--;)(l=j[k])&&(t[n[k]]=!(s[n[k]]=l));if(d){if(f||a){if(f){for(j=[],k=t.length;k--;)(l=t[k])&&j.push(s[k]=l);f(null,t=[],j,i)}for(k=t.length;k--;)(l=t[k])&&(j=f?bb.call(d,l):m[k])>-1&&(d[j]=!(g[j]=l))}}else t=q(t===g?t.splice(o,t.length):t),f?f(null,g,t,i):_.apply(g,t)})}function s(a){for(var b,c,d,e=a.length,f=w.relative[a[0].type],g=f||w.relative[" "],h=f?1:0,i=n(function(a){return a===b},g,!0),j=n(function(a){return bb.call(b,a)>-1},g,!0),k=[function(a,c,d){return!f&&(d||c!==C)||((b=c).nodeType?i(a,c,d):j(a,c,d))}];e>h;h++)if(c=w.relative[a[h].type])k=[n(o(k),c)];else{if(c=w.filter[a[h].type].apply(null,a[h].matches),c[N]){for(d=++h;e>d&&!w.relative[a[d].type];d++);return r(h>1&&o(k),h>1&&m(a.slice(0,h-1).concat({value:" "===a[h-2].type?"*":""})).replace(ib,"$1"),c,d>h&&s(a.slice(h,d)),e>d&&s(a=a.slice(d)),e>d&&m(a))}k.push(c)}return o(k)}function t(a,c){var e=c.length>0,f=a.length>0,g=function(d,g,h,i,j){var k,l,m,n=0,o="0",p=d&&[],r=[],s=C,t=d||f&&w.find.TAG("*",j),u=P+=null==s?1:Math.random()||.1,v=t.length;for(j&&(C=g!==G&&g);o!==v&&null!=(k=t[o]);o++){if(f&&k){for(l=0;m=a[l++];)if(m(k,g,h)){i.push(k);break}j&&(P=u)}e&&((k=!m&&k)&&n--,d&&p.push(k))}if(n+=o,e&&o!==n){for(l=0;m=c[l++];)m(p,r,g,h);if(d){if(n>0)for(;o--;)p[o]||r[o]||(r[o]=Z.call(i));r=q(r)}_.apply(i,r),j&&!d&&r.length>0&&n+c.length>1&&b.uniqueSort(i)}return j&&(P=u,C=s),p};return e?d(g):g}var u,v,w,x,y,z,A,B,C,D,E,F,G,H,I,J,K,L,M,N="sizzle"+-new Date,O=a.document,P=0,Q=0,R=c(),S=c(),T=c(),U=function(a,b){return a===b&&(E=!0),0},V="undefined",W=1<<31,X={}.hasOwnProperty,Y=[],Z=Y.pop,$=Y.push,_=Y.push,ab=Y.slice,bb=Y.indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1},cb="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",db="[\\x20\\t\\r\\n\\f]",eb="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",fb=eb.replace("w","w#"),gb="\\["+db+"*("+eb+")(?:"+db+"*([*^$|!~]?=)"+db+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+fb+"))|)"+db+"*\\]",hb=":("+eb+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+gb+")*)|.*)\\)|)",ib=new RegExp("^"+db+"+|((?:^|[^\\\\])(?:\\\\.)*)"+db+"+$","g"),jb=new RegExp("^"+db+"*,"+db+"*"),kb=new RegExp("^"+db+"*([>+~]|"+db+")"+db+"*"),lb=new RegExp("="+db+"*([^\\]'\"]*?)"+db+"*\\]","g"),mb=new RegExp(hb),nb=new RegExp("^"+fb+"$"),ob={ID:new RegExp("^#("+eb+")"),CLASS:new RegExp("^\\.("+eb+")"),TAG:new RegExp("^("+eb.replace("w","w*")+")"),ATTR:new RegExp("^"+gb),PSEUDO:new RegExp("^"+hb),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+db+"*(even|odd|(([+-]|)(\\d*)n|)"+db+"*(?:([+-]|)"+db+"*(\\d+)|))"+db+"*\\)|)","i"),bool:new RegExp("^(?:"+cb+")$","i"),needsContext:new RegExp("^"+db+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+db+"*((?:-\\d)?\\d*)"+db+"*\\)|)(?=[^-]|$)","i")},pb=/^(?:input|select|textarea|button)$/i,qb=/^h\d$/i,rb=/^[^{]+\{\s*\[native \w/,sb=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,tb=/[+~]/,ub=/'|\\/g,vb=new RegExp("\\\\([\\da-f]{1,6}"+db+"?|("+db+")|.)","ig"),wb=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)};try{_.apply(Y=ab.call(O.childNodes),O.childNodes),Y[O.childNodes.length].nodeType}catch(xb){_={apply:Y.length?function(a,b){$.apply(a,ab.call(b))}:function(a,b){for(var c=a.length,d=0;a[c++]=b[d++];);a.length=c-1}}}v=b.support={},y=b.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},F=b.setDocument=function(a){var b,c=a?a.ownerDocument||a:O,d=c.defaultView;return c!==G&&9===c.nodeType&&c.documentElement?(G=c,H=c.documentElement,I=!y(c),d&&d!==d.top&&(d.addEventListener?d.addEventListener("unload",function(){F()},!1):d.attachEvent&&d.attachEvent("onunload",function(){F()})),v.attributes=e(function(a){return a.className="i",!a.getAttribute("className")}),v.getElementsByTagName=e(function(a){return a.appendChild(c.createComment("")),!a.getElementsByTagName("*").length}),v.getElementsByClassName=rb.test(c.getElementsByClassName)&&e(function(a){return a.innerHTML="<div class='a'></div><div class='a i'></div>",a.firstChild.className="i",2===a.getElementsByClassName("i").length}),v.getById=e(function(a){return H.appendChild(a).id=N,!c.getElementsByName||!c.getElementsByName(N).length}),v.getById?(w.find.ID=function(a,b){if(typeof b.getElementById!==V&&I){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},w.filter.ID=function(a){var b=a.replace(vb,wb);return function(a){return a.getAttribute("id")===b}}):(delete w.find.ID,w.filter.ID=function(a){var b=a.replace(vb,wb);return function(a){var c=typeof a.getAttributeNode!==V&&a.getAttributeNode("id");return c&&c.value===b}}),w.find.TAG=v.getElementsByTagName?function(a,b){return typeof b.getElementsByTagName!==V?b.getElementsByTagName(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){for(;c=f[e++];)1===c.nodeType&&d.push(c);return d}return f},w.find.CLASS=v.getElementsByClassName&&function(a,b){return typeof b.getElementsByClassName!==V&&I?b.getElementsByClassName(a):void 0},K=[],J=[],(v.qsa=rb.test(c.querySelectorAll))&&(e(function(a){a.innerHTML="<select msallowclip=''><option selected=''></option></select>",a.querySelectorAll("[msallowclip^='']").length&&J.push("[*^$]="+db+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||J.push("\\["+db+"*(?:value|"+cb+")"),a.querySelectorAll(":checked").length||J.push(":checked")}),e(function(a){var b=c.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&J.push("name"+db+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||J.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),J.push(",.*:")})),(v.matchesSelector=rb.test(L=H.matches||H.webkitMatchesSelector||H.mozMatchesSelector||H.oMatchesSelector||H.msMatchesSelector))&&e(function(a){v.disconnectedMatch=L.call(a,"div"),L.call(a,"[s!='']:x"),K.push("!=",hb)}),J=J.length&&new RegExp(J.join("|")),K=K.length&&new RegExp(K.join("|")),b=rb.test(H.compareDocumentPosition),M=b||rb.test(H.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)for(;b=b.parentNode;)if(b===a)return!0;return!1},U=b?function(a,b){if(a===b)return E=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!v.sortDetached&&b.compareDocumentPosition(a)===d?a===c||a.ownerDocument===O&&M(O,a)?-1:b===c||b.ownerDocument===O&&M(O,b)?1:D?bb.call(D,a)-bb.call(D,b):0:4&d?-1:1)}:function(a,b){if(a===b)return E=!0,0;var d,e=0,f=a.parentNode,h=b.parentNode,i=[a],j=[b];if(!f||!h)return a===c?-1:b===c?1:f?-1:h?1:D?bb.call(D,a)-bb.call(D,b):0;if(f===h)return g(a,b);for(d=a;d=d.parentNode;)i.unshift(d);for(d=b;d=d.parentNode;)j.unshift(d);for(;i[e]===j[e];)e++;return e?g(i[e],j[e]):i[e]===O?-1:j[e]===O?1:0},c):G},b.matches=function(a,c){return b(a,null,null,c)},b.matchesSelector=function(a,c){if((a.ownerDocument||a)!==G&&F(a),c=c.replace(lb,"='$1']"),!(!v.matchesSelector||!I||K&&K.test(c)||J&&J.test(c)))try{var d=L.call(a,c);if(d||v.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return b(c,G,null,[a]).length>0},b.contains=function(a,b){return(a.ownerDocument||a)!==G&&F(a),M(a,b)},b.attr=function(a,b){(a.ownerDocument||a)!==G&&F(a);var c=w.attrHandle[b.toLowerCase()],d=c&&X.call(w.attrHandle,b.toLowerCase())?c(a,b,!I):void 0;return void 0!==d?d:v.attributes||!I?a.getAttribute(b):(d=a.getAttributeNode(b))&&d.specified?d.value:null},b.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},b.uniqueSort=function(a){var b,c=[],d=0,e=0;if(E=!v.detectDuplicates,D=!v.sortStable&&a.slice(0),a.sort(U),E){for(;b=a[e++];)b===a[e]&&(d=c.push(e));for(;d--;)a.splice(c[d],1)}return D=null,a},x=b.getText=function(a){var b,c="",d=0,e=a.nodeType;if(e){if(1===e||9===e||11===e){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=x(a)}else if(3===e||4===e)return a.nodeValue}else for(;b=a[d++];)c+=x(b);return c},w=b.selectors={cacheLength:50,createPseudo:d,match:ob,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(vb,wb),a[3]=(a[3]||a[4]||a[5]||"").replace(vb,wb),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||b.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&b.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return ob.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&mb.test(c)&&(b=z(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(vb,wb).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=R[a+" "];return b||(b=new RegExp("(^|"+db+")"+a+"("+db+"|$)"))&&R(a,function(a){return b.test("string"==typeof a.className&&a.className||typeof a.getAttribute!==V&&a.getAttribute("class")||"")})},ATTR:function(a,c,d){return function(e){var f=b.attr(e,a);return null==f?"!="===c:c?(f+="","="===c?f===d:"!="===c?f!==d:"^="===c?d&&0===f.indexOf(d):"*="===c?d&&f.indexOf(d)>-1:"$="===c?d&&f.slice(-d.length)===d:"~="===c?(" "+f+" ").indexOf(d)>-1:"|="===c?f===d||f.slice(0,d.length+1)===d+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){for(;p;){for(l=b;l=l[p];)if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){for(k=q[N]||(q[N]={}),j=k[a]||[],n=j[0]===P&&j[1],m=j[0]===P&&j[2],l=n&&q.childNodes[n];l=++n&&l&&l[p]||(m=n=0)||o.pop();)if(1===l.nodeType&&++m&&l===b){k[a]=[P,n,m];break}}else if(s&&(j=(b[N]||(b[N]={}))[a])&&j[0]===P)m=j[1];else for(;(l=++n&&l&&l[p]||(m=n=0)||o.pop())&&((h?l.nodeName.toLowerCase()!==r:1!==l.nodeType)||!++m||(s&&((l[N]||(l[N]={}))[a]=[P,m]),l!==b)););return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,c){var e,f=w.pseudos[a]||w.setFilters[a.toLowerCase()]||b.error("unsupported pseudo: "+a);return f[N]?f(c):f.length>1?(e=[a,a,"",c],w.setFilters.hasOwnProperty(a.toLowerCase())?d(function(a,b){for(var d,e=f(a,c),g=e.length;g--;)d=bb.call(a,e[g]),a[d]=!(b[d]=e[g])}):function(a){return f(a,0,e)}):f}},pseudos:{not:d(function(a){var b=[],c=[],e=A(a.replace(ib,"$1"));return e[N]?d(function(a,b,c,d){for(var f,g=e(a,null,d,[]),h=a.length;h--;)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,d,f){return b[0]=a,e(b,null,f,c),!c.pop()}}),has:d(function(a){return function(c){return b(a,c).length>0}}),contains:d(function(a){return function(b){return(b.textContent||b.innerText||x(b)).indexOf(a)>-1}}),lang:d(function(a){return nb.test(a||"")||b.error("unsupported lang: "+a),a=a.replace(vb,wb).toLowerCase(),function(b){var c;do if(c=I?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===H},focus:function(a){return a===G.activeElement&&(!G.hasFocus||G.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!w.pseudos.empty(a)},header:function(a){return qb.test(a.nodeName)},input:function(a){return pb.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:j(function(){return[0]}),last:j(function(a,b){return[b-1]}),eq:j(function(a,b,c){return[0>c?c+b:c]}),even:j(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:j(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:j(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:j(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},w.pseudos.nth=w.pseudos.eq;for(u in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})w.pseudos[u]=h(u);for(u in{submit:!0,reset:!0})w.pseudos[u]=i(u);return l.prototype=w.filters=w.pseudos,w.setFilters=new l,z=b.tokenize=function(a,c){var d,e,f,g,h,i,j,k=S[a+" "];if(k)return c?0:k.slice(0);for(h=a,i=[],j=w.preFilter;h;){(!d||(e=jb.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),d=!1,(e=kb.exec(h))&&(d=e.shift(),f.push({value:d,type:e[0].replace(ib," ")}),h=h.slice(d.length));for(g in w.filter)!(e=ob[g].exec(h))||j[g]&&!(e=j[g](e))||(d=e.shift(),f.push({value:d,type:g,matches:e}),h=h.slice(d.length));if(!d)break}return c?h.length:h?b.error(a):S(a,i).slice(0)},A=b.compile=function(a,b){var c,d=[],e=[],f=T[a+" "];if(!f){for(b||(b=z(a)),c=b.length;c--;)f=s(b[c]),f[N]?d.push(f):e.push(f);f=T(a,t(e,d)),f.selector=a}return f},B=b.select=function(a,b,c,d){var e,f,g,h,i,j="function"==typeof a&&a,l=!d&&z(a=j.selector||a);if(c=c||[],1===l.length){if(f=l[0]=l[0].slice(0),f.length>2&&"ID"===(g=f[0]).type&&v.getById&&9===b.nodeType&&I&&w.relative[f[1].type]){if(b=(w.find.ID(g.matches[0].replace(vb,wb),b)||[])[0],!b)return c;j&&(b=b.parentNode),a=a.slice(f.shift().value.length)}for(e=ob.needsContext.test(a)?0:f.length;e--&&(g=f[e],!w.relative[h=g.type]);)if((i=w.find[h])&&(d=i(g.matches[0].replace(vb,wb),tb.test(f[0].type)&&k(b.parentNode)||b))){if(f.splice(e,1),a=d.length&&m(f),!a)return _.apply(c,d),c;break}}return(j||A(a,l))(d,b,!I,c,tb.test(a)&&k(b.parentNode)||b),c},v.sortStable=N.split("").sort(U).join("")===N,v.detectDuplicates=!!E,F(),v.sortDetached=e(function(a){return 1&a.compareDocumentPosition(G.createElement("div"))}),e(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||f("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),v.attributes&&e(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||f("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),e(function(a){return null==a.getAttribute("disabled")})||f(cb,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),b}(a);_.find=eb,_.expr=eb.selectors,_.expr[":"]=_.expr.pseudos,_.unique=eb.uniqueSort,_.text=eb.getText,_.isXMLDoc=eb.isXML,_.contains=eb.contains;var fb=_.expr.match.needsContext,gb=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,hb=/^.[^:#\[\.,]*$/;_.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?_.find.matchesSelector(d,a)?[d]:[]:_.find.matches(a,_.grep(b,function(a){return 1===a.nodeType}))},_.fn.extend({find:function(a){var b,c=this.length,d=[],e=this;if("string"!=typeof a)return this.pushStack(_(a).filter(function(){for(b=0;c>b;b++)if(_.contains(e[b],this))return!0}));for(b=0;c>b;b++)_.find(a,e[b],d);return d=this.pushStack(c>1?_.unique(d):d),d.selector=this.selector?this.selector+" "+a:a,d},filter:function(a){return this.pushStack(d(this,a||[],!1))},not:function(a){return this.pushStack(d(this,a||[],!0))},is:function(a){return!!d(this,"string"==typeof a&&fb.test(a)?_(a):a||[],!1).length}});var ib,jb=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,kb=_.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:jb.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||ib).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof _?b[0]:b,_.merge(this,_.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:Z,!0)),gb.test(c[1])&&_.isPlainObject(b))for(c in b)_.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}return d=Z.getElementById(c[2]),d&&d.parentNode&&(this.length=1,this[0]=d),this.context=Z,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):_.isFunction(a)?"undefined"!=typeof ib.ready?ib.ready(a):a(_):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),_.makeArray(a,this))};kb.prototype=_.fn,ib=_(Z);var lb=/^(?:parents|prev(?:Until|All))/,mb={children:!0,contents:!0,next:!0,prev:!0};_.extend({dir:function(a,b,c){for(var d=[],e=void 0!==c;(a=a[b])&&9!==a.nodeType;)if(1===a.nodeType){if(e&&_(a).is(c))break;d.push(a)}return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),_.fn.extend({has:function(a){var b=_(a,this),c=b.length;return this.filter(function(){for(var a=0;c>a;a++)if(_.contains(this,b[a]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=fb.test(a)||"string"!=typeof a?_(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&_.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?_.unique(f):f)},index:function(a){return a?"string"==typeof a?U.call(_(a),this[0]):U.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(_.unique(_.merge(this.get(),_(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}}),_.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return _.dir(a,"parentNode")},parentsUntil:function(a,b,c){return _.dir(a,"parentNode",c)},next:function(a){return e(a,"nextSibling")},prev:function(a){return e(a,"previousSibling")},nextAll:function(a){return _.dir(a,"nextSibling")},prevAll:function(a){return _.dir(a,"previousSibling")},nextUntil:function(a,b,c){return _.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return _.dir(a,"previousSibling",c)},siblings:function(a){return _.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return _.sibling(a.firstChild)},contents:function(a){return a.contentDocument||_.merge([],a.childNodes)}},function(a,b){_.fn[a]=function(c,d){var e=_.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=_.filter(d,e)),this.length>1&&(mb[a]||_.unique(e),lb.test(a)&&e.reverse()),this.pushStack(e)}});var nb=/\S+/g,ob={};_.Callbacks=function(a){a="string"==typeof a?ob[a]||f(a):_.extend({},a);var b,c,d,e,g,h,i=[],j=!a.once&&[],k=function(f){for(b=a.memory&&f,c=!0,h=e||0,e=0,g=i.length,d=!0;i&&g>h;h++)if(i[h].apply(f[0],f[1])===!1&&a.stopOnFalse){b=!1;break}d=!1,i&&(j?j.length&&k(j.shift()):b?i=[]:l.disable())},l={add:function(){if(i){var c=i.length;!function f(b){_.each(b,function(b,c){var d=_.type(c);"function"===d?a.unique&&l.has(c)||i.push(c):c&&c.length&&"string"!==d&&f(c)})}(arguments),d?g=i.length:b&&(e=c,k(b))}return this},remove:function(){return i&&_.each(arguments,function(a,b){for(var c;(c=_.inArray(b,i,c))>-1;)i.splice(c,1),d&&(g>=c&&g--,h>=c&&h--)}),this},has:function(a){return a?_.inArray(a,i)>-1:!(!i||!i.length)},empty:function(){return i=[],g=0,this},disable:function(){return i=j=b=void 0,this},disabled:function(){return!i},lock:function(){return j=void 0,b||l.disable(),this},locked:function(){return!j},fireWith:function(a,b){return!i||c&&!j||(b=b||[],b=[a,b.slice?b.slice():b],d?j.push(b):k(b)),this},fire:function(){return l.fireWith(this,arguments),this},fired:function(){return!!c}};return l},_.extend({Deferred:function(a){var b=[["resolve","done",_.Callbacks("once memory"),"resolved"],["reject","fail",_.Callbacks("once memory"),"rejected"],["notify","progress",_.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return _.Deferred(function(c){_.each(b,function(b,f){var g=_.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&_.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?_.extend(a,d):d}},e={};return d.pipe=d.then,_.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b,c,d,e=0,f=R.call(arguments),g=f.length,h=1!==g||a&&_.isFunction(a.promise)?g:0,i=1===h?a:_.Deferred(),j=function(a,c,d){return function(e){c[a]=this,d[a]=arguments.length>1?R.call(arguments):e,d===b?i.notifyWith(c,d):--h||i.resolveWith(c,d)}};if(g>1)for(b=new Array(g),c=new Array(g),d=new Array(g);g>e;e++)f[e]&&_.isFunction(f[e].promise)?f[e].promise().done(j(e,d,f)).fail(i.reject).progress(j(e,c,b)):--h;return h||i.resolveWith(d,f),i.promise()}});var pb;_.fn.ready=function(a){return _.ready.promise().done(a),this},_.extend({isReady:!1,readyWait:1,holdReady:function(a){a?_.readyWait++:_.ready(!0)},ready:function(a){(a===!0?--_.readyWait:_.isReady)||(_.isReady=!0,a!==!0&&--_.readyWait>0||(pb.resolveWith(Z,[_]),_.fn.triggerHandler&&(_(Z).triggerHandler("ready"),_(Z).off("ready"))))}}),_.ready.promise=function(b){return pb||(pb=_.Deferred(),"complete"===Z.readyState?setTimeout(_.ready):(Z.addEventListener("DOMContentLoaded",g,!1),a.addEventListener("load",g,!1))),pb.promise(b)},_.ready.promise();var qb=_.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===_.type(c)){e=!0;for(h in c)_.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,_.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(_(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f};_.acceptData=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType},h.uid=1,h.accepts=_.acceptData,h.prototype={key:function(a){if(!h.accepts(a))return 0;var b={},c=a[this.expando];if(!c){c=h.uid++;try{b[this.expando]={value:c},Object.defineProperties(a,b)}catch(d){b[this.expando]=c,_.extend(a,b)}}return this.cache[c]||(this.cache[c]={}),c},set:function(a,b,c){var d,e=this.key(a),f=this.cache[e];if("string"==typeof b)f[b]=c;else if(_.isEmptyObject(f))_.extend(this.cache[e],b);else for(d in b)f[d]=b[d];return f},get:function(a,b){var c=this.cache[this.key(a)];return void 0===b?c:c[b]},access:function(a,b,c){var d;return void 0===b||b&&"string"==typeof b&&void 0===c?(d=this.get(a,b),void 0!==d?d:this.get(a,_.camelCase(b))):(this.set(a,b,c),void 0!==c?c:b)},remove:function(a,b){var c,d,e,f=this.key(a),g=this.cache[f];if(void 0===b)this.cache[f]={};else{_.isArray(b)?d=b.concat(b.map(_.camelCase)):(e=_.camelCase(b),b in g?d=[b,e]:(d=e,d=d in g?[d]:d.match(nb)||[])),c=d.length;for(;c--;)delete g[d[c]]}},hasData:function(a){return!_.isEmptyObject(this.cache[a[this.expando]]||{})},discard:function(a){a[this.expando]&&delete this.cache[a[this.expando]]}};var rb=new h,sb=new h,tb=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,ub=/([A-Z])/g;_.extend({hasData:function(a){return sb.hasData(a)||rb.hasData(a)},data:function(a,b,c){return sb.access(a,b,c)},removeData:function(a,b){sb.remove(a,b)},_data:function(a,b,c){return rb.access(a,b,c)},_removeData:function(a,b){rb.remove(a,b)}}),_.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=sb.get(f),1===f.nodeType&&!rb.get(f,"hasDataAttrs"))){for(c=g.length;c--;)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=_.camelCase(d.slice(5)),i(f,d,e[d])));rb.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){sb.set(this,a)}):qb(this,function(b){var c,d=_.camelCase(a);if(f&&void 0===b){if(c=sb.get(f,a),void 0!==c)return c;if(c=sb.get(f,d),void 0!==c)return c;if(c=i(f,d,void 0),void 0!==c)return c}else this.each(function(){var c=sb.get(this,d);sb.set(this,d,b),-1!==a.indexOf("-")&&void 0!==c&&sb.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){sb.remove(this,a)})}}),_.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=rb.get(a,b),c&&(!d||_.isArray(c)?d=rb.access(a,b,_.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=_.queue(a,b),d=c.length,e=c.shift(),f=_._queueHooks(a,b),g=function(){_.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return rb.get(a,c)||rb.access(a,c,{empty:_.Callbacks("once memory").add(function(){rb.remove(a,[b+"queue",c])})})}}),_.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?_.queue(this[0],a):void 0===b?this:this.each(function(){var c=_.queue(this,a,b);_._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&_.dequeue(this,a)})},dequeue:function(a){return this.each(function(){_.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=_.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};for("string"!=typeof a&&(b=a,a=void 0),a=a||"fx";g--;)c=rb.get(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var vb=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,wb=["Top","Right","Bottom","Left"],xb=function(a,b){return a=b||a,"none"===_.css(a,"display")||!_.contains(a.ownerDocument,a)},yb=/^(?:checkbox|radio)$/i;!function(){var a=Z.createDocumentFragment(),b=a.appendChild(Z.createElement("div")),c=Z.createElement("input");c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),b.appendChild(c),Y.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,b.innerHTML="<textarea>x</textarea>",Y.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var zb="undefined";Y.focusinBubbles="onfocusin"in a;var Ab=/^key/,Bb=/^(?:mouse|pointer|contextmenu)|click/,Cb=/^(?:focusinfocus|focusoutblur)$/,Db=/^([^.]*)(?:\.(.+)|)$/;_.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,p,q=rb.get(a);if(q)for(c.handler&&(f=c,c=f.handler,e=f.selector),c.guid||(c.guid=_.guid++),(i=q.events)||(i=q.events={}),(g=q.handle)||(g=q.handle=function(b){return typeof _!==zb&&_.event.triggered!==b.type?_.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(nb)||[""],j=b.length;j--;)h=Db.exec(b[j])||[],n=p=h[1],o=(h[2]||"").split(".").sort(),n&&(l=_.event.special[n]||{},n=(e?l.delegateType:l.bindType)||n,l=_.event.special[n]||{},k=_.extend({type:n,origType:p,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&_.expr.match.needsContext.test(e),namespace:o.join(".")},f),(m=i[n])||(m=i[n]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,o,g)!==!1||a.addEventListener&&a.addEventListener(n,g,!1)),l.add&&(l.add.call(a,k),k.handler.guid||(k.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,k):m.push(k),_.event.global[n]=!0)},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,p,q=rb.hasData(a)&&rb.get(a);if(q&&(i=q.events)){for(b=(b||"").match(nb)||[""],j=b.length;j--;)if(h=Db.exec(b[j])||[],n=p=h[1],o=(h[2]||"").split(".").sort(),n){for(l=_.event.special[n]||{},n=(d?l.delegateType:l.bindType)||n,m=i[n]||[],h=h[2]&&new RegExp("(^|\\.)"+o.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;f--;)k=m[f],!e&&p!==k.origType||c&&c.guid!==k.guid||h&&!h.test(k.namespace)||d&&d!==k.selector&&("**"!==d||!k.selector)||(m.splice(f,1),k.selector&&m.delegateCount--,l.remove&&l.remove.call(a,k));g&&!m.length&&(l.teardown&&l.teardown.call(a,o,q.handle)!==!1||_.removeEvent(a,n,q.handle),delete i[n])}else for(n in i)_.event.remove(a,n+b[j],c,d,!0);_.isEmptyObject(i)&&(delete q.handle,rb.remove(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,j,k,l,m=[d||Z],n=X.call(b,"type")?b.type:b,o=X.call(b,"namespace")?b.namespace.split("."):[];if(g=h=d=d||Z,3!==d.nodeType&&8!==d.nodeType&&!Cb.test(n+_.event.triggered)&&(n.indexOf(".")>=0&&(o=n.split("."),n=o.shift(),o.sort()),j=n.indexOf(":")<0&&"on"+n,b=b[_.expando]?b:new _.Event(n,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=o.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+o.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:_.makeArray(c,[b]),l=_.event.special[n]||{},e||!l.trigger||l.trigger.apply(d,c)!==!1)){if(!e&&!l.noBubble&&!_.isWindow(d)){for(i=l.delegateType||n,Cb.test(i+n)||(g=g.parentNode);g;g=g.parentNode)m.push(g),h=g;
-h===(d.ownerDocument||Z)&&m.push(h.defaultView||h.parentWindow||a)}for(f=0;(g=m[f++])&&!b.isPropagationStopped();)b.type=f>1?i:l.bindType||n,k=(rb.get(g,"events")||{})[b.type]&&rb.get(g,"handle"),k&&k.apply(g,c),k=j&&g[j],k&&k.apply&&_.acceptData(g)&&(b.result=k.apply(g,c),b.result===!1&&b.preventDefault());return b.type=n,e||b.isDefaultPrevented()||l._default&&l._default.apply(m.pop(),c)!==!1||!_.acceptData(d)||j&&_.isFunction(d[n])&&!_.isWindow(d)&&(h=d[j],h&&(d[j]=null),_.event.triggered=n,d[n](),_.event.triggered=void 0,h&&(d[j]=h)),b.result}},dispatch:function(a){a=_.event.fix(a);var b,c,d,e,f,g=[],h=R.call(arguments),i=(rb.get(this,"events")||{})[a.type]||[],j=_.event.special[a.type]||{};if(h[0]=a,a.delegateTarget=this,!j.preDispatch||j.preDispatch.call(this,a)!==!1){for(g=_.event.handlers.call(this,a,i),b=0;(e=g[b++])&&!a.isPropagationStopped();)for(a.currentTarget=e.elem,c=0;(f=e.handlers[c++])&&!a.isImmediatePropagationStopped();)(!a.namespace_re||a.namespace_re.test(f.namespace))&&(a.handleObj=f,a.data=f.data,d=((_.event.special[f.origType]||{}).handle||f.handler).apply(e.elem,h),void 0!==d&&(a.result=d)===!1&&(a.preventDefault(),a.stopPropagation()));return j.postDispatch&&j.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!==this;i=i.parentNode||this)if(i.disabled!==!0||"click"!==a.type){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?_(e,this).index(i)>=0:_.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,d,e,f=b.button;return null==a.pageX&&null!=b.clientX&&(c=a.target.ownerDocument||Z,d=c.documentElement,e=c.body,a.pageX=b.clientX+(d&&d.scrollLeft||e&&e.scrollLeft||0)-(d&&d.clientLeft||e&&e.clientLeft||0),a.pageY=b.clientY+(d&&d.scrollTop||e&&e.scrollTop||0)-(d&&d.clientTop||e&&e.clientTop||0)),a.which||void 0===f||(a.which=1&f?1:2&f?3:4&f?2:0),a}},fix:function(a){if(a[_.expando])return a;var b,c,d,e=a.type,f=a,g=this.fixHooks[e];for(g||(this.fixHooks[e]=g=Bb.test(e)?this.mouseHooks:Ab.test(e)?this.keyHooks:{}),d=g.props?this.props.concat(g.props):this.props,a=new _.Event(f),b=d.length;b--;)c=d[b],a[c]=f[c];return a.target||(a.target=Z),3===a.target.nodeType&&(a.target=a.target.parentNode),g.filter?g.filter(a,f):a},special:{load:{noBubble:!0},focus:{trigger:function(){return this!==l()&&this.focus?(this.focus(),!1):void 0},delegateType:"focusin"},blur:{trigger:function(){return this===l()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return"checkbox"===this.type&&this.click&&_.nodeName(this,"input")?(this.click(),!1):void 0},_default:function(a){return _.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c,d){var e=_.extend(new _.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?_.event.trigger(e,null,b):_.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},_.removeEvent=function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)},_.Event=function(a,b){return this instanceof _.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?j:k):this.type=a,b&&_.extend(this,b),this.timeStamp=a&&a.timeStamp||_.now(),void(this[_.expando]=!0)):new _.Event(a,b)},_.Event.prototype={isDefaultPrevented:k,isPropagationStopped:k,isImmediatePropagationStopped:k,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=j,a&&a.preventDefault&&a.preventDefault()},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=j,a&&a.stopPropagation&&a.stopPropagation()},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=j,a&&a.stopImmediatePropagation&&a.stopImmediatePropagation(),this.stopPropagation()}},_.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){_.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return(!e||e!==d&&!_.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),Y.focusinBubbles||_.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){_.event.simulate(b,a.target,_.event.fix(a),!0)};_.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=rb.access(d,b);e||d.addEventListener(a,c,!0),rb.access(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=rb.access(d,b)-1;e?rb.access(d,b,e):(d.removeEventListener(a,c,!0),rb.remove(d,b))}}}),_.fn.extend({on:function(a,b,c,d,e){var f,g;if("object"==typeof a){"string"!=typeof b&&(c=c||b,b=void 0);for(g in a)this.on(g,b,c,a[g],e);return this}if(null==c&&null==d?(d=b,c=b=void 0):null==d&&("string"==typeof b?(d=c,c=void 0):(d=c,c=b,b=void 0)),d===!1)d=k;else if(!d)return this;return 1===e&&(f=d,d=function(a){return _().off(a),f.apply(this,arguments)},d.guid=f.guid||(f.guid=_.guid++)),this.each(function(){_.event.add(this,a,d,c,b)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,_(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return(b===!1||"function"==typeof b)&&(c=b,b=void 0),c===!1&&(c=k),this.each(function(){_.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){_.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?_.event.trigger(a,b,c,!0):void 0}});var Eb=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,Fb=/<([\w:]+)/,Gb=/<|&#?\w+;/,Hb=/<(?:script|style|link)/i,Ib=/checked\s*(?:[^=]|=\s*.checked.)/i,Jb=/^$|\/(?:java|ecma)script/i,Kb=/^true\/(.*)/,Lb=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,Mb={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};Mb.optgroup=Mb.option,Mb.tbody=Mb.tfoot=Mb.colgroup=Mb.caption=Mb.thead,Mb.th=Mb.td,_.extend({clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=_.contains(a.ownerDocument,a);if(!(Y.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||_.isXMLDoc(a)))for(g=r(h),f=r(a),d=0,e=f.length;e>d;d++)s(f[d],g[d]);if(b)if(c)for(f=f||r(a),g=g||r(h),d=0,e=f.length;e>d;d++)q(f[d],g[d]);else q(a,h);return g=r(h,"script"),g.length>0&&p(g,!i&&r(a,"script")),h},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,k=b.createDocumentFragment(),l=[],m=0,n=a.length;n>m;m++)if(e=a[m],e||0===e)if("object"===_.type(e))_.merge(l,e.nodeType?[e]:e);else if(Gb.test(e)){for(f=f||k.appendChild(b.createElement("div")),g=(Fb.exec(e)||["",""])[1].toLowerCase(),h=Mb[g]||Mb._default,f.innerHTML=h[1]+e.replace(Eb,"<$1></$2>")+h[2],j=h[0];j--;)f=f.lastChild;_.merge(l,f.childNodes),f=k.firstChild,f.textContent=""}else l.push(b.createTextNode(e));for(k.textContent="",m=0;e=l[m++];)if((!d||-1===_.inArray(e,d))&&(i=_.contains(e.ownerDocument,e),f=r(k.appendChild(e),"script"),i&&p(f),c))for(j=0;e=f[j++];)Jb.test(e.type||"")&&c.push(e);return k},cleanData:function(a){for(var b,c,d,e,f=_.event.special,g=0;void 0!==(c=a[g]);g++){if(_.acceptData(c)&&(e=c[rb.expando],e&&(b=rb.cache[e]))){if(b.events)for(d in b.events)f[d]?_.event.remove(c,d):_.removeEvent(c,d,b.handle);rb.cache[e]&&delete rb.cache[e]}delete sb.cache[c[sb.expando]]}}}),_.fn.extend({text:function(a){return qb(this,function(a){return void 0===a?_.text(this):this.empty().each(function(){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&(this.textContent=a)})},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=m(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=m(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?_.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||_.cleanData(r(c)),c.parentNode&&(b&&_.contains(c.ownerDocument,c)&&p(r(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(_.cleanData(r(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return _.clone(this,a,b)})},html:function(a){return qb(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a&&1===b.nodeType)return b.innerHTML;if("string"==typeof a&&!Hb.test(a)&&!Mb[(Fb.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Eb,"<$1></$2>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(_.cleanData(r(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,_.cleanData(r(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=S.apply([],a);var c,d,e,f,g,h,i=0,j=this.length,k=this,l=j-1,m=a[0],p=_.isFunction(m);if(p||j>1&&"string"==typeof m&&!Y.checkClone&&Ib.test(m))return this.each(function(c){var d=k.eq(c);p&&(a[0]=m.call(this,c,d.html())),d.domManip(a,b)});if(j&&(c=_.buildFragment(a,this[0].ownerDocument,!1,this),d=c.firstChild,1===c.childNodes.length&&(c=d),d)){for(e=_.map(r(c,"script"),n),f=e.length;j>i;i++)g=c,i!==l&&(g=_.clone(g,!0,!0),f&&_.merge(e,r(g,"script"))),b.call(this[i],g,i);if(f)for(h=e[e.length-1].ownerDocument,_.map(e,o),i=0;f>i;i++)g=e[i],Jb.test(g.type||"")&&!rb.access(g,"globalEval")&&_.contains(h,g)&&(g.src?_._evalUrl&&_._evalUrl(g.src):_.globalEval(g.textContent.replace(Lb,"")))}return this}}),_.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){_.fn[a]=function(a){for(var c,d=[],e=_(a),f=e.length-1,g=0;f>=g;g++)c=g===f?this:this.clone(!0),_(e[g])[b](c),T.apply(d,c.get());return this.pushStack(d)}});var Nb,Ob={},Pb=/^margin/,Qb=new RegExp("^("+vb+")(?!px)[a-z%]+$","i"),Rb=function(a){return a.ownerDocument.defaultView.getComputedStyle(a,null)};!function(){function b(){g.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;display:block;margin-top:1%;top:1%;border:1px;padding:1px;width:4px;position:absolute",g.innerHTML="",e.appendChild(f);var b=a.getComputedStyle(g,null);c="1%"!==b.top,d="4px"===b.width,e.removeChild(f)}var c,d,e=Z.documentElement,f=Z.createElement("div"),g=Z.createElement("div");g.style&&(g.style.backgroundClip="content-box",g.cloneNode(!0).style.backgroundClip="",Y.clearCloneStyle="content-box"===g.style.backgroundClip,f.style.cssText="border:0;width:0;height:0;top:0;left:-9999px;margin-top:1px;position:absolute",f.appendChild(g),a.getComputedStyle&&_.extend(Y,{pixelPosition:function(){return b(),c},boxSizingReliable:function(){return null==d&&b(),d},reliableMarginRight:function(){var b,c=g.appendChild(Z.createElement("div"));return c.style.cssText=g.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",c.style.marginRight=c.style.width="0",g.style.width="1px",e.appendChild(f),b=!parseFloat(a.getComputedStyle(c,null).marginRight),e.removeChild(f),b}}))}(),_.swap=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};var Sb=/^(none|table(?!-c[ea]).+)/,Tb=new RegExp("^("+vb+")(.*)$","i"),Ub=new RegExp("^([+-])=("+vb+")","i"),Vb={position:"absolute",visibility:"hidden",display:"block"},Wb={letterSpacing:"0",fontWeight:"400"},Xb=["Webkit","O","Moz","ms"];_.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=v(a,"opacity");return""===c?"1":c}}}},cssNumber:{columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":"cssFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=_.camelCase(b),i=a.style;return b=_.cssProps[h]||(_.cssProps[h]=x(i,h)),g=_.cssHooks[b]||_.cssHooks[h],void 0===c?g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b]:(f=typeof c,"string"===f&&(e=Ub.exec(c))&&(c=(e[1]+1)*e[2]+parseFloat(_.css(a,b)),f="number"),null!=c&&c===c&&("number"!==f||_.cssNumber[h]||(c+="px"),Y.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),g&&"set"in g&&void 0===(c=g.set(a,c,d))||(i[b]=c)),void 0)}},css:function(a,b,c,d){var e,f,g,h=_.camelCase(b);return b=_.cssProps[h]||(_.cssProps[h]=x(a.style,h)),g=_.cssHooks[b]||_.cssHooks[h],g&&"get"in g&&(e=g.get(a,!0,c)),void 0===e&&(e=v(a,b,d)),"normal"===e&&b in Wb&&(e=Wb[b]),""===c||c?(f=parseFloat(e),c===!0||_.isNumeric(f)?f||0:e):e}}),_.each(["height","width"],function(a,b){_.cssHooks[b]={get:function(a,c,d){return c?Sb.test(_.css(a,"display"))&&0===a.offsetWidth?_.swap(a,Vb,function(){return A(a,b,d)}):A(a,b,d):void 0},set:function(a,c,d){var e=d&&Rb(a);return y(a,c,d?z(a,b,d,"border-box"===_.css(a,"boxSizing",!1,e),e):0)}}}),_.cssHooks.marginRight=w(Y.reliableMarginRight,function(a,b){return b?_.swap(a,{display:"inline-block"},v,[a,"marginRight"]):void 0}),_.each({margin:"",padding:"",border:"Width"},function(a,b){_.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+wb[d]+b]=f[d]||f[d-2]||f[0];return e}},Pb.test(a)||(_.cssHooks[a+b].set=y)}),_.fn.extend({css:function(a,b){return qb(this,function(a,b,c){var d,e,f={},g=0;if(_.isArray(b)){for(d=Rb(a),e=b.length;e>g;g++)f[b[g]]=_.css(a,b[g],!1,d);return f}return void 0!==c?_.style(a,b,c):_.css(a,b)},a,b,arguments.length>1)},show:function(){return B(this,!0)},hide:function(){return B(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){xb(this)?_(this).show():_(this).hide()})}}),_.Tween=C,C.prototype={constructor:C,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(_.cssNumber[c]?"":"px")},cur:function(){var a=C.propHooks[this.prop];return a&&a.get?a.get(this):C.propHooks._default.get(this)},run:function(a){var b,c=C.propHooks[this.prop];return this.pos=b=this.options.duration?_.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):C.propHooks._default.set(this),this}},C.prototype.init.prototype=C.prototype,C.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=_.css(a.elem,a.prop,""),b&&"auto"!==b?b:0):a.elem[a.prop]},set:function(a){_.fx.step[a.prop]?_.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[_.cssProps[a.prop]]||_.cssHooks[a.prop])?_.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},C.propHooks.scrollTop=C.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},_.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},_.fx=C.prototype.init,_.fx.step={};var Yb,Zb,$b=/^(?:toggle|show|hide)$/,_b=new RegExp("^(?:([+-])=|)("+vb+")([a-z%]*)$","i"),ac=/queueHooks$/,bc=[G],cc={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=_b.exec(b),f=e&&e[3]||(_.cssNumber[a]?"":"px"),g=(_.cssNumber[a]||"px"!==f&&+d)&&_b.exec(_.css(c.elem,a)),h=1,i=20;if(g&&g[3]!==f){f=f||g[3],e=e||[],g=+d||1;do h=h||".5",g/=h,_.style(c.elem,a,g+f);while(h!==(h=c.cur()/d)&&1!==h&&--i)}return e&&(g=c.start=+g||+d||0,c.unit=f,c.end=e[1]?g+(e[1]+1)*e[2]:+e[2]),c}]};_.Animation=_.extend(I,{tweener:function(a,b){_.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");for(var c,d=0,e=a.length;e>d;d++)c=a[d],cc[c]=cc[c]||[],cc[c].unshift(b)},prefilter:function(a,b){b?bc.unshift(a):bc.push(a)}}),_.speed=function(a,b,c){var d=a&&"object"==typeof a?_.extend({},a):{complete:c||!c&&b||_.isFunction(a)&&a,duration:a,easing:c&&b||b&&!_.isFunction(b)&&b};return d.duration=_.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in _.fx.speeds?_.fx.speeds[d.duration]:_.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){_.isFunction(d.old)&&d.old.call(this),d.queue&&_.dequeue(this,d.queue)},d},_.fn.extend({fadeTo:function(a,b,c,d){return this.filter(xb).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=_.isEmptyObject(a),f=_.speed(b,c,d),g=function(){var b=I(this,_.extend({},a),f);(e||rb.get(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=_.timers,g=rb.get(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&ac.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&_.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=rb.get(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=_.timers,g=d?d.length:0;for(c.finish=!0,_.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),_.each(["toggle","show","hide"],function(a,b){var c=_.fn[b];_.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(E(b,!0),a,d,e)}}),_.each({slideDown:E("show"),slideUp:E("hide"),slideToggle:E("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){_.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),_.timers=[],_.fx.tick=function(){var a,b=0,c=_.timers;for(Yb=_.now();b<c.length;b++)a=c[b],a()||c[b]!==a||c.splice(b--,1);c.length||_.fx.stop(),Yb=void 0},_.fx.timer=function(a){_.timers.push(a),a()?_.fx.start():_.timers.pop()},_.fx.interval=13,_.fx.start=function(){Zb||(Zb=setInterval(_.fx.tick,_.fx.interval))},_.fx.stop=function(){clearInterval(Zb),Zb=null},_.fx.speeds={slow:600,fast:200,_default:400},_.fn.delay=function(a,b){return a=_.fx?_.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},function(){var a=Z.createElement("input"),b=Z.createElement("select"),c=b.appendChild(Z.createElement("option"));a.type="checkbox",Y.checkOn=""!==a.value,Y.optSelected=c.selected,b.disabled=!0,Y.optDisabled=!c.disabled,a=Z.createElement("input"),a.value="t",a.type="radio",Y.radioValue="t"===a.value}();var dc,ec,fc=_.expr.attrHandle;_.fn.extend({attr:function(a,b){return qb(this,_.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){_.removeAttr(this,a)})}}),_.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(a&&3!==f&&8!==f&&2!==f)return typeof a.getAttribute===zb?_.prop(a,b,c):(1===f&&_.isXMLDoc(a)||(b=b.toLowerCase(),d=_.attrHooks[b]||(_.expr.match.bool.test(b)?ec:dc)),void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=_.find.attr(a,b),null==e?void 0:e):null!==c?d&&"set"in d&&void 0!==(e=d.set(a,c,b))?e:(a.setAttribute(b,c+""),c):void _.removeAttr(a,b))},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(nb);if(f&&1===a.nodeType)for(;c=f[e++];)d=_.propFix[c]||c,_.expr.match.bool.test(c)&&(a[d]=!1),a.removeAttribute(c)},attrHooks:{type:{set:function(a,b){if(!Y.radioValue&&"radio"===b&&_.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}}}),ec={set:function(a,b,c){return b===!1?_.removeAttr(a,c):a.setAttribute(c,c),c}},_.each(_.expr.match.bool.source.match(/\w+/g),function(a,b){var c=fc[b]||_.find.attr;fc[b]=function(a,b,d){var e,f;return d||(f=fc[b],fc[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,fc[b]=f),e}});var gc=/^(?:input|select|textarea|button)$/i;_.fn.extend({prop:function(a,b){return qb(this,_.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[_.propFix[a]||a]})}}),_.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(a,b,c){var d,e,f,g=a.nodeType;if(a&&3!==g&&8!==g&&2!==g)return f=1!==g||!_.isXMLDoc(a),f&&(b=_.propFix[b]||b,e=_.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){return a.hasAttribute("tabindex")||gc.test(a.nodeName)||a.href?a.tabIndex:-1}}}}),Y.optSelected||(_.propHooks.selected={get:function(a){var b=a.parentNode;return b&&b.parentNode&&b.parentNode.selectedIndex,null}}),_.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){_.propFix[this.toLowerCase()]=this});var hc=/[\t\r\n\f]/g;_.fn.extend({addClass:function(a){var b,c,d,e,f,g,h="string"==typeof a&&a,i=0,j=this.length;if(_.isFunction(a))return this.each(function(b){_(this).addClass(a.call(this,b,this.className))});if(h)for(b=(a||"").match(nb)||[];j>i;i++)if(c=this[i],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(hc," "):" ")){for(f=0;e=b[f++];)d.indexOf(" "+e+" ")<0&&(d+=e+" ");g=_.trim(d),c.className!==g&&(c.className=g)}return this},removeClass:function(a){var b,c,d,e,f,g,h=0===arguments.length||"string"==typeof a&&a,i=0,j=this.length;if(_.isFunction(a))return this.each(function(b){_(this).removeClass(a.call(this,b,this.className))});if(h)for(b=(a||"").match(nb)||[];j>i;i++)if(c=this[i],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(hc," "):"")){for(f=0;e=b[f++];)for(;d.indexOf(" "+e+" ")>=0;)d=d.replace(" "+e+" "," ");g=a?_.trim(d):"",c.className!==g&&(c.className=g)}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):this.each(_.isFunction(a)?function(c){_(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c)for(var b,d=0,e=_(this),f=a.match(nb)||[];b=f[d++];)e.hasClass(b)?e.removeClass(b):e.addClass(b);else(c===zb||"boolean"===c)&&(this.className&&rb.set(this,"__className__",this.className),this.className=this.className||a===!1?"":rb.get(this,"__className__")||"")})},hasClass:function(a){for(var b=" "+a+" ",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(" "+this[c].className+" ").replace(hc," ").indexOf(b)>=0)return!0;return!1}});var ic=/\r/g;_.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=_.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,_(this).val()):a,null==e?e="":"number"==typeof e?e+="":_.isArray(e)&&(e=_.map(e,function(a){return null==a?"":a+""})),b=_.valHooks[this.type]||_.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=_.valHooks[e.type]||_.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(ic,""):null==c?"":c)}}}),_.extend({valHooks:{option:{get:function(a){var b=_.find.attr(a,"value");return null!=b?b:_.trim(_.text(a))}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||(Y.optDisabled?c.disabled:null!==c.getAttribute("disabled"))||c.parentNode.disabled&&_.nodeName(c.parentNode,"optgroup"))){if(b=_(c).val(),f)return b;g.push(b)}return g},set:function(a,b){for(var c,d,e=a.options,f=_.makeArray(b),g=e.length;g--;)d=e[g],(d.selected=_.inArray(d.value,f)>=0)&&(c=!0);return c||(a.selectedIndex=-1),f}}}}),_.each(["radio","checkbox"],function(){_.valHooks[this]={set:function(a,b){return _.isArray(b)?a.checked=_.inArray(_(a).val(),b)>=0:void 0}},Y.checkOn||(_.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})}),_.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(a,b){_.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),_.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}});var jc=_.now(),kc=/\?/;_.parseJSON=function(a){return JSON.parse(a+"")},_.parseXML=function(a){var b,c;if(!a||"string"!=typeof a)return null;try{c=new DOMParser,b=c.parseFromString(a,"text/xml")}catch(d){b=void 0}return(!b||b.getElementsByTagName("parsererror").length)&&_.error("Invalid XML: "+a),b};var lc,mc,nc=/#.*$/,oc=/([?&])_=[^&]*/,pc=/^(.*?):[ \t]*([^\r\n]*)$/gm,qc=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,rc=/^(?:GET|HEAD)$/,sc=/^\/\//,tc=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,uc={},vc={},wc="*/".concat("*");try{mc=location.href}catch(xc){mc=Z.createElement("a"),mc.href="",mc=mc.href}lc=tc.exec(mc.toLowerCase())||[],_.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:mc,type:"GET",isLocal:qc.test(lc[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":wc,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":_.parseJSON,"text xml":_.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?L(L(a,_.ajaxSettings),b):L(_.ajaxSettings,a)},ajaxPrefilter:J(uc),ajaxTransport:J(vc),ajax:function(a,b){function c(a,b,c,g){var i,k,r,s,u,w=b;2!==t&&(t=2,h&&clearTimeout(h),d=void 0,f=g||"",v.readyState=a>0?4:0,i=a>=200&&300>a||304===a,c&&(s=M(l,v,c)),s=N(l,s,v,i),i?(l.ifModified&&(u=v.getResponseHeader("Last-Modified"),u&&(_.lastModified[e]=u),u=v.getResponseHeader("etag"),u&&(_.etag[e]=u)),204===a||"HEAD"===l.type?w="nocontent":304===a?w="notmodified":(w=s.state,k=s.data,r=s.error,i=!r)):(r=w,(a||!w)&&(w="error",0>a&&(a=0))),v.status=a,v.statusText=(b||w)+"",i?o.resolveWith(m,[k,w,v]):o.rejectWith(m,[v,w,r]),v.statusCode(q),q=void 0,j&&n.trigger(i?"ajaxSuccess":"ajaxError",[v,l,i?k:r]),p.fireWith(m,[v,w]),j&&(n.trigger("ajaxComplete",[v,l]),--_.active||_.event.trigger("ajaxStop")))}"object"==typeof a&&(b=a,a=void 0),b=b||{};var d,e,f,g,h,i,j,k,l=_.ajaxSetup({},b),m=l.context||l,n=l.context&&(m.nodeType||m.jquery)?_(m):_.event,o=_.Deferred(),p=_.Callbacks("once memory"),q=l.statusCode||{},r={},s={},t=0,u="canceled",v={readyState:0,getResponseHeader:function(a){var b;if(2===t){if(!g)for(g={};b=pc.exec(f);)g[b[1].toLowerCase()]=b[2];b=g[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===t?f:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return t||(a=s[c]=s[c]||a,r[a]=b),this},overrideMimeType:function(a){return t||(l.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>t)for(b in a)q[b]=[q[b],a[b]];else v.always(a[v.status]);return this},abort:function(a){var b=a||u;return d&&d.abort(b),c(0,b),this}};if(o.promise(v).complete=p.add,v.success=v.done,v.error=v.fail,l.url=((a||l.url||mc)+"").replace(nc,"").replace(sc,lc[1]+"//"),l.type=b.method||b.type||l.method||l.type,l.dataTypes=_.trim(l.dataType||"*").toLowerCase().match(nb)||[""],null==l.crossDomain&&(i=tc.exec(l.url.toLowerCase()),l.crossDomain=!(!i||i[1]===lc[1]&&i[2]===lc[2]&&(i[3]||("http:"===i[1]?"80":"443"))===(lc[3]||("http:"===lc[1]?"80":"443")))),l.data&&l.processData&&"string"!=typeof l.data&&(l.data=_.param(l.data,l.traditional)),K(uc,l,b,v),2===t)return v;j=l.global,j&&0===_.active++&&_.event.trigger("ajaxStart"),l.type=l.type.toUpperCase(),l.hasContent=!rc.test(l.type),e=l.url,l.hasContent||(l.data&&(e=l.url+=(kc.test(e)?"&":"?")+l.data,delete l.data),l.cache===!1&&(l.url=oc.test(e)?e.replace(oc,"$1_="+jc++):e+(kc.test(e)?"&":"?")+"_="+jc++)),l.ifModified&&(_.lastModified[e]&&v.setRequestHeader("If-Modified-Since",_.lastModified[e]),_.etag[e]&&v.setRequestHeader("If-None-Match",_.etag[e])),(l.data&&l.hasContent&&l.contentType!==!1||b.contentType)&&v.setRequestHeader("Content-Type",l.contentType),v.setRequestHeader("Accept",l.dataTypes[0]&&l.accepts[l.dataTypes[0]]?l.accepts[l.dataTypes[0]]+("*"!==l.dataTypes[0]?", "+wc+"; q=0.01":""):l.accepts["*"]);for(k in l.headers)v.setRequestHeader(k,l.headers[k]);if(l.beforeSend&&(l.beforeSend.call(m,v,l)===!1||2===t))return v.abort();u="abort";for(k in{success:1,error:1,complete:1})v[k](l[k]);if(d=K(vc,l,b,v)){v.readyState=1,j&&n.trigger("ajaxSend",[v,l]),l.async&&l.timeout>0&&(h=setTimeout(function(){v.abort("timeout")},l.timeout));try{t=1,d.send(r,c)}catch(w){if(!(2>t))throw w;c(-1,w)}}else c(-1,"No Transport");return v},getJSON:function(a,b,c){return _.get(a,b,c,"json")},getScript:function(a,b){return _.get(a,void 0,b,"script")}}),_.each(["get","post"],function(a,b){_[b]=function(a,c,d,e){return _.isFunction(c)&&(e=e||d,d=c,c=void 0),_.ajax({url:a,type:b,dataType:e,data:c,success:d})}}),_.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){_.fn[b]=function(a){return this.on(b,a)}}),_._evalUrl=function(a){return _.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},_.fn.extend({wrapAll:function(a){var b;return _.isFunction(a)?this.each(function(b){_(this).wrapAll(a.call(this,b))}):(this[0]&&(b=_(a,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){for(var a=this;a.firstElementChild;)a=a.firstElementChild;return a}).append(this)),this)},wrapInner:function(a){return this.each(_.isFunction(a)?function(b){_(this).wrapInner(a.call(this,b))}:function(){var b=_(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=_.isFunction(a);return this.each(function(c){_(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){_.nodeName(this,"body")||_(this).replaceWith(this.childNodes)}).end()}}),_.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0},_.expr.filters.visible=function(a){return!_.expr.filters.hidden(a)};var yc=/%20/g,zc=/\[\]$/,Ac=/\r?\n/g,Bc=/^(?:submit|button|image|reset|file)$/i,Cc=/^(?:input|select|textarea|keygen)/i;_.param=function(a,b){var c,d=[],e=function(a,b){b=_.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=_.ajaxSettings&&_.ajaxSettings.traditional),_.isArray(a)||a.jquery&&!_.isPlainObject(a))_.each(a,function(){e(this.name,this.value)
-});else for(c in a)O(c,a[c],b,e);return d.join("&").replace(yc,"+")},_.fn.extend({serialize:function(){return _.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=_.prop(this,"elements");return a?_.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!_(this).is(":disabled")&&Cc.test(this.nodeName)&&!Bc.test(a)&&(this.checked||!yb.test(a))}).map(function(a,b){var c=_(this).val();return null==c?null:_.isArray(c)?_.map(c,function(a){return{name:b.name,value:a.replace(Ac,"\r\n")}}):{name:b.name,value:c.replace(Ac,"\r\n")}}).get()}}),_.ajaxSettings.xhr=function(){try{return new XMLHttpRequest}catch(a){}};var Dc=0,Ec={},Fc={0:200,1223:204},Gc=_.ajaxSettings.xhr();a.ActiveXObject&&_(a).on("unload",function(){for(var a in Ec)Ec[a]()}),Y.cors=!!Gc&&"withCredentials"in Gc,Y.ajax=Gc=!!Gc,_.ajaxTransport(function(a){var b;return Y.cors||Gc&&!a.crossDomain?{send:function(c,d){var e,f=a.xhr(),g=++Dc;if(f.open(a.type,a.url,a.async,a.username,a.password),a.xhrFields)for(e in a.xhrFields)f[e]=a.xhrFields[e];a.mimeType&&f.overrideMimeType&&f.overrideMimeType(a.mimeType),a.crossDomain||c["X-Requested-With"]||(c["X-Requested-With"]="XMLHttpRequest");for(e in c)f.setRequestHeader(e,c[e]);b=function(a){return function(){b&&(delete Ec[g],b=f.onload=f.onerror=null,"abort"===a?f.abort():"error"===a?d(f.status,f.statusText):d(Fc[f.status]||f.status,f.statusText,"string"==typeof f.responseText?{text:f.responseText}:void 0,f.getAllResponseHeaders()))}},f.onload=b(),f.onerror=b("error"),b=Ec[g]=b("abort");try{f.send(a.hasContent&&a.data||null)}catch(h){if(b)throw h}},abort:function(){b&&b()}}:void 0}),_.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(a){return _.globalEval(a),a}}}),_.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET")}),_.ajaxTransport("script",function(a){if(a.crossDomain){var b,c;return{send:function(d,e){b=_("<script>").prop({async:!0,charset:a.scriptCharset,src:a.url}).on("load error",c=function(a){b.remove(),c=null,a&&e("error"===a.type?404:200,a.type)}),Z.head.appendChild(b[0])},abort:function(){c&&c()}}}});var Hc=[],Ic=/(=)\?(?=&|$)|\?\?/;_.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=Hc.pop()||_.expando+"_"+jc++;return this[a]=!0,a}}),_.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(Ic.test(b.url)?"url":"string"==typeof b.data&&!(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&Ic.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=_.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(Ic,"$1"+e):b.jsonp!==!1&&(b.url+=(kc.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||_.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,Hc.push(e)),g&&_.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),_.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||Z;var d=gb.exec(a),e=!c&&[];return d?[b.createElement(d[1])]:(d=_.buildFragment([a],b,e),e&&e.length&&_(e).remove(),_.merge([],d.childNodes))};var Jc=_.fn.load;_.fn.load=function(a,b,c){if("string"!=typeof a&&Jc)return Jc.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>=0&&(d=_.trim(a.slice(h)),a=a.slice(0,h)),_.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(e="POST"),g.length>0&&_.ajax({url:a,type:e,dataType:"html",data:b}).done(function(a){f=arguments,g.html(d?_("<div>").append(_.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,f||[a.responseText,b,a])}),this},_.expr.filters.animated=function(a){return _.grep(_.timers,function(b){return a===b.elem}).length};var Kc=a.document.documentElement;_.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=_.css(a,"position"),l=_(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=_.css(a,"top"),i=_.css(a,"left"),j=("absolute"===k||"fixed"===k)&&(f+i).indexOf("auto")>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),_.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},_.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){_.offset.setOffset(this,a,b)});var b,c,d=this[0],e={top:0,left:0},f=d&&d.ownerDocument;if(f)return b=f.documentElement,_.contains(b,d)?(typeof d.getBoundingClientRect!==zb&&(e=d.getBoundingClientRect()),c=P(f),{top:e.top+c.pageYOffset-b.clientTop,left:e.left+c.pageXOffset-b.clientLeft}):e},position:function(){if(this[0]){var a,b,c=this[0],d={top:0,left:0};return"fixed"===_.css(c,"position")?b=c.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),_.nodeName(a[0],"html")||(d=a.offset()),d.top+=_.css(a[0],"borderTopWidth",!0),d.left+=_.css(a[0],"borderLeftWidth",!0)),{top:b.top-d.top-_.css(c,"marginTop",!0),left:b.left-d.left-_.css(c,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){for(var a=this.offsetParent||Kc;a&&!_.nodeName(a,"html")&&"static"===_.css(a,"position");)a=a.offsetParent;return a||Kc})}}),_.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(b,c){var d="pageYOffset"===c;_.fn[b]=function(e){return qb(this,function(b,e,f){var g=P(b);return void 0===f?g?g[c]:b[e]:void(g?g.scrollTo(d?a.pageXOffset:f,d?f:a.pageYOffset):b[e]=f)},b,e,arguments.length,null)}}),_.each(["top","left"],function(a,b){_.cssHooks[b]=w(Y.pixelPosition,function(a,c){return c?(c=v(a,b),Qb.test(c)?_(a).position()[b]+"px":c):void 0})}),_.each({Height:"height",Width:"width"},function(a,b){_.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){_.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return qb(this,function(b,c,d){var e;return _.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?_.css(b,c,g):_.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),_.fn.size=function(){return this.length},_.fn.andSelf=_.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return _});var Lc=a.jQuery,Mc=a.$;return _.noConflict=function(b){return a.$===_&&(a.$=Mc),b&&a.jQuery===_&&(a.jQuery=Lc),_},typeof b===zb&&(a.jQuery=a.$=_),_});
\ No newline at end of file
diff --git a/NewLife.Cube/Content/js/jquery.mobile.custom.min.js b/NewLife.Cube/Content/js/jquery.mobile.custom.min.js
deleted file mode 100644
index f55e18a6f5..0000000000
--- a/NewLife.Cube/Content/js/jquery.mobile.custom.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(a,b,c){"function"==typeof define&&define.amd?define(["jquery"],function(d){return c(d,a,b),d.mobile}):c(a.jQuery,a,b)}(this,document,function(a,b,c){!function(a,b,c,d){function e(a){for(;a&&"undefined"!=typeof a.originalEvent;)a=a.originalEvent;return a}function f(b,c){var f,g,h,i,j,k,l,m,n,o=b.type;if(b=a.Event(b),b.type=c,f=b.originalEvent,g=a.event.props,o.search(/^(mouse|click)/)>-1&&(g=E),f)for(l=g.length,i;l;)i=g[--l],b[i]=f[i];if(o.search(/mouse(down|up)|click/)>-1&&!b.which&&(b.which=1),-1!==o.search(/^touch/)&&(h=e(f),o=h.touches,j=h.changedTouches,k=o&&o.length?o[0]:j&&j.length?j[0]:d))for(m=0,n=C.length;n>m;m++)i=C[m],b[i]=k[i];return b}function g(b){for(var c,d,e={};b;){c=a.data(b,z);for(d in c)c[d]&&(e[d]=e.hasVirtualBinding=!0);b=b.parentNode}return e}function h(b,c){for(var d;b;){if(d=a.data(b,z),d&&(!c||d[c]))return b;b=b.parentNode}return null}function i(){M=!1}function j(){M=!0}function k(){Q=0,K.length=0,L=!1,j()}function l(){i()}function m(){n(),G=setTimeout(function(){G=0,k()},a.vmouse.resetTimerDuration)}function n(){G&&(clearTimeout(G),G=0)}function o(b,c,d){var e;return(d&&d[b]||!d&&h(c.target,b))&&(e=f(c,b),a(c.target).trigger(e)),e}function p(b){var c,d=a.data(b.target,A);L||Q&&Q===d||(c=o("v"+b.type,b),c&&(c.isDefaultPrevented()&&b.preventDefault(),c.isPropagationStopped()&&b.stopPropagation(),c.isImmediatePropagationStopped()&&b.stopImmediatePropagation()))}function q(b){var c,d,f,h=e(b).touches;h&&1===h.length&&(c=b.target,d=g(c),d.hasVirtualBinding&&(Q=P++,a.data(c,A,Q),n(),l(),J=!1,f=e(b).touches[0],H=f.pageX,I=f.pageY,o("vmouseover",b,d),o("vmousedown",b,d)))}function r(a){M||(J||o("vmousecancel",a,g(a.target)),J=!0,m())}function s(b){if(!M){var c=e(b).touches[0],d=J,f=a.vmouse.moveDistanceThreshold,h=g(b.target);J=J||Math.abs(c.pageX-H)>f||Math.abs(c.pageY-I)>f,J&&!d&&o("vmousecancel",b,h),o("vmousemove",b,h),m()}}function t(a){if(!M){j();var b,c,d=g(a.target);o("vmouseup",a,d),J||(b=o("vclick",a,d),b&&b.isDefaultPrevented()&&(c=e(a).changedTouches[0],K.push({touchID:Q,x:c.clientX,y:c.clientY}),L=!0)),o("vmouseout",a,d),J=!1,m()}}function u(b){var c,d=a.data(b,z);if(d)for(c in d)if(d[c])return!0;return!1}function v(){}function w(b){var c=b.substr(1);return{setup:function(){u(this)||a.data(this,z,{});var d=a.data(this,z);d[b]=!0,F[b]=(F[b]||0)+1,1===F[b]&&O.bind(c,p),a(this).bind(c,v),N&&(F.touchstart=(F.touchstart||0)+1,1===F.touchstart&&O.bind("touchstart",q).bind("touchend",t).bind("touchmove",s).bind("scroll",r))},teardown:function(){--F[b],F[b]||O.unbind(c,p),N&&(--F.touchstart,F.touchstart||O.unbind("touchstart",q).unbind("touchmove",s).unbind("touchend",t).unbind("scroll",r));var d=a(this),e=a.data(this,z);e&&(e[b]=!1),d.unbind(c,v),u(this)||d.removeData(z)}}}var x,y,z="virtualMouseBindings",A="virtualTouchID",B="vmouseover vmousedown vmousemove vmouseup vclick vmouseout vmousecancel".split(" "),C="clientX clientY pageX pageY screenX screenY".split(" "),D=a.event.mouseHooks?a.event.mouseHooks.props:[],E=a.event.props.concat(D),F={},G=0,H=0,I=0,J=!1,K=[],L=!1,M=!1,N="addEventListener"in c,O=a(c),P=1,Q=0;for(a.vmouse={moveDistanceThreshold:10,clickDistanceThreshold:10,resetTimerDuration:1500},y=0;y<B.length;y++)a.event.special[B[y]]=w(B[y]);N&&c.addEventListener("click",function(b){var c,d,e,f,g,h,i=K.length,j=b.target;if(i)for(c=b.clientX,d=b.clientY,x=a.vmouse.clickDistanceThreshold,e=j;e;){for(f=0;i>f;f++)if(g=K[f],h=0,e===j&&Math.abs(g.x-c)<x&&Math.abs(g.y-d)<x||a.data(e,A)===g.touchID)return b.preventDefault(),void b.stopPropagation();e=e.parentNode}},!0)}(a,b,c),function(a){a.mobile={}}(a),function(a){var b={touch:"ontouchend"in c};a.mobile.support=a.mobile.support||{},a.extend(a.support,b),a.extend(a.mobile.support,b)}(a),function(a,b,d){function e(b,c,e,f){var g=e.type;e.type=c,f?a.event.trigger(e,d,b):a.event.dispatch.call(b,e),e.type=g}var f=a(c),g=a.mobile.support.touch,h="touchmove scroll",i=g?"touchstart":"mousedown",j=g?"touchend":"mouseup",k=g?"touchmove":"mousemove";a.each("touchstart touchmove touchend tap taphold swipe swipeleft swiperight scrollstart scrollstop".split(" "),function(b,c){a.fn[c]=function(a){return a?this.bind(c,a):this.trigger(c)},a.attrFn&&(a.attrFn[c]=!0)}),a.event.special.scrollstart={enabled:!0,setup:function(){function b(a,b){c=b,e(f,c?"scrollstart":"scrollstop",a)}var c,d,f=this,g=a(f);g.bind(h,function(e){a.event.special.scrollstart.enabled&&(c||b(e,!0),clearTimeout(d),d=setTimeout(function(){b(e,!1)},50))})},teardown:function(){a(this).unbind(h)}},a.event.special.tap={tapholdThreshold:750,emitTapOnTaphold:!0,setup:function(){var b=this,c=a(b),d=!1;c.bind("vmousedown",function(g){function h(){clearTimeout(k)}function i(){h(),c.unbind("vclick",j).unbind("vmouseup",h),f.unbind("vmousecancel",i)}function j(a){i(),d||l!==a.target?d&&a.preventDefault():e(b,"tap",a)}if(d=!1,g.which&&1!==g.which)return!1;var k,l=g.target;c.bind("vmouseup",h).bind("vclick",j),f.bind("vmousecancel",i),k=setTimeout(function(){a.event.special.tap.emitTapOnTaphold||(d=!0),e(b,"taphold",a.Event("taphold",{target:l}))},a.event.special.tap.tapholdThreshold)})},teardown:function(){a(this).unbind("vmousedown").unbind("vclick").unbind("vmouseup"),f.unbind("vmousecancel")}},a.event.special.swipe={scrollSupressionThreshold:30,durationThreshold:1e3,horizontalDistanceThreshold:30,verticalDistanceThreshold:30,getLocation:function(a){var c=b.pageXOffset,d=b.pageYOffset,e=a.clientX,f=a.clientY;return 0===a.pageY&&Math.floor(f)>Math.floor(a.pageY)||0===a.pageX&&Math.floor(e)>Math.floor(a.pageX)?(e-=c,f-=d):(f<a.pageY-d||e<a.pageX-c)&&(e=a.pageX-c,f=a.pageY-d),{x:e,y:f}},start:function(b){var c=b.originalEvent.touches?b.originalEvent.touches[0]:b,d=a.event.special.swipe.getLocation(c);return{time:(new Date).getTime(),coords:[d.x,d.y],origin:a(b.target)}},stop:function(b){var c=b.originalEvent.touches?b.originalEvent.touches[0]:b,d=a.event.special.swipe.getLocation(c);return{time:(new Date).getTime(),coords:[d.x,d.y]}},handleSwipe:function(b,c,d,f){if(c.time-b.time<a.event.special.swipe.durationThreshold&&Math.abs(b.coords[0]-c.coords[0])>a.event.special.swipe.horizontalDistanceThreshold&&Math.abs(b.coords[1]-c.coords[1])<a.event.special.swipe.verticalDistanceThreshold){var g=b.coords[0]>c.coords[0]?"swipeleft":"swiperight";return e(d,"swipe",a.Event("swipe",{target:f,swipestart:b,swipestop:c}),!0),e(d,g,a.Event(g,{target:f,swipestart:b,swipestop:c}),!0),!0}return!1},eventInProgress:!1,setup:function(){var b,c=this,d=a(c),e={};b=a.data(this,"mobile-events"),b||(b={length:0},a.data(this,"mobile-events",b)),b.length++,b.swipe=e,e.start=function(b){if(!a.event.special.swipe.eventInProgress){a.event.special.swipe.eventInProgress=!0;var d,g=a.event.special.swipe.start(b),h=b.target,i=!1;e.move=function(b){g&&!b.isDefaultPrevented()&&(d=a.event.special.swipe.stop(b),i||(i=a.event.special.swipe.handleSwipe(g,d,c,h),i&&(a.event.special.swipe.eventInProgress=!1)),Math.abs(g.coords[0]-d.coords[0])>a.event.special.swipe.scrollSupressionThreshold&&b.preventDefault())},e.stop=function(){i=!0,a.event.special.swipe.eventInProgress=!1,f.off(k,e.move),e.move=null},f.on(k,e.move).one(j,e.stop)}},d.on(i,e.start)},teardown:function(){var b,c;b=a.data(this,"mobile-events"),b&&(c=b.swipe,delete b.swipe,b.length--,0===b.length&&a.removeData(this,"mobile-events")),c&&(c.start&&a(this).off(i,c.start),c.move&&f.off(k,c.move),c.stop&&f.off(j,c.stop))}},a.each({scrollstop:"scrollstart",taphold:"tap",swipeleft:"swipe.left",swiperight:"swipe.right"},function(b,c){a.event.special[b]={setup:function(){a(this).bind(c,a.noop)},teardown:function(){a(this).unbind(c)}}})}(a,this)});
\ No newline at end of file
diff --git a/NewLife.Cube/Content/js/jquery.mousewheel.min.js b/NewLife.Cube/Content/js/jquery.mousewheel.min.js
deleted file mode 100644
index bb7f43fe56..0000000000
--- a/NewLife.Cube/Content/js/jquery.mousewheel.min.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/*! Copyright (c) 2013 Brandon Aaron (http://brandon.aaron.sh)
- * Licensed under the MIT License (LICENSE.txt).
- *
- * Version: 3.1.12
- *
- * Requires: jQuery 1.2.2+
- */
-!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):"object"==typeof exports?module.exports=a:a(jQuery)}(function(a){function b(b){var g=b||window.event,h=i.call(arguments,1),j=0,l=0,m=0,n=0,o=0,p=0;if(b=a.event.fix(g),b.type="mousewheel","detail"in g&&(m=-1*g.detail),"wheelDelta"in g&&(m=g.wheelDelta),"wheelDeltaY"in g&&(m=g.wheelDeltaY),"wheelDeltaX"in g&&(l=-1*g.wheelDeltaX),"axis"in g&&g.axis===g.HORIZONTAL_AXIS&&(l=-1*m,m=0),j=0===m?l:m,"deltaY"in g&&(m=-1*g.deltaY,j=m),"deltaX"in g&&(l=g.deltaX,0===m&&(j=-1*l)),0!==m||0!==l){if(1===g.deltaMode){var q=a.data(this,"mousewheel-line-height");j*=q,m*=q,l*=q}else if(2===g.deltaMode){var r=a.data(this,"mousewheel-page-height");j*=r,m*=r,l*=r}if(n=Math.max(Math.abs(m),Math.abs(l)),(!f||f>n)&&(f=n,d(g,n)&&(f/=40)),d(g,n)&&(j/=40,l/=40,m/=40),j=Math[j>=1?"floor":"ceil"](j/f),l=Math[l>=1?"floor":"ceil"](l/f),m=Math[m>=1?"floor":"ceil"](m/f),k.settings.normalizeOffset&&this.getBoundingClientRect){var s=this.getBoundingClientRect();o=b.clientX-s.left,p=b.clientY-s.top}return b.deltaX=l,b.deltaY=m,b.deltaFactor=f,b.offsetX=o,b.offsetY=p,b.deltaMode=0,h.unshift(b,j,l,m),e&&clearTimeout(e),e=setTimeout(c,200),(a.event.dispatch||a.event.handle).apply(this,h)}}function c(){f=null}function d(a,b){return k.settings.adjustOldDeltas&&"mousewheel"===a.type&&b%120===0}var e,f,g=["wheel","mousewheel","DOMMouseScroll","MozMousePixelScroll"],h="onwheel"in document||document.documentMode>=9?["wheel"]:["mousewheel","DomMouseScroll","MozMousePixelScroll"],i=Array.prototype.slice;if(a.event.fixHooks)for(var j=g.length;j;)a.event.fixHooks[g[--j]]=a.event.mouseHooks;var k=a.event.special.mousewheel={version:"3.1.12",setup:function(){if(this.addEventListener)for(var c=h.length;c;)this.addEventListener(h[--c],b,!1);else this.onmousewheel=b;a.data(this,"mousewheel-line-height",k.getLineHeight(this)),a.data(this,"mousewheel-page-height",k.getPageHeight(this))},teardown:function(){if(this.removeEventListener)for(var c=h.length;c;)this.removeEventListener(h[--c],b,!1);else this.onmousewheel=null;a.removeData(this,"mousewheel-line-height"),a.removeData(this,"mousewheel-page-height")},getLineHeight:function(b){var c=a(b),d=c["offsetParent"in a.fn?"offsetParent":"parent"]();return d.length||(d=a("body")),parseInt(d.css("fontSize"),10)||parseInt(c.css("fontSize"),10)||16},getPageHeight:function(b){return a(b).height()},settings:{adjustOldDeltas:!0,normalizeOffset:!0}};a.fn.extend({mousewheel:function(a){return a?this.bind("mousewheel",a):this.trigger("mousewheel")},unmousewheel:function(a){return this.unbind("mousewheel",a)}})});
\ No newline at end of file
diff --git a/NewLife.Cube/Content/js/jquery.nestable.min.js b/NewLife.Cube/Content/js/jquery.nestable.min.js
deleted file mode 100644
index 9c6d2bfb28..0000000000
--- a/NewLife.Cube/Content/js/jquery.nestable.min.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*!
- * Nestable jQuery Plugin - Copyright (c) 2012 David Bushell - http://dbushell.com/
- * Dual-licensed under the BSD or MIT licenses
- */
-!function(a,b,c,d){function e(c,d){this.w=a(b),this.el=a(c),this.options=a.extend({},j,d),this.init()}var f=("ontouchstart"in c.documentElement,function(){var a=c.createElement("div"),d=c.documentElement;if(!("pointerEvents"in a.style))return!1;a.style.pointerEvents="auto",a.style.pointerEvents="x",d.appendChild(a);var e=b.getComputedStyle&&"auto"===b.getComputedStyle(a,"").pointerEvents;return d.removeChild(a),!!e}()),g="mousedown touchstart MSPointerDown pointerdown",h="mousemove touchmove MSPointerMove pointermove",i="mouseup touchend touchcancel MSPointerUp MSPointerCancel pointerup pointercancel",j={listNodeName:"ol",itemNodeName:"li",rootClass:"dd",listClass:"dd-list",itemClass:"dd-item",dragClass:"dd-dragel",handleClass:"dd-handle",collapsedClass:"dd-collapsed",placeClass:"dd-placeholder",noDragClass:"dd-nodrag",emptyClass:"dd-empty",expandBtnHTML:'<button data-action="expand" type="button">Expand</button>',collapseBtnHTML:'<button data-action="collapse" type="button">Collapse</button>',group:0,maxDepth:5,threshold:20};e.prototype={init:function(){var b=this;b.reset(),b.el.data("nestable-group",this.options.group),b.placeEl=a('<div class="'+b.options.placeClass+'"/>'),a.each(this.el.find(b.options.itemNodeName),function(c,d){b.setParent(a(d))}),b.el.on("click","button",function(c){if(!(b.dragEl||"button"in c&&0!==c.button)){var d=a(c.currentTarget),e=d.data("action"),f=d.parent(b.options.itemNodeName);"collapse"===e&&b.collapseItem(f),"expand"===e&&b.expandItem(f)}});var c=function(c){c=c.originalEvent;var d=a(c.target);if(!d.hasClass(b.options.handleClass)){if(d.closest("."+b.options.noDragClass).length)return;d=d.closest("."+b.options.handleClass)}!d.length||b.dragEl||"button"in c&&0!==c.button||"touches"in c&&1!==c.touches.length||(c.preventDefault(),b.dragStart("touches"in c?c.touches[0]:c))},d=function(a){b.dragEl&&(a=a.originalEvent,a.preventDefault(),b.dragMove("touches"in a?a.touches[0]:a))},e=function(a){b.dragEl&&(a=a.originalEvent,a.preventDefault(),b.dragStop("touches"in a?a.touches[0]:a))};b.el.on(g,c),b.w.on(h,d),b.w.on(i,e)},serialize:function(){var b,c=0,d=this;return step=function(b,c){var e=[],f=b.children(d.options.itemNodeName);return f.each(function(){var b=a(this),f=a.extend({},b.data()),g=b.children(d.options.listNodeName);g.length&&(f.children=step(g,c+1)),e.push(f)}),e},b=step(d.el.find(d.options.listNodeName).first(),c)},serialise:function(){return this.serialize()},reset:function(){this.mouse={offsetX:0,offsetY:0,startX:0,startY:0,lastX:0,lastY:0,nowX:0,nowY:0,distX:0,distY:0,dirAx:0,dirX:0,dirY:0,lastDirX:0,lastDirY:0,distAxX:0,distAxY:0},this.moving=!1,this.dragEl=null,this.dragRootEl=null,this.dragDepth=0,this.hasNewRoot=!1,this.pointEl=null},expandItem:function(a){a.removeClass(this.options.collapsedClass),a.children('[data-action="expand"]').hide(),a.children('[data-action="collapse"]').show(),a.children(this.options.listNodeName).show()},collapseItem:function(a){var b=a.children(this.options.listNodeName);b.length&&(a.addClass(this.options.collapsedClass),a.children('[data-action="collapse"]').hide(),a.children('[data-action="expand"]').show(),a.children(this.options.listNodeName).hide())},expandAll:function(){var b=this;b.el.find(b.options.itemNodeName).each(function(){b.expandItem(a(this))})},collapseAll:function(){var b=this;b.el.find(b.options.itemNodeName).each(function(){b.collapseItem(a(this))})},setParent:function(b){b.children(this.options.listNodeName).length&&(b.prepend(a(this.options.expandBtnHTML)),b.prepend(a(this.options.collapseBtnHTML))),b.children('[data-action="expand"]').hide()},unsetParent:function(a){a.removeClass(this.options.collapsedClass),a.children("[data-action]").remove(),a.children(this.options.listNodeName).remove()},dragStart:function(b){var e=this.mouse,f=a(b.target),g=f.closest(this.options.itemNodeName);this.placeEl.css("height",g.height()),e.offsetX=b.offsetX!==d?b.offsetX:b.pageX-f.offset().left,e.offsetY=b.offsetY!==d?b.offsetY:b.pageY-f.offset().top,e.startX=e.lastX=b.pageX,e.startY=e.lastY=b.pageY,this.dragRootEl=this.el,this.dragEl=a(c.createElement(this.options.listNodeName)).addClass(this.options.listClass+" "+this.options.dragClass),this.dragEl.css("width",g.width()),g.after(this.placeEl),g[0].parentNode.removeChild(g[0]),g.appendTo(this.dragEl),a(c.body).append(this.dragEl),this.dragEl.css({left:b.pageX-e.offsetX,top:b.pageY-e.offsetY});var h,i,j=this.dragEl.find(this.options.itemNodeName);for(h=0;h<j.length;h++)i=a(j[h]).parents(this.options.listNodeName).length,i>this.dragDepth&&(this.dragDepth=i)},dragStop:function(){var a=this.dragEl.children(this.options.itemNodeName).first();a[0].parentNode.removeChild(a[0]),this.placeEl.replaceWith(a),this.dragEl.remove(),this.el.trigger("change"),this.hasNewRoot&&this.dragRootEl.trigger("change"),this.reset()},dragMove:function(d){var e,g,h,i,j,k=this.options,l=this.mouse;this.dragEl.css({left:d.pageX-l.offsetX,top:d.pageY-l.offsetY}),l.lastX=l.nowX,l.lastY=l.nowY,l.nowX=d.pageX,l.nowY=d.pageY,l.distX=l.nowX-l.lastX,l.distY=l.nowY-l.lastY,l.lastDirX=l.dirX,l.lastDirY=l.dirY,l.dirX=0===l.distX?0:l.distX>0?1:-1,l.dirY=0===l.distY?0:l.distY>0?1:-1;var m=Math.abs(l.distX)>Math.abs(l.distY)?1:0;if(!l.moving)return l.dirAx=m,void(l.moving=!0);l.dirAx!==m?(l.distAxX=0,l.distAxY=0):(l.distAxX+=Math.abs(l.distX),0!==l.dirX&&l.dirX!==l.lastDirX&&(l.distAxX=0),l.distAxY+=Math.abs(l.distY),0!==l.dirY&&l.dirY!==l.lastDirY&&(l.distAxY=0)),l.dirAx=m,l.dirAx&&l.distAxX>=k.threshold&&(l.distAxX=0,h=this.placeEl.prev(k.itemNodeName),l.distX>0&&h.length&&!h.hasClass(k.collapsedClass)&&(e=h.find(k.listNodeName).last(),j=this.placeEl.parents(k.listNodeName).length,j+this.dragDepth<=k.maxDepth&&(e.length?(e=h.children(k.listNodeName).last(),e.append(this.placeEl)):(e=a("<"+k.listNodeName+"/>").addClass(k.listClass),e.append(this.placeEl),h.append(e),this.setParent(h)))),l.distX<0&&(i=this.placeEl.next(k.itemNodeName),i.length||(g=this.placeEl.parent(),this.placeEl.closest(k.itemNodeName).after(this.placeEl),g.children().length||this.unsetParent(g.parent()))));var n=!1;if(f||(this.dragEl[0].style.visibility="hidden"),this.pointEl=a(c.elementFromPoint(d.pageX-c.body.scrollLeft,d.pageY-(b.pageYOffset||c.documentElement.scrollTop))),f||(this.dragEl[0].style.visibility="visible"),this.pointEl.hasClass(k.handleClass)&&(this.pointEl=this.pointEl.parent(k.itemNodeName)),this.pointEl.hasClass(k.emptyClass))n=!0;else if(!this.pointEl.length||!this.pointEl.hasClass(k.itemClass))return;var o=this.pointEl.closest("."+k.rootClass),p=this.dragRootEl.data("nestable-id")!==o.data("nestable-id");if(!l.dirAx||p||n){if(p&&k.group!==o.data("nestable-group"))return;if(j=this.dragDepth-1+this.pointEl.parents(k.listNodeName).length,j>k.maxDepth)return;var q=d.pageY<this.pointEl.offset().top+this.pointEl.height()/2;g=this.placeEl.parent(),n?(e=a(c.createElement(k.listNodeName)).addClass(k.listClass),e.append(this.placeEl),this.pointEl.replaceWith(e)):q?this.pointEl.before(this.placeEl):this.pointEl.after(this.placeEl),g.children().length||this.unsetParent(g.parent()),this.dragRootEl.find(k.itemNodeName).length||this.dragRootEl.append('<div class="'+k.emptyClass+'"/>'),p&&(this.dragRootEl=o,this.hasNewRoot=this.el[0]!==this.dragRootEl[0])}}},a.fn.nestable=function(b){var c=this,d=this;return c.each(function(){var c=a(this).data("nestable");c?"string"==typeof b&&"function"==typeof c[b]&&(d=c[b]()):(a(this).data("nestable",new e(this,b)),a(this).data("nestable-id",(new Date).getTime()))}),d||c}}(window.jQuery||window.Zepto,window,document);
\ No newline at end of file
diff --git a/NewLife.Cube/Content/js/jquery.raty.min.js b/NewLife.Cube/Content/js/jquery.raty.min.js
deleted file mode 100644
index 2c6dc56437..0000000000
--- a/NewLife.Cube/Content/js/jquery.raty.min.js
+++ /dev/null
@@ -1,11 +0,0 @@
-/*!
- * jQuery Raty - A Star Rating Plugin
- *
- * The MIT License
- *
- * @author  : Washington Botelho
- * @doc     : http://wbotelhos.com/raty
- * @version : 2.7.0
- *
- */
-!function(a){"use strict";var b={init:function(c){return this.each(function(){this.self=a(this),b.destroy.call(this.self),this.opt=a.extend(!0,{},a.fn.raty.defaults,c),b._adjustCallback.call(this),b._adjustNumber.call(this),b._adjustHints.call(this),this.opt.score=b._adjustedScore.call(this,this.opt.score),"img"!==this.opt.starType&&b._adjustStarType.call(this),b._adjustPath.call(this),b._createStars.call(this),this.opt.cancel&&b._createCancel.call(this),this.opt.precision&&b._adjustPrecision.call(this),b._createScore.call(this),b._apply.call(this,this.opt.score),b._setTitle.call(this,this.opt.score),b._target.call(this,this.opt.score),this.opt.readOnly?b._lock.call(this):(this.style.cursor="pointer",b._binds.call(this))})},_adjustCallback:function(){for(var a=["number","readOnly","score","scoreName","target"],b=0;b<a.length;b++)"function"==typeof this.opt[a[b]]&&(this.opt[a[b]]=this.opt[a[b]].call(this))},_adjustedScore:function(a){return a?b._between(a,0,this.opt.number):a},_adjustHints:function(){if(this.opt.hints||(this.opt.hints=[]),this.opt.halfShow||this.opt.half)for(var a=this.opt.precision?10:2,b=0;b<this.opt.number;b++){var c=this.opt.hints[b];"[object Array]"!==Object.prototype.toString.call(c)&&(c=[c]),this.opt.hints[b]=[];for(var d=0;a>d;d++){var e=c[d],f=c[c.length-1];void 0===f&&(f=null),this.opt.hints[b][d]=void 0===e?f:e}}},_adjustNumber:function(){this.opt.number=b._between(this.opt.number,1,this.opt.numberMax)},_adjustPath:function(){this.opt.path=this.opt.path||"",this.opt.path&&"/"!==this.opt.path.charAt(this.opt.path.length-1)&&(this.opt.path+="/")},_adjustPrecision:function(){this.opt.half=!0},_adjustStarType:function(){var a=["cancelOff","cancelOn","starHalf","starOff","starOn"];this.opt.path="";for(var b=0;b<a.length;b++)this.opt[a[b]]=this.opt[a[b]].replace(".","-")},_apply:function(a){b._fill.call(this,a),a&&(a>0&&this.score.val(a),b._roundStars.call(this,a))},_between:function(a,b,c){return Math.min(Math.max(parseFloat(a),b),c)},_binds:function(){this.cancel&&(b._bindOverCancel.call(this),b._bindClickCancel.call(this),b._bindOutCancel.call(this)),b._bindOver.call(this),b._bindClick.call(this),b._bindOut.call(this)},_bindClick:function(){var c=this;c.stars.on("click.raty",function(d){var e=!0,f=c.opt.half||c.opt.precision?c.self.data("score"):this.alt||a(this).data("alt");c.opt.click&&(e=c.opt.click.call(c,+f,d)),(e||void 0===e)&&(c.opt.half&&!c.opt.precision&&(f=b._roundHalfScore.call(c,f)),b._apply.call(c,f))})},_bindClickCancel:function(){var a=this;a.cancel.on("click.raty",function(b){a.score.removeAttr("value"),a.opt.click&&a.opt.click.call(a,null,b)})},_bindOut:function(){var a=this;a.self.on("mouseleave.raty",function(c){var d=+a.score.val()||void 0;b._apply.call(a,d),b._target.call(a,d,c),b._resetTitle.call(a),a.opt.mouseout&&a.opt.mouseout.call(a,d,c)})},_bindOutCancel:function(){var a=this;a.cancel.on("mouseleave.raty",function(c){var d=a.opt.cancelOff;if("img"!==a.opt.starType&&(d=a.opt.cancelClass+" "+d),b._setIcon.call(a,this,d),a.opt.mouseout){var e=+a.score.val()||void 0;a.opt.mouseout.call(a,e,c)}})},_bindOver:function(){var a=this,c=a.opt.half?"mousemove.raty":"mouseover.raty";a.stars.on(c,function(c){var d=b._getScoreByPosition.call(a,c,this);b._fill.call(a,d),a.opt.half&&(b._roundStars.call(a,d,c),b._setTitle.call(a,d,c),a.self.data("score",d)),b._target.call(a,d,c),a.opt.mouseover&&a.opt.mouseover.call(a,d,c)})},_bindOverCancel:function(){var a=this;a.cancel.on("mouseover.raty",function(c){var d=a.opt.path+a.opt.starOff,e=a.opt.cancelOn;"img"===a.opt.starType?a.stars.attr("src",d):(e=a.opt.cancelClass+" "+e,a.stars.attr("class",d)),b._setIcon.call(a,this,e),b._target.call(a,null,c),a.opt.mouseover&&a.opt.mouseover.call(a,null)})},_buildScoreField:function(){return a("<input />",{name:this.opt.scoreName,type:"hidden"}).appendTo(this)},_createCancel:function(){var b=this.opt.path+this.opt.cancelOff,c=a("<"+this.opt.starType+" />",{title:this.opt.cancelHint,"class":this.opt.cancelClass});"img"===this.opt.starType?c.attr({src:b,alt:"x"}):c.attr("data-alt","x").addClass(b),"left"===this.opt.cancelPlace?this.self.prepend("&#160;").prepend(c):this.self.append("&#160;").append(c),this.cancel=c},_createScore:function(){var c=a(this.opt.targetScore);this.score=c.length?c:b._buildScoreField.call(this)},_createStars:function(){for(var c=1;c<=this.opt.number;c++){var d=b._nameForIndex.call(this,c),e={alt:c,src:this.opt.path+this.opt[d]};"img"!==this.opt.starType&&(e={"data-alt":c,"class":e.src}),e.title=b._getHint.call(this,c),a("<"+this.opt.starType+" />",e).appendTo(this),this.opt.space&&this.self.append(c<this.opt.number?"&#160;":"")}this.stars=this.self.children(this.opt.starType)},_error:function(b){a(this).text(b),a.error(b)},_fill:function(a){for(var c=0,d=1;d<=this.stars.length;d++){var e,f=this.stars[d-1],g=b._turnOn.call(this,d,a);if(this.opt.iconRange&&this.opt.iconRange.length>c){var h=this.opt.iconRange[c];e=b._getRangeIcon.call(this,h,g),d<=h.range&&b._setIcon.call(this,f,e),d===h.range&&c++}else e=this.opt[g?"starOn":"starOff"],b._setIcon.call(this,f,e)}},_getFirstDecimal:function(a){var b=a.toString().split(".")[1],c=0;return b&&(c=parseInt(b.charAt(0),10),"9999"===b.slice(1,5)&&c++),c},_getRangeIcon:function(a,b){return b?a.on||this.opt.starOn:a.off||this.opt.starOff},_getScoreByPosition:function(c,d){var e=parseInt(d.alt||d.getAttribute("data-alt"),10);if(this.opt.half){var f=b._getWidth.call(this),g=parseFloat((c.pageX-a(d).offset().left)/f);e=e-1+g}return e},_getHint:function(a,c){if(0!==a&&!a)return this.opt.noRatedMsg;var d=b._getFirstDecimal.call(this,a),e=Math.ceil(a),f=this.opt.hints[(e||1)-1],g=f,h=!c||this.move;return this.opt.precision?(h&&(d=0===d?9:d-1),g=f[d]):(this.opt.halfShow||this.opt.half)&&(d=h&&0===d?1:d>5?1:0,g=f[d]),""===g?"":g||a},_getWidth:function(){var a=this.stars[0].width||parseFloat(this.stars.eq(0).css("font-size"));return a||b._error.call(this,"Could not get the icon width!"),a},_lock:function(){var a=b._getHint.call(this,this.score.val());this.style.cursor="",this.title=a,this.score.prop("readonly",!0),this.stars.prop("title",a),this.cancel&&this.cancel.hide(),this.self.data("readonly",!0)},_nameForIndex:function(a){return this.opt.score&&this.opt.score>=a?"starOn":"starOff"},_resetTitle:function(){for(var a=0;a<this.opt.number;a++)this.stars[a].title=b._getHint.call(this,a+1)},_roundHalfScore:function(a){var c=parseInt(a,10),d=b._getFirstDecimal.call(this,a);return 0!==d&&(d=d>5?1:.5),c+d},_roundStars:function(a,c){var d,e=(a%1).toFixed(2);if(c||this.move?d=e>.5?"starOn":"starHalf":e>this.opt.round.down&&(d="starOn",this.opt.halfShow&&e<this.opt.round.up?d="starHalf":e<this.opt.round.full&&(d="starOff")),d){var f=this.opt[d],g=this.stars[Math.ceil(a)-1];b._setIcon.call(this,g,f)}},_setIcon:function(a,b){try{a["img"===this.opt.starType?"src":"className"]=this.opt.path+b}catch(c){}},_setTarget:function(a,b){b&&(b=this.opt.targetFormat.toString().replace("{score}",b)),a.is(":input")?a.val(b):a.html(b)},_setTitle:function(a,c){if(a){var d=parseInt(Math.ceil(a),10),e=this.stars[d-1];e.title=b._getHint.call(this,a,c)}},_target:function(c,d){if(this.opt.target){var e=a(this.opt.target);e.length||b._error.call(this,"Target selector invalid or missing!");var f=d&&"mouseover"===d.type;if(void 0===c)c=this.opt.targetText;else if(null===c)c=f?this.opt.cancelHint:this.opt.targetText;else{"hint"===this.opt.targetType?c=b._getHint.call(this,c,d):this.opt.precision&&(c=parseFloat(c).toFixed(1));var g=d&&"mousemove"===d.type;f||g||this.opt.targetKeep||(c=this.opt.targetText)}b._setTarget.call(this,e,c)}},_turnOn:function(a,b){return this.opt.single?a===b:b>=a},_unlock:function(){this.style.cursor="pointer",this.removeAttribute("title"),this.score.removeAttr("readonly"),this.self.data("readonly",!1);for(var a=0;a<this.opt.number;a++)this.stars[a].title=b._getHint.call(this,a+1);this.cancel&&this.cancel.css("display","")},cancel:function(c){return this.each(function(){var d=a(this);d.data("readonly")!==!0&&(b[c?"click":"score"].call(d,null),this.score.removeAttr("value"))})},click:function(c){return this.each(function(){a(this).data("readonly")!==!0&&(c=b._adjustedScore.call(this,c),b._apply.call(this,c),this.opt.click&&this.opt.click.call(this,c,a.Event("click")),b._target.call(this,c))})},destroy:function(){return this.each(function(){var b=a(this),c=b.data("raw");c?b.off(".raty").empty().css({cursor:c.style.cursor}).removeData("readonly"):b.data("raw",b.clone()[0])})},getScore:function(){var a,b=[];return this.each(function(){a=this.score.val(),b.push(a?+a:void 0)}),b.length>1?b:b[0]},move:function(c){return this.each(function(){var d=parseInt(c,10),e=b._getFirstDecimal.call(this,c);d>=this.opt.number&&(d=this.opt.number-1,e=10);var f=b._getWidth.call(this),g=f/10,h=a(this.stars[d]),i=h.offset().left+g*e,j=a.Event("mousemove",{pageX:i});this.move=!0,h.trigger(j),this.move=!1})},readOnly:function(c){return this.each(function(){var d=a(this);d.data("readonly")!==c&&(c?(d.off(".raty").children("img").off(".raty"),b._lock.call(this)):(b._binds.call(this),b._unlock.call(this)),d.data("readonly",c))})},reload:function(){return b.set.call(this,{})},score:function(){var c=a(this);return arguments.length?b.setScore.apply(c,arguments):b.getScore.call(c)},set:function(b){return this.each(function(){a(this).raty(a.extend({},this.opt,b))})},setScore:function(c){return this.each(function(){a(this).data("readonly")!==!0&&(c=b._adjustedScore.call(this,c),b._apply.call(this,c),b._target.call(this,c))})}};a.fn.raty=function(c){return b[c]?b[c].apply(this,Array.prototype.slice.call(arguments,1)):"object"!=typeof c&&c?void a.error("Method "+c+" does not exist!"):b.init.apply(this,arguments)},a.fn.raty.defaults={cancel:!1,cancelClass:"raty-cancel",cancelHint:"Cancel this rating!",cancelOff:"cancel-off.png",cancelOn:"cancel-on.png",cancelPlace:"left",click:void 0,half:!1,halfShow:!0,hints:["bad","poor","regular","good","gorgeous"],iconRange:void 0,mouseout:void 0,mouseover:void 0,noRatedMsg:"Not rated yet!",number:5,numberMax:20,path:void 0,precision:!1,readOnly:!1,round:{down:.25,full:.6,up:.76},score:void 0,scoreName:"score",single:!1,space:!0,starHalf:"star-half.png",starOff:"star-off.png",starOn:"star-on.png",starType:"img",target:void 0,targetFormat:"{score}",targetKeep:!1,targetScore:void 0,targetText:"",targetType:"hint"}}(jQuery);
\ No newline at end of file
diff --git a/NewLife.Cube/Content/js/jquery.slimscroll.min.js b/NewLife.Cube/Content/js/jquery.slimscroll.min.js
deleted file mode 100644
index 0231cb2723..0000000000
--- a/NewLife.Cube/Content/js/jquery.slimscroll.min.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/*! Copyright (c) 2011 Piotr Rochala (http://rocha.la)
- * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php)
- * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
- *
- * Version: 1.3.3
- *
- */
-!function(a){a.fn.extend({slimScroll:function(b){var c={width:"auto",height:"250px",size:"7px",color:"#000",position:"right",distance:"1px",start:"top",opacity:.4,alwaysVisible:!1,disableFadeOut:!1,railVisible:!1,railColor:"#333",railOpacity:.2,railDraggable:!0,railClass:"slimScrollRail",barClass:"slimScrollBar",wrapperClass:"slimScrollDiv",allowPageScroll:!1,wheelStep:20,touchScrollStep:200,borderRadius:"7px",railBorderRadius:"7px"},d=a.extend(c,b);return this.each(function(){function c(b){if(j){var b=b||window.event,c=0;b.wheelDelta&&(c=-b.wheelDelta/120),b.detail&&(c=b.detail/3);var f=b.target||b.srcTarget||b.srcElement;a(f).closest("."+d.wrapperClass).is(v.parent())&&e(c,!0),b.preventDefault&&!u&&b.preventDefault(),u||(b.returnValue=!1)}}function e(a,b,c){u=!1;var e=a,f=v.outerHeight()-A.outerHeight();if(b&&(e=parseInt(A.css("top"))+a*parseInt(d.wheelStep)/100*A.outerHeight(),e=Math.min(Math.max(e,0),f),e=a>0?Math.ceil(e):Math.floor(e),A.css({top:e+"px"})),p=parseInt(A.css("top"))/(v.outerHeight()-A.outerHeight()),e=p*(v[0].scrollHeight-v.outerHeight()),c){e=a;var g=e/v[0].scrollHeight*v.outerHeight();g=Math.min(Math.max(g,0),f),A.css({top:g+"px"})}v.scrollTop(e),v.trigger("slimscrolling",~~e),h(),i()}function f(){window.addEventListener?(this.addEventListener("DOMMouseScroll",c,!1),this.addEventListener("mousewheel",c,!1)):document.attachEvent("onmousewheel",c)}function g(){o=Math.max(v.outerHeight()/v[0].scrollHeight*v.outerHeight(),s),A.css({height:o+"px"});var a=o==v.outerHeight()?"none":"block";A.css({display:a})}function h(){if(g(),clearTimeout(m),p==~~p){if(u=d.allowPageScroll,q!=p){var a=0==~~p?"top":"bottom";v.trigger("slimscroll",a)}}else u=!1;return q=p,o>=v.outerHeight()?void(u=!0):(A.stop(!0,!0).fadeIn("fast"),void(d.railVisible&&z.stop(!0,!0).fadeIn("fast")))}function i(){d.alwaysVisible||(m=setTimeout(function(){d.disableFadeOut&&j||k||l||(A.fadeOut("slow"),z.fadeOut("slow"))},1e3))}var j,k,l,m,n,o,p,q,r="<div></div>",s=30,u=!1,v=a(this);if(v.parent().hasClass(d.wrapperClass)){var w=v.scrollTop();if(A=v.parent().find("."+d.barClass),z=v.parent().find("."+d.railClass),g(),a.isPlainObject(b)){if("height"in b&&"auto"==b.height){v.parent().css("height","auto"),v.css("height","auto");var x=v.parent().parent().height();v.parent().css("height",x),v.css("height",x)}if("scrollTo"in b)w=parseInt(d.scrollTo);else if("scrollBy"in b)w+=parseInt(d.scrollBy);else if("destroy"in b)return A.remove(),z.remove(),void v.unwrap();e(w,!1,!0)}}else if(!(a.isPlainObject(b)&&"destroy"in b)){d.height="auto"==d.height?v.parent().height():d.height;var y=a(r).addClass(d.wrapperClass).css({position:"relative",overflow:"hidden",width:d.width,height:d.height});v.css({overflow:"hidden",width:d.width,height:d.height});var z=a(r).addClass(d.railClass).css({width:d.size,height:"100%",position:"absolute",top:0,display:d.alwaysVisible&&d.railVisible?"block":"none","border-radius":d.railBorderRadius,background:d.railColor,opacity:d.railOpacity,zIndex:90}),A=a(r).addClass(d.barClass).css({background:d.color,width:d.size,position:"absolute",top:0,opacity:d.opacity,display:d.alwaysVisible?"block":"none","border-radius":d.borderRadius,BorderRadius:d.borderRadius,MozBorderRadius:d.borderRadius,WebkitBorderRadius:d.borderRadius,zIndex:99}),B="right"==d.position?{right:d.distance}:{left:d.distance};z.css(B),A.css(B),v.wrap(y),v.parent().append(A),v.parent().append(z),d.railDraggable&&A.bind("mousedown",function(b){var c=a(document);return l=!0,t=parseFloat(A.css("top")),pageY=b.pageY,c.bind("mousemove.slimscroll",function(a){currTop=t+a.pageY-pageY,A.css("top",currTop),e(0,A.position().top,!1)}),c.bind("mouseup.slimscroll",function(){l=!1,i(),c.unbind(".slimscroll")}),!1}).bind("selectstart.slimscroll",function(a){return a.stopPropagation(),a.preventDefault(),!1}),z.hover(function(){h()},function(){i()}),A.hover(function(){k=!0},function(){k=!1}),v.hover(function(){j=!0,h(),i()},function(){j=!1,i()}),v.bind("touchstart",function(a){a.originalEvent.touches.length&&(n=a.originalEvent.touches[0].pageY)}),v.bind("touchmove",function(a){if(u||a.originalEvent.preventDefault(),a.originalEvent.touches.length){var b=(n-a.originalEvent.touches[0].pageY)/d.touchScrollStep;e(b,!0),n=a.originalEvent.touches[0].pageY}}),g(),"bottom"===d.start?(A.css({top:v.outerHeight()-A.outerHeight()}),e(0,!0)):"top"!==d.start&&(e(a(d.start).position().top,null,!0),d.alwaysVisible||A.hide()),f()}}),this}}),a.fn.extend({slimscroll:a.fn.slimScroll})}(jQuery);
\ No newline at end of file
diff --git a/NewLife.Cube/Content/js/jquery.sparkline.min.js b/NewLife.Cube/Content/js/jquery.sparkline.min.js
deleted file mode 100644
index 151e376270..0000000000
--- a/NewLife.Cube/Content/js/jquery.sparkline.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-!function(a,b,c){!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):jQuery&&!jQuery.fn.sparkline&&a(jQuery)}(function(d){"use strict";var e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C,D,E,F,G,H,I,J,K={},L=0;e=function(){return{common:{type:"line",lineColor:"#00f",fillColor:"#cdf",defaultPixelsPerValue:3,width:"auto",height:"auto",composite:!1,tagValuesAttribute:"values",tagOptionsPrefix:"spark",enableTagOptions:!1,enableHighlight:!0,highlightLighten:1.4,tooltipSkipNull:!0,tooltipPrefix:"",tooltipSuffix:"",disableHiddenCheck:!1,numberFormatter:!1,numberDigitGroupCount:3,numberDigitGroupSep:",",numberDecimalMark:".",disableTooltips:!1,disableInteraction:!1},line:{spotColor:"#f80",highlightSpotColor:"#5f5",highlightLineColor:"#f22",spotRadius:1.5,minSpotColor:"#f80",maxSpotColor:"#f80",lineWidth:1,normalRangeMin:c,normalRangeMax:c,normalRangeColor:"#ccc",drawNormalOnTop:!1,chartRangeMin:c,chartRangeMax:c,chartRangeMinX:c,chartRangeMaxX:c,tooltipFormat:new g('<span style="color: {{color}}">&#9679;</span> {{prefix}}{{y}}{{suffix}}')},bar:{barColor:"#3366cc",negBarColor:"#f44",stackedBarColor:["#3366cc","#dc3912","#ff9900","#109618","#66aa00","#dd4477","#0099c6","#990099"],zeroColor:c,nullColor:c,zeroAxis:!0,barWidth:4,barSpacing:1,chartRangeMax:c,chartRangeMin:c,chartRangeClip:!1,colorMap:c,tooltipFormat:new g('<span style="color: {{color}}">&#9679;</span> {{prefix}}{{value}}{{suffix}}')},tristate:{barWidth:4,barSpacing:1,posBarColor:"#6f6",negBarColor:"#f44",zeroBarColor:"#999",colorMap:{},tooltipFormat:new g('<span style="color: {{color}}">&#9679;</span> {{value:map}}'),tooltipValueLookups:{map:{"-1":"Loss",0:"Draw",1:"Win"}}},discrete:{lineHeight:"auto",thresholdColor:c,thresholdValue:0,chartRangeMax:c,chartRangeMin:c,chartRangeClip:!1,tooltipFormat:new g("{{prefix}}{{value}}{{suffix}}")},bullet:{targetColor:"#f33",targetWidth:3,performanceColor:"#33f",rangeColors:["#d3dafe","#a8b6ff","#7f94ff"],base:c,tooltipFormat:new g("{{fieldkey:fields}} - {{value}}"),tooltipValueLookups:{fields:{r:"Range",p:"Performance",t:"Target"}}},pie:{offset:0,sliceColors:["#3366cc","#dc3912","#ff9900","#109618","#66aa00","#dd4477","#0099c6","#990099"],borderWidth:0,borderColor:"#000",tooltipFormat:new g('<span style="color: {{color}}">&#9679;</span> {{value}} ({{percent.1}}%)')},box:{raw:!1,boxLineColor:"#000",boxFillColor:"#cdf",whiskerColor:"#000",outlierLineColor:"#333",outlierFillColor:"#fff",medianColor:"#f00",showOutliers:!0,outlierIQR:1.5,spotRadius:1.5,target:c,targetColor:"#4a2",chartRangeMax:c,chartRangeMin:c,tooltipFormat:new g("{{field:fields}}: {{value}}"),tooltipFormatFieldlistKey:"field",tooltipValueLookups:{fields:{lq:"Lower Quartile",med:"Median",uq:"Upper Quartile",lo:"Left Outlier",ro:"Right Outlier",lw:"Left Whisker",rw:"Right Whisker"}}}}},D='.jqstooltip { position: absolute;left: 0px;top: 0px;visibility: hidden;background: rgb(0, 0, 0) transparent;background-color: rgba(0,0,0,0.6);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000, endColorstr=#99000000);-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000, endColorstr=#99000000)";color: white;font: 10px arial, san serif;text-align: left;white-space: nowrap;padding: 5px;border: 1px solid white;z-index: 10000;}.jqsfield { color: white;font: 10px arial, san serif;text-align: left;}',f=function(){var a,b;return a=function(){this.init.apply(this,arguments)},arguments.length>1?(arguments[0]?(a.prototype=d.extend(new arguments[0],arguments[arguments.length-1]),a._super=arguments[0].prototype):a.prototype=arguments[arguments.length-1],arguments.length>2&&(b=Array.prototype.slice.call(arguments,1,-1),b.unshift(a.prototype),d.extend.apply(d,b))):a.prototype=arguments[0],a.prototype.cls=a,a},d.SPFormatClass=g=f({fre:/\{\{([\w.]+?)(:(.+?))?\}\}/g,precre:/(\w+)\.(\d+)/,init:function(a,b){this.format=a,this.fclass=b},render:function(a,b,d){var e,f,g,h,i,j=this,k=a;return this.format.replace(this.fre,function(){var a;return f=arguments[1],g=arguments[3],e=j.precre.exec(f),e?(i=e[2],f=e[1]):i=!1,h=k[f],h===c?"":g&&b&&b[g]?(a=b[g],a.get?b[g].get(h)||h:b[g][h]||h):(m(h)&&(h=d.get("numberFormatter")?d.get("numberFormatter")(h):r(h,i,d.get("numberDigitGroupCount"),d.get("numberDigitGroupSep"),d.get("numberDecimalMark"))),h)})}}),d.spformat=function(a,b){return new g(a,b)},h=function(a,b,c){return b>a?b:a>c?c:a},i=function(a,c){var d;return 2===c?(d=b.floor(a.length/2),a.length%2?a[d]:(a[d-1]+a[d])/2):a.length%2?(d=(a.length*c+c)/4,d%1?(a[b.floor(d)]+a[b.floor(d)-1])/2:a[d-1]):(d=(a.length*c+2)/4,d%1?(a[b.floor(d)]+a[b.floor(d)-1])/2:a[d-1])},j=function(a){var b;switch(a){case"undefined":a=c;break;case"null":a=null;break;case"true":a=!0;break;case"false":a=!1;break;default:b=parseFloat(a),a==b&&(a=b)}return a},k=function(a){var b,c=[];for(b=a.length;b--;)c[b]=j(a[b]);return c},l=function(a,b){var c,d,e=[];for(c=0,d=a.length;d>c;c++)a[c]!==b&&e.push(a[c]);return e},m=function(a){return!isNaN(parseFloat(a))&&isFinite(a)},r=function(a,b,c,e,f){var g,h;for(a=(b===!1?parseFloat(a).toString():a.toFixed(b)).split(""),g=(g=d.inArray(".",a))<0?a.length:g,g<a.length&&(a[g]=f),h=g-c;h>0;h-=c)a.splice(h,0,e);return a.join("")},n=function(a,b,c){var d;for(d=b.length;d--;)if((!c||null!==b[d])&&b[d]!==a)return!1;return!0},o=function(a){var b,c=0;for(b=a.length;b--;)c+="number"==typeof a[b]?a[b]:0;return c},q=function(a){return d.isArray(a)?a:[a]},p=function(b){var c;a.createStyleSheet?a.createStyleSheet().cssText=b:(c=a.createElement("style"),c.type="text/css",a.getElementsByTagName("head")[0].appendChild(c),c["string"==typeof a.body.style.WebkitAppearance?"innerText":"innerHTML"]=b)},d.fn.simpledraw=function(b,e,f,g){var h,i;if(f&&(h=this.data("_jqs_vcanvas")))return h;if(d.fn.sparkline.canvas===!1)return!1;if(d.fn.sparkline.canvas===c){var j=a.createElement("canvas");if(j.getContext&&j.getContext("2d"))d.fn.sparkline.canvas=function(a,b,c,d){return new H(a,b,c,d)};else{if(!a.namespaces||a.namespaces.v)return d.fn.sparkline.canvas=!1,!1;a.namespaces.add("v","urn:schemas-microsoft-com:vml","#default#VML"),d.fn.sparkline.canvas=function(a,b,c){return new I(a,b,c)}}}return b===c&&(b=d(this).innerWidth()),e===c&&(e=d(this).innerHeight()),h=d.fn.sparkline.canvas(b,e,this,g),i=d(this).data("_jqs_mhandler"),i&&i.registerCanvas(h),h},d.fn.cleardraw=function(){var a=this.data("_jqs_vcanvas");a&&a.reset()},d.RangeMapClass=s=f({init:function(a){var b,c,d=[];for(b in a)a.hasOwnProperty(b)&&"string"==typeof b&&b.indexOf(":")>-1&&(c=b.split(":"),c[0]=0===c[0].length?-1/0:parseFloat(c[0]),c[1]=0===c[1].length?1/0:parseFloat(c[1]),c[2]=a[b],d.push(c));this.map=a,this.rangelist=d||!1},get:function(a){var b,d,e,f=this.rangelist;if((e=this.map[a])!==c)return e;if(f)for(b=f.length;b--;)if(d=f[b],d[0]<=a&&d[1]>=a)return d[2];return c}}),d.range_map=function(a){return new s(a)},t=f({init:function(a,b){var c=d(a);this.$el=c,this.options=b,this.currentPageX=0,this.currentPageY=0,this.el=a,this.splist=[],this.tooltip=null,this.over=!1,this.displayTooltips=!b.get("disableTooltips"),this.highlightEnabled=!b.get("disableHighlight")},registerSparkline:function(a){this.splist.push(a),this.over&&this.updateDisplay()},registerCanvas:function(a){var b=d(a.canvas);this.canvas=a,this.$canvas=b,b.mouseenter(d.proxy(this.mouseenter,this)),b.mouseleave(d.proxy(this.mouseleave,this)),b.click(d.proxy(this.mouseclick,this))},reset:function(a){this.splist=[],this.tooltip&&a&&(this.tooltip.remove(),this.tooltip=c)},mouseclick:function(a){var b=d.Event("sparklineClick");b.originalEvent=a,b.sparklines=this.splist,this.$el.trigger(b)},mouseenter:function(b){d(a.body).unbind("mousemove.jqs"),d(a.body).bind("mousemove.jqs",d.proxy(this.mousemove,this)),this.over=!0,this.currentPageX=b.pageX,this.currentPageY=b.pageY,this.currentEl=b.target,!this.tooltip&&this.displayTooltips&&(this.tooltip=new u(this.options),this.tooltip.updatePosition(b.pageX,b.pageY)),this.updateDisplay()},mouseleave:function(){d(a.body).unbind("mousemove.jqs");var b,c,e=this.splist,f=e.length,g=!1;for(this.over=!1,this.currentEl=null,this.tooltip&&(this.tooltip.remove(),this.tooltip=null),c=0;f>c;c++)b=e[c],b.clearRegionHighlight()&&(g=!0);g&&this.canvas.render()},mousemove:function(a){this.currentPageX=a.pageX,this.currentPageY=a.pageY,this.currentEl=a.target,this.tooltip&&this.tooltip.updatePosition(a.pageX,a.pageY),this.updateDisplay()},updateDisplay:function(){var a,b,c,e,f,g=this.splist,h=g.length,i=!1,j=this.$canvas.offset(),k=this.currentPageX-j.left,l=this.currentPageY-j.top;if(this.over){for(c=0;h>c;c++)b=g[c],e=b.setRegionHighlight(this.currentEl,k,l),e&&(i=!0);if(i){if(f=d.Event("sparklineRegionChange"),f.sparklines=this.splist,this.$el.trigger(f),this.tooltip){for(a="",c=0;h>c;c++)b=g[c],a+=b.getCurrentRegionTooltip();this.tooltip.setContent(a)}this.disableHighlight||this.canvas.render()}null===e&&this.mouseleave()}}}),u=f({sizeStyle:"position: static !important;display: block !important;visibility: hidden !important;float: left !important;",init:function(b){var c,e=b.get("tooltipClassname","jqstooltip"),f=this.sizeStyle;this.container=b.get("tooltipContainer")||a.body,this.tooltipOffsetX=b.get("tooltipOffsetX",10),this.tooltipOffsetY=b.get("tooltipOffsetY",12),d("#jqssizetip").remove(),d("#jqstooltip").remove(),this.sizetip=d("<div/>",{id:"jqssizetip",style:f,"class":e}),this.tooltip=d("<div/>",{id:"jqstooltip","class":e}).appendTo(this.container),c=this.tooltip.offset(),this.offsetLeft=c.left,this.offsetTop=c.top,this.hidden=!0,d(window).unbind("resize.jqs scroll.jqs"),d(window).bind("resize.jqs scroll.jqs",d.proxy(this.updateWindowDims,this)),this.updateWindowDims()},updateWindowDims:function(){this.scrollTop=d(window).scrollTop(),this.scrollLeft=d(window).scrollLeft(),this.scrollRight=this.scrollLeft+d(window).width(),this.updatePosition()},getSize:function(a){this.sizetip.html(a).appendTo(this.container),this.width=this.sizetip.width()+1,this.height=this.sizetip.height(),this.sizetip.remove()},setContent:function(a){return a?(this.getSize(a),this.tooltip.html(a).css({width:this.width,height:this.height,visibility:"visible"}),void(this.hidden&&(this.hidden=!1,this.updatePosition()))):(this.tooltip.css("visibility","hidden"),void(this.hidden=!0))},updatePosition:function(a,b){if(a===c){if(this.mousex===c)return;a=this.mousex-this.offsetLeft,b=this.mousey-this.offsetTop}else this.mousex=a-=this.offsetLeft,this.mousey=b-=this.offsetTop;this.height&&this.width&&!this.hidden&&(b-=this.height+this.tooltipOffsetY,a+=this.tooltipOffsetX,b<this.scrollTop&&(b=this.scrollTop),a<this.scrollLeft?a=this.scrollLeft:a+this.width>this.scrollRight&&(a=this.scrollRight-this.width),this.tooltip.css({left:a,top:b}))},remove:function(){this.tooltip.remove(),this.sizetip.remove(),this.sizetip=this.tooltip=c,d(window).unbind("resize.jqs scroll.jqs")}}),E=function(){p(D)},d(E),J=[],d.fn.sparkline=function(b,e){return this.each(function(){var f,g,h=new d.fn.sparkline.options(this,e),i=d(this);if(f=function(){var e,f,g,j,k,l,m;return"html"===b||b===c?(m=this.getAttribute(h.get("tagValuesAttribute")),(m===c||null===m)&&(m=i.html()),e=m.replace(/(^\s*<!--)|(-->\s*$)|\s+/g,"").split(",")):e=b,f="auto"===h.get("width")?e.length*h.get("defaultPixelsPerValue"):h.get("width"),"auto"===h.get("height")?h.get("composite")&&d.data(this,"_jqs_vcanvas")||(j=a.createElement("span"),j.innerHTML="a",i.html(j),g=d(j).innerHeight()||d(j).height(),d(j).remove(),j=null):g=h.get("height"),h.get("disableInteraction")?k=!1:(k=d.data(this,"_jqs_mhandler"),k?h.get("composite")||k.reset():(k=new t(this,h),d.data(this,"_jqs_mhandler",k))),h.get("composite")&&!d.data(this,"_jqs_vcanvas")?void(d.data(this,"_jqs_errnotify")||(alert("Attempted to attach a composite sparkline to an element with no existing sparkline"),d.data(this,"_jqs_errnotify",!0))):(l=new(d.fn.sparkline[h.get("type")])(this,e,h,f,g),l.render(),void(k&&k.registerSparkline(l)))},d(this).html()&&!h.get("disableHiddenCheck")&&d(this).is(":hidden")||!d(this).parents("body").length){if(!h.get("composite")&&d.data(this,"_jqs_pending"))for(g=J.length;g;g--)J[g-1][0]==this&&J.splice(g-1,1);J.push([this,f]),d.data(this,"_jqs_pending",!0)}else f.call(this)})},d.fn.sparkline.defaults=e(),d.sparkline_display_visible=function(){var a,b,c,e=[];for(b=0,c=J.length;c>b;b++)a=J[b][0],d(a).is(":visible")&&!d(a).parents().is(":hidden")?(J[b][1].call(a),d.data(J[b][0],"_jqs_pending",!1),e.push(b)):d(a).closest("html").length||d.data(a,"_jqs_pending")||(d.data(J[b][0],"_jqs_pending",!1),e.push(b));for(b=e.length;b;b--)J.splice(e[b-1],1)},d.fn.sparkline.options=f({init:function(a,b){var c,e,f,g;this.userOptions=b=b||{},this.tag=a,this.tagValCache={},e=d.fn.sparkline.defaults,f=e.common,this.tagOptionsPrefix=b.enableTagOptions&&(b.tagOptionsPrefix||f.tagOptionsPrefix),g=this.getTagSetting("type"),c=g===K?e[b.type||f.type]:e[g],this.mergedOptions=d.extend({},f,c,b)},getTagSetting:function(a){var b,d,e,f,g=this.tagOptionsPrefix;if(g===!1||g===c)return K;if(this.tagValCache.hasOwnProperty(a))b=this.tagValCache.key;else{if(b=this.tag.getAttribute(g+a),b===c||null===b)b=K;else if("["===b.substr(0,1))for(b=b.substr(1,b.length-2).split(","),d=b.length;d--;)b[d]=j(b[d].replace(/(^\s*)|(\s*$)/g,""));else if("{"===b.substr(0,1))for(e=b.substr(1,b.length-2).split(","),b={},d=e.length;d--;)f=e[d].split(":",2),b[f[0].replace(/(^\s*)|(\s*$)/g,"")]=j(f[1].replace(/(^\s*)|(\s*$)/g,""));else b=j(b);this.tagValCache.key=b}return b},get:function(a,b){var d,e=this.getTagSetting(a);return e!==K?e:(d=this.mergedOptions[a])===c?b:d}}),d.fn.sparkline._base=f({disabled:!1,init:function(a,b,e,f,g){this.el=a,this.$el=d(a),this.values=b,this.options=e,this.width=f,this.height=g,this.currentRegion=c},initTarget:function(){var a=!this.options.get("disableInteraction");(this.target=this.$el.simpledraw(this.width,this.height,this.options.get("composite"),a))?(this.canvasWidth=this.target.pixelWidth,this.canvasHeight=this.target.pixelHeight):this.disabled=!0},render:function(){return this.disabled?(this.el.innerHTML="",!1):!0},getRegion:function(){},setRegionHighlight:function(a,b,d){var e,f=this.currentRegion,g=!this.options.get("disableHighlight");return b>this.canvasWidth||d>this.canvasHeight||0>b||0>d?null:(e=this.getRegion(a,b,d),f!==e?(f!==c&&g&&this.removeHighlight(),this.currentRegion=e,e!==c&&g&&this.renderHighlight(),!0):!1)},clearRegionHighlight:function(){return this.currentRegion!==c?(this.removeHighlight(),this.currentRegion=c,!0):!1},renderHighlight:function(){this.changeHighlight(!0)},removeHighlight:function(){this.changeHighlight(!1)},changeHighlight:function(){},getCurrentRegionTooltip:function(){var a,b,e,f,h,i,j,k,l,m,n,o,p,q,r=this.options,s="",t=[];if(this.currentRegion===c)return"";if(a=this.getCurrentRegionFields(),n=r.get("tooltipFormatter"))return n(this,r,a);if(r.get("tooltipChartTitle")&&(s+='<div class="jqs jqstitle">'+r.get("tooltipChartTitle")+"</div>\n"),b=this.options.get("tooltipFormat"),!b)return"";if(d.isArray(b)||(b=[b]),d.isArray(a)||(a=[a]),j=this.options.get("tooltipFormatFieldlist"),k=this.options.get("tooltipFormatFieldlistKey"),j&&k){for(l=[],i=a.length;i--;)m=a[i][k],-1!=(q=d.inArray(m,j))&&(l[q]=a[i]);a=l}for(e=b.length,p=a.length,i=0;e>i;i++)for(o=b[i],"string"==typeof o&&(o=new g(o)),f=o.fclass||"jqsfield",q=0;p>q;q++)a[q].isNull&&r.get("tooltipSkipNull")||(d.extend(a[q],{prefix:r.get("tooltipPrefix"),suffix:r.get("tooltipSuffix")}),h=o.render(a[q],r.get("tooltipValueLookups"),r),t.push('<div class="'+f+'">'+h+"</div>"));return t.length?s+t.join("\n"):""},getCurrentRegionFields:function(){},calcHighlightColor:function(a,c){var d,e,f,g,i=c.get("highlightColor"),j=c.get("highlightLighten");if(i)return i;if(j&&(d=/^#([0-9a-f])([0-9a-f])([0-9a-f])$/i.exec(a)||/^#([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})$/i.exec(a))){for(f=[],e=4===a.length?16:1,g=0;3>g;g++)f[g]=h(b.round(parseInt(d[g+1],16)*e*j),0,255);return"rgb("+f.join(",")+")"}return a}}),v={changeHighlight:function(a){var b,c=this.currentRegion,e=this.target,f=this.regionShapes[c];f&&(b=this.renderRegion(c,a),d.isArray(b)||d.isArray(f)?(e.replaceWithShapes(f,b),this.regionShapes[c]=d.map(b,function(a){return a.id})):(e.replaceWithShape(f,b),this.regionShapes[c]=b.id))},render:function(){var a,b,c,e,f=this.values,g=this.target,h=this.regionShapes;if(this.cls._super.render.call(this)){for(c=f.length;c--;)if(a=this.renderRegion(c))if(d.isArray(a)){for(b=[],e=a.length;e--;)a[e].append(),b.push(a[e].id);h[c]=b}else a.append(),h[c]=a.id;else h[c]=null;g.render()}}},d.fn.sparkline.line=w=f(d.fn.sparkline._base,{type:"line",init:function(a,b,c,d,e){w._super.init.call(this,a,b,c,d,e),this.vertices=[],this.regionMap=[],this.xvalues=[],this.yvalues=[],this.yminmax=[],this.hightlightSpotId=null,this.lastShapeId=null,this.initTarget()},getRegion:function(a,b){var d,e=this.regionMap;for(d=e.length;d--;)if(null!==e[d]&&b>=e[d][0]&&b<=e[d][1])return e[d][2];return c},getCurrentRegionFields:function(){var a=this.currentRegion;return{isNull:null===this.yvalues[a],x:this.xvalues[a],y:this.yvalues[a],color:this.options.get("lineColor"),fillColor:this.options.get("fillColor"),offset:a}},renderHighlight:function(){var a,b,d=this.currentRegion,e=this.target,f=this.vertices[d],g=this.options,h=g.get("spotRadius"),i=g.get("highlightSpotColor"),j=g.get("highlightLineColor");f&&(h&&i&&(a=e.drawCircle(f[0],f[1],h,c,i),this.highlightSpotId=a.id,e.insertAfterShape(this.lastShapeId,a)),j&&(b=e.drawLine(f[0],this.canvasTop,f[0],this.canvasTop+this.canvasHeight,j),this.highlightLineId=b.id,e.insertAfterShape(this.lastShapeId,b)))},removeHighlight:function(){var a=this.target;this.highlightSpotId&&(a.removeShapeId(this.highlightSpotId),this.highlightSpotId=null),this.highlightLineId&&(a.removeShapeId(this.highlightLineId),this.highlightLineId=null)},scanValues:function(){var a,c,d,e,f,g=this.values,h=g.length,i=this.xvalues,j=this.yvalues,k=this.yminmax;for(a=0;h>a;a++)c=g[a],d="string"==typeof g[a],e="object"==typeof g[a]&&g[a]instanceof Array,f=d&&g[a].split(":"),d&&2===f.length?(i.push(Number(f[0])),j.push(Number(f[1])),k.push(Number(f[1]))):e?(i.push(c[0]),j.push(c[1]),k.push(c[1])):(i.push(a),null===g[a]||"null"===g[a]?j.push(null):(j.push(Number(c)),k.push(Number(c))));this.options.get("xvalues")&&(i=this.options.get("xvalues")),this.maxy=this.maxyorg=b.max.apply(b,k),this.miny=this.minyorg=b.min.apply(b,k),this.maxx=b.max.apply(b,i),this.minx=b.min.apply(b,i),this.xvalues=i,this.yvalues=j,this.yminmax=k},processRangeOptions:function(){var a=this.options,b=a.get("normalRangeMin"),d=a.get("normalRangeMax");b!==c&&(b<this.miny&&(this.miny=b),d>this.maxy&&(this.maxy=d)),a.get("chartRangeMin")!==c&&(a.get("chartRangeClip")||a.get("chartRangeMin")<this.miny)&&(this.miny=a.get("chartRangeMin")),a.get("chartRangeMax")!==c&&(a.get("chartRangeClip")||a.get("chartRangeMax")>this.maxy)&&(this.maxy=a.get("chartRangeMax")),a.get("chartRangeMinX")!==c&&(a.get("chartRangeClipX")||a.get("chartRangeMinX")<this.minx)&&(this.minx=a.get("chartRangeMinX")),a.get("chartRangeMaxX")!==c&&(a.get("chartRangeClipX")||a.get("chartRangeMaxX")>this.maxx)&&(this.maxx=a.get("chartRangeMaxX"))},drawNormalRange:function(a,d,e,f,g){var h=this.options.get("normalRangeMin"),i=this.options.get("normalRangeMax"),j=d+b.round(e-e*((i-this.miny)/g)),k=b.round(e*(i-h)/g);this.target.drawRect(a,j,f,k,c,this.options.get("normalRangeColor")).append()},render:function(){var a,e,f,g,h,i,j,k,l,m,n,o,p,q,r,t,u,v,x,y,z,A,B,C,D,E=this.options,F=this.target,G=this.canvasWidth,H=this.canvasHeight,I=this.vertices,J=E.get("spotRadius"),K=this.regionMap;if(w._super.render.call(this)&&(this.scanValues(),this.processRangeOptions(),B=this.xvalues,C=this.yvalues,this.yminmax.length&&!(this.yvalues.length<2))){for(g=h=0,a=this.maxx-this.minx===0?1:this.maxx-this.minx,e=this.maxy-this.miny===0?1:this.maxy-this.miny,f=this.yvalues.length-1,J&&(4*J>G||4*J>H)&&(J=0),J&&(z=E.get("highlightSpotColor")&&!E.get("disableInteraction"),(z||E.get("minSpotColor")||E.get("spotColor")&&C[f]===this.miny)&&(H-=b.ceil(J)),(z||E.get("maxSpotColor")||E.get("spotColor")&&C[f]===this.maxy)&&(H-=b.ceil(J),g+=b.ceil(J)),(z||(E.get("minSpotColor")||E.get("maxSpotColor"))&&(C[0]===this.miny||C[0]===this.maxy))&&(h+=b.ceil(J),G-=b.ceil(J)),(z||E.get("spotColor")||E.get("minSpotColor")||E.get("maxSpotColor")&&(C[f]===this.miny||C[f]===this.maxy))&&(G-=b.ceil(J))),H--,E.get("normalRangeMin")===c||E.get("drawNormalOnTop")||this.drawNormalRange(h,g,H,G,e),j=[],k=[j],q=r=null,t=C.length,D=0;t>D;D++)l=B[D],n=B[D+1],m=C[D],o=h+b.round((l-this.minx)*(G/a)),p=t-1>D?h+b.round((n-this.minx)*(G/a)):G,r=o+(p-o)/2,K[D]=[q||0,r,D],q=r,null===m?D&&(null!==C[D-1]&&(j=[],k.push(j)),I.push(null)):(m<this.miny&&(m=this.miny),m>this.maxy&&(m=this.maxy),j.length||j.push([o,g+H]),i=[o,g+b.round(H-H*((m-this.miny)/e))],j.push(i),I.push(i));for(u=[],v=[],x=k.length,D=0;x>D;D++)j=k[D],j.length&&(E.get("fillColor")&&(j.push([j[j.length-1][0],g+H]),v.push(j.slice(0)),j.pop()),j.length>2&&(j[0]=[j[0][0],j[1][1]]),u.push(j));for(x=v.length,D=0;x>D;D++)F.drawShape(v[D],E.get("fillColor"),E.get("fillColor")).append();for(E.get("normalRangeMin")!==c&&E.get("drawNormalOnTop")&&this.drawNormalRange(h,g,H,G,e),x=u.length,D=0;x>D;D++)F.drawShape(u[D],E.get("lineColor"),c,E.get("lineWidth")).append();if(J&&E.get("valueSpots"))for(y=E.get("valueSpots"),y.get===c&&(y=new s(y)),D=0;t>D;D++)A=y.get(C[D]),A&&F.drawCircle(h+b.round((B[D]-this.minx)*(G/a)),g+b.round(H-H*((C[D]-this.miny)/e)),J,c,A).append();J&&E.get("spotColor")&&null!==C[f]&&F.drawCircle(h+b.round((B[B.length-1]-this.minx)*(G/a)),g+b.round(H-H*((C[f]-this.miny)/e)),J,c,E.get("spotColor")).append(),this.maxy!==this.minyorg&&(J&&E.get("minSpotColor")&&(l=B[d.inArray(this.minyorg,C)],F.drawCircle(h+b.round((l-this.minx)*(G/a)),g+b.round(H-H*((this.minyorg-this.miny)/e)),J,c,E.get("minSpotColor")).append()),J&&E.get("maxSpotColor")&&(l=B[d.inArray(this.maxyorg,C)],F.drawCircle(h+b.round((l-this.minx)*(G/a)),g+b.round(H-H*((this.maxyorg-this.miny)/e)),J,c,E.get("maxSpotColor")).append())),this.lastShapeId=F.getLastShapeId(),this.canvasTop=g,F.render()}}}),d.fn.sparkline.bar=x=f(d.fn.sparkline._base,v,{type:"bar",init:function(a,e,f,g,i){var m,n,o,p,q,r,t,u,v,w,y,z,A,B,C,D,E,F,G,H,I,J,K=parseInt(f.get("barWidth"),10),L=parseInt(f.get("barSpacing"),10),M=f.get("chartRangeMin"),N=f.get("chartRangeMax"),O=f.get("chartRangeClip"),P=1/0,Q=-1/0;for(x._super.init.call(this,a,e,f,g,i),r=0,t=e.length;t>r;r++)H=e[r],m="string"==typeof H&&H.indexOf(":")>-1,(m||d.isArray(H))&&(C=!0,m&&(H=e[r]=k(H.split(":"))),H=l(H,null),n=b.min.apply(b,H),o=b.max.apply(b,H),P>n&&(P=n),o>Q&&(Q=o));this.stacked=C,this.regionShapes={},this.barWidth=K,this.barSpacing=L,this.totalBarWidth=K+L,this.width=g=e.length*K+(e.length-1)*L,this.initTarget(),O&&(A=M===c?-1/0:M,B=N===c?1/0:N),q=[],p=C?[]:q;var R=[],S=[];for(r=0,t=e.length;t>r;r++)if(C)for(D=e[r],e[r]=G=[],R[r]=0,p[r]=S[r]=0,E=0,F=D.length;F>E;E++)H=G[E]=O?h(D[E],A,B):D[E],null!==H&&(H>0&&(R[r]+=H),0>P&&Q>0?0>H?S[r]+=b.abs(H):p[r]+=H:p[r]+=b.abs(H-(0>H?Q:P)),q.push(H));else H=O?h(e[r],A,B):e[r],H=e[r]=j(H),null!==H&&q.push(H);this.max=z=b.max.apply(b,q),this.min=y=b.min.apply(b,q),this.stackMax=Q=C?b.max.apply(b,R):z,this.stackMin=P=C?b.min.apply(b,q):y,f.get("chartRangeMin")!==c&&(f.get("chartRangeClip")||f.get("chartRangeMin")<y)&&(y=f.get("chartRangeMin")),f.get("chartRangeMax")!==c&&(f.get("chartRangeClip")||f.get("chartRangeMax")>z)&&(z=f.get("chartRangeMax")),this.zeroAxis=v=f.get("zeroAxis",!0),w=0>=y&&z>=0&&v?0:0==v?y:y>0?y:z,this.xaxisOffset=w,u=C?b.max.apply(b,p)+b.max.apply(b,S):z-y,this.canvasHeightEf=v&&0>y?this.canvasHeight-2:this.canvasHeight-1,w>y?(J=C&&z>=0?Q:z,I=(J-w)/u*this.canvasHeight,I!==b.ceil(I)&&(this.canvasHeightEf-=2,I=b.ceil(I))):I=this.canvasHeight,this.yoffset=I,d.isArray(f.get("colorMap"))?(this.colorMapByIndex=f.get("colorMap"),this.colorMapByValue=null):(this.colorMapByIndex=null,this.colorMapByValue=f.get("colorMap"),this.colorMapByValue&&this.colorMapByValue.get===c&&(this.colorMapByValue=new s(this.colorMapByValue))),this.range=u},getRegion:function(a,d){var e=b.floor(d/this.totalBarWidth);return 0>e||e>=this.values.length?c:e},getCurrentRegionFields:function(){var a,b,c=this.currentRegion,d=q(this.values[c]),e=[];for(b=d.length;b--;)a=d[b],e.push({isNull:null===a,value:a,color:this.calcColor(b,a,c),offset:c});return e},calcColor:function(a,b,e){var f,g,h=this.colorMapByIndex,i=this.colorMapByValue,j=this.options;return f=j.get(this.stacked?"stackedBarColor":0>b?"negBarColor":"barColor"),0===b&&j.get("zeroColor")!==c&&(f=j.get("zeroColor")),i&&(g=i.get(b))?f=g:h&&h.length>e&&(f=h[e]),d.isArray(f)?f[a%f.length]:f},renderRegion:function(a,e){var f,g,h,i,j,k,l,m,o,p,q=this.values[a],r=this.options,s=this.xaxisOffset,t=[],u=this.range,v=this.stacked,w=this.target,x=a*this.totalBarWidth,y=this.canvasHeightEf,z=this.yoffset;if(q=d.isArray(q)?q:[q],l=q.length,m=q[0],i=n(null,q),p=n(s,q,!0),i)return r.get("nullColor")?(h=e?r.get("nullColor"):this.calcHighlightColor(r.get("nullColor"),r),f=z>0?z-1:z,w.drawRect(x,f,this.barWidth-1,0,h,h)):c;for(j=z,k=0;l>k;k++){if(m=q[k],v&&m===s){if(!p||o)continue;o=!0}g=u>0?b.floor(y*(b.abs(m-s)/u))+1:1,s>m||m===s&&0===z?(f=j,j+=g):(f=z-g,z-=g),h=this.calcColor(k,m,a),e&&(h=this.calcHighlightColor(h,r)),t.push(w.drawRect(x,f,this.barWidth-1,g-1,h,h))}return 1===t.length?t[0]:t}}),d.fn.sparkline.tristate=y=f(d.fn.sparkline._base,v,{type:"tristate",init:function(a,b,e,f,g){var h=parseInt(e.get("barWidth"),10),i=parseInt(e.get("barSpacing"),10);y._super.init.call(this,a,b,e,f,g),this.regionShapes={},this.barWidth=h,this.barSpacing=i,this.totalBarWidth=h+i,this.values=d.map(b,Number),this.width=f=b.length*h+(b.length-1)*i,d.isArray(e.get("colorMap"))?(this.colorMapByIndex=e.get("colorMap"),this.colorMapByValue=null):(this.colorMapByIndex=null,this.colorMapByValue=e.get("colorMap"),this.colorMapByValue&&this.colorMapByValue.get===c&&(this.colorMapByValue=new s(this.colorMapByValue))),this.initTarget()},getRegion:function(a,c){return b.floor(c/this.totalBarWidth)},getCurrentRegionFields:function(){var a=this.currentRegion;return{isNull:this.values[a]===c,value:this.values[a],color:this.calcColor(this.values[a],a),offset:a}},calcColor:function(a,b){var c,d,e=this.values,f=this.options,g=this.colorMapByIndex,h=this.colorMapByValue;return c=h&&(d=h.get(a))?d:g&&g.length>b?g[b]:f.get(e[b]<0?"negBarColor":e[b]>0?"posBarColor":"zeroBarColor")},renderRegion:function(a,c){var d,e,f,g,h,i,j=this.values,k=this.options,l=this.target;return d=l.pixelHeight,f=b.round(d/2),g=a*this.totalBarWidth,j[a]<0?(h=f,e=f-1):j[a]>0?(h=0,e=f-1):(h=f-1,e=2),i=this.calcColor(j[a],a),null!==i?(c&&(i=this.calcHighlightColor(i,k)),l.drawRect(g,h,this.barWidth-1,e-1,i,i)):void 0}}),d.fn.sparkline.discrete=z=f(d.fn.sparkline._base,v,{type:"discrete",init:function(a,e,f,g,h){z._super.init.call(this,a,e,f,g,h),this.regionShapes={},this.values=e=d.map(e,Number),this.min=b.min.apply(b,e),this.max=b.max.apply(b,e),this.range=this.max-this.min,this.width=g="auto"===f.get("width")?2*e.length:this.width,this.interval=b.floor(g/e.length),this.itemWidth=g/e.length,f.get("chartRangeMin")!==c&&(f.get("chartRangeClip")||f.get("chartRangeMin")<this.min)&&(this.min=f.get("chartRangeMin")),f.get("chartRangeMax")!==c&&(f.get("chartRangeClip")||f.get("chartRangeMax")>this.max)&&(this.max=f.get("chartRangeMax")),this.initTarget(),this.target&&(this.lineHeight="auto"===f.get("lineHeight")?b.round(.3*this.canvasHeight):f.get("lineHeight"))},getRegion:function(a,c){return b.floor(c/this.itemWidth)},getCurrentRegionFields:function(){var a=this.currentRegion;return{isNull:this.values[a]===c,value:this.values[a],offset:a}},renderRegion:function(a,c){var d,e,f,g,i=this.values,j=this.options,k=this.min,l=this.max,m=this.range,n=this.interval,o=this.target,p=this.canvasHeight,q=this.lineHeight,r=p-q;return e=h(i[a],k,l),g=a*n,d=b.round(r-r*((e-k)/m)),f=j.get(j.get("thresholdColor")&&e<j.get("thresholdValue")?"thresholdColor":"lineColor"),c&&(f=this.calcHighlightColor(f,j)),o.drawLine(g,d,g,d+q,f)}}),d.fn.sparkline.bullet=A=f(d.fn.sparkline._base,{type:"bullet",init:function(a,d,e,f,g){var h,i,j;A._super.init.call(this,a,d,e,f,g),this.values=d=k(d),j=d.slice(),j[0]=null===j[0]?j[2]:j[0],j[1]=null===d[1]?j[2]:j[1],h=b.min.apply(b,d),i=b.max.apply(b,d),h=e.get("base")===c?0>h?h:0:e.get("base"),this.min=h,this.max=i,this.range=i-h,this.shapes={},this.valueShapes={},this.regiondata={},this.width=f="auto"===e.get("width")?"4.0em":f,this.target=this.$el.simpledraw(f,g,e.get("composite")),d.length||(this.disabled=!0),this.initTarget()},getRegion:function(a,b,d){var e=this.target.getShapeAt(a,b,d);return e!==c&&this.shapes[e]!==c?this.shapes[e]:c},getCurrentRegionFields:function(){var a=this.currentRegion;return{fieldkey:a.substr(0,1),value:this.values[a.substr(1)],region:a}},changeHighlight:function(a){var b,c=this.currentRegion,d=this.valueShapes[c];switch(delete this.shapes[d],c.substr(0,1)){case"r":b=this.renderRange(c.substr(1),a);break;case"p":b=this.renderPerformance(a);break;case"t":b=this.renderTarget(a)}this.valueShapes[c]=b.id,this.shapes[b.id]=c,this.target.replaceWithShape(d,b)},renderRange:function(a,c){var d=this.values[a],e=b.round(this.canvasWidth*((d-this.min)/this.range)),f=this.options.get("rangeColors")[a-2];return c&&(f=this.calcHighlightColor(f,this.options)),this.target.drawRect(0,0,e-1,this.canvasHeight-1,f,f)},renderPerformance:function(a){var c=this.values[1],d=b.round(this.canvasWidth*((c-this.min)/this.range)),e=this.options.get("performanceColor");return a&&(e=this.calcHighlightColor(e,this.options)),this.target.drawRect(0,b.round(.3*this.canvasHeight),d-1,b.round(.4*this.canvasHeight)-1,e,e)},renderTarget:function(a){var c=this.values[0],d=b.round(this.canvasWidth*((c-this.min)/this.range)-this.options.get("targetWidth")/2),e=b.round(.1*this.canvasHeight),f=this.canvasHeight-2*e,g=this.options.get("targetColor");return a&&(g=this.calcHighlightColor(g,this.options)),this.target.drawRect(d,e,this.options.get("targetWidth")-1,f-1,g,g)},render:function(){var a,b,c=this.values.length,d=this.target;if(A._super.render.call(this)){for(a=2;c>a;a++)b=this.renderRange(a).append(),this.shapes[b.id]="r"+a,this.valueShapes["r"+a]=b.id;null!==this.values[1]&&(b=this.renderPerformance().append(),this.shapes[b.id]="p1",this.valueShapes.p1=b.id),null!==this.values[0]&&(b=this.renderTarget().append(),this.shapes[b.id]="t0",this.valueShapes.t0=b.id),d.render()}}}),d.fn.sparkline.pie=B=f(d.fn.sparkline._base,{type:"pie",init:function(a,c,e,f,g){var h,i=0;if(B._super.init.call(this,a,c,e,f,g),this.shapes={},this.valueShapes={},this.values=c=d.map(c,Number),"auto"===e.get("width")&&(this.width=this.height),c.length>0)for(h=c.length;h--;)i+=c[h];this.total=i,this.initTarget(),this.radius=b.floor(b.min(this.canvasWidth,this.canvasHeight)/2)},getRegion:function(a,b,d){var e=this.target.getShapeAt(a,b,d);return e!==c&&this.shapes[e]!==c?this.shapes[e]:c},getCurrentRegionFields:function(){var a=this.currentRegion;return{isNull:this.values[a]===c,value:this.values[a],percent:this.values[a]/this.total*100,color:this.options.get("sliceColors")[a%this.options.get("sliceColors").length],offset:a}},changeHighlight:function(a){var b=this.currentRegion,c=this.renderSlice(b,a),d=this.valueShapes[b];delete this.shapes[d],this.target.replaceWithShape(d,c),this.valueShapes[b]=c.id,this.shapes[c.id]=b},renderSlice:function(a,d){var e,f,g,h,i,j=this.target,k=this.options,l=this.radius,m=k.get("borderWidth"),n=k.get("offset"),o=2*b.PI,p=this.values,q=this.total,r=n?2*b.PI*(n/360):0;for(h=p.length,g=0;h>g;g++){if(e=r,f=r,q>0&&(f=r+o*(p[g]/q)),a===g)return i=k.get("sliceColors")[g%k.get("sliceColors").length],d&&(i=this.calcHighlightColor(i,k)),j.drawPieSlice(l,l,l-m,e,f,c,i);r=f}},render:function(){var a,d,e=this.target,f=this.values,g=this.options,h=this.radius,i=g.get("borderWidth");if(B._super.render.call(this)){for(i&&e.drawCircle(h,h,b.floor(h-i/2),g.get("borderColor"),c,i).append(),d=f.length;d--;)f[d]&&(a=this.renderSlice(d).append(),this.valueShapes[d]=a.id,this.shapes[a.id]=d);
-e.render()}}}),d.fn.sparkline.box=C=f(d.fn.sparkline._base,{type:"box",init:function(a,b,c,e,f){C._super.init.call(this,a,b,c,e,f),this.values=d.map(b,Number),this.width="auto"===c.get("width")?"4.0em":e,this.initTarget(),this.values.length||(this.disabled=1)},getRegion:function(){return 1},getCurrentRegionFields:function(){var a=[{field:"lq",value:this.quartiles[0]},{field:"med",value:this.quartiles[1]},{field:"uq",value:this.quartiles[2]}];return this.loutlier!==c&&a.push({field:"lo",value:this.loutlier}),this.routlier!==c&&a.push({field:"ro",value:this.routlier}),this.lwhisker!==c&&a.push({field:"lw",value:this.lwhisker}),this.rwhisker!==c&&a.push({field:"rw",value:this.rwhisker}),a},render:function(){var a,d,e,f,g,h,j,k,l,m,n,o=this.target,p=this.values,q=p.length,r=this.options,s=this.canvasWidth,t=this.canvasHeight,u=r.get("chartRangeMin")===c?b.min.apply(b,p):r.get("chartRangeMin"),v=r.get("chartRangeMax")===c?b.max.apply(b,p):r.get("chartRangeMax"),w=0;if(C._super.render.call(this)){if(r.get("raw"))r.get("showOutliers")&&p.length>5?(d=p[0],a=p[1],f=p[2],g=p[3],h=p[4],j=p[5],k=p[6]):(a=p[0],f=p[1],g=p[2],h=p[3],j=p[4]);else if(p.sort(function(a,b){return a-b}),f=i(p,1),g=i(p,2),h=i(p,3),e=h-f,r.get("showOutliers")){for(a=j=c,l=0;q>l;l++)a===c&&p[l]>f-e*r.get("outlierIQR")&&(a=p[l]),p[l]<h+e*r.get("outlierIQR")&&(j=p[l]);d=p[0],k=p[q-1]}else a=p[0],j=p[q-1];this.quartiles=[f,g,h],this.lwhisker=a,this.rwhisker=j,this.loutlier=d,this.routlier=k,n=s/(v-u+1),r.get("showOutliers")&&(w=b.ceil(r.get("spotRadius")),s-=2*b.ceil(r.get("spotRadius")),n=s/(v-u+1),a>d&&o.drawCircle((d-u)*n+w,t/2,r.get("spotRadius"),r.get("outlierLineColor"),r.get("outlierFillColor")).append(),k>j&&o.drawCircle((k-u)*n+w,t/2,r.get("spotRadius"),r.get("outlierLineColor"),r.get("outlierFillColor")).append()),o.drawRect(b.round((f-u)*n+w),b.round(.1*t),b.round((h-f)*n),b.round(.8*t),r.get("boxLineColor"),r.get("boxFillColor")).append(),o.drawLine(b.round((a-u)*n+w),b.round(t/2),b.round((f-u)*n+w),b.round(t/2),r.get("lineColor")).append(),o.drawLine(b.round((a-u)*n+w),b.round(t/4),b.round((a-u)*n+w),b.round(t-t/4),r.get("whiskerColor")).append(),o.drawLine(b.round((j-u)*n+w),b.round(t/2),b.round((h-u)*n+w),b.round(t/2),r.get("lineColor")).append(),o.drawLine(b.round((j-u)*n+w),b.round(t/4),b.round((j-u)*n+w),b.round(t-t/4),r.get("whiskerColor")).append(),o.drawLine(b.round((g-u)*n+w),b.round(.1*t),b.round((g-u)*n+w),b.round(.9*t),r.get("medianColor")).append(),r.get("target")&&(m=b.ceil(r.get("spotRadius")),o.drawLine(b.round((r.get("target")-u)*n+w),b.round(t/2-m),b.round((r.get("target")-u)*n+w),b.round(t/2+m),r.get("targetColor")).append(),o.drawLine(b.round((r.get("target")-u)*n+w-m),b.round(t/2),b.round((r.get("target")-u)*n+w+m),b.round(t/2),r.get("targetColor")).append()),o.render()}}}),F=f({init:function(a,b,c,d){this.target=a,this.id=b,this.type=c,this.args=d},append:function(){return this.target.appendShape(this),this}}),G=f({_pxregex:/(\d+)(px)?\s*$/i,init:function(a,b,c){a&&(this.width=a,this.height=b,this.target=c,this.lastShapeId=null,c[0]&&(c=c[0]),d.data(c,"_jqs_vcanvas",this))},drawLine:function(a,b,c,d,e,f){return this.drawShape([[a,b],[c,d]],e,f)},drawShape:function(a,b,c,d){return this._genShape("Shape",[a,b,c,d])},drawCircle:function(a,b,c,d,e,f){return this._genShape("Circle",[a,b,c,d,e,f])},drawPieSlice:function(a,b,c,d,e,f,g){return this._genShape("PieSlice",[a,b,c,d,e,f,g])},drawRect:function(a,b,c,d,e,f){return this._genShape("Rect",[a,b,c,d,e,f])},getElement:function(){return this.canvas},getLastShapeId:function(){return this.lastShapeId},reset:function(){alert("reset not implemented")},_insert:function(a,b){d(b).html(a)},_calculatePixelDims:function(a,b,c){var e;e=this._pxregex.exec(b),this.pixelHeight=e?e[1]:d(c).height(),e=this._pxregex.exec(a),this.pixelWidth=e?e[1]:d(c).width()},_genShape:function(a,b){var c=L++;return b.unshift(c),new F(this,c,a,b)},appendShape:function(){alert("appendShape not implemented")},replaceWithShape:function(){alert("replaceWithShape not implemented")},insertAfterShape:function(){alert("insertAfterShape not implemented")},removeShapeId:function(){alert("removeShapeId not implemented")},getShapeAt:function(){alert("getShapeAt not implemented")},render:function(){alert("render not implemented")}}),H=f(G,{init:function(b,e,f,g){H._super.init.call(this,b,e,f),this.canvas=a.createElement("canvas"),f[0]&&(f=f[0]),d.data(f,"_jqs_vcanvas",this),d(this.canvas).css({display:"inline-block",width:b,height:e,verticalAlign:"top"}),this._insert(this.canvas,f),this._calculatePixelDims(b,e,this.canvas),this.canvas.width=this.pixelWidth,this.canvas.height=this.pixelHeight,this.interact=g,this.shapes={},this.shapeseq=[],this.currentTargetShapeId=c,d(this.canvas).css({width:this.pixelWidth,height:this.pixelHeight})},_getContext:function(a,b,d){var e=this.canvas.getContext("2d");return a!==c&&(e.strokeStyle=a),e.lineWidth=d===c?1:d,b!==c&&(e.fillStyle=b),e},reset:function(){var a=this._getContext();a.clearRect(0,0,this.pixelWidth,this.pixelHeight),this.shapes={},this.shapeseq=[],this.currentTargetShapeId=c},_drawShape:function(a,b,d,e,f){var g,h,i=this._getContext(d,e,f);for(i.beginPath(),i.moveTo(b[0][0]+.5,b[0][1]+.5),g=1,h=b.length;h>g;g++)i.lineTo(b[g][0]+.5,b[g][1]+.5);d!==c&&i.stroke(),e!==c&&i.fill(),this.targetX!==c&&this.targetY!==c&&i.isPointInPath(this.targetX,this.targetY)&&(this.currentTargetShapeId=a)},_drawCircle:function(a,d,e,f,g,h,i){var j=this._getContext(g,h,i);j.beginPath(),j.arc(d,e,f,0,2*b.PI,!1),this.targetX!==c&&this.targetY!==c&&j.isPointInPath(this.targetX,this.targetY)&&(this.currentTargetShapeId=a),g!==c&&j.stroke(),h!==c&&j.fill()},_drawPieSlice:function(a,b,d,e,f,g,h,i){var j=this._getContext(h,i);j.beginPath(),j.moveTo(b,d),j.arc(b,d,e,f,g,!1),j.lineTo(b,d),j.closePath(),h!==c&&j.stroke(),i&&j.fill(),this.targetX!==c&&this.targetY!==c&&j.isPointInPath(this.targetX,this.targetY)&&(this.currentTargetShapeId=a)},_drawRect:function(a,b,c,d,e,f,g){return this._drawShape(a,[[b,c],[b+d,c],[b+d,c+e],[b,c+e],[b,c]],f,g)},appendShape:function(a){return this.shapes[a.id]=a,this.shapeseq.push(a.id),this.lastShapeId=a.id,a.id},replaceWithShape:function(a,b){var c,d=this.shapeseq;for(this.shapes[b.id]=b,c=d.length;c--;)d[c]==a&&(d[c]=b.id);delete this.shapes[a]},replaceWithShapes:function(a,b){var c,d,e,f=this.shapeseq,g={};for(d=a.length;d--;)g[a[d]]=!0;for(d=f.length;d--;)c=f[d],g[c]&&(f.splice(d,1),delete this.shapes[c],e=d);for(d=b.length;d--;)f.splice(e,0,b[d].id),this.shapes[b[d].id]=b[d]},insertAfterShape:function(a,b){var c,d=this.shapeseq;for(c=d.length;c--;)if(d[c]===a)return d.splice(c+1,0,b.id),void(this.shapes[b.id]=b)},removeShapeId:function(a){var b,c=this.shapeseq;for(b=c.length;b--;)if(c[b]===a){c.splice(b,1);break}delete this.shapes[a]},getShapeAt:function(a,b,c){return this.targetX=b,this.targetY=c,this.render(),this.currentTargetShapeId},render:function(){var a,b,c,d=this.shapeseq,e=this.shapes,f=d.length,g=this._getContext();for(g.clearRect(0,0,this.pixelWidth,this.pixelHeight),c=0;f>c;c++)a=d[c],b=e[a],this["_draw"+b.type].apply(this,b.args);this.interact||(this.shapes={},this.shapeseq=[])}}),I=f(G,{init:function(b,c,e){var f;I._super.init.call(this,b,c,e),e[0]&&(e=e[0]),d.data(e,"_jqs_vcanvas",this),this.canvas=a.createElement("span"),d(this.canvas).css({display:"inline-block",position:"relative",overflow:"hidden",width:b,height:c,margin:"0px",padding:"0px",verticalAlign:"top"}),this._insert(this.canvas,e),this._calculatePixelDims(b,c,this.canvas),this.canvas.width=this.pixelWidth,this.canvas.height=this.pixelHeight,f='<v:group coordorigin="0 0" coordsize="'+this.pixelWidth+" "+this.pixelHeight+'" style="position:absolute;top:0;left:0;width:'+this.pixelWidth+"px;height="+this.pixelHeight+'px;"></v:group>',this.canvas.insertAdjacentHTML("beforeEnd",f),this.group=d(this.canvas).children()[0],this.rendered=!1,this.prerender=""},_drawShape:function(a,b,d,e,f){var g,h,i,j,k,l,m,n=[];for(m=0,l=b.length;l>m;m++)n[m]=""+b[m][0]+","+b[m][1];return g=n.splice(0,1),f=f===c?1:f,h=d===c?' stroked="false" ':' strokeWeight="'+f+'px" strokeColor="'+d+'" ',i=e===c?' filled="false"':' fillColor="'+e+'" filled="true" ',j=n[0]===n[n.length-1]?"x ":"",k='<v:shape coordorigin="0 0" coordsize="'+this.pixelWidth+" "+this.pixelHeight+'"  id="jqsshape'+a+'" '+h+i+' style="position:absolute;left:0px;top:0px;height:'+this.pixelHeight+"px;width:"+this.pixelWidth+'px;padding:0px;margin:0px;"  path="m '+g+" l "+n.join(", ")+" "+j+'e"> </v:shape>'},_drawCircle:function(a,b,d,e,f,g,h){var i,j,k;return b-=e,d-=e,i=f===c?' stroked="false" ':' strokeWeight="'+h+'px" strokeColor="'+f+'" ',j=g===c?' filled="false"':' fillColor="'+g+'" filled="true" ',k='<v:oval  id="jqsshape'+a+'" '+i+j+' style="position:absolute;top:'+d+"px; left:"+b+"px; width:"+2*e+"px; height:"+2*e+'px"></v:oval>'},_drawPieSlice:function(a,d,e,f,g,h,i,j){var k,l,m,n,o,p,q,r;if(g===h)return"";if(h-g===2*b.PI&&(g=0,h=2*b.PI),l=d+b.round(b.cos(g)*f),m=e+b.round(b.sin(g)*f),n=d+b.round(b.cos(h)*f),o=e+b.round(b.sin(h)*f),l===n&&m===o){if(h-g<b.PI)return"";l=n=d+f,m=o=e}return l===n&&m===o&&h-g<b.PI?"":(k=[d-f,e-f,d+f,e+f,l,m,n,o],p=i===c?' stroked="false" ':' strokeWeight="1px" strokeColor="'+i+'" ',q=j===c?' filled="false"':' fillColor="'+j+'" filled="true" ',r='<v:shape coordorigin="0 0" coordsize="'+this.pixelWidth+" "+this.pixelHeight+'"  id="jqsshape'+a+'" '+p+q+' style="position:absolute;left:0px;top:0px;height:'+this.pixelHeight+"px;width:"+this.pixelWidth+'px;padding:0px;margin:0px;"  path="m '+d+","+e+" wa "+k.join(", ")+' x e"> </v:shape>')},_drawRect:function(a,b,c,d,e,f,g){return this._drawShape(a,[[b,c],[b,c+e],[b+d,c+e],[b+d,c],[b,c]],f,g)},reset:function(){this.group.innerHTML=""},appendShape:function(a){var b=this["_draw"+a.type].apply(this,a.args);return this.rendered?this.group.insertAdjacentHTML("beforeEnd",b):this.prerender+=b,this.lastShapeId=a.id,a.id},replaceWithShape:function(a,b){var c=d("#jqsshape"+a),e=this["_draw"+b.type].apply(this,b.args);c[0].outerHTML=e},replaceWithShapes:function(a,b){var c,e=d("#jqsshape"+a[0]),f="",g=b.length;for(c=0;g>c;c++)f+=this["_draw"+b[c].type].apply(this,b[c].args);for(e[0].outerHTML=f,c=1;c<a.length;c++)d("#jqsshape"+a[c]).remove()},insertAfterShape:function(a,b){var c=d("#jqsshape"+a),e=this["_draw"+b.type].apply(this,b.args);c[0].insertAdjacentHTML("afterEnd",e)},removeShapeId:function(a){var b=d("#jqsshape"+a);this.group.removeChild(b[0])},getShapeAt:function(a){var b=a.id.substr(8);return b},render:function(){this.rendered||(this.group.innerHTML=this.prerender,this.rendered=!0)}})})}(document,Math);
\ No newline at end of file
diff --git a/NewLife.Cube/Content/js/jquery.ui.touch-punch.min.js b/NewLife.Cube/Content/js/jquery.ui.touch-punch.min.js
deleted file mode 100644
index 89e34f45d7..0000000000
--- a/NewLife.Cube/Content/js/jquery.ui.touch-punch.min.js
+++ /dev/null
@@ -1,11 +0,0 @@
-/*!
- * jQuery UI Touch Punch 0.2.3
- *
- * Copyright 2011–2014, Dave Furfero
- * Dual licensed under the MIT or GPL Version 2 licenses.
- *
- * Depends:
- *  jquery.ui.widget.js
- *  jquery.ui.mouse.js
- */
-!function(a){function b(a,b,c){if(!(a.originalEvent.touches.length>1)){c!==!1&&a.preventDefault();var d=a.originalEvent.changedTouches[0],e=document.createEvent("MouseEvents");e.initMouseEvent(b,!0,!0,window,1,d.screenX,d.screenY,d.clientX,d.clientY,!1,!1,!1,!1,0,null),a.target.dispatchEvent(e)}}if(a.support.touch="ontouchend"in document,a.support.touch){var c,d=a.ui.mouse.prototype,e=d._mouseInit,f=d._mouseDestroy;d._touchStart=function(a){var d=this;!c&&d._mouseCapture(a.originalEvent.changedTouches[0])&&(c=!0,d._touchMoved=!1,b(a,"mouseover",!1),b(a,"mousemove",!1),b(a,"mousedown",!1))},d._touchMove=function(a){c&&(this._touchMoved=!0,b(a,"mousemove"))},d._touchEnd=function(a){c&&(b(a,"mouseup"),b(a,"mouseout"),this._touchMoved||b(a,"click"),c=!1)},d._mouseInit=function(){var b=this;b.element.bind({touchstart:a.proxy(b,"_touchStart"),touchmove:a.proxy(b,"_touchMove"),touchend:a.proxy(b,"_touchEnd")}),e.call(b)},d._mouseDestroy=function(){var b=this;b.element.unbind({touchstart:a.proxy(b,"_touchStart"),touchmove:a.proxy(b,"_touchMove"),touchend:a.proxy(b,"_touchEnd")}),f.call(b)}}}(jQuery);
\ No newline at end of file
diff --git a/NewLife.Cube/Content/js/jquery.validate.min.js b/NewLife.Cube/Content/js/jquery.validate.min.js
deleted file mode 100644
index 859a8b714d..0000000000
--- a/NewLife.Cube/Content/js/jquery.validate.min.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/*!
- * jQuery Validation Plugin v1.13.1
- *
- * http://jqueryvalidation.org/
- *
- * Copyright (c) 2014 Jörn Zaefferer
- * Released under the MIT license
- */
-!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):a(jQuery)}(function(a){a.extend(a.fn,{validate:function(b){if(!this.length)return void(b&&b.debug&&window.console&&console.warn("Nothing selected, can't validate, returning nothing."));var c=a.data(this[0],"validator");return c?c:(this.attr("novalidate","novalidate"),c=new a.validator(b,this[0]),a.data(this[0],"validator",c),c.settings.onsubmit&&(this.validateDelegate(":submit","click",function(b){c.settings.submitHandler&&(c.submitButton=b.target),a(b.target).hasClass("cancel")&&(c.cancelSubmit=!0),void 0!==a(b.target).attr("formnovalidate")&&(c.cancelSubmit=!0)}),this.submit(function(b){function d(){var d,e;return c.settings.submitHandler?(c.submitButton&&(d=a("<input type='hidden'/>").attr("name",c.submitButton.name).val(a(c.submitButton).val()).appendTo(c.currentForm)),e=c.settings.submitHandler.call(c,c.currentForm,b),c.submitButton&&d.remove(),void 0!==e?e:!1):!0}return c.settings.debug&&b.preventDefault(),c.cancelSubmit?(c.cancelSubmit=!1,d()):c.form()?c.pendingRequest?(c.formSubmitted=!0,!1):d():(c.focusInvalid(),!1)})),c)},valid:function(){var b,c;return a(this[0]).is("form")?b=this.validate().form():(b=!0,c=a(this[0].form).validate(),this.each(function(){b=c.element(this)&&b})),b},removeAttrs:function(b){var c={},d=this;return a.each(b.split(/\s/),function(a,b){c[b]=d.attr(b),d.removeAttr(b)}),c},rules:function(b,c){var d,e,f,g,h,i,j=this[0];if(b)switch(d=a.data(j.form,"validator").settings,e=d.rules,f=a.validator.staticRules(j),b){case"add":a.extend(f,a.validator.normalizeRule(c)),delete f.messages,e[j.name]=f,c.messages&&(d.messages[j.name]=a.extend(d.messages[j.name],c.messages));break;case"remove":return c?(i={},a.each(c.split(/\s/),function(b,c){i[c]=f[c],delete f[c],"required"===c&&a(j).removeAttr("aria-required")}),i):(delete e[j.name],f)}return g=a.validator.normalizeRules(a.extend({},a.validator.classRules(j),a.validator.attributeRules(j),a.validator.dataRules(j),a.validator.staticRules(j)),j),g.required&&(h=g.required,delete g.required,g=a.extend({required:h},g),a(j).attr("aria-required","true")),g.remote&&(h=g.remote,delete g.remote,g=a.extend(g,{remote:h})),g}}),a.extend(a.expr[":"],{blank:function(b){return!a.trim(""+a(b).val())},filled:function(b){return!!a.trim(""+a(b).val())},unchecked:function(b){return!a(b).prop("checked")}}),a.validator=function(b,c){this.settings=a.extend(!0,{},a.validator.defaults,b),this.currentForm=c,this.init()},a.validator.format=function(b,c){return 1===arguments.length?function(){var c=a.makeArray(arguments);return c.unshift(b),a.validator.format.apply(this,c)}:(arguments.length>2&&c.constructor!==Array&&(c=a.makeArray(arguments).slice(1)),c.constructor!==Array&&(c=[c]),a.each(c,function(a,c){b=b.replace(new RegExp("\\{"+a+"\\}","g"),function(){return c})}),b)},a.extend(a.validator,{defaults:{messages:{},groups:{},rules:{},errorClass:"error",validClass:"valid",errorElement:"label",focusCleanup:!1,focusInvalid:!0,errorContainer:a([]),errorLabelContainer:a([]),onsubmit:!0,ignore:":hidden",ignoreTitle:!1,onfocusin:function(a){this.lastActive=a,this.settings.focusCleanup&&(this.settings.unhighlight&&this.settings.unhighlight.call(this,a,this.settings.errorClass,this.settings.validClass),this.hideThese(this.errorsFor(a)))},onfocusout:function(a){this.checkable(a)||!(a.name in this.submitted)&&this.optional(a)||this.element(a)},onkeyup:function(a,b){(9!==b.which||""!==this.elementValue(a))&&(a.name in this.submitted||a===this.lastElement)&&this.element(a)},onclick:function(a){a.name in this.submitted?this.element(a):a.parentNode.name in this.submitted&&this.element(a.parentNode)},highlight:function(b,c,d){"radio"===b.type?this.findByName(b.name).addClass(c).removeClass(d):a(b).addClass(c).removeClass(d)},unhighlight:function(b,c,d){"radio"===b.type?this.findByName(b.name).removeClass(c).addClass(d):a(b).removeClass(c).addClass(d)}},setDefaults:function(b){a.extend(a.validator.defaults,b)},messages:{required:"This field is required.",remote:"Please fix this field.",email:"Please enter a valid email address.",url:"Please enter a valid URL.",date:"Please enter a valid date.",dateISO:"Please enter a valid date ( ISO ).",number:"Please enter a valid number.",digits:"Please enter only digits.",creditcard:"Please enter a valid credit card number.",equalTo:"Please enter the same value again.",maxlength:a.validator.format("Please enter no more than {0} characters."),minlength:a.validator.format("Please enter at least {0} characters."),rangelength:a.validator.format("Please enter a value between {0} and {1} characters long."),range:a.validator.format("Please enter a value between {0} and {1}."),max:a.validator.format("Please enter a value less than or equal to {0}."),min:a.validator.format("Please enter a value greater than or equal to {0}.")},autoCreateRanges:!1,prototype:{init:function(){function b(b){var c=a.data(this[0].form,"validator"),d="on"+b.type.replace(/^validate/,""),e=c.settings;e[d]&&!this.is(e.ignore)&&e[d].call(c,this[0],b)}this.labelContainer=a(this.settings.errorLabelContainer),this.errorContext=this.labelContainer.length&&this.labelContainer||a(this.currentForm),this.containers=a(this.settings.errorContainer).add(this.settings.errorLabelContainer),this.submitted={},this.valueCache={},this.pendingRequest=0,this.pending={},this.invalid={},this.reset();var c,d=this.groups={};a.each(this.settings.groups,function(b,c){"string"==typeof c&&(c=c.split(/\s/)),a.each(c,function(a,c){d[c]=b})}),c=this.settings.rules,a.each(c,function(b,d){c[b]=a.validator.normalizeRule(d)}),a(this.currentForm).validateDelegate(":text, [type='password'], [type='file'], select, textarea, [type='number'], [type='search'] ,[type='tel'], [type='url'], [type='email'], [type='datetime'], [type='date'], [type='month'], [type='week'], [type='time'], [type='datetime-local'], [type='range'], [type='color'], [type='radio'], [type='checkbox']","focusin focusout keyup",b).validateDelegate("select, option, [type='radio'], [type='checkbox']","click",b),this.settings.invalidHandler&&a(this.currentForm).bind("invalid-form.validate",this.settings.invalidHandler),a(this.currentForm).find("[required], [data-rule-required], .required").attr("aria-required","true")},form:function(){return this.checkForm(),a.extend(this.submitted,this.errorMap),this.invalid=a.extend({},this.errorMap),this.valid()||a(this.currentForm).triggerHandler("invalid-form",[this]),this.showErrors(),this.valid()},checkForm:function(){this.prepareForm();for(var a=0,b=this.currentElements=this.elements();b[a];a++)this.check(b[a]);return this.valid()},element:function(b){var c=this.clean(b),d=this.validationTargetFor(c),e=!0;return this.lastElement=d,void 0===d?delete this.invalid[c.name]:(this.prepareElement(d),this.currentElements=a(d),e=this.check(d)!==!1,e?delete this.invalid[d.name]:this.invalid[d.name]=!0),a(b).attr("aria-invalid",!e),this.numberOfInvalids()||(this.toHide=this.toHide.add(this.containers)),this.showErrors(),e},showErrors:function(b){if(b){a.extend(this.errorMap,b),this.errorList=[];for(var c in b)this.errorList.push({message:b[c],element:this.findByName(c)[0]});this.successList=a.grep(this.successList,function(a){return!(a.name in b)})}this.settings.showErrors?this.settings.showErrors.call(this,this.errorMap,this.errorList):this.defaultShowErrors()},resetForm:function(){a.fn.resetForm&&a(this.currentForm).resetForm(),this.submitted={},this.lastElement=null,this.prepareForm(),this.hideErrors(),this.elements().removeClass(this.settings.errorClass).removeData("previousValue").removeAttr("aria-invalid")},numberOfInvalids:function(){return this.objectLength(this.invalid)},objectLength:function(a){var b,c=0;for(b in a)c++;return c},hideErrors:function(){this.hideThese(this.toHide)},hideThese:function(a){a.not(this.containers).text(""),this.addWrapper(a).hide()},valid:function(){return 0===this.size()},size:function(){return this.errorList.length},focusInvalid:function(){if(this.settings.focusInvalid)try{a(this.findLastActive()||this.errorList.length&&this.errorList[0].element||[]).filter(":visible").focus().trigger("focusin")}catch(b){}},findLastActive:function(){var b=this.lastActive;return b&&1===a.grep(this.errorList,function(a){return a.element.name===b.name}).length&&b},elements:function(){var b=this,c={};return a(this.currentForm).find("input, select, textarea").not(":submit, :reset, :image, [disabled], [readonly]").not(this.settings.ignore).filter(function(){return!this.name&&b.settings.debug&&window.console&&console.error("%o has no name assigned",this),this.name in c||!b.objectLength(a(this).rules())?!1:(c[this.name]=!0,!0)})},clean:function(b){return a(b)[0]},errors:function(){var b=this.settings.errorClass.split(" ").join(".");return a(this.settings.errorElement+"."+b,this.errorContext)},reset:function(){this.successList=[],this.errorList=[],this.errorMap={},this.toShow=a([]),this.toHide=a([]),this.currentElements=a([])},prepareForm:function(){this.reset(),this.toHide=this.errors().add(this.containers)},prepareElement:function(a){this.reset(),this.toHide=this.errorsFor(a)},elementValue:function(b){var c,d=a(b),e=b.type;return"radio"===e||"checkbox"===e?a("input[name='"+b.name+"']:checked").val():"number"===e&&"undefined"!=typeof b.validity?b.validity.badInput?!1:d.val():(c=d.val(),"string"==typeof c?c.replace(/\r/g,""):c)},check:function(b){b=this.validationTargetFor(this.clean(b));var c,d,e,f=a(b).rules(),g=a.map(f,function(a,b){return b}).length,h=!1,i=this.elementValue(b);for(d in f){e={method:d,parameters:f[d]};try{if(c=a.validator.methods[d].call(this,i,b,e.parameters),"dependency-mismatch"===c&&1===g){h=!0;continue}if(h=!1,"pending"===c)return void(this.toHide=this.toHide.not(this.errorsFor(b)));if(!c)return this.formatAndAdd(b,e),!1}catch(j){throw this.settings.debug&&window.console&&console.log("Exception occurred when checking element "+b.id+", check the '"+e.method+"' method.",j),j}}if(!h)return this.objectLength(f)&&this.successList.push(b),!0},customDataMessage:function(b,c){return a(b).data("msg"+c.charAt(0).toUpperCase()+c.substring(1).toLowerCase())||a(b).data("msg")},customMessage:function(a,b){var c=this.settings.messages[a];return c&&(c.constructor===String?c:c[b])},findDefined:function(){for(var a=0;a<arguments.length;a++)if(void 0!==arguments[a])return arguments[a];return void 0},defaultMessage:function(b,c){return this.findDefined(this.customMessage(b.name,c),this.customDataMessage(b,c),!this.settings.ignoreTitle&&b.title||void 0,a.validator.messages[c],"<strong>Warning: No message defined for "+b.name+"</strong>")},formatAndAdd:function(b,c){var d=this.defaultMessage(b,c.method),e=/\$?\{(\d+)\}/g;"function"==typeof d?d=d.call(this,c.parameters,b):e.test(d)&&(d=a.validator.format(d.replace(e,"{$1}"),c.parameters)),this.errorList.push({message:d,element:b,method:c.method}),this.errorMap[b.name]=d,this.submitted[b.name]=d},addWrapper:function(a){return this.settings.wrapper&&(a=a.add(a.parent(this.settings.wrapper))),a},defaultShowErrors:function(){var a,b,c;for(a=0;this.errorList[a];a++)c=this.errorList[a],this.settings.highlight&&this.settings.highlight.call(this,c.element,this.settings.errorClass,this.settings.validClass),this.showLabel(c.element,c.message);if(this.errorList.length&&(this.toShow=this.toShow.add(this.containers)),this.settings.success)for(a=0;this.successList[a];a++)this.showLabel(this.successList[a]);if(this.settings.unhighlight)for(a=0,b=this.validElements();b[a];a++)this.settings.unhighlight.call(this,b[a],this.settings.errorClass,this.settings.validClass);this.toHide=this.toHide.not(this.toShow),this.hideErrors(),this.addWrapper(this.toShow).show()},validElements:function(){return this.currentElements.not(this.invalidElements())},invalidElements:function(){return a(this.errorList).map(function(){return this.element})},showLabel:function(b,c){var d,e,f,g=this.errorsFor(b),h=this.idOrName(b),i=a(b).attr("aria-describedby");g.length?(g.removeClass(this.settings.validClass).addClass(this.settings.errorClass),g.html(c)):(g=a("<"+this.settings.errorElement+">").attr("id",h+"-error").addClass(this.settings.errorClass).html(c||""),d=g,this.settings.wrapper&&(d=g.hide().show().wrap("<"+this.settings.wrapper+"/>").parent()),this.labelContainer.length?this.labelContainer.append(d):this.settings.errorPlacement?this.settings.errorPlacement(d,a(b)):d.insertAfter(b),g.is("label")?g.attr("for",h):0===g.parents("label[for='"+h+"']").length&&(f=g.attr("id").replace(/(:|\.|\[|\])/g,"\\$1"),i?i.match(new RegExp("\\b"+f+"\\b"))||(i+=" "+f):i=f,a(b).attr("aria-describedby",i),e=this.groups[b.name],e&&a.each(this.groups,function(b,c){c===e&&a("[name='"+b+"']",this.currentForm).attr("aria-describedby",g.attr("id"))}))),!c&&this.settings.success&&(g.text(""),"string"==typeof this.settings.success?g.addClass(this.settings.success):this.settings.success(g,b)),this.toShow=this.toShow.add(g)},errorsFor:function(b){var c=this.idOrName(b),d=a(b).attr("aria-describedby"),e="label[for='"+c+"'], label[for='"+c+"'] *";return d&&(e=e+", #"+d.replace(/\s+/g,", #")),this.errors().filter(e)},idOrName:function(a){return this.groups[a.name]||(this.checkable(a)?a.name:a.id||a.name)},validationTargetFor:function(b){return this.checkable(b)&&(b=this.findByName(b.name)),a(b).not(this.settings.ignore)[0]},checkable:function(a){return/radio|checkbox/i.test(a.type)},findByName:function(b){return a(this.currentForm).find("[name='"+b+"']")},getLength:function(b,c){switch(c.nodeName.toLowerCase()){case"select":return a("option:selected",c).length;case"input":if(this.checkable(c))return this.findByName(c.name).filter(":checked").length}return b.length},depend:function(a,b){return this.dependTypes[typeof a]?this.dependTypes[typeof a](a,b):!0},dependTypes:{"boolean":function(a){return a},string:function(b,c){return!!a(b,c.form).length},"function":function(a,b){return a(b)}},optional:function(b){var c=this.elementValue(b);return!a.validator.methods.required.call(this,c,b)&&"dependency-mismatch"},startRequest:function(a){this.pending[a.name]||(this.pendingRequest++,this.pending[a.name]=!0)},stopRequest:function(b,c){this.pendingRequest--,this.pendingRequest<0&&(this.pendingRequest=0),delete this.pending[b.name],c&&0===this.pendingRequest&&this.formSubmitted&&this.form()?(a(this.currentForm).submit(),this.formSubmitted=!1):!c&&0===this.pendingRequest&&this.formSubmitted&&(a(this.currentForm).triggerHandler("invalid-form",[this]),this.formSubmitted=!1)},previousValue:function(b){return a.data(b,"previousValue")||a.data(b,"previousValue",{old:null,valid:!0,message:this.defaultMessage(b,"remote")})}},classRuleSettings:{required:{required:!0},email:{email:!0},url:{url:!0},date:{date:!0},dateISO:{dateISO:!0},number:{number:!0},digits:{digits:!0},creditcard:{creditcard:!0}},addClassRules:function(b,c){b.constructor===String?this.classRuleSettings[b]=c:a.extend(this.classRuleSettings,b)},classRules:function(b){var c={},d=a(b).attr("class");return d&&a.each(d.split(" "),function(){this in a.validator.classRuleSettings&&a.extend(c,a.validator.classRuleSettings[this])}),c},attributeRules:function(b){var c,d,e={},f=a(b),g=b.getAttribute("type");for(c in a.validator.methods)"required"===c?(d=b.getAttribute(c),""===d&&(d=!0),d=!!d):d=f.attr(c),/min|max/.test(c)&&(null===g||/number|range|text/.test(g))&&(d=Number(d)),d||0===d?e[c]=d:g===c&&"range"!==g&&(e[c]=!0);return e.maxlength&&/-1|2147483647|524288/.test(e.maxlength)&&delete e.maxlength,e},dataRules:function(b){var c,d,e={},f=a(b);for(c in a.validator.methods)d=f.data("rule"+c.charAt(0).toUpperCase()+c.substring(1).toLowerCase()),void 0!==d&&(e[c]=d);return e},staticRules:function(b){var c={},d=a.data(b.form,"validator");return d.settings.rules&&(c=a.validator.normalizeRule(d.settings.rules[b.name])||{}),c},normalizeRules:function(b,c){return a.each(b,function(d,e){if(e===!1)return void delete b[d];if(e.param||e.depends){var f=!0;switch(typeof e.depends){case"string":f=!!a(e.depends,c.form).length;break;case"function":f=e.depends.call(c,c)}f?b[d]=void 0!==e.param?e.param:!0:delete b[d]}}),a.each(b,function(d,e){b[d]=a.isFunction(e)?e(c):e}),a.each(["minlength","maxlength"],function(){b[this]&&(b[this]=Number(b[this]))}),a.each(["rangelength","range"],function(){var c;b[this]&&(a.isArray(b[this])?b[this]=[Number(b[this][0]),Number(b[this][1])]:"string"==typeof b[this]&&(c=b[this].replace(/[\[\]]/g,"").split(/[\s,]+/),b[this]=[Number(c[0]),Number(c[1])]))}),a.validator.autoCreateRanges&&(null!=b.min&&null!=b.max&&(b.range=[b.min,b.max],delete b.min,delete b.max),null!=b.minlength&&null!=b.maxlength&&(b.rangelength=[b.minlength,b.maxlength],delete b.minlength,delete b.maxlength)),b},normalizeRule:function(b){if("string"==typeof b){var c={};a.each(b.split(/\s/),function(){c[this]=!0}),b=c}return b},addMethod:function(b,c,d){a.validator.methods[b]=c,a.validator.messages[b]=void 0!==d?d:a.validator.messages[b],c.length<3&&a.validator.addClassRules(b,a.validator.normalizeRule(b))},methods:{required:function(b,c,d){if(!this.depend(d,c))return"dependency-mismatch";if("select"===c.nodeName.toLowerCase()){var e=a(c).val();return e&&e.length>0}return this.checkable(c)?this.getLength(b,c)>0:a.trim(b).length>0},email:function(a,b){return this.optional(b)||/^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/.test(a)},url:function(a,b){return this.optional(b)||/^(https?|s?ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i.test(a)},date:function(a,b){return this.optional(b)||!/Invalid|NaN/.test(new Date(a).toString())},dateISO:function(a,b){return this.optional(b)||/^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$/.test(a)},number:function(a,b){return this.optional(b)||/^-?(?:\d+|\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/.test(a)},digits:function(a,b){return this.optional(b)||/^\d+$/.test(a)},creditcard:function(a,b){if(this.optional(b))return"dependency-mismatch";if(/[^0-9 \-]+/.test(a))return!1;var c,d,e=0,f=0,g=!1;if(a=a.replace(/\D/g,""),a.length<13||a.length>19)return!1;for(c=a.length-1;c>=0;c--)d=a.charAt(c),f=parseInt(d,10),g&&(f*=2)>9&&(f-=9),e+=f,g=!g;return e%10===0},minlength:function(b,c,d){var e=a.isArray(b)?b.length:this.getLength(b,c);return this.optional(c)||e>=d},maxlength:function(b,c,d){var e=a.isArray(b)?b.length:this.getLength(b,c);return this.optional(c)||d>=e},rangelength:function(b,c,d){var e=a.isArray(b)?b.length:this.getLength(b,c);return this.optional(c)||e>=d[0]&&e<=d[1]},min:function(a,b,c){return this.optional(b)||a>=c},max:function(a,b,c){return this.optional(b)||c>=a},range:function(a,b,c){return this.optional(b)||a>=c[0]&&a<=c[1]},equalTo:function(b,c,d){var e=a(d);return this.settings.onfocusout&&e.unbind(".validate-equalTo").bind("blur.validate-equalTo",function(){a(c).valid()}),b===e.val()},remote:function(b,c,d){if(this.optional(c))return"dependency-mismatch";var e,f,g=this.previousValue(c);return this.settings.messages[c.name]||(this.settings.messages[c.name]={}),g.originalMessage=this.settings.messages[c.name].remote,this.settings.messages[c.name].remote=g.message,d="string"==typeof d&&{url:d}||d,g.old===b?g.valid:(g.old=b,e=this,this.startRequest(c),f={},f[c.name]=b,a.ajax(a.extend(!0,{url:d,mode:"abort",port:"validate"+c.name,dataType:"json",data:f,context:e.currentForm,success:function(d){var f,h,i,j=d===!0||"true"===d;e.settings.messages[c.name].remote=g.originalMessage,j?(i=e.formSubmitted,e.prepareElement(c),e.formSubmitted=i,e.successList.push(c),delete e.invalid[c.name],e.showErrors()):(f={},h=d||e.defaultMessage(c,"remote"),f[c.name]=g.message=a.isFunction(h)?h(b):h,e.invalid[c.name]=!0,e.showErrors(f)),g.valid=j,e.stopRequest(c,j)}},d)),"pending")}}}),a.format=function(){throw"$.format has been deprecated. Please use $.validator.format instead."};var b,c={};a.ajaxPrefilter?a.ajaxPrefilter(function(a,b,d){var e=a.port;"abort"===a.mode&&(c[e]&&c[e].abort(),c[e]=d)}):(b=a.ajax,a.ajax=function(d){var e=("mode"in d?d:a.ajaxSettings).mode,f=("port"in d?d:a.ajaxSettings).port;return"abort"===e?(c[f]&&c[f].abort(),c[f]=b.apply(this,arguments),c[f]):b.apply(this,arguments)}),a.extend(a.fn,{validateDelegate:function(b,c,d){return this.bind(c,function(c){var e=a(c.target);return e.is(b)?d.apply(e,arguments):void 0})}})});
\ No newline at end of file
diff --git a/NewLife.Cube/Content/js/jquery1x.min.js b/NewLife.Cube/Content/js/jquery1x.min.js
deleted file mode 100644
index 6ebb9a1b9b..0000000000
--- a/NewLife.Cube/Content/js/jquery1x.min.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/*!
- * jQuery JavaScript Library v1.11.1
- * http://jquery.com/
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- *
- * Copyright 2005, 2014 jQuery Foundation, Inc. and other contributors
- * Released under the MIT license
- * http://jquery.org/license
- *
- * Date: 2014-05-01T17:42Z
- */
-!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){function c(a){var b=a.length,c=eb.type(a);return"function"===c||eb.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}function d(a,b,c){if(eb.isFunction(b))return eb.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return eb.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(mb.test(b))return eb.filter(b,a,c);b=eb.filter(b,a)}return eb.grep(a,function(a){return eb.inArray(a,b)>=0!==c})}function e(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}function f(a){var b=ub[a]={};return eb.each(a.match(tb)||[],function(a,c){b[c]=!0}),b}function g(){ob.addEventListener?(ob.removeEventListener("DOMContentLoaded",h,!1),a.removeEventListener("load",h,!1)):(ob.detachEvent("onreadystatechange",h),a.detachEvent("onload",h))}function h(){(ob.addEventListener||"load"===event.type||"complete"===ob.readyState)&&(g(),eb.ready())}function i(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(zb,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:yb.test(c)?eb.parseJSON(c):c}catch(e){}eb.data(a,b,c)}else c=void 0}return c}function j(a){var b;for(b in a)if(("data"!==b||!eb.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;return!0}function k(a,b,c,d){if(eb.acceptData(a)){var e,f,g=eb.expando,h=a.nodeType,i=h?eb.cache:a,j=h?a[g]:a[g]&&g;if(j&&i[j]&&(d||i[j].data)||void 0!==c||"string"!=typeof b)return j||(j=h?a[g]=W.pop()||eb.guid++:g),i[j]||(i[j]=h?{}:{toJSON:eb.noop}),("object"==typeof b||"function"==typeof b)&&(d?i[j]=eb.extend(i[j],b):i[j].data=eb.extend(i[j].data,b)),f=i[j],d||(f.data||(f.data={}),f=f.data),void 0!==c&&(f[eb.camelCase(b)]=c),"string"==typeof b?(e=f[b],null==e&&(e=f[eb.camelCase(b)])):e=f,e}}function l(a,b,c){if(eb.acceptData(a)){var d,e,f=a.nodeType,g=f?eb.cache:a,h=f?a[eb.expando]:eb.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){eb.isArray(b)?b=b.concat(eb.map(b,eb.camelCase)):b in d?b=[b]:(b=eb.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;for(;e--;)delete d[b[e]];if(c?!j(d):!eb.isEmptyObject(d))return}(c||(delete g[h].data,j(g[h])))&&(f?eb.cleanData([a],!0):cb.deleteExpando||g!=g.window?delete g[h]:g[h]=null)}}}function m(){return!0}function n(){return!1}function o(){try{return ob.activeElement}catch(a){}}function p(a){var b=Kb.split("|"),c=a.createDocumentFragment();if(c.createElement)for(;b.length;)c.createElement(b.pop());return c}function q(a,b){var c,d,e=0,f=typeof a.getElementsByTagName!==xb?a.getElementsByTagName(b||"*"):typeof a.querySelectorAll!==xb?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||eb.nodeName(d,b)?f.push(d):eb.merge(f,q(d,b));return void 0===b||b&&eb.nodeName(a,b)?eb.merge([a],f):f}function r(a){Eb.test(a.type)&&(a.defaultChecked=a.checked)}function s(a,b){return eb.nodeName(a,"table")&&eb.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function t(a){return a.type=(null!==eb.find.attr(a,"type"))+"/"+a.type,a}function u(a){var b=Vb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function v(a,b){for(var c,d=0;null!=(c=a[d]);d++)eb._data(c,"globalEval",!b||eb._data(b[d],"globalEval"))}function w(a,b){if(1===b.nodeType&&eb.hasData(a)){var c,d,e,f=eb._data(a),g=eb._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)eb.event.add(b,c,h[c][d])}g.data&&(g.data=eb.extend({},g.data))}}function x(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!cb.noCloneEvent&&b[eb.expando]){e=eb._data(b);for(d in e.events)eb.removeEvent(b,d,e.handle);b.removeAttribute(eb.expando)}"script"===c&&b.text!==a.text?(t(b).text=a.text,u(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),cb.html5Clone&&a.innerHTML&&!eb.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&Eb.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}function y(b,c){var d,e=eb(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:eb.css(e[0],"display");return e.detach(),f}function z(a){var b=ob,c=_b[a];return c||(c=y(a,b),"none"!==c&&c||($b=($b||eb("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=($b[0].contentWindow||$b[0].contentDocument).document,b.write(),b.close(),c=y(a,b),$b.detach()),_b[a]=c),c}function A(a,b){return{get:function(){var c=a();if(null!=c)return c?void delete this.get:(this.get=b).apply(this,arguments)}}}function B(a,b){if(b in a)return b;for(var c=b.charAt(0).toUpperCase()+b.slice(1),d=b,e=mc.length;e--;)if(b=mc[e]+c,b in a)return b;return d}function C(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=eb._data(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&Cb(d)&&(f[g]=eb._data(d,"olddisplay",z(d.nodeName)))):(e=Cb(d),(c&&"none"!==c||!e)&&eb._data(d,"olddisplay",e?c:eb.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}function D(a,b,c){var d=ic.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function E(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=eb.css(a,c+Bb[f],!0,e)),d?("content"===c&&(g-=eb.css(a,"padding"+Bb[f],!0,e)),"margin"!==c&&(g-=eb.css(a,"border"+Bb[f]+"Width",!0,e))):(g+=eb.css(a,"padding"+Bb[f],!0,e),"padding"!==c&&(g+=eb.css(a,"border"+Bb[f]+"Width",!0,e)));return g}function F(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=ac(a),g=cb.boxSizing&&"border-box"===eb.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=bc(a,b,f),(0>e||null==e)&&(e=a.style[b]),dc.test(e))return e;d=g&&(cb.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+E(a,b,c||(g?"border":"content"),d,f)+"px"}function G(a,b,c,d,e){return new G.prototype.init(a,b,c,d,e)}function H(){return setTimeout(function(){nc=void 0}),nc=eb.now()}function I(a,b){var c,d={height:a},e=0;for(b=b?1:0;4>e;e+=2-b)c=Bb[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d.width=a),d}function J(a,b,c){for(var d,e=(tc[b]||[]).concat(tc["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function K(a,b,c){var d,e,f,g,h,i,j,k,l=this,m={},n=a.style,o=a.nodeType&&Cb(a),p=eb._data(a,"fxshow");c.queue||(h=eb._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,l.always(function(){l.always(function(){h.unqueued--,eb.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[n.overflow,n.overflowX,n.overflowY],j=eb.css(a,"display"),k="none"===j?eb._data(a,"olddisplay")||z(a.nodeName):j,"inline"===k&&"none"===eb.css(a,"float")&&(cb.inlineBlockNeedsLayout&&"inline"!==z(a.nodeName)?n.zoom=1:n.display="inline-block")),c.overflow&&(n.overflow="hidden",cb.shrinkWrapBlocks()||l.always(function(){n.overflow=c.overflow[0],n.overflowX=c.overflow[1],n.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],pc.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(o?"hide":"show")){if("show"!==e||!p||void 0===p[d])continue;o=!0}m[d]=p&&p[d]||eb.style(a,d)}else j=void 0;if(eb.isEmptyObject(m))"inline"===("none"===j?z(a.nodeName):j)&&(n.display=j);else{p?"hidden"in p&&(o=p.hidden):p=eb._data(a,"fxshow",{}),f&&(p.hidden=!o),o?eb(a).show():l.done(function(){eb(a).hide()}),l.done(function(){var b;eb._removeData(a,"fxshow");for(b in m)eb.style(a,b,m[b])});for(d in m)g=J(o?p[d]:0,d,l),d in p||(p[d]=g.start,o&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function L(a,b){var c,d,e,f,g;for(c in a)if(d=eb.camelCase(c),e=b[d],f=a[c],eb.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=eb.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function M(a,b,c){var d,e,f=0,g=sc.length,h=eb.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=nc||H(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:eb.extend({},b),opts:eb.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:nc||H(),duration:c.duration,tweens:[],createTween:function(b,c){var d=eb.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;for(L(k,j.opts.specialEasing);g>f;f++)if(d=sc[f].call(j,a,k,j.opts))return d;return eb.map(k,J,j),eb.isFunction(j.opts.start)&&j.opts.start.call(a,j),eb.fx.timer(eb.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}function N(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(tb)||[];if(eb.isFunction(c))for(;d=f[e++];)"+"===d.charAt(0)?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function O(a,b,c,d){function e(h){var i;return f[h]=!0,eb.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||g||f[j]?g?!(i=j):void 0:(b.dataTypes.unshift(j),e(j),!1)}),i}var f={},g=a===Rc;return e(b.dataTypes[0])||!f["*"]&&e("*")}function P(a,b){var c,d,e=eb.ajaxSettings.flatOptions||{};for(d in b)void 0!==b[d]&&((e[d]?a:c||(c={}))[d]=b[d]);return c&&eb.extend(!0,a,c),a}function Q(a,b,c){for(var d,e,f,g,h=a.contents,i=a.dataTypes;"*"===i[0];)i.shift(),void 0===e&&(e=a.mimeType||b.getResponseHeader("Content-Type"));if(e)for(g in h)if(h[g]&&h[g].test(e)){i.unshift(g);break}if(i[0]in c)f=i[0];else{for(g in c){if(!i[0]||a.converters[g+" "+i[0]]){f=g;break}d||(d=g)}f=f||d}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function R(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];for(f=k.shift();f;)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}function S(a,b,c,d){var e;if(eb.isArray(b))eb.each(b,function(b,e){c||Vc.test(a)?d(a,e):S(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==eb.type(b))d(a,b);else for(e in b)S(a+"["+e+"]",b[e],c,d)}function T(){try{return new a.XMLHttpRequest}catch(b){}}function U(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function V(a){return eb.isWindow(a)?a:9===a.nodeType?a.defaultView||a.parentWindow:!1}var W=[],X=W.slice,Y=W.concat,Z=W.push,$=W.indexOf,_={},ab=_.toString,bb=_.hasOwnProperty,cb={},db="1.11.1",eb=function(a,b){return new eb.fn.init(a,b)},fb=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,gb=/^-ms-/,hb=/-([\da-z])/gi,ib=function(a,b){return b.toUpperCase()};eb.fn=eb.prototype={jquery:db,constructor:eb,selector:"",length:0,toArray:function(){return X.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:X.call(this)},pushStack:function(a){var b=eb.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return eb.each(this,a,b)},map:function(a){return this.pushStack(eb.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(X.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:Z,sort:W.sort,splice:W.splice},eb.extend=eb.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||eb.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(eb.isPlainObject(c)||(b=eb.isArray(c)))?(b?(b=!1,f=a&&eb.isArray(a)?a:[]):f=a&&eb.isPlainObject(a)?a:{},g[d]=eb.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},eb.extend({expando:"jQuery"+(db+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===eb.type(a)},isArray:Array.isArray||function(a){return"array"===eb.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){return!eb.isArray(a)&&a-parseFloat(a)>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==eb.type(a)||a.nodeType||eb.isWindow(a))return!1;try{if(a.constructor&&!bb.call(a,"constructor")&&!bb.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(cb.ownLast)for(b in a)return bb.call(a,b);for(b in a);return void 0===b||bb.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?_[ab.call(a)]||"object":typeof a},globalEval:function(b){b&&eb.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(gb,"ms-").replace(hb,ib)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,d){var e,f=0,g=a.length,h=c(a);if(d){if(h)for(;g>f&&(e=b.apply(a[f],d),e!==!1);f++);else for(f in a)if(e=b.apply(a[f],d),e===!1)break}else if(h)for(;g>f&&(e=b.call(a[f],f,a[f]),e!==!1);f++);else for(f in a)if(e=b.call(a[f],f,a[f]),e===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(fb,"")},makeArray:function(a,b){var d=b||[];return null!=a&&(c(Object(a))?eb.merge(d,"string"==typeof a?[a]:a):Z.call(d,a)),d},inArray:function(a,b,c){var d;if(b){if($)return $.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){for(var c=+b.length,d=0,e=a.length;c>d;)a[e++]=b[d++];if(c!==c)for(;void 0!==b[d];)a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,d){var e,f=0,g=a.length,h=c(a),i=[];if(h)for(;g>f;f++)e=b(a[f],f,d),null!=e&&i.push(e);else for(f in a)e=b(a[f],f,d),null!=e&&i.push(e);return Y.apply([],i)},guid:1,proxy:function(a,b){var c,d,e;return"string"==typeof b&&(e=a[b],b=a,a=e),eb.isFunction(a)?(c=X.call(arguments,2),d=function(){return a.apply(b||this,c.concat(X.call(arguments)))},d.guid=a.guid=a.guid||eb.guid++,d):void 0},now:function(){return+new Date},support:cb}),eb.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){_["[object "+b+"]"]=b.toLowerCase()});var jb=/*!
- * Sizzle CSS Selector Engine v1.10.19
- * http://sizzlejs.com/
- *
- * Copyright 2013 jQuery Foundation, Inc. and other contributors
- * Released under the MIT license
- * http://jquery.org/license
- *
- * Date: 2014-04-18
- */
-function(a){function b(a,b,c,d){var e,f,g,h,i,j,l,n,o,p;if((b?b.ownerDocument||b:O)!==G&&F(b),b=b||G,c=c||[],!a||"string"!=typeof a)return c;if(1!==(h=b.nodeType)&&9!==h)return[];if(I&&!d){if(e=sb.exec(a))if(g=e[1]){if(9===h){if(f=b.getElementById(g),!f||!f.parentNode)return c;if(f.id===g)return c.push(f),c}else if(b.ownerDocument&&(f=b.ownerDocument.getElementById(g))&&M(b,f)&&f.id===g)return c.push(f),c}else{if(e[2])return _.apply(c,b.getElementsByTagName(a)),c;if((g=e[3])&&v.getElementsByClassName&&b.getElementsByClassName)return _.apply(c,b.getElementsByClassName(g)),c}if(v.qsa&&(!J||!J.test(a))){if(n=l=N,o=b,p=9===h&&a,1===h&&"object"!==b.nodeName.toLowerCase()){for(j=z(a),(l=b.getAttribute("id"))?n=l.replace(ub,"\\$&"):b.setAttribute("id",n),n="[id='"+n+"'] ",i=j.length;i--;)j[i]=n+m(j[i]);o=tb.test(a)&&k(b.parentNode)||b,p=j.join(",")}if(p)try{return _.apply(c,o.querySelectorAll(p)),c}catch(q){}finally{l||b.removeAttribute("id")}}}return B(a.replace(ib,"$1"),b,c,d)}function c(){function a(c,d){return b.push(c+" ")>w.cacheLength&&delete a[b.shift()],a[c+" "]=d}var b=[];return a}function d(a){return a[N]=!0,a}function e(a){var b=G.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function f(a,b){for(var c=a.split("|"),d=a.length;d--;)w.attrHandle[c[d]]=b}function g(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||W)-(~a.sourceIndex||W);if(d)return d;if(c)for(;c=c.nextSibling;)if(c===b)return-1;return a?1:-1}function h(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function i(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function j(a){return d(function(b){return b=+b,d(function(c,d){for(var e,f=a([],c.length,b),g=f.length;g--;)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function k(a){return a&&typeof a.getElementsByTagName!==V&&a}function l(){}function m(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function n(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=Q++;return b.first?function(b,c,f){for(;b=b[d];)if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[P,f];if(g){for(;b=b[d];)if((1===b.nodeType||e)&&a(b,c,g))return!0}else for(;b=b[d];)if(1===b.nodeType||e){if(i=b[N]||(b[N]={}),(h=i[d])&&h[0]===P&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function o(a){return a.length>1?function(b,c,d){for(var e=a.length;e--;)if(!a[e](b,c,d))return!1;return!0}:a[0]}function p(a,c,d){for(var e=0,f=c.length;f>e;e++)b(a,c[e],d);return d}function q(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function r(a,b,c,e,f,g){return e&&!e[N]&&(e=r(e)),f&&!f[N]&&(f=r(f,g)),d(function(d,g,h,i){var j,k,l,m=[],n=[],o=g.length,r=d||p(b||"*",h.nodeType?[h]:h,[]),s=!a||!d&&b?r:q(r,m,a,h,i),t=c?f||(d?a:o||e)?[]:g:s;if(c&&c(s,t,h,i),e)for(j=q(t,n),e(j,[],h,i),k=j.length;k--;)(l=j[k])&&(t[n[k]]=!(s[n[k]]=l));if(d){if(f||a){if(f){for(j=[],k=t.length;k--;)(l=t[k])&&j.push(s[k]=l);f(null,t=[],j,i)}for(k=t.length;k--;)(l=t[k])&&(j=f?bb.call(d,l):m[k])>-1&&(d[j]=!(g[j]=l))}}else t=q(t===g?t.splice(o,t.length):t),f?f(null,g,t,i):_.apply(g,t)})}function s(a){for(var b,c,d,e=a.length,f=w.relative[a[0].type],g=f||w.relative[" "],h=f?1:0,i=n(function(a){return a===b},g,!0),j=n(function(a){return bb.call(b,a)>-1},g,!0),k=[function(a,c,d){return!f&&(d||c!==C)||((b=c).nodeType?i(a,c,d):j(a,c,d))}];e>h;h++)if(c=w.relative[a[h].type])k=[n(o(k),c)];else{if(c=w.filter[a[h].type].apply(null,a[h].matches),c[N]){for(d=++h;e>d&&!w.relative[a[d].type];d++);return r(h>1&&o(k),h>1&&m(a.slice(0,h-1).concat({value:" "===a[h-2].type?"*":""})).replace(ib,"$1"),c,d>h&&s(a.slice(h,d)),e>d&&s(a=a.slice(d)),e>d&&m(a))}k.push(c)}return o(k)}function t(a,c){var e=c.length>0,f=a.length>0,g=function(d,g,h,i,j){var k,l,m,n=0,o="0",p=d&&[],r=[],s=C,t=d||f&&w.find.TAG("*",j),u=P+=null==s?1:Math.random()||.1,v=t.length;for(j&&(C=g!==G&&g);o!==v&&null!=(k=t[o]);o++){if(f&&k){for(l=0;m=a[l++];)if(m(k,g,h)){i.push(k);break}j&&(P=u)}e&&((k=!m&&k)&&n--,d&&p.push(k))}if(n+=o,e&&o!==n){for(l=0;m=c[l++];)m(p,r,g,h);if(d){if(n>0)for(;o--;)p[o]||r[o]||(r[o]=Z.call(i));r=q(r)}_.apply(i,r),j&&!d&&r.length>0&&n+c.length>1&&b.uniqueSort(i)}return j&&(P=u,C=s),p};return e?d(g):g}var u,v,w,x,y,z,A,B,C,D,E,F,G,H,I,J,K,L,M,N="sizzle"+-new Date,O=a.document,P=0,Q=0,R=c(),S=c(),T=c(),U=function(a,b){return a===b&&(E=!0),0},V="undefined",W=1<<31,X={}.hasOwnProperty,Y=[],Z=Y.pop,$=Y.push,_=Y.push,ab=Y.slice,bb=Y.indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1},cb="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",db="[\\x20\\t\\r\\n\\f]",eb="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",fb=eb.replace("w","w#"),gb="\\["+db+"*("+eb+")(?:"+db+"*([*^$|!~]?=)"+db+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+fb+"))|)"+db+"*\\]",hb=":("+eb+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+gb+")*)|.*)\\)|)",ib=new RegExp("^"+db+"+|((?:^|[^\\\\])(?:\\\\.)*)"+db+"+$","g"),jb=new RegExp("^"+db+"*,"+db+"*"),kb=new RegExp("^"+db+"*([>+~]|"+db+")"+db+"*"),lb=new RegExp("="+db+"*([^\\]'\"]*?)"+db+"*\\]","g"),mb=new RegExp(hb),nb=new RegExp("^"+fb+"$"),ob={ID:new RegExp("^#("+eb+")"),CLASS:new RegExp("^\\.("+eb+")"),TAG:new RegExp("^("+eb.replace("w","w*")+")"),ATTR:new RegExp("^"+gb),PSEUDO:new RegExp("^"+hb),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+db+"*(even|odd|(([+-]|)(\\d*)n|)"+db+"*(?:([+-]|)"+db+"*(\\d+)|))"+db+"*\\)|)","i"),bool:new RegExp("^(?:"+cb+")$","i"),needsContext:new RegExp("^"+db+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+db+"*((?:-\\d)?\\d*)"+db+"*\\)|)(?=[^-]|$)","i")},pb=/^(?:input|select|textarea|button)$/i,qb=/^h\d$/i,rb=/^[^{]+\{\s*\[native \w/,sb=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,tb=/[+~]/,ub=/'|\\/g,vb=new RegExp("\\\\([\\da-f]{1,6}"+db+"?|("+db+")|.)","ig"),wb=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)};try{_.apply(Y=ab.call(O.childNodes),O.childNodes),Y[O.childNodes.length].nodeType}catch(xb){_={apply:Y.length?function(a,b){$.apply(a,ab.call(b))}:function(a,b){for(var c=a.length,d=0;a[c++]=b[d++];);a.length=c-1}}}v=b.support={},y=b.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},F=b.setDocument=function(a){var b,c=a?a.ownerDocument||a:O,d=c.defaultView;return c!==G&&9===c.nodeType&&c.documentElement?(G=c,H=c.documentElement,I=!y(c),d&&d!==d.top&&(d.addEventListener?d.addEventListener("unload",function(){F()},!1):d.attachEvent&&d.attachEvent("onunload",function(){F()})),v.attributes=e(function(a){return a.className="i",!a.getAttribute("className")}),v.getElementsByTagName=e(function(a){return a.appendChild(c.createComment("")),!a.getElementsByTagName("*").length}),v.getElementsByClassName=rb.test(c.getElementsByClassName)&&e(function(a){return a.innerHTML="<div class='a'></div><div class='a i'></div>",a.firstChild.className="i",2===a.getElementsByClassName("i").length}),v.getById=e(function(a){return H.appendChild(a).id=N,!c.getElementsByName||!c.getElementsByName(N).length}),v.getById?(w.find.ID=function(a,b){if(typeof b.getElementById!==V&&I){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},w.filter.ID=function(a){var b=a.replace(vb,wb);return function(a){return a.getAttribute("id")===b}}):(delete w.find.ID,w.filter.ID=function(a){var b=a.replace(vb,wb);return function(a){var c=typeof a.getAttributeNode!==V&&a.getAttributeNode("id");return c&&c.value===b}}),w.find.TAG=v.getElementsByTagName?function(a,b){return typeof b.getElementsByTagName!==V?b.getElementsByTagName(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){for(;c=f[e++];)1===c.nodeType&&d.push(c);return d}return f},w.find.CLASS=v.getElementsByClassName&&function(a,b){return typeof b.getElementsByClassName!==V&&I?b.getElementsByClassName(a):void 0},K=[],J=[],(v.qsa=rb.test(c.querySelectorAll))&&(e(function(a){a.innerHTML="<select msallowclip=''><option selected=''></option></select>",a.querySelectorAll("[msallowclip^='']").length&&J.push("[*^$]="+db+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||J.push("\\["+db+"*(?:value|"+cb+")"),a.querySelectorAll(":checked").length||J.push(":checked")}),e(function(a){var b=c.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&J.push("name"+db+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||J.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),J.push(",.*:")})),(v.matchesSelector=rb.test(L=H.matches||H.webkitMatchesSelector||H.mozMatchesSelector||H.oMatchesSelector||H.msMatchesSelector))&&e(function(a){v.disconnectedMatch=L.call(a,"div"),L.call(a,"[s!='']:x"),K.push("!=",hb)}),J=J.length&&new RegExp(J.join("|")),K=K.length&&new RegExp(K.join("|")),b=rb.test(H.compareDocumentPosition),M=b||rb.test(H.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)for(;b=b.parentNode;)if(b===a)return!0;return!1},U=b?function(a,b){if(a===b)return E=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!v.sortDetached&&b.compareDocumentPosition(a)===d?a===c||a.ownerDocument===O&&M(O,a)?-1:b===c||b.ownerDocument===O&&M(O,b)?1:D?bb.call(D,a)-bb.call(D,b):0:4&d?-1:1)}:function(a,b){if(a===b)return E=!0,0;var d,e=0,f=a.parentNode,h=b.parentNode,i=[a],j=[b];if(!f||!h)return a===c?-1:b===c?1:f?-1:h?1:D?bb.call(D,a)-bb.call(D,b):0;if(f===h)return g(a,b);for(d=a;d=d.parentNode;)i.unshift(d);for(d=b;d=d.parentNode;)j.unshift(d);for(;i[e]===j[e];)e++;return e?g(i[e],j[e]):i[e]===O?-1:j[e]===O?1:0},c):G},b.matches=function(a,c){return b(a,null,null,c)},b.matchesSelector=function(a,c){if((a.ownerDocument||a)!==G&&F(a),c=c.replace(lb,"='$1']"),!(!v.matchesSelector||!I||K&&K.test(c)||J&&J.test(c)))try{var d=L.call(a,c);if(d||v.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return b(c,G,null,[a]).length>0},b.contains=function(a,b){return(a.ownerDocument||a)!==G&&F(a),M(a,b)},b.attr=function(a,b){(a.ownerDocument||a)!==G&&F(a);var c=w.attrHandle[b.toLowerCase()],d=c&&X.call(w.attrHandle,b.toLowerCase())?c(a,b,!I):void 0;return void 0!==d?d:v.attributes||!I?a.getAttribute(b):(d=a.getAttributeNode(b))&&d.specified?d.value:null},b.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},b.uniqueSort=function(a){var b,c=[],d=0,e=0;if(E=!v.detectDuplicates,D=!v.sortStable&&a.slice(0),a.sort(U),E){for(;b=a[e++];)b===a[e]&&(d=c.push(e));for(;d--;)a.splice(c[d],1)}return D=null,a},x=b.getText=function(a){var b,c="",d=0,e=a.nodeType;if(e){if(1===e||9===e||11===e){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=x(a)}else if(3===e||4===e)return a.nodeValue}else for(;b=a[d++];)c+=x(b);return c},w=b.selectors={cacheLength:50,createPseudo:d,match:ob,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(vb,wb),a[3]=(a[3]||a[4]||a[5]||"").replace(vb,wb),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||b.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&b.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return ob.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&mb.test(c)&&(b=z(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(vb,wb).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=R[a+" "];return b||(b=new RegExp("(^|"+db+")"+a+"("+db+"|$)"))&&R(a,function(a){return b.test("string"==typeof a.className&&a.className||typeof a.getAttribute!==V&&a.getAttribute("class")||"")})},ATTR:function(a,c,d){return function(e){var f=b.attr(e,a);return null==f?"!="===c:c?(f+="","="===c?f===d:"!="===c?f!==d:"^="===c?d&&0===f.indexOf(d):"*="===c?d&&f.indexOf(d)>-1:"$="===c?d&&f.slice(-d.length)===d:"~="===c?(" "+f+" ").indexOf(d)>-1:"|="===c?f===d||f.slice(0,d.length+1)===d+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){for(;p;){for(l=b;l=l[p];)if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){for(k=q[N]||(q[N]={}),j=k[a]||[],n=j[0]===P&&j[1],m=j[0]===P&&j[2],l=n&&q.childNodes[n];l=++n&&l&&l[p]||(m=n=0)||o.pop();)if(1===l.nodeType&&++m&&l===b){k[a]=[P,n,m];break}}else if(s&&(j=(b[N]||(b[N]={}))[a])&&j[0]===P)m=j[1];else for(;(l=++n&&l&&l[p]||(m=n=0)||o.pop())&&((h?l.nodeName.toLowerCase()!==r:1!==l.nodeType)||!++m||(s&&((l[N]||(l[N]={}))[a]=[P,m]),l!==b)););return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,c){var e,f=w.pseudos[a]||w.setFilters[a.toLowerCase()]||b.error("unsupported pseudo: "+a);return f[N]?f(c):f.length>1?(e=[a,a,"",c],w.setFilters.hasOwnProperty(a.toLowerCase())?d(function(a,b){for(var d,e=f(a,c),g=e.length;g--;)d=bb.call(a,e[g]),a[d]=!(b[d]=e[g])}):function(a){return f(a,0,e)}):f}},pseudos:{not:d(function(a){var b=[],c=[],e=A(a.replace(ib,"$1"));return e[N]?d(function(a,b,c,d){for(var f,g=e(a,null,d,[]),h=a.length;h--;)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,d,f){return b[0]=a,e(b,null,f,c),!c.pop()}}),has:d(function(a){return function(c){return b(a,c).length>0}}),contains:d(function(a){return function(b){return(b.textContent||b.innerText||x(b)).indexOf(a)>-1}}),lang:d(function(a){return nb.test(a||"")||b.error("unsupported lang: "+a),a=a.replace(vb,wb).toLowerCase(),function(b){var c;do if(c=I?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===H},focus:function(a){return a===G.activeElement&&(!G.hasFocus||G.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!w.pseudos.empty(a)},header:function(a){return qb.test(a.nodeName)},input:function(a){return pb.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:j(function(){return[0]}),last:j(function(a,b){return[b-1]}),eq:j(function(a,b,c){return[0>c?c+b:c]}),even:j(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:j(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:j(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:j(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},w.pseudos.nth=w.pseudos.eq;for(u in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})w.pseudos[u]=h(u);for(u in{submit:!0,reset:!0})w.pseudos[u]=i(u);return l.prototype=w.filters=w.pseudos,w.setFilters=new l,z=b.tokenize=function(a,c){var d,e,f,g,h,i,j,k=S[a+" "];if(k)return c?0:k.slice(0);for(h=a,i=[],j=w.preFilter;h;){(!d||(e=jb.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),d=!1,(e=kb.exec(h))&&(d=e.shift(),f.push({value:d,type:e[0].replace(ib," ")}),h=h.slice(d.length));for(g in w.filter)!(e=ob[g].exec(h))||j[g]&&!(e=j[g](e))||(d=e.shift(),f.push({value:d,type:g,matches:e}),h=h.slice(d.length));if(!d)break}return c?h.length:h?b.error(a):S(a,i).slice(0)},A=b.compile=function(a,b){var c,d=[],e=[],f=T[a+" "];if(!f){for(b||(b=z(a)),c=b.length;c--;)f=s(b[c]),f[N]?d.push(f):e.push(f);f=T(a,t(e,d)),f.selector=a}return f},B=b.select=function(a,b,c,d){var e,f,g,h,i,j="function"==typeof a&&a,l=!d&&z(a=j.selector||a);if(c=c||[],1===l.length){if(f=l[0]=l[0].slice(0),f.length>2&&"ID"===(g=f[0]).type&&v.getById&&9===b.nodeType&&I&&w.relative[f[1].type]){if(b=(w.find.ID(g.matches[0].replace(vb,wb),b)||[])[0],!b)return c;j&&(b=b.parentNode),a=a.slice(f.shift().value.length)}for(e=ob.needsContext.test(a)?0:f.length;e--&&(g=f[e],!w.relative[h=g.type]);)if((i=w.find[h])&&(d=i(g.matches[0].replace(vb,wb),tb.test(f[0].type)&&k(b.parentNode)||b))){if(f.splice(e,1),a=d.length&&m(f),!a)return _.apply(c,d),c;break}}return(j||A(a,l))(d,b,!I,c,tb.test(a)&&k(b.parentNode)||b),c},v.sortStable=N.split("").sort(U).join("")===N,v.detectDuplicates=!!E,F(),v.sortDetached=e(function(a){return 1&a.compareDocumentPosition(G.createElement("div"))}),e(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||f("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),v.attributes&&e(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||f("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),e(function(a){return null==a.getAttribute("disabled")})||f(cb,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),b}(a);eb.find=jb,eb.expr=jb.selectors,eb.expr[":"]=eb.expr.pseudos,eb.unique=jb.uniqueSort,eb.text=jb.getText,eb.isXMLDoc=jb.isXML,eb.contains=jb.contains;var kb=eb.expr.match.needsContext,lb=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,mb=/^.[^:#\[\.,]*$/;eb.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?eb.find.matchesSelector(d,a)?[d]:[]:eb.find.matches(a,eb.grep(b,function(a){return 1===a.nodeType}))},eb.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(eb(a).filter(function(){for(b=0;e>b;b++)if(eb.contains(d[b],this))return!0}));for(b=0;e>b;b++)eb.find(a,d[b],c);return c=this.pushStack(e>1?eb.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(d(this,a||[],!1))},not:function(a){return this.pushStack(d(this,a||[],!0))},is:function(a){return!!d(this,"string"==typeof a&&kb.test(a)?eb(a):a||[],!1).length}});var nb,ob=a.document,pb=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,qb=eb.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:pb.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||nb).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof eb?b[0]:b,eb.merge(this,eb.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:ob,!0)),lb.test(c[1])&&eb.isPlainObject(b))for(c in b)eb.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}if(d=ob.getElementById(c[2]),d&&d.parentNode){if(d.id!==c[2])return nb.find(a);this.length=1,this[0]=d}return this.context=ob,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):eb.isFunction(a)?"undefined"!=typeof nb.ready?nb.ready(a):a(eb):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),eb.makeArray(a,this))};qb.prototype=eb.fn,nb=eb(ob);var rb=/^(?:parents|prev(?:Until|All))/,sb={children:!0,contents:!0,next:!0,prev:!0};eb.extend({dir:function(a,b,c){for(var d=[],e=a[b];e&&9!==e.nodeType&&(void 0===c||1!==e.nodeType||!eb(e).is(c));)1===e.nodeType&&d.push(e),e=e[b];return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),eb.fn.extend({has:function(a){var b,c=eb(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(eb.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=kb.test(a)||"string"!=typeof a?eb(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&eb.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?eb.unique(f):f)},index:function(a){return a?"string"==typeof a?eb.inArray(this[0],eb(a)):eb.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(eb.unique(eb.merge(this.get(),eb(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}}),eb.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return eb.dir(a,"parentNode")},parentsUntil:function(a,b,c){return eb.dir(a,"parentNode",c)},next:function(a){return e(a,"nextSibling")},prev:function(a){return e(a,"previousSibling")},nextAll:function(a){return eb.dir(a,"nextSibling")},prevAll:function(a){return eb.dir(a,"previousSibling")},nextUntil:function(a,b,c){return eb.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return eb.dir(a,"previousSibling",c)},siblings:function(a){return eb.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return eb.sibling(a.firstChild)},contents:function(a){return eb.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:eb.merge([],a.childNodes)}},function(a,b){eb.fn[a]=function(c,d){var e=eb.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=eb.filter(d,e)),this.length>1&&(sb[a]||(e=eb.unique(e)),rb.test(a)&&(e=e.reverse())),this.pushStack(e)}});var tb=/\S+/g,ub={};eb.Callbacks=function(a){a="string"==typeof a?ub[a]||f(a):eb.extend({},a);var b,c,d,e,g,h,i=[],j=!a.once&&[],k=function(f){for(c=a.memory&&f,d=!0,g=h||0,h=0,e=i.length,b=!0;i&&e>g;g++)if(i[g].apply(f[0],f[1])===!1&&a.stopOnFalse){c=!1;break}b=!1,i&&(j?j.length&&k(j.shift()):c?i=[]:l.disable())},l={add:function(){if(i){var d=i.length;!function f(b){eb.each(b,function(b,c){var d=eb.type(c);"function"===d?a.unique&&l.has(c)||i.push(c):c&&c.length&&"string"!==d&&f(c)})}(arguments),b?e=i.length:c&&(h=d,k(c))}return this},remove:function(){return i&&eb.each(arguments,function(a,c){for(var d;(d=eb.inArray(c,i,d))>-1;)i.splice(d,1),b&&(e>=d&&e--,g>=d&&g--)}),this},has:function(a){return a?eb.inArray(a,i)>-1:!(!i||!i.length)},empty:function(){return i=[],e=0,this},disable:function(){return i=j=c=void 0,this},disabled:function(){return!i},lock:function(){return j=void 0,c||l.disable(),this},locked:function(){return!j},fireWith:function(a,c){return!i||d&&!j||(c=c||[],c=[a,c.slice?c.slice():c],b?j.push(c):k(c)),this},fire:function(){return l.fireWith(this,arguments),this},fired:function(){return!!d}};return l},eb.extend({Deferred:function(a){var b=[["resolve","done",eb.Callbacks("once memory"),"resolved"],["reject","fail",eb.Callbacks("once memory"),"rejected"],["notify","progress",eb.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return eb.Deferred(function(c){eb.each(b,function(b,f){var g=eb.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&eb.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?eb.extend(a,d):d}},e={};return d.pipe=d.then,eb.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b,c,d,e=0,f=X.call(arguments),g=f.length,h=1!==g||a&&eb.isFunction(a.promise)?g:0,i=1===h?a:eb.Deferred(),j=function(a,c,d){return function(e){c[a]=this,d[a]=arguments.length>1?X.call(arguments):e,d===b?i.notifyWith(c,d):--h||i.resolveWith(c,d)}};if(g>1)for(b=new Array(g),c=new Array(g),d=new Array(g);g>e;e++)f[e]&&eb.isFunction(f[e].promise)?f[e].promise().done(j(e,d,f)).fail(i.reject).progress(j(e,c,b)):--h;return h||i.resolveWith(d,f),i.promise()}});var vb;eb.fn.ready=function(a){return eb.ready.promise().done(a),this},eb.extend({isReady:!1,readyWait:1,holdReady:function(a){a?eb.readyWait++:eb.ready(!0)},ready:function(a){if(a===!0?!--eb.readyWait:!eb.isReady){if(!ob.body)return setTimeout(eb.ready);eb.isReady=!0,a!==!0&&--eb.readyWait>0||(vb.resolveWith(ob,[eb]),eb.fn.triggerHandler&&(eb(ob).triggerHandler("ready"),eb(ob).off("ready")))}}}),eb.ready.promise=function(b){if(!vb)if(vb=eb.Deferred(),"complete"===ob.readyState)setTimeout(eb.ready);else if(ob.addEventListener)ob.addEventListener("DOMContentLoaded",h,!1),a.addEventListener("load",h,!1);else{ob.attachEvent("onreadystatechange",h),a.attachEvent("onload",h);var c=!1;try{c=null==a.frameElement&&ob.documentElement}catch(d){}c&&c.doScroll&&!function e(){if(!eb.isReady){try{c.doScroll("left")}catch(a){return setTimeout(e,50)}g(),eb.ready()}}()}return vb.promise(b)};var wb,xb="undefined";for(wb in eb(cb))break;cb.ownLast="0"!==wb,cb.inlineBlockNeedsLayout=!1,eb(function(){var a,b,c,d;c=ob.getElementsByTagName("body")[0],c&&c.style&&(b=ob.createElement("div"),d=ob.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==xb&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",cb.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(d))}),function(){var a=ob.createElement("div");if(null==cb.deleteExpando){cb.deleteExpando=!0;try{delete a.test}catch(b){cb.deleteExpando=!1}}a=null}(),eb.acceptData=function(a){var b=eb.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b};var yb=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,zb=/([A-Z])/g;eb.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?eb.cache[a[eb.expando]]:a[eb.expando],!!a&&!j(a)},data:function(a,b,c){return k(a,b,c)},removeData:function(a,b){return l(a,b)},_data:function(a,b,c){return k(a,b,c,!0)},_removeData:function(a,b){return l(a,b,!0)}}),eb.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=eb.data(f),1===f.nodeType&&!eb._data(f,"parsedAttrs"))){for(c=g.length;c--;)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=eb.camelCase(d.slice(5)),i(f,d,e[d])));eb._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){eb.data(this,a)}):arguments.length>1?this.each(function(){eb.data(this,a,b)}):f?i(f,a,eb.data(f,a)):void 0},removeData:function(a){return this.each(function(){eb.removeData(this,a)})}}),eb.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=eb._data(a,b),c&&(!d||eb.isArray(c)?d=eb._data(a,b,eb.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=eb.queue(a,b),d=c.length,e=c.shift(),f=eb._queueHooks(a,b),g=function(){eb.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return eb._data(a,c)||eb._data(a,c,{empty:eb.Callbacks("once memory").add(function(){eb._removeData(a,b+"queue"),eb._removeData(a,c)})})}}),eb.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?eb.queue(this[0],a):void 0===b?this:this.each(function(){var c=eb.queue(this,a,b);eb._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&eb.dequeue(this,a)})},dequeue:function(a){return this.each(function(){eb.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=eb.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};for("string"!=typeof a&&(b=a,a=void 0),a=a||"fx";g--;)c=eb._data(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var Ab=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,Bb=["Top","Right","Bottom","Left"],Cb=function(a,b){return a=b||a,"none"===eb.css(a,"display")||!eb.contains(a.ownerDocument,a)},Db=eb.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===eb.type(c)){e=!0;for(h in c)eb.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,eb.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(eb(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},Eb=/^(?:checkbox|radio)$/i;!function(){var a=ob.createElement("input"),b=ob.createElement("div"),c=ob.createDocumentFragment();if(b.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",cb.leadingWhitespace=3===b.firstChild.nodeType,cb.tbody=!b.getElementsByTagName("tbody").length,cb.htmlSerialize=!!b.getElementsByTagName("link").length,cb.html5Clone="<:nav></:nav>"!==ob.createElement("nav").cloneNode(!0).outerHTML,a.type="checkbox",a.checked=!0,c.appendChild(a),cb.appendChecked=a.checked,b.innerHTML="<textarea>x</textarea>",cb.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue,c.appendChild(b),b.innerHTML="<input type='radio' checked='checked' name='t'/>",cb.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,cb.noCloneEvent=!0,b.attachEvent&&(b.attachEvent("onclick",function(){cb.noCloneEvent=!1}),b.cloneNode(!0).click()),null==cb.deleteExpando){cb.deleteExpando=!0;try{delete b.test}catch(d){cb.deleteExpando=!1}}}(),function(){var b,c,d=ob.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(cb[b+"Bubbles"]=c in a)||(d.setAttribute(c,"t"),cb[b+"Bubbles"]=d.attributes[c].expando===!1);d=null}();var Fb=/^(?:input|select|textarea)$/i,Gb=/^key/,Hb=/^(?:mouse|pointer|contextmenu)|click/,Ib=/^(?:focusinfocus|focusoutblur)$/,Jb=/^([^.]*)(?:\.(.+)|)$/;eb.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,p,q=eb._data(a);if(q){for(c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=eb.guid++),(g=q.events)||(g=q.events={}),(k=q.handle)||(k=q.handle=function(a){return typeof eb===xb||a&&eb.event.triggered===a.type?void 0:eb.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(tb)||[""],h=b.length;h--;)f=Jb.exec(b[h])||[],n=p=f[1],o=(f[2]||"").split(".").sort(),n&&(j=eb.event.special[n]||{},n=(e?j.delegateType:j.bindType)||n,j=eb.event.special[n]||{},l=eb.extend({type:n,origType:p,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&eb.expr.match.needsContext.test(e),namespace:o.join(".")},i),(m=g[n])||(m=g[n]=[],m.delegateCount=0,j.setup&&j.setup.call(a,d,o,k)!==!1||(a.addEventListener?a.addEventListener(n,k,!1):a.attachEvent&&a.attachEvent("on"+n,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,l):m.push(l),eb.event.global[n]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,p,q=eb.hasData(a)&&eb._data(a);if(q&&(k=q.events)){for(b=(b||"").match(tb)||[""],j=b.length;j--;)if(h=Jb.exec(b[j])||[],n=p=h[1],o=(h[2]||"").split(".").sort(),n){for(l=eb.event.special[n]||{},n=(d?l.delegateType:l.bindType)||n,m=k[n]||[],h=h[2]&&new RegExp("(^|\\.)"+o.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=m.length;f--;)g=m[f],!e&&p!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(m.splice(f,1),g.selector&&m.delegateCount--,l.remove&&l.remove.call(a,g));
-i&&!m.length&&(l.teardown&&l.teardown.call(a,o,q.handle)!==!1||eb.removeEvent(a,n,q.handle),delete k[n])}else for(n in k)eb.event.remove(a,n+b[j],c,d,!0);eb.isEmptyObject(k)&&(delete q.handle,eb._removeData(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,j,k,l,m=[d||ob],n=bb.call(b,"type")?b.type:b,o=bb.call(b,"namespace")?b.namespace.split("."):[];if(h=k=d=d||ob,3!==d.nodeType&&8!==d.nodeType&&!Ib.test(n+eb.event.triggered)&&(n.indexOf(".")>=0&&(o=n.split("."),n=o.shift(),o.sort()),g=n.indexOf(":")<0&&"on"+n,b=b[eb.expando]?b:new eb.Event(n,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=o.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+o.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:eb.makeArray(c,[b]),j=eb.event.special[n]||{},e||!j.trigger||j.trigger.apply(d,c)!==!1)){if(!e&&!j.noBubble&&!eb.isWindow(d)){for(i=j.delegateType||n,Ib.test(i+n)||(h=h.parentNode);h;h=h.parentNode)m.push(h),k=h;k===(d.ownerDocument||ob)&&m.push(k.defaultView||k.parentWindow||a)}for(l=0;(h=m[l++])&&!b.isPropagationStopped();)b.type=l>1?i:j.bindType||n,f=(eb._data(h,"events")||{})[b.type]&&eb._data(h,"handle"),f&&f.apply(h,c),f=g&&h[g],f&&f.apply&&eb.acceptData(h)&&(b.result=f.apply(h,c),b.result===!1&&b.preventDefault());if(b.type=n,!e&&!b.isDefaultPrevented()&&(!j._default||j._default.apply(m.pop(),c)===!1)&&eb.acceptData(d)&&g&&d[n]&&!eb.isWindow(d)){k=d[g],k&&(d[g]=null),eb.event.triggered=n;try{d[n]()}catch(p){}eb.event.triggered=void 0,k&&(d[g]=k)}return b.result}},dispatch:function(a){a=eb.event.fix(a);var b,c,d,e,f,g=[],h=X.call(arguments),i=(eb._data(this,"events")||{})[a.type]||[],j=eb.event.special[a.type]||{};if(h[0]=a,a.delegateTarget=this,!j.preDispatch||j.preDispatch.call(this,a)!==!1){for(g=eb.event.handlers.call(this,a,i),b=0;(e=g[b++])&&!a.isPropagationStopped();)for(a.currentTarget=e.elem,f=0;(d=e.handlers[f++])&&!a.isImmediatePropagationStopped();)(!a.namespace_re||a.namespace_re.test(d.namespace))&&(a.handleObj=d,a.data=d.data,c=((eb.event.special[d.origType]||{}).handle||d.handler).apply(e.elem,h),void 0!==c&&(a.result=c)===!1&&(a.preventDefault(),a.stopPropagation()));return j.postDispatch&&j.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(e=[],f=0;h>f;f++)d=b[f],c=d.selector+" ",void 0===e[c]&&(e[c]=d.needsContext?eb(c,this).index(i)>=0:eb.find(c,this,null,[i]).length),e[c]&&e.push(d);e.length&&g.push({elem:i,handlers:e})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},fix:function(a){if(a[eb.expando])return a;var b,c,d,e=a.type,f=a,g=this.fixHooks[e];for(g||(this.fixHooks[e]=g=Hb.test(e)?this.mouseHooks:Gb.test(e)?this.keyHooks:{}),d=g.props?this.props.concat(g.props):this.props,a=new eb.Event(f),b=d.length;b--;)c=d[b],a[c]=f[c];return a.target||(a.target=f.srcElement||ob),3===a.target.nodeType&&(a.target=a.target.parentNode),a.metaKey=!!a.metaKey,g.filter?g.filter(a,f):a},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,d,e,f=b.button,g=b.fromElement;return null==a.pageX&&null!=b.clientX&&(d=a.target.ownerDocument||ob,e=d.documentElement,c=d.body,a.pageX=b.clientX+(e&&e.scrollLeft||c&&c.scrollLeft||0)-(e&&e.clientLeft||c&&c.clientLeft||0),a.pageY=b.clientY+(e&&e.scrollTop||c&&c.scrollTop||0)-(e&&e.clientTop||c&&c.clientTop||0)),!a.relatedTarget&&g&&(a.relatedTarget=g===a.target?b.toElement:g),a.which||void 0===f||(a.which=1&f?1:2&f?3:4&f?2:0),a}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==o()&&this.focus)try{return this.focus(),!1}catch(a){}},delegateType:"focusin"},blur:{trigger:function(){return this===o()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return eb.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):void 0},_default:function(a){return eb.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c,d){var e=eb.extend(new eb.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?eb.event.trigger(e,null,b):eb.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},eb.removeEvent=ob.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){var d="on"+b;a.detachEvent&&(typeof a[d]===xb&&(a[d]=null),a.detachEvent(d,c))},eb.Event=function(a,b){return this instanceof eb.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?m:n):this.type=a,b&&eb.extend(this,b),this.timeStamp=a&&a.timeStamp||eb.now(),void(this[eb.expando]=!0)):new eb.Event(a,b)},eb.Event.prototype={isDefaultPrevented:n,isPropagationStopped:n,isImmediatePropagationStopped:n,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=m,a&&(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=m,a&&(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=m,a&&a.stopImmediatePropagation&&a.stopImmediatePropagation(),this.stopPropagation()}},eb.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){eb.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return(!e||e!==d&&!eb.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),cb.submitBubbles||(eb.event.special.submit={setup:function(){return eb.nodeName(this,"form")?!1:void eb.event.add(this,"click._submit keypress._submit",function(a){var b=a.target,c=eb.nodeName(b,"input")||eb.nodeName(b,"button")?b.form:void 0;c&&!eb._data(c,"submitBubbles")&&(eb.event.add(c,"submit._submit",function(a){a._submit_bubble=!0}),eb._data(c,"submitBubbles",!0))})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&eb.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){return eb.nodeName(this,"form")?!1:void eb.event.remove(this,"._submit")}}),cb.changeBubbles||(eb.event.special.change={setup:function(){return Fb.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(eb.event.add(this,"propertychange._change",function(a){"checked"===a.originalEvent.propertyName&&(this._just_changed=!0)}),eb.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1),eb.event.simulate("change",this,a,!0)})),!1):void eb.event.add(this,"beforeactivate._change",function(a){var b=a.target;Fb.test(b.nodeName)&&!eb._data(b,"changeBubbles")&&(eb.event.add(b,"change._change",function(a){!this.parentNode||a.isSimulated||a.isTrigger||eb.event.simulate("change",this.parentNode,a,!0)}),eb._data(b,"changeBubbles",!0))})},handle:function(a){var b=a.target;return this!==b||a.isSimulated||a.isTrigger||"radio"!==b.type&&"checkbox"!==b.type?a.handleObj.handler.apply(this,arguments):void 0},teardown:function(){return eb.event.remove(this,"._change"),!Fb.test(this.nodeName)}}),cb.focusinBubbles||eb.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){eb.event.simulate(b,a.target,eb.event.fix(a),!0)};eb.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=eb._data(d,b);e||d.addEventListener(a,c,!0),eb._data(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=eb._data(d,b)-1;e?eb._data(d,b,e):(d.removeEventListener(a,c,!0),eb._removeData(d,b))}}}),eb.fn.extend({on:function(a,b,c,d,e){var f,g;if("object"==typeof a){"string"!=typeof b&&(c=c||b,b=void 0);for(f in a)this.on(f,b,c,a[f],e);return this}if(null==c&&null==d?(d=b,c=b=void 0):null==d&&("string"==typeof b?(d=c,c=void 0):(d=c,c=b,b=void 0)),d===!1)d=n;else if(!d)return this;return 1===e&&(g=d,d=function(a){return eb().off(a),g.apply(this,arguments)},d.guid=g.guid||(g.guid=eb.guid++)),this.each(function(){eb.event.add(this,a,d,c,b)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,eb(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return(b===!1||"function"==typeof b)&&(c=b,b=void 0),c===!1&&(c=n),this.each(function(){eb.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){eb.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?eb.event.trigger(a,b,c,!0):void 0}});var Kb="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",Lb=/ jQuery\d+="(?:null|\d+)"/g,Mb=new RegExp("<(?:"+Kb+")[\\s/>]","i"),Nb=/^\s+/,Ob=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,Pb=/<([\w:]+)/,Qb=/<tbody/i,Rb=/<|&#?\w+;/,Sb=/<(?:script|style|link)/i,Tb=/checked\s*(?:[^=]|=\s*.checked.)/i,Ub=/^$|\/(?:java|ecma)script/i,Vb=/^true\/(.*)/,Wb=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,Xb={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:cb.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},Yb=p(ob),Zb=Yb.appendChild(ob.createElement("div"));Xb.optgroup=Xb.option,Xb.tbody=Xb.tfoot=Xb.colgroup=Xb.caption=Xb.thead,Xb.th=Xb.td,eb.extend({clone:function(a,b,c){var d,e,f,g,h,i=eb.contains(a.ownerDocument,a);if(cb.html5Clone||eb.isXMLDoc(a)||!Mb.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(Zb.innerHTML=a.outerHTML,Zb.removeChild(f=Zb.firstChild)),!(cb.noCloneEvent&&cb.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||eb.isXMLDoc(a)))for(d=q(f),h=q(a),g=0;null!=(e=h[g]);++g)d[g]&&x(e,d[g]);if(b)if(c)for(h=h||q(a),d=d||q(f),g=0;null!=(e=h[g]);g++)w(e,d[g]);else w(a,f);return d=q(f,"script"),d.length>0&&v(d,!i&&q(a,"script")),d=h=e=null,f},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,k,l=a.length,m=p(b),n=[],o=0;l>o;o++)if(f=a[o],f||0===f)if("object"===eb.type(f))eb.merge(n,f.nodeType?[f]:f);else if(Rb.test(f)){for(h=h||m.appendChild(b.createElement("div")),i=(Pb.exec(f)||["",""])[1].toLowerCase(),k=Xb[i]||Xb._default,h.innerHTML=k[1]+f.replace(Ob,"<$1></$2>")+k[2],e=k[0];e--;)h=h.lastChild;if(!cb.leadingWhitespace&&Nb.test(f)&&n.push(b.createTextNode(Nb.exec(f)[0])),!cb.tbody)for(f="table"!==i||Qb.test(f)?"<table>"!==k[1]||Qb.test(f)?0:h:h.firstChild,e=f&&f.childNodes.length;e--;)eb.nodeName(j=f.childNodes[e],"tbody")&&!j.childNodes.length&&f.removeChild(j);for(eb.merge(n,h.childNodes),h.textContent="";h.firstChild;)h.removeChild(h.firstChild);h=m.lastChild}else n.push(b.createTextNode(f));for(h&&m.removeChild(h),cb.appendChecked||eb.grep(q(n,"input"),r),o=0;f=n[o++];)if((!d||-1===eb.inArray(f,d))&&(g=eb.contains(f.ownerDocument,f),h=q(m.appendChild(f),"script"),g&&v(h),c))for(e=0;f=h[e++];)Ub.test(f.type||"")&&c.push(f);return h=null,m},cleanData:function(a,b){for(var c,d,e,f,g=0,h=eb.expando,i=eb.cache,j=cb.deleteExpando,k=eb.event.special;null!=(c=a[g]);g++)if((b||eb.acceptData(c))&&(e=c[h],f=e&&i[e])){if(f.events)for(d in f.events)k[d]?eb.event.remove(c,d):eb.removeEvent(c,d,f.handle);i[e]&&(delete i[e],j?delete c[h]:typeof c.removeAttribute!==xb?c.removeAttribute(h):c[h]=null,W.push(e))}}}),eb.fn.extend({text:function(a){return Db(this,function(a){return void 0===a?eb.text(this):this.empty().append((this[0]&&this[0].ownerDocument||ob).createTextNode(a))},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=s(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=s(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?eb.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||eb.cleanData(q(c)),c.parentNode&&(b&&eb.contains(c.ownerDocument,c)&&v(q(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){for(1===a.nodeType&&eb.cleanData(q(a,!1));a.firstChild;)a.removeChild(a.firstChild);a.options&&eb.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return eb.clone(this,a,b)})},html:function(a){return Db(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(Lb,""):void 0;if(!("string"!=typeof a||Sb.test(a)||!cb.htmlSerialize&&Mb.test(a)||!cb.leadingWhitespace&&Nb.test(a)||Xb[(Pb.exec(a)||["",""])[1].toLowerCase()])){a=a.replace(Ob,"<$1></$2>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(eb.cleanData(q(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,eb.cleanData(q(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=Y.apply([],a);var c,d,e,f,g,h,i=0,j=this.length,k=this,l=j-1,m=a[0],n=eb.isFunction(m);if(n||j>1&&"string"==typeof m&&!cb.checkClone&&Tb.test(m))return this.each(function(c){var d=k.eq(c);n&&(a[0]=m.call(this,c,d.html())),d.domManip(a,b)});if(j&&(h=eb.buildFragment(a,this[0].ownerDocument,!1,this),c=h.firstChild,1===h.childNodes.length&&(h=c),c)){for(f=eb.map(q(h,"script"),t),e=f.length;j>i;i++)d=h,i!==l&&(d=eb.clone(d,!0,!0),e&&eb.merge(f,q(d,"script"))),b.call(this[i],d,i);if(e)for(g=f[f.length-1].ownerDocument,eb.map(f,u),i=0;e>i;i++)d=f[i],Ub.test(d.type||"")&&!eb._data(d,"globalEval")&&eb.contains(g,d)&&(d.src?eb._evalUrl&&eb._evalUrl(d.src):eb.globalEval((d.text||d.textContent||d.innerHTML||"").replace(Wb,"")));h=c=null}return this}}),eb.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){eb.fn[a]=function(a){for(var c,d=0,e=[],f=eb(a),g=f.length-1;g>=d;d++)c=d===g?this:this.clone(!0),eb(f[d])[b](c),Z.apply(e,c.get());return this.pushStack(e)}});var $b,_b={};!function(){var a;cb.shrinkWrapBlocks=function(){if(null!=a)return a;a=!1;var b,c,d;return c=ob.getElementsByTagName("body")[0],c&&c.style?(b=ob.createElement("div"),d=ob.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==xb&&(b.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:1px;width:1px;zoom:1",b.appendChild(ob.createElement("div")).style.width="5px",a=3!==b.offsetWidth),c.removeChild(d),a):void 0}}();var ac,bc,cc=/^margin/,dc=new RegExp("^("+Ab+")(?!px)[a-z%]+$","i"),ec=/^(top|right|bottom|left)$/;a.getComputedStyle?(ac=function(a){return a.ownerDocument.defaultView.getComputedStyle(a,null)},bc=function(a,b,c){var d,e,f,g,h=a.style;return c=c||ac(a),g=c?c.getPropertyValue(b)||c[b]:void 0,c&&(""!==g||eb.contains(a.ownerDocument,a)||(g=eb.style(a,b)),dc.test(g)&&cc.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0===g?g:g+""}):ob.documentElement.currentStyle&&(ac=function(a){return a.currentStyle},bc=function(a,b,c){var d,e,f,g,h=a.style;return c=c||ac(a),g=c?c[b]:void 0,null==g&&h&&h[b]&&(g=h[b]),dc.test(g)&&!ec.test(b)&&(d=h.left,e=a.runtimeStyle,f=e&&e.left,f&&(e.left=a.currentStyle.left),h.left="fontSize"===b?"1em":g,g=h.pixelLeft+"px",h.left=d,f&&(e.left=f)),void 0===g?g:g+""||"auto"}),function(){function b(){var b,c,d,e;c=ob.getElementsByTagName("body")[0],c&&c.style&&(b=ob.createElement("div"),d=ob.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),b.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;display:block;margin-top:1%;top:1%;border:1px;padding:1px;width:4px;position:absolute",f=g=!1,i=!0,a.getComputedStyle&&(f="1%"!==(a.getComputedStyle(b,null)||{}).top,g="4px"===(a.getComputedStyle(b,null)||{width:"4px"}).width,e=b.appendChild(ob.createElement("div")),e.style.cssText=b.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",e.style.marginRight=e.style.width="0",b.style.width="1px",i=!parseFloat((a.getComputedStyle(e,null)||{}).marginRight)),b.innerHTML="<table><tr><td></td><td>t</td></tr></table>",e=b.getElementsByTagName("td"),e[0].style.cssText="margin:0;border:0;padding:0;display:none",h=0===e[0].offsetHeight,h&&(e[0].style.display="",e[1].style.display="none",h=0===e[0].offsetHeight),c.removeChild(d))}var c,d,e,f,g,h,i;c=ob.createElement("div"),c.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",e=c.getElementsByTagName("a")[0],d=e&&e.style,d&&(d.cssText="float:left;opacity:.5",cb.opacity="0.5"===d.opacity,cb.cssFloat=!!d.cssFloat,c.style.backgroundClip="content-box",c.cloneNode(!0).style.backgroundClip="",cb.clearCloneStyle="content-box"===c.style.backgroundClip,cb.boxSizing=""===d.boxSizing||""===d.MozBoxSizing||""===d.WebkitBoxSizing,eb.extend(cb,{reliableHiddenOffsets:function(){return null==h&&b(),h},boxSizingReliable:function(){return null==g&&b(),g},pixelPosition:function(){return null==f&&b(),f},reliableMarginRight:function(){return null==i&&b(),i}}))}(),eb.swap=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};var fc=/alpha\([^)]*\)/i,gc=/opacity\s*=\s*([^)]*)/,hc=/^(none|table(?!-c[ea]).+)/,ic=new RegExp("^("+Ab+")(.*)$","i"),jc=new RegExp("^([+-])=("+Ab+")","i"),kc={position:"absolute",visibility:"hidden",display:"block"},lc={letterSpacing:"0",fontWeight:"400"},mc=["Webkit","O","Moz","ms"];eb.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bc(a,"opacity");return""===c?"1":c}}}},cssNumber:{columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":cb.cssFloat?"cssFloat":"styleFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=eb.camelCase(b),i=a.style;if(b=eb.cssProps[h]||(eb.cssProps[h]=B(i,h)),g=eb.cssHooks[b]||eb.cssHooks[h],void 0===c)return g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b];if(f=typeof c,"string"===f&&(e=jc.exec(c))&&(c=(e[1]+1)*e[2]+parseFloat(eb.css(a,b)),f="number"),null!=c&&c===c&&("number"!==f||eb.cssNumber[h]||(c+="px"),cb.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),!(g&&"set"in g&&void 0===(c=g.set(a,c,d)))))try{i[b]=c}catch(j){}}},css:function(a,b,c,d){var e,f,g,h=eb.camelCase(b);return b=eb.cssProps[h]||(eb.cssProps[h]=B(a.style,h)),g=eb.cssHooks[b]||eb.cssHooks[h],g&&"get"in g&&(f=g.get(a,!0,c)),void 0===f&&(f=bc(a,b,d)),"normal"===f&&b in lc&&(f=lc[b]),""===c||c?(e=parseFloat(f),c===!0||eb.isNumeric(e)?e||0:f):f}}),eb.each(["height","width"],function(a,b){eb.cssHooks[b]={get:function(a,c,d){return c?hc.test(eb.css(a,"display"))&&0===a.offsetWidth?eb.swap(a,kc,function(){return F(a,b,d)}):F(a,b,d):void 0},set:function(a,c,d){var e=d&&ac(a);return D(a,c,d?E(a,b,d,cb.boxSizing&&"border-box"===eb.css(a,"boxSizing",!1,e),e):0)}}}),cb.opacity||(eb.cssHooks.opacity={get:function(a,b){return gc.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=eb.isNumeric(b)?"alpha(opacity="+100*b+")":"",f=d&&d.filter||c.filter||"";c.zoom=1,(b>=1||""===b)&&""===eb.trim(f.replace(fc,""))&&c.removeAttribute&&(c.removeAttribute("filter"),""===b||d&&!d.filter)||(c.filter=fc.test(f)?f.replace(fc,e):f+" "+e)}}),eb.cssHooks.marginRight=A(cb.reliableMarginRight,function(a,b){return b?eb.swap(a,{display:"inline-block"},bc,[a,"marginRight"]):void 0}),eb.each({margin:"",padding:"",border:"Width"},function(a,b){eb.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+Bb[d]+b]=f[d]||f[d-2]||f[0];return e}},cc.test(a)||(eb.cssHooks[a+b].set=D)}),eb.fn.extend({css:function(a,b){return Db(this,function(a,b,c){var d,e,f={},g=0;if(eb.isArray(b)){for(d=ac(a),e=b.length;e>g;g++)f[b[g]]=eb.css(a,b[g],!1,d);return f}return void 0!==c?eb.style(a,b,c):eb.css(a,b)},a,b,arguments.length>1)},show:function(){return C(this,!0)},hide:function(){return C(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){Cb(this)?eb(this).show():eb(this).hide()})}}),eb.Tween=G,G.prototype={constructor:G,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(eb.cssNumber[c]?"":"px")},cur:function(){var a=G.propHooks[this.prop];return a&&a.get?a.get(this):G.propHooks._default.get(this)},run:function(a){var b,c=G.propHooks[this.prop];return this.pos=b=this.options.duration?eb.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):G.propHooks._default.set(this),this}},G.prototype.init.prototype=G.prototype,G.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=eb.css(a.elem,a.prop,""),b&&"auto"!==b?b:0):a.elem[a.prop]},set:function(a){eb.fx.step[a.prop]?eb.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[eb.cssProps[a.prop]]||eb.cssHooks[a.prop])?eb.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},G.propHooks.scrollTop=G.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},eb.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},eb.fx=G.prototype.init,eb.fx.step={};var nc,oc,pc=/^(?:toggle|show|hide)$/,qc=new RegExp("^(?:([+-])=|)("+Ab+")([a-z%]*)$","i"),rc=/queueHooks$/,sc=[K],tc={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=qc.exec(b),f=e&&e[3]||(eb.cssNumber[a]?"":"px"),g=(eb.cssNumber[a]||"px"!==f&&+d)&&qc.exec(eb.css(c.elem,a)),h=1,i=20;if(g&&g[3]!==f){f=f||g[3],e=e||[],g=+d||1;do h=h||".5",g/=h,eb.style(c.elem,a,g+f);while(h!==(h=c.cur()/d)&&1!==h&&--i)}return e&&(g=c.start=+g||+d||0,c.unit=f,c.end=e[1]?g+(e[1]+1)*e[2]:+e[2]),c}]};eb.Animation=eb.extend(M,{tweener:function(a,b){eb.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");for(var c,d=0,e=a.length;e>d;d++)c=a[d],tc[c]=tc[c]||[],tc[c].unshift(b)},prefilter:function(a,b){b?sc.unshift(a):sc.push(a)}}),eb.speed=function(a,b,c){var d=a&&"object"==typeof a?eb.extend({},a):{complete:c||!c&&b||eb.isFunction(a)&&a,duration:a,easing:c&&b||b&&!eb.isFunction(b)&&b};return d.duration=eb.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in eb.fx.speeds?eb.fx.speeds[d.duration]:eb.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){eb.isFunction(d.old)&&d.old.call(this),d.queue&&eb.dequeue(this,d.queue)},d},eb.fn.extend({fadeTo:function(a,b,c,d){return this.filter(Cb).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=eb.isEmptyObject(a),f=eb.speed(b,c,d),g=function(){var b=M(this,eb.extend({},a),f);(e||eb._data(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=eb.timers,g=eb._data(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&rc.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&eb.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=eb._data(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=eb.timers,g=d?d.length:0;for(c.finish=!0,eb.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),eb.each(["toggle","show","hide"],function(a,b){var c=eb.fn[b];eb.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(I(b,!0),a,d,e)}}),eb.each({slideDown:I("show"),slideUp:I("hide"),slideToggle:I("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){eb.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),eb.timers=[],eb.fx.tick=function(){var a,b=eb.timers,c=0;for(nc=eb.now();c<b.length;c++)a=b[c],a()||b[c]!==a||b.splice(c--,1);b.length||eb.fx.stop(),nc=void 0},eb.fx.timer=function(a){eb.timers.push(a),a()?eb.fx.start():eb.timers.pop()},eb.fx.interval=13,eb.fx.start=function(){oc||(oc=setInterval(eb.fx.tick,eb.fx.interval))},eb.fx.stop=function(){clearInterval(oc),oc=null},eb.fx.speeds={slow:600,fast:200,_default:400},eb.fn.delay=function(a,b){return a=eb.fx?eb.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},function(){var a,b,c,d,e;b=ob.createElement("div"),b.setAttribute("className","t"),b.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",d=b.getElementsByTagName("a")[0],c=ob.createElement("select"),e=c.appendChild(ob.createElement("option")),a=b.getElementsByTagName("input")[0],d.style.cssText="top:1px",cb.getSetAttribute="t"!==b.className,cb.style=/top/.test(d.getAttribute("style")),cb.hrefNormalized="/a"===d.getAttribute("href"),cb.checkOn=!!a.value,cb.optSelected=e.selected,cb.enctype=!!ob.createElement("form").enctype,c.disabled=!0,cb.optDisabled=!e.disabled,a=ob.createElement("input"),a.setAttribute("value",""),cb.input=""===a.getAttribute("value"),a.value="t",a.setAttribute("type","radio"),cb.radioValue="t"===a.value}();var uc=/\r/g;eb.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=eb.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,eb(this).val()):a,null==e?e="":"number"==typeof e?e+="":eb.isArray(e)&&(e=eb.map(e,function(a){return null==a?"":a+""})),b=eb.valHooks[this.type]||eb.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=eb.valHooks[e.type]||eb.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(uc,""):null==c?"":c)}}}),eb.extend({valHooks:{option:{get:function(a){var b=eb.find.attr(a,"value");return null!=b?b:eb.trim(eb.text(a))}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||(cb.optDisabled?c.disabled:null!==c.getAttribute("disabled"))||c.parentNode.disabled&&eb.nodeName(c.parentNode,"optgroup"))){if(b=eb(c).val(),f)return b;g.push(b)}return g},set:function(a,b){for(var c,d,e=a.options,f=eb.makeArray(b),g=e.length;g--;)if(d=e[g],eb.inArray(eb.valHooks.option.get(d),f)>=0)try{d.selected=c=!0}catch(h){d.scrollHeight}else d.selected=!1;return c||(a.selectedIndex=-1),e}}}}),eb.each(["radio","checkbox"],function(){eb.valHooks[this]={set:function(a,b){return eb.isArray(b)?a.checked=eb.inArray(eb(a).val(),b)>=0:void 0}},cb.checkOn||(eb.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var vc,wc,xc=eb.expr.attrHandle,yc=/^(?:checked|selected)$/i,zc=cb.getSetAttribute,Ac=cb.input;eb.fn.extend({attr:function(a,b){return Db(this,eb.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){eb.removeAttr(this,a)})}}),eb.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(a&&3!==f&&8!==f&&2!==f)return typeof a.getAttribute===xb?eb.prop(a,b,c):(1===f&&eb.isXMLDoc(a)||(b=b.toLowerCase(),d=eb.attrHooks[b]||(eb.expr.match.bool.test(b)?wc:vc)),void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=eb.find.attr(a,b),null==e?void 0:e):null!==c?d&&"set"in d&&void 0!==(e=d.set(a,c,b))?e:(a.setAttribute(b,c+""),c):void eb.removeAttr(a,b))},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(tb);if(f&&1===a.nodeType)for(;c=f[e++];)d=eb.propFix[c]||c,eb.expr.match.bool.test(c)?Ac&&zc||!yc.test(c)?a[d]=!1:a[eb.camelCase("default-"+c)]=a[d]=!1:eb.attr(a,c,""),a.removeAttribute(zc?c:d)},attrHooks:{type:{set:function(a,b){if(!cb.radioValue&&"radio"===b&&eb.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}}}),wc={set:function(a,b,c){return b===!1?eb.removeAttr(a,c):Ac&&zc||!yc.test(c)?a.setAttribute(!zc&&eb.propFix[c]||c,c):a[eb.camelCase("default-"+c)]=a[c]=!0,c}},eb.each(eb.expr.match.bool.source.match(/\w+/g),function(a,b){var c=xc[b]||eb.find.attr;xc[b]=Ac&&zc||!yc.test(b)?function(a,b,d){var e,f;return d||(f=xc[b],xc[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,xc[b]=f),e}:function(a,b,c){return c?void 0:a[eb.camelCase("default-"+b)]?b.toLowerCase():null}}),Ac&&zc||(eb.attrHooks.value={set:function(a,b,c){return eb.nodeName(a,"input")?void(a.defaultValue=b):vc&&vc.set(a,b,c)}}),zc||(vc={set:function(a,b,c){var d=a.getAttributeNode(c);return d||a.setAttributeNode(d=a.ownerDocument.createAttribute(c)),d.value=b+="","value"===c||b===a.getAttribute(c)?b:void 0}},xc.id=xc.name=xc.coords=function(a,b,c){var d;return c?void 0:(d=a.getAttributeNode(b))&&""!==d.value?d.value:null},eb.valHooks.button={get:function(a,b){var c=a.getAttributeNode(b);return c&&c.specified?c.value:void 0},set:vc.set},eb.attrHooks.contenteditable={set:function(a,b,c){vc.set(a,""===b?!1:b,c)}},eb.each(["width","height"],function(a,b){eb.attrHooks[b]={set:function(a,c){return""===c?(a.setAttribute(b,"auto"),c):void 0}}})),cb.style||(eb.attrHooks.style={get:function(a){return a.style.cssText||void 0},set:function(a,b){return a.style.cssText=b+""}});var Bc=/^(?:input|select|textarea|button|object)$/i,Cc=/^(?:a|area)$/i;eb.fn.extend({prop:function(a,b){return Db(this,eb.prop,a,b,arguments.length>1)},removeProp:function(a){return a=eb.propFix[a]||a,this.each(function(){try{this[a]=void 0,delete this[a]}catch(b){}})}}),eb.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(a,b,c){var d,e,f,g=a.nodeType;if(a&&3!==g&&8!==g&&2!==g)return f=1!==g||!eb.isXMLDoc(a),f&&(b=eb.propFix[b]||b,e=eb.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=eb.find.attr(a,"tabindex");return b?parseInt(b,10):Bc.test(a.nodeName)||Cc.test(a.nodeName)&&a.href?0:-1}}}}),cb.hrefNormalized||eb.each(["href","src"],function(a,b){eb.propHooks[b]={get:function(a){return a.getAttribute(b,4)
-}}}),cb.optSelected||(eb.propHooks.selected={get:function(a){var b=a.parentNode;return b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex),null}}),eb.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){eb.propFix[this.toLowerCase()]=this}),cb.enctype||(eb.propFix.enctype="encoding");var Dc=/[\t\r\n\f]/g;eb.fn.extend({addClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j="string"==typeof a&&a;if(eb.isFunction(a))return this.each(function(b){eb(this).addClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(tb)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(Dc," "):" ")){for(f=0;e=b[f++];)d.indexOf(" "+e+" ")<0&&(d+=e+" ");g=eb.trim(d),c.className!==g&&(c.className=g)}return this},removeClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j=0===arguments.length||"string"==typeof a&&a;if(eb.isFunction(a))return this.each(function(b){eb(this).removeClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(tb)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(Dc," "):"")){for(f=0;e=b[f++];)for(;d.indexOf(" "+e+" ")>=0;)d=d.replace(" "+e+" "," ");g=a?eb.trim(d):"",c.className!==g&&(c.className=g)}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):this.each(eb.isFunction(a)?function(c){eb(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c)for(var b,d=0,e=eb(this),f=a.match(tb)||[];b=f[d++];)e.hasClass(b)?e.removeClass(b):e.addClass(b);else(c===xb||"boolean"===c)&&(this.className&&eb._data(this,"__className__",this.className),this.className=this.className||a===!1?"":eb._data(this,"__className__")||"")})},hasClass:function(a){for(var b=" "+a+" ",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(" "+this[c].className+" ").replace(Dc," ").indexOf(b)>=0)return!0;return!1}}),eb.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(a,b){eb.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),eb.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}});var Ec=eb.now(),Fc=/\?/,Gc=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;eb.parseJSON=function(b){if(a.JSON&&a.JSON.parse)return a.JSON.parse(b+"");var c,d=null,e=eb.trim(b+"");return e&&!eb.trim(e.replace(Gc,function(a,b,e,f){return c&&b&&(d=0),0===d?a:(c=e||b,d+=!f-!e,"")}))?Function("return "+e)():eb.error("Invalid JSON: "+b)},eb.parseXML=function(b){var c,d;if(!b||"string"!=typeof b)return null;try{a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b))}catch(e){c=void 0}return c&&c.documentElement&&!c.getElementsByTagName("parsererror").length||eb.error("Invalid XML: "+b),c};var Hc,Ic,Jc=/#.*$/,Kc=/([?&])_=[^&]*/,Lc=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Mc=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Nc=/^(?:GET|HEAD)$/,Oc=/^\/\//,Pc=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,Qc={},Rc={},Sc="*/".concat("*");try{Ic=location.href}catch(Tc){Ic=ob.createElement("a"),Ic.href="",Ic=Ic.href}Hc=Pc.exec(Ic.toLowerCase())||[],eb.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Ic,type:"GET",isLocal:Mc.test(Hc[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Sc,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":eb.parseJSON,"text xml":eb.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?P(P(a,eb.ajaxSettings),b):P(eb.ajaxSettings,a)},ajaxPrefilter:N(Qc),ajaxTransport:N(Rc),ajax:function(a,b){function c(a,b,c,d){var e,k,r,s,u,w=b;2!==t&&(t=2,h&&clearTimeout(h),j=void 0,g=d||"",v.readyState=a>0?4:0,e=a>=200&&300>a||304===a,c&&(s=Q(l,v,c)),s=R(l,s,v,e),e?(l.ifModified&&(u=v.getResponseHeader("Last-Modified"),u&&(eb.lastModified[f]=u),u=v.getResponseHeader("etag"),u&&(eb.etag[f]=u)),204===a||"HEAD"===l.type?w="nocontent":304===a?w="notmodified":(w=s.state,k=s.data,r=s.error,e=!r)):(r=w,(a||!w)&&(w="error",0>a&&(a=0))),v.status=a,v.statusText=(b||w)+"",e?o.resolveWith(m,[k,w,v]):o.rejectWith(m,[v,w,r]),v.statusCode(q),q=void 0,i&&n.trigger(e?"ajaxSuccess":"ajaxError",[v,l,e?k:r]),p.fireWith(m,[v,w]),i&&(n.trigger("ajaxComplete",[v,l]),--eb.active||eb.event.trigger("ajaxStop")))}"object"==typeof a&&(b=a,a=void 0),b=b||{};var d,e,f,g,h,i,j,k,l=eb.ajaxSetup({},b),m=l.context||l,n=l.context&&(m.nodeType||m.jquery)?eb(m):eb.event,o=eb.Deferred(),p=eb.Callbacks("once memory"),q=l.statusCode||{},r={},s={},t=0,u="canceled",v={readyState:0,getResponseHeader:function(a){var b;if(2===t){if(!k)for(k={};b=Lc.exec(g);)k[b[1].toLowerCase()]=b[2];b=k[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===t?g:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return t||(a=s[c]=s[c]||a,r[a]=b),this},overrideMimeType:function(a){return t||(l.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>t)for(b in a)q[b]=[q[b],a[b]];else v.always(a[v.status]);return this},abort:function(a){var b=a||u;return j&&j.abort(b),c(0,b),this}};if(o.promise(v).complete=p.add,v.success=v.done,v.error=v.fail,l.url=((a||l.url||Ic)+"").replace(Jc,"").replace(Oc,Hc[1]+"//"),l.type=b.method||b.type||l.method||l.type,l.dataTypes=eb.trim(l.dataType||"*").toLowerCase().match(tb)||[""],null==l.crossDomain&&(d=Pc.exec(l.url.toLowerCase()),l.crossDomain=!(!d||d[1]===Hc[1]&&d[2]===Hc[2]&&(d[3]||("http:"===d[1]?"80":"443"))===(Hc[3]||("http:"===Hc[1]?"80":"443")))),l.data&&l.processData&&"string"!=typeof l.data&&(l.data=eb.param(l.data,l.traditional)),O(Qc,l,b,v),2===t)return v;i=l.global,i&&0===eb.active++&&eb.event.trigger("ajaxStart"),l.type=l.type.toUpperCase(),l.hasContent=!Nc.test(l.type),f=l.url,l.hasContent||(l.data&&(f=l.url+=(Fc.test(f)?"&":"?")+l.data,delete l.data),l.cache===!1&&(l.url=Kc.test(f)?f.replace(Kc,"$1_="+Ec++):f+(Fc.test(f)?"&":"?")+"_="+Ec++)),l.ifModified&&(eb.lastModified[f]&&v.setRequestHeader("If-Modified-Since",eb.lastModified[f]),eb.etag[f]&&v.setRequestHeader("If-None-Match",eb.etag[f])),(l.data&&l.hasContent&&l.contentType!==!1||b.contentType)&&v.setRequestHeader("Content-Type",l.contentType),v.setRequestHeader("Accept",l.dataTypes[0]&&l.accepts[l.dataTypes[0]]?l.accepts[l.dataTypes[0]]+("*"!==l.dataTypes[0]?", "+Sc+"; q=0.01":""):l.accepts["*"]);for(e in l.headers)v.setRequestHeader(e,l.headers[e]);if(l.beforeSend&&(l.beforeSend.call(m,v,l)===!1||2===t))return v.abort();u="abort";for(e in{success:1,error:1,complete:1})v[e](l[e]);if(j=O(Rc,l,b,v)){v.readyState=1,i&&n.trigger("ajaxSend",[v,l]),l.async&&l.timeout>0&&(h=setTimeout(function(){v.abort("timeout")},l.timeout));try{t=1,j.send(r,c)}catch(w){if(!(2>t))throw w;c(-1,w)}}else c(-1,"No Transport");return v},getJSON:function(a,b,c){return eb.get(a,b,c,"json")},getScript:function(a,b){return eb.get(a,void 0,b,"script")}}),eb.each(["get","post"],function(a,b){eb[b]=function(a,c,d,e){return eb.isFunction(c)&&(e=e||d,d=c,c=void 0),eb.ajax({url:a,type:b,dataType:e,data:c,success:d})}}),eb.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){eb.fn[b]=function(a){return this.on(b,a)}}),eb._evalUrl=function(a){return eb.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},eb.fn.extend({wrapAll:function(a){if(eb.isFunction(a))return this.each(function(b){eb(this).wrapAll(a.call(this,b))});if(this[0]){var b=eb(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){for(var a=this;a.firstChild&&1===a.firstChild.nodeType;)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return this.each(eb.isFunction(a)?function(b){eb(this).wrapInner(a.call(this,b))}:function(){var b=eb(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=eb.isFunction(a);return this.each(function(c){eb(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){eb.nodeName(this,"body")||eb(this).replaceWith(this.childNodes)}).end()}}),eb.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0||!cb.reliableHiddenOffsets()&&"none"===(a.style&&a.style.display||eb.css(a,"display"))},eb.expr.filters.visible=function(a){return!eb.expr.filters.hidden(a)};var Uc=/%20/g,Vc=/\[\]$/,Wc=/\r?\n/g,Xc=/^(?:submit|button|image|reset|file)$/i,Yc=/^(?:input|select|textarea|keygen)/i;eb.param=function(a,b){var c,d=[],e=function(a,b){b=eb.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=eb.ajaxSettings&&eb.ajaxSettings.traditional),eb.isArray(a)||a.jquery&&!eb.isPlainObject(a))eb.each(a,function(){e(this.name,this.value)});else for(c in a)S(c,a[c],b,e);return d.join("&").replace(Uc,"+")},eb.fn.extend({serialize:function(){return eb.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=eb.prop(this,"elements");return a?eb.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!eb(this).is(":disabled")&&Yc.test(this.nodeName)&&!Xc.test(a)&&(this.checked||!Eb.test(a))}).map(function(a,b){var c=eb(this).val();return null==c?null:eb.isArray(c)?eb.map(c,function(a){return{name:b.name,value:a.replace(Wc,"\r\n")}}):{name:b.name,value:c.replace(Wc,"\r\n")}}).get()}}),eb.ajaxSettings.xhr=void 0!==a.ActiveXObject?function(){return!this.isLocal&&/^(get|post|head|put|delete|options)$/i.test(this.type)&&T()||U()}:T;var Zc=0,$c={},_c=eb.ajaxSettings.xhr();a.ActiveXObject&&eb(a).on("unload",function(){for(var a in $c)$c[a](void 0,!0)}),cb.cors=!!_c&&"withCredentials"in _c,_c=cb.ajax=!!_c,_c&&eb.ajaxTransport(function(a){if(!a.crossDomain||cb.cors){var b;return{send:function(c,d){var e,f=a.xhr(),g=++Zc;if(f.open(a.type,a.url,a.async,a.username,a.password),a.xhrFields)for(e in a.xhrFields)f[e]=a.xhrFields[e];a.mimeType&&f.overrideMimeType&&f.overrideMimeType(a.mimeType),a.crossDomain||c["X-Requested-With"]||(c["X-Requested-With"]="XMLHttpRequest");for(e in c)void 0!==c[e]&&f.setRequestHeader(e,c[e]+"");f.send(a.hasContent&&a.data||null),b=function(c,e){var h,i,j;if(b&&(e||4===f.readyState))if(delete $c[g],b=void 0,f.onreadystatechange=eb.noop,e)4!==f.readyState&&f.abort();else{j={},h=f.status,"string"==typeof f.responseText&&(j.text=f.responseText);try{i=f.statusText}catch(k){i=""}h||!a.isLocal||a.crossDomain?1223===h&&(h=204):h=j.text?200:404}j&&d(h,i,j,f.getAllResponseHeaders())},a.async?4===f.readyState?setTimeout(b):f.onreadystatechange=$c[g]=b:b()},abort:function(){b&&b(void 0,!0)}}}}),eb.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(a){return eb.globalEval(a),a}}}),eb.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),eb.ajaxTransport("script",function(a){if(a.crossDomain){var b,c=ob.head||eb("head")[0]||ob.documentElement;return{send:function(d,e){b=ob.createElement("script"),b.async=!0,a.scriptCharset&&(b.charset=a.scriptCharset),b.src=a.url,b.onload=b.onreadystatechange=function(a,c){(c||!b.readyState||/loaded|complete/.test(b.readyState))&&(b.onload=b.onreadystatechange=null,b.parentNode&&b.parentNode.removeChild(b),b=null,c||e(200,"success"))},c.insertBefore(b,c.firstChild)},abort:function(){b&&b.onload(void 0,!0)}}}});var ad=[],bd=/(=)\?(?=&|$)|\?\?/;eb.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=ad.pop()||eb.expando+"_"+Ec++;return this[a]=!0,a}}),eb.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(bd.test(b.url)?"url":"string"==typeof b.data&&!(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&bd.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=eb.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(bd,"$1"+e):b.jsonp!==!1&&(b.url+=(Fc.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||eb.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,ad.push(e)),g&&eb.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),eb.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||ob;var d=lb.exec(a),e=!c&&[];return d?[b.createElement(d[1])]:(d=eb.buildFragment([a],b,e),e&&e.length&&eb(e).remove(),eb.merge([],d.childNodes))};var cd=eb.fn.load;eb.fn.load=function(a,b,c){if("string"!=typeof a&&cd)return cd.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>=0&&(d=eb.trim(a.slice(h,a.length)),a=a.slice(0,h)),eb.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(f="POST"),g.length>0&&eb.ajax({url:a,type:f,dataType:"html",data:b}).done(function(a){e=arguments,g.html(d?eb("<div>").append(eb.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,e||[a.responseText,b,a])}),this},eb.expr.filters.animated=function(a){return eb.grep(eb.timers,function(b){return a===b.elem}).length};var dd=a.document.documentElement;eb.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=eb.css(a,"position"),l=eb(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=eb.css(a,"top"),i=eb.css(a,"left"),j=("absolute"===k||"fixed"===k)&&eb.inArray("auto",[f,i])>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),eb.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},eb.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){eb.offset.setOffset(this,a,b)});var b,c,d={top:0,left:0},e=this[0],f=e&&e.ownerDocument;if(f)return b=f.documentElement,eb.contains(b,e)?(typeof e.getBoundingClientRect!==xb&&(d=e.getBoundingClientRect()),c=V(f),{top:d.top+(c.pageYOffset||b.scrollTop)-(b.clientTop||0),left:d.left+(c.pageXOffset||b.scrollLeft)-(b.clientLeft||0)}):d},position:function(){if(this[0]){var a,b,c={top:0,left:0},d=this[0];return"fixed"===eb.css(d,"position")?b=d.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),eb.nodeName(a[0],"html")||(c=a.offset()),c.top+=eb.css(a[0],"borderTopWidth",!0),c.left+=eb.css(a[0],"borderLeftWidth",!0)),{top:b.top-c.top-eb.css(d,"marginTop",!0),left:b.left-c.left-eb.css(d,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){for(var a=this.offsetParent||dd;a&&!eb.nodeName(a,"html")&&"static"===eb.css(a,"position");)a=a.offsetParent;return a||dd})}}),eb.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c=/Y/.test(b);eb.fn[a]=function(d){return Db(this,function(a,d,e){var f=V(a);return void 0===e?f?b in f?f[b]:f.document.documentElement[d]:a[d]:void(f?f.scrollTo(c?eb(f).scrollLeft():e,c?e:eb(f).scrollTop()):a[d]=e)},a,d,arguments.length,null)}}),eb.each(["top","left"],function(a,b){eb.cssHooks[b]=A(cb.pixelPosition,function(a,c){return c?(c=bc(a,b),dc.test(c)?eb(a).position()[b]+"px":c):void 0})}),eb.each({Height:"height",Width:"width"},function(a,b){eb.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){eb.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return Db(this,function(b,c,d){var e;return eb.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?eb.css(b,c,g):eb.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),eb.fn.size=function(){return this.length},eb.fn.andSelf=eb.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return eb});var ed=a.jQuery,fd=a.$;return eb.noConflict=function(b){return a.$===eb&&(a.$=fd),b&&a.jQuery===eb&&(a.jQuery=ed),eb},typeof b===xb&&(a.jQuery=a.$=eb),eb});
\ No newline at end of file
diff --git a/NewLife.Cube/Content/js/respond.min.js b/NewLife.Cube/Content/js/respond.min.js
deleted file mode 100644
index 8b64c92faa..0000000000
--- a/NewLife.Cube/Content/js/respond.min.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/*! matchMedia() polyfill - Test a CSS media type/query in JS. Authors & copyright (c) 2012: Scott Jehl, Paul Irish, Nicholas Zakas. Dual MIT/BSD license */
-/*! NOTE: If you're already including a window.matchMedia polyfill via Modernizr or otherwise, you don't need this part */
-!function(a){"use strict";a.matchMedia=a.matchMedia||function(a){var b,c=a.documentElement,d=c.firstElementChild||c.firstChild,e=a.createElement("body"),f=a.createElement("div");return f.id="mq-test-1",f.style.cssText="position:absolute;top:-100em",e.style.background="none",e.appendChild(f),function(a){return f.innerHTML='&shy;<style media="'+a+'"> #mq-test-1 { width: 42px; }</style>',c.insertBefore(e,d),b=42===f.offsetWidth,c.removeChild(e),{matches:b,media:a}}}(a.document)}(this),/*! Respond.js v1.4.0: min/max-width media query polyfill. (c) Scott Jehl. MIT Lic. j.mp/respondjs  */
-function(a){"use strict";function b(){u(!0)}var c={};a.respond=c,c.update=function(){};var d=[],e=function(){var b=!1;try{b=new a.XMLHttpRequest}catch(c){b=new a.ActiveXObject("Microsoft.XMLHTTP")}return function(){return b}}(),f=function(a,b){var c=e();c&&(c.open("GET",a,!0),c.onreadystatechange=function(){4!==c.readyState||200!==c.status&&304!==c.status||b(c.responseText)},4!==c.readyState&&c.send(null))};if(c.ajax=f,c.queue=d,c.regex={media:/@media[^\{]+\{([^\{\}]*\{[^\}\{]*\})+/gi,keyframes:/@(?:\-(?:o|moz|webkit)\-)?keyframes[^\{]+\{(?:[^\{\}]*\{[^\}\{]*\})+[^\}]*\}/gi,urls:/(url\()['"]?([^\/\)'"][^:\)'"]+)['"]?(\))/g,findStyles:/@media *([^\{]+)\{([\S\s]+?)$/,only:/(only\s+)?([a-zA-Z]+)\s?/,minw:/\([\s]*min\-width\s*:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/,maxw:/\([\s]*max\-width\s*:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/},c.mediaQueriesSupported=a.matchMedia&&null!==a.matchMedia("only all")&&a.matchMedia("only all").matches,!c.mediaQueriesSupported){var g,h,i,j=a.document,k=j.documentElement,l=[],m=[],n=[],o={},p=30,q=j.getElementsByTagName("head")[0]||k,r=j.getElementsByTagName("base")[0],s=q.getElementsByTagName("link"),t=function(){var a,b=j.createElement("div"),c=j.body,d=k.style.fontSize,e=c&&c.style.fontSize,f=!1;return b.style.cssText="position:absolute;font-size:1em;width:1em",c||(c=f=j.createElement("body"),c.style.background="none"),k.style.fontSize="100%",c.style.fontSize="100%",c.appendChild(b),f&&k.insertBefore(c,k.firstChild),a=b.offsetWidth,f?k.removeChild(c):c.removeChild(b),k.style.fontSize=d,e&&(c.style.fontSize=e),a=i=parseFloat(a)},u=function(b){var c="clientWidth",d=k[c],e="CSS1Compat"===j.compatMode&&d||j.body[c]||d,f={},o=s[s.length-1],r=(new Date).getTime();if(b&&g&&p>r-g)return a.clearTimeout(h),void(h=a.setTimeout(u,p));g=r;for(var v in l)if(l.hasOwnProperty(v)){var w=l[v],x=w.minw,y=w.maxw,z=null===x,A=null===y,B="em";x&&(x=parseFloat(x)*(x.indexOf(B)>-1?i||t():1)),y&&(y=parseFloat(y)*(y.indexOf(B)>-1?i||t():1)),w.hasquery&&(z&&A||!(z||e>=x)||!(A||y>=e))||(f[w.media]||(f[w.media]=[]),f[w.media].push(m[w.rules]))}for(var C in n)n.hasOwnProperty(C)&&n[C]&&n[C].parentNode===q&&q.removeChild(n[C]);n.length=0;for(var D in f)if(f.hasOwnProperty(D)){var E=j.createElement("style"),F=f[D].join("\n");E.type="text/css",E.media=D,q.insertBefore(E,o.nextSibling),E.styleSheet?E.styleSheet.cssText=F:E.appendChild(j.createTextNode(F)),n.push(E)}},v=function(a,b,d){var e=a.replace(c.regex.keyframes,"").match(c.regex.media),f=e&&e.length||0;b=b.substring(0,b.lastIndexOf("/"));var g=function(a){return a.replace(c.regex.urls,"$1"+b+"$2$3")},h=!f&&d;b.length&&(b+="/"),h&&(f=1);for(var i=0;f>i;i++){var j,k,n,o;h?(j=d,m.push(g(a))):(j=e[i].match(c.regex.findStyles)&&RegExp.$1,m.push(RegExp.$2&&g(RegExp.$2))),n=j.split(","),o=n.length;for(var p=0;o>p;p++)k=n[p],l.push({media:k.split("(")[0].match(c.regex.only)&&RegExp.$2||"all",rules:m.length-1,hasquery:k.indexOf("(")>-1,minw:k.match(c.regex.minw)&&parseFloat(RegExp.$1)+(RegExp.$2||""),maxw:k.match(c.regex.maxw)&&parseFloat(RegExp.$1)+(RegExp.$2||"")})}u()},w=function(){if(d.length){var b=d.shift();f(b.href,function(c){v(c,b.href,b.media),o[b.href]=!0,a.setTimeout(function(){w()},0)})}},x=function(){for(var b=0;b<s.length;b++){var c=s[b],e=c.href,f=c.media,g=c.rel&&"stylesheet"===c.rel.toLowerCase();e&&g&&!o[e]&&(c.styleSheet&&c.styleSheet.rawCssText?(v(c.styleSheet.rawCssText,e,f),o[e]=!0):(!/^([a-zA-Z:]*\/\/)/.test(e)&&!r||e.replace(RegExp.$1,"").split("/")[0]===a.location.host)&&("//"===e.substring(0,2)&&(e=a.location.protocol+e),d.push({href:e,media:f})))}w()};x(),c.update=x,c.getEmValue=t,a.addEventListener?a.addEventListener("resize",b,!1):a.attachEvent&&a.attachEvent("onresize",b)}}(this);
\ No newline at end of file
diff --git a/NewLife.Cube/Content/jweui/css/demos.css b/NewLife.Cube/Content/jweui/css/demos.css
deleted file mode 100644
index 8f20bf9b55..0000000000
--- a/NewLife.Cube/Content/jweui/css/demos.css
+++ /dev/null
@@ -1,44 +0,0 @@
-body, html {
-  height: 100%;
-  -webkit-tap-highlight-color: transparent;
-}
-.demos-title {
-  text-align: center;
-  font-size: 34px;
-  color: #3cc51f;
-  font-weight: 400;
-  margin: 0 15%;
-}
-
-.demos-sub-title {
-  text-align: center;
-  color: #888;
-  font-size: 14px;
-}
-
-.demos-header {
-  padding: 35px 0;
-}
-
-.demos-content-padded {
-  padding: 15px;
-}
-
-.demos-second-title {
-  text-align: center;
-  font-size: 24px;
-  color: #3cc51f;
-  font-weight: 400;
-  margin: 0 15%;
-}
-
-footer {
-  text-align: center;
-  font-size: 14px;
-  padding: 20px;
-}
-
-footer a {
-  color: #999;
-  text-decoration: none;
-}
diff --git a/NewLife.Cube/Content/jweui/css/jquery-weui.css b/NewLife.Cube/Content/jweui/css/jquery-weui.css
deleted file mode 100644
index df3011fa82..0000000000
--- a/NewLife.Cube/Content/jweui/css/jquery-weui.css
+++ /dev/null
@@ -1,2304 +0,0 @@
-/** 
-* jQuery WeUI V1.0.1 
-* By 言川
-* http://lihongxun945.github.io/jquery-weui/
- */
-.preloader {
-  width: 20px;
-  height: 20px;
-  -webkit-transform-origin: 50%;
-          transform-origin: 50%;
-  -webkit-animation: preloader-spin 1s steps(12, end) infinite;
-          animation: preloader-spin 1s steps(12, end) infinite;
-}
-.preloader:after {
-  display: block;
-  width: 100%;
-  height: 100%;
-  content: "";
-  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20viewBox%3D'0%200%20120%20120'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20xmlns%3Axlink%3D'http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink'%3E%3Cdefs%3E%3Cline%20id%3D'l'%20x1%3D'60'%20x2%3D'60'%20y1%3D'7'%20y2%3D'27'%20stroke%3D'%236c6c6c'%20stroke-width%3D'11'%20stroke-linecap%3D'round'%2F%3E%3C%2Fdefs%3E%3Cg%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(30%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(60%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(90%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(120%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(150%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.37'%20transform%3D'rotate(180%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.46'%20transform%3D'rotate(210%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.56'%20transform%3D'rotate(240%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.66'%20transform%3D'rotate(270%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.75'%20transform%3D'rotate(300%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.85'%20transform%3D'rotate(330%2060%2C60)'%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");
-  background-repeat: no-repeat;
-  background-position: 50%;
-  background-size: 100%;
-}
-@-webkit-keyframes preloader-spin {
-  100% {
-    -webkit-transform: rotate(360deg);
-            transform: rotate(360deg);
-  }
-}
-@keyframes preloader-spin {
-  100% {
-    -webkit-transform: rotate(360deg);
-            transform: rotate(360deg);
-  }
-}
-/*
-.hairline(@position, @color) when (@position = top) {
-  border-top: 1px solid @color;
-}
-.hairline(@position, @color) when (@position = left) {
-  border-left: 1px solid @color;
-}
-.hairline(@position, @color) when (@position = bottom) {
-  border-bottom: 1px solid @color;
-}
-.hairline(@position, @color) when (@position = right) {
-  border-right: 1px solid @color;
-}
-// For right and bottom
-.hairline-remove(@position) when not (@position = left) and not (@position = top) {
-  border-left: 0;
-  border-bottom: 0;
-}
-// For left and top
-.hairline-remove(@position) when not (@position = right) and not (@position = bottom) {
-  border-right: 0;
-  border-top: 0;
-}
-// For right and bottom
-.hairline-color(@position, @color) when not (@position = left) and not (@position = top) {
-  border-right-color: @color;
-  border-bottom-color: @color;
-}
-// For left and top
-.hairline-color(@position, @color) when not (@position = right) and not (@position = bottom) {
-  border-left-color: @color;
-  border-top-color: @color;
-}
-*/
-label > * {
-  pointer-events: none;
-}
-html {
-  font-size: 20px;
-}
-body {
-  font-size: 16px;
-}
-@media only screen and (min-width: 400px) {
-  html {
-    font-size: 21.33333333px !important;
-  }
-}
-@media only screen and (min-width: 414px) {
-  html {
-    font-size: 22.08px !important;
-  }
-}
-@media only screen and (min-width: 480px) {
-  html {
-    font-size: 25.6px !important;
-  }
-}
-.weui_navbar {
-  z-index: 10;
-}
-.weui-popup-overlay,
-.weui-popup-container {
-  z-index: 1000;
-}
-.weui-mask {
-  z-index: 1000;
-}
-/* === Grid === */
-.weui-row {
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: -webkit-flex;
-  display: flex;
-  -webkit-box-pack: justify;
-  -ms-flex-pack: justify;
-  -webkit-justify-content: space-between;
-  justify-content: space-between;
-  -webkit-box-lines: multiple;
-  -moz-box-lines: multiple;
-  -webkit-flex-wrap: wrap;
-  -ms-flex-wrap: wrap;
-  flex-wrap: wrap;
-  -webkit-box-align: start;
-  -ms-flex-align: start;
-  -webkit-align-items: flex-start;
-  align-items: flex-start;
-}
-.weui-row > [class*="col-"] {
-  box-sizing: border-box;
-}
-.weui-row .col-auto {
-  width: 100%;
-}
-.weui-row .weui-col-100 {
-  width: 100%;
-  width: calc((100% - 15px*0) / 1);
-}
-.weui-row.weui-no-gutter .weui-col-100 {
-  width: 100%;
-}
-.weui-row .weui-col-95 {
-  width: 95%;
-  width: calc((100% - 15px*0.05263157894736836) / 1.0526315789473684);
-}
-.weui-row.weui-no-gutter .weui-col-95 {
-  width: 95%;
-}
-.weui-row .weui-col-90 {
-  width: 90%;
-  width: calc((100% - 15px*0.11111111111111116) / 1.1111111111111112);
-}
-.weui-row.weui-no-gutter .weui-col-90 {
-  width: 90%;
-}
-.weui-row .weui-col-85 {
-  width: 85%;
-  width: calc((100% - 15px*0.17647058823529416) / 1.1764705882352942);
-}
-.weui-row.weui-no-gutter .weui-col-85 {
-  width: 85%;
-}
-.weui-row .weui-col-80 {
-  width: 80%;
-  width: calc((100% - 15px*0.25) / 1.25);
-}
-.weui-row.weui-no-gutter .weui-col-80 {
-  width: 80%;
-}
-.weui-row .weui-col-75 {
-  width: 75%;
-  width: calc((100% - 15px*0.33333333333333326) / 1.3333333333333333);
-}
-.weui-row.weui-no-gutter .weui-col-75 {
-  width: 75%;
-}
-.weui-row .weui-col-66 {
-  width: 66.66666666666666%;
-  width: calc((100% - 15px*0.5000000000000002) / 1.5000000000000002);
-}
-.weui-row.weui-no-gutter .weui-col-66 {
-  width: 66.66666666666666%;
-}
-.weui-row .weui-col-60 {
-  width: 60%;
-  width: calc((100% - 15px*0.6666666666666667) / 1.6666666666666667);
-}
-.weui-row.weui-no-gutter .weui-col-60 {
-  width: 60%;
-}
-.weui-row .weui-col-50 {
-  width: 50%;
-  width: calc((100% - 15px*1) / 2);
-}
-.weui-row.weui-no-gutter .weui-col-50 {
-  width: 50%;
-}
-.weui-row .weui-col-40 {
-  width: 40%;
-  width: calc((100% - 15px*1.5) / 2.5);
-}
-.weui-row.weui-no-gutter .weui-col-40 {
-  width: 40%;
-}
-.weui-row .weui-col-33 {
-  width: 33.333333333333336%;
-  width: calc((100% - 15px*2) / 3);
-}
-.weui-row.weui-no-gutter .weui-col-33 {
-  width: 33.333333333333336%;
-}
-.weui-row .weui-col-25 {
-  width: 25%;
-  width: calc((100% - 15px*3) / 4);
-}
-.weui-row.weui-no-gutter .weui-col-25 {
-  width: 25%;
-}
-.weui-row .weui-col-20 {
-  width: 20%;
-  width: calc((100% - 15px*4) / 5);
-}
-.weui-row.weui-no-gutter .weui-col-20 {
-  width: 20%;
-}
-.weui-row .weui-col-15 {
-  width: 15%;
-  width: calc((100% - 15px*5.666666666666667) / 6.666666666666667);
-}
-.weui-row.weui-no-gutter .weui-col-15 {
-  width: 15%;
-}
-.weui-row .weui-col-10 {
-  width: 10%;
-  width: calc((100% - 15px*9) / 10);
-}
-.weui-row.weui-no-gutter .weui-col-10 {
-  width: 10%;
-}
-.weui-row .weui-col-5 {
-  width: 5%;
-  width: calc((100% - 15px*19) / 20);
-}
-.weui-row.weui-no-gutter .weui-col-5 {
-  width: 5%;
-}
-.weui-row .weui-col-auto:nth-last-child(1),
-.weui-row .weui-col-auto:nth-last-child(1) ~ .weui-col-auto {
-  width: 100%;
-  width: calc((100% - 15px*0) / 1);
-}
-.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(1),
-.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(1) ~ .weui-col-auto {
-  width: 100%;
-}
-.weui-row .weui-col-auto:nth-last-child(2),
-.weui-row .weui-col-auto:nth-last-child(2) ~ .weui-col-auto {
-  width: 50%;
-  width: calc((100% - 15px*1) / 2);
-}
-.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(2),
-.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(2) ~ .weui-col-auto {
-  width: 50%;
-}
-.weui-row .weui-col-auto:nth-last-child(3),
-.weui-row .weui-col-auto:nth-last-child(3) ~ .weui-col-auto {
-  width: 33.33333333%;
-  width: calc((100% - 15px*2) / 3);
-}
-.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(3),
-.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(3) ~ .weui-col-auto {
-  width: 33.33333333%;
-}
-.weui-row .weui-col-auto:nth-last-child(4),
-.weui-row .weui-col-auto:nth-last-child(4) ~ .weui-col-auto {
-  width: 25%;
-  width: calc((100% - 15px*3) / 4);
-}
-.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(4),
-.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(4) ~ .weui-col-auto {
-  width: 25%;
-}
-.weui-row .weui-col-auto:nth-last-child(5),
-.weui-row .weui-col-auto:nth-last-child(5) ~ .weui-col-auto {
-  width: 20%;
-  width: calc((100% - 15px*4) / 5);
-}
-.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(5),
-.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(5) ~ .weui-col-auto {
-  width: 20%;
-}
-.weui-row .weui-col-auto:nth-last-child(6),
-.weui-row .weui-col-auto:nth-last-child(6) ~ .weui-col-auto {
-  width: 16.66666667%;
-  width: calc((100% - 15px*5) / 6);
-}
-.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(6),
-.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(6) ~ .weui-col-auto {
-  width: 16.66666667%;
-}
-.weui-row .weui-col-auto:nth-last-child(7),
-.weui-row .weui-col-auto:nth-last-child(7) ~ .weui-col-auto {
-  width: 14.28571429%;
-  width: calc((100% - 15px*6) / 7);
-}
-.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(7),
-.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(7) ~ .weui-col-auto {
-  width: 14.28571429%;
-}
-.weui-row .weui-col-auto:nth-last-child(8),
-.weui-row .weui-col-auto:nth-last-child(8) ~ .weui-col-auto {
-  width: 12.5%;
-  width: calc((100% - 15px*7) / 8);
-}
-.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(8),
-.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(8) ~ .weui-col-auto {
-  width: 12.5%;
-}
-.weui-row .weui-col-auto:nth-last-child(9),
-.weui-row .weui-col-auto:nth-last-child(9) ~ .weui-col-auto {
-  width: 11.11111111%;
-  width: calc((100% - 15px*8) / 9);
-}
-.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(9),
-.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(9) ~ .weui-col-auto {
-  width: 11.11111111%;
-}
-.weui-row .weui-col-auto:nth-last-child(10),
-.weui-row .weui-col-auto:nth-last-child(10) ~ .weui-col-auto {
-  width: 10%;
-  width: calc((100% - 15px*9) / 10);
-}
-.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(10),
-.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(10) ~ .weui-col-auto {
-  width: 10%;
-}
-.weui-row .weui-col-auto:nth-last-child(11),
-.weui-row .weui-col-auto:nth-last-child(11) ~ .weui-col-auto {
-  width: 9.09090909%;
-  width: calc((100% - 15px*10) / 11);
-}
-.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(11),
-.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(11) ~ .weui-col-auto {
-  width: 9.09090909%;
-}
-.weui-row .weui-col-auto:nth-last-child(12),
-.weui-row .weui-col-auto:nth-last-child(12) ~ .weui-col-auto {
-  width: 8.33333333%;
-  width: calc((100% - 15px*11) / 12);
-}
-.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(12),
-.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(12) ~ .weui-col-auto {
-  width: 8.33333333%;
-}
-.weui-row .weui-col-auto:nth-last-child(13),
-.weui-row .weui-col-auto:nth-last-child(13) ~ .weui-col-auto {
-  width: 7.69230769%;
-  width: calc((100% - 15px*12) / 13);
-}
-.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(13),
-.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(13) ~ .weui-col-auto {
-  width: 7.69230769%;
-}
-.weui-row .weui-col-auto:nth-last-child(14),
-.weui-row .weui-col-auto:nth-last-child(14) ~ .weui-col-auto {
-  width: 7.14285714%;
-  width: calc((100% - 15px*13) / 14);
-}
-.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(14),
-.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(14) ~ .weui-col-auto {
-  width: 7.14285714%;
-}
-.weui-row .weui-col-auto:nth-last-child(15),
-.weui-row .weui-col-auto:nth-last-child(15) ~ .weui-col-auto {
-  width: 6.66666667%;
-  width: calc((100% - 15px*14) / 15);
-}
-.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(15),
-.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(15) ~ .weui-col-auto {
-  width: 6.66666667%;
-}
-@media all and (min-width: 768px) {
-  .row .tablet-100 {
-    width: 100%;
-    width: calc((100% - 15px*0) / 1);
-  }
-  .row.no-gutter .tablet-100 {
-    width: 100%;
-  }
-  .row .tablet-95 {
-    width: 95%;
-    width: calc((100% - 15px*0.05263157894736836) / 1.0526315789473684);
-  }
-  .row.no-gutter .tablet-95 {
-    width: 95%;
-  }
-  .row .tablet-90 {
-    width: 90%;
-    width: calc((100% - 15px*0.11111111111111116) / 1.1111111111111112);
-  }
-  .row.no-gutter .tablet-90 {
-    width: 90%;
-  }
-  .row .tablet-85 {
-    width: 85%;
-    width: calc((100% - 15px*0.17647058823529416) / 1.1764705882352942);
-  }
-  .row.no-gutter .tablet-85 {
-    width: 85%;
-  }
-  .row .tablet-80 {
-    width: 80%;
-    width: calc((100% - 15px*0.25) / 1.25);
-  }
-  .row.no-gutter .tablet-80 {
-    width: 80%;
-  }
-  .row .tablet-75 {
-    width: 75%;
-    width: calc((100% - 15px*0.33333333333333326) / 1.3333333333333333);
-  }
-  .row.no-gutter .tablet-75 {
-    width: 75%;
-  }
-  .row .tablet-66 {
-    width: 66.66666666666666%;
-    width: calc((100% - 15px*0.5000000000000002) / 1.5000000000000002);
-  }
-  .row.no-gutter .tablet-66 {
-    width: 66.66666666666666%;
-  }
-  .row .tablet-60 {
-    width: 60%;
-    width: calc((100% - 15px*0.6666666666666667) / 1.6666666666666667);
-  }
-  .row.no-gutter .tablet-60 {
-    width: 60%;
-  }
-  .row .tablet-50 {
-    width: 50%;
-    width: calc((100% - 15px*1) / 2);
-  }
-  .row.no-gutter .tablet-50 {
-    width: 50%;
-  }
-  .row .tablet-40 {
-    width: 40%;
-    width: calc((100% - 15px*1.5) / 2.5);
-  }
-  .row.no-gutter .tablet-40 {
-    width: 40%;
-  }
-  .row .tablet-33 {
-    width: 33.333333333333336%;
-    width: calc((100% - 15px*2) / 3);
-  }
-  .row.no-gutter .tablet-33 {
-    width: 33.333333333333336%;
-  }
-  .row .tablet-25 {
-    width: 25%;
-    width: calc((100% - 15px*3) / 4);
-  }
-  .row.no-gutter .tablet-25 {
-    width: 25%;
-  }
-  .row .tablet-20 {
-    width: 20%;
-    width: calc((100% - 15px*4) / 5);
-  }
-  .row.no-gutter .tablet-20 {
-    width: 20%;
-  }
-  .row .tablet-15 {
-    width: 15%;
-    width: calc((100% - 15px*5.666666666666667) / 6.666666666666667);
-  }
-  .row.no-gutter .tablet-15 {
-    width: 15%;
-  }
-  .row .tablet-10 {
-    width: 10%;
-    width: calc((100% - 15px*9) / 10);
-  }
-  .row.no-gutter .tablet-10 {
-    width: 10%;
-  }
-  .row .tablet-5 {
-    width: 5%;
-    width: calc((100% - 15px*19) / 20);
-  }
-  .row.no-gutter .tablet-5 {
-    width: 5%;
-  }
-  .row .tablet-auto:nth-last-child(1),
-  .row .tablet-auto:nth-last-child(1) ~ .col-auto {
-    width: 100%;
-    width: calc((100% - 15px*0) / 1);
-  }
-  .row.no-gutter .tablet-auto:nth-last-child(1),
-  .row.no-gutter .tablet-auto:nth-last-child(1) ~ .tablet-auto {
-    width: 100%;
-  }
-  .row .tablet-auto:nth-last-child(2),
-  .row .tablet-auto:nth-last-child(2) ~ .col-auto {
-    width: 50%;
-    width: calc((100% - 15px*1) / 2);
-  }
-  .row.no-gutter .tablet-auto:nth-last-child(2),
-  .row.no-gutter .tablet-auto:nth-last-child(2) ~ .tablet-auto {
-    width: 50%;
-  }
-  .row .tablet-auto:nth-last-child(3),
-  .row .tablet-auto:nth-last-child(3) ~ .col-auto {
-    width: 33.33333333%;
-    width: calc((100% - 15px*2) / 3);
-  }
-  .row.no-gutter .tablet-auto:nth-last-child(3),
-  .row.no-gutter .tablet-auto:nth-last-child(3) ~ .tablet-auto {
-    width: 33.33333333%;
-  }
-  .row .tablet-auto:nth-last-child(4),
-  .row .tablet-auto:nth-last-child(4) ~ .col-auto {
-    width: 25%;
-    width: calc((100% - 15px*3) / 4);
-  }
-  .row.no-gutter .tablet-auto:nth-last-child(4),
-  .row.no-gutter .tablet-auto:nth-last-child(4) ~ .tablet-auto {
-    width: 25%;
-  }
-  .row .tablet-auto:nth-last-child(5),
-  .row .tablet-auto:nth-last-child(5) ~ .col-auto {
-    width: 20%;
-    width: calc((100% - 15px*4) / 5);
-  }
-  .row.no-gutter .tablet-auto:nth-last-child(5),
-  .row.no-gutter .tablet-auto:nth-last-child(5) ~ .tablet-auto {
-    width: 20%;
-  }
-  .row .tablet-auto:nth-last-child(6),
-  .row .tablet-auto:nth-last-child(6) ~ .col-auto {
-    width: 16.66666667%;
-    width: calc((100% - 15px*5) / 6);
-  }
-  .row.no-gutter .tablet-auto:nth-last-child(6),
-  .row.no-gutter .tablet-auto:nth-last-child(6) ~ .tablet-auto {
-    width: 16.66666667%;
-  }
-  .row .tablet-auto:nth-last-child(7),
-  .row .tablet-auto:nth-last-child(7) ~ .col-auto {
-    width: 14.28571429%;
-    width: calc((100% - 15px*6) / 7);
-  }
-  .row.no-gutter .tablet-auto:nth-last-child(7),
-  .row.no-gutter .tablet-auto:nth-last-child(7) ~ .tablet-auto {
-    width: 14.28571429%;
-  }
-  .row .tablet-auto:nth-last-child(8),
-  .row .tablet-auto:nth-last-child(8) ~ .col-auto {
-    width: 12.5%;
-    width: calc((100% - 15px*7) / 8);
-  }
-  .row.no-gutter .tablet-auto:nth-last-child(8),
-  .row.no-gutter .tablet-auto:nth-last-child(8) ~ .tablet-auto {
-    width: 12.5%;
-  }
-  .row .tablet-auto:nth-last-child(9),
-  .row .tablet-auto:nth-last-child(9) ~ .col-auto {
-    width: 11.11111111%;
-    width: calc((100% - 15px*8) / 9);
-  }
-  .row.no-gutter .tablet-auto:nth-last-child(9),
-  .row.no-gutter .tablet-auto:nth-last-child(9) ~ .tablet-auto {
-    width: 11.11111111%;
-  }
-  .row .tablet-auto:nth-last-child(10),
-  .row .tablet-auto:nth-last-child(10) ~ .col-auto {
-    width: 10%;
-    width: calc((100% - 15px*9) / 10);
-  }
-  .row.no-gutter .tablet-auto:nth-last-child(10),
-  .row.no-gutter .tablet-auto:nth-last-child(10) ~ .tablet-auto {
-    width: 10%;
-  }
-  .row .tablet-auto:nth-last-child(11),
-  .row .tablet-auto:nth-last-child(11) ~ .col-auto {
-    width: 9.09090909%;
-    width: calc((100% - 15px*10) / 11);
-  }
-  .row.no-gutter .tablet-auto:nth-last-child(11),
-  .row.no-gutter .tablet-auto:nth-last-child(11) ~ .tablet-auto {
-    width: 9.09090909%;
-  }
-  .row .tablet-auto:nth-last-child(12),
-  .row .tablet-auto:nth-last-child(12) ~ .col-auto {
-    width: 8.33333333%;
-    width: calc((100% - 15px*11) / 12);
-  }
-  .row.no-gutter .tablet-auto:nth-last-child(12),
-  .row.no-gutter .tablet-auto:nth-last-child(12) ~ .tablet-auto {
-    width: 8.33333333%;
-  }
-  .row .tablet-auto:nth-last-child(13),
-  .row .tablet-auto:nth-last-child(13) ~ .col-auto {
-    width: 7.69230769%;
-    width: calc((100% - 15px*12) / 13);
-  }
-  .row.no-gutter .tablet-auto:nth-last-child(13),
-  .row.no-gutter .tablet-auto:nth-last-child(13) ~ .tablet-auto {
-    width: 7.69230769%;
-  }
-  .row .tablet-auto:nth-last-child(14),
-  .row .tablet-auto:nth-last-child(14) ~ .col-auto {
-    width: 7.14285714%;
-    width: calc((100% - 15px*13) / 14);
-  }
-  .row.no-gutter .tablet-auto:nth-last-child(14),
-  .row.no-gutter .tablet-auto:nth-last-child(14) ~ .tablet-auto {
-    width: 7.14285714%;
-  }
-  .row .tablet-auto:nth-last-child(15),
-  .row .tablet-auto:nth-last-child(15) ~ .col-auto {
-    width: 6.66666667%;
-    width: calc((100% - 15px*14) / 15);
-  }
-  .row.no-gutter .tablet-auto:nth-last-child(15),
-  .row.no-gutter .tablet-auto:nth-last-child(15) ~ .tablet-auto {
-    width: 6.66666667%;
-  }
-}
-.weui-cell__hd img {
-  display: block;
-  margin-right: 5px;
-}
-.weui-dialog,
-.weui-toast {
-  -webkit-transition-duration: .2s;
-          transition-duration: .2s;
-  opacity: 0;
-  -webkit-transform: scale(0.9) translate(-50%, -50%);
-          transform: scale(0.9) translate(-50%, -50%);
-  -webkit-transform-origin: 0 0;
-          transform-origin: 0 0;
-  visibility: hidden;
-  margin: 0;
-  top: 45%;
-  z-index: 2000;
-}
-.weui-dialog .weui-dialog__btn.default,
-.weui-toast .weui-dialog__btn.default {
-  color: #5f646e;
-}
-.weui-dialog .weui-dialog__btn + .weui-dialog__btn,
-.weui-toast .weui-dialog__btn + .weui-dialog__btn {
-  position: relative;
-}
-.weui-dialog .weui-dialog__btn + .weui-dialog__btn:after,
-.weui-toast .weui-dialog__btn + .weui-dialog__btn:after {
-  content: " ";
-  position: absolute;
-  left: 0;
-  top: 0;
-  width: 1px;
-  height: 100%;
-  border-left: 1px solid #D5D5D6;
-  color: #D5D5D6;
-  -webkit-transform-origin: 0 0;
-          transform-origin: 0 0;
-  -webkit-transform: scaleX(0.5);
-          transform: scaleX(0.5);
-}
-.weui-dialog.weui-dialog--visible,
-.weui-toast.weui-dialog--visible,
-.weui-dialog.weui-toast--visible,
-.weui-toast.weui-toast--visible {
-  opacity: 1;
-  visibility: visible;
-  -webkit-transform: scale(1) translate(-50%, -50%);
-          transform: scale(1) translate(-50%, -50%);
-}
-.weui-toast_forbidden {
-  color: #F76260;
-}
-.weui-toast_cancel .weui-icon-toast:before {
-  content: "\EA0D";
-}
-.weui-toast_forbidden .weui-icon-toast:before {
-  content: "\EA0B";
-  color: #F76260;
-}
-.weui-toast_text {
-  min-height: 1em;
-  width: auto;
-  height: 45px;
-  border-radius: 25px;
-  margin-left: 0;
-  -webkit-transform: scale(0.9) translate3d(-50%, 0, 0);
-          transform: scale(0.9) translate3d(-50%, 0, 0);
-  -webkit-transform-origin: left;
-          transform-origin: left;
-}
-.weui-toast_text.weui-toast--visible {
-  -webkit-transform: scale(1) translate3d(-50%, 0, 0);
-          transform: scale(1) translate3d(-50%, 0, 0);
-}
-.weui-toast_text .weui-icon-toast {
-  display: none;
-}
-.weui-toast_text .weui-toast_content {
-  margin: 10px 15px;
-}
-.weui-mask {
-  opacity: 0;
-  -webkit-transition-duration: .3s;
-          transition-duration: .3s;
-  visibility: hidden;
-}
-.weui-mask.weui-mask--visible {
-  opacity: 1;
-  visibility: visible;
-}
-.weui-prompt-input {
-  padding: 4px 6px;
-  border: 1px solid #ccc;
-  box-sizing: border-box;
-  height: 2em;
-  width: 80%;
-  margin-top: 10px;
-}
-.weui-pull-to-refresh {
-  margin-top: -50px;
-  -webkit-transition: -webkit-transform .4s;
-  transition: -webkit-transform .4s;
-  transition: transform .4s;
-  transition: transform .4s, -webkit-transform .4s;
-}
-.weui-pull-to-refresh.refreshing {
-  -webkit-transform: translate3d(0, 50px, 0);
-          transform: translate3d(0, 50px, 0);
-}
-.weui-pull-to-refresh.touching {
-  -webkit-transition-duration: 0s;
-          transition-duration: 0s;
-}
-.weui-pull-to-refresh__layer {
-  height: 30px;
-  line-height: 30px;
-  padding: 10px;
-  text-align: center;
-}
-.weui-pull-to-refresh__layer .down {
-  display: inline-block;
-}
-.weui-pull-to-refresh__layer .up,
-.weui-pull-to-refresh__layer .refresh {
-  display: none;
-}
-.weui-pull-to-refresh__layer .weui-pull-to-refresh__arrow {
-  display: inline-block;
-  z-index: 10;
-  width: 20px;
-  height: 20px;
-  margin-right: 4px;
-  vertical-align: -4px;
-  background: no-repeat center;
-  background-size: 13px 20px;
-  -webkit-transition-duration: 300ms;
-          transition-duration: 300ms;
-  -webkit-transform: rotate(0deg) translate3d(0, 0, 0);
-          transform: rotate(0deg) translate3d(0, 0, 0);
-  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2026%2040'%3E%3Cpolygon%20points%3D'9%2C22%209%2C0%2017%2C0%2017%2C22%2026%2C22%2013.5%2C40%200%2C22'%20fill%3D'%238c8c8c'%2F%3E%3C%2Fsvg%3E");
-}
-.weui-pull-to-refresh__layer .weui-pull-to-refresh__preloader {
-  display: none;
-  vertical-align: -4px;
-  margin-right: 4px;
-  width: 20px;
-  height: 20px;
-  -webkit-transform-origin: 50%;
-          transform-origin: 50%;
-  -webkit-animation: preloader-spin 1s steps(12, end) infinite;
-          animation: preloader-spin 1s steps(12, end) infinite;
-}
-.weui-pull-to-refresh__layer .weui-pull-to-refresh__preloader:after {
-  display: block;
-  width: 100%;
-  height: 100%;
-  content: "";
-  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20viewBox%3D'0%200%20120%20120'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20xmlns%3Axlink%3D'http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink'%3E%3Cdefs%3E%3Cline%20id%3D'l'%20x1%3D'60'%20x2%3D'60'%20y1%3D'7'%20y2%3D'27'%20stroke%3D'%236c6c6c'%20stroke-width%3D'11'%20stroke-linecap%3D'round'%2F%3E%3C%2Fdefs%3E%3Cg%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(30%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(60%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(90%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(120%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(150%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.37'%20transform%3D'rotate(180%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.46'%20transform%3D'rotate(210%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.56'%20transform%3D'rotate(240%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.66'%20transform%3D'rotate(270%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.75'%20transform%3D'rotate(300%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.85'%20transform%3D'rotate(330%2060%2C60)'%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");
-  background-repeat: no-repeat;
-  background-position: 50%;
-  background-size: 100%;
-}
-.pull-up .weui-pull-to-refresh__layer .down,
-.refreshing .weui-pull-to-refresh__layer .down {
-  display: none;
-}
-.pull-up .weui-pull-to-refresh__layer .weui-pull-to-refresh__arrow {
-  display: inline-block;
-  -webkit-transform: rotate(180deg) translate3d(0, 0, 0);
-          transform: rotate(180deg) translate3d(0, 0, 0);
-}
-.pull-up .weui-pull-to-refresh__layer .up {
-  display: inline-block;
-}
-.pull-down .weui-pull-to-refresh__layer .weui-pull-to-refresh__arrow {
-  display: inline-block;
-}
-.pull-down .weui-pull-to-refresh__layer .down {
-  display: inline-block;
-}
-.refreshing .weui-pull-to-refresh__layer .weui-pull-to-refresh__arrow {
-  display: none;
-}
-.refreshing .weui-pull-to-refresh__layer .weui-pull-to-refresh__preloader {
-  display: inline-block;
-}
-.refreshing .weui-pull-to-refresh__layer .refresh {
-  display: inline-block;
-}
-@keyframes preloader-spin {
-  100% {
-    -webkit-transform: rotate(360deg);
-            transform: rotate(360deg);
-  }
-}
-.weui-tab__bd-item.weui-pull-to-refresh {
-  position: absolute;
-  top: 50px;
-}
-.weui-tabbar__item {
-  position: relative;
-}
-.weui-tabbar__item.weui-bar__item--on .weui-tabbar__label {
-  color: #04BE02;
-}
-.weui-navbar__item {
-  color: #888;
-}
-.weui-navbar__item.weui-bar__item--on {
-  color: #666;
-  background-color: #f1f1f1;
-}
-.weui-tab__bd {
-  box-sizing: border-box;
-  height: 100%;
-}
-.weui-tab__bd .weui-tab__bd-item {
-  display: none;
-  height: 100%;
-  overflow: auto;
-}
-.weui-tab__bd .weui-tab__bd-item.weui-tab__bd-item--active {
-  display: block;
-}
-.weui-navbar + .weui-tab__bd {
-  padding-top: 50px;
-}
-.toolbar {
-  position: relative;
-  width: 100%;
-  font-size: .85rem;
-  line-height: 1.5;
-  color: #3d4145;
-  background: #f7f7f8;
-}
-.toolbar:before {
-  content: '';
-  position: absolute;
-  left: 0;
-  top: 0;
-  bottom: auto;
-  right: auto;
-  height: 1px;
-  width: 100%;
-  background-color: #d9d9d9;
-  display: block;
-  z-index: 15;
-  -webkit-transform-origin: 50% 0%;
-          transform-origin: 50% 0%;
-}
-@media only screen and (-webkit-min-device-pixel-ratio: 2) {
-  .toolbar:before {
-    -webkit-transform: scaleY(0.5);
-            transform: scaleY(0.5);
-  }
-}
-@media only screen and (-webkit-min-device-pixel-ratio: 3) {
-  .toolbar:before {
-    -webkit-transform: scaleY(0.33);
-            transform: scaleY(0.33);
-  }
-}
-.toolbar .toolbar-inner {
-  height: 2.2rem;
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: -webkit-flex;
-  display: flex;
-  text-align: center;
-}
-.toolbar .title {
-  position: absolute;
-  display: block;
-  width: 100%;
-  padding: 0;
-  font-size: .85rem;
-  font-weight: normal;
-  line-height: 2.2rem;
-  color: #3d4145;
-  text-align: center;
-  white-space: nowrap;
-}
-.toolbar .picker-button {
-  position: absolute;
-  right: 0;
-  box-sizing: border-box;
-  height: 2.2rem;
-  line-height: 2.2rem;
-  color: #04BE02;
-  z-index: 1;
-  padding: 0 .5rem;
-}
-/* === Columns Picker === */
-.weui-picker-modal {
-  width: 100%;
-  position: absolute;
-  bottom: 0;
-  text-align: center;
-  border-radius: 0;
-  opacity: 0.6;
-  color: #3d4145;
-  -webkit-transition-duration: .3s;
-          transition-duration: .3s;
-  height: 13rem;
-  background: #EFEFF4;
-  -webkit-transform: translate3d(0, 100%, 0);
-          transform: translate3d(0, 100%, 0);
-  -webkit-transition-property: opacity, -webkit-transform;
-  transition-property: opacity, -webkit-transform;
-  transition-property: transform, opacity;
-  transition-property: transform, opacity, -webkit-transform;
-}
-.weui-picker-modal.picker-modal-inline {
-  height: 10.8rem;
-  opacity: 1;
-  position: static;
-  -webkit-transform: translate3d(0, 0, 0);
-          transform: translate3d(0, 0, 0);
-}
-.weui-picker-modal.picker-modal-inline .toolbar {
-  display: none;
-}
-.weui-picker-modal.picker-columns-single .picker-items-col {
-  width: 100%;
-}
-.weui-picker-modal.weui-picker-modal-visible {
-  opacity: 1;
-  -webkit-transform: translate3d(0, 0, 0);
-          transform: translate3d(0, 0, 0);
-}
-.weui-picker-modal .picker-modal-inner {
-  position: relative;
-  height: 10.8rem;
-}
-.weui-picker-modal .picker-columns {
-  width: 100%;
-  height: 13rem;
-  z-index: 11500;
-}
-.weui-picker-modal .picker-columns.picker-modal-inline,
-.popover .weui-picker-modal .picker-columns {
-  height: 10rem;
-}
-@media (orientation: landscape) and (max-height: 415px) {
-  .weui-picker-modal .picker-columns:not(.picker-modal-inline) {
-    height: 10rem;
-  }
-}
-.weui-picker-modal .popover.popover-picker-columns {
-  width: 14rem;
-}
-.weui-picker-modal .picker-items {
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: -webkit-flex;
-  display: flex;
-  -webkit-box-pack: center;
-  -ms-flex-pack: center;
-  -webkit-justify-content: center;
-  justify-content: center;
-  width: 100%;
-  padding: 0;
-  text-align: right;
-  font-size: 1rem;
-  font-weight: normal;
-  -webkit-mask-box-image: -webkit-linear-gradient(bottom, transparent, transparent 5%, white 20%, white 80%, transparent 95%, transparent);
-  -webkit-mask-box-image: linear-gradient(to top, transparent, transparent 5%, white 20%, white 80%, transparent 95%, transparent);
-}
-.weui-picker-modal .bar + .picker-items {
-  height: 10.8rem;
-}
-.weui-picker-modal .picker-items-col {
-  overflow: hidden;
-  position: relative;
-  max-height: 100%;
-}
-.weui-picker-modal .picker-items-col.picker-items-col-left {
-  text-align: left;
-}
-.weui-picker-modal .picker-items-col.picker-items-col-center {
-  text-align: center;
-}
-.weui-picker-modal .picker-items-col.picker-items-col-right {
-  text-align: right;
-}
-.weui-picker-modal .picker-items-col.picker-items-col-divider {
-  color: #3d4145;
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: -webkit-flex;
-  display: flex;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  -webkit-align-items: center;
-  align-items: center;
-}
-.weui-picker-modal .picker-items-col-wrapper {
-  -webkit-transition: 300ms;
-  transition: 300ms;
-  -webkit-transition-timing-function: ease-out;
-  transition-timing-function: ease-out;
-}
-.weui-picker-modal .picker-item {
-  height: 32px;
-  line-height: 32px;
-  padding: 0 10px;
-  white-space: nowrap;
-  position: relative;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  color: #9b9b9b;
-  left: 0;
-  top: 0;
-  width: 100%;
-  box-sizing: border-box;
-  -webkit-transition: 300ms;
-  transition: 300ms;
-}
-.picker-items-col-absolute .weui-picker-modal .picker-item {
-  position: absolute;
-}
-.weui-picker-modal .picker-item.picker-item-far {
-  pointer-events: none;
-}
-.weui-picker-modal .picker-item.picker-selected {
-  color: #3d4145;
-  -webkit-transform: translate3d(0, 0, 0);
-          transform: translate3d(0, 0, 0);
-  -webkit-transform: rotateX(0deg);
-          transform: rotateX(0deg);
-}
-.weui-picker-modal .picker-center-highlight {
-  height: 32px;
-  box-sizing: border-box;
-  position: absolute;
-  left: 0;
-  width: 100%;
-  top: 50%;
-  margin-top: -16px;
-  pointer-events: none;
-}
-.weui-picker-modal .picker-center-highlight:before {
-  content: '';
-  position: absolute;
-  left: 0;
-  top: 0;
-  bottom: auto;
-  right: auto;
-  height: 1px;
-  width: 100%;
-  background-color: #D9D9D9;
-  display: block;
-  z-index: 15;
-  -webkit-transform-origin: 50% 0%;
-          transform-origin: 50% 0%;
-}
-@media only screen and (-webkit-min-device-pixel-ratio: 2) {
-  .weui-picker-modal .picker-center-highlight:before {
-    -webkit-transform: scaleY(0.5);
-            transform: scaleY(0.5);
-  }
-}
-@media only screen and (-webkit-min-device-pixel-ratio: 3) {
-  .weui-picker-modal .picker-center-highlight:before {
-    -webkit-transform: scaleY(0.33);
-            transform: scaleY(0.33);
-  }
-}
-.weui-picker-modal .picker-center-highlight:after {
-  content: '';
-  position: absolute;
-  left: 0;
-  bottom: 0;
-  right: auto;
-  top: auto;
-  height: 1px;
-  width: 100%;
-  background-color: #D9D9D9;
-  display: block;
-  z-index: 15;
-  -webkit-transform-origin: 50% 100%;
-          transform-origin: 50% 100%;
-}
-@media only screen and (-webkit-min-device-pixel-ratio: 2) {
-  .weui-picker-modal .picker-center-highlight:after {
-    -webkit-transform: scaleY(0.5);
-            transform: scaleY(0.5);
-  }
-}
-@media only screen and (-webkit-min-device-pixel-ratio: 3) {
-  .weui-picker-modal .picker-center-highlight:after {
-    -webkit-transform: scaleY(0.33);
-            transform: scaleY(0.33);
-  }
-}
-.weui-picker-modal .picker-3d .picker-items {
-  overflow: hidden;
-  -webkit-perspective: 1200px;
-  perspective: 1200px;
-}
-.weui-picker-modal .picker-3d .picker-items-col,
-.weui-picker-modal .picker-3d .picker-items-col-wrapper,
-.weui-picker-modal .picker-3d .picker-item {
-  -webkit-transform-style: preserve-3d;
-  transform-style: preserve-3d;
-}
-.weui-picker-modal .picker-3d .picker-items-col {
-  overflow: visible;
-}
-.weui-picker-modal .picker-3d .picker-item {
-  -webkit-transform-origin: center center -110px;
-  transform-origin: center center -110px;
-  -webkit-backface-visibility: hidden;
-  backface-visibility: hidden;
-  -webkit-transition-timing-function: ease-out;
-  transition-timing-function: ease-out;
-}
-.weui-picker-overlay,
-.weui-picker-container {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  height: 0;
-  width: 100%;
-  z-index: 1000;
-}
-.city-picker .picker-items-col {
-  -webkit-box-flex: 1;
-  -webkit-flex: 1;
-      -ms-flex: 1;
-          flex: 1;
-  max-width: 7rem;
-}
-.weui-picker-container .weui-cells {
-  margin: 0;
-  text-align: left;
-}
-.datetime-picker .picker-item {
-  text-overflow: initial;
-}
-.weui-select-modal {
-  height: auto;
-}
-.weui-select-modal .weui-cells {
-  margin: 0;
-  text-align: left;
-  overflow-y: auto;
-  overflow-x: hidden;
-  max-height: 16rem;
-}
-.weui-select-modal .weui-cells:after {
-  display: none;
-}
-/* === Calendar === */
-.weui-picker-calendar {
-  background: #fff;
-  height: 15rem;
-  width: 100%;
-  overflow: hidden;
-}
-.weui-picker-calendar .picker-modal-inner {
-  overflow: hidden;
-  height: 12.8rem;
-}
-.picker-calendar-week-days {
-  height: .9rem;
-  background: #f7f7f8;
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: -webkit-flex;
-  display: flex;
-  font-size: 11px;
-  box-sizing: border-box;
-  position: relative;
-}
-.picker-calendar-week-days:after {
-  content: '';
-  position: absolute;
-  left: 0;
-  bottom: 0;
-  right: auto;
-  top: auto;
-  height: 1px;
-  width: 100%;
-  background-color: #c4c4c4;
-  display: block;
-  z-index: 15;
-  -webkit-transform-origin: 50% 100%;
-          transform-origin: 50% 100%;
-}
-@media only screen and (-webkit-min-device-pixel-ratio: 2) {
-  .picker-calendar-week-days:after {
-    -webkit-transform: scaleY(0.5);
-            transform: scaleY(0.5);
-  }
-}
-@media only screen and (-webkit-min-device-pixel-ratio: 3) {
-  .picker-calendar-week-days:after {
-    -webkit-transform: scaleY(0.33);
-            transform: scaleY(0.33);
-  }
-}
-.picker-calendar-week-days .picker-calendar-week-day {
-  -webkit-flex-shrink: 1;
-  -ms-flex: 0 1 auto;
-  -webkit-flex-shrink: 1;
-      -ms-flex-negative: 1;
-          flex-shrink: 1;
-  width: 14.28571429%;
-  width: calc(100% / 7);
-  line-height: 17px;
-  text-align: center;
-}
-.picker-calendar-week-days + .picker-calendar-months {
-  height: 11.9rem;
-}
-.picker-calendar-months {
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
-  position: relative;
-}
-.picker-calendar-months-wrapper {
-  position: relative;
-  width: 100%;
-  height: 100%;
-  -webkit-transition: 300ms;
-  transition: 300ms;
-}
-.picker-calendar-month {
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: -webkit-flex;
-  display: flex;
-  -webkit-box-orient: vertical;
-  -ms-flex-direction: column;
-  -webkit-flex-direction: column;
-  flex-direction: column;
-  width: 100%;
-  height: 100%;
-  position: absolute;
-  left: 0;
-  top: 0;
-}
-.picker-calendar-row {
-  height: 16.66666667%;
-  height: calc(100% / 6);
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: -webkit-flex;
-  display: flex;
-  -webkit-flex-shrink: 1;
-  -ms-flex: 0 1 auto;
-  -webkit-flex-shrink: 1;
-      -ms-flex-negative: 1;
-          flex-shrink: 1;
-  width: 100%;
-  position: relative;
-}
-.picker-calendar-row:after {
-  content: '';
-  position: absolute;
-  left: 0;
-  bottom: 0;
-  right: auto;
-  top: auto;
-  height: 1px;
-  width: 100%;
-  background-color: #ccc;
-  display: block;
-  z-index: 15;
-  -webkit-transform-origin: 50% 100%;
-          transform-origin: 50% 100%;
-}
-@media only screen and (-webkit-min-device-pixel-ratio: 2) {
-  .picker-calendar-row:after {
-    -webkit-transform: scaleY(0.5);
-            transform: scaleY(0.5);
-  }
-}
-@media only screen and (-webkit-min-device-pixel-ratio: 3) {
-  .picker-calendar-row:after {
-    -webkit-transform: scaleY(0.33);
-            transform: scaleY(0.33);
-  }
-}
-.weui-picker-modal .picker-calendar-row:last-child:after {
-  display: none;
-}
-.picker-calendar-day {
-  -webkit-flex-shrink: 1;
-  -ms-flex: 0 1 auto;
-  -webkit-flex-shrink: 1;
-      -ms-flex-negative: 1;
-          flex-shrink: 1;
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: -webkit-flex;
-  display: flex;
-  -webkit-box-pack: center;
-  -ms-flex-pack: center;
-  -webkit-justify-content: center;
-  justify-content: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  -webkit-align-items: center;
-  align-items: center;
-  box-sizing: border-box;
-  width: 14.28571429%;
-  width: calc(100% / 7);
-  text-align: center;
-  color: #3d4145;
-  font-size: 15px;
-  cursor: pointer;
-}
-.picker-calendar-day.picker-calendar-day-prev,
-.picker-calendar-day.picker-calendar-day-next {
-  color: #ccc;
-}
-.picker-calendar-day.picker-calendar-day-disabled {
-  color: #d4d4d4;
-  cursor: auto;
-}
-.picker-calendar-day.picker-calendar-day-today span {
-  background: #e3e3e3;
-}
-.picker-calendar-day.picker-calendar-day-selected span {
-  background: #04BE02;
-  color: #fff;
-}
-.picker-calendar-day span {
-  display: inline-block;
-  border-radius: 100%;
-  width: 30px;
-  height: 30px;
-  line-height: 30px;
-}
-.picker-calendar-month-picker,
-.picker-calendar-year-picker {
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: -webkit-flex;
-  display: flex;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  -webkit-align-items: center;
-  align-items: center;
-  -webkit-box-pack: justify;
-  -ms-flex-pack: justify;
-  -webkit-justify-content: space-between;
-  justify-content: space-between;
-  width: 50%;
-  max-width: 200px;
-  -webkit-flex-shrink: 10;
-  -ms-flex: 0 10 auto;
-  -webkit-flex-shrink: 10;
-      -ms-flex-negative: 10;
-          flex-shrink: 10;
-}
-.picker-calendar-month-picker a.icon-only,
-.picker-calendar-year-picker a.icon-only {
-  min-width: 36px;
-}
-.picker-calendar-month-picker span,
-.picker-calendar-year-picker span {
-  -webkit-flex-shrink: 1;
-  -ms-flex: 0 1 auto;
-  -webkit-flex-shrink: 1;
-      -ms-flex-negative: 1;
-          flex-shrink: 1;
-  position: relative;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-.popover .picker-calendar .picker-calendar-week-days,
-.picker-calendar.picker-modal-inline .picker-calendar-week-days {
-  background: none;
-}
-.popover .picker-calendar .toolbar:before,
-.picker-calendar.picker-modal-inline .toolbar:before,
-.popover .picker-calendar .picker-calendar-week-days:before,
-.picker-calendar.picker-modal-inline .picker-calendar-week-days:before {
-  display: none;
-}
-.popover .picker-calendar .toolbar:after,
-.picker-calendar.picker-modal-inline .toolbar:after,
-.popover .picker-calendar .picker-calendar-week-days:after,
-.picker-calendar.picker-modal-inline .picker-calendar-week-days:after {
-  display: none;
-}
-.popover .picker-calendar .toolbar ~ .picker-modal-inner .picker-calendar-months:before,
-.picker-calendar.picker-modal-inline .toolbar ~ .picker-modal-inner .picker-calendar-months:before,
-.popover .picker-calendar .picker-calendar-week-days ~ .picker-calendar-months:before,
-.picker-calendar.picker-modal-inline .picker-calendar-week-days ~ .picker-calendar-months:before {
-  content: '';
-  position: absolute;
-  left: 0;
-  top: 0;
-  bottom: auto;
-  right: auto;
-  height: 1px;
-  width: 100%;
-  background-color: #c4c4c4;
-  display: block;
-  z-index: 15;
-  -webkit-transform-origin: 50% 0%;
-          transform-origin: 50% 0%;
-}
-@media only screen and (-webkit-min-device-pixel-ratio: 2) {
-  .popover .picker-calendar .toolbar ~ .picker-modal-inner .picker-calendar-months:before,
-  .picker-calendar.picker-modal-inline .toolbar ~ .picker-modal-inner .picker-calendar-months:before,
-  .popover .picker-calendar .picker-calendar-week-days ~ .picker-calendar-months:before,
-  .picker-calendar.picker-modal-inline .picker-calendar-week-days ~ .picker-calendar-months:before {
-    -webkit-transform: scaleY(0.5);
-            transform: scaleY(0.5);
-  }
-}
-@media only screen and (-webkit-min-device-pixel-ratio: 3) {
-  .popover .picker-calendar .toolbar ~ .picker-modal-inner .picker-calendar-months:before,
-  .picker-calendar.picker-modal-inline .toolbar ~ .picker-modal-inner .picker-calendar-months:before,
-  .popover .picker-calendar .picker-calendar-week-days ~ .picker-calendar-months:before,
-  .picker-calendar.picker-modal-inline .picker-calendar-week-days ~ .picker-calendar-months:before {
-    -webkit-transform: scaleY(0.33);
-            transform: scaleY(0.33);
-  }
-}
-.picker-calendar-month-picker,
-.picker-calendar-year-picker {
-  display: block;
-  line-height: 2.2rem;
-  -webkit-box-flex: 1;
-  -webkit-flex: 1;
-      -ms-flex: 1;
-          flex: 1;
-}
-.picker-calendar-month-picker a.icon-only,
-.picker-calendar-year-picker a.icon-only {
-  float: left;
-  width: 25%;
-  height: 2.2rem;
-  line-height: 2rem;
-}
-.picker-calendar-month-picker .current-month-value,
-.picker-calendar-year-picker .current-month-value,
-.picker-calendar-month-picker .current-year-value,
-.picker-calendar-year-picker .current-year-value {
-  float: left;
-  width: 50%;
-  height: 2.2rem;
-}
-i.icon {
-  display: inline-block;
-  vertical-align: middle;
-  background-size: 100% auto;
-  background-position: center;
-  background-repeat: no-repeat;
-  font-style: normal;
-  position: relative;
-}
-i.icon.icon-next,
-i.icon.icon-prev {
-  width: 0.75rem;
-  height: 0.75rem;
-}
-i.icon.icon-next {
-  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2015%2015'%3E%3Cg%3E%3Cpath%20fill%3D'%2304BE02'%20d%3D'M1%2C1.6l11.8%2C5.8L1%2C13.4V1.6%20M0%2C0v15l15-7.6L0%2C0L0%2C0z'%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");
-}
-i.icon.icon-prev {
-  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2015%2015'%3E%3Cg%3E%3Cpath%20fill%3D'%2304BE02'%20d%3D'M14%2C1.6v11.8L2.2%2C7.6L14%2C1.6%20M15%2C0L0%2C7.6L15%2C15V0L15%2C0z'%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");
-}
-/**
- * Swiper 3.3.1
- * Most modern mobile touch slider and framework with hardware accelerated transitions
- * 
- * http://www.idangero.us/swiper/
- * 
- * Copyright 2016, Vladimir Kharlampidi
- * The iDangero.us
- * http://www.idangero.us/
- * 
- * Licensed under MIT
- * 
- * Released on: February 7, 2016
- */
-.swiper-container {
-  margin: 0 auto;
-  position: relative;
-  overflow: hidden;
-  /* Fix of Webkit flickering */
-  z-index: 1;
-}
-.swiper-container-no-flexbox .swiper-slide {
-  float: left;
-}
-.swiper-container-vertical > .swiper-wrapper {
-  -webkit-box-orient: vertical;
-  -ms-flex-direction: column;
-  -webkit-flex-direction: column;
-  flex-direction: column;
-}
-.swiper-wrapper {
-  position: relative;
-  width: 100%;
-  height: 100%;
-  z-index: 1;
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: -webkit-flex;
-  display: flex;
-  -webkit-transition-property: -webkit-transform;
-  transition-property: -webkit-transform;
-  transition-property: transform;
-  transition-property: transform, -webkit-transform;
-  box-sizing: content-box;
-}
-.swiper-container-android .swiper-slide,
-.swiper-wrapper {
-  -webkit-transform: translate3d(0px, 0, 0);
-  transform: translate3d(0px, 0, 0);
-}
-.swiper-container-multirow > .swiper-wrapper {
-  -webkit-box-lines: multiple;
-  -moz-box-lines: multiple;
-  -ms-flex-wrap: wrap;
-  -webkit-flex-wrap: wrap;
-  flex-wrap: wrap;
-}
-.swiper-container-free-mode > .swiper-wrapper {
-  -webkit-transition-timing-function: ease-out;
-  transition-timing-function: ease-out;
-  margin: 0 auto;
-}
-.swiper-slide {
-  -webkit-flex-shrink: 0;
-  -ms-flex: 0 0 auto;
-  -webkit-flex-shrink: 0;
-      -ms-flex-negative: 0;
-          flex-shrink: 0;
-  width: 100%;
-  height: 100%;
-  position: relative;
-}
-/* Auto Height */
-.swiper-container-autoheight,
-.swiper-container-autoheight .swiper-slide {
-  height: auto;
-}
-.swiper-container-autoheight .swiper-wrapper {
-  -webkit-box-align: start;
-  -ms-flex-align: start;
-  -webkit-align-items: flex-start;
-  align-items: flex-start;
-  -webkit-transition-property: -webkit-transform, height;
-  -webkit-transition-property: height, -webkit-transform;
-  transition-property: height, -webkit-transform;
-  transition-property: transform, height;
-  transition-property: transform, height, -webkit-transform;
-}
-/* a11y */
-.swiper-container .swiper-notification {
-  position: absolute;
-  left: 0;
-  top: 0;
-  pointer-events: none;
-  opacity: 0;
-  z-index: -1000;
-}
-/* IE10 Windows Phone 8 Fixes */
-.swiper-wp8-horizontal {
-  -ms-touch-action: pan-y;
-  touch-action: pan-y;
-}
-.swiper-wp8-vertical {
-  -ms-touch-action: pan-x;
-  touch-action: pan-x;
-}
-/* Arrows */
-.swiper-button-prev,
-.swiper-button-next {
-  position: absolute;
-  top: 50%;
-  width: 27px;
-  height: 44px;
-  margin-top: -22px;
-  z-index: 10;
-  cursor: pointer;
-  background-size: 27px 44px;
-  background-position: center;
-  background-repeat: no-repeat;
-}
-.swiper-button-prev.swiper-button-disabled,
-.swiper-button-next.swiper-button-disabled {
-  opacity: 0.35;
-  cursor: auto;
-  pointer-events: none;
-}
-.swiper-button-prev,
-.swiper-container-rtl .swiper-button-next {
-  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M0%2C22L22%2C0l2.1%2C2.1L4.2%2C22l19.9%2C19.9L22%2C44L0%2C22L0%2C22L0%2C22z'%20fill%3D'%23007aff'%2F%3E%3C%2Fsvg%3E");
-  left: 10px;
-  right: auto;
-}
-.swiper-button-prev.swiper-button-black,
-.swiper-container-rtl .swiper-button-next.swiper-button-black {
-  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M0%2C22L22%2C0l2.1%2C2.1L4.2%2C22l19.9%2C19.9L22%2C44L0%2C22L0%2C22L0%2C22z'%20fill%3D'%23000000'%2F%3E%3C%2Fsvg%3E");
-}
-.swiper-button-prev.swiper-button-white,
-.swiper-container-rtl .swiper-button-next.swiper-button-white {
-  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M0%2C22L22%2C0l2.1%2C2.1L4.2%2C22l19.9%2C19.9L22%2C44L0%2C22L0%2C22L0%2C22z'%20fill%3D'%23ffffff'%2F%3E%3C%2Fsvg%3E");
-}
-.swiper-button-next,
-.swiper-container-rtl .swiper-button-prev {
-  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M27%2C22L27%2C22L5%2C44l-2.1-2.1L22.8%2C22L2.9%2C2.1L5%2C0L27%2C22L27%2C22z'%20fill%3D'%23007aff'%2F%3E%3C%2Fsvg%3E");
-  right: 10px;
-  left: auto;
-}
-.swiper-button-next.swiper-button-black,
-.swiper-container-rtl .swiper-button-prev.swiper-button-black {
-  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M27%2C22L27%2C22L5%2C44l-2.1-2.1L22.8%2C22L2.9%2C2.1L5%2C0L27%2C22L27%2C22z'%20fill%3D'%23000000'%2F%3E%3C%2Fsvg%3E");
-}
-.swiper-button-next.swiper-button-white,
-.swiper-container-rtl .swiper-button-prev.swiper-button-white {
-  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M27%2C22L27%2C22L5%2C44l-2.1-2.1L22.8%2C22L2.9%2C2.1L5%2C0L27%2C22L27%2C22z'%20fill%3D'%23ffffff'%2F%3E%3C%2Fsvg%3E");
-}
-/* Pagination Styles */
-.swiper-pagination {
-  position: absolute;
-  text-align: center;
-  -webkit-transition: 300ms;
-  transition: 300ms;
-  -webkit-transform: translate3d(0, 0, 0);
-  transform: translate3d(0, 0, 0);
-  z-index: 10;
-}
-.swiper-pagination.swiper-pagination-hidden {
-  opacity: 0;
-}
-/* Common Styles */
-.swiper-pagination-fraction,
-.swiper-pagination-custom,
-.swiper-container-horizontal > .swiper-pagination-bullets {
-  bottom: 10px;
-  left: 0;
-  width: 100%;
-}
-/* Bullets */
-.swiper-pagination-bullet {
-  width: 8px;
-  height: 8px;
-  display: inline-block;
-  border-radius: 100%;
-  background: #000;
-  opacity: 0.2;
-}
-button.swiper-pagination-bullet {
-  border: none;
-  margin: 0;
-  padding: 0;
-  box-shadow: none;
-  -moz-appearance: none;
-  -ms-appearance: none;
-  -webkit-appearance: none;
-  appearance: none;
-}
-.swiper-pagination-clickable .swiper-pagination-bullet {
-  cursor: pointer;
-}
-.swiper-pagination-white .swiper-pagination-bullet {
-  background: #fff;
-}
-.swiper-pagination-bullet-active {
-  opacity: 1;
-  background: #04BE02;
-}
-.swiper-pagination-white .swiper-pagination-bullet-active {
-  background: #fff;
-}
-.swiper-pagination-black .swiper-pagination-bullet-active {
-  background: #000;
-}
-.swiper-container-vertical > .swiper-pagination-bullets {
-  right: 10px;
-  top: 50%;
-  -webkit-transform: translate3d(0px, -50%, 0);
-  transform: translate3d(0px, -50%, 0);
-}
-.swiper-container-vertical > .swiper-pagination-bullets .swiper-pagination-bullet {
-  margin: 5px 0;
-  display: block;
-}
-.swiper-container-horizontal > .swiper-pagination-bullets .swiper-pagination-bullet {
-  margin: 0 5px;
-}
-/* Progress */
-.swiper-pagination-progress {
-  background: rgba(0, 0, 0, 0.25);
-  position: absolute;
-}
-.swiper-pagination-progress .swiper-pagination-progressbar {
-  background: #007aff;
-  position: absolute;
-  left: 0;
-  top: 0;
-  width: 100%;
-  height: 100%;
-  -webkit-transform: scale(0);
-  transform: scale(0);
-  -webkit-transform-origin: left top;
-  transform-origin: left top;
-}
-.swiper-container-rtl .swiper-pagination-progress .swiper-pagination-progressbar {
-  -webkit-transform-origin: right top;
-  transform-origin: right top;
-}
-.swiper-container-horizontal > .swiper-pagination-progress {
-  width: 100%;
-  height: 4px;
-  left: 0;
-  top: 0;
-}
-.swiper-container-vertical > .swiper-pagination-progress {
-  width: 4px;
-  height: 100%;
-  left: 0;
-  top: 0;
-}
-.swiper-pagination-progress.swiper-pagination-white {
-  background: rgba(255, 255, 255, 0.5);
-}
-.swiper-pagination-progress.swiper-pagination-white .swiper-pagination-progressbar {
-  background: #fff;
-}
-.swiper-pagination-progress.swiper-pagination-black .swiper-pagination-progressbar {
-  background: #000;
-}
-/* 3D Container */
-.swiper-container-3d {
-  -webkit-perspective: 1200px;
-  -o-perspective: 1200px;
-  perspective: 1200px;
-}
-.swiper-container-3d .swiper-wrapper,
-.swiper-container-3d .swiper-slide,
-.swiper-container-3d .swiper-slide-shadow-left,
-.swiper-container-3d .swiper-slide-shadow-right,
-.swiper-container-3d .swiper-slide-shadow-top,
-.swiper-container-3d .swiper-slide-shadow-bottom,
-.swiper-container-3d .swiper-cube-shadow {
-  -webkit-transform-style: preserve-3d;
-  transform-style: preserve-3d;
-}
-.swiper-container-3d .swiper-slide-shadow-left,
-.swiper-container-3d .swiper-slide-shadow-right,
-.swiper-container-3d .swiper-slide-shadow-top,
-.swiper-container-3d .swiper-slide-shadow-bottom {
-  position: absolute;
-  left: 0;
-  top: 0;
-  width: 100%;
-  height: 100%;
-  pointer-events: none;
-  z-index: 10;
-}
-.swiper-container-3d .swiper-slide-shadow-left {
-  background-image: -webkit-gradient(linear, left top, right top, from(rgba(0, 0, 0, 0.5)), to(rgba(0, 0, 0, 0)));
-  /* Safari 4+, Chrome */
-  background-image: -webkit-linear-gradient(right, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
-  /* Chrome 10+, Safari 5.1+, iOS 5+ */
-  /* Firefox 3.6-15 */
-  /* Opera 11.10-12.00 */
-  background-image: linear-gradient(to left, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
-  /* Firefox 16+, IE10, Opera 12.50+ */
-}
-.swiper-container-3d .swiper-slide-shadow-right {
-  background-image: -webkit-gradient(linear, right top, left top, from(rgba(0, 0, 0, 0.5)), to(rgba(0, 0, 0, 0)));
-  /* Safari 4+, Chrome */
-  background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
-  /* Chrome 10+, Safari 5.1+, iOS 5+ */
-  /* Firefox 3.6-15 */
-  /* Opera 11.10-12.00 */
-  background-image: linear-gradient(to right, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
-  /* Firefox 16+, IE10, Opera 12.50+ */
-}
-.swiper-container-3d .swiper-slide-shadow-top {
-  background-image: -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, 0.5)), to(rgba(0, 0, 0, 0)));
-  /* Safari 4+, Chrome */
-  background-image: -webkit-linear-gradient(bottom, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
-  /* Chrome 10+, Safari 5.1+, iOS 5+ */
-  /* Firefox 3.6-15 */
-  /* Opera 11.10-12.00 */
-  background-image: linear-gradient(to top, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
-  /* Firefox 16+, IE10, Opera 12.50+ */
-}
-.swiper-container-3d .swiper-slide-shadow-bottom {
-  background-image: -webkit-gradient(linear, left bottom, left top, from(rgba(0, 0, 0, 0.5)), to(rgba(0, 0, 0, 0)));
-  /* Safari 4+, Chrome */
-  background-image: -webkit-linear-gradient(top, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
-  /* Chrome 10+, Safari 5.1+, iOS 5+ */
-  /* Firefox 3.6-15 */
-  /* Opera 11.10-12.00 */
-  background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
-  /* Firefox 16+, IE10, Opera 12.50+ */
-}
-/* Coverflow */
-.swiper-container-coverflow .swiper-wrapper,
-.swiper-container-flip .swiper-wrapper {
-  /* Windows 8 IE 10 fix */
-  -ms-perspective: 1200px;
-}
-/* Cube + Flip */
-.swiper-container-cube,
-.swiper-container-flip {
-  overflow: visible;
-}
-.swiper-container-cube .swiper-slide,
-.swiper-container-flip .swiper-slide {
-  pointer-events: none;
-  -webkit-backface-visibility: hidden;
-  backface-visibility: hidden;
-  z-index: 1;
-}
-.swiper-container-cube .swiper-slide .swiper-slide,
-.swiper-container-flip .swiper-slide .swiper-slide {
-  pointer-events: none;
-}
-.swiper-container-cube .swiper-slide-active,
-.swiper-container-flip .swiper-slide-active,
-.swiper-container-cube .swiper-slide-active .swiper-slide-active,
-.swiper-container-flip .swiper-slide-active .swiper-slide-active {
-  pointer-events: auto;
-}
-.swiper-container-cube .swiper-slide-shadow-top,
-.swiper-container-flip .swiper-slide-shadow-top,
-.swiper-container-cube .swiper-slide-shadow-bottom,
-.swiper-container-flip .swiper-slide-shadow-bottom,
-.swiper-container-cube .swiper-slide-shadow-left,
-.swiper-container-flip .swiper-slide-shadow-left,
-.swiper-container-cube .swiper-slide-shadow-right,
-.swiper-container-flip .swiper-slide-shadow-right {
-  z-index: 0;
-  -webkit-backface-visibility: hidden;
-  backface-visibility: hidden;
-}
-/* Cube */
-.swiper-container-cube .swiper-slide {
-  visibility: hidden;
-  -webkit-transform-origin: 0 0;
-  transform-origin: 0 0;
-  width: 100%;
-  height: 100%;
-}
-.swiper-container-cube.swiper-container-rtl .swiper-slide {
-  -webkit-transform-origin: 100% 0;
-  transform-origin: 100% 0;
-}
-.swiper-container-cube .swiper-slide-active,
-.swiper-container-cube .swiper-slide-next,
-.swiper-container-cube .swiper-slide-prev,
-.swiper-container-cube .swiper-slide-next + .swiper-slide {
-  pointer-events: auto;
-  visibility: visible;
-}
-.swiper-container-cube .swiper-cube-shadow {
-  position: absolute;
-  left: 0;
-  bottom: 0px;
-  width: 100%;
-  height: 100%;
-  background: #000;
-  opacity: 0.6;
-  -webkit-filter: blur(50px);
-  filter: blur(50px);
-  z-index: 0;
-}
-/* Fade */
-.swiper-container-fade.swiper-container-free-mode .swiper-slide {
-  -webkit-transition-timing-function: ease-out;
-  transition-timing-function: ease-out;
-}
-.swiper-container-fade .swiper-slide {
-  pointer-events: none;
-  -webkit-transition-property: opacity;
-  transition-property: opacity;
-}
-.swiper-container-fade .swiper-slide .swiper-slide {
-  pointer-events: none;
-}
-.swiper-container-fade .swiper-slide-active,
-.swiper-container-fade .swiper-slide-active .swiper-slide-active {
-  pointer-events: auto;
-}
-/* Scrollbar */
-.swiper-scrollbar {
-  border-radius: 10px;
-  position: relative;
-  -ms-touch-action: none;
-  background: rgba(0, 0, 0, 0.1);
-}
-.swiper-container-horizontal > .swiper-scrollbar {
-  position: absolute;
-  left: 1%;
-  bottom: 3px;
-  z-index: 50;
-  height: 5px;
-  width: 98%;
-}
-.swiper-container-vertical > .swiper-scrollbar {
-  position: absolute;
-  right: 3px;
-  top: 1%;
-  z-index: 50;
-  width: 5px;
-  height: 98%;
-}
-.swiper-scrollbar-drag {
-  height: 100%;
-  width: 100%;
-  position: relative;
-  background: rgba(0, 0, 0, 0.5);
-  border-radius: 10px;
-  left: 0;
-  top: 0;
-}
-.swiper-scrollbar-cursor-drag {
-  cursor: move;
-}
-/* Preloader */
-.swiper-lazy-preloader {
-  width: 42px;
-  height: 42px;
-  position: absolute;
-  left: 50%;
-  top: 50%;
-  margin-left: -21px;
-  margin-top: -21px;
-  z-index: 10;
-  -webkit-transform-origin: 50%;
-  transform-origin: 50%;
-  -webkit-animation: swiper-preloader-spin 1s steps(12, end) infinite;
-  animation: swiper-preloader-spin 1s steps(12, end) infinite;
-}
-.swiper-lazy-preloader:after {
-  display: block;
-  content: "";
-  width: 100%;
-  height: 100%;
-  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20viewBox%3D'0%200%20120%20120'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20xmlns%3Axlink%3D'http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink'%3E%3Cdefs%3E%3Cline%20id%3D'l'%20x1%3D'60'%20x2%3D'60'%20y1%3D'7'%20y2%3D'27'%20stroke%3D'%236c6c6c'%20stroke-width%3D'11'%20stroke-linecap%3D'round'%2F%3E%3C%2Fdefs%3E%3Cg%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(30%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(60%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(90%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(120%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(150%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.37'%20transform%3D'rotate(180%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.46'%20transform%3D'rotate(210%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.56'%20transform%3D'rotate(240%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.66'%20transform%3D'rotate(270%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.75'%20transform%3D'rotate(300%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.85'%20transform%3D'rotate(330%2060%2C60)'%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");
-  background-position: 50%;
-  background-size: 100%;
-  background-repeat: no-repeat;
-}
-.swiper-lazy-preloader-white:after {
-  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20viewBox%3D'0%200%20120%20120'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20xmlns%3Axlink%3D'http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink'%3E%3Cdefs%3E%3Cline%20id%3D'l'%20x1%3D'60'%20x2%3D'60'%20y1%3D'7'%20y2%3D'27'%20stroke%3D'%23fff'%20stroke-width%3D'11'%20stroke-linecap%3D'round'%2F%3E%3C%2Fdefs%3E%3Cg%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(30%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(60%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(90%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(120%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(150%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.37'%20transform%3D'rotate(180%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.46'%20transform%3D'rotate(210%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.56'%20transform%3D'rotate(240%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.66'%20transform%3D'rotate(270%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.75'%20transform%3D'rotate(300%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.85'%20transform%3D'rotate(330%2060%2C60)'%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");
-}
-@-webkit-keyframes swiper-preloader-spin {
-  100% {
-    -webkit-transform: rotate(360deg);
-  }
-}
-@keyframes swiper-preloader-spin {
-  100% {
-    -webkit-transform: rotate(360deg);
-            transform: rotate(360deg);
-  }
-}
-.weui-actionsheet {
-  z-index: 10000;
-}
-.weui-actionsheet .weui-actionsheet__title {
-  padding: 8px 0;
-  text-align: center;
-  font-size: 16px;
-  color: #999;
-  background-color: #f4f4f4;
-  position: relative;
-}
-.weui-actionsheet .weui-actionsheet__title:after {
-  content: " ";
-  position: absolute;
-  left: 0;
-  bottom: 0;
-  width: 100%;
-  height: 1px;
-  border-top: 1px solid #d9d9d9;
-  color: #d9d9d9;
-  -webkit-transform-origin: 0 100%;
-          transform-origin: 0 100%;
-  -webkit-transform: scaleY(0.5);
-          transform: scaleY(0.5);
-}
-.weui-popup__overlay,
-.weui-popup__container {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  height: 0;
-  width: 100%;
-  height: 100%;
-  z-index: 10;
-}
-.weui-popup__overlay {
-  background-color: rgba(0, 0, 0, 0.6);
-  opacity: 0;
-  -webkit-transition: opacity .3s;
-  transition: opacity .3s;
-}
-.weui-popup__container {
-  display: none;
-}
-.weui-popup__container.weui-popup__container--visible {
-  display: block;
-}
-.weui-popup__container .weui-cells {
-  margin: 0;
-  text-align: left;
-}
-.weui-popup__modal {
-  width: 100%;
-  position: absolute;
-  z-index: 100;
-  bottom: 0;
-  border-radius: 0;
-  opacity: 0.6;
-  color: #3d4145;
-  -webkit-transition-duration: .3s;
-          transition-duration: .3s;
-  height: 100%;
-  background: #EFEFF4;
-  -webkit-transform: translate3d(0, 100%, 0);
-          transform: translate3d(0, 100%, 0);
-  -webkit-transition-property: opacity, -webkit-transform;
-  transition-property: opacity, -webkit-transform;
-  transition-property: transform, opacity;
-  transition-property: transform, opacity, -webkit-transform;
-  overflow-x: hidden;
-  overflow-y: auto;
-}
-.popup-bottom .weui-popup__modal {
-  height: auto;
-}
-.weui-popup__modal .toolbar {
-  position: absolute;
-  left: 0;
-  top: 0;
-  right: 0;
-  z-index: 1;
-}
-.weui-popup__modal .modal-content {
-  height: 100%;
-  padding-top: 2.2rem;
-  overflow: auto;
-  box-sizing: border-box;
-}
-.weui-popup__container--visible .weui-popup-overlay {
-  opacity: 1;
-}
-.weui-popup__container--visible .weui-popup__modal {
-  opacity: 1;
-  -webkit-transform: translate3d(0, 0, 0);
-          transform: translate3d(0, 0, 0);
-}
-.weui-notification {
-  position: fixed;
-  width: 100%;
-  min-height: 3.4rem;
-  top: -2rem;
-  padding-top: 2rem;
-  left: 0;
-  right: 0;
-  z-index: 9999;
-  background-color: rgba(0, 0, 0, 0.85);
-  color: white;
-  font-size: .65rem;
-  -webkit-transform: translate3d(0, -100%, 0);
-          transform: translate3d(0, -100%, 0);
-  -webkit-transition: .4s;
-  transition: .4s;
-}
-.weui-notification.weui-notification--in {
-  -webkit-transform: translate3d(0, 0, 0);
-          transform: translate3d(0, 0, 0);
-}
-.weui-notification.weui-notification--touching {
-  -webkit-transition-duration: 0s;
-          transition-duration: 0s;
-}
-.weui-notification .weui-notification__inner {
-  padding: .4rem .6rem 1rem .6rem;
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: -webkit-flex;
-  display: flex;
-  -webkit-box-align: start;
-  -ms-flex-align: start;
-  -webkit-align-items: flex-start;
-  align-items: flex-start;
-}
-.weui-notification .weui-notification__content {
-  width: 100%;
-  margin: 0rem .4rem;
-}
-.weui-notification .weui-notification__title {
-  font-weight: bold;
-}
-.weui-notification .weui-notification__text {
-  line-height: 1;
-}
-.weui-notification .weui-notification__media {
-  height: 1rem;
-  width: 1rem;
-}
-.weui-notification .weui-notification__media img {
-  width: 100%;
-}
-.weui-notification .weui-notification__handle-bar {
-  position: absolute;
-  bottom: .2rem;
-  left: 50%;
-  -webkit-transform: translate3d(-50%, 0, 0);
-          transform: translate3d(-50%, 0, 0);
-  width: 2rem;
-  height: .3rem;
-  border-radius: .15rem;
-  background: white;
-  opacity: .5;
-}
-.weui-photo-browser-modal {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background: black;
-  display: none;
-  opacity: 0;
-  -webkit-transition: opacity .3s;
-  transition: opacity .3s;
-}
-.weui-photo-browser-modal.weui-photo-browser-modal-visible {
-  opacity: 1;
-}
-.weui-photo-browser-modal .swiper-container {
-  height: 100%;
-  -webkit-transform: scale(0.2);
-          transform: scale(0.2);
-  -webkit-transition: -webkit-transform .5s;
-  transition: -webkit-transform .5s;
-  transition: transform .5s;
-  transition: transform .5s, -webkit-transform .5s;
-}
-.weui-photo-browser-modal .swiper-container .swiper-pagination-bullet {
-  background: white;
-  visibility: hidden;
-}
-.weui-photo-browser-modal .swiper-container.swiper-container-visible {
-  -webkit-transform: scale(1);
-          transform: scale(1);
-}
-.weui-photo-browser-modal .swiper-container.swiper-container-visible .swiper-pagination-bullet {
-  visibility: visible;
-  -webkit-transition-property: visibility;
-  transition-property: visibility;
-  -webkit-transition-delay: .5s;
-          transition-delay: .5s;
-}
-.weui-photo-browser-modal .swiper-container .swiper-pagination {
-  bottom: 10px;
-  left: 0;
-  width: 100%;
-}
-.weui-photo-browser-modal .photo-container {
-  height: 100%;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-align: center;
-  -webkit-align-items: center;
-      -ms-flex-align: center;
-          align-items: center;
-  overflow: hidden;
-}
-.weui-photo-browser-modal .photo-container img {
-  max-width: 100%;
-  margin-top: -30px;
-}
-.weui-photo-browser-modal .caption {
-  position: absolute;
-  bottom: 40px;
-  left: 0;
-  right: 0;
-  color: white;
-  text-align: center;
-  padding: 0 12px;
-  min-height: 3rem;
-  font-size: 14px;
-  z-index: 10;
-  -webkit-transition: opacity .3s;
-  transition: opacity .3s;
-  -webkit-transition-delay: .5s;
-          transition-delay: .5s;
-  opacity: 0;
-}
-.weui-photo-browser-modal .caption .caption-item {
-  display: none;
-  opacity: 0;
-  -webkit-transition: opacity .15s;
-  transition: opacity .15s;
-}
-.weui-photo-browser-modal .caption .caption-item.active {
-  display: block;
-  opacity: 1;
-}
-.weui-photo-browser-modal .swiper-container-visible .caption {
-  opacity: 1;
-}
-.color-primary {
-  color: #04BE02;
-}
-.color-danger,
-.color-error {
-  color: #f6383a;
-}
-.color-warning {
-  color: #f60;
-}
-.color-success {
-  color: #4cd964;
-}
-.bg-primary,
-.bg-success,
-.bg-danger,
-.bg-error,
-.bg-warning {
-  color: white;
-}
-.bg-primary {
-  background-color: #04BE02;
-}
-.bg-danger,
-.bg-error {
-  background-color: #f6383a;
-}
-.bg-warning {
-  background-color: #f60;
-}
-.bg-success {
-  background-color: #4cd964;
-}
-.weui-toptips {
-  z-index: 100;
-  opacity: 0;
-  -webkit-transition: opacity .3s;
-  transition: opacity .3s;
-}
-.weui-toptips.weui-toptips_visible {
-  opacity: 1;
-}
-.weui-icon_toast {
-  font-size: 55px;
-  color: white;
-  margin-bottom: 6px;
-}
-.weui-toast--forbidden .weui-icon_toast {
-  color: #f6383a;
-}
-.weui-toast--text {
-  min-height: initial;
-  font-size: 18px;
-  padding: 8px 16px;
-  width: auto;
-  top: 40%;
-}
-.weui-toast--text .weui-icon_toast {
-  display: none;
-}
diff --git a/NewLife.Cube/Content/jweui/css/jquery-weui.min.css b/NewLife.Cube/Content/jweui/css/jquery-weui.min.css
deleted file mode 100644
index a65cbed974..0000000000
--- a/NewLife.Cube/Content/jweui/css/jquery-weui.min.css
+++ /dev/null
@@ -1,6 +0,0 @@
-/** 
-* jQuery WeUI V1.0.1 
-* By 言川
-* http://lihongxun945.github.io/jquery-weui/
- */
-.preloader{width:20px;height:20px;-webkit-transform-origin:50%;transform-origin:50%;-webkit-animation:preloader-spin 1s steps(12,end) infinite;animation:preloader-spin 1s steps(12,end) infinite}.preloader:after{display:block;width:100%;height:100%;content:"";background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20viewBox%3D'0%200%20120%20120'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20xmlns%3Axlink%3D'http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink'%3E%3Cdefs%3E%3Cline%20id%3D'l'%20x1%3D'60'%20x2%3D'60'%20y1%3D'7'%20y2%3D'27'%20stroke%3D'%236c6c6c'%20stroke-width%3D'11'%20stroke-linecap%3D'round'%2F%3E%3C%2Fdefs%3E%3Cg%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(30%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(60%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(90%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(120%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(150%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.37'%20transform%3D'rotate(180%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.46'%20transform%3D'rotate(210%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.56'%20transform%3D'rotate(240%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.66'%20transform%3D'rotate(270%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.75'%20transform%3D'rotate(300%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.85'%20transform%3D'rotate(330%2060%2C60)'%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");background-repeat:no-repeat;background-position:50%;background-size:100%}@-webkit-keyframes preloader-spin{100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}label>*{pointer-events:none}html{font-size:20px}body{font-size:16px}@media only screen and (min-width:400px){html{font-size:21.33px!important}}@media only screen and (min-width:414px){html{font-size:22.08px!important}}@media only screen and (min-width:480px){html{font-size:25.6px!important}}.weui_navbar{z-index:10}.weui-mask,.weui-popup-container,.weui-popup-overlay{z-index:1000}.weui-row{display:-webkit-box;display:-ms-flexbox;display:-webkit-flex;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;-webkit-box-lines:multiple;-moz-box-lines:multiple;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-align:start;-ms-flex-align:start;-webkit-align-items:flex-start;align-items:flex-start}.weui-row>[class*=col-]{box-sizing:border-box}.weui-row .col-auto{width:100%}.weui-row .weui-col-100{width:100%;width:calc((100% - 15px*0)/ 1)}.weui-row.weui-no-gutter .weui-col-100{width:100%}.weui-row .weui-col-95{width:95%;width:calc((100% - 15px*.05263157894736836)/ 1.0526315789473684)}.weui-row.weui-no-gutter .weui-col-95{width:95%}.weui-row .weui-col-90{width:90%;width:calc((100% - 15px*.11111111111111116)/ 1.1111111111111112)}.weui-row.weui-no-gutter .weui-col-90{width:90%}.weui-row .weui-col-85{width:85%;width:calc((100% - 15px*.17647058823529416)/ 1.1764705882352942)}.weui-row.weui-no-gutter .weui-col-85{width:85%}.weui-row .weui-col-80{width:80%;width:calc((100% - 15px*.25)/ 1.25)}.weui-row.weui-no-gutter .weui-col-80{width:80%}.weui-row .weui-col-75{width:75%;width:calc((100% - 15px*.33333333333333326)/ 1.3333333333333333)}.weui-row.weui-no-gutter .weui-col-75{width:75%}.weui-row .weui-col-66{width:66.66666666666666%;width:calc((100% - 15px*.5000000000000002)/ 1.5000000000000002)}.weui-row.weui-no-gutter .weui-col-66{width:66.66666666666666%}.weui-row .weui-col-60{width:60%;width:calc((100% - 15px*.6666666666666667)/ 1.6666666666666667)}.weui-row.weui-no-gutter .weui-col-60{width:60%}.weui-row .weui-col-50{width:50%;width:calc((100% - 15px*1)/ 2)}.weui-row.weui-no-gutter .weui-col-50{width:50%}.weui-row .weui-col-40{width:40%;width:calc((100% - 15px*1.5)/ 2.5)}.weui-row.weui-no-gutter .weui-col-40{width:40%}.weui-row .weui-col-33{width:33.333333333333336%;width:calc((100% - 15px*2)/ 3)}.weui-row.weui-no-gutter .weui-col-33{width:33.333333333333336%}.weui-row .weui-col-25{width:25%;width:calc((100% - 15px*3)/ 4)}.weui-row.weui-no-gutter .weui-col-25{width:25%}.weui-row .weui-col-20{width:20%;width:calc((100% - 15px*4)/ 5)}.weui-row.weui-no-gutter .weui-col-20{width:20%}.weui-row .weui-col-15{width:15%;width:calc((100% - 15px*5.666666666666667)/ 6.666666666666667)}.weui-row.weui-no-gutter .weui-col-15{width:15%}.weui-row .weui-col-10{width:10%;width:calc((100% - 15px*9)/ 10)}.weui-row.weui-no-gutter .weui-col-10{width:10%}.weui-row .weui-col-5{width:5%;width:calc((100% - 15px*19)/ 20)}.weui-row.weui-no-gutter .weui-col-5{width:5%}.weui-row .weui-col-auto:nth-last-child(1),.weui-row .weui-col-auto:nth-last-child(1)~.weui-col-auto{width:100%;width:calc((100% - 15px*0)/ 1)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(1),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(1)~.weui-col-auto{width:100%}.weui-row .weui-col-auto:nth-last-child(2),.weui-row .weui-col-auto:nth-last-child(2)~.weui-col-auto{width:50%;width:calc((100% - 15px*1)/ 2)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(2),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(2)~.weui-col-auto{width:50%}.weui-row .weui-col-auto:nth-last-child(3),.weui-row .weui-col-auto:nth-last-child(3)~.weui-col-auto{width:33.33333333%;width:calc((100% - 15px*2)/ 3)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(3),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(3)~.weui-col-auto{width:33.33333333%}.weui-row .weui-col-auto:nth-last-child(4),.weui-row .weui-col-auto:nth-last-child(4)~.weui-col-auto{width:25%;width:calc((100% - 15px*3)/ 4)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(4),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(4)~.weui-col-auto{width:25%}.weui-row .weui-col-auto:nth-last-child(5),.weui-row .weui-col-auto:nth-last-child(5)~.weui-col-auto{width:20%;width:calc((100% - 15px*4)/ 5)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(5),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(5)~.weui-col-auto{width:20%}.weui-row .weui-col-auto:nth-last-child(6),.weui-row .weui-col-auto:nth-last-child(6)~.weui-col-auto{width:16.66666667%;width:calc((100% - 15px*5)/ 6)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(6),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(6)~.weui-col-auto{width:16.66666667%}.weui-row .weui-col-auto:nth-last-child(7),.weui-row .weui-col-auto:nth-last-child(7)~.weui-col-auto{width:14.28571429%;width:calc((100% - 15px*6)/ 7)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(7),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(7)~.weui-col-auto{width:14.28571429%}.weui-row .weui-col-auto:nth-last-child(8),.weui-row .weui-col-auto:nth-last-child(8)~.weui-col-auto{width:12.5%;width:calc((100% - 15px*7)/ 8)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(8),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(8)~.weui-col-auto{width:12.5%}.weui-row .weui-col-auto:nth-last-child(9),.weui-row .weui-col-auto:nth-last-child(9)~.weui-col-auto{width:11.11111111%;width:calc((100% - 15px*8)/ 9)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(9),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(9)~.weui-col-auto{width:11.11111111%}.weui-row .weui-col-auto:nth-last-child(10),.weui-row .weui-col-auto:nth-last-child(10)~.weui-col-auto{width:10%;width:calc((100% - 15px*9)/ 10)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(10),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(10)~.weui-col-auto{width:10%}.weui-row .weui-col-auto:nth-last-child(11),.weui-row .weui-col-auto:nth-last-child(11)~.weui-col-auto{width:9.09090909%;width:calc((100% - 15px*10)/ 11)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(11),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(11)~.weui-col-auto{width:9.09090909%}.weui-row .weui-col-auto:nth-last-child(12),.weui-row .weui-col-auto:nth-last-child(12)~.weui-col-auto{width:8.33333333%;width:calc((100% - 15px*11)/ 12)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(12),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(12)~.weui-col-auto{width:8.33333333%}.weui-row .weui-col-auto:nth-last-child(13),.weui-row .weui-col-auto:nth-last-child(13)~.weui-col-auto{width:7.69230769%;width:calc((100% - 15px*12)/ 13)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(13),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(13)~.weui-col-auto{width:7.69230769%}.weui-row .weui-col-auto:nth-last-child(14),.weui-row .weui-col-auto:nth-last-child(14)~.weui-col-auto{width:7.14285714%;width:calc((100% - 15px*13)/ 14)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(14),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(14)~.weui-col-auto{width:7.14285714%}.weui-row .weui-col-auto:nth-last-child(15),.weui-row .weui-col-auto:nth-last-child(15)~.weui-col-auto{width:6.66666667%;width:calc((100% - 15px*14)/ 15)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(15),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(15)~.weui-col-auto{width:6.66666667%}@media all and (min-width:768px){.row .tablet-100{width:100%;width:calc((100% - 15px*0)/ 1)}.row.no-gutter .tablet-100{width:100%}.row .tablet-95{width:95%;width:calc((100% - 15px*.05263157894736836)/ 1.0526315789473684)}.row.no-gutter .tablet-95{width:95%}.row .tablet-90{width:90%;width:calc((100% - 15px*.11111111111111116)/ 1.1111111111111112)}.row.no-gutter .tablet-90{width:90%}.row .tablet-85{width:85%;width:calc((100% - 15px*.17647058823529416)/ 1.1764705882352942)}.row.no-gutter .tablet-85{width:85%}.row .tablet-80{width:80%;width:calc((100% - 15px*.25)/ 1.25)}.row.no-gutter .tablet-80{width:80%}.row .tablet-75{width:75%;width:calc((100% - 15px*.33333333333333326)/ 1.3333333333333333)}.row.no-gutter .tablet-75{width:75%}.row .tablet-66{width:66.66666666666666%;width:calc((100% - 15px*.5000000000000002)/ 1.5000000000000002)}.row.no-gutter .tablet-66{width:66.66666666666666%}.row .tablet-60{width:60%;width:calc((100% - 15px*.6666666666666667)/ 1.6666666666666667)}.row.no-gutter .tablet-60{width:60%}.row .tablet-50{width:50%;width:calc((100% - 15px*1)/ 2)}.row.no-gutter .tablet-50{width:50%}.row .tablet-40{width:40%;width:calc((100% - 15px*1.5)/ 2.5)}.row.no-gutter .tablet-40{width:40%}.row .tablet-33{width:33.333333333333336%;width:calc((100% - 15px*2)/ 3)}.row.no-gutter .tablet-33{width:33.333333333333336%}.row .tablet-25{width:25%;width:calc((100% - 15px*3)/ 4)}.row.no-gutter .tablet-25{width:25%}.row .tablet-20{width:20%;width:calc((100% - 15px*4)/ 5)}.row.no-gutter .tablet-20{width:20%}.row .tablet-15{width:15%;width:calc((100% - 15px*5.666666666666667)/ 6.666666666666667)}.row.no-gutter .tablet-15{width:15%}.row .tablet-10{width:10%;width:calc((100% - 15px*9)/ 10)}.row.no-gutter .tablet-10{width:10%}.row .tablet-5{width:5%;width:calc((100% - 15px*19)/ 20)}.row.no-gutter .tablet-5{width:5%}.row .tablet-auto:nth-last-child(1),.row .tablet-auto:nth-last-child(1)~.col-auto{width:100%;width:calc((100% - 15px*0)/ 1)}.row.no-gutter .tablet-auto:nth-last-child(1),.row.no-gutter .tablet-auto:nth-last-child(1)~.tablet-auto{width:100%}.row .tablet-auto:nth-last-child(2),.row .tablet-auto:nth-last-child(2)~.col-auto{width:50%;width:calc((100% - 15px*1)/ 2)}.row.no-gutter .tablet-auto:nth-last-child(2),.row.no-gutter .tablet-auto:nth-last-child(2)~.tablet-auto{width:50%}.row .tablet-auto:nth-last-child(3),.row .tablet-auto:nth-last-child(3)~.col-auto{width:33.33333333%;width:calc((100% - 15px*2)/ 3)}.row.no-gutter .tablet-auto:nth-last-child(3),.row.no-gutter .tablet-auto:nth-last-child(3)~.tablet-auto{width:33.33333333%}.row .tablet-auto:nth-last-child(4),.row .tablet-auto:nth-last-child(4)~.col-auto{width:25%;width:calc((100% - 15px*3)/ 4)}.row.no-gutter .tablet-auto:nth-last-child(4),.row.no-gutter .tablet-auto:nth-last-child(4)~.tablet-auto{width:25%}.row .tablet-auto:nth-last-child(5),.row .tablet-auto:nth-last-child(5)~.col-auto{width:20%;width:calc((100% - 15px*4)/ 5)}.row.no-gutter .tablet-auto:nth-last-child(5),.row.no-gutter .tablet-auto:nth-last-child(5)~.tablet-auto{width:20%}.row .tablet-auto:nth-last-child(6),.row .tablet-auto:nth-last-child(6)~.col-auto{width:16.66666667%;width:calc((100% - 15px*5)/ 6)}.row.no-gutter .tablet-auto:nth-last-child(6),.row.no-gutter .tablet-auto:nth-last-child(6)~.tablet-auto{width:16.66666667%}.row .tablet-auto:nth-last-child(7),.row .tablet-auto:nth-last-child(7)~.col-auto{width:14.28571429%;width:calc((100% - 15px*6)/ 7)}.row.no-gutter .tablet-auto:nth-last-child(7),.row.no-gutter .tablet-auto:nth-last-child(7)~.tablet-auto{width:14.28571429%}.row .tablet-auto:nth-last-child(8),.row .tablet-auto:nth-last-child(8)~.col-auto{width:12.5%;width:calc((100% - 15px*7)/ 8)}.row.no-gutter .tablet-auto:nth-last-child(8),.row.no-gutter .tablet-auto:nth-last-child(8)~.tablet-auto{width:12.5%}.row .tablet-auto:nth-last-child(9),.row .tablet-auto:nth-last-child(9)~.col-auto{width:11.11111111%;width:calc((100% - 15px*8)/ 9)}.row.no-gutter .tablet-auto:nth-last-child(9),.row.no-gutter .tablet-auto:nth-last-child(9)~.tablet-auto{width:11.11111111%}.row .tablet-auto:nth-last-child(10),.row .tablet-auto:nth-last-child(10)~.col-auto{width:10%;width:calc((100% - 15px*9)/ 10)}.row.no-gutter .tablet-auto:nth-last-child(10),.row.no-gutter .tablet-auto:nth-last-child(10)~.tablet-auto{width:10%}.row .tablet-auto:nth-last-child(11),.row .tablet-auto:nth-last-child(11)~.col-auto{width:9.09090909%;width:calc((100% - 15px*10)/ 11)}.row.no-gutter .tablet-auto:nth-last-child(11),.row.no-gutter .tablet-auto:nth-last-child(11)~.tablet-auto{width:9.09090909%}.row .tablet-auto:nth-last-child(12),.row .tablet-auto:nth-last-child(12)~.col-auto{width:8.33333333%;width:calc((100% - 15px*11)/ 12)}.row.no-gutter .tablet-auto:nth-last-child(12),.row.no-gutter .tablet-auto:nth-last-child(12)~.tablet-auto{width:8.33333333%}.row .tablet-auto:nth-last-child(13),.row .tablet-auto:nth-last-child(13)~.col-auto{width:7.69230769%;width:calc((100% - 15px*12)/ 13)}.row.no-gutter .tablet-auto:nth-last-child(13),.row.no-gutter .tablet-auto:nth-last-child(13)~.tablet-auto{width:7.69230769%}.row .tablet-auto:nth-last-child(14),.row .tablet-auto:nth-last-child(14)~.col-auto{width:7.14285714%;width:calc((100% - 15px*13)/ 14)}.row.no-gutter .tablet-auto:nth-last-child(14),.row.no-gutter .tablet-auto:nth-last-child(14)~.tablet-auto{width:7.14285714%}.row .tablet-auto:nth-last-child(15),.row .tablet-auto:nth-last-child(15)~.col-auto{width:6.66666667%;width:calc((100% - 15px*14)/ 15)}.row.no-gutter .tablet-auto:nth-last-child(15),.row.no-gutter .tablet-auto:nth-last-child(15)~.tablet-auto{width:6.66666667%}}.weui-cell__hd img{display:block;margin-right:5px}.weui-dialog,.weui-toast{-webkit-transition-duration:.2s;transition-duration:.2s;opacity:0;-webkit-transform:scale(.9) translate(-50%,-50%);transform:scale(.9) translate(-50%,-50%);-webkit-transform-origin:0 0;transform-origin:0 0;visibility:hidden;margin:0;top:45%;z-index:2000}.weui-dialog .weui-dialog__btn.default,.weui-toast .weui-dialog__btn.default{color:#5f646e}.weui-dialog .weui-dialog__btn+.weui-dialog__btn,.weui-toast .weui-dialog__btn+.weui-dialog__btn{position:relative}.weui-dialog .weui-dialog__btn+.weui-dialog__btn:after,.weui-toast .weui-dialog__btn+.weui-dialog__btn:after{content:" ";position:absolute;left:0;top:0;width:1px;height:100%;border-left:1px solid #D5D5D6;color:#D5D5D6;-webkit-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scaleX(.5);transform:scaleX(.5)}.weui-dialog.weui-dialog--visible,.weui-dialog.weui-toast--visible,.weui-toast.weui-dialog--visible,.weui-toast.weui-toast--visible{opacity:1;visibility:visible;-webkit-transform:scale(1) translate(-50%,-50%);transform:scale(1) translate(-50%,-50%)}.weui-toast_forbidden{color:#F76260}.weui-toast_cancel .weui-icon-toast:before{content:"\EA0D"}.weui-toast_forbidden .weui-icon-toast:before{content:"\EA0B";color:#F76260}.weui-toast_text{min-height:1em;width:auto;height:45px;border-radius:25px;margin-left:0;-webkit-transform:scale(.9) translate3d(-50%,0,0);transform:scale(.9) translate3d(-50%,0,0);-webkit-transform-origin:left;transform-origin:left}.weui-toast_text.weui-toast--visible{-webkit-transform:scale(1) translate3d(-50%,0,0);transform:scale(1) translate3d(-50%,0,0)}.weui-toast_text .weui-icon-toast{display:none}.weui-toast_text .weui-toast_content{margin:10px 15px}.weui-mask{opacity:0;-webkit-transition-duration:.3s;transition-duration:.3s;visibility:hidden}.weui-mask.weui-mask--visible{opacity:1;visibility:visible}.weui-prompt-input{padding:4px 6px;border:1px solid #ccc;box-sizing:border-box;height:2em;width:80%;margin-top:10px}.weui-pull-to-refresh{margin-top:-50px;-webkit-transition:-webkit-transform .4s;transition:-webkit-transform .4s;transition:transform .4s;transition:transform .4s,-webkit-transform .4s}.weui-pull-to-refresh.refreshing{-webkit-transform:translate3d(0,50px,0);transform:translate3d(0,50px,0)}.weui-pull-to-refresh.touching{-webkit-transition-duration:0s;transition-duration:0s}.weui-pull-to-refresh__layer{height:30px;line-height:30px;padding:10px;text-align:center}.weui-pull-to-refresh__layer .down{display:inline-block}.weui-pull-to-refresh__layer .refresh,.weui-pull-to-refresh__layer .up{display:none}.weui-pull-to-refresh__layer .weui-pull-to-refresh__arrow{display:inline-block;z-index:10;width:20px;height:20px;margin-right:4px;vertical-align:-4px;background:url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2026%2040'%3E%3Cpolygon%20points%3D'9%2C22%209%2C0%2017%2C0%2017%2C22%2026%2C22%2013.5%2C40%200%2C22'%20fill%3D'%238c8c8c'%2F%3E%3C%2Fsvg%3E") center no-repeat;background-size:13px 20px;-webkit-transition-duration:.3s;transition-duration:.3s;-webkit-transform:rotate(0) translate3d(0,0,0);transform:rotate(0) translate3d(0,0,0)}.weui-pull-to-refresh__layer .weui-pull-to-refresh__preloader{display:none;vertical-align:-4px;margin-right:4px;width:20px;height:20px;-webkit-transform-origin:50%;transform-origin:50%;-webkit-animation:preloader-spin 1s steps(12,end) infinite;animation:preloader-spin 1s steps(12,end) infinite}.weui-pull-to-refresh__layer .weui-pull-to-refresh__preloader:after{display:block;width:100%;height:100%;content:"";background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20viewBox%3D'0%200%20120%20120'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20xmlns%3Axlink%3D'http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink'%3E%3Cdefs%3E%3Cline%20id%3D'l'%20x1%3D'60'%20x2%3D'60'%20y1%3D'7'%20y2%3D'27'%20stroke%3D'%236c6c6c'%20stroke-width%3D'11'%20stroke-linecap%3D'round'%2F%3E%3C%2Fdefs%3E%3Cg%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(30%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(60%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(90%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(120%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(150%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.37'%20transform%3D'rotate(180%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.46'%20transform%3D'rotate(210%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.56'%20transform%3D'rotate(240%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.66'%20transform%3D'rotate(270%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.75'%20transform%3D'rotate(300%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.85'%20transform%3D'rotate(330%2060%2C60)'%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");background-repeat:no-repeat;background-position:50%;background-size:100%}.pull-up .weui-pull-to-refresh__layer .down,.refreshing .weui-pull-to-refresh__layer .down{display:none}.pull-up .weui-pull-to-refresh__layer .weui-pull-to-refresh__arrow{display:inline-block;-webkit-transform:rotate(180deg) translate3d(0,0,0);transform:rotate(180deg) translate3d(0,0,0)}.pull-down .weui-pull-to-refresh__layer .down,.pull-down .weui-pull-to-refresh__layer .weui-pull-to-refresh__arrow,.pull-up .weui-pull-to-refresh__layer .up{display:inline-block}.refreshing .weui-pull-to-refresh__layer .weui-pull-to-refresh__arrow{display:none}.refreshing .weui-pull-to-refresh__layer .refresh,.refreshing .weui-pull-to-refresh__layer .weui-pull-to-refresh__preloader{display:inline-block}@keyframes preloader-spin{100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.weui-tab__bd-item.weui-pull-to-refresh{position:absolute;top:50px}.toolbar,.weui-tabbar__item{position:relative}.weui-tabbar__item.weui-bar__item--on .weui-tabbar__label{color:#04BE02}.weui-navbar__item{color:#888}.weui-navbar__item.weui-bar__item--on{color:#666;background-color:#f1f1f1}.toolbar,.toolbar .title{font-size:.85rem;color:#3d4145;width:100%}.weui-tab__bd{box-sizing:border-box;height:100%}.weui-tab__bd .weui-tab__bd-item{display:none;height:100%;overflow:auto}.weui-tab__bd .weui-tab__bd-item.weui-tab__bd-item--active{display:block}.weui-navbar+.weui-tab__bd{padding-top:50px}.toolbar{line-height:1.5;background:#f7f7f8}.toolbar:before{content:'';position:absolute;left:0;top:0;bottom:auto;right:auto;height:1px;width:100%;background-color:#d9d9d9;display:block;z-index:15;-webkit-transform-origin:50% 0;transform-origin:50% 0}.toolbar .toolbar-inner,.weui-picker-modal .picker-items{display:-webkit-box;display:-ms-flexbox;display:-webkit-flex}@media only screen and (-webkit-min-device-pixel-ratio:2){.toolbar:before{-webkit-transform:scaleY(.5);transform:scaleY(.5)}}@media only screen and (-webkit-min-device-pixel-ratio:3){.toolbar:before{-webkit-transform:scaleY(.33);transform:scaleY(.33)}}.toolbar .toolbar-inner{height:2.2rem;display:flex;text-align:center}.toolbar .title{position:absolute;display:block;padding:0;font-weight:400;line-height:2.2rem;text-align:center;white-space:nowrap}.toolbar .picker-button{position:absolute;right:0;box-sizing:border-box;height:2.2rem;line-height:2.2rem;color:#04BE02;z-index:1;padding:0 .5rem}.weui-picker-modal{width:100%;position:absolute;bottom:0;text-align:center;border-radius:0;opacity:.6;color:#3d4145;-webkit-transition-duration:.3s;transition-duration:.3s;height:13rem;background:#EFEFF4;-webkit-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0);-webkit-transition-property:opacity,-webkit-transform;transition-property:opacity,-webkit-transform;transition-property:transform,opacity;transition-property:transform,opacity,-webkit-transform}.weui-picker-modal.picker-modal-inline{height:10.8rem;opacity:1;position:static;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}.weui-picker-modal.picker-modal-inline .toolbar{display:none}.weui-picker-modal.picker-columns-single .picker-items-col{width:100%}.weui-picker-modal.weui-picker-modal-visible{opacity:1;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}.weui-picker-modal .picker-modal-inner{position:relative;height:10.8rem}.weui-picker-modal .picker-columns{width:100%;height:13rem;z-index:11500}.popover .weui-picker-modal .picker-columns,.weui-picker-modal .picker-columns.picker-modal-inline{height:10rem}@media (orientation:landscape) and (max-height:415px){.weui-picker-modal .picker-columns:not(.picker-modal-inline){height:10rem}}.weui-picker-modal .popover.popover-picker-columns{width:14rem}.weui-picker-modal .picker-items{display:flex;-webkit-box-pack:center;-ms-flex-pack:center;-webkit-justify-content:center;justify-content:center;width:100%;padding:0;text-align:right;font-size:1rem;font-weight:400;-webkit-mask-box-image:-webkit-linear-gradient(bottom,transparent,transparent 5%,#fff 20%,#fff 80%,transparent 95%,transparent);-webkit-mask-box-image:linear-gradient(to top,transparent,transparent 5%,#fff 20%,#fff 80%,transparent 95%,transparent)}.weui-picker-modal .bar+.picker-items{height:10.8rem}.weui-picker-modal .picker-items-col{overflow:hidden;position:relative;max-height:100%}.weui-picker-modal .picker-items-col.picker-items-col-left{text-align:left}.weui-picker-modal .picker-items-col.picker-items-col-center{text-align:center}.weui-picker-modal .picker-items-col.picker-items-col-right{text-align:right}.weui-picker-modal .picker-items-col.picker-items-col-divider{color:#3d4145;display:-webkit-box;display:-ms-flexbox;display:-webkit-flex;display:flex;-webkit-box-align:center;-ms-flex-align:center;-webkit-align-items:center;align-items:center}.weui-picker-modal .picker-items-col-wrapper{-webkit-transition:.3s;transition:.3s;-webkit-transition-timing-function:ease-out;transition-timing-function:ease-out}.weui-picker-modal .picker-item{height:32px;line-height:32px;padding:0 10px;white-space:nowrap;position:relative;overflow:hidden;text-overflow:ellipsis;color:#9b9b9b;left:0;top:0;width:100%;box-sizing:border-box;-webkit-transition:.3s;transition:.3s}.picker-items-col-absolute .weui-picker-modal .picker-item{position:absolute}.weui-picker-modal .picker-item.picker-item-far{pointer-events:none}.weui-picker-modal .picker-item.picker-selected{color:#3d4145;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0);-webkit-transform:rotateX(0);transform:rotateX(0)}.weui-picker-modal .picker-center-highlight{height:32px;box-sizing:border-box;position:absolute;left:0;width:100%;top:50%;margin-top:-16px;pointer-events:none}.weui-picker-modal .picker-center-highlight:after,.weui-picker-modal .picker-center-highlight:before{content:'';position:absolute;right:auto;height:1px;background-color:#D9D9D9;display:block;z-index:15;left:0;width:100%}.weui-picker-modal .picker-center-highlight:before{top:0;bottom:auto;-webkit-transform-origin:50% 0;transform-origin:50% 0}@media only screen and (-webkit-min-device-pixel-ratio:2){.weui-picker-modal .picker-center-highlight:before{-webkit-transform:scaleY(.5);transform:scaleY(.5)}}@media only screen and (-webkit-min-device-pixel-ratio:3){.weui-picker-modal .picker-center-highlight:before{-webkit-transform:scaleY(.33);transform:scaleY(.33)}}.weui-picker-modal .picker-center-highlight:after{bottom:0;top:auto;-webkit-transform-origin:50% 100%;transform-origin:50% 100%}@media only screen and (-webkit-min-device-pixel-ratio:2){.weui-picker-modal .picker-center-highlight:after{-webkit-transform:scaleY(.5);transform:scaleY(.5)}}@media only screen and (-webkit-min-device-pixel-ratio:3){.weui-picker-modal .picker-center-highlight:after{-webkit-transform:scaleY(.33);transform:scaleY(.33)}}.weui-picker-modal .picker-3d .picker-items{overflow:hidden;-webkit-perspective:1200px;perspective:1200px}.weui-picker-modal .picker-3d .picker-item,.weui-picker-modal .picker-3d .picker-items-col,.weui-picker-modal .picker-3d .picker-items-col-wrapper{-webkit-transform-style:preserve-3d;transform-style:preserve-3d}.weui-picker-modal .picker-3d .picker-items-col{overflow:visible}.weui-picker-modal .picker-3d .picker-item{-webkit-transform-origin:center center -110px;transform-origin:center center -110px;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-transition-timing-function:ease-out;transition-timing-function:ease-out}.weui-picker-container,.weui-picker-overlay{position:fixed;bottom:0;left:0;right:0;height:0;width:100%;z-index:1000}.picker-calendar-row:after,.picker-calendar-week-days:after{content:'';z-index:15;left:0;right:auto}.city-picker .picker-items-col{-webkit-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1;max-width:7rem}.weui-picker-container .weui-cells{margin:0;text-align:left}.datetime-picker .picker-item{text-overflow:initial}.weui-select-modal{height:auto}.weui-select-modal .weui-cells{margin:0;text-align:left;overflow-y:auto;overflow-x:hidden;max-height:16rem}.weui-select-modal .weui-cells:after{display:none}.picker-calendar-month,.picker-calendar-week-days{display:-webkit-box;display:-ms-flexbox;display:-webkit-flex}.weui-picker-calendar{background:#fff;height:15rem;width:100%;overflow:hidden}.weui-picker-calendar .picker-modal-inner{overflow:hidden;height:12.8rem}.picker-calendar-week-days{height:.9rem;background:#f7f7f8;display:flex;font-size:11px;box-sizing:border-box;position:relative}.picker-calendar-week-days:after{position:absolute;bottom:0;top:auto;height:1px;width:100%;background-color:#c4c4c4;display:block;-webkit-transform-origin:50% 100%;transform-origin:50% 100%}@media only screen and (-webkit-min-device-pixel-ratio:2){.picker-calendar-week-days:after{-webkit-transform:scaleY(.5);transform:scaleY(.5)}}@media only screen and (-webkit-min-device-pixel-ratio:3){.picker-calendar-week-days:after{-webkit-transform:scaleY(.33);transform:scaleY(.33)}}.picker-calendar-week-days .picker-calendar-week-day{-ms-flex:0 1 auto;-webkit-flex-shrink:1;-ms-flex-negative:1;flex-shrink:1;width:14.28571429%;width:calc(100% / 7);line-height:17px;text-align:center}.picker-calendar-week-days+.picker-calendar-months{height:11.9rem}.picker-calendar-months{width:100%;height:100%;overflow:hidden;position:relative}.picker-calendar-months-wrapper{position:relative;width:100%;height:100%;-webkit-transition:.3s;transition:.3s}.picker-calendar-month{display:flex;-webkit-box-orient:vertical;-ms-flex-direction:column;-webkit-flex-direction:column;flex-direction:column;width:100%;height:100%;position:absolute;left:0;top:0}.picker-calendar-row{height:16.66666667%;height:calc(100% / 6);display:-webkit-box;display:-ms-flexbox;display:-webkit-flex;display:flex;-ms-flex:0 1 auto;-webkit-flex-shrink:1;-ms-flex-negative:1;flex-shrink:1;width:100%;position:relative}.picker-calendar-row:after{position:absolute;bottom:0;top:auto;height:1px;width:100%;background-color:#ccc;display:block;-webkit-transform-origin:50% 100%;transform-origin:50% 100%}@media only screen and (-webkit-min-device-pixel-ratio:2){.picker-calendar-row:after{-webkit-transform:scaleY(.5);transform:scaleY(.5)}}@media only screen and (-webkit-min-device-pixel-ratio:3){.picker-calendar-row:after{-webkit-transform:scaleY(.33);transform:scaleY(.33)}}.weui-picker-modal .picker-calendar-row:last-child:after{display:none}.picker-calendar-day{-ms-flex:0 1 auto;-webkit-flex-shrink:1;-ms-flex-negative:1;flex-shrink:1;display:-webkit-box;display:-ms-flexbox;display:-webkit-flex;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;-webkit-justify-content:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;-webkit-align-items:center;align-items:center;box-sizing:border-box;width:14.28571429%;width:calc(100% / 7);text-align:center;color:#3d4145;font-size:15px;cursor:pointer}.picker-calendar-day.picker-calendar-day-next,.picker-calendar-day.picker-calendar-day-prev{color:#ccc}.picker-calendar-day.picker-calendar-day-disabled{color:#d4d4d4;cursor:auto}.picker-calendar-day.picker-calendar-day-today span{background:#e3e3e3}.picker-calendar-day.picker-calendar-day-selected span{background:#04BE02;color:#fff}.picker-calendar-day span{display:inline-block;border-radius:100%;width:30px;height:30px;line-height:30px}.picker-calendar-month-picker,.picker-calendar-year-picker{-webkit-box-align:center;-ms-flex-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;width:50%;max-width:200px;-webkit-flex-shrink:10;-ms-flex-negative:10;flex-shrink:10}.picker-calendar-month-picker span,.picker-calendar-year-picker span{-ms-flex:0 1 auto;-webkit-flex-shrink:1;-ms-flex-negative:1;flex-shrink:1;position:relative;overflow:hidden;text-overflow:ellipsis}.picker-calendar.picker-modal-inline .picker-calendar-week-days,.popover .picker-calendar .picker-calendar-week-days{background:0 0}.swiper-button-next,.swiper-button-prev,i.icon{background-position:center;background-repeat:no-repeat}.picker-calendar.picker-modal-inline .picker-calendar-week-days:after,.picker-calendar.picker-modal-inline .picker-calendar-week-days:before,.picker-calendar.picker-modal-inline .toolbar:after,.picker-calendar.picker-modal-inline .toolbar:before,.popover .picker-calendar .picker-calendar-week-days:after,.popover .picker-calendar .picker-calendar-week-days:before,.popover .picker-calendar .toolbar:after,.popover .picker-calendar .toolbar:before{display:none}.picker-calendar.picker-modal-inline .picker-calendar-week-days~.picker-calendar-months:before,.picker-calendar.picker-modal-inline .toolbar~.picker-modal-inner .picker-calendar-months:before,.popover .picker-calendar .picker-calendar-week-days~.picker-calendar-months:before,.popover .picker-calendar .toolbar~.picker-modal-inner .picker-calendar-months:before{content:'';position:absolute;left:0;top:0;bottom:auto;right:auto;height:1px;width:100%;background-color:#c4c4c4;display:block;z-index:15;-webkit-transform-origin:50% 0;transform-origin:50% 0}@media only screen and (-webkit-min-device-pixel-ratio:2){.picker-calendar.picker-modal-inline .picker-calendar-week-days~.picker-calendar-months:before,.picker-calendar.picker-modal-inline .toolbar~.picker-modal-inner .picker-calendar-months:before,.popover .picker-calendar .picker-calendar-week-days~.picker-calendar-months:before,.popover .picker-calendar .toolbar~.picker-modal-inner .picker-calendar-months:before{-webkit-transform:scaleY(.5);transform:scaleY(.5)}}@media only screen and (-webkit-min-device-pixel-ratio:3){.picker-calendar.picker-modal-inline .picker-calendar-week-days~.picker-calendar-months:before,.picker-calendar.picker-modal-inline .toolbar~.picker-modal-inner .picker-calendar-months:before,.popover .picker-calendar .picker-calendar-week-days~.picker-calendar-months:before,.popover .picker-calendar .toolbar~.picker-modal-inner .picker-calendar-months:before{-webkit-transform:scaleY(.33);transform:scaleY(.33)}}.picker-calendar-month-picker,.picker-calendar-year-picker{display:block;line-height:2.2rem;-webkit-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1}.picker-calendar-month-picker a.icon-only,.picker-calendar-year-picker a.icon-only{min-width:36px;float:left;width:25%;height:2.2rem;line-height:2rem}.picker-calendar-month-picker .current-month-value,.picker-calendar-month-picker .current-year-value,.picker-calendar-year-picker .current-month-value,.picker-calendar-year-picker .current-year-value{float:left;width:50%;height:2.2rem}i.icon{display:inline-block;vertical-align:middle;background-size:100% auto;font-style:normal;position:relative}i.icon.icon-next,i.icon.icon-prev{width:.75rem;height:.75rem}.swiper-slide,.swiper-wrapper{width:100%;height:100%;position:relative}i.icon.icon-next{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2015%2015'%3E%3Cg%3E%3Cpath%20fill%3D'%2304BE02'%20d%3D'M1%2C1.6l11.8%2C5.8L1%2C13.4V1.6%20M0%2C0v15l15-7.6L0%2C0L0%2C0z'%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E")}i.icon.icon-prev{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2015%2015'%3E%3Cg%3E%3Cpath%20fill%3D'%2304BE02'%20d%3D'M14%2C1.6v11.8L2.2%2C7.6L14%2C1.6%20M15%2C0L0%2C7.6L15%2C15V0L15%2C0z'%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.swiper-container{margin:0 auto;position:relative;overflow:hidden;z-index:1}.swiper-container-no-flexbox .swiper-slide{float:left}.swiper-container-vertical>.swiper-wrapper{-webkit-box-orient:vertical;-ms-flex-direction:column;-webkit-flex-direction:column;flex-direction:column}.swiper-wrapper{z-index:1;display:-webkit-box;display:-ms-flexbox;display:-webkit-flex;display:flex;-webkit-transition-property:-webkit-transform;transition-property:-webkit-transform;transition-property:transform;transition-property:transform,-webkit-transform;box-sizing:content-box}.swiper-container-android .swiper-slide,.swiper-wrapper{-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}.swiper-container-multirow>.swiper-wrapper{-webkit-box-lines:multiple;-moz-box-lines:multiple;-ms-flex-wrap:wrap;-webkit-flex-wrap:wrap;flex-wrap:wrap}.swiper-container-free-mode>.swiper-wrapper{-webkit-transition-timing-function:ease-out;transition-timing-function:ease-out;margin:0 auto}.swiper-slide{-ms-flex:0 0 auto;-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0}.swiper-container-autoheight,.swiper-container-autoheight .swiper-slide{height:auto}.swiper-container-autoheight .swiper-wrapper{-webkit-box-align:start;-ms-flex-align:start;-webkit-align-items:flex-start;align-items:flex-start;-webkit-transition-property:-webkit-transform,height;-webkit-transition-property:height,-webkit-transform;transition-property:height,-webkit-transform;transition-property:transform,height;transition-property:transform,height,-webkit-transform}.swiper-container .swiper-notification{position:absolute;left:0;top:0;pointer-events:none;opacity:0;z-index:-1000}.swiper-wp8-horizontal{-ms-touch-action:pan-y;touch-action:pan-y}.swiper-wp8-vertical{-ms-touch-action:pan-x;touch-action:pan-x}.swiper-button-next,.swiper-button-prev{position:absolute;top:50%;width:27px;height:44px;margin-top:-22px;z-index:10;cursor:pointer;background-size:27px 44px}.swiper-button-next.swiper-button-disabled,.swiper-button-prev.swiper-button-disabled{opacity:.35;cursor:auto;pointer-events:none}.swiper-button-prev,.swiper-container-rtl .swiper-button-next{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M0%2C22L22%2C0l2.1%2C2.1L4.2%2C22l19.9%2C19.9L22%2C44L0%2C22L0%2C22L0%2C22z'%20fill%3D'%23007aff'%2F%3E%3C%2Fsvg%3E");left:10px;right:auto}.swiper-button-prev.swiper-button-black,.swiper-container-rtl .swiper-button-next.swiper-button-black{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M0%2C22L22%2C0l2.1%2C2.1L4.2%2C22l19.9%2C19.9L22%2C44L0%2C22L0%2C22L0%2C22z'%20fill%3D'%23000000'%2F%3E%3C%2Fsvg%3E")}.swiper-button-prev.swiper-button-white,.swiper-container-rtl .swiper-button-next.swiper-button-white{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M0%2C22L22%2C0l2.1%2C2.1L4.2%2C22l19.9%2C19.9L22%2C44L0%2C22L0%2C22L0%2C22z'%20fill%3D'%23ffffff'%2F%3E%3C%2Fsvg%3E")}.swiper-button-next,.swiper-container-rtl .swiper-button-prev{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M27%2C22L27%2C22L5%2C44l-2.1-2.1L22.8%2C22L2.9%2C2.1L5%2C0L27%2C22L27%2C22z'%20fill%3D'%23007aff'%2F%3E%3C%2Fsvg%3E");right:10px;left:auto}.swiper-button-next.swiper-button-black,.swiper-container-rtl .swiper-button-prev.swiper-button-black{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M27%2C22L27%2C22L5%2C44l-2.1-2.1L22.8%2C22L2.9%2C2.1L5%2C0L27%2C22L27%2C22z'%20fill%3D'%23000000'%2F%3E%3C%2Fsvg%3E")}.swiper-button-next.swiper-button-white,.swiper-container-rtl .swiper-button-prev.swiper-button-white{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M27%2C22L27%2C22L5%2C44l-2.1-2.1L22.8%2C22L2.9%2C2.1L5%2C0L27%2C22L27%2C22z'%20fill%3D'%23ffffff'%2F%3E%3C%2Fsvg%3E")}.swiper-pagination{position:absolute;text-align:center;-webkit-transition:.3s;transition:.3s;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0);z-index:10}.swiper-pagination.swiper-pagination-hidden{opacity:0}.swiper-container-horizontal>.swiper-pagination-bullets,.swiper-pagination-custom,.swiper-pagination-fraction{bottom:10px;left:0;width:100%}.swiper-pagination-bullet{width:8px;height:8px;display:inline-block;border-radius:100%;background:#000;opacity:.2}button.swiper-pagination-bullet{border:none;margin:0;padding:0;box-shadow:none;-moz-appearance:none;-ms-appearance:none;-webkit-appearance:none;appearance:none}.swiper-pagination-clickable .swiper-pagination-bullet{cursor:pointer}.swiper-pagination-white .swiper-pagination-bullet{background:#fff}.swiper-pagination-bullet-active{opacity:1;background:#04BE02}.swiper-pagination-white .swiper-pagination-bullet-active{background:#fff}.swiper-pagination-black .swiper-pagination-bullet-active{background:#000}.swiper-container-vertical>.swiper-pagination-bullets{right:10px;top:50%;-webkit-transform:translate3d(0,-50%,0);transform:translate3d(0,-50%,0)}.swiper-container-vertical>.swiper-pagination-bullets .swiper-pagination-bullet{margin:5px 0;display:block}.swiper-container-horizontal>.swiper-pagination-bullets .swiper-pagination-bullet{margin:0 5px}.swiper-pagination-progress{background:rgba(0,0,0,.25);position:absolute}.swiper-pagination-progress .swiper-pagination-progressbar{background:#007aff;position:absolute;left:0;top:0;width:100%;height:100%;-webkit-transform:scale(0);transform:scale(0);-webkit-transform-origin:left top;transform-origin:left top}.swiper-container-rtl .swiper-pagination-progress .swiper-pagination-progressbar{-webkit-transform-origin:right top;transform-origin:right top}.swiper-container-horizontal>.swiper-pagination-progress{width:100%;height:4px;left:0;top:0}.swiper-container-vertical>.swiper-pagination-progress{width:4px;height:100%;left:0;top:0}.swiper-pagination-progress.swiper-pagination-white{background:rgba(255,255,255,.5)}.swiper-pagination-progress.swiper-pagination-white .swiper-pagination-progressbar{background:#fff}.swiper-pagination-progress.swiper-pagination-black .swiper-pagination-progressbar{background:#000}.swiper-container-3d{-webkit-perspective:1200px;-o-perspective:1200px;perspective:1200px}.swiper-container-3d .swiper-cube-shadow,.swiper-container-3d .swiper-slide,.swiper-container-3d .swiper-slide-shadow-bottom,.swiper-container-3d .swiper-slide-shadow-left,.swiper-container-3d .swiper-slide-shadow-right,.swiper-container-3d .swiper-slide-shadow-top,.swiper-container-3d .swiper-wrapper{-webkit-transform-style:preserve-3d;transform-style:preserve-3d}.swiper-container-3d .swiper-slide-shadow-bottom,.swiper-container-3d .swiper-slide-shadow-left,.swiper-container-3d .swiper-slide-shadow-right,.swiper-container-3d .swiper-slide-shadow-top{position:absolute;left:0;top:0;width:100%;height:100%;pointer-events:none;z-index:10}.swiper-container-3d .swiper-slide-shadow-left{background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,0)));background-image:-webkit-linear-gradient(right,rgba(0,0,0,.5),rgba(0,0,0,0));background-image:linear-gradient(to left,rgba(0,0,0,.5),rgba(0,0,0,0))}.swiper-container-3d .swiper-slide-shadow-right{background-image:-webkit-gradient(linear,right top,left top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,0)));background-image:-webkit-linear-gradient(left,rgba(0,0,0,.5),rgba(0,0,0,0));background-image:linear-gradient(to right,rgba(0,0,0,.5),rgba(0,0,0,0))}.swiper-container-3d .swiper-slide-shadow-top{background-image:-webkit-gradient(linear,left top,left bottom,from(rgba(0,0,0,.5)),to(rgba(0,0,0,0)));background-image:-webkit-linear-gradient(bottom,rgba(0,0,0,.5),rgba(0,0,0,0));background-image:linear-gradient(to top,rgba(0,0,0,.5),rgba(0,0,0,0))}.swiper-container-3d .swiper-slide-shadow-bottom{background-image:-webkit-gradient(linear,left bottom,left top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,0)));background-image:-webkit-linear-gradient(top,rgba(0,0,0,.5),rgba(0,0,0,0));background-image:linear-gradient(to bottom,rgba(0,0,0,.5),rgba(0,0,0,0))}.swiper-container-coverflow .swiper-wrapper,.swiper-container-flip .swiper-wrapper{-ms-perspective:1200px}.swiper-container-cube,.swiper-container-flip{overflow:visible}.swiper-container-cube .swiper-slide,.swiper-container-flip .swiper-slide{pointer-events:none;-webkit-backface-visibility:hidden;backface-visibility:hidden;z-index:1}.swiper-container-cube .swiper-slide .swiper-slide,.swiper-container-flip .swiper-slide .swiper-slide{pointer-events:none}.swiper-container-cube .swiper-slide-active,.swiper-container-cube .swiper-slide-active .swiper-slide-active,.swiper-container-flip .swiper-slide-active,.swiper-container-flip .swiper-slide-active .swiper-slide-active{pointer-events:auto}.swiper-container-cube .swiper-slide-shadow-bottom,.swiper-container-cube .swiper-slide-shadow-left,.swiper-container-cube .swiper-slide-shadow-right,.swiper-container-cube .swiper-slide-shadow-top,.swiper-container-flip .swiper-slide-shadow-bottom,.swiper-container-flip .swiper-slide-shadow-left,.swiper-container-flip .swiper-slide-shadow-right,.swiper-container-flip .swiper-slide-shadow-top{z-index:0;-webkit-backface-visibility:hidden;backface-visibility:hidden}.swiper-container-cube .swiper-slide{visibility:hidden;-webkit-transform-origin:0 0;transform-origin:0 0;width:100%;height:100%}.swiper-container-cube.swiper-container-rtl .swiper-slide{-webkit-transform-origin:100% 0;transform-origin:100% 0}.swiper-container-cube .swiper-slide-active,.swiper-container-cube .swiper-slide-next,.swiper-container-cube .swiper-slide-next+.swiper-slide,.swiper-container-cube .swiper-slide-prev{pointer-events:auto;visibility:visible}.swiper-container-cube .swiper-cube-shadow{position:absolute;left:0;bottom:0;width:100%;height:100%;background:#000;opacity:.6;-webkit-filter:blur(50px);filter:blur(50px);z-index:0}.swiper-container-fade.swiper-container-free-mode .swiper-slide{-webkit-transition-timing-function:ease-out;transition-timing-function:ease-out}.swiper-container-fade .swiper-slide{pointer-events:none;-webkit-transition-property:opacity;transition-property:opacity}.swiper-container-fade .swiper-slide .swiper-slide{pointer-events:none}.swiper-container-fade .swiper-slide-active,.swiper-container-fade .swiper-slide-active .swiper-slide-active{pointer-events:auto}.swiper-scrollbar{border-radius:10px;position:relative;-ms-touch-action:none;background:rgba(0,0,0,.1)}.swiper-container-horizontal>.swiper-scrollbar{position:absolute;left:1%;bottom:3px;z-index:50;height:5px;width:98%}.swiper-container-vertical>.swiper-scrollbar{position:absolute;right:3px;top:1%;z-index:50;width:5px;height:98%}.swiper-scrollbar-drag{height:100%;width:100%;position:relative;background:rgba(0,0,0,.5);border-radius:10px;left:0;top:0}.swiper-scrollbar-cursor-drag{cursor:move}.swiper-lazy-preloader{width:42px;height:42px;position:absolute;left:50%;top:50%;margin-left:-21px;margin-top:-21px;z-index:10;-webkit-transform-origin:50%;transform-origin:50%;-webkit-animation:swiper-preloader-spin 1s steps(12,end) infinite;animation:swiper-preloader-spin 1s steps(12,end) infinite}.swiper-lazy-preloader:after{display:block;content:"";width:100%;height:100%;background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20viewBox%3D'0%200%20120%20120'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20xmlns%3Axlink%3D'http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink'%3E%3Cdefs%3E%3Cline%20id%3D'l'%20x1%3D'60'%20x2%3D'60'%20y1%3D'7'%20y2%3D'27'%20stroke%3D'%236c6c6c'%20stroke-width%3D'11'%20stroke-linecap%3D'round'%2F%3E%3C%2Fdefs%3E%3Cg%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(30%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(60%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(90%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(120%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(150%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.37'%20transform%3D'rotate(180%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.46'%20transform%3D'rotate(210%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.56'%20transform%3D'rotate(240%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.66'%20transform%3D'rotate(270%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.75'%20transform%3D'rotate(300%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.85'%20transform%3D'rotate(330%2060%2C60)'%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");background-position:50%;background-size:100%;background-repeat:no-repeat}.swiper-lazy-preloader-white:after{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20viewBox%3D'0%200%20120%20120'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20xmlns%3Axlink%3D'http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink'%3E%3Cdefs%3E%3Cline%20id%3D'l'%20x1%3D'60'%20x2%3D'60'%20y1%3D'7'%20y2%3D'27'%20stroke%3D'%23fff'%20stroke-width%3D'11'%20stroke-linecap%3D'round'%2F%3E%3C%2Fdefs%3E%3Cg%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(30%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(60%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(90%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(120%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(150%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.37'%20transform%3D'rotate(180%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.46'%20transform%3D'rotate(210%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.56'%20transform%3D'rotate(240%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.66'%20transform%3D'rotate(270%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.75'%20transform%3D'rotate(300%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.85'%20transform%3D'rotate(330%2060%2C60)'%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E")}@-webkit-keyframes swiper-preloader-spin{100%{-webkit-transform:rotate(360deg)}}@keyframes swiper-preloader-spin{100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.weui-actionsheet{z-index:10000}.weui-actionsheet .weui-actionsheet__title{padding:8px 0;text-align:center;font-size:16px;color:#999;background-color:#f4f4f4;position:relative}.weui-actionsheet .weui-actionsheet__title:after{content:" ";position:absolute;left:0;bottom:0;width:100%;height:1px;border-top:1px solid #d9d9d9;color:#d9d9d9;-webkit-transform-origin:0 100%;transform-origin:0 100%;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.weui-popup__container,.weui-popup__overlay{position:fixed;bottom:0;left:0;right:0;width:100%;height:100%;z-index:10}.weui-popup__overlay{background-color:rgba(0,0,0,.6);opacity:0;-webkit-transition:opacity .3s;transition:opacity .3s}.weui-popup__container{display:none}.weui-popup__container.weui-popup__container--visible{display:block}.weui-popup__container .weui-cells{margin:0;text-align:left}.weui-popup__modal{width:100%;position:absolute;z-index:100;bottom:0;border-radius:0;opacity:.6;color:#3d4145;-webkit-transition-duration:.3s;transition-duration:.3s;height:100%;background:#EFEFF4;-webkit-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0);-webkit-transition-property:opacity,-webkit-transform;transition-property:opacity,-webkit-transform;transition-property:transform,opacity;transition-property:transform,opacity,-webkit-transform;overflow-x:hidden;overflow-y:auto}.popup-bottom .weui-popup__modal{height:auto}.weui-popup__modal .toolbar{position:absolute;left:0;top:0;right:0;z-index:1}.weui-popup__modal .modal-content{height:100%;padding-top:2.2rem;overflow:auto;box-sizing:border-box}.weui-popup__container--visible .weui-popup-overlay{opacity:1}.weui-popup__container--visible .weui-popup__modal{opacity:1;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}.weui-notification{position:fixed;width:100%;min-height:3.4rem;top:-2rem;padding-top:2rem;left:0;right:0;z-index:9999;background-color:rgba(0,0,0,.85);color:#fff;font-size:.65rem;-webkit-transform:translate3d(0,-100%,0);transform:translate3d(0,-100%,0);-webkit-transition:.4s;transition:.4s}.weui-notification.weui-notification--in{-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}.weui-notification.weui-notification--touching{-webkit-transition-duration:0s;transition-duration:0s}.weui-notification .weui-notification__inner{padding:.4rem .6rem 1rem;display:-webkit-box;display:-ms-flexbox;display:-webkit-flex;display:flex;-webkit-box-align:start;-ms-flex-align:start;-webkit-align-items:flex-start;align-items:flex-start}.weui-notification .weui-notification__content{width:100%;margin:0 .4rem}.weui-notification .weui-notification__title{font-weight:700}.weui-notification .weui-notification__text{line-height:1}.weui-notification .weui-notification__media{height:1rem;width:1rem}.weui-notification .weui-notification__media img{width:100%}.weui-notification .weui-notification__handle-bar{position:absolute;bottom:.2rem;left:50%;-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0);width:2rem;height:.3rem;border-radius:.15rem;background:#fff;opacity:.5}.weui-photo-browser-modal{position:fixed;top:0;left:0;right:0;bottom:0;background:#000;display:none;opacity:0;-webkit-transition:opacity .3s;transition:opacity .3s}.weui-photo-browser-modal.weui-photo-browser-modal-visible{opacity:1}.weui-photo-browser-modal .swiper-container{height:100%;-webkit-transform:scale(.2);transform:scale(.2);-webkit-transition:-webkit-transform .5s;transition:-webkit-transform .5s;transition:transform .5s;transition:transform .5s,-webkit-transform .5s}.weui-photo-browser-modal .swiper-container .swiper-pagination-bullet{background:#fff;visibility:hidden}.weui-photo-browser-modal .swiper-container.swiper-container-visible{-webkit-transform:scale(1);transform:scale(1)}.weui-photo-browser-modal .swiper-container.swiper-container-visible .swiper-pagination-bullet{visibility:visible;-webkit-transition-property:visibility;transition-property:visibility;-webkit-transition-delay:.5s;transition-delay:.5s}.weui-photo-browser-modal .swiper-container .swiper-pagination{bottom:10px;left:0;width:100%}.weui-photo-browser-modal .photo-container{height:100%;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;overflow:hidden}.weui-photo-browser-modal .photo-container img{max-width:100%;margin-top:-30px}.weui-photo-browser-modal .caption{position:absolute;bottom:40px;left:0;right:0;color:#fff;text-align:center;padding:0 12px;min-height:3rem;font-size:14px;z-index:10;-webkit-transition:opacity .3s;transition:opacity .3s;-webkit-transition-delay:.5s;transition-delay:.5s;opacity:0}.weui-photo-browser-modal .caption .caption-item{display:none;opacity:0;-webkit-transition:opacity .15s;transition:opacity .15s}.weui-photo-browser-modal .caption .caption-item.active{display:block;opacity:1}.weui-photo-browser-modal .swiper-container-visible .caption{opacity:1}.color-primary{color:#04BE02}.color-danger,.color-error{color:#f6383a}.color-warning{color:#f60}.color-success{color:#4cd964}.bg-danger,.bg-error,.bg-primary,.bg-success,.bg-warning{color:#fff}.bg-primary{background-color:#04BE02}.bg-danger,.bg-error{background-color:#f6383a}.bg-warning{background-color:#f60}.bg-success{background-color:#4cd964}.weui-toptips{z-index:100;opacity:0;-webkit-transition:opacity .3s;transition:opacity .3s}.weui-toptips.weui-toptips_visible{opacity:1}.weui-icon_toast{font-size:55px;color:#fff;margin-bottom:6px}.weui-toast--forbidden .weui-icon_toast{color:#f6383a}.weui-toast--text{min-height:initial;font-size:18px;padding:8px 16px;width:auto;top:40%}.weui-toast--text .weui-icon_toast{display:none}
\ No newline at end of file
diff --git a/NewLife.Cube/Content/jweui/images/icon_nav_actionSheet.png b/NewLife.Cube/Content/jweui/images/icon_nav_actionSheet.png
deleted file mode 100644
index 430364003e..0000000000
Binary files a/NewLife.Cube/Content/jweui/images/icon_nav_actionSheet.png and /dev/null differ
diff --git a/NewLife.Cube/Content/jweui/images/icon_nav_article.png b/NewLife.Cube/Content/jweui/images/icon_nav_article.png
deleted file mode 100644
index 6e73624cd6..0000000000
Binary files a/NewLife.Cube/Content/jweui/images/icon_nav_article.png and /dev/null differ
diff --git a/NewLife.Cube/Content/jweui/images/icon_nav_button.png b/NewLife.Cube/Content/jweui/images/icon_nav_button.png
deleted file mode 100644
index c417dde1b4..0000000000
Binary files a/NewLife.Cube/Content/jweui/images/icon_nav_button.png and /dev/null differ
diff --git a/NewLife.Cube/Content/jweui/images/icon_nav_calendar.png b/NewLife.Cube/Content/jweui/images/icon_nav_calendar.png
deleted file mode 100644
index bb0a440ca4..0000000000
Binary files a/NewLife.Cube/Content/jweui/images/icon_nav_calendar.png and /dev/null differ
diff --git a/NewLife.Cube/Content/jweui/images/icon_nav_cell.png b/NewLife.Cube/Content/jweui/images/icon_nav_cell.png
deleted file mode 100644
index baf564633a..0000000000
Binary files a/NewLife.Cube/Content/jweui/images/icon_nav_cell.png and /dev/null differ
diff --git a/NewLife.Cube/Content/jweui/images/icon_nav_city.png b/NewLife.Cube/Content/jweui/images/icon_nav_city.png
deleted file mode 100644
index dfe032e26f..0000000000
Binary files a/NewLife.Cube/Content/jweui/images/icon_nav_city.png and /dev/null differ
diff --git a/NewLife.Cube/Content/jweui/images/icon_nav_datetime.png b/NewLife.Cube/Content/jweui/images/icon_nav_datetime.png
deleted file mode 100644
index 2d8cf6f9eb..0000000000
Binary files a/NewLife.Cube/Content/jweui/images/icon_nav_datetime.png and /dev/null differ
diff --git a/NewLife.Cube/Content/jweui/images/icon_nav_dialog.png b/NewLife.Cube/Content/jweui/images/icon_nav_dialog.png
deleted file mode 100644
index 8e2748dac5..0000000000
Binary files a/NewLife.Cube/Content/jweui/images/icon_nav_dialog.png and /dev/null differ
diff --git a/NewLife.Cube/Content/jweui/images/icon_nav_icons.png b/NewLife.Cube/Content/jweui/images/icon_nav_icons.png
deleted file mode 100644
index cd1cc3246a..0000000000
Binary files a/NewLife.Cube/Content/jweui/images/icon_nav_icons.png and /dev/null differ
diff --git a/NewLife.Cube/Content/jweui/images/icon_nav_msg.png b/NewLife.Cube/Content/jweui/images/icon_nav_msg.png
deleted file mode 100644
index 6a3da3d488..0000000000
Binary files a/NewLife.Cube/Content/jweui/images/icon_nav_msg.png and /dev/null differ
diff --git a/NewLife.Cube/Content/jweui/images/icon_nav_new.png b/NewLife.Cube/Content/jweui/images/icon_nav_new.png
deleted file mode 100644
index 4d8ca7f095..0000000000
Binary files a/NewLife.Cube/Content/jweui/images/icon_nav_new.png and /dev/null differ
diff --git a/NewLife.Cube/Content/jweui/images/icon_nav_noti.png b/NewLife.Cube/Content/jweui/images/icon_nav_noti.png
deleted file mode 100644
index 356e041572..0000000000
Binary files a/NewLife.Cube/Content/jweui/images/icon_nav_noti.png and /dev/null differ
diff --git a/NewLife.Cube/Content/jweui/images/icon_nav_panel.png b/NewLife.Cube/Content/jweui/images/icon_nav_panel.png
deleted file mode 100644
index 15dc93714f..0000000000
Binary files a/NewLife.Cube/Content/jweui/images/icon_nav_panel.png and /dev/null differ
diff --git a/NewLife.Cube/Content/jweui/images/icon_nav_photo.png b/NewLife.Cube/Content/jweui/images/icon_nav_photo.png
deleted file mode 100644
index 6fe2dbb2a1..0000000000
Binary files a/NewLife.Cube/Content/jweui/images/icon_nav_photo.png and /dev/null differ
diff --git a/NewLife.Cube/Content/jweui/images/icon_nav_picker.png b/NewLife.Cube/Content/jweui/images/icon_nav_picker.png
deleted file mode 100644
index 0ea320c6ea..0000000000
Binary files a/NewLife.Cube/Content/jweui/images/icon_nav_picker.png and /dev/null differ
diff --git a/NewLife.Cube/Content/jweui/images/icon_nav_progress.png b/NewLife.Cube/Content/jweui/images/icon_nav_progress.png
deleted file mode 100644
index 53eb3d703b..0000000000
Binary files a/NewLife.Cube/Content/jweui/images/icon_nav_progress.png and /dev/null differ
diff --git a/NewLife.Cube/Content/jweui/images/icon_nav_ptr.png b/NewLife.Cube/Content/jweui/images/icon_nav_ptr.png
deleted file mode 100644
index 1db5db5963..0000000000
Binary files a/NewLife.Cube/Content/jweui/images/icon_nav_ptr.png and /dev/null differ
diff --git a/NewLife.Cube/Content/jweui/images/icon_nav_search_bar.png b/NewLife.Cube/Content/jweui/images/icon_nav_search_bar.png
deleted file mode 100644
index 50b8a4ac7a..0000000000
Binary files a/NewLife.Cube/Content/jweui/images/icon_nav_search_bar.png and /dev/null differ
diff --git a/NewLife.Cube/Content/jweui/images/icon_nav_select.png b/NewLife.Cube/Content/jweui/images/icon_nav_select.png
deleted file mode 100644
index 2b329d9079..0000000000
Binary files a/NewLife.Cube/Content/jweui/images/icon_nav_select.png and /dev/null differ
diff --git a/NewLife.Cube/Content/jweui/images/icon_nav_swiper.png b/NewLife.Cube/Content/jweui/images/icon_nav_swiper.png
deleted file mode 100644
index 2c4daf9a25..0000000000
Binary files a/NewLife.Cube/Content/jweui/images/icon_nav_swiper.png and /dev/null differ
diff --git a/NewLife.Cube/Content/jweui/images/icon_nav_tab.png b/NewLife.Cube/Content/jweui/images/icon_nav_tab.png
deleted file mode 100644
index 66258b13d8..0000000000
Binary files a/NewLife.Cube/Content/jweui/images/icon_nav_tab.png and /dev/null differ
diff --git a/NewLife.Cube/Content/jweui/images/icon_nav_toast.png b/NewLife.Cube/Content/jweui/images/icon_nav_toast.png
deleted file mode 100644
index ed631598e3..0000000000
Binary files a/NewLife.Cube/Content/jweui/images/icon_nav_toast.png and /dev/null differ
diff --git a/NewLife.Cube/Content/jweui/images/icon_nav_up.png b/NewLife.Cube/Content/jweui/images/icon_nav_up.png
deleted file mode 100644
index a942c6162e..0000000000
Binary files a/NewLife.Cube/Content/jweui/images/icon_nav_up.png and /dev/null differ
diff --git a/NewLife.Cube/Content/jweui/images/pic_160.png b/NewLife.Cube/Content/jweui/images/pic_160.png
deleted file mode 100644
index ba941704c7..0000000000
Binary files a/NewLife.Cube/Content/jweui/images/pic_160.png and /dev/null differ
diff --git a/NewLife.Cube/Content/jweui/images/pic_article.png b/NewLife.Cube/Content/jweui/images/pic_article.png
deleted file mode 100644
index c240812c28..0000000000
Binary files a/NewLife.Cube/Content/jweui/images/pic_article.png and /dev/null differ
diff --git a/NewLife.Cube/Content/jweui/images/present.png b/NewLife.Cube/Content/jweui/images/present.png
deleted file mode 100644
index 1d1b925f2c..0000000000
Binary files a/NewLife.Cube/Content/jweui/images/present.png and /dev/null differ
diff --git a/NewLife.Cube/Content/jweui/images/swiper-1.jpg b/NewLife.Cube/Content/jweui/images/swiper-1.jpg
deleted file mode 100644
index e2c6efc943..0000000000
Binary files a/NewLife.Cube/Content/jweui/images/swiper-1.jpg and /dev/null differ
diff --git a/NewLife.Cube/Content/jweui/images/swiper-2.jpg b/NewLife.Cube/Content/jweui/images/swiper-2.jpg
deleted file mode 100644
index 24c7440421..0000000000
Binary files a/NewLife.Cube/Content/jweui/images/swiper-2.jpg and /dev/null differ
diff --git a/NewLife.Cube/Content/jweui/images/swiper-3.jpg b/NewLife.Cube/Content/jweui/images/swiper-3.jpg
deleted file mode 100644
index ba97490eda..0000000000
Binary files a/NewLife.Cube/Content/jweui/images/swiper-3.jpg and /dev/null differ
diff --git a/NewLife.Cube/Content/jweui/images/swiper-4.jpg b/NewLife.Cube/Content/jweui/images/swiper-4.jpg
deleted file mode 100644
index 0b7f84fc78..0000000000
Binary files a/NewLife.Cube/Content/jweui/images/swiper-4.jpg and /dev/null differ
diff --git a/NewLife.Cube/Content/jweui/images/vcode.jpg b/NewLife.Cube/Content/jweui/images/vcode.jpg
deleted file mode 100644
index de54b38a31..0000000000
Binary files a/NewLife.Cube/Content/jweui/images/vcode.jpg and /dev/null differ
diff --git a/NewLife.Cube/Content/jweui/js/city-picker.js b/NewLife.Cube/Content/jweui/js/city-picker.js
deleted file mode 100644
index 129755d20b..0000000000
--- a/NewLife.Cube/Content/jweui/js/city-picker.js
+++ /dev/null
@@ -1,16713 +0,0 @@
-// jshint ignore: start
-+function($){
-
-$.rawCitiesData = [
-  {
-    "name":"北京",
-    "code":"110000",
-    "sub": [
-      {
-        "name": "北京市",
-        "code": "110000",
-        "sub":[
-            {
-              "name":"东城区",
-              "code":"110101"
-            },
-            {
-              "name":"西城区",
-              "code":"110102"
-            },
-            {
-              "name":"朝阳区",
-              "code":"110105"
-            },
-            {
-              "name":"丰台区",
-              "code":"110106"
-            },
-            {
-              "name":"石景山区",
-              "code":"110107"
-            },
-            {
-              "name":"海淀区",
-              "code":"110108"
-            },
-            {
-              "name":"门头沟区",
-              "code":"110109"
-            },
-            {
-              "name":"房山区",
-              "code":"110111"
-            },
-            {
-              "name":"通州区",
-              "code":"110112"
-            },
-            {
-              "name":"顺义区",
-              "code":"110113"
-            },
-            {
-              "name":"昌平区",
-              "code":"110114"
-            },
-            {
-              "name":"大兴区",
-              "code":"110115"
-            },
-            {
-              "name":"怀柔区",
-              "code":"110116"
-            },
-            {
-              "name":"平谷区",
-              "code":"110117"
-            },
-            {
-              "name":"密云县",
-              "code":"110228"
-            },
-            {
-              "name":"延庆县",
-              "code":"110229"
-            }
-        ]
-      }
-    ]
-  },
-  {
-    "name":"天津",
-    "code":"120000",
-    "sub": [
-      {
-        "name": "天津市",
-        "code": "120000",
-        "sub":[
-            {
-              "name":"和平区",
-              "code":"120101"
-            },
-            {
-              "name":"河东区",
-              "code":"120102"
-            },
-            {
-              "name":"河西区",
-              "code":"120103"
-            },
-            {
-              "name":"南开区",
-              "code":"120104"
-            },
-            {
-              "name":"河北区",
-              "code":"120105"
-            },
-            {
-              "name":"红桥区",
-              "code":"120106"
-            },
-            {
-              "name":"东丽区",
-              "code":"120110"
-            },
-            {
-              "name":"西青区",
-              "code":"120111"
-            },
-            {
-              "name":"津南区",
-              "code":"120112"
-            },
-            {
-              "name":"北辰区",
-              "code":"120113"
-            },
-            {
-              "name":"武清区",
-              "code":"120114"
-            },
-            {
-              "name":"宝坻区",
-              "code":"120115"
-            },
-            {
-              "name":"滨海新区",
-              "code":"120116"
-            },
-            {
-              "name":"宁河县",
-              "code":"120221"
-            },
-            {
-              "name":"静海县",
-              "code":"120223"
-            },
-            {
-              "name":"蓟县",
-              "code":"120225"
-            }
-        ]
-      }
-    ]
-  },
-  {
-    "name":"河北省",
-    "code":"130000",
-    "sub":[
-      {
-        "name":"石家庄市",
-        "code":"130100",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"130101"
-          },
-          {
-            "name":"长安区",
-            "code":"130102"
-          },
-          {
-            "name":"桥西区",
-            "code":"130104"
-          },
-          {
-            "name":"新华区",
-            "code":"130105"
-          },
-          {
-            "name":"井陉矿区",
-            "code":"130107"
-          },
-          {
-            "name":"裕华区",
-            "code":"130108"
-          },
-          {
-            "name":"藁城区",
-            "code":"130109"
-          },
-          {
-            "name":"鹿泉区",
-            "code":"130110"
-          },
-          {
-            "name":"栾城区",
-            "code":"130111"
-          },
-          {
-            "name":"井陉县",
-            "code":"130121"
-          },
-          {
-            "name":"正定县",
-            "code":"130123"
-          },
-          {
-            "name":"行唐县",
-            "code":"130125"
-          },
-          {
-            "name":"灵寿县",
-            "code":"130126"
-          },
-          {
-            "name":"高邑县",
-            "code":"130127"
-          },
-          {
-            "name":"深泽县",
-            "code":"130128"
-          },
-          {
-            "name":"赞皇县",
-            "code":"130129"
-          },
-          {
-            "name":"无极县",
-            "code":"130130"
-          },
-          {
-            "name":"平山县",
-            "code":"130131"
-          },
-          {
-            "name":"元氏县",
-            "code":"130132"
-          },
-          {
-            "name":"赵县",
-            "code":"130133"
-          },
-          {
-            "name":"辛集市",
-            "code":"130181"
-          },
-          {
-            "name":"晋州市",
-            "code":"130183"
-          },
-          {
-            "name":"新乐市",
-            "code":"130184"
-          }
-        ]
-      },
-      {
-        "name":"唐山市",
-        "code":"130200",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"130201"
-          },
-          {
-            "name":"路南区",
-            "code":"130202"
-          },
-          {
-            "name":"路北区",
-            "code":"130203"
-          },
-          {
-            "name":"古冶区",
-            "code":"130204"
-          },
-          {
-            "name":"开平区",
-            "code":"130205"
-          },
-          {
-            "name":"丰南区",
-            "code":"130207"
-          },
-          {
-            "name":"丰润区",
-            "code":"130208"
-          },
-          {
-            "name":"曹妃甸区",
-            "code":"130209"
-          },
-          {
-            "name":"滦县",
-            "code":"130223"
-          },
-          {
-            "name":"滦南县",
-            "code":"130224"
-          },
-          {
-            "name":"乐亭县",
-            "code":"130225"
-          },
-          {
-            "name":"迁西县",
-            "code":"130227"
-          },
-          {
-            "name":"玉田县",
-            "code":"130229"
-          },
-          {
-            "name":"遵化市",
-            "code":"130281"
-          },
-          {
-            "name":"迁安市",
-            "code":"130283"
-          }
-        ]
-      },
-      {
-        "name":"秦皇岛市",
-        "code":"130300",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"130301"
-          },
-          {
-            "name":"海港区",
-            "code":"130302"
-          },
-          {
-            "name":"山海关区",
-            "code":"130303"
-          },
-          {
-            "name":"北戴河区",
-            "code":"130304"
-          },
-          {
-            "name":"青龙满族自治县",
-            "code":"130321"
-          },
-          {
-            "name":"昌黎县",
-            "code":"130322"
-          },
-          {
-            "name":"抚宁县",
-            "code":"130323"
-          },
-          {
-            "name":"卢龙县",
-            "code":"130324"
-          }
-        ]
-      },
-      {
-        "name":"邯郸市",
-        "code":"130400",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"130401"
-          },
-          {
-            "name":"邯山区",
-            "code":"130402"
-          },
-          {
-            "name":"丛台区",
-            "code":"130403"
-          },
-          {
-            "name":"复兴区",
-            "code":"130404"
-          },
-          {
-            "name":"峰峰矿区",
-            "code":"130406"
-          },
-          {
-            "name":"邯郸县",
-            "code":"130421"
-          },
-          {
-            "name":"临漳县",
-            "code":"130423"
-          },
-          {
-            "name":"成安县",
-            "code":"130424"
-          },
-          {
-            "name":"大名县",
-            "code":"130425"
-          },
-          {
-            "name":"涉县",
-            "code":"130426"
-          },
-          {
-            "name":"磁县",
-            "code":"130427"
-          },
-          {
-            "name":"肥乡县",
-            "code":"130428"
-          },
-          {
-            "name":"永年县",
-            "code":"130429"
-          },
-          {
-            "name":"邱县",
-            "code":"130430"
-          },
-          {
-            "name":"鸡泽县",
-            "code":"130431"
-          },
-          {
-            "name":"广平县",
-            "code":"130432"
-          },
-          {
-            "name":"馆陶县",
-            "code":"130433"
-          },
-          {
-            "name":"魏县",
-            "code":"130434"
-          },
-          {
-            "name":"曲周县",
-            "code":"130435"
-          },
-          {
-            "name":"武安市",
-            "code":"130481"
-          }
-        ]
-      },
-      {
-        "name":"邢台市",
-        "code":"130500",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"130501"
-          },
-          {
-            "name":"桥东区",
-            "code":"130502"
-          },
-          {
-            "name":"桥西区",
-            "code":"130503"
-          },
-          {
-            "name":"邢台县",
-            "code":"130521"
-          },
-          {
-            "name":"临城县",
-            "code":"130522"
-          },
-          {
-            "name":"内丘县",
-            "code":"130523"
-          },
-          {
-            "name":"柏乡县",
-            "code":"130524"
-          },
-          {
-            "name":"隆尧县",
-            "code":"130525"
-          },
-          {
-            "name":"任县",
-            "code":"130526"
-          },
-          {
-            "name":"南和县",
-            "code":"130527"
-          },
-          {
-            "name":"宁晋县",
-            "code":"130528"
-          },
-          {
-            "name":"巨鹿县",
-            "code":"130529"
-          },
-          {
-            "name":"新河县",
-            "code":"130530"
-          },
-          {
-            "name":"广宗县",
-            "code":"130531"
-          },
-          {
-            "name":"平乡县",
-            "code":"130532"
-          },
-          {
-            "name":"威县",
-            "code":"130533"
-          },
-          {
-            "name":"清河县",
-            "code":"130534"
-          },
-          {
-            "name":"临西县",
-            "code":"130535"
-          },
-          {
-            "name":"南宫市",
-            "code":"130581"
-          },
-          {
-            "name":"沙河市",
-            "code":"130582"
-          }
-        ]
-      },
-      {
-        "name":"保定市",
-        "code":"130600",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"130601"
-          },
-          {
-            "name":"新市区",
-            "code":"130602"
-          },
-          {
-            "name":"北市区",
-            "code":"130603"
-          },
-          {
-            "name":"南市区",
-            "code":"130604"
-          },
-          {
-            "name":"满城县",
-            "code":"130621"
-          },
-          {
-            "name":"清苑县",
-            "code":"130622"
-          },
-          {
-            "name":"涞水县",
-            "code":"130623"
-          },
-          {
-            "name":"阜平县",
-            "code":"130624"
-          },
-          {
-            "name":"徐水县",
-            "code":"130625"
-          },
-          {
-            "name":"定兴县",
-            "code":"130626"
-          },
-          {
-            "name":"唐县",
-            "code":"130627"
-          },
-          {
-            "name":"高阳县",
-            "code":"130628"
-          },
-          {
-            "name":"容城县",
-            "code":"130629"
-          },
-          {
-            "name":"涞源县",
-            "code":"130630"
-          },
-          {
-            "name":"望都县",
-            "code":"130631"
-          },
-          {
-            "name":"安新县",
-            "code":"130632"
-          },
-          {
-            "name":"易县",
-            "code":"130633"
-          },
-          {
-            "name":"曲阳县",
-            "code":"130634"
-          },
-          {
-            "name":"蠡县",
-            "code":"130635"
-          },
-          {
-            "name":"顺平县",
-            "code":"130636"
-          },
-          {
-            "name":"博野县",
-            "code":"130637"
-          },
-          {
-            "name":"雄县",
-            "code":"130638"
-          },
-          {
-            "name":"涿州市",
-            "code":"130681"
-          },
-          {
-            "name":"定州市",
-            "code":"130682"
-          },
-          {
-            "name":"安国市",
-            "code":"130683"
-          },
-          {
-            "name":"高碑店市",
-            "code":"130684"
-          }
-        ]
-      },
-      {
-        "name":"张家口市",
-        "code":"130700",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"130701"
-          },
-          {
-            "name":"桥东区",
-            "code":"130702"
-          },
-          {
-            "name":"桥西区",
-            "code":"130703"
-          },
-          {
-            "name":"宣化区",
-            "code":"130705"
-          },
-          {
-            "name":"下花园区",
-            "code":"130706"
-          },
-          {
-            "name":"宣化县",
-            "code":"130721"
-          },
-          {
-            "name":"张北县",
-            "code":"130722"
-          },
-          {
-            "name":"康保县",
-            "code":"130723"
-          },
-          {
-            "name":"沽源县",
-            "code":"130724"
-          },
-          {
-            "name":"尚义县",
-            "code":"130725"
-          },
-          {
-            "name":"蔚县",
-            "code":"130726"
-          },
-          {
-            "name":"阳原县",
-            "code":"130727"
-          },
-          {
-            "name":"怀安县",
-            "code":"130728"
-          },
-          {
-            "name":"万全县",
-            "code":"130729"
-          },
-          {
-            "name":"怀来县",
-            "code":"130730"
-          },
-          {
-            "name":"涿鹿县",
-            "code":"130731"
-          },
-          {
-            "name":"赤城县",
-            "code":"130732"
-          },
-          {
-            "name":"崇礼县",
-            "code":"130733"
-          }
-        ]
-      },
-      {
-        "name":"承德市",
-        "code":"130800",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"130801"
-          },
-          {
-            "name":"双桥区",
-            "code":"130802"
-          },
-          {
-            "name":"双滦区",
-            "code":"130803"
-          },
-          {
-            "name":"鹰手营子矿区",
-            "code":"130804"
-          },
-          {
-            "name":"承德县",
-            "code":"130821"
-          },
-          {
-            "name":"兴隆县",
-            "code":"130822"
-          },
-          {
-            "name":"平泉县",
-            "code":"130823"
-          },
-          {
-            "name":"滦平县",
-            "code":"130824"
-          },
-          {
-            "name":"隆化县",
-            "code":"130825"
-          },
-          {
-            "name":"丰宁满族自治县",
-            "code":"130826"
-          },
-          {
-            "name":"宽城满族自治县",
-            "code":"130827"
-          },
-          {
-            "name":"围场满族蒙古族自治县",
-            "code":"130828"
-          }
-        ]
-      },
-      {
-        "name":"沧州市",
-        "code":"130900",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"130901"
-          },
-          {
-            "name":"新华区",
-            "code":"130902"
-          },
-          {
-            "name":"运河区",
-            "code":"130903"
-          },
-          {
-            "name":"沧县",
-            "code":"130921"
-          },
-          {
-            "name":"青县",
-            "code":"130922"
-          },
-          {
-            "name":"东光县",
-            "code":"130923"
-          },
-          {
-            "name":"海兴县",
-            "code":"130924"
-          },
-          {
-            "name":"盐山县",
-            "code":"130925"
-          },
-          {
-            "name":"肃宁县",
-            "code":"130926"
-          },
-          {
-            "name":"南皮县",
-            "code":"130927"
-          },
-          {
-            "name":"吴桥县",
-            "code":"130928"
-          },
-          {
-            "name":"献县",
-            "code":"130929"
-          },
-          {
-            "name":"孟村回族自治县",
-            "code":"130930"
-          },
-          {
-            "name":"泊头市",
-            "code":"130981"
-          },
-          {
-            "name":"任丘市",
-            "code":"130982"
-          },
-          {
-            "name":"黄骅市",
-            "code":"130983"
-          },
-          {
-            "name":"河间市",
-            "code":"130984"
-          }
-        ]
-      },
-      {
-        "name":"廊坊市",
-        "code":"131000",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"131001"
-          },
-          {
-            "name":"安次区",
-            "code":"131002"
-          },
-          {
-            "name":"广阳区",
-            "code":"131003"
-          },
-          {
-            "name":"固安县",
-            "code":"131022"
-          },
-          {
-            "name":"永清县",
-            "code":"131023"
-          },
-          {
-            "name":"香河县",
-            "code":"131024"
-          },
-          {
-            "name":"大城县",
-            "code":"131025"
-          },
-          {
-            "name":"文安县",
-            "code":"131026"
-          },
-          {
-            "name":"大厂回族自治县",
-            "code":"131028"
-          },
-          {
-            "name":"霸州市",
-            "code":"131081"
-          },
-          {
-            "name":"三河市",
-            "code":"131082"
-          }
-        ]
-      },
-      {
-        "name":"衡水市",
-        "code":"131100",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"131101"
-          },
-          {
-            "name":"桃城区",
-            "code":"131102"
-          },
-          {
-            "name":"枣强县",
-            "code":"131121"
-          },
-          {
-            "name":"武邑县",
-            "code":"131122"
-          },
-          {
-            "name":"武强县",
-            "code":"131123"
-          },
-          {
-            "name":"饶阳县",
-            "code":"131124"
-          },
-          {
-            "name":"安平县",
-            "code":"131125"
-          },
-          {
-            "name":"故城县",
-            "code":"131126"
-          },
-          {
-            "name":"景县",
-            "code":"131127"
-          },
-          {
-            "name":"阜城县",
-            "code":"131128"
-          },
-          {
-            "name":"冀州市",
-            "code":"131181"
-          },
-          {
-            "name":"深州市",
-            "code":"131182"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name":"山西省",
-    "code":"140000",
-    "sub":[
-      {
-        "name":"太原市",
-        "code":"140100",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"140101"
-          },
-          {
-            "name":"小店区",
-            "code":"140105"
-          },
-          {
-            "name":"迎泽区",
-            "code":"140106"
-          },
-          {
-            "name":"杏花岭区",
-            "code":"140107"
-          },
-          {
-            "name":"尖草坪区",
-            "code":"140108"
-          },
-          {
-            "name":"万柏林区",
-            "code":"140109"
-          },
-          {
-            "name":"晋源区",
-            "code":"140110"
-          },
-          {
-            "name":"清徐县",
-            "code":"140121"
-          },
-          {
-            "name":"阳曲县",
-            "code":"140122"
-          },
-          {
-            "name":"娄烦县",
-            "code":"140123"
-          },
-          {
-            "name":"古交市",
-            "code":"140181"
-          }
-        ]
-      },
-      {
-        "name":"大同市",
-        "code":"140200",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"140201"
-          },
-          {
-            "name":"城区",
-            "code":"140202"
-          },
-          {
-            "name":"矿区",
-            "code":"140203"
-          },
-          {
-            "name":"南郊区",
-            "code":"140211"
-          },
-          {
-            "name":"新荣区",
-            "code":"140212"
-          },
-          {
-            "name":"阳高县",
-            "code":"140221"
-          },
-          {
-            "name":"天镇县",
-            "code":"140222"
-          },
-          {
-            "name":"广灵县",
-            "code":"140223"
-          },
-          {
-            "name":"灵丘县",
-            "code":"140224"
-          },
-          {
-            "name":"浑源县",
-            "code":"140225"
-          },
-          {
-            "name":"左云县",
-            "code":"140226"
-          },
-          {
-            "name":"大同县",
-            "code":"140227"
-          }
-        ]
-      },
-      {
-        "name":"阳泉市",
-        "code":"140300",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"140301"
-          },
-          {
-            "name":"城区",
-            "code":"140302"
-          },
-          {
-            "name":"矿区",
-            "code":"140303"
-          },
-          {
-            "name":"郊区",
-            "code":"140311"
-          },
-          {
-            "name":"平定县",
-            "code":"140321"
-          },
-          {
-            "name":"盂县",
-            "code":"140322"
-          }
-        ]
-      },
-      {
-        "name":"长治市",
-        "code":"140400",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"140401"
-          },
-          {
-            "name":"城区",
-            "code":"140402"
-          },
-          {
-            "name":"郊区",
-            "code":"140411"
-          },
-          {
-            "name":"长治县",
-            "code":"140421"
-          },
-          {
-            "name":"襄垣县",
-            "code":"140423"
-          },
-          {
-            "name":"屯留县",
-            "code":"140424"
-          },
-          {
-            "name":"平顺县",
-            "code":"140425"
-          },
-          {
-            "name":"黎城县",
-            "code":"140426"
-          },
-          {
-            "name":"壶关县",
-            "code":"140427"
-          },
-          {
-            "name":"长子县",
-            "code":"140428"
-          },
-          {
-            "name":"武乡县",
-            "code":"140429"
-          },
-          {
-            "name":"沁县",
-            "code":"140430"
-          },
-          {
-            "name":"沁源县",
-            "code":"140431"
-          },
-          {
-            "name":"潞城市",
-            "code":"140481"
-          }
-        ]
-      },
-      {
-        "name":"晋城市",
-        "code":"140500",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"140501"
-          },
-          {
-            "name":"城区",
-            "code":"140502"
-          },
-          {
-            "name":"沁水县",
-            "code":"140521"
-          },
-          {
-            "name":"阳城县",
-            "code":"140522"
-          },
-          {
-            "name":"陵川县",
-            "code":"140524"
-          },
-          {
-            "name":"泽州县",
-            "code":"140525"
-          },
-          {
-            "name":"高平市",
-            "code":"140581"
-          }
-        ]
-      },
-      {
-        "name":"朔州市",
-        "code":"140600",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"140601"
-          },
-          {
-            "name":"朔城区",
-            "code":"140602"
-          },
-          {
-            "name":"平鲁区",
-            "code":"140603"
-          },
-          {
-            "name":"山阴县",
-            "code":"140621"
-          },
-          {
-            "name":"应县",
-            "code":"140622"
-          },
-          {
-            "name":"右玉县",
-            "code":"140623"
-          },
-          {
-            "name":"怀仁县",
-            "code":"140624"
-          }
-        ]
-      },
-      {
-        "name":"晋中市",
-        "code":"140700",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"140701"
-          },
-          {
-            "name":"榆次区",
-            "code":"140702"
-          },
-          {
-            "name":"榆社县",
-            "code":"140721"
-          },
-          {
-            "name":"左权县",
-            "code":"140722"
-          },
-          {
-            "name":"和顺县",
-            "code":"140723"
-          },
-          {
-            "name":"昔阳县",
-            "code":"140724"
-          },
-          {
-            "name":"寿阳县",
-            "code":"140725"
-          },
-          {
-            "name":"太谷县",
-            "code":"140726"
-          },
-          {
-            "name":"祁县",
-            "code":"140727"
-          },
-          {
-            "name":"平遥县",
-            "code":"140728"
-          },
-          {
-            "name":"灵石县",
-            "code":"140729"
-          },
-          {
-            "name":"介休市",
-            "code":"140781"
-          }
-        ]
-      },
-      {
-        "name":"运城市",
-        "code":"140800",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"140801"
-          },
-          {
-            "name":"盐湖区",
-            "code":"140802"
-          },
-          {
-            "name":"临猗县",
-            "code":"140821"
-          },
-          {
-            "name":"万荣县",
-            "code":"140822"
-          },
-          {
-            "name":"闻喜县",
-            "code":"140823"
-          },
-          {
-            "name":"稷山县",
-            "code":"140824"
-          },
-          {
-            "name":"新绛县",
-            "code":"140825"
-          },
-          {
-            "name":"绛县",
-            "code":"140826"
-          },
-          {
-            "name":"垣曲县",
-            "code":"140827"
-          },
-          {
-            "name":"夏县",
-            "code":"140828"
-          },
-          {
-            "name":"平陆县",
-            "code":"140829"
-          },
-          {
-            "name":"芮城县",
-            "code":"140830"
-          },
-          {
-            "name":"永济市",
-            "code":"140881"
-          },
-          {
-            "name":"河津市",
-            "code":"140882"
-          }
-        ]
-      },
-      {
-        "name":"忻州市",
-        "code":"140900",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"140901"
-          },
-          {
-            "name":"忻府区",
-            "code":"140902"
-          },
-          {
-            "name":"定襄县",
-            "code":"140921"
-          },
-          {
-            "name":"五台县",
-            "code":"140922"
-          },
-          {
-            "name":"代县",
-            "code":"140923"
-          },
-          {
-            "name":"繁峙县",
-            "code":"140924"
-          },
-          {
-            "name":"宁武县",
-            "code":"140925"
-          },
-          {
-            "name":"静乐县",
-            "code":"140926"
-          },
-          {
-            "name":"神池县",
-            "code":"140927"
-          },
-          {
-            "name":"五寨县",
-            "code":"140928"
-          },
-          {
-            "name":"岢岚县",
-            "code":"140929"
-          },
-          {
-            "name":"河曲县",
-            "code":"140930"
-          },
-          {
-            "name":"保德县",
-            "code":"140931"
-          },
-          {
-            "name":"偏关县",
-            "code":"140932"
-          },
-          {
-            "name":"原平市",
-            "code":"140981"
-          }
-        ]
-      },
-      {
-        "name":"临汾市",
-        "code":"141000",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"141001"
-          },
-          {
-            "name":"尧都区",
-            "code":"141002"
-          },
-          {
-            "name":"曲沃县",
-            "code":"141021"
-          },
-          {
-            "name":"翼城县",
-            "code":"141022"
-          },
-          {
-            "name":"襄汾县",
-            "code":"141023"
-          },
-          {
-            "name":"洪洞县",
-            "code":"141024"
-          },
-          {
-            "name":"古县",
-            "code":"141025"
-          },
-          {
-            "name":"安泽县",
-            "code":"141026"
-          },
-          {
-            "name":"浮山县",
-            "code":"141027"
-          },
-          {
-            "name":"吉县",
-            "code":"141028"
-          },
-          {
-            "name":"乡宁县",
-            "code":"141029"
-          },
-          {
-            "name":"大宁县",
-            "code":"141030"
-          },
-          {
-            "name":"隰县",
-            "code":"141031"
-          },
-          {
-            "name":"永和县",
-            "code":"141032"
-          },
-          {
-            "name":"蒲县",
-            "code":"141033"
-          },
-          {
-            "name":"汾西县",
-            "code":"141034"
-          },
-          {
-            "name":"侯马市",
-            "code":"141081"
-          },
-          {
-            "name":"霍州市",
-            "code":"141082"
-          }
-        ]
-      },
-      {
-        "name":"吕梁市",
-        "code":"141100",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"141101"
-          },
-          {
-            "name":"离石区",
-            "code":"141102"
-          },
-          {
-            "name":"文水县",
-            "code":"141121"
-          },
-          {
-            "name":"交城县",
-            "code":"141122"
-          },
-          {
-            "name":"兴县",
-            "code":"141123"
-          },
-          {
-            "name":"临县",
-            "code":"141124"
-          },
-          {
-            "name":"柳林县",
-            "code":"141125"
-          },
-          {
-            "name":"石楼县",
-            "code":"141126"
-          },
-          {
-            "name":"岚县",
-            "code":"141127"
-          },
-          {
-            "name":"方山县",
-            "code":"141128"
-          },
-          {
-            "name":"中阳县",
-            "code":"141129"
-          },
-          {
-            "name":"交口县",
-            "code":"141130"
-          },
-          {
-            "name":"孝义市",
-            "code":"141181"
-          },
-          {
-            "name":"汾阳市",
-            "code":"141182"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name":"内蒙古自治区",
-    "code":"150000",
-    "sub":[
-      {
-        "name":"呼和浩特市",
-        "code":"150100",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"150101"
-          },
-          {
-            "name":"新城区",
-            "code":"150102"
-          },
-          {
-            "name":"回民区",
-            "code":"150103"
-          },
-          {
-            "name":"玉泉区",
-            "code":"150104"
-          },
-          {
-            "name":"赛罕区",
-            "code":"150105"
-          },
-          {
-            "name":"土默特左旗",
-            "code":"150121"
-          },
-          {
-            "name":"托克托县",
-            "code":"150122"
-          },
-          {
-            "name":"和林格尔县",
-            "code":"150123"
-          },
-          {
-            "name":"清水河县",
-            "code":"150124"
-          },
-          {
-            "name":"武川县",
-            "code":"150125"
-          }
-        ]
-      },
-      {
-        "name":"包头市",
-        "code":"150200",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"150201"
-          },
-          {
-            "name":"东河区",
-            "code":"150202"
-          },
-          {
-            "name":"昆都仑区",
-            "code":"150203"
-          },
-          {
-            "name":"青山区",
-            "code":"150204"
-          },
-          {
-            "name":"石拐区",
-            "code":"150205"
-          },
-          {
-            "name":"白云鄂博矿区",
-            "code":"150206"
-          },
-          {
-            "name":"九原区",
-            "code":"150207"
-          },
-          {
-            "name":"土默特右旗",
-            "code":"150221"
-          },
-          {
-            "name":"固阳县",
-            "code":"150222"
-          },
-          {
-            "name":"达尔罕茂明安联合旗",
-            "code":"150223"
-          }
-        ]
-      },
-      {
-        "name":"乌海市",
-        "code":"150300",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"150301"
-          },
-          {
-            "name":"海勃湾区",
-            "code":"150302"
-          },
-          {
-            "name":"海南区",
-            "code":"150303"
-          },
-          {
-            "name":"乌达区",
-            "code":"150304"
-          }
-        ]
-      },
-      {
-        "name":"赤峰市",
-        "code":"150400",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"150401"
-          },
-          {
-            "name":"红山区",
-            "code":"150402"
-          },
-          {
-            "name":"元宝山区",
-            "code":"150403"
-          },
-          {
-            "name":"松山区",
-            "code":"150404"
-          },
-          {
-            "name":"阿鲁科尔沁旗",
-            "code":"150421"
-          },
-          {
-            "name":"巴林左旗",
-            "code":"150422"
-          },
-          {
-            "name":"巴林右旗",
-            "code":"150423"
-          },
-          {
-            "name":"林西县",
-            "code":"150424"
-          },
-          {
-            "name":"克什克腾旗",
-            "code":"150425"
-          },
-          {
-            "name":"翁牛特旗",
-            "code":"150426"
-          },
-          {
-            "name":"喀喇沁旗",
-            "code":"150428"
-          },
-          {
-            "name":"宁城县",
-            "code":"150429"
-          },
-          {
-            "name":"敖汉旗",
-            "code":"150430"
-          }
-        ]
-      },
-      {
-        "name":"通辽市",
-        "code":"150500",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"150501"
-          },
-          {
-            "name":"科尔沁区",
-            "code":"150502"
-          },
-          {
-            "name":"科尔沁左翼中旗",
-            "code":"150521"
-          },
-          {
-            "name":"科尔沁左翼后旗",
-            "code":"150522"
-          },
-          {
-            "name":"开鲁县",
-            "code":"150523"
-          },
-          {
-            "name":"库伦旗",
-            "code":"150524"
-          },
-          {
-            "name":"奈曼旗",
-            "code":"150525"
-          },
-          {
-            "name":"扎鲁特旗",
-            "code":"150526"
-          },
-          {
-            "name":"霍林郭勒市",
-            "code":"150581"
-          }
-        ]
-      },
-      {
-        "name":"鄂尔多斯市",
-        "code":"150600",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"150601"
-          },
-          {
-            "name":"东胜区",
-            "code":"150602"
-          },
-          {
-            "name":"达拉特旗",
-            "code":"150621"
-          },
-          {
-            "name":"准格尔旗",
-            "code":"150622"
-          },
-          {
-            "name":"鄂托克前旗",
-            "code":"150623"
-          },
-          {
-            "name":"鄂托克旗",
-            "code":"150624"
-          },
-          {
-            "name":"杭锦旗",
-            "code":"150625"
-          },
-          {
-            "name":"乌审旗",
-            "code":"150626"
-          },
-          {
-            "name":"伊金霍洛旗",
-            "code":"150627"
-          }
-        ]
-      },
-      {
-        "name":"呼伦贝尔市",
-        "code":"150700",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"150701"
-          },
-          {
-            "name":"海拉尔区",
-            "code":"150702"
-          },
-          {
-            "name":"扎赉诺尔区",
-            "code":"150703"
-          },
-          {
-            "name":"阿荣旗",
-            "code":"150721"
-          },
-          {
-            "name":"莫力达瓦达斡尔族自治旗",
-            "code":"150722"
-          },
-          {
-            "name":"鄂伦春自治旗",
-            "code":"150723"
-          },
-          {
-            "name":"鄂温克族自治旗",
-            "code":"150724"
-          },
-          {
-            "name":"陈巴尔虎旗",
-            "code":"150725"
-          },
-          {
-            "name":"新巴尔虎左旗",
-            "code":"150726"
-          },
-          {
-            "name":"新巴尔虎右旗",
-            "code":"150727"
-          },
-          {
-            "name":"满洲里市",
-            "code":"150781"
-          },
-          {
-            "name":"牙克石市",
-            "code":"150782"
-          },
-          {
-            "name":"扎兰屯市",
-            "code":"150783"
-          },
-          {
-            "name":"额尔古纳市",
-            "code":"150784"
-          },
-          {
-            "name":"根河市",
-            "code":"150785"
-          }
-        ]
-      },
-      {
-        "name":"巴彦淖尔市",
-        "code":"150800",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"150801"
-          },
-          {
-            "name":"临河区",
-            "code":"150802"
-          },
-          {
-            "name":"五原县",
-            "code":"150821"
-          },
-          {
-            "name":"磴口县",
-            "code":"150822"
-          },
-          {
-            "name":"乌拉特前旗",
-            "code":"150823"
-          },
-          {
-            "name":"乌拉特中旗",
-            "code":"150824"
-          },
-          {
-            "name":"乌拉特后旗",
-            "code":"150825"
-          },
-          {
-            "name":"杭锦后旗",
-            "code":"150826"
-          }
-        ]
-      },
-      {
-        "name":"乌兰察布市",
-        "code":"150900",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"150901"
-          },
-          {
-            "name":"集宁区",
-            "code":"150902"
-          },
-          {
-            "name":"卓资县",
-            "code":"150921"
-          },
-          {
-            "name":"化德县",
-            "code":"150922"
-          },
-          {
-            "name":"商都县",
-            "code":"150923"
-          },
-          {
-            "name":"兴和县",
-            "code":"150924"
-          },
-          {
-            "name":"凉城县",
-            "code":"150925"
-          },
-          {
-            "name":"察哈尔右翼前旗",
-            "code":"150926"
-          },
-          {
-            "name":"察哈尔右翼中旗",
-            "code":"150927"
-          },
-          {
-            "name":"察哈尔右翼后旗",
-            "code":"150928"
-          },
-          {
-            "name":"四子王旗",
-            "code":"150929"
-          },
-          {
-            "name":"丰镇市",
-            "code":"150981"
-          }
-        ]
-      },
-      {
-        "name":"兴安盟",
-        "code":"152200",
-        "sub":[
-          {
-            "name":"乌兰浩特市",
-            "code":"152201"
-          },
-          {
-            "name":"阿尔山市",
-            "code":"152202"
-          },
-          {
-            "name":"科尔沁右翼前旗",
-            "code":"152221"
-          },
-          {
-            "name":"科尔沁右翼中旗",
-            "code":"152222"
-          },
-          {
-            "name":"扎赉特旗",
-            "code":"152223"
-          },
-          {
-            "name":"突泉县",
-            "code":"152224"
-          }
-        ]
-      },
-      {
-        "name":"锡林郭勒盟",
-        "code":"152500",
-        "sub":[
-          {
-            "name":"二连浩特市",
-            "code":"152501"
-          },
-          {
-            "name":"锡林浩特市",
-            "code":"152502"
-          },
-          {
-            "name":"阿巴嘎旗",
-            "code":"152522"
-          },
-          {
-            "name":"苏尼特左旗",
-            "code":"152523"
-          },
-          {
-            "name":"苏尼特右旗",
-            "code":"152524"
-          },
-          {
-            "name":"东乌珠穆沁旗",
-            "code":"152525"
-          },
-          {
-            "name":"西乌珠穆沁旗",
-            "code":"152526"
-          },
-          {
-            "name":"太仆寺旗",
-            "code":"152527"
-          },
-          {
-            "name":"镶黄旗",
-            "code":"152528"
-          },
-          {
-            "name":"正镶白旗",
-            "code":"152529"
-          },
-          {
-            "name":"正蓝旗",
-            "code":"152530"
-          },
-          {
-            "name":"多伦县",
-            "code":"152531"
-          }
-        ]
-      },
-      {
-        "name":"阿拉善盟",
-        "code":"152900",
-        "sub":[
-          {
-            "name":"阿拉善左旗",
-            "code":"152921"
-          },
-          {
-            "name":"阿拉善右旗",
-            "code":"152922"
-          },
-          {
-            "name":"额济纳旗",
-            "code":"152923"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name":"辽宁省",
-    "code":"210000",
-    "sub":[
-      {
-        "name":"沈阳市",
-        "code":"210100",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"210101"
-          },
-          {
-            "name":"和平区",
-            "code":"210102"
-          },
-          {
-            "name":"沈河区",
-            "code":"210103"
-          },
-          {
-            "name":"大东区",
-            "code":"210104"
-          },
-          {
-            "name":"皇姑区",
-            "code":"210105"
-          },
-          {
-            "name":"铁西区",
-            "code":"210106"
-          },
-          {
-            "name":"苏家屯区",
-            "code":"210111"
-          },
-          {
-            "name":"浑南区",
-            "code":"210112"
-          },
-          {
-            "name":"沈北新区",
-            "code":"210113"
-          },
-          {
-            "name":"于洪区",
-            "code":"210114"
-          },
-          {
-            "name":"辽中县",
-            "code":"210122"
-          },
-          {
-            "name":"康平县",
-            "code":"210123"
-          },
-          {
-            "name":"法库县",
-            "code":"210124"
-          },
-          {
-            "name":"新民市",
-            "code":"210181"
-          }
-        ]
-      },
-      {
-        "name":"大连市",
-        "code":"210200",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"210201"
-          },
-          {
-            "name":"中山区",
-            "code":"210202"
-          },
-          {
-            "name":"西岗区",
-            "code":"210203"
-          },
-          {
-            "name":"沙河口区",
-            "code":"210204"
-          },
-          {
-            "name":"甘井子区",
-            "code":"210211"
-          },
-          {
-            "name":"旅顺口区",
-            "code":"210212"
-          },
-          {
-            "name":"金州区",
-            "code":"210213"
-          },
-          {
-            "name":"长海县",
-            "code":"210224"
-          },
-          {
-            "name":"瓦房店市",
-            "code":"210281"
-          },
-          {
-            "name":"普兰店市",
-            "code":"210282"
-          },
-          {
-            "name":"庄河市",
-            "code":"210283"
-          }
-        ]
-      },
-      {
-        "name":"鞍山市",
-        "code":"210300",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"210301"
-          },
-          {
-            "name":"铁东区",
-            "code":"210302"
-          },
-          {
-            "name":"铁西区",
-            "code":"210303"
-          },
-          {
-            "name":"立山区",
-            "code":"210304"
-          },
-          {
-            "name":"千山区",
-            "code":"210311"
-          },
-          {
-            "name":"台安县",
-            "code":"210321"
-          },
-          {
-            "name":"岫岩满族自治县",
-            "code":"210323"
-          },
-          {
-            "name":"海城市",
-            "code":"210381"
-          }
-        ]
-      },
-      {
-        "name":"抚顺市",
-        "code":"210400",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"210401"
-          },
-          {
-            "name":"新抚区",
-            "code":"210402"
-          },
-          {
-            "name":"东洲区",
-            "code":"210403"
-          },
-          {
-            "name":"望花区",
-            "code":"210404"
-          },
-          {
-            "name":"顺城区",
-            "code":"210411"
-          },
-          {
-            "name":"抚顺县",
-            "code":"210421"
-          },
-          {
-            "name":"新宾满族自治县",
-            "code":"210422"
-          },
-          {
-            "name":"清原满族自治县",
-            "code":"210423"
-          }
-        ]
-      },
-      {
-        "name":"本溪市",
-        "code":"210500",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"210501"
-          },
-          {
-            "name":"平山区",
-            "code":"210502"
-          },
-          {
-            "name":"溪湖区",
-            "code":"210503"
-          },
-          {
-            "name":"明山区",
-            "code":"210504"
-          },
-          {
-            "name":"南芬区",
-            "code":"210505"
-          },
-          {
-            "name":"本溪满族自治县",
-            "code":"210521"
-          },
-          {
-            "name":"桓仁满族自治县",
-            "code":"210522"
-          }
-        ]
-      },
-      {
-        "name":"丹东市",
-        "code":"210600",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"210601"
-          },
-          {
-            "name":"元宝区",
-            "code":"210602"
-          },
-          {
-            "name":"振兴区",
-            "code":"210603"
-          },
-          {
-            "name":"振安区",
-            "code":"210604"
-          },
-          {
-            "name":"宽甸满族自治县",
-            "code":"210624"
-          },
-          {
-            "name":"东港市",
-            "code":"210681"
-          },
-          {
-            "name":"凤城市",
-            "code":"210682"
-          }
-        ]
-      },
-      {
-        "name":"锦州市",
-        "code":"210700",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"210701"
-          },
-          {
-            "name":"古塔区",
-            "code":"210702"
-          },
-          {
-            "name":"凌河区",
-            "code":"210703"
-          },
-          {
-            "name":"太和区",
-            "code":"210711"
-          },
-          {
-            "name":"黑山县",
-            "code":"210726"
-          },
-          {
-            "name":"义县",
-            "code":"210727"
-          },
-          {
-            "name":"凌海市",
-            "code":"210781"
-          },
-          {
-            "name":"北镇市",
-            "code":"210782"
-          }
-        ]
-      },
-      {
-        "name":"营口市",
-        "code":"210800",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"210801"
-          },
-          {
-            "name":"站前区",
-            "code":"210802"
-          },
-          {
-            "name":"西市区",
-            "code":"210803"
-          },
-          {
-            "name":"鲅鱼圈区",
-            "code":"210804"
-          },
-          {
-            "name":"老边区",
-            "code":"210811"
-          },
-          {
-            "name":"盖州市",
-            "code":"210881"
-          },
-          {
-            "name":"大石桥市",
-            "code":"210882"
-          }
-        ]
-      },
-      {
-        "name":"阜新市",
-        "code":"210900",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"210901"
-          },
-          {
-            "name":"海州区",
-            "code":"210902"
-          },
-          {
-            "name":"新邱区",
-            "code":"210903"
-          },
-          {
-            "name":"太平区",
-            "code":"210904"
-          },
-          {
-            "name":"清河门区",
-            "code":"210905"
-          },
-          {
-            "name":"细河区",
-            "code":"210911"
-          },
-          {
-            "name":"阜新蒙古族自治县",
-            "code":"210921"
-          },
-          {
-            "name":"彰武县",
-            "code":"210922"
-          }
-        ]
-      },
-      {
-        "name":"辽阳市",
-        "code":"211000",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"211001"
-          },
-          {
-            "name":"白塔区",
-            "code":"211002"
-          },
-          {
-            "name":"文圣区",
-            "code":"211003"
-          },
-          {
-            "name":"宏伟区",
-            "code":"211004"
-          },
-          {
-            "name":"弓长岭区",
-            "code":"211005"
-          },
-          {
-            "name":"太子河区",
-            "code":"211011"
-          },
-          {
-            "name":"辽阳县",
-            "code":"211021"
-          },
-          {
-            "name":"灯塔市",
-            "code":"211081"
-          }
-        ]
-      },
-      {
-        "name":"盘锦市",
-        "code":"211100",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"211101"
-          },
-          {
-            "name":"双台子区",
-            "code":"211102"
-          },
-          {
-            "name":"兴隆台区",
-            "code":"211103"
-          },
-          {
-            "name":"大洼县",
-            "code":"211121"
-          },
-          {
-            "name":"盘山县",
-            "code":"211122"
-          }
-        ]
-      },
-      {
-        "name":"铁岭市",
-        "code":"211200",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"211201"
-          },
-          {
-            "name":"银州区",
-            "code":"211202"
-          },
-          {
-            "name":"清河区",
-            "code":"211204"
-          },
-          {
-            "name":"铁岭县",
-            "code":"211221"
-          },
-          {
-            "name":"西丰县",
-            "code":"211223"
-          },
-          {
-            "name":"昌图县",
-            "code":"211224"
-          },
-          {
-            "name":"调兵山市",
-            "code":"211281"
-          },
-          {
-            "name":"开原市",
-            "code":"211282"
-          }
-        ]
-      },
-      {
-        "name":"朝阳市",
-        "code":"211300",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"211301"
-          },
-          {
-            "name":"双塔区",
-            "code":"211302"
-          },
-          {
-            "name":"龙城区",
-            "code":"211303"
-          },
-          {
-            "name":"朝阳县",
-            "code":"211321"
-          },
-          {
-            "name":"建平县",
-            "code":"211322"
-          },
-          {
-            "name":"喀喇沁左翼蒙古族自治县",
-            "code":"211324"
-          },
-          {
-            "name":"北票市",
-            "code":"211381"
-          },
-          {
-            "name":"凌源市",
-            "code":"211382"
-          }
-        ]
-      },
-      {
-        "name":"葫芦岛市",
-        "code":"211400",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"211401"
-          },
-          {
-            "name":"连山区",
-            "code":"211402"
-          },
-          {
-            "name":"龙港区",
-            "code":"211403"
-          },
-          {
-            "name":"南票区",
-            "code":"211404"
-          },
-          {
-            "name":"绥中县",
-            "code":"211421"
-          },
-          {
-            "name":"建昌县",
-            "code":"211422"
-          },
-          {
-            "name":"兴城市",
-            "code":"211481"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name":"吉林省",
-    "code":"220000",
-    "sub":[
-      {
-        "name":"长春市",
-        "code":"220100",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"220101"
-          },
-          {
-            "name":"南关区",
-            "code":"220102"
-          },
-          {
-            "name":"宽城区",
-            "code":"220103"
-          },
-          {
-            "name":"朝阳区",
-            "code":"220104"
-          },
-          {
-            "name":"二道区",
-            "code":"220105"
-          },
-          {
-            "name":"绿园区",
-            "code":"220106"
-          },
-          {
-            "name":"双阳区",
-            "code":"220112"
-          },
-          {
-            "name":"九台区",
-            "code":"220113"
-          },
-          {
-            "name":"农安县",
-            "code":"220122"
-          },
-          {
-            "name":"榆树市",
-            "code":"220182"
-          },
-          {
-            "name":"德惠市",
-            "code":"220183"
-          }
-        ]
-      },
-      {
-        "name":"吉林市",
-        "code":"220200",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"220201"
-          },
-          {
-            "name":"昌邑区",
-            "code":"220202"
-          },
-          {
-            "name":"龙潭区",
-            "code":"220203"
-          },
-          {
-            "name":"船营区",
-            "code":"220204"
-          },
-          {
-            "name":"丰满区",
-            "code":"220211"
-          },
-          {
-            "name":"永吉县",
-            "code":"220221"
-          },
-          {
-            "name":"蛟河市",
-            "code":"220281"
-          },
-          {
-            "name":"桦甸市",
-            "code":"220282"
-          },
-          {
-            "name":"舒兰市",
-            "code":"220283"
-          },
-          {
-            "name":"磐石市",
-            "code":"220284"
-          }
-        ]
-      },
-      {
-        "name":"四平市",
-        "code":"220300",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"220301"
-          },
-          {
-            "name":"铁西区",
-            "code":"220302"
-          },
-          {
-            "name":"铁东区",
-            "code":"220303"
-          },
-          {
-            "name":"梨树县",
-            "code":"220322"
-          },
-          {
-            "name":"伊通满族自治县",
-            "code":"220323"
-          },
-          {
-            "name":"公主岭市",
-            "code":"220381"
-          },
-          {
-            "name":"双辽市",
-            "code":"220382"
-          }
-        ]
-      },
-      {
-        "name":"辽源市",
-        "code":"220400",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"220401"
-          },
-          {
-            "name":"龙山区",
-            "code":"220402"
-          },
-          {
-            "name":"西安区",
-            "code":"220403"
-          },
-          {
-            "name":"东丰县",
-            "code":"220421"
-          },
-          {
-            "name":"东辽县",
-            "code":"220422"
-          }
-        ]
-      },
-      {
-        "name":"通化市",
-        "code":"220500",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"220501"
-          },
-          {
-            "name":"东昌区",
-            "code":"220502"
-          },
-          {
-            "name":"二道江区",
-            "code":"220503"
-          },
-          {
-            "name":"通化县",
-            "code":"220521"
-          },
-          {
-            "name":"辉南县",
-            "code":"220523"
-          },
-          {
-            "name":"柳河县",
-            "code":"220524"
-          },
-          {
-            "name":"梅河口市",
-            "code":"220581"
-          },
-          {
-            "name":"集安市",
-            "code":"220582"
-          }
-        ]
-      },
-      {
-        "name":"白山市",
-        "code":"220600",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"220601"
-          },
-          {
-            "name":"浑江区",
-            "code":"220602"
-          },
-          {
-            "name":"江源区",
-            "code":"220605"
-          },
-          {
-            "name":"抚松县",
-            "code":"220621"
-          },
-          {
-            "name":"靖宇县",
-            "code":"220622"
-          },
-          {
-            "name":"长白朝鲜族自治县",
-            "code":"220623"
-          },
-          {
-            "name":"临江市",
-            "code":"220681"
-          }
-        ]
-      },
-      {
-        "name":"松原市",
-        "code":"220700",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"220701"
-          },
-          {
-            "name":"宁江区",
-            "code":"220702"
-          },
-          {
-            "name":"前郭尔罗斯蒙古族自治县",
-            "code":"220721"
-          },
-          {
-            "name":"长岭县",
-            "code":"220722"
-          },
-          {
-            "name":"乾安县",
-            "code":"220723"
-          },
-          {
-            "name":"扶余市",
-            "code":"220781"
-          }
-        ]
-      },
-      {
-        "name":"白城市",
-        "code":"220800",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"220801"
-          },
-          {
-            "name":"洮北区",
-            "code":"220802"
-          },
-          {
-            "name":"镇赉县",
-            "code":"220821"
-          },
-          {
-            "name":"通榆县",
-            "code":"220822"
-          },
-          {
-            "name":"洮南市",
-            "code":"220881"
-          },
-          {
-            "name":"大安市",
-            "code":"220882"
-          }
-        ]
-      },
-      {
-        "name":"延边朝鲜族自治州",
-        "code":"222400",
-        "sub":[
-          {
-            "name":"延吉市",
-            "code":"222401"
-          },
-          {
-            "name":"图们市",
-            "code":"222402"
-          },
-          {
-            "name":"敦化市",
-            "code":"222403"
-          },
-          {
-            "name":"珲春市",
-            "code":"222404"
-          },
-          {
-            "name":"龙井市",
-            "code":"222405"
-          },
-          {
-            "name":"和龙市",
-            "code":"222406"
-          },
-          {
-            "name":"汪清县",
-            "code":"222424"
-          },
-          {
-            "name":"安图县",
-            "code":"222426"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name":"黑龙江省",
-    "code":"230000",
-    "sub":[
-      {
-        "name":"哈尔滨市",
-        "code":"230100",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"230101"
-          },
-          {
-            "name":"道里区",
-            "code":"230102"
-          },
-          {
-            "name":"南岗区",
-            "code":"230103"
-          },
-          {
-            "name":"道外区",
-            "code":"230104"
-          },
-          {
-            "name":"平房区",
-            "code":"230108"
-          },
-          {
-            "name":"松北区",
-            "code":"230109"
-          },
-          {
-            "name":"香坊区",
-            "code":"230110"
-          },
-          {
-            "name":"呼兰区",
-            "code":"230111"
-          },
-          {
-            "name":"阿城区",
-            "code":"230112"
-          },
-          {
-            "name":"双城区",
-            "code":"230113"
-          },
-          {
-            "name":"依兰县",
-            "code":"230123"
-          },
-          {
-            "name":"方正县",
-            "code":"230124"
-          },
-          {
-            "name":"宾县",
-            "code":"230125"
-          },
-          {
-            "name":"巴彦县",
-            "code":"230126"
-          },
-          {
-            "name":"木兰县",
-            "code":"230127"
-          },
-          {
-            "name":"通河县",
-            "code":"230128"
-          },
-          {
-            "name":"延寿县",
-            "code":"230129"
-          },
-          {
-            "name":"尚志市",
-            "code":"230183"
-          },
-          {
-            "name":"五常市",
-            "code":"230184"
-          }
-        ]
-      },
-      {
-        "name":"齐齐哈尔市",
-        "code":"230200",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"230201"
-          },
-          {
-            "name":"龙沙区",
-            "code":"230202"
-          },
-          {
-            "name":"建华区",
-            "code":"230203"
-          },
-          {
-            "name":"铁锋区",
-            "code":"230204"
-          },
-          {
-            "name":"昂昂溪区",
-            "code":"230205"
-          },
-          {
-            "name":"富拉尔基区",
-            "code":"230206"
-          },
-          {
-            "name":"碾子山区",
-            "code":"230207"
-          },
-          {
-            "name":"梅里斯达斡尔族区",
-            "code":"230208"
-          },
-          {
-            "name":"龙江县",
-            "code":"230221"
-          },
-          {
-            "name":"依安县",
-            "code":"230223"
-          },
-          {
-            "name":"泰来县",
-            "code":"230224"
-          },
-          {
-            "name":"甘南县",
-            "code":"230225"
-          },
-          {
-            "name":"富裕县",
-            "code":"230227"
-          },
-          {
-            "name":"克山县",
-            "code":"230229"
-          },
-          {
-            "name":"克东县",
-            "code":"230230"
-          },
-          {
-            "name":"拜泉县",
-            "code":"230231"
-          },
-          {
-            "name":"讷河市",
-            "code":"230281"
-          }
-        ]
-      },
-      {
-        "name":"鸡西市",
-        "code":"230300",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"230301"
-          },
-          {
-            "name":"鸡冠区",
-            "code":"230302"
-          },
-          {
-            "name":"恒山区",
-            "code":"230303"
-          },
-          {
-            "name":"滴道区",
-            "code":"230304"
-          },
-          {
-            "name":"梨树区",
-            "code":"230305"
-          },
-          {
-            "name":"城子河区",
-            "code":"230306"
-          },
-          {
-            "name":"麻山区",
-            "code":"230307"
-          },
-          {
-            "name":"鸡东县",
-            "code":"230321"
-          },
-          {
-            "name":"虎林市",
-            "code":"230381"
-          },
-          {
-            "name":"密山市",
-            "code":"230382"
-          }
-        ]
-      },
-      {
-        "name":"鹤岗市",
-        "code":"230400",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"230401"
-          },
-          {
-            "name":"向阳区",
-            "code":"230402"
-          },
-          {
-            "name":"工农区",
-            "code":"230403"
-          },
-          {
-            "name":"南山区",
-            "code":"230404"
-          },
-          {
-            "name":"兴安区",
-            "code":"230405"
-          },
-          {
-            "name":"东山区",
-            "code":"230406"
-          },
-          {
-            "name":"兴山区",
-            "code":"230407"
-          },
-          {
-            "name":"萝北县",
-            "code":"230421"
-          },
-          {
-            "name":"绥滨县",
-            "code":"230422"
-          }
-        ]
-      },
-      {
-        "name":"双鸭山市",
-        "code":"230500",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"230501"
-          },
-          {
-            "name":"尖山区",
-            "code":"230502"
-          },
-          {
-            "name":"岭东区",
-            "code":"230503"
-          },
-          {
-            "name":"四方台区",
-            "code":"230505"
-          },
-          {
-            "name":"宝山区",
-            "code":"230506"
-          },
-          {
-            "name":"集贤县",
-            "code":"230521"
-          },
-          {
-            "name":"友谊县",
-            "code":"230522"
-          },
-          {
-            "name":"宝清县",
-            "code":"230523"
-          },
-          {
-            "name":"饶河县",
-            "code":"230524"
-          }
-        ]
-      },
-      {
-        "name":"大庆市",
-        "code":"230600",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"230601"
-          },
-          {
-            "name":"萨尔图区",
-            "code":"230602"
-          },
-          {
-            "name":"龙凤区",
-            "code":"230603"
-          },
-          {
-            "name":"让胡路区",
-            "code":"230604"
-          },
-          {
-            "name":"红岗区",
-            "code":"230605"
-          },
-          {
-            "name":"大同区",
-            "code":"230606"
-          },
-          {
-            "name":"肇州县",
-            "code":"230621"
-          },
-          {
-            "name":"肇源县",
-            "code":"230622"
-          },
-          {
-            "name":"林甸县",
-            "code":"230623"
-          },
-          {
-            "name":"杜尔伯特蒙古族自治县",
-            "code":"230624"
-          }
-        ]
-      },
-      {
-        "name":"伊春市",
-        "code":"230700",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"230701"
-          },
-          {
-            "name":"伊春区",
-            "code":"230702"
-          },
-          {
-            "name":"南岔区",
-            "code":"230703"
-          },
-          {
-            "name":"友好区",
-            "code":"230704"
-          },
-          {
-            "name":"西林区",
-            "code":"230705"
-          },
-          {
-            "name":"翠峦区",
-            "code":"230706"
-          },
-          {
-            "name":"新青区",
-            "code":"230707"
-          },
-          {
-            "name":"美溪区",
-            "code":"230708"
-          },
-          {
-            "name":"金山屯区",
-            "code":"230709"
-          },
-          {
-            "name":"五营区",
-            "code":"230710"
-          },
-          {
-            "name":"乌马河区",
-            "code":"230711"
-          },
-          {
-            "name":"汤旺河区",
-            "code":"230712"
-          },
-          {
-            "name":"带岭区",
-            "code":"230713"
-          },
-          {
-            "name":"乌伊岭区",
-            "code":"230714"
-          },
-          {
-            "name":"红星区",
-            "code":"230715"
-          },
-          {
-            "name":"上甘岭区",
-            "code":"230716"
-          },
-          {
-            "name":"嘉荫县",
-            "code":"230722"
-          },
-          {
-            "name":"铁力市",
-            "code":"230781"
-          }
-        ]
-      },
-      {
-        "name":"佳木斯市",
-        "code":"230800",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"230801"
-          },
-          {
-            "name":"向阳区",
-            "code":"230803"
-          },
-          {
-            "name":"前进区",
-            "code":"230804"
-          },
-          {
-            "name":"东风区",
-            "code":"230805"
-          },
-          {
-            "name":"郊区",
-            "code":"230811"
-          },
-          {
-            "name":"桦南县",
-            "code":"230822"
-          },
-          {
-            "name":"桦川县",
-            "code":"230826"
-          },
-          {
-            "name":"汤原县",
-            "code":"230828"
-          },
-          {
-            "name":"抚远县",
-            "code":"230833"
-          },
-          {
-            "name":"同江市",
-            "code":"230881"
-          },
-          {
-            "name":"富锦市",
-            "code":"230882"
-          }
-        ]
-      },
-      {
-        "name":"七台河市",
-        "code":"230900",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"230901"
-          },
-          {
-            "name":"新兴区",
-            "code":"230902"
-          },
-          {
-            "name":"桃山区",
-            "code":"230903"
-          },
-          {
-            "name":"茄子河区",
-            "code":"230904"
-          },
-          {
-            "name":"勃利县",
-            "code":"230921"
-          }
-        ]
-      },
-      {
-        "name":"牡丹江市",
-        "code":"231000",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"231001"
-          },
-          {
-            "name":"东安区",
-            "code":"231002"
-          },
-          {
-            "name":"阳明区",
-            "code":"231003"
-          },
-          {
-            "name":"爱民区",
-            "code":"231004"
-          },
-          {
-            "name":"西安区",
-            "code":"231005"
-          },
-          {
-            "name":"东宁县",
-            "code":"231024"
-          },
-          {
-            "name":"林口县",
-            "code":"231025"
-          },
-          {
-            "name":"绥芬河市",
-            "code":"231081"
-          },
-          {
-            "name":"海林市",
-            "code":"231083"
-          },
-          {
-            "name":"宁安市",
-            "code":"231084"
-          },
-          {
-            "name":"穆棱市",
-            "code":"231085"
-          }
-        ]
-      },
-      {
-        "name":"黑河市",
-        "code":"231100",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"231101"
-          },
-          {
-            "name":"爱辉区",
-            "code":"231102"
-          },
-          {
-            "name":"嫩江县",
-            "code":"231121"
-          },
-          {
-            "name":"逊克县",
-            "code":"231123"
-          },
-          {
-            "name":"孙吴县",
-            "code":"231124"
-          },
-          {
-            "name":"北安市",
-            "code":"231181"
-          },
-          {
-            "name":"五大连池市",
-            "code":"231182"
-          }
-        ]
-      },
-      {
-        "name":"绥化市",
-        "code":"231200",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"231201"
-          },
-          {
-            "name":"北林区",
-            "code":"231202"
-          },
-          {
-            "name":"望奎县",
-            "code":"231221"
-          },
-          {
-            "name":"兰西县",
-            "code":"231222"
-          },
-          {
-            "name":"青冈县",
-            "code":"231223"
-          },
-          {
-            "name":"庆安县",
-            "code":"231224"
-          },
-          {
-            "name":"明水县",
-            "code":"231225"
-          },
-          {
-            "name":"绥棱县",
-            "code":"231226"
-          },
-          {
-            "name":"安达市",
-            "code":"231281"
-          },
-          {
-            "name":"肇东市",
-            "code":"231282"
-          },
-          {
-            "name":"海伦市",
-            "code":"231283"
-          }
-        ]
-      },
-      {
-        "name":"大兴安岭地区",
-        "code":"232700",
-        "sub":[
-          {
-            "name":"呼玛县",
-            "code":"232721"
-          },
-          {
-            "name":"塔河县",
-            "code":"232722"
-          },
-          {
-            "name":"漠河县",
-            "code":"232723"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name":"上海",
-    "code":"310000",
-    "sub": [
-      {
-        "name":"上海市",
-        "code": "310000",
-        "sub":[
-            {
-              "name":"黄浦区",
-              "code":"310101"
-            },
-            {
-              "name":"徐汇区",
-              "code":"310104"
-            },
-            {
-              "name":"长宁区",
-              "code":"310105"
-            },
-            {
-              "name":"静安区",
-              "code":"310106"
-            },
-            {
-              "name":"普陀区",
-              "code":"310107"
-            },
-            {
-              "name":"闸北区",
-              "code":"310108"
-            },
-            {
-              "name":"虹口区",
-              "code":"310109"
-            },
-            {
-              "name":"杨浦区",
-              "code":"310110"
-            },
-            {
-              "name":"闵行区",
-              "code":"310112"
-            },
-            {
-              "name":"宝山区",
-              "code":"310113"
-            },
-            {
-              "name":"嘉定区",
-              "code":"310114"
-            },
-            {
-              "name":"浦东新区",
-              "code":"310115"
-            },
-            {
-              "name":"金山区",
-              "code":"310116"
-            },
-            {
-              "name":"松江区",
-              "code":"310117"
-            },
-            {
-              "name":"青浦区",
-              "code":"310118"
-            },
-            {
-              "name":"奉贤区",
-              "code":"310120"
-            },
-            {
-              "name":"崇明县",
-              "code":"310230"
-            }
-        ]
-      }
-    ]
-  },
-  {
-    "name":"江苏省",
-    "code":"320000",
-    "sub":[
-      {
-        "name":"南京市",
-        "code":"320100",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"320101"
-          },
-          {
-            "name":"玄武区",
-            "code":"320102"
-          },
-          {
-            "name":"秦淮区",
-            "code":"320104"
-          },
-          {
-            "name":"建邺区",
-            "code":"320105"
-          },
-          {
-            "name":"鼓楼区",
-            "code":"320106"
-          },
-          {
-            "name":"浦口区",
-            "code":"320111"
-          },
-          {
-            "name":"栖霞区",
-            "code":"320113"
-          },
-          {
-            "name":"雨花台区",
-            "code":"320114"
-          },
-          {
-            "name":"江宁区",
-            "code":"320115"
-          },
-          {
-            "name":"六合区",
-            "code":"320116"
-          },
-          {
-            "name":"溧水区",
-            "code":"320117"
-          },
-          {
-            "name":"高淳区",
-            "code":"320118"
-          }
-        ]
-      },
-      {
-        "name":"无锡市",
-        "code":"320200",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"320201"
-          },
-          {
-            "name":"崇安区",
-            "code":"320202"
-          },
-          {
-            "name":"南长区",
-            "code":"320203"
-          },
-          {
-            "name":"北塘区",
-            "code":"320204"
-          },
-          {
-            "name":"锡山区",
-            "code":"320205"
-          },
-          {
-            "name":"惠山区",
-            "code":"320206"
-          },
-          {
-            "name":"滨湖区",
-            "code":"320211"
-          },
-          {
-            "name":"江阴市",
-            "code":"320281"
-          },
-          {
-            "name":"宜兴市",
-            "code":"320282"
-          }
-        ]
-      },
-      {
-        "name":"徐州市",
-        "code":"320300",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"320301"
-          },
-          {
-            "name":"鼓楼区",
-            "code":"320302"
-          },
-          {
-            "name":"云龙区",
-            "code":"320303"
-          },
-          {
-            "name":"贾汪区",
-            "code":"320305"
-          },
-          {
-            "name":"泉山区",
-            "code":"320311"
-          },
-          {
-            "name":"铜山区",
-            "code":"320312"
-          },
-          {
-            "name":"丰县",
-            "code":"320321"
-          },
-          {
-            "name":"沛县",
-            "code":"320322"
-          },
-          {
-            "name":"睢宁县",
-            "code":"320324"
-          },
-          {
-            "name":"新沂市",
-            "code":"320381"
-          },
-          {
-            "name":"邳州市",
-            "code":"320382"
-          }
-        ]
-      },
-      {
-        "name":"常州市",
-        "code":"320400",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"320401"
-          },
-          {
-            "name":"天宁区",
-            "code":"320402"
-          },
-          {
-            "name":"钟楼区",
-            "code":"320404"
-          },
-          {
-            "name":"戚墅堰区",
-            "code":"320405"
-          },
-          {
-            "name":"新北区",
-            "code":"320411"
-          },
-          {
-            "name":"武进区",
-            "code":"320412"
-          },
-          {
-            "name":"溧阳市",
-            "code":"320481"
-          },
-          {
-            "name":"金坛市",
-            "code":"320482"
-          }
-        ]
-      },
-      {
-        "name":"苏州市",
-        "code":"320500",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"320501"
-          },
-          {
-            "name":"虎丘区",
-            "code":"320505"
-          },
-          {
-            "name":"吴中区",
-            "code":"320506"
-          },
-          {
-            "name":"相城区",
-            "code":"320507"
-          },
-          {
-            "name":"姑苏区",
-            "code":"320508"
-          },
-          {
-            "name":"吴江区",
-            "code":"320509"
-          },
-          {
-            "name":"常熟市",
-            "code":"320581"
-          },
-          {
-            "name":"张家港市",
-            "code":"320582"
-          },
-          {
-            "name":"昆山市",
-            "code":"320583"
-          },
-          {
-            "name":"太仓市",
-            "code":"320585"
-          }
-        ]
-      },
-      {
-        "name":"南通市",
-        "code":"320600",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"320601"
-          },
-          {
-            "name":"崇川区",
-            "code":"320602"
-          },
-          {
-            "name":"港闸区",
-            "code":"320611"
-          },
-          {
-            "name":"通州区",
-            "code":"320612"
-          },
-          {
-            "name":"海安县",
-            "code":"320621"
-          },
-          {
-            "name":"如东县",
-            "code":"320623"
-          },
-          {
-            "name":"启东市",
-            "code":"320681"
-          },
-          {
-            "name":"如皋市",
-            "code":"320682"
-          },
-          {
-            "name":"海门市",
-            "code":"320684"
-          }
-        ]
-      },
-      {
-        "name":"连云港市",
-        "code":"320700",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"320701"
-          },
-          {
-            "name":"连云区",
-            "code":"320703"
-          },
-          {
-            "name":"海州区",
-            "code":"320706"
-          },
-          {
-            "name":"赣榆区",
-            "code":"320707"
-          },
-          {
-            "name":"东海县",
-            "code":"320722"
-          },
-          {
-            "name":"灌云县",
-            "code":"320723"
-          },
-          {
-            "name":"灌南县",
-            "code":"320724"
-          }
-        ]
-      },
-      {
-        "name":"淮安市",
-        "code":"320800",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"320801"
-          },
-          {
-            "name":"清河区",
-            "code":"320802"
-          },
-          {
-            "name":"淮安区",
-            "code":"320803"
-          },
-          {
-            "name":"淮阴区",
-            "code":"320804"
-          },
-          {
-            "name":"清浦区",
-            "code":"320811"
-          },
-          {
-            "name":"涟水县",
-            "code":"320826"
-          },
-          {
-            "name":"洪泽县",
-            "code":"320829"
-          },
-          {
-            "name":"盱眙县",
-            "code":"320830"
-          },
-          {
-            "name":"金湖县",
-            "code":"320831"
-          }
-        ]
-      },
-      {
-        "name":"盐城市",
-        "code":"320900",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"320901"
-          },
-          {
-            "name":"亭湖区",
-            "code":"320902"
-          },
-          {
-            "name":"盐都区",
-            "code":"320903"
-          },
-          {
-            "name":"响水县",
-            "code":"320921"
-          },
-          {
-            "name":"滨海县",
-            "code":"320922"
-          },
-          {
-            "name":"阜宁县",
-            "code":"320923"
-          },
-          {
-            "name":"射阳县",
-            "code":"320924"
-          },
-          {
-            "name":"建湖县",
-            "code":"320925"
-          },
-          {
-            "name":"东台市",
-            "code":"320981"
-          },
-          {
-            "name":"大丰市",
-            "code":"320982"
-          }
-        ]
-      },
-      {
-        "name":"扬州市",
-        "code":"321000",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"321001"
-          },
-          {
-            "name":"广陵区",
-            "code":"321002"
-          },
-          {
-            "name":"邗江区",
-            "code":"321003"
-          },
-          {
-            "name":"江都区",
-            "code":"321012"
-          },
-          {
-            "name":"宝应县",
-            "code":"321023"
-          },
-          {
-            "name":"仪征市",
-            "code":"321081"
-          },
-          {
-            "name":"高邮市",
-            "code":"321084"
-          }
-        ]
-      },
-      {
-        "name":"镇江市",
-        "code":"321100",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"321101"
-          },
-          {
-            "name":"京口区",
-            "code":"321102"
-          },
-          {
-            "name":"润州区",
-            "code":"321111"
-          },
-          {
-            "name":"丹徒区",
-            "code":"321112"
-          },
-          {
-            "name":"丹阳市",
-            "code":"321181"
-          },
-          {
-            "name":"扬中市",
-            "code":"321182"
-          },
-          {
-            "name":"句容市",
-            "code":"321183"
-          }
-        ]
-      },
-      {
-        "name":"泰州市",
-        "code":"321200",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"321201"
-          },
-          {
-            "name":"海陵区",
-            "code":"321202"
-          },
-          {
-            "name":"高港区",
-            "code":"321203"
-          },
-          {
-            "name":"姜堰区",
-            "code":"321204"
-          },
-          {
-            "name":"兴化市",
-            "code":"321281"
-          },
-          {
-            "name":"靖江市",
-            "code":"321282"
-          },
-          {
-            "name":"泰兴市",
-            "code":"321283"
-          }
-        ]
-      },
-      {
-        "name":"宿迁市",
-        "code":"321300",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"321301"
-          },
-          {
-            "name":"宿城区",
-            "code":"321302"
-          },
-          {
-            "name":"宿豫区",
-            "code":"321311"
-          },
-          {
-            "name":"沭阳县",
-            "code":"321322"
-          },
-          {
-            "name":"泗阳县",
-            "code":"321323"
-          },
-          {
-            "name":"泗洪县",
-            "code":"321324"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name":"浙江省",
-    "code":"330000",
-    "sub":[
-      {
-        "name":"杭州市",
-        "code":"330100",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"330101"
-          },
-          {
-            "name":"上城区",
-            "code":"330102"
-          },
-          {
-            "name":"下城区",
-            "code":"330103"
-          },
-          {
-            "name":"江干区",
-            "code":"330104"
-          },
-          {
-            "name":"拱墅区",
-            "code":"330105"
-          },
-          {
-            "name":"西湖区",
-            "code":"330106"
-          },
-          {
-            "name":"滨江区",
-            "code":"330108"
-          },
-          {
-            "name":"萧山区",
-            "code":"330109"
-          },
-          {
-            "name":"余杭区",
-            "code":"330110"
-          },
-          {
-            "name":"富阳区",
-            "code":"330111"
-          },
-          {
-            "name":"桐庐县",
-            "code":"330122"
-          },
-          {
-            "name":"淳安县",
-            "code":"330127"
-          },
-          {
-            "name":"建德市",
-            "code":"330182"
-          },
-          {
-            "name":"临安市",
-            "code":"330185"
-          }
-        ]
-      },
-      {
-        "name":"宁波市",
-        "code":"330200",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"330201"
-          },
-          {
-            "name":"海曙区",
-            "code":"330203"
-          },
-          {
-            "name":"江东区",
-            "code":"330204"
-          },
-          {
-            "name":"江北区",
-            "code":"330205"
-          },
-          {
-            "name":"北仑区",
-            "code":"330206"
-          },
-          {
-            "name":"镇海区",
-            "code":"330211"
-          },
-          {
-            "name":"鄞州区",
-            "code":"330212"
-          },
-          {
-            "name":"象山县",
-            "code":"330225"
-          },
-          {
-            "name":"宁海县",
-            "code":"330226"
-          },
-          {
-            "name":"余姚市",
-            "code":"330281"
-          },
-          {
-            "name":"慈溪市",
-            "code":"330282"
-          },
-          {
-            "name":"奉化市",
-            "code":"330283"
-          }
-        ]
-      },
-      {
-        "name":"温州市",
-        "code":"330300",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"330301"
-          },
-          {
-            "name":"鹿城区",
-            "code":"330302"
-          },
-          {
-            "name":"龙湾区",
-            "code":"330303"
-          },
-          {
-            "name":"瓯海区",
-            "code":"330304"
-          },
-          {
-            "name":"洞头县",
-            "code":"330322"
-          },
-          {
-            "name":"永嘉县",
-            "code":"330324"
-          },
-          {
-            "name":"平阳县",
-            "code":"330326"
-          },
-          {
-            "name":"苍南县",
-            "code":"330327"
-          },
-          {
-            "name":"文成县",
-            "code":"330328"
-          },
-          {
-            "name":"泰顺县",
-            "code":"330329"
-          },
-          {
-            "name":"瑞安市",
-            "code":"330381"
-          },
-          {
-            "name":"乐清市",
-            "code":"330382"
-          }
-        ]
-      },
-      {
-        "name":"嘉兴市",
-        "code":"330400",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"330401"
-          },
-          {
-            "name":"南湖区",
-            "code":"330402"
-          },
-          {
-            "name":"秀洲区",
-            "code":"330411"
-          },
-          {
-            "name":"嘉善县",
-            "code":"330421"
-          },
-          {
-            "name":"海盐县",
-            "code":"330424"
-          },
-          {
-            "name":"海宁市",
-            "code":"330481"
-          },
-          {
-            "name":"平湖市",
-            "code":"330482"
-          },
-          {
-            "name":"桐乡市",
-            "code":"330483"
-          }
-        ]
-      },
-      {
-        "name":"湖州市",
-        "code":"330500",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"330501"
-          },
-          {
-            "name":"吴兴区",
-            "code":"330502"
-          },
-          {
-            "name":"南浔区",
-            "code":"330503"
-          },
-          {
-            "name":"德清县",
-            "code":"330521"
-          },
-          {
-            "name":"长兴县",
-            "code":"330522"
-          },
-          {
-            "name":"安吉县",
-            "code":"330523"
-          }
-        ]
-      },
-      {
-        "name":"绍兴市",
-        "code":"330600",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"330601"
-          },
-          {
-            "name":"越城区",
-            "code":"330602"
-          },
-          {
-            "name":"柯桥区",
-            "code":"330603"
-          },
-          {
-            "name":"上虞区",
-            "code":"330604"
-          },
-          {
-            "name":"新昌县",
-            "code":"330624"
-          },
-          {
-            "name":"诸暨市",
-            "code":"330681"
-          },
-          {
-            "name":"嵊州市",
-            "code":"330683"
-          }
-        ]
-      },
-      {
-        "name":"金华市",
-        "code":"330700",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"330701"
-          },
-          {
-            "name":"婺城区",
-            "code":"330702"
-          },
-          {
-            "name":"金东区",
-            "code":"330703"
-          },
-          {
-            "name":"武义县",
-            "code":"330723"
-          },
-          {
-            "name":"浦江县",
-            "code":"330726"
-          },
-          {
-            "name":"磐安县",
-            "code":"330727"
-          },
-          {
-            "name":"兰溪市",
-            "code":"330781"
-          },
-          {
-            "name":"义乌市",
-            "code":"330782"
-          },
-          {
-            "name":"东阳市",
-            "code":"330783"
-          },
-          {
-            "name":"永康市",
-            "code":"330784"
-          }
-        ]
-      },
-      {
-        "name":"衢州市",
-        "code":"330800",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"330801"
-          },
-          {
-            "name":"柯城区",
-            "code":"330802"
-          },
-          {
-            "name":"衢江区",
-            "code":"330803"
-          },
-          {
-            "name":"常山县",
-            "code":"330822"
-          },
-          {
-            "name":"开化县",
-            "code":"330824"
-          },
-          {
-            "name":"龙游县",
-            "code":"330825"
-          },
-          {
-            "name":"江山市",
-            "code":"330881"
-          }
-        ]
-      },
-      {
-        "name":"舟山市",
-        "code":"330900",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"330901"
-          },
-          {
-            "name":"定海区",
-            "code":"330902"
-          },
-          {
-            "name":"普陀区",
-            "code":"330903"
-          },
-          {
-            "name":"岱山县",
-            "code":"330921"
-          },
-          {
-            "name":"嵊泗县",
-            "code":"330922"
-          }
-        ]
-      },
-      {
-        "name":"台州市",
-        "code":"331000",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"331001"
-          },
-          {
-            "name":"椒江区",
-            "code":"331002"
-          },
-          {
-            "name":"黄岩区",
-            "code":"331003"
-          },
-          {
-            "name":"路桥区",
-            "code":"331004"
-          },
-          {
-            "name":"玉环县",
-            "code":"331021"
-          },
-          {
-            "name":"三门县",
-            "code":"331022"
-          },
-          {
-            "name":"天台县",
-            "code":"331023"
-          },
-          {
-            "name":"仙居县",
-            "code":"331024"
-          },
-          {
-            "name":"温岭市",
-            "code":"331081"
-          },
-          {
-            "name":"临海市",
-            "code":"331082"
-          }
-        ]
-      },
-      {
-        "name":"丽水市",
-        "code":"331100",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"331101"
-          },
-          {
-            "name":"莲都区",
-            "code":"331102"
-          },
-          {
-            "name":"青田县",
-            "code":"331121"
-          },
-          {
-            "name":"缙云县",
-            "code":"331122"
-          },
-          {
-            "name":"遂昌县",
-            "code":"331123"
-          },
-          {
-            "name":"松阳县",
-            "code":"331124"
-          },
-          {
-            "name":"云和县",
-            "code":"331125"
-          },
-          {
-            "name":"庆元县",
-            "code":"331126"
-          },
-          {
-            "name":"景宁畲族自治县",
-            "code":"331127"
-          },
-          {
-            "name":"龙泉市",
-            "code":"331181"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name":"安徽省",
-    "code":"340000",
-    "sub":[
-      {
-        "name":"合肥市",
-        "code":"340100",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"340101"
-          },
-          {
-            "name":"瑶海区",
-            "code":"340102"
-          },
-          {
-            "name":"庐阳区",
-            "code":"340103"
-          },
-          {
-            "name":"蜀山区",
-            "code":"340104"
-          },
-          {
-            "name":"包河区",
-            "code":"340111"
-          },
-          {
-            "name":"长丰县",
-            "code":"340121"
-          },
-          {
-            "name":"肥东县",
-            "code":"340122"
-          },
-          {
-            "name":"肥西县",
-            "code":"340123"
-          },
-          {
-            "name":"庐江县",
-            "code":"340124"
-          },
-          {
-            "name":"巢湖市",
-            "code":"340181"
-          }
-        ]
-      },
-      {
-        "name":"芜湖市",
-        "code":"340200",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"340201"
-          },
-          {
-            "name":"镜湖区",
-            "code":"340202"
-          },
-          {
-            "name":"弋江区",
-            "code":"340203"
-          },
-          {
-            "name":"鸠江区",
-            "code":"340207"
-          },
-          {
-            "name":"三山区",
-            "code":"340208"
-          },
-          {
-            "name":"芜湖县",
-            "code":"340221"
-          },
-          {
-            "name":"繁昌县",
-            "code":"340222"
-          },
-          {
-            "name":"南陵县",
-            "code":"340223"
-          },
-          {
-            "name":"无为县",
-            "code":"340225"
-          }
-        ]
-      },
-      {
-        "name":"蚌埠市",
-        "code":"340300",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"340301"
-          },
-          {
-            "name":"龙子湖区",
-            "code":"340302"
-          },
-          {
-            "name":"蚌山区",
-            "code":"340303"
-          },
-          {
-            "name":"禹会区",
-            "code":"340304"
-          },
-          {
-            "name":"淮上区",
-            "code":"340311"
-          },
-          {
-            "name":"怀远县",
-            "code":"340321"
-          },
-          {
-            "name":"五河县",
-            "code":"340322"
-          },
-          {
-            "name":"固镇县",
-            "code":"340323"
-          }
-        ]
-      },
-      {
-        "name":"淮南市",
-        "code":"340400",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"340401"
-          },
-          {
-            "name":"大通区",
-            "code":"340402"
-          },
-          {
-            "name":"田家庵区",
-            "code":"340403"
-          },
-          {
-            "name":"谢家集区",
-            "code":"340404"
-          },
-          {
-            "name":"八公山区",
-            "code":"340405"
-          },
-          {
-            "name":"潘集区",
-            "code":"340406"
-          },
-          {
-            "name":"凤台县",
-            "code":"340421"
-          }
-        ]
-      },
-      {
-        "name":"马鞍山市",
-        "code":"340500",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"340501"
-          },
-          {
-            "name":"花山区",
-            "code":"340503"
-          },
-          {
-            "name":"雨山区",
-            "code":"340504"
-          },
-          {
-            "name":"博望区",
-            "code":"340506"
-          },
-          {
-            "name":"当涂县",
-            "code":"340521"
-          },
-          {
-            "name":"含山县",
-            "code":"340522"
-          },
-          {
-            "name":"和县",
-            "code":"340523"
-          }
-        ]
-      },
-      {
-        "name":"淮北市",
-        "code":"340600",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"340601"
-          },
-          {
-            "name":"杜集区",
-            "code":"340602"
-          },
-          {
-            "name":"相山区",
-            "code":"340603"
-          },
-          {
-            "name":"烈山区",
-            "code":"340604"
-          },
-          {
-            "name":"濉溪县",
-            "code":"340621"
-          }
-        ]
-      },
-      {
-        "name":"铜陵市",
-        "code":"340700",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"340701"
-          },
-          {
-            "name":"铜官山区",
-            "code":"340702"
-          },
-          {
-            "name":"狮子山区",
-            "code":"340703"
-          },
-          {
-            "name":"郊区",
-            "code":"340711"
-          },
-          {
-            "name":"铜陵县",
-            "code":"340721"
-          }
-        ]
-      },
-      {
-        "name":"安庆市",
-        "code":"340800",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"340801"
-          },
-          {
-            "name":"迎江区",
-            "code":"340802"
-          },
-          {
-            "name":"大观区",
-            "code":"340803"
-          },
-          {
-            "name":"宜秀区",
-            "code":"340811"
-          },
-          {
-            "name":"怀宁县",
-            "code":"340822"
-          },
-          {
-            "name":"枞阳县",
-            "code":"340823"
-          },
-          {
-            "name":"潜山县",
-            "code":"340824"
-          },
-          {
-            "name":"太湖县",
-            "code":"340825"
-          },
-          {
-            "name":"宿松县",
-            "code":"340826"
-          },
-          {
-            "name":"望江县",
-            "code":"340827"
-          },
-          {
-            "name":"岳西县",
-            "code":"340828"
-          },
-          {
-            "name":"桐城市",
-            "code":"340881"
-          }
-        ]
-      },
-      {
-        "name":"黄山市",
-        "code":"341000",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"341001"
-          },
-          {
-            "name":"屯溪区",
-            "code":"341002"
-          },
-          {
-            "name":"黄山区",
-            "code":"341003"
-          },
-          {
-            "name":"徽州区",
-            "code":"341004"
-          },
-          {
-            "name":"歙县",
-            "code":"341021"
-          },
-          {
-            "name":"休宁县",
-            "code":"341022"
-          },
-          {
-            "name":"黟县",
-            "code":"341023"
-          },
-          {
-            "name":"祁门县",
-            "code":"341024"
-          }
-        ]
-      },
-      {
-        "name":"滁州市",
-        "code":"341100",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"341101"
-          },
-          {
-            "name":"琅琊区",
-            "code":"341102"
-          },
-          {
-            "name":"南谯区",
-            "code":"341103"
-          },
-          {
-            "name":"来安县",
-            "code":"341122"
-          },
-          {
-            "name":"全椒县",
-            "code":"341124"
-          },
-          {
-            "name":"定远县",
-            "code":"341125"
-          },
-          {
-            "name":"凤阳县",
-            "code":"341126"
-          },
-          {
-            "name":"天长市",
-            "code":"341181"
-          },
-          {
-            "name":"明光市",
-            "code":"341182"
-          }
-        ]
-      },
-      {
-        "name":"阜阳市",
-        "code":"341200",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"341201"
-          },
-          {
-            "name":"颍州区",
-            "code":"341202"
-          },
-          {
-            "name":"颍东区",
-            "code":"341203"
-          },
-          {
-            "name":"颍泉区",
-            "code":"341204"
-          },
-          {
-            "name":"临泉县",
-            "code":"341221"
-          },
-          {
-            "name":"太和县",
-            "code":"341222"
-          },
-          {
-            "name":"阜南县",
-            "code":"341225"
-          },
-          {
-            "name":"颍上县",
-            "code":"341226"
-          },
-          {
-            "name":"界首市",
-            "code":"341282"
-          }
-        ]
-      },
-      {
-        "name":"宿州市",
-        "code":"341300",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"341301"
-          },
-          {
-            "name":"埇桥区",
-            "code":"341302"
-          },
-          {
-            "name":"砀山县",
-            "code":"341321"
-          },
-          {
-            "name":"萧县",
-            "code":"341322"
-          },
-          {
-            "name":"灵璧县",
-            "code":"341323"
-          },
-          {
-            "name":"泗县",
-            "code":"341324"
-          }
-        ]
-      },
-      {
-        "name":"六安市",
-        "code":"341500",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"341501"
-          },
-          {
-            "name":"金安区",
-            "code":"341502"
-          },
-          {
-            "name":"裕安区",
-            "code":"341503"
-          },
-          {
-            "name":"寿县",
-            "code":"341521"
-          },
-          {
-            "name":"霍邱县",
-            "code":"341522"
-          },
-          {
-            "name":"舒城县",
-            "code":"341523"
-          },
-          {
-            "name":"金寨县",
-            "code":"341524"
-          },
-          {
-            "name":"霍山县",
-            "code":"341525"
-          }
-        ]
-      },
-      {
-        "name":"亳州市",
-        "code":"341600",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"341601"
-          },
-          {
-            "name":"谯城区",
-            "code":"341602"
-          },
-          {
-            "name":"涡阳县",
-            "code":"341621"
-          },
-          {
-            "name":"蒙城县",
-            "code":"341622"
-          },
-          {
-            "name":"利辛县",
-            "code":"341623"
-          }
-        ]
-      },
-      {
-        "name":"池州市",
-        "code":"341700",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"341701"
-          },
-          {
-            "name":"贵池区",
-            "code":"341702"
-          },
-          {
-            "name":"东至县",
-            "code":"341721"
-          },
-          {
-            "name":"石台县",
-            "code":"341722"
-          },
-          {
-            "name":"青阳县",
-            "code":"341723"
-          }
-        ]
-      },
-      {
-        "name":"宣城市",
-        "code":"341800",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"341801"
-          },
-          {
-            "name":"宣州区",
-            "code":"341802"
-          },
-          {
-            "name":"郎溪县",
-            "code":"341821"
-          },
-          {
-            "name":"广德县",
-            "code":"341822"
-          },
-          {
-            "name":"泾县",
-            "code":"341823"
-          },
-          {
-            "name":"绩溪县",
-            "code":"341824"
-          },
-          {
-            "name":"旌德县",
-            "code":"341825"
-          },
-          {
-            "name":"宁国市",
-            "code":"341881"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name":"福建省",
-    "code":"350000",
-    "sub":[
-      {
-        "name":"福州市",
-        "code":"350100",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"350101"
-          },
-          {
-            "name":"鼓楼区",
-            "code":"350102"
-          },
-          {
-            "name":"台江区",
-            "code":"350103"
-          },
-          {
-            "name":"仓山区",
-            "code":"350104"
-          },
-          {
-            "name":"马尾区",
-            "code":"350105"
-          },
-          {
-            "name":"晋安区",
-            "code":"350111"
-          },
-          {
-            "name":"闽侯县",
-            "code":"350121"
-          },
-          {
-            "name":"连江县",
-            "code":"350122"
-          },
-          {
-            "name":"罗源县",
-            "code":"350123"
-          },
-          {
-            "name":"闽清县",
-            "code":"350124"
-          },
-          {
-            "name":"永泰县",
-            "code":"350125"
-          },
-          {
-            "name":"平潭县",
-            "code":"350128"
-          },
-          {
-            "name":"福清市",
-            "code":"350181"
-          },
-          {
-            "name":"长乐市",
-            "code":"350182"
-          }
-        ]
-      },
-      {
-        "name":"厦门市",
-        "code":"350200",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"350201"
-          },
-          {
-            "name":"思明区",
-            "code":"350203"
-          },
-          {
-            "name":"海沧区",
-            "code":"350205"
-          },
-          {
-            "name":"湖里区",
-            "code":"350206"
-          },
-          {
-            "name":"集美区",
-            "code":"350211"
-          },
-          {
-            "name":"同安区",
-            "code":"350212"
-          },
-          {
-            "name":"翔安区",
-            "code":"350213"
-          }
-        ]
-      },
-      {
-        "name":"莆田市",
-        "code":"350300",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"350301"
-          },
-          {
-            "name":"城厢区",
-            "code":"350302"
-          },
-          {
-            "name":"涵江区",
-            "code":"350303"
-          },
-          {
-            "name":"荔城区",
-            "code":"350304"
-          },
-          {
-            "name":"秀屿区",
-            "code":"350305"
-          },
-          {
-            "name":"仙游县",
-            "code":"350322"
-          }
-        ]
-      },
-      {
-        "name":"三明市",
-        "code":"350400",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"350401"
-          },
-          {
-            "name":"梅列区",
-            "code":"350402"
-          },
-          {
-            "name":"三元区",
-            "code":"350403"
-          },
-          {
-            "name":"明溪县",
-            "code":"350421"
-          },
-          {
-            "name":"清流县",
-            "code":"350423"
-          },
-          {
-            "name":"宁化县",
-            "code":"350424"
-          },
-          {
-            "name":"大田县",
-            "code":"350425"
-          },
-          {
-            "name":"尤溪县",
-            "code":"350426"
-          },
-          {
-            "name":"沙县",
-            "code":"350427"
-          },
-          {
-            "name":"将乐县",
-            "code":"350428"
-          },
-          {
-            "name":"泰宁县",
-            "code":"350429"
-          },
-          {
-            "name":"建宁县",
-            "code":"350430"
-          },
-          {
-            "name":"永安市",
-            "code":"350481"
-          }
-        ]
-      },
-      {
-        "name":"泉州市",
-        "code":"350500",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"350501"
-          },
-          {
-            "name":"鲤城区",
-            "code":"350502"
-          },
-          {
-            "name":"丰泽区",
-            "code":"350503"
-          },
-          {
-            "name":"洛江区",
-            "code":"350504"
-          },
-          {
-            "name":"泉港区",
-            "code":"350505"
-          },
-          {
-            "name":"惠安县",
-            "code":"350521"
-          },
-          {
-            "name":"安溪县",
-            "code":"350524"
-          },
-          {
-            "name":"永春县",
-            "code":"350525"
-          },
-          {
-            "name":"德化县",
-            "code":"350526"
-          },
-          {
-            "name":"金门县",
-            "code":"350527"
-          },
-          {
-            "name":"石狮市",
-            "code":"350581"
-          },
-          {
-            "name":"晋江市",
-            "code":"350582"
-          },
-          {
-            "name":"南安市",
-            "code":"350583"
-          }
-        ]
-      },
-      {
-        "name":"漳州市",
-        "code":"350600",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"350601"
-          },
-          {
-            "name":"芗城区",
-            "code":"350602"
-          },
-          {
-            "name":"龙文区",
-            "code":"350603"
-          },
-          {
-            "name":"云霄县",
-            "code":"350622"
-          },
-          {
-            "name":"漳浦县",
-            "code":"350623"
-          },
-          {
-            "name":"诏安县",
-            "code":"350624"
-          },
-          {
-            "name":"长泰县",
-            "code":"350625"
-          },
-          {
-            "name":"东山县",
-            "code":"350626"
-          },
-          {
-            "name":"南靖县",
-            "code":"350627"
-          },
-          {
-            "name":"平和县",
-            "code":"350628"
-          },
-          {
-            "name":"华安县",
-            "code":"350629"
-          },
-          {
-            "name":"龙海市",
-            "code":"350681"
-          }
-        ]
-      },
-      {
-        "name":"南平市",
-        "code":"350700",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"350701"
-          },
-          {
-            "name":"延平区",
-            "code":"350702"
-          },
-          {
-            "name":"建阳区",
-            "code":"350703"
-          },
-          {
-            "name":"顺昌县",
-            "code":"350721"
-          },
-          {
-            "name":"浦城县",
-            "code":"350722"
-          },
-          {
-            "name":"光泽县",
-            "code":"350723"
-          },
-          {
-            "name":"松溪县",
-            "code":"350724"
-          },
-          {
-            "name":"政和县",
-            "code":"350725"
-          },
-          {
-            "name":"邵武市",
-            "code":"350781"
-          },
-          {
-            "name":"武夷山市",
-            "code":"350782"
-          },
-          {
-            "name":"建瓯市",
-            "code":"350783"
-          }
-        ]
-      },
-      {
-        "name":"龙岩市",
-        "code":"350800",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"350801"
-          },
-          {
-            "name":"新罗区",
-            "code":"350802"
-          },
-          {
-            "name":"永定区",
-            "code":"350803"
-          },
-          {
-            "name":"长汀县",
-            "code":"350821"
-          },
-          {
-            "name":"上杭县",
-            "code":"350823"
-          },
-          {
-            "name":"武平县",
-            "code":"350824"
-          },
-          {
-            "name":"连城县",
-            "code":"350825"
-          },
-          {
-            "name":"漳平市",
-            "code":"350881"
-          }
-        ]
-      },
-      {
-        "name":"宁德市",
-        "code":"350900",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"350901"
-          },
-          {
-            "name":"蕉城区",
-            "code":"350902"
-          },
-          {
-            "name":"霞浦县",
-            "code":"350921"
-          },
-          {
-            "name":"古田县",
-            "code":"350922"
-          },
-          {
-            "name":"屏南县",
-            "code":"350923"
-          },
-          {
-            "name":"寿宁县",
-            "code":"350924"
-          },
-          {
-            "name":"周宁县",
-            "code":"350925"
-          },
-          {
-            "name":"柘荣县",
-            "code":"350926"
-          },
-          {
-            "name":"福安市",
-            "code":"350981"
-          },
-          {
-            "name":"福鼎市",
-            "code":"350982"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name":"江西省",
-    "code":"360000",
-    "sub":[
-      {
-        "name":"南昌市",
-        "code":"360100",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"360101"
-          },
-          {
-            "name":"东湖区",
-            "code":"360102"
-          },
-          {
-            "name":"西湖区",
-            "code":"360103"
-          },
-          {
-            "name":"青云谱区",
-            "code":"360104"
-          },
-          {
-            "name":"湾里区",
-            "code":"360105"
-          },
-          {
-            "name":"青山湖区",
-            "code":"360111"
-          },
-          {
-            "name":"南昌县",
-            "code":"360121"
-          },
-          {
-            "name":"新建县",
-            "code":"360122"
-          },
-          {
-            "name":"安义县",
-            "code":"360123"
-          },
-          {
-            "name":"进贤县",
-            "code":"360124"
-          }
-        ]
-      },
-      {
-        "name":"景德镇市",
-        "code":"360200",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"360201"
-          },
-          {
-            "name":"昌江区",
-            "code":"360202"
-          },
-          {
-            "name":"珠山区",
-            "code":"360203"
-          },
-          {
-            "name":"浮梁县",
-            "code":"360222"
-          },
-          {
-            "name":"乐平市",
-            "code":"360281"
-          }
-        ]
-      },
-      {
-        "name":"萍乡市",
-        "code":"360300",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"360301"
-          },
-          {
-            "name":"安源区",
-            "code":"360302"
-          },
-          {
-            "name":"湘东区",
-            "code":"360313"
-          },
-          {
-            "name":"莲花县",
-            "code":"360321"
-          },
-          {
-            "name":"上栗县",
-            "code":"360322"
-          },
-          {
-            "name":"芦溪县",
-            "code":"360323"
-          }
-        ]
-      },
-      {
-        "name":"九江市",
-        "code":"360400",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"360401"
-          },
-          {
-            "name":"庐山区",
-            "code":"360402"
-          },
-          {
-            "name":"浔阳区",
-            "code":"360403"
-          },
-          {
-            "name":"九江县",
-            "code":"360421"
-          },
-          {
-            "name":"武宁县",
-            "code":"360423"
-          },
-          {
-            "name":"修水县",
-            "code":"360424"
-          },
-          {
-            "name":"永修县",
-            "code":"360425"
-          },
-          {
-            "name":"德安县",
-            "code":"360426"
-          },
-          {
-            "name":"星子县",
-            "code":"360427"
-          },
-          {
-            "name":"都昌县",
-            "code":"360428"
-          },
-          {
-            "name":"湖口县",
-            "code":"360429"
-          },
-          {
-            "name":"彭泽县",
-            "code":"360430"
-          },
-          {
-            "name":"瑞昌市",
-            "code":"360481"
-          },
-          {
-            "name":"共青城市",
-            "code":"360482"
-          }
-        ]
-      },
-      {
-        "name":"新余市",
-        "code":"360500",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"360501"
-          },
-          {
-            "name":"渝水区",
-            "code":"360502"
-          },
-          {
-            "name":"分宜县",
-            "code":"360521"
-          }
-        ]
-      },
-      {
-        "name":"鹰潭市",
-        "code":"360600",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"360601"
-          },
-          {
-            "name":"月湖区",
-            "code":"360602"
-          },
-          {
-            "name":"余江县",
-            "code":"360622"
-          },
-          {
-            "name":"贵溪市",
-            "code":"360681"
-          }
-        ]
-      },
-      {
-        "name":"赣州市",
-        "code":"360700",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"360701"
-          },
-          {
-            "name":"章贡区",
-            "code":"360702"
-          },
-          {
-            "name":"南康区",
-            "code":"360703"
-          },
-          {
-            "name":"赣县",
-            "code":"360721"
-          },
-          {
-            "name":"信丰县",
-            "code":"360722"
-          },
-          {
-            "name":"大余县",
-            "code":"360723"
-          },
-          {
-            "name":"上犹县",
-            "code":"360724"
-          },
-          {
-            "name":"崇义县",
-            "code":"360725"
-          },
-          {
-            "name":"安远县",
-            "code":"360726"
-          },
-          {
-            "name":"龙南县",
-            "code":"360727"
-          },
-          {
-            "name":"定南县",
-            "code":"360728"
-          },
-          {
-            "name":"全南县",
-            "code":"360729"
-          },
-          {
-            "name":"宁都县",
-            "code":"360730"
-          },
-          {
-            "name":"于都县",
-            "code":"360731"
-          },
-          {
-            "name":"兴国县",
-            "code":"360732"
-          },
-          {
-            "name":"会昌县",
-            "code":"360733"
-          },
-          {
-            "name":"寻乌县",
-            "code":"360734"
-          },
-          {
-            "name":"石城县",
-            "code":"360735"
-          },
-          {
-            "name":"瑞金市",
-            "code":"360781"
-          }
-        ]
-      },
-      {
-        "name":"吉安市",
-        "code":"360800",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"360801"
-          },
-          {
-            "name":"吉州区",
-            "code":"360802"
-          },
-          {
-            "name":"青原区",
-            "code":"360803"
-          },
-          {
-            "name":"吉安县",
-            "code":"360821"
-          },
-          {
-            "name":"吉水县",
-            "code":"360822"
-          },
-          {
-            "name":"峡江县",
-            "code":"360823"
-          },
-          {
-            "name":"新干县",
-            "code":"360824"
-          },
-          {
-            "name":"永丰县",
-            "code":"360825"
-          },
-          {
-            "name":"泰和县",
-            "code":"360826"
-          },
-          {
-            "name":"遂川县",
-            "code":"360827"
-          },
-          {
-            "name":"万安县",
-            "code":"360828"
-          },
-          {
-            "name":"安福县",
-            "code":"360829"
-          },
-          {
-            "name":"永新县",
-            "code":"360830"
-          },
-          {
-            "name":"井冈山市",
-            "code":"360881"
-          }
-        ]
-      },
-      {
-        "name":"宜春市",
-        "code":"360900",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"360901"
-          },
-          {
-            "name":"袁州区",
-            "code":"360902"
-          },
-          {
-            "name":"奉新县",
-            "code":"360921"
-          },
-          {
-            "name":"万载县",
-            "code":"360922"
-          },
-          {
-            "name":"上高县",
-            "code":"360923"
-          },
-          {
-            "name":"宜丰县",
-            "code":"360924"
-          },
-          {
-            "name":"靖安县",
-            "code":"360925"
-          },
-          {
-            "name":"铜鼓县",
-            "code":"360926"
-          },
-          {
-            "name":"丰城市",
-            "code":"360981"
-          },
-          {
-            "name":"樟树市",
-            "code":"360982"
-          },
-          {
-            "name":"高安市",
-            "code":"360983"
-          }
-        ]
-      },
-      {
-        "name":"抚州市",
-        "code":"361000",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"361001"
-          },
-          {
-            "name":"临川区",
-            "code":"361002"
-          },
-          {
-            "name":"南城县",
-            "code":"361021"
-          },
-          {
-            "name":"黎川县",
-            "code":"361022"
-          },
-          {
-            "name":"南丰县",
-            "code":"361023"
-          },
-          {
-            "name":"崇仁县",
-            "code":"361024"
-          },
-          {
-            "name":"乐安县",
-            "code":"361025"
-          },
-          {
-            "name":"宜黄县",
-            "code":"361026"
-          },
-          {
-            "name":"金溪县",
-            "code":"361027"
-          },
-          {
-            "name":"资溪县",
-            "code":"361028"
-          },
-          {
-            "name":"东乡县",
-            "code":"361029"
-          },
-          {
-            "name":"广昌县",
-            "code":"361030"
-          }
-        ]
-      },
-      {
-        "name":"上饶市",
-        "code":"361100",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"361101"
-          },
-          {
-            "name":"信州区",
-            "code":"361102"
-          },
-          {
-            "name":"上饶县",
-            "code":"361121"
-          },
-          {
-            "name":"广丰县",
-            "code":"361122"
-          },
-          {
-            "name":"玉山县",
-            "code":"361123"
-          },
-          {
-            "name":"铅山县",
-            "code":"361124"
-          },
-          {
-            "name":"横峰县",
-            "code":"361125"
-          },
-          {
-            "name":"弋阳县",
-            "code":"361126"
-          },
-          {
-            "name":"余干县",
-            "code":"361127"
-          },
-          {
-            "name":"鄱阳县",
-            "code":"361128"
-          },
-          {
-            "name":"万年县",
-            "code":"361129"
-          },
-          {
-            "name":"婺源县",
-            "code":"361130"
-          },
-          {
-            "name":"德兴市",
-            "code":"361181"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name":"山东省",
-    "code":"370000",
-    "sub":[
-      {
-        "name":"济南市",
-        "code":"370100",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"370101"
-          },
-          {
-            "name":"历下区",
-            "code":"370102"
-          },
-          {
-            "name":"市中区",
-            "code":"370103"
-          },
-          {
-            "name":"槐荫区",
-            "code":"370104"
-          },
-          {
-            "name":"天桥区",
-            "code":"370105"
-          },
-          {
-            "name":"历城区",
-            "code":"370112"
-          },
-          {
-            "name":"长清区",
-            "code":"370113"
-          },
-          {
-            "name":"平阴县",
-            "code":"370124"
-          },
-          {
-            "name":"济阳县",
-            "code":"370125"
-          },
-          {
-            "name":"商河县",
-            "code":"370126"
-          },
-          {
-            "name":"章丘市",
-            "code":"370181"
-          }
-        ]
-      },
-      {
-        "name":"青岛市",
-        "code":"370200",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"370201"
-          },
-          {
-            "name":"市南区",
-            "code":"370202"
-          },
-          {
-            "name":"市北区",
-            "code":"370203"
-          },
-          {
-            "name":"黄岛区",
-            "code":"370211"
-          },
-          {
-            "name":"崂山区",
-            "code":"370212"
-          },
-          {
-            "name":"李沧区",
-            "code":"370213"
-          },
-          {
-            "name":"城阳区",
-            "code":"370214"
-          },
-          {
-            "name":"胶州市",
-            "code":"370281"
-          },
-          {
-            "name":"即墨市",
-            "code":"370282"
-          },
-          {
-            "name":"平度市",
-            "code":"370283"
-          },
-          {
-            "name":"莱西市",
-            "code":"370285"
-          }
-        ]
-      },
-      {
-        "name":"淄博市",
-        "code":"370300",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"370301"
-          },
-          {
-            "name":"淄川区",
-            "code":"370302"
-          },
-          {
-            "name":"张店区",
-            "code":"370303"
-          },
-          {
-            "name":"博山区",
-            "code":"370304"
-          },
-          {
-            "name":"临淄区",
-            "code":"370305"
-          },
-          {
-            "name":"周村区",
-            "code":"370306"
-          },
-          {
-            "name":"桓台县",
-            "code":"370321"
-          },
-          {
-            "name":"高青县",
-            "code":"370322"
-          },
-          {
-            "name":"沂源县",
-            "code":"370323"
-          }
-        ]
-      },
-      {
-        "name":"枣庄市",
-        "code":"370400",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"370401"
-          },
-          {
-            "name":"市中区",
-            "code":"370402"
-          },
-          {
-            "name":"薛城区",
-            "code":"370403"
-          },
-          {
-            "name":"峄城区",
-            "code":"370404"
-          },
-          {
-            "name":"台儿庄区",
-            "code":"370405"
-          },
-          {
-            "name":"山亭区",
-            "code":"370406"
-          },
-          {
-            "name":"滕州市",
-            "code":"370481"
-          }
-        ]
-      },
-      {
-        "name":"东营市",
-        "code":"370500",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"370501"
-          },
-          {
-            "name":"东营区",
-            "code":"370502"
-          },
-          {
-            "name":"河口区",
-            "code":"370503"
-          },
-          {
-            "name":"垦利县",
-            "code":"370521"
-          },
-          {
-            "name":"利津县",
-            "code":"370522"
-          },
-          {
-            "name":"广饶县",
-            "code":"370523"
-          }
-        ]
-      },
-      {
-        "name":"烟台市",
-        "code":"370600",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"370601"
-          },
-          {
-            "name":"芝罘区",
-            "code":"370602"
-          },
-          {
-            "name":"福山区",
-            "code":"370611"
-          },
-          {
-            "name":"牟平区",
-            "code":"370612"
-          },
-          {
-            "name":"莱山区",
-            "code":"370613"
-          },
-          {
-            "name":"长岛县",
-            "code":"370634"
-          },
-          {
-            "name":"龙口市",
-            "code":"370681"
-          },
-          {
-            "name":"莱阳市",
-            "code":"370682"
-          },
-          {
-            "name":"莱州市",
-            "code":"370683"
-          },
-          {
-            "name":"蓬莱市",
-            "code":"370684"
-          },
-          {
-            "name":"招远市",
-            "code":"370685"
-          },
-          {
-            "name":"栖霞市",
-            "code":"370686"
-          },
-          {
-            "name":"海阳市",
-            "code":"370687"
-          }
-        ]
-      },
-      {
-        "name":"潍坊市",
-        "code":"370700",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"370701"
-          },
-          {
-            "name":"潍城区",
-            "code":"370702"
-          },
-          {
-            "name":"寒亭区",
-            "code":"370703"
-          },
-          {
-            "name":"坊子区",
-            "code":"370704"
-          },
-          {
-            "name":"奎文区",
-            "code":"370705"
-          },
-          {
-            "name":"临朐县",
-            "code":"370724"
-          },
-          {
-            "name":"昌乐县",
-            "code":"370725"
-          },
-          {
-            "name":"青州市",
-            "code":"370781"
-          },
-          {
-            "name":"诸城市",
-            "code":"370782"
-          },
-          {
-            "name":"寿光市",
-            "code":"370783"
-          },
-          {
-            "name":"安丘市",
-            "code":"370784"
-          },
-          {
-            "name":"高密市",
-            "code":"370785"
-          },
-          {
-            "name":"昌邑市",
-            "code":"370786"
-          }
-        ]
-      },
-      {
-        "name":"济宁市",
-        "code":"370800",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"370801"
-          },
-          {
-            "name":"任城区",
-            "code":"370811"
-          },
-          {
-            "name":"兖州区",
-            "code":"370812"
-          },
-          {
-            "name":"微山县",
-            "code":"370826"
-          },
-          {
-            "name":"鱼台县",
-            "code":"370827"
-          },
-          {
-            "name":"金乡县",
-            "code":"370828"
-          },
-          {
-            "name":"嘉祥县",
-            "code":"370829"
-          },
-          {
-            "name":"汶上县",
-            "code":"370830"
-          },
-          {
-            "name":"泗水县",
-            "code":"370831"
-          },
-          {
-            "name":"梁山县",
-            "code":"370832"
-          },
-          {
-            "name":"曲阜市",
-            "code":"370881"
-          },
-          {
-            "name":"邹城市",
-            "code":"370883"
-          }
-        ]
-      },
-      {
-        "name":"泰安市",
-        "code":"370900",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"370901"
-          },
-          {
-            "name":"泰山区",
-            "code":"370902"
-          },
-          {
-            "name":"岱岳区",
-            "code":"370911"
-          },
-          {
-            "name":"宁阳县",
-            "code":"370921"
-          },
-          {
-            "name":"东平县",
-            "code":"370923"
-          },
-          {
-            "name":"新泰市",
-            "code":"370982"
-          },
-          {
-            "name":"肥城市",
-            "code":"370983"
-          }
-        ]
-      },
-      {
-        "name":"威海市",
-        "code":"371000",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"371001"
-          },
-          {
-            "name":"环翠区",
-            "code":"371002"
-          },
-          {
-            "name":"文登市",
-            "code":"371081"
-          },
-          {
-            "name":"荣成市",
-            "code":"371082"
-          },
-          {
-            "name":"乳山市",
-            "code":"371083"
-          }
-        ]
-      },
-      {
-        "name":"日照市",
-        "code":"371100",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"371101"
-          },
-          {
-            "name":"东港区",
-            "code":"371102"
-          },
-          {
-            "name":"岚山区",
-            "code":"371103"
-          },
-          {
-            "name":"五莲县",
-            "code":"371121"
-          },
-          {
-            "name":"莒县",
-            "code":"371122"
-          }
-        ]
-      },
-      {
-        "name":"莱芜市",
-        "code":"371200",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"371201"
-          },
-          {
-            "name":"莱城区",
-            "code":"371202"
-          },
-          {
-            "name":"钢城区",
-            "code":"371203"
-          }
-        ]
-      },
-      {
-        "name":"临沂市",
-        "code":"371300",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"371301"
-          },
-          {
-            "name":"兰山区",
-            "code":"371302"
-          },
-          {
-            "name":"罗庄区",
-            "code":"371311"
-          },
-          {
-            "name":"河东区",
-            "code":"371312"
-          },
-          {
-            "name":"沂南县",
-            "code":"371321"
-          },
-          {
-            "name":"郯城县",
-            "code":"371322"
-          },
-          {
-            "name":"沂水县",
-            "code":"371323"
-          },
-          {
-            "name":"兰陵县",
-            "code":"371324"
-          },
-          {
-            "name":"费县",
-            "code":"371325"
-          },
-          {
-            "name":"平邑县",
-            "code":"371326"
-          },
-          {
-            "name":"莒南县",
-            "code":"371327"
-          },
-          {
-            "name":"蒙阴县",
-            "code":"371328"
-          },
-          {
-            "name":"临沭县",
-            "code":"371329"
-          }
-        ]
-      },
-      {
-        "name":"德州市",
-        "code":"371400",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"371401"
-          },
-          {
-            "name":"德城区",
-            "code":"371402"
-          },
-          {
-            "name":"陵城区",
-            "code":"371403"
-          },
-          {
-            "name":"宁津县",
-            "code":"371422"
-          },
-          {
-            "name":"庆云县",
-            "code":"371423"
-          },
-          {
-            "name":"临邑县",
-            "code":"371424"
-          },
-          {
-            "name":"齐河县",
-            "code":"371425"
-          },
-          {
-            "name":"平原县",
-            "code":"371426"
-          },
-          {
-            "name":"夏津县",
-            "code":"371427"
-          },
-          {
-            "name":"武城县",
-            "code":"371428"
-          },
-          {
-            "name":"乐陵市",
-            "code":"371481"
-          },
-          {
-            "name":"禹城市",
-            "code":"371482"
-          }
-        ]
-      },
-      {
-        "name":"聊城市",
-        "code":"371500",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"371501"
-          },
-          {
-            "name":"东昌府区",
-            "code":"371502"
-          },
-          {
-            "name":"阳谷县",
-            "code":"371521"
-          },
-          {
-            "name":"莘县",
-            "code":"371522"
-          },
-          {
-            "name":"茌平县",
-            "code":"371523"
-          },
-          {
-            "name":"东阿县",
-            "code":"371524"
-          },
-          {
-            "name":"冠县",
-            "code":"371525"
-          },
-          {
-            "name":"高唐县",
-            "code":"371526"
-          },
-          {
-            "name":"临清市",
-            "code":"371581"
-          }
-        ]
-      },
-      {
-        "name":"滨州市",
-        "code":"371600",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"371601"
-          },
-          {
-            "name":"滨城区",
-            "code":"371602"
-          },
-          {
-            "name":"沾化区",
-            "code":"371603"
-          },
-          {
-            "name":"惠民县",
-            "code":"371621"
-          },
-          {
-            "name":"阳信县",
-            "code":"371622"
-          },
-          {
-            "name":"无棣县",
-            "code":"371623"
-          },
-          {
-            "name":"博兴县",
-            "code":"371625"
-          },
-          {
-            "name":"邹平县",
-            "code":"371626"
-          }
-        ]
-      },
-      {
-        "name":"菏泽市",
-        "code":"371700",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"371701"
-          },
-          {
-            "name":"牡丹区",
-            "code":"371702"
-          },
-          {
-            "name":"曹县",
-            "code":"371721"
-          },
-          {
-            "name":"单县",
-            "code":"371722"
-          },
-          {
-            "name":"成武县",
-            "code":"371723"
-          },
-          {
-            "name":"巨野县",
-            "code":"371724"
-          },
-          {
-            "name":"郓城县",
-            "code":"371725"
-          },
-          {
-            "name":"鄄城县",
-            "code":"371726"
-          },
-          {
-            "name":"定陶县",
-            "code":"371727"
-          },
-          {
-            "name":"东明县",
-            "code":"371728"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name":"河南省",
-    "code":"410000",
-    "sub":[
-      {
-        "name":"郑州市",
-        "code":"410100",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"410101"
-          },
-          {
-            "name":"中原区",
-            "code":"410102"
-          },
-          {
-            "name":"二七区",
-            "code":"410103"
-          },
-          {
-            "name":"管城回族区",
-            "code":"410104"
-          },
-          {
-            "name":"金水区",
-            "code":"410105"
-          },
-          {
-            "name":"上街区",
-            "code":"410106"
-          },
-          {
-            "name":"惠济区",
-            "code":"410108"
-          },
-          {
-            "name":"中牟县",
-            "code":"410122"
-          },
-          {
-            "name":"巩义市",
-            "code":"410181"
-          },
-          {
-            "name":"荥阳市",
-            "code":"410182"
-          },
-          {
-            "name":"新密市",
-            "code":"410183"
-          },
-          {
-            "name":"新郑市",
-            "code":"410184"
-          },
-          {
-            "name":"登封市",
-            "code":"410185"
-          }
-        ]
-      },
-      {
-        "name":"开封市",
-        "code":"410200",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"410201"
-          },
-          {
-            "name":"龙亭区",
-            "code":"410202"
-          },
-          {
-            "name":"顺河回族区",
-            "code":"410203"
-          },
-          {
-            "name":"鼓楼区",
-            "code":"410204"
-          },
-          {
-            "name":"禹王台区",
-            "code":"410205"
-          },
-          {
-            "name":"祥符区",
-            "code":"410212"
-          },
-          {
-            "name":"杞县",
-            "code":"410221"
-          },
-          {
-            "name":"通许县",
-            "code":"410222"
-          },
-          {
-            "name":"尉氏县",
-            "code":"410223"
-          },
-          {
-            "name":"兰考县",
-            "code":"410225"
-          }
-        ]
-      },
-      {
-        "name":"洛阳市",
-        "code":"410300",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"410301"
-          },
-          {
-            "name":"老城区",
-            "code":"410302"
-          },
-          {
-            "name":"西工区",
-            "code":"410303"
-          },
-          {
-            "name":"瀍河回族区",
-            "code":"410304"
-          },
-          {
-            "name":"涧西区",
-            "code":"410305"
-          },
-          {
-            "name":"吉利区",
-            "code":"410306"
-          },
-          {
-            "name":"洛龙区",
-            "code":"410311"
-          },
-          {
-            "name":"孟津县",
-            "code":"410322"
-          },
-          {
-            "name":"新安县",
-            "code":"410323"
-          },
-          {
-            "name":"栾川县",
-            "code":"410324"
-          },
-          {
-            "name":"嵩县",
-            "code":"410325"
-          },
-          {
-            "name":"汝阳县",
-            "code":"410326"
-          },
-          {
-            "name":"宜阳县",
-            "code":"410327"
-          },
-          {
-            "name":"洛宁县",
-            "code":"410328"
-          },
-          {
-            "name":"伊川县",
-            "code":"410329"
-          },
-          {
-            "name":"偃师市",
-            "code":"410381"
-          }
-        ]
-      },
-      {
-        "name":"平顶山市",
-        "code":"410400",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"410401"
-          },
-          {
-            "name":"新华区",
-            "code":"410402"
-          },
-          {
-            "name":"卫东区",
-            "code":"410403"
-          },
-          {
-            "name":"石龙区",
-            "code":"410404"
-          },
-          {
-            "name":"湛河区",
-            "code":"410411"
-          },
-          {
-            "name":"宝丰县",
-            "code":"410421"
-          },
-          {
-            "name":"叶县",
-            "code":"410422"
-          },
-          {
-            "name":"鲁山县",
-            "code":"410423"
-          },
-          {
-            "name":"郏县",
-            "code":"410425"
-          },
-          {
-            "name":"舞钢市",
-            "code":"410481"
-          },
-          {
-            "name":"汝州市",
-            "code":"410482"
-          }
-        ]
-      },
-      {
-        "name":"安阳市",
-        "code":"410500",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"410501"
-          },
-          {
-            "name":"文峰区",
-            "code":"410502"
-          },
-          {
-            "name":"北关区",
-            "code":"410503"
-          },
-          {
-            "name":"殷都区",
-            "code":"410505"
-          },
-          {
-            "name":"龙安区",
-            "code":"410506"
-          },
-          {
-            "name":"安阳县",
-            "code":"410522"
-          },
-          {
-            "name":"汤阴县",
-            "code":"410523"
-          },
-          {
-            "name":"滑县",
-            "code":"410526"
-          },
-          {
-            "name":"内黄县",
-            "code":"410527"
-          },
-          {
-            "name":"林州市",
-            "code":"410581"
-          }
-        ]
-      },
-      {
-        "name":"鹤壁市",
-        "code":"410600",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"410601"
-          },
-          {
-            "name":"鹤山区",
-            "code":"410602"
-          },
-          {
-            "name":"山城区",
-            "code":"410603"
-          },
-          {
-            "name":"淇滨区",
-            "code":"410611"
-          },
-          {
-            "name":"浚县",
-            "code":"410621"
-          },
-          {
-            "name":"淇县",
-            "code":"410622"
-          }
-        ]
-      },
-      {
-        "name":"新乡市",
-        "code":"410700",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"410701"
-          },
-          {
-            "name":"红旗区",
-            "code":"410702"
-          },
-          {
-            "name":"卫滨区",
-            "code":"410703"
-          },
-          {
-            "name":"凤泉区",
-            "code":"410704"
-          },
-          {
-            "name":"牧野区",
-            "code":"410711"
-          },
-          {
-            "name":"新乡县",
-            "code":"410721"
-          },
-          {
-            "name":"获嘉县",
-            "code":"410724"
-          },
-          {
-            "name":"原阳县",
-            "code":"410725"
-          },
-          {
-            "name":"延津县",
-            "code":"410726"
-          },
-          {
-            "name":"封丘县",
-            "code":"410727"
-          },
-          {
-            "name":"长垣县",
-            "code":"410728"
-          },
-          {
-            "name":"卫辉市",
-            "code":"410781"
-          },
-          {
-            "name":"辉县市",
-            "code":"410782"
-          }
-        ]
-      },
-      {
-        "name":"焦作市",
-        "code":"410800",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"410801"
-          },
-          {
-            "name":"解放区",
-            "code":"410802"
-          },
-          {
-            "name":"中站区",
-            "code":"410803"
-          },
-          {
-            "name":"马村区",
-            "code":"410804"
-          },
-          {
-            "name":"山阳区",
-            "code":"410811"
-          },
-          {
-            "name":"修武县",
-            "code":"410821"
-          },
-          {
-            "name":"博爱县",
-            "code":"410822"
-          },
-          {
-            "name":"武陟县",
-            "code":"410823"
-          },
-          {
-            "name":"温县",
-            "code":"410825"
-          },
-          {
-            "name":"沁阳市",
-            "code":"410882"
-          },
-          {
-            "name":"孟州市",
-            "code":"410883"
-          }
-        ]
-      },
-      {
-        "name":"濮阳市",
-        "code":"410900",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"410901"
-          },
-          {
-            "name":"华龙区",
-            "code":"410902"
-          },
-          {
-            "name":"清丰县",
-            "code":"410922"
-          },
-          {
-            "name":"南乐县",
-            "code":"410923"
-          },
-          {
-            "name":"范县",
-            "code":"410926"
-          },
-          {
-            "name":"台前县",
-            "code":"410927"
-          },
-          {
-            "name":"濮阳县",
-            "code":"410928"
-          }
-        ]
-      },
-      {
-        "name":"许昌市",
-        "code":"411000",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"411001"
-          },
-          {
-            "name":"魏都区",
-            "code":"411002"
-          },
-          {
-            "name":"许昌县",
-            "code":"411023"
-          },
-          {
-            "name":"鄢陵县",
-            "code":"411024"
-          },
-          {
-            "name":"襄城县",
-            "code":"411025"
-          },
-          {
-            "name":"禹州市",
-            "code":"411081"
-          },
-          {
-            "name":"长葛市",
-            "code":"411082"
-          }
-        ]
-      },
-      {
-        "name":"漯河市",
-        "code":"411100",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"411101"
-          },
-          {
-            "name":"源汇区",
-            "code":"411102"
-          },
-          {
-            "name":"郾城区",
-            "code":"411103"
-          },
-          {
-            "name":"召陵区",
-            "code":"411104"
-          },
-          {
-            "name":"舞阳县",
-            "code":"411121"
-          },
-          {
-            "name":"临颍县",
-            "code":"411122"
-          }
-        ]
-      },
-      {
-        "name":"三门峡市",
-        "code":"411200",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"411201"
-          },
-          {
-            "name":"湖滨区",
-            "code":"411202"
-          },
-          {
-            "name":"渑池县",
-            "code":"411221"
-          },
-          {
-            "name":"陕县",
-            "code":"411222"
-          },
-          {
-            "name":"卢氏县",
-            "code":"411224"
-          },
-          {
-            "name":"义马市",
-            "code":"411281"
-          },
-          {
-            "name":"灵宝市",
-            "code":"411282"
-          }
-        ]
-      },
-      {
-        "name":"南阳市",
-        "code":"411300",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"411301"
-          },
-          {
-            "name":"宛城区",
-            "code":"411302"
-          },
-          {
-            "name":"卧龙区",
-            "code":"411303"
-          },
-          {
-            "name":"南召县",
-            "code":"411321"
-          },
-          {
-            "name":"方城县",
-            "code":"411322"
-          },
-          {
-            "name":"西峡县",
-            "code":"411323"
-          },
-          {
-            "name":"镇平县",
-            "code":"411324"
-          },
-          {
-            "name":"内乡县",
-            "code":"411325"
-          },
-          {
-            "name":"淅川县",
-            "code":"411326"
-          },
-          {
-            "name":"社旗县",
-            "code":"411327"
-          },
-          {
-            "name":"唐河县",
-            "code":"411328"
-          },
-          {
-            "name":"新野县",
-            "code":"411329"
-          },
-          {
-            "name":"桐柏县",
-            "code":"411330"
-          },
-          {
-            "name":"邓州市",
-            "code":"411381"
-          }
-        ]
-      },
-      {
-        "name":"商丘市",
-        "code":"411400",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"411401"
-          },
-          {
-            "name":"梁园区",
-            "code":"411402"
-          },
-          {
-            "name":"睢阳区",
-            "code":"411403"
-          },
-          {
-            "name":"民权县",
-            "code":"411421"
-          },
-          {
-            "name":"睢县",
-            "code":"411422"
-          },
-          {
-            "name":"宁陵县",
-            "code":"411423"
-          },
-          {
-            "name":"柘城县",
-            "code":"411424"
-          },
-          {
-            "name":"虞城县",
-            "code":"411425"
-          },
-          {
-            "name":"夏邑县",
-            "code":"411426"
-          },
-          {
-            "name":"永城市",
-            "code":"411481"
-          }
-        ]
-      },
-      {
-        "name":"信阳市",
-        "code":"411500",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"411501"
-          },
-          {
-            "name":"浉河区",
-            "code":"411502"
-          },
-          {
-            "name":"平桥区",
-            "code":"411503"
-          },
-          {
-            "name":"罗山县",
-            "code":"411521"
-          },
-          {
-            "name":"光山县",
-            "code":"411522"
-          },
-          {
-            "name":"新县",
-            "code":"411523"
-          },
-          {
-            "name":"商城县",
-            "code":"411524"
-          },
-          {
-            "name":"固始县",
-            "code":"411525"
-          },
-          {
-            "name":"潢川县",
-            "code":"411526"
-          },
-          {
-            "name":"淮滨县",
-            "code":"411527"
-          },
-          {
-            "name":"息县",
-            "code":"411528"
-          }
-        ]
-      },
-      {
-        "name":"周口市",
-        "code":"411600",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"411601"
-          },
-          {
-            "name":"川汇区",
-            "code":"411602"
-          },
-          {
-            "name":"扶沟县",
-            "code":"411621"
-          },
-          {
-            "name":"西华县",
-            "code":"411622"
-          },
-          {
-            "name":"商水县",
-            "code":"411623"
-          },
-          {
-            "name":"沈丘县",
-            "code":"411624"
-          },
-          {
-            "name":"郸城县",
-            "code":"411625"
-          },
-          {
-            "name":"淮阳县",
-            "code":"411626"
-          },
-          {
-            "name":"太康县",
-            "code":"411627"
-          },
-          {
-            "name":"鹿邑县",
-            "code":"411628"
-          },
-          {
-            "name":"项城市",
-            "code":"411681"
-          }
-        ]
-      },
-      {
-        "name":"驻马店市",
-        "code":"411700",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"411701"
-          },
-          {
-            "name":"驿城区",
-            "code":"411702"
-          },
-          {
-            "name":"西平县",
-            "code":"411721"
-          },
-          {
-            "name":"上蔡县",
-            "code":"411722"
-          },
-          {
-            "name":"平舆县",
-            "code":"411723"
-          },
-          {
-            "name":"正阳县",
-            "code":"411724"
-          },
-          {
-            "name":"确山县",
-            "code":"411725"
-          },
-          {
-            "name":"泌阳县",
-            "code":"411726"
-          },
-          {
-            "name":"汝南县",
-            "code":"411727"
-          },
-          {
-            "name":"遂平县",
-            "code":"411728"
-          },
-          {
-            "name":"新蔡县",
-            "code":"411729"
-          }
-        ]
-      },
-      {
-        "name":"济源市",
-        "code":"419001"
-      }
-    ]
-  },
-  {
-    "name":"湖北省",
-    "code":"420000",
-    "sub":[
-      {
-        "name":"武汉市",
-        "code":"420100",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"420101"
-          },
-          {
-            "name":"江岸区",
-            "code":"420102"
-          },
-          {
-            "name":"江汉区",
-            "code":"420103"
-          },
-          {
-            "name":"硚口区",
-            "code":"420104"
-          },
-          {
-            "name":"汉阳区",
-            "code":"420105"
-          },
-          {
-            "name":"武昌区",
-            "code":"420106"
-          },
-          {
-            "name":"青山区",
-            "code":"420107"
-          },
-          {
-            "name":"洪山区",
-            "code":"420111"
-          },
-          {
-            "name":"东西湖区",
-            "code":"420112"
-          },
-          {
-            "name":"汉南区",
-            "code":"420113"
-          },
-          {
-            "name":"蔡甸区",
-            "code":"420114"
-          },
-          {
-            "name":"江夏区",
-            "code":"420115"
-          },
-          {
-            "name":"黄陂区",
-            "code":"420116"
-          },
-          {
-            "name":"新洲区",
-            "code":"420117"
-          }
-        ]
-      },
-      {
-        "name":"黄石市",
-        "code":"420200",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"420201"
-          },
-          {
-            "name":"黄石港区",
-            "code":"420202"
-          },
-          {
-            "name":"西塞山区",
-            "code":"420203"
-          },
-          {
-            "name":"下陆区",
-            "code":"420204"
-          },
-          {
-            "name":"铁山区",
-            "code":"420205"
-          },
-          {
-            "name":"阳新县",
-            "code":"420222"
-          },
-          {
-            "name":"大冶市",
-            "code":"420281"
-          }
-        ]
-      },
-      {
-        "name":"十堰市",
-        "code":"420300",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"420301"
-          },
-          {
-            "name":"茅箭区",
-            "code":"420302"
-          },
-          {
-            "name":"张湾区",
-            "code":"420303"
-          },
-          {
-            "name":"郧阳区",
-            "code":"420304"
-          },
-          {
-            "name":"郧西县",
-            "code":"420322"
-          },
-          {
-            "name":"竹山县",
-            "code":"420323"
-          },
-          {
-            "name":"竹溪县",
-            "code":"420324"
-          },
-          {
-            "name":"房县",
-            "code":"420325"
-          },
-          {
-            "name":"丹江口市",
-            "code":"420381"
-          }
-        ]
-      },
-      {
-        "name":"宜昌市",
-        "code":"420500",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"420501"
-          },
-          {
-            "name":"西陵区",
-            "code":"420502"
-          },
-          {
-            "name":"伍家岗区",
-            "code":"420503"
-          },
-          {
-            "name":"点军区",
-            "code":"420504"
-          },
-          {
-            "name":"猇亭区",
-            "code":"420505"
-          },
-          {
-            "name":"夷陵区",
-            "code":"420506"
-          },
-          {
-            "name":"远安县",
-            "code":"420525"
-          },
-          {
-            "name":"兴山县",
-            "code":"420526"
-          },
-          {
-            "name":"秭归县",
-            "code":"420527"
-          },
-          {
-            "name":"长阳土家族自治县",
-            "code":"420528"
-          },
-          {
-            "name":"五峰土家族自治县",
-            "code":"420529"
-          },
-          {
-            "name":"宜都市",
-            "code":"420581"
-          },
-          {
-            "name":"当阳市",
-            "code":"420582"
-          },
-          {
-            "name":"枝江市",
-            "code":"420583"
-          }
-        ]
-      },
-      {
-        "name":"襄阳市",
-        "code":"420600",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"420601"
-          },
-          {
-            "name":"襄城区",
-            "code":"420602"
-          },
-          {
-            "name":"樊城区",
-            "code":"420606"
-          },
-          {
-            "name":"襄州区",
-            "code":"420607"
-          },
-          {
-            "name":"南漳县",
-            "code":"420624"
-          },
-          {
-            "name":"谷城县",
-            "code":"420625"
-          },
-          {
-            "name":"保康县",
-            "code":"420626"
-          },
-          {
-            "name":"老河口市",
-            "code":"420682"
-          },
-          {
-            "name":"枣阳市",
-            "code":"420683"
-          },
-          {
-            "name":"宜城市",
-            "code":"420684"
-          }
-        ]
-      },
-      {
-        "name":"鄂州市",
-        "code":"420700",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"420701"
-          },
-          {
-            "name":"梁子湖区",
-            "code":"420702"
-          },
-          {
-            "name":"华容区",
-            "code":"420703"
-          },
-          {
-            "name":"鄂城区",
-            "code":"420704"
-          }
-        ]
-      },
-      {
-        "name":"荆门市",
-        "code":"420800",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"420801"
-          },
-          {
-            "name":"东宝区",
-            "code":"420802"
-          },
-          {
-            "name":"掇刀区",
-            "code":"420804"
-          },
-          {
-            "name":"京山县",
-            "code":"420821"
-          },
-          {
-            "name":"沙洋县",
-            "code":"420822"
-          },
-          {
-            "name":"钟祥市",
-            "code":"420881"
-          }
-        ]
-      },
-      {
-        "name":"孝感市",
-        "code":"420900",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"420901"
-          },
-          {
-            "name":"孝南区",
-            "code":"420902"
-          },
-          {
-            "name":"孝昌县",
-            "code":"420921"
-          },
-          {
-            "name":"大悟县",
-            "code":"420922"
-          },
-          {
-            "name":"云梦县",
-            "code":"420923"
-          },
-          {
-            "name":"应城市",
-            "code":"420981"
-          },
-          {
-            "name":"安陆市",
-            "code":"420982"
-          },
-          {
-            "name":"汉川市",
-            "code":"420984"
-          }
-        ]
-      },
-      {
-        "name":"荆州市",
-        "code":"421000",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"421001"
-          },
-          {
-            "name":"沙市区",
-            "code":"421002"
-          },
-          {
-            "name":"荆州区",
-            "code":"421003"
-          },
-          {
-            "name":"公安县",
-            "code":"421022"
-          },
-          {
-            "name":"监利县",
-            "code":"421023"
-          },
-          {
-            "name":"江陵县",
-            "code":"421024"
-          },
-          {
-            "name":"石首市",
-            "code":"421081"
-          },
-          {
-            "name":"洪湖市",
-            "code":"421083"
-          },
-          {
-            "name":"松滋市",
-            "code":"421087"
-          }
-        ]
-      },
-      {
-        "name":"黄冈市",
-        "code":"421100",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"421101"
-          },
-          {
-            "name":"黄州区",
-            "code":"421102"
-          },
-          {
-            "name":"团风县",
-            "code":"421121"
-          },
-          {
-            "name":"红安县",
-            "code":"421122"
-          },
-          {
-            "name":"罗田县",
-            "code":"421123"
-          },
-          {
-            "name":"英山县",
-            "code":"421124"
-          },
-          {
-            "name":"浠水县",
-            "code":"421125"
-          },
-          {
-            "name":"蕲春县",
-            "code":"421126"
-          },
-          {
-            "name":"黄梅县",
-            "code":"421127"
-          },
-          {
-            "name":"麻城市",
-            "code":"421181"
-          },
-          {
-            "name":"武穴市",
-            "code":"421182"
-          }
-        ]
-      },
-      {
-        "name":"咸宁市",
-        "code":"421200",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"421201"
-          },
-          {
-            "name":"咸安区",
-            "code":"421202"
-          },
-          {
-            "name":"嘉鱼县",
-            "code":"421221"
-          },
-          {
-            "name":"通城县",
-            "code":"421222"
-          },
-          {
-            "name":"崇阳县",
-            "code":"421223"
-          },
-          {
-            "name":"通山县",
-            "code":"421224"
-          },
-          {
-            "name":"赤壁市",
-            "code":"421281"
-          }
-        ]
-      },
-      {
-        "name":"随州市",
-        "code":"421300",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"421301"
-          },
-          {
-            "name":"曾都区",
-            "code":"421303"
-          },
-          {
-            "name":"随县",
-            "code":"421321"
-          },
-          {
-            "name":"广水市",
-            "code":"421381"
-          }
-        ]
-      },
-      {
-        "name":"恩施土家族苗族自治州",
-        "code":"422800",
-        "sub":[
-          {
-            "name":"恩施市",
-            "code":"422801"
-          },
-          {
-            "name":"利川市",
-            "code":"422802"
-          },
-          {
-            "name":"建始县",
-            "code":"422822"
-          },
-          {
-            "name":"巴东县",
-            "code":"422823"
-          },
-          {
-            "name":"宣恩县",
-            "code":"422825"
-          },
-          {
-            "name":"咸丰县",
-            "code":"422826"
-          },
-          {
-            "name":"来凤县",
-            "code":"422827"
-          },
-          {
-            "name":"鹤峰县",
-            "code":"422828"
-          }
-        ]
-      },
-      {
-        "name":"仙桃市",
-        "code":"429004"
-      },
-      {
-        "name":"潜江市",
-        "code":"429005"
-      },
-      {
-        "name":"天门市",
-        "code":"429006"
-      },
-      {
-        "name":"神农架林区",
-        "code":"429021"
-      }
-    ]
-  },
-  {
-    "name":"湖南省",
-    "code":"430000",
-    "sub":[
-      {
-        "name":"长沙市",
-        "code":"430100",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"430101"
-          },
-          {
-            "name":"芙蓉区",
-            "code":"430102"
-          },
-          {
-            "name":"天心区",
-            "code":"430103"
-          },
-          {
-            "name":"岳麓区",
-            "code":"430104"
-          },
-          {
-            "name":"开福区",
-            "code":"430105"
-          },
-          {
-            "name":"雨花区",
-            "code":"430111"
-          },
-          {
-            "name":"望城区",
-            "code":"430112"
-          },
-          {
-            "name":"长沙县",
-            "code":"430121"
-          },
-          {
-            "name":"宁乡县",
-            "code":"430124"
-          },
-          {
-            "name":"浏阳市",
-            "code":"430181"
-          }
-        ]
-      },
-      {
-        "name":"株洲市",
-        "code":"430200",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"430201"
-          },
-          {
-            "name":"荷塘区",
-            "code":"430202"
-          },
-          {
-            "name":"芦淞区",
-            "code":"430203"
-          },
-          {
-            "name":"石峰区",
-            "code":"430204"
-          },
-          {
-            "name":"天元区",
-            "code":"430211"
-          },
-          {
-            "name":"株洲县",
-            "code":"430221"
-          },
-          {
-            "name":"攸县",
-            "code":"430223"
-          },
-          {
-            "name":"茶陵县",
-            "code":"430224"
-          },
-          {
-            "name":"炎陵县",
-            "code":"430225"
-          },
-          {
-            "name":"醴陵市",
-            "code":"430281"
-          }
-        ]
-      },
-      {
-        "name":"湘潭市",
-        "code":"430300",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"430301"
-          },
-          {
-            "name":"雨湖区",
-            "code":"430302"
-          },
-          {
-            "name":"岳塘区",
-            "code":"430304"
-          },
-          {
-            "name":"湘潭县",
-            "code":"430321"
-          },
-          {
-            "name":"湘乡市",
-            "code":"430381"
-          },
-          {
-            "name":"韶山市",
-            "code":"430382"
-          }
-        ]
-      },
-      {
-        "name":"衡阳市",
-        "code":"430400",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"430401"
-          },
-          {
-            "name":"珠晖区",
-            "code":"430405"
-          },
-          {
-            "name":"雁峰区",
-            "code":"430406"
-          },
-          {
-            "name":"石鼓区",
-            "code":"430407"
-          },
-          {
-            "name":"蒸湘区",
-            "code":"430408"
-          },
-          {
-            "name":"南岳区",
-            "code":"430412"
-          },
-          {
-            "name":"衡阳县",
-            "code":"430421"
-          },
-          {
-            "name":"衡南县",
-            "code":"430422"
-          },
-          {
-            "name":"衡山县",
-            "code":"430423"
-          },
-          {
-            "name":"衡东县",
-            "code":"430424"
-          },
-          {
-            "name":"祁东县",
-            "code":"430426"
-          },
-          {
-            "name":"耒阳市",
-            "code":"430481"
-          },
-          {
-            "name":"常宁市",
-            "code":"430482"
-          }
-        ]
-      },
-      {
-        "name":"邵阳市",
-        "code":"430500",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"430501"
-          },
-          {
-            "name":"双清区",
-            "code":"430502"
-          },
-          {
-            "name":"大祥区",
-            "code":"430503"
-          },
-          {
-            "name":"北塔区",
-            "code":"430511"
-          },
-          {
-            "name":"邵东县",
-            "code":"430521"
-          },
-          {
-            "name":"新邵县",
-            "code":"430522"
-          },
-          {
-            "name":"邵阳县",
-            "code":"430523"
-          },
-          {
-            "name":"隆回县",
-            "code":"430524"
-          },
-          {
-            "name":"洞口县",
-            "code":"430525"
-          },
-          {
-            "name":"绥宁县",
-            "code":"430527"
-          },
-          {
-            "name":"新宁县",
-            "code":"430528"
-          },
-          {
-            "name":"城步苗族自治县",
-            "code":"430529"
-          },
-          {
-            "name":"武冈市",
-            "code":"430581"
-          }
-        ]
-      },
-      {
-        "name":"岳阳市",
-        "code":"430600",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"430601"
-          },
-          {
-            "name":"岳阳楼区",
-            "code":"430602"
-          },
-          {
-            "name":"云溪区",
-            "code":"430603"
-          },
-          {
-            "name":"君山区",
-            "code":"430611"
-          },
-          {
-            "name":"岳阳县",
-            "code":"430621"
-          },
-          {
-            "name":"华容县",
-            "code":"430623"
-          },
-          {
-            "name":"湘阴县",
-            "code":"430624"
-          },
-          {
-            "name":"平江县",
-            "code":"430626"
-          },
-          {
-            "name":"汨罗市",
-            "code":"430681"
-          },
-          {
-            "name":"临湘市",
-            "code":"430682"
-          }
-        ]
-      },
-      {
-        "name":"常德市",
-        "code":"430700",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"430701"
-          },
-          {
-            "name":"武陵区",
-            "code":"430702"
-          },
-          {
-            "name":"鼎城区",
-            "code":"430703"
-          },
-          {
-            "name":"安乡县",
-            "code":"430721"
-          },
-          {
-            "name":"汉寿县",
-            "code":"430722"
-          },
-          {
-            "name":"澧县",
-            "code":"430723"
-          },
-          {
-            "name":"临澧县",
-            "code":"430724"
-          },
-          {
-            "name":"桃源县",
-            "code":"430725"
-          },
-          {
-            "name":"石门县",
-            "code":"430726"
-          },
-          {
-            "name":"津市市",
-            "code":"430781"
-          }
-        ]
-      },
-      {
-        "name":"张家界市",
-        "code":"430800",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"430801"
-          },
-          {
-            "name":"永定区",
-            "code":"430802"
-          },
-          {
-            "name":"武陵源区",
-            "code":"430811"
-          },
-          {
-            "name":"慈利县",
-            "code":"430821"
-          },
-          {
-            "name":"桑植县",
-            "code":"430822"
-          }
-        ]
-      },
-      {
-        "name":"益阳市",
-        "code":"430900",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"430901"
-          },
-          {
-            "name":"资阳区",
-            "code":"430902"
-          },
-          {
-            "name":"赫山区",
-            "code":"430903"
-          },
-          {
-            "name":"南县",
-            "code":"430921"
-          },
-          {
-            "name":"桃江县",
-            "code":"430922"
-          },
-          {
-            "name":"安化县",
-            "code":"430923"
-          },
-          {
-            "name":"沅江市",
-            "code":"430981"
-          }
-        ]
-      },
-      {
-        "name":"郴州市",
-        "code":"431000",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"431001"
-          },
-          {
-            "name":"北湖区",
-            "code":"431002"
-          },
-          {
-            "name":"苏仙区",
-            "code":"431003"
-          },
-          {
-            "name":"桂阳县",
-            "code":"431021"
-          },
-          {
-            "name":"宜章县",
-            "code":"431022"
-          },
-          {
-            "name":"永兴县",
-            "code":"431023"
-          },
-          {
-            "name":"嘉禾县",
-            "code":"431024"
-          },
-          {
-            "name":"临武县",
-            "code":"431025"
-          },
-          {
-            "name":"汝城县",
-            "code":"431026"
-          },
-          {
-            "name":"桂东县",
-            "code":"431027"
-          },
-          {
-            "name":"安仁县",
-            "code":"431028"
-          },
-          {
-            "name":"资兴市",
-            "code":"431081"
-          }
-        ]
-      },
-      {
-        "name":"永州市",
-        "code":"431100",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"431101"
-          },
-          {
-            "name":"零陵区",
-            "code":"431102"
-          },
-          {
-            "name":"冷水滩区",
-            "code":"431103"
-          },
-          {
-            "name":"祁阳县",
-            "code":"431121"
-          },
-          {
-            "name":"东安县",
-            "code":"431122"
-          },
-          {
-            "name":"双牌县",
-            "code":"431123"
-          },
-          {
-            "name":"道县",
-            "code":"431124"
-          },
-          {
-            "name":"江永县",
-            "code":"431125"
-          },
-          {
-            "name":"宁远县",
-            "code":"431126"
-          },
-          {
-            "name":"蓝山县",
-            "code":"431127"
-          },
-          {
-            "name":"新田县",
-            "code":"431128"
-          },
-          {
-            "name":"江华瑶族自治县",
-            "code":"431129"
-          }
-        ]
-      },
-      {
-        "name":"怀化市",
-        "code":"431200",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"431201"
-          },
-          {
-            "name":"鹤城区",
-            "code":"431202"
-          },
-          {
-            "name":"中方县",
-            "code":"431221"
-          },
-          {
-            "name":"沅陵县",
-            "code":"431222"
-          },
-          {
-            "name":"辰溪县",
-            "code":"431223"
-          },
-          {
-            "name":"溆浦县",
-            "code":"431224"
-          },
-          {
-            "name":"会同县",
-            "code":"431225"
-          },
-          {
-            "name":"麻阳苗族自治县",
-            "code":"431226"
-          },
-          {
-            "name":"新晃侗族自治县",
-            "code":"431227"
-          },
-          {
-            "name":"芷江侗族自治县",
-            "code":"431228"
-          },
-          {
-            "name":"靖州苗族侗族自治县",
-            "code":"431229"
-          },
-          {
-            "name":"通道侗族自治县",
-            "code":"431230"
-          },
-          {
-            "name":"洪江市",
-            "code":"431281"
-          }
-        ]
-      },
-      {
-        "name":"娄底市",
-        "code":"431300",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"431301"
-          },
-          {
-            "name":"娄星区",
-            "code":"431302"
-          },
-          {
-            "name":"双峰县",
-            "code":"431321"
-          },
-          {
-            "name":"新化县",
-            "code":"431322"
-          },
-          {
-            "name":"冷水江市",
-            "code":"431381"
-          },
-          {
-            "name":"涟源市",
-            "code":"431382"
-          }
-        ]
-      },
-      {
-        "name":"湘西土家族苗族自治州",
-        "code":"433100",
-        "sub":[
-          {
-            "name":"吉首市",
-            "code":"433101"
-          },
-          {
-            "name":"泸溪县",
-            "code":"433122"
-          },
-          {
-            "name":"凤凰县",
-            "code":"433123"
-          },
-          {
-            "name":"花垣县",
-            "code":"433124"
-          },
-          {
-            "name":"保靖县",
-            "code":"433125"
-          },
-          {
-            "name":"古丈县",
-            "code":"433126"
-          },
-          {
-            "name":"永顺县",
-            "code":"433127"
-          },
-          {
-            "name":"龙山县",
-            "code":"433130"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name":"广东省",
-    "code":"440000",
-    "sub":[
-      {
-        "name":"广州市",
-        "code":"440100",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"440101"
-          },
-          {
-            "name":"荔湾区",
-            "code":"440103"
-          },
-          {
-            "name":"越秀区",
-            "code":"440104"
-          },
-          {
-            "name":"海珠区",
-            "code":"440105"
-          },
-          {
-            "name":"天河区",
-            "code":"440106"
-          },
-          {
-            "name":"白云区",
-            "code":"440111"
-          },
-          {
-            "name":"黄埔区",
-            "code":"440112"
-          },
-          {
-            "name":"番禺区",
-            "code":"440113"
-          },
-          {
-            "name":"花都区",
-            "code":"440114"
-          },
-          {
-            "name":"南沙区",
-            "code":"440115"
-          },
-          {
-            "name":"从化区",
-            "code":"440117"
-          },
-          {
-            "name":"增城区",
-            "code":"440118"
-          }
-        ]
-      },
-      {
-        "name":"韶关市",
-        "code":"440200",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"440201"
-          },
-          {
-            "name":"武江区",
-            "code":"440203"
-          },
-          {
-            "name":"浈江区",
-            "code":"440204"
-          },
-          {
-            "name":"曲江区",
-            "code":"440205"
-          },
-          {
-            "name":"始兴县",
-            "code":"440222"
-          },
-          {
-            "name":"仁化县",
-            "code":"440224"
-          },
-          {
-            "name":"翁源县",
-            "code":"440229"
-          },
-          {
-            "name":"乳源瑶族自治县",
-            "code":"440232"
-          },
-          {
-            "name":"新丰县",
-            "code":"440233"
-          },
-          {
-            "name":"乐昌市",
-            "code":"440281"
-          },
-          {
-            "name":"南雄市",
-            "code":"440282"
-          }
-        ]
-      },
-      {
-        "name":"深圳市",
-        "code":"440300",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"440301"
-          },
-          {
-            "name":"罗湖区",
-            "code":"440303"
-          },
-          {
-            "name":"福田区",
-            "code":"440304"
-          },
-          {
-            "name":"南山区",
-            "code":"440305"
-          },
-          {
-            "name":"宝安区",
-            "code":"440306"
-          },
-          {
-            "name":"龙岗区",
-            "code":"440307"
-          },
-          {
-            "name":"盐田区",
-            "code":"440308"
-          }
-        ]
-      },
-      {
-        "name":"珠海市",
-        "code":"440400",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"440401"
-          },
-          {
-            "name":"香洲区",
-            "code":"440402"
-          },
-          {
-            "name":"斗门区",
-            "code":"440403"
-          },
-          {
-            "name":"金湾区",
-            "code":"440404"
-          }
-        ]
-      },
-      {
-        "name":"汕头市",
-        "code":"440500",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"440501"
-          },
-          {
-            "name":"龙湖区",
-            "code":"440507"
-          },
-          {
-            "name":"金平区",
-            "code":"440511"
-          },
-          {
-            "name":"濠江区",
-            "code":"440512"
-          },
-          {
-            "name":"潮阳区",
-            "code":"440513"
-          },
-          {
-            "name":"潮南区",
-            "code":"440514"
-          },
-          {
-            "name":"澄海区",
-            "code":"440515"
-          },
-          {
-            "name":"南澳县",
-            "code":"440523"
-          }
-        ]
-      },
-      {
-        "name":"佛山市",
-        "code":"440600",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"440601"
-          },
-          {
-            "name":"禅城区",
-            "code":"440604"
-          },
-          {
-            "name":"南海区",
-            "code":"440605"
-          },
-          {
-            "name":"顺德区",
-            "code":"440606"
-          },
-          {
-            "name":"三水区",
-            "code":"440607"
-          },
-          {
-            "name":"高明区",
-            "code":"440608"
-          }
-        ]
-      },
-      {
-        "name":"江门市",
-        "code":"440700",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"440701"
-          },
-          {
-            "name":"蓬江区",
-            "code":"440703"
-          },
-          {
-            "name":"江海区",
-            "code":"440704"
-          },
-          {
-            "name":"新会区",
-            "code":"440705"
-          },
-          {
-            "name":"台山市",
-            "code":"440781"
-          },
-          {
-            "name":"开平市",
-            "code":"440783"
-          },
-          {
-            "name":"鹤山市",
-            "code":"440784"
-          },
-          {
-            "name":"恩平市",
-            "code":"440785"
-          }
-        ]
-      },
-      {
-        "name":"湛江市",
-        "code":"440800",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"440801"
-          },
-          {
-            "name":"赤坎区",
-            "code":"440802"
-          },
-          {
-            "name":"霞山区",
-            "code":"440803"
-          },
-          {
-            "name":"坡头区",
-            "code":"440804"
-          },
-          {
-            "name":"麻章区",
-            "code":"440811"
-          },
-          {
-            "name":"遂溪县",
-            "code":"440823"
-          },
-          {
-            "name":"徐闻县",
-            "code":"440825"
-          },
-          {
-            "name":"廉江市",
-            "code":"440881"
-          },
-          {
-            "name":"雷州市",
-            "code":"440882"
-          },
-          {
-            "name":"吴川市",
-            "code":"440883"
-          }
-        ]
-      },
-      {
-        "name":"茂名市",
-        "code":"440900",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"440901"
-          },
-          {
-            "name":"茂南区",
-            "code":"440902"
-          },
-          {
-            "name":"电白区",
-            "code":"440904"
-          },
-          {
-            "name":"高州市",
-            "code":"440981"
-          },
-          {
-            "name":"化州市",
-            "code":"440982"
-          },
-          {
-            "name":"信宜市",
-            "code":"440983"
-          }
-        ]
-      },
-      {
-        "name":"肇庆市",
-        "code":"441200",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"441201"
-          },
-          {
-            "name":"端州区",
-            "code":"441202"
-          },
-          {
-            "name":"鼎湖区",
-            "code":"441203"
-          },
-          {
-            "name":"广宁县",
-            "code":"441223"
-          },
-          {
-            "name":"怀集县",
-            "code":"441224"
-          },
-          {
-            "name":"封开县",
-            "code":"441225"
-          },
-          {
-            "name":"德庆县",
-            "code":"441226"
-          },
-          {
-            "name":"高要市",
-            "code":"441283"
-          },
-          {
-            "name":"四会市",
-            "code":"441284"
-          }
-        ]
-      },
-      {
-        "name":"惠州市",
-        "code":"441300",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"441301"
-          },
-          {
-            "name":"惠城区",
-            "code":"441302"
-          },
-          {
-            "name":"惠阳区",
-            "code":"441303"
-          },
-          {
-            "name":"博罗县",
-            "code":"441322"
-          },
-          {
-            "name":"惠东县",
-            "code":"441323"
-          },
-          {
-            "name":"龙门县",
-            "code":"441324"
-          }
-        ]
-      },
-      {
-        "name":"梅州市",
-        "code":"441400",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"441401"
-          },
-          {
-            "name":"梅江区",
-            "code":"441402"
-          },
-          {
-            "name":"梅县区",
-            "code":"441403"
-          },
-          {
-            "name":"大埔县",
-            "code":"441422"
-          },
-          {
-            "name":"丰顺县",
-            "code":"441423"
-          },
-          {
-            "name":"五华县",
-            "code":"441424"
-          },
-          {
-            "name":"平远县",
-            "code":"441426"
-          },
-          {
-            "name":"蕉岭县",
-            "code":"441427"
-          },
-          {
-            "name":"兴宁市",
-            "code":"441481"
-          }
-        ]
-      },
-      {
-        "name":"汕尾市",
-        "code":"441500",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"441501"
-          },
-          {
-            "name":"城区",
-            "code":"441502"
-          },
-          {
-            "name":"海丰县",
-            "code":"441521"
-          },
-          {
-            "name":"陆河县",
-            "code":"441523"
-          },
-          {
-            "name":"陆丰市",
-            "code":"441581"
-          }
-        ]
-      },
-      {
-        "name":"河源市",
-        "code":"441600",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"441601"
-          },
-          {
-            "name":"源城区",
-            "code":"441602"
-          },
-          {
-            "name":"紫金县",
-            "code":"441621"
-          },
-          {
-            "name":"龙川县",
-            "code":"441622"
-          },
-          {
-            "name":"连平县",
-            "code":"441623"
-          },
-          {
-            "name":"和平县",
-            "code":"441624"
-          },
-          {
-            "name":"东源县",
-            "code":"441625"
-          }
-        ]
-      },
-      {
-        "name":"阳江市",
-        "code":"441700",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"441701"
-          },
-          {
-            "name":"江城区",
-            "code":"441702"
-          },
-          {
-            "name":"阳东区",
-            "code":"441704"
-          },
-          {
-            "name":"阳西县",
-            "code":"441721"
-          },
-          {
-            "name":"阳春市",
-            "code":"441781"
-          }
-        ]
-      },
-      {
-        "name":"清远市",
-        "code":"441800",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"441801"
-          },
-          {
-            "name":"清城区",
-            "code":"441802"
-          },
-          {
-            "name":"清新区",
-            "code":"441803"
-          },
-          {
-            "name":"佛冈县",
-            "code":"441821"
-          },
-          {
-            "name":"阳山县",
-            "code":"441823"
-          },
-          {
-            "name":"连山壮族瑶族自治县",
-            "code":"441825"
-          },
-          {
-            "name":"连南瑶族自治县",
-            "code":"441826"
-          },
-          {
-            "name":"英德市",
-            "code":"441881"
-          },
-          {
-            "name":"连州市",
-            "code":"441882"
-          }
-        ]
-      },
-      {
-        "name":"东莞市",
-        "code":"441900",
-        "sub":[
-
-        ]
-      },
-      {
-        "name":"中山市",
-        "code":"442000",
-        "sub":[
-
-        ]
-      },
-      {
-        "name":"潮州市",
-        "code":"445100",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"445101"
-          },
-          {
-            "name":"湘桥区",
-            "code":"445102"
-          },
-          {
-            "name":"潮安区",
-            "code":"445103"
-          },
-          {
-            "name":"饶平县",
-            "code":"445122"
-          }
-        ]
-      },
-      {
-        "name":"揭阳市",
-        "code":"445200",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"445201"
-          },
-          {
-            "name":"榕城区",
-            "code":"445202"
-          },
-          {
-            "name":"揭东区",
-            "code":"445203"
-          },
-          {
-            "name":"揭西县",
-            "code":"445222"
-          },
-          {
-            "name":"惠来县",
-            "code":"445224"
-          },
-          {
-            "name":"普宁市",
-            "code":"445281"
-          }
-        ]
-      },
-      {
-        "name":"云浮市",
-        "code":"445300",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"445301"
-          },
-          {
-            "name":"云城区",
-            "code":"445302"
-          },
-          {
-            "name":"云安区",
-            "code":"445303"
-          },
-          {
-            "name":"新兴县",
-            "code":"445321"
-          },
-          {
-            "name":"郁南县",
-            "code":"445322"
-          },
-          {
-            "name":"罗定市",
-            "code":"445381"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name":"广西壮族自治区",
-    "code":"450000",
-    "sub":[
-      {
-        "name":"南宁市",
-        "code":"450100",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"450101"
-          },
-          {
-            "name":"兴宁区",
-            "code":"450102"
-          },
-          {
-            "name":"青秀区",
-            "code":"450103"
-          },
-          {
-            "name":"江南区",
-            "code":"450105"
-          },
-          {
-            "name":"西乡塘区",
-            "code":"450107"
-          },
-          {
-            "name":"良庆区",
-            "code":"450108"
-          },
-          {
-            "name":"邕宁区",
-            "code":"450109"
-          },
-          {
-            "name":"武鸣县",
-            "code":"450122"
-          },
-          {
-            "name":"隆安县",
-            "code":"450123"
-          },
-          {
-            "name":"马山县",
-            "code":"450124"
-          },
-          {
-            "name":"上林县",
-            "code":"450125"
-          },
-          {
-            "name":"宾阳县",
-            "code":"450126"
-          },
-          {
-            "name":"横县",
-            "code":"450127"
-          }
-        ]
-      },
-      {
-        "name":"柳州市",
-        "code":"450200",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"450201"
-          },
-          {
-            "name":"城中区",
-            "code":"450202"
-          },
-          {
-            "name":"鱼峰区",
-            "code":"450203"
-          },
-          {
-            "name":"柳南区",
-            "code":"450204"
-          },
-          {
-            "name":"柳北区",
-            "code":"450205"
-          },
-          {
-            "name":"柳江县",
-            "code":"450221"
-          },
-          {
-            "name":"柳城县",
-            "code":"450222"
-          },
-          {
-            "name":"鹿寨县",
-            "code":"450223"
-          },
-          {
-            "name":"融安县",
-            "code":"450224"
-          },
-          {
-            "name":"融水苗族自治县",
-            "code":"450225"
-          },
-          {
-            "name":"三江侗族自治县",
-            "code":"450226"
-          }
-        ]
-      },
-      {
-        "name":"桂林市",
-        "code":"450300",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"450301"
-          },
-          {
-            "name":"秀峰区",
-            "code":"450302"
-          },
-          {
-            "name":"叠彩区",
-            "code":"450303"
-          },
-          {
-            "name":"象山区",
-            "code":"450304"
-          },
-          {
-            "name":"七星区",
-            "code":"450305"
-          },
-          {
-            "name":"雁山区",
-            "code":"450311"
-          },
-          {
-            "name":"临桂区",
-            "code":"450312"
-          },
-          {
-            "name":"阳朔县",
-            "code":"450321"
-          },
-          {
-            "name":"灵川县",
-            "code":"450323"
-          },
-          {
-            "name":"全州县",
-            "code":"450324"
-          },
-          {
-            "name":"兴安县",
-            "code":"450325"
-          },
-          {
-            "name":"永福县",
-            "code":"450326"
-          },
-          {
-            "name":"灌阳县",
-            "code":"450327"
-          },
-          {
-            "name":"龙胜各族自治县",
-            "code":"450328"
-          },
-          {
-            "name":"资源县",
-            "code":"450329"
-          },
-          {
-            "name":"平乐县",
-            "code":"450330"
-          },
-          {
-            "name":"荔浦县",
-            "code":"450331"
-          },
-          {
-            "name":"恭城瑶族自治县",
-            "code":"450332"
-          }
-        ]
-      },
-      {
-        "name":"梧州市",
-        "code":"450400",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"450401"
-          },
-          {
-            "name":"万秀区",
-            "code":"450403"
-          },
-          {
-            "name":"长洲区",
-            "code":"450405"
-          },
-          {
-            "name":"龙圩区",
-            "code":"450406"
-          },
-          {
-            "name":"苍梧县",
-            "code":"450421"
-          },
-          {
-            "name":"藤县",
-            "code":"450422"
-          },
-          {
-            "name":"蒙山县",
-            "code":"450423"
-          },
-          {
-            "name":"岑溪市",
-            "code":"450481"
-          }
-        ]
-      },
-      {
-        "name":"北海市",
-        "code":"450500",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"450501"
-          },
-          {
-            "name":"海城区",
-            "code":"450502"
-          },
-          {
-            "name":"银海区",
-            "code":"450503"
-          },
-          {
-            "name":"铁山港区",
-            "code":"450512"
-          },
-          {
-            "name":"合浦县",
-            "code":"450521"
-          }
-        ]
-      },
-      {
-        "name":"防城港市",
-        "code":"450600",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"450601"
-          },
-          {
-            "name":"港口区",
-            "code":"450602"
-          },
-          {
-            "name":"防城区",
-            "code":"450603"
-          },
-          {
-            "name":"上思县",
-            "code":"450621"
-          },
-          {
-            "name":"东兴市",
-            "code":"450681"
-          }
-        ]
-      },
-      {
-        "name":"钦州市",
-        "code":"450700",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"450701"
-          },
-          {
-            "name":"钦南区",
-            "code":"450702"
-          },
-          {
-            "name":"钦北区",
-            "code":"450703"
-          },
-          {
-            "name":"灵山县",
-            "code":"450721"
-          },
-          {
-            "name":"浦北县",
-            "code":"450722"
-          }
-        ]
-      },
-      {
-        "name":"贵港市",
-        "code":"450800",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"450801"
-          },
-          {
-            "name":"港北区",
-            "code":"450802"
-          },
-          {
-            "name":"港南区",
-            "code":"450803"
-          },
-          {
-            "name":"覃塘区",
-            "code":"450804"
-          },
-          {
-            "name":"平南县",
-            "code":"450821"
-          },
-          {
-            "name":"桂平市",
-            "code":"450881"
-          }
-        ]
-      },
-      {
-        "name":"玉林市",
-        "code":"450900",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"450901"
-          },
-          {
-            "name":"玉州区",
-            "code":"450902"
-          },
-          {
-            "name":"福绵区",
-            "code":"450903"
-          },
-          {
-            "name":"容县",
-            "code":"450921"
-          },
-          {
-            "name":"陆川县",
-            "code":"450922"
-          },
-          {
-            "name":"博白县",
-            "code":"450923"
-          },
-          {
-            "name":"兴业县",
-            "code":"450924"
-          },
-          {
-            "name":"北流市",
-            "code":"450981"
-          }
-        ]
-      },
-      {
-        "name":"百色市",
-        "code":"451000",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"451001"
-          },
-          {
-            "name":"右江区",
-            "code":"451002"
-          },
-          {
-            "name":"田阳县",
-            "code":"451021"
-          },
-          {
-            "name":"田东县",
-            "code":"451022"
-          },
-          {
-            "name":"平果县",
-            "code":"451023"
-          },
-          {
-            "name":"德保县",
-            "code":"451024"
-          },
-          {
-            "name":"靖西县",
-            "code":"451025"
-          },
-          {
-            "name":"那坡县",
-            "code":"451026"
-          },
-          {
-            "name":"凌云县",
-            "code":"451027"
-          },
-          {
-            "name":"乐业县",
-            "code":"451028"
-          },
-          {
-            "name":"田林县",
-            "code":"451029"
-          },
-          {
-            "name":"西林县",
-            "code":"451030"
-          },
-          {
-            "name":"隆林各族自治县",
-            "code":"451031"
-          }
-        ]
-      },
-      {
-        "name":"贺州市",
-        "code":"451100",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"451101"
-          },
-          {
-            "name":"八步区",
-            "code":"451102"
-          },
-          {
-            "name":"平桂管理区",
-            "code":"451119"
-          },
-          {
-            "name":"昭平县",
-            "code":"451121"
-          },
-          {
-            "name":"钟山县",
-            "code":"451122"
-          },
-          {
-            "name":"富川瑶族自治县",
-            "code":"451123"
-          }
-        ]
-      },
-      {
-        "name":"河池市",
-        "code":"451200",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"451201"
-          },
-          {
-            "name":"金城江区",
-            "code":"451202"
-          },
-          {
-            "name":"南丹县",
-            "code":"451221"
-          },
-          {
-            "name":"天峨县",
-            "code":"451222"
-          },
-          {
-            "name":"凤山县",
-            "code":"451223"
-          },
-          {
-            "name":"东兰县",
-            "code":"451224"
-          },
-          {
-            "name":"罗城仫佬族自治县",
-            "code":"451225"
-          },
-          {
-            "name":"环江毛南族自治县",
-            "code":"451226"
-          },
-          {
-            "name":"巴马瑶族自治县",
-            "code":"451227"
-          },
-          {
-            "name":"都安瑶族自治县",
-            "code":"451228"
-          },
-          {
-            "name":"大化瑶族自治县",
-            "code":"451229"
-          },
-          {
-            "name":"宜州市",
-            "code":"451281"
-          }
-        ]
-      },
-      {
-        "name":"来宾市",
-        "code":"451300",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"451301"
-          },
-          {
-            "name":"兴宾区",
-            "code":"451302"
-          },
-          {
-            "name":"忻城县",
-            "code":"451321"
-          },
-          {
-            "name":"象州县",
-            "code":"451322"
-          },
-          {
-            "name":"武宣县",
-            "code":"451323"
-          },
-          {
-            "name":"金秀瑶族自治县",
-            "code":"451324"
-          },
-          {
-            "name":"合山市",
-            "code":"451381"
-          }
-        ]
-      },
-      {
-        "name":"崇左市",
-        "code":"451400",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"451401"
-          },
-          {
-            "name":"江州区",
-            "code":"451402"
-          },
-          {
-            "name":"扶绥县",
-            "code":"451421"
-          },
-          {
-            "name":"宁明县",
-            "code":"451422"
-          },
-          {
-            "name":"龙州县",
-            "code":"451423"
-          },
-          {
-            "name":"大新县",
-            "code":"451424"
-          },
-          {
-            "name":"天等县",
-            "code":"451425"
-          },
-          {
-            "name":"凭祥市",
-            "code":"451481"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name":"海南省",
-    "code":"460000",
-    "sub":[
-      {
-        "name":"海口市",
-        "code":"460100",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"460101"
-          },
-          {
-            "name":"秀英区",
-            "code":"460105"
-          },
-          {
-            "name":"龙华区",
-            "code":"460106"
-          },
-          {
-            "name":"琼山区",
-            "code":"460107"
-          },
-          {
-            "name":"美兰区",
-            "code":"460108"
-          }
-        ]
-      },
-      {
-        "name":"三亚市",
-        "code":"460200",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"460201"
-          },
-          {
-            "name":"海棠区",
-            "code":"460202"
-          },
-          {
-            "name":"吉阳区",
-            "code":"460203"
-          },
-          {
-            "name":"天涯区",
-            "code":"460204"
-          },
-          {
-            "name":"崖州区",
-            "code":"460205"
-          }
-        ]
-      },
-      {
-        "name":"三沙市",
-        "code":"460300",
-        "sub":[
-          {
-            "name":"西沙群岛",
-            "code":"460321"
-          },
-          {
-            "name":"南沙群岛",
-            "code":"460322"
-          },
-          {
-            "name":"中沙群岛的岛礁及其海域",
-            "code":"460323"
-          }
-        ]
-      },
-      {
-        "name":"五指山市",
-        "code":"469001"
-      },
-      {
-        "name":"琼海市",
-        "code":"469002"
-      },
-      {
-        "name":"儋州市",
-        "code":"469003"
-      },
-      {
-        "name":"文昌市",
-        "code":"469005"
-      },
-      {
-        "name":"万宁市",
-        "code":"469006"
-      },
-      {
-        "name":"东方市",
-        "code":"469007"
-      },
-      {
-        "name":"定安县",
-        "code":"469021"
-      },
-      {
-        "name":"屯昌县",
-        "code":"469022"
-      },
-      {
-        "name":"澄迈县",
-        "code":"469023"
-      },
-      {
-        "name":"临高县",
-        "code":"469024"
-      },
-      {
-        "name":"白沙黎族自治县",
-        "code":"469025"
-      },
-      {
-        "name":"昌江黎族自治县",
-        "code":"469026"
-      },
-      {
-        "name":"乐东黎族自治县",
-        "code":"469027"
-      },
-      {
-        "name":"陵水黎族自治县",
-        "code":"469028"
-      },
-      {
-        "name":"保亭黎族苗族自治县",
-        "code":"469029"
-      },
-      {
-        "name":"琼中黎族苗族自治县",
-        "code":"469030"
-      }
-    ]
-  },
-  {
-    "name":"重庆",
-    "code":"500000",
-    "sub": [
-      {
-        "name": "重庆市",
-        "code": "500000",
-        "sub":[
-            {
-              "name":"万州区",
-              "code":"500101"
-            },
-            {
-              "name":"涪陵区",
-              "code":"500102"
-            },
-            {
-              "name":"渝中区",
-              "code":"500103"
-            },
-            {
-              "name":"大渡口区",
-              "code":"500104"
-            },
-            {
-              "name":"江北区",
-              "code":"500105"
-            },
-            {
-              "name":"沙坪坝区",
-              "code":"500106"
-            },
-            {
-              "name":"九龙坡区",
-              "code":"500107"
-            },
-            {
-              "name":"南岸区",
-              "code":"500108"
-            },
-            {
-              "name":"北碚区",
-              "code":"500109"
-            },
-            {
-              "name":"綦江区",
-              "code":"500110"
-            },
-            {
-              "name":"大足区",
-              "code":"500111"
-            },
-            {
-              "name":"渝北区",
-              "code":"500112"
-            },
-            {
-              "name":"巴南区",
-              "code":"500113"
-            },
-            {
-              "name":"黔江区",
-              "code":"500114"
-            },
-            {
-              "name":"长寿区",
-              "code":"500115"
-            },
-            {
-              "name":"江津区",
-              "code":"500116"
-            },
-            {
-              "name":"合川区",
-              "code":"500117"
-            },
-            {
-              "name":"永川区",
-              "code":"500118"
-            },
-            {
-              "name":"南川区",
-              "code":"500119"
-            },
-            {
-              "name":"璧山区",
-              "code":"500120"
-            },
-            {
-              "name":"铜梁区",
-              "code":"500151"
-            },
-            {
-              "name":"潼南县",
-              "code":"500223"
-            },
-            {
-              "name":"荣昌县",
-              "code":"500226"
-            },
-            {
-              "name":"梁平县",
-              "code":"500228"
-            },
-            {
-              "name":"城口县",
-              "code":"500229"
-            },
-            {
-              "name":"丰都县",
-              "code":"500230"
-            },
-            {
-              "name":"垫江县",
-              "code":"500231"
-            },
-            {
-              "name":"武隆县",
-              "code":"500232"
-            },
-            {
-              "name":"忠县",
-              "code":"500233"
-            },
-            {
-              "name":"开县",
-              "code":"500234"
-            },
-            {
-              "name":"云阳县",
-              "code":"500235"
-            },
-            {
-              "name":"奉节县",
-              "code":"500236"
-            },
-            {
-              "name":"巫山县",
-              "code":"500237"
-            },
-            {
-              "name":"巫溪县",
-              "code":"500238"
-            },
-            {
-              "name":"石柱土家族自治县",
-              "code":"500240"
-            },
-            {
-              "name":"秀山土家族苗族自治县",
-              "code":"500241"
-            },
-            {
-              "name":"酉阳土家族苗族自治县",
-              "code":"500242"
-            },
-            {
-              "name":"彭水苗族土家族自治县",
-              "code":"500243"
-            }
-        ]
-      }
-    ]
-  },
-  {
-    "name":"四川省",
-    "code":"510000",
-    "sub":[
-      {
-        "name":"成都市",
-        "code":"510100",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"510101"
-          },
-          {
-            "name":"锦江区",
-            "code":"510104"
-          },
-          {
-            "name":"青羊区",
-            "code":"510105"
-          },
-          {
-            "name":"金牛区",
-            "code":"510106"
-          },
-          {
-            "name":"武侯区",
-            "code":"510107"
-          },
-          {
-            "name":"成华区",
-            "code":"510108"
-          },
-          {
-            "name":"龙泉驿区",
-            "code":"510112"
-          },
-          {
-            "name":"青白江区",
-            "code":"510113"
-          },
-          {
-            "name":"新都区",
-            "code":"510114"
-          },
-          {
-            "name":"温江区",
-            "code":"510115"
-          },
-          {
-            "name":"金堂县",
-            "code":"510121"
-          },
-          {
-            "name":"双流县",
-            "code":"510122"
-          },
-          {
-            "name":"郫县",
-            "code":"510124"
-          },
-          {
-            "name":"大邑县",
-            "code":"510129"
-          },
-          {
-            "name":"蒲江县",
-            "code":"510131"
-          },
-          {
-            "name":"新津县",
-            "code":"510132"
-          },
-          {
-            "name":"都江堰市",
-            "code":"510181"
-          },
-          {
-            "name":"彭州市",
-            "code":"510182"
-          },
-          {
-            "name":"邛崃市",
-            "code":"510183"
-          },
-          {
-            "name":"崇州市",
-            "code":"510184"
-          }
-        ]
-      },
-      {
-        "name":"自贡市",
-        "code":"510300",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"510301"
-          },
-          {
-            "name":"自流井区",
-            "code":"510302"
-          },
-          {
-            "name":"贡井区",
-            "code":"510303"
-          },
-          {
-            "name":"大安区",
-            "code":"510304"
-          },
-          {
-            "name":"沿滩区",
-            "code":"510311"
-          },
-          {
-            "name":"荣县",
-            "code":"510321"
-          },
-          {
-            "name":"富顺县",
-            "code":"510322"
-          }
-        ]
-      },
-      {
-        "name":"攀枝花市",
-        "code":"510400",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"510401"
-          },
-          {
-            "name":"东区",
-            "code":"510402"
-          },
-          {
-            "name":"西区",
-            "code":"510403"
-          },
-          {
-            "name":"仁和区",
-            "code":"510411"
-          },
-          {
-            "name":"米易县",
-            "code":"510421"
-          },
-          {
-            "name":"盐边县",
-            "code":"510422"
-          }
-        ]
-      },
-      {
-        "name":"泸州市",
-        "code":"510500",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"510501"
-          },
-          {
-            "name":"江阳区",
-            "code":"510502"
-          },
-          {
-            "name":"纳溪区",
-            "code":"510503"
-          },
-          {
-            "name":"龙马潭区",
-            "code":"510504"
-          },
-          {
-            "name":"泸县",
-            "code":"510521"
-          },
-          {
-            "name":"合江县",
-            "code":"510522"
-          },
-          {
-            "name":"叙永县",
-            "code":"510524"
-          },
-          {
-            "name":"古蔺县",
-            "code":"510525"
-          }
-        ]
-      },
-      {
-        "name":"德阳市",
-        "code":"510600",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"510601"
-          },
-          {
-            "name":"旌阳区",
-            "code":"510603"
-          },
-          {
-            "name":"中江县",
-            "code":"510623"
-          },
-          {
-            "name":"罗江县",
-            "code":"510626"
-          },
-          {
-            "name":"广汉市",
-            "code":"510681"
-          },
-          {
-            "name":"什邡市",
-            "code":"510682"
-          },
-          {
-            "name":"绵竹市",
-            "code":"510683"
-          }
-        ]
-      },
-      {
-        "name":"绵阳市",
-        "code":"510700",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"510701"
-          },
-          {
-            "name":"涪城区",
-            "code":"510703"
-          },
-          {
-            "name":"游仙区",
-            "code":"510704"
-          },
-          {
-            "name":"三台县",
-            "code":"510722"
-          },
-          {
-            "name":"盐亭县",
-            "code":"510723"
-          },
-          {
-            "name":"安县",
-            "code":"510724"
-          },
-          {
-            "name":"梓潼县",
-            "code":"510725"
-          },
-          {
-            "name":"北川羌族自治县",
-            "code":"510726"
-          },
-          {
-            "name":"平武县",
-            "code":"510727"
-          },
-          {
-            "name":"江油市",
-            "code":"510781"
-          }
-        ]
-      },
-      {
-        "name":"广元市",
-        "code":"510800",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"510801"
-          },
-          {
-            "name":"利州区",
-            "code":"510802"
-          },
-          {
-            "name":"昭化区",
-            "code":"510811"
-          },
-          {
-            "name":"朝天区",
-            "code":"510812"
-          },
-          {
-            "name":"旺苍县",
-            "code":"510821"
-          },
-          {
-            "name":"青川县",
-            "code":"510822"
-          },
-          {
-            "name":"剑阁县",
-            "code":"510823"
-          },
-          {
-            "name":"苍溪县",
-            "code":"510824"
-          }
-        ]
-      },
-      {
-        "name":"遂宁市",
-        "code":"510900",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"510901"
-          },
-          {
-            "name":"船山区",
-            "code":"510903"
-          },
-          {
-            "name":"安居区",
-            "code":"510904"
-          },
-          {
-            "name":"蓬溪县",
-            "code":"510921"
-          },
-          {
-            "name":"射洪县",
-            "code":"510922"
-          },
-          {
-            "name":"大英县",
-            "code":"510923"
-          }
-        ]
-      },
-      {
-        "name":"内江市",
-        "code":"511000",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"511001"
-          },
-          {
-            "name":"市中区",
-            "code":"511002"
-          },
-          {
-            "name":"东兴区",
-            "code":"511011"
-          },
-          {
-            "name":"威远县",
-            "code":"511024"
-          },
-          {
-            "name":"资中县",
-            "code":"511025"
-          },
-          {
-            "name":"隆昌县",
-            "code":"511028"
-          }
-        ]
-      },
-      {
-        "name":"乐山市",
-        "code":"511100",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"511101"
-          },
-          {
-            "name":"市中区",
-            "code":"511102"
-          },
-          {
-            "name":"沙湾区",
-            "code":"511111"
-          },
-          {
-            "name":"五通桥区",
-            "code":"511112"
-          },
-          {
-            "name":"金口河区",
-            "code":"511113"
-          },
-          {
-            "name":"犍为县",
-            "code":"511123"
-          },
-          {
-            "name":"井研县",
-            "code":"511124"
-          },
-          {
-            "name":"夹江县",
-            "code":"511126"
-          },
-          {
-            "name":"沐川县",
-            "code":"511129"
-          },
-          {
-            "name":"峨边彝族自治县",
-            "code":"511132"
-          },
-          {
-            "name":"马边彝族自治县",
-            "code":"511133"
-          },
-          {
-            "name":"峨眉山市",
-            "code":"511181"
-          }
-        ]
-      },
-      {
-        "name":"南充市",
-        "code":"511300",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"511301"
-          },
-          {
-            "name":"顺庆区",
-            "code":"511302"
-          },
-          {
-            "name":"高坪区",
-            "code":"511303"
-          },
-          {
-            "name":"嘉陵区",
-            "code":"511304"
-          },
-          {
-            "name":"南部县",
-            "code":"511321"
-          },
-          {
-            "name":"营山县",
-            "code":"511322"
-          },
-          {
-            "name":"蓬安县",
-            "code":"511323"
-          },
-          {
-            "name":"仪陇县",
-            "code":"511324"
-          },
-          {
-            "name":"西充县",
-            "code":"511325"
-          },
-          {
-            "name":"阆中市",
-            "code":"511381"
-          }
-        ]
-      },
-      {
-        "name":"眉山市",
-        "code":"511400",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"511401"
-          },
-          {
-            "name":"东坡区",
-            "code":"511402"
-          },
-          {
-            "name":"彭山区",
-            "code":"511403"
-          },
-          {
-            "name":"仁寿县",
-            "code":"511421"
-          },
-          {
-            "name":"洪雅县",
-            "code":"511423"
-          },
-          {
-            "name":"丹棱县",
-            "code":"511424"
-          },
-          {
-            "name":"青神县",
-            "code":"511425"
-          }
-        ]
-      },
-      {
-        "name":"宜宾市",
-        "code":"511500",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"511501"
-          },
-          {
-            "name":"翠屏区",
-            "code":"511502"
-          },
-          {
-            "name":"南溪区",
-            "code":"511503"
-          },
-          {
-            "name":"宜宾县",
-            "code":"511521"
-          },
-          {
-            "name":"江安县",
-            "code":"511523"
-          },
-          {
-            "name":"长宁县",
-            "code":"511524"
-          },
-          {
-            "name":"高县",
-            "code":"511525"
-          },
-          {
-            "name":"珙县",
-            "code":"511526"
-          },
-          {
-            "name":"筠连县",
-            "code":"511527"
-          },
-          {
-            "name":"兴文县",
-            "code":"511528"
-          },
-          {
-            "name":"屏山县",
-            "code":"511529"
-          }
-        ]
-      },
-      {
-        "name":"广安市",
-        "code":"511600",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"511601"
-          },
-          {
-            "name":"广安区",
-            "code":"511602"
-          },
-          {
-            "name":"前锋区",
-            "code":"511603"
-          },
-          {
-            "name":"岳池县",
-            "code":"511621"
-          },
-          {
-            "name":"武胜县",
-            "code":"511622"
-          },
-          {
-            "name":"邻水县",
-            "code":"511623"
-          },
-          {
-            "name":"华蓥市",
-            "code":"511681"
-          }
-        ]
-      },
-      {
-        "name":"达州市",
-        "code":"511700",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"511701"
-          },
-          {
-            "name":"通川区",
-            "code":"511702"
-          },
-          {
-            "name":"达川区",
-            "code":"511703"
-          },
-          {
-            "name":"宣汉县",
-            "code":"511722"
-          },
-          {
-            "name":"开江县",
-            "code":"511723"
-          },
-          {
-            "name":"大竹县",
-            "code":"511724"
-          },
-          {
-            "name":"渠县",
-            "code":"511725"
-          },
-          {
-            "name":"万源市",
-            "code":"511781"
-          }
-        ]
-      },
-      {
-        "name":"雅安市",
-        "code":"511800",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"511801"
-          },
-          {
-            "name":"雨城区",
-            "code":"511802"
-          },
-          {
-            "name":"名山区",
-            "code":"511803"
-          },
-          {
-            "name":"荥经县",
-            "code":"511822"
-          },
-          {
-            "name":"汉源县",
-            "code":"511823"
-          },
-          {
-            "name":"石棉县",
-            "code":"511824"
-          },
-          {
-            "name":"天全县",
-            "code":"511825"
-          },
-          {
-            "name":"芦山县",
-            "code":"511826"
-          },
-          {
-            "name":"宝兴县",
-            "code":"511827"
-          }
-        ]
-      },
-      {
-        "name":"巴中市",
-        "code":"511900",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"511901"
-          },
-          {
-            "name":"巴州区",
-            "code":"511902"
-          },
-          {
-            "name":"恩阳区",
-            "code":"511903"
-          },
-          {
-            "name":"通江县",
-            "code":"511921"
-          },
-          {
-            "name":"南江县",
-            "code":"511922"
-          },
-          {
-            "name":"平昌县",
-            "code":"511923"
-          }
-        ]
-      },
-      {
-        "name":"资阳市",
-        "code":"512000",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"512001"
-          },
-          {
-            "name":"雁江区",
-            "code":"512002"
-          },
-          {
-            "name":"安岳县",
-            "code":"512021"
-          },
-          {
-            "name":"乐至县",
-            "code":"512022"
-          },
-          {
-            "name":"简阳市",
-            "code":"512081"
-          }
-        ]
-      },
-      {
-        "name":"阿坝藏族羌族自治州",
-        "code":"513200",
-        "sub":[
-          {
-            "name":"汶川县",
-            "code":"513221"
-          },
-          {
-            "name":"理县",
-            "code":"513222"
-          },
-          {
-            "name":"茂县",
-            "code":"513223"
-          },
-          {
-            "name":"松潘县",
-            "code":"513224"
-          },
-          {
-            "name":"九寨沟县",
-            "code":"513225"
-          },
-          {
-            "name":"金川县",
-            "code":"513226"
-          },
-          {
-            "name":"小金县",
-            "code":"513227"
-          },
-          {
-            "name":"黑水县",
-            "code":"513228"
-          },
-          {
-            "name":"马尔康县",
-            "code":"513229"
-          },
-          {
-            "name":"壤塘县",
-            "code":"513230"
-          },
-          {
-            "name":"阿坝县",
-            "code":"513231"
-          },
-          {
-            "name":"若尔盖县",
-            "code":"513232"
-          },
-          {
-            "name":"红原县",
-            "code":"513233"
-          }
-        ]
-      },
-      {
-        "name":"甘孜藏族自治州",
-        "code":"513300",
-        "sub":[
-          {
-            "name":"康定县",
-            "code":"513321"
-          },
-          {
-            "name":"泸定县",
-            "code":"513322"
-          },
-          {
-            "name":"丹巴县",
-            "code":"513323"
-          },
-          {
-            "name":"九龙县",
-            "code":"513324"
-          },
-          {
-            "name":"雅江县",
-            "code":"513325"
-          },
-          {
-            "name":"道孚县",
-            "code":"513326"
-          },
-          {
-            "name":"炉霍县",
-            "code":"513327"
-          },
-          {
-            "name":"甘孜县",
-            "code":"513328"
-          },
-          {
-            "name":"新龙县",
-            "code":"513329"
-          },
-          {
-            "name":"德格县",
-            "code":"513330"
-          },
-          {
-            "name":"白玉县",
-            "code":"513331"
-          },
-          {
-            "name":"石渠县",
-            "code":"513332"
-          },
-          {
-            "name":"色达县",
-            "code":"513333"
-          },
-          {
-            "name":"理塘县",
-            "code":"513334"
-          },
-          {
-            "name":"巴塘县",
-            "code":"513335"
-          },
-          {
-            "name":"乡城县",
-            "code":"513336"
-          },
-          {
-            "name":"稻城县",
-            "code":"513337"
-          },
-          {
-            "name":"得荣县",
-            "code":"513338"
-          }
-        ]
-      },
-      {
-        "name":"凉山彝族自治州",
-        "code":"513400",
-        "sub":[
-          {
-            "name":"西昌市",
-            "code":"513401"
-          },
-          {
-            "name":"木里藏族自治县",
-            "code":"513422"
-          },
-          {
-            "name":"盐源县",
-            "code":"513423"
-          },
-          {
-            "name":"德昌县",
-            "code":"513424"
-          },
-          {
-            "name":"会理县",
-            "code":"513425"
-          },
-          {
-            "name":"会东县",
-            "code":"513426"
-          },
-          {
-            "name":"宁南县",
-            "code":"513427"
-          },
-          {
-            "name":"普格县",
-            "code":"513428"
-          },
-          {
-            "name":"布拖县",
-            "code":"513429"
-          },
-          {
-            "name":"金阳县",
-            "code":"513430"
-          },
-          {
-            "name":"昭觉县",
-            "code":"513431"
-          },
-          {
-            "name":"喜德县",
-            "code":"513432"
-          },
-          {
-            "name":"冕宁县",
-            "code":"513433"
-          },
-          {
-            "name":"越西县",
-            "code":"513434"
-          },
-          {
-            "name":"甘洛县",
-            "code":"513435"
-          },
-          {
-            "name":"美姑县",
-            "code":"513436"
-          },
-          {
-            "name":"雷波县",
-            "code":"513437"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name":"贵州省",
-    "code":"520000",
-    "sub":[
-      {
-        "name":"贵阳市",
-        "code":"520100",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"520101"
-          },
-          {
-            "name":"南明区",
-            "code":"520102"
-          },
-          {
-            "name":"云岩区",
-            "code":"520103"
-          },
-          {
-            "name":"花溪区",
-            "code":"520111"
-          },
-          {
-            "name":"乌当区",
-            "code":"520112"
-          },
-          {
-            "name":"白云区",
-            "code":"520113"
-          },
-          {
-            "name":"观山湖区",
-            "code":"520115"
-          },
-          {
-            "name":"开阳县",
-            "code":"520121"
-          },
-          {
-            "name":"息烽县",
-            "code":"520122"
-          },
-          {
-            "name":"修文县",
-            "code":"520123"
-          },
-          {
-            "name":"清镇市",
-            "code":"520181"
-          }
-        ]
-      },
-      {
-        "name":"六盘水市",
-        "code":"520200",
-        "sub":[
-          {
-            "name":"钟山区",
-            "code":"520201"
-          },
-          {
-            "name":"六枝特区",
-            "code":"520203"
-          },
-          {
-            "name":"水城县",
-            "code":"520221"
-          },
-          {
-            "name":"盘县",
-            "code":"520222"
-          }
-        ]
-      },
-      {
-        "name":"遵义市",
-        "code":"520300",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"520301"
-          },
-          {
-            "name":"红花岗区",
-            "code":"520302"
-          },
-          {
-            "name":"汇川区",
-            "code":"520303"
-          },
-          {
-            "name":"遵义县",
-            "code":"520321"
-          },
-          {
-            "name":"桐梓县",
-            "code":"520322"
-          },
-          {
-            "name":"绥阳县",
-            "code":"520323"
-          },
-          {
-            "name":"正安县",
-            "code":"520324"
-          },
-          {
-            "name":"道真仡佬族苗族自治县",
-            "code":"520325"
-          },
-          {
-            "name":"务川仡佬族苗族自治县",
-            "code":"520326"
-          },
-          {
-            "name":"凤冈县",
-            "code":"520327"
-          },
-          {
-            "name":"湄潭县",
-            "code":"520328"
-          },
-          {
-            "name":"余庆县",
-            "code":"520329"
-          },
-          {
-            "name":"习水县",
-            "code":"520330"
-          },
-          {
-            "name":"赤水市",
-            "code":"520381"
-          },
-          {
-            "name":"仁怀市",
-            "code":"520382"
-          }
-        ]
-      },
-      {
-        "name":"安顺市",
-        "code":"520400",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"520401"
-          },
-          {
-            "name":"西秀区",
-            "code":"520402"
-          },
-          {
-            "name":"平坝区",
-            "code":"520403"
-          },
-          {
-            "name":"普定县",
-            "code":"520422"
-          },
-          {
-            "name":"镇宁布依族苗族自治县",
-            "code":"520423"
-          },
-          {
-            "name":"关岭布依族苗族自治县",
-            "code":"520424"
-          },
-          {
-            "name":"紫云苗族布依族自治县",
-            "code":"520425"
-          }
-        ]
-      },
-      {
-        "name":"毕节市",
-        "code":"520500",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"520501"
-          },
-          {
-            "name":"七星关区",
-            "code":"520502"
-          },
-          {
-            "name":"大方县",
-            "code":"520521"
-          },
-          {
-            "name":"黔西县",
-            "code":"520522"
-          },
-          {
-            "name":"金沙县",
-            "code":"520523"
-          },
-          {
-            "name":"织金县",
-            "code":"520524"
-          },
-          {
-            "name":"纳雍县",
-            "code":"520525"
-          },
-          {
-            "name":"威宁彝族回族苗族自治县",
-            "code":"520526"
-          },
-          {
-            "name":"赫章县",
-            "code":"520527"
-          }
-        ]
-      },
-      {
-        "name":"铜仁市",
-        "code":"520600",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"520601"
-          },
-          {
-            "name":"碧江区",
-            "code":"520602"
-          },
-          {
-            "name":"万山区",
-            "code":"520603"
-          },
-          {
-            "name":"江口县",
-            "code":"520621"
-          },
-          {
-            "name":"玉屏侗族自治县",
-            "code":"520622"
-          },
-          {
-            "name":"石阡县",
-            "code":"520623"
-          },
-          {
-            "name":"思南县",
-            "code":"520624"
-          },
-          {
-            "name":"印江土家族苗族自治县",
-            "code":"520625"
-          },
-          {
-            "name":"德江县",
-            "code":"520626"
-          },
-          {
-            "name":"沿河土家族自治县",
-            "code":"520627"
-          },
-          {
-            "name":"松桃苗族自治县",
-            "code":"520628"
-          }
-        ]
-      },
-      {
-        "name":"黔西南布依族苗族自治州",
-        "code":"522300",
-        "sub":[
-          {
-            "name":"兴义市",
-            "code":"522301"
-          },
-          {
-            "name":"兴仁县",
-            "code":"522322"
-          },
-          {
-            "name":"普安县",
-            "code":"522323"
-          },
-          {
-            "name":"晴隆县",
-            "code":"522324"
-          },
-          {
-            "name":"贞丰县",
-            "code":"522325"
-          },
-          {
-            "name":"望谟县",
-            "code":"522326"
-          },
-          {
-            "name":"册亨县",
-            "code":"522327"
-          },
-          {
-            "name":"安龙县",
-            "code":"522328"
-          }
-        ]
-      },
-      {
-        "name":"黔东南苗族侗族自治州",
-        "code":"522600",
-        "sub":[
-          {
-            "name":"凯里市",
-            "code":"522601"
-          },
-          {
-            "name":"黄平县",
-            "code":"522622"
-          },
-          {
-            "name":"施秉县",
-            "code":"522623"
-          },
-          {
-            "name":"三穗县",
-            "code":"522624"
-          },
-          {
-            "name":"镇远县",
-            "code":"522625"
-          },
-          {
-            "name":"岑巩县",
-            "code":"522626"
-          },
-          {
-            "name":"天柱县",
-            "code":"522627"
-          },
-          {
-            "name":"锦屏县",
-            "code":"522628"
-          },
-          {
-            "name":"剑河县",
-            "code":"522629"
-          },
-          {
-            "name":"台江县",
-            "code":"522630"
-          },
-          {
-            "name":"黎平县",
-            "code":"522631"
-          },
-          {
-            "name":"榕江县",
-            "code":"522632"
-          },
-          {
-            "name":"从江县",
-            "code":"522633"
-          },
-          {
-            "name":"雷山县",
-            "code":"522634"
-          },
-          {
-            "name":"麻江县",
-            "code":"522635"
-          },
-          {
-            "name":"丹寨县",
-            "code":"522636"
-          }
-        ]
-      },
-      {
-        "name":"黔南布依族苗族自治州",
-        "code":"522700",
-        "sub":[
-          {
-            "name":"都匀市",
-            "code":"522701"
-          },
-          {
-            "name":"福泉市",
-            "code":"522702"
-          },
-          {
-            "name":"荔波县",
-            "code":"522722"
-          },
-          {
-            "name":"贵定县",
-            "code":"522723"
-          },
-          {
-            "name":"瓮安县",
-            "code":"522725"
-          },
-          {
-            "name":"独山县",
-            "code":"522726"
-          },
-          {
-            "name":"平塘县",
-            "code":"522727"
-          },
-          {
-            "name":"罗甸县",
-            "code":"522728"
-          },
-          {
-            "name":"长顺县",
-            "code":"522729"
-          },
-          {
-            "name":"龙里县",
-            "code":"522730"
-          },
-          {
-            "name":"惠水县",
-            "code":"522731"
-          },
-          {
-            "name":"三都水族自治县",
-            "code":"522732"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name":"云南省",
-    "code":"530000",
-    "sub":[
-      {
-        "name":"昆明市",
-        "code":"530100",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"530101"
-          },
-          {
-            "name":"五华区",
-            "code":"530102"
-          },
-          {
-            "name":"盘龙区",
-            "code":"530103"
-          },
-          {
-            "name":"官渡区",
-            "code":"530111"
-          },
-          {
-            "name":"西山区",
-            "code":"530112"
-          },
-          {
-            "name":"东川区",
-            "code":"530113"
-          },
-          {
-            "name":"呈贡区",
-            "code":"530114"
-          },
-          {
-            "name":"晋宁县",
-            "code":"530122"
-          },
-          {
-            "name":"富民县",
-            "code":"530124"
-          },
-          {
-            "name":"宜良县",
-            "code":"530125"
-          },
-          {
-            "name":"石林彝族自治县",
-            "code":"530126"
-          },
-          {
-            "name":"嵩明县",
-            "code":"530127"
-          },
-          {
-            "name":"禄劝彝族苗族自治县",
-            "code":"530128"
-          },
-          {
-            "name":"寻甸回族彝族自治县",
-            "code":"530129"
-          },
-          {
-            "name":"安宁市",
-            "code":"530181"
-          }
-        ]
-      },
-      {
-        "name":"曲靖市",
-        "code":"530300",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"530301"
-          },
-          {
-            "name":"麒麟区",
-            "code":"530302"
-          },
-          {
-            "name":"马龙县",
-            "code":"530321"
-          },
-          {
-            "name":"陆良县",
-            "code":"530322"
-          },
-          {
-            "name":"师宗县",
-            "code":"530323"
-          },
-          {
-            "name":"罗平县",
-            "code":"530324"
-          },
-          {
-            "name":"富源县",
-            "code":"530325"
-          },
-          {
-            "name":"会泽县",
-            "code":"530326"
-          },
-          {
-            "name":"沾益县",
-            "code":"530328"
-          },
-          {
-            "name":"宣威市",
-            "code":"530381"
-          }
-        ]
-      },
-      {
-        "name":"玉溪市",
-        "code":"530400",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"530401"
-          },
-          {
-            "name":"红塔区",
-            "code":"530402"
-          },
-          {
-            "name":"江川县",
-            "code":"530421"
-          },
-          {
-            "name":"澄江县",
-            "code":"530422"
-          },
-          {
-            "name":"通海县",
-            "code":"530423"
-          },
-          {
-            "name":"华宁县",
-            "code":"530424"
-          },
-          {
-            "name":"易门县",
-            "code":"530425"
-          },
-          {
-            "name":"峨山彝族自治县",
-            "code":"530426"
-          },
-          {
-            "name":"新平彝族傣族自治县",
-            "code":"530427"
-          },
-          {
-            "name":"元江哈尼族彝族傣族自治县",
-            "code":"530428"
-          }
-        ]
-      },
-      {
-        "name":"保山市",
-        "code":"530500",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"530501"
-          },
-          {
-            "name":"隆阳区",
-            "code":"530502"
-          },
-          {
-            "name":"施甸县",
-            "code":"530521"
-          },
-          {
-            "name":"腾冲县",
-            "code":"530522"
-          },
-          {
-            "name":"龙陵县",
-            "code":"530523"
-          },
-          {
-            "name":"昌宁县",
-            "code":"530524"
-          }
-        ]
-      },
-      {
-        "name":"昭通市",
-        "code":"530600",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"530601"
-          },
-          {
-            "name":"昭阳区",
-            "code":"530602"
-          },
-          {
-            "name":"鲁甸县",
-            "code":"530621"
-          },
-          {
-            "name":"巧家县",
-            "code":"530622"
-          },
-          {
-            "name":"盐津县",
-            "code":"530623"
-          },
-          {
-            "name":"大关县",
-            "code":"530624"
-          },
-          {
-            "name":"永善县",
-            "code":"530625"
-          },
-          {
-            "name":"绥江县",
-            "code":"530626"
-          },
-          {
-            "name":"镇雄县",
-            "code":"530627"
-          },
-          {
-            "name":"彝良县",
-            "code":"530628"
-          },
-          {
-            "name":"威信县",
-            "code":"530629"
-          },
-          {
-            "name":"水富县",
-            "code":"530630"
-          }
-        ]
-      },
-      {
-        "name":"丽江市",
-        "code":"530700",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"530701"
-          },
-          {
-            "name":"古城区",
-            "code":"530702"
-          },
-          {
-            "name":"玉龙纳西族自治县",
-            "code":"530721"
-          },
-          {
-            "name":"永胜县",
-            "code":"530722"
-          },
-          {
-            "name":"华坪县",
-            "code":"530723"
-          },
-          {
-            "name":"宁蒗彝族自治县",
-            "code":"530724"
-          }
-        ]
-      },
-      {
-        "name":"普洱市",
-        "code":"530800",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"530801"
-          },
-          {
-            "name":"思茅区",
-            "code":"530802"
-          },
-          {
-            "name":"宁洱哈尼族彝族自治县",
-            "code":"530821"
-          },
-          {
-            "name":"墨江哈尼族自治县",
-            "code":"530822"
-          },
-          {
-            "name":"景东彝族自治县",
-            "code":"530823"
-          },
-          {
-            "name":"景谷傣族彝族自治县",
-            "code":"530824"
-          },
-          {
-            "name":"镇沅彝族哈尼族拉祜族自治县",
-            "code":"530825"
-          },
-          {
-            "name":"江城哈尼族彝族自治县",
-            "code":"530826"
-          },
-          {
-            "name":"孟连傣族拉祜族佤族自治县",
-            "code":"530827"
-          },
-          {
-            "name":"澜沧拉祜族自治县",
-            "code":"530828"
-          },
-          {
-            "name":"西盟佤族自治县",
-            "code":"530829"
-          }
-        ]
-      },
-      {
-        "name":"临沧市",
-        "code":"530900",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"530901"
-          },
-          {
-            "name":"临翔区",
-            "code":"530902"
-          },
-          {
-            "name":"凤庆县",
-            "code":"530921"
-          },
-          {
-            "name":"云县",
-            "code":"530922"
-          },
-          {
-            "name":"永德县",
-            "code":"530923"
-          },
-          {
-            "name":"镇康县",
-            "code":"530924"
-          },
-          {
-            "name":"双江拉祜族佤族布朗族傣族自治县",
-            "code":"530925"
-          },
-          {
-            "name":"耿马傣族佤族自治县",
-            "code":"530926"
-          },
-          {
-            "name":"沧源佤族自治县",
-            "code":"530927"
-          }
-        ]
-      },
-      {
-        "name":"楚雄彝族自治州",
-        "code":"532300",
-        "sub":[
-          {
-            "name":"楚雄市",
-            "code":"532301"
-          },
-          {
-            "name":"双柏县",
-            "code":"532322"
-          },
-          {
-            "name":"牟定县",
-            "code":"532323"
-          },
-          {
-            "name":"南华县",
-            "code":"532324"
-          },
-          {
-            "name":"姚安县",
-            "code":"532325"
-          },
-          {
-            "name":"大姚县",
-            "code":"532326"
-          },
-          {
-            "name":"永仁县",
-            "code":"532327"
-          },
-          {
-            "name":"元谋县",
-            "code":"532328"
-          },
-          {
-            "name":"武定县",
-            "code":"532329"
-          },
-          {
-            "name":"禄丰县",
-            "code":"532331"
-          }
-        ]
-      },
-      {
-        "name":"红河哈尼族彝族自治州",
-        "code":"532500",
-        "sub":[
-          {
-            "name":"个旧市",
-            "code":"532501"
-          },
-          {
-            "name":"开远市",
-            "code":"532502"
-          },
-          {
-            "name":"蒙自市",
-            "code":"532503"
-          },
-          {
-            "name":"弥勒市",
-            "code":"532504"
-          },
-          {
-            "name":"屏边苗族自治县",
-            "code":"532523"
-          },
-          {
-            "name":"建水县",
-            "code":"532524"
-          },
-          {
-            "name":"石屏县",
-            "code":"532525"
-          },
-          {
-            "name":"泸西县",
-            "code":"532527"
-          },
-          {
-            "name":"元阳县",
-            "code":"532528"
-          },
-          {
-            "name":"红河县",
-            "code":"532529"
-          },
-          {
-            "name":"金平苗族瑶族傣族自治县",
-            "code":"532530"
-          },
-          {
-            "name":"绿春县",
-            "code":"532531"
-          },
-          {
-            "name":"河口瑶族自治县",
-            "code":"532532"
-          }
-        ]
-      },
-      {
-        "name":"文山壮族苗族自治州",
-        "code":"532600",
-        "sub":[
-          {
-            "name":"文山市",
-            "code":"532601"
-          },
-          {
-            "name":"砚山县",
-            "code":"532622"
-          },
-          {
-            "name":"西畴县",
-            "code":"532623"
-          },
-          {
-            "name":"麻栗坡县",
-            "code":"532624"
-          },
-          {
-            "name":"马关县",
-            "code":"532625"
-          },
-          {
-            "name":"丘北县",
-            "code":"532626"
-          },
-          {
-            "name":"广南县",
-            "code":"532627"
-          },
-          {
-            "name":"富宁县",
-            "code":"532628"
-          }
-        ]
-      },
-      {
-        "name":"西双版纳傣族自治州",
-        "code":"532800",
-        "sub":[
-          {
-            "name":"景洪市",
-            "code":"532801"
-          },
-          {
-            "name":"勐海县",
-            "code":"532822"
-          },
-          {
-            "name":"勐腊县",
-            "code":"532823"
-          }
-        ]
-      },
-      {
-        "name":"大理白族自治州",
-        "code":"532900",
-        "sub":[
-          {
-            "name":"大理市",
-            "code":"532901"
-          },
-          {
-            "name":"漾濞彝族自治县",
-            "code":"532922"
-          },
-          {
-            "name":"祥云县",
-            "code":"532923"
-          },
-          {
-            "name":"宾川县",
-            "code":"532924"
-          },
-          {
-            "name":"弥渡县",
-            "code":"532925"
-          },
-          {
-            "name":"南涧彝族自治县",
-            "code":"532926"
-          },
-          {
-            "name":"巍山彝族回族自治县",
-            "code":"532927"
-          },
-          {
-            "name":"永平县",
-            "code":"532928"
-          },
-          {
-            "name":"云龙县",
-            "code":"532929"
-          },
-          {
-            "name":"洱源县",
-            "code":"532930"
-          },
-          {
-            "name":"剑川县",
-            "code":"532931"
-          },
-          {
-            "name":"鹤庆县",
-            "code":"532932"
-          }
-        ]
-      },
-      {
-        "name":"德宏傣族景颇族自治州",
-        "code":"533100",
-        "sub":[
-          {
-            "name":"瑞丽市",
-            "code":"533102"
-          },
-          {
-            "name":"芒市",
-            "code":"533103"
-          },
-          {
-            "name":"梁河县",
-            "code":"533122"
-          },
-          {
-            "name":"盈江县",
-            "code":"533123"
-          },
-          {
-            "name":"陇川县",
-            "code":"533124"
-          }
-        ]
-      },
-      {
-        "name":"怒江傈僳族自治州",
-        "code":"533300",
-        "sub":[
-          {
-            "name":"泸水县",
-            "code":"533321"
-          },
-          {
-            "name":"福贡县",
-            "code":"533323"
-          },
-          {
-            "name":"贡山独龙族怒族自治县",
-            "code":"533324"
-          },
-          {
-            "name":"兰坪白族普米族自治县",
-            "code":"533325"
-          }
-        ]
-      },
-      {
-        "name":"迪庆藏族自治州",
-        "code":"533400",
-        "sub":[
-          {
-            "name":"香格里拉市",
-            "code":"533401"
-          },
-          {
-            "name":"德钦县",
-            "code":"533422"
-          },
-          {
-            "name":"维西傈僳族自治县",
-            "code":"533423"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name":"西藏自治区",
-    "code":"540000",
-    "sub":[
-      {
-        "name":"拉萨市",
-        "code":"540100",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"540101"
-          },
-          {
-            "name":"城关区",
-            "code":"540102"
-          },
-          {
-            "name":"林周县",
-            "code":"540121"
-          },
-          {
-            "name":"当雄县",
-            "code":"540122"
-          },
-          {
-            "name":"尼木县",
-            "code":"540123"
-          },
-          {
-            "name":"曲水县",
-            "code":"540124"
-          },
-          {
-            "name":"堆龙德庆县",
-            "code":"540125"
-          },
-          {
-            "name":"达孜县",
-            "code":"540126"
-          },
-          {
-            "name":"墨竹工卡县",
-            "code":"540127"
-          }
-        ]
-      },
-      {
-        "name":"日喀则市",
-        "code":"540200",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"540201"
-          },
-          {
-            "name":"桑珠孜区",
-            "code":"540202"
-          },
-          {
-            "name":"南木林县",
-            "code":"540221"
-          },
-          {
-            "name":"江孜县",
-            "code":"540222"
-          },
-          {
-            "name":"定日县",
-            "code":"540223"
-          },
-          {
-            "name":"萨迦县",
-            "code":"540224"
-          },
-          {
-            "name":"拉孜县",
-            "code":"540225"
-          },
-          {
-            "name":"昂仁县",
-            "code":"540226"
-          },
-          {
-            "name":"谢通门县",
-            "code":"540227"
-          },
-          {
-            "name":"白朗县",
-            "code":"540228"
-          },
-          {
-            "name":"仁布县",
-            "code":"540229"
-          },
-          {
-            "name":"康马县",
-            "code":"540230"
-          },
-          {
-            "name":"定结县",
-            "code":"540231"
-          },
-          {
-            "name":"仲巴县",
-            "code":"540232"
-          },
-          {
-            "name":"亚东县",
-            "code":"540233"
-          },
-          {
-            "name":"吉隆县",
-            "code":"540234"
-          },
-          {
-            "name":"聂拉木县",
-            "code":"540235"
-          },
-          {
-            "name":"萨嘎县",
-            "code":"540236"
-          },
-          {
-            "name":"岗巴县",
-            "code":"540237"
-          }
-        ]
-      },
-      {
-        "name":"昌都市",
-        "code":"540300",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"540301"
-          },
-          {
-            "name":"卡若区",
-            "code":"540302"
-          },
-          {
-            "name":"江达县",
-            "code":"540321"
-          },
-          {
-            "name":"贡觉县",
-            "code":"540322"
-          },
-          {
-            "name":"类乌齐县",
-            "code":"540323"
-          },
-          {
-            "name":"丁青县",
-            "code":"540324"
-          },
-          {
-            "name":"察雅县",
-            "code":"540325"
-          },
-          {
-            "name":"八宿县",
-            "code":"540326"
-          },
-          {
-            "name":"左贡县",
-            "code":"540327"
-          },
-          {
-            "name":"芒康县",
-            "code":"540328"
-          },
-          {
-            "name":"洛隆县",
-            "code":"540329"
-          },
-          {
-            "name":"边坝县",
-            "code":"540330"
-          }
-        ]
-      },
-      {
-        "name":"山南地区",
-        "code":"542200",
-        "sub":[
-          {
-            "name":"乃东县",
-            "code":"542221"
-          },
-          {
-            "name":"扎囊县",
-            "code":"542222"
-          },
-          {
-            "name":"贡嘎县",
-            "code":"542223"
-          },
-          {
-            "name":"桑日县",
-            "code":"542224"
-          },
-          {
-            "name":"琼结县",
-            "code":"542225"
-          },
-          {
-            "name":"曲松县",
-            "code":"542226"
-          },
-          {
-            "name":"措美县",
-            "code":"542227"
-          },
-          {
-            "name":"洛扎县",
-            "code":"542228"
-          },
-          {
-            "name":"加查县",
-            "code":"542229"
-          },
-          {
-            "name":"隆子县",
-            "code":"542231"
-          },
-          {
-            "name":"错那县",
-            "code":"542232"
-          },
-          {
-            "name":"浪卡子县",
-            "code":"542233"
-          }
-        ]
-      },
-      {
-        "name":"那曲地区",
-        "code":"542400",
-        "sub":[
-          {
-            "name":"那曲县",
-            "code":"542421"
-          },
-          {
-            "name":"嘉黎县",
-            "code":"542422"
-          },
-          {
-            "name":"比如县",
-            "code":"542423"
-          },
-          {
-            "name":"聂荣县",
-            "code":"542424"
-          },
-          {
-            "name":"安多县",
-            "code":"542425"
-          },
-          {
-            "name":"申扎县",
-            "code":"542426"
-          },
-          {
-            "name":"索县",
-            "code":"542427"
-          },
-          {
-            "name":"班戈县",
-            "code":"542428"
-          },
-          {
-            "name":"巴青县",
-            "code":"542429"
-          },
-          {
-            "name":"尼玛县",
-            "code":"542430"
-          },
-          {
-            "name":"双湖县",
-            "code":"542431"
-          }
-        ]
-      },
-      {
-        "name":"阿里地区",
-        "code":"542500",
-        "sub":[
-          {
-            "name":"普兰县",
-            "code":"542521"
-          },
-          {
-            "name":"札达县",
-            "code":"542522"
-          },
-          {
-            "name":"噶尔县",
-            "code":"542523"
-          },
-          {
-            "name":"日土县",
-            "code":"542524"
-          },
-          {
-            "name":"革吉县",
-            "code":"542525"
-          },
-          {
-            "name":"改则县",
-            "code":"542526"
-          },
-          {
-            "name":"措勤县",
-            "code":"542527"
-          }
-        ]
-      },
-      {
-        "name":"林芝地区",
-        "code":"542600",
-        "sub":[
-          {
-            "name":"林芝县",
-            "code":"542621"
-          },
-          {
-            "name":"工布江达县",
-            "code":"542622"
-          },
-          {
-            "name":"米林县",
-            "code":"542623"
-          },
-          {
-            "name":"墨脱县",
-            "code":"542624"
-          },
-          {
-            "name":"波密县",
-            "code":"542625"
-          },
-          {
-            "name":"察隅县",
-            "code":"542626"
-          },
-          {
-            "name":"朗县",
-            "code":"542627"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name":"陕西省",
-    "code":"610000",
-    "sub":[
-      {
-        "name":"西安市",
-        "code":"610100",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"610101"
-          },
-          {
-            "name":"新城区",
-            "code":"610102"
-          },
-          {
-            "name":"碑林区",
-            "code":"610103"
-          },
-          {
-            "name":"莲湖区",
-            "code":"610104"
-          },
-          {
-            "name":"灞桥区",
-            "code":"610111"
-          },
-          {
-            "name":"未央区",
-            "code":"610112"
-          },
-          {
-            "name":"雁塔区",
-            "code":"610113"
-          },
-          {
-            "name":"阎良区",
-            "code":"610114"
-          },
-          {
-            "name":"临潼区",
-            "code":"610115"
-          },
-          {
-            "name":"长安区",
-            "code":"610116"
-          },
-          {
-            "name":"高陵区",
-            "code":"610117"
-          },
-          {
-            "name":"蓝田县",
-            "code":"610122"
-          },
-          {
-            "name":"周至县",
-            "code":"610124"
-          },
-          {
-            "name":"户县",
-            "code":"610125"
-          }
-        ]
-      },
-      {
-        "name":"铜川市",
-        "code":"610200",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"610201"
-          },
-          {
-            "name":"王益区",
-            "code":"610202"
-          },
-          {
-            "name":"印台区",
-            "code":"610203"
-          },
-          {
-            "name":"耀州区",
-            "code":"610204"
-          },
-          {
-            "name":"宜君县",
-            "code":"610222"
-          }
-        ]
-      },
-      {
-        "name":"宝鸡市",
-        "code":"610300",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"610301"
-          },
-          {
-            "name":"渭滨区",
-            "code":"610302"
-          },
-          {
-            "name":"金台区",
-            "code":"610303"
-          },
-          {
-            "name":"陈仓区",
-            "code":"610304"
-          },
-          {
-            "name":"凤翔县",
-            "code":"610322"
-          },
-          {
-            "name":"岐山县",
-            "code":"610323"
-          },
-          {
-            "name":"扶风县",
-            "code":"610324"
-          },
-          {
-            "name":"眉县",
-            "code":"610326"
-          },
-          {
-            "name":"陇县",
-            "code":"610327"
-          },
-          {
-            "name":"千阳县",
-            "code":"610328"
-          },
-          {
-            "name":"麟游县",
-            "code":"610329"
-          },
-          {
-            "name":"凤县",
-            "code":"610330"
-          },
-          {
-            "name":"太白县",
-            "code":"610331"
-          }
-        ]
-      },
-      {
-        "name":"咸阳市",
-        "code":"610400",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"610401"
-          },
-          {
-            "name":"秦都区",
-            "code":"610402"
-          },
-          {
-            "name":"杨陵区",
-            "code":"610403"
-          },
-          {
-            "name":"渭城区",
-            "code":"610404"
-          },
-          {
-            "name":"三原县",
-            "code":"610422"
-          },
-          {
-            "name":"泾阳县",
-            "code":"610423"
-          },
-          {
-            "name":"乾县",
-            "code":"610424"
-          },
-          {
-            "name":"礼泉县",
-            "code":"610425"
-          },
-          {
-            "name":"永寿县",
-            "code":"610426"
-          },
-          {
-            "name":"彬县",
-            "code":"610427"
-          },
-          {
-            "name":"长武县",
-            "code":"610428"
-          },
-          {
-            "name":"旬邑县",
-            "code":"610429"
-          },
-          {
-            "name":"淳化县",
-            "code":"610430"
-          },
-          {
-            "name":"武功县",
-            "code":"610431"
-          },
-          {
-            "name":"兴平市",
-            "code":"610481"
-          }
-        ]
-      },
-      {
-        "name":"渭南市",
-        "code":"610500",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"610501"
-          },
-          {
-            "name":"临渭区",
-            "code":"610502"
-          },
-          {
-            "name":"华县",
-            "code":"610521"
-          },
-          {
-            "name":"潼关县",
-            "code":"610522"
-          },
-          {
-            "name":"大荔县",
-            "code":"610523"
-          },
-          {
-            "name":"合阳县",
-            "code":"610524"
-          },
-          {
-            "name":"澄城县",
-            "code":"610525"
-          },
-          {
-            "name":"蒲城县",
-            "code":"610526"
-          },
-          {
-            "name":"白水县",
-            "code":"610527"
-          },
-          {
-            "name":"富平县",
-            "code":"610528"
-          },
-          {
-            "name":"韩城市",
-            "code":"610581"
-          },
-          {
-            "name":"华阴市",
-            "code":"610582"
-          }
-        ]
-      },
-      {
-        "name":"延安市",
-        "code":"610600",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"610601"
-          },
-          {
-            "name":"宝塔区",
-            "code":"610602"
-          },
-          {
-            "name":"延长县",
-            "code":"610621"
-          },
-          {
-            "name":"延川县",
-            "code":"610622"
-          },
-          {
-            "name":"子长县",
-            "code":"610623"
-          },
-          {
-            "name":"安塞县",
-            "code":"610624"
-          },
-          {
-            "name":"志丹县",
-            "code":"610625"
-          },
-          {
-            "name":"吴起县",
-            "code":"610626"
-          },
-          {
-            "name":"甘泉县",
-            "code":"610627"
-          },
-          {
-            "name":"富县",
-            "code":"610628"
-          },
-          {
-            "name":"洛川县",
-            "code":"610629"
-          },
-          {
-            "name":"宜川县",
-            "code":"610630"
-          },
-          {
-            "name":"黄龙县",
-            "code":"610631"
-          },
-          {
-            "name":"黄陵县",
-            "code":"610632"
-          }
-        ]
-      },
-      {
-        "name":"汉中市",
-        "code":"610700",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"610701"
-          },
-          {
-            "name":"汉台区",
-            "code":"610702"
-          },
-          {
-            "name":"南郑县",
-            "code":"610721"
-          },
-          {
-            "name":"城固县",
-            "code":"610722"
-          },
-          {
-            "name":"洋县",
-            "code":"610723"
-          },
-          {
-            "name":"西乡县",
-            "code":"610724"
-          },
-          {
-            "name":"勉县",
-            "code":"610725"
-          },
-          {
-            "name":"宁强县",
-            "code":"610726"
-          },
-          {
-            "name":"略阳县",
-            "code":"610727"
-          },
-          {
-            "name":"镇巴县",
-            "code":"610728"
-          },
-          {
-            "name":"留坝县",
-            "code":"610729"
-          },
-          {
-            "name":"佛坪县",
-            "code":"610730"
-          }
-        ]
-      },
-      {
-        "name":"榆林市",
-        "code":"610800",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"610801"
-          },
-          {
-            "name":"榆阳区",
-            "code":"610802"
-          },
-          {
-            "name":"神木县",
-            "code":"610821"
-          },
-          {
-            "name":"府谷县",
-            "code":"610822"
-          },
-          {
-            "name":"横山县",
-            "code":"610823"
-          },
-          {
-            "name":"靖边县",
-            "code":"610824"
-          },
-          {
-            "name":"定边县",
-            "code":"610825"
-          },
-          {
-            "name":"绥德县",
-            "code":"610826"
-          },
-          {
-            "name":"米脂县",
-            "code":"610827"
-          },
-          {
-            "name":"佳县",
-            "code":"610828"
-          },
-          {
-            "name":"吴堡县",
-            "code":"610829"
-          },
-          {
-            "name":"清涧县",
-            "code":"610830"
-          },
-          {
-            "name":"子洲县",
-            "code":"610831"
-          }
-        ]
-      },
-      {
-        "name":"安康市",
-        "code":"610900",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"610901"
-          },
-          {
-            "name":"汉阴县",
-            "code":"610921"
-          },
-          {
-            "name":"石泉县",
-            "code":"610922"
-          },
-          {
-            "name":"宁陕县",
-            "code":"610923"
-          },
-          {
-            "name":"紫阳县",
-            "code":"610924"
-          },
-          {
-            "name":"岚皋县",
-            "code":"610925"
-          },
-          {
-            "name":"平利县",
-            "code":"610926"
-          },
-          {
-            "name":"镇坪县",
-            "code":"610927"
-          },
-          {
-            "name":"旬阳县",
-            "code":"610928"
-          },
-          {
-            "name":"白河县",
-            "code":"610929"
-          }
-        ]
-      },
-      {
-        "name":"商洛市",
-        "code":"611000",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"611001"
-          },
-          {
-            "name":"商州区",
-            "code":"611002"
-          },
-          {
-            "name":"洛南县",
-            "code":"611021"
-          },
-          {
-            "name":"丹凤县",
-            "code":"611022"
-          },
-          {
-            "name":"商南县",
-            "code":"611023"
-          },
-          {
-            "name":"山阳县",
-            "code":"611024"
-          },
-          {
-            "name":"镇安县",
-            "code":"611025"
-          },
-          {
-            "name":"柞水县",
-            "code":"611026"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name":"甘肃省",
-    "code":"620000",
-    "sub":[
-      {
-        "name":"兰州市",
-        "code":"620100",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"620101"
-          },
-          {
-            "name":"城关区",
-            "code":"620102"
-          },
-          {
-            "name":"七里河区",
-            "code":"620103"
-          },
-          {
-            "name":"西固区",
-            "code":"620104"
-          },
-          {
-            "name":"安宁区",
-            "code":"620105"
-          },
-          {
-            "name":"红古区",
-            "code":"620111"
-          },
-          {
-            "name":"永登县",
-            "code":"620121"
-          },
-          {
-            "name":"皋兰县",
-            "code":"620122"
-          },
-          {
-            "name":"榆中县",
-            "code":"620123"
-          }
-        ]
-      },
-      {
-        "name":"嘉峪关市",
-        "code":"620200",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"620201"
-          }
-        ]
-      },
-      {
-        "name":"金昌市",
-        "code":"620300",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"620301"
-          },
-          {
-            "name":"金川区",
-            "code":"620302"
-          },
-          {
-            "name":"永昌县",
-            "code":"620321"
-          }
-        ]
-      },
-      {
-        "name":"白银市",
-        "code":"620400",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"620401"
-          },
-          {
-            "name":"白银区",
-            "code":"620402"
-          },
-          {
-            "name":"平川区",
-            "code":"620403"
-          },
-          {
-            "name":"靖远县",
-            "code":"620421"
-          },
-          {
-            "name":"会宁县",
-            "code":"620422"
-          },
-          {
-            "name":"景泰县",
-            "code":"620423"
-          }
-        ]
-      },
-      {
-        "name":"天水市",
-        "code":"620500",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"620501"
-          },
-          {
-            "name":"秦州区",
-            "code":"620502"
-          },
-          {
-            "name":"麦积区",
-            "code":"620503"
-          },
-          {
-            "name":"清水县",
-            "code":"620521"
-          },
-          {
-            "name":"秦安县",
-            "code":"620522"
-          },
-          {
-            "name":"甘谷县",
-            "code":"620523"
-          },
-          {
-            "name":"武山县",
-            "code":"620524"
-          },
-          {
-            "name":"张家川回族自治县",
-            "code":"620525"
-          }
-        ]
-      },
-      {
-        "name":"武威市",
-        "code":"620600",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"620601"
-          },
-          {
-            "name":"凉州区",
-            "code":"620602"
-          },
-          {
-            "name":"民勤县",
-            "code":"620621"
-          },
-          {
-            "name":"古浪县",
-            "code":"620622"
-          },
-          {
-            "name":"天祝藏族自治县",
-            "code":"620623"
-          }
-        ]
-      },
-      {
-        "name":"张掖市",
-        "code":"620700",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"620701"
-          },
-          {
-            "name":"甘州区",
-            "code":"620702"
-          },
-          {
-            "name":"肃南裕固族自治县",
-            "code":"620721"
-          },
-          {
-            "name":"民乐县",
-            "code":"620722"
-          },
-          {
-            "name":"临泽县",
-            "code":"620723"
-          },
-          {
-            "name":"高台县",
-            "code":"620724"
-          },
-          {
-            "name":"山丹县",
-            "code":"620725"
-          }
-        ]
-      },
-      {
-        "name":"平凉市",
-        "code":"620800",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"620801"
-          },
-          {
-            "name":"崆峒区",
-            "code":"620802"
-          },
-          {
-            "name":"泾川县",
-            "code":"620821"
-          },
-          {
-            "name":"灵台县",
-            "code":"620822"
-          },
-          {
-            "name":"崇信县",
-            "code":"620823"
-          },
-          {
-            "name":"华亭县",
-            "code":"620824"
-          },
-          {
-            "name":"庄浪县",
-            "code":"620825"
-          },
-          {
-            "name":"静宁县",
-            "code":"620826"
-          }
-        ]
-      },
-      {
-        "name":"酒泉市",
-        "code":"620900",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"620901"
-          },
-          {
-            "name":"肃州区",
-            "code":"620902"
-          },
-          {
-            "name":"金塔县",
-            "code":"620921"
-          },
-          {
-            "name":"瓜州县",
-            "code":"620922"
-          },
-          {
-            "name":"肃北蒙古族自治县",
-            "code":"620923"
-          },
-          {
-            "name":"阿克塞哈萨克族自治县",
-            "code":"620924"
-          },
-          {
-            "name":"玉门市",
-            "code":"620981"
-          },
-          {
-            "name":"敦煌市",
-            "code":"620982"
-          }
-        ]
-      },
-      {
-        "name":"庆阳市",
-        "code":"621000",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"621001"
-          },
-          {
-            "name":"西峰区",
-            "code":"621002"
-          },
-          {
-            "name":"庆城县",
-            "code":"621021"
-          },
-          {
-            "name":"环县",
-            "code":"621022"
-          },
-          {
-            "name":"华池县",
-            "code":"621023"
-          },
-          {
-            "name":"合水县",
-            "code":"621024"
-          },
-          {
-            "name":"正宁县",
-            "code":"621025"
-          },
-          {
-            "name":"宁县",
-            "code":"621026"
-          },
-          {
-            "name":"镇原县",
-            "code":"621027"
-          }
-        ]
-      },
-      {
-        "name":"定西市",
-        "code":"621100",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"621101"
-          },
-          {
-            "name":"安定区",
-            "code":"621102"
-          },
-          {
-            "name":"通渭县",
-            "code":"621121"
-          },
-          {
-            "name":"陇西县",
-            "code":"621122"
-          },
-          {
-            "name":"渭源县",
-            "code":"621123"
-          },
-          {
-            "name":"临洮县",
-            "code":"621124"
-          },
-          {
-            "name":"漳县",
-            "code":"621125"
-          },
-          {
-            "name":"岷县",
-            "code":"621126"
-          }
-        ]
-      },
-      {
-        "name":"陇南市",
-        "code":"621200",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"621201"
-          },
-          {
-            "name":"武都区",
-            "code":"621202"
-          },
-          {
-            "name":"成县",
-            "code":"621221"
-          },
-          {
-            "name":"文县",
-            "code":"621222"
-          },
-          {
-            "name":"宕昌县",
-            "code":"621223"
-          },
-          {
-            "name":"康县",
-            "code":"621224"
-          },
-          {
-            "name":"西和县",
-            "code":"621225"
-          },
-          {
-            "name":"礼县",
-            "code":"621226"
-          },
-          {
-            "name":"徽县",
-            "code":"621227"
-          },
-          {
-            "name":"两当县",
-            "code":"621228"
-          }
-        ]
-      },
-      {
-        "name":"临夏回族自治州",
-        "code":"622900",
-        "sub":[
-          {
-            "name":"临夏市",
-            "code":"622901"
-          },
-          {
-            "name":"临夏县",
-            "code":"622921"
-          },
-          {
-            "name":"康乐县",
-            "code":"622922"
-          },
-          {
-            "name":"永靖县",
-            "code":"622923"
-          },
-          {
-            "name":"广河县",
-            "code":"622924"
-          },
-          {
-            "name":"和政县",
-            "code":"622925"
-          },
-          {
-            "name":"东乡族自治县",
-            "code":"622926"
-          },
-          {
-            "name":"积石山保安族东乡族撒拉族自治县",
-            "code":"622927"
-          }
-        ]
-      },
-      {
-        "name":"甘南藏族自治州",
-        "code":"623000",
-        "sub":[
-          {
-            "name":"合作市",
-            "code":"623001"
-          },
-          {
-            "name":"临潭县",
-            "code":"623021"
-          },
-          {
-            "name":"卓尼县",
-            "code":"623022"
-          },
-          {
-            "name":"舟曲县",
-            "code":"623023"
-          },
-          {
-            "name":"迭部县",
-            "code":"623024"
-          },
-          {
-            "name":"玛曲县",
-            "code":"623025"
-          },
-          {
-            "name":"碌曲县",
-            "code":"623026"
-          },
-          {
-            "name":"夏河县",
-            "code":"623027"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name":"青海省",
-    "code":"630000",
-    "sub":[
-      {
-        "name":"西宁市",
-        "code":"630100",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"630101"
-          },
-          {
-            "name":"城东区",
-            "code":"630102"
-          },
-          {
-            "name":"城中区",
-            "code":"630103"
-          },
-          {
-            "name":"城西区",
-            "code":"630104"
-          },
-          {
-            "name":"城北区",
-            "code":"630105"
-          },
-          {
-            "name":"大通回族土族自治县",
-            "code":"630121"
-          },
-          {
-            "name":"湟中县",
-            "code":"630122"
-          },
-          {
-            "name":"湟源县",
-            "code":"630123"
-          }
-        ]
-      },
-      {
-        "name":"海东市",
-        "code":"630200",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"630201"
-          },
-          {
-            "name":"乐都区",
-            "code":"630202"
-          },
-          {
-            "name":"平安县",
-            "code":"630221"
-          },
-          {
-            "name":"民和回族土族自治县",
-            "code":"630222"
-          },
-          {
-            "name":"互助土族自治县",
-            "code":"630223"
-          },
-          {
-            "name":"化隆回族自治县",
-            "code":"630224"
-          },
-          {
-            "name":"循化撒拉族自治县",
-            "code":"630225"
-          }
-        ]
-      },
-      {
-        "name":"海北藏族自治州",
-        "code":"632200",
-        "sub":[
-          {
-            "name":"门源回族自治县",
-            "code":"632221"
-          },
-          {
-            "name":"祁连县",
-            "code":"632222"
-          },
-          {
-            "name":"海晏县",
-            "code":"632223"
-          },
-          {
-            "name":"刚察县",
-            "code":"632224"
-          }
-        ]
-      },
-      {
-        "name":"黄南藏族自治州",
-        "code":"632300",
-        "sub":[
-          {
-            "name":"同仁县",
-            "code":"632321"
-          },
-          {
-            "name":"尖扎县",
-            "code":"632322"
-          },
-          {
-            "name":"泽库县",
-            "code":"632323"
-          },
-          {
-            "name":"河南蒙古族自治县",
-            "code":"632324"
-          }
-        ]
-      },
-      {
-        "name":"海南藏族自治州",
-        "code":"632500",
-        "sub":[
-          {
-            "name":"共和县",
-            "code":"632521"
-          },
-          {
-            "name":"同德县",
-            "code":"632522"
-          },
-          {
-            "name":"贵德县",
-            "code":"632523"
-          },
-          {
-            "name":"兴海县",
-            "code":"632524"
-          },
-          {
-            "name":"贵南县",
-            "code":"632525"
-          }
-        ]
-      },
-      {
-        "name":"果洛藏族自治州",
-        "code":"632600",
-        "sub":[
-          {
-            "name":"玛沁县",
-            "code":"632621"
-          },
-          {
-            "name":"班玛县",
-            "code":"632622"
-          },
-          {
-            "name":"甘德县",
-            "code":"632623"
-          },
-          {
-            "name":"达日县",
-            "code":"632624"
-          },
-          {
-            "name":"久治县",
-            "code":"632625"
-          },
-          {
-            "name":"玛多县",
-            "code":"632626"
-          }
-        ]
-      },
-      {
-        "name":"玉树藏族自治州",
-        "code":"632700",
-        "sub":[
-          {
-            "name":"玉树市",
-            "code":"632701"
-          },
-          {
-            "name":"杂多县",
-            "code":"632722"
-          },
-          {
-            "name":"称多县",
-            "code":"632723"
-          },
-          {
-            "name":"治多县",
-            "code":"632724"
-          },
-          {
-            "name":"囊谦县",
-            "code":"632725"
-          },
-          {
-            "name":"曲麻莱县",
-            "code":"632726"
-          }
-        ]
-      },
-      {
-        "name":"海西蒙古族藏族自治州",
-        "code":"632800",
-        "sub":[
-          {
-            "name":"格尔木市",
-            "code":"632801"
-          },
-          {
-            "name":"德令哈市",
-            "code":"632802"
-          },
-          {
-            "name":"乌兰县",
-            "code":"632821"
-          },
-          {
-            "name":"都兰县",
-            "code":"632822"
-          },
-          {
-            "name":"天峻县",
-            "code":"632823"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name":"宁夏回族自治区",
-    "code":"640000",
-    "sub":[
-      {
-        "name":"银川市",
-        "code":"640100",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"640101"
-          },
-          {
-            "name":"兴庆区",
-            "code":"640104"
-          },
-          {
-            "name":"西夏区",
-            "code":"640105"
-          },
-          {
-            "name":"金凤区",
-            "code":"640106"
-          },
-          {
-            "name":"永宁县",
-            "code":"640121"
-          },
-          {
-            "name":"贺兰县",
-            "code":"640122"
-          },
-          {
-            "name":"灵武市",
-            "code":"640181"
-          }
-        ]
-      },
-      {
-        "name":"石嘴山市",
-        "code":"640200",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"640201"
-          },
-          {
-            "name":"大武口区",
-            "code":"640202"
-          },
-          {
-            "name":"惠农区",
-            "code":"640205"
-          },
-          {
-            "name":"平罗县",
-            "code":"640221"
-          }
-        ]
-      },
-      {
-        "name":"吴忠市",
-        "code":"640300",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"640301"
-          },
-          {
-            "name":"利通区",
-            "code":"640302"
-          },
-          {
-            "name":"红寺堡区",
-            "code":"640303"
-          },
-          {
-            "name":"盐池县",
-            "code":"640323"
-          },
-          {
-            "name":"同心县",
-            "code":"640324"
-          },
-          {
-            "name":"青铜峡市",
-            "code":"640381"
-          }
-        ]
-      },
-      {
-        "name":"固原市",
-        "code":"640400",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"640401"
-          },
-          {
-            "name":"原州区",
-            "code":"640402"
-          },
-          {
-            "name":"西吉县",
-            "code":"640422"
-          },
-          {
-            "name":"隆德县",
-            "code":"640423"
-          },
-          {
-            "name":"泾源县",
-            "code":"640424"
-          },
-          {
-            "name":"彭阳县",
-            "code":"640425"
-          }
-        ]
-      },
-      {
-        "name":"中卫市",
-        "code":"640500",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"640501"
-          },
-          {
-            "name":"沙坡头区",
-            "code":"640502"
-          },
-          {
-            "name":"中宁县",
-            "code":"640521"
-          },
-          {
-            "name":"海原县",
-            "code":"640522"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name":"新疆维吾尔自治区",
-    "code":"650000",
-    "sub":[
-      {
-        "name":"乌鲁木齐市",
-        "code":"650100",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"650101"
-          },
-          {
-            "name":"天山区",
-            "code":"650102"
-          },
-          {
-            "name":"沙依巴克区",
-            "code":"650103"
-          },
-          {
-            "name":"新市区",
-            "code":"650104"
-          },
-          {
-            "name":"水磨沟区",
-            "code":"650105"
-          },
-          {
-            "name":"头屯河区",
-            "code":"650106"
-          },
-          {
-            "name":"达坂城区",
-            "code":"650107"
-          },
-          {
-            "name":"米东区",
-            "code":"650109"
-          },
-          {
-            "name":"乌鲁木齐县",
-            "code":"650121"
-          }
-        ]
-      },
-      {
-        "name":"克拉玛依市",
-        "code":"650200",
-        "sub":[
-          {
-            "name":"市辖区",
-            "code":"650201"
-          },
-          {
-            "name":"独山子区",
-            "code":"650202"
-          },
-          {
-            "name":"克拉玛依区",
-            "code":"650203"
-          },
-          {
-            "name":"白碱滩区",
-            "code":"650204"
-          },
-          {
-            "name":"乌尔禾区",
-            "code":"650205"
-          }
-        ]
-      },
-      {
-        "name":"吐鲁番地区",
-        "code":"652100",
-        "sub":[
-          {
-            "name":"吐鲁番市",
-            "code":"652101"
-          },
-          {
-            "name":"鄯善县",
-            "code":"652122"
-          },
-          {
-            "name":"托克逊县",
-            "code":"652123"
-          }
-        ]
-      },
-      {
-        "name":"哈密地区",
-        "code":"652200",
-        "sub":[
-          {
-            "name":"哈密市",
-            "code":"652201"
-          },
-          {
-            "name":"巴里坤哈萨克自治县",
-            "code":"652222"
-          },
-          {
-            "name":"伊吾县",
-            "code":"652223"
-          }
-        ]
-      },
-      {
-        "name":"昌吉回族自治州",
-        "code":"652300",
-        "sub":[
-          {
-            "name":"昌吉市",
-            "code":"652301"
-          },
-          {
-            "name":"阜康市",
-            "code":"652302"
-          },
-          {
-            "name":"呼图壁县",
-            "code":"652323"
-          },
-          {
-            "name":"玛纳斯县",
-            "code":"652324"
-          },
-          {
-            "name":"奇台县",
-            "code":"652325"
-          },
-          {
-            "name":"吉木萨尔县",
-            "code":"652327"
-          },
-          {
-            "name":"木垒哈萨克自治县",
-            "code":"652328"
-          }
-        ]
-      },
-      {
-        "name":"博尔塔拉蒙古自治州",
-        "code":"652700",
-        "sub":[
-          {
-            "name":"博乐市",
-            "code":"652701"
-          },
-          {
-            "name":"阿拉山口市",
-            "code":"652702"
-          },
-          {
-            "name":"精河县",
-            "code":"652722"
-          },
-          {
-            "name":"温泉县",
-            "code":"652723"
-          }
-        ]
-      },
-      {
-        "name":"巴音郭楞蒙古自治州",
-        "code":"652800",
-        "sub":[
-          {
-            "name":"库尔勒市",
-            "code":"652801"
-          },
-          {
-            "name":"轮台县",
-            "code":"652822"
-          },
-          {
-            "name":"尉犁县",
-            "code":"652823"
-          },
-          {
-            "name":"若羌县",
-            "code":"652824"
-          },
-          {
-            "name":"且末县",
-            "code":"652825"
-          },
-          {
-            "name":"焉耆回族自治县",
-            "code":"652826"
-          },
-          {
-            "name":"和静县",
-            "code":"652827"
-          },
-          {
-            "name":"和硕县",
-            "code":"652828"
-          },
-          {
-            "name":"博湖县",
-            "code":"652829"
-          }
-        ]
-      },
-      {
-        "name":"阿克苏地区",
-        "code":"652900",
-        "sub":[
-          {
-            "name":"阿克苏市",
-            "code":"652901"
-          },
-          {
-            "name":"温宿县",
-            "code":"652922"
-          },
-          {
-            "name":"库车县",
-            "code":"652923"
-          },
-          {
-            "name":"沙雅县",
-            "code":"652924"
-          },
-          {
-            "name":"新和县",
-            "code":"652925"
-          },
-          {
-            "name":"拜城县",
-            "code":"652926"
-          },
-          {
-            "name":"乌什县",
-            "code":"652927"
-          },
-          {
-            "name":"阿瓦提县",
-            "code":"652928"
-          },
-          {
-            "name":"柯坪县",
-            "code":"652929"
-          }
-        ]
-      },
-      {
-        "name":"克孜勒苏柯尔克孜自治州",
-        "code":"653000",
-        "sub":[
-          {
-            "name":"阿图什市",
-            "code":"653001"
-          },
-          {
-            "name":"阿克陶县",
-            "code":"653022"
-          },
-          {
-            "name":"阿合奇县",
-            "code":"653023"
-          },
-          {
-            "name":"乌恰县",
-            "code":"653024"
-          }
-        ]
-      },
-      {
-        "name":"喀什地区",
-        "code":"653100",
-        "sub":[
-          {
-            "name":"喀什市",
-            "code":"653101"
-          },
-          {
-            "name":"疏附县",
-            "code":"653121"
-          },
-          {
-            "name":"疏勒县",
-            "code":"653122"
-          },
-          {
-            "name":"英吉沙县",
-            "code":"653123"
-          },
-          {
-            "name":"泽普县",
-            "code":"653124"
-          },
-          {
-            "name":"莎车县",
-            "code":"653125"
-          },
-          {
-            "name":"叶城县",
-            "code":"653126"
-          },
-          {
-            "name":"麦盖提县",
-            "code":"653127"
-          },
-          {
-            "name":"岳普湖县",
-            "code":"653128"
-          },
-          {
-            "name":"伽师县",
-            "code":"653129"
-          },
-          {
-            "name":"巴楚县",
-            "code":"653130"
-          },
-          {
-            "name":"塔什库尔干塔吉克自治县",
-            "code":"653131"
-          }
-        ]
-      },
-      {
-        "name":"和田地区",
-        "code":"653200",
-        "sub":[
-          {
-            "name":"和田市",
-            "code":"653201"
-          },
-          {
-            "name":"和田县",
-            "code":"653221"
-          },
-          {
-            "name":"墨玉县",
-            "code":"653222"
-          },
-          {
-            "name":"皮山县",
-            "code":"653223"
-          },
-          {
-            "name":"洛浦县",
-            "code":"653224"
-          },
-          {
-            "name":"策勒县",
-            "code":"653225"
-          },
-          {
-            "name":"于田县",
-            "code":"653226"
-          },
-          {
-            "name":"民丰县",
-            "code":"653227"
-          }
-        ]
-      },
-      {
-        "name":"伊犁哈萨克自治州",
-        "code":"654000",
-        "sub":[
-          {
-            "name":"伊宁市",
-            "code":"654002"
-          },
-          {
-            "name":"奎屯市",
-            "code":"654003"
-          },
-          {
-            "name":"霍尔果斯市",
-            "code":"654004"
-          },
-          {
-            "name":"伊宁县",
-            "code":"654021"
-          },
-          {
-            "name":"察布查尔锡伯自治县",
-            "code":"654022"
-          },
-          {
-            "name":"霍城县",
-            "code":"654023"
-          },
-          {
-            "name":"巩留县",
-            "code":"654024"
-          },
-          {
-            "name":"新源县",
-            "code":"654025"
-          },
-          {
-            "name":"昭苏县",
-            "code":"654026"
-          },
-          {
-            "name":"特克斯县",
-            "code":"654027"
-          },
-          {
-            "name":"尼勒克县",
-            "code":"654028"
-          },
-          {
-            "name":"塔城地区",
-            "code":"654200"
-          },
-          {
-            "name":"塔城市",
-            "code":"654201"
-          },
-          {
-            "name":"乌苏市",
-            "code":"654202"
-          },
-          {
-            "name":"额敏县",
-            "code":"654221"
-          },
-          {
-            "name":"沙湾县",
-            "code":"654223"
-          },
-          {
-            "name":"托里县",
-            "code":"654224"
-          },
-          {
-            "name":"裕民县",
-            "code":"654225"
-          },
-          {
-            "name":"和布克赛尔蒙古自治县",
-            "code":"654226"
-          },
-          {
-            "name":"阿勒泰地区",
-            "code":"654300"
-          },
-          {
-            "name":"阿勒泰市",
-            "code":"654301"
-          },
-          {
-            "name":"布尔津县",
-            "code":"654321"
-          },
-          {
-            "name":"富蕴县",
-            "code":"654322"
-          },
-          {
-            "name":"福海县",
-            "code":"654323"
-          },
-          {
-            "name":"哈巴河县",
-            "code":"654324"
-          },
-          {
-            "name":"青河县",
-            "code":"654325"
-          },
-          {
-            "name":"吉木乃县",
-            "code":"654326"
-          }
-        ]
-      },
-      {
-        "name":"自治区直辖县级行政区划",
-        "code":"659000",
-        "sub":[
-          {
-            "name":"石河子市",
-            "code":"659001"
-          },
-          {
-            "name":"阿拉尔市",
-            "code":"659002"
-          },
-          {
-            "name":"图木舒克市",
-            "code":"659003"
-          },
-          {
-            "name":"五家渠市",
-            "code":"659004"
-          },
-          {
-            "name":"北屯市",
-            "code":"659005"
-          },
-          {
-            "name":"铁门关市",
-            "code":"659006"
-          },
-          {
-            "name":"双河市",
-            "code":"659007"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name":"台湾省",
-    "code":"710000",
-    "sub":[
-      {
-        "name":"台北市",
-        "code":"710100",
-        "sub":[
-          {
-            "name":"松山区",
-            "code":"710101"
-          },
-          {
-            "name":"信义区",
-            "code":"710102"
-          },
-          {
-            "name":"大安区",
-            "code":"710103"
-          },
-          {
-            "name":"中山区",
-            "code":"710104"
-          },
-          {
-            "name":"中正区",
-            "code":"710105"
-          },
-          {
-            "name":"大同区",
-            "code":"710106"
-          },
-          {
-            "name":"万华区",
-            "code":"710107"
-          },
-          {
-            "name":"文山区",
-            "code":"710108"
-          },
-          {
-            "name":"南港区",
-            "code":"710109"
-          },
-          {
-            "name":"内湖区",
-            "code":"710110"
-          },
-          {
-            "name":"士林区",
-            "code":"710111"
-          },
-          {
-            "name":"北投区",
-            "code":"710112"
-          }
-        ]
-      },
-      {
-        "name":"高雄市",
-        "code":"710200",
-        "sub":[
-          {
-            "name":"盐埕区",
-            "code":"710201"
-          },
-          {
-            "name":"鼓山区",
-            "code":"710202"
-          },
-          {
-            "name":"左营区",
-            "code":"710203"
-          },
-          {
-            "name":"楠梓区",
-            "code":"710204"
-          },
-          {
-            "name":"三民区",
-            "code":"710205"
-          },
-          {
-            "name":"新兴区",
-            "code":"710206"
-          },
-          {
-            "name":"前金区",
-            "code":"710207"
-          },
-          {
-            "name":"苓雅区",
-            "code":"710208"
-          },
-          {
-            "name":"前镇区",
-            "code":"710209"
-          },
-          {
-            "name":"旗津区",
-            "code":"710210"
-          },
-          {
-            "name":"小港区",
-            "code":"710211"
-          },
-          {
-            "name":"凤山区",
-            "code":"710212"
-          },
-          {
-            "name":"林园区",
-            "code":"710213"
-          },
-          {
-            "name":"大寮区",
-            "code":"710214"
-          },
-          {
-            "name":"大树区",
-            "code":"710215"
-          },
-          {
-            "name":"大社区",
-            "code":"710216"
-          },
-          {
-            "name":"仁武区",
-            "code":"710217"
-          },
-          {
-            "name":"鸟松区",
-            "code":"710218"
-          },
-          {
-            "name":"冈山区",
-            "code":"710219"
-          },
-          {
-            "name":"桥头区",
-            "code":"710220"
-          },
-          {
-            "name":"燕巢区",
-            "code":"710221"
-          },
-          {
-            "name":"田寮区",
-            "code":"710222"
-          },
-          {
-            "name":"阿莲区",
-            "code":"710223"
-          },
-          {
-            "name":"路竹区",
-            "code":"710224"
-          },
-          {
-            "name":"湖内区",
-            "code":"710225"
-          },
-          {
-            "name":"茄萣区",
-            "code":"710226"
-          },
-          {
-            "name":"永安区",
-            "code":"710227"
-          },
-          {
-            "name":"弥陀区",
-            "code":"710228"
-          },
-          {
-            "name":"梓官区",
-            "code":"710229"
-          },
-          {
-            "name":"旗山区",
-            "code":"710230"
-          },
-          {
-            "name":"美浓区",
-            "code":"710231"
-          },
-          {
-            "name":"六龟区",
-            "code":"710232"
-          },
-          {
-            "name":"甲仙区",
-            "code":"710233"
-          },
-          {
-            "name":"杉林区",
-            "code":"710234"
-          },
-          {
-            "name":"内门区",
-            "code":"710235"
-          },
-          {
-            "name":"茂林区",
-            "code":"710236"
-          },
-          {
-            "name":"桃源区",
-            "code":"710237"
-          },
-          {
-            "name":"那玛夏区",
-            "code":"710238"
-          }
-        ]
-      },
-      {
-        "name":"基隆市",
-        "code":"710300",
-        "sub":[
-          {
-            "name":"中正区",
-            "code":"710301"
-          },
-          {
-            "name":"七堵区",
-            "code":"710302"
-          },
-          {
-            "name":"暖暖区",
-            "code":"710303"
-          },
-          {
-            "name":"仁爱区",
-            "code":"710304"
-          },
-          {
-            "name":"中山区",
-            "code":"710305"
-          },
-          {
-            "name":"安乐区",
-            "code":"710306"
-          },
-          {
-            "name":"信义区",
-            "code":"710307"
-          }
-        ]
-      },
-      {
-        "name":"台中市",
-        "code":"710400",
-        "sub":[
-          {
-            "name":"中区",
-            "code":"710401"
-          },
-          {
-            "name":"东区",
-            "code":"710402"
-          },
-          {
-            "name":"南区",
-            "code":"710403"
-          },
-          {
-            "name":"西区",
-            "code":"710404"
-          },
-          {
-            "name":"北区",
-            "code":"710405"
-          },
-          {
-            "name":"西屯区",
-            "code":"710406"
-          },
-          {
-            "name":"南屯区",
-            "code":"710407"
-          },
-          {
-            "name":"北屯区",
-            "code":"710408"
-          },
-          {
-            "name":"丰原区",
-            "code":"710409"
-          },
-          {
-            "name":"东势区",
-            "code":"710410"
-          },
-          {
-            "name":"大甲区",
-            "code":"710411"
-          },
-          {
-            "name":"清水区",
-            "code":"710412"
-          },
-          {
-            "name":"沙鹿区",
-            "code":"710413"
-          },
-          {
-            "name":"梧栖区",
-            "code":"710414"
-          },
-          {
-            "name":"后里区",
-            "code":"710415"
-          },
-          {
-            "name":"神冈区",
-            "code":"710416"
-          },
-          {
-            "name":"潭子区",
-            "code":"710417"
-          },
-          {
-            "name":"大雅区",
-            "code":"710418"
-          },
-          {
-            "name":"新社区",
-            "code":"710419"
-          },
-          {
-            "name":"石冈区",
-            "code":"710420"
-          },
-          {
-            "name":"外埔区",
-            "code":"710421"
-          },
-          {
-            "name":"大安区",
-            "code":"710422"
-          },
-          {
-            "name":"乌日区",
-            "code":"710423"
-          },
-          {
-            "name":"大肚区",
-            "code":"710424"
-          },
-          {
-            "name":"龙井区",
-            "code":"710425"
-          },
-          {
-            "name":"雾峰区",
-            "code":"710426"
-          },
-          {
-            "name":"太平区",
-            "code":"710427"
-          },
-          {
-            "name":"大里区",
-            "code":"710428"
-          },
-          {
-            "name":"和平区",
-            "code":"710429"
-          }
-        ]
-      },
-      {
-        "name":"台南市",
-        "code":"710500",
-        "sub":[
-          {
-            "name":"东区",
-            "code":"710501"
-          },
-          {
-            "name":"南区",
-            "code":"710502"
-          },
-          {
-            "name":"北区",
-            "code":"710504"
-          },
-          {
-            "name":"安南区",
-            "code":"710506"
-          },
-          {
-            "name":"安平区",
-            "code":"710507"
-          },
-          {
-            "name":"中西区",
-            "code":"710508"
-          },
-          {
-            "name":"新营区",
-            "code":"710509"
-          },
-          {
-            "name":"盐水区",
-            "code":"710510"
-          },
-          {
-            "name":"白河区",
-            "code":"710511"
-          },
-          {
-            "name":"柳营区",
-            "code":"710512"
-          },
-          {
-            "name":"后壁区",
-            "code":"710513"
-          },
-          {
-            "name":"东山区",
-            "code":"710514"
-          },
-          {
-            "name":"麻豆区",
-            "code":"710515"
-          },
-          {
-            "name":"下营区",
-            "code":"710516"
-          },
-          {
-            "name":"六甲区",
-            "code":"710517"
-          },
-          {
-            "name":"官田区",
-            "code":"710518"
-          },
-          {
-            "name":"大内区",
-            "code":"710519"
-          },
-          {
-            "name":"佳里区",
-            "code":"710520"
-          },
-          {
-            "name":"学甲区",
-            "code":"710521"
-          },
-          {
-            "name":"西港区",
-            "code":"710522"
-          },
-          {
-            "name":"七股区",
-            "code":"710523"
-          },
-          {
-            "name":"将军区",
-            "code":"710524"
-          },
-          {
-            "name":"北门区",
-            "code":"710525"
-          },
-          {
-            "name":"新化区",
-            "code":"710526"
-          },
-          {
-            "name":"善化区",
-            "code":"710527"
-          },
-          {
-            "name":"新市区",
-            "code":"710528"
-          },
-          {
-            "name":"安定区",
-            "code":"710529"
-          },
-          {
-            "name":"山上区",
-            "code":"710530"
-          },
-          {
-            "name":"玉井区",
-            "code":"710531"
-          },
-          {
-            "name":"楠西区",
-            "code":"710532"
-          },
-          {
-            "name":"南化区",
-            "code":"710533"
-          },
-          {
-            "name":"左镇区",
-            "code":"710534"
-          },
-          {
-            "name":"仁德区",
-            "code":"710535"
-          },
-          {
-            "name":"归仁区",
-            "code":"710536"
-          },
-          {
-            "name":"关庙区",
-            "code":"710537"
-          },
-          {
-            "name":"龙崎区",
-            "code":"710538"
-          },
-          {
-            "name":"永康区",
-            "code":"710539"
-          }
-        ]
-      },
-      {
-        "name":"新竹市",
-        "code":"710600",
-        "sub":[
-          {
-            "name":"东区",
-            "code":"710601"
-          },
-          {
-            "name":"北区",
-            "code":"710602"
-          },
-          {
-            "name":"香山区",
-            "code":"710603"
-          }
-        ]
-      },
-      {
-        "name":"嘉义市",
-        "code":"710700",
-        "sub":[
-          {
-            "name":"东区",
-            "code":"710701"
-          },
-          {
-            "name":"西区",
-            "code":"710702"
-          }
-        ]
-      },
-      {
-        "name":"新北市",
-        "code":"710800",
-        "sub":[
-          {
-            "name":"板桥区",
-            "code":"710801"
-          },
-          {
-            "name":"三重区",
-            "code":"710802"
-          },
-          {
-            "name":"中和区",
-            "code":"710803"
-          },
-          {
-            "name":"永和区",
-            "code":"710804"
-          },
-          {
-            "name":"新庄区",
-            "code":"710805"
-          },
-          {
-            "name":"新店区",
-            "code":"710806"
-          },
-          {
-            "name":"树林区",
-            "code":"710807"
-          },
-          {
-            "name":"莺歌区",
-            "code":"710808"
-          },
-          {
-            "name":"三峡区",
-            "code":"710809"
-          },
-          {
-            "name":"淡水区",
-            "code":"710810"
-          },
-          {
-            "name":"汐止区",
-            "code":"710811"
-          },
-          {
-            "name":"瑞芳区",
-            "code":"710812"
-          },
-          {
-            "name":"土城区",
-            "code":"710813"
-          },
-          {
-            "name":"芦洲区",
-            "code":"710814"
-          },
-          {
-            "name":"五股区",
-            "code":"710815"
-          },
-          {
-            "name":"泰山区",
-            "code":"710816"
-          },
-          {
-            "name":"林口区",
-            "code":"710817"
-          },
-          {
-            "name":"深坑区",
-            "code":"710818"
-          },
-          {
-            "name":"石碇区",
-            "code":"710819"
-          },
-          {
-            "name":"坪林区",
-            "code":"710820"
-          },
-          {
-            "name":"三芝区",
-            "code":"710821"
-          },
-          {
-            "name":"石门区",
-            "code":"710822"
-          },
-          {
-            "name":"八里区",
-            "code":"710823"
-          },
-          {
-            "name":"平溪区",
-            "code":"710824"
-          },
-          {
-            "name":"双溪区",
-            "code":"710825"
-          },
-          {
-            "name":"贡寮区",
-            "code":"710826"
-          },
-          {
-            "name":"金山区",
-            "code":"710827"
-          },
-          {
-            "name":"万里区",
-            "code":"710828"
-          },
-          {
-            "name":"乌来区",
-            "code":"710829"
-          }
-        ]
-      },
-      {
-        "name":"宜兰县",
-        "code":"712200",
-        "sub":[
-          {
-            "name":"宜兰市",
-            "code":"712201"
-          },
-          {
-            "name":"罗东镇",
-            "code":"712221"
-          },
-          {
-            "name":"苏澳镇",
-            "code":"712222"
-          },
-          {
-            "name":"头城镇",
-            "code":"712223"
-          },
-          {
-            "name":"礁溪乡",
-            "code":"712224"
-          },
-          {
-            "name":"壮围乡",
-            "code":"712225"
-          },
-          {
-            "name":"员山乡",
-            "code":"712226"
-          },
-          {
-            "name":"冬山乡",
-            "code":"712227"
-          },
-          {
-            "name":"五结乡",
-            "code":"712228"
-          },
-          {
-            "name":"三星乡",
-            "code":"712229"
-          },
-          {
-            "name":"大同乡",
-            "code":"712230"
-          },
-          {
-            "name":"南澳乡",
-            "code":"712231"
-          }
-        ]
-      },
-      {
-        "name":"桃园县",
-        "code":"712300",
-        "sub":[
-          {
-            "name":"桃园市",
-            "code":"712301"
-          },
-          {
-            "name":"中坜市",
-            "code":"712302"
-          },
-          {
-            "name":"平镇市",
-            "code":"712303"
-          },
-          {
-            "name":"八德市",
-            "code":"712304"
-          },
-          {
-            "name":"杨梅市",
-            "code":"712305"
-          },
-          {
-            "name":"大溪镇",
-            "code":"712321"
-          },
-          {
-            "name":"芦竹乡",
-            "code":"712323"
-          },
-          {
-            "name":"大园乡",
-            "code":"712324"
-          },
-          {
-            "name":"龟山乡",
-            "code":"712325"
-          },
-          {
-            "name":"龙潭乡",
-            "code":"712327"
-          },
-          {
-            "name":"新屋乡",
-            "code":"712329"
-          },
-          {
-            "name":"观音乡",
-            "code":"712330"
-          },
-          {
-            "name":"复兴乡",
-            "code":"712331"
-          }
-        ]
-      },
-      {
-        "name":"新竹县",
-        "code":"712400",
-        "sub":[
-          {
-            "name":"竹北市",
-            "code":"712401"
-          },
-          {
-            "name":"竹东镇",
-            "code":"712421"
-          },
-          {
-            "name":"新埔镇",
-            "code":"712422"
-          },
-          {
-            "name":"关西镇",
-            "code":"712423"
-          },
-          {
-            "name":"湖口乡",
-            "code":"712424"
-          },
-          {
-            "name":"新丰乡",
-            "code":"712425"
-          },
-          {
-            "name":"芎林乡",
-            "code":"712426"
-          },
-          {
-            "name":"橫山乡",
-            "code":"712427"
-          },
-          {
-            "name":"北埔乡",
-            "code":"712428"
-          },
-          {
-            "name":"宝山乡",
-            "code":"712429"
-          },
-          {
-            "name":"峨眉乡",
-            "code":"712430"
-          },
-          {
-            "name":"尖石乡",
-            "code":"712431"
-          },
-          {
-            "name":"五峰乡",
-            "code":"712432"
-          }
-        ]
-      },
-      {
-        "name":"苗栗县",
-        "code":"712500",
-        "sub":[
-          {
-            "name":"苗栗市",
-            "code":"712501"
-          },
-          {
-            "name":"苑里镇",
-            "code":"712521"
-          },
-          {
-            "name":"通霄镇",
-            "code":"712522"
-          },
-          {
-            "name":"竹南镇",
-            "code":"712523"
-          },
-          {
-            "name":"头份镇",
-            "code":"712524"
-          },
-          {
-            "name":"后龙镇",
-            "code":"712525"
-          },
-          {
-            "name":"卓兰镇",
-            "code":"712526"
-          },
-          {
-            "name":"大湖乡",
-            "code":"712527"
-          },
-          {
-            "name":"公馆乡",
-            "code":"712528"
-          },
-          {
-            "name":"铜锣乡",
-            "code":"712529"
-          },
-          {
-            "name":"南庄乡",
-            "code":"712530"
-          },
-          {
-            "name":"头屋乡",
-            "code":"712531"
-          },
-          {
-            "name":"三义乡",
-            "code":"712532"
-          },
-          {
-            "name":"西湖乡",
-            "code":"712533"
-          },
-          {
-            "name":"造桥乡",
-            "code":"712534"
-          },
-          {
-            "name":"三湾乡",
-            "code":"712535"
-          },
-          {
-            "name":"狮潭乡",
-            "code":"712536"
-          },
-          {
-            "name":"泰安乡",
-            "code":"712537"
-          }
-        ]
-      },
-      {
-        "name":"彰化县",
-        "code":"712700",
-        "sub":[
-          {
-            "name":"彰化市",
-            "code":"712701"
-          },
-          {
-            "name":"鹿港镇",
-            "code":"712721"
-          },
-          {
-            "name":"和美镇",
-            "code":"712722"
-          },
-          {
-            "name":"线西乡",
-            "code":"712723"
-          },
-          {
-            "name":"伸港乡",
-            "code":"712724"
-          },
-          {
-            "name":"福兴乡",
-            "code":"712725"
-          },
-          {
-            "name":"秀水乡",
-            "code":"712726"
-          },
-          {
-            "name":"花坛乡",
-            "code":"712727"
-          },
-          {
-            "name":"芬园乡",
-            "code":"712728"
-          },
-          {
-            "name":"员林镇",
-            "code":"712729"
-          },
-          {
-            "name":"溪湖镇",
-            "code":"712730"
-          },
-          {
-            "name":"田中镇",
-            "code":"712731"
-          },
-          {
-            "name":"大村乡",
-            "code":"712732"
-          },
-          {
-            "name":"埔盐乡",
-            "code":"712733"
-          },
-          {
-            "name":"埔心乡",
-            "code":"712734"
-          },
-          {
-            "name":"永靖乡",
-            "code":"712735"
-          },
-          {
-            "name":"社头乡",
-            "code":"712736"
-          },
-          {
-            "name":"二水乡",
-            "code":"712737"
-          },
-          {
-            "name":"北斗镇",
-            "code":"712738"
-          },
-          {
-            "name":"二林镇",
-            "code":"712739"
-          },
-          {
-            "name":"田尾乡",
-            "code":"712740"
-          },
-          {
-            "name":"埤头乡",
-            "code":"712741"
-          },
-          {
-            "name":"芳苑乡",
-            "code":"712742"
-          },
-          {
-            "name":"大城乡",
-            "code":"712743"
-          },
-          {
-            "name":"竹塘乡",
-            "code":"712744"
-          },
-          {
-            "name":"溪州乡",
-            "code":"712745"
-          }
-        ]
-      },
-      {
-        "name":"南投县",
-        "code":"712800",
-        "sub":[
-          {
-            "name":"南投市",
-            "code":"712801"
-          },
-          {
-            "name":"埔里镇",
-            "code":"712821"
-          },
-          {
-            "name":"草屯镇",
-            "code":"712822"
-          },
-          {
-            "name":"竹山镇",
-            "code":"712823"
-          },
-          {
-            "name":"集集镇",
-            "code":"712824"
-          },
-          {
-            "name":"名间乡",
-            "code":"712825"
-          },
-          {
-            "name":"鹿谷乡",
-            "code":"712826"
-          },
-          {
-            "name":"中寮乡",
-            "code":"712827"
-          },
-          {
-            "name":"鱼池乡",
-            "code":"712828"
-          },
-          {
-            "name":"国姓乡",
-            "code":"712829"
-          },
-          {
-            "name":"水里乡",
-            "code":"712830"
-          },
-          {
-            "name":"信义乡",
-            "code":"712831"
-          },
-          {
-            "name":"仁爱乡",
-            "code":"712832"
-          }
-        ]
-      },
-      {
-        "name":"云林县",
-        "code":"712900",
-        "sub":[
-          {
-            "name":"斗六市",
-            "code":"712901"
-          },
-          {
-            "name":"斗南镇",
-            "code":"712921"
-          },
-          {
-            "name":"虎尾镇",
-            "code":"712922"
-          },
-          {
-            "name":"西螺镇",
-            "code":"712923"
-          },
-          {
-            "name":"土库镇",
-            "code":"712924"
-          },
-          {
-            "name":"北港镇",
-            "code":"712925"
-          },
-          {
-            "name":"古坑乡",
-            "code":"712926"
-          },
-          {
-            "name":"大埤乡",
-            "code":"712927"
-          },
-          {
-            "name":"莿桐乡",
-            "code":"712928"
-          },
-          {
-            "name":"林内乡",
-            "code":"712929"
-          },
-          {
-            "name":"二仑乡",
-            "code":"712930"
-          },
-          {
-            "name":"仑背乡",
-            "code":"712931"
-          },
-          {
-            "name":"麦寮乡",
-            "code":"712932"
-          },
-          {
-            "name":"东势乡",
-            "code":"712933"
-          },
-          {
-            "name":"褒忠乡",
-            "code":"712934"
-          },
-          {
-            "name":"台西乡",
-            "code":"712935"
-          },
-          {
-            "name":"元长乡",
-            "code":"712936"
-          },
-          {
-            "name":"四湖乡",
-            "code":"712937"
-          },
-          {
-            "name":"口湖乡",
-            "code":"712938"
-          },
-          {
-            "name":"水林乡",
-            "code":"712939"
-          }
-        ]
-      },
-      {
-        "name":"嘉义县",
-        "code":"713000",
-        "sub":[
-          {
-            "name":"太保市",
-            "code":"713001"
-          },
-          {
-            "name":"朴子市",
-            "code":"713002"
-          },
-          {
-            "name":"布袋镇",
-            "code":"713023"
-          },
-          {
-            "name":"大林镇",
-            "code":"713024"
-          },
-          {
-            "name":"民雄乡",
-            "code":"713025"
-          },
-          {
-            "name":"溪口乡",
-            "code":"713026"
-          },
-          {
-            "name":"新港乡",
-            "code":"713027"
-          },
-          {
-            "name":"六脚乡",
-            "code":"713028"
-          },
-          {
-            "name":"东石乡",
-            "code":"713029"
-          },
-          {
-            "name":"义竹乡",
-            "code":"713030"
-          },
-          {
-            "name":"鹿草乡",
-            "code":"713031"
-          },
-          {
-            "name":"水上乡",
-            "code":"713032"
-          },
-          {
-            "name":"中埔乡",
-            "code":"713033"
-          },
-          {
-            "name":"竹崎乡",
-            "code":"713034"
-          },
-          {
-            "name":"梅山乡",
-            "code":"713035"
-          },
-          {
-            "name":"番路乡",
-            "code":"713036"
-          },
-          {
-            "name":"大埔乡",
-            "code":"713037"
-          },
-          {
-            "name":"阿里山乡",
-            "code":"713038"
-          }
-        ]
-      },
-      {
-        "name":"屏东县",
-        "code":"713300",
-        "sub":[
-          {
-            "name":"屏东市",
-            "code":"713301"
-          },
-          {
-            "name":"潮州镇",
-            "code":"713321"
-          },
-          {
-            "name":"东港镇",
-            "code":"713322"
-          },
-          {
-            "name":"恒春镇",
-            "code":"713323"
-          },
-          {
-            "name":"万丹乡",
-            "code":"713324"
-          },
-          {
-            "name":"长治乡",
-            "code":"713325"
-          },
-          {
-            "name":"麟洛乡",
-            "code":"713326"
-          },
-          {
-            "name":"九如乡",
-            "code":"713327"
-          },
-          {
-            "name":"里港乡",
-            "code":"713328"
-          },
-          {
-            "name":"盐埔乡",
-            "code":"713329"
-          },
-          {
-            "name":"高树乡",
-            "code":"713330"
-          },
-          {
-            "name":"万峦乡",
-            "code":"713331"
-          },
-          {
-            "name":"内埔乡",
-            "code":"713332"
-          },
-          {
-            "name":"竹田乡",
-            "code":"713333"
-          },
-          {
-            "name":"新埤乡",
-            "code":"713334"
-          },
-          {
-            "name":"枋寮乡",
-            "code":"713335"
-          },
-          {
-            "name":"新园乡",
-            "code":"713336"
-          },
-          {
-            "name":"崁顶乡",
-            "code":"713337"
-          },
-          {
-            "name":"林边乡",
-            "code":"713338"
-          },
-          {
-            "name":"南州乡",
-            "code":"713339"
-          },
-          {
-            "name":"佳冬乡",
-            "code":"713340"
-          },
-          {
-            "name":"琉球乡",
-            "code":"713341"
-          },
-          {
-            "name":"车城乡",
-            "code":"713342"
-          },
-          {
-            "name":"满州乡",
-            "code":"713343"
-          },
-          {
-            "name":"枋山乡",
-            "code":"713344"
-          },
-          {
-            "name":"三地门乡",
-            "code":"713345"
-          },
-          {
-            "name":"雾台乡",
-            "code":"713346"
-          },
-          {
-            "name":"玛家乡",
-            "code":"713347"
-          },
-          {
-            "name":"泰武乡",
-            "code":"713348"
-          },
-          {
-            "name":"来义乡",
-            "code":"713349"
-          },
-          {
-            "name":"春日乡",
-            "code":"713350"
-          },
-          {
-            "name":"狮子乡",
-            "code":"713351"
-          },
-          {
-            "name":"牡丹乡",
-            "code":"713352"
-          }
-        ]
-      },
-      {
-        "name":"台东县",
-        "code":"713400",
-        "sub":[
-          {
-            "name":"台东市",
-            "code":"713401"
-          },
-          {
-            "name":"成功镇",
-            "code":"713421"
-          },
-          {
-            "name":"关山镇",
-            "code":"713422"
-          },
-          {
-            "name":"卑南乡",
-            "code":"713423"
-          },
-          {
-            "name":"鹿野乡",
-            "code":"713424"
-          },
-          {
-            "name":"池上乡",
-            "code":"713425"
-          },
-          {
-            "name":"东河乡",
-            "code":"713426"
-          },
-          {
-            "name":"长滨乡",
-            "code":"713427"
-          },
-          {
-            "name":"太麻里乡",
-            "code":"713428"
-          },
-          {
-            "name":"大武乡",
-            "code":"713429"
-          },
-          {
-            "name":"绿岛乡",
-            "code":"713430"
-          },
-          {
-            "name":"海端乡",
-            "code":"713431"
-          },
-          {
-            "name":"延平乡",
-            "code":"713432"
-          },
-          {
-            "name":"金峰乡",
-            "code":"713433"
-          },
-          {
-            "name":"达仁乡",
-            "code":"713434"
-          },
-          {
-            "name":"兰屿乡",
-            "code":"713435"
-          }
-        ]
-      },
-      {
-        "name":"花莲县",
-        "code":"713500",
-        "sub":[
-          {
-            "name":"花莲市",
-            "code":"713501"
-          },
-          {
-            "name":"凤林镇",
-            "code":"713521"
-          },
-          {
-            "name":"玉里镇",
-            "code":"713522"
-          },
-          {
-            "name":"新城乡",
-            "code":"713523"
-          },
-          {
-            "name":"吉安乡",
-            "code":"713524"
-          },
-          {
-            "name":"寿丰乡",
-            "code":"713525"
-          },
-          {
-            "name":"光复乡",
-            "code":"713526"
-          },
-          {
-            "name":"丰滨乡",
-            "code":"713527"
-          },
-          {
-            "name":"瑞穗乡",
-            "code":"713528"
-          },
-          {
-            "name":"富里乡",
-            "code":"713529"
-          },
-          {
-            "name":"秀林乡",
-            "code":"713530"
-          },
-          {
-            "name":"万荣乡",
-            "code":"713531"
-          },
-          {
-            "name":"卓溪乡",
-            "code":"713532"
-          }
-        ]
-      },
-      {
-        "name":"澎湖县",
-        "code":"713600",
-        "sub":[
-          {
-            "name":"马公市",
-            "code":"713601"
-          },
-          {
-            "name":"湖西乡",
-            "code":"713621"
-          },
-          {
-            "name":"白沙乡",
-            "code":"713622"
-          },
-          {
-            "name":"西屿乡",
-            "code":"713623"
-          },
-          {
-            "name":"望安乡",
-            "code":"713624"
-          },
-          {
-            "name":"七美乡",
-            "code":"713625"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name":"香港特别行政区",
-    "code":"810000",
-    "sub":[
-      {
-        "name":"香港岛",
-        "code":"810100",
-        "sub":[
-          {
-            "name":"中西区",
-            "code":"810101"
-          },
-          {
-            "name":"湾仔区",
-            "code":"810102"
-          },
-          {
-            "name":"东区",
-            "code":"810103"
-          },
-          {
-            "name":"南区",
-            "code":"810104"
-          }
-        ]
-      },
-      {
-        "name":"九龙",
-        "code":"810200",
-        "sub":[
-          {
-            "name":"油尖旺区",
-            "code":"810201"
-          },
-          {
-            "name":"深水埗区",
-            "code":"810202"
-          },
-          {
-            "name":"九龙城区",
-            "code":"810203"
-          },
-          {
-            "name":"黄大仙区",
-            "code":"810204"
-          },
-          {
-            "name":"观塘区",
-            "code":"810205"
-          }
-        ]
-      },
-      {
-        "name":"新界",
-        "code":"810300",
-        "sub":[
-          {
-            "name":"荃湾区",
-            "code":"810301"
-          },
-          {
-            "name":"屯门区",
-            "code":"810302"
-          },
-          {
-            "name":"元朗区",
-            "code":"810303"
-          },
-          {
-            "name":"北区",
-            "code":"810304"
-          },
-          {
-            "name":"大埔区",
-            "code":"810305"
-          },
-          {
-            "name":"西贡区",
-            "code":"810306"
-          },
-          {
-            "name":"沙田区",
-            "code":"810307"
-          },
-          {
-            "name":"葵青区",
-            "code":"810308"
-          },
-          {
-            "name":"离岛区",
-            "code":"810309"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name":"澳门特别行政区",
-    "code":"820000",
-    "sub":[
-      {
-        "name":"澳门半岛",
-        "code":"820100",
-        "sub":[
-          {
-            "name":"花地玛堂区",
-            "code":"820101"
-          },
-          {
-            "name":"圣安多尼堂区",
-            "code":"820102"
-          },
-          {
-            "name":"大堂区",
-            "code":"820103"
-          },
-          {
-            "name":"望德堂区",
-            "code":"820104"
-          },
-          {
-            "name":"风顺堂区",
-            "code":"820105"
-          }
-        ]
-      },
-      {
-        "name":"氹仔岛",
-        "code":"820200",
-        "sub":[
-          {
-            "name":"嘉模堂区",
-            "code":"820201"
-          }
-        ]
-      },
-      {
-        "name":"路环岛",
-        "code":"820300",
-        "sub":[
-          {
-            "name":"圣方济各堂区",
-            "code":"820301"
-          }
-        ]
-      }
-    ]
-  }
-
-];
-}($);
-// jshint ignore: end
-
-/* global $:true */
-/* jshint unused:false*/
-
-+ function($) {
-  "use strict";
-
-  var defaults;
-  var raw = $.rawCitiesData;
-
-  var format = function(data) {
-    var result = [];
-    for(var i=0;i<data.length;i++) {
-      var d = data[i];
-      if(/^请选择|市辖区/.test(d.name)) continue;
-      result.push(d);
-    }
-    if(result.length) return result;
-    return [];
-  };
-
-  var sub = function(data) {
-    if(!data.sub) return [{ name: '', code: data.code }];  // 有可能某些县级市没有区
-    return format(data.sub);
-  };
-
-  var getCities = function(d) {
-    for(var i=0;i< raw.length;i++) {
-      if(raw[i].code === d || raw[i].name === d) return sub(raw[i]);
-    }
-    return [];
-  };
-
-  var getDistricts = function(p, c) {
-    for(var i=0;i< raw.length;i++) {
-      if(raw[i].code === p || raw[i].name === p) {
-        for(var j=0;j< raw[i].sub.length;j++) {
-          if(raw[i].sub[j].code === c || raw[i].sub[j].name === c) {
-            return sub(raw[i].sub[j]);
-          }
-        }
-      }
-    }
-  };
-
-  var parseInitValue = function (val) {
-    var p = raw[0], c, d;
-    var tokens = val.split(' ');
-    raw.map(function (t) {
-      if (t.name === tokens[0]) p = t;
-    });
-
-    p.sub.map(function (t) {
-      if (t.name === tokens[1]) c = t;
-    })
-
-    if (tokens[2]) {
-      c.sub.map(function (t) {
-        if (t.name === tokens[2]) d = t;
-      })
-    }
-
-    if (d) return [p.code, c.code, d.code];
-    return [p.code, c.code];
-  }
-
-  $.fn.cityPicker = function(params) {
-    params = $.extend({}, defaults, params);
-    return this.each(function() {
-      var self = this;
-      
-      var provincesName = raw.map(function(d) {
-        return d.name;
-      });
-      var provincesCode = raw.map(function(d) {
-        return d.code;
-      });
-      var initCities = sub(raw[0]);
-      var initCitiesName = initCities.map(function (c) {
-        return c.name;
-      });
-      var initCitiesCode = initCities.map(function (c) {
-        return c.code;
-      });
-      var initDistricts = sub(raw[0].sub[0]);
-
-      var initDistrictsName = initDistricts.map(function (c) {
-        return c.name;
-      });
-      var initDistrictsCode = initDistricts.map(function (c) {
-        return c.code;
-      });
-
-      var currentProvince = provincesName[0];
-      var currentCity = initCitiesName[0];
-      var currentDistrict = initDistrictsName[0];
-
-      var cols = [
-          {
-            displayValues: provincesName,
-            values: provincesCode,
-            cssClass: "col-province"
-          },
-          {
-            displayValues: initCitiesName,
-            values: initCitiesCode,
-            cssClass: "col-city"
-          }
-        ];
-
-        if(params.showDistrict) cols.push({
-          values: initDistrictsCode,
-          displayValues: initDistrictsName,
-          cssClass: "col-district"
-        });
-
-      var config = {
-
-        cssClass: "city-picker",
-        rotateEffect: false,  //为了性能
-        formatValue: function (p, values, displayValues) {
-          return displayValues.join(' ');
-        },
-        onChange: function (picker, values, displayValues) {
-          var newProvince = picker.cols[0].displayValue;
-          var newCity;
-          if(newProvince !== currentProvince) {
-            var newCities = getCities(newProvince);
-            newCity = newCities[0].name;
-            var newDistricts = getDistricts(newProvince, newCity);
-            picker.cols[1].replaceValues(newCities.map(function (c) {
-              return c.code;
-            }), newCities.map(function (c) {
-              return c.name;
-            }));
-            if(params.showDistrict) picker.cols[2].replaceValues(newDistricts.map(function (d) {
-              return d.code;
-            }), newDistricts.map(function (d) {
-              return d.name;
-            }));
-            currentProvince = newProvince;
-            currentCity = newCity;
-            picker.updateValue();
-            return false; // 因为数据未更新完，所以这里不进行后序的值的处理
-          } else {
-            if(params.showDistrict) {
-              newCity = picker.cols[1].displayValue;
-              if(newCity !== currentCity) {
-                var districts = getDistricts(newProvince, newCity);
-                picker.cols[2].replaceValues(districts.map(function (d) {
-                  return d.code;
-                }), districts.map(function (d) {
-                  return d.name;
-                }));
-                currentCity = newCity;
-                picker.updateValue();
-                return false; // 因为数据未更新完，所以这里不进行后序的值的处理
-              }
-            }
-          }
-          //如果最后一列是空的，那么取倒数第二列
-          var len = (values[values.length-1] ? values.length - 1 : values.length - 2)
-          $(self).attr('data-code', values[len]);
-          $(self).attr('data-codes', values.join(','));
-          if (params.onChange) {
-            params.onChange.call(self, picker, values, displayValues);
-          }
-        },
-
-        cols: cols
-      };
-
-      if(!this) return;
-      var p = $.extend({}, params, config);
-      //计算value
-      var val = $(this).val();
-      if (!val) val = '北京 北京市 东城区';
-      currentProvince = val.split(" ")[0];
-      currentCity = val.split(" ")[1];
-      currentDistrict= val.split(" ")[2];
-      if(val) {
-        p.value = parseInitValue(val);
-        if(p.value[0]) {
-          var cities = getCities(p.value[0]);
-          p.cols[1].values = cities.map(function (c) {
-            return c.code;
-          });
-          p.cols[1].displayValues = cities.map(function (c) {
-            return c.name;
-          });
-        }
-
-        if(p.value[1]) {
-          if (params.showDistrict) {
-            var dis = getDistricts(p.value[0], p.value[1]);
-            p.cols[2].values = dis.map(function (d) {
-              return d.code;
-            });
-            p.cols[2].displayValues = dis.map(function (d) {
-              return d.name;
-            });
-          }
-        } else {
-          if (params.showDistrict) {
-            var dis = getDistricts(p.value[0], p.cols[1].values[0]);
-            p.cols[2].values = dis.map(function (d) {
-              return d.code;
-            });
-            p.cols[2].displayValues = dis.map(function (d) {
-              return d.name;
-            });
-          }
-        }
-      }
-      $(this).picker(p);
-    });
-  };
-
-  defaults = $.fn.cityPicker.prototype.defaults = {
-    showDistrict: true //是否显示地区选择
-  };
-
-}($);
diff --git a/NewLife.Cube/Content/jweui/js/city-picker.min.js b/NewLife.Cube/Content/jweui/js/city-picker.min.js
deleted file mode 100644
index 8091f11fb2..0000000000
--- a/NewLife.Cube/Content/jweui/js/city-picker.min.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// jshint ignore: start
-+function(e){e.rawCitiesData=[{name:"北京",code:"110000",sub:[{name:"北京市",code:"110000",sub:[{name:"东城区",code:"110101"},{name:"西城区",code:"110102"},{name:"朝阳区",code:"110105"},{name:"丰台区",code:"110106"},{name:"石景山区",code:"110107"},{name:"海淀区",code:"110108"},{name:"门头沟区",code:"110109"},{name:"房山区",code:"110111"},{name:"通州区",code:"110112"},{name:"顺义区",code:"110113"},{name:"昌平区",code:"110114"},{name:"大兴区",code:"110115"},{name:"怀柔区",code:"110116"},{name:"平谷区",code:"110117"},{name:"密云县",code:"110228"},{name:"延庆县",code:"110229"}]}]},{name:"天津",code:"120000",sub:[{name:"天津市",code:"120000",sub:[{name:"和平区",code:"120101"},{name:"河东区",code:"120102"},{name:"河西区",code:"120103"},{name:"南开区",code:"120104"},{name:"河北区",code:"120105"},{name:"红桥区",code:"120106"},{name:"东丽区",code:"120110"},{name:"西青区",code:"120111"},{name:"津南区",code:"120112"},{name:"北辰区",code:"120113"},{name:"武清区",code:"120114"},{name:"宝坻区",code:"120115"},{name:"滨海新区",code:"120116"},{name:"宁河县",code:"120221"},{name:"静海县",code:"120223"},{name:"蓟县",code:"120225"}]}]},{name:"河北省",code:"130000",sub:[{name:"石家庄市",code:"130100",sub:[{name:"市辖区",code:"130101"},{name:"长安区",code:"130102"},{name:"桥西区",code:"130104"},{name:"新华区",code:"130105"},{name:"井陉矿区",code:"130107"},{name:"裕华区",code:"130108"},{name:"藁城区",code:"130109"},{name:"鹿泉区",code:"130110"},{name:"栾城区",code:"130111"},{name:"井陉县",code:"130121"},{name:"正定县",code:"130123"},{name:"行唐县",code:"130125"},{name:"灵寿县",code:"130126"},{name:"高邑县",code:"130127"},{name:"深泽县",code:"130128"},{name:"赞皇县",code:"130129"},{name:"无极县",code:"130130"},{name:"平山县",code:"130131"},{name:"元氏县",code:"130132"},{name:"赵县",code:"130133"},{name:"辛集市",code:"130181"},{name:"晋州市",code:"130183"},{name:"新乐市",code:"130184"}]},{name:"唐山市",code:"130200",sub:[{name:"市辖区",code:"130201"},{name:"路南区",code:"130202"},{name:"路北区",code:"130203"},{name:"古冶区",code:"130204"},{name:"开平区",code:"130205"},{name:"丰南区",code:"130207"},{name:"丰润区",code:"130208"},{name:"曹妃甸区",code:"130209"},{name:"滦县",code:"130223"},{name:"滦南县",code:"130224"},{name:"乐亭县",code:"130225"},{name:"迁西县",code:"130227"},{name:"玉田县",code:"130229"},{name:"遵化市",code:"130281"},{name:"迁安市",code:"130283"}]},{name:"秦皇岛市",code:"130300",sub:[{name:"市辖区",code:"130301"},{name:"海港区",code:"130302"},{name:"山海关区",code:"130303"},{name:"北戴河区",code:"130304"},{name:"青龙满族自治县",code:"130321"},{name:"昌黎县",code:"130322"},{name:"抚宁县",code:"130323"},{name:"卢龙县",code:"130324"}]},{name:"邯郸市",code:"130400",sub:[{name:"市辖区",code:"130401"},{name:"邯山区",code:"130402"},{name:"丛台区",code:"130403"},{name:"复兴区",code:"130404"},{name:"峰峰矿区",code:"130406"},{name:"邯郸县",code:"130421"},{name:"临漳县",code:"130423"},{name:"成安县",code:"130424"},{name:"大名县",code:"130425"},{name:"涉县",code:"130426"},{name:"磁县",code:"130427"},{name:"肥乡县",code:"130428"},{name:"永年县",code:"130429"},{name:"邱县",code:"130430"},{name:"鸡泽县",code:"130431"},{name:"广平县",code:"130432"},{name:"馆陶县",code:"130433"},{name:"魏县",code:"130434"},{name:"曲周县",code:"130435"},{name:"武安市",code:"130481"}]},{name:"邢台市",code:"130500",sub:[{name:"市辖区",code:"130501"},{name:"桥东区",code:"130502"},{name:"桥西区",code:"130503"},{name:"邢台县",code:"130521"},{name:"临城县",code:"130522"},{name:"内丘县",code:"130523"},{name:"柏乡县",code:"130524"},{name:"隆尧县",code:"130525"},{name:"任县",code:"130526"},{name:"南和县",code:"130527"},{name:"宁晋县",code:"130528"},{name:"巨鹿县",code:"130529"},{name:"新河县",code:"130530"},{name:"广宗县",code:"130531"},{name:"平乡县",code:"130532"},{name:"威县",code:"130533"},{name:"清河县",code:"130534"},{name:"临西县",code:"130535"},{name:"南宫市",code:"130581"},{name:"沙河市",code:"130582"}]},{name:"保定市",code:"130600",sub:[{name:"市辖区",code:"130601"},{name:"新市区",code:"130602"},{name:"北市区",code:"130603"},{name:"南市区",code:"130604"},{name:"满城县",code:"130621"},{name:"清苑县",code:"130622"},{name:"涞水县",code:"130623"},{name:"阜平县",code:"130624"},{name:"徐水县",code:"130625"},{name:"定兴县",code:"130626"},{name:"唐县",code:"130627"},{name:"高阳县",code:"130628"},{name:"容城县",code:"130629"},{name:"涞源县",code:"130630"},{name:"望都县",code:"130631"},{name:"安新县",code:"130632"},{name:"易县",code:"130633"},{name:"曲阳县",code:"130634"},{name:"蠡县",code:"130635"},{name:"顺平县",code:"130636"},{name:"博野县",code:"130637"},{name:"雄县",code:"130638"},{name:"涿州市",code:"130681"},{name:"定州市",code:"130682"},{name:"安国市",code:"130683"},{name:"高碑店市",code:"130684"}]},{name:"张家口市",code:"130700",sub:[{name:"市辖区",code:"130701"},{name:"桥东区",code:"130702"},{name:"桥西区",code:"130703"},{name:"宣化区",code:"130705"},{name:"下花园区",code:"130706"},{name:"宣化县",code:"130721"},{name:"张北县",code:"130722"},{name:"康保县",code:"130723"},{name:"沽源县",code:"130724"},{name:"尚义县",code:"130725"},{name:"蔚县",code:"130726"},{name:"阳原县",code:"130727"},{name:"怀安县",code:"130728"},{name:"万全县",code:"130729"},{name:"怀来县",code:"130730"},{name:"涿鹿县",code:"130731"},{name:"赤城县",code:"130732"},{name:"崇礼县",code:"130733"}]},{name:"承德市",code:"130800",sub:[{name:"市辖区",code:"130801"},{name:"双桥区",code:"130802"},{name:"双滦区",code:"130803"},{name:"鹰手营子矿区",code:"130804"},{name:"承德县",code:"130821"},{name:"兴隆县",code:"130822"},{name:"平泉县",code:"130823"},{name:"滦平县",code:"130824"},{name:"隆化县",code:"130825"},{name:"丰宁满族自治县",code:"130826"},{name:"宽城满族自治县",code:"130827"},{name:"围场满族蒙古族自治县",code:"130828"}]},{name:"沧州市",code:"130900",sub:[{name:"市辖区",code:"130901"},{name:"新华区",code:"130902"},{name:"运河区",code:"130903"},{name:"沧县",code:"130921"},{name:"青县",code:"130922"},{name:"东光县",code:"130923"},{name:"海兴县",code:"130924"},{name:"盐山县",code:"130925"},{name:"肃宁县",code:"130926"},{name:"南皮县",code:"130927"},{name:"吴桥县",code:"130928"},{name:"献县",code:"130929"},{name:"孟村回族自治县",code:"130930"},{name:"泊头市",code:"130981"},{name:"任丘市",code:"130982"},{name:"黄骅市",code:"130983"},{name:"河间市",code:"130984"}]},{name:"廊坊市",code:"131000",sub:[{name:"市辖区",code:"131001"},{name:"安次区",code:"131002"},{name:"广阳区",code:"131003"},{name:"固安县",code:"131022"},{name:"永清县",code:"131023"},{name:"香河县",code:"131024"},{name:"大城县",code:"131025"},{name:"文安县",code:"131026"},{name:"大厂回族自治县",code:"131028"},{name:"霸州市",code:"131081"},{name:"三河市",code:"131082"}]},{name:"衡水市",code:"131100",sub:[{name:"市辖区",code:"131101"},{name:"桃城区",code:"131102"},{name:"枣强县",code:"131121"},{name:"武邑县",code:"131122"},{name:"武强县",code:"131123"},{name:"饶阳县",code:"131124"},{name:"安平县",code:"131125"},{name:"故城县",code:"131126"},{name:"景县",code:"131127"},{name:"阜城县",code:"131128"},{name:"冀州市",code:"131181"},{name:"深州市",code:"131182"}]}]},{name:"山西省",code:"140000",sub:[{name:"太原市",code:"140100",sub:[{name:"市辖区",code:"140101"},{name:"小店区",code:"140105"},{name:"迎泽区",code:"140106"},{name:"杏花岭区",code:"140107"},{name:"尖草坪区",code:"140108"},{name:"万柏林区",code:"140109"},{name:"晋源区",code:"140110"},{name:"清徐县",code:"140121"},{name:"阳曲县",code:"140122"},{name:"娄烦县",code:"140123"},{name:"古交市",code:"140181"}]},{name:"大同市",code:"140200",sub:[{name:"市辖区",code:"140201"},{name:"城区",code:"140202"},{name:"矿区",code:"140203"},{name:"南郊区",code:"140211"},{name:"新荣区",code:"140212"},{name:"阳高县",code:"140221"},{name:"天镇县",code:"140222"},{name:"广灵县",code:"140223"},{name:"灵丘县",code:"140224"},{name:"浑源县",code:"140225"},{name:"左云县",code:"140226"},{name:"大同县",code:"140227"}]},{name:"阳泉市",code:"140300",sub:[{name:"市辖区",code:"140301"},{name:"城区",code:"140302"},{name:"矿区",code:"140303"},{name:"郊区",code:"140311"},{name:"平定县",code:"140321"},{name:"盂县",code:"140322"}]},{name:"长治市",code:"140400",sub:[{name:"市辖区",code:"140401"},{name:"城区",code:"140402"},{name:"郊区",code:"140411"},{name:"长治县",code:"140421"},{name:"襄垣县",code:"140423"},{name:"屯留县",code:"140424"},{name:"平顺县",code:"140425"},{name:"黎城县",code:"140426"},{name:"壶关县",code:"140427"},{name:"长子县",code:"140428"},{name:"武乡县",code:"140429"},{name:"沁县",code:"140430"},{name:"沁源县",code:"140431"},{name:"潞城市",code:"140481"}]},{name:"晋城市",code:"140500",sub:[{name:"市辖区",code:"140501"},{name:"城区",code:"140502"},{name:"沁水县",code:"140521"},{name:"阳城县",code:"140522"},{name:"陵川县",code:"140524"},{name:"泽州县",code:"140525"},{name:"高平市",code:"140581"}]},{name:"朔州市",code:"140600",sub:[{name:"市辖区",code:"140601"},{name:"朔城区",code:"140602"},{name:"平鲁区",code:"140603"},{name:"山阴县",code:"140621"},{name:"应县",code:"140622"},{name:"右玉县",code:"140623"},{name:"怀仁县",code:"140624"}]},{name:"晋中市",code:"140700",sub:[{name:"市辖区",code:"140701"},{name:"榆次区",code:"140702"},{name:"榆社县",code:"140721"},{name:"左权县",code:"140722"},{name:"和顺县",code:"140723"},{name:"昔阳县",code:"140724"},{name:"寿阳县",code:"140725"},{name:"太谷县",code:"140726"},{name:"祁县",code:"140727"},{name:"平遥县",code:"140728"},{name:"灵石县",code:"140729"},{name:"介休市",code:"140781"}]},{name:"运城市",code:"140800",sub:[{name:"市辖区",code:"140801"},{name:"盐湖区",code:"140802"},{name:"临猗县",code:"140821"},{name:"万荣县",code:"140822"},{name:"闻喜县",code:"140823"},{name:"稷山县",code:"140824"},{name:"新绛县",code:"140825"},{name:"绛县",code:"140826"},{name:"垣曲县",code:"140827"},{name:"夏县",code:"140828"},{name:"平陆县",code:"140829"},{name:"芮城县",code:"140830"},{name:"永济市",code:"140881"},{name:"河津市",code:"140882"}]},{name:"忻州市",code:"140900",sub:[{name:"市辖区",code:"140901"},{name:"忻府区",code:"140902"},{name:"定襄县",code:"140921"},{name:"五台县",code:"140922"},{name:"代县",code:"140923"},{name:"繁峙县",code:"140924"},{name:"宁武县",code:"140925"},{name:"静乐县",code:"140926"},{name:"神池县",code:"140927"},{name:"五寨县",code:"140928"},{name:"岢岚县",code:"140929"},{name:"河曲县",code:"140930"},{name:"保德县",code:"140931"},{name:"偏关县",code:"140932"},{name:"原平市",code:"140981"}]},{name:"临汾市",code:"141000",sub:[{name:"市辖区",code:"141001"},{name:"尧都区",code:"141002"},{name:"曲沃县",code:"141021"},{name:"翼城县",code:"141022"},{name:"襄汾县",code:"141023"},{name:"洪洞县",code:"141024"},{name:"古县",code:"141025"},{name:"安泽县",code:"141026"},{name:"浮山县",code:"141027"},{name:"吉县",code:"141028"},{name:"乡宁县",code:"141029"},{name:"大宁县",code:"141030"},{name:"隰县",code:"141031"},{name:"永和县",code:"141032"},{name:"蒲县",code:"141033"},{name:"汾西县",code:"141034"},{name:"侯马市",code:"141081"},{name:"霍州市",code:"141082"}]},{name:"吕梁市",code:"141100",sub:[{name:"市辖区",code:"141101"},{name:"离石区",code:"141102"},{name:"文水县",code:"141121"},{name:"交城县",code:"141122"},{name:"兴县",code:"141123"},{name:"临县",code:"141124"},{name:"柳林县",code:"141125"},{name:"石楼县",code:"141126"},{name:"岚县",code:"141127"},{name:"方山县",code:"141128"},{name:"中阳县",code:"141129"},{name:"交口县",code:"141130"},{name:"孝义市",code:"141181"},{name:"汾阳市",code:"141182"}]}]},{name:"内蒙古自治区",code:"150000",sub:[{name:"呼和浩特市",code:"150100",sub:[{name:"市辖区",code:"150101"},{name:"新城区",code:"150102"},{name:"回民区",code:"150103"},{name:"玉泉区",code:"150104"},{name:"赛罕区",code:"150105"},{name:"土默特左旗",code:"150121"},{name:"托克托县",code:"150122"},{name:"和林格尔县",code:"150123"},{name:"清水河县",code:"150124"},{name:"武川县",code:"150125"}]},{name:"包头市",code:"150200",sub:[{name:"市辖区",code:"150201"},{name:"东河区",code:"150202"},{name:"昆都仑区",code:"150203"},{name:"青山区",code:"150204"},{name:"石拐区",code:"150205"},{name:"白云鄂博矿区",code:"150206"},{name:"九原区",code:"150207"},{name:"土默特右旗",code:"150221"},{name:"固阳县",code:"150222"},{name:"达尔罕茂明安联合旗",code:"150223"}]},{name:"乌海市",code:"150300",sub:[{name:"市辖区",code:"150301"},{name:"海勃湾区",code:"150302"},{name:"海南区",code:"150303"},{name:"乌达区",code:"150304"}]},{name:"赤峰市",code:"150400",sub:[{name:"市辖区",code:"150401"},{name:"红山区",code:"150402"},{name:"元宝山区",code:"150403"},{name:"松山区",code:"150404"},{name:"阿鲁科尔沁旗",code:"150421"},{name:"巴林左旗",code:"150422"},{name:"巴林右旗",code:"150423"},{name:"林西县",code:"150424"},{name:"克什克腾旗",code:"150425"},{name:"翁牛特旗",code:"150426"},{name:"喀喇沁旗",code:"150428"},{name:"宁城县",code:"150429"},{name:"敖汉旗",code:"150430"}]},{name:"通辽市",code:"150500",sub:[{name:"市辖区",code:"150501"},{name:"科尔沁区",code:"150502"},{name:"科尔沁左翼中旗",code:"150521"},{name:"科尔沁左翼后旗",code:"150522"},{name:"开鲁县",code:"150523"},{name:"库伦旗",code:"150524"},{name:"奈曼旗",code:"150525"},{name:"扎鲁特旗",code:"150526"},{name:"霍林郭勒市",code:"150581"}]},{name:"鄂尔多斯市",code:"150600",sub:[{name:"市辖区",code:"150601"},{name:"东胜区",code:"150602"},{name:"达拉特旗",code:"150621"},{name:"准格尔旗",code:"150622"},{name:"鄂托克前旗",code:"150623"},{name:"鄂托克旗",code:"150624"},{name:"杭锦旗",code:"150625"},{name:"乌审旗",code:"150626"},{name:"伊金霍洛旗",code:"150627"}]},{name:"呼伦贝尔市",code:"150700",sub:[{name:"市辖区",code:"150701"},{name:"海拉尔区",code:"150702"},{name:"扎赉诺尔区",code:"150703"},{name:"阿荣旗",code:"150721"},{name:"莫力达瓦达斡尔族自治旗",code:"150722"},{name:"鄂伦春自治旗",code:"150723"},{name:"鄂温克族自治旗",code:"150724"},{name:"陈巴尔虎旗",code:"150725"},{name:"新巴尔虎左旗",code:"150726"},{name:"新巴尔虎右旗",code:"150727"},{name:"满洲里市",code:"150781"},{name:"牙克石市",code:"150782"},{name:"扎兰屯市",code:"150783"},{name:"额尔古纳市",code:"150784"},{name:"根河市",code:"150785"}]},{name:"巴彦淖尔市",code:"150800",sub:[{name:"市辖区",code:"150801"},{name:"临河区",code:"150802"},{name:"五原县",code:"150821"},{name:"磴口县",code:"150822"},{name:"乌拉特前旗",code:"150823"},{name:"乌拉特中旗",code:"150824"},{name:"乌拉特后旗",code:"150825"},{name:"杭锦后旗",code:"150826"}]},{name:"乌兰察布市",code:"150900",sub:[{name:"市辖区",code:"150901"},{name:"集宁区",code:"150902"},{name:"卓资县",code:"150921"},{name:"化德县",code:"150922"},{name:"商都县",code:"150923"},{name:"兴和县",code:"150924"},{name:"凉城县",code:"150925"},{name:"察哈尔右翼前旗",code:"150926"},{name:"察哈尔右翼中旗",code:"150927"},{name:"察哈尔右翼后旗",code:"150928"},{name:"四子王旗",code:"150929"},{name:"丰镇市",code:"150981"}]},{name:"兴安盟",code:"152200",sub:[{name:"乌兰浩特市",code:"152201"},{name:"阿尔山市",code:"152202"},{name:"科尔沁右翼前旗",code:"152221"},{name:"科尔沁右翼中旗",code:"152222"},{name:"扎赉特旗",code:"152223"},{name:"突泉县",code:"152224"}]},{name:"锡林郭勒盟",code:"152500",sub:[{name:"二连浩特市",code:"152501"},{name:"锡林浩特市",code:"152502"},{name:"阿巴嘎旗",code:"152522"},{name:"苏尼特左旗",code:"152523"},{name:"苏尼特右旗",code:"152524"},{name:"东乌珠穆沁旗",code:"152525"},{name:"西乌珠穆沁旗",code:"152526"},{name:"太仆寺旗",code:"152527"},{name:"镶黄旗",code:"152528"},{name:"正镶白旗",code:"152529"},{name:"正蓝旗",code:"152530"},{name:"多伦县",code:"152531"}]},{name:"阿拉善盟",code:"152900",sub:[{name:"阿拉善左旗",code:"152921"},{name:"阿拉善右旗",code:"152922"},{name:"额济纳旗",code:"152923"}]}]},{name:"辽宁省",code:"210000",sub:[{name:"沈阳市",code:"210100",sub:[{name:"市辖区",code:"210101"},{name:"和平区",code:"210102"},{name:"沈河区",code:"210103"},{name:"大东区",code:"210104"},{name:"皇姑区",code:"210105"},{name:"铁西区",code:"210106"},{name:"苏家屯区",code:"210111"},{name:"浑南区",code:"210112"},{name:"沈北新区",code:"210113"},{name:"于洪区",code:"210114"},{name:"辽中县",code:"210122"},{name:"康平县",code:"210123"},{name:"法库县",code:"210124"},{name:"新民市",code:"210181"}]},{name:"大连市",code:"210200",sub:[{name:"市辖区",code:"210201"},{name:"中山区",code:"210202"},{name:"西岗区",code:"210203"},{name:"沙河口区",code:"210204"},{name:"甘井子区",code:"210211"},{name:"旅顺口区",code:"210212"},{name:"金州区",code:"210213"},{name:"长海县",code:"210224"},{name:"瓦房店市",code:"210281"},{name:"普兰店市",code:"210282"},{name:"庄河市",code:"210283"}]},{name:"鞍山市",code:"210300",sub:[{name:"市辖区",code:"210301"},{name:"铁东区",code:"210302"},{name:"铁西区",code:"210303"},{name:"立山区",code:"210304"},{name:"千山区",code:"210311"},{name:"台安县",code:"210321"},{name:"岫岩满族自治县",code:"210323"},{name:"海城市",code:"210381"}]},{name:"抚顺市",code:"210400",sub:[{name:"市辖区",code:"210401"},{name:"新抚区",code:"210402"},{name:"东洲区",code:"210403"},{name:"望花区",code:"210404"},{name:"顺城区",code:"210411"},{name:"抚顺县",code:"210421"},{name:"新宾满族自治县",code:"210422"},{name:"清原满族自治县",code:"210423"}]},{name:"本溪市",code:"210500",sub:[{name:"市辖区",code:"210501"},{name:"平山区",code:"210502"},{name:"溪湖区",code:"210503"},{name:"明山区",code:"210504"},{name:"南芬区",code:"210505"},{name:"本溪满族自治县",code:"210521"},{name:"桓仁满族自治县",code:"210522"}]},{name:"丹东市",code:"210600",sub:[{name:"市辖区",code:"210601"},{name:"元宝区",code:"210602"},{name:"振兴区",code:"210603"},{name:"振安区",code:"210604"},{name:"宽甸满族自治县",code:"210624"},{name:"东港市",code:"210681"},{name:"凤城市",code:"210682"}]},{name:"锦州市",code:"210700",sub:[{name:"市辖区",code:"210701"},{name:"古塔区",code:"210702"},{name:"凌河区",code:"210703"},{name:"太和区",code:"210711"},{name:"黑山县",code:"210726"},{name:"义县",code:"210727"},{name:"凌海市",code:"210781"},{name:"北镇市",code:"210782"}]},{name:"营口市",code:"210800",sub:[{name:"市辖区",code:"210801"},{name:"站前区",code:"210802"},{name:"西市区",code:"210803"},{name:"鲅鱼圈区",code:"210804"},{name:"老边区",code:"210811"},{name:"盖州市",code:"210881"},{name:"大石桥市",code:"210882"}]},{name:"阜新市",code:"210900",sub:[{name:"市辖区",code:"210901"},{name:"海州区",code:"210902"},{name:"新邱区",code:"210903"},{name:"太平区",code:"210904"},{name:"清河门区",code:"210905"},{name:"细河区",code:"210911"},{name:"阜新蒙古族自治县",code:"210921"},{name:"彰武县",code:"210922"}]},{name:"辽阳市",code:"211000",sub:[{name:"市辖区",code:"211001"},{name:"白塔区",code:"211002"},{name:"文圣区",code:"211003"},{name:"宏伟区",code:"211004"},{name:"弓长岭区",code:"211005"},{name:"太子河区",code:"211011"},{name:"辽阳县",code:"211021"},{name:"灯塔市",code:"211081"}]},{name:"盘锦市",code:"211100",sub:[{name:"市辖区",code:"211101"},{name:"双台子区",code:"211102"},{name:"兴隆台区",code:"211103"},{name:"大洼县",code:"211121"},{name:"盘山县",code:"211122"}]},{name:"铁岭市",code:"211200",sub:[{name:"市辖区",code:"211201"},{name:"银州区",code:"211202"},{name:"清河区",code:"211204"},{name:"铁岭县",code:"211221"},{name:"西丰县",code:"211223"},{name:"昌图县",code:"211224"},{name:"调兵山市",code:"211281"},{name:"开原市",code:"211282"}]},{name:"朝阳市",code:"211300",sub:[{name:"市辖区",code:"211301"},{name:"双塔区",code:"211302"},{name:"龙城区",code:"211303"},{name:"朝阳县",code:"211321"},{name:"建平县",code:"211322"},{name:"喀喇沁左翼蒙古族自治县",code:"211324"},{name:"北票市",code:"211381"},{name:"凌源市",code:"211382"}]},{name:"葫芦岛市",code:"211400",sub:[{name:"市辖区",code:"211401"},{name:"连山区",code:"211402"},{name:"龙港区",code:"211403"},{name:"南票区",code:"211404"},{name:"绥中县",code:"211421"},{name:"建昌县",code:"211422"},{name:"兴城市",code:"211481"}]}]},{name:"吉林省",code:"220000",sub:[{name:"长春市",code:"220100",sub:[{name:"市辖区",code:"220101"},{name:"南关区",code:"220102"},{name:"宽城区",code:"220103"},{name:"朝阳区",code:"220104"},{name:"二道区",code:"220105"},{name:"绿园区",code:"220106"},{name:"双阳区",code:"220112"},{name:"九台区",code:"220113"},{name:"农安县",code:"220122"},{name:"榆树市",code:"220182"},{name:"德惠市",code:"220183"}]},{name:"吉林市",code:"220200",sub:[{name:"市辖区",code:"220201"},{name:"昌邑区",code:"220202"},{name:"龙潭区",code:"220203"},{name:"船营区",code:"220204"},{name:"丰满区",code:"220211"},{name:"永吉县",code:"220221"},{name:"蛟河市",code:"220281"},{name:"桦甸市",code:"220282"},{name:"舒兰市",code:"220283"},{name:"磐石市",code:"220284"}]},{name:"四平市",code:"220300",sub:[{name:"市辖区",code:"220301"},{name:"铁西区",code:"220302"},{name:"铁东区",code:"220303"},{name:"梨树县",code:"220322"},{name:"伊通满族自治县",code:"220323"},{name:"公主岭市",code:"220381"},{name:"双辽市",code:"220382"}]},{name:"辽源市",code:"220400",sub:[{name:"市辖区",code:"220401"},{name:"龙山区",code:"220402"},{name:"西安区",code:"220403"},{name:"东丰县",code:"220421"},{name:"东辽县",code:"220422"}]},{name:"通化市",code:"220500",sub:[{name:"市辖区",code:"220501"},{name:"东昌区",code:"220502"},{name:"二道江区",code:"220503"},{name:"通化县",code:"220521"},{name:"辉南县",code:"220523"},{name:"柳河县",code:"220524"},{name:"梅河口市",code:"220581"},{name:"集安市",code:"220582"}]},{name:"白山市",code:"220600",sub:[{name:"市辖区",code:"220601"},{name:"浑江区",code:"220602"},{name:"江源区",code:"220605"},{name:"抚松县",code:"220621"},{name:"靖宇县",code:"220622"},{name:"长白朝鲜族自治县",code:"220623"},{name:"临江市",code:"220681"}]},{name:"松原市",code:"220700",sub:[{name:"市辖区",code:"220701"},{name:"宁江区",code:"220702"},{name:"前郭尔罗斯蒙古族自治县",code:"220721"},{name:"长岭县",code:"220722"},{name:"乾安县",code:"220723"},{name:"扶余市",code:"220781"}]},{name:"白城市",code:"220800",sub:[{name:"市辖区",code:"220801"},{name:"洮北区",code:"220802"},{name:"镇赉县",code:"220821"},{name:"通榆县",code:"220822"},{name:"洮南市",code:"220881"},{name:"大安市",code:"220882"}]},{name:"延边朝鲜族自治州",code:"222400",sub:[{name:"延吉市",code:"222401"},{name:"图们市",code:"222402"},{name:"敦化市",code:"222403"},{name:"珲春市",code:"222404"},{name:"龙井市",code:"222405"},{name:"和龙市",code:"222406"},{name:"汪清县",code:"222424"},{name:"安图县",code:"222426"}]}]},{name:"黑龙江省",code:"230000",sub:[{name:"哈尔滨市",code:"230100",sub:[{name:"市辖区",code:"230101"},{name:"道里区",code:"230102"},{name:"南岗区",code:"230103"},{name:"道外区",code:"230104"},{name:"平房区",code:"230108"},{name:"松北区",code:"230109"},{name:"香坊区",code:"230110"},{name:"呼兰区",code:"230111"},{name:"阿城区",code:"230112"},{name:"双城区",code:"230113"},{name:"依兰县",code:"230123"},{name:"方正县",code:"230124"},{name:"宾县",code:"230125"},{name:"巴彦县",code:"230126"},{name:"木兰县",code:"230127"},{name:"通河县",code:"230128"},{name:"延寿县",code:"230129"},{name:"尚志市",code:"230183"},{name:"五常市",code:"230184"}]},{name:"齐齐哈尔市",code:"230200",sub:[{name:"市辖区",code:"230201"},{name:"龙沙区",code:"230202"},{name:"建华区",code:"230203"},{name:"铁锋区",code:"230204"},{name:"昂昂溪区",code:"230205"},{name:"富拉尔基区",code:"230206"},{name:"碾子山区",code:"230207"},{name:"梅里斯达斡尔族区",code:"230208"},{name:"龙江县",code:"230221"},{name:"依安县",code:"230223"},{name:"泰来县",code:"230224"},{name:"甘南县",code:"230225"},{name:"富裕县",code:"230227"},{name:"克山县",code:"230229"},{name:"克东县",code:"230230"},{name:"拜泉县",code:"230231"},{name:"讷河市",code:"230281"}]},{name:"鸡西市",code:"230300",sub:[{name:"市辖区",code:"230301"},{name:"鸡冠区",code:"230302"},{name:"恒山区",code:"230303"},{name:"滴道区",code:"230304"},{name:"梨树区",code:"230305"},{name:"城子河区",code:"230306"},{name:"麻山区",code:"230307"},{name:"鸡东县",code:"230321"},{name:"虎林市",code:"230381"},{name:"密山市",code:"230382"}]},{name:"鹤岗市",code:"230400",sub:[{name:"市辖区",code:"230401"},{name:"向阳区",code:"230402"},{name:"工农区",code:"230403"},{name:"南山区",code:"230404"},{name:"兴安区",code:"230405"},{name:"东山区",code:"230406"},{name:"兴山区",code:"230407"},{name:"萝北县",code:"230421"},{name:"绥滨县",code:"230422"}]},{name:"双鸭山市",code:"230500",sub:[{name:"市辖区",code:"230501"},{name:"尖山区",code:"230502"},{name:"岭东区",code:"230503"},{name:"四方台区",code:"230505"},{name:"宝山区",code:"230506"},{name:"集贤县",code:"230521"},{name:"友谊县",code:"230522"},{name:"宝清县",code:"230523"},{name:"饶河县",code:"230524"}]},{name:"大庆市",code:"230600",sub:[{name:"市辖区",code:"230601"},{name:"萨尔图区",code:"230602"},{name:"龙凤区",code:"230603"},{name:"让胡路区",code:"230604"},{name:"红岗区",code:"230605"},{name:"大同区",code:"230606"},{name:"肇州县",code:"230621"},{name:"肇源县",code:"230622"},{name:"林甸县",code:"230623"},{name:"杜尔伯特蒙古族自治县",code:"230624"}]},{name:"伊春市",code:"230700",sub:[{name:"市辖区",code:"230701"},{name:"伊春区",code:"230702"},{name:"南岔区",code:"230703"},{name:"友好区",code:"230704"},{name:"西林区",code:"230705"},{name:"翠峦区",code:"230706"},{name:"新青区",code:"230707"},{name:"美溪区",code:"230708"},{name:"金山屯区",code:"230709"},{name:"五营区",code:"230710"},{name:"乌马河区",code:"230711"},{name:"汤旺河区",code:"230712"},{name:"带岭区",code:"230713"},{name:"乌伊岭区",code:"230714"},{name:"红星区",code:"230715"},{name:"上甘岭区",code:"230716"},{name:"嘉荫县",code:"230722"},{name:"铁力市",code:"230781"}]},{name:"佳木斯市",code:"230800",sub:[{name:"市辖区",code:"230801"},{name:"向阳区",code:"230803"},{name:"前进区",code:"230804"},{name:"东风区",code:"230805"},{name:"郊区",code:"230811"},{name:"桦南县",code:"230822"},{name:"桦川县",code:"230826"},{name:"汤原县",code:"230828"},{name:"抚远县",code:"230833"},{name:"同江市",code:"230881"},{name:"富锦市",code:"230882"}]},{name:"七台河市",code:"230900",sub:[{name:"市辖区",code:"230901"},{name:"新兴区",code:"230902"},{name:"桃山区",code:"230903"},{name:"茄子河区",code:"230904"},{name:"勃利县",code:"230921"}]},{name:"牡丹江市",code:"231000",sub:[{name:"市辖区",code:"231001"},{name:"东安区",code:"231002"},{name:"阳明区",code:"231003"},{name:"爱民区",code:"231004"},{name:"西安区",code:"231005"},{name:"东宁县",code:"231024"},{name:"林口县",code:"231025"},{name:"绥芬河市",code:"231081"},{name:"海林市",code:"231083"},{name:"宁安市",code:"231084"},{name:"穆棱市",code:"231085"}]},{name:"黑河市",code:"231100",sub:[{name:"市辖区",code:"231101"},{name:"爱辉区",code:"231102"},{name:"嫩江县",code:"231121"},{name:"逊克县",code:"231123"},{name:"孙吴县",code:"231124"},{name:"北安市",code:"231181"},{name:"五大连池市",code:"231182"}]},{name:"绥化市",code:"231200",sub:[{name:"市辖区",code:"231201"},{name:"北林区",code:"231202"},{name:"望奎县",code:"231221"},{name:"兰西县",code:"231222"},{name:"青冈县",code:"231223"},{name:"庆安县",code:"231224"},{name:"明水县",code:"231225"},{name:"绥棱县",code:"231226"},{name:"安达市",code:"231281"},{name:"肇东市",code:"231282"},{name:"海伦市",code:"231283"}]},{name:"大兴安岭地区",code:"232700",sub:[{name:"呼玛县",code:"232721"},{name:"塔河县",code:"232722"},{name:"漠河县",code:"232723"}]}]},{name:"上海",code:"310000",sub:[{name:"上海市",code:"310000",sub:[{name:"黄浦区",code:"310101"},{name:"徐汇区",code:"310104"},{name:"长宁区",code:"310105"},{name:"静安区",code:"310106"},{name:"普陀区",code:"310107"},{name:"闸北区",code:"310108"},{name:"虹口区",code:"310109"},{name:"杨浦区",code:"310110"},{name:"闵行区",code:"310112"},{name:"宝山区",code:"310113"},{name:"嘉定区",code:"310114"},{name:"浦东新区",code:"310115"},{name:"金山区",code:"310116"},{name:"松江区",code:"310117"},{name:"青浦区",code:"310118"},{name:"奉贤区",code:"310120"},{name:"崇明县",code:"310230"}]}]},{name:"江苏省",code:"320000",sub:[{name:"南京市",code:"320100",sub:[{name:"市辖区",code:"320101"},{name:"玄武区",code:"320102"},{name:"秦淮区",code:"320104"},{name:"建邺区",code:"320105"},{name:"鼓楼区",code:"320106"},{name:"浦口区",code:"320111"},{name:"栖霞区",code:"320113"},{name:"雨花台区",code:"320114"},{name:"江宁区",code:"320115"},{name:"六合区",code:"320116"},{name:"溧水区",code:"320117"},{name:"高淳区",code:"320118"}]},{name:"无锡市",code:"320200",sub:[{name:"市辖区",code:"320201"},{name:"崇安区",code:"320202"},{name:"南长区",code:"320203"},{name:"北塘区",code:"320204"},{name:"锡山区",code:"320205"},{name:"惠山区",code:"320206"},{name:"滨湖区",code:"320211"},{name:"江阴市",code:"320281"},{name:"宜兴市",code:"320282"}]},{name:"徐州市",code:"320300",sub:[{name:"市辖区",code:"320301"},{name:"鼓楼区",code:"320302"},{name:"云龙区",code:"320303"},{name:"贾汪区",code:"320305"},{name:"泉山区",code:"320311"},{name:"铜山区",code:"320312"},{name:"丰县",code:"320321"},{name:"沛县",code:"320322"},{name:"睢宁县",code:"320324"},{name:"新沂市",code:"320381"},{name:"邳州市",code:"320382"}]},{name:"常州市",code:"320400",sub:[{name:"市辖区",code:"320401"},{name:"天宁区",code:"320402"},{name:"钟楼区",code:"320404"},{name:"戚墅堰区",code:"320405"},{name:"新北区",code:"320411"},{name:"武进区",code:"320412"},{name:"溧阳市",code:"320481"},{name:"金坛市",code:"320482"}]},{name:"苏州市",code:"320500",sub:[{name:"市辖区",code:"320501"},{name:"虎丘区",code:"320505"},{name:"吴中区",code:"320506"},{name:"相城区",code:"320507"},{name:"姑苏区",code:"320508"},{name:"吴江区",code:"320509"},{name:"常熟市",code:"320581"},{name:"张家港市",code:"320582"},{name:"昆山市",code:"320583"},{name:"太仓市",code:"320585"}]},{name:"南通市",code:"320600",sub:[{name:"市辖区",code:"320601"},{name:"崇川区",code:"320602"},{name:"港闸区",code:"320611"},{name:"通州区",code:"320612"},{name:"海安县",code:"320621"},{name:"如东县",code:"320623"},{name:"启东市",code:"320681"},{name:"如皋市",code:"320682"},{name:"海门市",code:"320684"}]},{name:"连云港市",code:"320700",sub:[{name:"市辖区",code:"320701"},{name:"连云区",code:"320703"},{name:"海州区",code:"320706"},{name:"赣榆区",code:"320707"},{name:"东海县",code:"320722"},{name:"灌云县",code:"320723"},{name:"灌南县",code:"320724"}]},{name:"淮安市",code:"320800",sub:[{name:"市辖区",code:"320801"},{name:"清河区",code:"320802"},{name:"淮安区",code:"320803"},{name:"淮阴区",code:"320804"},{name:"清浦区",code:"320811"},{name:"涟水县",code:"320826"},{name:"洪泽县",code:"320829"},{name:"盱眙县",code:"320830"},{name:"金湖县",code:"320831"}]},{name:"盐城市",code:"320900",sub:[{name:"市辖区",code:"320901"},{name:"亭湖区",code:"320902"},{name:"盐都区",code:"320903"},{name:"响水县",code:"320921"},{name:"滨海县",code:"320922"},{name:"阜宁县",code:"320923"},{name:"射阳县",code:"320924"},{name:"建湖县",code:"320925"},{name:"东台市",code:"320981"},{name:"大丰市",code:"320982"}]},{name:"扬州市",code:"321000",sub:[{name:"市辖区",code:"321001"},{name:"广陵区",code:"321002"},{name:"邗江区",code:"321003"},{name:"江都区",code:"321012"},{name:"宝应县",code:"321023"},{name:"仪征市",code:"321081"},{name:"高邮市",code:"321084"}]},{name:"镇江市",code:"321100",sub:[{name:"市辖区",code:"321101"},{name:"京口区",code:"321102"},{name:"润州区",code:"321111"},{name:"丹徒区",code:"321112"},{name:"丹阳市",code:"321181"},{name:"扬中市",code:"321182"},{name:"句容市",code:"321183"}]},{name:"泰州市",code:"321200",sub:[{name:"市辖区",code:"321201"},{name:"海陵区",code:"321202"},{name:"高港区",code:"321203"},{name:"姜堰区",code:"321204"},{name:"兴化市",code:"321281"},{name:"靖江市",code:"321282"},{name:"泰兴市",code:"321283"}]},{name:"宿迁市",code:"321300",sub:[{name:"市辖区",code:"321301"},{name:"宿城区",code:"321302"},{name:"宿豫区",code:"321311"},{name:"沭阳县",code:"321322"},{name:"泗阳县",code:"321323"},{name:"泗洪县",code:"321324"}]}]},{name:"浙江省",code:"330000",sub:[{name:"杭州市",code:"330100",sub:[{name:"市辖区",code:"330101"},{name:"上城区",code:"330102"},{name:"下城区",code:"330103"},{name:"江干区",code:"330104"},{name:"拱墅区",code:"330105"},{name:"西湖区",code:"330106"},{name:"滨江区",code:"330108"},{name:"萧山区",code:"330109"},{name:"余杭区",code:"330110"},{name:"富阳区",code:"330111"},{name:"桐庐县",code:"330122"},{name:"淳安县",code:"330127"},{name:"建德市",code:"330182"},{name:"临安市",code:"330185"}]},{name:"宁波市",code:"330200",sub:[{name:"市辖区",code:"330201"},{name:"海曙区",code:"330203"},{name:"江东区",code:"330204"},{name:"江北区",code:"330205"},{name:"北仑区",code:"330206"},{name:"镇海区",code:"330211"},{name:"鄞州区",code:"330212"},{name:"象山县",code:"330225"},{name:"宁海县",code:"330226"},{name:"余姚市",code:"330281"},{name:"慈溪市",code:"330282"},{name:"奉化市",code:"330283"}]},{name:"温州市",code:"330300",sub:[{name:"市辖区",code:"330301"},{name:"鹿城区",code:"330302"},{name:"龙湾区",code:"330303"},{name:"瓯海区",code:"330304"},{name:"洞头县",code:"330322"},{name:"永嘉县",code:"330324"},{name:"平阳县",code:"330326"},{name:"苍南县",code:"330327"},{name:"文成县",code:"330328"},{name:"泰顺县",code:"330329"},{name:"瑞安市",code:"330381"},{name:"乐清市",code:"330382"}]},{name:"嘉兴市",code:"330400",sub:[{name:"市辖区",code:"330401"},{name:"南湖区",code:"330402"},{name:"秀洲区",code:"330411"},{name:"嘉善县",code:"330421"},{name:"海盐县",code:"330424"},{name:"海宁市",code:"330481"},{name:"平湖市",code:"330482"},{name:"桐乡市",code:"330483"}]},{name:"湖州市",code:"330500",sub:[{name:"市辖区",code:"330501"},{name:"吴兴区",code:"330502"},{name:"南浔区",code:"330503"},{name:"德清县",code:"330521"},{name:"长兴县",code:"330522"},{name:"安吉县",code:"330523"}]},{name:"绍兴市",code:"330600",sub:[{name:"市辖区",code:"330601"},{name:"越城区",code:"330602"},{name:"柯桥区",code:"330603"},{name:"上虞区",code:"330604"},{name:"新昌县",code:"330624"},{name:"诸暨市",code:"330681"},{name:"嵊州市",code:"330683"}]},{name:"金华市",code:"330700",sub:[{name:"市辖区",code:"330701"},{name:"婺城区",code:"330702"},{name:"金东区",code:"330703"},{name:"武义县",code:"330723"},{name:"浦江县",code:"330726"},{name:"磐安县",code:"330727"},{name:"兰溪市",code:"330781"},{name:"义乌市",code:"330782"},{name:"东阳市",code:"330783"},{name:"永康市",code:"330784"}]},{name:"衢州市",code:"330800",sub:[{name:"市辖区",code:"330801"},{name:"柯城区",code:"330802"},{name:"衢江区",code:"330803"},{name:"常山县",code:"330822"},{name:"开化县",code:"330824"},{name:"龙游县",code:"330825"},{name:"江山市",code:"330881"}]},{name:"舟山市",code:"330900",sub:[{name:"市辖区",code:"330901"},{name:"定海区",code:"330902"},{name:"普陀区",code:"330903"},{name:"岱山县",code:"330921"},{name:"嵊泗县",code:"330922"}]},{name:"台州市",code:"331000",sub:[{name:"市辖区",code:"331001"},{name:"椒江区",code:"331002"},{name:"黄岩区",code:"331003"},{name:"路桥区",code:"331004"},{name:"玉环县",code:"331021"},{name:"三门县",code:"331022"},{name:"天台县",code:"331023"},{name:"仙居县",code:"331024"},{name:"温岭市",code:"331081"},{name:"临海市",code:"331082"}]},{name:"丽水市",code:"331100",sub:[{name:"市辖区",code:"331101"},{name:"莲都区",code:"331102"},{name:"青田县",code:"331121"},{name:"缙云县",code:"331122"},{name:"遂昌县",code:"331123"},{name:"松阳县",code:"331124"},{name:"云和县",code:"331125"},{name:"庆元县",code:"331126"},{name:"景宁畲族自治县",code:"331127"},{name:"龙泉市",code:"331181"}]}]},{name:"安徽省",code:"340000",sub:[{name:"合肥市",code:"340100",sub:[{name:"市辖区",code:"340101"},{name:"瑶海区",code:"340102"},{name:"庐阳区",code:"340103"},{name:"蜀山区",code:"340104"},{name:"包河区",code:"340111"},{name:"长丰县",code:"340121"},{name:"肥东县",code:"340122"},{name:"肥西县",code:"340123"},{name:"庐江县",code:"340124"},{name:"巢湖市",code:"340181"}]},{name:"芜湖市",code:"340200",sub:[{name:"市辖区",code:"340201"},{name:"镜湖区",code:"340202"},{name:"弋江区",code:"340203"},{name:"鸠江区",code:"340207"},{name:"三山区",code:"340208"},{name:"芜湖县",code:"340221"},{name:"繁昌县",code:"340222"},{name:"南陵县",code:"340223"},{name:"无为县",code:"340225"}]},{name:"蚌埠市",code:"340300",sub:[{name:"市辖区",code:"340301"},{name:"龙子湖区",code:"340302"},{name:"蚌山区",code:"340303"},{name:"禹会区",code:"340304"},{name:"淮上区",code:"340311"},{name:"怀远县",code:"340321"},{name:"五河县",code:"340322"},{name:"固镇县",code:"340323"}]},{name:"淮南市",code:"340400",sub:[{name:"市辖区",code:"340401"},{name:"大通区",code:"340402"},{
-name:"田家庵区",code:"340403"},{name:"谢家集区",code:"340404"},{name:"八公山区",code:"340405"},{name:"潘集区",code:"340406"},{name:"凤台县",code:"340421"}]},{name:"马鞍山市",code:"340500",sub:[{name:"市辖区",code:"340501"},{name:"花山区",code:"340503"},{name:"雨山区",code:"340504"},{name:"博望区",code:"340506"},{name:"当涂县",code:"340521"},{name:"含山县",code:"340522"},{name:"和县",code:"340523"}]},{name:"淮北市",code:"340600",sub:[{name:"市辖区",code:"340601"},{name:"杜集区",code:"340602"},{name:"相山区",code:"340603"},{name:"烈山区",code:"340604"},{name:"濉溪县",code:"340621"}]},{name:"铜陵市",code:"340700",sub:[{name:"市辖区",code:"340701"},{name:"铜官山区",code:"340702"},{name:"狮子山区",code:"340703"},{name:"郊区",code:"340711"},{name:"铜陵县",code:"340721"}]},{name:"安庆市",code:"340800",sub:[{name:"市辖区",code:"340801"},{name:"迎江区",code:"340802"},{name:"大观区",code:"340803"},{name:"宜秀区",code:"340811"},{name:"怀宁县",code:"340822"},{name:"枞阳县",code:"340823"},{name:"潜山县",code:"340824"},{name:"太湖县",code:"340825"},{name:"宿松县",code:"340826"},{name:"望江县",code:"340827"},{name:"岳西县",code:"340828"},{name:"桐城市",code:"340881"}]},{name:"黄山市",code:"341000",sub:[{name:"市辖区",code:"341001"},{name:"屯溪区",code:"341002"},{name:"黄山区",code:"341003"},{name:"徽州区",code:"341004"},{name:"歙县",code:"341021"},{name:"休宁县",code:"341022"},{name:"黟县",code:"341023"},{name:"祁门县",code:"341024"}]},{name:"滁州市",code:"341100",sub:[{name:"市辖区",code:"341101"},{name:"琅琊区",code:"341102"},{name:"南谯区",code:"341103"},{name:"来安县",code:"341122"},{name:"全椒县",code:"341124"},{name:"定远县",code:"341125"},{name:"凤阳县",code:"341126"},{name:"天长市",code:"341181"},{name:"明光市",code:"341182"}]},{name:"阜阳市",code:"341200",sub:[{name:"市辖区",code:"341201"},{name:"颍州区",code:"341202"},{name:"颍东区",code:"341203"},{name:"颍泉区",code:"341204"},{name:"临泉县",code:"341221"},{name:"太和县",code:"341222"},{name:"阜南县",code:"341225"},{name:"颍上县",code:"341226"},{name:"界首市",code:"341282"}]},{name:"宿州市",code:"341300",sub:[{name:"市辖区",code:"341301"},{name:"埇桥区",code:"341302"},{name:"砀山县",code:"341321"},{name:"萧县",code:"341322"},{name:"灵璧县",code:"341323"},{name:"泗县",code:"341324"}]},{name:"六安市",code:"341500",sub:[{name:"市辖区",code:"341501"},{name:"金安区",code:"341502"},{name:"裕安区",code:"341503"},{name:"寿县",code:"341521"},{name:"霍邱县",code:"341522"},{name:"舒城县",code:"341523"},{name:"金寨县",code:"341524"},{name:"霍山县",code:"341525"}]},{name:"亳州市",code:"341600",sub:[{name:"市辖区",code:"341601"},{name:"谯城区",code:"341602"},{name:"涡阳县",code:"341621"},{name:"蒙城县",code:"341622"},{name:"利辛县",code:"341623"}]},{name:"池州市",code:"341700",sub:[{name:"市辖区",code:"341701"},{name:"贵池区",code:"341702"},{name:"东至县",code:"341721"},{name:"石台县",code:"341722"},{name:"青阳县",code:"341723"}]},{name:"宣城市",code:"341800",sub:[{name:"市辖区",code:"341801"},{name:"宣州区",code:"341802"},{name:"郎溪县",code:"341821"},{name:"广德县",code:"341822"},{name:"泾县",code:"341823"},{name:"绩溪县",code:"341824"},{name:"旌德县",code:"341825"},{name:"宁国市",code:"341881"}]}]},{name:"福建省",code:"350000",sub:[{name:"福州市",code:"350100",sub:[{name:"市辖区",code:"350101"},{name:"鼓楼区",code:"350102"},{name:"台江区",code:"350103"},{name:"仓山区",code:"350104"},{name:"马尾区",code:"350105"},{name:"晋安区",code:"350111"},{name:"闽侯县",code:"350121"},{name:"连江县",code:"350122"},{name:"罗源县",code:"350123"},{name:"闽清县",code:"350124"},{name:"永泰县",code:"350125"},{name:"平潭县",code:"350128"},{name:"福清市",code:"350181"},{name:"长乐市",code:"350182"}]},{name:"厦门市",code:"350200",sub:[{name:"市辖区",code:"350201"},{name:"思明区",code:"350203"},{name:"海沧区",code:"350205"},{name:"湖里区",code:"350206"},{name:"集美区",code:"350211"},{name:"同安区",code:"350212"},{name:"翔安区",code:"350213"}]},{name:"莆田市",code:"350300",sub:[{name:"市辖区",code:"350301"},{name:"城厢区",code:"350302"},{name:"涵江区",code:"350303"},{name:"荔城区",code:"350304"},{name:"秀屿区",code:"350305"},{name:"仙游县",code:"350322"}]},{name:"三明市",code:"350400",sub:[{name:"市辖区",code:"350401"},{name:"梅列区",code:"350402"},{name:"三元区",code:"350403"},{name:"明溪县",code:"350421"},{name:"清流县",code:"350423"},{name:"宁化县",code:"350424"},{name:"大田县",code:"350425"},{name:"尤溪县",code:"350426"},{name:"沙县",code:"350427"},{name:"将乐县",code:"350428"},{name:"泰宁县",code:"350429"},{name:"建宁县",code:"350430"},{name:"永安市",code:"350481"}]},{name:"泉州市",code:"350500",sub:[{name:"市辖区",code:"350501"},{name:"鲤城区",code:"350502"},{name:"丰泽区",code:"350503"},{name:"洛江区",code:"350504"},{name:"泉港区",code:"350505"},{name:"惠安县",code:"350521"},{name:"安溪县",code:"350524"},{name:"永春县",code:"350525"},{name:"德化县",code:"350526"},{name:"金门县",code:"350527"},{name:"石狮市",code:"350581"},{name:"晋江市",code:"350582"},{name:"南安市",code:"350583"}]},{name:"漳州市",code:"350600",sub:[{name:"市辖区",code:"350601"},{name:"芗城区",code:"350602"},{name:"龙文区",code:"350603"},{name:"云霄县",code:"350622"},{name:"漳浦县",code:"350623"},{name:"诏安县",code:"350624"},{name:"长泰县",code:"350625"},{name:"东山县",code:"350626"},{name:"南靖县",code:"350627"},{name:"平和县",code:"350628"},{name:"华安县",code:"350629"},{name:"龙海市",code:"350681"}]},{name:"南平市",code:"350700",sub:[{name:"市辖区",code:"350701"},{name:"延平区",code:"350702"},{name:"建阳区",code:"350703"},{name:"顺昌县",code:"350721"},{name:"浦城县",code:"350722"},{name:"光泽县",code:"350723"},{name:"松溪县",code:"350724"},{name:"政和县",code:"350725"},{name:"邵武市",code:"350781"},{name:"武夷山市",code:"350782"},{name:"建瓯市",code:"350783"}]},{name:"龙岩市",code:"350800",sub:[{name:"市辖区",code:"350801"},{name:"新罗区",code:"350802"},{name:"永定区",code:"350803"},{name:"长汀县",code:"350821"},{name:"上杭县",code:"350823"},{name:"武平县",code:"350824"},{name:"连城县",code:"350825"},{name:"漳平市",code:"350881"}]},{name:"宁德市",code:"350900",sub:[{name:"市辖区",code:"350901"},{name:"蕉城区",code:"350902"},{name:"霞浦县",code:"350921"},{name:"古田县",code:"350922"},{name:"屏南县",code:"350923"},{name:"寿宁县",code:"350924"},{name:"周宁县",code:"350925"},{name:"柘荣县",code:"350926"},{name:"福安市",code:"350981"},{name:"福鼎市",code:"350982"}]}]},{name:"江西省",code:"360000",sub:[{name:"南昌市",code:"360100",sub:[{name:"市辖区",code:"360101"},{name:"东湖区",code:"360102"},{name:"西湖区",code:"360103"},{name:"青云谱区",code:"360104"},{name:"湾里区",code:"360105"},{name:"青山湖区",code:"360111"},{name:"南昌县",code:"360121"},{name:"新建县",code:"360122"},{name:"安义县",code:"360123"},{name:"进贤县",code:"360124"}]},{name:"景德镇市",code:"360200",sub:[{name:"市辖区",code:"360201"},{name:"昌江区",code:"360202"},{name:"珠山区",code:"360203"},{name:"浮梁县",code:"360222"},{name:"乐平市",code:"360281"}]},{name:"萍乡市",code:"360300",sub:[{name:"市辖区",code:"360301"},{name:"安源区",code:"360302"},{name:"湘东区",code:"360313"},{name:"莲花县",code:"360321"},{name:"上栗县",code:"360322"},{name:"芦溪县",code:"360323"}]},{name:"九江市",code:"360400",sub:[{name:"市辖区",code:"360401"},{name:"庐山区",code:"360402"},{name:"浔阳区",code:"360403"},{name:"九江县",code:"360421"},{name:"武宁县",code:"360423"},{name:"修水县",code:"360424"},{name:"永修县",code:"360425"},{name:"德安县",code:"360426"},{name:"星子县",code:"360427"},{name:"都昌县",code:"360428"},{name:"湖口县",code:"360429"},{name:"彭泽县",code:"360430"},{name:"瑞昌市",code:"360481"},{name:"共青城市",code:"360482"}]},{name:"新余市",code:"360500",sub:[{name:"市辖区",code:"360501"},{name:"渝水区",code:"360502"},{name:"分宜县",code:"360521"}]},{name:"鹰潭市",code:"360600",sub:[{name:"市辖区",code:"360601"},{name:"月湖区",code:"360602"},{name:"余江县",code:"360622"},{name:"贵溪市",code:"360681"}]},{name:"赣州市",code:"360700",sub:[{name:"市辖区",code:"360701"},{name:"章贡区",code:"360702"},{name:"南康区",code:"360703"},{name:"赣县",code:"360721"},{name:"信丰县",code:"360722"},{name:"大余县",code:"360723"},{name:"上犹县",code:"360724"},{name:"崇义县",code:"360725"},{name:"安远县",code:"360726"},{name:"龙南县",code:"360727"},{name:"定南县",code:"360728"},{name:"全南县",code:"360729"},{name:"宁都县",code:"360730"},{name:"于都县",code:"360731"},{name:"兴国县",code:"360732"},{name:"会昌县",code:"360733"},{name:"寻乌县",code:"360734"},{name:"石城县",code:"360735"},{name:"瑞金市",code:"360781"}]},{name:"吉安市",code:"360800",sub:[{name:"市辖区",code:"360801"},{name:"吉州区",code:"360802"},{name:"青原区",code:"360803"},{name:"吉安县",code:"360821"},{name:"吉水县",code:"360822"},{name:"峡江县",code:"360823"},{name:"新干县",code:"360824"},{name:"永丰县",code:"360825"},{name:"泰和县",code:"360826"},{name:"遂川县",code:"360827"},{name:"万安县",code:"360828"},{name:"安福县",code:"360829"},{name:"永新县",code:"360830"},{name:"井冈山市",code:"360881"}]},{name:"宜春市",code:"360900",sub:[{name:"市辖区",code:"360901"},{name:"袁州区",code:"360902"},{name:"奉新县",code:"360921"},{name:"万载县",code:"360922"},{name:"上高县",code:"360923"},{name:"宜丰县",code:"360924"},{name:"靖安县",code:"360925"},{name:"铜鼓县",code:"360926"},{name:"丰城市",code:"360981"},{name:"樟树市",code:"360982"},{name:"高安市",code:"360983"}]},{name:"抚州市",code:"361000",sub:[{name:"市辖区",code:"361001"},{name:"临川区",code:"361002"},{name:"南城县",code:"361021"},{name:"黎川县",code:"361022"},{name:"南丰县",code:"361023"},{name:"崇仁县",code:"361024"},{name:"乐安县",code:"361025"},{name:"宜黄县",code:"361026"},{name:"金溪县",code:"361027"},{name:"资溪县",code:"361028"},{name:"东乡县",code:"361029"},{name:"广昌县",code:"361030"}]},{name:"上饶市",code:"361100",sub:[{name:"市辖区",code:"361101"},{name:"信州区",code:"361102"},{name:"上饶县",code:"361121"},{name:"广丰县",code:"361122"},{name:"玉山县",code:"361123"},{name:"铅山县",code:"361124"},{name:"横峰县",code:"361125"},{name:"弋阳县",code:"361126"},{name:"余干县",code:"361127"},{name:"鄱阳县",code:"361128"},{name:"万年县",code:"361129"},{name:"婺源县",code:"361130"},{name:"德兴市",code:"361181"}]}]},{name:"山东省",code:"370000",sub:[{name:"济南市",code:"370100",sub:[{name:"市辖区",code:"370101"},{name:"历下区",code:"370102"},{name:"市中区",code:"370103"},{name:"槐荫区",code:"370104"},{name:"天桥区",code:"370105"},{name:"历城区",code:"370112"},{name:"长清区",code:"370113"},{name:"平阴县",code:"370124"},{name:"济阳县",code:"370125"},{name:"商河县",code:"370126"},{name:"章丘市",code:"370181"}]},{name:"青岛市",code:"370200",sub:[{name:"市辖区",code:"370201"},{name:"市南区",code:"370202"},{name:"市北区",code:"370203"},{name:"黄岛区",code:"370211"},{name:"崂山区",code:"370212"},{name:"李沧区",code:"370213"},{name:"城阳区",code:"370214"},{name:"胶州市",code:"370281"},{name:"即墨市",code:"370282"},{name:"平度市",code:"370283"},{name:"莱西市",code:"370285"}]},{name:"淄博市",code:"370300",sub:[{name:"市辖区",code:"370301"},{name:"淄川区",code:"370302"},{name:"张店区",code:"370303"},{name:"博山区",code:"370304"},{name:"临淄区",code:"370305"},{name:"周村区",code:"370306"},{name:"桓台县",code:"370321"},{name:"高青县",code:"370322"},{name:"沂源县",code:"370323"}]},{name:"枣庄市",code:"370400",sub:[{name:"市辖区",code:"370401"},{name:"市中区",code:"370402"},{name:"薛城区",code:"370403"},{name:"峄城区",code:"370404"},{name:"台儿庄区",code:"370405"},{name:"山亭区",code:"370406"},{name:"滕州市",code:"370481"}]},{name:"东营市",code:"370500",sub:[{name:"市辖区",code:"370501"},{name:"东营区",code:"370502"},{name:"河口区",code:"370503"},{name:"垦利县",code:"370521"},{name:"利津县",code:"370522"},{name:"广饶县",code:"370523"}]},{name:"烟台市",code:"370600",sub:[{name:"市辖区",code:"370601"},{name:"芝罘区",code:"370602"},{name:"福山区",code:"370611"},{name:"牟平区",code:"370612"},{name:"莱山区",code:"370613"},{name:"长岛县",code:"370634"},{name:"龙口市",code:"370681"},{name:"莱阳市",code:"370682"},{name:"莱州市",code:"370683"},{name:"蓬莱市",code:"370684"},{name:"招远市",code:"370685"},{name:"栖霞市",code:"370686"},{name:"海阳市",code:"370687"}]},{name:"潍坊市",code:"370700",sub:[{name:"市辖区",code:"370701"},{name:"潍城区",code:"370702"},{name:"寒亭区",code:"370703"},{name:"坊子区",code:"370704"},{name:"奎文区",code:"370705"},{name:"临朐县",code:"370724"},{name:"昌乐县",code:"370725"},{name:"青州市",code:"370781"},{name:"诸城市",code:"370782"},{name:"寿光市",code:"370783"},{name:"安丘市",code:"370784"},{name:"高密市",code:"370785"},{name:"昌邑市",code:"370786"}]},{name:"济宁市",code:"370800",sub:[{name:"市辖区",code:"370801"},{name:"任城区",code:"370811"},{name:"兖州区",code:"370812"},{name:"微山县",code:"370826"},{name:"鱼台县",code:"370827"},{name:"金乡县",code:"370828"},{name:"嘉祥县",code:"370829"},{name:"汶上县",code:"370830"},{name:"泗水县",code:"370831"},{name:"梁山县",code:"370832"},{name:"曲阜市",code:"370881"},{name:"邹城市",code:"370883"}]},{name:"泰安市",code:"370900",sub:[{name:"市辖区",code:"370901"},{name:"泰山区",code:"370902"},{name:"岱岳区",code:"370911"},{name:"宁阳县",code:"370921"},{name:"东平县",code:"370923"},{name:"新泰市",code:"370982"},{name:"肥城市",code:"370983"}]},{name:"威海市",code:"371000",sub:[{name:"市辖区",code:"371001"},{name:"环翠区",code:"371002"},{name:"文登市",code:"371081"},{name:"荣成市",code:"371082"},{name:"乳山市",code:"371083"}]},{name:"日照市",code:"371100",sub:[{name:"市辖区",code:"371101"},{name:"东港区",code:"371102"},{name:"岚山区",code:"371103"},{name:"五莲县",code:"371121"},{name:"莒县",code:"371122"}]},{name:"莱芜市",code:"371200",sub:[{name:"市辖区",code:"371201"},{name:"莱城区",code:"371202"},{name:"钢城区",code:"371203"}]},{name:"临沂市",code:"371300",sub:[{name:"市辖区",code:"371301"},{name:"兰山区",code:"371302"},{name:"罗庄区",code:"371311"},{name:"河东区",code:"371312"},{name:"沂南县",code:"371321"},{name:"郯城县",code:"371322"},{name:"沂水县",code:"371323"},{name:"兰陵县",code:"371324"},{name:"费县",code:"371325"},{name:"平邑县",code:"371326"},{name:"莒南县",code:"371327"},{name:"蒙阴县",code:"371328"},{name:"临沭县",code:"371329"}]},{name:"德州市",code:"371400",sub:[{name:"市辖区",code:"371401"},{name:"德城区",code:"371402"},{name:"陵城区",code:"371403"},{name:"宁津县",code:"371422"},{name:"庆云县",code:"371423"},{name:"临邑县",code:"371424"},{name:"齐河县",code:"371425"},{name:"平原县",code:"371426"},{name:"夏津县",code:"371427"},{name:"武城县",code:"371428"},{name:"乐陵市",code:"371481"},{name:"禹城市",code:"371482"}]},{name:"聊城市",code:"371500",sub:[{name:"市辖区",code:"371501"},{name:"东昌府区",code:"371502"},{name:"阳谷县",code:"371521"},{name:"莘县",code:"371522"},{name:"茌平县",code:"371523"},{name:"东阿县",code:"371524"},{name:"冠县",code:"371525"},{name:"高唐县",code:"371526"},{name:"临清市",code:"371581"}]},{name:"滨州市",code:"371600",sub:[{name:"市辖区",code:"371601"},{name:"滨城区",code:"371602"},{name:"沾化区",code:"371603"},{name:"惠民县",code:"371621"},{name:"阳信县",code:"371622"},{name:"无棣县",code:"371623"},{name:"博兴县",code:"371625"},{name:"邹平县",code:"371626"}]},{name:"菏泽市",code:"371700",sub:[{name:"市辖区",code:"371701"},{name:"牡丹区",code:"371702"},{name:"曹县",code:"371721"},{name:"单县",code:"371722"},{name:"成武县",code:"371723"},{name:"巨野县",code:"371724"},{name:"郓城县",code:"371725"},{name:"鄄城县",code:"371726"},{name:"定陶县",code:"371727"},{name:"东明县",code:"371728"}]}]},{name:"河南省",code:"410000",sub:[{name:"郑州市",code:"410100",sub:[{name:"市辖区",code:"410101"},{name:"中原区",code:"410102"},{name:"二七区",code:"410103"},{name:"管城回族区",code:"410104"},{name:"金水区",code:"410105"},{name:"上街区",code:"410106"},{name:"惠济区",code:"410108"},{name:"中牟县",code:"410122"},{name:"巩义市",code:"410181"},{name:"荥阳市",code:"410182"},{name:"新密市",code:"410183"},{name:"新郑市",code:"410184"},{name:"登封市",code:"410185"}]},{name:"开封市",code:"410200",sub:[{name:"市辖区",code:"410201"},{name:"龙亭区",code:"410202"},{name:"顺河回族区",code:"410203"},{name:"鼓楼区",code:"410204"},{name:"禹王台区",code:"410205"},{name:"祥符区",code:"410212"},{name:"杞县",code:"410221"},{name:"通许县",code:"410222"},{name:"尉氏县",code:"410223"},{name:"兰考县",code:"410225"}]},{name:"洛阳市",code:"410300",sub:[{name:"市辖区",code:"410301"},{name:"老城区",code:"410302"},{name:"西工区",code:"410303"},{name:"瀍河回族区",code:"410304"},{name:"涧西区",code:"410305"},{name:"吉利区",code:"410306"},{name:"洛龙区",code:"410311"},{name:"孟津县",code:"410322"},{name:"新安县",code:"410323"},{name:"栾川县",code:"410324"},{name:"嵩县",code:"410325"},{name:"汝阳县",code:"410326"},{name:"宜阳县",code:"410327"},{name:"洛宁县",code:"410328"},{name:"伊川县",code:"410329"},{name:"偃师市",code:"410381"}]},{name:"平顶山市",code:"410400",sub:[{name:"市辖区",code:"410401"},{name:"新华区",code:"410402"},{name:"卫东区",code:"410403"},{name:"石龙区",code:"410404"},{name:"湛河区",code:"410411"},{name:"宝丰县",code:"410421"},{name:"叶县",code:"410422"},{name:"鲁山县",code:"410423"},{name:"郏县",code:"410425"},{name:"舞钢市",code:"410481"},{name:"汝州市",code:"410482"}]},{name:"安阳市",code:"410500",sub:[{name:"市辖区",code:"410501"},{name:"文峰区",code:"410502"},{name:"北关区",code:"410503"},{name:"殷都区",code:"410505"},{name:"龙安区",code:"410506"},{name:"安阳县",code:"410522"},{name:"汤阴县",code:"410523"},{name:"滑县",code:"410526"},{name:"内黄县",code:"410527"},{name:"林州市",code:"410581"}]},{name:"鹤壁市",code:"410600",sub:[{name:"市辖区",code:"410601"},{name:"鹤山区",code:"410602"},{name:"山城区",code:"410603"},{name:"淇滨区",code:"410611"},{name:"浚县",code:"410621"},{name:"淇县",code:"410622"}]},{name:"新乡市",code:"410700",sub:[{name:"市辖区",code:"410701"},{name:"红旗区",code:"410702"},{name:"卫滨区",code:"410703"},{name:"凤泉区",code:"410704"},{name:"牧野区",code:"410711"},{name:"新乡县",code:"410721"},{name:"获嘉县",code:"410724"},{name:"原阳县",code:"410725"},{name:"延津县",code:"410726"},{name:"封丘县",code:"410727"},{name:"长垣县",code:"410728"},{name:"卫辉市",code:"410781"},{name:"辉县市",code:"410782"}]},{name:"焦作市",code:"410800",sub:[{name:"市辖区",code:"410801"},{name:"解放区",code:"410802"},{name:"中站区",code:"410803"},{name:"马村区",code:"410804"},{name:"山阳区",code:"410811"},{name:"修武县",code:"410821"},{name:"博爱县",code:"410822"},{name:"武陟县",code:"410823"},{name:"温县",code:"410825"},{name:"沁阳市",code:"410882"},{name:"孟州市",code:"410883"}]},{name:"濮阳市",code:"410900",sub:[{name:"市辖区",code:"410901"},{name:"华龙区",code:"410902"},{name:"清丰县",code:"410922"},{name:"南乐县",code:"410923"},{name:"范县",code:"410926"},{name:"台前县",code:"410927"},{name:"濮阳县",code:"410928"}]},{name:"许昌市",code:"411000",sub:[{name:"市辖区",code:"411001"},{name:"魏都区",code:"411002"},{name:"许昌县",code:"411023"},{name:"鄢陵县",code:"411024"},{name:"襄城县",code:"411025"},{name:"禹州市",code:"411081"},{name:"长葛市",code:"411082"}]},{name:"漯河市",code:"411100",sub:[{name:"市辖区",code:"411101"},{name:"源汇区",code:"411102"},{name:"郾城区",code:"411103"},{name:"召陵区",code:"411104"},{name:"舞阳县",code:"411121"},{name:"临颍县",code:"411122"}]},{name:"三门峡市",code:"411200",sub:[{name:"市辖区",code:"411201"},{name:"湖滨区",code:"411202"},{name:"渑池县",code:"411221"},{name:"陕县",code:"411222"},{name:"卢氏县",code:"411224"},{name:"义马市",code:"411281"},{name:"灵宝市",code:"411282"}]},{name:"南阳市",code:"411300",sub:[{name:"市辖区",code:"411301"},{name:"宛城区",code:"411302"},{name:"卧龙区",code:"411303"},{name:"南召县",code:"411321"},{name:"方城县",code:"411322"},{name:"西峡县",code:"411323"},{name:"镇平县",code:"411324"},{name:"内乡县",code:"411325"},{name:"淅川县",code:"411326"},{name:"社旗县",code:"411327"},{name:"唐河县",code:"411328"},{name:"新野县",code:"411329"},{name:"桐柏县",code:"411330"},{name:"邓州市",code:"411381"}]},{name:"商丘市",code:"411400",sub:[{name:"市辖区",code:"411401"},{name:"梁园区",code:"411402"},{name:"睢阳区",code:"411403"},{name:"民权县",code:"411421"},{name:"睢县",code:"411422"},{name:"宁陵县",code:"411423"},{name:"柘城县",code:"411424"},{name:"虞城县",code:"411425"},{name:"夏邑县",code:"411426"},{name:"永城市",code:"411481"}]},{name:"信阳市",code:"411500",sub:[{name:"市辖区",code:"411501"},{name:"浉河区",code:"411502"},{name:"平桥区",code:"411503"},{name:"罗山县",code:"411521"},{name:"光山县",code:"411522"},{name:"新县",code:"411523"},{name:"商城县",code:"411524"},{name:"固始县",code:"411525"},{name:"潢川县",code:"411526"},{name:"淮滨县",code:"411527"},{name:"息县",code:"411528"}]},{name:"周口市",code:"411600",sub:[{name:"市辖区",code:"411601"},{name:"川汇区",code:"411602"},{name:"扶沟县",code:"411621"},{name:"西华县",code:"411622"},{name:"商水县",code:"411623"},{name:"沈丘县",code:"411624"},{name:"郸城县",code:"411625"},{name:"淮阳县",code:"411626"},{name:"太康县",code:"411627"},{name:"鹿邑县",code:"411628"},{name:"项城市",code:"411681"}]},{name:"驻马店市",code:"411700",sub:[{name:"市辖区",code:"411701"},{name:"驿城区",code:"411702"},{name:"西平县",code:"411721"},{name:"上蔡县",code:"411722"},{name:"平舆县",code:"411723"},{name:"正阳县",code:"411724"},{name:"确山县",code:"411725"},{name:"泌阳县",code:"411726"},{name:"汝南县",code:"411727"},{name:"遂平县",code:"411728"},{name:"新蔡县",code:"411729"}]},{name:"济源市",code:"419001"}]},{name:"湖北省",code:"420000",sub:[{name:"武汉市",code:"420100",sub:[{name:"市辖区",code:"420101"},{name:"江岸区",code:"420102"},{name:"江汉区",code:"420103"},{name:"硚口区",code:"420104"},{name:"汉阳区",code:"420105"},{name:"武昌区",code:"420106"},{name:"青山区",code:"420107"},{name:"洪山区",code:"420111"},{name:"东西湖区",code:"420112"},{name:"汉南区",code:"420113"},{name:"蔡甸区",code:"420114"},{name:"江夏区",code:"420115"},{name:"黄陂区",code:"420116"},{name:"新洲区",code:"420117"}]},{name:"黄石市",code:"420200",sub:[{name:"市辖区",code:"420201"},{name:"黄石港区",code:"420202"},{name:"西塞山区",code:"420203"},{name:"下陆区",code:"420204"},{name:"铁山区",code:"420205"},{name:"阳新县",code:"420222"},{name:"大冶市",code:"420281"}]},{name:"十堰市",code:"420300",sub:[{name:"市辖区",code:"420301"},{name:"茅箭区",code:"420302"},{name:"张湾区",code:"420303"},{name:"郧阳区",code:"420304"},{name:"郧西县",code:"420322"},{name:"竹山县",code:"420323"},{name:"竹溪县",code:"420324"},{name:"房县",code:"420325"},{name:"丹江口市",code:"420381"}]},{name:"宜昌市",code:"420500",sub:[{name:"市辖区",code:"420501"},{name:"西陵区",code:"420502"},{name:"伍家岗区",code:"420503"},{name:"点军区",code:"420504"},{name:"猇亭区",code:"420505"},{name:"夷陵区",code:"420506"},{name:"远安县",code:"420525"},{name:"兴山县",code:"420526"},{name:"秭归县",code:"420527"},{name:"长阳土家族自治县",code:"420528"},{name:"五峰土家族自治县",code:"420529"},{name:"宜都市",code:"420581"},{name:"当阳市",code:"420582"},{name:"枝江市",code:"420583"}]},{name:"襄阳市",code:"420600",sub:[{name:"市辖区",code:"420601"},{name:"襄城区",code:"420602"},{name:"樊城区",code:"420606"},{name:"襄州区",code:"420607"},{name:"南漳县",code:"420624"},{name:"谷城县",code:"420625"},{name:"保康县",code:"420626"},{name:"老河口市",code:"420682"},{name:"枣阳市",code:"420683"},{name:"宜城市",code:"420684"}]},{name:"鄂州市",code:"420700",sub:[{name:"市辖区",code:"420701"},{name:"梁子湖区",code:"420702"},{name:"华容区",code:"420703"},{name:"鄂城区",code:"420704"}]},{name:"荆门市",code:"420800",sub:[{name:"市辖区",code:"420801"},{name:"东宝区",code:"420802"},{name:"掇刀区",code:"420804"},{name:"京山县",code:"420821"},{name:"沙洋县",code:"420822"},{name:"钟祥市",code:"420881"}]},{name:"孝感市",code:"420900",sub:[{name:"市辖区",code:"420901"},{name:"孝南区",code:"420902"},{name:"孝昌县",code:"420921"},{name:"大悟县",code:"420922"},{name:"云梦县",code:"420923"},{name:"应城市",code:"420981"},{name:"安陆市",code:"420982"},{name:"汉川市",code:"420984"}]},{name:"荆州市",code:"421000",sub:[{name:"市辖区",code:"421001"},{name:"沙市区",code:"421002"},{name:"荆州区",code:"421003"},{name:"公安县",code:"421022"},{name:"监利县",code:"421023"},{name:"江陵县",code:"421024"},{name:"石首市",code:"421081"},{name:"洪湖市",code:"421083"},{name:"松滋市",code:"421087"}]},{name:"黄冈市",code:"421100",sub:[{name:"市辖区",code:"421101"},{name:"黄州区",code:"421102"},{name:"团风县",code:"421121"},{name:"红安县",code:"421122"},{name:"罗田县",code:"421123"},{name:"英山县",code:"421124"},{name:"浠水县",code:"421125"},{name:"蕲春县",code:"421126"},{name:"黄梅县",code:"421127"},{name:"麻城市",code:"421181"},{name:"武穴市",code:"421182"}]},{name:"咸宁市",code:"421200",sub:[{name:"市辖区",code:"421201"},{name:"咸安区",code:"421202"},{name:"嘉鱼县",code:"421221"},{name:"通城县",code:"421222"},{name:"崇阳县",code:"421223"},{name:"通山县",code:"421224"},{name:"赤壁市",code:"421281"}]},{name:"随州市",code:"421300",sub:[{name:"市辖区",code:"421301"},{name:"曾都区",code:"421303"},{name:"随县",code:"421321"},{name:"广水市",code:"421381"}]},{name:"恩施土家族苗族自治州",code:"422800",sub:[{name:"恩施市",code:"422801"},{name:"利川市",code:"422802"},{name:"建始县",code:"422822"},{name:"巴东县",code:"422823"},{name:"宣恩县",code:"422825"},{name:"咸丰县",code:"422826"},{name:"来凤县",code:"422827"},{name:"鹤峰县",code:"422828"}]},{name:"仙桃市",code:"429004"},{name:"潜江市",code:"429005"},{name:"天门市",code:"429006"},{name:"神农架林区",code:"429021"}]},{name:"湖南省",code:"430000",sub:[{name:"长沙市",code:"430100",sub:[{name:"市辖区",code:"430101"},{name:"芙蓉区",code:"430102"},{name:"天心区",code:"430103"},{name:"岳麓区",code:"430104"},{name:"开福区",code:"430105"},{name:"雨花区",code:"430111"},{name:"望城区",code:"430112"},{name:"长沙县",code:"430121"},{name:"宁乡县",code:"430124"},{name:"浏阳市",code:"430181"}]},{name:"株洲市",code:"430200",sub:[{name:"市辖区",code:"430201"},{name:"荷塘区",code:"430202"},{name:"芦淞区",code:"430203"},{name:"石峰区",code:"430204"},{name:"天元区",code:"430211"},{name:"株洲县",code:"430221"},{name:"攸县",code:"430223"},{name:"茶陵县",code:"430224"},{name:"炎陵县",code:"430225"},{name:"醴陵市",code:"430281"}]},{name:"湘潭市",code:"430300",sub:[{name:"市辖区",code:"430301"},{name:"雨湖区",code:"430302"},{name:"岳塘区",code:"430304"},{name:"湘潭县",code:"430321"},{name:"湘乡市",code:"430381"},{name:"韶山市",code:"430382"}]},{name:"衡阳市",code:"430400",sub:[{name:"市辖区",code:"430401"},{name:"珠晖区",code:"430405"},{name:"雁峰区",code:"430406"},{name:"石鼓区",code:"430407"},{name:"蒸湘区",code:"430408"},{name:"南岳区",code:"430412"},{name:"衡阳县",code:"430421"},{name:"衡南县",code:"430422"},{name:"衡山县",code:"430423"},{name:"衡东县",code:"430424"},{name:"祁东县",code:"430426"},{name:"耒阳市",code:"430481"},{name:"常宁市",code:"430482"}]},{name:"邵阳市",code:"430500",sub:[{name:"市辖区",code:"430501"},{name:"双清区",code:"430502"},{name:"大祥区",code:"430503"},{name:"北塔区",code:"430511"},{name:"邵东县",code:"430521"},{name:"新邵县",code:"430522"},{name:"邵阳县",code:"430523"},{name:"隆回县",code:"430524"},{name:"洞口县",code:"430525"},{name:"绥宁县",code:"430527"},{name:"新宁县",code:"430528"},{name:"城步苗族自治县",code:"430529"},{name:"武冈市",code:"430581"}]},{name:"岳阳市",code:"430600",sub:[{name:"市辖区",code:"430601"},{name:"岳阳楼区",code:"430602"},{name:"云溪区",code:"430603"},{name:"君山区",code:"430611"},{name:"岳阳县",code:"430621"},{name:"华容县",code:"430623"},{name:"湘阴县",code:"430624"},{name:"平江县",code:"430626"},{name:"汨罗市",code:"430681"},{name:"临湘市",code:"430682"}]},{name:"常德市",code:"430700",sub:[{name:"市辖区",code:"430701"},{name:"武陵区",code:"430702"},{name:"鼎城区",code:"430703"},{name:"安乡县",code:"430721"},{name:"汉寿县",code:"430722"},{name:"澧县",code:"430723"},{name:"临澧县",code:"430724"},{name:"桃源县",code:"430725"},{name:"石门县",code:"430726"},{name:"津市市",code:"430781"}]},{name:"张家界市",code:"430800",sub:[{name:"市辖区",code:"430801"},{name:"永定区",code:"430802"},{name:"武陵源区",code:"430811"},{name:"慈利县",code:"430821"},{name:"桑植县",code:"430822"}]},{name:"益阳市",code:"430900",sub:[{name:"市辖区",code:"430901"},{name:"资阳区",code:"430902"},{name:"赫山区",code:"430903"},{name:"南县",code:"430921"},{name:"桃江县",code:"430922"},{name:"安化县",code:"430923"},{name:"沅江市",code:"430981"}]},{name:"郴州市",code:"431000",sub:[{name:"市辖区",code:"431001"},{name:"北湖区",code:"431002"},{name:"苏仙区",code:"431003"},{name:"桂阳县",code:"431021"},{name:"宜章县",code:"431022"},{name:"永兴县",code:"431023"},{name:"嘉禾县",code:"431024"},{name:"临武县",code:"431025"},{name:"汝城县",code:"431026"},{name:"桂东县",code:"431027"},{name:"安仁县",code:"431028"},{name:"资兴市",code:"431081"}]},{name:"永州市",code:"431100",sub:[{name:"市辖区",code:"431101"},{name:"零陵区",code:"431102"},{name:"冷水滩区",code:"431103"},{name:"祁阳县",code:"431121"},{name:"东安县",code:"431122"},{name:"双牌县",code:"431123"},{name:"道县",code:"431124"},{name:"江永县",code:"431125"},{name:"宁远县",code:"431126"},{name:"蓝山县",code:"431127"},{name:"新田县",code:"431128"},{name:"江华瑶族自治县",code:"431129"}]},{name:"怀化市",code:"431200",sub:[{name:"市辖区",code:"431201"},{name:"鹤城区",code:"431202"},{name:"中方县",code:"431221"},{name:"沅陵县",code:"431222"},{name:"辰溪县",code:"431223"},{name:"溆浦县",code:"431224"},{name:"会同县",code:"431225"},{name:"麻阳苗族自治县",code:"431226"},{name:"新晃侗族自治县",code:"431227"},{name:"芷江侗族自治县",code:"431228"},{name:"靖州苗族侗族自治县",code:"431229"},{name:"通道侗族自治县",code:"431230"},{name:"洪江市",code:"431281"}]},{name:"娄底市",code:"431300",sub:[{name:"市辖区",code:"431301"},{name:"娄星区",code:"431302"},{name:"双峰县",code:"431321"},{name:"新化县",code:"431322"},{name:"冷水江市",code:"431381"},{name:"涟源市",code:"431382"}]},{name:"湘西土家族苗族自治州",code:"433100",sub:[{name:"吉首市",code:"433101"},{name:"泸溪县",code:"433122"},{name:"凤凰县",code:"433123"},{name:"花垣县",code:"433124"},{name:"保靖县",code:"433125"},{name:"古丈县",code:"433126"},{name:"永顺县",code:"433127"},{name:"龙山县",code:"433130"}]}]},{name:"广东省",code:"440000",sub:[{name:"广州市",code:"440100",sub:[{name:"市辖区",code:"440101"},{name:"荔湾区",code:"440103"},{name:"越秀区",code:"440104"},{name:"海珠区",code:"440105"},{name:"天河区",code:"440106"},{name:"白云区",code:"440111"},{name:"黄埔区",code:"440112"},{name:"番禺区",code:"440113"},{name:"花都区",code:"440114"},{name:"南沙区",code:"440115"},{name:"从化区",code:"440117"},{name:"增城区",code:"440118"}]},{name:"韶关市",code:"440200",sub:[{name:"市辖区",code:"440201"},{name:"武江区",code:"440203"},{name:"浈江区",code:"440204"},{name:"曲江区",code:"440205"},{name:"始兴县",code:"440222"},{name:"仁化县",code:"440224"},{name:"翁源县",code:"440229"},{name:"乳源瑶族自治县",code:"440232"},{name:"新丰县",code:"440233"},{name:"乐昌市",code:"440281"},{name:"南雄市",code:"440282"}]},{name:"深圳市",code:"440300",sub:[{name:"市辖区",code:"440301"},{name:"罗湖区",code:"440303"},{name:"福田区",code:"440304"},{name:"南山区",code:"440305"},{name:"宝安区",code:"440306"},{name:"龙岗区",code:"440307"},{name:"盐田区",code:"440308"}]},{name:"珠海市",code:"440400",sub:[{name:"市辖区",code:"440401"},{name:"香洲区",code:"440402"},{name:"斗门区",code:"440403"},{name:"金湾区",code:"440404"}]},{name:"汕头市",code:"440500",sub:[{name:"市辖区",code:"440501"},{name:"龙湖区",code:"440507"},{name:"金平区",code:"440511"},{name:"濠江区",code:"440512"},{name:"潮阳区",code:"440513"},{name:"潮南区",code:"440514"},{name:"澄海区",code:"440515"},{name:"南澳县",code:"440523"}]},{name:"佛山市",code:"440600",sub:[{name:"市辖区",code:"440601"},{name:"禅城区",code:"440604"},{name:"南海区",code:"440605"},{name:"顺德区",code:"440606"},{name:"三水区",code:"440607"},{name:"高明区",code:"440608"}]},{name:"江门市",code:"440700",sub:[{name:"市辖区",code:"440701"},{name:"蓬江区",code:"440703"},{name:"江海区",code:"440704"},{name:"新会区",code:"440705"},{name:"台山市",code:"440781"},{name:"开平市",code:"440783"},{name:"鹤山市",code:"440784"},{name:"恩平市",code:"440785"}]},{name:"湛江市",code:"440800",sub:[{name:"市辖区",code:"440801"},{name:"赤坎区",code:"440802"},{name:"霞山区",code:"440803"},{name:"坡头区",code:"440804"},{name:"麻章区",code:"440811"},{name:"遂溪县",code:"440823"},{name:"徐闻县",code:"440825"},{name:"廉江市",code:"440881"},{name:"雷州市",code:"440882"},{name:"吴川市",code:"440883"}]},{name:"茂名市",code:"440900",sub:[{name:"市辖区",code:"440901"},{name:"茂南区",code:"440902"},{name:"电白区",code:"440904"},{name:"高州市",code:"440981"},{name:"化州市",code:"440982"},{name:"信宜市",code:"440983"}]},{name:"肇庆市",code:"441200",sub:[{name:"市辖区",code:"441201"},{name:"端州区",code:"441202"},{name:"鼎湖区",code:"441203"},{name:"广宁县",code:"441223"},{name:"怀集县",code:"441224"},{name:"封开县",code:"441225"},{name:"德庆县",code:"441226"},{name:"高要市",code:"441283"},{name:"四会市",code:"441284"}]},{name:"惠州市",code:"441300",sub:[{name:"市辖区",code:"441301"},{name:"惠城区",code:"441302"},{name:"惠阳区",code:"441303"},{name:"博罗县",code:"441322"},{name:"惠东县",code:"441323"},{name:"龙门县",code:"441324"}]},{name:"梅州市",code:"441400",sub:[{name:"市辖区",code:"441401"},{name:"梅江区",code:"441402"},{name:"梅县区",code:"441403"},{name:"大埔县",code:"441422"},{name:"丰顺县",code:"441423"},{name:"五华县",code:"441424"},{name:"平远县",code:"441426"},{name:"蕉岭县",code:"441427"},{name:"兴宁市",code:"441481"}]},{name:"汕尾市",code:"441500",sub:[{name:"市辖区",code:"441501"},{name:"城区",code:"441502"},{name:"海丰县",code:"441521"},{name:"陆河县",code:"441523"},{name:"陆丰市",code:"441581"}]},{name:"河源市",code:"441600",sub:[{name:"市辖区",code:"441601"},{name:"源城区",code:"441602"},{name:"紫金县",code:"441621"},{name:"龙川县",code:"441622"},{name:"连平县",code:"441623"},{name:"和平县",code:"441624"},{name:"东源县",code:"441625"}]},{name:"阳江市",code:"441700",sub:[{name:"市辖区",code:"441701"},{name:"江城区",code:"441702"},{name:"阳东区",code:"441704"},{name:"阳西县",code:"441721"},{name:"阳春市",code:"441781"}]},{name:"清远市",code:"441800",sub:[{name:"市辖区",code:"441801"},{name:"清城区",code:"441802"},{name:"清新区",code:"441803"},{name:"佛冈县",code:"441821"},{name:"阳山县",code:"441823"},{name:"连山壮族瑶族自治县",code:"441825"},{name:"连南瑶族自治县",code:"441826"},{name:"英德市",code:"441881"},{name:"连州市",code:"441882"}]},{name:"东莞市",code:"441900",sub:[]},{name:"中山市",code:"442000",sub:[]},{name:"潮州市",code:"445100",sub:[{name:"市辖区",code:"445101"},{name:"湘桥区",code:"445102"},{name:"潮安区",code:"445103"},{name:"饶平县",code:"445122"}]},{name:"揭阳市",code:"445200",sub:[{name:"市辖区",code:"445201"},{name:"榕城区",code:"445202"},{name:"揭东区",code:"445203"},{name:"揭西县",code:"445222"},{name:"惠来县",code:"445224"},{name:"普宁市",code:"445281"}]},{name:"云浮市",code:"445300",sub:[{name:"市辖区",code:"445301"},{name:"云城区",code:"445302"},{name:"云安区",code:"445303"},{name:"新兴县",code:"445321"},{name:"郁南县",code:"445322"},{name:"罗定市",code:"445381"}]}]},{name:"广西壮族自治区",code:"450000",sub:[{name:"南宁市",code:"450100",sub:[{name:"市辖区",code:"450101"},{name:"兴宁区",code:"450102"},{name:"青秀区",code:"450103"},{name:"江南区",code:"450105"},{name:"西乡塘区",code:"450107"},{name:"良庆区",code:"450108"},{name:"邕宁区",code:"450109"},{name:"武鸣县",code:"450122"},{name:"隆安县",code:"450123"},{name:"马山县",code:"450124"},{name:"上林县",code:"450125"},{name:"宾阳县",code:"450126"},{name:"横县",code:"450127"}]},{name:"柳州市",code:"450200",sub:[{name:"市辖区",code:"450201"},{name:"城中区",code:"450202"},{name:"鱼峰区",code:"450203"},{name:"柳南区",code:"450204"
-},{name:"柳北区",code:"450205"},{name:"柳江县",code:"450221"},{name:"柳城县",code:"450222"},{name:"鹿寨县",code:"450223"},{name:"融安县",code:"450224"},{name:"融水苗族自治县",code:"450225"},{name:"三江侗族自治县",code:"450226"}]},{name:"桂林市",code:"450300",sub:[{name:"市辖区",code:"450301"},{name:"秀峰区",code:"450302"},{name:"叠彩区",code:"450303"},{name:"象山区",code:"450304"},{name:"七星区",code:"450305"},{name:"雁山区",code:"450311"},{name:"临桂区",code:"450312"},{name:"阳朔县",code:"450321"},{name:"灵川县",code:"450323"},{name:"全州县",code:"450324"},{name:"兴安县",code:"450325"},{name:"永福县",code:"450326"},{name:"灌阳县",code:"450327"},{name:"龙胜各族自治县",code:"450328"},{name:"资源县",code:"450329"},{name:"平乐县",code:"450330"},{name:"荔浦县",code:"450331"},{name:"恭城瑶族自治县",code:"450332"}]},{name:"梧州市",code:"450400",sub:[{name:"市辖区",code:"450401"},{name:"万秀区",code:"450403"},{name:"长洲区",code:"450405"},{name:"龙圩区",code:"450406"},{name:"苍梧县",code:"450421"},{name:"藤县",code:"450422"},{name:"蒙山县",code:"450423"},{name:"岑溪市",code:"450481"}]},{name:"北海市",code:"450500",sub:[{name:"市辖区",code:"450501"},{name:"海城区",code:"450502"},{name:"银海区",code:"450503"},{name:"铁山港区",code:"450512"},{name:"合浦县",code:"450521"}]},{name:"防城港市",code:"450600",sub:[{name:"市辖区",code:"450601"},{name:"港口区",code:"450602"},{name:"防城区",code:"450603"},{name:"上思县",code:"450621"},{name:"东兴市",code:"450681"}]},{name:"钦州市",code:"450700",sub:[{name:"市辖区",code:"450701"},{name:"钦南区",code:"450702"},{name:"钦北区",code:"450703"},{name:"灵山县",code:"450721"},{name:"浦北县",code:"450722"}]},{name:"贵港市",code:"450800",sub:[{name:"市辖区",code:"450801"},{name:"港北区",code:"450802"},{name:"港南区",code:"450803"},{name:"覃塘区",code:"450804"},{name:"平南县",code:"450821"},{name:"桂平市",code:"450881"}]},{name:"玉林市",code:"450900",sub:[{name:"市辖区",code:"450901"},{name:"玉州区",code:"450902"},{name:"福绵区",code:"450903"},{name:"容县",code:"450921"},{name:"陆川县",code:"450922"},{name:"博白县",code:"450923"},{name:"兴业县",code:"450924"},{name:"北流市",code:"450981"}]},{name:"百色市",code:"451000",sub:[{name:"市辖区",code:"451001"},{name:"右江区",code:"451002"},{name:"田阳县",code:"451021"},{name:"田东县",code:"451022"},{name:"平果县",code:"451023"},{name:"德保县",code:"451024"},{name:"靖西县",code:"451025"},{name:"那坡县",code:"451026"},{name:"凌云县",code:"451027"},{name:"乐业县",code:"451028"},{name:"田林县",code:"451029"},{name:"西林县",code:"451030"},{name:"隆林各族自治县",code:"451031"}]},{name:"贺州市",code:"451100",sub:[{name:"市辖区",code:"451101"},{name:"八步区",code:"451102"},{name:"平桂管理区",code:"451119"},{name:"昭平县",code:"451121"},{name:"钟山县",code:"451122"},{name:"富川瑶族自治县",code:"451123"}]},{name:"河池市",code:"451200",sub:[{name:"市辖区",code:"451201"},{name:"金城江区",code:"451202"},{name:"南丹县",code:"451221"},{name:"天峨县",code:"451222"},{name:"凤山县",code:"451223"},{name:"东兰县",code:"451224"},{name:"罗城仫佬族自治县",code:"451225"},{name:"环江毛南族自治县",code:"451226"},{name:"巴马瑶族自治县",code:"451227"},{name:"都安瑶族自治县",code:"451228"},{name:"大化瑶族自治县",code:"451229"},{name:"宜州市",code:"451281"}]},{name:"来宾市",code:"451300",sub:[{name:"市辖区",code:"451301"},{name:"兴宾区",code:"451302"},{name:"忻城县",code:"451321"},{name:"象州县",code:"451322"},{name:"武宣县",code:"451323"},{name:"金秀瑶族自治县",code:"451324"},{name:"合山市",code:"451381"}]},{name:"崇左市",code:"451400",sub:[{name:"市辖区",code:"451401"},{name:"江州区",code:"451402"},{name:"扶绥县",code:"451421"},{name:"宁明县",code:"451422"},{name:"龙州县",code:"451423"},{name:"大新县",code:"451424"},{name:"天等县",code:"451425"},{name:"凭祥市",code:"451481"}]}]},{name:"海南省",code:"460000",sub:[{name:"海口市",code:"460100",sub:[{name:"市辖区",code:"460101"},{name:"秀英区",code:"460105"},{name:"龙华区",code:"460106"},{name:"琼山区",code:"460107"},{name:"美兰区",code:"460108"}]},{name:"三亚市",code:"460200",sub:[{name:"市辖区",code:"460201"},{name:"海棠区",code:"460202"},{name:"吉阳区",code:"460203"},{name:"天涯区",code:"460204"},{name:"崖州区",code:"460205"}]},{name:"三沙市",code:"460300",sub:[{name:"西沙群岛",code:"460321"},{name:"南沙群岛",code:"460322"},{name:"中沙群岛的岛礁及其海域",code:"460323"}]},{name:"五指山市",code:"469001"},{name:"琼海市",code:"469002"},{name:"儋州市",code:"469003"},{name:"文昌市",code:"469005"},{name:"万宁市",code:"469006"},{name:"东方市",code:"469007"},{name:"定安县",code:"469021"},{name:"屯昌县",code:"469022"},{name:"澄迈县",code:"469023"},{name:"临高县",code:"469024"},{name:"白沙黎族自治县",code:"469025"},{name:"昌江黎族自治县",code:"469026"},{name:"乐东黎族自治县",code:"469027"},{name:"陵水黎族自治县",code:"469028"},{name:"保亭黎族苗族自治县",code:"469029"},{name:"琼中黎族苗族自治县",code:"469030"}]},{name:"重庆",code:"500000",sub:[{name:"重庆市",code:"500000",sub:[{name:"万州区",code:"500101"},{name:"涪陵区",code:"500102"},{name:"渝中区",code:"500103"},{name:"大渡口区",code:"500104"},{name:"江北区",code:"500105"},{name:"沙坪坝区",code:"500106"},{name:"九龙坡区",code:"500107"},{name:"南岸区",code:"500108"},{name:"北碚区",code:"500109"},{name:"綦江区",code:"500110"},{name:"大足区",code:"500111"},{name:"渝北区",code:"500112"},{name:"巴南区",code:"500113"},{name:"黔江区",code:"500114"},{name:"长寿区",code:"500115"},{name:"江津区",code:"500116"},{name:"合川区",code:"500117"},{name:"永川区",code:"500118"},{name:"南川区",code:"500119"},{name:"璧山区",code:"500120"},{name:"铜梁区",code:"500151"},{name:"潼南县",code:"500223"},{name:"荣昌县",code:"500226"},{name:"梁平县",code:"500228"},{name:"城口县",code:"500229"},{name:"丰都县",code:"500230"},{name:"垫江县",code:"500231"},{name:"武隆县",code:"500232"},{name:"忠县",code:"500233"},{name:"开县",code:"500234"},{name:"云阳县",code:"500235"},{name:"奉节县",code:"500236"},{name:"巫山县",code:"500237"},{name:"巫溪县",code:"500238"},{name:"石柱土家族自治县",code:"500240"},{name:"秀山土家族苗族自治县",code:"500241"},{name:"酉阳土家族苗族自治县",code:"500242"},{name:"彭水苗族土家族自治县",code:"500243"}]}]},{name:"四川省",code:"510000",sub:[{name:"成都市",code:"510100",sub:[{name:"市辖区",code:"510101"},{name:"锦江区",code:"510104"},{name:"青羊区",code:"510105"},{name:"金牛区",code:"510106"},{name:"武侯区",code:"510107"},{name:"成华区",code:"510108"},{name:"龙泉驿区",code:"510112"},{name:"青白江区",code:"510113"},{name:"新都区",code:"510114"},{name:"温江区",code:"510115"},{name:"金堂县",code:"510121"},{name:"双流县",code:"510122"},{name:"郫县",code:"510124"},{name:"大邑县",code:"510129"},{name:"蒲江县",code:"510131"},{name:"新津县",code:"510132"},{name:"都江堰市",code:"510181"},{name:"彭州市",code:"510182"},{name:"邛崃市",code:"510183"},{name:"崇州市",code:"510184"}]},{name:"自贡市",code:"510300",sub:[{name:"市辖区",code:"510301"},{name:"自流井区",code:"510302"},{name:"贡井区",code:"510303"},{name:"大安区",code:"510304"},{name:"沿滩区",code:"510311"},{name:"荣县",code:"510321"},{name:"富顺县",code:"510322"}]},{name:"攀枝花市",code:"510400",sub:[{name:"市辖区",code:"510401"},{name:"东区",code:"510402"},{name:"西区",code:"510403"},{name:"仁和区",code:"510411"},{name:"米易县",code:"510421"},{name:"盐边县",code:"510422"}]},{name:"泸州市",code:"510500",sub:[{name:"市辖区",code:"510501"},{name:"江阳区",code:"510502"},{name:"纳溪区",code:"510503"},{name:"龙马潭区",code:"510504"},{name:"泸县",code:"510521"},{name:"合江县",code:"510522"},{name:"叙永县",code:"510524"},{name:"古蔺县",code:"510525"}]},{name:"德阳市",code:"510600",sub:[{name:"市辖区",code:"510601"},{name:"旌阳区",code:"510603"},{name:"中江县",code:"510623"},{name:"罗江县",code:"510626"},{name:"广汉市",code:"510681"},{name:"什邡市",code:"510682"},{name:"绵竹市",code:"510683"}]},{name:"绵阳市",code:"510700",sub:[{name:"市辖区",code:"510701"},{name:"涪城区",code:"510703"},{name:"游仙区",code:"510704"},{name:"三台县",code:"510722"},{name:"盐亭县",code:"510723"},{name:"安县",code:"510724"},{name:"梓潼县",code:"510725"},{name:"北川羌族自治县",code:"510726"},{name:"平武县",code:"510727"},{name:"江油市",code:"510781"}]},{name:"广元市",code:"510800",sub:[{name:"市辖区",code:"510801"},{name:"利州区",code:"510802"},{name:"昭化区",code:"510811"},{name:"朝天区",code:"510812"},{name:"旺苍县",code:"510821"},{name:"青川县",code:"510822"},{name:"剑阁县",code:"510823"},{name:"苍溪县",code:"510824"}]},{name:"遂宁市",code:"510900",sub:[{name:"市辖区",code:"510901"},{name:"船山区",code:"510903"},{name:"安居区",code:"510904"},{name:"蓬溪县",code:"510921"},{name:"射洪县",code:"510922"},{name:"大英县",code:"510923"}]},{name:"内江市",code:"511000",sub:[{name:"市辖区",code:"511001"},{name:"市中区",code:"511002"},{name:"东兴区",code:"511011"},{name:"威远县",code:"511024"},{name:"资中县",code:"511025"},{name:"隆昌县",code:"511028"}]},{name:"乐山市",code:"511100",sub:[{name:"市辖区",code:"511101"},{name:"市中区",code:"511102"},{name:"沙湾区",code:"511111"},{name:"五通桥区",code:"511112"},{name:"金口河区",code:"511113"},{name:"犍为县",code:"511123"},{name:"井研县",code:"511124"},{name:"夹江县",code:"511126"},{name:"沐川县",code:"511129"},{name:"峨边彝族自治县",code:"511132"},{name:"马边彝族自治县",code:"511133"},{name:"峨眉山市",code:"511181"}]},{name:"南充市",code:"511300",sub:[{name:"市辖区",code:"511301"},{name:"顺庆区",code:"511302"},{name:"高坪区",code:"511303"},{name:"嘉陵区",code:"511304"},{name:"南部县",code:"511321"},{name:"营山县",code:"511322"},{name:"蓬安县",code:"511323"},{name:"仪陇县",code:"511324"},{name:"西充县",code:"511325"},{name:"阆中市",code:"511381"}]},{name:"眉山市",code:"511400",sub:[{name:"市辖区",code:"511401"},{name:"东坡区",code:"511402"},{name:"彭山区",code:"511403"},{name:"仁寿县",code:"511421"},{name:"洪雅县",code:"511423"},{name:"丹棱县",code:"511424"},{name:"青神县",code:"511425"}]},{name:"宜宾市",code:"511500",sub:[{name:"市辖区",code:"511501"},{name:"翠屏区",code:"511502"},{name:"南溪区",code:"511503"},{name:"宜宾县",code:"511521"},{name:"江安县",code:"511523"},{name:"长宁县",code:"511524"},{name:"高县",code:"511525"},{name:"珙县",code:"511526"},{name:"筠连县",code:"511527"},{name:"兴文县",code:"511528"},{name:"屏山县",code:"511529"}]},{name:"广安市",code:"511600",sub:[{name:"市辖区",code:"511601"},{name:"广安区",code:"511602"},{name:"前锋区",code:"511603"},{name:"岳池县",code:"511621"},{name:"武胜县",code:"511622"},{name:"邻水县",code:"511623"},{name:"华蓥市",code:"511681"}]},{name:"达州市",code:"511700",sub:[{name:"市辖区",code:"511701"},{name:"通川区",code:"511702"},{name:"达川区",code:"511703"},{name:"宣汉县",code:"511722"},{name:"开江县",code:"511723"},{name:"大竹县",code:"511724"},{name:"渠县",code:"511725"},{name:"万源市",code:"511781"}]},{name:"雅安市",code:"511800",sub:[{name:"市辖区",code:"511801"},{name:"雨城区",code:"511802"},{name:"名山区",code:"511803"},{name:"荥经县",code:"511822"},{name:"汉源县",code:"511823"},{name:"石棉县",code:"511824"},{name:"天全县",code:"511825"},{name:"芦山县",code:"511826"},{name:"宝兴县",code:"511827"}]},{name:"巴中市",code:"511900",sub:[{name:"市辖区",code:"511901"},{name:"巴州区",code:"511902"},{name:"恩阳区",code:"511903"},{name:"通江县",code:"511921"},{name:"南江县",code:"511922"},{name:"平昌县",code:"511923"}]},{name:"资阳市",code:"512000",sub:[{name:"市辖区",code:"512001"},{name:"雁江区",code:"512002"},{name:"安岳县",code:"512021"},{name:"乐至县",code:"512022"},{name:"简阳市",code:"512081"}]},{name:"阿坝藏族羌族自治州",code:"513200",sub:[{name:"汶川县",code:"513221"},{name:"理县",code:"513222"},{name:"茂县",code:"513223"},{name:"松潘县",code:"513224"},{name:"九寨沟县",code:"513225"},{name:"金川县",code:"513226"},{name:"小金县",code:"513227"},{name:"黑水县",code:"513228"},{name:"马尔康县",code:"513229"},{name:"壤塘县",code:"513230"},{name:"阿坝县",code:"513231"},{name:"若尔盖县",code:"513232"},{name:"红原县",code:"513233"}]},{name:"甘孜藏族自治州",code:"513300",sub:[{name:"康定县",code:"513321"},{name:"泸定县",code:"513322"},{name:"丹巴县",code:"513323"},{name:"九龙县",code:"513324"},{name:"雅江县",code:"513325"},{name:"道孚县",code:"513326"},{name:"炉霍县",code:"513327"},{name:"甘孜县",code:"513328"},{name:"新龙县",code:"513329"},{name:"德格县",code:"513330"},{name:"白玉县",code:"513331"},{name:"石渠县",code:"513332"},{name:"色达县",code:"513333"},{name:"理塘县",code:"513334"},{name:"巴塘县",code:"513335"},{name:"乡城县",code:"513336"},{name:"稻城县",code:"513337"},{name:"得荣县",code:"513338"}]},{name:"凉山彝族自治州",code:"513400",sub:[{name:"西昌市",code:"513401"},{name:"木里藏族自治县",code:"513422"},{name:"盐源县",code:"513423"},{name:"德昌县",code:"513424"},{name:"会理县",code:"513425"},{name:"会东县",code:"513426"},{name:"宁南县",code:"513427"},{name:"普格县",code:"513428"},{name:"布拖县",code:"513429"},{name:"金阳县",code:"513430"},{name:"昭觉县",code:"513431"},{name:"喜德县",code:"513432"},{name:"冕宁县",code:"513433"},{name:"越西县",code:"513434"},{name:"甘洛县",code:"513435"},{name:"美姑县",code:"513436"},{name:"雷波县",code:"513437"}]}]},{name:"贵州省",code:"520000",sub:[{name:"贵阳市",code:"520100",sub:[{name:"市辖区",code:"520101"},{name:"南明区",code:"520102"},{name:"云岩区",code:"520103"},{name:"花溪区",code:"520111"},{name:"乌当区",code:"520112"},{name:"白云区",code:"520113"},{name:"观山湖区",code:"520115"},{name:"开阳县",code:"520121"},{name:"息烽县",code:"520122"},{name:"修文县",code:"520123"},{name:"清镇市",code:"520181"}]},{name:"六盘水市",code:"520200",sub:[{name:"钟山区",code:"520201"},{name:"六枝特区",code:"520203"},{name:"水城县",code:"520221"},{name:"盘县",code:"520222"}]},{name:"遵义市",code:"520300",sub:[{name:"市辖区",code:"520301"},{name:"红花岗区",code:"520302"},{name:"汇川区",code:"520303"},{name:"遵义县",code:"520321"},{name:"桐梓县",code:"520322"},{name:"绥阳县",code:"520323"},{name:"正安县",code:"520324"},{name:"道真仡佬族苗族自治县",code:"520325"},{name:"务川仡佬族苗族自治县",code:"520326"},{name:"凤冈县",code:"520327"},{name:"湄潭县",code:"520328"},{name:"余庆县",code:"520329"},{name:"习水县",code:"520330"},{name:"赤水市",code:"520381"},{name:"仁怀市",code:"520382"}]},{name:"安顺市",code:"520400",sub:[{name:"市辖区",code:"520401"},{name:"西秀区",code:"520402"},{name:"平坝区",code:"520403"},{name:"普定县",code:"520422"},{name:"镇宁布依族苗族自治县",code:"520423"},{name:"关岭布依族苗族自治县",code:"520424"},{name:"紫云苗族布依族自治县",code:"520425"}]},{name:"毕节市",code:"520500",sub:[{name:"市辖区",code:"520501"},{name:"七星关区",code:"520502"},{name:"大方县",code:"520521"},{name:"黔西县",code:"520522"},{name:"金沙县",code:"520523"},{name:"织金县",code:"520524"},{name:"纳雍县",code:"520525"},{name:"威宁彝族回族苗族自治县",code:"520526"},{name:"赫章县",code:"520527"}]},{name:"铜仁市",code:"520600",sub:[{name:"市辖区",code:"520601"},{name:"碧江区",code:"520602"},{name:"万山区",code:"520603"},{name:"江口县",code:"520621"},{name:"玉屏侗族自治县",code:"520622"},{name:"石阡县",code:"520623"},{name:"思南县",code:"520624"},{name:"印江土家族苗族自治县",code:"520625"},{name:"德江县",code:"520626"},{name:"沿河土家族自治县",code:"520627"},{name:"松桃苗族自治县",code:"520628"}]},{name:"黔西南布依族苗族自治州",code:"522300",sub:[{name:"兴义市",code:"522301"},{name:"兴仁县",code:"522322"},{name:"普安县",code:"522323"},{name:"晴隆县",code:"522324"},{name:"贞丰县",code:"522325"},{name:"望谟县",code:"522326"},{name:"册亨县",code:"522327"},{name:"安龙县",code:"522328"}]},{name:"黔东南苗族侗族自治州",code:"522600",sub:[{name:"凯里市",code:"522601"},{name:"黄平县",code:"522622"},{name:"施秉县",code:"522623"},{name:"三穗县",code:"522624"},{name:"镇远县",code:"522625"},{name:"岑巩县",code:"522626"},{name:"天柱县",code:"522627"},{name:"锦屏县",code:"522628"},{name:"剑河县",code:"522629"},{name:"台江县",code:"522630"},{name:"黎平县",code:"522631"},{name:"榕江县",code:"522632"},{name:"从江县",code:"522633"},{name:"雷山县",code:"522634"},{name:"麻江县",code:"522635"},{name:"丹寨县",code:"522636"}]},{name:"黔南布依族苗族自治州",code:"522700",sub:[{name:"都匀市",code:"522701"},{name:"福泉市",code:"522702"},{name:"荔波县",code:"522722"},{name:"贵定县",code:"522723"},{name:"瓮安县",code:"522725"},{name:"独山县",code:"522726"},{name:"平塘县",code:"522727"},{name:"罗甸县",code:"522728"},{name:"长顺县",code:"522729"},{name:"龙里县",code:"522730"},{name:"惠水县",code:"522731"},{name:"三都水族自治县",code:"522732"}]}]},{name:"云南省",code:"530000",sub:[{name:"昆明市",code:"530100",sub:[{name:"市辖区",code:"530101"},{name:"五华区",code:"530102"},{name:"盘龙区",code:"530103"},{name:"官渡区",code:"530111"},{name:"西山区",code:"530112"},{name:"东川区",code:"530113"},{name:"呈贡区",code:"530114"},{name:"晋宁县",code:"530122"},{name:"富民县",code:"530124"},{name:"宜良县",code:"530125"},{name:"石林彝族自治县",code:"530126"},{name:"嵩明县",code:"530127"},{name:"禄劝彝族苗族自治县",code:"530128"},{name:"寻甸回族彝族自治县",code:"530129"},{name:"安宁市",code:"530181"}]},{name:"曲靖市",code:"530300",sub:[{name:"市辖区",code:"530301"},{name:"麒麟区",code:"530302"},{name:"马龙县",code:"530321"},{name:"陆良县",code:"530322"},{name:"师宗县",code:"530323"},{name:"罗平县",code:"530324"},{name:"富源县",code:"530325"},{name:"会泽县",code:"530326"},{name:"沾益县",code:"530328"},{name:"宣威市",code:"530381"}]},{name:"玉溪市",code:"530400",sub:[{name:"市辖区",code:"530401"},{name:"红塔区",code:"530402"},{name:"江川县",code:"530421"},{name:"澄江县",code:"530422"},{name:"通海县",code:"530423"},{name:"华宁县",code:"530424"},{name:"易门县",code:"530425"},{name:"峨山彝族自治县",code:"530426"},{name:"新平彝族傣族自治县",code:"530427"},{name:"元江哈尼族彝族傣族自治县",code:"530428"}]},{name:"保山市",code:"530500",sub:[{name:"市辖区",code:"530501"},{name:"隆阳区",code:"530502"},{name:"施甸县",code:"530521"},{name:"腾冲县",code:"530522"},{name:"龙陵县",code:"530523"},{name:"昌宁县",code:"530524"}]},{name:"昭通市",code:"530600",sub:[{name:"市辖区",code:"530601"},{name:"昭阳区",code:"530602"},{name:"鲁甸县",code:"530621"},{name:"巧家县",code:"530622"},{name:"盐津县",code:"530623"},{name:"大关县",code:"530624"},{name:"永善县",code:"530625"},{name:"绥江县",code:"530626"},{name:"镇雄县",code:"530627"},{name:"彝良县",code:"530628"},{name:"威信县",code:"530629"},{name:"水富县",code:"530630"}]},{name:"丽江市",code:"530700",sub:[{name:"市辖区",code:"530701"},{name:"古城区",code:"530702"},{name:"玉龙纳西族自治县",code:"530721"},{name:"永胜县",code:"530722"},{name:"华坪县",code:"530723"},{name:"宁蒗彝族自治县",code:"530724"}]},{name:"普洱市",code:"530800",sub:[{name:"市辖区",code:"530801"},{name:"思茅区",code:"530802"},{name:"宁洱哈尼族彝族自治县",code:"530821"},{name:"墨江哈尼族自治县",code:"530822"},{name:"景东彝族自治县",code:"530823"},{name:"景谷傣族彝族自治县",code:"530824"},{name:"镇沅彝族哈尼族拉祜族自治县",code:"530825"},{name:"江城哈尼族彝族自治县",code:"530826"},{name:"孟连傣族拉祜族佤族自治县",code:"530827"},{name:"澜沧拉祜族自治县",code:"530828"},{name:"西盟佤族自治县",code:"530829"}]},{name:"临沧市",code:"530900",sub:[{name:"市辖区",code:"530901"},{name:"临翔区",code:"530902"},{name:"凤庆县",code:"530921"},{name:"云县",code:"530922"},{name:"永德县",code:"530923"},{name:"镇康县",code:"530924"},{name:"双江拉祜族佤族布朗族傣族自治县",code:"530925"},{name:"耿马傣族佤族自治县",code:"530926"},{name:"沧源佤族自治县",code:"530927"}]},{name:"楚雄彝族自治州",code:"532300",sub:[{name:"楚雄市",code:"532301"},{name:"双柏县",code:"532322"},{name:"牟定县",code:"532323"},{name:"南华县",code:"532324"},{name:"姚安县",code:"532325"},{name:"大姚县",code:"532326"},{name:"永仁县",code:"532327"},{name:"元谋县",code:"532328"},{name:"武定县",code:"532329"},{name:"禄丰县",code:"532331"}]},{name:"红河哈尼族彝族自治州",code:"532500",sub:[{name:"个旧市",code:"532501"},{name:"开远市",code:"532502"},{name:"蒙自市",code:"532503"},{name:"弥勒市",code:"532504"},{name:"屏边苗族自治县",code:"532523"},{name:"建水县",code:"532524"},{name:"石屏县",code:"532525"},{name:"泸西县",code:"532527"},{name:"元阳县",code:"532528"},{name:"红河县",code:"532529"},{name:"金平苗族瑶族傣族自治县",code:"532530"},{name:"绿春县",code:"532531"},{name:"河口瑶族自治县",code:"532532"}]},{name:"文山壮族苗族自治州",code:"532600",sub:[{name:"文山市",code:"532601"},{name:"砚山县",code:"532622"},{name:"西畴县",code:"532623"},{name:"麻栗坡县",code:"532624"},{name:"马关县",code:"532625"},{name:"丘北县",code:"532626"},{name:"广南县",code:"532627"},{name:"富宁县",code:"532628"}]},{name:"西双版纳傣族自治州",code:"532800",sub:[{name:"景洪市",code:"532801"},{name:"勐海县",code:"532822"},{name:"勐腊县",code:"532823"}]},{name:"大理白族自治州",code:"532900",sub:[{name:"大理市",code:"532901"},{name:"漾濞彝族自治县",code:"532922"},{name:"祥云县",code:"532923"},{name:"宾川县",code:"532924"},{name:"弥渡县",code:"532925"},{name:"南涧彝族自治县",code:"532926"},{name:"巍山彝族回族自治县",code:"532927"},{name:"永平县",code:"532928"},{name:"云龙县",code:"532929"},{name:"洱源县",code:"532930"},{name:"剑川县",code:"532931"},{name:"鹤庆县",code:"532932"}]},{name:"德宏傣族景颇族自治州",code:"533100",sub:[{name:"瑞丽市",code:"533102"},{name:"芒市",code:"533103"},{name:"梁河县",code:"533122"},{name:"盈江县",code:"533123"},{name:"陇川县",code:"533124"}]},{name:"怒江傈僳族自治州",code:"533300",sub:[{name:"泸水县",code:"533321"},{name:"福贡县",code:"533323"},{name:"贡山独龙族怒族自治县",code:"533324"},{name:"兰坪白族普米族自治县",code:"533325"}]},{name:"迪庆藏族自治州",code:"533400",sub:[{name:"香格里拉市",code:"533401"},{name:"德钦县",code:"533422"},{name:"维西傈僳族自治县",code:"533423"}]}]},{name:"西藏自治区",code:"540000",sub:[{name:"拉萨市",code:"540100",sub:[{name:"市辖区",code:"540101"},{name:"城关区",code:"540102"},{name:"林周县",code:"540121"},{name:"当雄县",code:"540122"},{name:"尼木县",code:"540123"},{name:"曲水县",code:"540124"},{name:"堆龙德庆县",code:"540125"},{name:"达孜县",code:"540126"},{name:"墨竹工卡县",code:"540127"}]},{name:"日喀则市",code:"540200",sub:[{name:"市辖区",code:"540201"},{name:"桑珠孜区",code:"540202"},{name:"南木林县",code:"540221"},{name:"江孜县",code:"540222"},{name:"定日县",code:"540223"},{name:"萨迦县",code:"540224"},{name:"拉孜县",code:"540225"},{name:"昂仁县",code:"540226"},{name:"谢通门县",code:"540227"},{name:"白朗县",code:"540228"},{name:"仁布县",code:"540229"},{name:"康马县",code:"540230"},{name:"定结县",code:"540231"},{name:"仲巴县",code:"540232"},{name:"亚东县",code:"540233"},{name:"吉隆县",code:"540234"},{name:"聂拉木县",code:"540235"},{name:"萨嘎县",code:"540236"},{name:"岗巴县",code:"540237"}]},{name:"昌都市",code:"540300",sub:[{name:"市辖区",code:"540301"},{name:"卡若区",code:"540302"},{name:"江达县",code:"540321"},{name:"贡觉县",code:"540322"},{name:"类乌齐县",code:"540323"},{name:"丁青县",code:"540324"},{name:"察雅县",code:"540325"},{name:"八宿县",code:"540326"},{name:"左贡县",code:"540327"},{name:"芒康县",code:"540328"},{name:"洛隆县",code:"540329"},{name:"边坝县",code:"540330"}]},{name:"山南地区",code:"542200",sub:[{name:"乃东县",code:"542221"},{name:"扎囊县",code:"542222"},{name:"贡嘎县",code:"542223"},{name:"桑日县",code:"542224"},{name:"琼结县",code:"542225"},{name:"曲松县",code:"542226"},{name:"措美县",code:"542227"},{name:"洛扎县",code:"542228"},{name:"加查县",code:"542229"},{name:"隆子县",code:"542231"},{name:"错那县",code:"542232"},{name:"浪卡子县",code:"542233"}]},{name:"那曲地区",code:"542400",sub:[{name:"那曲县",code:"542421"},{name:"嘉黎县",code:"542422"},{name:"比如县",code:"542423"},{name:"聂荣县",code:"542424"},{name:"安多县",code:"542425"},{name:"申扎县",code:"542426"},{name:"索县",code:"542427"},{name:"班戈县",code:"542428"},{name:"巴青县",code:"542429"},{name:"尼玛县",code:"542430"},{name:"双湖县",code:"542431"}]},{name:"阿里地区",code:"542500",sub:[{name:"普兰县",code:"542521"},{name:"札达县",code:"542522"},{name:"噶尔县",code:"542523"},{name:"日土县",code:"542524"},{name:"革吉县",code:"542525"},{name:"改则县",code:"542526"},{name:"措勤县",code:"542527"}]},{name:"林芝地区",code:"542600",sub:[{name:"林芝县",code:"542621"},{name:"工布江达县",code:"542622"},{name:"米林县",code:"542623"},{name:"墨脱县",code:"542624"},{name:"波密县",code:"542625"},{name:"察隅县",code:"542626"},{name:"朗县",code:"542627"}]}]},{name:"陕西省",code:"610000",sub:[{name:"西安市",code:"610100",sub:[{name:"市辖区",code:"610101"},{name:"新城区",code:"610102"},{name:"碑林区",code:"610103"},{name:"莲湖区",code:"610104"},{name:"灞桥区",code:"610111"},{name:"未央区",code:"610112"},{name:"雁塔区",code:"610113"},{name:"阎良区",code:"610114"},{name:"临潼区",code:"610115"},{name:"长安区",code:"610116"},{name:"高陵区",code:"610117"},{name:"蓝田县",code:"610122"},{name:"周至县",code:"610124"},{name:"户县",code:"610125"}]},{name:"铜川市",code:"610200",sub:[{name:"市辖区",code:"610201"},{name:"王益区",code:"610202"},{name:"印台区",code:"610203"},{name:"耀州区",code:"610204"},{name:"宜君县",code:"610222"}]},{name:"宝鸡市",code:"610300",sub:[{name:"市辖区",code:"610301"},{name:"渭滨区",code:"610302"},{name:"金台区",code:"610303"},{name:"陈仓区",code:"610304"},{name:"凤翔县",code:"610322"},{name:"岐山县",code:"610323"},{name:"扶风县",code:"610324"},{name:"眉县",code:"610326"},{name:"陇县",code:"610327"},{name:"千阳县",code:"610328"},{name:"麟游县",code:"610329"},{name:"凤县",code:"610330"},{name:"太白县",code:"610331"}]},{name:"咸阳市",code:"610400",sub:[{name:"市辖区",code:"610401"},{name:"秦都区",code:"610402"},{name:"杨陵区",code:"610403"},{name:"渭城区",code:"610404"},{name:"三原县",code:"610422"},{name:"泾阳县",code:"610423"},{name:"乾县",code:"610424"},{name:"礼泉县",code:"610425"},{name:"永寿县",code:"610426"},{name:"彬县",code:"610427"},{name:"长武县",code:"610428"},{name:"旬邑县",code:"610429"},{name:"淳化县",code:"610430"},{name:"武功县",code:"610431"},{name:"兴平市",code:"610481"}]},{name:"渭南市",code:"610500",sub:[{name:"市辖区",code:"610501"},{name:"临渭区",code:"610502"},{name:"华县",code:"610521"},{name:"潼关县",code:"610522"},{name:"大荔县",code:"610523"},{name:"合阳县",code:"610524"},{name:"澄城县",code:"610525"},{name:"蒲城县",code:"610526"},{name:"白水县",code:"610527"},{name:"富平县",code:"610528"},{name:"韩城市",code:"610581"},{name:"华阴市",code:"610582"}]},{name:"延安市",code:"610600",sub:[{name:"市辖区",code:"610601"},{name:"宝塔区",code:"610602"},{name:"延长县",code:"610621"},{name:"延川县",code:"610622"},{name:"子长县",code:"610623"},{name:"安塞县",code:"610624"},{name:"志丹县",code:"610625"},{name:"吴起县",code:"610626"},{name:"甘泉县",code:"610627"},{name:"富县",code:"610628"},{name:"洛川县",code:"610629"},{name:"宜川县",code:"610630"},{name:"黄龙县",code:"610631"},{name:"黄陵县",code:"610632"}]},{name:"汉中市",code:"610700",sub:[{name:"市辖区",code:"610701"},{name:"汉台区",code:"610702"},{name:"南郑县",code:"610721"},{name:"城固县",code:"610722"},{name:"洋县",code:"610723"},{name:"西乡县",code:"610724"},{name:"勉县",code:"610725"},{name:"宁强县",code:"610726"},{name:"略阳县",code:"610727"},{name:"镇巴县",code:"610728"},{name:"留坝县",code:"610729"},{name:"佛坪县",code:"610730"}]},{name:"榆林市",code:"610800",sub:[{name:"市辖区",code:"610801"},{name:"榆阳区",code:"610802"},{name:"神木县",code:"610821"},{name:"府谷县",code:"610822"},{name:"横山县",code:"610823"},{name:"靖边县",code:"610824"},{name:"定边县",code:"610825"},{name:"绥德县",code:"610826"},{name:"米脂县",code:"610827"},{name:"佳县",code:"610828"},{name:"吴堡县",code:"610829"},{name:"清涧县",code:"610830"},{name:"子洲县",code:"610831"}]},{name:"安康市",code:"610900",sub:[{name:"市辖区",code:"610901"},{name:"汉阴县",code:"610921"},{name:"石泉县",code:"610922"},{name:"宁陕县",code:"610923"},{name:"紫阳县",code:"610924"},{name:"岚皋县",code:"610925"},{name:"平利县",code:"610926"},{name:"镇坪县",code:"610927"},{name:"旬阳县",code:"610928"},{name:"白河县",code:"610929"}]},{name:"商洛市",code:"611000",sub:[{name:"市辖区",code:"611001"},{name:"商州区",code:"611002"},{name:"洛南县",code:"611021"},{name:"丹凤县",code:"611022"},{name:"商南县",code:"611023"},{name:"山阳县",code:"611024"},{name:"镇安县",code:"611025"},{name:"柞水县",code:"611026"}]}]},{name:"甘肃省",code:"620000",sub:[{name:"兰州市",code:"620100",sub:[{name:"市辖区",code:"620101"},{name:"城关区",code:"620102"},{name:"七里河区",code:"620103"},{name:"西固区",code:"620104"},{name:"安宁区",code:"620105"},{name:"红古区",code:"620111"},{name:"永登县",code:"620121"},{name:"皋兰县",code:"620122"},{name:"榆中县",code:"620123"}]},{name:"嘉峪关市",code:"620200",sub:[{name:"市辖区",code:"620201"}]},{name:"金昌市",code:"620300",sub:[{name:"市辖区",code:"620301"},{name:"金川区",code:"620302"},{name:"永昌县",code:"620321"}]},{name:"白银市",code:"620400",sub:[{name:"市辖区",code:"620401"},{name:"白银区",code:"620402"},{name:"平川区",code:"620403"},{name:"靖远县",code:"620421"},{name:"会宁县",code:"620422"},{name:"景泰县",code:"620423"}]},{name:"天水市",code:"620500",sub:[{name:"市辖区",code:"620501"},{name:"秦州区",code:"620502"},{name:"麦积区",code:"620503"},{name:"清水县",code:"620521"},{name:"秦安县",code:"620522"},{name:"甘谷县",code:"620523"},{name:"武山县",code:"620524"},{name:"张家川回族自治县",code:"620525"}]},{name:"武威市",code:"620600",sub:[{name:"市辖区",code:"620601"},{name:"凉州区",code:"620602"},{name:"民勤县",code:"620621"},{name:"古浪县",code:"620622"},{name:"天祝藏族自治县",code:"620623"}]},{name:"张掖市",code:"620700",sub:[{name:"市辖区",code:"620701"},{name:"甘州区",code:"620702"},{name:"肃南裕固族自治县",code:"620721"},{name:"民乐县",code:"620722"},{name:"临泽县",code:"620723"},{name:"高台县",code:"620724"},{name:"山丹县",code:"620725"}]},{name:"平凉市",code:"620800",sub:[{name:"市辖区",code:"620801"},{name:"崆峒区",code:"620802"},{name:"泾川县",code:"620821"},{name:"灵台县",code:"620822"},{name:"崇信县",code:"620823"},{name:"华亭县",code:"620824"},{name:"庄浪县",code:"620825"},{name:"静宁县",code:"620826"}]},{name:"酒泉市",code:"620900",sub:[{name:"市辖区",code:"620901"},{name:"肃州区",code:"620902"},{name:"金塔县",code:"620921"},{name:"瓜州县",code:"620922"},{name:"肃北蒙古族自治县",code:"620923"},{name:"阿克塞哈萨克族自治县",code:"620924"},{name:"玉门市",code:"620981"},{name:"敦煌市",code:"620982"}]},{name:"庆阳市",code:"621000",sub:[{name:"市辖区",code:"621001"},{name:"西峰区",code:"621002"},{name:"庆城县",code:"621021"},{name:"环县",code:"621022"},{name:"华池县",code:"621023"},{name:"合水县",code:"621024"},{name:"正宁县",code:"621025"},{name:"宁县",code:"621026"},{name:"镇原县",code:"621027"}]},{name:"定西市",code:"621100",sub:[{name:"市辖区",code:"621101"},{name:"安定区",code:"621102"},{name:"通渭县",code:"621121"},{name:"陇西县",code:"621122"},{name:"渭源县",code:"621123"},{name:"临洮县",code:"621124"},{name:"漳县",code:"621125"},{name:"岷县",code:"621126"}]},{name:"陇南市",code:"621200",sub:[{name:"市辖区",code:"621201"},{name:"武都区",code:"621202"},{name:"成县",code:"621221"},{name:"文县",code:"621222"},{name:"宕昌县",code:"621223"},{name:"康县",code:"621224"},{name:"西和县",code:"621225"},{name:"礼县",code:"621226"},{name:"徽县",code:"621227"},{name:"两当县",code:"621228"}]},{name:"临夏回族自治州",code:"622900",sub:[{name:"临夏市",code:"622901"},{name:"临夏县",code:"622921"},{name:"康乐县",code:"622922"},{name:"永靖县",code:"622923"},{name:"广河县",code:"622924"},{name:"和政县",code:"622925"},{name:"东乡族自治县",code:"622926"},{name:"积石山保安族东乡族撒拉族自治县",code:"622927"}]},{name:"甘南藏族自治州",code:"623000",sub:[{name:"合作市",code:"623001"},{name:"临潭县",code:"623021"},{name:"卓尼县",code:"623022"},{name:"舟曲县",code:"623023"},{name:"迭部县",code:"623024"},{name:"玛曲县",code:"623025"},{name:"碌曲县",code:"623026"},{name:"夏河县",code:"623027"}]}]},{name:"青海省",code:"630000",sub:[{name:"西宁市",code:"630100",sub:[{name:"市辖区",code:"630101"},{name:"城东区",code:"630102"},{name:"城中区",code:"630103"},{name:"城西区",code:"630104"},{name:"城北区",code:"630105"},{name:"大通回族土族自治县",code:"630121"},{name:"湟中县",code:"630122"},{name:"湟源县",code:"630123"}]},{name:"海东市",code:"630200",sub:[{name:"市辖区",code:"630201"},{name:"乐都区",code:"630202"},{name:"平安县",code:"630221"},{name:"民和回族土族自治县",code:"630222"},{name:"互助土族自治县",code:"630223"},{name:"化隆回族自治县",code:"630224"},{name:"循化撒拉族自治县",code:"630225"}]},{name:"海北藏族自治州",code:"632200",sub:[{name:"门源回族自治县",code:"632221"},{name:"祁连县",code:"632222"},{name:"海晏县",code:"632223"},{name:"刚察县",code:"632224"}]},{name:"黄南藏族自治州",code:"632300",sub:[{name:"同仁县",code:"632321"},{name:"尖扎县",code:"632322"},{name:"泽库县",code:"632323"},{name:"河南蒙古族自治县",code:"632324"}]},{name:"海南藏族自治州",code:"632500",sub:[{name:"共和县",code:"632521"},{name:"同德县",code:"632522"},{name:"贵德县",code:"632523"},{name:"兴海县",code:"632524"},{name:"贵南县",code:"632525"}]},{name:"果洛藏族自治州",code:"632600",sub:[{name:"玛沁县",code:"632621"},{name:"班玛县",code:"632622"},{name:"甘德县",code:"632623"},{name:"达日县",code:"632624"},{name:"久治县",code:"632625"},{name:"玛多县",code:"632626"}]},{name:"玉树藏族自治州",code:"632700",sub:[{name:"玉树市",code:"632701"},{name:"杂多县",code:"632722"},{name:"称多县",code:"632723"},{name:"治多县",code:"632724"},{name:"囊谦县",code:"632725"},{name:"曲麻莱县",code:"632726"}]},{name:"海西蒙古族藏族自治州",code:"632800",sub:[{name:"格尔木市",code:"632801"},{name:"德令哈市",code:"632802"},{name:"乌兰县",code:"632821"},{name:"都兰县",code:"632822"},{name:"天峻县",code:"632823"}]}]},{name:"宁夏回族自治区",code:"640000",sub:[{name:"银川市",code:"640100",sub:[{name:"市辖区",code:"640101"},{name:"兴庆区",code:"640104"},{name:"西夏区",code:"640105"},{name:"金凤区",code:"640106"},{name:"永宁县",code:"640121"},{name:"贺兰县",code:"640122"},{name:"灵武市",code:"640181"}]},{name:"石嘴山市",code:"640200",sub:[{name:"市辖区",code:"640201"},{name:"大武口区",code:"640202"},{name:"惠农区",code:"640205"},{name:"平罗县",code:"640221"}]},{name:"吴忠市",code:"640300",sub:[{name:"市辖区",code:"640301"},{name:"利通区",code:"640302"},{name:"红寺堡区",code:"640303"},{name:"盐池县",code:"640323"},{name:"同心县",code:"640324"},{name:"青铜峡市",code:"640381"}]},{name:"固原市",code:"640400",sub:[{name:"市辖区",code:"640401"},{name:"原州区",code:"640402"},{name:"西吉县",code:"640422"},{name:"隆德县",code:"640423"},{name:"泾源县",code:"640424"},{name:"彭阳县",code:"640425"}]},{name:"中卫市",code:"640500",sub:[{name:"市辖区",code:"640501"},{name:"沙坡头区",code:"640502"},{name:"中宁县",code:"640521"},{name:"海原县",code:"640522"}]}]},{name:"新疆维吾尔自治区",code:"650000",sub:[{name:"乌鲁木齐市",code:"650100",sub:[{name:"市辖区",code:"650101"},{name:"天山区",code:"650102"},{name:"沙依巴克区",code:"650103"},{name:"新市区",code:"650104"},{name:"水磨沟区",code:"650105"},{name:"头屯河区",code:"650106"},{name:"达坂城区",code:"650107"},{name:"米东区",code:"650109"},{name:"乌鲁木齐县",code:"650121"}]},{name:"克拉玛依市",code:"650200",sub:[{name:"市辖区",code:"650201"},{name:"独山子区",code:"650202"},{name:"克拉玛依区",code:"650203"},{name:"白碱滩区",code:"650204"},{name:"乌尔禾区",code:"650205"}]},{name:"吐鲁番地区",code:"652100",sub:[{name:"吐鲁番市",code:"652101"},{name:"鄯善县",code:"652122"},{name:"托克逊县",code:"652123"}]},{name:"哈密地区",code:"652200",sub:[{name:"哈密市",code:"652201"},{name:"巴里坤哈萨克自治县",code:"652222"},{name:"伊吾县",code:"652223"}]},{name:"昌吉回族自治州",code:"652300",sub:[{name:"昌吉市",code:"652301"},{name:"阜康市",code:"652302"},{name:"呼图壁县",code:"652323"},{name:"玛纳斯县",code:"652324"},{name:"奇台县",code:"652325"},{name:"吉木萨尔县",code:"652327"},{name:"木垒哈萨克自治县",code:"652328"}]},{name:"博尔塔拉蒙古自治州",code:"652700",sub:[{name:"博乐市",code:"652701"},{name:"阿拉山口市",code:"652702"},{name:"精河县",code:"652722"},{name:"温泉县",code:"652723"}]},{name:"巴音郭楞蒙古自治州",code:"652800",sub:[{name:"库尔勒市",code:"652801"},{name:"轮台县",code:"652822"},{name:"尉犁县",code:"652823"},{name:"若羌县",code:"652824"},{name:"且末县",code:"652825"},{name:"焉耆回族自治县",code:"652826"},{name:"和静县",code:"652827"},{name:"和硕县",code:"652828"},{name:"博湖县",code:"652829"}]},{name:"阿克苏地区",code:"652900",
-sub:[{name:"阿克苏市",code:"652901"},{name:"温宿县",code:"652922"},{name:"库车县",code:"652923"},{name:"沙雅县",code:"652924"},{name:"新和县",code:"652925"},{name:"拜城县",code:"652926"},{name:"乌什县",code:"652927"},{name:"阿瓦提县",code:"652928"},{name:"柯坪县",code:"652929"}]},{name:"克孜勒苏柯尔克孜自治州",code:"653000",sub:[{name:"阿图什市",code:"653001"},{name:"阿克陶县",code:"653022"},{name:"阿合奇县",code:"653023"},{name:"乌恰县",code:"653024"}]},{name:"喀什地区",code:"653100",sub:[{name:"喀什市",code:"653101"},{name:"疏附县",code:"653121"},{name:"疏勒县",code:"653122"},{name:"英吉沙县",code:"653123"},{name:"泽普县",code:"653124"},{name:"莎车县",code:"653125"},{name:"叶城县",code:"653126"},{name:"麦盖提县",code:"653127"},{name:"岳普湖县",code:"653128"},{name:"伽师县",code:"653129"},{name:"巴楚县",code:"653130"},{name:"塔什库尔干塔吉克自治县",code:"653131"}]},{name:"和田地区",code:"653200",sub:[{name:"和田市",code:"653201"},{name:"和田县",code:"653221"},{name:"墨玉县",code:"653222"},{name:"皮山县",code:"653223"},{name:"洛浦县",code:"653224"},{name:"策勒县",code:"653225"},{name:"于田县",code:"653226"},{name:"民丰县",code:"653227"}]},{name:"伊犁哈萨克自治州",code:"654000",sub:[{name:"伊宁市",code:"654002"},{name:"奎屯市",code:"654003"},{name:"霍尔果斯市",code:"654004"},{name:"伊宁县",code:"654021"},{name:"察布查尔锡伯自治县",code:"654022"},{name:"霍城县",code:"654023"},{name:"巩留县",code:"654024"},{name:"新源县",code:"654025"},{name:"昭苏县",code:"654026"},{name:"特克斯县",code:"654027"},{name:"尼勒克县",code:"654028"},{name:"塔城地区",code:"654200"},{name:"塔城市",code:"654201"},{name:"乌苏市",code:"654202"},{name:"额敏县",code:"654221"},{name:"沙湾县",code:"654223"},{name:"托里县",code:"654224"},{name:"裕民县",code:"654225"},{name:"和布克赛尔蒙古自治县",code:"654226"},{name:"阿勒泰地区",code:"654300"},{name:"阿勒泰市",code:"654301"},{name:"布尔津县",code:"654321"},{name:"富蕴县",code:"654322"},{name:"福海县",code:"654323"},{name:"哈巴河县",code:"654324"},{name:"青河县",code:"654325"},{name:"吉木乃县",code:"654326"}]},{name:"自治区直辖县级行政区划",code:"659000",sub:[{name:"石河子市",code:"659001"},{name:"阿拉尔市",code:"659002"},{name:"图木舒克市",code:"659003"},{name:"五家渠市",code:"659004"},{name:"北屯市",code:"659005"},{name:"铁门关市",code:"659006"},{name:"双河市",code:"659007"}]}]},{name:"台湾省",code:"710000",sub:[{name:"台北市",code:"710100",sub:[{name:"松山区",code:"710101"},{name:"信义区",code:"710102"},{name:"大安区",code:"710103"},{name:"中山区",code:"710104"},{name:"中正区",code:"710105"},{name:"大同区",code:"710106"},{name:"万华区",code:"710107"},{name:"文山区",code:"710108"},{name:"南港区",code:"710109"},{name:"内湖区",code:"710110"},{name:"士林区",code:"710111"},{name:"北投区",code:"710112"}]},{name:"高雄市",code:"710200",sub:[{name:"盐埕区",code:"710201"},{name:"鼓山区",code:"710202"},{name:"左营区",code:"710203"},{name:"楠梓区",code:"710204"},{name:"三民区",code:"710205"},{name:"新兴区",code:"710206"},{name:"前金区",code:"710207"},{name:"苓雅区",code:"710208"},{name:"前镇区",code:"710209"},{name:"旗津区",code:"710210"},{name:"小港区",code:"710211"},{name:"凤山区",code:"710212"},{name:"林园区",code:"710213"},{name:"大寮区",code:"710214"},{name:"大树区",code:"710215"},{name:"大社区",code:"710216"},{name:"仁武区",code:"710217"},{name:"鸟松区",code:"710218"},{name:"冈山区",code:"710219"},{name:"桥头区",code:"710220"},{name:"燕巢区",code:"710221"},{name:"田寮区",code:"710222"},{name:"阿莲区",code:"710223"},{name:"路竹区",code:"710224"},{name:"湖内区",code:"710225"},{name:"茄萣区",code:"710226"},{name:"永安区",code:"710227"},{name:"弥陀区",code:"710228"},{name:"梓官区",code:"710229"},{name:"旗山区",code:"710230"},{name:"美浓区",code:"710231"},{name:"六龟区",code:"710232"},{name:"甲仙区",code:"710233"},{name:"杉林区",code:"710234"},{name:"内门区",code:"710235"},{name:"茂林区",code:"710236"},{name:"桃源区",code:"710237"},{name:"那玛夏区",code:"710238"}]},{name:"基隆市",code:"710300",sub:[{name:"中正区",code:"710301"},{name:"七堵区",code:"710302"},{name:"暖暖区",code:"710303"},{name:"仁爱区",code:"710304"},{name:"中山区",code:"710305"},{name:"安乐区",code:"710306"},{name:"信义区",code:"710307"}]},{name:"台中市",code:"710400",sub:[{name:"中区",code:"710401"},{name:"东区",code:"710402"},{name:"南区",code:"710403"},{name:"西区",code:"710404"},{name:"北区",code:"710405"},{name:"西屯区",code:"710406"},{name:"南屯区",code:"710407"},{name:"北屯区",code:"710408"},{name:"丰原区",code:"710409"},{name:"东势区",code:"710410"},{name:"大甲区",code:"710411"},{name:"清水区",code:"710412"},{name:"沙鹿区",code:"710413"},{name:"梧栖区",code:"710414"},{name:"后里区",code:"710415"},{name:"神冈区",code:"710416"},{name:"潭子区",code:"710417"},{name:"大雅区",code:"710418"},{name:"新社区",code:"710419"},{name:"石冈区",code:"710420"},{name:"外埔区",code:"710421"},{name:"大安区",code:"710422"},{name:"乌日区",code:"710423"},{name:"大肚区",code:"710424"},{name:"龙井区",code:"710425"},{name:"雾峰区",code:"710426"},{name:"太平区",code:"710427"},{name:"大里区",code:"710428"},{name:"和平区",code:"710429"}]},{name:"台南市",code:"710500",sub:[{name:"东区",code:"710501"},{name:"南区",code:"710502"},{name:"北区",code:"710504"},{name:"安南区",code:"710506"},{name:"安平区",code:"710507"},{name:"中西区",code:"710508"},{name:"新营区",code:"710509"},{name:"盐水区",code:"710510"},{name:"白河区",code:"710511"},{name:"柳营区",code:"710512"},{name:"后壁区",code:"710513"},{name:"东山区",code:"710514"},{name:"麻豆区",code:"710515"},{name:"下营区",code:"710516"},{name:"六甲区",code:"710517"},{name:"官田区",code:"710518"},{name:"大内区",code:"710519"},{name:"佳里区",code:"710520"},{name:"学甲区",code:"710521"},{name:"西港区",code:"710522"},{name:"七股区",code:"710523"},{name:"将军区",code:"710524"},{name:"北门区",code:"710525"},{name:"新化区",code:"710526"},{name:"善化区",code:"710527"},{name:"新市区",code:"710528"},{name:"安定区",code:"710529"},{name:"山上区",code:"710530"},{name:"玉井区",code:"710531"},{name:"楠西区",code:"710532"},{name:"南化区",code:"710533"},{name:"左镇区",code:"710534"},{name:"仁德区",code:"710535"},{name:"归仁区",code:"710536"},{name:"关庙区",code:"710537"},{name:"龙崎区",code:"710538"},{name:"永康区",code:"710539"}]},{name:"新竹市",code:"710600",sub:[{name:"东区",code:"710601"},{name:"北区",code:"710602"},{name:"香山区",code:"710603"}]},{name:"嘉义市",code:"710700",sub:[{name:"东区",code:"710701"},{name:"西区",code:"710702"}]},{name:"新北市",code:"710800",sub:[{name:"板桥区",code:"710801"},{name:"三重区",code:"710802"},{name:"中和区",code:"710803"},{name:"永和区",code:"710804"},{name:"新庄区",code:"710805"},{name:"新店区",code:"710806"},{name:"树林区",code:"710807"},{name:"莺歌区",code:"710808"},{name:"三峡区",code:"710809"},{name:"淡水区",code:"710810"},{name:"汐止区",code:"710811"},{name:"瑞芳区",code:"710812"},{name:"土城区",code:"710813"},{name:"芦洲区",code:"710814"},{name:"五股区",code:"710815"},{name:"泰山区",code:"710816"},{name:"林口区",code:"710817"},{name:"深坑区",code:"710818"},{name:"石碇区",code:"710819"},{name:"坪林区",code:"710820"},{name:"三芝区",code:"710821"},{name:"石门区",code:"710822"},{name:"八里区",code:"710823"},{name:"平溪区",code:"710824"},{name:"双溪区",code:"710825"},{name:"贡寮区",code:"710826"},{name:"金山区",code:"710827"},{name:"万里区",code:"710828"},{name:"乌来区",code:"710829"}]},{name:"宜兰县",code:"712200",sub:[{name:"宜兰市",code:"712201"},{name:"罗东镇",code:"712221"},{name:"苏澳镇",code:"712222"},{name:"头城镇",code:"712223"},{name:"礁溪乡",code:"712224"},{name:"壮围乡",code:"712225"},{name:"员山乡",code:"712226"},{name:"冬山乡",code:"712227"},{name:"五结乡",code:"712228"},{name:"三星乡",code:"712229"},{name:"大同乡",code:"712230"},{name:"南澳乡",code:"712231"}]},{name:"桃园县",code:"712300",sub:[{name:"桃园市",code:"712301"},{name:"中坜市",code:"712302"},{name:"平镇市",code:"712303"},{name:"八德市",code:"712304"},{name:"杨梅市",code:"712305"},{name:"大溪镇",code:"712321"},{name:"芦竹乡",code:"712323"},{name:"大园乡",code:"712324"},{name:"龟山乡",code:"712325"},{name:"龙潭乡",code:"712327"},{name:"新屋乡",code:"712329"},{name:"观音乡",code:"712330"},{name:"复兴乡",code:"712331"}]},{name:"新竹县",code:"712400",sub:[{name:"竹北市",code:"712401"},{name:"竹东镇",code:"712421"},{name:"新埔镇",code:"712422"},{name:"关西镇",code:"712423"},{name:"湖口乡",code:"712424"},{name:"新丰乡",code:"712425"},{name:"芎林乡",code:"712426"},{name:"橫山乡",code:"712427"},{name:"北埔乡",code:"712428"},{name:"宝山乡",code:"712429"},{name:"峨眉乡",code:"712430"},{name:"尖石乡",code:"712431"},{name:"五峰乡",code:"712432"}]},{name:"苗栗县",code:"712500",sub:[{name:"苗栗市",code:"712501"},{name:"苑里镇",code:"712521"},{name:"通霄镇",code:"712522"},{name:"竹南镇",code:"712523"},{name:"头份镇",code:"712524"},{name:"后龙镇",code:"712525"},{name:"卓兰镇",code:"712526"},{name:"大湖乡",code:"712527"},{name:"公馆乡",code:"712528"},{name:"铜锣乡",code:"712529"},{name:"南庄乡",code:"712530"},{name:"头屋乡",code:"712531"},{name:"三义乡",code:"712532"},{name:"西湖乡",code:"712533"},{name:"造桥乡",code:"712534"},{name:"三湾乡",code:"712535"},{name:"狮潭乡",code:"712536"},{name:"泰安乡",code:"712537"}]},{name:"彰化县",code:"712700",sub:[{name:"彰化市",code:"712701"},{name:"鹿港镇",code:"712721"},{name:"和美镇",code:"712722"},{name:"线西乡",code:"712723"},{name:"伸港乡",code:"712724"},{name:"福兴乡",code:"712725"},{name:"秀水乡",code:"712726"},{name:"花坛乡",code:"712727"},{name:"芬园乡",code:"712728"},{name:"员林镇",code:"712729"},{name:"溪湖镇",code:"712730"},{name:"田中镇",code:"712731"},{name:"大村乡",code:"712732"},{name:"埔盐乡",code:"712733"},{name:"埔心乡",code:"712734"},{name:"永靖乡",code:"712735"},{name:"社头乡",code:"712736"},{name:"二水乡",code:"712737"},{name:"北斗镇",code:"712738"},{name:"二林镇",code:"712739"},{name:"田尾乡",code:"712740"},{name:"埤头乡",code:"712741"},{name:"芳苑乡",code:"712742"},{name:"大城乡",code:"712743"},{name:"竹塘乡",code:"712744"},{name:"溪州乡",code:"712745"}]},{name:"南投县",code:"712800",sub:[{name:"南投市",code:"712801"},{name:"埔里镇",code:"712821"},{name:"草屯镇",code:"712822"},{name:"竹山镇",code:"712823"},{name:"集集镇",code:"712824"},{name:"名间乡",code:"712825"},{name:"鹿谷乡",code:"712826"},{name:"中寮乡",code:"712827"},{name:"鱼池乡",code:"712828"},{name:"国姓乡",code:"712829"},{name:"水里乡",code:"712830"},{name:"信义乡",code:"712831"},{name:"仁爱乡",code:"712832"}]},{name:"云林县",code:"712900",sub:[{name:"斗六市",code:"712901"},{name:"斗南镇",code:"712921"},{name:"虎尾镇",code:"712922"},{name:"西螺镇",code:"712923"},{name:"土库镇",code:"712924"},{name:"北港镇",code:"712925"},{name:"古坑乡",code:"712926"},{name:"大埤乡",code:"712927"},{name:"莿桐乡",code:"712928"},{name:"林内乡",code:"712929"},{name:"二仑乡",code:"712930"},{name:"仑背乡",code:"712931"},{name:"麦寮乡",code:"712932"},{name:"东势乡",code:"712933"},{name:"褒忠乡",code:"712934"},{name:"台西乡",code:"712935"},{name:"元长乡",code:"712936"},{name:"四湖乡",code:"712937"},{name:"口湖乡",code:"712938"},{name:"水林乡",code:"712939"}]},{name:"嘉义县",code:"713000",sub:[{name:"太保市",code:"713001"},{name:"朴子市",code:"713002"},{name:"布袋镇",code:"713023"},{name:"大林镇",code:"713024"},{name:"民雄乡",code:"713025"},{name:"溪口乡",code:"713026"},{name:"新港乡",code:"713027"},{name:"六脚乡",code:"713028"},{name:"东石乡",code:"713029"},{name:"义竹乡",code:"713030"},{name:"鹿草乡",code:"713031"},{name:"水上乡",code:"713032"},{name:"中埔乡",code:"713033"},{name:"竹崎乡",code:"713034"},{name:"梅山乡",code:"713035"},{name:"番路乡",code:"713036"},{name:"大埔乡",code:"713037"},{name:"阿里山乡",code:"713038"}]},{name:"屏东县",code:"713300",sub:[{name:"屏东市",code:"713301"},{name:"潮州镇",code:"713321"},{name:"东港镇",code:"713322"},{name:"恒春镇",code:"713323"},{name:"万丹乡",code:"713324"},{name:"长治乡",code:"713325"},{name:"麟洛乡",code:"713326"},{name:"九如乡",code:"713327"},{name:"里港乡",code:"713328"},{name:"盐埔乡",code:"713329"},{name:"高树乡",code:"713330"},{name:"万峦乡",code:"713331"},{name:"内埔乡",code:"713332"},{name:"竹田乡",code:"713333"},{name:"新埤乡",code:"713334"},{name:"枋寮乡",code:"713335"},{name:"新园乡",code:"713336"},{name:"崁顶乡",code:"713337"},{name:"林边乡",code:"713338"},{name:"南州乡",code:"713339"},{name:"佳冬乡",code:"713340"},{name:"琉球乡",code:"713341"},{name:"车城乡",code:"713342"},{name:"满州乡",code:"713343"},{name:"枋山乡",code:"713344"},{name:"三地门乡",code:"713345"},{name:"雾台乡",code:"713346"},{name:"玛家乡",code:"713347"},{name:"泰武乡",code:"713348"},{name:"来义乡",code:"713349"},{name:"春日乡",code:"713350"},{name:"狮子乡",code:"713351"},{name:"牡丹乡",code:"713352"}]},{name:"台东县",code:"713400",sub:[{name:"台东市",code:"713401"},{name:"成功镇",code:"713421"},{name:"关山镇",code:"713422"},{name:"卑南乡",code:"713423"},{name:"鹿野乡",code:"713424"},{name:"池上乡",code:"713425"},{name:"东河乡",code:"713426"},{name:"长滨乡",code:"713427"},{name:"太麻里乡",code:"713428"},{name:"大武乡",code:"713429"},{name:"绿岛乡",code:"713430"},{name:"海端乡",code:"713431"},{name:"延平乡",code:"713432"},{name:"金峰乡",code:"713433"},{name:"达仁乡",code:"713434"},{name:"兰屿乡",code:"713435"}]},{name:"花莲县",code:"713500",sub:[{name:"花莲市",code:"713501"},{name:"凤林镇",code:"713521"},{name:"玉里镇",code:"713522"},{name:"新城乡",code:"713523"},{name:"吉安乡",code:"713524"},{name:"寿丰乡",code:"713525"},{name:"光复乡",code:"713526"},{name:"丰滨乡",code:"713527"},{name:"瑞穗乡",code:"713528"},{name:"富里乡",code:"713529"},{name:"秀林乡",code:"713530"},{name:"万荣乡",code:"713531"},{name:"卓溪乡",code:"713532"}]},{name:"澎湖县",code:"713600",sub:[{name:"马公市",code:"713601"},{name:"湖西乡",code:"713621"},{name:"白沙乡",code:"713622"},{name:"西屿乡",code:"713623"},{name:"望安乡",code:"713624"},{name:"七美乡",code:"713625"}]}]},{name:"香港特别行政区",code:"810000",sub:[{name:"香港岛",code:"810100",sub:[{name:"中西区",code:"810101"},{name:"湾仔区",code:"810102"},{name:"东区",code:"810103"},{name:"南区",code:"810104"}]},{name:"九龙",code:"810200",sub:[{name:"油尖旺区",code:"810201"},{name:"深水埗区",code:"810202"},{name:"九龙城区",code:"810203"},{name:"黄大仙区",code:"810204"},{name:"观塘区",code:"810205"}]},{name:"新界",code:"810300",sub:[{name:"荃湾区",code:"810301"},{name:"屯门区",code:"810302"},{name:"元朗区",code:"810303"},{name:"北区",code:"810304"},{name:"大埔区",code:"810305"},{name:"西贡区",code:"810306"},{name:"沙田区",code:"810307"},{name:"葵青区",code:"810308"},{name:"离岛区",code:"810309"}]}]},{name:"澳门特别行政区",code:"820000",sub:[{name:"澳门半岛",code:"820100",sub:[{name:"花地玛堂区",code:"820101"},{name:"圣安多尼堂区",code:"820102"},{name:"大堂区",code:"820103"},{name:"望德堂区",code:"820104"},{name:"风顺堂区",code:"820105"}]},{name:"氹仔岛",code:"820200",sub:[{name:"嘉模堂区",code:"820201"}]},{name:"路环岛",code:"820300",sub:[{name:"圣方济各堂区",code:"820301"}]}]}]}($),+function(e){"use strict";var n,a=e.rawCitiesData,c=function(e){for(var n=[],a=0;a<e.length;a++){var c=e[a];/^请选择|市辖区/.test(c.name)||n.push(c)}return n.length?n:[]},o=function(e){return e.sub?c(e.sub):[{name:"",code:e.code}]},m=function(e){for(var n=0;n<a.length;n++)if(a[n].code===e||a[n].name===e)return o(a[n]);return[]},d=function(e,n){for(var c=0;c<a.length;c++)if(a[c].code===e||a[c].name===e)for(var m=0;m<a[c].sub.length;m++)if(a[c].sub[m].code===n||a[c].sub[m].name===n)return o(a[c].sub[m])},u=function(e){var n,c,o=a[0],m=e.split(" ");return a.map(function(e){e.name===m[0]&&(o=e)}),o.sub.map(function(e){e.name===m[1]&&(n=e)}),m[2]&&n.sub.map(function(e){e.name===m[2]&&(c=e)}),c?[o.code,n.code,c.code]:[o.code,n.code]};e.fn.cityPicker=function(c){return c=e.extend({},n,c),this.each(function(){var n=this,s=a.map(function(e){return e.name}),b=a.map(function(e){return e.code}),t=o(a[0]),r=t.map(function(e){return e.name}),i=t.map(function(e){return e.code}),l=o(a[0].sub[0]),f=l.map(function(e){return e.name}),p=l.map(function(e){return e.code}),v=s[0],h=r[0],V=f[0],y=[{displayValues:s,values:b,cssClass:"col-province"},{displayValues:r,values:i,cssClass:"col-city"}];c.showDistrict&&y.push({values:p,displayValues:f,cssClass:"col-district"});var g={cssClass:"city-picker",rotateEffect:!1,formatValue:function(e,n,a){return a.join(" ")},onChange:function(a,o,u){var s,b=a.cols[0].displayValue;if(b!==v){var t=m(b);s=t[0].name;var r=d(b,s);return a.cols[1].replaceValues(t.map(function(e){return e.code}),t.map(function(e){return e.name})),c.showDistrict&&a.cols[2].replaceValues(r.map(function(e){return e.code}),r.map(function(e){return e.name})),v=b,h=s,a.updateValue(),!1}if(c.showDistrict&&(s=a.cols[1].displayValue,s!==h)){var i=d(b,s);return a.cols[2].replaceValues(i.map(function(e){return e.code}),i.map(function(e){return e.name})),h=s,a.updateValue(),!1}var l=o[o.length-1]?o.length-1:o.length-2;e(n).attr("data-code",o[l]),e(n).attr("data-codes",o.join(",")),c.onChange&&c.onChange.call(n,a,o,u)},cols:y};if(this){var C=e.extend({},c,g),w=e(this).val();if(w||(w="北京 北京市 东城区"),v=w.split(" ")[0],h=w.split(" ")[1],V=w.split(" ")[2],w){if(C.value=u(w),C.value[0]){var D=m(C.value[0]);C.cols[1].values=D.map(function(e){return e.code}),C.cols[1].displayValues=D.map(function(e){return e.name})}if(C.value[1]){if(c.showDistrict){var k=d(C.value[0],C.value[1]);C.cols[2].values=k.map(function(e){return e.code}),C.cols[2].displayValues=k.map(function(e){return e.name})}}else if(c.showDistrict){var k=d(C.value[0],C.cols[1].values[0]);C.cols[2].values=k.map(function(e){return e.code}),C.cols[2].displayValues=k.map(function(e){return e.name})}}e(this).picker(C)}})},n=e.fn.cityPicker.prototype.defaults={showDistrict:!0}}($);
\ No newline at end of file
diff --git a/NewLife.Cube/Content/jweui/js/jquery-weui.js b/NewLife.Cube/Content/jweui/js/jquery-weui.js
deleted file mode 100644
index 937c8dbaaf..0000000000
--- a/NewLife.Cube/Content/jweui/js/jquery-weui.js
+++ /dev/null
@@ -1,6276 +0,0 @@
-/** 
-* jQuery WeUI V1.0.1 
-* By 言川
-* http://lihongxun945.github.io/jquery-weui/
- */
-/* global $:true */
-/* global WebKitCSSMatrix:true */
-
-(function($) {
-  "use strict";
-
-  $.fn.transitionEnd = function(callback) {
-    var events = ['webkitTransitionEnd', 'transitionend', 'oTransitionEnd', 'MSTransitionEnd', 'msTransitionEnd'],
-      i, dom = this;
-
-    function fireCallBack(e) {
-      /*jshint validthis:true */
-      if (e.target !== this) return;
-      callback.call(this, e);
-      for (i = 0; i < events.length; i++) {
-        dom.off(events[i], fireCallBack);
-      }
-    }
-    if (callback) {
-      for (i = 0; i < events.length; i++) {
-        dom.on(events[i], fireCallBack);
-      }
-    }
-    return this;
-  };
-
-  $.support = (function() {
-    var support = {
-      touch: !!(('ontouchstart' in window) || window.DocumentTouch && document instanceof window.DocumentTouch)
-    };
-    return support;
-  })();
-
-  $.touchEvents = {
-    start: $.support.touch ? 'touchstart' : 'mousedown',
-    move: $.support.touch ? 'touchmove' : 'mousemove',
-    end: $.support.touch ? 'touchend' : 'mouseup'
-  };
-
-  $.getTouchPosition = function(e) {
-    e = e.originalEvent || e; //jquery wrap the originevent
-    if(e.type === 'touchstart' || e.type === 'touchmove' || e.type === 'touchend') {
-      return {
-        x: e.targetTouches[0].pageX,
-        y: e.targetTouches[0].pageY
-      };
-    } else {
-      return {
-        x: e.pageX,
-        y: e.pageY
-      };
-    }
-  };
-
-  $.fn.scrollHeight = function() {
-    return this[0].scrollHeight;
-  };
-
-  $.fn.transform = function(transform) {
-    for (var i = 0; i < this.length; i++) {
-      var elStyle = this[i].style;
-      elStyle.webkitTransform = elStyle.MsTransform = elStyle.msTransform = elStyle.MozTransform = elStyle.OTransform = elStyle.transform = transform;
-    }
-    return this;
-  };
-  $.fn.transition = function(duration) {
-    if (typeof duration !== 'string') {
-      duration = duration + 'ms';
-    }
-    for (var i = 0; i < this.length; i++) {
-      var elStyle = this[i].style;
-      elStyle.webkitTransitionDuration = elStyle.MsTransitionDuration = elStyle.msTransitionDuration = elStyle.MozTransitionDuration = elStyle.OTransitionDuration = elStyle.transitionDuration = duration;
-    }
-    return this;
-  };
-
-  $.getTranslate = function (el, axis) {
-    var matrix, curTransform, curStyle, transformMatrix;
-
-    // automatic axis detection
-    if (typeof axis === 'undefined') {
-      axis = 'x';
-    }
-
-    curStyle = window.getComputedStyle(el, null);
-    if (window.WebKitCSSMatrix) {
-      // Some old versions of Webkit choke when 'none' is passed; pass
-      // empty string instead in this case
-      transformMatrix = new WebKitCSSMatrix(curStyle.webkitTransform === 'none' ? '' : curStyle.webkitTransform);
-    }
-    else {
-      transformMatrix = curStyle.MozTransform || curStyle.OTransform || curStyle.MsTransform || curStyle.msTransform  || curStyle.transform || curStyle.getPropertyValue('transform').replace('translate(', 'matrix(1, 0, 0, 1,');
-      matrix = transformMatrix.toString().split(',');
-    }
-
-    if (axis === 'x') {
-      //Latest Chrome and webkits Fix
-      if (window.WebKitCSSMatrix)
-        curTransform = transformMatrix.m41;
-      //Crazy IE10 Matrix
-      else if (matrix.length === 16)
-        curTransform = parseFloat(matrix[12]);
-      //Normal Browsers
-      else
-        curTransform = parseFloat(matrix[4]);
-    }
-    if (axis === 'y') {
-      //Latest Chrome and webkits Fix
-      if (window.WebKitCSSMatrix)
-        curTransform = transformMatrix.m42;
-      //Crazy IE10 Matrix
-      else if (matrix.length === 16)
-        curTransform = parseFloat(matrix[13]);
-      //Normal Browsers
-      else
-        curTransform = parseFloat(matrix[5]);
-    }
-
-    return curTransform || 0;
-  };
-  $.requestAnimationFrame = function (callback) {
-    if (window.requestAnimationFrame) return window.requestAnimationFrame(callback);
-    else if (window.webkitRequestAnimationFrame) return window.webkitRequestAnimationFrame(callback);
-    else if (window.mozRequestAnimationFrame) return window.mozRequestAnimationFrame(callback);
-    else {
-      return window.setTimeout(callback, 1000 / 60);
-    }
-  };
-
-  $.cancelAnimationFrame = function (id) {
-    if (window.cancelAnimationFrame) return window.cancelAnimationFrame(id);
-    else if (window.webkitCancelAnimationFrame) return window.webkitCancelAnimationFrame(id);
-    else if (window.mozCancelAnimationFrame) return window.mozCancelAnimationFrame(id);
-    else {
-      return window.clearTimeout(id);
-    }  
-  };
-
-  $.fn.join = function(arg) {
-    return this.toArray().join(arg);
-  }
-})($);
-
-/*===========================
-  Template7 Template engine
-  ===========================*/
-/* global $:true */
-/* jshint unused:false */
-/* jshint forin:false */
-+function ($) {
-  "use strict";
-  $.Template7 = $.t7 = (function () {
-    function isArray(arr) {
-      return Object.prototype.toString.apply(arr) === '[object Array]';
-    }
-    function isObject(obj) {
-      return obj instanceof Object;
-    }
-    function isFunction(func) {
-      return typeof func === 'function';
-    }
-    var cache = {};
-    function helperToSlices(string) {
-      var helperParts = string.replace(/[{}#}]/g, '').split(' ');
-      var slices = [];
-      var shiftIndex, i, j;
-      for (i = 0; i < helperParts.length; i++) {
-        var part = helperParts[i];
-        if (i === 0) slices.push(part);
-        else {
-          if (part.indexOf('"') === 0) {
-            // Plain String
-            if (part.match(/"/g).length === 2) {
-              // One word string
-              slices.push(part);
-            }
-            else {
-              // Find closed Index
-              shiftIndex = 0;
-              for (j = i + 1; j < helperParts.length; j++) {
-                part += ' ' + helperParts[j];
-                if (helperParts[j].indexOf('"') >= 0) {
-                  shiftIndex = j;
-                  slices.push(part);
-                  break;
-                }
-              }
-              if (shiftIndex) i = shiftIndex;
-            }
-          }
-          else {
-            if (part.indexOf('=') > 0) {
-              // Hash
-              var hashParts = part.split('=');
-              var hashName = hashParts[0];
-              var hashContent = hashParts[1];
-              if (hashContent.match(/"/g).length !== 2) {
-                shiftIndex = 0;
-                for (j = i + 1; j < helperParts.length; j++) {
-                  hashContent += ' ' + helperParts[j];
-                  if (helperParts[j].indexOf('"') >= 0) {
-                    shiftIndex = j;
-                    break;
-                  }
-                }
-                if (shiftIndex) i = shiftIndex;
-              }
-              var hash = [hashName, hashContent.replace(/"/g,'')];
-              slices.push(hash);
-            }
-            else {
-              // Plain variable
-              slices.push(part);
-            }
-          }
-        }
-      }
-      return slices;
-    }
-    function stringToBlocks(string) {
-      var blocks = [], i, j, k;
-      if (!string) return [];
-      var _blocks = string.split(/({{[^{^}]*}})/);
-      for (i = 0; i < _blocks.length; i++) {
-        var block = _blocks[i];
-        if (block === '') continue;
-        if (block.indexOf('{{') < 0) {
-          blocks.push({
-            type: 'plain',
-            content: block
-          });
-        }
-        else {
-          if (block.indexOf('{/') >= 0) {
-            continue;
-          }
-          if (block.indexOf('{#') < 0 && block.indexOf(' ') < 0 && block.indexOf('else') < 0) {
-            // Simple variable
-            blocks.push({
-              type: 'variable',
-              contextName: block.replace(/[{}]/g, '')
-            });
-            continue;
-          }
-          // Helpers
-          var helperSlices = helperToSlices(block);
-          var helperName = helperSlices[0];
-          var helperContext = [];
-          var helperHash = {};
-          for (j = 1; j < helperSlices.length; j++) {
-            var slice = helperSlices[j];
-            if (isArray(slice)) {
-              // Hash
-              helperHash[slice[0]] = slice[1] === 'false' ? false : slice[1];
-            }
-            else {
-              helperContext.push(slice);
-            }
-          }
-
-          if (block.indexOf('{#') >= 0) {
-            // Condition/Helper
-            var helperStartIndex = i;
-            var helperContent = '';
-            var elseContent = '';
-            var toSkip = 0;
-            var shiftIndex;
-            var foundClosed = false, foundElse = false, foundClosedElse = false, depth = 0;
-            for (j = i + 1; j < _blocks.length; j++) {
-              if (_blocks[j].indexOf('{{#') >= 0) {
-                depth ++;
-              }
-              if (_blocks[j].indexOf('{{/') >= 0) {
-                depth --;
-              }
-              if (_blocks[j].indexOf('{{#' + helperName) >= 0) {
-                helperContent += _blocks[j];
-                if (foundElse) elseContent += _blocks[j];
-                toSkip ++;
-              }
-              else if (_blocks[j].indexOf('{{/' + helperName) >= 0) {
-                if (toSkip > 0) {
-                  toSkip--;
-                  helperContent += _blocks[j];
-                  if (foundElse) elseContent += _blocks[j];
-                }
-                else {
-                  shiftIndex = j;
-                  foundClosed = true;
-                  break;
-                }
-              }
-              else if (_blocks[j].indexOf('else') >= 0 && depth === 0) {
-                foundElse = true;
-              }
-              else {
-                if (!foundElse) helperContent += _blocks[j];
-                if (foundElse) elseContent += _blocks[j];
-              }
-
-            }
-            if (foundClosed) {
-              if (shiftIndex) i = shiftIndex;
-              blocks.push({
-                type: 'helper',
-                helperName: helperName,
-                contextName: helperContext,
-                content: helperContent,
-                inverseContent: elseContent,
-                hash: helperHash
-              });
-            }
-          }
-          else if (block.indexOf(' ') > 0) {
-            blocks.push({
-              type: 'helper',
-              helperName: helperName,
-              contextName: helperContext,
-              hash: helperHash
-            });
-          }
-        }
-      }
-      return blocks;
-    }
-    var Template7 = function (template) {
-      var t = this;
-      t.template = template;
-
-      function getCompileFn(block, depth) {
-        if (block.content) return compile(block.content, depth);
-        else return function () {return ''; };
-      }
-      function getCompileInverse(block, depth) {
-        if (block.inverseContent) return compile(block.inverseContent, depth);
-        else return function () {return ''; };
-      }
-      function getCompileVar(name, ctx) {
-        var variable, parts, levelsUp = 0, initialCtx = ctx;
-        if (name.indexOf('../') === 0) {
-          levelsUp = name.split('../').length - 1;
-          var newDepth = ctx.split('_')[1] - levelsUp;
-          ctx = 'ctx_' + (newDepth >= 1 ? newDepth : 1);
-          parts = name.split('../')[levelsUp].split('.');
-        }
-        else if (name.indexOf('@global') === 0) {
-          ctx = '$.Template7.global';
-          parts = name.split('@global.')[1].split('.');
-        }
-        else if (name.indexOf('@root') === 0) {
-          ctx = 'ctx_1';
-          parts = name.split('@root.')[1].split('.');
-        }
-        else {
-          parts = name.split('.');
-        }
-        variable = ctx;
-        for (var i = 0; i < parts.length; i++) {
-          var part = parts[i];
-          if (part.indexOf('@') === 0) {
-            if (i > 0) {
-              variable += '[(data && data.' + part.replace('@', '') + ')]';
-            }
-            else {
-              variable = '(data && data.' + name.replace('@', '') + ')';
-            }
-          }
-          else {
-            if (isFinite(part)) {
-              variable += '[' + part + ']';
-            }
-            else {
-              if (part.indexOf('this') === 0) {
-                variable = part.replace('this', ctx);
-              }
-              else {
-                variable += '.' + part;       
-              }
-            }
-          }
-        }
-
-        return variable;
-      }
-      function getCompiledArguments(contextArray, ctx) {
-        var arr = [];
-        for (var i = 0; i < contextArray.length; i++) {
-          if (contextArray[i].indexOf('"') === 0) arr.push(contextArray[i]);
-          else {
-            arr.push(getCompileVar(contextArray[i], ctx));
-          }
-        }
-        return arr.join(', ');
-      }
-      function compile(template, depth) {
-        depth = depth || 1;
-        template = template || t.template;
-        if (typeof template !== 'string') {
-          throw new Error('Template7: Template must be a string');
-        }
-        var blocks = stringToBlocks(template);
-        if (blocks.length === 0) {
-          return function () { return ''; };
-        }
-        var ctx = 'ctx_' + depth;
-        var resultString = '(function (' + ctx + ', data) {\n';
-        if (depth === 1) {
-          resultString += 'function isArray(arr){return Object.prototype.toString.apply(arr) === \'[object Array]\';}\n';
-          resultString += 'function isFunction(func){return (typeof func === \'function\');}\n';
-          resultString += 'function c(val, ctx) {if (typeof val !== "undefined") {if (isFunction(val)) {return val.call(ctx);} else return val;} else return "";}\n';
-        }
-        resultString += 'var r = \'\';\n';
-        var i, j, context;
-        for (i = 0; i < blocks.length; i++) {
-          var block = blocks[i];
-          // Plain block
-          if (block.type === 'plain') {
-            resultString += 'r +=\'' + (block.content).replace(/\r/g, '\\r').replace(/\n/g, '\\n').replace(/'/g, '\\' + '\'') + '\';';
-            continue;
-          }
-          var variable, compiledArguments;
-          // Variable block
-          if (block.type === 'variable') {
-            variable = getCompileVar(block.contextName, ctx);
-            resultString += 'r += c(' + variable + ', ' + ctx + ');';
-          }
-          // Helpers block
-          if (block.type === 'helper') {
-            if (block.helperName in t.helpers) {
-              compiledArguments = getCompiledArguments(block.contextName, ctx);
-              resultString += 'r += ($.Template7.helpers.' + block.helperName + ').call(' + ctx + ', ' + (compiledArguments && (compiledArguments + ', ')) +'{hash:' + JSON.stringify(block.hash) + ', data: data || {}, fn: ' + getCompileFn(block, depth+1) + ', inverse: ' + getCompileInverse(block, depth+1) + ', root: ctx_1});';
-            }
-            else {
-              if (block.contextName.length > 0) {
-                throw new Error('Template7: Missing helper: "' + block.helperName + '"');
-              }
-              else {
-                variable = getCompileVar(block.helperName, ctx);
-                resultString += 'if (' + variable + ') {';
-                resultString += 'if (isArray(' + variable + ')) {';
-                resultString += 'r += ($.Template7.helpers.each).call(' + ctx + ', ' + variable + ', {hash:' + JSON.stringify(block.hash) + ', data: data || {}, fn: ' + getCompileFn(block, depth+1) + ', inverse: ' + getCompileInverse(block, depth+1) + ', root: ctx_1});';
-                resultString += '}else {';
-                resultString += 'r += ($.Template7.helpers.with).call(' + ctx + ', ' + variable + ', {hash:' + JSON.stringify(block.hash) + ', data: data || {}, fn: ' + getCompileFn(block, depth+1) + ', inverse: ' + getCompileInverse(block, depth+1) + ', root: ctx_1});';
-                resultString += '}}';
-              }
-            }
-          }
-        }
-        resultString += '\nreturn r;})';
-        return eval.call(window, resultString);
-      }
-      t.compile = function (template) {
-        if (!t.compiled) {
-          t.compiled = compile(template);
-        }
-        return t.compiled;
-      };
-    };
-    Template7.prototype = {
-      options: {},
-      helpers: {
-        'if': function (context, options) {
-          if (isFunction(context)) { context = context.call(this); }
-          if (context) {
-            return options.fn(this, options.data);
-          }
-          else {
-            return options.inverse(this, options.data);
-          }
-        },
-        'unless': function (context, options) {
-          if (isFunction(context)) { context = context.call(this); }
-          if (!context) {
-            return options.fn(this, options.data);
-          }
-          else {
-            return options.inverse(this, options.data);
-          }
-        },
-        'each': function (context, options) {
-          var ret = '', i = 0;
-          if (isFunction(context)) { context = context.call(this); }
-          if (isArray(context)) {
-            if (options.hash.reverse) {
-              context = context.reverse();
-            }
-            for (i = 0; i < context.length; i++) {
-              ret += options.fn(context[i], {first: i === 0, last: i === context.length - 1, index: i});
-            }
-            if (options.hash.reverse) {
-              context = context.reverse();
-            }
-          }
-          else {
-            for (var key in context) {
-              i++;
-              ret += options.fn(context[key], {key: key});
-            }
-          }
-          if (i > 0) return ret;
-          else return options.inverse(this);
-        },
-        'with': function (context, options) {
-          if (isFunction(context)) { context = context.call(this); }
-          return options.fn(context);
-        },
-        'join': function (context, options) {
-          if (isFunction(context)) { context = context.call(this); }
-          return context.join(options.hash.delimiter || options.hash.delimeter);
-        },
-        'js': function (expression, options) {
-          var func;
-          if (expression.indexOf('return')>=0) {
-            func = '(function(){'+expression+'})';
-          }
-          else {
-            func = '(function(){return ('+expression+')})';
-          }
-          return eval.call(this, func).call(this);
-        },
-        'js_compare': function (expression, options) {
-          var func;
-          if (expression.indexOf('return')>=0) {
-            func = '(function(){'+expression+'})';
-          }
-          else {
-            func = '(function(){return ('+expression+')})';
-          }
-          var condition = eval.call(this, func).call(this);
-          if (condition) {
-            return options.fn(this, options.data);
-          }
-          else {
-            return options.inverse(this, options.data);   
-          }
-        }
-      }
-    };
-    var t7 = function (template, data) {
-      if (arguments.length === 2) {
-        var instance = new Template7(template);
-        var rendered = instance.compile()(data);
-        instance = null;
-        return (rendered);
-      }
-      else return new Template7(template);
-    };
-    t7.registerHelper = function (name, fn) {
-      Template7.prototype.helpers[name] = fn;
-    };
-    t7.unregisterHelper = function (name) {
-      Template7.prototype.helpers[name] = undefined;  
-      delete Template7.prototype.helpers[name];
-    };
-
-    t7.compile = function (template, options) {
-      var instance = new Template7(template, options);
-      return instance.compile();
-    };
-
-    t7.options = Template7.prototype.options;
-    t7.helpers = Template7.prototype.helpers;
-    return t7;
-  })();
-}($);
-
-/*! Hammer.JS - v2.0.8 - 2016-04-23
- * http://hammerjs.github.io/
- *
- * Copyright (c) 2016 Jorik Tangelder;
- * Licensed under the MIT license */
-(function(window, document, exportName, undefined) {
-  'use strict';
-
-var VENDOR_PREFIXES = ['', 'webkit', 'Moz', 'MS', 'ms', 'o'];
-var TEST_ELEMENT = document.createElement('div');
-
-var TYPE_FUNCTION = 'function';
-
-var round = Math.round;
-var abs = Math.abs;
-var now = Date.now;
-
-/**
- * set a timeout with a given scope
- * @param {Function} fn
- * @param {Number} timeout
- * @param {Object} context
- * @returns {number}
- */
-function setTimeoutContext(fn, timeout, context) {
-    return setTimeout(bindFn(fn, context), timeout);
-}
-
-/**
- * if the argument is an array, we want to execute the fn on each entry
- * if it aint an array we don't want to do a thing.
- * this is used by all the methods that accept a single and array argument.
- * @param {*|Array} arg
- * @param {String} fn
- * @param {Object} [context]
- * @returns {Boolean}
- */
-function invokeArrayArg(arg, fn, context) {
-    if (Array.isArray(arg)) {
-        each(arg, context[fn], context);
-        return true;
-    }
-    return false;
-}
-
-/**
- * walk objects and arrays
- * @param {Object} obj
- * @param {Function} iterator
- * @param {Object} context
- */
-function each(obj, iterator, context) {
-    var i;
-
-    if (!obj) {
-        return;
-    }
-
-    if (obj.forEach) {
-        obj.forEach(iterator, context);
-    } else if (obj.length !== undefined) {
-        i = 0;
-        while (i < obj.length) {
-            iterator.call(context, obj[i], i, obj);
-            i++;
-        }
-    } else {
-        for (i in obj) {
-            obj.hasOwnProperty(i) && iterator.call(context, obj[i], i, obj);
-        }
-    }
-}
-
-/**
- * wrap a method with a deprecation warning and stack trace
- * @param {Function} method
- * @param {String} name
- * @param {String} message
- * @returns {Function} A new function wrapping the supplied method.
- */
-function deprecate(method, name, message) {
-    var deprecationMessage = 'DEPRECATED METHOD: ' + name + '\n' + message + ' AT \n';
-    return function() {
-        var e = new Error('get-stack-trace');
-        var stack = e && e.stack ? e.stack.replace(/^[^\(]+?[\n$]/gm, '')
-            .replace(/^\s+at\s+/gm, '')
-            .replace(/^Object.<anonymous>\s*\(/gm, '{anonymous}()@') : 'Unknown Stack Trace';
-
-        var log = window.console && (window.console.warn || window.console.log);
-        if (log) {
-            log.call(window.console, deprecationMessage, stack);
-        }
-        return method.apply(this, arguments);
-    };
-}
-
-/**
- * extend object.
- * means that properties in dest will be overwritten by the ones in src.
- * @param {Object} target
- * @param {...Object} objects_to_assign
- * @returns {Object} target
- */
-var assign;
-if (typeof Object.assign !== 'function') {
-    assign = function assign(target) {
-        if (target === undefined || target === null) {
-            throw new TypeError('Cannot convert undefined or null to object');
-        }
-
-        var output = Object(target);
-        for (var index = 1; index < arguments.length; index++) {
-            var source = arguments[index];
-            if (source !== undefined && source !== null) {
-                for (var nextKey in source) {
-                    if (source.hasOwnProperty(nextKey)) {
-                        output[nextKey] = source[nextKey];
-                    }
-                }
-            }
-        }
-        return output;
-    };
-} else {
-    assign = Object.assign;
-}
-
-/**
- * extend object.
- * means that properties in dest will be overwritten by the ones in src.
- * @param {Object} dest
- * @param {Object} src
- * @param {Boolean} [merge=false]
- * @returns {Object} dest
- */
-var extend = deprecate(function extend(dest, src, merge) {
-    var keys = Object.keys(src);
-    var i = 0;
-    while (i < keys.length) {
-        if (!merge || (merge && dest[keys[i]] === undefined)) {
-            dest[keys[i]] = src[keys[i]];
-        }
-        i++;
-    }
-    return dest;
-}, 'extend', 'Use `assign`.');
-
-/**
- * merge the values from src in the dest.
- * means that properties that exist in dest will not be overwritten by src
- * @param {Object} dest
- * @param {Object} src
- * @returns {Object} dest
- */
-var merge = deprecate(function merge(dest, src) {
-    return extend(dest, src, true);
-}, 'merge', 'Use `assign`.');
-
-/**
- * simple class inheritance
- * @param {Function} child
- * @param {Function} base
- * @param {Object} [properties]
- */
-function inherit(child, base, properties) {
-    var baseP = base.prototype,
-        childP;
-
-    childP = child.prototype = Object.create(baseP);
-    childP.constructor = child;
-    childP._super = baseP;
-
-    if (properties) {
-        assign(childP, properties);
-    }
-}
-
-/**
- * simple function bind
- * @param {Function} fn
- * @param {Object} context
- * @returns {Function}
- */
-function bindFn(fn, context) {
-    return function boundFn() {
-        return fn.apply(context, arguments);
-    };
-}
-
-/**
- * let a boolean value also be a function that must return a boolean
- * this first item in args will be used as the context
- * @param {Boolean|Function} val
- * @param {Array} [args]
- * @returns {Boolean}
- */
-function boolOrFn(val, args) {
-    if (typeof val == TYPE_FUNCTION) {
-        return val.apply(args ? args[0] || undefined : undefined, args);
-    }
-    return val;
-}
-
-/**
- * use the val2 when val1 is undefined
- * @param {*} val1
- * @param {*} val2
- * @returns {*}
- */
-function ifUndefined(val1, val2) {
-    return (val1 === undefined) ? val2 : val1;
-}
-
-/**
- * addEventListener with multiple events at once
- * @param {EventTarget} target
- * @param {String} types
- * @param {Function} handler
- */
-function addEventListeners(target, types, handler) {
-    each(splitStr(types), function(type) {
-        target.addEventListener(type, handler, false);
-    });
-}
-
-/**
- * removeEventListener with multiple events at once
- * @param {EventTarget} target
- * @param {String} types
- * @param {Function} handler
- */
-function removeEventListeners(target, types, handler) {
-    each(splitStr(types), function(type) {
-        target.removeEventListener(type, handler, false);
-    });
-}
-
-/**
- * find if a node is in the given parent
- * @method hasParent
- * @param {HTMLElement} node
- * @param {HTMLElement} parent
- * @return {Boolean} found
- */
-function hasParent(node, parent) {
-    while (node) {
-        if (node == parent) {
-            return true;
-        }
-        node = node.parentNode;
-    }
-    return false;
-}
-
-/**
- * small indexOf wrapper
- * @param {String} str
- * @param {String} find
- * @returns {Boolean} found
- */
-function inStr(str, find) {
-    return str.indexOf(find) > -1;
-}
-
-/**
- * split string on whitespace
- * @param {String} str
- * @returns {Array} words
- */
-function splitStr(str) {
-    return str.trim().split(/\s+/g);
-}
-
-/**
- * find if a array contains the object using indexOf or a simple polyFill
- * @param {Array} src
- * @param {String} find
- * @param {String} [findByKey]
- * @return {Boolean|Number} false when not found, or the index
- */
-function inArray(src, find, findByKey) {
-    if (src.indexOf && !findByKey) {
-        return src.indexOf(find);
-    } else {
-        var i = 0;
-        while (i < src.length) {
-            if ((findByKey && src[i][findByKey] == find) || (!findByKey && src[i] === find)) {
-                return i;
-            }
-            i++;
-        }
-        return -1;
-    }
-}
-
-/**
- * convert array-like objects to real arrays
- * @param {Object} obj
- * @returns {Array}
- */
-function toArray(obj) {
-    return Array.prototype.slice.call(obj, 0);
-}
-
-/**
- * unique array with objects based on a key (like 'id') or just by the array's value
- * @param {Array} src [{id:1},{id:2},{id:1}]
- * @param {String} [key]
- * @param {Boolean} [sort=False]
- * @returns {Array} [{id:1},{id:2}]
- */
-function uniqueArray(src, key, sort) {
-    var results = [];
-    var values = [];
-    var i = 0;
-
-    while (i < src.length) {
-        var val = key ? src[i][key] : src[i];
-        if (inArray(values, val) < 0) {
-            results.push(src[i]);
-        }
-        values[i] = val;
-        i++;
-    }
-
-    if (sort) {
-        if (!key) {
-            results = results.sort();
-        } else {
-            results = results.sort(function sortUniqueArray(a, b) {
-                return a[key] > b[key];
-            });
-        }
-    }
-
-    return results;
-}
-
-/**
- * get the prefixed property
- * @param {Object} obj
- * @param {String} property
- * @returns {String|Undefined} prefixed
- */
-function prefixed(obj, property) {
-    var prefix, prop;
-    var camelProp = property[0].toUpperCase() + property.slice(1);
-
-    var i = 0;
-    while (i < VENDOR_PREFIXES.length) {
-        prefix = VENDOR_PREFIXES[i];
-        prop = (prefix) ? prefix + camelProp : property;
-
-        if (prop in obj) {
-            return prop;
-        }
-        i++;
-    }
-    return undefined;
-}
-
-/**
- * get a unique id
- * @returns {number} uniqueId
- */
-var _uniqueId = 1;
-function uniqueId() {
-    return _uniqueId++;
-}
-
-/**
- * get the window object of an element
- * @param {HTMLElement} element
- * @returns {DocumentView|Window}
- */
-function getWindowForElement(element) {
-    var doc = element.ownerDocument || element;
-    return (doc.defaultView || doc.parentWindow || window);
-}
-
-var MOBILE_REGEX = /mobile|tablet|ip(ad|hone|od)|android/i;
-
-var SUPPORT_TOUCH = ('ontouchstart' in window);
-var SUPPORT_POINTER_EVENTS = prefixed(window, 'PointerEvent') !== undefined;
-var SUPPORT_ONLY_TOUCH = SUPPORT_TOUCH && MOBILE_REGEX.test(navigator.userAgent);
-
-var INPUT_TYPE_TOUCH = 'touch';
-var INPUT_TYPE_PEN = 'pen';
-var INPUT_TYPE_MOUSE = 'mouse';
-var INPUT_TYPE_KINECT = 'kinect';
-
-var COMPUTE_INTERVAL = 25;
-
-var INPUT_START = 1;
-var INPUT_MOVE = 2;
-var INPUT_END = 4;
-var INPUT_CANCEL = 8;
-
-var DIRECTION_NONE = 1;
-var DIRECTION_LEFT = 2;
-var DIRECTION_RIGHT = 4;
-var DIRECTION_UP = 8;
-var DIRECTION_DOWN = 16;
-
-var DIRECTION_HORIZONTAL = DIRECTION_LEFT | DIRECTION_RIGHT;
-var DIRECTION_VERTICAL = DIRECTION_UP | DIRECTION_DOWN;
-var DIRECTION_ALL = DIRECTION_HORIZONTAL | DIRECTION_VERTICAL;
-
-var PROPS_XY = ['x', 'y'];
-var PROPS_CLIENT_XY = ['clientX', 'clientY'];
-
-/**
- * create new input type manager
- * @param {Manager} manager
- * @param {Function} callback
- * @returns {Input}
- * @constructor
- */
-function Input(manager, callback) {
-    var self = this;
-    this.manager = manager;
-    this.callback = callback;
-    this.element = manager.element;
-    this.target = manager.options.inputTarget;
-
-    // smaller wrapper around the handler, for the scope and the enabled state of the manager,
-    // so when disabled the input events are completely bypassed.
-    this.domHandler = function(ev) {
-        if (boolOrFn(manager.options.enable, [manager])) {
-            self.handler(ev);
-        }
-    };
-
-    this.init();
-
-}
-
-Input.prototype = {
-    /**
-     * should handle the inputEvent data and trigger the callback
-     * @virtual
-     */
-    handler: function() { },
-
-    /**
-     * bind the events
-     */
-    init: function() {
-        this.evEl && addEventListeners(this.element, this.evEl, this.domHandler);
-        this.evTarget && addEventListeners(this.target, this.evTarget, this.domHandler);
-        this.evWin && addEventListeners(getWindowForElement(this.element), this.evWin, this.domHandler);
-    },
-
-    /**
-     * unbind the events
-     */
-    destroy: function() {
-        this.evEl && removeEventListeners(this.element, this.evEl, this.domHandler);
-        this.evTarget && removeEventListeners(this.target, this.evTarget, this.domHandler);
-        this.evWin && removeEventListeners(getWindowForElement(this.element), this.evWin, this.domHandler);
-    }
-};
-
-/**
- * create new input type manager
- * called by the Manager constructor
- * @param {Hammer} manager
- * @returns {Input}
- */
-function createInputInstance(manager) {
-    var Type;
-    var inputClass = manager.options.inputClass;
-
-    if (inputClass) {
-        Type = inputClass;
-    } else if (SUPPORT_POINTER_EVENTS) {
-        Type = PointerEventInput;
-    } else if (SUPPORT_ONLY_TOUCH) {
-        Type = TouchInput;
-    } else if (!SUPPORT_TOUCH) {
-        Type = MouseInput;
-    } else {
-        Type = TouchMouseInput;
-    }
-    return new (Type)(manager, inputHandler);
-}
-
-/**
- * handle input events
- * @param {Manager} manager
- * @param {String} eventType
- * @param {Object} input
- */
-function inputHandler(manager, eventType, input) {
-    var pointersLen = input.pointers.length;
-    var changedPointersLen = input.changedPointers.length;
-    var isFirst = (eventType & INPUT_START && (pointersLen - changedPointersLen === 0));
-    var isFinal = (eventType & (INPUT_END | INPUT_CANCEL) && (pointersLen - changedPointersLen === 0));
-
-    input.isFirst = !!isFirst;
-    input.isFinal = !!isFinal;
-
-    if (isFirst) {
-        manager.session = {};
-    }
-
-    // source event is the normalized value of the domEvents
-    // like 'touchstart, mouseup, pointerdown'
-    input.eventType = eventType;
-
-    // compute scale, rotation etc
-    computeInputData(manager, input);
-
-    // emit secret event
-    manager.emit('hammer.input', input);
-
-    manager.recognize(input);
-    manager.session.prevInput = input;
-}
-
-/**
- * extend the data with some usable properties like scale, rotate, velocity etc
- * @param {Object} manager
- * @param {Object} input
- */
-function computeInputData(manager, input) {
-    var session = manager.session;
-    var pointers = input.pointers;
-    var pointersLength = pointers.length;
-
-    // store the first input to calculate the distance and direction
-    if (!session.firstInput) {
-        session.firstInput = simpleCloneInputData(input);
-    }
-
-    // to compute scale and rotation we need to store the multiple touches
-    if (pointersLength > 1 && !session.firstMultiple) {
-        session.firstMultiple = simpleCloneInputData(input);
-    } else if (pointersLength === 1) {
-        session.firstMultiple = false;
-    }
-
-    var firstInput = session.firstInput;
-    var firstMultiple = session.firstMultiple;
-    var offsetCenter = firstMultiple ? firstMultiple.center : firstInput.center;
-
-    var center = input.center = getCenter(pointers);
-    input.timeStamp = now();
-    input.deltaTime = input.timeStamp - firstInput.timeStamp;
-
-    input.angle = getAngle(offsetCenter, center);
-    input.distance = getDistance(offsetCenter, center);
-
-    computeDeltaXY(session, input);
-    input.offsetDirection = getDirection(input.deltaX, input.deltaY);
-
-    var overallVelocity = getVelocity(input.deltaTime, input.deltaX, input.deltaY);
-    input.overallVelocityX = overallVelocity.x;
-    input.overallVelocityY = overallVelocity.y;
-    input.overallVelocity = (abs(overallVelocity.x) > abs(overallVelocity.y)) ? overallVelocity.x : overallVelocity.y;
-
-    input.scale = firstMultiple ? getScale(firstMultiple.pointers, pointers) : 1;
-    input.rotation = firstMultiple ? getRotation(firstMultiple.pointers, pointers) : 0;
-
-    input.maxPointers = !session.prevInput ? input.pointers.length : ((input.pointers.length >
-        session.prevInput.maxPointers) ? input.pointers.length : session.prevInput.maxPointers);
-
-    computeIntervalInputData(session, input);
-
-    // find the correct target
-    var target = manager.element;
-    if (hasParent(input.srcEvent.target, target)) {
-        target = input.srcEvent.target;
-    }
-    input.target = target;
-}
-
-function computeDeltaXY(session, input) {
-    var center = input.center;
-    var offset = session.offsetDelta || {};
-    var prevDelta = session.prevDelta || {};
-    var prevInput = session.prevInput || {};
-
-    if (input.eventType === INPUT_START || prevInput.eventType === INPUT_END) {
-        prevDelta = session.prevDelta = {
-            x: prevInput.deltaX || 0,
-            y: prevInput.deltaY || 0
-        };
-
-        offset = session.offsetDelta = {
-            x: center.x,
-            y: center.y
-        };
-    }
-
-    input.deltaX = prevDelta.x + (center.x - offset.x);
-    input.deltaY = prevDelta.y + (center.y - offset.y);
-}
-
-/**
- * velocity is calculated every x ms
- * @param {Object} session
- * @param {Object} input
- */
-function computeIntervalInputData(session, input) {
-    var last = session.lastInterval || input,
-        deltaTime = input.timeStamp - last.timeStamp,
-        velocity, velocityX, velocityY, direction;
-
-    if (input.eventType != INPUT_CANCEL && (deltaTime > COMPUTE_INTERVAL || last.velocity === undefined)) {
-        var deltaX = input.deltaX - last.deltaX;
-        var deltaY = input.deltaY - last.deltaY;
-
-        var v = getVelocity(deltaTime, deltaX, deltaY);
-        velocityX = v.x;
-        velocityY = v.y;
-        velocity = (abs(v.x) > abs(v.y)) ? v.x : v.y;
-        direction = getDirection(deltaX, deltaY);
-
-        session.lastInterval = input;
-    } else {
-        // use latest velocity info if it doesn't overtake a minimum period
-        velocity = last.velocity;
-        velocityX = last.velocityX;
-        velocityY = last.velocityY;
-        direction = last.direction;
-    }
-
-    input.velocity = velocity;
-    input.velocityX = velocityX;
-    input.velocityY = velocityY;
-    input.direction = direction;
-}
-
-/**
- * create a simple clone from the input used for storage of firstInput and firstMultiple
- * @param {Object} input
- * @returns {Object} clonedInputData
- */
-function simpleCloneInputData(input) {
-    // make a simple copy of the pointers because we will get a reference if we don't
-    // we only need clientXY for the calculations
-    var pointers = [];
-    var i = 0;
-    while (i < input.pointers.length) {
-        pointers[i] = {
-            clientX: round(input.pointers[i].clientX),
-            clientY: round(input.pointers[i].clientY)
-        };
-        i++;
-    }
-
-    return {
-        timeStamp: now(),
-        pointers: pointers,
-        center: getCenter(pointers),
-        deltaX: input.deltaX,
-        deltaY: input.deltaY
-    };
-}
-
-/**
- * get the center of all the pointers
- * @param {Array} pointers
- * @return {Object} center contains `x` and `y` properties
- */
-function getCenter(pointers) {
-    var pointersLength = pointers.length;
-
-    // no need to loop when only one touch
-    if (pointersLength === 1) {
-        return {
-            x: round(pointers[0].clientX),
-            y: round(pointers[0].clientY)
-        };
-    }
-
-    var x = 0, y = 0, i = 0;
-    while (i < pointersLength) {
-        x += pointers[i].clientX;
-        y += pointers[i].clientY;
-        i++;
-    }
-
-    return {
-        x: round(x / pointersLength),
-        y: round(y / pointersLength)
-    };
-}
-
-/**
- * calculate the velocity between two points. unit is in px per ms.
- * @param {Number} deltaTime
- * @param {Number} x
- * @param {Number} y
- * @return {Object} velocity `x` and `y`
- */
-function getVelocity(deltaTime, x, y) {
-    return {
-        x: x / deltaTime || 0,
-        y: y / deltaTime || 0
-    };
-}
-
-/**
- * get the direction between two points
- * @param {Number} x
- * @param {Number} y
- * @return {Number} direction
- */
-function getDirection(x, y) {
-    if (x === y) {
-        return DIRECTION_NONE;
-    }
-
-    if (abs(x) >= abs(y)) {
-        return x < 0 ? DIRECTION_LEFT : DIRECTION_RIGHT;
-    }
-    return y < 0 ? DIRECTION_UP : DIRECTION_DOWN;
-}
-
-/**
- * calculate the absolute distance between two points
- * @param {Object} p1 {x, y}
- * @param {Object} p2 {x, y}
- * @param {Array} [props] containing x and y keys
- * @return {Number} distance
- */
-function getDistance(p1, p2, props) {
-    if (!props) {
-        props = PROPS_XY;
-    }
-    var x = p2[props[0]] - p1[props[0]],
-        y = p2[props[1]] - p1[props[1]];
-
-    return Math.sqrt((x * x) + (y * y));
-}
-
-/**
- * calculate the angle between two coordinates
- * @param {Object} p1
- * @param {Object} p2
- * @param {Array} [props] containing x and y keys
- * @return {Number} angle
- */
-function getAngle(p1, p2, props) {
-    if (!props) {
-        props = PROPS_XY;
-    }
-    var x = p2[props[0]] - p1[props[0]],
-        y = p2[props[1]] - p1[props[1]];
-    return Math.atan2(y, x) * 180 / Math.PI;
-}
-
-/**
- * calculate the rotation degrees between two pointersets
- * @param {Array} start array of pointers
- * @param {Array} end array of pointers
- * @return {Number} rotation
- */
-function getRotation(start, end) {
-    return getAngle(end[1], end[0], PROPS_CLIENT_XY) + getAngle(start[1], start[0], PROPS_CLIENT_XY);
-}
-
-/**
- * calculate the scale factor between two pointersets
- * no scale is 1, and goes down to 0 when pinched together, and bigger when pinched out
- * @param {Array} start array of pointers
- * @param {Array} end array of pointers
- * @return {Number} scale
- */
-function getScale(start, end) {
-    return getDistance(end[0], end[1], PROPS_CLIENT_XY) / getDistance(start[0], start[1], PROPS_CLIENT_XY);
-}
-
-var MOUSE_INPUT_MAP = {
-    mousedown: INPUT_START,
-    mousemove: INPUT_MOVE,
-    mouseup: INPUT_END
-};
-
-var MOUSE_ELEMENT_EVENTS = 'mousedown';
-var MOUSE_WINDOW_EVENTS = 'mousemove mouseup';
-
-/**
- * Mouse events input
- * @constructor
- * @extends Input
- */
-function MouseInput() {
-    this.evEl = MOUSE_ELEMENT_EVENTS;
-    this.evWin = MOUSE_WINDOW_EVENTS;
-
-    this.pressed = false; // mousedown state
-
-    Input.apply(this, arguments);
-}
-
-inherit(MouseInput, Input, {
-    /**
-     * handle mouse events
-     * @param {Object} ev
-     */
-    handler: function MEhandler(ev) {
-        var eventType = MOUSE_INPUT_MAP[ev.type];
-
-        // on start we want to have the left mouse button down
-        if (eventType & INPUT_START && ev.button === 0) {
-            this.pressed = true;
-        }
-
-        if (eventType & INPUT_MOVE && ev.which !== 1) {
-            eventType = INPUT_END;
-        }
-
-        // mouse must be down
-        if (!this.pressed) {
-            return;
-        }
-
-        if (eventType & INPUT_END) {
-            this.pressed = false;
-        }
-
-        this.callback(this.manager, eventType, {
-            pointers: [ev],
-            changedPointers: [ev],
-            pointerType: INPUT_TYPE_MOUSE,
-            srcEvent: ev
-        });
-    }
-});
-
-var POINTER_INPUT_MAP = {
-    pointerdown: INPUT_START,
-    pointermove: INPUT_MOVE,
-    pointerup: INPUT_END,
-    pointercancel: INPUT_CANCEL,
-    pointerout: INPUT_CANCEL
-};
-
-// in IE10 the pointer types is defined as an enum
-var IE10_POINTER_TYPE_ENUM = {
-    2: INPUT_TYPE_TOUCH,
-    3: INPUT_TYPE_PEN,
-    4: INPUT_TYPE_MOUSE,
-    5: INPUT_TYPE_KINECT // see https://twitter.com/jacobrossi/status/480596438489890816
-};
-
-var POINTER_ELEMENT_EVENTS = 'pointerdown';
-var POINTER_WINDOW_EVENTS = 'pointermove pointerup pointercancel';
-
-// IE10 has prefixed support, and case-sensitive
-if (window.MSPointerEvent && !window.PointerEvent) {
-    POINTER_ELEMENT_EVENTS = 'MSPointerDown';
-    POINTER_WINDOW_EVENTS = 'MSPointerMove MSPointerUp MSPointerCancel';
-}
-
-/**
- * Pointer events input
- * @constructor
- * @extends Input
- */
-function PointerEventInput() {
-    this.evEl = POINTER_ELEMENT_EVENTS;
-    this.evWin = POINTER_WINDOW_EVENTS;
-
-    Input.apply(this, arguments);
-
-    this.store = (this.manager.session.pointerEvents = []);
-}
-
-inherit(PointerEventInput, Input, {
-    /**
-     * handle mouse events
-     * @param {Object} ev
-     */
-    handler: function PEhandler(ev) {
-        var store = this.store;
-        var removePointer = false;
-
-        var eventTypeNormalized = ev.type.toLowerCase().replace('ms', '');
-        var eventType = POINTER_INPUT_MAP[eventTypeNormalized];
-        var pointerType = IE10_POINTER_TYPE_ENUM[ev.pointerType] || ev.pointerType;
-
-        var isTouch = (pointerType == INPUT_TYPE_TOUCH);
-
-        // get index of the event in the store
-        var storeIndex = inArray(store, ev.pointerId, 'pointerId');
-
-        // start and mouse must be down
-        if (eventType & INPUT_START && (ev.button === 0 || isTouch)) {
-            if (storeIndex < 0) {
-                store.push(ev);
-                storeIndex = store.length - 1;
-            }
-        } else if (eventType & (INPUT_END | INPUT_CANCEL)) {
-            removePointer = true;
-        }
-
-        // it not found, so the pointer hasn't been down (so it's probably a hover)
-        if (storeIndex < 0) {
-            return;
-        }
-
-        // update the event in the store
-        store[storeIndex] = ev;
-
-        this.callback(this.manager, eventType, {
-            pointers: store,
-            changedPointers: [ev],
-            pointerType: pointerType,
-            srcEvent: ev
-        });
-
-        if (removePointer) {
-            // remove from the store
-            store.splice(storeIndex, 1);
-        }
-    }
-});
-
-var SINGLE_TOUCH_INPUT_MAP = {
-    touchstart: INPUT_START,
-    touchmove: INPUT_MOVE,
-    touchend: INPUT_END,
-    touchcancel: INPUT_CANCEL
-};
-
-var SINGLE_TOUCH_TARGET_EVENTS = 'touchstart';
-var SINGLE_TOUCH_WINDOW_EVENTS = 'touchstart touchmove touchend touchcancel';
-
-/**
- * Touch events input
- * @constructor
- * @extends Input
- */
-function SingleTouchInput() {
-    this.evTarget = SINGLE_TOUCH_TARGET_EVENTS;
-    this.evWin = SINGLE_TOUCH_WINDOW_EVENTS;
-    this.started = false;
-
-    Input.apply(this, arguments);
-}
-
-inherit(SingleTouchInput, Input, {
-    handler: function TEhandler(ev) {
-        var type = SINGLE_TOUCH_INPUT_MAP[ev.type];
-
-        // should we handle the touch events?
-        if (type === INPUT_START) {
-            this.started = true;
-        }
-
-        if (!this.started) {
-            return;
-        }
-
-        var touches = normalizeSingleTouches.call(this, ev, type);
-
-        // when done, reset the started state
-        if (type & (INPUT_END | INPUT_CANCEL) && touches[0].length - touches[1].length === 0) {
-            this.started = false;
-        }
-
-        this.callback(this.manager, type, {
-            pointers: touches[0],
-            changedPointers: touches[1],
-            pointerType: INPUT_TYPE_TOUCH,
-            srcEvent: ev
-        });
-    }
-});
-
-/**
- * @this {TouchInput}
- * @param {Object} ev
- * @param {Number} type flag
- * @returns {undefined|Array} [all, changed]
- */
-function normalizeSingleTouches(ev, type) {
-    var all = toArray(ev.touches);
-    var changed = toArray(ev.changedTouches);
-
-    if (type & (INPUT_END | INPUT_CANCEL)) {
-        all = uniqueArray(all.concat(changed), 'identifier', true);
-    }
-
-    return [all, changed];
-}
-
-var TOUCH_INPUT_MAP = {
-    touchstart: INPUT_START,
-    touchmove: INPUT_MOVE,
-    touchend: INPUT_END,
-    touchcancel: INPUT_CANCEL
-};
-
-var TOUCH_TARGET_EVENTS = 'touchstart touchmove touchend touchcancel';
-
-/**
- * Multi-user touch events input
- * @constructor
- * @extends Input
- */
-function TouchInput() {
-    this.evTarget = TOUCH_TARGET_EVENTS;
-    this.targetIds = {};
-
-    Input.apply(this, arguments);
-}
-
-inherit(TouchInput, Input, {
-    handler: function MTEhandler(ev) {
-        var type = TOUCH_INPUT_MAP[ev.type];
-        var touches = getTouches.call(this, ev, type);
-        if (!touches) {
-            return;
-        }
-
-        this.callback(this.manager, type, {
-            pointers: touches[0],
-            changedPointers: touches[1],
-            pointerType: INPUT_TYPE_TOUCH,
-            srcEvent: ev
-        });
-    }
-});
-
-/**
- * @this {TouchInput}
- * @param {Object} ev
- * @param {Number} type flag
- * @returns {undefined|Array} [all, changed]
- */
-function getTouches(ev, type) {
-    var allTouches = toArray(ev.touches);
-    var targetIds = this.targetIds;
-
-    // when there is only one touch, the process can be simplified
-    if (type & (INPUT_START | INPUT_MOVE) && allTouches.length === 1) {
-        targetIds[allTouches[0].identifier] = true;
-        return [allTouches, allTouches];
-    }
-
-    var i,
-        targetTouches,
-        changedTouches = toArray(ev.changedTouches),
-        changedTargetTouches = [],
-        target = this.target;
-
-    // get target touches from touches
-    targetTouches = allTouches.filter(function(touch) {
-        return hasParent(touch.target, target);
-    });
-
-    // collect touches
-    if (type === INPUT_START) {
-        i = 0;
-        while (i < targetTouches.length) {
-            targetIds[targetTouches[i].identifier] = true;
-            i++;
-        }
-    }
-
-    // filter changed touches to only contain touches that exist in the collected target ids
-    i = 0;
-    while (i < changedTouches.length) {
-        if (targetIds[changedTouches[i].identifier]) {
-            changedTargetTouches.push(changedTouches[i]);
-        }
-
-        // cleanup removed touches
-        if (type & (INPUT_END | INPUT_CANCEL)) {
-            delete targetIds[changedTouches[i].identifier];
-        }
-        i++;
-    }
-
-    if (!changedTargetTouches.length) {
-        return;
-    }
-
-    return [
-        // merge targetTouches with changedTargetTouches so it contains ALL touches, including 'end' and 'cancel'
-        uniqueArray(targetTouches.concat(changedTargetTouches), 'identifier', true),
-        changedTargetTouches
-    ];
-}
-
-/**
- * Combined touch and mouse input
- *
- * Touch has a higher priority then mouse, and while touching no mouse events are allowed.
- * This because touch devices also emit mouse events while doing a touch.
- *
- * @constructor
- * @extends Input
- */
-
-var DEDUP_TIMEOUT = 2500;
-var DEDUP_DISTANCE = 25;
-
-function TouchMouseInput() {
-    Input.apply(this, arguments);
-
-    var handler = bindFn(this.handler, this);
-    this.touch = new TouchInput(this.manager, handler);
-    this.mouse = new MouseInput(this.manager, handler);
-
-    this.primaryTouch = null;
-    this.lastTouches = [];
-}
-
-inherit(TouchMouseInput, Input, {
-    /**
-     * handle mouse and touch events
-     * @param {Hammer} manager
-     * @param {String} inputEvent
-     * @param {Object} inputData
-     */
-    handler: function TMEhandler(manager, inputEvent, inputData) {
-        var isTouch = (inputData.pointerType == INPUT_TYPE_TOUCH),
-            isMouse = (inputData.pointerType == INPUT_TYPE_MOUSE);
-
-        if (isMouse && inputData.sourceCapabilities && inputData.sourceCapabilities.firesTouchEvents) {
-            return;
-        }
-
-        // when we're in a touch event, record touches to  de-dupe synthetic mouse event
-        if (isTouch) {
-            recordTouches.call(this, inputEvent, inputData);
-        } else if (isMouse && isSyntheticEvent.call(this, inputData)) {
-            return;
-        }
-
-        this.callback(manager, inputEvent, inputData);
-    },
-
-    /**
-     * remove the event listeners
-     */
-    destroy: function destroy() {
-        this.touch.destroy();
-        this.mouse.destroy();
-    }
-});
-
-function recordTouches(eventType, eventData) {
-    if (eventType & INPUT_START) {
-        this.primaryTouch = eventData.changedPointers[0].identifier;
-        setLastTouch.call(this, eventData);
-    } else if (eventType & (INPUT_END | INPUT_CANCEL)) {
-        setLastTouch.call(this, eventData);
-    }
-}
-
-function setLastTouch(eventData) {
-    var touch = eventData.changedPointers[0];
-
-    if (touch.identifier === this.primaryTouch) {
-        var lastTouch = {x: touch.clientX, y: touch.clientY};
-        this.lastTouches.push(lastTouch);
-        var lts = this.lastTouches;
-        var removeLastTouch = function() {
-            var i = lts.indexOf(lastTouch);
-            if (i > -1) {
-                lts.splice(i, 1);
-            }
-        };
-        setTimeout(removeLastTouch, DEDUP_TIMEOUT);
-    }
-}
-
-function isSyntheticEvent(eventData) {
-    var x = eventData.srcEvent.clientX, y = eventData.srcEvent.clientY;
-    for (var i = 0; i < this.lastTouches.length; i++) {
-        var t = this.lastTouches[i];
-        var dx = Math.abs(x - t.x), dy = Math.abs(y - t.y);
-        if (dx <= DEDUP_DISTANCE && dy <= DEDUP_DISTANCE) {
-            return true;
-        }
-    }
-    return false;
-}
-
-var PREFIXED_TOUCH_ACTION = prefixed(TEST_ELEMENT.style, 'touchAction');
-var NATIVE_TOUCH_ACTION = PREFIXED_TOUCH_ACTION !== undefined;
-
-// magical touchAction value
-var TOUCH_ACTION_COMPUTE = 'compute';
-var TOUCH_ACTION_AUTO = 'auto';
-var TOUCH_ACTION_MANIPULATION = 'manipulation'; // not implemented
-var TOUCH_ACTION_NONE = 'none';
-var TOUCH_ACTION_PAN_X = 'pan-x';
-var TOUCH_ACTION_PAN_Y = 'pan-y';
-var TOUCH_ACTION_MAP = getTouchActionProps();
-
-/**
- * Touch Action
- * sets the touchAction property or uses the js alternative
- * @param {Manager} manager
- * @param {String} value
- * @constructor
- */
-function TouchAction(manager, value) {
-    this.manager = manager;
-    this.set(value);
-}
-
-TouchAction.prototype = {
-    /**
-     * set the touchAction value on the element or enable the polyfill
-     * @param {String} value
-     */
-    set: function(value) {
-        // find out the touch-action by the event handlers
-        if (value == TOUCH_ACTION_COMPUTE) {
-            value = this.compute();
-        }
-
-        if (NATIVE_TOUCH_ACTION && this.manager.element.style && TOUCH_ACTION_MAP[value]) {
-            this.manager.element.style[PREFIXED_TOUCH_ACTION] = value;
-        }
-        this.actions = value.toLowerCase().trim();
-    },
-
-    /**
-     * just re-set the touchAction value
-     */
-    update: function() {
-        this.set(this.manager.options.touchAction);
-    },
-
-    /**
-     * compute the value for the touchAction property based on the recognizer's settings
-     * @returns {String} value
-     */
-    compute: function() {
-        var actions = [];
-        each(this.manager.recognizers, function(recognizer) {
-            if (boolOrFn(recognizer.options.enable, [recognizer])) {
-                actions = actions.concat(recognizer.getTouchAction());
-            }
-        });
-        return cleanTouchActions(actions.join(' '));
-    },
-
-    /**
-     * this method is called on each input cycle and provides the preventing of the browser behavior
-     * @param {Object} input
-     */
-    preventDefaults: function(input) {
-        var srcEvent = input.srcEvent;
-        var direction = input.offsetDirection;
-
-        // if the touch action did prevented once this session
-        if (this.manager.session.prevented) {
-            srcEvent.preventDefault();
-            return;
-        }
-
-        var actions = this.actions;
-        var hasNone = inStr(actions, TOUCH_ACTION_NONE) && !TOUCH_ACTION_MAP[TOUCH_ACTION_NONE];
-        var hasPanY = inStr(actions, TOUCH_ACTION_PAN_Y) && !TOUCH_ACTION_MAP[TOUCH_ACTION_PAN_Y];
-        var hasPanX = inStr(actions, TOUCH_ACTION_PAN_X) && !TOUCH_ACTION_MAP[TOUCH_ACTION_PAN_X];
-
-        if (hasNone) {
-            //do not prevent defaults if this is a tap gesture
-
-            var isTapPointer = input.pointers.length === 1;
-            var isTapMovement = input.distance < 2;
-            var isTapTouchTime = input.deltaTime < 250;
-
-            if (isTapPointer && isTapMovement && isTapTouchTime) {
-                return;
-            }
-        }
-
-        if (hasPanX && hasPanY) {
-            // `pan-x pan-y` means browser handles all scrolling/panning, do not prevent
-            return;
-        }
-
-        if (hasNone ||
-            (hasPanY && direction & DIRECTION_HORIZONTAL) ||
-            (hasPanX && direction & DIRECTION_VERTICAL)) {
-            return this.preventSrc(srcEvent);
-        }
-    },
-
-    /**
-     * call preventDefault to prevent the browser's default behavior (scrolling in most cases)
-     * @param {Object} srcEvent
-     */
-    preventSrc: function(srcEvent) {
-        this.manager.session.prevented = true;
-        srcEvent.preventDefault();
-    }
-};
-
-/**
- * when the touchActions are collected they are not a valid value, so we need to clean things up. *
- * @param {String} actions
- * @returns {*}
- */
-function cleanTouchActions(actions) {
-    // none
-    if (inStr(actions, TOUCH_ACTION_NONE)) {
-        return TOUCH_ACTION_NONE;
-    }
-
-    var hasPanX = inStr(actions, TOUCH_ACTION_PAN_X);
-    var hasPanY = inStr(actions, TOUCH_ACTION_PAN_Y);
-
-    // if both pan-x and pan-y are set (different recognizers
-    // for different directions, e.g. horizontal pan but vertical swipe?)
-    // we need none (as otherwise with pan-x pan-y combined none of these
-    // recognizers will work, since the browser would handle all panning
-    if (hasPanX && hasPanY) {
-        return TOUCH_ACTION_NONE;
-    }
-
-    // pan-x OR pan-y
-    if (hasPanX || hasPanY) {
-        return hasPanX ? TOUCH_ACTION_PAN_X : TOUCH_ACTION_PAN_Y;
-    }
-
-    // manipulation
-    if (inStr(actions, TOUCH_ACTION_MANIPULATION)) {
-        return TOUCH_ACTION_MANIPULATION;
-    }
-
-    return TOUCH_ACTION_AUTO;
-}
-
-function getTouchActionProps() {
-    if (!NATIVE_TOUCH_ACTION) {
-        return false;
-    }
-    var touchMap = {};
-    var cssSupports = window.CSS && window.CSS.supports;
-    ['auto', 'manipulation', 'pan-y', 'pan-x', 'pan-x pan-y', 'none'].forEach(function(val) {
-
-        // If css.supports is not supported but there is native touch-action assume it supports
-        // all values. This is the case for IE 10 and 11.
-        touchMap[val] = cssSupports ? window.CSS.supports('touch-action', val) : true;
-    });
-    return touchMap;
-}
-
-/**
- * Recognizer flow explained; *
- * All recognizers have the initial state of POSSIBLE when a input session starts.
- * The definition of a input session is from the first input until the last input, with all it's movement in it. *
- * Example session for mouse-input: mousedown -> mousemove -> mouseup
- *
- * On each recognizing cycle (see Manager.recognize) the .recognize() method is executed
- * which determines with state it should be.
- *
- * If the recognizer has the state FAILED, CANCELLED or RECOGNIZED (equals ENDED), it is reset to
- * POSSIBLE to give it another change on the next cycle.
- *
- *               Possible
- *                  |
- *            +-----+---------------+
- *            |                     |
- *      +-----+-----+               |
- *      |           |               |
- *   Failed      Cancelled          |
- *                          +-------+------+
- *                          |              |
- *                      Recognized       Began
- *                                         |
- *                                      Changed
- *                                         |
- *                                  Ended/Recognized
- */
-var STATE_POSSIBLE = 1;
-var STATE_BEGAN = 2;
-var STATE_CHANGED = 4;
-var STATE_ENDED = 8;
-var STATE_RECOGNIZED = STATE_ENDED;
-var STATE_CANCELLED = 16;
-var STATE_FAILED = 32;
-
-/**
- * Recognizer
- * Every recognizer needs to extend from this class.
- * @constructor
- * @param {Object} options
- */
-function Recognizer(options) {
-    this.options = assign({}, this.defaults, options || {});
-
-    this.id = uniqueId();
-
-    this.manager = null;
-
-    // default is enable true
-    this.options.enable = ifUndefined(this.options.enable, true);
-
-    this.state = STATE_POSSIBLE;
-
-    this.simultaneous = {};
-    this.requireFail = [];
-}
-
-Recognizer.prototype = {
-    /**
-     * @virtual
-     * @type {Object}
-     */
-    defaults: {},
-
-    /**
-     * set options
-     * @param {Object} options
-     * @return {Recognizer}
-     */
-    set: function(options) {
-        assign(this.options, options);
-
-        // also update the touchAction, in case something changed about the directions/enabled state
-        this.manager && this.manager.touchAction.update();
-        return this;
-    },
-
-    /**
-     * recognize simultaneous with an other recognizer.
-     * @param {Recognizer} otherRecognizer
-     * @returns {Recognizer} this
-     */
-    recognizeWith: function(otherRecognizer) {
-        if (invokeArrayArg(otherRecognizer, 'recognizeWith', this)) {
-            return this;
-        }
-
-        var simultaneous = this.simultaneous;
-        otherRecognizer = getRecognizerByNameIfManager(otherRecognizer, this);
-        if (!simultaneous[otherRecognizer.id]) {
-            simultaneous[otherRecognizer.id] = otherRecognizer;
-            otherRecognizer.recognizeWith(this);
-        }
-        return this;
-    },
-
-    /**
-     * drop the simultaneous link. it doesnt remove the link on the other recognizer.
-     * @param {Recognizer} otherRecognizer
-     * @returns {Recognizer} this
-     */
-    dropRecognizeWith: function(otherRecognizer) {
-        if (invokeArrayArg(otherRecognizer, 'dropRecognizeWith', this)) {
-            return this;
-        }
-
-        otherRecognizer = getRecognizerByNameIfManager(otherRecognizer, this);
-        delete this.simultaneous[otherRecognizer.id];
-        return this;
-    },
-
-    /**
-     * recognizer can only run when an other is failing
-     * @param {Recognizer} otherRecognizer
-     * @returns {Recognizer} this
-     */
-    requireFailure: function(otherRecognizer) {
-        if (invokeArrayArg(otherRecognizer, 'requireFailure', this)) {
-            return this;
-        }
-
-        var requireFail = this.requireFail;
-        otherRecognizer = getRecognizerByNameIfManager(otherRecognizer, this);
-        if (inArray(requireFail, otherRecognizer) === -1) {
-            requireFail.push(otherRecognizer);
-            otherRecognizer.requireFailure(this);
-        }
-        return this;
-    },
-
-    /**
-     * drop the requireFailure link. it does not remove the link on the other recognizer.
-     * @param {Recognizer} otherRecognizer
-     * @returns {Recognizer} this
-     */
-    dropRequireFailure: function(otherRecognizer) {
-        if (invokeArrayArg(otherRecognizer, 'dropRequireFailure', this)) {
-            return this;
-        }
-
-        otherRecognizer = getRecognizerByNameIfManager(otherRecognizer, this);
-        var index = inArray(this.requireFail, otherRecognizer);
-        if (index > -1) {
-            this.requireFail.splice(index, 1);
-        }
-        return this;
-    },
-
-    /**
-     * has require failures boolean
-     * @returns {boolean}
-     */
-    hasRequireFailures: function() {
-        return this.requireFail.length > 0;
-    },
-
-    /**
-     * if the recognizer can recognize simultaneous with an other recognizer
-     * @param {Recognizer} otherRecognizer
-     * @returns {Boolean}
-     */
-    canRecognizeWith: function(otherRecognizer) {
-        return !!this.simultaneous[otherRecognizer.id];
-    },
-
-    /**
-     * You should use `tryEmit` instead of `emit` directly to check
-     * that all the needed recognizers has failed before emitting.
-     * @param {Object} input
-     */
-    emit: function(input) {
-        var self = this;
-        var state = this.state;
-
-        function emit(event) {
-            self.manager.emit(event, input);
-        }
-
-        // 'panstart' and 'panmove'
-        if (state < STATE_ENDED) {
-            emit(self.options.event + stateStr(state));
-        }
-
-        emit(self.options.event); // simple 'eventName' events
-
-        if (input.additionalEvent) { // additional event(panleft, panright, pinchin, pinchout...)
-            emit(input.additionalEvent);
-        }
-
-        // panend and pancancel
-        if (state >= STATE_ENDED) {
-            emit(self.options.event + stateStr(state));
-        }
-    },
-
-    /**
-     * Check that all the require failure recognizers has failed,
-     * if true, it emits a gesture event,
-     * otherwise, setup the state to FAILED.
-     * @param {Object} input
-     */
-    tryEmit: function(input) {
-        if (this.canEmit()) {
-            return this.emit(input);
-        }
-        // it's failing anyway
-        this.state = STATE_FAILED;
-    },
-
-    /**
-     * can we emit?
-     * @returns {boolean}
-     */
-    canEmit: function() {
-        var i = 0;
-        while (i < this.requireFail.length) {
-            if (!(this.requireFail[i].state & (STATE_FAILED | STATE_POSSIBLE))) {
-                return false;
-            }
-            i++;
-        }
-        return true;
-    },
-
-    /**
-     * update the recognizer
-     * @param {Object} inputData
-     */
-    recognize: function(inputData) {
-        // make a new copy of the inputData
-        // so we can change the inputData without messing up the other recognizers
-        var inputDataClone = assign({}, inputData);
-
-        // is is enabled and allow recognizing?
-        if (!boolOrFn(this.options.enable, [this, inputDataClone])) {
-            this.reset();
-            this.state = STATE_FAILED;
-            return;
-        }
-
-        // reset when we've reached the end
-        if (this.state & (STATE_RECOGNIZED | STATE_CANCELLED | STATE_FAILED)) {
-            this.state = STATE_POSSIBLE;
-        }
-
-        this.state = this.process(inputDataClone);
-
-        // the recognizer has recognized a gesture
-        // so trigger an event
-        if (this.state & (STATE_BEGAN | STATE_CHANGED | STATE_ENDED | STATE_CANCELLED)) {
-            this.tryEmit(inputDataClone);
-        }
-    },
-
-    /**
-     * return the state of the recognizer
-     * the actual recognizing happens in this method
-     * @virtual
-     * @param {Object} inputData
-     * @returns {Const} STATE
-     */
-    process: function(inputData) { }, // jshint ignore:line
-
-    /**
-     * return the preferred touch-action
-     * @virtual
-     * @returns {Array}
-     */
-    getTouchAction: function() { },
-
-    /**
-     * called when the gesture isn't allowed to recognize
-     * like when another is being recognized or it is disabled
-     * @virtual
-     */
-    reset: function() { }
-};
-
-/**
- * get a usable string, used as event postfix
- * @param {Const} state
- * @returns {String} state
- */
-function stateStr(state) {
-    if (state & STATE_CANCELLED) {
-        return 'cancel';
-    } else if (state & STATE_ENDED) {
-        return 'end';
-    } else if (state & STATE_CHANGED) {
-        return 'move';
-    } else if (state & STATE_BEGAN) {
-        return 'start';
-    }
-    return '';
-}
-
-/**
- * direction cons to string
- * @param {Const} direction
- * @returns {String}
- */
-function directionStr(direction) {
-    if (direction == DIRECTION_DOWN) {
-        return 'down';
-    } else if (direction == DIRECTION_UP) {
-        return 'up';
-    } else if (direction == DIRECTION_LEFT) {
-        return 'left';
-    } else if (direction == DIRECTION_RIGHT) {
-        return 'right';
-    }
-    return '';
-}
-
-/**
- * get a recognizer by name if it is bound to a manager
- * @param {Recognizer|String} otherRecognizer
- * @param {Recognizer} recognizer
- * @returns {Recognizer}
- */
-function getRecognizerByNameIfManager(otherRecognizer, recognizer) {
-    var manager = recognizer.manager;
-    if (manager) {
-        return manager.get(otherRecognizer);
-    }
-    return otherRecognizer;
-}
-
-/**
- * This recognizer is just used as a base for the simple attribute recognizers.
- * @constructor
- * @extends Recognizer
- */
-function AttrRecognizer() {
-    Recognizer.apply(this, arguments);
-}
-
-inherit(AttrRecognizer, Recognizer, {
-    /**
-     * @namespace
-     * @memberof AttrRecognizer
-     */
-    defaults: {
-        /**
-         * @type {Number}
-         * @default 1
-         */
-        pointers: 1
-    },
-
-    /**
-     * Used to check if it the recognizer receives valid input, like input.distance > 10.
-     * @memberof AttrRecognizer
-     * @param {Object} input
-     * @returns {Boolean} recognized
-     */
-    attrTest: function(input) {
-        var optionPointers = this.options.pointers;
-        return optionPointers === 0 || input.pointers.length === optionPointers;
-    },
-
-    /**
-     * Process the input and return the state for the recognizer
-     * @memberof AttrRecognizer
-     * @param {Object} input
-     * @returns {*} State
-     */
-    process: function(input) {
-        var state = this.state;
-        var eventType = input.eventType;
-
-        var isRecognized = state & (STATE_BEGAN | STATE_CHANGED);
-        var isValid = this.attrTest(input);
-
-        // on cancel input and we've recognized before, return STATE_CANCELLED
-        if (isRecognized && (eventType & INPUT_CANCEL || !isValid)) {
-            return state | STATE_CANCELLED;
-        } else if (isRecognized || isValid) {
-            if (eventType & INPUT_END) {
-                return state | STATE_ENDED;
-            } else if (!(state & STATE_BEGAN)) {
-                return STATE_BEGAN;
-            }
-            return state | STATE_CHANGED;
-        }
-        return STATE_FAILED;
-    }
-});
-
-/**
- * Pan
- * Recognized when the pointer is down and moved in the allowed direction.
- * @constructor
- * @extends AttrRecognizer
- */
-function PanRecognizer() {
-    AttrRecognizer.apply(this, arguments);
-
-    this.pX = null;
-    this.pY = null;
-}
-
-inherit(PanRecognizer, AttrRecognizer, {
-    /**
-     * @namespace
-     * @memberof PanRecognizer
-     */
-    defaults: {
-        event: 'pan',
-        threshold: 10,
-        pointers: 1,
-        direction: DIRECTION_ALL
-    },
-
-    getTouchAction: function() {
-        var direction = this.options.direction;
-        var actions = [];
-        if (direction & DIRECTION_HORIZONTAL) {
-            actions.push(TOUCH_ACTION_PAN_Y);
-        }
-        if (direction & DIRECTION_VERTICAL) {
-            actions.push(TOUCH_ACTION_PAN_X);
-        }
-        return actions;
-    },
-
-    directionTest: function(input) {
-        var options = this.options;
-        var hasMoved = true;
-        var distance = input.distance;
-        var direction = input.direction;
-        var x = input.deltaX;
-        var y = input.deltaY;
-
-        // lock to axis?
-        if (!(direction & options.direction)) {
-            if (options.direction & DIRECTION_HORIZONTAL) {
-                direction = (x === 0) ? DIRECTION_NONE : (x < 0) ? DIRECTION_LEFT : DIRECTION_RIGHT;
-                hasMoved = x != this.pX;
-                distance = Math.abs(input.deltaX);
-            } else {
-                direction = (y === 0) ? DIRECTION_NONE : (y < 0) ? DIRECTION_UP : DIRECTION_DOWN;
-                hasMoved = y != this.pY;
-                distance = Math.abs(input.deltaY);
-            }
-        }
-        input.direction = direction;
-        return hasMoved && distance > options.threshold && direction & options.direction;
-    },
-
-    attrTest: function(input) {
-        return AttrRecognizer.prototype.attrTest.call(this, input) &&
-            (this.state & STATE_BEGAN || (!(this.state & STATE_BEGAN) && this.directionTest(input)));
-    },
-
-    emit: function(input) {
-
-        this.pX = input.deltaX;
-        this.pY = input.deltaY;
-
-        var direction = directionStr(input.direction);
-
-        if (direction) {
-            input.additionalEvent = this.options.event + direction;
-        }
-        this._super.emit.call(this, input);
-    }
-});
-
-/**
- * Pinch
- * Recognized when two or more pointers are moving toward (zoom-in) or away from each other (zoom-out).
- * @constructor
- * @extends AttrRecognizer
- */
-function PinchRecognizer() {
-    AttrRecognizer.apply(this, arguments);
-}
-
-inherit(PinchRecognizer, AttrRecognizer, {
-    /**
-     * @namespace
-     * @memberof PinchRecognizer
-     */
-    defaults: {
-        event: 'pinch',
-        threshold: 0,
-        pointers: 2
-    },
-
-    getTouchAction: function() {
-        return [TOUCH_ACTION_NONE];
-    },
-
-    attrTest: function(input) {
-        return this._super.attrTest.call(this, input) &&
-            (Math.abs(input.scale - 1) > this.options.threshold || this.state & STATE_BEGAN);
-    },
-
-    emit: function(input) {
-        if (input.scale !== 1) {
-            var inOut = input.scale < 1 ? 'in' : 'out';
-            input.additionalEvent = this.options.event + inOut;
-        }
-        this._super.emit.call(this, input);
-    }
-});
-
-/**
- * Press
- * Recognized when the pointer is down for x ms without any movement.
- * @constructor
- * @extends Recognizer
- */
-function PressRecognizer() {
-    Recognizer.apply(this, arguments);
-
-    this._timer = null;
-    this._input = null;
-}
-
-inherit(PressRecognizer, Recognizer, {
-    /**
-     * @namespace
-     * @memberof PressRecognizer
-     */
-    defaults: {
-        event: 'press',
-        pointers: 1,
-        time: 251, // minimal time of the pointer to be pressed
-        threshold: 9 // a minimal movement is ok, but keep it low
-    },
-
-    getTouchAction: function() {
-        return [TOUCH_ACTION_AUTO];
-    },
-
-    process: function(input) {
-        var options = this.options;
-        var validPointers = input.pointers.length === options.pointers;
-        var validMovement = input.distance < options.threshold;
-        var validTime = input.deltaTime > options.time;
-
-        this._input = input;
-
-        // we only allow little movement
-        // and we've reached an end event, so a tap is possible
-        if (!validMovement || !validPointers || (input.eventType & (INPUT_END | INPUT_CANCEL) && !validTime)) {
-            this.reset();
-        } else if (input.eventType & INPUT_START) {
-            this.reset();
-            this._timer = setTimeoutContext(function() {
-                this.state = STATE_RECOGNIZED;
-                this.tryEmit();
-            }, options.time, this);
-        } else if (input.eventType & INPUT_END) {
-            return STATE_RECOGNIZED;
-        }
-        return STATE_FAILED;
-    },
-
-    reset: function() {
-        clearTimeout(this._timer);
-    },
-
-    emit: function(input) {
-        if (this.state !== STATE_RECOGNIZED) {
-            return;
-        }
-
-        if (input && (input.eventType & INPUT_END)) {
-            this.manager.emit(this.options.event + 'up', input);
-        } else {
-            this._input.timeStamp = now();
-            this.manager.emit(this.options.event, this._input);
-        }
-    }
-});
-
-/**
- * Rotate
- * Recognized when two or more pointer are moving in a circular motion.
- * @constructor
- * @extends AttrRecognizer
- */
-function RotateRecognizer() {
-    AttrRecognizer.apply(this, arguments);
-}
-
-inherit(RotateRecognizer, AttrRecognizer, {
-    /**
-     * @namespace
-     * @memberof RotateRecognizer
-     */
-    defaults: {
-        event: 'rotate',
-        threshold: 0,
-        pointers: 2
-    },
-
-    getTouchAction: function() {
-        return [TOUCH_ACTION_NONE];
-    },
-
-    attrTest: function(input) {
-        return this._super.attrTest.call(this, input) &&
-            (Math.abs(input.rotation) > this.options.threshold || this.state & STATE_BEGAN);
-    }
-});
-
-/**
- * Swipe
- * Recognized when the pointer is moving fast (velocity), with enough distance in the allowed direction.
- * @constructor
- * @extends AttrRecognizer
- */
-function SwipeRecognizer() {
-    AttrRecognizer.apply(this, arguments);
-}
-
-inherit(SwipeRecognizer, AttrRecognizer, {
-    /**
-     * @namespace
-     * @memberof SwipeRecognizer
-     */
-    defaults: {
-        event: 'swipe',
-        threshold: 10,
-        velocity: 0.3,
-        direction: DIRECTION_HORIZONTAL | DIRECTION_VERTICAL,
-        pointers: 1
-    },
-
-    getTouchAction: function() {
-        return PanRecognizer.prototype.getTouchAction.call(this);
-    },
-
-    attrTest: function(input) {
-        var direction = this.options.direction;
-        var velocity;
-
-        if (direction & (DIRECTION_HORIZONTAL | DIRECTION_VERTICAL)) {
-            velocity = input.overallVelocity;
-        } else if (direction & DIRECTION_HORIZONTAL) {
-            velocity = input.overallVelocityX;
-        } else if (direction & DIRECTION_VERTICAL) {
-            velocity = input.overallVelocityY;
-        }
-
-        return this._super.attrTest.call(this, input) &&
-            direction & input.offsetDirection &&
-            input.distance > this.options.threshold &&
-            input.maxPointers == this.options.pointers &&
-            abs(velocity) > this.options.velocity && input.eventType & INPUT_END;
-    },
-
-    emit: function(input) {
-        var direction = directionStr(input.offsetDirection);
-        if (direction) {
-            this.manager.emit(this.options.event + direction, input);
-        }
-
-        this.manager.emit(this.options.event, input);
-    }
-});
-
-/**
- * A tap is ecognized when the pointer is doing a small tap/click. Multiple taps are recognized if they occur
- * between the given interval and position. The delay option can be used to recognize multi-taps without firing
- * a single tap.
- *
- * The eventData from the emitted event contains the property `tapCount`, which contains the amount of
- * multi-taps being recognized.
- * @constructor
- * @extends Recognizer
- */
-function TapRecognizer() {
-    Recognizer.apply(this, arguments);
-
-    // previous time and center,
-    // used for tap counting
-    this.pTime = false;
-    this.pCenter = false;
-
-    this._timer = null;
-    this._input = null;
-    this.count = 0;
-}
-
-inherit(TapRecognizer, Recognizer, {
-    /**
-     * @namespace
-     * @memberof PinchRecognizer
-     */
-    defaults: {
-        event: 'tap',
-        pointers: 1,
-        taps: 1,
-        interval: 300, // max time between the multi-tap taps
-        time: 250, // max time of the pointer to be down (like finger on the screen)
-        threshold: 9, // a minimal movement is ok, but keep it low
-        posThreshold: 10 // a multi-tap can be a bit off the initial position
-    },
-
-    getTouchAction: function() {
-        return [TOUCH_ACTION_MANIPULATION];
-    },
-
-    process: function(input) {
-        var options = this.options;
-
-        var validPointers = input.pointers.length === options.pointers;
-        var validMovement = input.distance < options.threshold;
-        var validTouchTime = input.deltaTime < options.time;
-
-        this.reset();
-
-        if ((input.eventType & INPUT_START) && (this.count === 0)) {
-            return this.failTimeout();
-        }
-
-        // we only allow little movement
-        // and we've reached an end event, so a tap is possible
-        if (validMovement && validTouchTime && validPointers) {
-            if (input.eventType != INPUT_END) {
-                return this.failTimeout();
-            }
-
-            var validInterval = this.pTime ? (input.timeStamp - this.pTime < options.interval) : true;
-            var validMultiTap = !this.pCenter || getDistance(this.pCenter, input.center) < options.posThreshold;
-
-            this.pTime = input.timeStamp;
-            this.pCenter = input.center;
-
-            if (!validMultiTap || !validInterval) {
-                this.count = 1;
-            } else {
-                this.count += 1;
-            }
-
-            this._input = input;
-
-            // if tap count matches we have recognized it,
-            // else it has began recognizing...
-            var tapCount = this.count % options.taps;
-            if (tapCount === 0) {
-                // no failing requirements, immediately trigger the tap event
-                // or wait as long as the multitap interval to trigger
-                if (!this.hasRequireFailures()) {
-                    return STATE_RECOGNIZED;
-                } else {
-                    this._timer = setTimeoutContext(function() {
-                        this.state = STATE_RECOGNIZED;
-                        this.tryEmit();
-                    }, options.interval, this);
-                    return STATE_BEGAN;
-                }
-            }
-        }
-        return STATE_FAILED;
-    },
-
-    failTimeout: function() {
-        this._timer = setTimeoutContext(function() {
-            this.state = STATE_FAILED;
-        }, this.options.interval, this);
-        return STATE_FAILED;
-    },
-
-    reset: function() {
-        clearTimeout(this._timer);
-    },
-
-    emit: function() {
-        if (this.state == STATE_RECOGNIZED) {
-            this._input.tapCount = this.count;
-            this.manager.emit(this.options.event, this._input);
-        }
-    }
-});
-
-/**
- * Simple way to create a manager with a default set of recognizers.
- * @param {HTMLElement} element
- * @param {Object} [options]
- * @constructor
- */
-function Hammer(element, options) {
-    options = options || {};
-    options.recognizers = ifUndefined(options.recognizers, Hammer.defaults.preset);
-    return new Manager(element, options);
-}
-
-/**
- * @const {string}
- */
-Hammer.VERSION = '2.0.8';
-
-/**
- * default settings
- * @namespace
- */
-Hammer.defaults = {
-    /**
-     * set if DOM events are being triggered.
-     * But this is slower and unused by simple implementations, so disabled by default.
-     * @type {Boolean}
-     * @default false
-     */
-    domEvents: false,
-
-    /**
-     * The value for the touchAction property/fallback.
-     * When set to `compute` it will magically set the correct value based on the added recognizers.
-     * @type {String}
-     * @default compute
-     */
-    touchAction: TOUCH_ACTION_COMPUTE,
-
-    /**
-     * @type {Boolean}
-     * @default true
-     */
-    enable: true,
-
-    /**
-     * EXPERIMENTAL FEATURE -- can be removed/changed
-     * Change the parent input target element.
-     * If Null, then it is being set the to main element.
-     * @type {Null|EventTarget}
-     * @default null
-     */
-    inputTarget: null,
-
-    /**
-     * force an input class
-     * @type {Null|Function}
-     * @default null
-     */
-    inputClass: null,
-
-    /**
-     * Default recognizer setup when calling `Hammer()`
-     * When creating a new Manager these will be skipped.
-     * @type {Array}
-     */
-    preset: [
-        // RecognizerClass, options, [recognizeWith, ...], [requireFailure, ...]
-        [RotateRecognizer, {enable: false}],
-        [PinchRecognizer, {enable: false}, ['rotate']],
-        [SwipeRecognizer, {direction: DIRECTION_HORIZONTAL}],
-        [PanRecognizer, {direction: DIRECTION_HORIZONTAL}, ['swipe']],
-        [TapRecognizer],
-        [TapRecognizer, {event: 'doubletap', taps: 2}, ['tap']],
-        [PressRecognizer]
-    ],
-
-    /**
-     * Some CSS properties can be used to improve the working of Hammer.
-     * Add them to this method and they will be set when creating a new Manager.
-     * @namespace
-     */
-    cssProps: {
-        /**
-         * Disables text selection to improve the dragging gesture. Mainly for desktop browsers.
-         * @type {String}
-         * @default 'none'
-         */
-        userSelect: 'none',
-
-        /**
-         * Disable the Windows Phone grippers when pressing an element.
-         * @type {String}
-         * @default 'none'
-         */
-        touchSelect: 'none',
-
-        /**
-         * Disables the default callout shown when you touch and hold a touch target.
-         * On iOS, when you touch and hold a touch target such as a link, Safari displays
-         * a callout containing information about the link. This property allows you to disable that callout.
-         * @type {String}
-         * @default 'none'
-         */
-        touchCallout: 'none',
-
-        /**
-         * Specifies whether zooming is enabled. Used by IE10>
-         * @type {String}
-         * @default 'none'
-         */
-        contentZooming: 'none',
-
-        /**
-         * Specifies that an entire element should be draggable instead of its contents. Mainly for desktop browsers.
-         * @type {String}
-         * @default 'none'
-         */
-        userDrag: 'none',
-
-        /**
-         * Overrides the highlight color shown when the user taps a link or a JavaScript
-         * clickable element in iOS. This property obeys the alpha value, if specified.
-         * @type {String}
-         * @default 'rgba(0,0,0,0)'
-         */
-        tapHighlightColor: 'rgba(0,0,0,0)'
-    }
-};
-
-var STOP = 1;
-var FORCED_STOP = 2;
-
-/**
- * Manager
- * @param {HTMLElement} element
- * @param {Object} [options]
- * @constructor
- */
-function Manager(element, options) {
-    this.options = assign({}, Hammer.defaults, options || {});
-
-    this.options.inputTarget = this.options.inputTarget || element;
-
-    this.handlers = {};
-    this.session = {};
-    this.recognizers = [];
-    this.oldCssProps = {};
-
-    this.element = element;
-    this.input = createInputInstance(this);
-    this.touchAction = new TouchAction(this, this.options.touchAction);
-
-    toggleCssProps(this, true);
-
-    each(this.options.recognizers, function(item) {
-        var recognizer = this.add(new (item[0])(item[1]));
-        item[2] && recognizer.recognizeWith(item[2]);
-        item[3] && recognizer.requireFailure(item[3]);
-    }, this);
-}
-
-Manager.prototype = {
-    /**
-     * set options
-     * @param {Object} options
-     * @returns {Manager}
-     */
-    set: function(options) {
-        assign(this.options, options);
-
-        // Options that need a little more setup
-        if (options.touchAction) {
-            this.touchAction.update();
-        }
-        if (options.inputTarget) {
-            // Clean up existing event listeners and reinitialize
-            this.input.destroy();
-            this.input.target = options.inputTarget;
-            this.input.init();
-        }
-        return this;
-    },
-
-    /**
-     * stop recognizing for this session.
-     * This session will be discarded, when a new [input]start event is fired.
-     * When forced, the recognizer cycle is stopped immediately.
-     * @param {Boolean} [force]
-     */
-    stop: function(force) {
-        this.session.stopped = force ? FORCED_STOP : STOP;
-    },
-
-    /**
-     * run the recognizers!
-     * called by the inputHandler function on every movement of the pointers (touches)
-     * it walks through all the recognizers and tries to detect the gesture that is being made
-     * @param {Object} inputData
-     */
-    recognize: function(inputData) {
-        var session = this.session;
-        if (session.stopped) {
-            return;
-        }
-
-        // run the touch-action polyfill
-        this.touchAction.preventDefaults(inputData);
-
-        var recognizer;
-        var recognizers = this.recognizers;
-
-        // this holds the recognizer that is being recognized.
-        // so the recognizer's state needs to be BEGAN, CHANGED, ENDED or RECOGNIZED
-        // if no recognizer is detecting a thing, it is set to `null`
-        var curRecognizer = session.curRecognizer;
-
-        // reset when the last recognizer is recognized
-        // or when we're in a new session
-        if (!curRecognizer || (curRecognizer && curRecognizer.state & STATE_RECOGNIZED)) {
-            curRecognizer = session.curRecognizer = null;
-        }
-
-        var i = 0;
-        while (i < recognizers.length) {
-            recognizer = recognizers[i];
-
-            // find out if we are allowed try to recognize the input for this one.
-            // 1.   allow if the session is NOT forced stopped (see the .stop() method)
-            // 2.   allow if we still haven't recognized a gesture in this session, or the this recognizer is the one
-            //      that is being recognized.
-            // 3.   allow if the recognizer is allowed to run simultaneous with the current recognized recognizer.
-            //      this can be setup with the `recognizeWith()` method on the recognizer.
-            if (session.stopped !== FORCED_STOP && ( // 1
-                    !curRecognizer || recognizer == curRecognizer || // 2
-                    recognizer.canRecognizeWith(curRecognizer))) { // 3
-                recognizer.recognize(inputData);
-            } else {
-                recognizer.reset();
-            }
-
-            // if the recognizer has been recognizing the input as a valid gesture, we want to store this one as the
-            // current active recognizer. but only if we don't already have an active recognizer
-            if (!curRecognizer && recognizer.state & (STATE_BEGAN | STATE_CHANGED | STATE_ENDED)) {
-                curRecognizer = session.curRecognizer = recognizer;
-            }
-            i++;
-        }
-    },
-
-    /**
-     * get a recognizer by its event name.
-     * @param {Recognizer|String} recognizer
-     * @returns {Recognizer|Null}
-     */
-    get: function(recognizer) {
-        if (recognizer instanceof Recognizer) {
-            return recognizer;
-        }
-
-        var recognizers = this.recognizers;
-        for (var i = 0; i < recognizers.length; i++) {
-            if (recognizers[i].options.event == recognizer) {
-                return recognizers[i];
-            }
-        }
-        return null;
-    },
-
-    /**
-     * add a recognizer to the manager
-     * existing recognizers with the same event name will be removed
-     * @param {Recognizer} recognizer
-     * @returns {Recognizer|Manager}
-     */
-    add: function(recognizer) {
-        if (invokeArrayArg(recognizer, 'add', this)) {
-            return this;
-        }
-
-        // remove existing
-        var existing = this.get(recognizer.options.event);
-        if (existing) {
-            this.remove(existing);
-        }
-
-        this.recognizers.push(recognizer);
-        recognizer.manager = this;
-
-        this.touchAction.update();
-        return recognizer;
-    },
-
-    /**
-     * remove a recognizer by name or instance
-     * @param {Recognizer|String} recognizer
-     * @returns {Manager}
-     */
-    remove: function(recognizer) {
-        if (invokeArrayArg(recognizer, 'remove', this)) {
-            return this;
-        }
-
-        recognizer = this.get(recognizer);
-
-        // let's make sure this recognizer exists
-        if (recognizer) {
-            var recognizers = this.recognizers;
-            var index = inArray(recognizers, recognizer);
-
-            if (index !== -1) {
-                recognizers.splice(index, 1);
-                this.touchAction.update();
-            }
-        }
-
-        return this;
-    },
-
-    /**
-     * bind event
-     * @param {String} events
-     * @param {Function} handler
-     * @returns {EventEmitter} this
-     */
-    on: function(events, handler) {
-        if (events === undefined) {
-            return;
-        }
-        if (handler === undefined) {
-            return;
-        }
-
-        var handlers = this.handlers;
-        each(splitStr(events), function(event) {
-            handlers[event] = handlers[event] || [];
-            handlers[event].push(handler);
-        });
-        return this;
-    },
-
-    /**
-     * unbind event, leave emit blank to remove all handlers
-     * @param {String} events
-     * @param {Function} [handler]
-     * @returns {EventEmitter} this
-     */
-    off: function(events, handler) {
-        if (events === undefined) {
-            return;
-        }
-
-        var handlers = this.handlers;
-        each(splitStr(events), function(event) {
-            if (!handler) {
-                delete handlers[event];
-            } else {
-                handlers[event] && handlers[event].splice(inArray(handlers[event], handler), 1);
-            }
-        });
-        return this;
-    },
-
-    /**
-     * emit event to the listeners
-     * @param {String} event
-     * @param {Object} data
-     */
-    emit: function(event, data) {
-        // we also want to trigger dom events
-        if (this.options.domEvents) {
-            triggerDomEvent(event, data);
-        }
-
-        // no handlers, so skip it all
-        var handlers = this.handlers[event] && this.handlers[event].slice();
-        if (!handlers || !handlers.length) {
-            return;
-        }
-
-        data.type = event;
-        data.preventDefault = function() {
-            data.srcEvent.preventDefault();
-        };
-
-        var i = 0;
-        while (i < handlers.length) {
-            handlers[i](data);
-            i++;
-        }
-    },
-
-    /**
-     * destroy the manager and unbinds all events
-     * it doesn't unbind dom events, that is the user own responsibility
-     */
-    destroy: function() {
-        this.element && toggleCssProps(this, false);
-
-        this.handlers = {};
-        this.session = {};
-        this.input.destroy();
-        this.element = null;
-    }
-};
-
-/**
- * add/remove the css properties as defined in manager.options.cssProps
- * @param {Manager} manager
- * @param {Boolean} add
- */
-function toggleCssProps(manager, add) {
-    var element = manager.element;
-    if (!element.style) {
-        return;
-    }
-    var prop;
-    each(manager.options.cssProps, function(value, name) {
-        prop = prefixed(element.style, name);
-        if (add) {
-            manager.oldCssProps[prop] = element.style[prop];
-            element.style[prop] = value;
-        } else {
-            element.style[prop] = manager.oldCssProps[prop] || '';
-        }
-    });
-    if (!add) {
-        manager.oldCssProps = {};
-    }
-}
-
-/**
- * trigger dom event
- * @param {String} event
- * @param {Object} data
- */
-function triggerDomEvent(event, data) {
-    var gestureEvent = document.createEvent('Event');
-    gestureEvent.initEvent(event, true, true);
-    gestureEvent.gesture = data;
-    data.target.dispatchEvent(gestureEvent);
-}
-
-assign(Hammer, {
-    INPUT_START: INPUT_START,
-    INPUT_MOVE: INPUT_MOVE,
-    INPUT_END: INPUT_END,
-    INPUT_CANCEL: INPUT_CANCEL,
-
-    STATE_POSSIBLE: STATE_POSSIBLE,
-    STATE_BEGAN: STATE_BEGAN,
-    STATE_CHANGED: STATE_CHANGED,
-    STATE_ENDED: STATE_ENDED,
-    STATE_RECOGNIZED: STATE_RECOGNIZED,
-    STATE_CANCELLED: STATE_CANCELLED,
-    STATE_FAILED: STATE_FAILED,
-
-    DIRECTION_NONE: DIRECTION_NONE,
-    DIRECTION_LEFT: DIRECTION_LEFT,
-    DIRECTION_RIGHT: DIRECTION_RIGHT,
-    DIRECTION_UP: DIRECTION_UP,
-    DIRECTION_DOWN: DIRECTION_DOWN,
-    DIRECTION_HORIZONTAL: DIRECTION_HORIZONTAL,
-    DIRECTION_VERTICAL: DIRECTION_VERTICAL,
-    DIRECTION_ALL: DIRECTION_ALL,
-
-    Manager: Manager,
-    Input: Input,
-    TouchAction: TouchAction,
-
-    TouchInput: TouchInput,
-    MouseInput: MouseInput,
-    PointerEventInput: PointerEventInput,
-    TouchMouseInput: TouchMouseInput,
-    SingleTouchInput: SingleTouchInput,
-
-    Recognizer: Recognizer,
-    AttrRecognizer: AttrRecognizer,
-    Tap: TapRecognizer,
-    Pan: PanRecognizer,
-    Swipe: SwipeRecognizer,
-    Pinch: PinchRecognizer,
-    Rotate: RotateRecognizer,
-    Press: PressRecognizer,
-
-    on: addEventListeners,
-    off: removeEventListeners,
-    each: each,
-    merge: merge,
-    extend: extend,
-    assign: assign,
-    inherit: inherit,
-    bindFn: bindFn,
-    prefixed: prefixed
-});
-
-// this prevents errors when Hammer is loaded in the presence of an AMD
-//  style loader but by script tag, not by the loader.
-var freeGlobal = (typeof window !== 'undefined' ? window : (typeof self !== 'undefined' ? self : {})); // jshint ignore:line
-freeGlobal.Hammer = Hammer;
-
-if (typeof define === 'function' && define.amd) {
-    define(function() {
-        return Hammer;
-    });
-} else if (typeof module != 'undefined' && module.exports) {
-    module.exports = Hammer;
-} else {
-    window[exportName] = Hammer;
-}
-
-})(window, document, 'Hammer');
-
-+ function($) {
-  "use strict";
-
-  var defaults;
-  
-  $.modal = function(params, onOpen) {
-    params = $.extend({}, defaults, params);
-
-
-    var buttons = params.buttons;
-
-    var buttonsHtml = buttons.map(function(d, i) {
-      return '<a href="javascript:;" class="weui-dialog__btn ' + (d.className || "") + '">' + d.text + '</a>';
-    }).join("");
-
-    var tpl = '<div class="weui-dialog">' +
-                '<div class="weui-dialog__hd"><strong class="weui-dialog__title">' + params.title + '</strong></div>' +
-                ( params.text ? '<div class="weui-dialog__bd">'+params.text+'</div>' : '')+
-                '<div class="weui-dialog__ft">' + buttonsHtml + '</div>' +
-              '</div>';
-    
-    var dialog = $.openModal(tpl, onOpen);
-
-    dialog.find(".weui-dialog__btn").each(function(i, e) {
-      var el = $(e);
-      el.click(function() {
-        //先关闭对话框，再调用回调函数
-        if(params.autoClose) $.closeModal();
-
-        if(buttons[i].onClick) {
-          buttons[i].onClick.call(dialog);
-        }
-      });
-    });
-
-    return dialog;
-  };
-
-  $.openModal = function(tpl, onOpen) {
-    var mask = $("<div class='weui-mask'></div>").appendTo(document.body);
-    mask.show();
-
-    var dialog = $(tpl).appendTo(document.body);
- 
-    if (onOpen) {
-      dialog.transitionEnd(function () {
-        onOpen.call(dialog);
-      });
-    }   
-
-    dialog.show();
-    mask.addClass("weui-mask--visible");
-    dialog.addClass("weui-dialog--visible");
-
-
-    return dialog;
-  }
-
-  $.closeModal = function() {
-    $(".weui-mask--visible").removeClass("weui-mask--visible").transitionEnd(function() {
-      $(this).remove();
-    });
-    $(".weui-dialog--visible").removeClass("weui-dialog--visible").transitionEnd(function() {
-      $(this).remove();
-    });
-  };
-
-  $.alert = function(text, title, onOK) {
-    var config;
-    if (typeof text === 'object') {
-      config = text;
-    } else {
-      if (typeof title === 'function') {
-        onOK = arguments[1];
-        title = undefined;
-      }
-
-      config = {
-        text: text,
-        title: title,
-        onOK: onOK
-      }
-    }
-    return $.modal({
-      text: config.text,
-      title: config.title,
-      buttons: [{
-        text: defaults.buttonOK,
-        className: "primary",
-        onClick: config.onOK
-      }]
-    });
-  }
-
-  $.confirm = function(text, title, onOK, onCancel) {
-    var config;
-    if (typeof text === 'object') {
-      config = text
-    } else {
-      if (typeof title === 'function') {
-        onCancel = arguments[2];
-        onOK = arguments[1];
-        title = undefined;
-      }
-
-      config = {
-        text: text,
-        title: title,
-        onOK: onOK,
-        onCancel: onCancel
-      }
-    }
-    return $.modal({
-      text: config.text,
-      title: config.title,
-      buttons: [
-      {
-        text: defaults.buttonCancel,
-        className: "default",
-        onClick: config.onCancel
-      },
-      {
-        text: defaults.buttonOK,
-        className: "primary",
-        onClick: config.onOK
-      }]
-    });
-  };
-
-  //如果参数过多，建议通过 config 对象进行配置，而不是传入多个参数。
-  $.prompt = function(text, title, onOK, onCancel, input) {
-    var config;
-    if (typeof text === 'object') {
-      config = text;
-    } else {
-      if (typeof title === 'function') {
-        input = arguments[3];
-        onCancel = arguments[2];
-        onOK = arguments[1];
-        title = undefined;
-      }
-      config = {
-        text: text,
-        title: title,
-        input: input,
-        onOK: onOK,
-        onCancel: onCancel,
-        empty: false  //allow empty
-      }
-    }
-
-    var modal = $.modal({
-      text: '<p class="weui-prompt-text">'+(config.text || '')+'</p><input type="text" class="weui-input weui-prompt-input" id="weui-prompt-input" value="' + (config.input || '') + '" />',
-      title: config.title,
-      autoClose: false,
-      buttons: [
-      {
-        text: defaults.buttonCancel,
-        className: "default",
-        onClick: function () {
-          $.closeModal();
-          config.onCancel && config.onCancel.call(modal);
-        }
-      },
-      {
-        text: defaults.buttonOK,
-        className: "primary",
-        onClick: function() {
-          var input = $("#weui-prompt-input").val();
-          if (!config.empty && (input === "" || input === null)) {
-            modal.find('.weui-prompt-input').focus()[0].select();
-            return false;
-          }
-          $.closeModal();
-          config.onOK && config.onOK.call(modal, input);
-        }
-      }]
-    }, function () {
-      this.find('.weui-prompt-input').focus()[0].select();
-    });
-
-    return modal;
-  };
-
-  //如果参数过多，建议通过 config 对象进行配置，而不是传入多个参数。
-  $.login = function(text, title, onOK, onCancel, username, password) {
-    var config;
-    if (typeof text === 'object') {
-      config = text;
-    } else {
-      if (typeof title === 'function') {
-        password = arguments[4];
-        username = arguments[3];
-        onCancel = arguments[2];
-        onOK = arguments[1];
-        title = undefined;
-      }
-      config = {
-        text: text,
-        title: title,
-        username: username,
-        password: password,
-        onOK: onOK,
-        onCancel: onCancel
-      }
-    }
-
-    var modal = $.modal({
-      text: '<p class="weui-prompt-text">'+(config.text || '')+'</p>' +
-            '<input type="text" class="weui-input weui-prompt-input" id="weui-prompt-username" value="' + (config.username || '') + '" placeholder="输入用户名" />' +
-            '<input type="password" class="weui-input weui-prompt-input" id="weui-prompt-password" value="' + (config.password || '') + '" placeholder="输入密码" />',
-      title: config.title,
-      autoClose: false,
-      buttons: [
-      {
-        text: defaults.buttonCancel,
-        className: "default",
-        onClick: function () {
-          $.closeModal();
-          config.onCancel && config.onCancel.call(modal);
-        }
-      }, {
-        text: defaults.buttonOK,
-        className: "primary",
-        onClick: function() {
-          var username = $("#weui-prompt-username").val();
-          var password = $("#weui-prompt-password").val();
-          if (!config.empty && (username === "" || username === null)) {
-            modal.find('#weui-prompt-username').focus()[0].select();
-            return false;
-          }
-          if (!config.empty && (password === "" || password === null)) {
-            modal.find('#weui-prompt-password').focus()[0].select();
-            return false;
-          }
-          $.closeModal();
-          config.onOK && config.onOK.call(modal, username, password);
-        }
-      }]
-    }, function () {
-      this.find('#weui-prompt-username').focus()[0].select();
-    });
-
-    return modal;
-  };
-
-  defaults = $.modal.prototype.defaults = {
-    title: "提示",
-    text: undefined,
-    buttonOK: "确定",
-    buttonCancel: "取消",
-    buttons: [{
-      text: "确定",
-      className: "primary"
-    }],
-    autoClose: true //点击按钮自动关闭对话框，如果你不希望点击按钮就关闭对话框，可以把这个设置为false
-  };
-
-}($);
-
-+ function($) {
-  "use strict";
-
-  var defaults;
-  
-  var show = function(html, className) {
-    className = className || "";
-    var mask = $("<div class='weui-mask_transparent'></div>").appendTo(document.body);
-
-    var tpl = '<div class="weui-toast ' + className + '">' + html + '</div>';
-    var dialog = $(tpl).appendTo(document.body);
-
-    dialog.show();
-    dialog.addClass("weui-toast--visible");
-  };
-
-  var hide = function(callback) {
-    $(".weui-mask_transparent").remove();
-    $(".weui-toast--visible").removeClass("weui-toast--visible").transitionEnd(function() {
-      var $this = $(this);
-      $this.remove();
-      callback && callback($this);
-    });
-  }
-
-  $.toast = function(text, style, callback) {
-    if(typeof style === "function") {
-      callback = style;
-    }
-    var className, iconClassName = 'weui-icon-success-no-circle';
-    var duration = toastDefaults.duration;
-    if(style == "cancel") {
-      className = "weui-toast_cancel";
-      iconClassName = 'weui-icon-cancel'
-    } else if(style == "forbidden") {
-      className = "weui-toast--forbidden";
-      iconClassName = 'weui-icon-warn'
-    } else if(style == "text") {
-      className = "weui-toast--text";
-    } else if(typeof style === typeof 1) {
-      duration = style
-    }
-    show('<i class="' + iconClassName + ' weui-icon_toast"></i><p class="weui-toast_content">' + (text || "已经完成") + '</p>', className);
-
-    setTimeout(function() {
-      hide(callback);
-    }, duration);
-  }
-
-  $.showLoading = function(text) {
-    var html = '<div class="weui_loading">';
-    html += '<i class="weui-loading weui-icon_toast"></i>';
-    html += '</div>';
-    html += '<p class="weui-toast_content">' + (text || "数据加载中") + '</p>';
-    show(html, 'weui_loading_toast');
-  }
-
-  $.hideLoading = function() {
-    hide();
-  }
-
-  var toastDefaults = $.toast.prototype.defaults = {
-    duration: 2500
-  }
-
-}($);
-
-+ function($) {
-  "use strict";
-
-  var defaults;
-  
-  var show = function(params) {
-
-    var mask = $("<div class='weui-mask weui-actions_mask'></div>").appendTo(document.body);
-
-    var actions = params.actions || [];
-
-    var actionsHtml = actions.map(function(d, i) {
-      return '<div class="weui-actionsheet__cell ' + (d.className || "") + '">' + d.text + '</div>';
-    }).join("");
-
-    var titleHtml = "";
-    
-    if (params.title) {
-      titleHtml = '<div class="weui-actionsheet__title">' + params.title + '</div>';
-    }
-
-    var tpl = '<div class="weui-actionsheet " id="weui-actionsheet">'+
-                titleHtml +
-                '<div class="weui-actionsheet__menu">'+
-                actionsHtml +
-                '</div>'+
-                '<div class="weui-actionsheet__action">'+
-                  '<div class="weui-actionsheet__cell weui-actionsheet_cancel">取消</div>'+
-                  '</div>'+
-                '</div>';
-    var dialog = $(tpl).appendTo(document.body);
-
-    dialog.find(".weui-actionsheet__menu .weui-actionsheet__cell, .weui-actionsheet__action .weui-actionsheet__cell").each(function(i, e) {
-      $(e).click(function() {
-        $.closeActions();
-        params.onClose && params.onClose();
-        if(actions[i] && actions[i].onClick) {
-          actions[i].onClick();
-        }
-      })
-    });
-
-    mask.show();
-    dialog.show();
-    mask.addClass("weui-mask--visible");
-    dialog.addClass("weui-actionsheet_toggle");
-  };
-
-  var hide = function() {
-    $(".weui-mask").removeClass("weui-mask--visible").transitionEnd(function() {
-      $(this).remove();
-    });
-    $(".weui-actionsheet").removeClass("weui-actionsheet_toggle").transitionEnd(function() {
-      $(this).remove();
-    });
-  }
-
-  $.actions = function(params) {
-    params = $.extend({}, defaults, params);
-    show(params);
-  }
-
-  $.closeActions = function() {
-    hide();
-  }
-
-  $(document).on("click", ".weui-actions_mask", function() {
-    $.closeActions();
-  });
-
-  var defaults = $.actions.prototype.defaults = {
-    title: undefined,
-    onClose: undefined,
-    /*actions: [{
-      text: "菜单",
-      className: "color-danger",
-      onClick: function() {
-        console.log(1);
-      }
-    },{
-      text: "菜单2",
-      className: "color-success",
-      onClick: function() {
-        console.log(2);
-      }
-    }]*/
-  }
-
-}($);
-
-/* ===============================================================================
-************   Pull to refreh ************
-=============================================================================== */
-/* global $:true */
-
-+function ($) {
-  "use strict";
-
-  var PTR = function(el) {
-    this.container = $(el);
-    this.distance = 50;
-    this.attachEvents();
-  }
-
-  PTR.prototype.touchStart = function(e) {
-    if(this.container.hasClass("refreshing")) return;
-    var p = $.getTouchPosition(e);
-    this.start = p;
-    this.diffX = this.diffY = 0;
-  };
-
-  PTR.prototype.touchMove= function(e) {
-    if(this.container.hasClass("refreshing")) return;
-    if(!this.start) return false;
-    if(this.container.scrollTop() > 0) return;
-    var p = $.getTouchPosition(e);
-    this.diffX = p.x - this.start.x;
-    this.diffY = p.y - this.start.y;
-    if(this.diffY < 0) return;
-    this.container.addClass("touching");
-    e.preventDefault();
-    e.stopPropagation();
-    this.diffY = Math.pow(this.diffY, 0.8);
-    this.container.css("transform", "translate3d(0, "+this.diffY+"px, 0)");
-
-    if(this.diffY < this.distance) {
-      this.container.removeClass("pull-up").addClass("pull-down");
-    } else {
-      this.container.removeClass("pull-down").addClass("pull-up");
-    }
-  };
-  PTR.prototype.touchEnd = function() {
-    this.start = false;
-    if(this.diffY <= 0 || this.container.hasClass("refreshing")) return;
-    this.container.removeClass("touching");
-    this.container.removeClass("pull-down pull-up");
-    this.container.css("transform", "");
-    if(Math.abs(this.diffY) <= this.distance) {
-    } else {
-      this.container.addClass("refreshing");
-      this.container.trigger("pull-to-refresh");
-    }
-  };
-
-  PTR.prototype.attachEvents = function() {
-    var el = this.container;
-    el.addClass("weui-pull-to-refresh");
-    el.on($.touchEvents.start, $.proxy(this.touchStart, this));
-    el.on($.touchEvents.move, $.proxy(this.touchMove, this));
-    el.on($.touchEvents.end, $.proxy(this.touchEnd, this));
-  };
-
-  var pullToRefresh = function(el) {
-    new PTR(el);
-  };
-
-  var pullToRefreshDone = function(el) {
-    $(el).removeClass("refreshing");
-  }
-
-  $.fn.pullToRefresh = function() {
-    return this.each(function() {
-      pullToRefresh(this);
-    });
-  }
-
-  $.fn.pullToRefreshDone = function() {
-    return this.each(function() {
-      pullToRefreshDone(this);
-    });
-  }
-
-}($);
-
-/* ===============================================================================
-************   Infinite ************
-=============================================================================== */
-/* global $:true */
-+function ($) {
-  "use strict";
-
-
-  var Infinite = function(el, distance) {
-    this.container = $(el);
-    this.container.data("infinite", this);
-    this.distance = distance || 50;
-    this.attachEvents();
-  }
-
-  Infinite.prototype.scroll = function() {
-    var container = this.container;
-    var offset = container.scrollHeight() - ($(window).height() + container.scrollTop());
-    if(offset <= this.distance) {
-      container.trigger("infinite");
-    }
-  }
-
-  Infinite.prototype.attachEvents = function(off) {
-    var el = this.container;
-    var scrollContainer = (el[0].tagName.toUpperCase() === "BODY" ? $(document) : el);
-    scrollContainer[off ? "off" : "on"]("scroll", $.proxy(this.scroll, this));
-  };
-  Infinite.prototype.detachEvents = function(off) {
-    this.attachEvents(true);
-  }
-
-  var infinite = function(el) {
-    attachEvents(el);
-  }
-
-  $.fn.infinite = function(distance) {
-    return this.each(function() {
-      new Infinite(this, distance);
-    });
-  }
-  $.fn.destroyInfinite = function() {
-    return this.each(function() {
-      var infinite = $(this).data("infinite");
-      if(infinite && infinite.detachEvents) infinite.detachEvents();
-    });
-  }
-
-}($);
-
-/* global $:true */
-+function ($) {
-  "use strict";
-
-  var ITEM_ON = "weui-bar__item--on";
-
-  var showTab = function(a) {
-    var $a = $(a);
-    if($a.hasClass(ITEM_ON)) return;
-    var href = $a.attr("href");
-
-    if(!/^#/.test(href)) return ;
-
-    $a.parent().find("."+ITEM_ON).removeClass(ITEM_ON);
-    $a.addClass(ITEM_ON);
-
-    var bd = $a.parents(".weui-tab").find(".weui-tab__bd");
-
-    bd.find(".weui-tab__bd-item--active").removeClass("weui-tab__bd-item--active");
-
-    $(href).addClass("weui-tab__bd-item--active");
-  }
-
-  $.showTab = showTab;
-
-  $(document).on("click", ".weui-navbar__item, .weui-tabbar__item", function(e) {
-    var $a = $(e.currentTarget);
-    var href = $a.attr("href");
-    if($a.hasClass(ITEM_ON)) return;
-    if(!/^#/.test(href)) return;
-
-    e.preventDefault();
-
-    showTab($a);
-  });
-
-}($);
-
-/* global $:true */
-+ function($) {
-  "use strict";
-
-  $(document).on("click touchstart", ".weui-search-bar__label", function(e) {
-    $(e.target).parents(".weui-search-bar").addClass("weui-search-bar_focusing").find('input').focus();
-  }) 
-  /*
-  .on("blur", ".weui-search-bar__input", function(e) {
-    var $input = $(e.target);
-    if(!$input.val()) $input.parents(".weui-search-bar").removeClass("weui-search-bar_focusing");
-  })
-  */
-  .on("click", ".weui-search-bar__cancel-btn", function(e) {
-    var $input = $(e.target).parents(".weui-search-bar").removeClass("weui-search-bar_focusing").find(".weui-search-bar__input").val("").blur();
-  })
-  .on("click", ".weui-icon-clear", function(e) {
-    var $input = $(e.target).parents(".weui-search-bar").find(".weui-search-bar__input").val("").focus();
-  });
-
-}($);
-
-/*===========================
-Device/OS Detection
-===========================*/
-/* global $:true */
-;(function ($) {
-    "use strict";
-    var device = {};
-    var ua = navigator.userAgent;
-
-    var android = ua.match(/(Android);?[\s\/]+([\d.]+)?/);
-    var ipad = ua.match(/(iPad).*OS\s([\d_]+)/);
-    var ipod = ua.match(/(iPod)(.*OS\s([\d_]+))?/);
-    var iphone = !ipad && ua.match(/(iPhone\sOS)\s([\d_]+)/);
-
-    device.ios = device.android = device.iphone = device.ipad = device.androidChrome = false;
-    
-    // Android
-    if (android) {
-        device.os = 'android';
-        device.osVersion = android[2];
-        device.android = true;
-        device.androidChrome = ua.toLowerCase().indexOf('chrome') >= 0;
-    }
-    if (ipad || iphone || ipod) {
-        device.os = 'ios';
-        device.ios = true;
-    }
-    // iOS
-    if (iphone && !ipod) {
-        device.osVersion = iphone[2].replace(/_/g, '.');
-        device.iphone = true;
-    }
-    if (ipad) {
-        device.osVersion = ipad[2].replace(/_/g, '.');
-        device.ipad = true;
-    }
-    if (ipod) {
-        device.osVersion = ipod[3] ? ipod[3].replace(/_/g, '.') : null;
-        device.iphone = true;
-    }
-    // iOS 8+ changed UA
-    if (device.ios && device.osVersion && ua.indexOf('Version/') >= 0) {
-        if (device.osVersion.split('.')[0] === '10') {
-            device.osVersion = ua.toLowerCase().split('version/')[1].split(' ')[0];
-        }
-    }
-
-    // Webview
-    device.webView = (iphone || ipad || ipod) && ua.match(/.*AppleWebKit(?!.*Safari)/i);
-        
-    // Minimal UI
-    if (device.os && device.os === 'ios') {
-        var osVersionArr = device.osVersion.split('.');
-        device.minimalUi = !device.webView &&
-                            (ipod || iphone) &&
-                            (osVersionArr[0] * 1 === 7 ? osVersionArr[1] * 1 >= 1 : osVersionArr[0] * 1 > 7) &&
-                            $('meta[name="viewport"]').length > 0 && $('meta[name="viewport"]').attr('content').indexOf('minimal-ui') >= 0;
-    }
-
-    // Check for status bar and fullscreen app mode
-    var windowWidth = $(window).width();
-    var windowHeight = $(window).height();
-    device.statusBar = false;
-    if (device.webView && (windowWidth * windowHeight === screen.width * screen.height)) {
-        device.statusBar = true;
-    }
-    else {
-        device.statusBar = false;
-    }
-
-    // Classes
-    var classNames = [];
-
-    // Pixel Ratio
-    device.pixelRatio = window.devicePixelRatio || 1;
-    classNames.push('pixel-ratio-' + Math.floor(device.pixelRatio));
-    if (device.pixelRatio >= 2) {
-        classNames.push('retina');
-    }
-
-    // OS classes
-    if (device.os) {
-        classNames.push(device.os, device.os + '-' + device.osVersion.split('.')[0], device.os + '-' + device.osVersion.replace(/\./g, '-'));
-        if (device.os === 'ios') {
-            var major = parseInt(device.osVersion.split('.')[0], 10);
-            for (var i = major - 1; i >= 6; i--) {
-                classNames.push('ios-gt-' + i);
-            }
-        }
-        
-    }
-    // Status bar classes
-    if (device.statusBar) {
-        classNames.push('with-statusbar-overlay');
-    }
-    else {
-        $('html').removeClass('with-statusbar-overlay');
-    }
-
-    // Add html classes
-    if (classNames.length > 0) $('html').addClass(classNames.join(' '));
-
-    $.device = device;
-})($);
-
-/*======================================================
-************   Picker   ************
-======================================================*/
-/* global $:true */
-/* jshint unused:false */
-/* jshint multistr:true */
-+ function($) {
-  "use strict";
-  var Picker = function (params) {
-      var p = this;
-      var defaults = {
-          updateValuesOnMomentum: false,
-          updateValuesOnTouchmove: true,
-          rotateEffect: false,
-          momentumRatio: 7,
-          freeMode: false,
-          // Common settings
-          scrollToInput: true,
-          inputReadOnly: true,
-          toolbar: true,
-          toolbarCloseText: '完成',
-          title: '请选择',
-          toolbarTemplate: '<div class="toolbar">\
-          <div class="toolbar-inner">\
-          <a href="javascript:;" class="picker-button close-picker">{{closeText}}</a>\
-          <h1 class="title">{{title}}</h1>\
-          </div>\
-          </div>',
-      };
-      params = params || {};
-      for (var def in defaults) {
-          if (typeof params[def] === 'undefined') {
-              params[def] = defaults[def];
-          }
-      }
-      p.params = params;
-      p.cols = [];
-      p.initialized = false;
-      
-      // Inline flag
-      p.inline = p.params.container ? true : false;
-
-      // 3D Transforms origin bug, only on safari
-      var originBug = $.device.ios || (navigator.userAgent.toLowerCase().indexOf('safari') >= 0 && navigator.userAgent.toLowerCase().indexOf('chrome') < 0) && !$.device.android;
-
-      // Should be converted to popover
-      function isPopover() {
-          var toPopover = false;
-          if (!p.params.convertToPopover && !p.params.onlyInPopover) return toPopover;
-          if (!p.inline && p.params.input) {
-              if (p.params.onlyInPopover) toPopover = true;
-              else {
-                  if ($.device.ios) {
-                      toPopover = $.device.ipad ? true : false;
-                  }
-                  else {
-                      if ($(window).width() >= 768) toPopover = true;
-                  }
-              }
-          } 
-          return toPopover; 
-      }
-      function inPopover() {
-          if (p.opened && p.container && p.container.length > 0 && p.container.parents('.popover').length > 0) return true;
-          else return false;
-      }
-
-      // Value
-      p.setValue = function (arrValues, transition) {
-          var valueIndex = 0;
-          for (var i = 0; i < p.cols.length; i++) {
-              if (p.cols[i] && !p.cols[i].divider) {
-                  p.cols[i].setValue(arrValues[valueIndex], transition);
-                  valueIndex++;
-              }
-          }
-      };
-      p.updateValue = function () {
-          var newValue = [];
-          var newDisplayValue = [];
-          for (var i = 0; i < p.cols.length; i++) {
-              if (!p.cols[i].divider) {
-                  newValue.push(p.cols[i].value);
-                  newDisplayValue.push(p.cols[i].displayValue);
-              }
-          }
-          if (newValue.indexOf(undefined) >= 0) {
-              return;
-          }
-          p.value = newValue;
-          p.displayValue = newDisplayValue;
-          if (p.params.onChange) {
-              p.params.onChange(p, p.value, p.displayValue);
-          }
-          if (p.input && p.input.length > 0) {
-              $(p.input).val(p.params.formatValue ? p.params.formatValue(p, p.value, p.displayValue) : p.value.join(' '));
-              $(p.input).trigger('change');
-          }
-      };
-
-      // Columns Handlers
-      p.initPickerCol = function (colElement, updateItems) {
-          var colContainer = $(colElement);
-          var colIndex = colContainer.index();
-          var col = p.cols[colIndex];
-          if (col.divider) return;
-          col.container = colContainer;
-          col.wrapper = col.container.find('.picker-items-col-wrapper');
-          col.items = col.wrapper.find('.picker-item');
-          
-          var i, j;
-          var wrapperHeight, itemHeight, itemsHeight, minTranslate, maxTranslate;
-          col.replaceValues = function (values, displayValues) {
-              col.destroyEvents();
-              col.values = values;
-              col.displayValues = displayValues;
-              var newItemsHTML = p.columnHTML(col, true);
-              col.wrapper.html(newItemsHTML);
-              col.items = col.wrapper.find('.picker-item');
-              col.calcSize();
-              col.setValue(col.values[0] || '', 0, true);
-              col.initEvents();
-          };
-          col.calcSize = function () {
-              if (!col.values.length) return;
-              if (p.params.rotateEffect) {
-                  col.container.removeClass('picker-items-col-absolute');
-                  if (!col.width) col.container.css({width:''});
-              }
-              var colWidth, colHeight;
-              colWidth = 0;
-              colHeight = col.container[0].offsetHeight;
-              wrapperHeight = col.wrapper[0].offsetHeight;
-              itemHeight = col.items[0].offsetHeight;
-              itemsHeight = itemHeight * col.items.length;
-              minTranslate = colHeight / 2 - itemsHeight + itemHeight / 2;
-              maxTranslate = colHeight / 2 - itemHeight / 2;    
-              if (col.width) {
-                  colWidth = col.width;
-                  if (parseInt(colWidth, 10) === colWidth) colWidth = colWidth + 'px';
-                  col.container.css({width: colWidth});
-              }
-              if (p.params.rotateEffect) {
-                  if (!col.width) {
-                      col.items.each(function () {
-                          var item = $(this);
-                          item.css({width:'auto'});
-                          colWidth = Math.max(colWidth, item[0].offsetWidth);
-                          item.css({width:''});
-                      });
-                      col.container.css({width: (colWidth + 2) + 'px'});
-                  }
-                  col.container.addClass('picker-items-col-absolute');
-              }
-          };
-          col.calcSize();
-          
-          col.wrapper.transform('translate3d(0,' + maxTranslate + 'px,0)').transition(0);
-
-
-          var activeIndex = 0;
-          var animationFrameId;
-
-          // Set Value Function
-          col.setValue = function (newValue, transition, valueCallbacks) {
-              if (typeof transition === 'undefined') transition = '';
-              var newActiveIndex = col.wrapper.find('.picker-item[data-picker-value="' + newValue + '"]').index();
-              if(typeof newActiveIndex === 'undefined' || newActiveIndex === -1) {
-                  col.value = col.displayValue = newValue;
-                  return;
-              }
-              var newTranslate = -newActiveIndex * itemHeight + maxTranslate;
-              // Update wrapper
-              col.wrapper.transition(transition);
-              col.wrapper.transform('translate3d(0,' + (newTranslate) + 'px,0)');
-                  
-              // Watch items
-              if (p.params.updateValuesOnMomentum && col.activeIndex && col.activeIndex !== newActiveIndex ) {
-                  $.cancelAnimationFrame(animationFrameId);
-                  col.wrapper.transitionEnd(function(){
-                      $.cancelAnimationFrame(animationFrameId);
-                  });
-                  updateDuringScroll();
-              }
-
-              // Update items
-              col.updateItems(newActiveIndex, newTranslate, transition, valueCallbacks);
-          };
-
-          col.updateItems = function (activeIndex, translate, transition, valueCallbacks) {
-              if (typeof translate === 'undefined') {
-                  translate = $.getTranslate(col.wrapper[0], 'y');
-              }
-              if(typeof activeIndex === 'undefined') activeIndex = -Math.round((translate - maxTranslate)/itemHeight);
-              if (activeIndex < 0) activeIndex = 0;
-              if (activeIndex >= col.items.length) activeIndex = col.items.length - 1;
-              var previousActiveIndex = col.activeIndex;
-              col.activeIndex = activeIndex;
-              /*
-              col.wrapper.find('.picker-selected, .picker-after-selected, .picker-before-selected').removeClass('picker-selected picker-after-selected picker-before-selected');
-
-              col.items.transition(transition);
-              var selectedItem = col.items.eq(activeIndex).addClass('picker-selected').transform('');
-              var prevItems = selectedItem.prevAll().addClass('picker-before-selected');
-              var nextItems = selectedItem.nextAll().addClass('picker-after-selected');
-              */
-              //去掉 .picker-after-selected, .picker-before-selected 以提高性能
-              col.wrapper.find('.picker-selected').removeClass('picker-selected');
-              if (p.params.rotateEffect) {
-                col.items.transition(transition);
-              }
-              var selectedItem = col.items.eq(activeIndex).addClass('picker-selected').transform('');
-
-              if (valueCallbacks || typeof valueCallbacks === 'undefined') {
-                  // Update values
-                  col.value = selectedItem.attr('data-picker-value');
-                  col.displayValue = col.displayValues ? col.displayValues[activeIndex] : col.value;
-                  // On change callback
-                  if (previousActiveIndex !== activeIndex) {
-                      if (col.onChange) {
-                          col.onChange(p, col.value, col.displayValue);
-                      }
-                      p.updateValue();
-                  }
-              }
-                  
-              // Set 3D rotate effect
-              if (!p.params.rotateEffect) {
-                  return;
-              }
-              var percentage = (translate - (Math.floor((translate - maxTranslate)/itemHeight) * itemHeight + maxTranslate)) / itemHeight;
-              
-              col.items.each(function () {
-                  var item = $(this);
-                  var itemOffsetTop = item.index() * itemHeight;
-                  var translateOffset = maxTranslate - translate;
-                  var itemOffset = itemOffsetTop - translateOffset;
-                  var percentage = itemOffset / itemHeight;
-
-                  var itemsFit = Math.ceil(col.height / itemHeight / 2) + 1;
-                  
-                  var angle = (-18*percentage);
-                  if (angle > 180) angle = 180;
-                  if (angle < -180) angle = -180;
-                  // Far class
-                  if (Math.abs(percentage) > itemsFit) item.addClass('picker-item-far');
-                  else item.removeClass('picker-item-far');
-                  // Set transform
-                  item.transform('translate3d(0, ' + (-translate + maxTranslate) + 'px, ' + (originBug ? -110 : 0) + 'px) rotateX(' + angle + 'deg)');
-              });
-          };
-
-          function updateDuringScroll() {
-              animationFrameId = $.requestAnimationFrame(function () {
-                  col.updateItems(undefined, undefined, 0);
-                  updateDuringScroll();
-              });
-          }
-
-          // Update items on init
-          if (updateItems) col.updateItems(0, maxTranslate, 0);
-
-          var allowItemClick = true;
-          var isTouched, isMoved, touchStartY, touchCurrentY, touchStartTime, touchEndTime, startTranslate, returnTo, currentTranslate, prevTranslate, velocityTranslate, velocityTime;
-          function handleTouchStart (e) {
-              if (isMoved || isTouched) return;
-              e.preventDefault();
-              isTouched = true;
-              var position = $.getTouchPosition(e);
-              touchStartY = touchCurrentY = position.y;
-              touchStartTime = (new Date()).getTime();
-              
-              allowItemClick = true;
-              startTranslate = currentTranslate = $.getTranslate(col.wrapper[0], 'y');
-          }
-          function handleTouchMove (e) {
-              if (!isTouched) return;
-              e.preventDefault();
-              allowItemClick = false;
-              var position = $.getTouchPosition(e);
-              touchCurrentY = position.y;
-              if (!isMoved) {
-                  // First move
-                  $.cancelAnimationFrame(animationFrameId);
-                  isMoved = true;
-                  startTranslate = currentTranslate = $.getTranslate(col.wrapper[0], 'y');
-                  col.wrapper.transition(0);
-              }
-              e.preventDefault();
-
-              var diff = touchCurrentY - touchStartY;
-              currentTranslate = startTranslate + diff;
-              returnTo = undefined;
-
-              // Normalize translate
-              if (currentTranslate < minTranslate) {
-                  currentTranslate = minTranslate - Math.pow(minTranslate - currentTranslate, 0.8);
-                  returnTo = 'min';
-              }
-              if (currentTranslate > maxTranslate) {
-                  currentTranslate = maxTranslate + Math.pow(currentTranslate - maxTranslate, 0.8);
-                  returnTo = 'max';
-              }
-              // Transform wrapper
-              col.wrapper.transform('translate3d(0,' + currentTranslate + 'px,0)');
-
-              // Update items
-              col.updateItems(undefined, currentTranslate, 0, p.params.updateValuesOnTouchmove);
-              
-              // Calc velocity
-              velocityTranslate = currentTranslate - prevTranslate || currentTranslate;
-              velocityTime = (new Date()).getTime();
-              prevTranslate = currentTranslate;
-          }
-          function handleTouchEnd (e) {
-              if (!isTouched || !isMoved) {
-                  isTouched = isMoved = false;
-                  return;
-              }
-              isTouched = isMoved = false;
-              col.wrapper.transition('');
-              if (returnTo) {
-                  if (returnTo === 'min') {
-                      col.wrapper.transform('translate3d(0,' + minTranslate + 'px,0)');
-                  }
-                  else col.wrapper.transform('translate3d(0,' + maxTranslate + 'px,0)');
-              }
-              touchEndTime = new Date().getTime();
-              var velocity, newTranslate;
-              if (touchEndTime - touchStartTime > 300) {
-                  newTranslate = currentTranslate;
-              }
-              else {
-                  velocity = Math.abs(velocityTranslate / (touchEndTime - velocityTime));
-                  newTranslate = currentTranslate + velocityTranslate * p.params.momentumRatio;
-              }
-
-              newTranslate = Math.max(Math.min(newTranslate, maxTranslate), minTranslate);
-
-              // Active Index
-              var activeIndex = -Math.floor((newTranslate - maxTranslate)/itemHeight);
-
-              // Normalize translate
-              if (!p.params.freeMode) newTranslate = -activeIndex * itemHeight + maxTranslate;
-
-              // Transform wrapper
-              col.wrapper.transform('translate3d(0,' + (parseInt(newTranslate,10)) + 'px,0)');
-
-              // Update items
-              col.updateItems(activeIndex, newTranslate, '', true);
-
-              // Watch items
-              if (p.params.updateValuesOnMomentum) {
-                  updateDuringScroll();
-                  col.wrapper.transitionEnd(function(){
-                      $.cancelAnimationFrame(animationFrameId);
-                  });
-              }
-
-              // Allow click
-              setTimeout(function () {
-                  allowItemClick = true;
-              }, 100);
-          }
-
-          function handleClick(e) {
-              if (!allowItemClick) return;
-              $.cancelAnimationFrame(animationFrameId);
-              /*jshint validthis:true */
-              var value = $(this).attr('data-picker-value');
-              col.setValue(value);
-          }
-
-          col.initEvents = function (detach) {
-              var method = detach ? 'off' : 'on';
-              col.container[method]($.touchEvents.start, handleTouchStart);
-              col.container[method]($.touchEvents.move, handleTouchMove);
-              col.container[method]($.touchEvents.end, handleTouchEnd);
-              col.items[method]('click', handleClick);
-          };
-          col.destroyEvents = function () {
-              col.initEvents(true);
-          };
-
-          col.container[0].f7DestroyPickerCol = function () {
-              col.destroyEvents();
-          };
-
-          col.initEvents();
-
-      };
-      p.destroyPickerCol = function (colContainer) {
-          colContainer = $(colContainer);
-          if ('f7DestroyPickerCol' in colContainer[0]) colContainer[0].f7DestroyPickerCol();
-      };
-      // Resize cols
-      function resizeCols() {
-          if (!p.opened) return;
-          for (var i = 0; i < p.cols.length; i++) {
-              if (!p.cols[i].divider) {
-                  p.cols[i].calcSize();
-                  p.cols[i].setValue(p.cols[i].value, 0, false);
-              }
-          }
-      }
-      $(window).on('resize', resizeCols);
-
-      // HTML Layout
-      p.columnHTML = function (col, onlyItems) {
-          var columnItemsHTML = '';
-          var columnHTML = '';
-          if (col.divider) {
-              columnHTML += '<div class="picker-items-col picker-items-col-divider ' + (col.textAlign ? 'picker-items-col-' + col.textAlign : '') + ' ' + (col.cssClass || '') + '">' + col.content + '</div>';
-          }
-          else {
-              for (var j = 0; j < col.values.length; j++) {
-                  columnItemsHTML += '<div class="picker-item" data-picker-value="' + col.values[j] + '">' + (col.displayValues ? col.displayValues[j] : col.values[j]) + '</div>';
-              }
-              columnHTML += '<div class="picker-items-col ' + (col.textAlign ? 'picker-items-col-' + col.textAlign : '') + ' ' + (col.cssClass || '') + '"><div class="picker-items-col-wrapper">' + columnItemsHTML + '</div></div>';
-          }
-          return onlyItems ? columnItemsHTML : columnHTML;
-      };
-      p.layout = function () {
-          var pickerHTML = '';
-          var pickerClass = '';
-          var i;
-          p.cols = [];
-          var colsHTML = '';
-          for (i = 0; i < p.params.cols.length; i++) {
-              var col = p.params.cols[i];
-              colsHTML += p.columnHTML(p.params.cols[i]);
-              p.cols.push(col);
-          }
-          pickerClass = 'weui-picker-modal picker-columns ' + (p.params.cssClass || '') + (p.params.rotateEffect ? ' picker-3d' : '') + (p.params.cols.length === 1 ? ' picker-columns-single' : '');
-          pickerHTML =
-              '<div class="' + (pickerClass) + '">' +
-                  (p.params.toolbar ? p.params.toolbarTemplate.replace(/{{closeText}}/g, p.params.toolbarCloseText).replace(/{{title}}/g, p.params.title) : '') +
-                  '<div class="picker-modal-inner picker-items">' +
-                      colsHTML +
-                      '<div class="picker-center-highlight"></div>' +
-                  '</div>' +
-              '</div>';
-              
-          p.pickerHTML = pickerHTML;    
-      };
-
-      // Input Events
-      function openOnInput(e) {
-          e.preventDefault();
-          if (p.opened) return;
-          p.open();
-          if (p.params.scrollToInput && !isPopover()) {
-              var pageContent = p.input.parents('.content');
-              if (pageContent.length === 0) return;
-
-              var paddingTop = parseInt(pageContent.css('padding-top'), 10),
-                  paddingBottom = parseInt(pageContent.css('padding-bottom'), 10),
-                  pageHeight = pageContent[0].offsetHeight - paddingTop - p.container.height(),
-                  pageScrollHeight = pageContent[0].scrollHeight - paddingTop - p.container.height(),
-                  newPaddingBottom;
-              var inputTop = p.input.offset().top - paddingTop + p.input[0].offsetHeight;
-              if (inputTop > pageHeight) {
-                  var scrollTop = pageContent.scrollTop() + inputTop - pageHeight;
-                  if (scrollTop + pageHeight > pageScrollHeight) {
-                      newPaddingBottom = scrollTop + pageHeight - pageScrollHeight + paddingBottom;
-                      if (pageHeight === pageScrollHeight) {
-                          newPaddingBottom = p.container.height();
-                      }
-                      pageContent.css({'padding-bottom': (newPaddingBottom) + 'px'});
-                  }
-                  pageContent.scrollTop(scrollTop, 300);
-              }
-          }
-      }
-      function closeOnHTMLClick(e) {
-          if (inPopover()) return;
-          if (p.input && p.input.length > 0) {
-              if (e.target !== p.input[0] && $(e.target).parents('.weui-picker-modal').length === 0) p.close();
-          }
-          else {
-              if ($(e.target).parents('.weui-picker-modal').length === 0) p.close();   
-          }
-      }
-
-      if (p.params.input) {
-          p.input = $(p.params.input);
-          if (p.input.length > 0) {
-              if (p.params.inputReadOnly) p.input.prop('readOnly', true);
-              if (!p.inline) {
-                  p.input.on('click', openOnInput);    
-              }
-              if (p.params.inputReadOnly) {
-                  p.input.on('focus mousedown', function (e) {
-                      e.preventDefault();
-                  });
-              }
-          }
-              
-      }
-      
-      if (!p.inline) $('html').on('click', closeOnHTMLClick);
-
-      // Open
-      function onPickerClose() {
-          p.opened = false;
-          if (p.input && p.input.length > 0) p.input.parents('.page-content').css({'padding-bottom': ''});
-          if (p.params.onClose) p.params.onClose(p);
-
-          // Destroy events
-          p.container.find('.picker-items-col').each(function () {
-              p.destroyPickerCol(this);
-          });
-      }
-
-      p.opened = false;
-      p.open = function () {
-          var toPopover = isPopover();
-
-          if (!p.opened) {
-
-              // Layout
-              p.layout();
-
-              // Append
-              if (toPopover) {
-                  p.pickerHTML = '<div class="popover popover-picker-columns"><div class="popover-inner">' + p.pickerHTML + '</div></div>';
-                  p.popover = $.popover(p.pickerHTML, p.params.input, true);
-                  p.container = $(p.popover).find('.weui-picker-modal');
-                  $(p.popover).on('close', function () {
-                      onPickerClose();
-                  });
-              }
-              else if (p.inline) {
-                  p.container = $(p.pickerHTML);
-                  p.container.addClass('picker-modal-inline');
-                  $(p.params.container).append(p.container);
-              }
-              else {
-                  p.container = $($.openPicker(p.pickerHTML));
-                  $(p.container)
-                  .on('close', function () {
-                      onPickerClose();
-                  });
-              }
-
-              // Store picker instance
-              p.container[0].f7Picker = p;
-
-              // Init Events
-              p.container.find('.picker-items-col').each(function () {
-                  var updateItems = true;
-                  if ((!p.initialized && p.params.value) || (p.initialized && p.value)) updateItems = false;
-                  p.initPickerCol(this, updateItems);
-              });
-              
-              // Set value
-              if (!p.initialized) {
-                  if (p.params.value) {
-                      p.setValue(p.params.value, 0);
-                  }
-              }
-              else {
-                  if (p.value) p.setValue(p.value, 0);
-              }
-          }
-
-          // Set flag
-          p.opened = true;
-          p.initialized = true;
-
-          if (p.params.onOpen) p.params.onOpen(p);
-      };
-
-      // Close
-      p.close = function (force) {
-          if (!p.opened || p.inline) return;
-          if (inPopover()) {
-              $.closePicker(p.popover);
-              return;
-          }
-          else {
-              $.closePicker(p.container);
-              return;
-          }
-      };
-
-      // Destroy
-      p.destroy = function () {
-          p.close();
-          if (p.params.input && p.input.length > 0) {
-              p.input.off('click focus', openOnInput);
-              $(p.input).data('picker', null);
-          }
-          $('html').off('click', closeOnHTMLClick);
-          $(window).off('resize', resizeCols);
-      };
-
-      if (p.inline) {
-          p.open();
-      }
-
-      return p;
-  };
-
-  $(document).on("click", ".close-picker", function() {
-    var pickerToClose = $('.weui-picker-modal.weui-picker-modal-visible');
-    if (pickerToClose.length > 0) {
-      $.closePicker(pickerToClose);
-    }
-  });
-
-  //修复picker会滚动页面的bug
-  $(document).on($.touchEvents.move, ".picker-modal-inner", function(e) {
-    e.preventDefault();
-  });
-
-
-  $.openPicker = function(tpl, className, callback) {
-
-    if(typeof className === "function") {
-      callback = className;
-      className = undefined;
-    }
-
-    $.closePicker();
-
-    var container = $("<div class='weui-picker-container "+ (className || "") + "'></div>").appendTo(document.body);
-    container.show();
-
-    container.addClass("weui-picker-container-visible");
-
-    //关于布局的问题，如果直接放在body上，则做动画的时候会撑开body高度而导致滚动条变化。
-    var dialog = $(tpl).appendTo(container);
-    
-    dialog.width(); //通过取一次CSS值，强制浏览器不能把上下两行代码合并执行，因为合并之后会导致无法出现动画。
-
-    dialog.addClass("weui-picker-modal-visible");
-
-    callback && container.on("close", callback);
-
-    return dialog;
-  }
-
-  $.updatePicker = function(tpl) {
-    var container = $(".weui-picker-container-visible");
-    if(!container[0]) return false;
-
-    container.html("");
-
-    var dialog = $(tpl).appendTo(container);
-
-    dialog.addClass("weui-picker-modal-visible");
-
-    return dialog;
-  }
-
-  $.closePicker = function(container, callback) {
-    if(typeof container === "function") callback = container;
-    $(".weui-picker-modal-visible").removeClass("weui-picker-modal-visible").transitionEnd(function() {
-      $(this).parent().remove();
-      callback && callback();
-    }).trigger("close");
-  };
-
-  $.fn.picker = function(params) {
-    var args = arguments;
-    return this.each(function() {
-      if(!this) return;
-      var $this = $(this);
-      
-      var picker = $this.data("picker");
-      if(!picker) {
-        params = params || {};
-        var inputValue = $this.val();
-        if(params.value === undefined && inputValue !== "") {
-          params.value = (params.cols && params.cols.length > 1) ? inputValue.split(" ") : [inputValue];
-        }
-        var p = $.extend({input: this}, params);
-        picker = new Picker(p);
-        $this.data("picker", picker);
-      }
-      if(typeof params === typeof "a") {
-        picker[params].apply(picker, Array.prototype.slice.call(args, 1));
-      }
-    });
-  };
-}($);
-
-/* global $:true */
-+ function($) {
-  "use strict";
-
-  var defaults;
-
-  var selects = [];
-
-  var Select = function(input, config) {
-
-    var self = this;
-    this.config = config;
-
-    //init empty data
-    this.data = {
-      values: '',
-      titles: '',
-      origins: [],
-      length: 0
-    };
-
-    this.$input = $(input);
-    this.$input.prop("readOnly", true);
-
-    this.initConfig();
-
-    config = this.config;
-
-    this.$input.click($.proxy(this.open, this));
-    selects.push(this)
-  }
-
-  Select.prototype.initConfig = function() {
-    this.config = $.extend({}, defaults, this.config);
-
-    var config = this.config;
-
-    if(!config.items || !config.items.length) return;
-
-    config.items = config.items.map(function(d, i) {
-      if(typeof d == typeof "a") {
-        return {
-          title: d,
-          value: d
-        };
-      }
-
-      return d;
-    });
-
-
-    this.tpl = $.t7.compile("<div class='weui-picker-modal weui-select-modal'>" + config.toolbarTemplate + (config.multi ? config.checkboxTemplate : config.radioTemplate) + "</div>");
-
-    if(config.input !== undefined) this.$input.val(config.input);
-
-    this.parseInitValue();
-
-    this._init = true;
-  }
-
-  Select.prototype.updateInputValue = function(values, titles) {
-    var v, t;
-    if(this.config.multi) {
-      v = values.join(this.config.split);
-      t = titles.join(this.config.split);
-    } else {
-      v = values[0];
-      t = titles[0];
-    }
-
-    //caculate origin data
-    var origins = [];
-
-    this.config.items.forEach(function(d) {
-      values.each(function(i, dd) {
-        if(d.value == dd) origins.push(d);
-      });
-    });
-
-    this.$input.val(t).data("values", v);
-    this.$input.attr("value", t).attr("data-values", v);
-
-    var data = {
-      values: v,
-      titles: t,
-      valuesArray: values,
-      titlesArray: titles,
-      origins: origins,
-      length: origins.length
-    };
-    this.data = data;
-    this.$input.trigger("change", data);
-    this.config.onChange && this.config.onChange.call(this, data);
-  }
-
-  Select.prototype.parseInitValue = function() {
-    var value = this.$input.val();
-    var items = this.config.items;
-
-    //如果input为空，只有在第一次初始化的时候才保留默认选择。因为后来就是用户自己取消了全部选择，不能再为他选中默认值。
-    if( !this._init && (value === undefined || value == null || value === "")) return;
-
-    var titles = this.config.multi ? value.split(this.config.split) : [value];
-    for(var i=0;i<items.length;i++) {
-      items[i].checked = false;
-      for(var j=0;j<titles.length;j++) {
-        if(items[i].title === titles[j]) {
-          items[i].checked = true;
-        }
-      }
-    }
-  }
-
-  Select.prototype._bind = function(dialog) {
-    var self = this,
-        config = this.config;
-    dialog.on("change", function(e) {
-      var checked = dialog.find("input:checked");
-      var values = checked.map(function() {
-        return $(this).val();
-      });
-      var titles = checked.map(function() {
-        return $(this).data("title");
-      });
-      self.updateInputValue(values, titles);
-
-      if(config.autoClose && !config.multi) self.close();
-    })
-    .on("click", ".close-select", function() {
-      self.close();
-    });
-  }
-
-  //更新数据
-  Select.prototype.update = function(config) {
-    this.config = $.extend({}, this.config, config);
-    this.initConfig();
-    if(this._open) {
-      this._bind($.updatePicker(this.getHTML()));
-    }
-  }
-  
-  Select.prototype.open = function(values, titles) {
-
-    if(this._open) return;
-
-    // open picker 会默认关掉其他的，但是 onClose 不会被调用，所以这里先关掉其他select
-    for (var i = 0; i < selects.length; i++ ) {
-      var s = selects[i];
-      if (s === this) continue;
-      if (s._open) {
-        if(!s.close()) return false; // 其他的select由于某些条件限制关闭失败。
-      }
-    }
-
-    this.parseInitValue();
-
-    var config = this.config;
-
-    var dialog = this.dialog = $.openPicker(this.getHTML());
-    
-    this._bind(dialog);
-
-    this._open = true;
-    if(config.onOpen) config.onOpen(this);
-  }
-
-  Select.prototype.close = function(callback, force) {
-    if (!this._open) return false;
-    var self = this,
-        beforeClose = this.config.beforeClose;
-
-    if(typeof callback === typeof true) {
-      force === callback;
-    }
-    if(!force) {
-      if(beforeClose && typeof beforeClose === 'function' && beforeClose.call(this, this.data.values, this.data.titles) === false) {
-        return false
-      }
-      if(this.config.multi) {
-        if(this.config.min !== undefined && this.data.length < this.config.min) {
-          $.toast("请至少选择"+this.config.min+"个", "text");
-          return false
-        }
-        if(this.config.max !== undefined && this.data.length > this.config.max) {
-          $.toast("最多只能选择"+this.config.max+"个", "text");
-          return false
-        }
-      }
-    }
-    $.closePicker(function() {
-      self.onClose();
-      callback && callback();
-    });
-
-    return true
-  }
-
-  Select.prototype.onClose = function() {
-    this._open = false;
-    if(this.config.onClose) this.config.onClose(this);
-  }
-
-  Select.prototype.getHTML = function(callback) {
-    var config = this.config;
-    return this.tpl({
-      items: config.items,
-      title: config.title,
-      closeText: config.closeText
-    })
-  }
-
-
-  $.fn.select = function(params, args) {
-
-    return this.each(function() {
-      var $this = $(this);
-      if(!$this.data("weui-select")) $this.data("weui-select", new Select(this, params));
-
-      var select = $this.data("weui-select");
-
-      if(typeof params === typeof "a") select[params].call(select, args);
-
-      return select;
-    });
-  }
-
-  defaults = $.fn.select.prototype.defaults = {
-    items: [],
-    input: undefined, //输入框的初始值
-    title: "请选择",
-    multi: false,
-    closeText: "确定",
-    autoClose: true, //是否选择完成后自动关闭，只有单选模式下才有效
-    onChange: undefined, //function
-    beforeClose: undefined, // function 关闭之前，如果返回false则阻止关闭
-    onClose: undefined, //function
-    onOpen: undefined, //function
-    split: ",",  //多选模式下的分隔符
-    min: undefined, //多选模式下可用，最少选择数
-    max: undefined, //单选模式下可用，最多选择数
-    toolbarTemplate: '<div class="toolbar">\
-      <div class="toolbar-inner">\
-      <a href="javascript:;" class="picker-button close-select">{{closeText}}</a>\
-      <h1 class="title">{{title}}</h1>\
-      </div>\
-      </div>',
-    radioTemplate:
-      '<div class="weui-cells weui-cells_radio">\
-        {{#items}}\
-        <label class="weui-cell weui-check_label" for="weui-select-id-{{this.title}}">\
-          <div class="weui-cell__bd weui-cell_primary">\
-            <p>{{this.title}}</p>\
-          </div>\
-          <div class="weui-cell__ft">\
-            <input type="radio" class="weui-check" name="weui-select" id="weui-select-id-{{this.title}}" value="{{this.value}}" {{#if this.checked}}checked="checked"{{/if}} data-title="{{this.title}}">\
-            <span class="weui-icon-checked"></span>\
-          </div>\
-        </label>\
-        {{/items}}\
-      </div>',
-    checkboxTemplate:
-      '<div class="weui-cells weui-cells_checkbox">\
-        {{#items}}\
-        <label class="weui-cell weui-check_label" for="weui-select-id-{{this.title}}">\
-          <div class="weui-cell__bd weui-cell_primary">\
-            <p>{{this.title}}</p>\
-          </div>\
-          <div class="weui-cell__ft">\
-            <input type="checkbox" class="weui-check" name="weui-select" id="weui-select-id-{{this.title}}" value="{{this.value}}" {{#if this.checked}}checked="checked"{{/if}} data-title="{{this.title}}" >\
-            <span class="weui-icon-checked"></span>\
-          </div>\
-        </label>\
-        {{/items}}\
-      </div>',
-  }
-
-}($);
-
-/*======================================================
-************   Calendar   ************
-======================================================*/
-/* global $:true */
-/*jshint unused: false*/
-+function ($) {
-  "use strict";
-  var rtl = false;
-  var defaults;
-  var isSameDate = function (a, b) {
-    var a = new Date(a),
-      b = new Date(b);
-    return a.getFullYear() === b.getFullYear() && a.getMonth() === b.getMonth() && a.getDate() === b.getDate()
-  }
-  var Calendar = function (params) {
-      var p = this;
-      params = params || {};
-      for (var def in defaults) {
-          if (typeof params[def] === 'undefined') {
-              params[def] = defaults[def];
-          }
-      }
-      p.params = params;
-      p.initialized = false;
-
-      // Inline flag
-      p.inline = p.params.container ? true : false;
-
-      // Is horizontal
-      p.isH = p.params.direction === 'horizontal';
-
-      // RTL inverter
-      var inverter = p.isH ? (rtl ? -1 : 1) : 1;
-
-      // Animating flag
-      p.animating = false;
-
-      // Should be converted to popover
-      function isPopover() {
-          var toPopover = false;
-          if (!p.params.convertToPopover && !p.params.onlyInPopover) return toPopover;
-          if (!p.inline && p.params.input) {
-              if (p.params.onlyInPopover) toPopover = true;
-              else {
-                  if ($.device.ios) {
-                      toPopover = $.device.ipad ? true : false;
-                  }
-                  else {
-                      if ($(window).width() >= 768) toPopover = true;
-                  }
-              }
-          } 
-          return toPopover; 
-      }
-      function inPopover() {
-          if (p.opened && p.container && p.container.length > 0 && p.container.parents('.popover').length > 0) return true;
-          else return false;
-      }
-
-      // Format date
-      function formatDate(date) {
-          date = new Date(date);
-          var year = date.getFullYear();
-          var month = date.getMonth();
-          var month1 = month + 1;
-          var day = date.getDate();
-          var weekDay = date.getDay();
-          return p.params.dateFormat
-              .replace(/yyyy/g, year)
-              .replace(/yy/g, (year + '').substring(2))
-              .replace(/mm/g, month1 < 10 ? '0' + month1 : month1)
-              .replace(/m/g, month1)
-              .replace(/MM/g, p.params.monthNames[month])
-              .replace(/M/g, p.params.monthNamesShort[month])
-              .replace(/dd/g, day < 10 ? '0' + day : day)
-              .replace(/d/g, day)
-              .replace(/DD/g, p.params.dayNames[weekDay])
-              .replace(/D/g, p.params.dayNamesShort[weekDay]);
-      }
-
-
-      // Value
-      p.addValue = function (value) {
-          if (p.params.multiple) {
-              if (!p.value) p.value = [];
-              var inValuesIndex;
-              for (var i = 0; i < p.value.length; i++) {
-                  if (isSameDate(value, p.value[i])) {
-                      inValuesIndex = i;
-                  }
-              }
-              if (typeof inValuesIndex === 'undefined') {
-                  p.value.push(value);
-              }
-              else {
-                  p.value.splice(inValuesIndex, 1);
-              }
-              p.updateValue();
-          }
-          else {
-              p.value = [value];
-              p.updateValue();
-          }
-      };
-      p.setValue = function (arrValues) {
-        var date = new Date(arrValues[0]);
-        p.setYearMonth(date.getFullYear(), date.getMonth());
-        p.addValue(+ date);
-      };
-      p.updateValue = function () {
-          p.wrapper.find('.picker-calendar-day-selected').removeClass('picker-calendar-day-selected');
-          var i, inputValue;
-          for (i = 0; i < p.value.length; i++) {
-              var valueDate = new Date(p.value[i]);
-              p.wrapper.find('.picker-calendar-day[data-date="' + valueDate.getFullYear() + '-' + valueDate.getMonth() + '-' + valueDate.getDate() + '"]').addClass('picker-calendar-day-selected');
-          }
-          if (p.params.onChange) {
-            p.params.onChange(p, p.value.map(formatDate), p.value.map(function (d) {
-              return + new Date(typeof d === typeof 'a' ? d.split(/\D/).filter(function (a) { return !!a; }).join("-") : d);
-            }));
-          }
-          if (p.input && p.input.length > 0) {
-              if (p.params.formatValue) inputValue = p.params.formatValue(p, p.value);
-              else {
-                  inputValue = [];
-                  for (i = 0; i < p.value.length; i++) {
-                      inputValue.push(formatDate(p.value[i]));
-                  }
-                  inputValue = inputValue.join(', ');
-              } 
-              $(p.input).val(inputValue);
-              $(p.input).trigger('change');
-          }
-      };
-
-      // Columns Handlers
-      p.initCalendarEvents = function () {
-          var col;
-          var allowItemClick = true;
-          var isTouched, isMoved, touchStartX, touchStartY, touchCurrentX, touchCurrentY, touchStartTime, touchEndTime, startTranslate, currentTranslate, wrapperWidth, wrapperHeight, percentage, touchesDiff, isScrolling;
-          function handleTouchStart (e) {
-              if (isMoved || isTouched) return;
-              // e.preventDefault();
-              isTouched = true;
-              var position = $.getTouchPosition(e);
-              touchStartX = touchCurrentY = position.x;
-              touchStartY = touchCurrentY = position.y;
-              touchStartTime = (new Date()).getTime();
-              percentage = 0;
-              allowItemClick = true;
-              isScrolling = undefined;
-              startTranslate = currentTranslate = p.monthsTranslate;
-          }
-          function handleTouchMove (e) {
-              if (!isTouched) return;
-              var position = $.getTouchPosition(e);
-              touchCurrentX = position.x;
-              touchCurrentY = position.y;
-              if (typeof isScrolling === 'undefined') {
-                  isScrolling = !!(isScrolling || Math.abs(touchCurrentY - touchStartY) > Math.abs(touchCurrentX - touchStartX));
-              }
-              if (p.isH && isScrolling) {
-                  isTouched = false;
-                  return;
-              }
-              e.preventDefault();
-              if (p.animating) {
-                  isTouched = false;
-                  return;   
-              }
-              allowItemClick = false;
-              if (!isMoved) {
-                  // First move
-                  isMoved = true;
-                  wrapperWidth = p.wrapper[0].offsetWidth;
-                  wrapperHeight = p.wrapper[0].offsetHeight;
-                  p.wrapper.transition(0);
-              }
-              e.preventDefault();
-
-              touchesDiff = p.isH ? touchCurrentX - touchStartX : touchCurrentY - touchStartY;
-              percentage = touchesDiff/(p.isH ? wrapperWidth : wrapperHeight);
-              currentTranslate = (p.monthsTranslate * inverter + percentage) * 100;
-
-              // Transform wrapper
-              p.wrapper.transform('translate3d(' + (p.isH ? currentTranslate : 0) + '%, ' + (p.isH ? 0 : currentTranslate) + '%, 0)');
-
-          }
-          function handleTouchEnd (e) {
-              if (!isTouched || !isMoved) {
-                  isTouched = isMoved = false;
-                  return;
-              }
-              isTouched = isMoved = false;
-              
-              touchEndTime = new Date().getTime();
-              if (touchEndTime - touchStartTime < 300) {
-                  if (Math.abs(touchesDiff) < 10) {
-                      p.resetMonth();
-                  }
-                  else if (touchesDiff >= 10) {
-                      if (rtl) p.nextMonth();
-                      else p.prevMonth();
-                  }
-                  else {
-                      if (rtl) p.prevMonth();
-                      else p.nextMonth();   
-                  }
-              }
-              else {
-                  if (percentage <= -0.5) {
-                      if (rtl) p.prevMonth();
-                      else p.nextMonth();
-                  }
-                  else if (percentage >= 0.5) {
-                      if (rtl) p.nextMonth();
-                      else p.prevMonth();
-                  }
-                  else {
-                      p.resetMonth();
-                  }
-              }
-
-              // Allow click
-              setTimeout(function () {
-                  allowItemClick = true;
-              }, 100);
-          }
-
-          function handleDayClick(e) {
-              if (!allowItemClick) return;
-              var day = $(e.target).parents('.picker-calendar-day');
-              if (day.length === 0 && $(e.target).hasClass('picker-calendar-day')) {
-                  day = $(e.target);
-              }
-              if (day.length === 0) return;
-              // if (day.hasClass('picker-calendar-day-selected') && !p.params.multiple) return;
-              if (day.hasClass('picker-calendar-day-disabled')) return;
-              if (day.hasClass('picker-calendar-day-next')) p.nextMonth();
-              if (day.hasClass('picker-calendar-day-prev')) p.prevMonth();
-              var dateYear = day.attr('data-year');
-              var dateMonth = day.attr('data-month');
-              var dateDay = day.attr('data-day');
-              if (p.params.onDayClick) {
-                  p.params.onDayClick(p, day[0], dateYear, dateMonth, dateDay);
-              }
-              p.addValue(new Date(dateYear, dateMonth, dateDay).getTime());
-              if (p.params.closeOnSelect && !p.params.multiple) p.close();
-          }
-
-          p.container.find('.picker-calendar-prev-month').on('click', p.prevMonth);
-          p.container.find('.picker-calendar-next-month').on('click', p.nextMonth);
-          p.container.find('.picker-calendar-prev-year').on('click', p.prevYear);
-          p.container.find('.picker-calendar-next-year').on('click', p.nextYear);
-          p.wrapper.on('click', handleDayClick);
-          if (p.params.touchMove) {
-              p.wrapper.on($.touchEvents.start, handleTouchStart);
-              p.wrapper.on($.touchEvents.move, handleTouchMove);
-              p.wrapper.on($.touchEvents.end, handleTouchEnd);
-          }
-              
-          p.container[0].f7DestroyCalendarEvents = function () {
-              p.container.find('.picker-calendar-prev-month').off('click', p.prevMonth);
-              p.container.find('.picker-calendar-next-month').off('click', p.nextMonth);
-              p.container.find('.picker-calendar-prev-year').off('click', p.prevYear);
-              p.container.find('.picker-calendar-next-year').off('click', p.nextYear);
-              p.wrapper.off('click', handleDayClick);
-              if (p.params.touchMove) {
-                  p.wrapper.off($.touchEvents.start, handleTouchStart);
-                  p.wrapper.off($.touchEvents.move, handleTouchMove);
-                  p.wrapper.off($.touchEvents.end, handleTouchEnd);
-              }
-          };
-          
-
-      };
-      p.destroyCalendarEvents = function (colContainer) {
-          if ('f7DestroyCalendarEvents' in p.container[0]) p.container[0].f7DestroyCalendarEvents();
-      };
-
-      // Calendar Methods
-      p.daysInMonth = function (date) {
-          var d = new Date(date);
-          return new Date(d.getFullYear(), d.getMonth() + 1, 0).getDate();
-      };
-      p.monthHTML = function (date, offset) {
-          date = new Date(date);
-          var year = date.getFullYear(),
-              month = date.getMonth(),
-              day = date.getDate();
-          if (offset === 'next') {
-              if (month === 11) date = new Date(year + 1, 0);
-              else date = new Date(year, month + 1, 1);
-          }
-          if (offset === 'prev') {
-              if (month === 0) date = new Date(year - 1, 11);
-              else date = new Date(year, month - 1, 1);
-          }
-          if (offset === 'next' || offset === 'prev') {
-              month = date.getMonth();
-              year = date.getFullYear();
-          }
-          var daysInPrevMonth = p.daysInMonth(new Date(date.getFullYear(), date.getMonth()).getTime() - 10 * 24 * 60 * 60 * 1000),
-              daysInMonth = p.daysInMonth(date),
-              firstDayOfMonthIndex = new Date(date.getFullYear(), date.getMonth()).getDay();
-          if (firstDayOfMonthIndex === 0) firstDayOfMonthIndex = 7;
-          
-          var dayDate, currentValues = [], i, j,
-              rows = 6, cols = 7,
-              monthHTML = '',
-              dayIndex = 0 + (p.params.firstDay - 1),    
-              today = new Date().setHours(0,0,0,0),
-              minDate = p.params.minDate ? new Date(p.params.minDate).getTime() : null,
-              maxDate = p.params.maxDate ? new Date(p.params.maxDate).getTime() : null;
-
-          if (p.value && p.value.length) {
-              for (i = 0; i < p.value.length; i++) {
-                  currentValues.push(new Date(p.value[i]).setHours(0,0,0,0));
-              }
-          }
-              
-          for (i = 1; i <= rows; i++) {
-              var rowHTML = '';
-              var row = i;
-              for (j = 1; j <= cols; j++) {
-                  var col = j;
-                  dayIndex ++;
-                  var dayNumber = dayIndex - firstDayOfMonthIndex;
-                  var addClass = '';
-                  if (dayNumber < 0) {
-                      dayNumber = daysInPrevMonth + dayNumber + 1;
-                      addClass += ' picker-calendar-day-prev';
-                      dayDate = new Date(month - 1 < 0 ? year - 1 : year, month - 1 < 0 ? 11 : month - 1, dayNumber).getTime();
-                  }
-                  else {
-                      dayNumber = dayNumber + 1;
-                      if (dayNumber > daysInMonth) {
-                          dayNumber = dayNumber - daysInMonth;
-                          addClass += ' picker-calendar-day-next';
-                          dayDate = new Date(month + 1 > 11 ? year + 1 : year, month + 1 > 11 ? 0 : month + 1, dayNumber).getTime();
-                      }
-                      else {
-                          dayDate = new Date(year, month, dayNumber).getTime();    
-                      }
-                  }
-                  // Today
-                  if (dayDate === today) addClass += ' picker-calendar-day-today';
-                  // Selected
-                  if (currentValues.indexOf(dayDate) >= 0) addClass += ' picker-calendar-day-selected';
-                  // Weekend
-                  if (p.params.weekendDays.indexOf(col - 1) >= 0) {
-                      addClass += ' picker-calendar-day-weekend';
-                  }
-                  // Disabled
-                  if ((minDate && dayDate < minDate) || (maxDate && dayDate > maxDate)) {
-                      addClass += ' picker-calendar-day-disabled';   
-                  }
-
-                  dayDate = new Date(dayDate);
-                  var dayYear = dayDate.getFullYear();
-                  var dayMonth = dayDate.getMonth();
-                  rowHTML += '<div data-year="' + dayYear + '" data-month="' + dayMonth + '" data-day="' + dayNumber + '" class="picker-calendar-day' + (addClass) + '" data-date="' + (dayYear + '-' + dayMonth + '-' + dayNumber) + '"><span>'+dayNumber+'</span></div>';
-              }
-              monthHTML += '<div class="picker-calendar-row">' + rowHTML + '</div>';
-          }
-          monthHTML = '<div class="picker-calendar-month" data-year="' + year + '" data-month="' + month + '">' + monthHTML + '</div>';
-          return monthHTML;
-      };
-      p.animating = false;
-      p.updateCurrentMonthYear = function (dir) {
-          if (typeof dir === 'undefined') {
-              p.currentMonth = parseInt(p.months.eq(1).attr('data-month'), 10);
-              p.currentYear = parseInt(p.months.eq(1).attr('data-year'), 10);   
-          }
-          else {
-              p.currentMonth = parseInt(p.months.eq(dir === 'next' ? (p.months.length - 1) : 0).attr('data-month'), 10);
-              p.currentYear = parseInt(p.months.eq(dir === 'next' ? (p.months.length - 1) : 0).attr('data-year'), 10);
-          }
-          p.container.find('.current-month-value').text(p.params.monthNames[p.currentMonth]);
-          p.container.find('.current-year-value').text(p.currentYear);
-              
-      };
-      p.onMonthChangeStart = function (dir) {
-          p.updateCurrentMonthYear(dir);
-          p.months.removeClass('picker-calendar-month-current picker-calendar-month-prev picker-calendar-month-next');
-          var currentIndex = dir === 'next' ? p.months.length - 1 : 0;
-
-          p.months.eq(currentIndex).addClass('picker-calendar-month-current');
-          p.months.eq(dir === 'next' ? currentIndex - 1 : currentIndex + 1).addClass(dir === 'next' ? 'picker-calendar-month-prev' : 'picker-calendar-month-next');
-
-          if (p.params.onMonthYearChangeStart) {
-              p.params.onMonthYearChangeStart(p, p.currentYear, p.currentMonth);
-          }
-      };
-      p.onMonthChangeEnd = function (dir, rebuildBoth) {
-          p.animating = false;
-          var nextMonthHTML, prevMonthHTML, newMonthHTML;
-          p.wrapper.find('.picker-calendar-month:not(.picker-calendar-month-prev):not(.picker-calendar-month-current):not(.picker-calendar-month-next)').remove();
-          
-          if (typeof dir === 'undefined') {
-              dir = 'next';
-              rebuildBoth = true;
-          }
-          if (!rebuildBoth) {
-              newMonthHTML = p.monthHTML(new Date(p.currentYear, p.currentMonth), dir);
-          }
-          else {
-              p.wrapper.find('.picker-calendar-month-next, .picker-calendar-month-prev').remove();
-              prevMonthHTML = p.monthHTML(new Date(p.currentYear, p.currentMonth), 'prev');
-              nextMonthHTML = p.monthHTML(new Date(p.currentYear, p.currentMonth), 'next');
-          }
-          if (dir === 'next' || rebuildBoth) {
-              p.wrapper.append(newMonthHTML || nextMonthHTML);
-          }
-          if (dir === 'prev' || rebuildBoth) {
-              p.wrapper.prepend(newMonthHTML || prevMonthHTML);
-          }
-          p.months = p.wrapper.find('.picker-calendar-month');
-          p.setMonthsTranslate(p.monthsTranslate);
-          if (p.params.onMonthAdd) {
-              p.params.onMonthAdd(p, dir === 'next' ? p.months.eq(p.months.length - 1)[0] : p.months.eq(0)[0]);
-          }
-          if (p.params.onMonthYearChangeEnd) {
-              p.params.onMonthYearChangeEnd(p, p.currentYear, p.currentMonth);
-          }
-      };
-      p.setMonthsTranslate = function (translate) {
-          translate = translate || p.monthsTranslate || 0;
-          if (typeof p.monthsTranslate === 'undefined') p.monthsTranslate = translate;
-          p.months.removeClass('picker-calendar-month-current picker-calendar-month-prev picker-calendar-month-next');
-          var prevMonthTranslate = -(translate + 1) * 100 * inverter;
-          var currentMonthTranslate = -translate * 100 * inverter;
-          var nextMonthTranslate = -(translate - 1) * 100 * inverter;
-          p.months.eq(0).transform('translate3d(' + (p.isH ? prevMonthTranslate : 0) + '%, ' + (p.isH ? 0 : prevMonthTranslate) + '%, 0)').addClass('picker-calendar-month-prev');
-          p.months.eq(1).transform('translate3d(' + (p.isH ? currentMonthTranslate : 0) + '%, ' + (p.isH ? 0 : currentMonthTranslate) + '%, 0)').addClass('picker-calendar-month-current');
-          p.months.eq(2).transform('translate3d(' + (p.isH ? nextMonthTranslate : 0) + '%, ' + (p.isH ? 0 : nextMonthTranslate) + '%, 0)').addClass('picker-calendar-month-next');
-      };
-      p.nextMonth = function (transition) {
-          if (typeof transition === 'undefined' || typeof transition === 'object') {
-              transition = '';
-              if (!p.params.animate) transition = 0;
-          }
-          var nextMonth = parseInt(p.months.eq(p.months.length - 1).attr('data-month'), 10);
-          var nextYear = parseInt(p.months.eq(p.months.length - 1).attr('data-year'), 10);
-          var nextDate = new Date(nextYear, nextMonth);
-          var nextDateTime = nextDate.getTime();
-          var transitionEndCallback = p.animating ? false : true;
-          if (p.params.maxDate) {
-              if (nextDateTime > new Date(p.params.maxDate).getTime()) {
-                  return p.resetMonth();
-              }
-          }
-          p.monthsTranslate --;
-          if (nextMonth === p.currentMonth) {
-              var nextMonthTranslate = -(p.monthsTranslate) * 100 * inverter;
-              var nextMonthHTML = $(p.monthHTML(nextDateTime, 'next')).transform('translate3d(' + (p.isH ? nextMonthTranslate : 0) + '%, ' + (p.isH ? 0 : nextMonthTranslate) + '%, 0)').addClass('picker-calendar-month-next');
-              p.wrapper.append(nextMonthHTML[0]);
-              p.months = p.wrapper.find('.picker-calendar-month');
-              if (p.params.onMonthAdd) {
-                  p.params.onMonthAdd(p, p.months.eq(p.months.length - 1)[0]);
-              }
-          }
-          p.animating = true;
-          p.onMonthChangeStart('next');
-          var translate = (p.monthsTranslate * 100) * inverter;
-
-          p.wrapper.transition(transition).transform('translate3d(' + (p.isH ? translate : 0) + '%, ' + (p.isH ? 0 : translate) + '%, 0)');
-          if (transitionEndCallback) {
-              p.wrapper.transitionEnd(function () {
-                  p.onMonthChangeEnd('next');
-              });
-          }
-          if (!p.params.animate) {
-              p.onMonthChangeEnd('next');
-          }
-      };
-      p.prevMonth = function (transition) {
-          if (typeof transition === 'undefined' || typeof transition === 'object') {
-              transition = '';
-              if (!p.params.animate) transition = 0;
-          }
-          var prevMonth = parseInt(p.months.eq(0).attr('data-month'), 10);
-          var prevYear = parseInt(p.months.eq(0).attr('data-year'), 10);
-          var prevDate = new Date(prevYear, prevMonth + 1, -1);
-          var prevDateTime = prevDate.getTime();
-          var transitionEndCallback = p.animating ? false : true;
-          if (p.params.minDate) {
-              if (prevDateTime < new Date(p.params.minDate).getTime()) {
-                  return p.resetMonth();
-              }
-          }
-          p.monthsTranslate ++;
-          if (prevMonth === p.currentMonth) {
-              var prevMonthTranslate = -(p.monthsTranslate) * 100 * inverter;
-              var prevMonthHTML = $(p.monthHTML(prevDateTime, 'prev')).transform('translate3d(' + (p.isH ? prevMonthTranslate : 0) + '%, ' + (p.isH ? 0 : prevMonthTranslate) + '%, 0)').addClass('picker-calendar-month-prev');
-              p.wrapper.prepend(prevMonthHTML[0]);
-              p.months = p.wrapper.find('.picker-calendar-month');
-              if (p.params.onMonthAdd) {
-                  p.params.onMonthAdd(p, p.months.eq(0)[0]);
-              }
-          }
-          p.animating = true;
-          p.onMonthChangeStart('prev');
-          var translate = (p.monthsTranslate * 100) * inverter;
-          p.wrapper.transition(transition).transform('translate3d(' + (p.isH ? translate : 0) + '%, ' + (p.isH ? 0 : translate) + '%, 0)');
-          if (transitionEndCallback) {
-              p.wrapper.transitionEnd(function () {
-                  p.onMonthChangeEnd('prev');
-              });
-          }
-          if (!p.params.animate) {
-              p.onMonthChangeEnd('prev');
-          }
-      };
-      p.resetMonth = function (transition) {
-          if (typeof transition === 'undefined') transition = '';
-          var translate = (p.monthsTranslate * 100) * inverter;
-          p.wrapper.transition(transition).transform('translate3d(' + (p.isH ? translate : 0) + '%, ' + (p.isH ? 0 : translate) + '%, 0)');
-      };
-      p.setYearMonth = function (year, month, transition) {
-          if (typeof year === 'undefined') year = p.currentYear;
-          if (typeof month === 'undefined') month = p.currentMonth;
-          if (typeof transition === 'undefined' || typeof transition === 'object') {
-              transition = '';
-              if (!p.params.animate) transition = 0;
-          }
-          var targetDate;
-          if (year < p.currentYear) {
-              targetDate = new Date(year, month + 1, -1).getTime();
-          }
-          else {
-              targetDate = new Date(year, month).getTime();
-          }
-          if (p.params.maxDate && targetDate > new Date(p.params.maxDate).getTime()) {
-              return false;
-          }
-          if (p.params.minDate && targetDate < new Date(p.params.minDate).getTime()) {
-              return false;
-          }
-          var currentDate = new Date(p.currentYear, p.currentMonth).getTime();
-          var dir = targetDate > currentDate ? 'next' : 'prev';
-          var newMonthHTML = p.monthHTML(new Date(year, month));
-          p.monthsTranslate = p.monthsTranslate || 0;
-          var prevTranslate = p.monthsTranslate;
-          var monthTranslate, wrapperTranslate;
-          var transitionEndCallback = p.animating ? false : true;
-          if (targetDate > currentDate) {
-              // To next
-              p.monthsTranslate --;
-              if (!p.animating) p.months.eq(p.months.length - 1).remove();
-              p.wrapper.append(newMonthHTML);
-              p.months = p.wrapper.find('.picker-calendar-month');
-              monthTranslate = -(prevTranslate - 1) * 100 * inverter;
-              p.months.eq(p.months.length - 1).transform('translate3d(' + (p.isH ? monthTranslate : 0) + '%, ' + (p.isH ? 0 : monthTranslate) + '%, 0)').addClass('picker-calendar-month-next');
-          }
-          else {
-              // To prev
-              p.monthsTranslate ++;
-              if (!p.animating) p.months.eq(0).remove();
-              p.wrapper.prepend(newMonthHTML);
-              p.months = p.wrapper.find('.picker-calendar-month');
-              monthTranslate = -(prevTranslate + 1) * 100 * inverter;
-              p.months.eq(0).transform('translate3d(' + (p.isH ? monthTranslate : 0) + '%, ' + (p.isH ? 0 : monthTranslate) + '%, 0)').addClass('picker-calendar-month-prev');
-          }
-          if (p.params.onMonthAdd) {
-              p.params.onMonthAdd(p, dir === 'next' ? p.months.eq(p.months.length - 1)[0] : p.months.eq(0)[0]);
-          }
-          p.animating = true;
-          p.onMonthChangeStart(dir);
-          wrapperTranslate = (p.monthsTranslate * 100) * inverter;
-          p.wrapper.transition(transition).transform('translate3d(' + (p.isH ? wrapperTranslate : 0) + '%, ' + (p.isH ? 0 : wrapperTranslate) + '%, 0)');
-          if (transitionEndCallback) {
-             p.wrapper.transitionEnd(function () {
-                  p.onMonthChangeEnd(dir, true);
-              }); 
-          }
-          if (!p.params.animate) {
-              p.onMonthChangeEnd(dir);
-          }
-      };
-      p.nextYear = function () {
-          p.setYearMonth(p.currentYear + 1);
-      };
-      p.prevYear = function () {
-          p.setYearMonth(p.currentYear - 1);
-      };
-      
-
-      // HTML Layout
-      p.layout = function () {
-          var pickerHTML = '';
-          var pickerClass = '';
-          var i;
-          
-          var layoutDate = p.value && p.value.length ? p.value[0] : new Date().setHours(0,0,0,0);
-          var prevMonthHTML = p.monthHTML(layoutDate, 'prev');
-          var currentMonthHTML = p.monthHTML(layoutDate);
-          var nextMonthHTML = p.monthHTML(layoutDate, 'next');
-          var monthsHTML = '<div class="picker-calendar-months"><div class="picker-calendar-months-wrapper">' + (prevMonthHTML + currentMonthHTML + nextMonthHTML) + '</div></div>';
-          // Week days header
-          var weekHeaderHTML = '';
-          if (p.params.weekHeader) {
-              for (i = 0; i < 7; i++) {
-                  var weekDayIndex = (i + p.params.firstDay > 6) ? (i - 7 + p.params.firstDay) : (i + p.params.firstDay);
-                  var dayName = p.params.dayNamesShort[weekDayIndex];
-                  weekHeaderHTML += '<div class="picker-calendar-week-day ' + ((p.params.weekendDays.indexOf(weekDayIndex) >= 0) ? 'picker-calendar-week-day-weekend' : '') + '"> ' + dayName + '</div>';
-                  
-              }
-              weekHeaderHTML = '<div class="picker-calendar-week-days">' + weekHeaderHTML + '</div>';
-          }
-          pickerClass = 'weui-picker-calendar ' + (p.params.cssClass || '');
-          if(!p.inline) pickerClass = 'weui-picker-modal ' + pickerClass;
-          var toolbarHTML = p.params.toolbar ? p.params.toolbarTemplate.replace(/{{closeText}}/g, p.params.toolbarCloseText) : '';
-          if (p.params.toolbar) {
-              toolbarHTML = p.params.toolbarTemplate
-                  .replace(/{{closeText}}/g, p.params.toolbarCloseText)
-                  .replace(/{{monthPicker}}/g, (p.params.monthPicker ? p.params.monthPickerTemplate : ''))
-                  .replace(/{{yearPicker}}/g, (p.params.yearPicker ? p.params.yearPickerTemplate : ''));
-          }
-
-          pickerHTML =
-              '<div class="' + (pickerClass) + '">' +
-                  toolbarHTML +
-                  '<div class="picker-modal-inner">' +
-                      weekHeaderHTML +
-                      monthsHTML +
-                  '</div>' +
-              '</div>';
-              
-              
-          p.pickerHTML = pickerHTML;    
-      };
-
-      // Input Events
-      function openOnInput(e) {
-          e.preventDefault();
-          if (p.opened) return;
-          p.open();
-          if (p.params.scrollToInput && !isPopover()) {
-              var pageContent = p.input.parents('.page-content');
-              if (pageContent.length === 0) return;
-
-              var paddingTop = parseInt(pageContent.css('padding-top'), 10),
-                  paddingBottom = parseInt(pageContent.css('padding-bottom'), 10),
-                  pageHeight = pageContent[0].offsetHeight - paddingTop - p.container.height(),
-                  pageScrollHeight = pageContent[0].scrollHeight - paddingTop - p.container.height(),
-                  newPaddingBottom;
-
-              var inputTop = p.input.offset().top - paddingTop + p.input[0].offsetHeight;
-              if (inputTop > pageHeight) {
-                  var scrollTop = pageContent.scrollTop() + inputTop - pageHeight;
-                  if (scrollTop + pageHeight > pageScrollHeight) {
-                      newPaddingBottom = scrollTop + pageHeight - pageScrollHeight + paddingBottom;
-                      if (pageHeight === pageScrollHeight) {
-                          newPaddingBottom = p.container.height();
-                      }
-                      pageContent.css({'padding-bottom': (newPaddingBottom) + 'px'});
-                  }
-                  pageContent.scrollTop(scrollTop, 300);
-              }
-          }
-      }
-      function closeOnHTMLClick(e) {
-          if (inPopover()) return;
-          if (p.input && p.input.length > 0) {
-              if (e.target !== p.input[0] && $(e.target).parents('.weui-picker-modal').length === 0) p.close();
-          }
-          else {
-              if ($(e.target).parents('.weui-picker-modal').length === 0) p.close();   
-          }
-      }
-
-      if (p.params.input) {
-          p.input = $(p.params.input);
-          if (p.input.length > 0) {
-              if (p.params.inputReadOnly) p.input.prop('readOnly', true);
-              if (!p.inline) {
-                  p.input.on('click', openOnInput);    
-              }
-              if (p.params.inputReadOnly) {
-                  p.input.on('focus mousedown', function (e) {
-                      e.preventDefault();
-                  });
-              }
-          }
-              
-      }
-      
-      //iphone 上无法正确触发 click，会导致点击外面无法关闭
-      if (!p.inline) $(document).on('click touchend', closeOnHTMLClick);
-
-      // Open
-      function onPickerClose() {
-          p.opened = false;
-          if (p.input && p.input.length > 0) p.input.parents('.page-content').css({'padding-bottom': ''});
-          if (p.params.onClose) p.params.onClose(p);
-
-          // Destroy events
-          p.destroyCalendarEvents();
-      }
-
-      p.opened = false;
-      p.open = function () {
-          var toPopover = isPopover() && false;
-          var updateValue = false;
-          if (!p.opened) {
-              // Set date value
-              if (!p.value) {
-                  if (p.params.value) {
-                      p.value = p.params.value;
-                      updateValue = true;
-                  }
-              }
-
-              // Layout
-              p.layout();
-
-              // Append
-              if (toPopover) {
-                  p.pickerHTML = '<div class="popover popover-picker-calendar"><div class="popover-inner">' + p.pickerHTML + '</div></div>';
-                  p.popover = $.popover(p.pickerHTML, p.params.input, true);
-                  p.container = $(p.popover).find('.weui-picker-modal');
-                  $(p.popover).on('close', function () {
-                      onPickerClose();
-                  });
-              }
-              else if (p.inline) {
-                  p.container = $(p.pickerHTML);
-                  p.container.addClass('picker-modal-inline');
-                  $(p.params.container).append(p.container);
-              }
-              else {
-                  p.container = $($.openPicker(p.pickerHTML));
-                  $(p.container)
-                  .on('close', function () {
-                      onPickerClose();
-                  });
-              }
-
-              // Store calendar instance
-              p.container[0].f7Calendar = p;
-              p.wrapper = p.container.find('.picker-calendar-months-wrapper');
-
-              // Months
-              p.months = p.wrapper.find('.picker-calendar-month');
-
-              // Update current month and year
-              p.updateCurrentMonthYear();
-
-              // Set initial translate
-              p.monthsTranslate = 0;
-              p.setMonthsTranslate();
-
-              // Init events
-              p.initCalendarEvents();
-
-              // Update input value
-              if (updateValue) p.updateValue();
-              
-          }
-
-          // Set flag
-          p.opened = true;
-          p.initialized = true;
-          if (p.params.onMonthAdd) {
-              p.months.each(function () {
-                  p.params.onMonthAdd(p, this);
-              });
-          }
-          if (p.params.onOpen) p.params.onOpen(p);
-      };
-
-      // Close
-      p.close = function () {
-          if (!p.opened || p.inline) return;
-          p.animating = false;  //有可能还有动画没做完，因此animating设置还没改。
-          if (inPopover()) {
-              $.closePicker(p.popover);
-              return;
-          }
-          else {
-              $.closePicker(p.container);
-              return;
-          }
-      };
-
-      // Destroy
-      p.destroy = function () {
-          p.close();
-          if (p.params.input && p.input.length > 0) {
-              p.input.off('click focus', openOnInput);
-              p.input.data("calendar", null);
-          }
-          $('html').off('click', closeOnHTMLClick);
-      };
-
-      if (p.inline) {
-          p.open();
-      }
-
-      return p;
-  };
-
-  var format = function(d) {
-    return d < 10 ? "0"+d : d;
-  }
-
-
-  $.fn.calendar = function (params, args) {
-      params = params || {};
-      return this.each(function() {
-        var $this = $(this);
-        if(!$this[0]) return;
-        var p = {};
-        if($this[0].tagName.toUpperCase() === "INPUT") {
-          p.input = $this;
-        } else {
-          p.container = $this;
-        }
-
-        var calendar = $this.data("calendar");
-
-        if(!calendar) {
-          if(typeof params === typeof "a") {
-          } else {
-            if(!params.value && $this.val()) params.value = [$this.val()];
-            //默认显示今天
-            if(!params.value) {
-              var today = new Date();
-              params.value = [today.getFullYear() + "-" + format(today.getMonth() + 1) + "-" + format(today.getDate())];
-            }
-            calendar = $this.data("calendar", new Calendar($.extend(p, params)));
-          }
-        }
-
-        if(typeof params === typeof "a") {
-          calendar[params].call(calendar, args);
-        }
-      });
-  };
-
-  defaults = $.fn.calendar.prototype.defaults = {
-    value: undefined, // 通过JS赋值，注意是数组
-    monthNames: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
-    monthNamesShort: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
-    dayNames: ['周日', '周一', '周二', '周三', '周四', '周五', '周六'],
-    dayNamesShort: ['周日', '周一', '周二', '周三', '周四', '周五', '周六'],
-    firstDay: 1, // First day of the week, Monday
-    weekendDays: [0, 6], // Sunday and Saturday
-    multiple: false,
-    dateFormat: 'yyyy-mm-dd',
-    direction: 'horizontal', // or 'vertical'
-    minDate: null,
-    maxDate: null,
-    touchMove: true,
-    animate: true,
-    closeOnSelect: true,
-    monthPicker: true,
-    monthPickerTemplate: 
-        '<div class="picker-calendar-month-picker">' +
-            '<a href="javascript:;" class="link icon-only picker-calendar-prev-month"><i class="icon icon-prev"></i></a>' +
-            '<div class="current-month-value"></div>' +
-            '<a href="javascript:;" class="link icon-only picker-calendar-next-month"><i class="icon icon-next"></i></a>' +
-        '</div>',
-    yearPicker: true,
-    yearPickerTemplate: 
-        '<div class="picker-calendar-year-picker">' +
-            '<a href="javascript:;" class="link icon-only picker-calendar-prev-year"><i class="icon icon-prev"></i></a>' +
-            '<span class="current-year-value"></span>' +
-            '<a href="javascript:;" class="link icon-only picker-calendar-next-year"><i class="icon icon-next"></i></a>' +
-        '</div>',
-    weekHeader: true,
-    // Common settings
-    scrollToInput: true,
-    inputReadOnly: true,
-    convertToPopover: true,
-    onlyInPopover: false,
-    toolbar: true,
-    toolbarCloseText: 'Done',
-    toolbarTemplate: 
-        '<div class="toolbar">' +
-            '<div class="toolbar-inner">' +
-                '{{yearPicker}}' +
-                '{{monthPicker}}' +
-                // '<a href="#" class="link close-picker">{{closeText}}</a>' +
-            '</div>' +
-        '</div>',
-    /* Callbacks
-    onMonthAdd
-    onChange
-    onOpen
-    onClose
-    onDayClick
-    onMonthYearChangeStart
-    onMonthYearChangeEnd
-    */
-  };
-
-}($);
-
-/* global $:true */
-/* jshint unused:false*/
-
-+ function($) {
-  "use strict";
-
-
-  var defaults;
-
-  var formatNumber = function (n) {
-    return n < 10 ? "0" + n : n;
-  }
-
-  var Datetime = function(input, params) {
-    this.input = $(input);
-    this.params = params;
-
-    this.initMonthes = ('01 02 03 04 05 06 07 08 09 10 11 12').split(' ');
-
-    this.initYears = (function () {
-      var arr = [];
-      for (var i = 1950; i <= 2030; i++) { arr.push(i); }
-      return arr;
-    })();
-
-    var p = $.extend({}, params, this.getConfig());
-    $(this.input).picker(p);
-  }
-
-  Datetime.prototype = {
-    getDays : function(max) {
-      var days = [];
-      for(var i=1; i<= (max||31);i++) {
-        days.push(i < 10 ? "0"+i : i);
-      }
-      return days;
-    },
-
-    getDaysByMonthAndYear : function(month, year) {
-      var int_d = new Date(year, parseInt(month)+1-1, 1);
-      var d = new Date(int_d - 1);
-      return this.getDays(d.getDate());
-    },
-    getConfig: function() {
-      var today = new Date(),
-          params = this.params,
-          self = this,
-          lastValidValues;
-
-      var config = {
-        rotateEffect: false,  //为了性能
-        cssClass: 'datetime-picker',
-
-        value: [today.getFullYear(), formatNumber(today.getMonth()+1), formatNumber(today.getDate()), formatNumber(today.getHours()), (formatNumber(today.getMinutes()))],
-
-        onChange: function (picker, values, displayValues) {
-          var cols = picker.cols;
-          var days = self.getDaysByMonthAndYear(values[1], values[0]);
-          var currentValue = values[2];
-          if(currentValue > days.length) currentValue = days.length;
-          picker.cols[4].setValue(currentValue);
-
-          //check min and max
-          var current = new Date(values[0]+'-'+values[1]+'-'+values[2]);
-          var valid = true;
-          if(params.min) {
-            var min = new Date(typeof params.min === "function" ? params.min() : params.min);
-
-            if(current < +min) {
-              picker.setValue(lastValidValues);
-              valid = false;
-            } 
-          }
-          if(params.max) {
-            var max = new Date(typeof params.max === "function" ? params.max() : params.max);
-            if(current > +max) {
-              picker.setValue(lastValidValues);
-              valid = false;
-            }
-          }
-
-          valid && (lastValidValues = values);
-
-          if (self.params.onChange) {
-            self.params.onChange.apply(this, arguments);
-          }
-        },
-
-        formatValue: function (p, values, displayValues) {
-          return self.params.format(p, values, displayValues);
-        },
-
-        cols: [
-          {
-            values: (function () {
-              var years = [];
-              for (var i=1950; i<=2050; i++) years.push(i);
-              return years;
-            })()
-          },
-          {
-            divider: true,  // 这是一个分隔符
-            content: params.yearSplit
-          },
-          {
-            values: ['01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '11', '12']
-          },
-          {
-            divider: true,  // 这是一个分隔符
-            content: params.monthSplit
-          },
-          {
-            values: (function () {
-              var dates = [];
-              for (var i=1; i<=31; i++) dates.push(formatNumber(i));
-              return dates;
-            })()
-          },
-          
-        ]
-      }
-
-      if (params.dateSplit) {
-        config.cols.push({
-          divider: true,
-          content: params.dateSplit
-        })
-      }
-
-      config.cols.push({
-        divider: true,
-        content: params.datetimeSplit
-      })
-
-      var times = self.params.times();
-      if (times && times.length) {
-        config.cols = config.cols.concat(times);
-      }
-
-      var inputValue = this.input.val();
-      if(inputValue) config.value = params.parse(inputValue);
-      if(this.params.value) {
-        this.input.val(this.params.value);
-        config.value = params.parse(this.params.value);
-      }
-
-      return config;
-    }
-  }
-
-  $.fn.datetimePicker = function(params) {
-    params = $.extend({}, defaults, params);
-    return this.each(function() {
-      if(!this) return;
-      var $this = $(this);
-      var datetime = $this.data("datetime");
-      if(!datetime) $this.data("datetime", new Datetime(this, params));
-      return datetime;
-    });
-  };
-
-  defaults = $.fn.datetimePicker.prototype.defaults = {
-    input: undefined, // 默认值
-    min: undefined, // YYYY-MM-DD 最大最小值只比较年月日，不比较时分秒
-    max: undefined,  // YYYY-MM-DD
-    yearSplit: '-',
-    monthSplit: '-',
-    dateSplit: '',  // 默认为空
-    datetimeSplit: ' ',  // 日期和时间之间的分隔符，不可为空
-    times: function () {
-      return [  // 自定义的时间
-        {
-          values: (function () {
-            var hours = [];
-            for (var i=0; i<24; i++) hours.push(formatNumber(i));
-            return hours;
-          })()
-        },
-        {
-          divider: true,  // 这是一个分隔符
-          content: ':'
-        },
-        {
-          values: (function () {
-            var minutes = [];
-            for (var i=0; i<60; i++) minutes.push(formatNumber(i));
-            return minutes;
-          })()
-        }
-      ];
-    },
-    format: function (p, values) { // 数组转换成字符串
-      return p.cols.map(function (col) {
-        return col.value || col.content;
-      }).join('');
-    },
-    parse: function (str) {
-      // 把字符串转换成数组，用来解析初始值
-      // 如果你的定制的初始值格式无法被这个默认函数解析，请自定义这个函数。比如你的时间是 '子时' 那么默认情况这个'时'会被当做分隔符而导致错误，所以你需要自己定义parse函数
-      // 默认兼容的分隔符
-      var t = str.split(this.datetimeSplit);
-      return t[0].split(/\D/).concat(t[1].split(/:|时|分|秒/)).filter(function (d) {
-        return !!d;
-      })
-    }
-  }
-
-}($);
-
-/*======================================================
-************   Picker   ************
-======================================================*/
-/* global $:true */
-
-+ function($) {
-  "use strict";
-
-
-  //Popup 和 picker 之类的不要共用一个弹出方法，因为这样会导致 在 popup 中再弹出 picker 的时候会有问题。
-
-  $.openPopup = function(popup, className) {
-
-    $.closePopup();
-
-    popup = $(popup);
-    popup.show();
-    popup.width();
-    popup.addClass("weui-popup__container--visible");
-    var modal = popup.find(".weui-popup__modal");
-    modal.width();
-    modal.transitionEnd(function() {
-      modal.trigger("open");
-    });
-  }
-
-
-  $.closePopup = function(container, remove) {
-    container = $(container || ".weui-popup__container--visible");
-    container.find('.weui-popup__modal').transitionEnd(function() {
-      var $this = $(this);
-      $this.trigger("close");
-      container.hide();
-      remove && container.remove();
-    })
-    container.removeClass("weui-popup__container--visible")
-  };
-
-
-  $(document).on("click", ".close-popup, .weui-popup__overlay", function() {
-    $.closePopup();
-  })
-  .on("click", ".open-popup", function() {
-    $($(this).data("target")).popup();
-  })
-  .on("click", ".weui-popup__container", function(e) {
-    if($(e.target).hasClass("weui-popup__container")) $.closePopup();
-  })
-
-  $.fn.popup = function() {
-    return this.each(function() {
-      $.openPopup(this);
-    });
-  };
-
-}($);
-
-/* ===============================================================================
-************   Notification ************
-=============================================================================== */
-/* global $:true */
-+function ($) {
-  "use strict";
-
-  var noti, defaults, timeout, start, diffX, diffY;
-
-  var touchStart = function(e) {
-    var p = $.getTouchPosition(e);
-    start = p;
-    diffX = diffY = 0;
-    noti.addClass("touching");
-  };
-  var touchMove = function(e) {
-    if(!start) return false;
-    e.preventDefault();
-    e.stopPropagation();
-    var p = $.getTouchPosition(e);
-    diffX = p.x - start.x;
-    diffY = p.y - start.y;
-    if(diffY > 0) {
-      diffY = Math.sqrt(diffY);
-    }
-
-    noti.css("transform", "translate3d(0, "+diffY+"px, 0)");
-  };
-  var touchEnd = function() {
-    noti.removeClass("touching");
-    noti.attr("style", "");
-    if(diffY < 0 && (Math.abs(diffY) > noti.height()*0.38)) {
-      $.closeNotification();
-    }
-
-    if(Math.abs(diffX) <= 1 && Math.abs(diffY) <= 1) {
-      noti.trigger("noti-click");
-    }
-
-    start = false;
-  };
-
-  var attachEvents = function(el) {
-    el.on($.touchEvents.start, touchStart);
-    el.on($.touchEvents.move, touchMove);
-    el.on($.touchEvents.end, touchEnd);
-  };
-
-  $.notification = $.noti = function(params) {
-    params = $.extend({}, defaults, params);
-    noti = $(".weui-notification");
-    if(!noti[0]) { // create a new notification
-      noti = $('<div class="weui-notification"></div>').appendTo(document.body);
-      attachEvents(noti);
-    }
-
-    noti.off("noti-click"); //the click event is not correct sometime: it will trigger when user is draging.
-    if(params.onClick) noti.on("noti-click", function() {
-      params.onClick(params.data);
-    });
-
-    noti.html($.t7.compile(params.tpl)(params));
-
-    noti.show();
-
-    noti.addClass("weui-notification--in");
-    noti.data("params", params);
-
-    var startTimeout = function() {
-      if(timeout) {
-        clearTimeout(timeout);
-        timeout = null;
-      }
-
-      timeout = setTimeout(function() {
-        if(noti.hasClass("weui-notification--touching")) {
-          startTimeout();
-        } else {
-          $.closeNotification();
-        }
-      }, params.time);
-    };
-
-    startTimeout();
-
-  };
-
-  $.closeNotification = function() {
-    timeout && clearTimeout(timeout);
-    timeout = null;
-    var noti = $(".weui-notification").removeClass("weui-notification--in").transitionEnd(function() {
-      $(this).remove();
-    });
-
-    if(noti[0]) {
-      var params = $(".weui-notification").data("params");
-      if(params && params.onClose) {
-        params.onClose(params.data);
-      }
-    }
-  };
-
-  defaults = $.noti.prototype.defaults = {
-    title: undefined,
-    text: undefined,
-    media: undefined,
-    time: 4000,
-    onClick: undefined,
-    onClose: undefined,
-    data: undefined,
-    tpl:  '<div class="weui-notification__inner">' +
-            '{{#if media}}<div class="weui-notification__media">{{media}}</div>{{/if}}' +
-            '<div class="weui-notification__content">' +
-            '{{#if title}}<div class="weui-notification__title">{{title}}</div>{{/if}}' +
-            '{{#if text}}<div class="weui-notification__text">{{text}}</div>{{/if}}' +
-            '</div>' +
-            '<div class="weui-notification__handle-bar"></div>' +
-          '</div>'
-  };
-
-}($);
-
-+ function($) {
-  "use strict";
-
-  var timeout;
-
-  $.toptip = function(text, duration, type) {
-    if(!text) return;
-    if(typeof duration === typeof "a") {
-      type = duration;
-      duration = undefined;
-    }
-    duration = duration || 3000;
-    var className = type ? 'bg-' + type : 'bg-danger';
-    var $t = $('.weui-toptips').remove();
-    $t = $('<div class="weui-toptips"></div>').appendTo(document.body);
-    $t.html(text);
-    $t[0].className = 'weui-toptips ' + className
-
-    clearTimeout(timeout);
-
-    if(!$t.hasClass('weui-toptips_visible')) {
-      $t.show().width();
-      $t.addClass('weui-toptips_visible');
-    }
-
-    timeout = setTimeout(function() {
-      $t.removeClass('weui-toptips_visible').transitionEnd(function() {
-        $t.remove();
-      });
-    }, duration);
-  }
-}($);
-
-/* global $:true */
-+ function($) {
-  "use strict";
-  var Slider = function (container, arg) {
-    this.container = $(container);
-    this.handler = this.container.find('.weui-slider__handler')
-    this.track = this.container.find('.weui-slider__track')
-    this.value = this.container.find('.weui-slider-box__value')
-    this.bind()
-    if (typeof arg === 'function') {
-      this.callback = arg
-    }
-  }
-
-  Slider.prototype.bind = function () {
-    this.container
-      .on($.touchEvents.start, $.proxy(this.touchStart, this))
-      .on($.touchEvents.end, $.proxy(this.touchEnd, this));
-    $(document.body).on($.touchEvents.move, $.proxy(this.touchMove, this)) // move even outside container
-  }
-
-  Slider.prototype.touchStart = function (e) {
-    e.preventDefault()
-    this.start = $.getTouchPosition(e)
-    this.width = this.container.find('.weui-slider__inner').width()
-    this.left = parseInt(this.container.find('.weui-slider__handler').css('left'))
-    this.touching = true
-  }
-
-  Slider.prototype.touchMove = function (e) {
-    if (!this.touching) return true
-    var p = $.getTouchPosition(e)
-    var distance = p.x - this.start.x
-    var left = distance + this.left
-    var per = parseInt(left / this.width * 100)
-    if (per < 0) per = 0
-    if (per > 100) per = 100
-    this.handler.css('left', per + '%')
-    this.track.css('width', per + '%')
-    this.value.text(per)
-    this.callback && this.callback.call(this, per)
-    this.container.trigger('change', per)
-  }
-
-  Slider.prototype.touchEnd = function (e) {
-    this.touching = false
-  }
-
-  $.fn.slider = function (arg) {
-    this.each(function () {
-      var $this = $(this)
-      var slider = $this.data('slider')
-      if (slider) return slider;
-      else $this.data('slider', new Slider(this, arg))
-    })
-  }
-}($);
diff --git a/NewLife.Cube/Content/jweui/js/jquery-weui.min.js b/NewLife.Cube/Content/jweui/js/jquery-weui.min.js
deleted file mode 100644
index 2c13d626ab..0000000000
--- a/NewLife.Cube/Content/jweui/js/jquery-weui.min.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/** 
-* jQuery WeUI V1.0.1 
-* By 言川
-* http://lihongxun945.github.io/jquery-weui/
- */
-!function(t){"use strict";t.fn.transitionEnd=function(t){function e(r){if(r.target===this)for(t.call(this,r),n=0;n<i.length;n++)a.off(i[n],e)}var n,i=["webkitTransitionEnd","transitionend","oTransitionEnd","MSTransitionEnd","msTransitionEnd"],a=this;if(t)for(n=0;n<i.length;n++)a.on(i[n],e);return this},t.support=function(){var t={touch:!!("ontouchstart"in window||window.DocumentTouch&&document instanceof window.DocumentTouch)};return t}(),t.touchEvents={start:t.support.touch?"touchstart":"mousedown",move:t.support.touch?"touchmove":"mousemove",end:t.support.touch?"touchend":"mouseup"},t.getTouchPosition=function(t){return t=t.originalEvent||t,"touchstart"===t.type||"touchmove"===t.type||"touchend"===t.type?{x:t.targetTouches[0].pageX,y:t.targetTouches[0].pageY}:{x:t.pageX,y:t.pageY}},t.fn.scrollHeight=function(){return this[0].scrollHeight},t.fn.transform=function(t){for(var e=0;e<this.length;e++){var n=this[e].style;n.webkitTransform=n.MsTransform=n.msTransform=n.MozTransform=n.OTransform=n.transform=t}return this},t.fn.transition=function(t){"string"!=typeof t&&(t+="ms");for(var e=0;e<this.length;e++){var n=this[e].style;n.webkitTransitionDuration=n.MsTransitionDuration=n.msTransitionDuration=n.MozTransitionDuration=n.OTransitionDuration=n.transitionDuration=t}return this},t.getTranslate=function(t,e){var n,i,a,r;return"undefined"==typeof e&&(e="x"),a=window.getComputedStyle(t,null),window.WebKitCSSMatrix?r=new WebKitCSSMatrix("none"===a.webkitTransform?"":a.webkitTransform):(r=a.MozTransform||a.OTransform||a.MsTransform||a.msTransform||a.transform||a.getPropertyValue("transform").replace("translate(","matrix(1, 0, 0, 1,"),n=r.toString().split(",")),"x"===e&&(i=window.WebKitCSSMatrix?r.m41:16===n.length?parseFloat(n[12]):parseFloat(n[4])),"y"===e&&(i=window.WebKitCSSMatrix?r.m42:16===n.length?parseFloat(n[13]):parseFloat(n[5])),i||0},t.requestAnimationFrame=function(t){return window.requestAnimationFrame?window.requestAnimationFrame(t):window.webkitRequestAnimationFrame?window.webkitRequestAnimationFrame(t):window.mozRequestAnimationFrame?window.mozRequestAnimationFrame(t):window.setTimeout(t,1e3/60)},t.cancelAnimationFrame=function(t){return window.cancelAnimationFrame?window.cancelAnimationFrame(t):window.webkitCancelAnimationFrame?window.webkitCancelAnimationFrame(t):window.mozCancelAnimationFrame?window.mozCancelAnimationFrame(t):window.clearTimeout(t)},t.fn.join=function(t){return this.toArray().join(t)}}($),+function(t){"use strict";t.Template7=t.t7=function(){function t(t){return"[object Array]"===Object.prototype.toString.apply(t)}function e(t){return"function"==typeof t}function n(t){var e,n,i,a=t.replace(/[{}#}]/g,"").split(" "),r=[];for(n=0;n<a.length;n++){var o=a[n];if(0===n)r.push(o);else if(0===o.indexOf('"'))if(2===o.match(/"/g).length)r.push(o);else{for(e=0,i=n+1;i<a.length;i++)if(o+=" "+a[i],a[i].indexOf('"')>=0){e=i,r.push(o);break}e&&(n=e)}else if(o.indexOf("=")>0){var s=o.split("="),c=s[0],l=s[1];if(2!==l.match(/"/g).length){for(e=0,i=n+1;i<a.length;i++)if(l+=" "+a[i],a[i].indexOf('"')>=0){e=i;break}e&&(n=e)}var u=[c,l.replace(/"/g,"")];r.push(u)}else r.push(o)}return r}function i(e){var i,a,r=[];if(!e)return[];var o=e.split(/({{[^{^}]*}})/);for(i=0;i<o.length;i++){var s=o[i];if(""!==s)if(s.indexOf("{{")<0)r.push({type:"plain",content:s});else{if(s.indexOf("{/")>=0)continue;if(s.indexOf("{#")<0&&s.indexOf(" ")<0&&s.indexOf("else")<0){r.push({type:"variable",contextName:s.replace(/[{}]/g,"")});continue}var c=n(s),l=c[0],u=[],p={};for(a=1;a<c.length;a++){var h=c[a];t(h)?p[h[0]]="false"===h[1]?!1:h[1]:u.push(h)}if(s.indexOf("{#")>=0){var d,f="",m="",v=0,g=!1,w=!1,y=0;for(a=i+1;a<o.length;a++)if(o[a].indexOf("{{#")>=0&&y++,o[a].indexOf("{{/")>=0&&y--,o[a].indexOf("{{#"+l)>=0)f+=o[a],w&&(m+=o[a]),v++;else if(o[a].indexOf("{{/"+l)>=0){if(!(v>0)){d=a,g=!0;break}v--,f+=o[a],w&&(m+=o[a])}else o[a].indexOf("else")>=0&&0===y?w=!0:(w||(f+=o[a]),w&&(m+=o[a]));g&&(d&&(i=d),r.push({type:"helper",helperName:l,contextName:u,content:f,inverseContent:m,hash:p}))}else s.indexOf(" ")>0&&r.push({type:"helper",helperName:l,contextName:u,hash:p})}}return r}var a=function(t){function e(t,e){return t.content?o(t.content,e):function(){return""}}function n(t,e){return t.inverseContent?o(t.inverseContent,e):function(){return""}}function a(t,e){var n,i,a=0;if(0===t.indexOf("../")){a=t.split("../").length-1;var r=e.split("_")[1]-a;e="ctx_"+(r>=1?r:1),i=t.split("../")[a].split(".")}else 0===t.indexOf("@global")?(e="$.Template7.global",i=t.split("@global.")[1].split(".")):0===t.indexOf("@root")?(e="ctx_1",i=t.split("@root.")[1].split(".")):i=t.split(".");n=e;for(var o=0;o<i.length;o++){var s=i[o];0===s.indexOf("@")?o>0?n+="[(data && data."+s.replace("@","")+")]":n="(data && data."+t.replace("@","")+")":isFinite(s)?n+="["+s+"]":0===s.indexOf("this")?n=s.replace("this",e):n+="."+s}return n}function r(t,e){for(var n=[],i=0;i<t.length;i++)0===t[i].indexOf('"')?n.push(t[i]):n.push(a(t[i],e));return n.join(", ")}function o(t,o){if(o=o||1,t=t||s.template,"string"!=typeof t)throw new Error("Template7: Template must be a string");var c=i(t);if(0===c.length)return function(){return""};var l="ctx_"+o,u="(function ("+l+", data) {\n";1===o&&(u+="function isArray(arr){return Object.prototype.toString.apply(arr) === '[object Array]';}\n",u+="function isFunction(func){return (typeof func === 'function');}\n",u+='function c(val, ctx) {if (typeof val !== "undefined") {if (isFunction(val)) {return val.call(ctx);} else return val;} else return "";}\n'),u+="var r = '';\n";var p;for(p=0;p<c.length;p++){var h=c[p];if("plain"!==h.type){var d,f;if("variable"===h.type&&(d=a(h.contextName,l),u+="r += c("+d+", "+l+");"),"helper"===h.type)if(h.helperName in s.helpers)f=r(h.contextName,l),u+="r += ($.Template7.helpers."+h.helperName+").call("+l+", "+(f&&f+", ")+"{hash:"+JSON.stringify(h.hash)+", data: data || {}, fn: "+e(h,o+1)+", inverse: "+n(h,o+1)+", root: ctx_1});";else{if(h.contextName.length>0)throw new Error('Template7: Missing helper: "'+h.helperName+'"');d=a(h.helperName,l),u+="if ("+d+") {",u+="if (isArray("+d+")) {",u+="r += ($.Template7.helpers.each).call("+l+", "+d+", {hash:"+JSON.stringify(h.hash)+", data: data || {}, fn: "+e(h,o+1)+", inverse: "+n(h,o+1)+", root: ctx_1});",u+="}else {",u+="r += ($.Template7.helpers.with).call("+l+", "+d+", {hash:"+JSON.stringify(h.hash)+", data: data || {}, fn: "+e(h,o+1)+", inverse: "+n(h,o+1)+", root: ctx_1});",u+="}}"}}else u+="r +='"+h.content.replace(/\r/g,"\\r").replace(/\n/g,"\\n").replace(/'/g,"\\'")+"';"}return u+="\nreturn r;})",eval.call(window,u)}var s=this;s.template=t,s.compile=function(t){return s.compiled||(s.compiled=o(t)),s.compiled}};a.prototype={options:{},helpers:{"if":function(t,n){return e(t)&&(t=t.call(this)),t?n.fn(this,n.data):n.inverse(this,n.data)},unless:function(t,n){return e(t)&&(t=t.call(this)),t?n.inverse(this,n.data):n.fn(this,n.data)},each:function(n,i){var a="",r=0;if(e(n)&&(n=n.call(this)),t(n)){for(i.hash.reverse&&(n=n.reverse()),r=0;r<n.length;r++)a+=i.fn(n[r],{first:0===r,last:r===n.length-1,index:r});i.hash.reverse&&(n=n.reverse())}else for(var o in n)r++,a+=i.fn(n[o],{key:o});return r>0?a:i.inverse(this)},"with":function(t,n){return e(t)&&(t=t.call(this)),n.fn(t)},join:function(t,n){return e(t)&&(t=t.call(this)),t.join(n.hash.delimiter||n.hash.delimeter)},js:function(t,e){var n;return n=t.indexOf("return")>=0?"(function(){"+t+"})":"(function(){return ("+t+")})",eval.call(this,n).call(this)},js_compare:function(t,e){var n;n=t.indexOf("return")>=0?"(function(){"+t+"})":"(function(){return ("+t+")})";var i=eval.call(this,n).call(this);return i?e.fn(this,e.data):e.inverse(this,e.data)}}};var r=function(t,e){if(2===arguments.length){var n=new a(t),i=n.compile()(e);return n=null,i}return new a(t)};return r.registerHelper=function(t,e){a.prototype.helpers[t]=e},r.unregisterHelper=function(t){a.prototype.helpers[t]=void 0,delete a.prototype.helpers[t]},r.compile=function(t,e){var n=new a(t,e);return n.compile()},r.options=a.prototype.options,r.helpers=a.prototype.helpers,r}()}($),/*! Hammer.JS - v2.0.8 - 2016-04-23
- * http://hammerjs.github.io/
- *
- * Copyright (c) 2016 Jorik Tangelder;
- * Licensed under the MIT license */
-function(t,e,n,i){"use strict";function a(t,e,n){return setTimeout(l(t,n),e)}function r(t,e,n){return Array.isArray(t)?(o(t,n[e],n),!0):!1}function o(t,e,n){var a;if(t)if(t.forEach)t.forEach(e,n);else if(t.length!==i)for(a=0;a<t.length;)e.call(n,t[a],a,t),a++;else for(a in t)t.hasOwnProperty(a)&&e.call(n,t[a],a,t)}function s(e,n,i){var a="DEPRECATED METHOD: "+n+"\n"+i+" AT \n";return function(){var n=new Error("get-stack-trace"),i=n&&n.stack?n.stack.replace(/^[^\(]+?[\n$]/gm,"").replace(/^\s+at\s+/gm,"").replace(/^Object.<anonymous>\s*\(/gm,"{anonymous}()@"):"Unknown Stack Trace",r=t.console&&(t.console.warn||t.console.log);return r&&r.call(t.console,a,i),e.apply(this,arguments)}}function c(t,e,n){var i,a=e.prototype;i=t.prototype=Object.create(a),i.constructor=t,i._super=a,n&&pt(i,n)}function l(t,e){return function(){return t.apply(e,arguments)}}function u(t,e){return typeof t==ft?t.apply(e?e[0]||i:i,e):t}function p(t,e){return t===i?e:t}function h(t,e,n){o(v(e),function(e){t.addEventListener(e,n,!1)})}function d(t,e,n){o(v(e),function(e){t.removeEventListener(e,n,!1)})}function f(t,e){for(;t;){if(t==e)return!0;t=t.parentNode}return!1}function m(t,e){return t.indexOf(e)>-1}function v(t){return t.trim().split(/\s+/g)}function g(t,e,n){if(t.indexOf&&!n)return t.indexOf(e);for(var i=0;i<t.length;){if(n&&t[i][n]==e||!n&&t[i]===e)return i;i++}return-1}function w(t){return Array.prototype.slice.call(t,0)}function y(t,e,n){for(var i=[],a=[],r=0;r<t.length;){var o=e?t[r][e]:t[r];g(a,o)<0&&i.push(t[r]),a[r]=o,r++}return n&&(i=e?i.sort(function(t,n){return t[e]>n[e]}):i.sort()),i}function T(t,e){for(var n,a,r=e[0].toUpperCase()+e.slice(1),o=0;o<ht.length;){if(n=ht[o],a=n?n+r:e,a in t)return a;o++}return i}function k(){return Tt++}function x(e){var n=e.ownerDocument||e;return n.defaultView||n.parentWindow||t}function C(t,e){var n=this;this.manager=t,this.callback=e,this.element=t.element,this.target=t.options.inputTarget,this.domHandler=function(e){u(t.options.enable,[t])&&n.handler(e)},this.init()}function b(t){var e,n=t.options.inputClass;return new(e=n?n:Ct?F:bt?L:xt?j:N)(t,M)}function M(t,e,n){var i=n.pointers.length,a=n.changedPointers.length,r=e&Pt&&i-a===0,o=e&(It|Ht)&&i-a===0;n.isFirst=!!r,n.isFinal=!!o,r&&(t.session={}),n.eventType=e,_(t,n),t.emit("hammer.input",n),t.recognize(n),t.session.prevInput=n}function _(t,e){var n=t.session,i=e.pointers,a=i.length;n.firstInput||(n.firstInput=O(e)),a>1&&!n.firstMultiple?n.firstMultiple=O(e):1===a&&(n.firstMultiple=!1);var r=n.firstInput,o=n.firstMultiple,s=o?o.center:r.center,c=e.center=P(i);e.timeStamp=gt(),e.deltaTime=e.timeStamp-r.timeStamp,e.angle=S(s,c),e.distance=H(s,c),E(n,e),e.offsetDirection=I(e.deltaX,e.deltaY);var l=A(e.deltaTime,e.deltaX,e.deltaY);e.overallVelocityX=l.x,e.overallVelocityY=l.y,e.overallVelocity=vt(l.x)>vt(l.y)?l.x:l.y,e.scale=o?V(o.pointers,i):1,e.rotation=o?Y(o.pointers,i):0,e.maxPointers=n.prevInput?e.pointers.length>n.prevInput.maxPointers?e.pointers.length:n.prevInput.maxPointers:e.pointers.length,D(n,e);var u=t.element;f(e.srcEvent.target,u)&&(u=e.srcEvent.target),e.target=u}function E(t,e){var n=e.center,i=t.offsetDelta||{},a=t.prevDelta||{},r=t.prevInput||{};e.eventType!==Pt&&r.eventType!==It||(a=t.prevDelta={x:r.deltaX||0,y:r.deltaY||0},i=t.offsetDelta={x:n.x,y:n.y}),e.deltaX=a.x+(n.x-i.x),e.deltaY=a.y+(n.y-i.y)}function D(t,e){var n,a,r,o,s=t.lastInterval||e,c=e.timeStamp-s.timeStamp;if(e.eventType!=Ht&&(c>Ot||s.velocity===i)){var l=e.deltaX-s.deltaX,u=e.deltaY-s.deltaY,p=A(c,l,u);a=p.x,r=p.y,n=vt(p.x)>vt(p.y)?p.x:p.y,o=I(l,u),t.lastInterval=e}else n=s.velocity,a=s.velocityX,r=s.velocityY,o=s.direction;e.velocity=n,e.velocityX=a,e.velocityY=r,e.direction=o}function O(t){for(var e=[],n=0;n<t.pointers.length;)e[n]={clientX:mt(t.pointers[n].clientX),clientY:mt(t.pointers[n].clientY)},n++;return{timeStamp:gt(),pointers:e,center:P(e),deltaX:t.deltaX,deltaY:t.deltaY}}function P(t){var e=t.length;if(1===e)return{x:mt(t[0].clientX),y:mt(t[0].clientY)};for(var n=0,i=0,a=0;e>a;)n+=t[a].clientX,i+=t[a].clientY,a++;return{x:mt(n/e),y:mt(i/e)}}function A(t,e,n){return{x:e/t||0,y:n/t||0}}function I(t,e){return t===e?St:vt(t)>=vt(e)?0>t?Yt:Vt:0>e?Nt:Ft}function H(t,e,n){n||(n=Rt);var i=e[n[0]]-t[n[0]],a=e[n[1]]-t[n[1]];return Math.sqrt(i*i+a*a)}function S(t,e,n){n||(n=Rt);var i=e[n[0]]-t[n[0]],a=e[n[1]]-t[n[1]];return 180*Math.atan2(a,i)/Math.PI}function Y(t,e){return S(e[1],e[0],jt)+S(t[1],t[0],jt)}function V(t,e){return H(e[0],e[1],jt)/H(t[0],t[1],jt)}function N(){this.evEl=Xt,this.evWin=Wt,this.pressed=!1,C.apply(this,arguments)}function F(){this.evEl=Bt,this.evWin=Gt,C.apply(this,arguments),this.store=this.manager.session.pointerEvents=[]}function q(){this.evTarget=Zt,this.evWin=Qt,this.started=!1,C.apply(this,arguments)}function z(t,e){var n=w(t.touches),i=w(t.changedTouches);return e&(It|Ht)&&(n=y(n.concat(i),"identifier",!0)),[n,i]}function L(){this.evTarget=ee,this.targetIds={},C.apply(this,arguments)}function R(t,e){var n=w(t.touches),i=this.targetIds;if(e&(Pt|At)&&1===n.length)return i[n[0].identifier]=!0,[n,n];var a,r,o=w(t.changedTouches),s=[],c=this.target;if(r=n.filter(function(t){return f(t.target,c)}),e===Pt)for(a=0;a<r.length;)i[r[a].identifier]=!0,a++;for(a=0;a<o.length;)i[o[a].identifier]&&s.push(o[a]),e&(It|Ht)&&delete i[o[a].identifier],a++;return s.length?[y(r.concat(s),"identifier",!0),s]:void 0}function j(){C.apply(this,arguments);var t=l(this.handler,this);this.touch=new L(this.manager,t),this.mouse=new N(this.manager,t),this.primaryTouch=null,this.lastTouches=[]}function $(t,e){t&Pt?(this.primaryTouch=e.changedPointers[0].identifier,X.call(this,e)):t&(It|Ht)&&X.call(this,e)}function X(t){var e=t.changedPointers[0];if(e.identifier===this.primaryTouch){var n={x:e.clientX,y:e.clientY};this.lastTouches.push(n);var i=this.lastTouches,a=function(){var t=i.indexOf(n);t>-1&&i.splice(t,1)};setTimeout(a,ne)}}function W(t){for(var e=t.srcEvent.clientX,n=t.srcEvent.clientY,i=0;i<this.lastTouches.length;i++){var a=this.lastTouches[i],r=Math.abs(e-a.x),o=Math.abs(n-a.y);if(ie>=r&&ie>=o)return!0}return!1}function K(t,e){this.manager=t,this.set(e)}function U(t){if(m(t,le))return le;var e=m(t,ue),n=m(t,pe);return e&&n?le:e||n?e?ue:pe:m(t,ce)?ce:se}function B(){if(!re)return!1;var e={},n=t.CSS&&t.CSS.supports;return["auto","manipulation","pan-y","pan-x","pan-x pan-y","none"].forEach(function(i){e[i]=n?t.CSS.supports("touch-action",i):!0}),e}function G(t){this.options=pt({},this.defaults,t||{}),this.id=k(),this.manager=null,this.options.enable=p(this.options.enable,!0),this.state=de,this.simultaneous={},this.requireFail=[]}function J(t){return t&we?"cancel":t&ve?"end":t&me?"move":t&fe?"start":""}function Z(t){return t==Ft?"down":t==Nt?"up":t==Yt?"left":t==Vt?"right":""}function Q(t,e){var n=e.manager;return n?n.get(t):t}function tt(){G.apply(this,arguments)}function et(){tt.apply(this,arguments),this.pX=null,this.pY=null}function nt(){tt.apply(this,arguments)}function it(){G.apply(this,arguments),this._timer=null,this._input=null}function at(){tt.apply(this,arguments)}function rt(){tt.apply(this,arguments)}function ot(){G.apply(this,arguments),this.pTime=!1,this.pCenter=!1,this._timer=null,this._input=null,this.count=0}function st(t,e){return e=e||{},e.recognizers=p(e.recognizers,st.defaults.preset),new ct(t,e)}function ct(t,e){this.options=pt({},st.defaults,e||{}),this.options.inputTarget=this.options.inputTarget||t,this.handlers={},this.session={},this.recognizers=[],this.oldCssProps={},this.element=t,this.input=b(this),this.touchAction=new K(this,this.options.touchAction),lt(this,!0),o(this.options.recognizers,function(t){var e=this.add(new t[0](t[1]));t[2]&&e.recognizeWith(t[2]),t[3]&&e.requireFailure(t[3])},this)}function lt(t,e){var n=t.element;if(n.style){var i;o(t.options.cssProps,function(a,r){i=T(n.style,r),e?(t.oldCssProps[i]=n.style[i],n.style[i]=a):n.style[i]=t.oldCssProps[i]||""}),e||(t.oldCssProps={})}}function ut(t,n){var i=e.createEvent("Event");i.initEvent(t,!0,!0),i.gesture=n,n.target.dispatchEvent(i)}var pt,ht=["","webkit","Moz","MS","ms","o"],dt=e.createElement("div"),ft="function",mt=Math.round,vt=Math.abs,gt=Date.now;pt="function"!=typeof Object.assign?function(t){if(t===i||null===t)throw new TypeError("Cannot convert undefined or null to object");for(var e=Object(t),n=1;n<arguments.length;n++){var a=arguments[n];if(a!==i&&null!==a)for(var r in a)a.hasOwnProperty(r)&&(e[r]=a[r])}return e}:Object.assign;var wt=s(function(t,e,n){for(var a=Object.keys(e),r=0;r<a.length;)(!n||n&&t[a[r]]===i)&&(t[a[r]]=e[a[r]]),r++;return t},"extend","Use `assign`."),yt=s(function(t,e){return wt(t,e,!0)},"merge","Use `assign`."),Tt=1,kt=/mobile|tablet|ip(ad|hone|od)|android/i,xt="ontouchstart"in t,Ct=T(t,"PointerEvent")!==i,bt=xt&&kt.test(navigator.userAgent),Mt="touch",_t="pen",Et="mouse",Dt="kinect",Ot=25,Pt=1,At=2,It=4,Ht=8,St=1,Yt=2,Vt=4,Nt=8,Ft=16,qt=Yt|Vt,zt=Nt|Ft,Lt=qt|zt,Rt=["x","y"],jt=["clientX","clientY"];C.prototype={handler:function(){},init:function(){this.evEl&&h(this.element,this.evEl,this.domHandler),this.evTarget&&h(this.target,this.evTarget,this.domHandler),this.evWin&&h(x(this.element),this.evWin,this.domHandler)},destroy:function(){this.evEl&&d(this.element,this.evEl,this.domHandler),this.evTarget&&d(this.target,this.evTarget,this.domHandler),this.evWin&&d(x(this.element),this.evWin,this.domHandler)}};var $t={mousedown:Pt,mousemove:At,mouseup:It},Xt="mousedown",Wt="mousemove mouseup";c(N,C,{handler:function(t){var e=$t[t.type];e&Pt&&0===t.button&&(this.pressed=!0),e&At&&1!==t.which&&(e=It),this.pressed&&(e&It&&(this.pressed=!1),this.callback(this.manager,e,{pointers:[t],changedPointers:[t],pointerType:Et,srcEvent:t}))}});var Kt={pointerdown:Pt,pointermove:At,pointerup:It,pointercancel:Ht,pointerout:Ht},Ut={2:Mt,3:_t,4:Et,5:Dt},Bt="pointerdown",Gt="pointermove pointerup pointercancel";t.MSPointerEvent&&!t.PointerEvent&&(Bt="MSPointerDown",Gt="MSPointerMove MSPointerUp MSPointerCancel"),c(F,C,{handler:function(t){var e=this.store,n=!1,i=t.type.toLowerCase().replace("ms",""),a=Kt[i],r=Ut[t.pointerType]||t.pointerType,o=r==Mt,s=g(e,t.pointerId,"pointerId");a&Pt&&(0===t.button||o)?0>s&&(e.push(t),s=e.length-1):a&(It|Ht)&&(n=!0),0>s||(e[s]=t,this.callback(this.manager,a,{pointers:e,changedPointers:[t],pointerType:r,srcEvent:t}),n&&e.splice(s,1))}});var Jt={touchstart:Pt,touchmove:At,touchend:It,touchcancel:Ht},Zt="touchstart",Qt="touchstart touchmove touchend touchcancel";c(q,C,{handler:function(t){var e=Jt[t.type];if(e===Pt&&(this.started=!0),this.started){var n=z.call(this,t,e);e&(It|Ht)&&n[0].length-n[1].length===0&&(this.started=!1),this.callback(this.manager,e,{pointers:n[0],changedPointers:n[1],pointerType:Mt,srcEvent:t})}}});var te={touchstart:Pt,touchmove:At,touchend:It,touchcancel:Ht},ee="touchstart touchmove touchend touchcancel";c(L,C,{handler:function(t){var e=te[t.type],n=R.call(this,t,e);n&&this.callback(this.manager,e,{pointers:n[0],changedPointers:n[1],pointerType:Mt,srcEvent:t})}});var ne=2500,ie=25;c(j,C,{handler:function(t,e,n){var i=n.pointerType==Mt,a=n.pointerType==Et;if(!(a&&n.sourceCapabilities&&n.sourceCapabilities.firesTouchEvents)){if(i)$.call(this,e,n);else if(a&&W.call(this,n))return;this.callback(t,e,n)}},destroy:function(){this.touch.destroy(),this.mouse.destroy()}});var ae=T(dt.style,"touchAction"),re=ae!==i,oe="compute",se="auto",ce="manipulation",le="none",ue="pan-x",pe="pan-y",he=B();K.prototype={set:function(t){t==oe&&(t=this.compute()),re&&this.manager.element.style&&he[t]&&(this.manager.element.style[ae]=t),this.actions=t.toLowerCase().trim()},update:function(){this.set(this.manager.options.touchAction)},compute:function(){var t=[];return o(this.manager.recognizers,function(e){u(e.options.enable,[e])&&(t=t.concat(e.getTouchAction()))}),U(t.join(" "))},preventDefaults:function(t){var e=t.srcEvent,n=t.offsetDirection;if(this.manager.session.prevented)return void e.preventDefault();var i=this.actions,a=m(i,le)&&!he[le],r=m(i,pe)&&!he[pe],o=m(i,ue)&&!he[ue];if(a){var s=1===t.pointers.length,c=t.distance<2,l=t.deltaTime<250;if(s&&c&&l)return}return o&&r?void 0:a||r&&n&qt||o&&n&zt?this.preventSrc(e):void 0},preventSrc:function(t){this.manager.session.prevented=!0,t.preventDefault()}};var de=1,fe=2,me=4,ve=8,ge=ve,we=16,ye=32;G.prototype={defaults:{},set:function(t){return pt(this.options,t),this.manager&&this.manager.touchAction.update(),this},recognizeWith:function(t){if(r(t,"recognizeWith",this))return this;var e=this.simultaneous;return t=Q(t,this),e[t.id]||(e[t.id]=t,t.recognizeWith(this)),this},dropRecognizeWith:function(t){return r(t,"dropRecognizeWith",this)?this:(t=Q(t,this),delete this.simultaneous[t.id],this)},requireFailure:function(t){if(r(t,"requireFailure",this))return this;var e=this.requireFail;return t=Q(t,this),-1===g(e,t)&&(e.push(t),t.requireFailure(this)),this},dropRequireFailure:function(t){if(r(t,"dropRequireFailure",this))return this;t=Q(t,this);var e=g(this.requireFail,t);return e>-1&&this.requireFail.splice(e,1),this},hasRequireFailures:function(){return this.requireFail.length>0},canRecognizeWith:function(t){return!!this.simultaneous[t.id]},emit:function(t){function e(e){n.manager.emit(e,t)}var n=this,i=this.state;ve>i&&e(n.options.event+J(i)),e(n.options.event),t.additionalEvent&&e(t.additionalEvent),i>=ve&&e(n.options.event+J(i))},tryEmit:function(t){return this.canEmit()?this.emit(t):void(this.state=ye)},canEmit:function(){for(var t=0;t<this.requireFail.length;){if(!(this.requireFail[t].state&(ye|de)))return!1;t++}return!0},recognize:function(t){var e=pt({},t);return u(this.options.enable,[this,e])?(this.state&(ge|we|ye)&&(this.state=de),this.state=this.process(e),void(this.state&(fe|me|ve|we)&&this.tryEmit(e))):(this.reset(),void(this.state=ye))},process:function(t){},getTouchAction:function(){},reset:function(){}},c(tt,G,{defaults:{pointers:1},attrTest:function(t){var e=this.options.pointers;return 0===e||t.pointers.length===e},process:function(t){var e=this.state,n=t.eventType,i=e&(fe|me),a=this.attrTest(t);return i&&(n&Ht||!a)?e|we:i||a?n&It?e|ve:e&fe?e|me:fe:ye}}),c(et,tt,{defaults:{event:"pan",threshold:10,pointers:1,direction:Lt},getTouchAction:function(){var t=this.options.direction,e=[];return t&qt&&e.push(pe),t&zt&&e.push(ue),e},directionTest:function(t){var e=this.options,n=!0,i=t.distance,a=t.direction,r=t.deltaX,o=t.deltaY;return a&e.direction||(e.direction&qt?(a=0===r?St:0>r?Yt:Vt,n=r!=this.pX,i=Math.abs(t.deltaX)):(a=0===o?St:0>o?Nt:Ft,n=o!=this.pY,i=Math.abs(t.deltaY))),t.direction=a,n&&i>e.threshold&&a&e.direction},attrTest:function(t){return tt.prototype.attrTest.call(this,t)&&(this.state&fe||!(this.state&fe)&&this.directionTest(t))},emit:function(t){this.pX=t.deltaX,this.pY=t.deltaY;var e=Z(t.direction);e&&(t.additionalEvent=this.options.event+e),this._super.emit.call(this,t)}}),c(nt,tt,{defaults:{event:"pinch",threshold:0,pointers:2},getTouchAction:function(){return[le]},attrTest:function(t){return this._super.attrTest.call(this,t)&&(Math.abs(t.scale-1)>this.options.threshold||this.state&fe)},emit:function(t){if(1!==t.scale){var e=t.scale<1?"in":"out";t.additionalEvent=this.options.event+e}this._super.emit.call(this,t)}}),c(it,G,{defaults:{event:"press",pointers:1,time:251,threshold:9},getTouchAction:function(){return[se]},process:function(t){var e=this.options,n=t.pointers.length===e.pointers,i=t.distance<e.threshold,r=t.deltaTime>e.time;if(this._input=t,!i||!n||t.eventType&(It|Ht)&&!r)this.reset();else if(t.eventType&Pt)this.reset(),this._timer=a(function(){this.state=ge,this.tryEmit()},e.time,this);else if(t.eventType&It)return ge;return ye},reset:function(){clearTimeout(this._timer)},emit:function(t){this.state===ge&&(t&&t.eventType&It?this.manager.emit(this.options.event+"up",t):(this._input.timeStamp=gt(),this.manager.emit(this.options.event,this._input)))}}),c(at,tt,{defaults:{event:"rotate",threshold:0,pointers:2},getTouchAction:function(){return[le]},attrTest:function(t){return this._super.attrTest.call(this,t)&&(Math.abs(t.rotation)>this.options.threshold||this.state&fe)}}),c(rt,tt,{defaults:{event:"swipe",threshold:10,velocity:.3,direction:qt|zt,pointers:1},getTouchAction:function(){return et.prototype.getTouchAction.call(this)},attrTest:function(t){var e,n=this.options.direction;return n&(qt|zt)?e=t.overallVelocity:n&qt?e=t.overallVelocityX:n&zt&&(e=t.overallVelocityY),this._super.attrTest.call(this,t)&&n&t.offsetDirection&&t.distance>this.options.threshold&&t.maxPointers==this.options.pointers&&vt(e)>this.options.velocity&&t.eventType&It},emit:function(t){var e=Z(t.offsetDirection);e&&this.manager.emit(this.options.event+e,t),this.manager.emit(this.options.event,t)}}),c(ot,G,{defaults:{event:"tap",pointers:1,taps:1,interval:300,time:250,threshold:9,posThreshold:10},getTouchAction:function(){return[ce]},process:function(t){var e=this.options,n=t.pointers.length===e.pointers,i=t.distance<e.threshold,r=t.deltaTime<e.time;if(this.reset(),t.eventType&Pt&&0===this.count)return this.failTimeout();if(i&&r&&n){if(t.eventType!=It)return this.failTimeout();var o=this.pTime?t.timeStamp-this.pTime<e.interval:!0,s=!this.pCenter||H(this.pCenter,t.center)<e.posThreshold;this.pTime=t.timeStamp,this.pCenter=t.center,s&&o?this.count+=1:this.count=1,this._input=t;var c=this.count%e.taps;if(0===c)return this.hasRequireFailures()?(this._timer=a(function(){this.state=ge,this.tryEmit()},e.interval,this),fe):ge}return ye},failTimeout:function(){return this._timer=a(function(){this.state=ye},this.options.interval,this),ye},reset:function(){clearTimeout(this._timer)},emit:function(){this.state==ge&&(this._input.tapCount=this.count,this.manager.emit(this.options.event,this._input))}}),st.VERSION="2.0.8",st.defaults={domEvents:!1,touchAction:oe,enable:!0,inputTarget:null,inputClass:null,preset:[[at,{enable:!1}],[nt,{enable:!1},["rotate"]],[rt,{direction:qt}],[et,{direction:qt},["swipe"]],[ot],[ot,{event:"doubletap",taps:2},["tap"]],[it]],cssProps:{userSelect:"none",touchSelect:"none",touchCallout:"none",contentZooming:"none",userDrag:"none",tapHighlightColor:"rgba(0,0,0,0)"}};var Te=1,ke=2;ct.prototype={set:function(t){return pt(this.options,t),t.touchAction&&this.touchAction.update(),t.inputTarget&&(this.input.destroy(),this.input.target=t.inputTarget,this.input.init()),this},stop:function(t){this.session.stopped=t?ke:Te},recognize:function(t){var e=this.session;if(!e.stopped){this.touchAction.preventDefaults(t);var n,i=this.recognizers,a=e.curRecognizer;(!a||a&&a.state&ge)&&(a=e.curRecognizer=null);for(var r=0;r<i.length;)n=i[r],e.stopped===ke||a&&n!=a&&!n.canRecognizeWith(a)?n.reset():n.recognize(t),!a&&n.state&(fe|me|ve)&&(a=e.curRecognizer=n),r++}},get:function(t){if(t instanceof G)return t;for(var e=this.recognizers,n=0;n<e.length;n++)if(e[n].options.event==t)return e[n];return null},add:function(t){if(r(t,"add",this))return this;var e=this.get(t.options.event);return e&&this.remove(e),this.recognizers.push(t),t.manager=this,this.touchAction.update(),t},remove:function(t){if(r(t,"remove",this))return this;if(t=this.get(t)){var e=this.recognizers,n=g(e,t);-1!==n&&(e.splice(n,1),this.touchAction.update())}return this},on:function(t,e){if(t!==i&&e!==i){var n=this.handlers;return o(v(t),function(t){n[t]=n[t]||[],n[t].push(e)}),this}},off:function(t,e){if(t!==i){var n=this.handlers;return o(v(t),function(t){e?n[t]&&n[t].splice(g(n[t],e),1):delete n[t]}),this}},emit:function(t,e){this.options.domEvents&&ut(t,e);var n=this.handlers[t]&&this.handlers[t].slice();if(n&&n.length){e.type=t,e.preventDefault=function(){e.srcEvent.preventDefault()};for(var i=0;i<n.length;)n[i](e),i++}},destroy:function(){this.element&&lt(this,!1),this.handlers={},this.session={},this.input.destroy(),this.element=null}},pt(st,{INPUT_START:Pt,INPUT_MOVE:At,INPUT_END:It,INPUT_CANCEL:Ht,STATE_POSSIBLE:de,STATE_BEGAN:fe,STATE_CHANGED:me,STATE_ENDED:ve,STATE_RECOGNIZED:ge,STATE_CANCELLED:we,STATE_FAILED:ye,DIRECTION_NONE:St,DIRECTION_LEFT:Yt,DIRECTION_RIGHT:Vt,DIRECTION_UP:Nt,DIRECTION_DOWN:Ft,DIRECTION_HORIZONTAL:qt,DIRECTION_VERTICAL:zt,DIRECTION_ALL:Lt,Manager:ct,Input:C,TouchAction:K,TouchInput:L,MouseInput:N,PointerEventInput:F,TouchMouseInput:j,SingleTouchInput:q,Recognizer:G,AttrRecognizer:tt,Tap:ot,Pan:et,Swipe:rt,Pinch:nt,Rotate:at,Press:it,on:h,off:d,each:o,merge:yt,extend:wt,assign:pt,inherit:c,bindFn:l,prefixed:T});var xe="undefined"!=typeof t?t:"undefined"!=typeof self?self:{};xe.Hammer=st,"function"==typeof define&&define.amd?define(function(){return st}):"undefined"!=typeof module&&module.exports?module.exports=st:t[n]=st}(window,document,"Hammer"),+function(t){"use strict";var e;t.modal=function(n,i){n=t.extend({},e,n);var a=n.buttons,r=a.map(function(t,e){return'<a href="javascript:;" class="weui-dialog__btn '+(t.className||"")+'">'+t.text+"</a>"}).join(""),o='<div class="weui-dialog"><div class="weui-dialog__hd"><strong class="weui-dialog__title">'+n.title+"</strong></div>"+(n.text?'<div class="weui-dialog__bd">'+n.text+"</div>":"")+'<div class="weui-dialog__ft">'+r+"</div></div>",s=t.openModal(o,i);return s.find(".weui-dialog__btn").each(function(e,i){var r=t(i);r.click(function(){n.autoClose&&t.closeModal(),a[e].onClick&&a[e].onClick.call(s)})}),s},t.openModal=function(e,n){var i=t("<div class='weui-mask'></div>").appendTo(document.body);i.show();var a=t(e).appendTo(document.body);return n&&a.transitionEnd(function(){n.call(a)}),a.show(),i.addClass("weui-mask--visible"),a.addClass("weui-dialog--visible"),a},t.closeModal=function(){t(".weui-mask--visible").removeClass("weui-mask--visible").transitionEnd(function(){t(this).remove()}),t(".weui-dialog--visible").removeClass("weui-dialog--visible").transitionEnd(function(){t(this).remove()})},t.alert=function(n,i,a){var r;return"object"==typeof n?r=n:("function"==typeof i&&(a=arguments[1],i=void 0),r={text:n,title:i,onOK:a}),t.modal({text:r.text,title:r.title,buttons:[{text:e.buttonOK,className:"primary",onClick:r.onOK}]})},t.confirm=function(n,i,a,r){var o;return"object"==typeof n?o=n:("function"==typeof i&&(r=arguments[2],a=arguments[1],i=void 0),o={text:n,title:i,onOK:a,onCancel:r}),t.modal({text:o.text,title:o.title,buttons:[{text:e.buttonCancel,className:"default",onClick:o.onCancel},{text:e.buttonOK,className:"primary",onClick:o.onOK}]})},t.prompt=function(n,i,a,r,o){var s;"object"==typeof n?s=n:("function"==typeof i&&(o=arguments[3],r=arguments[2],a=arguments[1],i=void 0),s={text:n,title:i,input:o,onOK:a,onCancel:r,empty:!1});var c=t.modal({text:'<p class="weui-prompt-text">'+(s.text||"")+'</p><input type="text" class="weui-input weui-prompt-input" id="weui-prompt-input" value="'+(s.input||"")+'" />',title:s.title,autoClose:!1,buttons:[{text:e.buttonCancel,className:"default",onClick:function(){t.closeModal(),s.onCancel&&s.onCancel.call(c)}},{text:e.buttonOK,className:"primary",onClick:function(){var e=t("#weui-prompt-input").val();return s.empty||""!==e&&null!==e?(t.closeModal(),void(s.onOK&&s.onOK.call(c,e))):(c.find(".weui-prompt-input").focus()[0].select(),!1)}}]},function(){this.find(".weui-prompt-input").focus()[0].select()});return c},t.login=function(n,i,a,r,o,s){var c;"object"==typeof n?c=n:("function"==typeof i&&(s=arguments[4],o=arguments[3],r=arguments[2],a=arguments[1],i=void 0),c={text:n,title:i,username:o,password:s,onOK:a,onCancel:r});var l=t.modal({text:'<p class="weui-prompt-text">'+(c.text||"")+'</p><input type="text" class="weui-input weui-prompt-input" id="weui-prompt-username" value="'+(c.username||"")+'" placeholder="输入用户名" /><input type="password" class="weui-input weui-prompt-input" id="weui-prompt-password" value="'+(c.password||"")+'" placeholder="输入密码" />',title:c.title,autoClose:!1,buttons:[{text:e.buttonCancel,className:"default",onClick:function(){t.closeModal(),c.onCancel&&c.onCancel.call(l)}},{text:e.buttonOK,className:"primary",onClick:function(){var e=t("#weui-prompt-username").val(),n=t("#weui-prompt-password").val();return c.empty||""!==e&&null!==e?c.empty||""!==n&&null!==n?(t.closeModal(),void(c.onOK&&c.onOK.call(l,e,n))):(l.find("#weui-prompt-password").focus()[0].select(),!1):(l.find("#weui-prompt-username").focus()[0].select(),!1)}}]},function(){this.find("#weui-prompt-username").focus()[0].select()});return l},e=t.modal.prototype.defaults={title:"提示",text:void 0,buttonOK:"确定",buttonCancel:"取消",buttons:[{text:"确定",className:"primary"}],autoClose:!0}}($),+function(t){"use strict";var e=function(e,n){n=n||"";var i=(t("<div class='weui-mask_transparent'></div>").appendTo(document.body),'<div class="weui-toast '+n+'">'+e+"</div>"),a=t(i).appendTo(document.body);a.show(),a.addClass("weui-toast--visible")},n=function(e){t(".weui-mask_transparent").remove(),t(".weui-toast--visible").removeClass("weui-toast--visible").transitionEnd(function(){var n=t(this);n.remove(),e&&e(n)})};t.toast=function(t,a,r){"function"==typeof a&&(r=a);var o,s="weui-icon-success-no-circle",c=i.duration;"cancel"==a?(o="weui-toast_cancel",s="weui-icon-cancel"):"forbidden"==a?(o="weui-toast--forbidden",s="weui-icon-warn"):"text"==a?o="weui-toast--text":"number"==typeof a&&(c=a),e('<i class="'+s+' weui-icon_toast"></i><p class="weui-toast_content">'+(t||"已经完成")+"</p>",o),setTimeout(function(){n(r)},c)},t.showLoading=function(t){var n='<div class="weui_loading">';n+='<i class="weui-loading weui-icon_toast"></i>',n+="</div>",n+='<p class="weui-toast_content">'+(t||"数据加载中")+"</p>",e(n,"weui_loading_toast")},t.hideLoading=function(){n()};var i=t.toast.prototype.defaults={duration:2500}}($),+function(t){"use strict";var e,n=function(e){var n=t("<div class='weui-mask weui-actions_mask'></div>").appendTo(document.body),i=e.actions||[],a=i.map(function(t,e){return'<div class="weui-actionsheet__cell '+(t.className||"")+'">'+t.text+"</div>"}).join(""),r="";e.title&&(r='<div class="weui-actionsheet__title">'+e.title+"</div>");var o='<div class="weui-actionsheet " id="weui-actionsheet">'+r+'<div class="weui-actionsheet__menu">'+a+'</div><div class="weui-actionsheet__action"><div class="weui-actionsheet__cell weui-actionsheet_cancel">取消</div></div></div>',s=t(o).appendTo(document.body);s.find(".weui-actionsheet__menu .weui-actionsheet__cell, .weui-actionsheet__action .weui-actionsheet__cell").each(function(n,a){t(a).click(function(){t.closeActions(),e.onClose&&e.onClose(),i[n]&&i[n].onClick&&i[n].onClick()})}),n.show(),s.show(),n.addClass("weui-mask--visible"),s.addClass("weui-actionsheet_toggle")},i=function(){t(".weui-mask").removeClass("weui-mask--visible").transitionEnd(function(){t(this).remove()}),t(".weui-actionsheet").removeClass("weui-actionsheet_toggle").transitionEnd(function(){t(this).remove()})};t.actions=function(i){i=t.extend({},e,i),n(i)},t.closeActions=function(){i()},t(document).on("click",".weui-actions_mask",function(){t.closeActions()});var e=t.actions.prototype.defaults={title:void 0,onClose:void 0}}($),+function(t){"use strict";var e=function(e){this.container=t(e),this.distance=50,this.attachEvents()};e.prototype.touchStart=function(e){if(!this.container.hasClass("refreshing")){var n=t.getTouchPosition(e);this.start=n,this.diffX=this.diffY=0}},e.prototype.touchMove=function(e){if(!this.container.hasClass("refreshing")){if(!this.start)return!1;if(!(this.container.scrollTop()>0)){var n=t.getTouchPosition(e);this.diffX=n.x-this.start.x,this.diffY=n.y-this.start.y,this.diffY<0||(this.container.addClass("touching"),e.preventDefault(),e.stopPropagation(),this.diffY=Math.pow(this.diffY,.8),this.container.css("transform","translate3d(0, "+this.diffY+"px, 0)"),this.diffY<this.distance?this.container.removeClass("pull-up").addClass("pull-down"):this.container.removeClass("pull-down").addClass("pull-up"))}}},e.prototype.touchEnd=function(){this.start=!1,this.diffY<=0||this.container.hasClass("refreshing")||(this.container.removeClass("touching"),this.container.removeClass("pull-down pull-up"),this.container.css("transform",""),Math.abs(this.diffY)<=this.distance||(this.container.addClass("refreshing"),this.container.trigger("pull-to-refresh")))},e.prototype.attachEvents=function(){var e=this.container;e.addClass("weui-pull-to-refresh"),e.on(t.touchEvents.start,t.proxy(this.touchStart,this)),e.on(t.touchEvents.move,t.proxy(this.touchMove,this)),e.on(t.touchEvents.end,t.proxy(this.touchEnd,this))};var n=function(t){new e(t)},i=function(e){t(e).removeClass("refreshing")};t.fn.pullToRefresh=function(){return this.each(function(){n(this)})},t.fn.pullToRefreshDone=function(){return this.each(function(){i(this)})}}($),+function(t){"use strict";var e=function(e,n){this.container=t(e),this.container.data("infinite",this),this.distance=n||50,this.attachEvents()};e.prototype.scroll=function(){var e=this.container,n=e.scrollHeight()-(t(window).height()+e.scrollTop());n<=this.distance&&e.trigger("infinite")},e.prototype.attachEvents=function(e){var n=this.container,i="BODY"===n[0].tagName.toUpperCase()?t(document):n;i[e?"off":"on"]("scroll",t.proxy(this.scroll,this))},e.prototype.detachEvents=function(t){this.attachEvents(!0)};t.fn.infinite=function(t){return this.each(function(){new e(this,t)})},t.fn.destroyInfinite=function(){return this.each(function(){var e=t(this).data("infinite");e&&e.detachEvents&&e.detachEvents()})}}($),+function(t){"use strict";var e="weui-bar__item--on",n=function(n){var i=t(n);if(!i.hasClass(e)){var a=i.attr("href");if(/^#/.test(a)){i.parent().find("."+e).removeClass(e),i.addClass(e);var r=i.parents(".weui-tab").find(".weui-tab__bd");r.find(".weui-tab__bd-item--active").removeClass("weui-tab__bd-item--active"),t(a).addClass("weui-tab__bd-item--active")}}};t.showTab=n,t(document).on("click",".weui-navbar__item, .weui-tabbar__item",function(i){var a=t(i.currentTarget),r=a.attr("href");a.hasClass(e)||/^#/.test(r)&&(i.preventDefault(),n(a))})}($),+function(t){"use strict";t(document).on("click touchstart",".weui-search-bar__label",function(e){t(e.target).parents(".weui-search-bar").addClass("weui-search-bar_focusing").find("input").focus()}).on("click",".weui-search-bar__cancel-btn",function(e){t(e.target).parents(".weui-search-bar").removeClass("weui-search-bar_focusing").find(".weui-search-bar__input").val("").blur()}).on("click",".weui-icon-clear",function(e){t(e.target).parents(".weui-search-bar").find(".weui-search-bar__input").val("").focus()})}($),function(t){"use strict";var e={},n=navigator.userAgent,i=n.match(/(Android);?[\s\/]+([\d.]+)?/),a=n.match(/(iPad).*OS\s([\d_]+)/),r=n.match(/(iPod)(.*OS\s([\d_]+))?/),o=!a&&n.match(/(iPhone\sOS)\s([\d_]+)/);if(e.ios=e.android=e.iphone=e.ipad=e.androidChrome=!1,i&&(e.os="android",e.osVersion=i[2],e.android=!0,e.androidChrome=n.toLowerCase().indexOf("chrome")>=0),(a||o||r)&&(e.os="ios",e.ios=!0),o&&!r&&(e.osVersion=o[2].replace(/_/g,"."),e.iphone=!0),a&&(e.osVersion=a[2].replace(/_/g,"."),e.ipad=!0),r&&(e.osVersion=r[3]?r[3].replace(/_/g,"."):null,e.iphone=!0),e.ios&&e.osVersion&&n.indexOf("Version/")>=0&&"10"===e.osVersion.split(".")[0]&&(e.osVersion=n.toLowerCase().split("version/")[1].split(" ")[0]),e.webView=(o||a||r)&&n.match(/.*AppleWebKit(?!.*Safari)/i),e.os&&"ios"===e.os){var s=e.osVersion.split(".");e.minimalUi=!e.webView&&(r||o)&&(1*s[0]===7?1*s[1]>=1:1*s[0]>7)&&t('meta[name="viewport"]').length>0&&t('meta[name="viewport"]').attr("content").indexOf("minimal-ui")>=0}var c=t(window).width(),l=t(window).height();e.statusBar=!1,e.webView&&c*l===screen.width*screen.height?e.statusBar=!0:e.statusBar=!1;var u=[];if(e.pixelRatio=window.devicePixelRatio||1,u.push("pixel-ratio-"+Math.floor(e.pixelRatio)),e.pixelRatio>=2&&u.push("retina"),e.os&&(u.push(e.os,e.os+"-"+e.osVersion.split(".")[0],e.os+"-"+e.osVersion.replace(/\./g,"-")),"ios"===e.os))for(var p=parseInt(e.osVersion.split(".")[0],10),h=p-1;h>=6;h--)u.push("ios-gt-"+h);e.statusBar?u.push("with-statusbar-overlay"):t("html").removeClass("with-statusbar-overlay"),u.length>0&&t("html").addClass(u.join(" ")),t.device=e}($),+function(t){"use strict";var e=function(e){function n(){var e=!1;return c.params.convertToPopover||c.params.onlyInPopover?(!c.inline&&c.params.input&&(c.params.onlyInPopover?e=!0:t.device.ios?e=!!t.device.ipad:t(window).width()>=768&&(e=!0)),
-e):e}function i(){return!!(c.opened&&c.container&&c.container.length>0&&c.container.parents(".popover").length>0)}function a(){if(c.opened)for(var t=0;t<c.cols.length;t++)c.cols[t].divider||(c.cols[t].calcSize(),c.cols[t].setValue(c.cols[t].value,0,!1))}function r(t){if(t.preventDefault(),!c.opened&&(c.open(),c.params.scrollToInput&&!n())){var e=c.input.parents(".content");if(0===e.length)return;var i,a=parseInt(e.css("padding-top"),10),r=parseInt(e.css("padding-bottom"),10),o=e[0].offsetHeight-a-c.container.height(),s=e[0].scrollHeight-a-c.container.height(),l=c.input.offset().top-a+c.input[0].offsetHeight;if(l>o){var u=e.scrollTop()+l-o;u+o>s&&(i=u+o-s+r,o===s&&(i=c.container.height()),e.css({"padding-bottom":i+"px"})),e.scrollTop(u,300)}}}function o(e){i()||(c.input&&c.input.length>0?e.target!==c.input[0]&&0===t(e.target).parents(".weui-picker-modal").length&&c.close():0===t(e.target).parents(".weui-picker-modal").length&&c.close())}function s(){c.opened=!1,c.input&&c.input.length>0&&c.input.parents(".page-content").css({"padding-bottom":""}),c.params.onClose&&c.params.onClose(c),c.container.find(".picker-items-col").each(function(){c.destroyPickerCol(this)})}var c=this,l={updateValuesOnMomentum:!1,updateValuesOnTouchmove:!0,rotateEffect:!1,momentumRatio:7,freeMode:!1,scrollToInput:!0,inputReadOnly:!0,toolbar:!0,toolbarCloseText:"完成",title:"请选择",toolbarTemplate:'<div class="toolbar">          <div class="toolbar-inner">          <a href="javascript:;" class="picker-button close-picker">{{closeText}}</a>          <h1 class="title">{{title}}</h1>          </div>          </div>'};e=e||{};for(var u in l)"undefined"==typeof e[u]&&(e[u]=l[u]);c.params=e,c.cols=[],c.initialized=!1,c.inline=!!c.params.container;var p=t.device.ios||navigator.userAgent.toLowerCase().indexOf("safari")>=0&&navigator.userAgent.toLowerCase().indexOf("chrome")<0&&!t.device.android;return c.setValue=function(t,e){for(var n=0,i=0;i<c.cols.length;i++)c.cols[i]&&!c.cols[i].divider&&(c.cols[i].setValue(t[n],e),n++)},c.updateValue=function(){for(var e=[],n=[],i=0;i<c.cols.length;i++)c.cols[i].divider||(e.push(c.cols[i].value),n.push(c.cols[i].displayValue));e.indexOf(void 0)>=0||(c.value=e,c.displayValue=n,c.params.onChange&&c.params.onChange(c,c.value,c.displayValue),c.input&&c.input.length>0&&(t(c.input).val(c.params.formatValue?c.params.formatValue(c,c.value,c.displayValue):c.value.join(" ")),t(c.input).trigger("change")))},c.initPickerCol=function(e,n){function i(){w=t.requestAnimationFrame(function(){h.updateItems(void 0,void 0,0),i()})}function a(e){if(!T&&!y){e.preventDefault(),y=!0;var n=t.getTouchPosition(e);k=x=n.y,C=(new Date).getTime(),A=!0,M=E=t.getTranslate(h.wrapper[0],"y")}}function r(e){if(y){e.preventDefault(),A=!1;var n=t.getTouchPosition(e);x=n.y,T||(t.cancelAnimationFrame(w),T=!0,M=E=t.getTranslate(h.wrapper[0],"y"),h.wrapper.transition(0)),e.preventDefault();var i=x-k;E=M+i,_=void 0,v>E&&(E=v-Math.pow(v-E,.8),_="min"),E>g&&(E=g+Math.pow(E-g,.8),_="max"),h.wrapper.transform("translate3d(0,"+E+"px,0)"),h.updateItems(void 0,E,0,c.params.updateValuesOnTouchmove),O=E-D||E,P=(new Date).getTime(),D=E}}function o(e){if(!y||!T)return void(y=T=!1);y=T=!1,h.wrapper.transition(""),_&&("min"===_?h.wrapper.transform("translate3d(0,"+v+"px,0)"):h.wrapper.transform("translate3d(0,"+g+"px,0)")),b=(new Date).getTime();var n,a;b-C>300?a=E:(n=Math.abs(O/(b-P)),a=E+O*c.params.momentumRatio),a=Math.max(Math.min(a,g),v);var r=-Math.floor((a-g)/f);c.params.freeMode||(a=-r*f+g),h.wrapper.transform("translate3d(0,"+parseInt(a,10)+"px,0)"),h.updateItems(r,a,"",!0),c.params.updateValuesOnMomentum&&(i(),h.wrapper.transitionEnd(function(){t.cancelAnimationFrame(w)})),setTimeout(function(){A=!0},100)}function s(e){if(A){t.cancelAnimationFrame(w);var n=t(this).attr("data-picker-value");h.setValue(n)}}var l=t(e),u=l.index(),h=c.cols[u];if(!h.divider){h.container=l,h.wrapper=h.container.find(".picker-items-col-wrapper"),h.items=h.wrapper.find(".picker-item");var d,f,m,v,g;h.replaceValues=function(t,e){h.destroyEvents(),h.values=t,h.displayValues=e;var n=c.columnHTML(h,!0);h.wrapper.html(n),h.items=h.wrapper.find(".picker-item"),h.calcSize(),h.setValue(h.values[0]||"",0,!0),h.initEvents()},h.calcSize=function(){if(h.values.length){c.params.rotateEffect&&(h.container.removeClass("picker-items-col-absolute"),h.width||h.container.css({width:""}));var e,n;e=0,n=h.container[0].offsetHeight,d=h.wrapper[0].offsetHeight,f=h.items[0].offsetHeight,m=f*h.items.length,v=n/2-m+f/2,g=n/2-f/2,h.width&&(e=h.width,parseInt(e,10)===e&&(e+="px"),h.container.css({width:e})),c.params.rotateEffect&&(h.width||(h.items.each(function(){var n=t(this);n.css({width:"auto"}),e=Math.max(e,n[0].offsetWidth),n.css({width:""})}),h.container.css({width:e+2+"px"})),h.container.addClass("picker-items-col-absolute"))}},h.calcSize(),h.wrapper.transform("translate3d(0,"+g+"px,0)").transition(0);var w;h.setValue=function(e,n,a){"undefined"==typeof n&&(n="");var r=h.wrapper.find('.picker-item[data-picker-value="'+e+'"]').index();if("undefined"==typeof r||-1===r)return void(h.value=h.displayValue=e);var o=-r*f+g;h.wrapper.transition(n),h.wrapper.transform("translate3d(0,"+o+"px,0)"),c.params.updateValuesOnMomentum&&h.activeIndex&&h.activeIndex!==r&&(t.cancelAnimationFrame(w),h.wrapper.transitionEnd(function(){t.cancelAnimationFrame(w)}),i()),h.updateItems(r,o,n,a)},h.updateItems=function(e,n,i,a){"undefined"==typeof n&&(n=t.getTranslate(h.wrapper[0],"y")),"undefined"==typeof e&&(e=-Math.round((n-g)/f)),0>e&&(e=0),e>=h.items.length&&(e=h.items.length-1);var r=h.activeIndex;h.activeIndex=e,h.wrapper.find(".picker-selected").removeClass("picker-selected"),c.params.rotateEffect&&h.items.transition(i);var o=h.items.eq(e).addClass("picker-selected").transform("");if((a||"undefined"==typeof a)&&(h.value=o.attr("data-picker-value"),h.displayValue=h.displayValues?h.displayValues[e]:h.value,r!==e&&(h.onChange&&h.onChange(c,h.value,h.displayValue),c.updateValue())),c.params.rotateEffect){(n-(Math.floor((n-g)/f)*f+g))/f;h.items.each(function(){var e=t(this),i=e.index()*f,a=g-n,r=i-a,o=r/f,s=Math.ceil(h.height/f/2)+1,c=-18*o;c>180&&(c=180),-180>c&&(c=-180),Math.abs(o)>s?e.addClass("picker-item-far"):e.removeClass("picker-item-far"),e.transform("translate3d(0, "+(-n+g)+"px, "+(p?-110:0)+"px) rotateX("+c+"deg)")})}},n&&h.updateItems(0,g,0);var y,T,k,x,C,b,M,_,E,D,O,P,A=!0;h.initEvents=function(e){var n=e?"off":"on";h.container[n](t.touchEvents.start,a),h.container[n](t.touchEvents.move,r),h.container[n](t.touchEvents.end,o),h.items[n]("click",s)},h.destroyEvents=function(){h.initEvents(!0)},h.container[0].f7DestroyPickerCol=function(){h.destroyEvents()},h.initEvents()}},c.destroyPickerCol=function(e){e=t(e),"f7DestroyPickerCol"in e[0]&&e[0].f7DestroyPickerCol()},t(window).on("resize",a),c.columnHTML=function(t,e){var n="",i="";if(t.divider)i+='<div class="picker-items-col picker-items-col-divider '+(t.textAlign?"picker-items-col-"+t.textAlign:"")+" "+(t.cssClass||"")+'">'+t.content+"</div>";else{for(var a=0;a<t.values.length;a++)n+='<div class="picker-item" data-picker-value="'+t.values[a]+'">'+(t.displayValues?t.displayValues[a]:t.values[a])+"</div>";i+='<div class="picker-items-col '+(t.textAlign?"picker-items-col-"+t.textAlign:"")+" "+(t.cssClass||"")+'"><div class="picker-items-col-wrapper">'+n+"</div></div>"}return e?n:i},c.layout=function(){var t,e="",n="";c.cols=[];var i="";for(t=0;t<c.params.cols.length;t++){var a=c.params.cols[t];i+=c.columnHTML(c.params.cols[t]),c.cols.push(a)}n="weui-picker-modal picker-columns "+(c.params.cssClass||"")+(c.params.rotateEffect?" picker-3d":"")+(1===c.params.cols.length?" picker-columns-single":""),e='<div class="'+n+'">'+(c.params.toolbar?c.params.toolbarTemplate.replace(/{{closeText}}/g,c.params.toolbarCloseText).replace(/{{title}}/g,c.params.title):"")+'<div class="picker-modal-inner picker-items">'+i+'<div class="picker-center-highlight"></div></div></div>',c.pickerHTML=e},c.params.input&&(c.input=t(c.params.input),c.input.length>0&&(c.params.inputReadOnly&&c.input.prop("readOnly",!0),c.inline||c.input.on("click",r),c.params.inputReadOnly&&c.input.on("focus mousedown",function(t){t.preventDefault()}))),c.inline||t("html").on("click",o),c.opened=!1,c.open=function(){var e=n();c.opened||(c.layout(),e?(c.pickerHTML='<div class="popover popover-picker-columns"><div class="popover-inner">'+c.pickerHTML+"</div></div>",c.popover=t.popover(c.pickerHTML,c.params.input,!0),c.container=t(c.popover).find(".weui-picker-modal"),t(c.popover).on("close",function(){s()})):c.inline?(c.container=t(c.pickerHTML),c.container.addClass("picker-modal-inline"),t(c.params.container).append(c.container)):(c.container=t(t.openPicker(c.pickerHTML)),t(c.container).on("close",function(){s()})),c.container[0].f7Picker=c,c.container.find(".picker-items-col").each(function(){var t=!0;(!c.initialized&&c.params.value||c.initialized&&c.value)&&(t=!1),c.initPickerCol(this,t)}),c.initialized?c.value&&c.setValue(c.value,0):c.params.value&&c.setValue(c.params.value,0)),c.opened=!0,c.initialized=!0,c.params.onOpen&&c.params.onOpen(c)},c.close=function(e){return c.opened&&!c.inline?i()?void t.closePicker(c.popover):void t.closePicker(c.container):void 0},c.destroy=function(){c.close(),c.params.input&&c.input.length>0&&(c.input.off("click focus",r),t(c.input).data("picker",null)),t("html").off("click",o),t(window).off("resize",a)},c.inline&&c.open(),c};t(document).on("click",".close-picker",function(){var e=t(".weui-picker-modal.weui-picker-modal-visible");e.length>0&&t.closePicker(e)}),t(document).on(t.touchEvents.move,".picker-modal-inner",function(t){t.preventDefault()}),t.openPicker=function(e,n,i){"function"==typeof n&&(i=n,n=void 0),t.closePicker();var a=t("<div class='weui-picker-container "+(n||"")+"'></div>").appendTo(document.body);a.show(),a.addClass("weui-picker-container-visible");var r=t(e).appendTo(a);return r.width(),r.addClass("weui-picker-modal-visible"),i&&a.on("close",i),r},t.updatePicker=function(e){var n=t(".weui-picker-container-visible");if(!n[0])return!1;n.html("");var i=t(e).appendTo(n);return i.addClass("weui-picker-modal-visible"),i},t.closePicker=function(e,n){"function"==typeof e&&(n=e),t(".weui-picker-modal-visible").removeClass("weui-picker-modal-visible").transitionEnd(function(){t(this).parent().remove(),n&&n()}).trigger("close")},t.fn.picker=function(n){var i=arguments;return this.each(function(){if(this){var a=t(this),r=a.data("picker");if(!r){n=n||{};var o=a.val();void 0===n.value&&""!==o&&(n.value=n.cols&&n.cols.length>1?o.split(" "):[o]);var s=t.extend({input:this},n);r=new e(s),a.data("picker",r)}"string"==typeof n&&r[n].apply(r,Array.prototype.slice.call(i,1))}})}}($),+function(t){"use strict";var e,n=[],i=function(e,i){this.config=i,this.data={values:"",titles:"",origins:[],length:0},this.$input=t(e),this.$input.prop("readOnly",!0),this.initConfig(),i=this.config,this.$input.click(t.proxy(this.open,this)),n.push(this)};i.prototype.initConfig=function(){this.config=t.extend({},e,this.config);var n=this.config;n.items&&n.items.length&&(n.items=n.items.map(function(t,e){return"string"==typeof t?{title:t,value:t}:t}),this.tpl=t.t7.compile("<div class='weui-picker-modal weui-select-modal'>"+n.toolbarTemplate+(n.multi?n.checkboxTemplate:n.radioTemplate)+"</div>"),void 0!==n.input&&this.$input.val(n.input),this.parseInitValue(),this._init=!0)},i.prototype.updateInputValue=function(t,e){var n,i;this.config.multi?(n=t.join(this.config.split),i=e.join(this.config.split)):(n=t[0],i=e[0]);var a=[];this.config.items.forEach(function(e){t.each(function(t,n){e.value==n&&a.push(e)})}),this.$input.val(i).data("values",n),this.$input.attr("value",i).attr("data-values",n);var r={values:n,titles:i,valuesArray:t,titlesArray:e,origins:a,length:a.length};this.data=r,this.$input.trigger("change",r),this.config.onChange&&this.config.onChange.call(this,r)},i.prototype.parseInitValue=function(){var t=this.$input.val(),e=this.config.items;if(this._init||void 0!==t&&null!=t&&""!==t)for(var n=this.config.multi?t.split(this.config.split):[t],i=0;i<e.length;i++){e[i].checked=!1;for(var a=0;a<n.length;a++)e[i].title===n[a]&&(e[i].checked=!0)}},i.prototype._bind=function(e){var n=this,i=this.config;e.on("change",function(a){var r=e.find("input:checked"),o=r.map(function(){return t(this).val()}),s=r.map(function(){return t(this).data("title")});n.updateInputValue(o,s),i.autoClose&&!i.multi&&n.close()}).on("click",".close-select",function(){n.close()})},i.prototype.update=function(e){this.config=t.extend({},this.config,e),this.initConfig(),this._open&&this._bind(t.updatePicker(this.getHTML()))},i.prototype.open=function(e,i){if(!this._open){for(var a=0;a<n.length;a++){var r=n[a];if(r!==this&&r._open&&!r.close())return!1}this.parseInitValue();var o=this.config,s=this.dialog=t.openPicker(this.getHTML());this._bind(s),this._open=!0,o.onOpen&&o.onOpen(this)}},i.prototype.close=function(e,n){if(!this._open)return!1;var i=this,a=this.config.beforeClose;if(!n){if(a&&"function"==typeof a&&a.call(this,this.data.values,this.data.titles)===!1)return!1;if(this.config.multi){if(void 0!==this.config.min&&this.data.length<this.config.min)return t.toast("请至少选择"+this.config.min+"个","text"),!1;if(void 0!==this.config.max&&this.data.length>this.config.max)return t.toast("最多只能选择"+this.config.max+"个","text"),!1}}return t.closePicker(function(){i.onClose(),e&&e()}),!0},i.prototype.onClose=function(){this._open=!1,this.config.onClose&&this.config.onClose(this)},i.prototype.getHTML=function(t){var e=this.config;return this.tpl({items:e.items,title:e.title,closeText:e.closeText})},t.fn.select=function(e,n){return this.each(function(){var a=t(this);a.data("weui-select")||a.data("weui-select",new i(this,e));var r=a.data("weui-select");return"string"==typeof e&&r[e].call(r,n),r})},e=t.fn.select.prototype.defaults={items:[],input:void 0,title:"请选择",multi:!1,closeText:"确定",autoClose:!0,onChange:void 0,beforeClose:void 0,onClose:void 0,onOpen:void 0,split:",",min:void 0,max:void 0,toolbarTemplate:'<div class="toolbar">      <div class="toolbar-inner">      <a href="javascript:;" class="picker-button close-select">{{closeText}}</a>      <h1 class="title">{{title}}</h1>      </div>      </div>',radioTemplate:'<div class="weui-cells weui-cells_radio">        {{#items}}        <label class="weui-cell weui-check_label" for="weui-select-id-{{this.title}}">          <div class="weui-cell__bd weui-cell_primary">            <p>{{this.title}}</p>          </div>          <div class="weui-cell__ft">            <input type="radio" class="weui-check" name="weui-select" id="weui-select-id-{{this.title}}" value="{{this.value}}" {{#if this.checked}}checked="checked"{{/if}} data-title="{{this.title}}">            <span class="weui-icon-checked"></span>          </div>        </label>        {{/items}}      </div>',checkboxTemplate:'<div class="weui-cells weui-cells_checkbox">        {{#items}}        <label class="weui-cell weui-check_label" for="weui-select-id-{{this.title}}">          <div class="weui-cell__bd weui-cell_primary">            <p>{{this.title}}</p>          </div>          <div class="weui-cell__ft">            <input type="checkbox" class="weui-check" name="weui-select" id="weui-select-id-{{this.title}}" value="{{this.value}}" {{#if this.checked}}checked="checked"{{/if}} data-title="{{this.title}}" >            <span class="weui-icon-checked"></span>          </div>        </label>        {{/items}}      </div>'}}($),+function(t){"use strict";var e,n=!1,i=function(t,e){var t=new Date(t),e=new Date(e);return t.getFullYear()===e.getFullYear()&&t.getMonth()===e.getMonth()&&t.getDate()===e.getDate()},a=function(a){function r(){var e=!1;return p.params.convertToPopover||p.params.onlyInPopover?(!p.inline&&p.params.input&&(p.params.onlyInPopover?e=!0:t.device.ios?e=!!t.device.ipad:t(window).width()>=768&&(e=!0)),e):e}function o(){return!!(p.opened&&p.container&&p.container.length>0&&p.container.parents(".popover").length>0)}function s(t){t=new Date(t);var e=t.getFullYear(),n=t.getMonth(),i=n+1,a=t.getDate(),r=t.getDay();return p.params.dateFormat.replace(/yyyy/g,e).replace(/yy/g,(e+"").substring(2)).replace(/mm/g,10>i?"0"+i:i).replace(/m/g,i).replace(/MM/g,p.params.monthNames[n]).replace(/M/g,p.params.monthNamesShort[n]).replace(/dd/g,10>a?"0"+a:a).replace(/d/g,a).replace(/DD/g,p.params.dayNames[r]).replace(/D/g,p.params.dayNamesShort[r])}function c(t){if(t.preventDefault(),!p.opened&&(p.open(),p.params.scrollToInput&&!r())){var e=p.input.parents(".page-content");if(0===e.length)return;var n,i=parseInt(e.css("padding-top"),10),a=parseInt(e.css("padding-bottom"),10),o=e[0].offsetHeight-i-p.container.height(),s=e[0].scrollHeight-i-p.container.height(),c=p.input.offset().top-i+p.input[0].offsetHeight;if(c>o){var l=e.scrollTop()+c-o;l+o>s&&(n=l+o-s+a,o===s&&(n=p.container.height()),e.css({"padding-bottom":n+"px"})),e.scrollTop(l,300)}}}function l(e){o()||(p.input&&p.input.length>0?e.target!==p.input[0]&&0===t(e.target).parents(".weui-picker-modal").length&&p.close():0===t(e.target).parents(".weui-picker-modal").length&&p.close())}function u(){p.opened=!1,p.input&&p.input.length>0&&p.input.parents(".page-content").css({"padding-bottom":""}),p.params.onClose&&p.params.onClose(p),p.destroyCalendarEvents()}var p=this;a=a||{};for(var h in e)"undefined"==typeof a[h]&&(a[h]=e[h]);p.params=a,p.initialized=!1,p.inline=!!p.params.container,p.isH="horizontal"===p.params.direction;var d=p.isH&&n?-1:1;return p.animating=!1,p.addValue=function(t){if(p.params.multiple){p.value||(p.value=[]);for(var e,n=0;n<p.value.length;n++)i(t,p.value[n])&&(e=n);"undefined"==typeof e?p.value.push(t):p.value.splice(e,1),p.updateValue()}else p.value=[t],p.updateValue()},p.setValue=function(t){var e=new Date(t[0]);p.setYearMonth(e.getFullYear(),e.getMonth()),p.addValue(+e)},p.updateValue=function(){p.wrapper.find(".picker-calendar-day-selected").removeClass("picker-calendar-day-selected");var e,n;for(e=0;e<p.value.length;e++){var i=new Date(p.value[e]);p.wrapper.find('.picker-calendar-day[data-date="'+i.getFullYear()+"-"+i.getMonth()+"-"+i.getDate()+'"]').addClass("picker-calendar-day-selected")}if(p.params.onChange&&p.params.onChange(p,p.value.map(s),p.value.map(function(t){return+new Date("string"==typeof t?t.split(/\D/).filter(function(t){return!!t}).join("-"):t)})),p.input&&p.input.length>0){if(p.params.formatValue)n=p.params.formatValue(p,p.value);else{for(n=[],e=0;e<p.value.length;e++)n.push(s(p.value[e]));n=n.join(", ")}t(p.input).val(n),t(p.input).trigger("change")}},p.initCalendarEvents=function(){function e(e){if(!s&&!o){o=!0;var n=t.getTouchPosition(e);c=h=n.x,l=h=n.y,f=(new Date).getTime(),T=0,C=!0,x=void 0,v=g=p.monthsTranslate}}function i(e){if(o){var n=t.getTouchPosition(e);if(u=n.x,h=n.y,"undefined"==typeof x&&(x=!!(x||Math.abs(h-l)>Math.abs(u-c))),p.isH&&x)return void(o=!1);if(e.preventDefault(),p.animating)return void(o=!1);C=!1,s||(s=!0,w=p.wrapper[0].offsetWidth,y=p.wrapper[0].offsetHeight,p.wrapper.transition(0)),e.preventDefault(),k=p.isH?u-c:h-l,T=k/(p.isH?w:y),g=100*(p.monthsTranslate*d+T),p.wrapper.transform("translate3d("+(p.isH?g:0)+"%, "+(p.isH?0:g)+"%, 0)")}}function a(t){return o&&s?(o=s=!1,m=(new Date).getTime(),300>m-f?Math.abs(k)<10?p.resetMonth():k>=10?n?p.nextMonth():p.prevMonth():n?p.prevMonth():p.nextMonth():-.5>=T?n?p.prevMonth():p.nextMonth():T>=.5?n?p.nextMonth():p.prevMonth():p.resetMonth(),void setTimeout(function(){C=!0},100)):void(o=s=!1)}function r(e){if(C){var n=t(e.target).parents(".picker-calendar-day");if(0===n.length&&t(e.target).hasClass("picker-calendar-day")&&(n=t(e.target)),0!==n.length&&!n.hasClass("picker-calendar-day-disabled")){n.hasClass("picker-calendar-day-next")&&p.nextMonth(),n.hasClass("picker-calendar-day-prev")&&p.prevMonth();var i=n.attr("data-year"),a=n.attr("data-month"),r=n.attr("data-day");p.params.onDayClick&&p.params.onDayClick(p,n[0],i,a,r),p.addValue(new Date(i,a,r).getTime()),p.params.closeOnSelect&&!p.params.multiple&&p.close()}}}var o,s,c,l,u,h,f,m,v,g,w,y,T,k,x,C=!0;p.container.find(".picker-calendar-prev-month").on("click",p.prevMonth),p.container.find(".picker-calendar-next-month").on("click",p.nextMonth),p.container.find(".picker-calendar-prev-year").on("click",p.prevYear),p.container.find(".picker-calendar-next-year").on("click",p.nextYear),p.wrapper.on("click",r),p.params.touchMove&&(p.wrapper.on(t.touchEvents.start,e),p.wrapper.on(t.touchEvents.move,i),p.wrapper.on(t.touchEvents.end,a)),p.container[0].f7DestroyCalendarEvents=function(){p.container.find(".picker-calendar-prev-month").off("click",p.prevMonth),p.container.find(".picker-calendar-next-month").off("click",p.nextMonth),p.container.find(".picker-calendar-prev-year").off("click",p.prevYear),p.container.find(".picker-calendar-next-year").off("click",p.nextYear),p.wrapper.off("click",r),p.params.touchMove&&(p.wrapper.off(t.touchEvents.start,e),p.wrapper.off(t.touchEvents.move,i),p.wrapper.off(t.touchEvents.end,a))}},p.destroyCalendarEvents=function(t){"f7DestroyCalendarEvents"in p.container[0]&&p.container[0].f7DestroyCalendarEvents()},p.daysInMonth=function(t){var e=new Date(t);return new Date(e.getFullYear(),e.getMonth()+1,0).getDate()},p.monthHTML=function(t,e){t=new Date(t);var n=t.getFullYear(),i=t.getMonth();t.getDate();"next"===e&&(t=11===i?new Date(n+1,0):new Date(n,i+1,1)),"prev"===e&&(t=0===i?new Date(n-1,11):new Date(n,i-1,1)),"next"!==e&&"prev"!==e||(i=t.getMonth(),n=t.getFullYear());var a=p.daysInMonth(new Date(t.getFullYear(),t.getMonth()).getTime()-864e6),r=p.daysInMonth(t),o=new Date(t.getFullYear(),t.getMonth()).getDay();0===o&&(o=7);var s,c,l,u=[],h=6,d=7,f="",m=0+(p.params.firstDay-1),v=(new Date).setHours(0,0,0,0),g=p.params.minDate?new Date(p.params.minDate).getTime():null,w=p.params.maxDate?new Date(p.params.maxDate).getTime():null;if(p.value&&p.value.length)for(c=0;c<p.value.length;c++)u.push(new Date(p.value[c]).setHours(0,0,0,0));for(c=1;h>=c;c++){var y="";for(l=1;d>=l;l++){var T=l;m++;var k=m-o,x="";0>k?(k=a+k+1,x+=" picker-calendar-day-prev",s=new Date(0>i-1?n-1:n,0>i-1?11:i-1,k).getTime()):(k+=1,k>r?(k-=r,x+=" picker-calendar-day-next",s=new Date(i+1>11?n+1:n,i+1>11?0:i+1,k).getTime()):s=new Date(n,i,k).getTime()),s===v&&(x+=" picker-calendar-day-today"),u.indexOf(s)>=0&&(x+=" picker-calendar-day-selected"),p.params.weekendDays.indexOf(T-1)>=0&&(x+=" picker-calendar-day-weekend"),(g&&g>s||w&&s>w)&&(x+=" picker-calendar-day-disabled"),s=new Date(s);var C=s.getFullYear(),b=s.getMonth();y+='<div data-year="'+C+'" data-month="'+b+'" data-day="'+k+'" class="picker-calendar-day'+x+'" data-date="'+(C+"-"+b+"-"+k)+'"><span>'+k+"</span></div>"}f+='<div class="picker-calendar-row">'+y+"</div>"}return f='<div class="picker-calendar-month" data-year="'+n+'" data-month="'+i+'">'+f+"</div>"},p.animating=!1,p.updateCurrentMonthYear=function(t){"undefined"==typeof t?(p.currentMonth=parseInt(p.months.eq(1).attr("data-month"),10),p.currentYear=parseInt(p.months.eq(1).attr("data-year"),10)):(p.currentMonth=parseInt(p.months.eq("next"===t?p.months.length-1:0).attr("data-month"),10),p.currentYear=parseInt(p.months.eq("next"===t?p.months.length-1:0).attr("data-year"),10)),p.container.find(".current-month-value").text(p.params.monthNames[p.currentMonth]),p.container.find(".current-year-value").text(p.currentYear)},p.onMonthChangeStart=function(t){p.updateCurrentMonthYear(t),p.months.removeClass("picker-calendar-month-current picker-calendar-month-prev picker-calendar-month-next");var e="next"===t?p.months.length-1:0;p.months.eq(e).addClass("picker-calendar-month-current"),p.months.eq("next"===t?e-1:e+1).addClass("next"===t?"picker-calendar-month-prev":"picker-calendar-month-next"),p.params.onMonthYearChangeStart&&p.params.onMonthYearChangeStart(p,p.currentYear,p.currentMonth)},p.onMonthChangeEnd=function(t,e){p.animating=!1;var n,i,a;p.wrapper.find(".picker-calendar-month:not(.picker-calendar-month-prev):not(.picker-calendar-month-current):not(.picker-calendar-month-next)").remove(),"undefined"==typeof t&&(t="next",e=!0),e?(p.wrapper.find(".picker-calendar-month-next, .picker-calendar-month-prev").remove(),i=p.monthHTML(new Date(p.currentYear,p.currentMonth),"prev"),n=p.monthHTML(new Date(p.currentYear,p.currentMonth),"next")):a=p.monthHTML(new Date(p.currentYear,p.currentMonth),t),("next"===t||e)&&p.wrapper.append(a||n),("prev"===t||e)&&p.wrapper.prepend(a||i),p.months=p.wrapper.find(".picker-calendar-month"),p.setMonthsTranslate(p.monthsTranslate),p.params.onMonthAdd&&p.params.onMonthAdd(p,"next"===t?p.months.eq(p.months.length-1)[0]:p.months.eq(0)[0]),p.params.onMonthYearChangeEnd&&p.params.onMonthYearChangeEnd(p,p.currentYear,p.currentMonth)},p.setMonthsTranslate=function(t){t=t||p.monthsTranslate||0,"undefined"==typeof p.monthsTranslate&&(p.monthsTranslate=t),p.months.removeClass("picker-calendar-month-current picker-calendar-month-prev picker-calendar-month-next");var e=100*-(t+1)*d,n=100*-t*d,i=100*-(t-1)*d;p.months.eq(0).transform("translate3d("+(p.isH?e:0)+"%, "+(p.isH?0:e)+"%, 0)").addClass("picker-calendar-month-prev"),p.months.eq(1).transform("translate3d("+(p.isH?n:0)+"%, "+(p.isH?0:n)+"%, 0)").addClass("picker-calendar-month-current"),p.months.eq(2).transform("translate3d("+(p.isH?i:0)+"%, "+(p.isH?0:i)+"%, 0)").addClass("picker-calendar-month-next")},p.nextMonth=function(e){"undefined"!=typeof e&&"object"!=typeof e||(e="",p.params.animate||(e=0));var n=parseInt(p.months.eq(p.months.length-1).attr("data-month"),10),i=parseInt(p.months.eq(p.months.length-1).attr("data-year"),10),a=new Date(i,n),r=a.getTime(),o=!p.animating;if(p.params.maxDate&&r>new Date(p.params.maxDate).getTime())return p.resetMonth();if(p.monthsTranslate--,n===p.currentMonth){var s=100*-p.monthsTranslate*d,c=t(p.monthHTML(r,"next")).transform("translate3d("+(p.isH?s:0)+"%, "+(p.isH?0:s)+"%, 0)").addClass("picker-calendar-month-next");p.wrapper.append(c[0]),p.months=p.wrapper.find(".picker-calendar-month"),p.params.onMonthAdd&&p.params.onMonthAdd(p,p.months.eq(p.months.length-1)[0])}p.animating=!0,p.onMonthChangeStart("next");var l=100*p.monthsTranslate*d;p.wrapper.transition(e).transform("translate3d("+(p.isH?l:0)+"%, "+(p.isH?0:l)+"%, 0)"),o&&p.wrapper.transitionEnd(function(){p.onMonthChangeEnd("next")}),p.params.animate||p.onMonthChangeEnd("next")},p.prevMonth=function(e){"undefined"!=typeof e&&"object"!=typeof e||(e="",p.params.animate||(e=0));var n=parseInt(p.months.eq(0).attr("data-month"),10),i=parseInt(p.months.eq(0).attr("data-year"),10),a=new Date(i,n+1,-1),r=a.getTime(),o=!p.animating;if(p.params.minDate&&r<new Date(p.params.minDate).getTime())return p.resetMonth();if(p.monthsTranslate++,n===p.currentMonth){var s=100*-p.monthsTranslate*d,c=t(p.monthHTML(r,"prev")).transform("translate3d("+(p.isH?s:0)+"%, "+(p.isH?0:s)+"%, 0)").addClass("picker-calendar-month-prev");p.wrapper.prepend(c[0]),p.months=p.wrapper.find(".picker-calendar-month"),p.params.onMonthAdd&&p.params.onMonthAdd(p,p.months.eq(0)[0])}p.animating=!0,p.onMonthChangeStart("prev");var l=100*p.monthsTranslate*d;p.wrapper.transition(e).transform("translate3d("+(p.isH?l:0)+"%, "+(p.isH?0:l)+"%, 0)"),o&&p.wrapper.transitionEnd(function(){p.onMonthChangeEnd("prev")}),p.params.animate||p.onMonthChangeEnd("prev")},p.resetMonth=function(t){"undefined"==typeof t&&(t="");var e=100*p.monthsTranslate*d;p.wrapper.transition(t).transform("translate3d("+(p.isH?e:0)+"%, "+(p.isH?0:e)+"%, 0)")},p.setYearMonth=function(t,e,n){"undefined"==typeof t&&(t=p.currentYear),"undefined"==typeof e&&(e=p.currentMonth),"undefined"!=typeof n&&"object"!=typeof n||(n="",p.params.animate||(n=0));var i;if(i=t<p.currentYear?new Date(t,e+1,-1).getTime():new Date(t,e).getTime(),p.params.maxDate&&i>new Date(p.params.maxDate).getTime())return!1;if(p.params.minDate&&i<new Date(p.params.minDate).getTime())return!1;var a=new Date(p.currentYear,p.currentMonth).getTime(),r=i>a?"next":"prev",o=p.monthHTML(new Date(t,e));p.monthsTranslate=p.monthsTranslate||0;var s,c,l=p.monthsTranslate,u=!p.animating;i>a?(p.monthsTranslate--,p.animating||p.months.eq(p.months.length-1).remove(),p.wrapper.append(o),p.months=p.wrapper.find(".picker-calendar-month"),s=100*-(l-1)*d,p.months.eq(p.months.length-1).transform("translate3d("+(p.isH?s:0)+"%, "+(p.isH?0:s)+"%, 0)").addClass("picker-calendar-month-next")):(p.monthsTranslate++,p.animating||p.months.eq(0).remove(),p.wrapper.prepend(o),p.months=p.wrapper.find(".picker-calendar-month"),s=100*-(l+1)*d,p.months.eq(0).transform("translate3d("+(p.isH?s:0)+"%, "+(p.isH?0:s)+"%, 0)").addClass("picker-calendar-month-prev")),p.params.onMonthAdd&&p.params.onMonthAdd(p,"next"===r?p.months.eq(p.months.length-1)[0]:p.months.eq(0)[0]),p.animating=!0,p.onMonthChangeStart(r),c=100*p.monthsTranslate*d,p.wrapper.transition(n).transform("translate3d("+(p.isH?c:0)+"%, "+(p.isH?0:c)+"%, 0)"),u&&p.wrapper.transitionEnd(function(){p.onMonthChangeEnd(r,!0)}),p.params.animate||p.onMonthChangeEnd(r)},p.nextYear=function(){p.setYearMonth(p.currentYear+1)},p.prevYear=function(){p.setYearMonth(p.currentYear-1)},p.layout=function(){var t,e="",n="",i=p.value&&p.value.length?p.value[0]:(new Date).setHours(0,0,0,0),a=p.monthHTML(i,"prev"),r=p.monthHTML(i),o=p.monthHTML(i,"next"),s='<div class="picker-calendar-months"><div class="picker-calendar-months-wrapper">'+(a+r+o)+"</div></div>",c="";if(p.params.weekHeader){for(t=0;7>t;t++){var l=t+p.params.firstDay>6?t-7+p.params.firstDay:t+p.params.firstDay,u=p.params.dayNamesShort[l];c+='<div class="picker-calendar-week-day '+(p.params.weekendDays.indexOf(l)>=0?"picker-calendar-week-day-weekend":"")+'"> '+u+"</div>"}c='<div class="picker-calendar-week-days">'+c+"</div>"}n="weui-picker-calendar "+(p.params.cssClass||""),p.inline||(n="weui-picker-modal "+n);var h=p.params.toolbar?p.params.toolbarTemplate.replace(/{{closeText}}/g,p.params.toolbarCloseText):"";p.params.toolbar&&(h=p.params.toolbarTemplate.replace(/{{closeText}}/g,p.params.toolbarCloseText).replace(/{{monthPicker}}/g,p.params.monthPicker?p.params.monthPickerTemplate:"").replace(/{{yearPicker}}/g,p.params.yearPicker?p.params.yearPickerTemplate:"")),e='<div class="'+n+'">'+h+'<div class="picker-modal-inner">'+c+s+"</div></div>",p.pickerHTML=e},p.params.input&&(p.input=t(p.params.input),p.input.length>0&&(p.params.inputReadOnly&&p.input.prop("readOnly",!0),p.inline||p.input.on("click",c),p.params.inputReadOnly&&p.input.on("focus mousedown",function(t){t.preventDefault()}))),p.inline||t(document).on("click touchend",l),p.opened=!1,p.open=function(){var e=r()&&!1,n=!1;p.opened||(p.value||p.params.value&&(p.value=p.params.value,n=!0),p.layout(),e?(p.pickerHTML='<div class="popover popover-picker-calendar"><div class="popover-inner">'+p.pickerHTML+"</div></div>",p.popover=t.popover(p.pickerHTML,p.params.input,!0),p.container=t(p.popover).find(".weui-picker-modal"),t(p.popover).on("close",function(){u()})):p.inline?(p.container=t(p.pickerHTML),p.container.addClass("picker-modal-inline"),t(p.params.container).append(p.container)):(p.container=t(t.openPicker(p.pickerHTML)),t(p.container).on("close",function(){u()})),p.container[0].f7Calendar=p,p.wrapper=p.container.find(".picker-calendar-months-wrapper"),p.months=p.wrapper.find(".picker-calendar-month"),p.updateCurrentMonthYear(),p.monthsTranslate=0,p.setMonthsTranslate(),p.initCalendarEvents(),n&&p.updateValue()),p.opened=!0,p.initialized=!0,p.params.onMonthAdd&&p.months.each(function(){p.params.onMonthAdd(p,this)}),p.params.onOpen&&p.params.onOpen(p)},p.close=function(){return p.opened&&!p.inline?(p.animating=!1,o()?void t.closePicker(p.popover):void t.closePicker(p.container)):void 0},p.destroy=function(){p.close(),p.params.input&&p.input.length>0&&(p.input.off("click focus",c),p.input.data("calendar",null)),t("html").off("click",l)},p.inline&&p.open(),p},r=function(t){return 10>t?"0"+t:t};t.fn.calendar=function(e,n){return e=e||{},this.each(function(){var i=t(this);if(i[0]){var o={};"INPUT"===i[0].tagName.toUpperCase()?o.input=i:o.container=i;
-var s=i.data("calendar");if(!s)if("string"==typeof e);else{if(!e.value&&i.val()&&(e.value=[i.val()]),!e.value){var c=new Date;e.value=[c.getFullYear()+"-"+r(c.getMonth()+1)+"-"+r(c.getDate())]}s=i.data("calendar",new a(t.extend(o,e)))}"string"==typeof e&&s[e].call(s,n)}})},e=t.fn.calendar.prototype.defaults={value:void 0,monthNames:["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],monthNamesShort:["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],dayNames:["周日","周一","周二","周三","周四","周五","周六"],dayNamesShort:["周日","周一","周二","周三","周四","周五","周六"],firstDay:1,weekendDays:[0,6],multiple:!1,dateFormat:"yyyy-mm-dd",direction:"horizontal",minDate:null,maxDate:null,touchMove:!0,animate:!0,closeOnSelect:!0,monthPicker:!0,monthPickerTemplate:'<div class="picker-calendar-month-picker"><a href="javascript:;" class="link icon-only picker-calendar-prev-month"><i class="icon icon-prev"></i></a><div class="current-month-value"></div><a href="javascript:;" class="link icon-only picker-calendar-next-month"><i class="icon icon-next"></i></a></div>',yearPicker:!0,yearPickerTemplate:'<div class="picker-calendar-year-picker"><a href="javascript:;" class="link icon-only picker-calendar-prev-year"><i class="icon icon-prev"></i></a><span class="current-year-value"></span><a href="javascript:;" class="link icon-only picker-calendar-next-year"><i class="icon icon-next"></i></a></div>',weekHeader:!0,scrollToInput:!0,inputReadOnly:!0,convertToPopover:!0,onlyInPopover:!1,toolbar:!0,toolbarCloseText:"Done",toolbarTemplate:'<div class="toolbar"><div class="toolbar-inner">{{yearPicker}}{{monthPicker}}</div></div>'}}($),+function(t){"use strict";var e,n=function(t){return 10>t?"0"+t:t},i=function(e,n){this.input=t(e),this.params=n,this.initMonthes="01 02 03 04 05 06 07 08 09 10 11 12".split(" "),this.initYears=function(){for(var t=[],e=1950;2030>=e;e++)t.push(e);return t}();var i=t.extend({},n,this.getConfig());t(this.input).picker(i)};i.prototype={getDays:function(t){for(var e=[],n=1;(t||31)>=n;n++)e.push(10>n?"0"+n:n);return e},getDaysByMonthAndYear:function(t,e){var n=new Date(e,parseInt(t)+1-1,1),i=new Date(n-1);return this.getDays(i.getDate())},getConfig:function(){var t,e=new Date,i=this.params,a=this,r={rotateEffect:!1,cssClass:"datetime-picker",value:[e.getFullYear(),n(e.getMonth()+1),n(e.getDate()),n(e.getHours()),n(e.getMinutes())],onChange:function(e,n,r){var o=(e.cols,a.getDaysByMonthAndYear(n[1],n[0])),s=n[2];s>o.length&&(s=o.length),e.cols[4].setValue(s);var c=new Date(n[0]+"-"+n[1]+"-"+n[2]),l=!0;if(i.min){var u=new Date("function"==typeof i.min?i.min():i.min);+u>c&&(e.setValue(t),l=!1)}if(i.max){var p=new Date("function"==typeof i.max?i.max():i.max);c>+p&&(e.setValue(t),l=!1)}l&&(t=n),a.params.onChange&&a.params.onChange.apply(this,arguments)},formatValue:function(t,e,n){return a.params.format(t,e,n)},cols:[{values:function(){for(var t=[],e=1950;2050>=e;e++)t.push(e);return t}()},{divider:!0,content:i.yearSplit},{values:["01","02","03","04","05","06","07","08","09","10","11","12"]},{divider:!0,content:i.monthSplit},{values:function(){for(var t=[],e=1;31>=e;e++)t.push(n(e));return t}()}]};i.dateSplit&&r.cols.push({divider:!0,content:i.dateSplit}),r.cols.push({divider:!0,content:i.datetimeSplit});var o=a.params.times();o&&o.length&&(r.cols=r.cols.concat(o));var s=this.input.val();return s&&(r.value=i.parse(s)),this.params.value&&(this.input.val(this.params.value),r.value=i.parse(this.params.value)),r}},t.fn.datetimePicker=function(n){return n=t.extend({},e,n),this.each(function(){if(this){var e=t(this),a=e.data("datetime");return a||e.data("datetime",new i(this,n)),a}})},e=t.fn.datetimePicker.prototype.defaults={input:void 0,min:void 0,max:void 0,yearSplit:"-",monthSplit:"-",dateSplit:"",datetimeSplit:" ",times:function(){return[{values:function(){for(var t=[],e=0;24>e;e++)t.push(n(e));return t}()},{divider:!0,content:":"},{values:function(){for(var t=[],e=0;60>e;e++)t.push(n(e));return t}()}]},format:function(t,e){return t.cols.map(function(t){return t.value||t.content}).join("")},parse:function(t){var e=t.split(this.datetimeSplit);return e[0].split(/\D/).concat(e[1].split(/:|时|分|秒/)).filter(function(t){return!!t})}}}($),+function(t){"use strict";t.openPopup=function(e,n){t.closePopup(),e=t(e),e.show(),e.width(),e.addClass("weui-popup__container--visible");var i=e.find(".weui-popup__modal");i.width(),i.transitionEnd(function(){i.trigger("open")})},t.closePopup=function(e,n){e=t(e||".weui-popup__container--visible"),e.find(".weui-popup__modal").transitionEnd(function(){var i=t(this);i.trigger("close"),e.hide(),n&&e.remove()}),e.removeClass("weui-popup__container--visible")},t(document).on("click",".close-popup, .weui-popup__overlay",function(){t.closePopup()}).on("click",".open-popup",function(){t(t(this).data("target")).popup()}).on("click",".weui-popup__container",function(e){t(e.target).hasClass("weui-popup__container")&&t.closePopup()}),t.fn.popup=function(){return this.each(function(){t.openPopup(this)})}}($),+function(t){"use strict";var e,n,i,a,r,o,s=function(n){var i=t.getTouchPosition(n);a=i,r=o=0,e.addClass("touching")},c=function(n){if(!a)return!1;n.preventDefault(),n.stopPropagation();var i=t.getTouchPosition(n);r=i.x-a.x,o=i.y-a.y,o>0&&(o=Math.sqrt(o)),e.css("transform","translate3d(0, "+o+"px, 0)")},l=function(){e.removeClass("touching"),e.attr("style",""),0>o&&Math.abs(o)>.38*e.height()&&t.closeNotification(),Math.abs(r)<=1&&Math.abs(o)<=1&&e.trigger("noti-click"),a=!1},u=function(e){e.on(t.touchEvents.start,s),e.on(t.touchEvents.move,c),e.on(t.touchEvents.end,l)};t.notification=t.noti=function(a){a=t.extend({},n,a),e=t(".weui-notification"),e[0]||(e=t('<div class="weui-notification"></div>').appendTo(document.body),u(e)),e.off("noti-click"),a.onClick&&e.on("noti-click",function(){a.onClick(a.data)}),e.html(t.t7.compile(a.tpl)(a)),e.show(),e.addClass("weui-notification--in"),e.data("params",a);var r=function(){i&&(clearTimeout(i),i=null),i=setTimeout(function(){e.hasClass("weui-notification--touching")?r():t.closeNotification()},a.time)};r()},t.closeNotification=function(){i&&clearTimeout(i),i=null;var e=t(".weui-notification").removeClass("weui-notification--in").transitionEnd(function(){t(this).remove()});if(e[0]){var n=t(".weui-notification").data("params");n&&n.onClose&&n.onClose(n.data)}},n=t.noti.prototype.defaults={title:void 0,text:void 0,media:void 0,time:4e3,onClick:void 0,onClose:void 0,data:void 0,tpl:'<div class="weui-notification__inner">{{#if media}}<div class="weui-notification__media">{{media}}</div>{{/if}}<div class="weui-notification__content">{{#if title}}<div class="weui-notification__title">{{title}}</div>{{/if}}{{#if text}}<div class="weui-notification__text">{{text}}</div>{{/if}}</div><div class="weui-notification__handle-bar"></div></div>'}}($),+function(t){"use strict";var e;t.toptip=function(n,i,a){if(n){"string"==typeof i&&(a=i,i=void 0),i=i||3e3;var r=a?"bg-"+a:"bg-danger",o=t(".weui-toptips").remove();o=t('<div class="weui-toptips"></div>').appendTo(document.body),o.html(n),o[0].className="weui-toptips "+r,clearTimeout(e),o.hasClass("weui-toptips_visible")||(o.show().width(),o.addClass("weui-toptips_visible")),e=setTimeout(function(){o.removeClass("weui-toptips_visible").transitionEnd(function(){o.remove()})},i)}}}($),+function(t){"use strict";var e=function(e,n){this.container=t(e),this.handler=this.container.find(".weui-slider__handler"),this.track=this.container.find(".weui-slider__track"),this.value=this.container.find(".weui-slider-box__value"),this.bind(),"function"==typeof n&&(this.callback=n)};e.prototype.bind=function(){this.container.on(t.touchEvents.start,t.proxy(this.touchStart,this)).on(t.touchEvents.end,t.proxy(this.touchEnd,this)),t(document.body).on(t.touchEvents.move,t.proxy(this.touchMove,this))},e.prototype.touchStart=function(e){e.preventDefault(),this.start=t.getTouchPosition(e),this.width=this.container.find(".weui-slider__inner").width(),this.left=parseInt(this.container.find(".weui-slider__handler").css("left")),this.touching=!0},e.prototype.touchMove=function(e){if(!this.touching)return!0;var n=t.getTouchPosition(e),i=n.x-this.start.x,a=i+this.left,r=parseInt(a/this.width*100);0>r&&(r=0),r>100&&(r=100),this.handler.css("left",r+"%"),this.track.css("width",r+"%"),this.value.text(r),this.callback&&this.callback.call(this,r),this.container.trigger("change",r)},e.prototype.touchEnd=function(t){this.touching=!1},t.fn.slider=function(n){this.each(function(){var i=t(this),a=i.data("slider");return a?a:void i.data("slider",new e(this,n))})}}($);
\ No newline at end of file
diff --git a/NewLife.Cube/Content/jweui/js/swiper.js b/NewLife.Cube/Content/jweui/js/swiper.js
deleted file mode 100644
index 47000ffb7f..0000000000
--- a/NewLife.Cube/Content/jweui/js/swiper.js
+++ /dev/null
@@ -1,4160 +0,0 @@
-/**
- * Swiper 3.3.1
- * Most modern mobile touch slider and framework with hardware accelerated transitions
- * 
- * http://www.idangero.us/swiper/
- * 
- * Copyright 2016, Vladimir Kharlampidi
- * The iDangero.us
- * http://www.idangero.us/
- * 
- * Licensed under MIT
- * 
- * Released on: February 7, 2016
- */
-(function () {
-    'use strict';
-    var $;
-    /*===========================
-    Swiper
-    ===========================*/
-    var Swiper = function (container, params) {
-        if (!(this instanceof Swiper)) return new Swiper(container, params);
-
-        var defaults = {
-            direction: 'horizontal',
-            touchEventsTarget: 'container',
-            initialSlide: 0,
-            speed: 300,
-            // autoplay
-            autoplay: false,
-            autoplayDisableOnInteraction: true,
-            autoplayStopOnLast: false,
-            // To support iOS's swipe-to-go-back gesture (when being used in-app, with UIWebView).
-            iOSEdgeSwipeDetection: false,
-            iOSEdgeSwipeThreshold: 20,
-            // Free mode
-            freeMode: false,
-            freeModeMomentum: true,
-            freeModeMomentumRatio: 1,
-            freeModeMomentumBounce: true,
-            freeModeMomentumBounceRatio: 1,
-            freeModeSticky: false,
-            freeModeMinimumVelocity: 0.02,
-            // Autoheight
-            autoHeight: false,
-            // Set wrapper width
-            setWrapperSize: false,
-            // Virtual Translate
-            virtualTranslate: false,
-            // Effects
-            effect: 'slide', // 'slide' or 'fade' or 'cube' or 'coverflow' or 'flip'
-            coverflow: {
-                rotate: 50,
-                stretch: 0,
-                depth: 100,
-                modifier: 1,
-                slideShadows : true
-            },
-            flip: {
-                slideShadows : true,
-                limitRotation: true
-            },
-            cube: {
-                slideShadows: true,
-                shadow: true,
-                shadowOffset: 20,
-                shadowScale: 0.94
-            },
-            fade: {
-                crossFade: false
-            },
-            // Parallax
-            parallax: false,
-            // Scrollbar
-            scrollbar: null,
-            scrollbarHide: true,
-            scrollbarDraggable: false,
-            scrollbarSnapOnRelease: false,
-            // Keyboard Mousewheel
-            keyboardControl: false,
-            mousewheelControl: false,
-            mousewheelReleaseOnEdges: false,
-            mousewheelInvert: false,
-            mousewheelForceToAxis: false,
-            mousewheelSensitivity: 1,
-            // Hash Navigation
-            hashnav: false,
-            // Breakpoints
-            breakpoints: undefined,
-            // Slides grid
-            spaceBetween: 0,
-            slidesPerView: 1,
-            slidesPerColumn: 1,
-            slidesPerColumnFill: 'column',
-            slidesPerGroup: 1,
-            centeredSlides: false,
-            slidesOffsetBefore: 0, // in px
-            slidesOffsetAfter: 0, // in px
-            // Round length
-            roundLengths: false,
-            // Touches
-            touchRatio: 1,
-            touchAngle: 45,
-            simulateTouch: true,
-            shortSwipes: true,
-            longSwipes: true,
-            longSwipesRatio: 0.5,
-            longSwipesMs: 300,
-            followFinger: true,
-            onlyExternal: false,
-            threshold: 0,
-            touchMoveStopPropagation: true,
-            // Unique Navigation Elements
-            uniqueNavElements: true,
-            // Pagination
-            pagination: null,
-            paginationElement: 'span',
-            paginationClickable: false,
-            paginationHide: false,
-            paginationBulletRender: null,
-            paginationProgressRender: null,
-            paginationFractionRender: null,
-            paginationCustomRender: null,
-            paginationType: 'bullets', // 'bullets' or 'progress' or 'fraction' or 'custom'
-            // Resistance
-            resistance: true,
-            resistanceRatio: 0.85,
-            // Next/prev buttons
-            nextButton: null,
-            prevButton: null,
-            // Progress
-            watchSlidesProgress: false,
-            watchSlidesVisibility: false,
-            // Cursor
-            grabCursor: false,
-            // Clicks
-            preventClicks: true,
-            preventClicksPropagation: true,
-            slideToClickedSlide: false,
-            // Lazy Loading
-            lazyLoading: false,
-            lazyLoadingInPrevNext: false,
-            lazyLoadingInPrevNextAmount: 1,
-            lazyLoadingOnTransitionStart: false,
-            // Images
-            preloadImages: true,
-            updateOnImagesReady: true,
-            // loop
-            loop: false,
-            loopAdditionalSlides: 0,
-            loopedSlides: null,
-            // Control
-            control: undefined,
-            controlInverse: false,
-            controlBy: 'slide', //or 'container'
-            // Swiping/no swiping
-            allowSwipeToPrev: true,
-            allowSwipeToNext: true,
-            swipeHandler: null, //'.swipe-handler',
-            noSwiping: true,
-            noSwipingClass: 'swiper-no-swiping',
-            // NS
-            slideClass: 'swiper-slide',
-            slideActiveClass: 'swiper-slide-active',
-            slideVisibleClass: 'swiper-slide-visible',
-            slideDuplicateClass: 'swiper-slide-duplicate',
-            slideNextClass: 'swiper-slide-next',
-            slidePrevClass: 'swiper-slide-prev',
-            wrapperClass: 'swiper-wrapper',
-            bulletClass: 'swiper-pagination-bullet',
-            bulletActiveClass: 'swiper-pagination-bullet-active',
-            buttonDisabledClass: 'swiper-button-disabled',
-            paginationCurrentClass: 'swiper-pagination-current',
-            paginationTotalClass: 'swiper-pagination-total',
-            paginationHiddenClass: 'swiper-pagination-hidden',
-            paginationProgressbarClass: 'swiper-pagination-progressbar',
-            // Observer
-            observer: false,
-            observeParents: false,
-            // Accessibility
-            a11y: false,
-            prevSlideMessage: 'Previous slide',
-            nextSlideMessage: 'Next slide',
-            firstSlideMessage: 'This is the first slide',
-            lastSlideMessage: 'This is the last slide',
-            paginationBulletMessage: 'Go to slide {{index}}',
-            // Callbacks
-            runCallbacksOnInit: true
-            /*
-            Callbacks:
-            onInit: function (swiper)
-            onDestroy: function (swiper)
-            onClick: function (swiper, e)
-            onTap: function (swiper, e)
-            onDoubleTap: function (swiper, e)
-            onSliderMove: function (swiper, e)
-            onSlideChangeStart: function (swiper)
-            onSlideChangeEnd: function (swiper)
-            onTransitionStart: function (swiper)
-            onTransitionEnd: function (swiper)
-            onImagesReady: function (swiper)
-            onProgress: function (swiper, progress)
-            onTouchStart: function (swiper, e)
-            onTouchMove: function (swiper, e)
-            onTouchMoveOpposite: function (swiper, e)
-            onTouchEnd: function (swiper, e)
-            onReachBeginning: function (swiper)
-            onReachEnd: function (swiper)
-            onSetTransition: function (swiper, duration)
-            onSetTranslate: function (swiper, translate)
-            onAutoplayStart: function (swiper)
-            onAutoplayStop: function (swiper),
-            onLazyImageLoad: function (swiper, slide, image)
-            onLazyImageReady: function (swiper, slide, image)
-            */
-        
-        };
-        var initialVirtualTranslate = params && params.virtualTranslate;
-        
-        params = params || {};
-        var originalParams = {};
-        for (var param in params) {
-            if (typeof params[param] === 'object' && params[param] !== null && !(params[param].nodeType || params[param] === window || params[param] === document || (typeof Dom7 !== 'undefined' && params[param] instanceof Dom7) || (typeof jQuery !== 'undefined' && params[param] instanceof jQuery))) {
-                originalParams[param] = {};
-                for (var deepParam in params[param]) {
-                    originalParams[param][deepParam] = params[param][deepParam];
-                }
-            }
-            else {
-                originalParams[param] = params[param];
-            }
-        }
-        for (var def in defaults) {
-            if (typeof params[def] === 'undefined') {
-                params[def] = defaults[def];
-            }
-            else if (typeof params[def] === 'object') {
-                for (var deepDef in defaults[def]) {
-                    if (typeof params[def][deepDef] === 'undefined') {
-                        params[def][deepDef] = defaults[def][deepDef];
-                    }
-                }
-            }
-        }
-        
-        // Swiper
-        var s = this;
-        
-        // Params
-        s.params = params;
-        s.originalParams = originalParams;
-        
-        // Classname
-        s.classNames = [];
-        /*=========================
-          Dom Library and plugins
-          ===========================*/
-        if (typeof $ !== 'undefined' && typeof Dom7 !== 'undefined'){
-            $ = Dom7;
-        }
-        if (typeof $ === 'undefined') {
-            if (typeof Dom7 === 'undefined') {
-                $ = window.Dom7 || window.Zepto || window.jQuery;
-            }
-            else {
-                $ = Dom7;
-            }
-            if (!$) return;
-        }
-        // Export it to Swiper instance
-        s.$ = $;
-        
-        /*=========================
-          Breakpoints
-          ===========================*/
-        s.currentBreakpoint = undefined;
-        s.getActiveBreakpoint = function () {
-            //Get breakpoint for window width
-            if (!s.params.breakpoints) return false;
-            var breakpoint = false;
-            var points = [], point;
-            for ( point in s.params.breakpoints ) {
-                if (s.params.breakpoints.hasOwnProperty(point)) {
-                    points.push(point);
-                }
-            }
-            points.sort(function (a, b) {
-                return parseInt(a, 10) > parseInt(b, 10);
-            });
-            for (var i = 0; i < points.length; i++) {
-                point = points[i];
-                if (point >= window.innerWidth && !breakpoint) {
-                    breakpoint = point;
-                }
-            }
-            return breakpoint || 'max';
-        };
-        s.setBreakpoint = function () {
-            //Set breakpoint for window width and update parameters
-            var breakpoint = s.getActiveBreakpoint();
-            if (breakpoint && s.currentBreakpoint !== breakpoint) {
-                var breakPointsParams = breakpoint in s.params.breakpoints ? s.params.breakpoints[breakpoint] : s.originalParams;
-                var needsReLoop = s.params.loop && (breakPointsParams.slidesPerView !== s.params.slidesPerView);
-                for ( var param in breakPointsParams ) {
-                    s.params[param] = breakPointsParams[param];
-                }
-                s.currentBreakpoint = breakpoint;
-                if(needsReLoop && s.destroyLoop) {
-                    s.reLoop(true);
-                }
-            }
-        };
-        // Set breakpoint on load
-        if (s.params.breakpoints) {
-            s.setBreakpoint();
-        }
-        
-        /*=========================
-          Preparation - Define Container, Wrapper and Pagination
-          ===========================*/
-        s.container = $(container);
-        if (s.container.length === 0) return;
-        if (s.container.length > 1) {
-            var swipers = [];
-            s.container.each(function () {
-                var container = this;
-                swipers.push(new Swiper(this, params));
-            });
-            return swipers;
-        }
-        
-        // Save instance in container HTML Element and in data
-        s.container[0].swiper = s;
-        s.container.data('swiper', s);
-        
-        s.classNames.push('swiper-container-' + s.params.direction);
-        
-        if (s.params.freeMode) {
-            s.classNames.push('swiper-container-free-mode');
-        }
-        if (!s.support.flexbox) {
-            s.classNames.push('swiper-container-no-flexbox');
-            s.params.slidesPerColumn = 1;
-        }
-        if (s.params.autoHeight) {
-            s.classNames.push('swiper-container-autoheight');
-        }
-        // Enable slides progress when required
-        if (s.params.parallax || s.params.watchSlidesVisibility) {
-            s.params.watchSlidesProgress = true;
-        }
-        // Coverflow / 3D
-        if (['cube', 'coverflow', 'flip'].indexOf(s.params.effect) >= 0) {
-            if (s.support.transforms3d) {
-                s.params.watchSlidesProgress = true;
-                s.classNames.push('swiper-container-3d');
-            }
-            else {
-                s.params.effect = 'slide';
-            }
-        }
-        if (s.params.effect !== 'slide') {
-            s.classNames.push('swiper-container-' + s.params.effect);
-        }
-        if (s.params.effect === 'cube') {
-            s.params.resistanceRatio = 0;
-            s.params.slidesPerView = 1;
-            s.params.slidesPerColumn = 1;
-            s.params.slidesPerGroup = 1;
-            s.params.centeredSlides = false;
-            s.params.spaceBetween = 0;
-            s.params.virtualTranslate = true;
-            s.params.setWrapperSize = false;
-        }
-        if (s.params.effect === 'fade' || s.params.effect === 'flip') {
-            s.params.slidesPerView = 1;
-            s.params.slidesPerColumn = 1;
-            s.params.slidesPerGroup = 1;
-            s.params.watchSlidesProgress = true;
-            s.params.spaceBetween = 0;
-            s.params.setWrapperSize = false;
-            if (typeof initialVirtualTranslate === 'undefined') {
-                s.params.virtualTranslate = true;
-            }
-        }
-        
-        // Grab Cursor
-        if (s.params.grabCursor && s.support.touch) {
-            s.params.grabCursor = false;
-        }
-        
-        // Wrapper
-        s.wrapper = s.container.children('.' + s.params.wrapperClass);
-        
-        // Pagination
-        if (s.params.pagination) {
-            s.paginationContainer = $(s.params.pagination);
-            if (s.params.uniqueNavElements && typeof s.params.pagination === 'string' && s.paginationContainer.length > 1 && s.container.find(s.params.pagination).length === 1) {
-                s.paginationContainer = s.container.find(s.params.pagination);
-            }
-        
-            if (s.params.paginationType === 'bullets' && s.params.paginationClickable) {
-                s.paginationContainer.addClass('swiper-pagination-clickable');
-            }
-            else {
-                s.params.paginationClickable = false;
-            }
-            s.paginationContainer.addClass('swiper-pagination-' + s.params.paginationType);
-        }
-        // Next/Prev Buttons
-        if (s.params.nextButton || s.params.prevButton) {
-            if (s.params.nextButton) {
-                s.nextButton = $(s.params.nextButton);
-                if (s.params.uniqueNavElements && typeof s.params.nextButton === 'string' && s.nextButton.length > 1 && s.container.find(s.params.nextButton).length === 1) {
-                    s.nextButton = s.container.find(s.params.nextButton);
-                }
-            }
-            if (s.params.prevButton) {
-                s.prevButton = $(s.params.prevButton);
-                if (s.params.uniqueNavElements && typeof s.params.prevButton === 'string' && s.prevButton.length > 1 && s.container.find(s.params.prevButton).length === 1) {
-                    s.prevButton = s.container.find(s.params.prevButton);
-                }
-            }
-        }
-        
-        // Is Horizontal
-        s.isHorizontal = function () {
-            return s.params.direction === 'horizontal';
-        };
-        // s.isH = isH;
-        
-        // RTL
-        s.rtl = s.isHorizontal() && (s.container[0].dir.toLowerCase() === 'rtl' || s.container.css('direction') === 'rtl');
-        if (s.rtl) {
-            s.classNames.push('swiper-container-rtl');
-        }
-        
-        // Wrong RTL support
-        if (s.rtl) {
-            s.wrongRTL = s.wrapper.css('display') === '-webkit-box';
-        }
-        
-        // Columns
-        if (s.params.slidesPerColumn > 1) {
-            s.classNames.push('swiper-container-multirow');
-        }
-        
-        // Check for Android
-        if (s.device.android) {
-            s.classNames.push('swiper-container-android');
-        }
-        
-        // Add classes
-        s.container.addClass(s.classNames.join(' '));
-        
-        // Translate
-        s.translate = 0;
-        
-        // Progress
-        s.progress = 0;
-        
-        // Velocity
-        s.velocity = 0;
-        
-        /*=========================
-          Locks, unlocks
-          ===========================*/
-        s.lockSwipeToNext = function () {
-            s.params.allowSwipeToNext = false;
-        };
-        s.lockSwipeToPrev = function () {
-            s.params.allowSwipeToPrev = false;
-        };
-        s.lockSwipes = function () {
-            s.params.allowSwipeToNext = s.params.allowSwipeToPrev = false;
-        };
-        s.unlockSwipeToNext = function () {
-            s.params.allowSwipeToNext = true;
-        };
-        s.unlockSwipeToPrev = function () {
-            s.params.allowSwipeToPrev = true;
-        };
-        s.unlockSwipes = function () {
-            s.params.allowSwipeToNext = s.params.allowSwipeToPrev = true;
-        };
-        
-        /*=========================
-          Round helper
-          ===========================*/
-        function round(a) {
-            return Math.floor(a);
-        }
-        /*=========================
-          Set grab cursor
-          ===========================*/
-        if (s.params.grabCursor) {
-            s.container[0].style.cursor = 'move';
-            s.container[0].style.cursor = '-webkit-grab';
-            s.container[0].style.cursor = '-moz-grab';
-            s.container[0].style.cursor = 'grab';
-        }
-        /*=========================
-          Update on Images Ready
-          ===========================*/
-        s.imagesToLoad = [];
-        s.imagesLoaded = 0;
-        
-        s.loadImage = function (imgElement, src, srcset, checkForComplete, callback) {
-            var image;
-            function onReady () {
-                if (callback) callback();
-            }
-            if (!imgElement.complete || !checkForComplete) {
-                if (src) {
-                    image = new window.Image();
-                    image.onload = onReady;
-                    image.onerror = onReady;
-                    if (srcset) {
-                        image.srcset = srcset;
-                    }
-                    if (src) {
-                        image.src = src;
-                    }
-                } else {
-                    onReady();
-                }
-        
-            } else {//image already loaded...
-                onReady();
-            }
-        };
-        s.preloadImages = function () {
-            s.imagesToLoad = s.container.find('img');
-            function _onReady() {
-                if (typeof s === 'undefined' || s === null) return;
-                if (s.imagesLoaded !== undefined) s.imagesLoaded++;
-                if (s.imagesLoaded === s.imagesToLoad.length) {
-                    if (s.params.updateOnImagesReady) s.update();
-                    s.emit('onImagesReady', s);
-                }
-            }
-            for (var i = 0; i < s.imagesToLoad.length; i++) {
-                s.loadImage(s.imagesToLoad[i], (s.imagesToLoad[i].currentSrc || s.imagesToLoad[i].getAttribute('src')), (s.imagesToLoad[i].srcset || s.imagesToLoad[i].getAttribute('srcset')), true, _onReady);
-            }
-        };
-        
-        /*=========================
-          Autoplay
-          ===========================*/
-        s.autoplayTimeoutId = undefined;
-        s.autoplaying = false;
-        s.autoplayPaused = false;
-        function autoplay() {
-            s.autoplayTimeoutId = setTimeout(function () {
-                if (s.params.loop) {
-                    s.fixLoop();
-                    s._slideNext();
-                    s.emit('onAutoplay', s);
-                }
-                else {
-                    if (!s.isEnd) {
-                        s._slideNext();
-                        s.emit('onAutoplay', s);
-                    }
-                    else {
-                        if (!params.autoplayStopOnLast) {
-                            s._slideTo(0);
-                            s.emit('onAutoplay', s);
-                        }
-                        else {
-                            s.stopAutoplay();
-                        }
-                    }
-                }
-            }, s.params.autoplay);
-        }
-        s.startAutoplay = function () {
-            if (typeof s.autoplayTimeoutId !== 'undefined') return false;
-            if (!s.params.autoplay) return false;
-            if (s.autoplaying) return false;
-            s.autoplaying = true;
-            s.emit('onAutoplayStart', s);
-            autoplay();
-        };
-        s.stopAutoplay = function (internal) {
-            if (!s.autoplayTimeoutId) return;
-            if (s.autoplayTimeoutId) clearTimeout(s.autoplayTimeoutId);
-            s.autoplaying = false;
-            s.autoplayTimeoutId = undefined;
-            s.emit('onAutoplayStop', s);
-        };
-        s.pauseAutoplay = function (speed) {
-            if (s.autoplayPaused) return;
-            if (s.autoplayTimeoutId) clearTimeout(s.autoplayTimeoutId);
-            s.autoplayPaused = true;
-            if (speed === 0) {
-                s.autoplayPaused = false;
-                autoplay();
-            }
-            else {
-                s.wrapper.transitionEnd(function () {
-                    if (!s) return;
-                    s.autoplayPaused = false;
-                    if (!s.autoplaying) {
-                        s.stopAutoplay();
-                    }
-                    else {
-                        autoplay();
-                    }
-                });
-            }
-        };
-        /*=========================
-          Min/Max Translate
-          ===========================*/
-        s.minTranslate = function () {
-            return (-s.snapGrid[0]);
-        };
-        s.maxTranslate = function () {
-            return (-s.snapGrid[s.snapGrid.length - 1]);
-        };
-        /*=========================
-          Slider/slides sizes
-          ===========================*/
-        s.updateAutoHeight = function () {
-            // Update Height
-            var slide = s.slides.eq(s.activeIndex)[0];
-            if (typeof slide !== 'undefined') {
-                var newHeight = slide.offsetHeight;
-                if (newHeight) s.wrapper.css('height', newHeight + 'px');
-            }
-        };
-        s.updateContainerSize = function () {
-            var width, height;
-            if (typeof s.params.width !== 'undefined') {
-                width = s.params.width;
-            }
-            else {
-                width = s.container[0].clientWidth;
-            }
-            if (typeof s.params.height !== 'undefined') {
-                height = s.params.height;
-            }
-            else {
-                height = s.container[0].clientHeight;
-            }
-            if (width === 0 && s.isHorizontal() || height === 0 && !s.isHorizontal()) {
-                return;
-            }
-        
-            //Subtract paddings
-            width = width - parseInt(s.container.css('padding-left'), 10) - parseInt(s.container.css('padding-right'), 10);
-            height = height - parseInt(s.container.css('padding-top'), 10) - parseInt(s.container.css('padding-bottom'), 10);
-        
-            // Store values
-            s.width = width;
-            s.height = height;
-            s.size = s.isHorizontal() ? s.width : s.height;
-        };
-        
-        s.updateSlidesSize = function () {
-            s.slides = s.wrapper.children('.' + s.params.slideClass);
-            s.snapGrid = [];
-            s.slidesGrid = [];
-            s.slidesSizesGrid = [];
-        
-            var spaceBetween = s.params.spaceBetween,
-                slidePosition = -s.params.slidesOffsetBefore,
-                i,
-                prevSlideSize = 0,
-                index = 0;
-            if (typeof s.size === 'undefined') return;
-            if (typeof spaceBetween === 'string' && spaceBetween.indexOf('%') >= 0) {
-                spaceBetween = parseFloat(spaceBetween.replace('%', '')) / 100 * s.size;
-            }
-        
-            s.virtualSize = -spaceBetween;
-            // reset margins
-            if (s.rtl) s.slides.css({marginLeft: '', marginTop: ''});
-            else s.slides.css({marginRight: '', marginBottom: ''});
-        
-            var slidesNumberEvenToRows;
-            if (s.params.slidesPerColumn > 1) {
-                if (Math.floor(s.slides.length / s.params.slidesPerColumn) === s.slides.length / s.params.slidesPerColumn) {
-                    slidesNumberEvenToRows = s.slides.length;
-                }
-                else {
-                    slidesNumberEvenToRows = Math.ceil(s.slides.length / s.params.slidesPerColumn) * s.params.slidesPerColumn;
-                }
-                if (s.params.slidesPerView !== 'auto' && s.params.slidesPerColumnFill === 'row') {
-                    slidesNumberEvenToRows = Math.max(slidesNumberEvenToRows, s.params.slidesPerView * s.params.slidesPerColumn);
-                }
-            }
-        
-            // Calc slides
-            var slideSize;
-            var slidesPerColumn = s.params.slidesPerColumn;
-            var slidesPerRow = slidesNumberEvenToRows / slidesPerColumn;
-            var numFullColumns = slidesPerRow - (s.params.slidesPerColumn * slidesPerRow - s.slides.length);
-            for (i = 0; i < s.slides.length; i++) {
-                slideSize = 0;
-                var slide = s.slides.eq(i);
-                if (s.params.slidesPerColumn > 1) {
-                    // Set slides order
-                    var newSlideOrderIndex;
-                    var column, row;
-                    if (s.params.slidesPerColumnFill === 'column') {
-                        column = Math.floor(i / slidesPerColumn);
-                        row = i - column * slidesPerColumn;
-                        if (column > numFullColumns || (column === numFullColumns && row === slidesPerColumn-1)) {
-                            if (++row >= slidesPerColumn) {
-                                row = 0;
-                                column++;
-                            }
-                        }
-                        newSlideOrderIndex = column + row * slidesNumberEvenToRows / slidesPerColumn;
-                        slide
-                            .css({
-                                '-webkit-box-ordinal-group': newSlideOrderIndex,
-                                '-moz-box-ordinal-group': newSlideOrderIndex,
-                                '-ms-flex-order': newSlideOrderIndex,
-                                '-webkit-order': newSlideOrderIndex,
-                                'order': newSlideOrderIndex
-                            });
-                    }
-                    else {
-                        row = Math.floor(i / slidesPerRow);
-                        column = i - row * slidesPerRow;
-                    }
-                    slide
-                        .css({
-                            'margin-top': (row !== 0 && s.params.spaceBetween) && (s.params.spaceBetween + 'px')
-                        })
-                        .attr('data-swiper-column', column)
-                        .attr('data-swiper-row', row);
-        
-                }
-                if (slide.css('display') === 'none') continue;
-                if (s.params.slidesPerView === 'auto') {
-                    slideSize = s.isHorizontal() ? slide.outerWidth(true) : slide.outerHeight(true);
-                    if (s.params.roundLengths) slideSize = round(slideSize);
-                }
-                else {
-                    slideSize = (s.size - (s.params.slidesPerView - 1) * spaceBetween) / s.params.slidesPerView;
-                    if (s.params.roundLengths) slideSize = round(slideSize);
-        
-                    if (s.isHorizontal()) {
-                        s.slides[i].style.width = slideSize + 'px';
-                    }
-                    else {
-                        s.slides[i].style.height = slideSize + 'px';
-                    }
-                }
-                s.slides[i].swiperSlideSize = slideSize;
-                s.slidesSizesGrid.push(slideSize);
-        
-        
-                if (s.params.centeredSlides) {
-                    slidePosition = slidePosition + slideSize / 2 + prevSlideSize / 2 + spaceBetween;
-                    if (i === 0) slidePosition = slidePosition - s.size / 2 - spaceBetween;
-                    if (Math.abs(slidePosition) < 1 / 1000) slidePosition = 0;
-                    if ((index) % s.params.slidesPerGroup === 0) s.snapGrid.push(slidePosition);
-                    s.slidesGrid.push(slidePosition);
-                }
-                else {
-                    if ((index) % s.params.slidesPerGroup === 0) s.snapGrid.push(slidePosition);
-                    s.slidesGrid.push(slidePosition);
-                    slidePosition = slidePosition + slideSize + spaceBetween;
-                }
-        
-                s.virtualSize += slideSize + spaceBetween;
-        
-                prevSlideSize = slideSize;
-        
-                index ++;
-            }
-            s.virtualSize = Math.max(s.virtualSize, s.size) + s.params.slidesOffsetAfter;
-            var newSlidesGrid;
-        
-            if (
-                s.rtl && s.wrongRTL && (s.params.effect === 'slide' || s.params.effect === 'coverflow')) {
-                s.wrapper.css({width: s.virtualSize + s.params.spaceBetween + 'px'});
-            }
-            if (!s.support.flexbox || s.params.setWrapperSize) {
-                if (s.isHorizontal()) s.wrapper.css({width: s.virtualSize + s.params.spaceBetween + 'px'});
-                else s.wrapper.css({height: s.virtualSize + s.params.spaceBetween + 'px'});
-            }
-        
-            if (s.params.slidesPerColumn > 1) {
-                s.virtualSize = (slideSize + s.params.spaceBetween) * slidesNumberEvenToRows;
-                s.virtualSize = Math.ceil(s.virtualSize / s.params.slidesPerColumn) - s.params.spaceBetween;
-                s.wrapper.css({width: s.virtualSize + s.params.spaceBetween + 'px'});
-                if (s.params.centeredSlides) {
-                    newSlidesGrid = [];
-                    for (i = 0; i < s.snapGrid.length; i++) {
-                        if (s.snapGrid[i] < s.virtualSize + s.snapGrid[0]) newSlidesGrid.push(s.snapGrid[i]);
-                    }
-                    s.snapGrid = newSlidesGrid;
-                }
-            }
-        
-            // Remove last grid elements depending on width
-            if (!s.params.centeredSlides) {
-                newSlidesGrid = [];
-                for (i = 0; i < s.snapGrid.length; i++) {
-                    if (s.snapGrid[i] <= s.virtualSize - s.size) {
-                        newSlidesGrid.push(s.snapGrid[i]);
-                    }
-                }
-                s.snapGrid = newSlidesGrid;
-                if (Math.floor(s.virtualSize - s.size) - Math.floor(s.snapGrid[s.snapGrid.length - 1]) > 1) {
-                    s.snapGrid.push(s.virtualSize - s.size);
-                }
-            }
-            if (s.snapGrid.length === 0) s.snapGrid = [0];
-        
-            if (s.params.spaceBetween !== 0) {
-                if (s.isHorizontal()) {
-                    if (s.rtl) s.slides.css({marginLeft: spaceBetween + 'px'});
-                    else s.slides.css({marginRight: spaceBetween + 'px'});
-                }
-                else s.slides.css({marginBottom: spaceBetween + 'px'});
-            }
-            if (s.params.watchSlidesProgress) {
-                s.updateSlidesOffset();
-            }
-        };
-        s.updateSlidesOffset = function () {
-            for (var i = 0; i < s.slides.length; i++) {
-                s.slides[i].swiperSlideOffset = s.isHorizontal() ? s.slides[i].offsetLeft : s.slides[i].offsetTop;
-            }
-        };
-        
-        /*=========================
-          Slider/slides progress
-          ===========================*/
-        s.updateSlidesProgress = function (translate) {
-            if (typeof translate === 'undefined') {
-                translate = s.translate || 0;
-            }
-            if (s.slides.length === 0) return;
-            if (typeof s.slides[0].swiperSlideOffset === 'undefined') s.updateSlidesOffset();
-        
-            var offsetCenter = -translate;
-            if (s.rtl) offsetCenter = translate;
-        
-            // Visible Slides
-            s.slides.removeClass(s.params.slideVisibleClass);
-            for (var i = 0; i < s.slides.length; i++) {
-                var slide = s.slides[i];
-                var slideProgress = (offsetCenter - slide.swiperSlideOffset) / (slide.swiperSlideSize + s.params.spaceBetween);
-                if (s.params.watchSlidesVisibility) {
-                    var slideBefore = -(offsetCenter - slide.swiperSlideOffset);
-                    var slideAfter = slideBefore + s.slidesSizesGrid[i];
-                    var isVisible =
-                        (slideBefore >= 0 && slideBefore < s.size) ||
-                        (slideAfter > 0 && slideAfter <= s.size) ||
-                        (slideBefore <= 0 && slideAfter >= s.size);
-                    if (isVisible) {
-                        s.slides.eq(i).addClass(s.params.slideVisibleClass);
-                    }
-                }
-                slide.progress = s.rtl ? -slideProgress : slideProgress;
-            }
-        };
-        s.updateProgress = function (translate) {
-            if (typeof translate === 'undefined') {
-                translate = s.translate || 0;
-            }
-            var translatesDiff = s.maxTranslate() - s.minTranslate();
-            var wasBeginning = s.isBeginning;
-            var wasEnd = s.isEnd;
-            if (translatesDiff === 0) {
-                s.progress = 0;
-                s.isBeginning = s.isEnd = true;
-            }
-            else {
-                s.progress = (translate - s.minTranslate()) / (translatesDiff);
-                s.isBeginning = s.progress <= 0;
-                s.isEnd = s.progress >= 1;
-            }
-            if (s.isBeginning && !wasBeginning) s.emit('onReachBeginning', s);
-            if (s.isEnd && !wasEnd) s.emit('onReachEnd', s);
-        
-            if (s.params.watchSlidesProgress) s.updateSlidesProgress(translate);
-            s.emit('onProgress', s, s.progress);
-        };
-        s.updateActiveIndex = function () {
-            var translate = s.rtl ? s.translate : -s.translate;
-            var newActiveIndex, i, snapIndex;
-            for (i = 0; i < s.slidesGrid.length; i ++) {
-                if (typeof s.slidesGrid[i + 1] !== 'undefined') {
-                    if (translate >= s.slidesGrid[i] && translate < s.slidesGrid[i + 1] - (s.slidesGrid[i + 1] - s.slidesGrid[i]) / 2) {
-                        newActiveIndex = i;
-                    }
-                    else if (translate >= s.slidesGrid[i] && translate < s.slidesGrid[i + 1]) {
-                        newActiveIndex = i + 1;
-                    }
-                }
-                else {
-                    if (translate >= s.slidesGrid[i]) {
-                        newActiveIndex = i;
-                    }
-                }
-            }
-            // Normalize slideIndex
-            if (newActiveIndex < 0 || typeof newActiveIndex === 'undefined') newActiveIndex = 0;
-            // for (i = 0; i < s.slidesGrid.length; i++) {
-                // if (- translate >= s.slidesGrid[i]) {
-                    // newActiveIndex = i;
-                // }
-            // }
-            snapIndex = Math.floor(newActiveIndex / s.params.slidesPerGroup);
-            if (snapIndex >= s.snapGrid.length) snapIndex = s.snapGrid.length - 1;
-        
-            if (newActiveIndex === s.activeIndex) {
-                return;
-            }
-            s.snapIndex = snapIndex;
-            s.previousIndex = s.activeIndex;
-            s.activeIndex = newActiveIndex;
-            s.updateClasses();
-        };
-        
-        /*=========================
-          Classes
-          ===========================*/
-        s.updateClasses = function () {
-            s.slides.removeClass(s.params.slideActiveClass + ' ' + s.params.slideNextClass + ' ' + s.params.slidePrevClass);
-            var activeSlide = s.slides.eq(s.activeIndex);
-            // Active classes
-            activeSlide.addClass(s.params.slideActiveClass);
-            // Next Slide
-            var nextSlide = activeSlide.next('.' + s.params.slideClass).addClass(s.params.slideNextClass);
-            if (s.params.loop && nextSlide.length === 0) {
-                s.slides.eq(0).addClass(s.params.slideNextClass);
-            }
-            // Prev Slide
-            var prevSlide = activeSlide.prev('.' + s.params.slideClass).addClass(s.params.slidePrevClass);
-            if (s.params.loop && prevSlide.length === 0) {
-                s.slides.eq(-1).addClass(s.params.slidePrevClass);
-            }
-        
-            // Pagination
-            if (s.paginationContainer && s.paginationContainer.length > 0) {
-                // Current/Total
-                var current,
-                    total = s.params.loop ? Math.ceil((s.slides.length - s.loopedSlides * 2) / s.params.slidesPerGroup) : s.snapGrid.length;
-                if (s.params.loop) {
-                    current = Math.ceil((s.activeIndex - s.loopedSlides)/s.params.slidesPerGroup);
-                    if (current > s.slides.length - 1 - s.loopedSlides * 2) {
-                        current = current - (s.slides.length - s.loopedSlides * 2);
-                    }
-                    if (current > total - 1) current = current - total;
-                    if (current < 0 && s.params.paginationType !== 'bullets') current = total + current;
-                }
-                else {
-                    if (typeof s.snapIndex !== 'undefined') {
-                        current = s.snapIndex;
-                    }
-                    else {
-                        current = s.activeIndex || 0;
-                    }
-                }
-                // Types
-                if (s.params.paginationType === 'bullets' && s.bullets && s.bullets.length > 0) {
-                    s.bullets.removeClass(s.params.bulletActiveClass);
-                    if (s.paginationContainer.length > 1) {
-                        s.bullets.each(function () {
-                            if ($(this).index() === current) $(this).addClass(s.params.bulletActiveClass);
-                        });
-                    }
-                    else {
-                        s.bullets.eq(current).addClass(s.params.bulletActiveClass);
-                    }
-                }
-                if (s.params.paginationType === 'fraction') {
-                    s.paginationContainer.find('.' + s.params.paginationCurrentClass).text(current + 1);
-                    s.paginationContainer.find('.' + s.params.paginationTotalClass).text(total);
-                }
-                if (s.params.paginationType === 'progress') {
-                    var scale = (current + 1) / total,
-                        scaleX = scale,
-                        scaleY = 1;
-                    if (!s.isHorizontal()) {
-                        scaleY = scale;
-                        scaleX = 1;
-                    }
-                    s.paginationContainer.find('.' + s.params.paginationProgressbarClass).transform('translate3d(0,0,0) scaleX(' + scaleX + ') scaleY(' + scaleY + ')').transition(s.params.speed);
-                }
-                if (s.params.paginationType === 'custom' && s.params.paginationCustomRender) {
-                    s.paginationContainer.html(s.params.paginationCustomRender(s, current + 1, total));
-                    s.emit('onPaginationRendered', s, s.paginationContainer[0]);
-                }
-            }
-        
-            // Next/active buttons
-            if (!s.params.loop) {
-                if (s.params.prevButton && s.prevButton && s.prevButton.length > 0) {
-                    if (s.isBeginning) {
-                        s.prevButton.addClass(s.params.buttonDisabledClass);
-                        if (s.params.a11y && s.a11y) s.a11y.disable(s.prevButton);
-                    }
-                    else {
-                        s.prevButton.removeClass(s.params.buttonDisabledClass);
-                        if (s.params.a11y && s.a11y) s.a11y.enable(s.prevButton);
-                    }
-                }
-                if (s.params.nextButton && s.nextButton && s.nextButton.length > 0) {
-                    if (s.isEnd) {
-                        s.nextButton.addClass(s.params.buttonDisabledClass);
-                        if (s.params.a11y && s.a11y) s.a11y.disable(s.nextButton);
-                    }
-                    else {
-                        s.nextButton.removeClass(s.params.buttonDisabledClass);
-                        if (s.params.a11y && s.a11y) s.a11y.enable(s.nextButton);
-                    }
-                }
-            }
-        };
-        
-        /*=========================
-          Pagination
-          ===========================*/
-        s.updatePagination = function () {
-            if (!s.params.pagination) return;
-            if (s.paginationContainer && s.paginationContainer.length > 0) {
-                var paginationHTML = '';
-                if (s.params.paginationType === 'bullets') {
-                    var numberOfBullets = s.params.loop ? Math.ceil((s.slides.length - s.loopedSlides * 2) / s.params.slidesPerGroup) : s.snapGrid.length;
-                    for (var i = 0; i < numberOfBullets; i++) {
-                        if (s.params.paginationBulletRender) {
-                            paginationHTML += s.params.paginationBulletRender(i, s.params.bulletClass);
-                        }
-                        else {
-                            paginationHTML += '<' + s.params.paginationElement+' class="' + s.params.bulletClass + '"></' + s.params.paginationElement + '>';
-                        }
-                    }
-                    s.paginationContainer.html(paginationHTML);
-                    s.bullets = s.paginationContainer.find('.' + s.params.bulletClass);
-                    if (s.params.paginationClickable && s.params.a11y && s.a11y) {
-                        s.a11y.initPagination();
-                    }
-                }
-                if (s.params.paginationType === 'fraction') {
-                    if (s.params.paginationFractionRender) {
-                        paginationHTML = s.params.paginationFractionRender(s, s.params.paginationCurrentClass, s.params.paginationTotalClass);
-                    }
-                    else {
-                        paginationHTML =
-                            '<span class="' + s.params.paginationCurrentClass + '"></span>' +
-                            ' / ' +
-                            '<span class="' + s.params.paginationTotalClass+'"></span>';
-                    }
-                    s.paginationContainer.html(paginationHTML);
-                }
-                if (s.params.paginationType === 'progress') {
-                    if (s.params.paginationProgressRender) {
-                        paginationHTML = s.params.paginationProgressRender(s, s.params.paginationProgressbarClass);
-                    }
-                    else {
-                        paginationHTML = '<span class="' + s.params.paginationProgressbarClass + '"></span>';
-                    }
-                    s.paginationContainer.html(paginationHTML);
-                }
-                if (s.params.paginationType !== 'custom') {
-                    s.emit('onPaginationRendered', s, s.paginationContainer[0]);
-                }
-            }
-        };
-        /*=========================
-          Common update method
-          ===========================*/
-        s.update = function (updateTranslate) {
-            s.updateContainerSize();
-            s.updateSlidesSize();
-            s.updateProgress();
-            s.updatePagination();
-            s.updateClasses();
-            if (s.params.scrollbar && s.scrollbar) {
-                s.scrollbar.set();
-            }
-            function forceSetTranslate() {
-                newTranslate = Math.min(Math.max(s.translate, s.maxTranslate()), s.minTranslate());
-                s.setWrapperTranslate(newTranslate);
-                s.updateActiveIndex();
-                s.updateClasses();
-            }
-            if (updateTranslate) {
-                var translated, newTranslate;
-                if (s.controller && s.controller.spline) {
-                    s.controller.spline = undefined;
-                }
-                if (s.params.freeMode) {
-                    forceSetTranslate();
-                    if (s.params.autoHeight) {
-                        s.updateAutoHeight();
-                    }
-                }
-                else {
-                    if ((s.params.slidesPerView === 'auto' || s.params.slidesPerView > 1) && s.isEnd && !s.params.centeredSlides) {
-                        translated = s.slideTo(s.slides.length - 1, 0, false, true);
-                    }
-                    else {
-                        translated = s.slideTo(s.activeIndex, 0, false, true);
-                    }
-                    if (!translated) {
-                        forceSetTranslate();
-                    }
-                }
-            }
-            else if (s.params.autoHeight) {
-                s.updateAutoHeight();
-            }
-        };
-        
-        /*=========================
-          Resize Handler
-          ===========================*/
-        s.onResize = function (forceUpdatePagination) {
-            //Breakpoints
-            if (s.params.breakpoints) {
-                s.setBreakpoint();
-            }
-        
-            // Disable locks on resize
-            var allowSwipeToPrev = s.params.allowSwipeToPrev;
-            var allowSwipeToNext = s.params.allowSwipeToNext;
-            s.params.allowSwipeToPrev = s.params.allowSwipeToNext = true;
-        
-            s.updateContainerSize();
-            s.updateSlidesSize();
-            if (s.params.slidesPerView === 'auto' || s.params.freeMode || forceUpdatePagination) s.updatePagination();
-            if (s.params.scrollbar && s.scrollbar) {
-                s.scrollbar.set();
-            }
-            if (s.controller && s.controller.spline) {
-                s.controller.spline = undefined;
-            }
-            var slideChangedBySlideTo = false;
-            if (s.params.freeMode) {
-                var newTranslate = Math.min(Math.max(s.translate, s.maxTranslate()), s.minTranslate());
-                s.setWrapperTranslate(newTranslate);
-                s.updateActiveIndex();
-                s.updateClasses();
-        
-                if (s.params.autoHeight) {
-                    s.updateAutoHeight();
-                }
-            }
-            else {
-                s.updateClasses();
-                if ((s.params.slidesPerView === 'auto' || s.params.slidesPerView > 1) && s.isEnd && !s.params.centeredSlides) {
-                    slideChangedBySlideTo = s.slideTo(s.slides.length - 1, 0, false, true);
-                }
-                else {
-                    slideChangedBySlideTo = s.slideTo(s.activeIndex, 0, false, true);
-                }
-            }
-            if (s.params.lazyLoading && !slideChangedBySlideTo && s.lazy) {
-                s.lazy.load();
-            }
-            // Return locks after resize
-            s.params.allowSwipeToPrev = allowSwipeToPrev;
-            s.params.allowSwipeToNext = allowSwipeToNext;
-        };
-        
-        /*=========================
-          Events
-          ===========================*/
-        
-        //Define Touch Events
-        var desktopEvents = ['mousedown', 'mousemove', 'mouseup'];
-        if (window.navigator.pointerEnabled) desktopEvents = ['pointerdown', 'pointermove', 'pointerup'];
-        else if (window.navigator.msPointerEnabled) desktopEvents = ['MSPointerDown', 'MSPointerMove', 'MSPointerUp'];
-        s.touchEvents = {
-            start : s.support.touch || !s.params.simulateTouch  ? 'touchstart' : desktopEvents[0],
-            move : s.support.touch || !s.params.simulateTouch ? 'touchmove' : desktopEvents[1],
-            end : s.support.touch || !s.params.simulateTouch ? 'touchend' : desktopEvents[2]
-        };
-        
-        
-        // WP8 Touch Events Fix
-        if (window.navigator.pointerEnabled || window.navigator.msPointerEnabled) {
-            (s.params.touchEventsTarget === 'container' ? s.container : s.wrapper).addClass('swiper-wp8-' + s.params.direction);
-        }
-        
-        // Attach/detach events
-        s.initEvents = function (detach) {
-            var actionDom = detach ? 'off' : 'on';
-            var action = detach ? 'removeEventListener' : 'addEventListener';
-            var touchEventsTarget = s.params.touchEventsTarget === 'container' ? s.container[0] : s.wrapper[0];
-            var target = s.support.touch ? touchEventsTarget : document;
-        
-            var moveCapture = s.params.nested ? true : false;
-        
-            //Touch Events
-            if (s.browser.ie) {
-                touchEventsTarget[action](s.touchEvents.start, s.onTouchStart, false);
-                target[action](s.touchEvents.move, s.onTouchMove, moveCapture);
-                target[action](s.touchEvents.end, s.onTouchEnd, false);
-            }
-            else {
-                if (s.support.touch) {
-                    touchEventsTarget[action](s.touchEvents.start, s.onTouchStart, false);
-                    touchEventsTarget[action](s.touchEvents.move, s.onTouchMove, moveCapture);
-                    touchEventsTarget[action](s.touchEvents.end, s.onTouchEnd, false);
-                }
-                if (params.simulateTouch && !s.device.ios && !s.device.android) {
-                    touchEventsTarget[action]('mousedown', s.onTouchStart, false);
-                    document[action]('mousemove', s.onTouchMove, moveCapture);
-                    document[action]('mouseup', s.onTouchEnd, false);
-                }
-            }
-            window[action]('resize', s.onResize);
-        
-            // Next, Prev, Index
-            if (s.params.nextButton && s.nextButton && s.nextButton.length > 0) {
-                s.nextButton[actionDom]('click', s.onClickNext);
-                if (s.params.a11y && s.a11y) s.nextButton[actionDom]('keydown', s.a11y.onEnterKey);
-            }
-            if (s.params.prevButton && s.prevButton && s.prevButton.length > 0) {
-                s.prevButton[actionDom]('click', s.onClickPrev);
-                if (s.params.a11y && s.a11y) s.prevButton[actionDom]('keydown', s.a11y.onEnterKey);
-            }
-            if (s.params.pagination && s.params.paginationClickable) {
-                s.paginationContainer[actionDom]('click', '.' + s.params.bulletClass, s.onClickIndex);
-                if (s.params.a11y && s.a11y) s.paginationContainer[actionDom]('keydown', '.' + s.params.bulletClass, s.a11y.onEnterKey);
-            }
-        
-            // Prevent Links Clicks
-            if (s.params.preventClicks || s.params.preventClicksPropagation) touchEventsTarget[action]('click', s.preventClicks, true);
-        };
-        s.attachEvents = function () {
-            s.initEvents();
-        };
-        s.detachEvents = function () {
-            s.initEvents(true);
-        };
-        
-        /*=========================
-          Handle Clicks
-          ===========================*/
-        // Prevent Clicks
-        s.allowClick = true;
-        s.preventClicks = function (e) {
-            if (!s.allowClick) {
-                if (s.params.preventClicks) e.preventDefault();
-                if (s.params.preventClicksPropagation && s.animating) {
-                    e.stopPropagation();
-                    e.stopImmediatePropagation();
-                }
-            }
-        };
-        // Clicks
-        s.onClickNext = function (e) {
-            e.preventDefault();
-            if (s.isEnd && !s.params.loop) return;
-            s.slideNext();
-        };
-        s.onClickPrev = function (e) {
-            e.preventDefault();
-            if (s.isBeginning && !s.params.loop) return;
-            s.slidePrev();
-        };
-        s.onClickIndex = function (e) {
-            e.preventDefault();
-            var index = $(this).index() * s.params.slidesPerGroup;
-            if (s.params.loop) index = index + s.loopedSlides;
-            s.slideTo(index);
-        };
-        
-        /*=========================
-          Handle Touches
-          ===========================*/
-        function findElementInEvent(e, selector) {
-            var el = $(e.target);
-            if (!el.is(selector)) {
-                if (typeof selector === 'string') {
-                    el = el.parents(selector);
-                }
-                else if (selector.nodeType) {
-                    var found;
-                    el.parents().each(function (index, _el) {
-                        if (_el === selector) found = selector;
-                    });
-                    if (!found) return undefined;
-                    else return selector;
-                }
-            }
-            if (el.length === 0) {
-                return undefined;
-            }
-            return el[0];
-        }
-        s.updateClickedSlide = function (e) {
-            var slide = findElementInEvent(e, '.' + s.params.slideClass);
-            var slideFound = false;
-            if (slide) {
-                for (var i = 0; i < s.slides.length; i++) {
-                    if (s.slides[i] === slide) slideFound = true;
-                }
-            }
-        
-            if (slide && slideFound) {
-                s.clickedSlide = slide;
-                s.clickedIndex = $(slide).index();
-            }
-            else {
-                s.clickedSlide = undefined;
-                s.clickedIndex = undefined;
-                return;
-            }
-            if (s.params.slideToClickedSlide && s.clickedIndex !== undefined && s.clickedIndex !== s.activeIndex) {
-                var slideToIndex = s.clickedIndex,
-                    realIndex,
-                    duplicatedSlides;
-                if (s.params.loop) {
-                    if (s.animating) return;
-                    realIndex = $(s.clickedSlide).attr('data-swiper-slide-index');
-                    if (s.params.centeredSlides) {
-                        if ((slideToIndex < s.loopedSlides - s.params.slidesPerView/2) || (slideToIndex > s.slides.length - s.loopedSlides + s.params.slidesPerView/2)) {
-                            s.fixLoop();
-                            slideToIndex = s.wrapper.children('.' + s.params.slideClass + '[data-swiper-slide-index="' + realIndex + '"]:not(.swiper-slide-duplicate)').eq(0).index();
-                            setTimeout(function () {
-                                s.slideTo(slideToIndex);
-                            }, 0);
-                        }
-                        else {
-                            s.slideTo(slideToIndex);
-                        }
-                    }
-                    else {
-                        if (slideToIndex > s.slides.length - s.params.slidesPerView) {
-                            s.fixLoop();
-                            slideToIndex = s.wrapper.children('.' + s.params.slideClass + '[data-swiper-slide-index="' + realIndex + '"]:not(.swiper-slide-duplicate)').eq(0).index();
-                            setTimeout(function () {
-                                s.slideTo(slideToIndex);
-                            }, 0);
-                        }
-                        else {
-                            s.slideTo(slideToIndex);
-                        }
-                    }
-                }
-                else {
-                    s.slideTo(slideToIndex);
-                }
-            }
-        };
-        
-        var isTouched,
-            isMoved,
-            allowTouchCallbacks,
-            touchStartTime,
-            isScrolling,
-            currentTranslate,
-            startTranslate,
-            allowThresholdMove,
-            // Form elements to match
-            formElements = 'input, select, textarea, button',
-            // Last click time
-            lastClickTime = Date.now(), clickTimeout,
-            //Velocities
-            velocities = [],
-            allowMomentumBounce;
-        
-        // Animating Flag
-        s.animating = false;
-        
-        // Touches information
-        s.touches = {
-            startX: 0,
-            startY: 0,
-            currentX: 0,
-            currentY: 0,
-            diff: 0
-        };
-        
-        // Touch handlers
-        var isTouchEvent, startMoving;
-        s.onTouchStart = function (e) {
-            if (e.originalEvent) e = e.originalEvent;
-            isTouchEvent = e.type === 'touchstart';
-            if (!isTouchEvent && 'which' in e && e.which === 3) return;
-            if (s.params.noSwiping && findElementInEvent(e, '.' + s.params.noSwipingClass)) {
-                s.allowClick = true;
-                return;
-            }
-            if (s.params.swipeHandler) {
-                if (!findElementInEvent(e, s.params.swipeHandler)) return;
-            }
-        
-            var startX = s.touches.currentX = e.type === 'touchstart' ? e.targetTouches[0].pageX : e.pageX;
-            var startY = s.touches.currentY = e.type === 'touchstart' ? e.targetTouches[0].pageY : e.pageY;
-        
-            // Do NOT start if iOS edge swipe is detected. Otherwise iOS app (UIWebView) cannot swipe-to-go-back anymore
-            if(s.device.ios && s.params.iOSEdgeSwipeDetection && startX <= s.params.iOSEdgeSwipeThreshold) {
-                return;
-            }
-        
-            isTouched = true;
-            isMoved = false;
-            allowTouchCallbacks = true;
-            isScrolling = undefined;
-            startMoving = undefined;
-            s.touches.startX = startX;
-            s.touches.startY = startY;
-            touchStartTime = Date.now();
-            s.allowClick = true;
-            s.updateContainerSize();
-            s.swipeDirection = undefined;
-            if (s.params.threshold > 0) allowThresholdMove = false;
-            if (e.type !== 'touchstart') {
-                var preventDefault = true;
-                if ($(e.target).is(formElements)) preventDefault = false;
-                if (document.activeElement && $(document.activeElement).is(formElements)) {
-                    document.activeElement.blur();
-                }
-                if (preventDefault) {
-                    e.preventDefault();
-                }
-            }
-            s.emit('onTouchStart', s, e);
-        };
-        
-        s.onTouchMove = function (e) {
-            if (e.originalEvent) e = e.originalEvent;
-            if (isTouchEvent && e.type === 'mousemove') return;
-            if (e.preventedByNestedSwiper) {
-                s.touches.startX = e.type === 'touchmove' ? e.targetTouches[0].pageX : e.pageX;
-                s.touches.startY = e.type === 'touchmove' ? e.targetTouches[0].pageY : e.pageY;
-                return;
-            }
-            if (s.params.onlyExternal) {
-                // isMoved = true;
-                s.allowClick = false;
-                if (isTouched) {
-                    s.touches.startX = s.touches.currentX = e.type === 'touchmove' ? e.targetTouches[0].pageX : e.pageX;
-                    s.touches.startY = s.touches.currentY = e.type === 'touchmove' ? e.targetTouches[0].pageY : e.pageY;
-                    touchStartTime = Date.now();
-                }
-                return;
-            }
-            if (isTouchEvent && document.activeElement) {
-                if (e.target === document.activeElement && $(e.target).is(formElements)) {
-                    isMoved = true;
-                    s.allowClick = false;
-                    return;
-                }
-            }
-            if (allowTouchCallbacks) {
-                s.emit('onTouchMove', s, e);
-            }
-            if (e.targetTouches && e.targetTouches.length > 1) return;
-        
-            s.touches.currentX = e.type === 'touchmove' ? e.targetTouches[0].pageX : e.pageX;
-            s.touches.currentY = e.type === 'touchmove' ? e.targetTouches[0].pageY : e.pageY;
-        
-            if (typeof isScrolling === 'undefined') {
-                var touchAngle = Math.atan2(Math.abs(s.touches.currentY - s.touches.startY), Math.abs(s.touches.currentX - s.touches.startX)) * 180 / Math.PI;
-                isScrolling = s.isHorizontal() ? touchAngle > s.params.touchAngle : (90 - touchAngle > s.params.touchAngle);
-            }
-            if (isScrolling) {
-                s.emit('onTouchMoveOpposite', s, e);
-            }
-            if (typeof startMoving === 'undefined' && s.browser.ieTouch) {
-                if (s.touches.currentX !== s.touches.startX || s.touches.currentY !== s.touches.startY) {
-                    startMoving = true;
-                }
-            }
-            if (!isTouched) return;
-            if (isScrolling)  {
-                isTouched = false;
-                return;
-            }
-            if (!startMoving && s.browser.ieTouch) {
-                return;
-            }
-            s.allowClick = false;
-            s.emit('onSliderMove', s, e);
-            e.preventDefault();
-            if (s.params.touchMoveStopPropagation && !s.params.nested) {
-                e.stopPropagation();
-            }
-        
-            if (!isMoved) {
-                if (params.loop) {
-                    s.fixLoop();
-                }
-                startTranslate = s.getWrapperTranslate();
-                s.setWrapperTransition(0);
-                if (s.animating) {
-                    s.wrapper.trigger('webkitTransitionEnd transitionend oTransitionEnd MSTransitionEnd msTransitionEnd');
-                }
-                if (s.params.autoplay && s.autoplaying) {
-                    if (s.params.autoplayDisableOnInteraction) {
-                        s.stopAutoplay();
-                    }
-                    else {
-                        s.pauseAutoplay();
-                    }
-                }
-                allowMomentumBounce = false;
-                //Grab Cursor
-                if (s.params.grabCursor) {
-                    s.container[0].style.cursor = 'move';
-                    s.container[0].style.cursor = '-webkit-grabbing';
-                    s.container[0].style.cursor = '-moz-grabbin';
-                    s.container[0].style.cursor = 'grabbing';
-                }
-            }
-            isMoved = true;
-        
-            var diff = s.touches.diff = s.isHorizontal() ? s.touches.currentX - s.touches.startX : s.touches.currentY - s.touches.startY;
-        
-            diff = diff * s.params.touchRatio;
-            if (s.rtl) diff = -diff;
-        
-            s.swipeDirection = diff > 0 ? 'prev' : 'next';
-            currentTranslate = diff + startTranslate;
-        
-            var disableParentSwiper = true;
-            if ((diff > 0 && currentTranslate > s.minTranslate())) {
-                disableParentSwiper = false;
-                if (s.params.resistance) currentTranslate = s.minTranslate() - 1 + Math.pow(-s.minTranslate() + startTranslate + diff, s.params.resistanceRatio);
-            }
-            else if (diff < 0 && currentTranslate < s.maxTranslate()) {
-                disableParentSwiper = false;
-                if (s.params.resistance) currentTranslate = s.maxTranslate() + 1 - Math.pow(s.maxTranslate() - startTranslate - diff, s.params.resistanceRatio);
-            }
-        
-            if (disableParentSwiper) {
-                e.preventedByNestedSwiper = true;
-            }
-        
-            // Directions locks
-            if (!s.params.allowSwipeToNext && s.swipeDirection === 'next' && currentTranslate < startTranslate) {
-                currentTranslate = startTranslate;
-            }
-            if (!s.params.allowSwipeToPrev && s.swipeDirection === 'prev' && currentTranslate > startTranslate) {
-                currentTranslate = startTranslate;
-            }
-        
-            if (!s.params.followFinger) return;
-        
-            // Threshold
-            if (s.params.threshold > 0) {
-                if (Math.abs(diff) > s.params.threshold || allowThresholdMove) {
-                    if (!allowThresholdMove) {
-                        allowThresholdMove = true;
-                        s.touches.startX = s.touches.currentX;
-                        s.touches.startY = s.touches.currentY;
-                        currentTranslate = startTranslate;
-                        s.touches.diff = s.isHorizontal() ? s.touches.currentX - s.touches.startX : s.touches.currentY - s.touches.startY;
-                        return;
-                    }
-                }
-                else {
-                    currentTranslate = startTranslate;
-                    return;
-                }
-            }
-            // Update active index in free mode
-            if (s.params.freeMode || s.params.watchSlidesProgress) {
-                s.updateActiveIndex();
-            }
-            if (s.params.freeMode) {
-                //Velocity
-                if (velocities.length === 0) {
-                    velocities.push({
-                        position: s.touches[s.isHorizontal() ? 'startX' : 'startY'],
-                        time: touchStartTime
-                    });
-                }
-                velocities.push({
-                    position: s.touches[s.isHorizontal() ? 'currentX' : 'currentY'],
-                    time: (new window.Date()).getTime()
-                });
-            }
-            // Update progress
-            s.updateProgress(currentTranslate);
-            // Update translate
-            s.setWrapperTranslate(currentTranslate);
-        };
-        s.onTouchEnd = function (e) {
-            if (e.originalEvent) e = e.originalEvent;
-            if (allowTouchCallbacks) {
-                s.emit('onTouchEnd', s, e);
-            }
-            allowTouchCallbacks = false;
-            if (!isTouched) return;
-            //Return Grab Cursor
-            if (s.params.grabCursor && isMoved && isTouched) {
-                s.container[0].style.cursor = 'move';
-                s.container[0].style.cursor = '-webkit-grab';
-                s.container[0].style.cursor = '-moz-grab';
-                s.container[0].style.cursor = 'grab';
-            }
-        
-            // Time diff
-            var touchEndTime = Date.now();
-            var timeDiff = touchEndTime - touchStartTime;
-        
-            // Tap, doubleTap, Click
-            if (s.allowClick) {
-                s.updateClickedSlide(e);
-                s.emit('onTap', s, e);
-                if (timeDiff < 300 && (touchEndTime - lastClickTime) > 300) {
-                    if (clickTimeout) clearTimeout(clickTimeout);
-                    clickTimeout = setTimeout(function () {
-                        if (!s) return;
-                        if (s.params.paginationHide && s.paginationContainer.length > 0 && !$(e.target).hasClass(s.params.bulletClass)) {
-                            s.paginationContainer.toggleClass(s.params.paginationHiddenClass);
-                        }
-                        s.emit('onClick', s, e);
-                    }, 300);
-        
-                }
-                if (timeDiff < 300 && (touchEndTime - lastClickTime) < 300) {
-                    if (clickTimeout) clearTimeout(clickTimeout);
-                    s.emit('onDoubleTap', s, e);
-                }
-            }
-        
-            lastClickTime = Date.now();
-            setTimeout(function () {
-                if (s) s.allowClick = true;
-            }, 0);
-        
-            if (!isTouched || !isMoved || !s.swipeDirection || s.touches.diff === 0 || currentTranslate === startTranslate) {
-                isTouched = isMoved = false;
-                return;
-            }
-            isTouched = isMoved = false;
-        
-            var currentPos;
-            if (s.params.followFinger) {
-                currentPos = s.rtl ? s.translate : -s.translate;
-            }
-            else {
-                currentPos = -currentTranslate;
-            }
-            if (s.params.freeMode) {
-                if (currentPos < -s.minTranslate()) {
-                    s.slideTo(s.activeIndex);
-                    return;
-                }
-                else if (currentPos > -s.maxTranslate()) {
-                    if (s.slides.length < s.snapGrid.length) {
-                        s.slideTo(s.snapGrid.length - 1);
-                    }
-                    else {
-                        s.slideTo(s.slides.length - 1);
-                    }
-                    return;
-                }
-        
-                if (s.params.freeModeMomentum) {
-                    if (velocities.length > 1) {
-                        var lastMoveEvent = velocities.pop(), velocityEvent = velocities.pop();
-        
-                        var distance = lastMoveEvent.position - velocityEvent.position;
-                        var time = lastMoveEvent.time - velocityEvent.time;
-                        s.velocity = distance / time;
-                        s.velocity = s.velocity / 2;
-                        if (Math.abs(s.velocity) < s.params.freeModeMinimumVelocity) {
-                            s.velocity = 0;
-                        }
-                        // this implies that the user stopped moving a finger then released.
-                        // There would be no events with distance zero, so the last event is stale.
-                        if (time > 150 || (new window.Date().getTime() - lastMoveEvent.time) > 300) {
-                            s.velocity = 0;
-                        }
-                    } else {
-                        s.velocity = 0;
-                    }
-        
-                    velocities.length = 0;
-                    var momentumDuration = 1000 * s.params.freeModeMomentumRatio;
-                    var momentumDistance = s.velocity * momentumDuration;
-        
-                    var newPosition = s.translate + momentumDistance;
-                    if (s.rtl) newPosition = - newPosition;
-                    var doBounce = false;
-                    var afterBouncePosition;
-                    var bounceAmount = Math.abs(s.velocity) * 20 * s.params.freeModeMomentumBounceRatio;
-                    if (newPosition < s.maxTranslate()) {
-                        if (s.params.freeModeMomentumBounce) {
-                            if (newPosition + s.maxTranslate() < -bounceAmount) {
-                                newPosition = s.maxTranslate() - bounceAmount;
-                            }
-                            afterBouncePosition = s.maxTranslate();
-                            doBounce = true;
-                            allowMomentumBounce = true;
-                        }
-                        else {
-                            newPosition = s.maxTranslate();
-                        }
-                    }
-                    else if (newPosition > s.minTranslate()) {
-                        if (s.params.freeModeMomentumBounce) {
-                            if (newPosition - s.minTranslate() > bounceAmount) {
-                                newPosition = s.minTranslate() + bounceAmount;
-                            }
-                            afterBouncePosition = s.minTranslate();
-                            doBounce = true;
-                            allowMomentumBounce = true;
-                        }
-                        else {
-                            newPosition = s.minTranslate();
-                        }
-                    }
-                    else if (s.params.freeModeSticky) {
-                        var j = 0,
-                            nextSlide;
-                        for (j = 0; j < s.snapGrid.length; j += 1) {
-                            if (s.snapGrid[j] > -newPosition) {
-                                nextSlide = j;
-                                break;
-                            }
-        
-                        }
-                        if (Math.abs(s.snapGrid[nextSlide] - newPosition) < Math.abs(s.snapGrid[nextSlide - 1] - newPosition) || s.swipeDirection === 'next') {
-                            newPosition = s.snapGrid[nextSlide];
-                        } else {
-                            newPosition = s.snapGrid[nextSlide - 1];
-                        }
-                        if (!s.rtl) newPosition = - newPosition;
-                    }
-                    //Fix duration
-                    if (s.velocity !== 0) {
-                        if (s.rtl) {
-                            momentumDuration = Math.abs((-newPosition - s.translate) / s.velocity);
-                        }
-                        else {
-                            momentumDuration = Math.abs((newPosition - s.translate) / s.velocity);
-                        }
-                    }
-                    else if (s.params.freeModeSticky) {
-                        s.slideReset();
-                        return;
-                    }
-        
-                    if (s.params.freeModeMomentumBounce && doBounce) {
-                        s.updateProgress(afterBouncePosition);
-                        s.setWrapperTransition(momentumDuration);
-                        s.setWrapperTranslate(newPosition);
-                        s.onTransitionStart();
-                        s.animating = true;
-                        s.wrapper.transitionEnd(function () {
-                            if (!s || !allowMomentumBounce) return;
-                            s.emit('onMomentumBounce', s);
-        
-                            s.setWrapperTransition(s.params.speed);
-                            s.setWrapperTranslate(afterBouncePosition);
-                            s.wrapper.transitionEnd(function () {
-                                if (!s) return;
-                                s.onTransitionEnd();
-                            });
-                        });
-                    } else if (s.velocity) {
-                        s.updateProgress(newPosition);
-                        s.setWrapperTransition(momentumDuration);
-                        s.setWrapperTranslate(newPosition);
-                        s.onTransitionStart();
-                        if (!s.animating) {
-                            s.animating = true;
-                            s.wrapper.transitionEnd(function () {
-                                if (!s) return;
-                                s.onTransitionEnd();
-                            });
-                        }
-        
-                    } else {
-                        s.updateProgress(newPosition);
-                    }
-        
-                    s.updateActiveIndex();
-                }
-                if (!s.params.freeModeMomentum || timeDiff >= s.params.longSwipesMs) {
-                    s.updateProgress();
-                    s.updateActiveIndex();
-                }
-                return;
-            }
-        
-            // Find current slide
-            var i, stopIndex = 0, groupSize = s.slidesSizesGrid[0];
-            for (i = 0; i < s.slidesGrid.length; i += s.params.slidesPerGroup) {
-                if (typeof s.slidesGrid[i + s.params.slidesPerGroup] !== 'undefined') {
-                    if (currentPos >= s.slidesGrid[i] && currentPos < s.slidesGrid[i + s.params.slidesPerGroup]) {
-                        stopIndex = i;
-                        groupSize = s.slidesGrid[i + s.params.slidesPerGroup] - s.slidesGrid[i];
-                    }
-                }
-                else {
-                    if (currentPos >= s.slidesGrid[i]) {
-                        stopIndex = i;
-                        groupSize = s.slidesGrid[s.slidesGrid.length - 1] - s.slidesGrid[s.slidesGrid.length - 2];
-                    }
-                }
-            }
-        
-            // Find current slide size
-            var ratio = (currentPos - s.slidesGrid[stopIndex]) / groupSize;
-        
-            if (timeDiff > s.params.longSwipesMs) {
-                // Long touches
-                if (!s.params.longSwipes) {
-                    s.slideTo(s.activeIndex);
-                    return;
-                }
-                if (s.swipeDirection === 'next') {
-                    if (ratio >= s.params.longSwipesRatio) s.slideTo(stopIndex + s.params.slidesPerGroup);
-                    else s.slideTo(stopIndex);
-        
-                }
-                if (s.swipeDirection === 'prev') {
-                    if (ratio > (1 - s.params.longSwipesRatio)) s.slideTo(stopIndex + s.params.slidesPerGroup);
-                    else s.slideTo(stopIndex);
-                }
-            }
-            else {
-                // Short swipes
-                if (!s.params.shortSwipes) {
-                    s.slideTo(s.activeIndex);
-                    return;
-                }
-                if (s.swipeDirection === 'next') {
-                    s.slideTo(stopIndex + s.params.slidesPerGroup);
-        
-                }
-                if (s.swipeDirection === 'prev') {
-                    s.slideTo(stopIndex);
-                }
-            }
-        };
-        /*=========================
-          Transitions
-          ===========================*/
-        s._slideTo = function (slideIndex, speed) {
-            return s.slideTo(slideIndex, speed, true, true);
-        };
-        s.slideTo = function (slideIndex, speed, runCallbacks, internal) {
-            if (typeof runCallbacks === 'undefined') runCallbacks = true;
-            if (typeof slideIndex === 'undefined') slideIndex = 0;
-            if (slideIndex < 0) slideIndex = 0;
-            s.snapIndex = Math.floor(slideIndex / s.params.slidesPerGroup);
-            if (s.snapIndex >= s.snapGrid.length) s.snapIndex = s.snapGrid.length - 1;
-        
-            var translate = - s.snapGrid[s.snapIndex];
-            // Stop autoplay
-            if (s.params.autoplay && s.autoplaying) {
-                if (internal || !s.params.autoplayDisableOnInteraction) {
-                    s.pauseAutoplay(speed);
-                }
-                else {
-                    s.stopAutoplay();
-                }
-            }
-            // Update progress
-            s.updateProgress(translate);
-        
-            // Normalize slideIndex
-            for (var i = 0; i < s.slidesGrid.length; i++) {
-                if (- Math.floor(translate * 100) >= Math.floor(s.slidesGrid[i] * 100)) {
-                    slideIndex = i;
-                }
-            }
-        
-            // Directions locks
-            if (!s.params.allowSwipeToNext && translate < s.translate && translate < s.minTranslate()) {
-                return false;
-            }
-            if (!s.params.allowSwipeToPrev && translate > s.translate && translate > s.maxTranslate()) {
-                if ((s.activeIndex || 0) !== slideIndex ) return false;
-            }
-        
-            // Update Index
-            if (typeof speed === 'undefined') speed = s.params.speed;
-            s.previousIndex = s.activeIndex || 0;
-            s.activeIndex = slideIndex;
-        
-            if ((s.rtl && -translate === s.translate) || (!s.rtl && translate === s.translate)) {
-                // Update Height
-                if (s.params.autoHeight) {
-                    s.updateAutoHeight();
-                }
-                s.updateClasses();
-                if (s.params.effect !== 'slide') {
-                    s.setWrapperTranslate(translate);
-                }
-                return false;
-            }
-            s.updateClasses();
-            s.onTransitionStart(runCallbacks);
-        
-            if (speed === 0) {
-                s.setWrapperTranslate(translate);
-                s.setWrapperTransition(0);
-                s.onTransitionEnd(runCallbacks);
-            }
-            else {
-                s.setWrapperTranslate(translate);
-                s.setWrapperTransition(speed);
-                if (!s.animating) {
-                    s.animating = true;
-                    s.wrapper.transitionEnd(function () {
-                        if (!s) return;
-                        s.onTransitionEnd(runCallbacks);
-                    });
-                }
-        
-            }
-        
-            return true;
-        };
-        
-        s.onTransitionStart = function (runCallbacks) {
-            if (typeof runCallbacks === 'undefined') runCallbacks = true;
-            if (s.params.autoHeight) {
-                s.updateAutoHeight();
-            }
-            if (s.lazy) s.lazy.onTransitionStart();
-            if (runCallbacks) {
-                s.emit('onTransitionStart', s);
-                if (s.activeIndex !== s.previousIndex) {
-                    s.emit('onSlideChangeStart', s);
-                    if (s.activeIndex > s.previousIndex) {
-                        s.emit('onSlideNextStart', s);
-                    }
-                    else {
-                        s.emit('onSlidePrevStart', s);
-                    }
-                }
-        
-            }
-        };
-        s.onTransitionEnd = function (runCallbacks) {
-            s.animating = false;
-            s.setWrapperTransition(0);
-            if (typeof runCallbacks === 'undefined') runCallbacks = true;
-            if (s.lazy) s.lazy.onTransitionEnd();
-            if (runCallbacks) {
-                s.emit('onTransitionEnd', s);
-                if (s.activeIndex !== s.previousIndex) {
-                    s.emit('onSlideChangeEnd', s);
-                    if (s.activeIndex > s.previousIndex) {
-                        s.emit('onSlideNextEnd', s);
-                    }
-                    else {
-                        s.emit('onSlidePrevEnd', s);
-                    }
-                }
-            }
-            if (s.params.hashnav && s.hashnav) {
-                s.hashnav.setHash();
-            }
-        
-        };
-        s.slideNext = function (runCallbacks, speed, internal) {
-            if (s.params.loop) {
-                if (s.animating) return false;
-                s.fixLoop();
-                var clientLeft = s.container[0].clientLeft;
-                return s.slideTo(s.activeIndex + s.params.slidesPerGroup, speed, runCallbacks, internal);
-            }
-            else return s.slideTo(s.activeIndex + s.params.slidesPerGroup, speed, runCallbacks, internal);
-        };
-        s._slideNext = function (speed) {
-            return s.slideNext(true, speed, true);
-        };
-        s.slidePrev = function (runCallbacks, speed, internal) {
-            if (s.params.loop) {
-                if (s.animating) return false;
-                s.fixLoop();
-                var clientLeft = s.container[0].clientLeft;
-                return s.slideTo(s.activeIndex - 1, speed, runCallbacks, internal);
-            }
-            else return s.slideTo(s.activeIndex - 1, speed, runCallbacks, internal);
-        };
-        s._slidePrev = function (speed) {
-            return s.slidePrev(true, speed, true);
-        };
-        s.slideReset = function (runCallbacks, speed, internal) {
-            return s.slideTo(s.activeIndex, speed, runCallbacks);
-        };
-        
-        /*=========================
-          Translate/transition helpers
-          ===========================*/
-        s.setWrapperTransition = function (duration, byController) {
-            s.wrapper.transition(duration);
-            if (s.params.effect !== 'slide' && s.effects[s.params.effect]) {
-                s.effects[s.params.effect].setTransition(duration);
-            }
-            if (s.params.parallax && s.parallax) {
-                s.parallax.setTransition(duration);
-            }
-            if (s.params.scrollbar && s.scrollbar) {
-                s.scrollbar.setTransition(duration);
-            }
-            if (s.params.control && s.controller) {
-                s.controller.setTransition(duration, byController);
-            }
-            s.emit('onSetTransition', s, duration);
-        };
-        s.setWrapperTranslate = function (translate, updateActiveIndex, byController) {
-            var x = 0, y = 0, z = 0;
-            if (s.isHorizontal()) {
-                x = s.rtl ? -translate : translate;
-            }
-            else {
-                y = translate;
-            }
-        
-            if (s.params.roundLengths) {
-                x = round(x);
-                y = round(y);
-            }
-        
-            if (!s.params.virtualTranslate) {
-                if (s.support.transforms3d) s.wrapper.transform('translate3d(' + x + 'px, ' + y + 'px, ' + z + 'px)');
-                else s.wrapper.transform('translate(' + x + 'px, ' + y + 'px)');
-            }
-        
-            s.translate = s.isHorizontal() ? x : y;
-        
-            // Check if we need to update progress
-            var progress;
-            var translatesDiff = s.maxTranslate() - s.minTranslate();
-            if (translatesDiff === 0) {
-                progress = 0;
-            }
-            else {
-                progress = (translate - s.minTranslate()) / (translatesDiff);
-            }
-            if (progress !== s.progress) {
-                s.updateProgress(translate);
-            }
-        
-            if (updateActiveIndex) s.updateActiveIndex();
-            if (s.params.effect !== 'slide' && s.effects[s.params.effect]) {
-                s.effects[s.params.effect].setTranslate(s.translate);
-            }
-            if (s.params.parallax && s.parallax) {
-                s.parallax.setTranslate(s.translate);
-            }
-            if (s.params.scrollbar && s.scrollbar) {
-                s.scrollbar.setTranslate(s.translate);
-            }
-            if (s.params.control && s.controller) {
-                s.controller.setTranslate(s.translate, byController);
-            }
-            s.emit('onSetTranslate', s, s.translate);
-        };
-        
-        s.getTranslate = function (el, axis) {
-            var matrix, curTransform, curStyle, transformMatrix;
-        
-            // automatic axis detection
-            if (typeof axis === 'undefined') {
-                axis = 'x';
-            }
-        
-            if (s.params.virtualTranslate) {
-                return s.rtl ? -s.translate : s.translate;
-            }
-        
-            curStyle = window.getComputedStyle(el, null);
-            if (window.WebKitCSSMatrix) {
-                curTransform = curStyle.transform || curStyle.webkitTransform;
-                if (curTransform.split(',').length > 6) {
-                    curTransform = curTransform.split(', ').map(function(a){
-                        return a.replace(',','.');
-                    }).join(', ');
-                }
-                // Some old versions of Webkit choke when 'none' is passed; pass
-                // empty string instead in this case
-                transformMatrix = new window.WebKitCSSMatrix(curTransform === 'none' ? '' : curTransform);
-            }
-            else {
-                transformMatrix = curStyle.MozTransform || curStyle.OTransform || curStyle.MsTransform || curStyle.msTransform  || curStyle.transform || curStyle.getPropertyValue('transform').replace('translate(', 'matrix(1, 0, 0, 1,');
-                matrix = transformMatrix.toString().split(',');
-            }
-        
-            if (axis === 'x') {
-                //Latest Chrome and webkits Fix
-                if (window.WebKitCSSMatrix)
-                    curTransform = transformMatrix.m41;
-                //Crazy IE10 Matrix
-                else if (matrix.length === 16)
-                    curTransform = parseFloat(matrix[12]);
-                //Normal Browsers
-                else
-                    curTransform = parseFloat(matrix[4]);
-            }
-            if (axis === 'y') {
-                //Latest Chrome and webkits Fix
-                if (window.WebKitCSSMatrix)
-                    curTransform = transformMatrix.m42;
-                //Crazy IE10 Matrix
-                else if (matrix.length === 16)
-                    curTransform = parseFloat(matrix[13]);
-                //Normal Browsers
-                else
-                    curTransform = parseFloat(matrix[5]);
-            }
-            if (s.rtl && curTransform) curTransform = -curTransform;
-            return curTransform || 0;
-        };
-        s.getWrapperTranslate = function (axis) {
-            if (typeof axis === 'undefined') {
-                axis = s.isHorizontal() ? 'x' : 'y';
-            }
-            return s.getTranslate(s.wrapper[0], axis);
-        };
-        
-        /*=========================
-          Observer
-          ===========================*/
-        s.observers = [];
-        function initObserver(target, options) {
-            options = options || {};
-            // create an observer instance
-            var ObserverFunc = window.MutationObserver || window.WebkitMutationObserver;
-            var observer = new ObserverFunc(function (mutations) {
-                mutations.forEach(function (mutation) {
-                    s.onResize(true);
-                    s.emit('onObserverUpdate', s, mutation);
-                });
-            });
-        
-            observer.observe(target, {
-                attributes: typeof options.attributes === 'undefined' ? true : options.attributes,
-                childList: typeof options.childList === 'undefined' ? true : options.childList,
-                characterData: typeof options.characterData === 'undefined' ? true : options.characterData
-            });
-        
-            s.observers.push(observer);
-        }
-        s.initObservers = function () {
-            if (s.params.observeParents) {
-                var containerParents = s.container.parents();
-                for (var i = 0; i < containerParents.length; i++) {
-                    initObserver(containerParents[i]);
-                }
-            }
-        
-            // Observe container
-            initObserver(s.container[0], {childList: false});
-        
-            // Observe wrapper
-            initObserver(s.wrapper[0], {attributes: false});
-        };
-        s.disconnectObservers = function () {
-            for (var i = 0; i < s.observers.length; i++) {
-                s.observers[i].disconnect();
-            }
-            s.observers = [];
-        };
-        /*=========================
-          Loop
-          ===========================*/
-        // Create looped slides
-        s.createLoop = function () {
-            // Remove duplicated slides
-            s.wrapper.children('.' + s.params.slideClass + '.' + s.params.slideDuplicateClass).remove();
-        
-            var slides = s.wrapper.children('.' + s.params.slideClass);
-        
-            if(s.params.slidesPerView === 'auto' && !s.params.loopedSlides) s.params.loopedSlides = slides.length;
-        
-            s.loopedSlides = parseInt(s.params.loopedSlides || s.params.slidesPerView, 10);
-            s.loopedSlides = s.loopedSlides + s.params.loopAdditionalSlides;
-            if (s.loopedSlides > slides.length) {
-                s.loopedSlides = slides.length;
-            }
-        
-            var prependSlides = [], appendSlides = [], i;
-            slides.each(function (index, el) {
-                var slide = $(this);
-                if (index < s.loopedSlides) appendSlides.push(el);
-                if (index < slides.length && index >= slides.length - s.loopedSlides) prependSlides.push(el);
-                slide.attr('data-swiper-slide-index', index);
-            });
-            for (i = 0; i < appendSlides.length; i++) {
-                s.wrapper.append($(appendSlides[i].cloneNode(true)).addClass(s.params.slideDuplicateClass));
-            }
-            for (i = prependSlides.length - 1; i >= 0; i--) {
-                s.wrapper.prepend($(prependSlides[i].cloneNode(true)).addClass(s.params.slideDuplicateClass));
-            }
-        };
-        s.destroyLoop = function () {
-            s.wrapper.children('.' + s.params.slideClass + '.' + s.params.slideDuplicateClass).remove();
-            s.slides.removeAttr('data-swiper-slide-index');
-        };
-        s.reLoop = function (updatePosition) {
-            var oldIndex = s.activeIndex - s.loopedSlides;
-            s.destroyLoop();
-            s.createLoop();
-            s.updateSlidesSize();
-            if (updatePosition) {
-                s.slideTo(oldIndex + s.loopedSlides, 0, false);
-            }
-        
-        };
-        s.fixLoop = function () {
-            var newIndex;
-            //Fix For Negative Oversliding
-            if (s.activeIndex < s.loopedSlides) {
-                newIndex = s.slides.length - s.loopedSlides * 3 + s.activeIndex;
-                newIndex = newIndex + s.loopedSlides;
-                s.slideTo(newIndex, 0, false, true);
-            }
-            //Fix For Positive Oversliding
-            else if ((s.params.slidesPerView === 'auto' && s.activeIndex >= s.loopedSlides * 2) || (s.activeIndex > s.slides.length - s.params.slidesPerView * 2)) {
-                newIndex = -s.slides.length + s.activeIndex + s.loopedSlides;
-                newIndex = newIndex + s.loopedSlides;
-                s.slideTo(newIndex, 0, false, true);
-            }
-        };
-        /*=========================
-          Append/Prepend/Remove Slides
-          ===========================*/
-        s.appendSlide = function (slides) {
-            if (s.params.loop) {
-                s.destroyLoop();
-            }
-            if (typeof slides === 'object' && slides.length) {
-                for (var i = 0; i < slides.length; i++) {
-                    if (slides[i]) s.wrapper.append(slides[i]);
-                }
-            }
-            else {
-                s.wrapper.append(slides);
-            }
-            if (s.params.loop) {
-                s.createLoop();
-            }
-            if (!(s.params.observer && s.support.observer)) {
-                s.update(true);
-            }
-        };
-        s.prependSlide = function (slides) {
-            if (s.params.loop) {
-                s.destroyLoop();
-            }
-            var newActiveIndex = s.activeIndex + 1;
-            if (typeof slides === 'object' && slides.length) {
-                for (var i = 0; i < slides.length; i++) {
-                    if (slides[i]) s.wrapper.prepend(slides[i]);
-                }
-                newActiveIndex = s.activeIndex + slides.length;
-            }
-            else {
-                s.wrapper.prepend(slides);
-            }
-            if (s.params.loop) {
-                s.createLoop();
-            }
-            if (!(s.params.observer && s.support.observer)) {
-                s.update(true);
-            }
-            s.slideTo(newActiveIndex, 0, false);
-        };
-        s.removeSlide = function (slidesIndexes) {
-            if (s.params.loop) {
-                s.destroyLoop();
-                s.slides = s.wrapper.children('.' + s.params.slideClass);
-            }
-            var newActiveIndex = s.activeIndex,
-                indexToRemove;
-            if (typeof slidesIndexes === 'object' && slidesIndexes.length) {
-                for (var i = 0; i < slidesIndexes.length; i++) {
-                    indexToRemove = slidesIndexes[i];
-                    if (s.slides[indexToRemove]) s.slides.eq(indexToRemove).remove();
-                    if (indexToRemove < newActiveIndex) newActiveIndex--;
-                }
-                newActiveIndex = Math.max(newActiveIndex, 0);
-            }
-            else {
-                indexToRemove = slidesIndexes;
-                if (s.slides[indexToRemove]) s.slides.eq(indexToRemove).remove();
-                if (indexToRemove < newActiveIndex) newActiveIndex--;
-                newActiveIndex = Math.max(newActiveIndex, 0);
-            }
-        
-            if (s.params.loop) {
-                s.createLoop();
-            }
-        
-            if (!(s.params.observer && s.support.observer)) {
-                s.update(true);
-            }
-            if (s.params.loop) {
-                s.slideTo(newActiveIndex + s.loopedSlides, 0, false);
-            }
-            else {
-                s.slideTo(newActiveIndex, 0, false);
-            }
-        
-        };
-        s.removeAllSlides = function () {
-            var slidesIndexes = [];
-            for (var i = 0; i < s.slides.length; i++) {
-                slidesIndexes.push(i);
-            }
-            s.removeSlide(slidesIndexes);
-        };
-        
-
-        /*=========================
-          Effects
-          ===========================*/
-        s.effects = {
-            fade: {
-                setTranslate: function () {
-                    for (var i = 0; i < s.slides.length; i++) {
-                        var slide = s.slides.eq(i);
-                        var offset = slide[0].swiperSlideOffset;
-                        var tx = -offset;
-                        if (!s.params.virtualTranslate) tx = tx - s.translate;
-                        var ty = 0;
-                        if (!s.isHorizontal()) {
-                            ty = tx;
-                            tx = 0;
-                        }
-                        var slideOpacity = s.params.fade.crossFade ?
-                                Math.max(1 - Math.abs(slide[0].progress), 0) :
-                                1 + Math.min(Math.max(slide[0].progress, -1), 0);
-                        slide
-                            .css({
-                                opacity: slideOpacity
-                            })
-                            .transform('translate3d(' + tx + 'px, ' + ty + 'px, 0px)');
-        
-                    }
-        
-                },
-                setTransition: function (duration) {
-                    s.slides.transition(duration);
-                    if (s.params.virtualTranslate && duration !== 0) {
-                        var eventTriggered = false;
-                        s.slides.transitionEnd(function () {
-                            if (eventTriggered) return;
-                            if (!s) return;
-                            eventTriggered = true;
-                            s.animating = false;
-                            var triggerEvents = ['webkitTransitionEnd', 'transitionend', 'oTransitionEnd', 'MSTransitionEnd', 'msTransitionEnd'];
-                            for (var i = 0; i < triggerEvents.length; i++) {
-                                s.wrapper.trigger(triggerEvents[i]);
-                            }
-                        });
-                    }
-                }
-            },
-            flip: {
-                setTranslate: function () {
-                    for (var i = 0; i < s.slides.length; i++) {
-                        var slide = s.slides.eq(i);
-                        var progress = slide[0].progress;
-                        if (s.params.flip.limitRotation) {
-                            progress = Math.max(Math.min(slide[0].progress, 1), -1);
-                        }
-                        var offset = slide[0].swiperSlideOffset;
-                        var rotate = -180 * progress,
-                            rotateY = rotate,
-                            rotateX = 0,
-                            tx = -offset,
-                            ty = 0;
-                        if (!s.isHorizontal()) {
-                            ty = tx;
-                            tx = 0;
-                            rotateX = -rotateY;
-                            rotateY = 0;
-                        }
-                        else if (s.rtl) {
-                            rotateY = -rotateY;
-                        }
-        
-                        slide[0].style.zIndex = -Math.abs(Math.round(progress)) + s.slides.length;
-        
-                        if (s.params.flip.slideShadows) {
-                            //Set shadows
-                            var shadowBefore = s.isHorizontal() ? slide.find('.swiper-slide-shadow-left') : slide.find('.swiper-slide-shadow-top');
-                            var shadowAfter = s.isHorizontal() ? slide.find('.swiper-slide-shadow-right') : slide.find('.swiper-slide-shadow-bottom');
-                            if (shadowBefore.length === 0) {
-                                shadowBefore = $('<div class="swiper-slide-shadow-' + (s.isHorizontal() ? 'left' : 'top') + '"></div>');
-                                slide.append(shadowBefore);
-                            }
-                            if (shadowAfter.length === 0) {
-                                shadowAfter = $('<div class="swiper-slide-shadow-' + (s.isHorizontal() ? 'right' : 'bottom') + '"></div>');
-                                slide.append(shadowAfter);
-                            }
-                            if (shadowBefore.length) shadowBefore[0].style.opacity = Math.max(-progress, 0);
-                            if (shadowAfter.length) shadowAfter[0].style.opacity = Math.max(progress, 0);
-                        }
-        
-                        slide
-                            .transform('translate3d(' + tx + 'px, ' + ty + 'px, 0px) rotateX(' + rotateX + 'deg) rotateY(' + rotateY + 'deg)');
-                    }
-                },
-                setTransition: function (duration) {
-                    s.slides.transition(duration).find('.swiper-slide-shadow-top, .swiper-slide-shadow-right, .swiper-slide-shadow-bottom, .swiper-slide-shadow-left').transition(duration);
-                    if (s.params.virtualTranslate && duration !== 0) {
-                        var eventTriggered = false;
-                        s.slides.eq(s.activeIndex).transitionEnd(function () {
-                            if (eventTriggered) return;
-                            if (!s) return;
-                            if (!$(this).hasClass(s.params.slideActiveClass)) return;
-                            eventTriggered = true;
-                            s.animating = false;
-                            var triggerEvents = ['webkitTransitionEnd', 'transitionend', 'oTransitionEnd', 'MSTransitionEnd', 'msTransitionEnd'];
-                            for (var i = 0; i < triggerEvents.length; i++) {
-                                s.wrapper.trigger(triggerEvents[i]);
-                            }
-                        });
-                    }
-                }
-            },
-            cube: {
-                setTranslate: function () {
-                    var wrapperRotate = 0, cubeShadow;
-                    if (s.params.cube.shadow) {
-                        if (s.isHorizontal()) {
-                            cubeShadow = s.wrapper.find('.swiper-cube-shadow');
-                            if (cubeShadow.length === 0) {
-                                cubeShadow = $('<div class="swiper-cube-shadow"></div>');
-                                s.wrapper.append(cubeShadow);
-                            }
-                            cubeShadow.css({height: s.width + 'px'});
-                        }
-                        else {
-                            cubeShadow = s.container.find('.swiper-cube-shadow');
-                            if (cubeShadow.length === 0) {
-                                cubeShadow = $('<div class="swiper-cube-shadow"></div>');
-                                s.container.append(cubeShadow);
-                            }
-                        }
-                    }
-                    for (var i = 0; i < s.slides.length; i++) {
-                        var slide = s.slides.eq(i);
-                        var slideAngle = i * 90;
-                        var round = Math.floor(slideAngle / 360);
-                        if (s.rtl) {
-                            slideAngle = -slideAngle;
-                            round = Math.floor(-slideAngle / 360);
-                        }
-                        var progress = Math.max(Math.min(slide[0].progress, 1), -1);
-                        var tx = 0, ty = 0, tz = 0;
-                        if (i % 4 === 0) {
-                            tx = - round * 4 * s.size;
-                            tz = 0;
-                        }
-                        else if ((i - 1) % 4 === 0) {
-                            tx = 0;
-                            tz = - round * 4 * s.size;
-                        }
-                        else if ((i - 2) % 4 === 0) {
-                            tx = s.size + round * 4 * s.size;
-                            tz = s.size;
-                        }
-                        else if ((i - 3) % 4 === 0) {
-                            tx = - s.size;
-                            tz = 3 * s.size + s.size * 4 * round;
-                        }
-                        if (s.rtl) {
-                            tx = -tx;
-                        }
-        
-                        if (!s.isHorizontal()) {
-                            ty = tx;
-                            tx = 0;
-                        }
-        
-                        var transform = 'rotateX(' + (s.isHorizontal() ? 0 : -slideAngle) + 'deg) rotateY(' + (s.isHorizontal() ? slideAngle : 0) + 'deg) translate3d(' + tx + 'px, ' + ty + 'px, ' + tz + 'px)';
-                        if (progress <= 1 && progress > -1) {
-                            wrapperRotate = i * 90 + progress * 90;
-                            if (s.rtl) wrapperRotate = -i * 90 - progress * 90;
-                        }
-                        slide.transform(transform);
-                        if (s.params.cube.slideShadows) {
-                            //Set shadows
-                            var shadowBefore = s.isHorizontal() ? slide.find('.swiper-slide-shadow-left') : slide.find('.swiper-slide-shadow-top');
-                            var shadowAfter = s.isHorizontal() ? slide.find('.swiper-slide-shadow-right') : slide.find('.swiper-slide-shadow-bottom');
-                            if (shadowBefore.length === 0) {
-                                shadowBefore = $('<div class="swiper-slide-shadow-' + (s.isHorizontal() ? 'left' : 'top') + '"></div>');
-                                slide.append(shadowBefore);
-                            }
-                            if (shadowAfter.length === 0) {
-                                shadowAfter = $('<div class="swiper-slide-shadow-' + (s.isHorizontal() ? 'right' : 'bottom') + '"></div>');
-                                slide.append(shadowAfter);
-                            }
-                            if (shadowBefore.length) shadowBefore[0].style.opacity = Math.max(-progress, 0);
-                            if (shadowAfter.length) shadowAfter[0].style.opacity = Math.max(progress, 0);
-                        }
-                    }
-                    s.wrapper.css({
-                        '-webkit-transform-origin': '50% 50% -' + (s.size / 2) + 'px',
-                        '-moz-transform-origin': '50% 50% -' + (s.size / 2) + 'px',
-                        '-ms-transform-origin': '50% 50% -' + (s.size / 2) + 'px',
-                        'transform-origin': '50% 50% -' + (s.size / 2) + 'px'
-                    });
-        
-                    if (s.params.cube.shadow) {
-                        if (s.isHorizontal()) {
-                            cubeShadow.transform('translate3d(0px, ' + (s.width / 2 + s.params.cube.shadowOffset) + 'px, ' + (-s.width / 2) + 'px) rotateX(90deg) rotateZ(0deg) scale(' + (s.params.cube.shadowScale) + ')');
-                        }
-                        else {
-                            var shadowAngle = Math.abs(wrapperRotate) - Math.floor(Math.abs(wrapperRotate) / 90) * 90;
-                            var multiplier = 1.5 - (Math.sin(shadowAngle * 2 * Math.PI / 360) / 2 + Math.cos(shadowAngle * 2 * Math.PI / 360) / 2);
-                            var scale1 = s.params.cube.shadowScale,
-                                scale2 = s.params.cube.shadowScale / multiplier,
-                                offset = s.params.cube.shadowOffset;
-                            cubeShadow.transform('scale3d(' + scale1 + ', 1, ' + scale2 + ') translate3d(0px, ' + (s.height / 2 + offset) + 'px, ' + (-s.height / 2 / scale2) + 'px) rotateX(-90deg)');
-                        }
-                    }
-                    var zFactor = (s.isSafari || s.isUiWebView) ? (-s.size / 2) : 0;
-                    s.wrapper.transform('translate3d(0px,0,' + zFactor + 'px) rotateX(' + (s.isHorizontal() ? 0 : wrapperRotate) + 'deg) rotateY(' + (s.isHorizontal() ? -wrapperRotate : 0) + 'deg)');
-                },
-                setTransition: function (duration) {
-                    s.slides.transition(duration).find('.swiper-slide-shadow-top, .swiper-slide-shadow-right, .swiper-slide-shadow-bottom, .swiper-slide-shadow-left').transition(duration);
-                    if (s.params.cube.shadow && !s.isHorizontal()) {
-                        s.container.find('.swiper-cube-shadow').transition(duration);
-                    }
-                }
-            },
-            coverflow: {
-                setTranslate: function () {
-                    var transform = s.translate;
-                    var center = s.isHorizontal() ? -transform + s.width / 2 : -transform + s.height / 2;
-                    var rotate = s.isHorizontal() ? s.params.coverflow.rotate: -s.params.coverflow.rotate;
-                    var translate = s.params.coverflow.depth;
-                    //Each slide offset from center
-                    for (var i = 0, length = s.slides.length; i < length; i++) {
-                        var slide = s.slides.eq(i);
-                        var slideSize = s.slidesSizesGrid[i];
-                        var slideOffset = slide[0].swiperSlideOffset;
-                        var offsetMultiplier = (center - slideOffset - slideSize / 2) / slideSize * s.params.coverflow.modifier;
-        
-                        var rotateY = s.isHorizontal() ? rotate * offsetMultiplier : 0;
-                        var rotateX = s.isHorizontal() ? 0 : rotate * offsetMultiplier;
-                        // var rotateZ = 0
-                        var translateZ = -translate * Math.abs(offsetMultiplier);
-        
-                        var translateY = s.isHorizontal() ? 0 : s.params.coverflow.stretch * (offsetMultiplier);
-                        var translateX = s.isHorizontal() ? s.params.coverflow.stretch * (offsetMultiplier) : 0;
-        
-                        //Fix for ultra small values
-                        if (Math.abs(translateX) < 0.001) translateX = 0;
-                        if (Math.abs(translateY) < 0.001) translateY = 0;
-                        if (Math.abs(translateZ) < 0.001) translateZ = 0;
-                        if (Math.abs(rotateY) < 0.001) rotateY = 0;
-                        if (Math.abs(rotateX) < 0.001) rotateX = 0;
-        
-                        var slideTransform = 'translate3d(' + translateX + 'px,' + translateY + 'px,' + translateZ + 'px)  rotateX(' + rotateX + 'deg) rotateY(' + rotateY + 'deg)';
-        
-                        slide.transform(slideTransform);
-                        slide[0].style.zIndex = -Math.abs(Math.round(offsetMultiplier)) + 1;
-                        if (s.params.coverflow.slideShadows) {
-                            //Set shadows
-                            var shadowBefore = s.isHorizontal() ? slide.find('.swiper-slide-shadow-left') : slide.find('.swiper-slide-shadow-top');
-                            var shadowAfter = s.isHorizontal() ? slide.find('.swiper-slide-shadow-right') : slide.find('.swiper-slide-shadow-bottom');
-                            if (shadowBefore.length === 0) {
-                                shadowBefore = $('<div class="swiper-slide-shadow-' + (s.isHorizontal() ? 'left' : 'top') + '"></div>');
-                                slide.append(shadowBefore);
-                            }
-                            if (shadowAfter.length === 0) {
-                                shadowAfter = $('<div class="swiper-slide-shadow-' + (s.isHorizontal() ? 'right' : 'bottom') + '"></div>');
-                                slide.append(shadowAfter);
-                            }
-                            if (shadowBefore.length) shadowBefore[0].style.opacity = offsetMultiplier > 0 ? offsetMultiplier : 0;
-                            if (shadowAfter.length) shadowAfter[0].style.opacity = (-offsetMultiplier) > 0 ? -offsetMultiplier : 0;
-                        }
-                    }
-        
-                    //Set correct perspective for IE10
-                    if (s.browser.ie) {
-                        var ws = s.wrapper[0].style;
-                        ws.perspectiveOrigin = center + 'px 50%';
-                    }
-                },
-                setTransition: function (duration) {
-                    s.slides.transition(duration).find('.swiper-slide-shadow-top, .swiper-slide-shadow-right, .swiper-slide-shadow-bottom, .swiper-slide-shadow-left').transition(duration);
-                }
-            }
-        };
-
-        /*=========================
-          Images Lazy Loading
-          ===========================*/
-        s.lazy = {
-            initialImageLoaded: false,
-            loadImageInSlide: function (index, loadInDuplicate) {
-                if (typeof index === 'undefined') return;
-                if (typeof loadInDuplicate === 'undefined') loadInDuplicate = true;
-                if (s.slides.length === 0) return;
-        
-                var slide = s.slides.eq(index);
-                var img = slide.find('.swiper-lazy:not(.swiper-lazy-loaded):not(.swiper-lazy-loading)');
-                if (slide.hasClass('swiper-lazy') && !slide.hasClass('swiper-lazy-loaded') && !slide.hasClass('swiper-lazy-loading')) {
-                    img = img.add(slide[0]);
-                }
-                if (img.length === 0) return;
-        
-                img.each(function () {
-                    var _img = $(this);
-                    _img.addClass('swiper-lazy-loading');
-                    var background = _img.attr('data-background');
-                    var src = _img.attr('data-src'),
-                        srcset = _img.attr('data-srcset');
-                    s.loadImage(_img[0], (src || background), srcset, false, function () {
-                        if (background) {
-                            _img.css('background-image', 'url("' + background + '")');
-                            _img.removeAttr('data-background');
-                        }
-                        else {
-                            if (srcset) {
-                                _img.attr('srcset', srcset);
-                                _img.removeAttr('data-srcset');
-                            }
-                            if (src) {
-                                _img.attr('src', src);
-                                _img.removeAttr('data-src');
-                            }
-        
-                        }
-        
-                        _img.addClass('swiper-lazy-loaded').removeClass('swiper-lazy-loading');
-                        slide.find('.swiper-lazy-preloader, .preloader').remove();
-                        if (s.params.loop && loadInDuplicate) {
-                            var slideOriginalIndex = slide.attr('data-swiper-slide-index');
-                            if (slide.hasClass(s.params.slideDuplicateClass)) {
-                                var originalSlide = s.wrapper.children('[data-swiper-slide-index="' + slideOriginalIndex + '"]:not(.' + s.params.slideDuplicateClass + ')');
-                                s.lazy.loadImageInSlide(originalSlide.index(), false);
-                            }
-                            else {
-                                var duplicatedSlide = s.wrapper.children('.' + s.params.slideDuplicateClass + '[data-swiper-slide-index="' + slideOriginalIndex + '"]');
-                                s.lazy.loadImageInSlide(duplicatedSlide.index(), false);
-                            }
-                        }
-                        s.emit('onLazyImageReady', s, slide[0], _img[0]);
-                    });
-        
-                    s.emit('onLazyImageLoad', s, slide[0], _img[0]);
-                });
-        
-            },
-            load: function () {
-                var i;
-                if (s.params.watchSlidesVisibility) {
-                    s.wrapper.children('.' + s.params.slideVisibleClass).each(function () {
-                        s.lazy.loadImageInSlide($(this).index());
-                    });
-                }
-                else {
-                    if (s.params.slidesPerView > 1) {
-                        for (i = s.activeIndex; i < s.activeIndex + s.params.slidesPerView ; i++) {
-                            if (s.slides[i]) s.lazy.loadImageInSlide(i);
-                        }
-                    }
-                    else {
-                        s.lazy.loadImageInSlide(s.activeIndex);
-                    }
-                }
-                if (s.params.lazyLoadingInPrevNext) {
-                    if (s.params.slidesPerView > 1 || (s.params.lazyLoadingInPrevNextAmount && s.params.lazyLoadingInPrevNextAmount > 1)) {
-                        var amount = s.params.lazyLoadingInPrevNextAmount;
-                        var spv = s.params.slidesPerView;
-                        var maxIndex = Math.min(s.activeIndex + spv + Math.max(amount, spv), s.slides.length);
-                        var minIndex = Math.max(s.activeIndex - Math.max(spv, amount), 0);
-                        // Next Slides
-                        for (i = s.activeIndex + s.params.slidesPerView; i < maxIndex; i++) {
-                            if (s.slides[i]) s.lazy.loadImageInSlide(i);
-                        }
-                        // Prev Slides
-                        for (i = minIndex; i < s.activeIndex ; i++) {
-                            if (s.slides[i]) s.lazy.loadImageInSlide(i);
-                        }
-                    }
-                    else {
-                        var nextSlide = s.wrapper.children('.' + s.params.slideNextClass);
-                        if (nextSlide.length > 0) s.lazy.loadImageInSlide(nextSlide.index());
-        
-                        var prevSlide = s.wrapper.children('.' + s.params.slidePrevClass);
-                        if (prevSlide.length > 0) s.lazy.loadImageInSlide(prevSlide.index());
-                    }
-                }
-            },
-            onTransitionStart: function () {
-                if (s.params.lazyLoading) {
-                    if (s.params.lazyLoadingOnTransitionStart || (!s.params.lazyLoadingOnTransitionStart && !s.lazy.initialImageLoaded)) {
-                        s.lazy.load();
-                    }
-                }
-            },
-            onTransitionEnd: function () {
-                if (s.params.lazyLoading && !s.params.lazyLoadingOnTransitionStart) {
-                    s.lazy.load();
-                }
-            }
-        };
-        
-
-        /*=========================
-          Scrollbar
-          ===========================*/
-        s.scrollbar = {
-            isTouched: false,
-            setDragPosition: function (e) {
-                var sb = s.scrollbar;
-                var x = 0, y = 0;
-                var translate;
-                var pointerPosition = s.isHorizontal() ?
-                    ((e.type === 'touchstart' || e.type === 'touchmove') ? e.targetTouches[0].pageX : e.pageX || e.clientX) :
-                    ((e.type === 'touchstart' || e.type === 'touchmove') ? e.targetTouches[0].pageY : e.pageY || e.clientY) ;
-                var position = (pointerPosition) - sb.track.offset()[s.isHorizontal() ? 'left' : 'top'] - sb.dragSize / 2;
-                var positionMin = -s.minTranslate() * sb.moveDivider;
-                var positionMax = -s.maxTranslate() * sb.moveDivider;
-                if (position < positionMin) {
-                    position = positionMin;
-                }
-                else if (position > positionMax) {
-                    position = positionMax;
-                }
-                position = -position / sb.moveDivider;
-                s.updateProgress(position);
-                s.setWrapperTranslate(position, true);
-            },
-            dragStart: function (e) {
-                var sb = s.scrollbar;
-                sb.isTouched = true;
-                e.preventDefault();
-                e.stopPropagation();
-        
-                sb.setDragPosition(e);
-                clearTimeout(sb.dragTimeout);
-        
-                sb.track.transition(0);
-                if (s.params.scrollbarHide) {
-                    sb.track.css('opacity', 1);
-                }
-                s.wrapper.transition(100);
-                sb.drag.transition(100);
-                s.emit('onScrollbarDragStart', s);
-            },
-            dragMove: function (e) {
-                var sb = s.scrollbar;
-                if (!sb.isTouched) return;
-                if (e.preventDefault) e.preventDefault();
-                else e.returnValue = false;
-                sb.setDragPosition(e);
-                s.wrapper.transition(0);
-                sb.track.transition(0);
-                sb.drag.transition(0);
-                s.emit('onScrollbarDragMove', s);
-            },
-            dragEnd: function (e) {
-                var sb = s.scrollbar;
-                if (!sb.isTouched) return;
-                sb.isTouched = false;
-                if (s.params.scrollbarHide) {
-                    clearTimeout(sb.dragTimeout);
-                    sb.dragTimeout = setTimeout(function () {
-                        sb.track.css('opacity', 0);
-                        sb.track.transition(400);
-                    }, 1000);
-        
-                }
-                s.emit('onScrollbarDragEnd', s);
-                if (s.params.scrollbarSnapOnRelease) {
-                    s.slideReset();
-                }
-            },
-            enableDraggable: function () {
-                var sb = s.scrollbar;
-                var target = s.support.touch ? sb.track : document;
-                $(sb.track).on(s.touchEvents.start, sb.dragStart);
-                $(target).on(s.touchEvents.move, sb.dragMove);
-                $(target).on(s.touchEvents.end, sb.dragEnd);
-            },
-            disableDraggable: function () {
-                var sb = s.scrollbar;
-                var target = s.support.touch ? sb.track : document;
-                $(sb.track).off(s.touchEvents.start, sb.dragStart);
-                $(target).off(s.touchEvents.move, sb.dragMove);
-                $(target).off(s.touchEvents.end, sb.dragEnd);
-            },
-            set: function () {
-                if (!s.params.scrollbar) return;
-                var sb = s.scrollbar;
-                sb.track = $(s.params.scrollbar);
-                if (s.params.uniqueNavElements && typeof s.params.scrollbar === 'string' && sb.track.length > 1 && s.container.find(s.params.scrollbar).length === 1) {
-                    sb.track = s.container.find(s.params.scrollbar);
-                }
-                sb.drag = sb.track.find('.swiper-scrollbar-drag');
-                if (sb.drag.length === 0) {
-                    sb.drag = $('<div class="swiper-scrollbar-drag"></div>');
-                    sb.track.append(sb.drag);
-                }
-                sb.drag[0].style.width = '';
-                sb.drag[0].style.height = '';
-                sb.trackSize = s.isHorizontal() ? sb.track[0].offsetWidth : sb.track[0].offsetHeight;
-        
-                sb.divider = s.size / s.virtualSize;
-                sb.moveDivider = sb.divider * (sb.trackSize / s.size);
-                sb.dragSize = sb.trackSize * sb.divider;
-        
-                if (s.isHorizontal()) {
-                    sb.drag[0].style.width = sb.dragSize + 'px';
-                }
-                else {
-                    sb.drag[0].style.height = sb.dragSize + 'px';
-                }
-        
-                if (sb.divider >= 1) {
-                    sb.track[0].style.display = 'none';
-                }
-                else {
-                    sb.track[0].style.display = '';
-                }
-                if (s.params.scrollbarHide) {
-                    sb.track[0].style.opacity = 0;
-                }
-            },
-            setTranslate: function () {
-                if (!s.params.scrollbar) return;
-                var diff;
-                var sb = s.scrollbar;
-                var translate = s.translate || 0;
-                var newPos;
-        
-                var newSize = sb.dragSize;
-                newPos = (sb.trackSize - sb.dragSize) * s.progress;
-                if (s.rtl && s.isHorizontal()) {
-                    newPos = -newPos;
-                    if (newPos > 0) {
-                        newSize = sb.dragSize - newPos;
-                        newPos = 0;
-                    }
-                    else if (-newPos + sb.dragSize > sb.trackSize) {
-                        newSize = sb.trackSize + newPos;
-                    }
-                }
-                else {
-                    if (newPos < 0) {
-                        newSize = sb.dragSize + newPos;
-                        newPos = 0;
-                    }
-                    else if (newPos + sb.dragSize > sb.trackSize) {
-                        newSize = sb.trackSize - newPos;
-                    }
-                }
-                if (s.isHorizontal()) {
-                    if (s.support.transforms3d) {
-                        sb.drag.transform('translate3d(' + (newPos) + 'px, 0, 0)');
-                    }
-                    else {
-                        sb.drag.transform('translateX(' + (newPos) + 'px)');
-                    }
-                    sb.drag[0].style.width = newSize + 'px';
-                }
-                else {
-                    if (s.support.transforms3d) {
-                        sb.drag.transform('translate3d(0px, ' + (newPos) + 'px, 0)');
-                    }
-                    else {
-                        sb.drag.transform('translateY(' + (newPos) + 'px)');
-                    }
-                    sb.drag[0].style.height = newSize + 'px';
-                }
-                if (s.params.scrollbarHide) {
-                    clearTimeout(sb.timeout);
-                    sb.track[0].style.opacity = 1;
-                    sb.timeout = setTimeout(function () {
-                        sb.track[0].style.opacity = 0;
-                        sb.track.transition(400);
-                    }, 1000);
-                }
-            },
-            setTransition: function (duration) {
-                if (!s.params.scrollbar) return;
-                s.scrollbar.drag.transition(duration);
-            }
-        };
-
-        /*=========================
-          Controller
-          ===========================*/
-        s.controller = {
-            LinearSpline: function (x, y) {
-                this.x = x;
-                this.y = y;
-                this.lastIndex = x.length - 1;
-                // Given an x value (x2), return the expected y2 value:
-                // (x1,y1) is the known point before given value,
-                // (x3,y3) is the known point after given value.
-                var i1, i3;
-                var l = this.x.length;
-        
-                this.interpolate = function (x2) {
-                    if (!x2) return 0;
-        
-                    // Get the indexes of x1 and x3 (the array indexes before and after given x2):
-                    i3 = binarySearch(this.x, x2);
-                    i1 = i3 - 1;
-        
-                    // We have our indexes i1 & i3, so we can calculate already:
-                    // y2 := ((x2−x1) × (y3−y1)) ÷ (x3−x1) + y1
-                    return ((x2 - this.x[i1]) * (this.y[i3] - this.y[i1])) / (this.x[i3] - this.x[i1]) + this.y[i1];
-                };
-        
-                var binarySearch = (function() {
-                    var maxIndex, minIndex, guess;
-                    return function(array, val) {
-                        minIndex = -1;
-                        maxIndex = array.length;
-                        while (maxIndex - minIndex > 1)
-                            if (array[guess = maxIndex + minIndex >> 1] <= val) {
-                                minIndex = guess;
-                            } else {
-                                maxIndex = guess;
-                            }
-                        return maxIndex;
-                    };
-                })();
-            },
-            //xxx: for now i will just save one spline function to to
-            getInterpolateFunction: function(c){
-                if(!s.controller.spline) s.controller.spline = s.params.loop ?
-                    new s.controller.LinearSpline(s.slidesGrid, c.slidesGrid) :
-                    new s.controller.LinearSpline(s.snapGrid, c.snapGrid);
-            },
-            setTranslate: function (translate, byController) {
-               var controlled = s.params.control;
-               var multiplier, controlledTranslate;
-               function setControlledTranslate(c) {
-                    // this will create an Interpolate function based on the snapGrids
-                    // x is the Grid of the scrolled scroller and y will be the controlled scroller
-                    // it makes sense to create this only once and recall it for the interpolation
-                    // the function does a lot of value caching for performance
-                    translate = c.rtl && c.params.direction === 'horizontal' ? -s.translate : s.translate;
-                    if (s.params.controlBy === 'slide') {
-                        s.controller.getInterpolateFunction(c);
-                        // i am not sure why the values have to be multiplicated this way, tried to invert the snapGrid
-                        // but it did not work out
-                        controlledTranslate = -s.controller.spline.interpolate(-translate);
-                    }
-        
-                    if(!controlledTranslate || s.params.controlBy === 'container'){
-                        multiplier = (c.maxTranslate() - c.minTranslate()) / (s.maxTranslate() - s.minTranslate());
-                        controlledTranslate = (translate - s.minTranslate()) * multiplier + c.minTranslate();
-                    }
-        
-                    if (s.params.controlInverse) {
-                        controlledTranslate = c.maxTranslate() - controlledTranslate;
-                    }
-                    c.updateProgress(controlledTranslate);
-                    c.setWrapperTranslate(controlledTranslate, false, s);
-                    c.updateActiveIndex();
-               }
-               if (s.isArray(controlled)) {
-                   for (var i = 0; i < controlled.length; i++) {
-                       if (controlled[i] !== byController && controlled[i] instanceof Swiper) {
-                           setControlledTranslate(controlled[i]);
-                       }
-                   }
-               }
-               else if (controlled instanceof Swiper && byController !== controlled) {
-        
-                   setControlledTranslate(controlled);
-               }
-            },
-            setTransition: function (duration, byController) {
-                var controlled = s.params.control;
-                var i;
-                function setControlledTransition(c) {
-                    c.setWrapperTransition(duration, s);
-                    if (duration !== 0) {
-                        c.onTransitionStart();
-                        c.wrapper.transitionEnd(function(){
-                            if (!controlled) return;
-                            if (c.params.loop && s.params.controlBy === 'slide') {
-                                c.fixLoop();
-                            }
-                            c.onTransitionEnd();
-        
-                        });
-                    }
-                }
-                if (s.isArray(controlled)) {
-                    for (i = 0; i < controlled.length; i++) {
-                        if (controlled[i] !== byController && controlled[i] instanceof Swiper) {
-                            setControlledTransition(controlled[i]);
-                        }
-                    }
-                }
-                else if (controlled instanceof Swiper && byController !== controlled) {
-                    setControlledTransition(controlled);
-                }
-            }
-        };
-
-        /*=========================
-          Hash Navigation
-          ===========================*/
-        s.hashnav = {
-            init: function () {
-                if (!s.params.hashnav) return;
-                s.hashnav.initialized = true;
-                var hash = document.location.hash.replace('#', '');
-                if (!hash) return;
-                var speed = 0;
-                for (var i = 0, length = s.slides.length; i < length; i++) {
-                    var slide = s.slides.eq(i);
-                    var slideHash = slide.attr('data-hash');
-                    if (slideHash === hash && !slide.hasClass(s.params.slideDuplicateClass)) {
-                        var index = slide.index();
-                        s.slideTo(index, speed, s.params.runCallbacksOnInit, true);
-                    }
-                }
-            },
-            setHash: function () {
-                if (!s.hashnav.initialized || !s.params.hashnav) return;
-                document.location.hash = s.slides.eq(s.activeIndex).attr('data-hash') || '';
-            }
-        };
-
-        /*=========================
-          Keyboard Control
-          ===========================*/
-        function handleKeyboard(e) {
-            if (e.originalEvent) e = e.originalEvent; //jquery fix
-            var kc = e.keyCode || e.charCode;
-            // Directions locks
-            if (!s.params.allowSwipeToNext && (s.isHorizontal() && kc === 39 || !s.isHorizontal() && kc === 40)) {
-                return false;
-            }
-            if (!s.params.allowSwipeToPrev && (s.isHorizontal() && kc === 37 || !s.isHorizontal() && kc === 38)) {
-                return false;
-            }
-            if (e.shiftKey || e.altKey || e.ctrlKey || e.metaKey) {
-                return;
-            }
-            if (document.activeElement && document.activeElement.nodeName && (document.activeElement.nodeName.toLowerCase() === 'input' || document.activeElement.nodeName.toLowerCase() === 'textarea')) {
-                return;
-            }
-            if (kc === 37 || kc === 39 || kc === 38 || kc === 40) {
-                var inView = false;
-                //Check that swiper should be inside of visible area of window
-                if (s.container.parents('.swiper-slide').length > 0 && s.container.parents('.swiper-slide-active').length === 0) {
-                    return;
-                }
-                var windowScroll = {
-                    left: window.pageXOffset,
-                    top: window.pageYOffset
-                };
-                var windowWidth = window.innerWidth;
-                var windowHeight = window.innerHeight;
-                var swiperOffset = s.container.offset();
-                if (s.rtl) swiperOffset.left = swiperOffset.left - s.container[0].scrollLeft;
-                var swiperCoord = [
-                    [swiperOffset.left, swiperOffset.top],
-                    [swiperOffset.left + s.width, swiperOffset.top],
-                    [swiperOffset.left, swiperOffset.top + s.height],
-                    [swiperOffset.left + s.width, swiperOffset.top + s.height]
-                ];
-                for (var i = 0; i < swiperCoord.length; i++) {
-                    var point = swiperCoord[i];
-                    if (
-                        point[0] >= windowScroll.left && point[0] <= windowScroll.left + windowWidth &&
-                        point[1] >= windowScroll.top && point[1] <= windowScroll.top + windowHeight
-                    ) {
-                        inView = true;
-                    }
-        
-                }
-                if (!inView) return;
-            }
-            if (s.isHorizontal()) {
-                if (kc === 37 || kc === 39) {
-                    if (e.preventDefault) e.preventDefault();
-                    else e.returnValue = false;
-                }
-                if ((kc === 39 && !s.rtl) || (kc === 37 && s.rtl)) s.slideNext();
-                if ((kc === 37 && !s.rtl) || (kc === 39 && s.rtl)) s.slidePrev();
-            }
-            else {
-                if (kc === 38 || kc === 40) {
-                    if (e.preventDefault) e.preventDefault();
-                    else e.returnValue = false;
-                }
-                if (kc === 40) s.slideNext();
-                if (kc === 38) s.slidePrev();
-            }
-        }
-        s.disableKeyboardControl = function () {
-            s.params.keyboardControl = false;
-            $(document).off('keydown', handleKeyboard);
-        };
-        s.enableKeyboardControl = function () {
-            s.params.keyboardControl = true;
-            $(document).on('keydown', handleKeyboard);
-        };
-        
-
-        /*=========================
-          Mousewheel Control
-          ===========================*/
-        s.mousewheel = {
-            event: false,
-            lastScrollTime: (new window.Date()).getTime()
-        };
-        if (s.params.mousewheelControl) {
-            try {
-                new window.WheelEvent('wheel');
-                s.mousewheel.event = 'wheel';
-            } catch (e) {
-                if (window.WheelEvent || (s.container[0] && 'wheel' in s.container[0])) {
-                    s.mousewheel.event = 'wheel';
-                }
-            }
-            if (!s.mousewheel.event && window.WheelEvent) {
-        
-            }
-            if (!s.mousewheel.event && document.onmousewheel !== undefined) {
-                s.mousewheel.event = 'mousewheel';
-            }
-            if (!s.mousewheel.event) {
-                s.mousewheel.event = 'DOMMouseScroll';
-            }
-        }
-        function handleMousewheel(e) {
-            if (e.originalEvent) e = e.originalEvent; //jquery fix
-            var we = s.mousewheel.event;
-            var delta = 0;
-            var rtlFactor = s.rtl ? -1 : 1;
-        
-            //WebKits
-            if (we === 'mousewheel') {
-                if (s.params.mousewheelForceToAxis) {
-                    if (s.isHorizontal()) {
-                        if (Math.abs(e.wheelDeltaX) > Math.abs(e.wheelDeltaY)) delta = e.wheelDeltaX * rtlFactor;
-                        else return;
-                    }
-                    else {
-                        if (Math.abs(e.wheelDeltaY) > Math.abs(e.wheelDeltaX)) delta = e.wheelDeltaY;
-                        else return;
-                    }
-                }
-                else {
-                    delta = Math.abs(e.wheelDeltaX) > Math.abs(e.wheelDeltaY) ? - e.wheelDeltaX * rtlFactor : - e.wheelDeltaY;
-                }
-            }
-            //Old FireFox
-            else if (we === 'DOMMouseScroll') delta = -e.detail;
-            //New FireFox
-            else if (we === 'wheel') {
-                if (s.params.mousewheelForceToAxis) {
-                    if (s.isHorizontal()) {
-                        if (Math.abs(e.deltaX) > Math.abs(e.deltaY)) delta = -e.deltaX * rtlFactor;
-                        else return;
-                    }
-                    else {
-                        if (Math.abs(e.deltaY) > Math.abs(e.deltaX)) delta = -e.deltaY;
-                        else return;
-                    }
-                }
-                else {
-                    delta = Math.abs(e.deltaX) > Math.abs(e.deltaY) ? - e.deltaX * rtlFactor : - e.deltaY;
-                }
-            }
-            if (delta === 0) return;
-        
-            if (s.params.mousewheelInvert) delta = -delta;
-        
-            if (!s.params.freeMode) {
-                if ((new window.Date()).getTime() - s.mousewheel.lastScrollTime > 60) {
-                    if (delta < 0) {
-                        if ((!s.isEnd || s.params.loop) && !s.animating) s.slideNext();
-                        else if (s.params.mousewheelReleaseOnEdges) return true;
-                    }
-                    else {
-                        if ((!s.isBeginning || s.params.loop) && !s.animating) s.slidePrev();
-                        else if (s.params.mousewheelReleaseOnEdges) return true;
-                    }
-                }
-                s.mousewheel.lastScrollTime = (new window.Date()).getTime();
-        
-            }
-            else {
-                //Freemode or scrollContainer:
-                var position = s.getWrapperTranslate() + delta * s.params.mousewheelSensitivity;
-                var wasBeginning = s.isBeginning,
-                    wasEnd = s.isEnd;
-        
-                if (position >= s.minTranslate()) position = s.minTranslate();
-                if (position <= s.maxTranslate()) position = s.maxTranslate();
-        
-                s.setWrapperTransition(0);
-                s.setWrapperTranslate(position);
-                s.updateProgress();
-                s.updateActiveIndex();
-        
-                if (!wasBeginning && s.isBeginning || !wasEnd && s.isEnd) {
-                    s.updateClasses();
-                }
-        
-                if (s.params.freeModeSticky) {
-                    clearTimeout(s.mousewheel.timeout);
-                    s.mousewheel.timeout = setTimeout(function () {
-                        s.slideReset();
-                    }, 300);
-                }
-                else {
-                    if (s.params.lazyLoading && s.lazy) {
-                        s.lazy.load();
-                    }
-                }
-        
-                // Return page scroll on edge positions
-                if (position === 0 || position === s.maxTranslate()) return;
-            }
-            if (s.params.autoplay) s.stopAutoplay();
-        
-            if (e.preventDefault) e.preventDefault();
-            else e.returnValue = false;
-            return false;
-        }
-        s.disableMousewheelControl = function () {
-            if (!s.mousewheel.event) return false;
-            s.container.off(s.mousewheel.event, handleMousewheel);
-            return true;
-        };
-        
-        s.enableMousewheelControl = function () {
-            if (!s.mousewheel.event) return false;
-            s.container.on(s.mousewheel.event, handleMousewheel);
-            return true;
-        };
-        
-
-        /*=========================
-          Parallax
-          ===========================*/
-        function setParallaxTransform(el, progress) {
-            el = $(el);
-            var p, pX, pY;
-            var rtlFactor = s.rtl ? -1 : 1;
-        
-            p = el.attr('data-swiper-parallax') || '0';
-            pX = el.attr('data-swiper-parallax-x');
-            pY = el.attr('data-swiper-parallax-y');
-            if (pX || pY) {
-                pX = pX || '0';
-                pY = pY || '0';
-            }
-            else {
-                if (s.isHorizontal()) {
-                    pX = p;
-                    pY = '0';
-                }
-                else {
-                    pY = p;
-                    pX = '0';
-                }
-            }
-        
-            if ((pX).indexOf('%') >= 0) {
-                pX = parseInt(pX, 10) * progress * rtlFactor + '%';
-            }
-            else {
-                pX = pX * progress * rtlFactor + 'px' ;
-            }
-            if ((pY).indexOf('%') >= 0) {
-                pY = parseInt(pY, 10) * progress + '%';
-            }
-            else {
-                pY = pY * progress + 'px' ;
-            }
-        
-            el.transform('translate3d(' + pX + ', ' + pY + ',0px)');
-        }
-        s.parallax = {
-            setTranslate: function () {
-                s.container.children('[data-swiper-parallax], [data-swiper-parallax-x], [data-swiper-parallax-y]').each(function(){
-                    setParallaxTransform(this, s.progress);
-        
-                });
-                s.slides.each(function () {
-                    var slide = $(this);
-                    slide.find('[data-swiper-parallax], [data-swiper-parallax-x], [data-swiper-parallax-y]').each(function () {
-                        var progress = Math.min(Math.max(slide[0].progress, -1), 1);
-                        setParallaxTransform(this, progress);
-                    });
-                });
-            },
-            setTransition: function (duration) {
-                if (typeof duration === 'undefined') duration = s.params.speed;
-                s.container.find('[data-swiper-parallax], [data-swiper-parallax-x], [data-swiper-parallax-y]').each(function(){
-                    var el = $(this);
-                    var parallaxDuration = parseInt(el.attr('data-swiper-parallax-duration'), 10) || duration;
-                    if (duration === 0) parallaxDuration = 0;
-                    el.transition(parallaxDuration);
-                });
-            }
-        };
-        
-
-        /*=========================
-          Plugins API. Collect all and init all plugins
-          ===========================*/
-        s._plugins = [];
-        for (var plugin in s.plugins) {
-            var p = s.plugins[plugin](s, s.params[plugin]);
-            if (p) s._plugins.push(p);
-        }
-        // Method to call all plugins event/method
-        s.callPlugins = function (eventName) {
-            for (var i = 0; i < s._plugins.length; i++) {
-                if (eventName in s._plugins[i]) {
-                    s._plugins[i][eventName](arguments[1], arguments[2], arguments[3], arguments[4], arguments[5]);
-                }
-            }
-        };
-
-        /*=========================
-          Events/Callbacks/Plugins Emitter
-          ===========================*/
-        function normalizeEventName (eventName) {
-            if (eventName.indexOf('on') !== 0) {
-                if (eventName[0] !== eventName[0].toUpperCase()) {
-                    eventName = 'on' + eventName[0].toUpperCase() + eventName.substring(1);
-                }
-                else {
-                    eventName = 'on' + eventName;
-                }
-            }
-            return eventName;
-        }
-        s.emitterEventListeners = {
-        
-        };
-        s.emit = function (eventName) {
-            // Trigger callbacks
-            if (s.params[eventName]) {
-                s.params[eventName](arguments[1], arguments[2], arguments[3], arguments[4], arguments[5]);
-            }
-            var i;
-            // Trigger events
-            if (s.emitterEventListeners[eventName]) {
-                for (i = 0; i < s.emitterEventListeners[eventName].length; i++) {
-                    s.emitterEventListeners[eventName][i](arguments[1], arguments[2], arguments[3], arguments[4], arguments[5]);
-                }
-            }
-            // Trigger plugins
-            if (s.callPlugins) s.callPlugins(eventName, arguments[1], arguments[2], arguments[3], arguments[4], arguments[5]);
-        };
-        s.on = function (eventName, handler) {
-            eventName = normalizeEventName(eventName);
-            if (!s.emitterEventListeners[eventName]) s.emitterEventListeners[eventName] = [];
-            s.emitterEventListeners[eventName].push(handler);
-            return s;
-        };
-        s.off = function (eventName, handler) {
-            var i;
-            eventName = normalizeEventName(eventName);
-            if (typeof handler === 'undefined') {
-                // Remove all handlers for such event
-                s.emitterEventListeners[eventName] = [];
-                return s;
-            }
-            if (!s.emitterEventListeners[eventName] || s.emitterEventListeners[eventName].length === 0) return;
-            for (i = 0; i < s.emitterEventListeners[eventName].length; i++) {
-                if(s.emitterEventListeners[eventName][i] === handler) s.emitterEventListeners[eventName].splice(i, 1);
-            }
-            return s;
-        };
-        s.once = function (eventName, handler) {
-            eventName = normalizeEventName(eventName);
-            var _handler = function () {
-                handler(arguments[0], arguments[1], arguments[2], arguments[3], arguments[4]);
-                s.off(eventName, _handler);
-            };
-            s.on(eventName, _handler);
-            return s;
-        };
-
-        // Accessibility tools
-        s.a11y = {
-            makeFocusable: function ($el) {
-                $el.attr('tabIndex', '0');
-                return $el;
-            },
-            addRole: function ($el, role) {
-                $el.attr('role', role);
-                return $el;
-            },
-        
-            addLabel: function ($el, label) {
-                $el.attr('aria-label', label);
-                return $el;
-            },
-        
-            disable: function ($el) {
-                $el.attr('aria-disabled', true);
-                return $el;
-            },
-        
-            enable: function ($el) {
-                $el.attr('aria-disabled', false);
-                return $el;
-            },
-        
-            onEnterKey: function (event) {
-                if (event.keyCode !== 13) return;
-                if ($(event.target).is(s.params.nextButton)) {
-                    s.onClickNext(event);
-                    if (s.isEnd) {
-                        s.a11y.notify(s.params.lastSlideMessage);
-                    }
-                    else {
-                        s.a11y.notify(s.params.nextSlideMessage);
-                    }
-                }
-                else if ($(event.target).is(s.params.prevButton)) {
-                    s.onClickPrev(event);
-                    if (s.isBeginning) {
-                        s.a11y.notify(s.params.firstSlideMessage);
-                    }
-                    else {
-                        s.a11y.notify(s.params.prevSlideMessage);
-                    }
-                }
-                if ($(event.target).is('.' + s.params.bulletClass)) {
-                    $(event.target)[0].click();
-                }
-            },
-        
-            liveRegion: $('<span class="swiper-notification" aria-live="assertive" aria-atomic="true"></span>'),
-        
-            notify: function (message) {
-                var notification = s.a11y.liveRegion;
-                if (notification.length === 0) return;
-                notification.html('');
-                notification.html(message);
-            },
-            init: function () {
-                // Setup accessibility
-                if (s.params.nextButton && s.nextButton && s.nextButton.length > 0) {
-                    s.a11y.makeFocusable(s.nextButton);
-                    s.a11y.addRole(s.nextButton, 'button');
-                    s.a11y.addLabel(s.nextButton, s.params.nextSlideMessage);
-                }
-                if (s.params.prevButton && s.prevButton && s.prevButton.length > 0) {
-                    s.a11y.makeFocusable(s.prevButton);
-                    s.a11y.addRole(s.prevButton, 'button');
-                    s.a11y.addLabel(s.prevButton, s.params.prevSlideMessage);
-                }
-        
-                $(s.container).append(s.a11y.liveRegion);
-            },
-            initPagination: function () {
-                if (s.params.pagination && s.params.paginationClickable && s.bullets && s.bullets.length) {
-                    s.bullets.each(function () {
-                        var bullet = $(this);
-                        s.a11y.makeFocusable(bullet);
-                        s.a11y.addRole(bullet, 'button');
-                        s.a11y.addLabel(bullet, s.params.paginationBulletMessage.replace(/{{index}}/, bullet.index() + 1));
-                    });
-                }
-            },
-            destroy: function () {
-                if (s.a11y.liveRegion && s.a11y.liveRegion.length > 0) s.a11y.liveRegion.remove();
-            }
-        };
-        
-
-        /*=========================
-          Init/Destroy
-          ===========================*/
-        s.init = function () {
-            if (s.params.loop) s.createLoop();
-            s.updateContainerSize();
-            s.updateSlidesSize();
-            s.updatePagination();
-            if (s.params.scrollbar && s.scrollbar) {
-                s.scrollbar.set();
-                if (s.params.scrollbarDraggable) {
-                    s.scrollbar.enableDraggable();
-                }
-            }
-            if (s.params.effect !== 'slide' && s.effects[s.params.effect]) {
-                if (!s.params.loop) s.updateProgress();
-                s.effects[s.params.effect].setTranslate();
-            }
-            if (s.params.loop) {
-                s.slideTo(s.params.initialSlide + s.loopedSlides, 0, s.params.runCallbacksOnInit);
-            }
-            else {
-                s.slideTo(s.params.initialSlide, 0, s.params.runCallbacksOnInit);
-                if (s.params.initialSlide === 0) {
-                    if (s.parallax && s.params.parallax) s.parallax.setTranslate();
-                    if (s.lazy && s.params.lazyLoading) {
-                        s.lazy.load();
-                        s.lazy.initialImageLoaded = true;
-                    }
-                }
-            }
-            s.attachEvents();
-            if (s.params.observer && s.support.observer) {
-                s.initObservers();
-            }
-            if (s.params.preloadImages && !s.params.lazyLoading) {
-                s.preloadImages();
-            }
-            if (s.params.autoplay) {
-                s.startAutoplay();
-            }
-            if (s.params.keyboardControl) {
-                if (s.enableKeyboardControl) s.enableKeyboardControl();
-            }
-            if (s.params.mousewheelControl) {
-                if (s.enableMousewheelControl) s.enableMousewheelControl();
-            }
-            if (s.params.hashnav) {
-                if (s.hashnav) s.hashnav.init();
-            }
-            if (s.params.a11y && s.a11y) s.a11y.init();
-            s.emit('onInit', s);
-        };
-        
-        // Cleanup dynamic styles
-        s.cleanupStyles = function () {
-            // Container
-            s.container.removeClass(s.classNames.join(' ')).removeAttr('style');
-        
-            // Wrapper
-            s.wrapper.removeAttr('style');
-        
-            // Slides
-            if (s.slides && s.slides.length) {
-                s.slides
-                    .removeClass([
-                      s.params.slideVisibleClass,
-                      s.params.slideActiveClass,
-                      s.params.slideNextClass,
-                      s.params.slidePrevClass
-                    ].join(' '))
-                    .removeAttr('style')
-                    .removeAttr('data-swiper-column')
-                    .removeAttr('data-swiper-row');
-            }
-        
-            // Pagination/Bullets
-            if (s.paginationContainer && s.paginationContainer.length) {
-                s.paginationContainer.removeClass(s.params.paginationHiddenClass);
-            }
-            if (s.bullets && s.bullets.length) {
-                s.bullets.removeClass(s.params.bulletActiveClass);
-            }
-        
-            // Buttons
-            if (s.params.prevButton) $(s.params.prevButton).removeClass(s.params.buttonDisabledClass);
-            if (s.params.nextButton) $(s.params.nextButton).removeClass(s.params.buttonDisabledClass);
-        
-            // Scrollbar
-            if (s.params.scrollbar && s.scrollbar) {
-                if (s.scrollbar.track && s.scrollbar.track.length) s.scrollbar.track.removeAttr('style');
-                if (s.scrollbar.drag && s.scrollbar.drag.length) s.scrollbar.drag.removeAttr('style');
-            }
-        };
-        
-        // Destroy
-        s.destroy = function (deleteInstance, cleanupStyles) {
-            // Detach evebts
-            s.detachEvents();
-            // Stop autoplay
-            s.stopAutoplay();
-            // Disable draggable
-            if (s.params.scrollbar && s.scrollbar) {
-                if (s.params.scrollbarDraggable) {
-                    s.scrollbar.disableDraggable();
-                }
-            }
-            // Destroy loop
-            if (s.params.loop) {
-                s.destroyLoop();
-            }
-            // Cleanup styles
-            if (cleanupStyles) {
-                s.cleanupStyles();
-            }
-            // Disconnect observer
-            s.disconnectObservers();
-            // Disable keyboard/mousewheel
-            if (s.params.keyboardControl) {
-                if (s.disableKeyboardControl) s.disableKeyboardControl();
-            }
-            if (s.params.mousewheelControl) {
-                if (s.disableMousewheelControl) s.disableMousewheelControl();
-            }
-            // Disable a11y
-            if (s.params.a11y && s.a11y) s.a11y.destroy();
-            // Destroy callback
-            s.emit('onDestroy');
-            // Delete instance
-            if (deleteInstance !== false) s = null;
-        };
-        
-        s.init();
-        
-
-    
-        // Return swiper instance
-        return s;
-    };
-    
-
-    /*==================================================
-        Prototype
-    ====================================================*/
-    Swiper.prototype = {
-        isSafari: (function () {
-            var ua = navigator.userAgent.toLowerCase();
-            return (ua.indexOf('safari') >= 0 && ua.indexOf('chrome') < 0 && ua.indexOf('android') < 0);
-        })(),
-        isUiWebView: /(iPhone|iPod|iPad).*AppleWebKit(?!.*Safari)/i.test(navigator.userAgent),
-        isArray: function (arr) {
-            return Object.prototype.toString.apply(arr) === '[object Array]';
-        },
-        /*==================================================
-        Browser
-        ====================================================*/
-        browser: {
-            ie: window.navigator.pointerEnabled || window.navigator.msPointerEnabled,
-            ieTouch: (window.navigator.msPointerEnabled && window.navigator.msMaxTouchPoints > 1) || (window.navigator.pointerEnabled && window.navigator.maxTouchPoints > 1)
-        },
-        /*==================================================
-        Devices
-        ====================================================*/
-        device: (function () {
-            var ua = navigator.userAgent;
-            var android = ua.match(/(Android);?[\s\/]+([\d.]+)?/);
-            var ipad = ua.match(/(iPad).*OS\s([\d_]+)/);
-            var ipod = ua.match(/(iPod)(.*OS\s([\d_]+))?/);
-            var iphone = !ipad && ua.match(/(iPhone\sOS)\s([\d_]+)/);
-            return {
-                ios: ipad || iphone || ipod,
-                android: android
-            };
-        })(),
-        /*==================================================
-        Feature Detection
-        ====================================================*/
-        support: {
-            touch : (window.Modernizr && Modernizr.touch === true) || (function () {
-                return !!(('ontouchstart' in window) || window.DocumentTouch && document instanceof DocumentTouch);
-            })(),
-    
-            transforms3d : (window.Modernizr && Modernizr.csstransforms3d === true) || (function () {
-                var div = document.createElement('div').style;
-                return ('webkitPerspective' in div || 'MozPerspective' in div || 'OPerspective' in div || 'MsPerspective' in div || 'perspective' in div);
-            })(),
-    
-            flexbox: (function () {
-                var div = document.createElement('div').style;
-                var styles = ('alignItems webkitAlignItems webkitBoxAlign msFlexAlign mozBoxAlign webkitFlexDirection msFlexDirection mozBoxDirection mozBoxOrient webkitBoxDirection webkitBoxOrient').split(' ');
-                for (var i = 0; i < styles.length; i++) {
-                    if (styles[i] in div) return true;
-                }
-            })(),
-    
-            observer: (function () {
-                return ('MutationObserver' in window || 'WebkitMutationObserver' in window);
-            })()
-        },
-        /*==================================================
-        Plugins
-        ====================================================*/
-        plugins: {}
-    };
-    
-
-    /*===========================
-     Get Dom libraries
-     ===========================*/
-    var swiperDomPlugins = ['jQuery', 'Zepto', 'Dom7'];
-    for (var i = 0; i < swiperDomPlugins.length; i++) {
-    	if (window[swiperDomPlugins[i]]) {
-    		addLibraryPlugin(window[swiperDomPlugins[i]]);
-    	}
-    }
-    // Required DOM Plugins
-    var domLib;
-    if (typeof Dom7 === 'undefined') {
-    	domLib = window.Dom7 || window.Zepto || window.jQuery;
-    }
-    else {
-    	domLib = Dom7;
-    }
-
-    /*===========================
-    Add .swiper plugin from Dom libraries
-    ===========================*/
-    function addLibraryPlugin(lib) {
-        lib.fn.swiper = function (params) {
-            var firstInstance;
-            lib(this).each(function () {
-                var s = new Swiper(this, params);
-                if (!firstInstance) firstInstance = s;
-            });
-            return firstInstance;
-        };
-    }
-    
-    if (domLib) {
-        if (!('transitionEnd' in domLib.fn)) {
-            domLib.fn.transitionEnd = function (callback) {
-                var events = ['webkitTransitionEnd', 'transitionend', 'oTransitionEnd', 'MSTransitionEnd', 'msTransitionEnd'],
-                    i, j, dom = this;
-                function fireCallBack(e) {
-                    /*jshint validthis:true */
-                    if (e.target !== this) return;
-                    callback.call(this, e);
-                    for (i = 0; i < events.length; i++) {
-                        dom.off(events[i], fireCallBack);
-                    }
-                }
-                if (callback) {
-                    for (i = 0; i < events.length; i++) {
-                        dom.on(events[i], fireCallBack);
-                    }
-                }
-                return this;
-            };
-        }
-        if (!('transform' in domLib.fn)) {
-            domLib.fn.transform = function (transform) {
-                for (var i = 0; i < this.length; i++) {
-                    var elStyle = this[i].style;
-                    elStyle.webkitTransform = elStyle.MsTransform = elStyle.msTransform = elStyle.MozTransform = elStyle.OTransform = elStyle.transform = transform;
-                }
-                return this;
-            };
-        }
-        if (!('transition' in domLib.fn)) {
-            domLib.fn.transition = function (duration) {
-                if (typeof duration !== 'string') {
-                    duration = duration + 'ms';
-                }
-                for (var i = 0; i < this.length; i++) {
-                    var elStyle = this[i].style;
-                    elStyle.webkitTransitionDuration = elStyle.MsTransitionDuration = elStyle.msTransitionDuration = elStyle.MozTransitionDuration = elStyle.OTransitionDuration = elStyle.transitionDuration = duration;
-                }
-                return this;
-            };
-        }
-    }
-
-    window.Swiper = Swiper;
-})();
-/*===========================
-Swiper AMD Export
-===========================*/
-if (typeof(module) !== 'undefined')
-{
-    module.exports = window.Swiper;
-}
-else if (typeof define === 'function' && define.amd) {
-    define([], function () {
-        'use strict';
-        return window.Swiper;
-    });
-}
-//# sourceMappingURL=maps/swiper.jquery.js.map
-
-/* ===============================================================================
-************ Swiper ************
-=============================================================================== */
-/* global $:true */
-
-+function ($) {
-  "use strict";
-
-  var defaults;
-
-  $.fn.swiper = function(params) {
-    return this.each(function() {
-      if(!this) return;
-      var $this = $(this);
-      var swiper = $this.data("swiper");
-      if(!swiper) $this.data("swiper", new Swiper(this, $.extend({}, defaults, params))); 
-      return swiper;
-    });
-  }
-
-  defaults = $.fn.swiper.prototype.defaults = {
-    pagination: ".swiper-pagination"
-  };
-
-}($);
-
-/* global $:true */
-+ function($) {
-
-  var defaults;
-
-  var Photos = function(config) {
-    this.initConfig(config);
-    this.index = 0;
-  }
-
-  Photos.prototype = {
-    initConfig: function (config) {
-      this.config = $.extend({}, defaults, config);
-      this.activeIndex = this.lastActiveIndex = this.config.initIndex;
-
-      this.config.items = this.config.items.map(function(d, i) {
-        if(typeof d === typeof 'a') {
-          return {
-            image: d,
-            caption: ''
-          }
-        }
-        return d;
-      });
-
-      this.tpl = $.t7.compile(this.config.tpl);
-      if(this.config.autoOpen) this.open();
-    },
-
-    open: function (index) {
-      if (this._open) return false;
-      if (!this.modal) {
-        this.modal = $(this.tpl(this.config)).appendTo(document.body);
-        this.container = this.modal.find('.swiper-container');
-        this.wrapper = this.modal.find('.swiper-wrapper');
-
-        var hammer = new Hammer(this.container[0]);
-        hammer.get('pinch').set({ enable: true });
-        hammer.on('pinchstart', $.proxy(this.onGestureStart, this));
-        hammer.on('pinchmove', $.proxy(this.onGestureChange, this));
-        hammer.on('pinchend', $.proxy(this.onGestureEnd, this));
-        this.modal.on($.touchEvents.start, $.proxy(this.onTouchStart, this));
-        this.modal.on($.touchEvents.move, $.proxy(this.onTouchMove, this));
-        this.modal.on($.touchEvents.end, $.proxy(this.onTouchEnd, this));
-
-        //init index
-        this.wrapper.transition(0);
-        this.wrapper.transform('translate3d(-' + $(window).width()*this.config.initIndex + 'px,0,0)');
-        this.container.find('.caption-item').eq(this.config.initIndex).addClass('active');
-        this.container.find('.swiper-pagination-bullet').eq(this.config.initIndex).addClass('swiper-pagination-bullet-active');
-      }
-
-      var self = this;
-      this.modal.show().height();
-      this.modal.addClass('weui-photo-browser-modal-visible');
-      this.container.addClass('swiper-container-visible').transitionEnd(function() {
-        self.initParams();
-        if(self.config.onOpen) {
-          self.config.onOpen.call(self);
-        }
-      });
-
-      this._open = true;
-      if(index !== undefined) {
-        this.slideTo(index, 0);
-      }
-    },
-
-    close: function() {
-      this.container.transitionEnd($.proxy(function() {
-        this.modal.hide();
-        this._open = false;
-        if(this.config.onClose) this.config.onClose.call(this);
-      }, this));
-      this.container.removeClass('swiper-container-visible');
-      this.modal.removeClass('weui-photo-browser-modal-visible');
-    },
-
-    initParams: function () {
-      if(this.containerHeight) return false;
-
-      this.windowWidth = $(window).width();
-      this.containerHeight = this.container.height();
-      this.containerWidth = this.container.width();
-
-      this.touchStart = {};
-
-      this.wrapperTransform = 0;
-      this.wrapperLastTransform = - $(window).width()*this.config.initIndex;
-      this.wrapperDiff = 0;
-
-      this.lastScale = 1;
-      this.currentScale = 1;
-
-      this.imageLastTransform = { x: 0, y: 0 };
-      this.imageTransform = { x: 0, y: 0 };
-      this.imageDiff = { x: 0, y: 0 };
-      this.imageLastDiff = { x: 0, y: 0 };
-    },
-
-    onTouchStart: function (e) {
-      if(this.scaling) return false;
-      this.touching = true;
-      this.touchStart = $.getTouchPosition(e);
-      this.touchMove = null;
-      this.touchStartTime = + new Date;
-      this.wrapperDiff = 0;
-      this.breakpointPosition = null;
-    },
-
-    onTouchMove: function (e) {
-      if(!this.touching || this.scaling) return false;
-
-      e.preventDefault();
-
-      if(this.gestureImage) {
-        var rect = this.gestureImage[0].getBoundingClientRect();
-        if (rect.left >= 0 || rect.right <= this.windowWidth) {
-          this.overflow = true;
-        } else {
-          this.overflow = false;
-        }
-      } else {
-        this.oveflow = false;
-      }
-      var p = this.touchMove = $.getTouchPosition(e);
-      if(this.currentScale === 1 || this.overflow) {
-        if(this.breakpointPosition) {
-          this.wrapperDiff = p.x - this.breakpointPosition.x;
-        } else {
-          this.wrapperDiff = p.x - this.touchStart.x;
-        }
-        if(this.activeIndex === 0 && this.wrapperDiff > 0) this.wrapperDiff = Math.pow(this.wrapperDiff, .8);
-        if(this.activeIndex === this.config.items.length - 1 && this.wrapperDiff < 0) this.wrapperDiff = - Math.pow(-this.wrapperDiff, .8);
-        this.wrapperTransform = this.wrapperLastTransform + this.wrapperDiff;
-        this.doWrapperTransform();
-      } else {
-        var img = this.gestureImage;
-        this.imageDiff = {
-          x: p.x - this.touchStart.x,
-          y: p.y - this.touchStart.y
-        }
-
-        this.imageTransform = {
-          x: this.imageDiff.x + this.imageLastTransform.x,
-          y: this.imageDiff.y + this.imageLastTransform.y
-        };
-        this.doImageTransform();
-
-        this.breakpointPosition = p;
-
-        this.imageLastDiff = this.imageDiff;
-      }
-    },
-
-    onTouchEnd: function (e) {
-      if(!this.touching) return false;
-      this.touching = false;
-      if(this.scaling) return false;
-      var duration = (+ new Date) - this.touchStartTime;
-
-      if(duration < 200 && (!this.touchMove || Math.abs(this.touchStart.x - this.touchMove.x) <= 2 && Math.abs(this.touchStart.y - this.touchMove.y) <= 2)) {
-        this.onClick();
-        return;
-      }
-      if(this.wrapperDiff > 0) {
-        if(this.wrapperDiff > this.containerWidth/2 || (this.wrapperDiff > 20 && duration < 300)) {
-          this.slidePrev();
-        } else {
-          this.slideTo(this.activeIndex, 200);
-        }
-      } else {
-        if(- this.wrapperDiff > this.containerWidth/2 || (-this.wrapperDiff > 20 && duration < 300)) {
-          this.slideNext();
-        } else {
-          this.slideTo(this.activeIndex, 200);
-        }
-      }
-
-      this.imageLastTransform = this.imageTransform;
-
-      this.adjust();
-    },
-
-    onClick: function () {
-      var self = this;
-      if (this._lastClickTime && ( + new Date - this._lastClickTime < 300)) {
-        this.onDoubleClick();
-        clearTimeout(this._clickTimeout);
-      } else {
-        this._clickTimeout = setTimeout(function () {
-          self.close();
-        }, 300);
-      }
-      this._lastClickTime = + new Date;
-    },
-
-    onDoubleClick: function () {
-      this.gestureImage = this.container.find('.swiper-slide').eq(this.activeIndex).find('img');
-      this.currentScale = this.currentScale > 1 ? 1 : 2;
-      this.doImageTransform(200); 
-      this.adjust();
-    },
-
-    onGestureStart: function (e) {
-      this.scaling = true;
-      this.gestureImage = this.container.find('.swiper-slide').eq(this.activeIndex).find('img');
-    },
-
-    onGestureChange: function (e) {
-      var s = this.lastScale * e.scale;
-      if (s > this.config.maxScale) {
-        s = this.config.maxScale + Math.pow((s - this.config.maxScale), 0.5);
-      } else if (s < 1) {
-        s = Math.pow(s, .5);
-      }
-      this.currentScale = s;
-      this.doImageTransform();
-    },
-
-    onGestureEnd: function (e) {
-      if (this.currentScale > this.config.maxScale) {
-        this.currentScale = this.config.maxScale;
-        this.doImageTransform(200);
-      } else if (this.currentScale < 1) {
-        this.currentScale = 1;
-        this.doImageTransform(200);
-      }
-      this.lastScale = this.currentScale;
-      this.scaling = false;
-      this.adjust();
-    },
-
-    doWrapperTransform: function(duration, callback) {
-      if (duration === 0) {
-        var origin = this.wrapper.css('transition-property')
-        this.wrapper.css('transition-property', 'none').transform('translate3d(' + this.wrapperTransform + 'px, 0, 0)');
-        this.wrapper.css('transition-property', origin);
-        callback()
-      } else {
-        this.wrapper.transitionEnd(function() {
-          callback && callback();
-        });
-        this.wrapper.transition(duration || 0).transform('translate3d(' + this.wrapperTransform + 'px, 0, 0)');
-      }
-    },
-
-    doImageTransform: function(duration, callback) {
-      if(!this.gestureImage) return;
-      this.gestureImage.transition(duration || 0).transform('translate3d(' + this.imageTransform.x + 'px,' + this.imageTransform.y + 'px, 0) scale(' + this.currentScale + ')');
-      this._needAdjust = true;
-    },
-
-    adjust: function() {
-      if(!this._needAdjust) return false;
-      var img = this.gestureImage;
-      if(!img) return false;
-      if(this.currentScale === 1) {
-        this.imageTransform = this.imageLastDiff =  {x:0,y:0};
-        this.doImageTransform(200);
-        return;
-      }
-
-      var rect = img[0].getBoundingClientRect();
-
-      //调整上下
-      if(rect.height < this.containerHeight) {  // 如果高度没容器高，则自动居中
-        this.imageTransform.y = this.imageLastTransform.y = 0;
-      } else {  //如果比容器高，那么要保证上下不能有空隙
-        if(rect.top > 0) this.imageTransform.y = this.imageTransform.y - rect.top;
-        else if(rect.bottom < this.containerHeight) this.imageTransform.y = this.imageTransform.y + this.containerHeight - rect.bottom;
-      }
-
-      this.doImageTransform(200);
-      this._needAdjust = false; // must at last line, because doImageTransform will set this._needAdjust true
-    },
-
-    slideTo: function(index, duration) {
-      if(index < 0) index = 0;
-      if(index > this.config.items.length-1) index = this.config.items.length - 1;
-      this.lastActiveIndex = this.activeIndex;
-      this.activeIndex = index;
-      this.wrapperTransform = - (index * this.containerWidth);
-      this.wrapperLastTransform = this.wrapperTransform;
-      this.doWrapperTransform(duration, $.proxy(function() {
-        if(this.lastActiveIndex === this.activeIndex) return false; // active index not change
-        this.container.find('.caption-item.active').removeClass('active');
-        this.container.find('.swiper-slide-active').removeClass('swiper-slide-active');
-        this.container.find('.swiper-pagination-bullet-active').removeClass('swiper-pagination-bullet-active');
-        this.container.find('.caption-item').eq(this.activeIndex).addClass('active');
-        this.container.find('.swiper-slide').eq(this.activeIndex).addClass('swiper-slide-active');
-        this.container.find('.swiper-pagination-bullet').eq(this.activeIndex).addClass('swiper-pagination-bullet-active');
-
-        //reset image transform
-        this.container.find('.swiper-slide img[style]').transition(0).transform('translate3d(0,0,0) scale(1)');
-
-        this.lastScale = 1;
-        this.currentScale = 1;
-
-        this.imageLastTransform = { x: 0, y: 0 };
-        this.imageTransform = { x: 0, y: 0 };
-        this.imageDiff = { x: 0, y: 0 };
-        this.imageLastDiff = { x: 0, y: 0 };
-
-        if(this.config.onSlideChange) {
-          this.config.onSlideChange.call(this, this.activeIndex);
-        }
-
-      }, this));
-    },
-    slideNext: function() {
-      return this.slideTo(this.activeIndex+1, 200);
-    },
-    slidePrev: function() {
-      return this.slideTo(this.activeIndex-1, 200);
-    }
-  }
-
-  defaults = Photos.prototype.defaults = {
-    items: [],
-    autoOpen: false, //初始化完成之后立刻打开
-    onOpen: undefined,
-    onClose: undefined,
-    initIndex: 0, //打开时默认显示第几张
-    maxScale: 3,
-    onSlideChange: undefined,
-    tpl: '<div class="weui-photo-browser-modal">\
-            <div class="swiper-container">\
-              <div class="swiper-wrapper">\
-                {{#items}}\
-                <div class="swiper-slide">\
-                  <div class="photo-container">\
-                    <img src="{{image}}" />\
-                  </div>\
-                </div>\
-                {{/items}}\
-              </div>\
-              <div class="caption">\
-                {{#items}}\
-                <div class="caption-item caption-item-{{@index}}">{{caption}}</div>\
-                {{/items}}\
-              </div>\
-              <div class="swiper-pagination swiper-pagination-bullets">\
-                {{#items}}\
-                <span class="swiper-pagination-bullet"></span>\
-                {{/items}}\
-              </div>\
-            </div>\
-          </div>'
-  }
-
-  $.photoBrowser = function(params) {
-    return new Photos(params);
-  }
-}($);
diff --git a/NewLife.Cube/Content/jweui/js/swiper.min.js b/NewLife.Cube/Content/jweui/js/swiper.min.js
deleted file mode 100644
index 005d5858ae..0000000000
--- a/NewLife.Cube/Content/jweui/js/swiper.min.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Swiper 3.3.1
- * Most modern mobile touch slider and framework with hardware accelerated transitions
- * 
- * http://www.idangero.us/swiper/
- * 
- * Copyright 2016, Vladimir Kharlampidi
- * The iDangero.us
- * http://www.idangero.us/
- * 
- * Licensed under MIT
- * 
- * Released on: February 7, 2016
- */
-!function(){"use strict";function e(e){e.fn.swiper=function(a){var i;return e(this).each(function(){var e=new t(this,a);i||(i=e)}),i}}var a,t=function(e,i){function s(e){return Math.floor(e)}function r(){y.autoplayTimeoutId=setTimeout(function(){y.params.loop?(y.fixLoop(),y._slideNext(),y.emit("onAutoplay",y)):y.isEnd?i.autoplayStopOnLast?y.stopAutoplay():(y._slideTo(0),y.emit("onAutoplay",y)):(y._slideNext(),y.emit("onAutoplay",y))},y.params.autoplay)}function n(e,t){var i=a(e.target);if(!i.is(t))if("string"==typeof t)i=i.parents(t);else if(t.nodeType){var s;return i.parents().each(function(e,a){a===t&&(s=t)}),s?t:void 0}if(0!==i.length)return i[0]}function o(e,a){a=a||{};var t=window.MutationObserver||window.WebkitMutationObserver,i=new t(function(e){e.forEach(function(e){y.onResize(!0),y.emit("onObserverUpdate",y,e)})});i.observe(e,{attributes:"undefined"==typeof a.attributes?!0:a.attributes,childList:"undefined"==typeof a.childList?!0:a.childList,characterData:"undefined"==typeof a.characterData?!0:a.characterData}),y.observers.push(i)}function l(e){e.originalEvent&&(e=e.originalEvent);var a=e.keyCode||e.charCode;if(!y.params.allowSwipeToNext&&(y.isHorizontal()&&39===a||!y.isHorizontal()&&40===a))return!1;if(!y.params.allowSwipeToPrev&&(y.isHorizontal()&&37===a||!y.isHorizontal()&&38===a))return!1;if(!(e.shiftKey||e.altKey||e.ctrlKey||e.metaKey||document.activeElement&&document.activeElement.nodeName&&("input"===document.activeElement.nodeName.toLowerCase()||"textarea"===document.activeElement.nodeName.toLowerCase()))){if(37===a||39===a||38===a||40===a){var t=!1;if(y.container.parents(".swiper-slide").length>0&&0===y.container.parents(".swiper-slide-active").length)return;var i={left:window.pageXOffset,top:window.pageYOffset},s=window.innerWidth,r=window.innerHeight,n=y.container.offset();y.rtl&&(n.left=n.left-y.container[0].scrollLeft);for(var o=[[n.left,n.top],[n.left+y.width,n.top],[n.left,n.top+y.height],[n.left+y.width,n.top+y.height]],l=0;l<o.length;l++){var p=o[l];p[0]>=i.left&&p[0]<=i.left+s&&p[1]>=i.top&&p[1]<=i.top+r&&(t=!0)}if(!t)return}y.isHorizontal()?(37!==a&&39!==a||(e.preventDefault?e.preventDefault():e.returnValue=!1),(39===a&&!y.rtl||37===a&&y.rtl)&&y.slideNext(),(37===a&&!y.rtl||39===a&&y.rtl)&&y.slidePrev()):(38!==a&&40!==a||(e.preventDefault?e.preventDefault():e.returnValue=!1),40===a&&y.slideNext(),38===a&&y.slidePrev())}}function p(e){e.originalEvent&&(e=e.originalEvent);var a=y.mousewheel.event,t=0,i=y.rtl?-1:1;if("mousewheel"===a)if(y.params.mousewheelForceToAxis)if(y.isHorizontal()){if(!(Math.abs(e.wheelDeltaX)>Math.abs(e.wheelDeltaY)))return;t=e.wheelDeltaX*i}else{if(!(Math.abs(e.wheelDeltaY)>Math.abs(e.wheelDeltaX)))return;t=e.wheelDeltaY}else t=Math.abs(e.wheelDeltaX)>Math.abs(e.wheelDeltaY)?-e.wheelDeltaX*i:-e.wheelDeltaY;else if("DOMMouseScroll"===a)t=-e.detail;else if("wheel"===a)if(y.params.mousewheelForceToAxis)if(y.isHorizontal()){if(!(Math.abs(e.deltaX)>Math.abs(e.deltaY)))return;t=-e.deltaX*i}else{if(!(Math.abs(e.deltaY)>Math.abs(e.deltaX)))return;t=-e.deltaY}else t=Math.abs(e.deltaX)>Math.abs(e.deltaY)?-e.deltaX*i:-e.deltaY;if(0!==t){if(y.params.mousewheelInvert&&(t=-t),y.params.freeMode){var s=y.getWrapperTranslate()+t*y.params.mousewheelSensitivity,r=y.isBeginning,n=y.isEnd;if(s>=y.minTranslate()&&(s=y.minTranslate()),s<=y.maxTranslate()&&(s=y.maxTranslate()),y.setWrapperTransition(0),y.setWrapperTranslate(s),y.updateProgress(),y.updateActiveIndex(),(!r&&y.isBeginning||!n&&y.isEnd)&&y.updateClasses(),y.params.freeModeSticky?(clearTimeout(y.mousewheel.timeout),y.mousewheel.timeout=setTimeout(function(){y.slideReset()},300)):y.params.lazyLoading&&y.lazy&&y.lazy.load(),0===s||s===y.maxTranslate())return}else{if((new window.Date).getTime()-y.mousewheel.lastScrollTime>60)if(0>t)if(y.isEnd&&!y.params.loop||y.animating){if(y.params.mousewheelReleaseOnEdges)return!0}else y.slideNext();else if(y.isBeginning&&!y.params.loop||y.animating){if(y.params.mousewheelReleaseOnEdges)return!0}else y.slidePrev();y.mousewheel.lastScrollTime=(new window.Date).getTime()}return y.params.autoplay&&y.stopAutoplay(),e.preventDefault?e.preventDefault():e.returnValue=!1,!1}}function d(e,t){e=a(e);var i,s,r,n=y.rtl?-1:1;i=e.attr("data-swiper-parallax")||"0",s=e.attr("data-swiper-parallax-x"),r=e.attr("data-swiper-parallax-y"),s||r?(s=s||"0",r=r||"0"):y.isHorizontal()?(s=i,r="0"):(r=i,s="0"),s=s.indexOf("%")>=0?parseInt(s,10)*t*n+"%":s*t*n+"px",r=r.indexOf("%")>=0?parseInt(r,10)*t+"%":r*t+"px",e.transform("translate3d("+s+", "+r+",0px)")}function c(e){return 0!==e.indexOf("on")&&(e=e[0]!==e[0].toUpperCase()?"on"+e[0].toUpperCase()+e.substring(1):"on"+e),e}if(!(this instanceof t))return new t(e,i);var u={direction:"horizontal",touchEventsTarget:"container",initialSlide:0,speed:300,autoplay:!1,autoplayDisableOnInteraction:!0,autoplayStopOnLast:!1,iOSEdgeSwipeDetection:!1,iOSEdgeSwipeThreshold:20,freeMode:!1,freeModeMomentum:!0,freeModeMomentumRatio:1,freeModeMomentumBounce:!0,freeModeMomentumBounceRatio:1,freeModeSticky:!1,freeModeMinimumVelocity:.02,autoHeight:!1,setWrapperSize:!1,virtualTranslate:!1,effect:"slide",coverflow:{rotate:50,stretch:0,depth:100,modifier:1,slideShadows:!0},flip:{slideShadows:!0,limitRotation:!0},cube:{slideShadows:!0,shadow:!0,shadowOffset:20,shadowScale:.94},fade:{crossFade:!1},parallax:!1,scrollbar:null,scrollbarHide:!0,scrollbarDraggable:!1,scrollbarSnapOnRelease:!1,keyboardControl:!1,mousewheelControl:!1,mousewheelReleaseOnEdges:!1,mousewheelInvert:!1,mousewheelForceToAxis:!1,mousewheelSensitivity:1,hashnav:!1,breakpoints:void 0,spaceBetween:0,slidesPerView:1,slidesPerColumn:1,slidesPerColumnFill:"column",slidesPerGroup:1,centeredSlides:!1,slidesOffsetBefore:0,slidesOffsetAfter:0,roundLengths:!1,touchRatio:1,touchAngle:45,simulateTouch:!0,shortSwipes:!0,longSwipes:!0,longSwipesRatio:.5,longSwipesMs:300,followFinger:!0,onlyExternal:!1,threshold:0,touchMoveStopPropagation:!0,uniqueNavElements:!0,pagination:null,paginationElement:"span",paginationClickable:!1,paginationHide:!1,paginationBulletRender:null,paginationProgressRender:null,paginationFractionRender:null,paginationCustomRender:null,paginationType:"bullets",resistance:!0,resistanceRatio:.85,nextButton:null,prevButton:null,watchSlidesProgress:!1,watchSlidesVisibility:!1,grabCursor:!1,preventClicks:!0,preventClicksPropagation:!0,slideToClickedSlide:!1,lazyLoading:!1,lazyLoadingInPrevNext:!1,lazyLoadingInPrevNextAmount:1,lazyLoadingOnTransitionStart:!1,preloadImages:!0,updateOnImagesReady:!0,loop:!1,loopAdditionalSlides:0,loopedSlides:null,control:void 0,controlInverse:!1,controlBy:"slide",allowSwipeToPrev:!0,allowSwipeToNext:!0,swipeHandler:null,noSwiping:!0,noSwipingClass:"swiper-no-swiping",slideClass:"swiper-slide",slideActiveClass:"swiper-slide-active",slideVisibleClass:"swiper-slide-visible",slideDuplicateClass:"swiper-slide-duplicate",slideNextClass:"swiper-slide-next",slidePrevClass:"swiper-slide-prev",wrapperClass:"swiper-wrapper",bulletClass:"swiper-pagination-bullet",bulletActiveClass:"swiper-pagination-bullet-active",buttonDisabledClass:"swiper-button-disabled",paginationCurrentClass:"swiper-pagination-current",paginationTotalClass:"swiper-pagination-total",paginationHiddenClass:"swiper-pagination-hidden",paginationProgressbarClass:"swiper-pagination-progressbar",observer:!1,observeParents:!1,a11y:!1,prevSlideMessage:"Previous slide",nextSlideMessage:"Next slide",firstSlideMessage:"This is the first slide",lastSlideMessage:"This is the last slide",paginationBulletMessage:"Go to slide {{index}}",runCallbacksOnInit:!0},m=i&&i.virtualTranslate;i=i||{};var h={};for(var f in i)if("object"!=typeof i[f]||null===i[f]||(i[f].nodeType||i[f]===window||i[f]===document||"undefined"!=typeof Dom7&&i[f]instanceof Dom7||"undefined"!=typeof jQuery&&i[f]instanceof jQuery))h[f]=i[f];else{h[f]={};for(var g in i[f])h[f][g]=i[f][g]}for(var v in u)if("undefined"==typeof i[v])i[v]=u[v];else if("object"==typeof i[v])for(var w in u[v])"undefined"==typeof i[v][w]&&(i[v][w]=u[v][w]);var y=this;if(y.params=i,y.originalParams=h,y.classNames=[],"undefined"!=typeof a&&"undefined"!=typeof Dom7&&(a=Dom7),("undefined"!=typeof a||(a="undefined"==typeof Dom7?window.Dom7||window.Zepto||window.jQuery:Dom7))&&(y.$=a,y.currentBreakpoint=void 0,y.getActiveBreakpoint=function(){if(!y.params.breakpoints)return!1;var e,a=!1,t=[];for(e in y.params.breakpoints)y.params.breakpoints.hasOwnProperty(e)&&t.push(e);t.sort(function(e,a){return parseInt(e,10)>parseInt(a,10)});for(var i=0;i<t.length;i++)e=t[i],e>=window.innerWidth&&!a&&(a=e);return a||"max"},y.setBreakpoint=function(){var e=y.getActiveBreakpoint();if(e&&y.currentBreakpoint!==e){var a=e in y.params.breakpoints?y.params.breakpoints[e]:y.originalParams,t=y.params.loop&&a.slidesPerView!==y.params.slidesPerView;for(var i in a)y.params[i]=a[i];y.currentBreakpoint=e,t&&y.destroyLoop&&y.reLoop(!0)}},y.params.breakpoints&&y.setBreakpoint(),y.container=a(e),0!==y.container.length)){if(y.container.length>1){var x=[];return y.container.each(function(){x.push(new t(this,i))}),x}y.container[0].swiper=y,y.container.data("swiper",y),y.classNames.push("swiper-container-"+y.params.direction),y.params.freeMode&&y.classNames.push("swiper-container-free-mode"),y.support.flexbox||(y.classNames.push("swiper-container-no-flexbox"),y.params.slidesPerColumn=1),y.params.autoHeight&&y.classNames.push("swiper-container-autoheight"),(y.params.parallax||y.params.watchSlidesVisibility)&&(y.params.watchSlidesProgress=!0),["cube","coverflow","flip"].indexOf(y.params.effect)>=0&&(y.support.transforms3d?(y.params.watchSlidesProgress=!0,y.classNames.push("swiper-container-3d")):y.params.effect="slide"),"slide"!==y.params.effect&&y.classNames.push("swiper-container-"+y.params.effect),"cube"===y.params.effect&&(y.params.resistanceRatio=0,y.params.slidesPerView=1,y.params.slidesPerColumn=1,y.params.slidesPerGroup=1,y.params.centeredSlides=!1,y.params.spaceBetween=0,y.params.virtualTranslate=!0,y.params.setWrapperSize=!1),"fade"!==y.params.effect&&"flip"!==y.params.effect||(y.params.slidesPerView=1,y.params.slidesPerColumn=1,y.params.slidesPerGroup=1,y.params.watchSlidesProgress=!0,y.params.spaceBetween=0,y.params.setWrapperSize=!1,"undefined"==typeof m&&(y.params.virtualTranslate=!0)),y.params.grabCursor&&y.support.touch&&(y.params.grabCursor=!1),y.wrapper=y.container.children("."+y.params.wrapperClass),y.params.pagination&&(y.paginationContainer=a(y.params.pagination),y.params.uniqueNavElements&&"string"==typeof y.params.pagination&&y.paginationContainer.length>1&&1===y.container.find(y.params.pagination).length&&(y.paginationContainer=y.container.find(y.params.pagination)),"bullets"===y.params.paginationType&&y.params.paginationClickable?y.paginationContainer.addClass("swiper-pagination-clickable"):y.params.paginationClickable=!1,y.paginationContainer.addClass("swiper-pagination-"+y.params.paginationType)),(y.params.nextButton||y.params.prevButton)&&(y.params.nextButton&&(y.nextButton=a(y.params.nextButton),y.params.uniqueNavElements&&"string"==typeof y.params.nextButton&&y.nextButton.length>1&&1===y.container.find(y.params.nextButton).length&&(y.nextButton=y.container.find(y.params.nextButton))),y.params.prevButton&&(y.prevButton=a(y.params.prevButton),y.params.uniqueNavElements&&"string"==typeof y.params.prevButton&&y.prevButton.length>1&&1===y.container.find(y.params.prevButton).length&&(y.prevButton=y.container.find(y.params.prevButton)))),y.isHorizontal=function(){return"horizontal"===y.params.direction},y.rtl=y.isHorizontal()&&("rtl"===y.container[0].dir.toLowerCase()||"rtl"===y.container.css("direction")),y.rtl&&y.classNames.push("swiper-container-rtl"),y.rtl&&(y.wrongRTL="-webkit-box"===y.wrapper.css("display")),y.params.slidesPerColumn>1&&y.classNames.push("swiper-container-multirow"),y.device.android&&y.classNames.push("swiper-container-android"),y.container.addClass(y.classNames.join(" ")),y.translate=0,y.progress=0,y.velocity=0,y.lockSwipeToNext=function(){y.params.allowSwipeToNext=!1},y.lockSwipeToPrev=function(){y.params.allowSwipeToPrev=!1},y.lockSwipes=function(){y.params.allowSwipeToNext=y.params.allowSwipeToPrev=!1},y.unlockSwipeToNext=function(){y.params.allowSwipeToNext=!0},y.unlockSwipeToPrev=function(){y.params.allowSwipeToPrev=!0},y.unlockSwipes=function(){y.params.allowSwipeToNext=y.params.allowSwipeToPrev=!0},y.params.grabCursor&&(y.container[0].style.cursor="move",y.container[0].style.cursor="-webkit-grab",y.container[0].style.cursor="-moz-grab",y.container[0].style.cursor="grab"),y.imagesToLoad=[],y.imagesLoaded=0,y.loadImage=function(e,a,t,i,s){function r(){s&&s()}var n;e.complete&&i?r():a?(n=new window.Image,n.onload=r,n.onerror=r,t&&(n.srcset=t),a&&(n.src=a)):r()},y.preloadImages=function(){function e(){"undefined"!=typeof y&&null!==y&&(void 0!==y.imagesLoaded&&y.imagesLoaded++,y.imagesLoaded===y.imagesToLoad.length&&(y.params.updateOnImagesReady&&y.update(),y.emit("onImagesReady",y)))}y.imagesToLoad=y.container.find("img");for(var a=0;a<y.imagesToLoad.length;a++)y.loadImage(y.imagesToLoad[a],y.imagesToLoad[a].currentSrc||y.imagesToLoad[a].getAttribute("src"),y.imagesToLoad[a].srcset||y.imagesToLoad[a].getAttribute("srcset"),!0,e)},y.autoplayTimeoutId=void 0,y.autoplaying=!1,y.autoplayPaused=!1,y.startAutoplay=function(){return"undefined"!=typeof y.autoplayTimeoutId?!1:y.params.autoplay?y.autoplaying?!1:(y.autoplaying=!0,y.emit("onAutoplayStart",y),void r()):!1},y.stopAutoplay=function(e){y.autoplayTimeoutId&&(y.autoplayTimeoutId&&clearTimeout(y.autoplayTimeoutId),y.autoplaying=!1,y.autoplayTimeoutId=void 0,y.emit("onAutoplayStop",y))},y.pauseAutoplay=function(e){y.autoplayPaused||(y.autoplayTimeoutId&&clearTimeout(y.autoplayTimeoutId),y.autoplayPaused=!0,0===e?(y.autoplayPaused=!1,r()):y.wrapper.transitionEnd(function(){y&&(y.autoplayPaused=!1,y.autoplaying?r():y.stopAutoplay())}))},y.minTranslate=function(){return-y.snapGrid[0]},y.maxTranslate=function(){return-y.snapGrid[y.snapGrid.length-1]},y.updateAutoHeight=function(){var e=y.slides.eq(y.activeIndex)[0];if("undefined"!=typeof e){var a=e.offsetHeight;a&&y.wrapper.css("height",a+"px")}},y.updateContainerSize=function(){var e,a;e="undefined"!=typeof y.params.width?y.params.width:y.container[0].clientWidth,a="undefined"!=typeof y.params.height?y.params.height:y.container[0].clientHeight,0===e&&y.isHorizontal()||0===a&&!y.isHorizontal()||(e=e-parseInt(y.container.css("padding-left"),10)-parseInt(y.container.css("padding-right"),10),a=a-parseInt(y.container.css("padding-top"),10)-parseInt(y.container.css("padding-bottom"),10),y.width=e,y.height=a,y.size=y.isHorizontal()?y.width:y.height)},y.updateSlidesSize=function(){y.slides=y.wrapper.children("."+y.params.slideClass),y.snapGrid=[],y.slidesGrid=[],y.slidesSizesGrid=[];var e,a=y.params.spaceBetween,t=-y.params.slidesOffsetBefore,i=0,r=0;if("undefined"!=typeof y.size){"string"==typeof a&&a.indexOf("%")>=0&&(a=parseFloat(a.replace("%",""))/100*y.size),y.virtualSize=-a,y.rtl?y.slides.css({marginLeft:"",marginTop:""}):y.slides.css({marginRight:"",marginBottom:""});var n;y.params.slidesPerColumn>1&&(n=Math.floor(y.slides.length/y.params.slidesPerColumn)===y.slides.length/y.params.slidesPerColumn?y.slides.length:Math.ceil(y.slides.length/y.params.slidesPerColumn)*y.params.slidesPerColumn,"auto"!==y.params.slidesPerView&&"row"===y.params.slidesPerColumnFill&&(n=Math.max(n,y.params.slidesPerView*y.params.slidesPerColumn)));var o,l=y.params.slidesPerColumn,p=n/l,d=p-(y.params.slidesPerColumn*p-y.slides.length);for(e=0;e<y.slides.length;e++){o=0;var c=y.slides.eq(e);if(y.params.slidesPerColumn>1){var u,m,h;"column"===y.params.slidesPerColumnFill?(m=Math.floor(e/l),h=e-m*l,(m>d||m===d&&h===l-1)&&++h>=l&&(h=0,m++),u=m+h*n/l,c.css({"-webkit-box-ordinal-group":u,"-moz-box-ordinal-group":u,"-ms-flex-order":u,"-webkit-order":u,order:u})):(h=Math.floor(e/p),m=e-h*p),c.css({"margin-top":0!==h&&y.params.spaceBetween&&y.params.spaceBetween+"px"}).attr("data-swiper-column",m).attr("data-swiper-row",h)}"none"!==c.css("display")&&("auto"===y.params.slidesPerView?(o=y.isHorizontal()?c.outerWidth(!0):c.outerHeight(!0),y.params.roundLengths&&(o=s(o))):(o=(y.size-(y.params.slidesPerView-1)*a)/y.params.slidesPerView,y.params.roundLengths&&(o=s(o)),y.isHorizontal()?y.slides[e].style.width=o+"px":y.slides[e].style.height=o+"px"),y.slides[e].swiperSlideSize=o,y.slidesSizesGrid.push(o),y.params.centeredSlides?(t=t+o/2+i/2+a,0===e&&(t=t-y.size/2-a),Math.abs(t)<.001&&(t=0),r%y.params.slidesPerGroup===0&&y.snapGrid.push(t),y.slidesGrid.push(t)):(r%y.params.slidesPerGroup===0&&y.snapGrid.push(t),y.slidesGrid.push(t),t=t+o+a),y.virtualSize+=o+a,i=o,r++)}y.virtualSize=Math.max(y.virtualSize,y.size)+y.params.slidesOffsetAfter;var f;if(y.rtl&&y.wrongRTL&&("slide"===y.params.effect||"coverflow"===y.params.effect)&&y.wrapper.css({width:y.virtualSize+y.params.spaceBetween+"px"}),y.support.flexbox&&!y.params.setWrapperSize||(y.isHorizontal()?y.wrapper.css({width:y.virtualSize+y.params.spaceBetween+"px"}):y.wrapper.css({height:y.virtualSize+y.params.spaceBetween+"px"})),y.params.slidesPerColumn>1&&(y.virtualSize=(o+y.params.spaceBetween)*n,y.virtualSize=Math.ceil(y.virtualSize/y.params.slidesPerColumn)-y.params.spaceBetween,y.wrapper.css({width:y.virtualSize+y.params.spaceBetween+"px"}),y.params.centeredSlides)){for(f=[],e=0;e<y.snapGrid.length;e++)y.snapGrid[e]<y.virtualSize+y.snapGrid[0]&&f.push(y.snapGrid[e]);y.snapGrid=f}if(!y.params.centeredSlides){for(f=[],e=0;e<y.snapGrid.length;e++)y.snapGrid[e]<=y.virtualSize-y.size&&f.push(y.snapGrid[e]);y.snapGrid=f,Math.floor(y.virtualSize-y.size)-Math.floor(y.snapGrid[y.snapGrid.length-1])>1&&y.snapGrid.push(y.virtualSize-y.size)}0===y.snapGrid.length&&(y.snapGrid=[0]),0!==y.params.spaceBetween&&(y.isHorizontal()?y.rtl?y.slides.css({marginLeft:a+"px"}):y.slides.css({marginRight:a+"px"}):y.slides.css({marginBottom:a+"px"})),y.params.watchSlidesProgress&&y.updateSlidesOffset()}},y.updateSlidesOffset=function(){for(var e=0;e<y.slides.length;e++)y.slides[e].swiperSlideOffset=y.isHorizontal()?y.slides[e].offsetLeft:y.slides[e].offsetTop},y.updateSlidesProgress=function(e){if("undefined"==typeof e&&(e=y.translate||0),0!==y.slides.length){"undefined"==typeof y.slides[0].swiperSlideOffset&&y.updateSlidesOffset();var a=-e;y.rtl&&(a=e),y.slides.removeClass(y.params.slideVisibleClass);for(var t=0;t<y.slides.length;t++){var i=y.slides[t],s=(a-i.swiperSlideOffset)/(i.swiperSlideSize+y.params.spaceBetween);if(y.params.watchSlidesVisibility){var r=-(a-i.swiperSlideOffset),n=r+y.slidesSizesGrid[t],o=r>=0&&r<y.size||n>0&&n<=y.size||0>=r&&n>=y.size;o&&y.slides.eq(t).addClass(y.params.slideVisibleClass)}i.progress=y.rtl?-s:s}}},y.updateProgress=function(e){"undefined"==typeof e&&(e=y.translate||0);var a=y.maxTranslate()-y.minTranslate(),t=y.isBeginning,i=y.isEnd;0===a?(y.progress=0,y.isBeginning=y.isEnd=!0):(y.progress=(e-y.minTranslate())/a,y.isBeginning=y.progress<=0,y.isEnd=y.progress>=1),y.isBeginning&&!t&&y.emit("onReachBeginning",y),y.isEnd&&!i&&y.emit("onReachEnd",y),y.params.watchSlidesProgress&&y.updateSlidesProgress(e),y.emit("onProgress",y,y.progress)},y.updateActiveIndex=function(){var e,a,t,i=y.rtl?y.translate:-y.translate;for(a=0;a<y.slidesGrid.length;a++)"undefined"!=typeof y.slidesGrid[a+1]?i>=y.slidesGrid[a]&&i<y.slidesGrid[a+1]-(y.slidesGrid[a+1]-y.slidesGrid[a])/2?e=a:i>=y.slidesGrid[a]&&i<y.slidesGrid[a+1]&&(e=a+1):i>=y.slidesGrid[a]&&(e=a);(0>e||"undefined"==typeof e)&&(e=0),t=Math.floor(e/y.params.slidesPerGroup),t>=y.snapGrid.length&&(t=y.snapGrid.length-1),e!==y.activeIndex&&(y.snapIndex=t,y.previousIndex=y.activeIndex,y.activeIndex=e,y.updateClasses())},y.updateClasses=function(){y.slides.removeClass(y.params.slideActiveClass+" "+y.params.slideNextClass+" "+y.params.slidePrevClass);var e=y.slides.eq(y.activeIndex);e.addClass(y.params.slideActiveClass);var t=e.next("."+y.params.slideClass).addClass(y.params.slideNextClass);y.params.loop&&0===t.length&&y.slides.eq(0).addClass(y.params.slideNextClass);var i=e.prev("."+y.params.slideClass).addClass(y.params.slidePrevClass);if(y.params.loop&&0===i.length&&y.slides.eq(-1).addClass(y.params.slidePrevClass),y.paginationContainer&&y.paginationContainer.length>0){var s,r=y.params.loop?Math.ceil((y.slides.length-2*y.loopedSlides)/y.params.slidesPerGroup):y.snapGrid.length;if(y.params.loop?(s=Math.ceil((y.activeIndex-y.loopedSlides)/y.params.slidesPerGroup),s>y.slides.length-1-2*y.loopedSlides&&(s-=y.slides.length-2*y.loopedSlides),s>r-1&&(s-=r),0>s&&"bullets"!==y.params.paginationType&&(s=r+s)):s="undefined"!=typeof y.snapIndex?y.snapIndex:y.activeIndex||0,"bullets"===y.params.paginationType&&y.bullets&&y.bullets.length>0&&(y.bullets.removeClass(y.params.bulletActiveClass),y.paginationContainer.length>1?y.bullets.each(function(){a(this).index()===s&&a(this).addClass(y.params.bulletActiveClass)}):y.bullets.eq(s).addClass(y.params.bulletActiveClass)),"fraction"===y.params.paginationType&&(y.paginationContainer.find("."+y.params.paginationCurrentClass).text(s+1),y.paginationContainer.find("."+y.params.paginationTotalClass).text(r)),"progress"===y.params.paginationType){var n=(s+1)/r,o=n,l=1;y.isHorizontal()||(l=n,o=1),y.paginationContainer.find("."+y.params.paginationProgressbarClass).transform("translate3d(0,0,0) scaleX("+o+") scaleY("+l+")").transition(y.params.speed)}"custom"===y.params.paginationType&&y.params.paginationCustomRender&&(y.paginationContainer.html(y.params.paginationCustomRender(y,s+1,r)),y.emit("onPaginationRendered",y,y.paginationContainer[0]))}y.params.loop||(y.params.prevButton&&y.prevButton&&y.prevButton.length>0&&(y.isBeginning?(y.prevButton.addClass(y.params.buttonDisabledClass),y.params.a11y&&y.a11y&&y.a11y.disable(y.prevButton)):(y.prevButton.removeClass(y.params.buttonDisabledClass),y.params.a11y&&y.a11y&&y.a11y.enable(y.prevButton))),y.params.nextButton&&y.nextButton&&y.nextButton.length>0&&(y.isEnd?(y.nextButton.addClass(y.params.buttonDisabledClass),y.params.a11y&&y.a11y&&y.a11y.disable(y.nextButton)):(y.nextButton.removeClass(y.params.buttonDisabledClass),y.params.a11y&&y.a11y&&y.a11y.enable(y.nextButton))))},y.updatePagination=function(){if(y.params.pagination&&y.paginationContainer&&y.paginationContainer.length>0){var e="";if("bullets"===y.params.paginationType){for(var a=y.params.loop?Math.ceil((y.slides.length-2*y.loopedSlides)/y.params.slidesPerGroup):y.snapGrid.length,t=0;a>t;t++)e+=y.params.paginationBulletRender?y.params.paginationBulletRender(t,y.params.bulletClass):"<"+y.params.paginationElement+' class="'+y.params.bulletClass+'"></'+y.params.paginationElement+">";y.paginationContainer.html(e),y.bullets=y.paginationContainer.find("."+y.params.bulletClass),y.params.paginationClickable&&y.params.a11y&&y.a11y&&y.a11y.initPagination()}"fraction"===y.params.paginationType&&(e=y.params.paginationFractionRender?y.params.paginationFractionRender(y,y.params.paginationCurrentClass,y.params.paginationTotalClass):'<span class="'+y.params.paginationCurrentClass+'"></span> / <span class="'+y.params.paginationTotalClass+'"></span>',y.paginationContainer.html(e)),"progress"===y.params.paginationType&&(e=y.params.paginationProgressRender?y.params.paginationProgressRender(y,y.params.paginationProgressbarClass):'<span class="'+y.params.paginationProgressbarClass+'"></span>',y.paginationContainer.html(e)),"custom"!==y.params.paginationType&&y.emit("onPaginationRendered",y,y.paginationContainer[0])}},y.update=function(e){function a(){i=Math.min(Math.max(y.translate,y.maxTranslate()),y.minTranslate()),y.setWrapperTranslate(i),y.updateActiveIndex(),y.updateClasses()}if(y.updateContainerSize(),y.updateSlidesSize(),y.updateProgress(),y.updatePagination(),y.updateClasses(),y.params.scrollbar&&y.scrollbar&&y.scrollbar.set(),e){var t,i;y.controller&&y.controller.spline&&(y.controller.spline=void 0),y.params.freeMode?(a(),y.params.autoHeight&&y.updateAutoHeight()):(t=("auto"===y.params.slidesPerView||y.params.slidesPerView>1)&&y.isEnd&&!y.params.centeredSlides?y.slideTo(y.slides.length-1,0,!1,!0):y.slideTo(y.activeIndex,0,!1,!0),t||a())}else y.params.autoHeight&&y.updateAutoHeight()},y.onResize=function(e){y.params.breakpoints&&y.setBreakpoint();var a=y.params.allowSwipeToPrev,t=y.params.allowSwipeToNext;y.params.allowSwipeToPrev=y.params.allowSwipeToNext=!0,y.updateContainerSize(),y.updateSlidesSize(),("auto"===y.params.slidesPerView||y.params.freeMode||e)&&y.updatePagination(),y.params.scrollbar&&y.scrollbar&&y.scrollbar.set(),y.controller&&y.controller.spline&&(y.controller.spline=void 0);var i=!1;if(y.params.freeMode){var s=Math.min(Math.max(y.translate,y.maxTranslate()),y.minTranslate());y.setWrapperTranslate(s),y.updateActiveIndex(),y.updateClasses(),y.params.autoHeight&&y.updateAutoHeight()}else y.updateClasses(),i=("auto"===y.params.slidesPerView||y.params.slidesPerView>1)&&y.isEnd&&!y.params.centeredSlides?y.slideTo(y.slides.length-1,0,!1,!0):y.slideTo(y.activeIndex,0,!1,!0);y.params.lazyLoading&&!i&&y.lazy&&y.lazy.load(),y.params.allowSwipeToPrev=a,y.params.allowSwipeToNext=t};var T=["mousedown","mousemove","mouseup"];window.navigator.pointerEnabled?T=["pointerdown","pointermove","pointerup"]:window.navigator.msPointerEnabled&&(T=["MSPointerDown","MSPointerMove","MSPointerUp"]),y.touchEvents={start:y.support.touch||!y.params.simulateTouch?"touchstart":T[0],move:y.support.touch||!y.params.simulateTouch?"touchmove":T[1],end:y.support.touch||!y.params.simulateTouch?"touchend":T[2]},(window.navigator.pointerEnabled||window.navigator.msPointerEnabled)&&("container"===y.params.touchEventsTarget?y.container:y.wrapper).addClass("swiper-wp8-"+y.params.direction),y.initEvents=function(e){var a=e?"off":"on",t=e?"removeEventListener":"addEventListener",s="container"===y.params.touchEventsTarget?y.container[0]:y.wrapper[0],r=y.support.touch?s:document,n=!!y.params.nested;y.browser.ie?(s[t](y.touchEvents.start,y.onTouchStart,!1),r[t](y.touchEvents.move,y.onTouchMove,n),r[t](y.touchEvents.end,y.onTouchEnd,!1)):(y.support.touch&&(s[t](y.touchEvents.start,y.onTouchStart,!1),s[t](y.touchEvents.move,y.onTouchMove,n),s[t](y.touchEvents.end,y.onTouchEnd,!1)),!i.simulateTouch||y.device.ios||y.device.android||(s[t]("mousedown",y.onTouchStart,!1),document[t]("mousemove",y.onTouchMove,n),document[t]("mouseup",y.onTouchEnd,!1))),window[t]("resize",y.onResize),y.params.nextButton&&y.nextButton&&y.nextButton.length>0&&(y.nextButton[a]("click",y.onClickNext),y.params.a11y&&y.a11y&&y.nextButton[a]("keydown",y.a11y.onEnterKey)),y.params.prevButton&&y.prevButton&&y.prevButton.length>0&&(y.prevButton[a]("click",y.onClickPrev),y.params.a11y&&y.a11y&&y.prevButton[a]("keydown",y.a11y.onEnterKey)),y.params.pagination&&y.params.paginationClickable&&(y.paginationContainer[a]("click","."+y.params.bulletClass,y.onClickIndex),y.params.a11y&&y.a11y&&y.paginationContainer[a]("keydown","."+y.params.bulletClass,y.a11y.onEnterKey)),(y.params.preventClicks||y.params.preventClicksPropagation)&&s[t]("click",y.preventClicks,!0)},y.attachEvents=function(){y.initEvents()},y.detachEvents=function(){y.initEvents(!0)},y.allowClick=!0,y.preventClicks=function(e){y.allowClick||(y.params.preventClicks&&e.preventDefault(),y.params.preventClicksPropagation&&y.animating&&(e.stopPropagation(),e.stopImmediatePropagation()))},y.onClickNext=function(e){e.preventDefault(),y.isEnd&&!y.params.loop||y.slideNext()},y.onClickPrev=function(e){e.preventDefault(),y.isBeginning&&!y.params.loop||y.slidePrev()},y.onClickIndex=function(e){e.preventDefault();var t=a(this).index()*y.params.slidesPerGroup;y.params.loop&&(t+=y.loopedSlides),y.slideTo(t)},y.updateClickedSlide=function(e){var t=n(e,"."+y.params.slideClass),i=!1;if(t)for(var s=0;s<y.slides.length;s++)y.slides[s]===t&&(i=!0);if(!t||!i)return y.clickedSlide=void 0,void(y.clickedIndex=void 0);if(y.clickedSlide=t,y.clickedIndex=a(t).index(),y.params.slideToClickedSlide&&void 0!==y.clickedIndex&&y.clickedIndex!==y.activeIndex){var r,o=y.clickedIndex;if(y.params.loop){if(y.animating)return;r=a(y.clickedSlide).attr("data-swiper-slide-index"),y.params.centeredSlides?o<y.loopedSlides-y.params.slidesPerView/2||o>y.slides.length-y.loopedSlides+y.params.slidesPerView/2?(y.fixLoop(),o=y.wrapper.children("."+y.params.slideClass+'[data-swiper-slide-index="'+r+'"]:not(.swiper-slide-duplicate)').eq(0).index(),setTimeout(function(){y.slideTo(o)},0)):y.slideTo(o):o>y.slides.length-y.params.slidesPerView?(y.fixLoop(),o=y.wrapper.children("."+y.params.slideClass+'[data-swiper-slide-index="'+r+'"]:not(.swiper-slide-duplicate)').eq(0).index(),setTimeout(function(){y.slideTo(o)},0)):y.slideTo(o)}else y.slideTo(o)}};var b,S,C,z,M,P,I,k,E,D,B="input, select, textarea, button",L=Date.now(),H=[];y.animating=!1,y.touches={startX:0,startY:0,currentX:0,currentY:0,diff:0};var G,A;if(y.onTouchStart=function(e){if(e.originalEvent&&(e=e.originalEvent),G="touchstart"===e.type,G||!("which"in e)||3!==e.which){if(y.params.noSwiping&&n(e,"."+y.params.noSwipingClass))return void(y.allowClick=!0);if(!y.params.swipeHandler||n(e,y.params.swipeHandler)){var t=y.touches.currentX="touchstart"===e.type?e.targetTouches[0].pageX:e.pageX,i=y.touches.currentY="touchstart"===e.type?e.targetTouches[0].pageY:e.pageY;if(!(y.device.ios&&y.params.iOSEdgeSwipeDetection&&t<=y.params.iOSEdgeSwipeThreshold)){if(b=!0,S=!1,C=!0,M=void 0,A=void 0,y.touches.startX=t,y.touches.startY=i,z=Date.now(),y.allowClick=!0,y.updateContainerSize(),y.swipeDirection=void 0,y.params.threshold>0&&(k=!1),"touchstart"!==e.type){var s=!0;a(e.target).is(B)&&(s=!1),document.activeElement&&a(document.activeElement).is(B)&&document.activeElement.blur(),s&&e.preventDefault()}y.emit("onTouchStart",y,e)}}}},y.onTouchMove=function(e){if(e.originalEvent&&(e=e.originalEvent),!G||"mousemove"!==e.type){if(e.preventedByNestedSwiper)return y.touches.startX="touchmove"===e.type?e.targetTouches[0].pageX:e.pageX,void(y.touches.startY="touchmove"===e.type?e.targetTouches[0].pageY:e.pageY);if(y.params.onlyExternal)return y.allowClick=!1,void(b&&(y.touches.startX=y.touches.currentX="touchmove"===e.type?e.targetTouches[0].pageX:e.pageX,y.touches.startY=y.touches.currentY="touchmove"===e.type?e.targetTouches[0].pageY:e.pageY,z=Date.now()));if(G&&document.activeElement&&e.target===document.activeElement&&a(e.target).is(B))return S=!0,void(y.allowClick=!1);if(C&&y.emit("onTouchMove",y,e),!(e.targetTouches&&e.targetTouches.length>1)){if(y.touches.currentX="touchmove"===e.type?e.targetTouches[0].pageX:e.pageX,y.touches.currentY="touchmove"===e.type?e.targetTouches[0].pageY:e.pageY,"undefined"==typeof M){var t=180*Math.atan2(Math.abs(y.touches.currentY-y.touches.startY),Math.abs(y.touches.currentX-y.touches.startX))/Math.PI;M=y.isHorizontal()?t>y.params.touchAngle:90-t>y.params.touchAngle}if(M&&y.emit("onTouchMoveOpposite",y,e),"undefined"==typeof A&&y.browser.ieTouch&&(y.touches.currentX===y.touches.startX&&y.touches.currentY===y.touches.startY||(A=!0)),b){if(M)return void(b=!1);if(A||!y.browser.ieTouch){y.allowClick=!1,y.emit("onSliderMove",y,e),e.preventDefault(),y.params.touchMoveStopPropagation&&!y.params.nested&&e.stopPropagation(),S||(i.loop&&y.fixLoop(),I=y.getWrapperTranslate(),y.setWrapperTransition(0),y.animating&&y.wrapper.trigger("webkitTransitionEnd transitionend oTransitionEnd MSTransitionEnd msTransitionEnd"),y.params.autoplay&&y.autoplaying&&(y.params.autoplayDisableOnInteraction?y.stopAutoplay():y.pauseAutoplay()),D=!1,y.params.grabCursor&&(y.container[0].style.cursor="move",y.container[0].style.cursor="-webkit-grabbing",y.container[0].style.cursor="-moz-grabbin",y.container[0].style.cursor="grabbing")),S=!0;var s=y.touches.diff=y.isHorizontal()?y.touches.currentX-y.touches.startX:y.touches.currentY-y.touches.startY;s*=y.params.touchRatio,y.rtl&&(s=-s),y.swipeDirection=s>0?"prev":"next",P=s+I;var r=!0;if(s>0&&P>y.minTranslate()?(r=!1,y.params.resistance&&(P=y.minTranslate()-1+Math.pow(-y.minTranslate()+I+s,y.params.resistanceRatio))):0>s&&P<y.maxTranslate()&&(r=!1,y.params.resistance&&(P=y.maxTranslate()+1-Math.pow(y.maxTranslate()-I-s,y.params.resistanceRatio))),
-r&&(e.preventedByNestedSwiper=!0),!y.params.allowSwipeToNext&&"next"===y.swipeDirection&&I>P&&(P=I),!y.params.allowSwipeToPrev&&"prev"===y.swipeDirection&&P>I&&(P=I),y.params.followFinger){if(y.params.threshold>0){if(!(Math.abs(s)>y.params.threshold||k))return void(P=I);if(!k)return k=!0,y.touches.startX=y.touches.currentX,y.touches.startY=y.touches.currentY,P=I,void(y.touches.diff=y.isHorizontal()?y.touches.currentX-y.touches.startX:y.touches.currentY-y.touches.startY)}(y.params.freeMode||y.params.watchSlidesProgress)&&y.updateActiveIndex(),y.params.freeMode&&(0===H.length&&H.push({position:y.touches[y.isHorizontal()?"startX":"startY"],time:z}),H.push({position:y.touches[y.isHorizontal()?"currentX":"currentY"],time:(new window.Date).getTime()})),y.updateProgress(P),y.setWrapperTranslate(P)}}}}}},y.onTouchEnd=function(e){if(e.originalEvent&&(e=e.originalEvent),C&&y.emit("onTouchEnd",y,e),C=!1,b){y.params.grabCursor&&S&&b&&(y.container[0].style.cursor="move",y.container[0].style.cursor="-webkit-grab",y.container[0].style.cursor="-moz-grab",y.container[0].style.cursor="grab");var t=Date.now(),i=t-z;if(y.allowClick&&(y.updateClickedSlide(e),y.emit("onTap",y,e),300>i&&t-L>300&&(E&&clearTimeout(E),E=setTimeout(function(){y&&(y.params.paginationHide&&y.paginationContainer.length>0&&!a(e.target).hasClass(y.params.bulletClass)&&y.paginationContainer.toggleClass(y.params.paginationHiddenClass),y.emit("onClick",y,e))},300)),300>i&&300>t-L&&(E&&clearTimeout(E),y.emit("onDoubleTap",y,e))),L=Date.now(),setTimeout(function(){y&&(y.allowClick=!0)},0),!b||!S||!y.swipeDirection||0===y.touches.diff||P===I)return void(b=S=!1);b=S=!1;var s;if(s=y.params.followFinger?y.rtl?y.translate:-y.translate:-P,y.params.freeMode){if(s<-y.minTranslate())return void y.slideTo(y.activeIndex);if(s>-y.maxTranslate())return void(y.slides.length<y.snapGrid.length?y.slideTo(y.snapGrid.length-1):y.slideTo(y.slides.length-1));if(y.params.freeModeMomentum){if(H.length>1){var r=H.pop(),n=H.pop(),o=r.position-n.position,l=r.time-n.time;y.velocity=o/l,y.velocity=y.velocity/2,Math.abs(y.velocity)<y.params.freeModeMinimumVelocity&&(y.velocity=0),(l>150||(new window.Date).getTime()-r.time>300)&&(y.velocity=0)}else y.velocity=0;H.length=0;var p=1e3*y.params.freeModeMomentumRatio,d=y.velocity*p,c=y.translate+d;y.rtl&&(c=-c);var u,m=!1,h=20*Math.abs(y.velocity)*y.params.freeModeMomentumBounceRatio;if(c<y.maxTranslate())y.params.freeModeMomentumBounce?(c+y.maxTranslate()<-h&&(c=y.maxTranslate()-h),u=y.maxTranslate(),m=!0,D=!0):c=y.maxTranslate();else if(c>y.minTranslate())y.params.freeModeMomentumBounce?(c-y.minTranslate()>h&&(c=y.minTranslate()+h),u=y.minTranslate(),m=!0,D=!0):c=y.minTranslate();else if(y.params.freeModeSticky){var f,g=0;for(g=0;g<y.snapGrid.length;g+=1)if(y.snapGrid[g]>-c){f=g;break}c=Math.abs(y.snapGrid[f]-c)<Math.abs(y.snapGrid[f-1]-c)||"next"===y.swipeDirection?y.snapGrid[f]:y.snapGrid[f-1],y.rtl||(c=-c)}if(0!==y.velocity)p=y.rtl?Math.abs((-c-y.translate)/y.velocity):Math.abs((c-y.translate)/y.velocity);else if(y.params.freeModeSticky)return void y.slideReset();y.params.freeModeMomentumBounce&&m?(y.updateProgress(u),y.setWrapperTransition(p),y.setWrapperTranslate(c),y.onTransitionStart(),y.animating=!0,y.wrapper.transitionEnd(function(){y&&D&&(y.emit("onMomentumBounce",y),y.setWrapperTransition(y.params.speed),y.setWrapperTranslate(u),y.wrapper.transitionEnd(function(){y&&y.onTransitionEnd()}))})):y.velocity?(y.updateProgress(c),y.setWrapperTransition(p),y.setWrapperTranslate(c),y.onTransitionStart(),y.animating||(y.animating=!0,y.wrapper.transitionEnd(function(){y&&y.onTransitionEnd()}))):y.updateProgress(c),y.updateActiveIndex()}return void((!y.params.freeModeMomentum||i>=y.params.longSwipesMs)&&(y.updateProgress(),y.updateActiveIndex()))}var v,w=0,x=y.slidesSizesGrid[0];for(v=0;v<y.slidesGrid.length;v+=y.params.slidesPerGroup)"undefined"!=typeof y.slidesGrid[v+y.params.slidesPerGroup]?s>=y.slidesGrid[v]&&s<y.slidesGrid[v+y.params.slidesPerGroup]&&(w=v,x=y.slidesGrid[v+y.params.slidesPerGroup]-y.slidesGrid[v]):s>=y.slidesGrid[v]&&(w=v,x=y.slidesGrid[y.slidesGrid.length-1]-y.slidesGrid[y.slidesGrid.length-2]);var T=(s-y.slidesGrid[w])/x;if(i>y.params.longSwipesMs){if(!y.params.longSwipes)return void y.slideTo(y.activeIndex);"next"===y.swipeDirection&&(T>=y.params.longSwipesRatio?y.slideTo(w+y.params.slidesPerGroup):y.slideTo(w)),"prev"===y.swipeDirection&&(T>1-y.params.longSwipesRatio?y.slideTo(w+y.params.slidesPerGroup):y.slideTo(w))}else{if(!y.params.shortSwipes)return void y.slideTo(y.activeIndex);"next"===y.swipeDirection&&y.slideTo(w+y.params.slidesPerGroup),"prev"===y.swipeDirection&&y.slideTo(w)}}},y._slideTo=function(e,a){return y.slideTo(e,a,!0,!0)},y.slideTo=function(e,a,t,i){"undefined"==typeof t&&(t=!0),"undefined"==typeof e&&(e=0),0>e&&(e=0),y.snapIndex=Math.floor(e/y.params.slidesPerGroup),y.snapIndex>=y.snapGrid.length&&(y.snapIndex=y.snapGrid.length-1);var s=-y.snapGrid[y.snapIndex];y.params.autoplay&&y.autoplaying&&(i||!y.params.autoplayDisableOnInteraction?y.pauseAutoplay(a):y.stopAutoplay()),y.updateProgress(s);for(var r=0;r<y.slidesGrid.length;r++)-Math.floor(100*s)>=Math.floor(100*y.slidesGrid[r])&&(e=r);return!y.params.allowSwipeToNext&&s<y.translate&&s<y.minTranslate()?!1:!y.params.allowSwipeToPrev&&s>y.translate&&s>y.maxTranslate()&&(y.activeIndex||0)!==e?!1:("undefined"==typeof a&&(a=y.params.speed),y.previousIndex=y.activeIndex||0,y.activeIndex=e,y.rtl&&-s===y.translate||!y.rtl&&s===y.translate?(y.params.autoHeight&&y.updateAutoHeight(),y.updateClasses(),"slide"!==y.params.effect&&y.setWrapperTranslate(s),!1):(y.updateClasses(),y.onTransitionStart(t),0===a?(y.setWrapperTranslate(s),y.setWrapperTransition(0),y.onTransitionEnd(t)):(y.setWrapperTranslate(s),y.setWrapperTransition(a),y.animating||(y.animating=!0,y.wrapper.transitionEnd(function(){y&&y.onTransitionEnd(t)}))),!0))},y.onTransitionStart=function(e){"undefined"==typeof e&&(e=!0),y.params.autoHeight&&y.updateAutoHeight(),y.lazy&&y.lazy.onTransitionStart(),e&&(y.emit("onTransitionStart",y),y.activeIndex!==y.previousIndex&&(y.emit("onSlideChangeStart",y),y.activeIndex>y.previousIndex?y.emit("onSlideNextStart",y):y.emit("onSlidePrevStart",y)))},y.onTransitionEnd=function(e){y.animating=!1,y.setWrapperTransition(0),"undefined"==typeof e&&(e=!0),y.lazy&&y.lazy.onTransitionEnd(),e&&(y.emit("onTransitionEnd",y),y.activeIndex!==y.previousIndex&&(y.emit("onSlideChangeEnd",y),y.activeIndex>y.previousIndex?y.emit("onSlideNextEnd",y):y.emit("onSlidePrevEnd",y))),y.params.hashnav&&y.hashnav&&y.hashnav.setHash()},y.slideNext=function(e,a,t){if(y.params.loop){if(y.animating)return!1;y.fixLoop();y.container[0].clientLeft;return y.slideTo(y.activeIndex+y.params.slidesPerGroup,a,e,t)}return y.slideTo(y.activeIndex+y.params.slidesPerGroup,a,e,t)},y._slideNext=function(e){return y.slideNext(!0,e,!0)},y.slidePrev=function(e,a,t){if(y.params.loop){if(y.animating)return!1;y.fixLoop();y.container[0].clientLeft;return y.slideTo(y.activeIndex-1,a,e,t)}return y.slideTo(y.activeIndex-1,a,e,t)},y._slidePrev=function(e){return y.slidePrev(!0,e,!0)},y.slideReset=function(e,a,t){return y.slideTo(y.activeIndex,a,e)},y.setWrapperTransition=function(e,a){y.wrapper.transition(e),"slide"!==y.params.effect&&y.effects[y.params.effect]&&y.effects[y.params.effect].setTransition(e),y.params.parallax&&y.parallax&&y.parallax.setTransition(e),y.params.scrollbar&&y.scrollbar&&y.scrollbar.setTransition(e),y.params.control&&y.controller&&y.controller.setTransition(e,a),y.emit("onSetTransition",y,e)},y.setWrapperTranslate=function(e,a,t){var i=0,r=0,n=0;y.isHorizontal()?i=y.rtl?-e:e:r=e,y.params.roundLengths&&(i=s(i),r=s(r)),y.params.virtualTranslate||(y.support.transforms3d?y.wrapper.transform("translate3d("+i+"px, "+r+"px, "+n+"px)"):y.wrapper.transform("translate("+i+"px, "+r+"px)")),y.translate=y.isHorizontal()?i:r;var o,l=y.maxTranslate()-y.minTranslate();o=0===l?0:(e-y.minTranslate())/l,o!==y.progress&&y.updateProgress(e),a&&y.updateActiveIndex(),"slide"!==y.params.effect&&y.effects[y.params.effect]&&y.effects[y.params.effect].setTranslate(y.translate),y.params.parallax&&y.parallax&&y.parallax.setTranslate(y.translate),y.params.scrollbar&&y.scrollbar&&y.scrollbar.setTranslate(y.translate),y.params.control&&y.controller&&y.controller.setTranslate(y.translate,t),y.emit("onSetTranslate",y,y.translate)},y.getTranslate=function(e,a){var t,i,s,r;return"undefined"==typeof a&&(a="x"),y.params.virtualTranslate?y.rtl?-y.translate:y.translate:(s=window.getComputedStyle(e,null),window.WebKitCSSMatrix?(i=s.transform||s.webkitTransform,i.split(",").length>6&&(i=i.split(", ").map(function(e){return e.replace(",",".")}).join(", ")),r=new window.WebKitCSSMatrix("none"===i?"":i)):(r=s.MozTransform||s.OTransform||s.MsTransform||s.msTransform||s.transform||s.getPropertyValue("transform").replace("translate(","matrix(1, 0, 0, 1,"),t=r.toString().split(",")),"x"===a&&(i=window.WebKitCSSMatrix?r.m41:16===t.length?parseFloat(t[12]):parseFloat(t[4])),"y"===a&&(i=window.WebKitCSSMatrix?r.m42:16===t.length?parseFloat(t[13]):parseFloat(t[5])),y.rtl&&i&&(i=-i),i||0)},y.getWrapperTranslate=function(e){return"undefined"==typeof e&&(e=y.isHorizontal()?"x":"y"),y.getTranslate(y.wrapper[0],e)},y.observers=[],y.initObservers=function(){if(y.params.observeParents)for(var e=y.container.parents(),a=0;a<e.length;a++)o(e[a]);o(y.container[0],{childList:!1}),o(y.wrapper[0],{attributes:!1})},y.disconnectObservers=function(){for(var e=0;e<y.observers.length;e++)y.observers[e].disconnect();y.observers=[]},y.createLoop=function(){y.wrapper.children("."+y.params.slideClass+"."+y.params.slideDuplicateClass).remove();var e=y.wrapper.children("."+y.params.slideClass);"auto"!==y.params.slidesPerView||y.params.loopedSlides||(y.params.loopedSlides=e.length),y.loopedSlides=parseInt(y.params.loopedSlides||y.params.slidesPerView,10),y.loopedSlides=y.loopedSlides+y.params.loopAdditionalSlides,y.loopedSlides>e.length&&(y.loopedSlides=e.length);var t,i=[],s=[];for(e.each(function(t,r){var n=a(this);t<y.loopedSlides&&s.push(r),t<e.length&&t>=e.length-y.loopedSlides&&i.push(r),n.attr("data-swiper-slide-index",t)}),t=0;t<s.length;t++)y.wrapper.append(a(s[t].cloneNode(!0)).addClass(y.params.slideDuplicateClass));for(t=i.length-1;t>=0;t--)y.wrapper.prepend(a(i[t].cloneNode(!0)).addClass(y.params.slideDuplicateClass))},y.destroyLoop=function(){y.wrapper.children("."+y.params.slideClass+"."+y.params.slideDuplicateClass).remove(),y.slides.removeAttr("data-swiper-slide-index")},y.reLoop=function(e){var a=y.activeIndex-y.loopedSlides;y.destroyLoop(),y.createLoop(),y.updateSlidesSize(),e&&y.slideTo(a+y.loopedSlides,0,!1)},y.fixLoop=function(){var e;y.activeIndex<y.loopedSlides?(e=y.slides.length-3*y.loopedSlides+y.activeIndex,e+=y.loopedSlides,y.slideTo(e,0,!1,!0)):("auto"===y.params.slidesPerView&&y.activeIndex>=2*y.loopedSlides||y.activeIndex>y.slides.length-2*y.params.slidesPerView)&&(e=-y.slides.length+y.activeIndex+y.loopedSlides,e+=y.loopedSlides,y.slideTo(e,0,!1,!0))},y.appendSlide=function(e){if(y.params.loop&&y.destroyLoop(),"object"==typeof e&&e.length)for(var a=0;a<e.length;a++)e[a]&&y.wrapper.append(e[a]);else y.wrapper.append(e);y.params.loop&&y.createLoop(),y.params.observer&&y.support.observer||y.update(!0)},y.prependSlide=function(e){y.params.loop&&y.destroyLoop();var a=y.activeIndex+1;if("object"==typeof e&&e.length){for(var t=0;t<e.length;t++)e[t]&&y.wrapper.prepend(e[t]);a=y.activeIndex+e.length}else y.wrapper.prepend(e);y.params.loop&&y.createLoop(),y.params.observer&&y.support.observer||y.update(!0),y.slideTo(a,0,!1)},y.removeSlide=function(e){y.params.loop&&(y.destroyLoop(),y.slides=y.wrapper.children("."+y.params.slideClass));var a,t=y.activeIndex;if("object"==typeof e&&e.length){for(var i=0;i<e.length;i++)a=e[i],y.slides[a]&&y.slides.eq(a).remove(),t>a&&t--;t=Math.max(t,0)}else a=e,y.slides[a]&&y.slides.eq(a).remove(),t>a&&t--,t=Math.max(t,0);y.params.loop&&y.createLoop(),y.params.observer&&y.support.observer||y.update(!0),y.params.loop?y.slideTo(t+y.loopedSlides,0,!1):y.slideTo(t,0,!1)},y.removeAllSlides=function(){for(var e=[],a=0;a<y.slides.length;a++)e.push(a);y.removeSlide(e)},y.effects={fade:{setTranslate:function(){for(var e=0;e<y.slides.length;e++){var a=y.slides.eq(e),t=a[0].swiperSlideOffset,i=-t;y.params.virtualTranslate||(i-=y.translate);var s=0;y.isHorizontal()||(s=i,i=0);var r=y.params.fade.crossFade?Math.max(1-Math.abs(a[0].progress),0):1+Math.min(Math.max(a[0].progress,-1),0);a.css({opacity:r}).transform("translate3d("+i+"px, "+s+"px, 0px)")}},setTransition:function(e){if(y.slides.transition(e),y.params.virtualTranslate&&0!==e){var a=!1;y.slides.transitionEnd(function(){if(!a&&y){a=!0,y.animating=!1;for(var e=["webkitTransitionEnd","transitionend","oTransitionEnd","MSTransitionEnd","msTransitionEnd"],t=0;t<e.length;t++)y.wrapper.trigger(e[t])}})}}},flip:{setTranslate:function(){for(var e=0;e<y.slides.length;e++){var t=y.slides.eq(e),i=t[0].progress;y.params.flip.limitRotation&&(i=Math.max(Math.min(t[0].progress,1),-1));var s=t[0].swiperSlideOffset,r=-180*i,n=r,o=0,l=-s,p=0;if(y.isHorizontal()?y.rtl&&(n=-n):(p=l,l=0,o=-n,n=0),t[0].style.zIndex=-Math.abs(Math.round(i))+y.slides.length,y.params.flip.slideShadows){var d=y.isHorizontal()?t.find(".swiper-slide-shadow-left"):t.find(".swiper-slide-shadow-top"),c=y.isHorizontal()?t.find(".swiper-slide-shadow-right"):t.find(".swiper-slide-shadow-bottom");0===d.length&&(d=a('<div class="swiper-slide-shadow-'+(y.isHorizontal()?"left":"top")+'"></div>'),t.append(d)),0===c.length&&(c=a('<div class="swiper-slide-shadow-'+(y.isHorizontal()?"right":"bottom")+'"></div>'),t.append(c)),d.length&&(d[0].style.opacity=Math.max(-i,0)),c.length&&(c[0].style.opacity=Math.max(i,0))}t.transform("translate3d("+l+"px, "+p+"px, 0px) rotateX("+o+"deg) rotateY("+n+"deg)")}},setTransition:function(e){if(y.slides.transition(e).find(".swiper-slide-shadow-top, .swiper-slide-shadow-right, .swiper-slide-shadow-bottom, .swiper-slide-shadow-left").transition(e),y.params.virtualTranslate&&0!==e){var t=!1;y.slides.eq(y.activeIndex).transitionEnd(function(){if(!t&&y&&a(this).hasClass(y.params.slideActiveClass)){t=!0,y.animating=!1;for(var e=["webkitTransitionEnd","transitionend","oTransitionEnd","MSTransitionEnd","msTransitionEnd"],i=0;i<e.length;i++)y.wrapper.trigger(e[i])}})}}},cube:{setTranslate:function(){var e,t=0;y.params.cube.shadow&&(y.isHorizontal()?(e=y.wrapper.find(".swiper-cube-shadow"),0===e.length&&(e=a('<div class="swiper-cube-shadow"></div>'),y.wrapper.append(e)),e.css({height:y.width+"px"})):(e=y.container.find(".swiper-cube-shadow"),0===e.length&&(e=a('<div class="swiper-cube-shadow"></div>'),y.container.append(e))));for(var i=0;i<y.slides.length;i++){var s=y.slides.eq(i),r=90*i,n=Math.floor(r/360);y.rtl&&(r=-r,n=Math.floor(-r/360));var o=Math.max(Math.min(s[0].progress,1),-1),l=0,p=0,d=0;i%4===0?(l=4*-n*y.size,d=0):(i-1)%4===0?(l=0,d=4*-n*y.size):(i-2)%4===0?(l=y.size+4*n*y.size,d=y.size):(i-3)%4===0&&(l=-y.size,d=3*y.size+4*y.size*n),y.rtl&&(l=-l),y.isHorizontal()||(p=l,l=0);var c="rotateX("+(y.isHorizontal()?0:-r)+"deg) rotateY("+(y.isHorizontal()?r:0)+"deg) translate3d("+l+"px, "+p+"px, "+d+"px)";if(1>=o&&o>-1&&(t=90*i+90*o,y.rtl&&(t=90*-i-90*o)),s.transform(c),y.params.cube.slideShadows){var u=y.isHorizontal()?s.find(".swiper-slide-shadow-left"):s.find(".swiper-slide-shadow-top"),m=y.isHorizontal()?s.find(".swiper-slide-shadow-right"):s.find(".swiper-slide-shadow-bottom");0===u.length&&(u=a('<div class="swiper-slide-shadow-'+(y.isHorizontal()?"left":"top")+'"></div>'),s.append(u)),0===m.length&&(m=a('<div class="swiper-slide-shadow-'+(y.isHorizontal()?"right":"bottom")+'"></div>'),s.append(m)),u.length&&(u[0].style.opacity=Math.max(-o,0)),m.length&&(m[0].style.opacity=Math.max(o,0))}}if(y.wrapper.css({"-webkit-transform-origin":"50% 50% -"+y.size/2+"px","-moz-transform-origin":"50% 50% -"+y.size/2+"px","-ms-transform-origin":"50% 50% -"+y.size/2+"px","transform-origin":"50% 50% -"+y.size/2+"px"}),y.params.cube.shadow)if(y.isHorizontal())e.transform("translate3d(0px, "+(y.width/2+y.params.cube.shadowOffset)+"px, "+-y.width/2+"px) rotateX(90deg) rotateZ(0deg) scale("+y.params.cube.shadowScale+")");else{var h=Math.abs(t)-90*Math.floor(Math.abs(t)/90),f=1.5-(Math.sin(2*h*Math.PI/360)/2+Math.cos(2*h*Math.PI/360)/2),g=y.params.cube.shadowScale,v=y.params.cube.shadowScale/f,w=y.params.cube.shadowOffset;e.transform("scale3d("+g+", 1, "+v+") translate3d(0px, "+(y.height/2+w)+"px, "+-y.height/2/v+"px) rotateX(-90deg)")}var x=y.isSafari||y.isUiWebView?-y.size/2:0;y.wrapper.transform("translate3d(0px,0,"+x+"px) rotateX("+(y.isHorizontal()?0:t)+"deg) rotateY("+(y.isHorizontal()?-t:0)+"deg)")},setTransition:function(e){y.slides.transition(e).find(".swiper-slide-shadow-top, .swiper-slide-shadow-right, .swiper-slide-shadow-bottom, .swiper-slide-shadow-left").transition(e),y.params.cube.shadow&&!y.isHorizontal()&&y.container.find(".swiper-cube-shadow").transition(e)}},coverflow:{setTranslate:function(){for(var e=y.translate,t=y.isHorizontal()?-e+y.width/2:-e+y.height/2,i=y.isHorizontal()?y.params.coverflow.rotate:-y.params.coverflow.rotate,s=y.params.coverflow.depth,r=0,n=y.slides.length;n>r;r++){var o=y.slides.eq(r),l=y.slidesSizesGrid[r],p=o[0].swiperSlideOffset,d=(t-p-l/2)/l*y.params.coverflow.modifier,c=y.isHorizontal()?i*d:0,u=y.isHorizontal()?0:i*d,m=-s*Math.abs(d),h=y.isHorizontal()?0:y.params.coverflow.stretch*d,f=y.isHorizontal()?y.params.coverflow.stretch*d:0;Math.abs(f)<.001&&(f=0),Math.abs(h)<.001&&(h=0),Math.abs(m)<.001&&(m=0),Math.abs(c)<.001&&(c=0),Math.abs(u)<.001&&(u=0);var g="translate3d("+f+"px,"+h+"px,"+m+"px)  rotateX("+u+"deg) rotateY("+c+"deg)";if(o.transform(g),o[0].style.zIndex=-Math.abs(Math.round(d))+1,y.params.coverflow.slideShadows){var v=y.isHorizontal()?o.find(".swiper-slide-shadow-left"):o.find(".swiper-slide-shadow-top"),w=y.isHorizontal()?o.find(".swiper-slide-shadow-right"):o.find(".swiper-slide-shadow-bottom");0===v.length&&(v=a('<div class="swiper-slide-shadow-'+(y.isHorizontal()?"left":"top")+'"></div>'),o.append(v)),0===w.length&&(w=a('<div class="swiper-slide-shadow-'+(y.isHorizontal()?"right":"bottom")+'"></div>'),o.append(w)),v.length&&(v[0].style.opacity=d>0?d:0),w.length&&(w[0].style.opacity=-d>0?-d:0)}}if(y.browser.ie){var x=y.wrapper[0].style;x.perspectiveOrigin=t+"px 50%"}},setTransition:function(e){y.slides.transition(e).find(".swiper-slide-shadow-top, .swiper-slide-shadow-right, .swiper-slide-shadow-bottom, .swiper-slide-shadow-left").transition(e)}}},y.lazy={initialImageLoaded:!1,loadImageInSlide:function(e,t){if("undefined"!=typeof e&&("undefined"==typeof t&&(t=!0),0!==y.slides.length)){var i=y.slides.eq(e),s=i.find(".swiper-lazy:not(.swiper-lazy-loaded):not(.swiper-lazy-loading)");!i.hasClass("swiper-lazy")||i.hasClass("swiper-lazy-loaded")||i.hasClass("swiper-lazy-loading")||(s=s.add(i[0])),0!==s.length&&s.each(function(){var e=a(this);e.addClass("swiper-lazy-loading");var s=e.attr("data-background"),r=e.attr("data-src"),n=e.attr("data-srcset");y.loadImage(e[0],r||s,n,!1,function(){if(s?(e.css("background-image",'url("'+s+'")'),e.removeAttr("data-background")):(n&&(e.attr("srcset",n),e.removeAttr("data-srcset")),r&&(e.attr("src",r),e.removeAttr("data-src"))),e.addClass("swiper-lazy-loaded").removeClass("swiper-lazy-loading"),i.find(".swiper-lazy-preloader, .preloader").remove(),y.params.loop&&t){var a=i.attr("data-swiper-slide-index");if(i.hasClass(y.params.slideDuplicateClass)){var o=y.wrapper.children('[data-swiper-slide-index="'+a+'"]:not(.'+y.params.slideDuplicateClass+")");y.lazy.loadImageInSlide(o.index(),!1)}else{var l=y.wrapper.children("."+y.params.slideDuplicateClass+'[data-swiper-slide-index="'+a+'"]');y.lazy.loadImageInSlide(l.index(),!1)}}y.emit("onLazyImageReady",y,i[0],e[0])}),y.emit("onLazyImageLoad",y,i[0],e[0])})}},load:function(){var e;if(y.params.watchSlidesVisibility)y.wrapper.children("."+y.params.slideVisibleClass).each(function(){y.lazy.loadImageInSlide(a(this).index())});else if(y.params.slidesPerView>1)for(e=y.activeIndex;e<y.activeIndex+y.params.slidesPerView;e++)y.slides[e]&&y.lazy.loadImageInSlide(e);else y.lazy.loadImageInSlide(y.activeIndex);if(y.params.lazyLoadingInPrevNext)if(y.params.slidesPerView>1||y.params.lazyLoadingInPrevNextAmount&&y.params.lazyLoadingInPrevNextAmount>1){var t=y.params.lazyLoadingInPrevNextAmount,i=y.params.slidesPerView,s=Math.min(y.activeIndex+i+Math.max(t,i),y.slides.length),r=Math.max(y.activeIndex-Math.max(i,t),0);for(e=y.activeIndex+y.params.slidesPerView;s>e;e++)y.slides[e]&&y.lazy.loadImageInSlide(e);for(e=r;e<y.activeIndex;e++)y.slides[e]&&y.lazy.loadImageInSlide(e)}else{var n=y.wrapper.children("."+y.params.slideNextClass);n.length>0&&y.lazy.loadImageInSlide(n.index());var o=y.wrapper.children("."+y.params.slidePrevClass);o.length>0&&y.lazy.loadImageInSlide(o.index())}},onTransitionStart:function(){y.params.lazyLoading&&(y.params.lazyLoadingOnTransitionStart||!y.params.lazyLoadingOnTransitionStart&&!y.lazy.initialImageLoaded)&&y.lazy.load()},onTransitionEnd:function(){y.params.lazyLoading&&!y.params.lazyLoadingOnTransitionStart&&y.lazy.load()}},y.scrollbar={isTouched:!1,setDragPosition:function(e){var a=y.scrollbar,t=y.isHorizontal()?"touchstart"===e.type||"touchmove"===e.type?e.targetTouches[0].pageX:e.pageX||e.clientX:"touchstart"===e.type||"touchmove"===e.type?e.targetTouches[0].pageY:e.pageY||e.clientY,i=t-a.track.offset()[y.isHorizontal()?"left":"top"]-a.dragSize/2,s=-y.minTranslate()*a.moveDivider,r=-y.maxTranslate()*a.moveDivider;s>i?i=s:i>r&&(i=r),i=-i/a.moveDivider,y.updateProgress(i),y.setWrapperTranslate(i,!0)},dragStart:function(e){var a=y.scrollbar;a.isTouched=!0,e.preventDefault(),e.stopPropagation(),a.setDragPosition(e),clearTimeout(a.dragTimeout),a.track.transition(0),y.params.scrollbarHide&&a.track.css("opacity",1),y.wrapper.transition(100),a.drag.transition(100),y.emit("onScrollbarDragStart",y)},dragMove:function(e){var a=y.scrollbar;a.isTouched&&(e.preventDefault?e.preventDefault():e.returnValue=!1,a.setDragPosition(e),y.wrapper.transition(0),a.track.transition(0),a.drag.transition(0),y.emit("onScrollbarDragMove",y))},dragEnd:function(e){var a=y.scrollbar;a.isTouched&&(a.isTouched=!1,y.params.scrollbarHide&&(clearTimeout(a.dragTimeout),a.dragTimeout=setTimeout(function(){a.track.css("opacity",0),a.track.transition(400)},1e3)),y.emit("onScrollbarDragEnd",y),y.params.scrollbarSnapOnRelease&&y.slideReset())},enableDraggable:function(){var e=y.scrollbar,t=y.support.touch?e.track:document;a(e.track).on(y.touchEvents.start,e.dragStart),a(t).on(y.touchEvents.move,e.dragMove),a(t).on(y.touchEvents.end,e.dragEnd)},disableDraggable:function(){var e=y.scrollbar,t=y.support.touch?e.track:document;a(e.track).off(y.touchEvents.start,e.dragStart),a(t).off(y.touchEvents.move,e.dragMove),a(t).off(y.touchEvents.end,e.dragEnd)},set:function(){if(y.params.scrollbar){var e=y.scrollbar;e.track=a(y.params.scrollbar),y.params.uniqueNavElements&&"string"==typeof y.params.scrollbar&&e.track.length>1&&1===y.container.find(y.params.scrollbar).length&&(e.track=y.container.find(y.params.scrollbar)),e.drag=e.track.find(".swiper-scrollbar-drag"),0===e.drag.length&&(e.drag=a('<div class="swiper-scrollbar-drag"></div>'),e.track.append(e.drag)),e.drag[0].style.width="",e.drag[0].style.height="",e.trackSize=y.isHorizontal()?e.track[0].offsetWidth:e.track[0].offsetHeight,e.divider=y.size/y.virtualSize,e.moveDivider=e.divider*(e.trackSize/y.size),e.dragSize=e.trackSize*e.divider,y.isHorizontal()?e.drag[0].style.width=e.dragSize+"px":e.drag[0].style.height=e.dragSize+"px",e.divider>=1?e.track[0].style.display="none":e.track[0].style.display="",y.params.scrollbarHide&&(e.track[0].style.opacity=0)}},setTranslate:function(){if(y.params.scrollbar){var e,a=y.scrollbar,t=(y.translate||0,a.dragSize);e=(a.trackSize-a.dragSize)*y.progress,y.rtl&&y.isHorizontal()?(e=-e,e>0?(t=a.dragSize-e,e=0):-e+a.dragSize>a.trackSize&&(t=a.trackSize+e)):0>e?(t=a.dragSize+e,e=0):e+a.dragSize>a.trackSize&&(t=a.trackSize-e),y.isHorizontal()?(y.support.transforms3d?a.drag.transform("translate3d("+e+"px, 0, 0)"):a.drag.transform("translateX("+e+"px)"),a.drag[0].style.width=t+"px"):(y.support.transforms3d?a.drag.transform("translate3d(0px, "+e+"px, 0)"):a.drag.transform("translateY("+e+"px)"),a.drag[0].style.height=t+"px"),y.params.scrollbarHide&&(clearTimeout(a.timeout),a.track[0].style.opacity=1,a.timeout=setTimeout(function(){a.track[0].style.opacity=0,a.track.transition(400)},1e3))}},setTransition:function(e){y.params.scrollbar&&y.scrollbar.drag.transition(e)}},y.controller={LinearSpline:function(e,a){this.x=e,this.y=a,this.lastIndex=e.length-1;var t,i;this.x.length;this.interpolate=function(e){return e?(i=s(this.x,e),t=i-1,(e-this.x[t])*(this.y[i]-this.y[t])/(this.x[i]-this.x[t])+this.y[t]):0};var s=function(){var e,a,t;return function(i,s){for(a=-1,e=i.length;e-a>1;)i[t=e+a>>1]<=s?a=t:e=t;return e}}()},getInterpolateFunction:function(e){y.controller.spline||(y.controller.spline=y.params.loop?new y.controller.LinearSpline(y.slidesGrid,e.slidesGrid):new y.controller.LinearSpline(y.snapGrid,e.snapGrid))},setTranslate:function(e,a){function i(a){e=a.rtl&&"horizontal"===a.params.direction?-y.translate:y.translate,"slide"===y.params.controlBy&&(y.controller.getInterpolateFunction(a),r=-y.controller.spline.interpolate(-e)),r&&"container"!==y.params.controlBy||(s=(a.maxTranslate()-a.minTranslate())/(y.maxTranslate()-y.minTranslate()),r=(e-y.minTranslate())*s+a.minTranslate()),y.params.controlInverse&&(r=a.maxTranslate()-r),a.updateProgress(r),a.setWrapperTranslate(r,!1,y),a.updateActiveIndex()}var s,r,n=y.params.control;if(y.isArray(n))for(var o=0;o<n.length;o++)n[o]!==a&&n[o]instanceof t&&i(n[o]);else n instanceof t&&a!==n&&i(n)},setTransition:function(e,a){function i(a){a.setWrapperTransition(e,y),0!==e&&(a.onTransitionStart(),a.wrapper.transitionEnd(function(){r&&(a.params.loop&&"slide"===y.params.controlBy&&a.fixLoop(),a.onTransitionEnd())}))}var s,r=y.params.control;if(y.isArray(r))for(s=0;s<r.length;s++)r[s]!==a&&r[s]instanceof t&&i(r[s]);else r instanceof t&&a!==r&&i(r)}},y.hashnav={init:function(){if(y.params.hashnav){y.hashnav.initialized=!0;var e=document.location.hash.replace("#","");if(e)for(var a=0,t=0,i=y.slides.length;i>t;t++){var s=y.slides.eq(t),r=s.attr("data-hash");if(r===e&&!s.hasClass(y.params.slideDuplicateClass)){var n=s.index();y.slideTo(n,a,y.params.runCallbacksOnInit,!0)}}}},setHash:function(){y.hashnav.initialized&&y.params.hashnav&&(document.location.hash=y.slides.eq(y.activeIndex).attr("data-hash")||"")}},y.disableKeyboardControl=function(){y.params.keyboardControl=!1,a(document).off("keydown",l)},y.enableKeyboardControl=function(){y.params.keyboardControl=!0,a(document).on("keydown",l)},y.mousewheel={event:!1,lastScrollTime:(new window.Date).getTime()},y.params.mousewheelControl){try{new window.WheelEvent("wheel"),y.mousewheel.event="wheel"}catch(O){(window.WheelEvent||y.container[0]&&"wheel"in y.container[0])&&(y.mousewheel.event="wheel")}!y.mousewheel.event&&window.WheelEvent,y.mousewheel.event||void 0===document.onmousewheel||(y.mousewheel.event="mousewheel"),y.mousewheel.event||(y.mousewheel.event="DOMMouseScroll")}y.disableMousewheelControl=function(){return y.mousewheel.event?(y.container.off(y.mousewheel.event,p),!0):!1},y.enableMousewheelControl=function(){return y.mousewheel.event?(y.container.on(y.mousewheel.event,p),!0):!1},y.parallax={setTranslate:function(){y.container.children("[data-swiper-parallax], [data-swiper-parallax-x], [data-swiper-parallax-y]").each(function(){d(this,y.progress)}),y.slides.each(function(){var e=a(this);e.find("[data-swiper-parallax], [data-swiper-parallax-x], [data-swiper-parallax-y]").each(function(){var a=Math.min(Math.max(e[0].progress,-1),1);d(this,a)})})},setTransition:function(e){"undefined"==typeof e&&(e=y.params.speed),y.container.find("[data-swiper-parallax], [data-swiper-parallax-x], [data-swiper-parallax-y]").each(function(){var t=a(this),i=parseInt(t.attr("data-swiper-parallax-duration"),10)||e;0===e&&(i=0),t.transition(i)})}},y._plugins=[];for(var N in y.plugins){var R=y.plugins[N](y,y.params[N]);R&&y._plugins.push(R)}return y.callPlugins=function(e){for(var a=0;a<y._plugins.length;a++)e in y._plugins[a]&&y._plugins[a][e](arguments[1],arguments[2],arguments[3],arguments[4],arguments[5])},y.emitterEventListeners={},y.emit=function(e){y.params[e]&&y.params[e](arguments[1],arguments[2],arguments[3],arguments[4],arguments[5]);var a;if(y.emitterEventListeners[e])for(a=0;a<y.emitterEventListeners[e].length;a++)y.emitterEventListeners[e][a](arguments[1],arguments[2],arguments[3],arguments[4],arguments[5]);y.callPlugins&&y.callPlugins(e,arguments[1],arguments[2],arguments[3],arguments[4],arguments[5])},y.on=function(e,a){return e=c(e),y.emitterEventListeners[e]||(y.emitterEventListeners[e]=[]),y.emitterEventListeners[e].push(a),y},y.off=function(e,a){var t;if(e=c(e),"undefined"==typeof a)return y.emitterEventListeners[e]=[],y;if(y.emitterEventListeners[e]&&0!==y.emitterEventListeners[e].length){for(t=0;t<y.emitterEventListeners[e].length;t++)y.emitterEventListeners[e][t]===a&&y.emitterEventListeners[e].splice(t,1);return y}},y.once=function(e,a){e=c(e);var t=function(){a(arguments[0],arguments[1],arguments[2],arguments[3],arguments[4]),y.off(e,t)};return y.on(e,t),y},y.a11y={makeFocusable:function(e){return e.attr("tabIndex","0"),e},addRole:function(e,a){return e.attr("role",a),e},addLabel:function(e,a){return e.attr("aria-label",a),e},disable:function(e){return e.attr("aria-disabled",!0),e},enable:function(e){return e.attr("aria-disabled",!1),e},onEnterKey:function(e){13===e.keyCode&&(a(e.target).is(y.params.nextButton)?(y.onClickNext(e),y.isEnd?y.a11y.notify(y.params.lastSlideMessage):y.a11y.notify(y.params.nextSlideMessage)):a(e.target).is(y.params.prevButton)&&(y.onClickPrev(e),y.isBeginning?y.a11y.notify(y.params.firstSlideMessage):y.a11y.notify(y.params.prevSlideMessage)),a(e.target).is("."+y.params.bulletClass)&&a(e.target)[0].click())},liveRegion:a('<span class="swiper-notification" aria-live="assertive" aria-atomic="true"></span>'),notify:function(e){var a=y.a11y.liveRegion;0!==a.length&&(a.html(""),a.html(e))},init:function(){y.params.nextButton&&y.nextButton&&y.nextButton.length>0&&(y.a11y.makeFocusable(y.nextButton),y.a11y.addRole(y.nextButton,"button"),y.a11y.addLabel(y.nextButton,y.params.nextSlideMessage)),y.params.prevButton&&y.prevButton&&y.prevButton.length>0&&(y.a11y.makeFocusable(y.prevButton),y.a11y.addRole(y.prevButton,"button"),y.a11y.addLabel(y.prevButton,y.params.prevSlideMessage)),a(y.container).append(y.a11y.liveRegion)},initPagination:function(){y.params.pagination&&y.params.paginationClickable&&y.bullets&&y.bullets.length&&y.bullets.each(function(){var e=a(this);y.a11y.makeFocusable(e),y.a11y.addRole(e,"button"),y.a11y.addLabel(e,y.params.paginationBulletMessage.replace(/{{index}}/,e.index()+1))})},destroy:function(){y.a11y.liveRegion&&y.a11y.liveRegion.length>0&&y.a11y.liveRegion.remove()}},y.init=function(){y.params.loop&&y.createLoop(),y.updateContainerSize(),y.updateSlidesSize(),y.updatePagination(),y.params.scrollbar&&y.scrollbar&&(y.scrollbar.set(),y.params.scrollbarDraggable&&y.scrollbar.enableDraggable()),"slide"!==y.params.effect&&y.effects[y.params.effect]&&(y.params.loop||y.updateProgress(),y.effects[y.params.effect].setTranslate()),y.params.loop?y.slideTo(y.params.initialSlide+y.loopedSlides,0,y.params.runCallbacksOnInit):(y.slideTo(y.params.initialSlide,0,y.params.runCallbacksOnInit),0===y.params.initialSlide&&(y.parallax&&y.params.parallax&&y.parallax.setTranslate(),y.lazy&&y.params.lazyLoading&&(y.lazy.load(),y.lazy.initialImageLoaded=!0))),y.attachEvents(),y.params.observer&&y.support.observer&&y.initObservers(),y.params.preloadImages&&!y.params.lazyLoading&&y.preloadImages(),y.params.autoplay&&y.startAutoplay(),y.params.keyboardControl&&y.enableKeyboardControl&&y.enableKeyboardControl(),y.params.mousewheelControl&&y.enableMousewheelControl&&y.enableMousewheelControl(),
-y.params.hashnav&&y.hashnav&&y.hashnav.init(),y.params.a11y&&y.a11y&&y.a11y.init(),y.emit("onInit",y)},y.cleanupStyles=function(){y.container.removeClass(y.classNames.join(" ")).removeAttr("style"),y.wrapper.removeAttr("style"),y.slides&&y.slides.length&&y.slides.removeClass([y.params.slideVisibleClass,y.params.slideActiveClass,y.params.slideNextClass,y.params.slidePrevClass].join(" ")).removeAttr("style").removeAttr("data-swiper-column").removeAttr("data-swiper-row"),y.paginationContainer&&y.paginationContainer.length&&y.paginationContainer.removeClass(y.params.paginationHiddenClass),y.bullets&&y.bullets.length&&y.bullets.removeClass(y.params.bulletActiveClass),y.params.prevButton&&a(y.params.prevButton).removeClass(y.params.buttonDisabledClass),y.params.nextButton&&a(y.params.nextButton).removeClass(y.params.buttonDisabledClass),y.params.scrollbar&&y.scrollbar&&(y.scrollbar.track&&y.scrollbar.track.length&&y.scrollbar.track.removeAttr("style"),y.scrollbar.drag&&y.scrollbar.drag.length&&y.scrollbar.drag.removeAttr("style"))},y.destroy=function(e,a){y.detachEvents(),y.stopAutoplay(),y.params.scrollbar&&y.scrollbar&&y.params.scrollbarDraggable&&y.scrollbar.disableDraggable(),y.params.loop&&y.destroyLoop(),a&&y.cleanupStyles(),y.disconnectObservers(),y.params.keyboardControl&&y.disableKeyboardControl&&y.disableKeyboardControl(),y.params.mousewheelControl&&y.disableMousewheelControl&&y.disableMousewheelControl(),y.params.a11y&&y.a11y&&y.a11y.destroy(),y.emit("onDestroy"),e!==!1&&(y=null)},y.init(),y}};t.prototype={isSafari:function(){var e=navigator.userAgent.toLowerCase();return e.indexOf("safari")>=0&&e.indexOf("chrome")<0&&e.indexOf("android")<0}(),isUiWebView:/(iPhone|iPod|iPad).*AppleWebKit(?!.*Safari)/i.test(navigator.userAgent),isArray:function(e){return"[object Array]"===Object.prototype.toString.apply(e)},browser:{ie:window.navigator.pointerEnabled||window.navigator.msPointerEnabled,ieTouch:window.navigator.msPointerEnabled&&window.navigator.msMaxTouchPoints>1||window.navigator.pointerEnabled&&window.navigator.maxTouchPoints>1},device:function(){var e=navigator.userAgent,a=e.match(/(Android);?[\s\/]+([\d.]+)?/),t=e.match(/(iPad).*OS\s([\d_]+)/),i=e.match(/(iPod)(.*OS\s([\d_]+))?/),s=!t&&e.match(/(iPhone\sOS)\s([\d_]+)/);return{ios:t||s||i,android:a}}(),support:{touch:window.Modernizr&&Modernizr.touch===!0||function(){return!!("ontouchstart"in window||window.DocumentTouch&&document instanceof DocumentTouch)}(),transforms3d:window.Modernizr&&Modernizr.csstransforms3d===!0||function(){var e=document.createElement("div").style;return"webkitPerspective"in e||"MozPerspective"in e||"OPerspective"in e||"MsPerspective"in e||"perspective"in e}(),flexbox:function(){for(var e=document.createElement("div").style,a="alignItems webkitAlignItems webkitBoxAlign msFlexAlign mozBoxAlign webkitFlexDirection msFlexDirection mozBoxDirection mozBoxOrient webkitBoxDirection webkitBoxOrient".split(" "),t=0;t<a.length;t++)if(a[t]in e)return!0}(),observer:function(){return"MutationObserver"in window||"WebkitMutationObserver"in window}()},plugins:{}};for(var i=["jQuery","Zepto","Dom7"],s=0;s<i.length;s++)window[i[s]]&&e(window[i[s]]);var r;r="undefined"==typeof Dom7?window.Dom7||window.Zepto||window.jQuery:Dom7,r&&("transitionEnd"in r.fn||(r.fn.transitionEnd=function(e){function a(r){if(r.target===this)for(e.call(this,r),t=0;t<i.length;t++)s.off(i[t],a)}var t,i=["webkitTransitionEnd","transitionend","oTransitionEnd","MSTransitionEnd","msTransitionEnd"],s=this;if(e)for(t=0;t<i.length;t++)s.on(i[t],a);return this}),"transform"in r.fn||(r.fn.transform=function(e){for(var a=0;a<this.length;a++){var t=this[a].style;t.webkitTransform=t.MsTransform=t.msTransform=t.MozTransform=t.OTransform=t.transform=e}return this}),"transition"in r.fn||(r.fn.transition=function(e){"string"!=typeof e&&(e+="ms");for(var a=0;a<this.length;a++){var t=this[a].style;t.webkitTransitionDuration=t.MsTransitionDuration=t.msTransitionDuration=t.MozTransitionDuration=t.OTransitionDuration=t.transitionDuration=e}return this})),window.Swiper=t}(),"undefined"!=typeof module?module.exports=window.Swiper:"function"==typeof define&&define.amd&&define([],function(){"use strict";return window.Swiper}),+function(e){"use strict";var a;e.fn.swiper=function(t){return this.each(function(){if(this){var i=e(this),s=i.data("swiper");return s||i.data("swiper",new Swiper(this,e.extend({},a,t))),s}})},a=e.fn.swiper.prototype.defaults={pagination:".swiper-pagination"}}($),+function(e){var a,t=function(e){this.initConfig(e),this.index=0};t.prototype={initConfig:function(t){this.config=e.extend({},a,t),this.activeIndex=this.lastActiveIndex=this.config.initIndex,this.config.items=this.config.items.map(function(e,a){return"string"==typeof e?{image:e,caption:""}:e}),this.tpl=e.t7.compile(this.config.tpl),this.config.autoOpen&&this.open()},open:function(a){if(this._open)return!1;if(!this.modal){this.modal=e(this.tpl(this.config)).appendTo(document.body),this.container=this.modal.find(".swiper-container"),this.wrapper=this.modal.find(".swiper-wrapper");var t=new Hammer(this.container[0]);t.get("pinch").set({enable:!0}),t.on("pinchstart",e.proxy(this.onGestureStart,this)),t.on("pinchmove",e.proxy(this.onGestureChange,this)),t.on("pinchend",e.proxy(this.onGestureEnd,this)),this.modal.on(e.touchEvents.start,e.proxy(this.onTouchStart,this)),this.modal.on(e.touchEvents.move,e.proxy(this.onTouchMove,this)),this.modal.on(e.touchEvents.end,e.proxy(this.onTouchEnd,this)),this.wrapper.transition(0),this.wrapper.transform("translate3d(-"+e(window).width()*this.config.initIndex+"px,0,0)"),this.container.find(".caption-item").eq(this.config.initIndex).addClass("active"),this.container.find(".swiper-pagination-bullet").eq(this.config.initIndex).addClass("swiper-pagination-bullet-active")}var i=this;this.modal.show().height(),this.modal.addClass("weui-photo-browser-modal-visible"),this.container.addClass("swiper-container-visible").transitionEnd(function(){i.initParams(),i.config.onOpen&&i.config.onOpen.call(i)}),this._open=!0,void 0!==a&&this.slideTo(a,0)},close:function(){this.container.transitionEnd(e.proxy(function(){this.modal.hide(),this._open=!1,this.config.onClose&&this.config.onClose.call(this)},this)),this.container.removeClass("swiper-container-visible"),this.modal.removeClass("weui-photo-browser-modal-visible")},initParams:function(){return this.containerHeight?!1:(this.windowWidth=e(window).width(),this.containerHeight=this.container.height(),this.containerWidth=this.container.width(),this.touchStart={},this.wrapperTransform=0,this.wrapperLastTransform=-e(window).width()*this.config.initIndex,this.wrapperDiff=0,this.lastScale=1,this.currentScale=1,this.imageLastTransform={x:0,y:0},this.imageTransform={x:0,y:0},this.imageDiff={x:0,y:0},void(this.imageLastDiff={x:0,y:0}))},onTouchStart:function(a){return this.scaling?!1:(this.touching=!0,this.touchStart=e.getTouchPosition(a),this.touchMove=null,this.touchStartTime=+new Date,this.wrapperDiff=0,void(this.breakpointPosition=null))},onTouchMove:function(a){if(!this.touching||this.scaling)return!1;if(a.preventDefault(),this.gestureImage){var t=this.gestureImage[0].getBoundingClientRect();t.left>=0||t.right<=this.windowWidth?this.overflow=!0:this.overflow=!1}else this.oveflow=!1;var i=this.touchMove=e.getTouchPosition(a);if(1===this.currentScale||this.overflow)this.breakpointPosition?this.wrapperDiff=i.x-this.breakpointPosition.x:this.wrapperDiff=i.x-this.touchStart.x,0===this.activeIndex&&this.wrapperDiff>0&&(this.wrapperDiff=Math.pow(this.wrapperDiff,.8)),this.activeIndex===this.config.items.length-1&&this.wrapperDiff<0&&(this.wrapperDiff=-Math.pow(-this.wrapperDiff,.8)),this.wrapperTransform=this.wrapperLastTransform+this.wrapperDiff,this.doWrapperTransform();else{this.gestureImage;this.imageDiff={x:i.x-this.touchStart.x,y:i.y-this.touchStart.y},this.imageTransform={x:this.imageDiff.x+this.imageLastTransform.x,y:this.imageDiff.y+this.imageLastTransform.y},this.doImageTransform(),this.breakpointPosition=i,this.imageLastDiff=this.imageDiff}},onTouchEnd:function(e){if(!this.touching)return!1;if(this.touching=!1,this.scaling)return!1;var a=+new Date-this.touchStartTime;return 200>a&&(!this.touchMove||Math.abs(this.touchStart.x-this.touchMove.x)<=2&&Math.abs(this.touchStart.y-this.touchMove.y)<=2)?void this.onClick():(this.wrapperDiff>0?this.wrapperDiff>this.containerWidth/2||this.wrapperDiff>20&&300>a?this.slidePrev():this.slideTo(this.activeIndex,200):-this.wrapperDiff>this.containerWidth/2||-this.wrapperDiff>20&&300>a?this.slideNext():this.slideTo(this.activeIndex,200),this.imageLastTransform=this.imageTransform,void this.adjust())},onClick:function(){var e=this;this._lastClickTime&&+new Date-this._lastClickTime<300?(this.onDoubleClick(),clearTimeout(this._clickTimeout)):this._clickTimeout=setTimeout(function(){e.close()},300),this._lastClickTime=+new Date},onDoubleClick:function(){this.gestureImage=this.container.find(".swiper-slide").eq(this.activeIndex).find("img"),this.currentScale=this.currentScale>1?1:2,this.doImageTransform(200),this.adjust()},onGestureStart:function(e){this.scaling=!0,this.gestureImage=this.container.find(".swiper-slide").eq(this.activeIndex).find("img")},onGestureChange:function(e){var a=this.lastScale*e.scale;a>this.config.maxScale?a=this.config.maxScale+Math.pow(a-this.config.maxScale,.5):1>a&&(a=Math.pow(a,.5)),this.currentScale=a,this.doImageTransform()},onGestureEnd:function(e){this.currentScale>this.config.maxScale?(this.currentScale=this.config.maxScale,this.doImageTransform(200)):this.currentScale<1&&(this.currentScale=1,this.doImageTransform(200)),this.lastScale=this.currentScale,this.scaling=!1,this.adjust()},doWrapperTransform:function(e,a){if(0===e){var t=this.wrapper.css("transition-property");this.wrapper.css("transition-property","none").transform("translate3d("+this.wrapperTransform+"px, 0, 0)"),this.wrapper.css("transition-property",t),a()}else this.wrapper.transitionEnd(function(){a&&a()}),this.wrapper.transition(e||0).transform("translate3d("+this.wrapperTransform+"px, 0, 0)")},doImageTransform:function(e,a){this.gestureImage&&(this.gestureImage.transition(e||0).transform("translate3d("+this.imageTransform.x+"px,"+this.imageTransform.y+"px, 0) scale("+this.currentScale+")"),this._needAdjust=!0)},adjust:function(){if(!this._needAdjust)return!1;var e=this.gestureImage;if(!e)return!1;if(1===this.currentScale)return this.imageTransform=this.imageLastDiff={x:0,y:0},void this.doImageTransform(200);var a=e[0].getBoundingClientRect();a.height<this.containerHeight?this.imageTransform.y=this.imageLastTransform.y=0:a.top>0?this.imageTransform.y=this.imageTransform.y-a.top:a.bottom<this.containerHeight&&(this.imageTransform.y=this.imageTransform.y+this.containerHeight-a.bottom),this.doImageTransform(200),this._needAdjust=!1},slideTo:function(a,t){0>a&&(a=0),a>this.config.items.length-1&&(a=this.config.items.length-1),this.lastActiveIndex=this.activeIndex,this.activeIndex=a,this.wrapperTransform=-(a*this.containerWidth),this.wrapperLastTransform=this.wrapperTransform,this.doWrapperTransform(t,e.proxy(function(){return this.lastActiveIndex===this.activeIndex?!1:(this.container.find(".caption-item.active").removeClass("active"),this.container.find(".swiper-slide-active").removeClass("swiper-slide-active"),this.container.find(".swiper-pagination-bullet-active").removeClass("swiper-pagination-bullet-active"),this.container.find(".caption-item").eq(this.activeIndex).addClass("active"),this.container.find(".swiper-slide").eq(this.activeIndex).addClass("swiper-slide-active"),this.container.find(".swiper-pagination-bullet").eq(this.activeIndex).addClass("swiper-pagination-bullet-active"),this.container.find(".swiper-slide img[style]").transition(0).transform("translate3d(0,0,0) scale(1)"),this.lastScale=1,this.currentScale=1,this.imageLastTransform={x:0,y:0},this.imageTransform={x:0,y:0},this.imageDiff={x:0,y:0},this.imageLastDiff={x:0,y:0},void(this.config.onSlideChange&&this.config.onSlideChange.call(this,this.activeIndex)))},this))},slideNext:function(){return this.slideTo(this.activeIndex+1,200)},slidePrev:function(){return this.slideTo(this.activeIndex-1,200)}},a=t.prototype.defaults={items:[],autoOpen:!1,onOpen:void 0,onClose:void 0,initIndex:0,maxScale:3,onSlideChange:void 0,tpl:'<div class="weui-photo-browser-modal">            <div class="swiper-container">              <div class="swiper-wrapper">                {{#items}}                <div class="swiper-slide">                  <div class="photo-container">                    <img src="{{image}}" />                  </div>                </div>                {{/items}}              </div>              <div class="caption">                {{#items}}                <div class="caption-item caption-item-{{@index}}">{{caption}}</div>                {{/items}}              </div>              <div class="swiper-pagination swiper-pagination-bullets">                {{#items}}                <span class="swiper-pagination-bullet"></span>                {{/items}}              </div>            </div>          </div>'},e.photoBrowser=function(e){return new t(e)}}($);
\ No newline at end of file
diff --git a/NewLife.Cube/Content/jweui/lib/fastclick.js b/NewLife.Cube/Content/jweui/lib/fastclick.js
deleted file mode 100644
index 3af4f9d6f1..0000000000
--- a/NewLife.Cube/Content/jweui/lib/fastclick.js
+++ /dev/null
@@ -1,841 +0,0 @@
-;(function () {
-	'use strict';
-
-	/**
-	 * @preserve FastClick: polyfill to remove click delays on browsers with touch UIs.
-	 *
-	 * @codingstandard ftlabs-jsv2
-	 * @copyright The Financial Times Limited [All Rights Reserved]
-	 * @license MIT License (see LICENSE.txt)
-	 */
-
-	/*jslint browser:true, node:true*/
-	/*global define, Event, Node*/
-
-
-	/**
-	 * Instantiate fast-clicking listeners on the specified layer.
-	 *
-	 * @constructor
-	 * @param {Element} layer The layer to listen on
-	 * @param {Object} [options={}] The options to override the defaults
-	 */
-	function FastClick(layer, options) {
-		var oldOnClick;
-
-		options = options || {};
-
-		/**
-		 * Whether a click is currently being tracked.
-		 *
-		 * @type boolean
-		 */
-		this.trackingClick = false;
-
-
-		/**
-		 * Timestamp for when click tracking started.
-		 *
-		 * @type number
-		 */
-		this.trackingClickStart = 0;
-
-
-		/**
-		 * The element being tracked for a click.
-		 *
-		 * @type EventTarget
-		 */
-		this.targetElement = null;
-
-
-		/**
-		 * X-coordinate of touch start event.
-		 *
-		 * @type number
-		 */
-		this.touchStartX = 0;
-
-
-		/**
-		 * Y-coordinate of touch start event.
-		 *
-		 * @type number
-		 */
-		this.touchStartY = 0;
-
-
-		/**
-		 * ID of the last touch, retrieved from Touch.identifier.
-		 *
-		 * @type number
-		 */
-		this.lastTouchIdentifier = 0;
-
-
-		/**
-		 * Touchmove boundary, beyond which a click will be cancelled.
-		 *
-		 * @type number
-		 */
-		this.touchBoundary = options.touchBoundary || 10;
-
-
-		/**
-		 * The FastClick layer.
-		 *
-		 * @type Element
-		 */
-		this.layer = layer;
-
-		/**
-		 * The minimum time between tap(touchstart and touchend) events
-		 *
-		 * @type number
-		 */
-		this.tapDelay = options.tapDelay || 200;
-
-		/**
-		 * The maximum time for a tap
-		 *
-		 * @type number
-		 */
-		this.tapTimeout = options.tapTimeout || 700;
-
-		if (FastClick.notNeeded(layer)) {
-			return;
-		}
-
-		// Some old versions of Android don't have Function.prototype.bind
-		function bind(method, context) {
-			return function() { return method.apply(context, arguments); };
-		}
-
-
-		var methods = ['onMouse', 'onClick', 'onTouchStart', 'onTouchMove', 'onTouchEnd', 'onTouchCancel'];
-		var context = this;
-		for (var i = 0, l = methods.length; i < l; i++) {
-			context[methods[i]] = bind(context[methods[i]], context);
-		}
-
-		// Set up event handlers as required
-		if (deviceIsAndroid) {
-			layer.addEventListener('mouseover', this.onMouse, true);
-			layer.addEventListener('mousedown', this.onMouse, true);
-			layer.addEventListener('mouseup', this.onMouse, true);
-		}
-
-		layer.addEventListener('click', this.onClick, true);
-		layer.addEventListener('touchstart', this.onTouchStart, false);
-		layer.addEventListener('touchmove', this.onTouchMove, false);
-		layer.addEventListener('touchend', this.onTouchEnd, false);
-		layer.addEventListener('touchcancel', this.onTouchCancel, false);
-
-		// Hack is required for browsers that don't support Event#stopImmediatePropagation (e.g. Android 2)
-		// which is how FastClick normally stops click events bubbling to callbacks registered on the FastClick
-		// layer when they are cancelled.
-		if (!Event.prototype.stopImmediatePropagation) {
-			layer.removeEventListener = function(type, callback, capture) {
-				var rmv = Node.prototype.removeEventListener;
-				if (type === 'click') {
-					rmv.call(layer, type, callback.hijacked || callback, capture);
-				} else {
-					rmv.call(layer, type, callback, capture);
-				}
-			};
-
-			layer.addEventListener = function(type, callback, capture) {
-				var adv = Node.prototype.addEventListener;
-				if (type === 'click') {
-					adv.call(layer, type, callback.hijacked || (callback.hijacked = function(event) {
-						if (!event.propagationStopped) {
-							callback(event);
-						}
-					}), capture);
-				} else {
-					adv.call(layer, type, callback, capture);
-				}
-			};
-		}
-
-		// If a handler is already declared in the element's onclick attribute, it will be fired before
-		// FastClick's onClick handler. Fix this by pulling out the user-defined handler function and
-		// adding it as listener.
-		if (typeof layer.onclick === 'function') {
-
-			// Android browser on at least 3.2 requires a new reference to the function in layer.onclick
-			// - the old one won't work if passed to addEventListener directly.
-			oldOnClick = layer.onclick;
-			layer.addEventListener('click', function(event) {
-				oldOnClick(event);
-			}, false);
-			layer.onclick = null;
-		}
-	}
-
-	/**
-	* Windows Phone 8.1 fakes user agent string to look like Android and iPhone.
-	*
-	* @type boolean
-	*/
-	var deviceIsWindowsPhone = navigator.userAgent.indexOf("Windows Phone") >= 0;
-
-	/**
-	 * Android requires exceptions.
-	 *
-	 * @type boolean
-	 */
-	var deviceIsAndroid = navigator.userAgent.indexOf('Android') > 0 && !deviceIsWindowsPhone;
-
-
-	/**
-	 * iOS requires exceptions.
-	 *
-	 * @type boolean
-	 */
-	var deviceIsIOS = /iP(ad|hone|od)/.test(navigator.userAgent) && !deviceIsWindowsPhone;
-
-
-	/**
-	 * iOS 4 requires an exception for select elements.
-	 *
-	 * @type boolean
-	 */
-	var deviceIsIOS4 = deviceIsIOS && (/OS 4_\d(_\d)?/).test(navigator.userAgent);
-
-
-	/**
-	 * iOS 6.0-7.* requires the target element to be manually derived
-	 *
-	 * @type boolean
-	 */
-	var deviceIsIOSWithBadTarget = deviceIsIOS && (/OS [6-7]_\d/).test(navigator.userAgent);
-
-	/**
-	 * BlackBerry requires exceptions.
-	 *
-	 * @type boolean
-	 */
-	var deviceIsBlackBerry10 = navigator.userAgent.indexOf('BB10') > 0;
-
-	/**
-	 * Determine whether a given element requires a native click.
-	 *
-	 * @param {EventTarget|Element} target Target DOM element
-	 * @returns {boolean} Returns true if the element needs a native click
-	 */
-	FastClick.prototype.needsClick = function(target) {
-		switch (target.nodeName.toLowerCase()) {
-
-		// Don't send a synthetic click to disabled inputs (issue #62)
-		case 'button':
-		case 'select':
-		case 'textarea':
-			if (target.disabled) {
-				return true;
-			}
-
-			break;
-		case 'input':
-
-			// File inputs need real clicks on iOS 6 due to a browser bug (issue #68)
-			if ((deviceIsIOS && target.type === 'file') || target.disabled) {
-				return true;
-			}
-
-			break;
-		case 'label':
-		case 'iframe': // iOS8 homescreen apps can prevent events bubbling into frames
-		case 'video':
-			return true;
-		}
-
-		return (/\bneedsclick\b/).test(target.className);
-	};
-
-
-	/**
-	 * Determine whether a given element requires a call to focus to simulate click into element.
-	 *
-	 * @param {EventTarget|Element} target Target DOM element
-	 * @returns {boolean} Returns true if the element requires a call to focus to simulate native click.
-	 */
-	FastClick.prototype.needsFocus = function(target) {
-		switch (target.nodeName.toLowerCase()) {
-		case 'textarea':
-			return true;
-		case 'select':
-			return !deviceIsAndroid;
-		case 'input':
-			switch (target.type) {
-			case 'button':
-			case 'checkbox':
-			case 'file':
-			case 'image':
-			case 'radio':
-			case 'submit':
-				return false;
-			}
-
-			// No point in attempting to focus disabled inputs
-			return !target.disabled && !target.readOnly;
-		default:
-			return (/\bneedsfocus\b/).test(target.className);
-		}
-	};
-
-
-	/**
-	 * Send a click event to the specified element.
-	 *
-	 * @param {EventTarget|Element} targetElement
-	 * @param {Event} event
-	 */
-	FastClick.prototype.sendClick = function(targetElement, event) {
-		var clickEvent, touch;
-
-		// On some Android devices activeElement needs to be blurred otherwise the synthetic click will have no effect (#24)
-		if (document.activeElement && document.activeElement !== targetElement) {
-			document.activeElement.blur();
-		}
-
-		touch = event.changedTouches[0];
-
-		// Synthesise a click event, with an extra attribute so it can be tracked
-		clickEvent = document.createEvent('MouseEvents');
-		clickEvent.initMouseEvent(this.determineEventType(targetElement), true, true, window, 1, touch.screenX, touch.screenY, touch.clientX, touch.clientY, false, false, false, false, 0, null);
-		clickEvent.forwardedTouchEvent = true;
-		targetElement.dispatchEvent(clickEvent);
-	};
-
-	FastClick.prototype.determineEventType = function(targetElement) {
-
-		//Issue #159: Android Chrome Select Box does not open with a synthetic click event
-		if (deviceIsAndroid && targetElement.tagName.toLowerCase() === 'select') {
-			return 'mousedown';
-		}
-
-		return 'click';
-	};
-
-
-	/**
-	 * @param {EventTarget|Element} targetElement
-	 */
-	FastClick.prototype.focus = function(targetElement) {
-		var length;
-
-		// Issue #160: on iOS 7, some input elements (e.g. date datetime month) throw a vague TypeError on setSelectionRange. These elements don't have an integer value for the selectionStart and selectionEnd properties, but unfortunately that can't be used for detection because accessing the properties also throws a TypeError. Just check the type instead. Filed as Apple bug #15122724.
-		if (deviceIsIOS && targetElement.setSelectionRange && targetElement.type.indexOf('date') !== 0 && targetElement.type !== 'time' && targetElement.type !== 'month') {
-			length = targetElement.value.length;
-			targetElement.setSelectionRange(length, length);
-		} else {
-			targetElement.focus();
-		}
-	};
-
-
-	/**
-	 * Check whether the given target element is a child of a scrollable layer and if so, set a flag on it.
-	 *
-	 * @param {EventTarget|Element} targetElement
-	 */
-	FastClick.prototype.updateScrollParent = function(targetElement) {
-		var scrollParent, parentElement;
-
-		scrollParent = targetElement.fastClickScrollParent;
-
-		// Attempt to discover whether the target element is contained within a scrollable layer. Re-check if the
-		// target element was moved to another parent.
-		if (!scrollParent || !scrollParent.contains(targetElement)) {
-			parentElement = targetElement;
-			do {
-				if (parentElement.scrollHeight > parentElement.offsetHeight) {
-					scrollParent = parentElement;
-					targetElement.fastClickScrollParent = parentElement;
-					break;
-				}
-
-				parentElement = parentElement.parentElement;
-			} while (parentElement);
-		}
-
-		// Always update the scroll top tracker if possible.
-		if (scrollParent) {
-			scrollParent.fastClickLastScrollTop = scrollParent.scrollTop;
-		}
-	};
-
-
-	/**
-	 * @param {EventTarget} targetElement
-	 * @returns {Element|EventTarget}
-	 */
-	FastClick.prototype.getTargetElementFromEventTarget = function(eventTarget) {
-
-		// On some older browsers (notably Safari on iOS 4.1 - see issue #56) the event target may be a text node.
-		if (eventTarget.nodeType === Node.TEXT_NODE) {
-			return eventTarget.parentNode;
-		}
-
-		return eventTarget;
-	};
-
-
-	/**
-	 * On touch start, record the position and scroll offset.
-	 *
-	 * @param {Event} event
-	 * @returns {boolean}
-	 */
-	FastClick.prototype.onTouchStart = function(event) {
-		var targetElement, touch, selection;
-
-		// Ignore multiple touches, otherwise pinch-to-zoom is prevented if both fingers are on the FastClick element (issue #111).
-		if (event.targetTouches.length > 1) {
-			return true;
-		}
-
-		targetElement = this.getTargetElementFromEventTarget(event.target);
-		touch = event.targetTouches[0];
-
-		if (deviceIsIOS) {
-
-			// Only trusted events will deselect text on iOS (issue #49)
-			selection = window.getSelection();
-			if (selection.rangeCount && !selection.isCollapsed) {
-				return true;
-			}
-
-			if (!deviceIsIOS4) {
-
-				// Weird things happen on iOS when an alert or confirm dialog is opened from a click event callback (issue #23):
-				// when the user next taps anywhere else on the page, new touchstart and touchend events are dispatched
-				// with the same identifier as the touch event that previously triggered the click that triggered the alert.
-				// Sadly, there is an issue on iOS 4 that causes some normal touch events to have the same identifier as an
-				// immediately preceeding touch event (issue #52), so this fix is unavailable on that platform.
-				// Issue 120: touch.identifier is 0 when Chrome dev tools 'Emulate touch events' is set with an iOS device UA string,
-				// which causes all touch events to be ignored. As this block only applies to iOS, and iOS identifiers are always long,
-				// random integers, it's safe to to continue if the identifier is 0 here.
-				if (touch.identifier && touch.identifier === this.lastTouchIdentifier) {
-					event.preventDefault();
-					return false;
-				}
-
-				this.lastTouchIdentifier = touch.identifier;
-
-				// If the target element is a child of a scrollable layer (using -webkit-overflow-scrolling: touch) and:
-				// 1) the user does a fling scroll on the scrollable layer
-				// 2) the user stops the fling scroll with another tap
-				// then the event.target of the last 'touchend' event will be the element that was under the user's finger
-				// when the fling scroll was started, causing FastClick to send a click event to that layer - unless a check
-				// is made to ensure that a parent layer was not scrolled before sending a synthetic click (issue #42).
-				this.updateScrollParent(targetElement);
-			}
-		}
-
-		this.trackingClick = true;
-		this.trackingClickStart = event.timeStamp;
-		this.targetElement = targetElement;
-
-		this.touchStartX = touch.pageX;
-		this.touchStartY = touch.pageY;
-
-		// Prevent phantom clicks on fast double-tap (issue #36)
-		if ((event.timeStamp - this.lastClickTime) < this.tapDelay) {
-			event.preventDefault();
-		}
-
-		return true;
-	};
-
-
-	/**
-	 * Based on a touchmove event object, check whether the touch has moved past a boundary since it started.
-	 *
-	 * @param {Event} event
-	 * @returns {boolean}
-	 */
-	FastClick.prototype.touchHasMoved = function(event) {
-		var touch = event.changedTouches[0], boundary = this.touchBoundary;
-
-		if (Math.abs(touch.pageX - this.touchStartX) > boundary || Math.abs(touch.pageY - this.touchStartY) > boundary) {
-			return true;
-		}
-
-		return false;
-	};
-
-
-	/**
-	 * Update the last position.
-	 *
-	 * @param {Event} event
-	 * @returns {boolean}
-	 */
-	FastClick.prototype.onTouchMove = function(event) {
-		if (!this.trackingClick) {
-			return true;
-		}
-
-		// If the touch has moved, cancel the click tracking
-		if (this.targetElement !== this.getTargetElementFromEventTarget(event.target) || this.touchHasMoved(event)) {
-			this.trackingClick = false;
-			this.targetElement = null;
-		}
-
-		return true;
-	};
-
-
-	/**
-	 * Attempt to find the labelled control for the given label element.
-	 *
-	 * @param {EventTarget|HTMLLabelElement} labelElement
-	 * @returns {Element|null}
-	 */
-	FastClick.prototype.findControl = function(labelElement) {
-
-		// Fast path for newer browsers supporting the HTML5 control attribute
-		if (labelElement.control !== undefined) {
-			return labelElement.control;
-		}
-
-		// All browsers under test that support touch events also support the HTML5 htmlFor attribute
-		if (labelElement.htmlFor) {
-			return document.getElementById(labelElement.htmlFor);
-		}
-
-		// If no for attribute exists, attempt to retrieve the first labellable descendant element
-		// the list of which is defined here: http://www.w3.org/TR/html5/forms.html#category-label
-		return labelElement.querySelector('button, input:not([type=hidden]), keygen, meter, output, progress, select, textarea');
-	};
-
-
-	/**
-	 * On touch end, determine whether to send a click event at once.
-	 *
-	 * @param {Event} event
-	 * @returns {boolean}
-	 */
-	FastClick.prototype.onTouchEnd = function(event) {
-		var forElement, trackingClickStart, targetTagName, scrollParent, touch, targetElement = this.targetElement;
-
-		if (!this.trackingClick) {
-			return true;
-		}
-
-		// Prevent phantom clicks on fast double-tap (issue #36)
-		if ((event.timeStamp - this.lastClickTime) < this.tapDelay) {
-			this.cancelNextClick = true;
-			return true;
-		}
-
-		if ((event.timeStamp - this.trackingClickStart) > this.tapTimeout) {
-			return true;
-		}
-
-		// Reset to prevent wrong click cancel on input (issue #156).
-		this.cancelNextClick = false;
-
-		this.lastClickTime = event.timeStamp;
-
-		trackingClickStart = this.trackingClickStart;
-		this.trackingClick = false;
-		this.trackingClickStart = 0;
-
-		// On some iOS devices, the targetElement supplied with the event is invalid if the layer
-		// is performing a transition or scroll, and has to be re-detected manually. Note that
-		// for this to function correctly, it must be called *after* the event target is checked!
-		// See issue #57; also filed as rdar://13048589 .
-		if (deviceIsIOSWithBadTarget) {
-			touch = event.changedTouches[0];
-
-			// In certain cases arguments of elementFromPoint can be negative, so prevent setting targetElement to null
-			targetElement = document.elementFromPoint(touch.pageX - window.pageXOffset, touch.pageY - window.pageYOffset) || targetElement;
-			targetElement.fastClickScrollParent = this.targetElement.fastClickScrollParent;
-		}
-
-		targetTagName = targetElement.tagName.toLowerCase();
-		if (targetTagName === 'label') {
-			forElement = this.findControl(targetElement);
-			if (forElement) {
-				this.focus(targetElement);
-				if (deviceIsAndroid) {
-					return false;
-				}
-
-				targetElement = forElement;
-			}
-		} else if (this.needsFocus(targetElement)) {
-
-			// Case 1: If the touch started a while ago (best guess is 100ms based on tests for issue #36) then focus will be triggered anyway. Return early and unset the target element reference so that the subsequent click will be allowed through.
-			// Case 2: Without this exception for input elements tapped when the document is contained in an iframe, then any inputted text won't be visible even though the value attribute is updated as the user types (issue #37).
-			if ((event.timeStamp - trackingClickStart) > 100 || (deviceIsIOS && window.top !== window && targetTagName === 'input')) {
-				this.targetElement = null;
-				return false;
-			}
-
-			this.focus(targetElement);
-			this.sendClick(targetElement, event);
-
-			// Select elements need the event to go through on iOS 4, otherwise the selector menu won't open.
-			// Also this breaks opening selects when VoiceOver is active on iOS6, iOS7 (and possibly others)
-			if (!deviceIsIOS || targetTagName !== 'select') {
-				this.targetElement = null;
-				event.preventDefault();
-			}
-
-			return false;
-		}
-
-		if (deviceIsIOS && !deviceIsIOS4) {
-
-			// Don't send a synthetic click event if the target element is contained within a parent layer that was scrolled
-			// and this tap is being used to stop the scrolling (usually initiated by a fling - issue #42).
-			scrollParent = targetElement.fastClickScrollParent;
-			if (scrollParent && scrollParent.fastClickLastScrollTop !== scrollParent.scrollTop) {
-				return true;
-			}
-		}
-
-		// Prevent the actual click from going though - unless the target node is marked as requiring
-		// real clicks or if it is in the whitelist in which case only non-programmatic clicks are permitted.
-		if (!this.needsClick(targetElement)) {
-			event.preventDefault();
-			this.sendClick(targetElement, event);
-		}
-
-		return false;
-	};
-
-
-	/**
-	 * On touch cancel, stop tracking the click.
-	 *
-	 * @returns {void}
-	 */
-	FastClick.prototype.onTouchCancel = function() {
-		this.trackingClick = false;
-		this.targetElement = null;
-	};
-
-
-	/**
-	 * Determine mouse events which should be permitted.
-	 *
-	 * @param {Event} event
-	 * @returns {boolean}
-	 */
-	FastClick.prototype.onMouse = function(event) {
-
-		// If a target element was never set (because a touch event was never fired) allow the event
-		if (!this.targetElement) {
-			return true;
-		}
-
-		if (event.forwardedTouchEvent) {
-			return true;
-		}
-
-		// Programmatically generated events targeting a specific element should be permitted
-		if (!event.cancelable) {
-			return true;
-		}
-
-		// Derive and check the target element to see whether the mouse event needs to be permitted;
-		// unless explicitly enabled, prevent non-touch click events from triggering actions,
-		// to prevent ghost/doubleclicks.
-		if (!this.needsClick(this.targetElement) || this.cancelNextClick) {
-
-			// Prevent any user-added listeners declared on FastClick element from being fired.
-			if (event.stopImmediatePropagation) {
-				event.stopImmediatePropagation();
-			} else {
-
-				// Part of the hack for browsers that don't support Event#stopImmediatePropagation (e.g. Android 2)
-				event.propagationStopped = true;
-			}
-
-			// Cancel the event
-			event.stopPropagation();
-			event.preventDefault();
-
-			return false;
-		}
-
-		// If the mouse event is permitted, return true for the action to go through.
-		return true;
-	};
-
-
-	/**
-	 * On actual clicks, determine whether this is a touch-generated click, a click action occurring
-	 * naturally after a delay after a touch (which needs to be cancelled to avoid duplication), or
-	 * an actual click which should be permitted.
-	 *
-	 * @param {Event} event
-	 * @returns {boolean}
-	 */
-	FastClick.prototype.onClick = function(event) {
-		var permitted;
-
-		// It's possible for another FastClick-like library delivered with third-party code to fire a click event before FastClick does (issue #44). In that case, set the click-tracking flag back to false and return early. This will cause onTouchEnd to return early.
-		if (this.trackingClick) {
-			this.targetElement = null;
-			this.trackingClick = false;
-			return true;
-		}
-
-		// Very odd behaviour on iOS (issue #18): if a submit element is present inside a form and the user hits enter in the iOS simulator or clicks the Go button on the pop-up OS keyboard the a kind of 'fake' click event will be triggered with the submit-type input element as the target.
-		if (event.target.type === 'submit' && event.detail === 0) {
-			return true;
-		}
-
-		permitted = this.onMouse(event);
-
-		// Only unset targetElement if the click is not permitted. This will ensure that the check for !targetElement in onMouse fails and the browser's click doesn't go through.
-		if (!permitted) {
-			this.targetElement = null;
-		}
-
-		// If clicks are permitted, return true for the action to go through.
-		return permitted;
-	};
-
-
-	/**
-	 * Remove all FastClick's event listeners.
-	 *
-	 * @returns {void}
-	 */
-	FastClick.prototype.destroy = function() {
-		var layer = this.layer;
-
-		if (deviceIsAndroid) {
-			layer.removeEventListener('mouseover', this.onMouse, true);
-			layer.removeEventListener('mousedown', this.onMouse, true);
-			layer.removeEventListener('mouseup', this.onMouse, true);
-		}
-
-		layer.removeEventListener('click', this.onClick, true);
-		layer.removeEventListener('touchstart', this.onTouchStart, false);
-		layer.removeEventListener('touchmove', this.onTouchMove, false);
-		layer.removeEventListener('touchend', this.onTouchEnd, false);
-		layer.removeEventListener('touchcancel', this.onTouchCancel, false);
-	};
-
-
-	/**
-	 * Check whether FastClick is needed.
-	 *
-	 * @param {Element} layer The layer to listen on
-	 */
-	FastClick.notNeeded = function(layer) {
-		var metaViewport;
-		var chromeVersion;
-		var blackberryVersion;
-		var firefoxVersion;
-
-		// Devices that don't support touch don't need FastClick
-		if (typeof window.ontouchstart === 'undefined') {
-			return true;
-		}
-
-		// Chrome version - zero for other browsers
-		chromeVersion = +(/Chrome\/([0-9]+)/.exec(navigator.userAgent) || [,0])[1];
-
-		if (chromeVersion) {
-
-			if (deviceIsAndroid) {
-				metaViewport = document.querySelector('meta[name=viewport]');
-
-				if (metaViewport) {
-					// Chrome on Android with user-scalable="no" doesn't need FastClick (issue #89)
-					if (metaViewport.content.indexOf('user-scalable=no') !== -1) {
-						return true;
-					}
-					// Chrome 32 and above with width=device-width or less don't need FastClick
-					if (chromeVersion > 31 && document.documentElement.scrollWidth <= window.outerWidth) {
-						return true;
-					}
-				}
-
-			// Chrome desktop doesn't need FastClick (issue #15)
-			} else {
-				return true;
-			}
-		}
-
-		if (deviceIsBlackBerry10) {
-			blackberryVersion = navigator.userAgent.match(/Version\/([0-9]*)\.([0-9]*)/);
-
-			// BlackBerry 10.3+ does not require Fastclick library.
-			// https://github.com/ftlabs/fastclick/issues/251
-			if (blackberryVersion[1] >= 10 && blackberryVersion[2] >= 3) {
-				metaViewport = document.querySelector('meta[name=viewport]');
-
-				if (metaViewport) {
-					// user-scalable=no eliminates click delay.
-					if (metaViewport.content.indexOf('user-scalable=no') !== -1) {
-						return true;
-					}
-					// width=device-width (or less than device-width) eliminates click delay.
-					if (document.documentElement.scrollWidth <= window.outerWidth) {
-						return true;
-					}
-				}
-			}
-		}
-
-		// IE10 with -ms-touch-action: none or manipulation, which disables double-tap-to-zoom (issue #97)
-		if (layer.style.msTouchAction === 'none' || layer.style.touchAction === 'manipulation') {
-			return true;
-		}
-
-		// Firefox version - zero for other browsers
-		firefoxVersion = +(/Firefox\/([0-9]+)/.exec(navigator.userAgent) || [,0])[1];
-
-		if (firefoxVersion >= 27) {
-			// Firefox 27+ does not have tap delay if the content is not zoomable - https://bugzilla.mozilla.org/show_bug.cgi?id=922896
-
-			metaViewport = document.querySelector('meta[name=viewport]');
-			if (metaViewport && (metaViewport.content.indexOf('user-scalable=no') !== -1 || document.documentElement.scrollWidth <= window.outerWidth)) {
-				return true;
-			}
-		}
-
-		// IE11: prefixed -ms-touch-action is no longer supported and it's recomended to use non-prefixed version
-		// http://msdn.microsoft.com/en-us/library/windows/apps/Hh767313.aspx
-		if (layer.style.touchAction === 'none' || layer.style.touchAction === 'manipulation') {
-			return true;
-		}
-
-		return false;
-	};
-
-
-	/**
-	 * Factory method for creating a FastClick object
-	 *
-	 * @param {Element} layer The layer to listen on
-	 * @param {Object} [options={}] The options to override the defaults
-	 */
-	FastClick.attach = function(layer, options) {
-		return new FastClick(layer, options);
-	};
-
-
-	if (typeof define === 'function' && typeof define.amd === 'object' && define.amd) {
-
-		// AMD. Register as an anonymous module.
-		define(function() {
-			return FastClick;
-		});
-	} else if (typeof module !== 'undefined' && module.exports) {
-		module.exports = FastClick.attach;
-		module.exports.FastClick = FastClick;
-	} else {
-		window.FastClick = FastClick;
-	}
-}());
diff --git a/NewLife.Cube/Content/jweui/lib/jquery-2.1.4.js b/NewLife.Cube/Content/jweui/lib/jquery-2.1.4.js
deleted file mode 100644
index eed17778c6..0000000000
--- a/NewLife.Cube/Content/jweui/lib/jquery-2.1.4.js
+++ /dev/null
@@ -1,9210 +0,0 @@
-/*!
- * jQuery JavaScript Library v2.1.4
- * http://jquery.com/
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- *
- * Copyright 2005, 2014 jQuery Foundation, Inc. and other contributors
- * Released under the MIT license
- * http://jquery.org/license
- *
- * Date: 2015-04-28T16:01Z
- */
-
-(function( global, factory ) {
-
-	if ( typeof module === "object" && typeof module.exports === "object" ) {
-		// For CommonJS and CommonJS-like environments where a proper `window`
-		// is present, execute the factory and get jQuery.
-		// For environments that do not have a `window` with a `document`
-		// (such as Node.js), expose a factory as module.exports.
-		// This accentuates the need for the creation of a real `window`.
-		// e.g. var jQuery = require("jquery")(window);
-		// See ticket #14549 for more info.
-		module.exports = global.document ?
-			factory( global, true ) :
-			function( w ) {
-				if ( !w.document ) {
-					throw new Error( "jQuery requires a window with a document" );
-				}
-				return factory( w );
-			};
-	} else {
-		factory( global );
-	}
-
-// Pass this if window is not defined yet
-}(typeof window !== "undefined" ? window : this, function( window, noGlobal ) {
-
-// Support: Firefox 18+
-// Can't be in strict mode, several libs including ASP.NET trace
-// the stack via arguments.caller.callee and Firefox dies if
-// you try to trace through "use strict" call chains. (#13335)
-//
-
-var arr = [];
-
-var slice = arr.slice;
-
-var concat = arr.concat;
-
-var push = arr.push;
-
-var indexOf = arr.indexOf;
-
-var class2type = {};
-
-var toString = class2type.toString;
-
-var hasOwn = class2type.hasOwnProperty;
-
-var support = {};
-
-
-
-var
-	// Use the correct document accordingly with window argument (sandbox)
-	document = window.document,
-
-	version = "2.1.4",
-
-	// Define a local copy of jQuery
-	jQuery = function( selector, context ) {
-		// The jQuery object is actually just the init constructor 'enhanced'
-		// Need init if jQuery is called (just allow error to be thrown if not included)
-		return new jQuery.fn.init( selector, context );
-	},
-
-	// Support: Android<4.1
-	// Make sure we trim BOM and NBSP
-	rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,
-
-	// Matches dashed string for camelizing
-	rmsPrefix = /^-ms-/,
-	rdashAlpha = /-([\da-z])/gi,
-
-	// Used by jQuery.camelCase as callback to replace()
-	fcamelCase = function( all, letter ) {
-		return letter.toUpperCase();
-	};
-
-jQuery.fn = jQuery.prototype = {
-	// The current version of jQuery being used
-	jquery: version,
-
-	constructor: jQuery,
-
-	// Start with an empty selector
-	selector: "",
-
-	// The default length of a jQuery object is 0
-	length: 0,
-
-	toArray: function() {
-		return slice.call( this );
-	},
-
-	// 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 just the one element from the set
-			( num < 0 ? this[ num + this.length ] : this[ num ] ) :
-
-			// Return all the elements in a clean array
-			slice.call( this );
-	},
-
-	// Take an array of elements and push it onto the stack
-	// (returning the new matched element set)
-	pushStack: function( elems ) {
-
-		// Build a new jQuery matched element set
-		var ret = jQuery.merge( this.constructor(), elems );
-
-		// Add the old object onto the stack (as a reference)
-		ret.prevObject = this;
-		ret.context = this.context;
-
-		// 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 );
-	},
-
-	map: function( callback ) {
-		return this.pushStack( jQuery.map(this, function( elem, i ) {
-			return callback.call( elem, i, elem );
-		}));
-	},
-
-	slice: function() {
-		return this.pushStack( slice.apply( this, arguments ) );
-	},
-
-	first: function() {
-		return this.eq( 0 );
-	},
-
-	last: function() {
-		return this.eq( -1 );
-	},
-
-	eq: function( i ) {
-		var len = this.length,
-			j = +i + ( i < 0 ? len : 0 );
-		return this.pushStack( j >= 0 && j < len ? [ this[j] ] : [] );
-	},
-
-	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: arr.sort,
-	splice: arr.splice
-};
-
-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;
-
-		// Skip the boolean and the target
-		target = arguments[ i ] || {};
-		i++;
-	}
-
-	// 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 ( i === length ) {
-		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({
-	// Unique for each copy of jQuery on the page
-	expando: "jQuery" + ( version + Math.random() ).replace( /\D/g, "" ),
-
-	// Assume jQuery is ready without the ready module
-	isReady: true,
-
-	error: function( msg ) {
-		throw new Error( msg );
-	},
-
-	noop: function() {},
-
-	isFunction: function( obj ) {
-		return jQuery.type(obj) === "function";
-	},
-
-	isArray: Array.isArray,
-
-	isWindow: function( obj ) {
-		return obj != null && obj === obj.window;
-	},
-
-	isNumeric: function( obj ) {
-		// parseFloat NaNs numeric-cast false positives (null|true|false|"")
-		// ...but misinterprets leading-number strings, particularly hex literals ("0x...")
-		// subtraction forces infinities to NaN
-		// adding 1 corrects loss of precision from parseFloat (#15100)
-		return !jQuery.isArray( obj ) && (obj - parseFloat( obj ) + 1) >= 0;
-	},
-
-	isPlainObject: function( obj ) {
-		// Not plain objects:
-		// - Any object or value whose internal [[Class]] property is not "[object Object]"
-		// - DOM nodes
-		// - window
-		if ( jQuery.type( obj ) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
-			return false;
-		}
-
-		if ( obj.constructor &&
-				!hasOwn.call( obj.constructor.prototype, "isPrototypeOf" ) ) {
-			return false;
-		}
-
-		// If the function hasn't returned already, we're confident that
-		// |obj| is a plain object, created by {} or constructed with new Object
-		return true;
-	},
-
-	isEmptyObject: function( obj ) {
-		var name;
-		for ( name in obj ) {
-			return false;
-		}
-		return true;
-	},
-
-	type: function( obj ) {
-		if ( obj == null ) {
-			return obj + "";
-		}
-		// Support: Android<4.0, iOS<6 (functionish RegExp)
-		return typeof obj === "object" || typeof obj === "function" ?
-			class2type[ toString.call(obj) ] || "object" :
-			typeof obj;
-	},
-
-	// Evaluates a script in a global context
-	globalEval: function( code ) {
-		var script,
-			indirect = eval;
-
-		code = jQuery.trim( code );
-
-		if ( code ) {
-			// If the code includes a valid, prologue position
-			// strict mode pragma, execute code by injecting a
-			// script tag into the document.
-			if ( code.indexOf("use strict") === 1 ) {
-				script = document.createElement("script");
-				script.text = code;
-				document.head.appendChild( script ).parentNode.removeChild( script );
-			} else {
-			// Otherwise, avoid the DOM node creation, insertion
-			// and removal by using an indirect global eval
-				indirect( code );
-			}
-		}
-	},
-
-	// Convert dashed to camelCase; used by the css and data modules
-	// Support: IE9-11+
-	// 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.toLowerCase() === name.toLowerCase();
-	},
-
-	// args is for internal usage only
-	each: function( obj, callback, args ) {
-		var value,
-			i = 0,
-			length = obj.length,
-			isArray = isArraylike( obj );
-
-		if ( args ) {
-			if ( isArray ) {
-				for ( ; i < length; i++ ) {
-					value = callback.apply( obj[ i ], args );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( i in obj ) {
-					value = callback.apply( obj[ i ], args );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			}
-
-		// A special, fast, case for the most common use of each
-		} else {
-			if ( isArray ) {
-				for ( ; i < length; i++ ) {
-					value = callback.call( obj[ i ], i, obj[ i ] );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( i in obj ) {
-					value = callback.call( obj[ i ], i, obj[ i ] );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			}
-		}
-
-		return obj;
-	},
-
-	// Support: Android<4.1
-	trim: function( text ) {
-		return text == null ?
-			"" :
-			( text + "" ).replace( rtrim, "" );
-	},
-
-	// results is for internal usage only
-	makeArray: function( arr, results ) {
-		var ret = results || [];
-
-		if ( arr != null ) {
-			if ( isArraylike( Object(arr) ) ) {
-				jQuery.merge( ret,
-					typeof arr === "string" ?
-					[ arr ] : arr
-				);
-			} else {
-				push.call( ret, arr );
-			}
-		}
-
-		return ret;
-	},
-
-	inArray: function( elem, arr, i ) {
-		return arr == null ? -1 : indexOf.call( arr, elem, i );
-	},
-
-	merge: function( first, second ) {
-		var len = +second.length,
-			j = 0,
-			i = first.length;
-
-		for ( ; j < len; j++ ) {
-			first[ i++ ] = second[ j ];
-		}
-
-		first.length = i;
-
-		return first;
-	},
-
-	grep: function( elems, callback, invert ) {
-		var callbackInverse,
-			matches = [],
-			i = 0,
-			length = elems.length,
-			callbackExpect = !invert;
-
-		// Go through the array, only saving the items
-		// that pass the validator function
-		for ( ; i < length; i++ ) {
-			callbackInverse = !callback( elems[ i ], i );
-			if ( callbackInverse !== callbackExpect ) {
-				matches.push( elems[ i ] );
-			}
-		}
-
-		return matches;
-	},
-
-	// arg is for internal usage only
-	map: function( elems, callback, arg ) {
-		var value,
-			i = 0,
-			length = elems.length,
-			isArray = isArraylike( elems ),
-			ret = [];
-
-		// Go through the array, translating each of the items to their new values
-		if ( isArray ) {
-			for ( ; i < length; i++ ) {
-				value = callback( elems[ i ], i, arg );
-
-				if ( value != null ) {
-					ret.push( value );
-				}
-			}
-
-		// Go through every key on the object,
-		} else {
-			for ( i in elems ) {
-				value = callback( elems[ i ], i, arg );
-
-				if ( value != null ) {
-					ret.push( value );
-				}
-			}
-		}
-
-		// Flatten any nested arrays
-		return 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 ) {
-		var tmp, args, proxy;
-
-		if ( typeof context === "string" ) {
-			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
-		args = slice.call( arguments, 2 );
-		proxy = function() {
-			return fn.apply( context || this, 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 || jQuery.guid++;
-
-		return proxy;
-	},
-
-	now: Date.now,
-
-	// jQuery.support is not used in Core but other projects attach their
-	// properties to it so it needs to exist.
-	support: support
-});
-
-// Populate the class2type map
-jQuery.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function(i, name) {
-	class2type[ "[object " + name + "]" ] = name.toLowerCase();
-});
-
-function isArraylike( obj ) {
-
-	// Support: iOS 8.2 (not reproducible in simulator)
-	// `in` check used to prevent JIT error (gh-2145)
-	// hasOwn isn't used here due to false negatives
-	// regarding Nodelist length in IE
-	var length = "length" in obj && obj.length,
-		type = jQuery.type( obj );
-
-	if ( type === "function" || jQuery.isWindow( obj ) ) {
-		return false;
-	}
-
-	if ( obj.nodeType === 1 && length ) {
-		return true;
-	}
-
-	return type === "array" || length === 0 ||
-		typeof length === "number" && length > 0 && ( length - 1 ) in obj;
-}
-var Sizzle =
-/*!
- * Sizzle CSS Selector Engine v2.2.0-pre
- * http://sizzlejs.com/
- *
- * Copyright 2008, 2014 jQuery Foundation, Inc. and other contributors
- * Released under the MIT license
- * http://jquery.org/license
- *
- * Date: 2014-12-16
- */
-(function( window ) {
-
-var i,
-	support,
-	Expr,
-	getText,
-	isXML,
-	tokenize,
-	compile,
-	select,
-	outermostContext,
-	sortInput,
-	hasDuplicate,
-
-	// Local document vars
-	setDocument,
-	document,
-	docElem,
-	documentIsHTML,
-	rbuggyQSA,
-	rbuggyMatches,
-	matches,
-	contains,
-
-	// Instance-specific data
-	expando = "sizzle" + 1 * new Date(),
-	preferredDoc = window.document,
-	dirruns = 0,
-	done = 0,
-	classCache = createCache(),
-	tokenCache = createCache(),
-	compilerCache = createCache(),
-	sortOrder = function( a, b ) {
-		if ( a === b ) {
-			hasDuplicate = true;
-		}
-		return 0;
-	},
-
-	// General-purpose constants
-	MAX_NEGATIVE = 1 << 31,
-
-	// Instance methods
-	hasOwn = ({}).hasOwnProperty,
-	arr = [],
-	pop = arr.pop,
-	push_native = arr.push,
-	push = arr.push,
-	slice = arr.slice,
-	// Use a stripped-down indexOf as it's faster than native
-	// http://jsperf.com/thor-indexof-vs-for/5
-	indexOf = function( list, elem ) {
-		var i = 0,
-			len = list.length;
-		for ( ; i < len; i++ ) {
-			if ( list[i] === elem ) {
-				return i;
-			}
-		}
-		return -1;
-	},
-
-	booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",
-
-	// Regular expressions
-
-	// Whitespace characters http://www.w3.org/TR/css3-selectors/#whitespace
-	whitespace = "[\\x20\\t\\r\\n\\f]",
-	// http://www.w3.org/TR/css3-syntax/#characters
-	characterEncoding = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",
-
-	// Loosely modeled on CSS identifier characters
-	// An unquoted value should be a CSS identifier http://www.w3.org/TR/css3-selectors/#attribute-selectors
-	// Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
-	identifier = characterEncoding.replace( "w", "w#" ),
-
-	// Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors
-	attributes = "\\[" + whitespace + "*(" + characterEncoding + ")(?:" + whitespace +
-		// Operator (capture 2)
-		"*([*^$|!~]?=)" + whitespace +
-		// "Attribute values must be CSS identifiers [capture 5] or strings [capture 3 or capture 4]"
-		"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" + whitespace +
-		"*\\]",
-
-	pseudos = ":(" + characterEncoding + ")(?:\\((" +
-		// To reduce the number of selectors needing tokenize in the preFilter, prefer arguments:
-		// 1. quoted (capture 3; capture 4 or capture 5)
-		"('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|" +
-		// 2. simple (capture 6)
-		"((?:\\\\.|[^\\\\()[\\]]|" + attributes + ")*)|" +
-		// 3. anything else (capture 2)
-		".*" +
-		")\\)|)",
-
-	// Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
-	rwhitespace = new RegExp( whitespace + "+", "g" ),
-	rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
-
-	rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
-	rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ),
-
-	rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*?)" + whitespace + "*\\]", "g" ),
-
-	rpseudo = new RegExp( pseudos ),
-	ridentifier = new RegExp( "^" + identifier + "$" ),
-
-	matchExpr = {
-		"ID": new RegExp( "^#(" + characterEncoding + ")" ),
-		"CLASS": new RegExp( "^\\.(" + characterEncoding + ")" ),
-		"TAG": new RegExp( "^(" + characterEncoding.replace( "w", "w*" ) + ")" ),
-		"ATTR": new RegExp( "^" + attributes ),
-		"PSEUDO": new RegExp( "^" + pseudos ),
-		"CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace +
-			"*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace +
-			"*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
-		"bool": new RegExp( "^(?:" + booleans + ")$", "i" ),
-		// For use in libraries implementing .is()
-		// We use this for POS matching in `select`
-		"needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" +
-			whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
-	},
-
-	rinputs = /^(?:input|select|textarea|button)$/i,
-	rheader = /^h\d$/i,
-
-	rnative = /^[^{]+\{\s*\[native \w/,
-
-	// Easily-parseable/retrievable ID or TAG or CLASS selectors
-	rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,
-
-	rsibling = /[+~]/,
-	rescape = /'|\\/g,
-
-	// CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
-	runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ),
-	funescape = function( _, escaped, escapedWhitespace ) {
-		var high = "0x" + escaped - 0x10000;
-		// NaN means non-codepoint
-		// Support: Firefox<24
-		// Workaround erroneous numeric interpretation of +"0x"
-		return high !== high || escapedWhitespace ?
-			escaped :
-			high < 0 ?
-				// BMP codepoint
-				String.fromCharCode( high + 0x10000 ) :
-				// Supplemental Plane codepoint (surrogate pair)
-				String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
-	},
-
-	// Used for iframes
-	// See setDocument()
-	// Removing the function wrapper causes a "Permission Denied"
-	// error in IE
-	unloadHandler = function() {
-		setDocument();
-	};
-
-// Optimize for push.apply( _, NodeList )
-try {
-	push.apply(
-		(arr = slice.call( preferredDoc.childNodes )),
-		preferredDoc.childNodes
-	);
-	// Support: Android<4.0
-	// Detect silently failing push.apply
-	arr[ preferredDoc.childNodes.length ].nodeType;
-} catch ( e ) {
-	push = { apply: arr.length ?
-
-		// Leverage slice if possible
-		function( target, els ) {
-			push_native.apply( target, slice.call(els) );
-		} :
-
-		// Support: IE<9
-		// Otherwise append directly
-		function( target, els ) {
-			var j = target.length,
-				i = 0;
-			// Can't trust NodeList.length
-			while ( (target[j++] = els[i++]) ) {}
-			target.length = j - 1;
-		}
-	};
-}
-
-function Sizzle( selector, context, results, seed ) {
-	var match, elem, m, nodeType,
-		// QSA vars
-		i, groups, old, nid, newContext, newSelector;
-
-	if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) {
-		setDocument( context );
-	}
-
-	context = context || document;
-	results = results || [];
-	nodeType = context.nodeType;
-
-	if ( typeof selector !== "string" || !selector ||
-		nodeType !== 1 && nodeType !== 9 && nodeType !== 11 ) {
-
-		return results;
-	}
-
-	if ( !seed && documentIsHTML ) {
-
-		// Try to shortcut find operations when possible (e.g., not under DocumentFragment)
-		if ( nodeType !== 11 && (match = rquickExpr.exec( selector )) ) {
-			// Speed-up: Sizzle("#ID")
-			if ( (m = match[1]) ) {
-				if ( nodeType === 9 ) {
-					elem = context.getElementById( m );
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document (jQuery #6963)
-					if ( elem && elem.parentNode ) {
-						// Handle the case where IE, Opera, and Webkit return items
-						// by name instead of ID
-						if ( elem.id === m ) {
-							results.push( elem );
-							return results;
-						}
-					} else {
-						return results;
-					}
-				} else {
-					// Context is not a document
-					if ( context.ownerDocument && (elem = context.ownerDocument.getElementById( m )) &&
-						contains( context, elem ) && elem.id === m ) {
-						results.push( elem );
-						return results;
-					}
-				}
-
-			// Speed-up: Sizzle("TAG")
-			} else if ( match[2] ) {
-				push.apply( results, context.getElementsByTagName( selector ) );
-				return results;
-
-			// Speed-up: Sizzle(".CLASS")
-			} else if ( (m = match[3]) && support.getElementsByClassName ) {
-				push.apply( results, context.getElementsByClassName( m ) );
-				return results;
-			}
-		}
-
-		// QSA path
-		if ( support.qsa && (!rbuggyQSA || !rbuggyQSA.test( selector )) ) {
-			nid = old = expando;
-			newContext = context;
-			newSelector = nodeType !== 1 && selector;
-
-			// 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
-			if ( nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
-				groups = tokenize( selector );
-
-				if ( (old = context.getAttribute("id")) ) {
-					nid = old.replace( rescape, "\\$&" );
-				} else {
-					context.setAttribute( "id", nid );
-				}
-				nid = "[id='" + nid + "'] ";
-
-				i = groups.length;
-				while ( i-- ) {
-					groups[i] = nid + toSelector( groups[i] );
-				}
-				newContext = rsibling.test( selector ) && testContext( context.parentNode ) || context;
-				newSelector = groups.join(",");
-			}
-
-			if ( newSelector ) {
-				try {
-					push.apply( results,
-						newContext.querySelectorAll( newSelector )
-					);
-					return results;
-				} catch(qsaError) {
-				} finally {
-					if ( !old ) {
-						context.removeAttribute("id");
-					}
-				}
-			}
-		}
-	}
-
-	// All others
-	return select( selector.replace( rtrim, "$1" ), context, results, seed );
-}
-
-/**
- * Create key-value caches of limited size
- * @returns {Function(string, Object)} Returns the Object data after storing it on itself with
- *	property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength)
- *	deleting the oldest entry
- */
-function createCache() {
-	var keys = [];
-
-	function cache( key, value ) {
-		// Use (key + " ") to avoid collision with native prototype properties (see Issue #157)
-		if ( keys.push( key + " " ) > Expr.cacheLength ) {
-			// Only keep the most recent entries
-			delete cache[ keys.shift() ];
-		}
-		return (cache[ key + " " ] = value);
-	}
-	return cache;
-}
-
-/**
- * Mark a function for special use by Sizzle
- * @param {Function} fn The function to mark
- */
-function markFunction( fn ) {
-	fn[ expando ] = true;
-	return fn;
-}
-
-/**
- * Support testing using an element
- * @param {Function} fn Passed the created div and expects a boolean result
- */
-function assert( fn ) {
-	var div = document.createElement("div");
-
-	try {
-		return !!fn( div );
-	} catch (e) {
-		return false;
-	} finally {
-		// Remove from its parent by default
-		if ( div.parentNode ) {
-			div.parentNode.removeChild( div );
-		}
-		// release memory in IE
-		div = null;
-	}
-}
-
-/**
- * Adds the same handler for all of the specified attrs
- * @param {String} attrs Pipe-separated list of attributes
- * @param {Function} handler The method that will be applied
- */
-function addHandle( attrs, handler ) {
-	var arr = attrs.split("|"),
-		i = attrs.length;
-
-	while ( i-- ) {
-		Expr.attrHandle[ arr[i] ] = handler;
-	}
-}
-
-/**
- * Checks document order of two siblings
- * @param {Element} a
- * @param {Element} b
- * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b
- */
-function siblingCheck( a, b ) {
-	var cur = b && a,
-		diff = cur && a.nodeType === 1 && b.nodeType === 1 &&
-			( ~b.sourceIndex || MAX_NEGATIVE ) -
-			( ~a.sourceIndex || MAX_NEGATIVE );
-
-	// Use IE sourceIndex if available on both nodes
-	if ( diff ) {
-		return diff;
-	}
-
-	// Check if b follows a
-	if ( cur ) {
-		while ( (cur = cur.nextSibling) ) {
-			if ( cur === b ) {
-				return -1;
-			}
-		}
-	}
-
-	return a ? 1 : -1;
-}
-
-/**
- * Returns a function to use in pseudos for input types
- * @param {String} type
- */
-function createInputPseudo( type ) {
-	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return name === "input" && elem.type === type;
-	};
-}
-
-/**
- * Returns a function to use in pseudos for buttons
- * @param {String} type
- */
-function createButtonPseudo( type ) {
-	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return (name === "input" || name === "button") && elem.type === type;
-	};
-}
-
-/**
- * Returns a function to use in pseudos for positionals
- * @param {Function} fn
- */
-function createPositionalPseudo( fn ) {
-	return markFunction(function( argument ) {
-		argument = +argument;
-		return markFunction(function( seed, matches ) {
-			var j,
-				matchIndexes = fn( [], seed.length, argument ),
-				i = matchIndexes.length;
-
-			// Match elements found at the specified indexes
-			while ( i-- ) {
-				if ( seed[ (j = matchIndexes[i]) ] ) {
-					seed[j] = !(matches[j] = seed[j]);
-				}
-			}
-		});
-	});
-}
-
-/**
- * Checks a node for validity as a Sizzle context
- * @param {Element|Object=} context
- * @returns {Element|Object|Boolean} The input node if acceptable, otherwise a falsy value
- */
-function testContext( context ) {
-	return context && typeof context.getElementsByTagName !== "undefined" && context;
-}
-
-// Expose support vars for convenience
-support = Sizzle.support = {};
-
-/**
- * Detects XML nodes
- * @param {Element|Object} elem An element or a document
- * @returns {Boolean} True iff elem is a non-HTML XML node
- */
-isXML = 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).documentElement;
-	return documentElement ? documentElement.nodeName !== "HTML" : false;
-};
-
-/**
- * Sets document-related variables once based on the current document
- * @param {Element|Object} [doc] An element or document object to use to set the document
- * @returns {Object} Returns the current document
- */
-setDocument = Sizzle.setDocument = function( node ) {
-	var hasCompare, parent,
-		doc = node ? node.ownerDocument || node : preferredDoc;
-
-	// If no document and documentElement is available, return
-	if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) {
-		return document;
-	}
-
-	// Set our document
-	document = doc;
-	docElem = doc.documentElement;
-	parent = doc.defaultView;
-
-	// Support: IE>8
-	// If iframe document is assigned to "document" variable and if iframe has been reloaded,
-	// IE will throw "permission denied" error when accessing "document" variable, see jQuery #13936
-	// IE6-8 do not support the defaultView property so parent will be undefined
-	if ( parent && parent !== parent.top ) {
-		// IE11 does not have attachEvent, so all must suffer
-		if ( parent.addEventListener ) {
-			parent.addEventListener( "unload", unloadHandler, false );
-		} else if ( parent.attachEvent ) {
-			parent.attachEvent( "onunload", unloadHandler );
-		}
-	}
-
-	/* Support tests
-	---------------------------------------------------------------------- */
-	documentIsHTML = !isXML( doc );
-
-	/* Attributes
-	---------------------------------------------------------------------- */
-
-	// Support: IE<8
-	// Verify that getAttribute really returns attributes and not properties
-	// (excepting IE8 booleans)
-	support.attributes = assert(function( div ) {
-		div.className = "i";
-		return !div.getAttribute("className");
-	});
-
-	/* getElement(s)By*
-	---------------------------------------------------------------------- */
-
-	// Check if getElementsByTagName("*") returns only elements
-	support.getElementsByTagName = assert(function( div ) {
-		div.appendChild( doc.createComment("") );
-		return !div.getElementsByTagName("*").length;
-	});
-
-	// Support: IE<9
-	support.getElementsByClassName = rnative.test( doc.getElementsByClassName );
-
-	// Support: IE<10
-	// Check if getElementById returns elements by name
-	// The broken getElementById methods don't pick up programatically-set names,
-	// so use a roundabout getElementsByName test
-	support.getById = assert(function( div ) {
-		docElem.appendChild( div ).id = expando;
-		return !doc.getElementsByName || !doc.getElementsByName( expando ).length;
-	});
-
-	// ID find and filter
-	if ( support.getById ) {
-		Expr.find["ID"] = function( id, context ) {
-			if ( typeof context.getElementById !== "undefined" && documentIsHTML ) {
-				var m = context.getElementById( id );
-				// Check parentNode to catch when Blackberry 4.6 returns
-				// nodes that are no longer in the document #6963
-				return m && m.parentNode ? [ m ] : [];
-			}
-		};
-		Expr.filter["ID"] = function( id ) {
-			var attrId = id.replace( runescape, funescape );
-			return function( elem ) {
-				return elem.getAttribute("id") === attrId;
-			};
-		};
-	} else {
-		// Support: IE6/7
-		// getElementById is not reliable as a find shortcut
-		delete Expr.find["ID"];
-
-		Expr.filter["ID"] =  function( id ) {
-			var attrId = id.replace( runescape, funescape );
-			return function( elem ) {
-				var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id");
-				return node && node.value === attrId;
-			};
-		};
-	}
-
-	// Tag
-	Expr.find["TAG"] = support.getElementsByTagName ?
-		function( tag, context ) {
-			if ( typeof context.getElementsByTagName !== "undefined" ) {
-				return context.getElementsByTagName( tag );
-
-			// DocumentFragment nodes don't have gEBTN
-			} else if ( support.qsa ) {
-				return context.querySelectorAll( tag );
-			}
-		} :
-
-		function( tag, context ) {
-			var elem,
-				tmp = [],
-				i = 0,
-				// By happy coincidence, a (broken) gEBTN appears on DocumentFragment nodes too
-				results = context.getElementsByTagName( tag );
-
-			// Filter out possible comments
-			if ( tag === "*" ) {
-				while ( (elem = results[i++]) ) {
-					if ( elem.nodeType === 1 ) {
-						tmp.push( elem );
-					}
-				}
-
-				return tmp;
-			}
-			return results;
-		};
-
-	// Class
-	Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) {
-		if ( documentIsHTML ) {
-			return context.getElementsByClassName( className );
-		}
-	};
-
-	/* QSA/matchesSelector
-	---------------------------------------------------------------------- */
-
-	// QSA and matchesSelector support
-
-	// matchesSelector(:active) reports false when true (IE9/Opera 11.5)
-	rbuggyMatches = [];
-
-	// qSa(:focus) reports false when true (Chrome 21)
-	// We allow this because of a bug in IE8/9 that throws an error
-	// whenever `document.activeElement` is accessed on an iframe
-	// So, we allow :focus to pass through QSA all the time to avoid the IE error
-	// See http://bugs.jquery.com/ticket/13378
-	rbuggyQSA = [];
-
-	if ( (support.qsa = rnative.test( doc.querySelectorAll )) ) {
-		// Build QSA regex
-		// Regex strategy adopted from Diego Perini
-		assert(function( div ) {
-			// Select is set to empty string on purpose
-			// This is to test IE's treatment of not explicitly
-			// setting a boolean content attribute,
-			// since its presence should be enough
-			// http://bugs.jquery.com/ticket/12359
-			docElem.appendChild( div ).innerHTML = "<a id='" + expando + "'></a>" +
-				"<select id='" + expando + "-\f]' msallowcapture=''>" +
-				"<option selected=''></option></select>";
-
-			// Support: IE8, Opera 11-12.16
-			// Nothing should be selected when empty strings follow ^= or $= or *=
-			// The test attribute must be unknown in Opera but "safe" for WinRT
-			// http://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section
-			if ( div.querySelectorAll("[msallowcapture^='']").length ) {
-				rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" );
-			}
-
-			// Support: IE8
-			// Boolean attributes and "value" are not treated correctly
-			if ( !div.querySelectorAll("[selected]").length ) {
-				rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" );
-			}
-
-			// Support: Chrome<29, Android<4.2+, Safari<7.0+, iOS<7.0+, PhantomJS<1.9.7+
-			if ( !div.querySelectorAll( "[id~=" + expando + "-]" ).length ) {
-				rbuggyQSA.push("~=");
-			}
-
-			// Webkit/Opera - :checked should return selected option elements
-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-			// IE8 throws error here and will not see later tests
-			if ( !div.querySelectorAll(":checked").length ) {
-				rbuggyQSA.push(":checked");
-			}
-
-			// Support: Safari 8+, iOS 8+
-			// https://bugs.webkit.org/show_bug.cgi?id=136851
-			// In-page `selector#id sibing-combinator selector` fails
-			if ( !div.querySelectorAll( "a#" + expando + "+*" ).length ) {
-				rbuggyQSA.push(".#.+[+~]");
-			}
-		});
-
-		assert(function( div ) {
-			// Support: Windows 8 Native Apps
-			// The type and name attributes are restricted during .innerHTML assignment
-			var input = doc.createElement("input");
-			input.setAttribute( "type", "hidden" );
-			div.appendChild( input ).setAttribute( "name", "D" );
-
-			// Support: IE8
-			// Enforce case-sensitivity of name attribute
-			if ( div.querySelectorAll("[name=d]").length ) {
-				rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" );
-			}
-
-			// FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
-			// IE8 throws error here and will not see later tests
-			if ( !div.querySelectorAll(":enabled").length ) {
-				rbuggyQSA.push( ":enabled", ":disabled" );
-			}
-
-			// Opera 10-11 does not throw on post-comma invalid pseudos
-			div.querySelectorAll("*,:x");
-			rbuggyQSA.push(",.*:");
-		});
-	}
-
-	if ( (support.matchesSelector = rnative.test( (matches = docElem.matches ||
-		docElem.webkitMatchesSelector ||
-		docElem.mozMatchesSelector ||
-		docElem.oMatchesSelector ||
-		docElem.msMatchesSelector) )) ) {
-
-		assert(function( div ) {
-			// Check to see if it's possible to do matchesSelector
-			// on a disconnected node (IE 9)
-			support.disconnectedMatch = matches.call( div, "div" );
-
-			// This should fail with an exception
-			// Gecko does not error, returns false instead
-			matches.call( div, "[s!='']:x" );
-			rbuggyMatches.push( "!=", pseudos );
-		});
-	}
-
-	rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") );
-	rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") );
-
-	/* Contains
-	---------------------------------------------------------------------- */
-	hasCompare = rnative.test( docElem.compareDocumentPosition );
-
-	// Element contains another
-	// Purposefully does not implement inclusive descendent
-	// As in, an element does not contain itself
-	contains = hasCompare || rnative.test( docElem.contains ) ?
-		function( a, b ) {
-			var adown = a.nodeType === 9 ? a.documentElement : a,
-				bup = b && b.parentNode;
-			return a === bup || !!( bup && bup.nodeType === 1 && (
-				adown.contains ?
-					adown.contains( bup ) :
-					a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
-			));
-		} :
-		function( a, b ) {
-			if ( b ) {
-				while ( (b = b.parentNode) ) {
-					if ( b === a ) {
-						return true;
-					}
-				}
-			}
-			return false;
-		};
-
-	/* Sorting
-	---------------------------------------------------------------------- */
-
-	// Document order sorting
-	sortOrder = hasCompare ?
-	function( a, b ) {
-
-		// Flag for duplicate removal
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-		}
-
-		// Sort on method existence if only one input has compareDocumentPosition
-		var compare = !a.compareDocumentPosition - !b.compareDocumentPosition;
-		if ( compare ) {
-			return compare;
-		}
-
-		// Calculate position if both inputs belong to the same document
-		compare = ( a.ownerDocument || a ) === ( b.ownerDocument || b ) ?
-			a.compareDocumentPosition( b ) :
-
-			// Otherwise we know they are disconnected
-			1;
-
-		// Disconnected nodes
-		if ( compare & 1 ||
-			(!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) {
-
-			// Choose the first element that is related to our preferred document
-			if ( a === doc || a.ownerDocument === preferredDoc && contains(preferredDoc, a) ) {
-				return -1;
-			}
-			if ( b === doc || b.ownerDocument === preferredDoc && contains(preferredDoc, b) ) {
-				return 1;
-			}
-
-			// Maintain original order
-			return sortInput ?
-				( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) :
-				0;
-		}
-
-		return compare & 4 ? -1 : 1;
-	} :
-	function( a, b ) {
-		// Exit early if the nodes are identical
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-		}
-
-		var cur,
-			i = 0,
-			aup = a.parentNode,
-			bup = b.parentNode,
-			ap = [ a ],
-			bp = [ b ];
-
-		// Parentless nodes are either documents or disconnected
-		if ( !aup || !bup ) {
-			return a === doc ? -1 :
-				b === doc ? 1 :
-				aup ? -1 :
-				bup ? 1 :
-				sortInput ?
-				( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) :
-				0;
-
-		// If the nodes are siblings, we can do a quick check
-		} else if ( aup === bup ) {
-			return siblingCheck( a, b );
-		}
-
-		// Otherwise we need full lists of their ancestors for comparison
-		cur = a;
-		while ( (cur = cur.parentNode) ) {
-			ap.unshift( cur );
-		}
-		cur = b;
-		while ( (cur = cur.parentNode) ) {
-			bp.unshift( cur );
-		}
-
-		// Walk down the tree looking for a discrepancy
-		while ( ap[i] === bp[i] ) {
-			i++;
-		}
-
-		return i ?
-			// Do a sibling check if the nodes have a common ancestor
-			siblingCheck( ap[i], bp[i] ) :
-
-			// Otherwise nodes in our document sort first
-			ap[i] === preferredDoc ? -1 :
-			bp[i] === preferredDoc ? 1 :
-			0;
-	};
-
-	return doc;
-};
-
-Sizzle.matches = function( expr, elements ) {
-	return Sizzle( expr, null, null, elements );
-};
-
-Sizzle.matchesSelector = function( elem, expr ) {
-	// Set document vars if needed
-	if ( ( elem.ownerDocument || elem ) !== document ) {
-		setDocument( elem );
-	}
-
-	// Make sure that attribute selectors are quoted
-	expr = expr.replace( rattributeQuotes, "='$1']" );
-
-	if ( support.matchesSelector && documentIsHTML &&
-		( !rbuggyMatches || !rbuggyMatches.test( expr ) ) &&
-		( !rbuggyQSA     || !rbuggyQSA.test( expr ) ) ) {
-
-		try {
-			var ret = matches.call( elem, expr );
-
-			// IE 9's matchesSelector returns false on disconnected nodes
-			if ( ret || support.disconnectedMatch ||
-					// As well, disconnected nodes are said to be in a document
-					// fragment in IE 9
-					elem.document && elem.document.nodeType !== 11 ) {
-				return ret;
-			}
-		} catch (e) {}
-	}
-
-	return Sizzle( expr, document, null, [ elem ] ).length > 0;
-};
-
-Sizzle.contains = function( context, elem ) {
-	// Set document vars if needed
-	if ( ( context.ownerDocument || context ) !== document ) {
-		setDocument( context );
-	}
-	return contains( context, elem );
-};
-
-Sizzle.attr = function( elem, name ) {
-	// Set document vars if needed
-	if ( ( elem.ownerDocument || elem ) !== document ) {
-		setDocument( elem );
-	}
-
-	var fn = Expr.attrHandle[ name.toLowerCase() ],
-		// Don't get fooled by Object.prototype properties (jQuery #13807)
-		val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ?
-			fn( elem, name, !documentIsHTML ) :
-			undefined;
-
-	return val !== undefined ?
-		val :
-		support.attributes || !documentIsHTML ?
-			elem.getAttribute( name ) :
-			(val = elem.getAttributeNode(name)) && val.specified ?
-				val.value :
-				null;
-};
-
-Sizzle.error = function( msg ) {
-	throw new Error( "Syntax error, unrecognized expression: " + msg );
-};
-
-/**
- * Document sorting and removing duplicates
- * @param {ArrayLike} results
- */
-Sizzle.uniqueSort = function( results ) {
-	var elem,
-		duplicates = [],
-		j = 0,
-		i = 0;
-
-	// Unless we *know* we can detect duplicates, assume their presence
-	hasDuplicate = !support.detectDuplicates;
-	sortInput = !support.sortStable && results.slice( 0 );
-	results.sort( sortOrder );
-
-	if ( hasDuplicate ) {
-		while ( (elem = results[i++]) ) {
-			if ( elem === results[ i ] ) {
-				j = duplicates.push( i );
-			}
-		}
-		while ( j-- ) {
-			results.splice( duplicates[ j ], 1 );
-		}
-	}
-
-	// Clear input after sorting to release objects
-	// See https://github.com/jquery/sizzle/pull/225
-	sortInput = null;
-
-	return results;
-};
-
-/**
- * Utility function for retrieving the text value of an array of DOM nodes
- * @param {Array|Element} elem
- */
-getText = Sizzle.getText = function( elem ) {
-	var node,
-		ret = "",
-		i = 0,
-		nodeType = elem.nodeType;
-
-	if ( !nodeType ) {
-		// If no nodeType, this is expected to be an array
-		while ( (node = elem[i++]) ) {
-			// Do not traverse comment nodes
-			ret += getText( node );
-		}
-	} else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
-		// Use textContent for elements
-		// innerText usage removed for consistency of new lines (jQuery #11153)
-		if ( typeof elem.textContent === "string" ) {
-			return elem.textContent;
-		} else {
-			// Traverse its children
-			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-				ret += getText( elem );
-			}
-		}
-	} else if ( nodeType === 3 || nodeType === 4 ) {
-		return elem.nodeValue;
-	}
-	// Do not include comment or processing instruction nodes
-
-	return ret;
-};
-
-Expr = Sizzle.selectors = {
-
-	// Can be adjusted by the user
-	cacheLength: 50,
-
-	createPseudo: markFunction,
-
-	match: matchExpr,
-
-	attrHandle: {},
-
-	find: {},
-
-	relative: {
-		">": { dir: "parentNode", first: true },
-		" ": { dir: "parentNode" },
-		"+": { dir: "previousSibling", first: true },
-		"~": { dir: "previousSibling" }
-	},
-
-	preFilter: {
-		"ATTR": function( match ) {
-			match[1] = match[1].replace( runescape, funescape );
-
-			// Move the given value to match[3] whether quoted or unquoted
-			match[3] = ( match[3] || match[4] || match[5] || "" ).replace( runescape, funescape );
-
-			if ( match[2] === "~=" ) {
-				match[3] = " " + match[3] + " ";
-			}
-
-			return match.slice( 0, 4 );
-		},
-
-		"CHILD": function( match ) {
-			/* matches from matchExpr["CHILD"]
-				1 type (only|nth|...)
-				2 what (child|of-type)
-				3 argument (even|odd|\d*|\d*n([+-]\d+)?|...)
-				4 xn-component of xn+y argument ([+-]?\d*n|)
-				5 sign of xn-component
-				6 x of xn-component
-				7 sign of y-component
-				8 y of y-component
-			*/
-			match[1] = match[1].toLowerCase();
-
-			if ( match[1].slice( 0, 3 ) === "nth" ) {
-				// nth-* requires argument
-				if ( !match[3] ) {
-					Sizzle.error( match[0] );
-				}
-
-				// numeric x and y parameters for Expr.filter.CHILD
-				// remember that false/true cast respectively to 0/1
-				match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) );
-				match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" );
-
-			// other types prohibit arguments
-			} else if ( match[3] ) {
-				Sizzle.error( match[0] );
-			}
-
-			return match;
-		},
-
-		"PSEUDO": function( match ) {
-			var excess,
-				unquoted = !match[6] && match[2];
-
-			if ( matchExpr["CHILD"].test( match[0] ) ) {
-				return null;
-			}
-
-			// Accept quoted arguments as-is
-			if ( match[3] ) {
-				match[2] = match[4] || match[5] || "";
-
-			// Strip excess characters from unquoted arguments
-			} else if ( unquoted && rpseudo.test( unquoted ) &&
-				// Get excess from tokenize (recursively)
-				(excess = tokenize( unquoted, true )) &&
-				// advance to the next closing parenthesis
-				(excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) {
-
-				// excess is a negative index
-				match[0] = match[0].slice( 0, excess );
-				match[2] = unquoted.slice( 0, excess );
-			}
-
-			// Return only captures needed by the pseudo filter method (type and argument)
-			return match.slice( 0, 3 );
-		}
-	},
-
-	filter: {
-
-		"TAG": function( nodeNameSelector ) {
-			var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase();
-			return nodeNameSelector === "*" ?
-				function() { return true; } :
-				function( elem ) {
-					return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
-				};
-		},
-
-		"CLASS": function( className ) {
-			var pattern = classCache[ className + " " ];
-
-			return pattern ||
-				(pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) &&
-				classCache( className, function( elem ) {
-					return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== "undefined" && elem.getAttribute("class") || "" );
-				});
-		},
-
-		"ATTR": function( name, operator, check ) {
-			return function( elem ) {
-				var result = Sizzle.attr( elem, name );
-
-				if ( result == null ) {
-					return operator === "!=";
-				}
-				if ( !operator ) {
-					return true;
-				}
-
-				result += "";
-
-				return operator === "=" ? result === check :
-					operator === "!=" ? result !== check :
-					operator === "^=" ? check && result.indexOf( check ) === 0 :
-					operator === "*=" ? check && result.indexOf( check ) > -1 :
-					operator === "$=" ? check && result.slice( -check.length ) === check :
-					operator === "~=" ? ( " " + result.replace( rwhitespace, " " ) + " " ).indexOf( check ) > -1 :
-					operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" :
-					false;
-			};
-		},
-
-		"CHILD": function( type, what, argument, first, last ) {
-			var simple = type.slice( 0, 3 ) !== "nth",
-				forward = type.slice( -4 ) !== "last",
-				ofType = what === "of-type";
-
-			return first === 1 && last === 0 ?
-
-				// Shortcut for :nth-*(n)
-				function( elem ) {
-					return !!elem.parentNode;
-				} :
-
-				function( elem, context, xml ) {
-					var cache, outerCache, node, diff, nodeIndex, start,
-						dir = simple !== forward ? "nextSibling" : "previousSibling",
-						parent = elem.parentNode,
-						name = ofType && elem.nodeName.toLowerCase(),
-						useCache = !xml && !ofType;
-
-					if ( parent ) {
-
-						// :(first|last|only)-(child|of-type)
-						if ( simple ) {
-							while ( dir ) {
-								node = elem;
-								while ( (node = node[ dir ]) ) {
-									if ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) {
-										return false;
-									}
-								}
-								// Reverse direction for :only-* (if we haven't yet done so)
-								start = dir = type === "only" && !start && "nextSibling";
-							}
-							return true;
-						}
-
-						start = [ forward ? parent.firstChild : parent.lastChild ];
-
-						// non-xml :nth-child(...) stores cache data on `parent`
-						if ( forward && useCache ) {
-							// Seek `elem` from a previously-cached index
-							outerCache = parent[ expando ] || (parent[ expando ] = {});
-							cache = outerCache[ type ] || [];
-							nodeIndex = cache[0] === dirruns && cache[1];
-							diff = cache[0] === dirruns && cache[2];
-							node = nodeIndex && parent.childNodes[ nodeIndex ];
-
-							while ( (node = ++nodeIndex && node && node[ dir ] ||
-
-								// Fallback to seeking `elem` from the start
-								(diff = nodeIndex = 0) || start.pop()) ) {
-
-								// When found, cache indexes on `parent` and break
-								if ( node.nodeType === 1 && ++diff && node === elem ) {
-									outerCache[ type ] = [ dirruns, nodeIndex, diff ];
-									break;
-								}
-							}
-
-						// Use previously-cached element index if available
-						} else if ( useCache && (cache = (elem[ expando ] || (elem[ expando ] = {}))[ type ]) && cache[0] === dirruns ) {
-							diff = cache[1];
-
-						// xml :nth-child(...) or :nth-last-child(...) or :nth(-last)?-of-type(...)
-						} else {
-							// Use the same loop as above to seek `elem` from the start
-							while ( (node = ++nodeIndex && node && node[ dir ] ||
-								(diff = nodeIndex = 0) || start.pop()) ) {
-
-								if ( ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) && ++diff ) {
-									// Cache the index of each encountered element
-									if ( useCache ) {
-										(node[ expando ] || (node[ expando ] = {}))[ type ] = [ dirruns, diff ];
-									}
-
-									if ( node === elem ) {
-										break;
-									}
-								}
-							}
-						}
-
-						// Incorporate the offset, then check against cycle size
-						diff -= last;
-						return diff === first || ( diff % first === 0 && diff / first >= 0 );
-					}
-				};
-		},
-
-		"PSEUDO": function( pseudo, argument ) {
-			// pseudo-class names are case-insensitive
-			// http://www.w3.org/TR/selectors/#pseudo-classes
-			// Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
-			// Remember that setFilters inherits from pseudos
-			var args,
-				fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] ||
-					Sizzle.error( "unsupported pseudo: " + pseudo );
-
-			// The user may use createPseudo to indicate that
-			// arguments are needed to create the filter function
-			// just as Sizzle does
-			if ( fn[ expando ] ) {
-				return fn( argument );
-			}
-
-			// But maintain support for old signatures
-			if ( fn.length > 1 ) {
-				args = [ pseudo, pseudo, "", argument ];
-				return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ?
-					markFunction(function( seed, matches ) {
-						var idx,
-							matched = fn( seed, argument ),
-							i = matched.length;
-						while ( i-- ) {
-							idx = indexOf( seed, matched[i] );
-							seed[ idx ] = !( matches[ idx ] = matched[i] );
-						}
-					}) :
-					function( elem ) {
-						return fn( elem, 0, args );
-					};
-			}
-
-			return fn;
-		}
-	},
-
-	pseudos: {
-		// Potentially complex pseudos
-		"not": markFunction(function( selector ) {
-			// Trim the selector passed to compile
-			// to avoid treating leading and trailing
-			// spaces as combinators
-			var input = [],
-				results = [],
-				matcher = compile( selector.replace( rtrim, "$1" ) );
-
-			return matcher[ expando ] ?
-				markFunction(function( seed, matches, context, xml ) {
-					var elem,
-						unmatched = matcher( seed, null, xml, [] ),
-						i = seed.length;
-
-					// Match elements unmatched by `matcher`
-					while ( i-- ) {
-						if ( (elem = unmatched[i]) ) {
-							seed[i] = !(matches[i] = elem);
-						}
-					}
-				}) :
-				function( elem, context, xml ) {
-					input[0] = elem;
-					matcher( input, null, xml, results );
-					// Don't keep the element (issue #299)
-					input[0] = null;
-					return !results.pop();
-				};
-		}),
-
-		"has": markFunction(function( selector ) {
-			return function( elem ) {
-				return Sizzle( selector, elem ).length > 0;
-			};
-		}),
-
-		"contains": markFunction(function( text ) {
-			text = text.replace( runescape, funescape );
-			return function( elem ) {
-				return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1;
-			};
-		}),
-
-		// "Whether an element is represented by a :lang() selector
-		// is based solely on the element's language value
-		// being equal to the identifier C,
-		// or beginning with the identifier C immediately followed by "-".
-		// The matching of C against the element's language value is performed case-insensitively.
-		// The identifier C does not have to be a valid language name."
-		// http://www.w3.org/TR/selectors/#lang-pseudo
-		"lang": markFunction( function( lang ) {
-			// lang value must be a valid identifier
-			if ( !ridentifier.test(lang || "") ) {
-				Sizzle.error( "unsupported lang: " + lang );
-			}
-			lang = lang.replace( runescape, funescape ).toLowerCase();
-			return function( elem ) {
-				var elemLang;
-				do {
-					if ( (elemLang = documentIsHTML ?
-						elem.lang :
-						elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) {
-
-						elemLang = elemLang.toLowerCase();
-						return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0;
-					}
-				} while ( (elem = elem.parentNode) && elem.nodeType === 1 );
-				return false;
-			};
-		}),
-
-		// Miscellaneous
-		"target": function( elem ) {
-			var hash = window.location && window.location.hash;
-			return hash && hash.slice( 1 ) === elem.id;
-		},
-
-		"root": function( elem ) {
-			return elem === docElem;
-		},
-
-		"focus": function( elem ) {
-			return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex);
-		},
-
-		// Boolean properties
-		"enabled": function( elem ) {
-			return elem.disabled === false;
-		},
-
-		"disabled": function( elem ) {
-			return elem.disabled === true;
-		},
-
-		"checked": function( elem ) {
-			// In CSS3, :checked should return both checked and selected elements
-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-			var nodeName = elem.nodeName.toLowerCase();
-			return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected);
-		},
-
-		"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;
-		},
-
-		// Contents
-		"empty": function( elem ) {
-			// http://www.w3.org/TR/selectors/#empty-pseudo
-			// :empty is negated by element (1) or content nodes (text: 3; cdata: 4; entity ref: 5),
-			//   but not by others (comment: 8; processing instruction: 7; etc.)
-			// nodeType < 6 works because attributes (2) do not appear as children
-			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-				if ( elem.nodeType < 6 ) {
-					return false;
-				}
-			}
-			return true;
-		},
-
-		"parent": function( elem ) {
-			return !Expr.pseudos["empty"]( elem );
-		},
-
-		// Element/input types
-		"header": function( elem ) {
-			return rheader.test( elem.nodeName );
-		},
-
-		"input": function( elem ) {
-			return rinputs.test( elem.nodeName );
-		},
-
-		"button": function( elem ) {
-			var name = elem.nodeName.toLowerCase();
-			return name === "input" && elem.type === "button" || name === "button";
-		},
-
-		"text": function( elem ) {
-			var attr;
-			return elem.nodeName.toLowerCase() === "input" &&
-				elem.type === "text" &&
-
-				// Support: IE<8
-				// New HTML5 attribute values (e.g., "search") appear with elem.type === "text"
-				( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === "text" );
-		},
-
-		// Position-in-collection
-		"first": createPositionalPseudo(function() {
-			return [ 0 ];
-		}),
-
-		"last": createPositionalPseudo(function( matchIndexes, length ) {
-			return [ length - 1 ];
-		}),
-
-		"eq": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			return [ argument < 0 ? argument + length : argument ];
-		}),
-
-		"even": createPositionalPseudo(function( matchIndexes, length ) {
-			var i = 0;
-			for ( ; i < length; i += 2 ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"odd": createPositionalPseudo(function( matchIndexes, length ) {
-			var i = 1;
-			for ( ; i < length; i += 2 ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"lt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			var i = argument < 0 ? argument + length : argument;
-			for ( ; --i >= 0; ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"gt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			var i = argument < 0 ? argument + length : argument;
-			for ( ; ++i < length; ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		})
-	}
-};
-
-Expr.pseudos["nth"] = Expr.pseudos["eq"];
-
-// Add button/input type pseudos
-for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) {
-	Expr.pseudos[ i ] = createInputPseudo( i );
-}
-for ( i in { submit: true, reset: true } ) {
-	Expr.pseudos[ i ] = createButtonPseudo( i );
-}
-
-// Easy API for creating new setFilters
-function setFilters() {}
-setFilters.prototype = Expr.filters = Expr.pseudos;
-Expr.setFilters = new setFilters();
-
-tokenize = Sizzle.tokenize = function( selector, parseOnly ) {
-	var matched, match, tokens, type,
-		soFar, groups, preFilters,
-		cached = tokenCache[ selector + " " ];
-
-	if ( cached ) {
-		return parseOnly ? 0 : cached.slice( 0 );
-	}
-
-	soFar = selector;
-	groups = [];
-	preFilters = Expr.preFilter;
-
-	while ( soFar ) {
-
-		// Comma and first run
-		if ( !matched || (match = rcomma.exec( soFar )) ) {
-			if ( match ) {
-				// Don't consume trailing commas as valid
-				soFar = soFar.slice( match[0].length ) || soFar;
-			}
-			groups.push( (tokens = []) );
-		}
-
-		matched = false;
-
-		// Combinators
-		if ( (match = rcombinators.exec( soFar )) ) {
-			matched = match.shift();
-			tokens.push({
-				value: matched,
-				// Cast descendant combinators to space
-				type: match[0].replace( rtrim, " " )
-			});
-			soFar = soFar.slice( matched.length );
-		}
-
-		// Filters
-		for ( type in Expr.filter ) {
-			if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] ||
-				(match = preFilters[ type ]( match ))) ) {
-				matched = match.shift();
-				tokens.push({
-					value: matched,
-					type: type,
-					matches: match
-				});
-				soFar = soFar.slice( matched.length );
-			}
-		}
-
-		if ( !matched ) {
-			break;
-		}
-	}
-
-	// Return the length of the invalid excess
-	// if we're just parsing
-	// Otherwise, throw an error or return tokens
-	return parseOnly ?
-		soFar.length :
-		soFar ?
-			Sizzle.error( selector ) :
-			// Cache the tokens
-			tokenCache( selector, groups ).slice( 0 );
-};
-
-function toSelector( tokens ) {
-	var i = 0,
-		len = tokens.length,
-		selector = "";
-	for ( ; i < len; i++ ) {
-		selector += tokens[i].value;
-	}
-	return selector;
-}
-
-function addCombinator( matcher, combinator, base ) {
-	var dir = combinator.dir,
-		checkNonElements = base && dir === "parentNode",
-		doneName = done++;
-
-	return combinator.first ?
-		// Check against closest ancestor/preceding element
-		function( elem, context, xml ) {
-			while ( (elem = elem[ dir ]) ) {
-				if ( elem.nodeType === 1 || checkNonElements ) {
-					return matcher( elem, context, xml );
-				}
-			}
-		} :
-
-		// Check against all ancestor/preceding elements
-		function( elem, context, xml ) {
-			var oldCache, outerCache,
-				newCache = [ dirruns, doneName ];
-
-			// We can't set arbitrary data on XML nodes, so they don't benefit from dir caching
-			if ( xml ) {
-				while ( (elem = elem[ dir ]) ) {
-					if ( elem.nodeType === 1 || checkNonElements ) {
-						if ( matcher( elem, context, xml ) ) {
-							return true;
-						}
-					}
-				}
-			} else {
-				while ( (elem = elem[ dir ]) ) {
-					if ( elem.nodeType === 1 || checkNonElements ) {
-						outerCache = elem[ expando ] || (elem[ expando ] = {});
-						if ( (oldCache = outerCache[ dir ]) &&
-							oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) {
-
-							// Assign to newCache so results back-propagate to previous elements
-							return (newCache[ 2 ] = oldCache[ 2 ]);
-						} else {
-							// Reuse newcache so results back-propagate to previous elements
-							outerCache[ dir ] = newCache;
-
-							// A match means we're done; a fail means we have to keep checking
-							if ( (newCache[ 2 ] = matcher( elem, context, xml )) ) {
-								return true;
-							}
-						}
-					}
-				}
-			}
-		};
-}
-
-function elementMatcher( matchers ) {
-	return matchers.length > 1 ?
-		function( elem, context, xml ) {
-			var i = matchers.length;
-			while ( i-- ) {
-				if ( !matchers[i]( elem, context, xml ) ) {
-					return false;
-				}
-			}
-			return true;
-		} :
-		matchers[0];
-}
-
-function multipleContexts( selector, contexts, results ) {
-	var i = 0,
-		len = contexts.length;
-	for ( ; i < len; i++ ) {
-		Sizzle( selector, contexts[i], results );
-	}
-	return results;
-}
-
-function condense( unmatched, map, filter, context, xml ) {
-	var elem,
-		newUnmatched = [],
-		i = 0,
-		len = unmatched.length,
-		mapped = map != null;
-
-	for ( ; i < len; i++ ) {
-		if ( (elem = unmatched[i]) ) {
-			if ( !filter || filter( elem, context, xml ) ) {
-				newUnmatched.push( elem );
-				if ( mapped ) {
-					map.push( i );
-				}
-			}
-		}
-	}
-
-	return newUnmatched;
-}
-
-function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) {
-	if ( postFilter && !postFilter[ expando ] ) {
-		postFilter = setMatcher( postFilter );
-	}
-	if ( postFinder && !postFinder[ expando ] ) {
-		postFinder = setMatcher( postFinder, postSelector );
-	}
-	return markFunction(function( seed, results, context, xml ) {
-		var temp, i, elem,
-			preMap = [],
-			postMap = [],
-			preexisting = results.length,
-
-			// Get initial elements from seed or context
-			elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ),
-
-			// Prefilter to get matcher input, preserving a map for seed-results synchronization
-			matcherIn = preFilter && ( seed || !selector ) ?
-				condense( elems, preMap, preFilter, context, xml ) :
-				elems,
-
-			matcherOut = matcher ?
-				// If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results,
-				postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
-
-					// ...intermediate processing is necessary
-					[] :
-
-					// ...otherwise use results directly
-					results :
-				matcherIn;
-
-		// Find primary matches
-		if ( matcher ) {
-			matcher( matcherIn, matcherOut, context, xml );
-		}
-
-		// Apply postFilter
-		if ( postFilter ) {
-			temp = condense( matcherOut, postMap );
-			postFilter( temp, [], context, xml );
-
-			// Un-match failing elements by moving them back to matcherIn
-			i = temp.length;
-			while ( i-- ) {
-				if ( (elem = temp[i]) ) {
-					matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem);
-				}
-			}
-		}
-
-		if ( seed ) {
-			if ( postFinder || preFilter ) {
-				if ( postFinder ) {
-					// Get the final matcherOut by condensing this intermediate into postFinder contexts
-					temp = [];
-					i = matcherOut.length;
-					while ( i-- ) {
-						if ( (elem = matcherOut[i]) ) {
-							// Restore matcherIn since elem is not yet a final match
-							temp.push( (matcherIn[i] = elem) );
-						}
-					}
-					postFinder( null, (matcherOut = []), temp, xml );
-				}
-
-				// Move matched elements from seed to results to keep them synchronized
-				i = matcherOut.length;
-				while ( i-- ) {
-					if ( (elem = matcherOut[i]) &&
-						(temp = postFinder ? indexOf( seed, elem ) : preMap[i]) > -1 ) {
-
-						seed[temp] = !(results[temp] = elem);
-					}
-				}
-			}
-
-		// Add elements to results, through postFinder if defined
-		} else {
-			matcherOut = condense(
-				matcherOut === results ?
-					matcherOut.splice( preexisting, matcherOut.length ) :
-					matcherOut
-			);
-			if ( postFinder ) {
-				postFinder( null, results, matcherOut, xml );
-			} else {
-				push.apply( results, matcherOut );
-			}
-		}
-	});
-}
-
-function matcherFromTokens( tokens ) {
-	var checkContext, matcher, j,
-		len = tokens.length,
-		leadingRelative = Expr.relative[ tokens[0].type ],
-		implicitRelative = leadingRelative || Expr.relative[" "],
-		i = leadingRelative ? 1 : 0,
-
-		// The foundational matcher ensures that elements are reachable from top-level context(s)
-		matchContext = addCombinator( function( elem ) {
-			return elem === checkContext;
-		}, implicitRelative, true ),
-		matchAnyContext = addCombinator( function( elem ) {
-			return indexOf( checkContext, elem ) > -1;
-		}, implicitRelative, true ),
-		matchers = [ function( elem, context, xml ) {
-			var ret = ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
-				(checkContext = context).nodeType ?
-					matchContext( elem, context, xml ) :
-					matchAnyContext( elem, context, xml ) );
-			// Avoid hanging onto element (issue #299)
-			checkContext = null;
-			return ret;
-		} ];
-
-	for ( ; i < len; i++ ) {
-		if ( (matcher = Expr.relative[ tokens[i].type ]) ) {
-			matchers = [ addCombinator(elementMatcher( matchers ), matcher) ];
-		} else {
-			matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches );
-
-			// Return special upon seeing a positional matcher
-			if ( matcher[ expando ] ) {
-				// Find the next relative operator (if any) for proper handling
-				j = ++i;
-				for ( ; j < len; j++ ) {
-					if ( Expr.relative[ tokens[j].type ] ) {
-						break;
-					}
-				}
-				return setMatcher(
-					i > 1 && elementMatcher( matchers ),
-					i > 1 && toSelector(
-						// If the preceding token was a descendant combinator, insert an implicit any-element `*`
-						tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" })
-					).replace( rtrim, "$1" ),
-					matcher,
-					i < j && matcherFromTokens( tokens.slice( i, j ) ),
-					j < len && matcherFromTokens( (tokens = tokens.slice( j )) ),
-					j < len && toSelector( tokens )
-				);
-			}
-			matchers.push( matcher );
-		}
-	}
-
-	return elementMatcher( matchers );
-}
-
-function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
-	var bySet = setMatchers.length > 0,
-		byElement = elementMatchers.length > 0,
-		superMatcher = function( seed, context, xml, results, outermost ) {
-			var elem, j, matcher,
-				matchedCount = 0,
-				i = "0",
-				unmatched = seed && [],
-				setMatched = [],
-				contextBackup = outermostContext,
-				// We must always have either seed elements or outermost context
-				elems = seed || byElement && Expr.find["TAG"]( "*", outermost ),
-				// Use integer dirruns iff this is the outermost matcher
-				dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1),
-				len = elems.length;
-
-			if ( outermost ) {
-				outermostContext = context !== document && context;
-			}
-
-			// Add elements passing elementMatchers directly to results
-			// Keep `i` a string if there are no elements so `matchedCount` will be "00" below
-			// Support: IE<9, Safari
-			// Tolerate NodeList properties (IE: "length"; Safari: <number>) matching elements by id
-			for ( ; i !== len && (elem = elems[i]) != null; i++ ) {
-				if ( byElement && elem ) {
-					j = 0;
-					while ( (matcher = elementMatchers[j++]) ) {
-						if ( matcher( elem, context, xml ) ) {
-							results.push( elem );
-							break;
-						}
-					}
-					if ( outermost ) {
-						dirruns = dirrunsUnique;
-					}
-				}
-
-				// Track unmatched elements for set filters
-				if ( bySet ) {
-					// They will have gone through all possible matchers
-					if ( (elem = !matcher && elem) ) {
-						matchedCount--;
-					}
-
-					// Lengthen the array for every element, matched or not
-					if ( seed ) {
-						unmatched.push( elem );
-					}
-				}
-			}
-
-			// Apply set filters to unmatched elements
-			matchedCount += i;
-			if ( bySet && i !== matchedCount ) {
-				j = 0;
-				while ( (matcher = setMatchers[j++]) ) {
-					matcher( unmatched, setMatched, context, xml );
-				}
-
-				if ( seed ) {
-					// Reintegrate element matches to eliminate the need for sorting
-					if ( matchedCount > 0 ) {
-						while ( i-- ) {
-							if ( !(unmatched[i] || setMatched[i]) ) {
-								setMatched[i] = pop.call( results );
-							}
-						}
-					}
-
-					// Discard index placeholder values to get only actual matches
-					setMatched = condense( setMatched );
-				}
-
-				// Add matches to results
-				push.apply( results, setMatched );
-
-				// Seedless set matches succeeding multiple successful matchers stipulate sorting
-				if ( outermost && !seed && setMatched.length > 0 &&
-					( matchedCount + setMatchers.length ) > 1 ) {
-
-					Sizzle.uniqueSort( results );
-				}
-			}
-
-			// Override manipulation of globals by nested matchers
-			if ( outermost ) {
-				dirruns = dirrunsUnique;
-				outermostContext = contextBackup;
-			}
-
-			return unmatched;
-		};
-
-	return bySet ?
-		markFunction( superMatcher ) :
-		superMatcher;
-}
-
-compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) {
-	var i,
-		setMatchers = [],
-		elementMatchers = [],
-		cached = compilerCache[ selector + " " ];
-
-	if ( !cached ) {
-		// Generate a function of recursive functions that can be used to check each element
-		if ( !match ) {
-			match = tokenize( selector );
-		}
-		i = match.length;
-		while ( i-- ) {
-			cached = matcherFromTokens( match[i] );
-			if ( cached[ expando ] ) {
-				setMatchers.push( cached );
-			} else {
-				elementMatchers.push( cached );
-			}
-		}
-
-		// Cache the compiled function
-		cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) );
-
-		// Save selector and tokenization
-		cached.selector = selector;
-	}
-	return cached;
-};
-
-/**
- * A low-level selection function that works with Sizzle's compiled
- *  selector functions
- * @param {String|Function} selector A selector or a pre-compiled
- *  selector function built with Sizzle.compile
- * @param {Element} context
- * @param {Array} [results]
- * @param {Array} [seed] A set of elements to match against
- */
-select = Sizzle.select = function( selector, context, results, seed ) {
-	var i, tokens, token, type, find,
-		compiled = typeof selector === "function" && selector,
-		match = !seed && tokenize( (selector = compiled.selector || selector) );
-
-	results = results || [];
-
-	// Try to minimize operations if there is no seed and only one group
-	if ( match.length === 1 ) {
-
-		// Take a shortcut and set the context if the root selector is an ID
-		tokens = match[0] = match[0].slice( 0 );
-		if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
-				support.getById && context.nodeType === 9 && documentIsHTML &&
-				Expr.relative[ tokens[1].type ] ) {
-
-			context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0];
-			if ( !context ) {
-				return results;
-
-			// Precompiled matchers will still verify ancestry, so step up a level
-			} else if ( compiled ) {
-				context = context.parentNode;
-			}
-
-			selector = selector.slice( tokens.shift().value.length );
-		}
-
-		// Fetch a seed set for right-to-left matching
-		i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length;
-		while ( i-- ) {
-			token = tokens[i];
-
-			// Abort if we hit a combinator
-			if ( Expr.relative[ (type = token.type) ] ) {
-				break;
-			}
-			if ( (find = Expr.find[ type ]) ) {
-				// Search, expanding context for leading sibling combinators
-				if ( (seed = find(
-					token.matches[0].replace( runescape, funescape ),
-					rsibling.test( tokens[0].type ) && testContext( context.parentNode ) || context
-				)) ) {
-
-					// If seed is empty or no tokens remain, we can return early
-					tokens.splice( i, 1 );
-					selector = seed.length && toSelector( tokens );
-					if ( !selector ) {
-						push.apply( results, seed );
-						return results;
-					}
-
-					break;
-				}
-			}
-		}
-	}
-
-	// Compile and execute a filtering function if one is not provided
-	// Provide `match` to avoid retokenization if we modified the selector above
-	( compiled || compile( selector, match ) )(
-		seed,
-		context,
-		!documentIsHTML,
-		results,
-		rsibling.test( selector ) && testContext( context.parentNode ) || context
-	);
-	return results;
-};
-
-// One-time assignments
-
-// Sort stability
-support.sortStable = expando.split("").sort( sortOrder ).join("") === expando;
-
-// Support: Chrome 14-35+
-// Always assume duplicates if they aren't passed to the comparison function
-support.detectDuplicates = !!hasDuplicate;
-
-// Initialize against the default document
-setDocument();
-
-// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27)
-// Detached nodes confoundingly follow *each other*
-support.sortDetached = assert(function( div1 ) {
-	// Should return 1, but returns 4 (following)
-	return div1.compareDocumentPosition( document.createElement("div") ) & 1;
-});
-
-// Support: IE<8
-// Prevent attribute/property "interpolation"
-// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
-if ( !assert(function( div ) {
-	div.innerHTML = "<a href='#'></a>";
-	return div.firstChild.getAttribute("href") === "#" ;
-}) ) {
-	addHandle( "type|href|height|width", function( elem, name, isXML ) {
-		if ( !isXML ) {
-			return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 );
-		}
-	});
-}
-
-// Support: IE<9
-// Use defaultValue in place of getAttribute("value")
-if ( !support.attributes || !assert(function( div ) {
-	div.innerHTML = "<input/>";
-	div.firstChild.setAttribute( "value", "" );
-	return div.firstChild.getAttribute( "value" ) === "";
-}) ) {
-	addHandle( "value", function( elem, name, isXML ) {
-		if ( !isXML && elem.nodeName.toLowerCase() === "input" ) {
-			return elem.defaultValue;
-		}
-	});
-}
-
-// Support: IE<9
-// Use getAttributeNode to fetch booleans when getAttribute lies
-if ( !assert(function( div ) {
-	return div.getAttribute("disabled") == null;
-}) ) {
-	addHandle( booleans, function( elem, name, isXML ) {
-		var val;
-		if ( !isXML ) {
-			return elem[ name ] === true ? name.toLowerCase() :
-					(val = elem.getAttributeNode( name )) && val.specified ?
-					val.value :
-				null;
-		}
-	});
-}
-
-return Sizzle;
-
-})( window );
-
-
-
-jQuery.find = Sizzle;
-jQuery.expr = Sizzle.selectors;
-jQuery.expr[":"] = jQuery.expr.pseudos;
-jQuery.unique = Sizzle.uniqueSort;
-jQuery.text = Sizzle.getText;
-jQuery.isXMLDoc = Sizzle.isXML;
-jQuery.contains = Sizzle.contains;
-
-
-
-var rneedsContext = jQuery.expr.match.needsContext;
-
-var rsingleTag = (/^<(\w+)\s*\/?>(?:<\/\1>|)$/);
-
-
-
-var risSimple = /^.[^:#\[\.,]*$/;
-
-// Implement the identical functionality for filter and not
-function winnow( elements, qualifier, not ) {
-	if ( jQuery.isFunction( qualifier ) ) {
-		return jQuery.grep( elements, function( elem, i ) {
-			/* jshint -W018 */
-			return !!qualifier.call( elem, i, elem ) !== not;
-		});
-
-	}
-
-	if ( qualifier.nodeType ) {
-		return jQuery.grep( elements, function( elem ) {
-			return ( elem === qualifier ) !== not;
-		});
-
-	}
-
-	if ( typeof qualifier === "string" ) {
-		if ( risSimple.test( qualifier ) ) {
-			return jQuery.filter( qualifier, elements, not );
-		}
-
-		qualifier = jQuery.filter( qualifier, elements );
-	}
-
-	return jQuery.grep( elements, function( elem ) {
-		return ( indexOf.call( qualifier, elem ) >= 0 ) !== not;
-	});
-}
-
-jQuery.filter = function( expr, elems, not ) {
-	var elem = elems[ 0 ];
-
-	if ( not ) {
-		expr = ":not(" + expr + ")";
-	}
-
-	return elems.length === 1 && elem.nodeType === 1 ?
-		jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [] :
-		jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) {
-			return elem.nodeType === 1;
-		}));
-};
-
-jQuery.fn.extend({
-	find: function( selector ) {
-		var i,
-			len = this.length,
-			ret = [],
-			self = this;
-
-		if ( typeof selector !== "string" ) {
-			return this.pushStack( jQuery( selector ).filter(function() {
-				for ( i = 0; i < len; i++ ) {
-					if ( jQuery.contains( self[ i ], this ) ) {
-						return true;
-					}
-				}
-			}) );
-		}
-
-		for ( i = 0; i < len; i++ ) {
-			jQuery.find( selector, self[ i ], ret );
-		}
-
-		// Needed because $( selector, context ) becomes $( context ).find( selector )
-		ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret );
-		ret.selector = this.selector ? this.selector + " " + selector : selector;
-		return ret;
-	},
-	filter: function( selector ) {
-		return this.pushStack( winnow(this, selector || [], false) );
-	},
-	not: function( selector ) {
-		return this.pushStack( winnow(this, selector || [], true) );
-	},
-	is: function( selector ) {
-		return !!winnow(
-			this,
-
-			// If this is a positional/relative selector, check membership in the returned set
-			// so $("p:first").is("p:last") won't return true for a doc with two "p".
-			typeof selector === "string" && rneedsContext.test( selector ) ?
-				jQuery( selector ) :
-				selector || [],
-			false
-		).length;
-	}
-});
-
-
-// Initialize a jQuery object
-
-
-// A central reference to the root jQuery(document)
-var rootjQuery,
-
-	// A simple way to check for HTML strings
-	// Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
-	// Strict HTML recognition (#11290: must start with <)
-	rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,
-
-	init = jQuery.fn.init = function( selector, context ) {
-		var match, elem;
-
-		// HANDLE: $(""), $(null), $(undefined), $(false)
-		if ( !selector ) {
-			return this;
-		}
-
-		// Handle HTML strings
-		if ( typeof selector === "string" ) {
-			if ( selector[0] === "<" && selector[ 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 = rquickExpr.exec( selector );
-			}
-
-			// Match html or make sure no context is specified for #id
-			if ( match && (match[1] || !context) ) {
-
-				// HANDLE: $(html) -> $(array)
-				if ( match[1] ) {
-					context = context instanceof jQuery ? context[0] : context;
-
-					// Option to run scripts is true for back-compat
-					// Intentionally let the error be thrown if parseHTML is not present
-					jQuery.merge( this, jQuery.parseHTML(
-						match[1],
-						context && context.nodeType ? context.ownerDocument || context : document,
-						true
-					) );
-
-					// HANDLE: $(html, props)
-					if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) {
-						for ( match in context ) {
-							// Properties of context are called as methods if possible
-							if ( jQuery.isFunction( this[ match ] ) ) {
-								this[ match ]( context[ match ] );
-
-							// ...and otherwise set as attributes
-							} else {
-								this.attr( match, context[ match ] );
-							}
-						}
-					}
-
-					return this;
-
-				// HANDLE: $(#id)
-				} else {
-					elem = document.getElementById( match[2] );
-
-					// Support: Blackberry 4.6
-					// gEBID returns nodes no longer in the document (#6963)
-					if ( elem && elem.parentNode ) {
-						// 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: $(DOMElement)
-		} else if ( selector.nodeType ) {
-			this.context = this[0] = selector;
-			this.length = 1;
-			return this;
-
-		// HANDLE: $(function)
-		// Shortcut for document ready
-		} else if ( jQuery.isFunction( selector ) ) {
-			return typeof rootjQuery.ready !== "undefined" ?
-				rootjQuery.ready( selector ) :
-				// Execute immediately if ready is not present
-				selector( jQuery );
-		}
-
-		if ( selector.selector !== undefined ) {
-			this.selector = selector.selector;
-			this.context = selector.context;
-		}
-
-		return jQuery.makeArray( selector, this );
-	};
-
-// Give the init function the jQuery prototype for later instantiation
-init.prototype = jQuery.fn;
-
-// Initialize central reference
-rootjQuery = jQuery( document );
-
-
-var rparentsprev = /^(?:parents|prev(?:Until|All))/,
-	// Methods guaranteed to produce a unique set when starting from a unique set
-	guaranteedUnique = {
-		children: true,
-		contents: true,
-		next: true,
-		prev: true
-	};
-
-jQuery.extend({
-	dir: function( elem, dir, until ) {
-		var matched = [],
-			truncate = until !== undefined;
-
-		while ( (elem = elem[ dir ]) && elem.nodeType !== 9 ) {
-			if ( elem.nodeType === 1 ) {
-				if ( truncate && jQuery( elem ).is( until ) ) {
-					break;
-				}
-				matched.push( elem );
-			}
-		}
-		return matched;
-	},
-
-	sibling: function( n, elem ) {
-		var matched = [];
-
-		for ( ; n; n = n.nextSibling ) {
-			if ( n.nodeType === 1 && n !== elem ) {
-				matched.push( n );
-			}
-		}
-
-		return matched;
-	}
-});
-
-jQuery.fn.extend({
-	has: function( target ) {
-		var targets = jQuery( target, this ),
-			l = targets.length;
-
-		return this.filter(function() {
-			var i = 0;
-			for ( ; i < l; i++ ) {
-				if ( jQuery.contains( this, targets[i] ) ) {
-					return true;
-				}
-			}
-		});
-	},
-
-	closest: function( selectors, context ) {
-		var cur,
-			i = 0,
-			l = this.length,
-			matched = [],
-			pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ?
-				jQuery( selectors, context || this.context ) :
-				0;
-
-		for ( ; i < l; i++ ) {
-			for ( cur = this[i]; cur && cur !== context; cur = cur.parentNode ) {
-				// Always skip document fragments
-				if ( cur.nodeType < 11 && (pos ?
-					pos.index(cur) > -1 :
-
-					// Don't pass non-elements to Sizzle
-					cur.nodeType === 1 &&
-						jQuery.find.matchesSelector(cur, selectors)) ) {
-
-					matched.push( cur );
-					break;
-				}
-			}
-		}
-
-		return this.pushStack( matched.length > 1 ? jQuery.unique( matched ) : matched );
-	},
-
-	// Determine the position of an element within the set
-	index: function( elem ) {
-
-		// No argument, return index in parent
-		if ( !elem ) {
-			return ( this[ 0 ] && this[ 0 ].parentNode ) ? this.first().prevAll().length : -1;
-		}
-
-		// Index in selector
-		if ( typeof elem === "string" ) {
-			return indexOf.call( jQuery( elem ), this[ 0 ] );
-		}
-
-		// Locate the position of the desired element
-		return indexOf.call( this,
-
-			// If it receives a jQuery object, the first element is used
-			elem.jquery ? elem[ 0 ] : elem
-		);
-	},
-
-	add: function( selector, context ) {
-		return this.pushStack(
-			jQuery.unique(
-				jQuery.merge( this.get(), jQuery( selector, context ) )
-			)
-		);
-	},
-
-	addBack: function( selector ) {
-		return this.add( selector == null ?
-			this.prevObject : this.prevObject.filter(selector)
-		);
-	}
-});
-
-function sibling( cur, dir ) {
-	while ( (cur = cur[dir]) && cur.nodeType !== 1 ) {}
-	return cur;
-}
-
-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 sibling( elem, "nextSibling" );
-	},
-	prev: function( elem ) {
-		return sibling( elem, "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 elem.contentDocument || jQuery.merge( [], elem.childNodes );
-	}
-}, function( name, fn ) {
-	jQuery.fn[ name ] = function( until, selector ) {
-		var matched = jQuery.map( this, fn, until );
-
-		if ( name.slice( -5 ) !== "Until" ) {
-			selector = until;
-		}
-
-		if ( selector && typeof selector === "string" ) {
-			matched = jQuery.filter( selector, matched );
-		}
-
-		if ( this.length > 1 ) {
-			// Remove duplicates
-			if ( !guaranteedUnique[ name ] ) {
-				jQuery.unique( matched );
-			}
-
-			// Reverse order for parents* and prev-derivatives
-			if ( rparentsprev.test( name ) ) {
-				matched.reverse();
-			}
-		}
-
-		return this.pushStack( matched );
-	};
-});
-var rnotwhite = (/\S+/g);
-
-
-
-// String to Object options format cache
-var optionsCache = {};
-
-// Convert String-formatted options into Object-formatted ones and store in cache
-function createOptions( options ) {
-	var object = optionsCache[ options ] = {};
-	jQuery.each( options.match( rnotwhite ) || [], function( _, flag ) {
-		object[ flag ] = true;
-	});
-	return object;
-}
-
-/*
- * Create a callback list using the following parameters:
- *
- *	options: an optional list of space-separated options that will change how
- *			the callback list behaves or a more traditional option object
- *
- * By default a callback list will act like an event callback list and can be
- * "fired" multiple times.
- *
- * Possible options:
- *
- *	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( options ) {
-
-	// Convert options from String-formatted to Object-formatted if needed
-	// (we check in cache first)
-	options = typeof options === "string" ?
-		( optionsCache[ options ] || createOptions( options ) ) :
-		jQuery.extend( {}, options );
-
-	var // 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,
-		// Actual callback list
-		list = [],
-		// Stack of fire calls for repeatable lists
-		stack = !options.once && [],
-		// Fire callbacks
-		fire = function( data ) {
-			memory = options.memory && data;
-			fired = true;
-			firingIndex = firingStart || 0;
-			firingStart = 0;
-			firingLength = list.length;
-			firing = true;
-			for ( ; list && firingIndex < firingLength; firingIndex++ ) {
-				if ( list[ firingIndex ].apply( data[ 0 ], data[ 1 ] ) === false && options.stopOnFalse ) {
-					memory = false; // To prevent further calls using add
-					break;
-				}
-			}
-			firing = false;
-			if ( list ) {
-				if ( stack ) {
-					if ( stack.length ) {
-						fire( stack.shift() );
-					}
-				} else if ( memory ) {
-					list = [];
-				} else {
-					self.disable();
-				}
-			}
-		},
-		// Actual Callbacks object
-		self = {
-			// Add a callback or a collection of callbacks to the list
-			add: function() {
-				if ( list ) {
-					// First, we save the current length
-					var start = list.length;
-					(function add( args ) {
-						jQuery.each( args, function( _, arg ) {
-							var type = jQuery.type( arg );
-							if ( type === "function" ) {
-								if ( !options.unique || !self.has( arg ) ) {
-									list.push( arg );
-								}
-							} else if ( arg && arg.length && type !== "string" ) {
-								// Inspect recursively
-								add( arg );
-							}
-						});
-					})( 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
-					} else if ( memory ) {
-						firingStart = start;
-						fire( memory );
-					}
-				}
-				return this;
-			},
-			// Remove a callback from the list
-			remove: function() {
-				if ( list ) {
-					jQuery.each( arguments, function( _, arg ) {
-						var index;
-						while ( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) {
-							list.splice( index, 1 );
-							// Handle firing indexes
-							if ( firing ) {
-								if ( index <= firingLength ) {
-									firingLength--;
-								}
-								if ( index <= firingIndex ) {
-									firingIndex--;
-								}
-							}
-						}
-					});
-				}
-				return this;
-			},
-			// Check if a given callback is in the list.
-			// If no argument is given, return whether or not list has callbacks attached.
-			has: function( fn ) {
-				return fn ? jQuery.inArray( fn, list ) > -1 : !!( list && list.length );
-			},
-			// Remove all callbacks from the list
-			empty: function() {
-				list = [];
-				firingLength = 0;
-				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 ) {
-					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 ( list && ( !fired || stack ) ) {
-					args = args || [];
-					args = [ context, args.slice ? args.slice() : args ];
-					if ( firing ) {
-						stack.push( args );
-					} else {
-						fire( 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;
-};
-
-
-jQuery.extend({
-
-	Deferred: function( func ) {
-		var tuples = [
-				// action, add listener, listener list, final state
-				[ "resolve", "done", jQuery.Callbacks("once memory"), "resolved" ],
-				[ "reject", "fail", jQuery.Callbacks("once memory"), "rejected" ],
-				[ "notify", "progress", jQuery.Callbacks("memory") ]
-			],
-			state = "pending",
-			promise = {
-				state: function() {
-					return state;
-				},
-				always: function() {
-					deferred.done( arguments ).fail( arguments );
-					return this;
-				},
-				then: function( /* fnDone, fnFail, fnProgress */ ) {
-					var fns = arguments;
-					return jQuery.Deferred(function( newDefer ) {
-						jQuery.each( tuples, function( i, tuple ) {
-							var fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
-							// deferred[ done | fail | progress ] for forwarding actions to newDefer
-							deferred[ tuple[1] ](function() {
-								var returned = fn && fn.apply( this, arguments );
-								if ( returned && jQuery.isFunction( returned.promise ) ) {
-									returned.promise()
-										.done( newDefer.resolve )
-										.fail( newDefer.reject )
-										.progress( newDefer.notify );
-								} else {
-									newDefer[ tuple[ 0 ] + "With" ]( this === promise ? newDefer.promise() : this, fn ? [ returned ] : arguments );
-								}
-							});
-						});
-						fns = null;
-					}).promise();
-				},
-				// Get a promise for this deferred
-				// If obj is provided, the promise aspect is added to the object
-				promise: function( obj ) {
-					return obj != null ? jQuery.extend( obj, promise ) : promise;
-				}
-			},
-			deferred = {};
-
-		// Keep pipe for back-compat
-		promise.pipe = promise.then;
-
-		// Add list-specific methods
-		jQuery.each( tuples, function( i, tuple ) {
-			var list = tuple[ 2 ],
-				stateString = tuple[ 3 ];
-
-			// promise[ done | fail | progress ] = list.add
-			promise[ tuple[1] ] = list.add;
-
-			// Handle state
-			if ( stateString ) {
-				list.add(function() {
-					// state = [ resolved | rejected ]
-					state = stateString;
-
-				// [ reject_list | resolve_list ].disable; progress_list.lock
-				}, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock );
-			}
-
-			// deferred[ resolve | reject | notify ]
-			deferred[ tuple[0] ] = function() {
-				deferred[ tuple[0] + "With" ]( this === deferred ? promise : this, arguments );
-				return this;
-			};
-			deferred[ tuple[0] + "With" ] = list.fireWith;
-		});
-
-		// Make the deferred a promise
-		promise.promise( deferred );
-
-		// Call given func if any
-		if ( func ) {
-			func.call( deferred, deferred );
-		}
-
-		// All done!
-		return deferred;
-	},
-
-	// Deferred helper
-	when: function( subordinate /* , ..., subordinateN */ ) {
-		var i = 0,
-			resolveValues = slice.call( arguments ),
-			length = resolveValues.length,
-
-			// the count of uncompleted subordinates
-			remaining = length !== 1 || ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0,
-
-			// the master Deferred. If resolveValues consist of only a single Deferred, just use that.
-			deferred = remaining === 1 ? subordinate : jQuery.Deferred(),
-
-			// Update function for both resolve and progress values
-			updateFunc = function( i, contexts, values ) {
-				return function( value ) {
-					contexts[ i ] = this;
-					values[ i ] = arguments.length > 1 ? slice.call( arguments ) : value;
-					if ( values === progressValues ) {
-						deferred.notifyWith( contexts, values );
-					} else if ( !( --remaining ) ) {
-						deferred.resolveWith( contexts, values );
-					}
-				};
-			},
-
-			progressValues, progressContexts, resolveContexts;
-
-		// Add listeners to Deferred subordinates; treat others as resolved
-		if ( length > 1 ) {
-			progressValues = new Array( length );
-			progressContexts = new Array( length );
-			resolveContexts = new Array( length );
-			for ( ; i < length; i++ ) {
-				if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) {
-					resolveValues[ i ].promise()
-						.done( updateFunc( i, resolveContexts, resolveValues ) )
-						.fail( deferred.reject )
-						.progress( updateFunc( i, progressContexts, progressValues ) );
-				} else {
-					--remaining;
-				}
-			}
-		}
-
-		// If we're not waiting on anything, resolve the master
-		if ( !remaining ) {
-			deferred.resolveWith( resolveContexts, resolveValues );
-		}
-
-		return deferred.promise();
-	}
-});
-
-
-// The deferred used on DOM ready
-var readyList;
-
-jQuery.fn.ready = function( fn ) {
-	// Add the callback
-	jQuery.ready.promise().done( fn );
-
-	return this;
-};
-
-jQuery.extend({
-	// 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 ) {
-
-		// Abort if there are pending holds or we're already ready
-		if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) {
-			return;
-		}
-
-		// 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.resolveWith( document, [ jQuery ] );
-
-		// Trigger any bound ready events
-		if ( jQuery.fn.triggerHandler ) {
-			jQuery( document ).triggerHandler( "ready" );
-			jQuery( document ).off( "ready" );
-		}
-	}
-});
-
-/**
- * The ready event handler and self cleanup method
- */
-function completed() {
-	document.removeEventListener( "DOMContentLoaded", completed, false );
-	window.removeEventListener( "load", completed, false );
-	jQuery.ready();
-}
-
-jQuery.ready.promise = function( obj ) {
-	if ( !readyList ) {
-
-		readyList = jQuery.Deferred();
-
-		// Catch cases where $(document).ready() is called after the browser event has already occurred.
-		// We once tried to use readyState "interactive" here, but it caused issues like the one
-		// discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15
-		if ( document.readyState === "complete" ) {
-			// Handle it asynchronously to allow scripts the opportunity to delay ready
-			setTimeout( jQuery.ready );
-
-		} else {
-
-			// Use the handy event callback
-			document.addEventListener( "DOMContentLoaded", completed, false );
-
-			// A fallback to window.onload, that will always work
-			window.addEventListener( "load", completed, false );
-		}
-	}
-	return readyList.promise( obj );
-};
-
-// Kick off the DOM ready check even if the user does not
-jQuery.ready.promise();
-
-
-
-
-// Multifunctional method to get and set values of a collection
-// The value/s can optionally be executed if it's a function
-var access = jQuery.access = function( elems, fn, key, value, chainable, emptyGet, raw ) {
-	var i = 0,
-		len = elems.length,
-		bulk = key == null;
-
-	// Sets many values
-	if ( jQuery.type( key ) === "object" ) {
-		chainable = true;
-		for ( i in key ) {
-			jQuery.access( elems, fn, i, key[i], true, emptyGet, raw );
-		}
-
-	// Sets one value
-	} else if ( value !== undefined ) {
-		chainable = true;
-
-		if ( !jQuery.isFunction( value ) ) {
-			raw = true;
-		}
-
-		if ( bulk ) {
-			// Bulk operations run against the entire set
-			if ( raw ) {
-				fn.call( elems, value );
-				fn = null;
-
-			// ...except when executing function values
-			} else {
-				bulk = fn;
-				fn = function( elem, key, value ) {
-					return bulk.call( jQuery( elem ), value );
-				};
-			}
-		}
-
-		if ( fn ) {
-			for ( ; i < len; i++ ) {
-				fn( elems[i], key, raw ? value : value.call( elems[i], i, fn( elems[i], key ) ) );
-			}
-		}
-	}
-
-	return chainable ?
-		elems :
-
-		// Gets
-		bulk ?
-			fn.call( elems ) :
-			len ? fn( elems[0], key ) : emptyGet;
-};
-
-
-/**
- * Determines whether an object can have data
- */
-jQuery.acceptData = function( owner ) {
-	// Accepts only:
-	//  - Node
-	//    - Node.ELEMENT_NODE
-	//    - Node.DOCUMENT_NODE
-	//  - Object
-	//    - Any
-	/* jshint -W018 */
-	return owner.nodeType === 1 || owner.nodeType === 9 || !( +owner.nodeType );
-};
-
-
-function Data() {
-	// Support: Android<4,
-	// Old WebKit does not have Object.preventExtensions/freeze method,
-	// return new empty object instead with no [[set]] accessor
-	Object.defineProperty( this.cache = {}, 0, {
-		get: function() {
-			return {};
-		}
-	});
-
-	this.expando = jQuery.expando + Data.uid++;
-}
-
-Data.uid = 1;
-Data.accepts = jQuery.acceptData;
-
-Data.prototype = {
-	key: function( owner ) {
-		// We can accept data for non-element nodes in modern browsers,
-		// but we should not, see #8335.
-		// Always return the key for a frozen object.
-		if ( !Data.accepts( owner ) ) {
-			return 0;
-		}
-
-		var descriptor = {},
-			// Check if the owner object already has a cache key
-			unlock = owner[ this.expando ];
-
-		// If not, create one
-		if ( !unlock ) {
-			unlock = Data.uid++;
-
-			// Secure it in a non-enumerable, non-writable property
-			try {
-				descriptor[ this.expando ] = { value: unlock };
-				Object.defineProperties( owner, descriptor );
-
-			// Support: Android<4
-			// Fallback to a less secure definition
-			} catch ( e ) {
-				descriptor[ this.expando ] = unlock;
-				jQuery.extend( owner, descriptor );
-			}
-		}
-
-		// Ensure the cache object
-		if ( !this.cache[ unlock ] ) {
-			this.cache[ unlock ] = {};
-		}
-
-		return unlock;
-	},
-	set: function( owner, data, value ) {
-		var prop,
-			// There may be an unlock assigned to this node,
-			// if there is no entry for this "owner", create one inline
-			// and set the unlock as though an owner entry had always existed
-			unlock = this.key( owner ),
-			cache = this.cache[ unlock ];
-
-		// Handle: [ owner, key, value ] args
-		if ( typeof data === "string" ) {
-			cache[ data ] = value;
-
-		// Handle: [ owner, { properties } ] args
-		} else {
-			// Fresh assignments by object are shallow copied
-			if ( jQuery.isEmptyObject( cache ) ) {
-				jQuery.extend( this.cache[ unlock ], data );
-			// Otherwise, copy the properties one-by-one to the cache object
-			} else {
-				for ( prop in data ) {
-					cache[ prop ] = data[ prop ];
-				}
-			}
-		}
-		return cache;
-	},
-	get: function( owner, key ) {
-		// Either a valid cache is found, or will be created.
-		// New caches will be created and the unlock returned,
-		// allowing direct access to the newly created
-		// empty data object. A valid owner object must be provided.
-		var cache = this.cache[ this.key( owner ) ];
-
-		return key === undefined ?
-			cache : cache[ key ];
-	},
-	access: function( owner, key, value ) {
-		var stored;
-		// In cases where either:
-		//
-		//   1. No key was specified
-		//   2. A string key was specified, but no value provided
-		//
-		// Take the "read" path and allow the get method to determine
-		// which value to return, respectively either:
-		//
-		//   1. The entire cache object
-		//   2. The data stored at the key
-		//
-		if ( key === undefined ||
-				((key && typeof key === "string") && value === undefined) ) {
-
-			stored = this.get( owner, key );
-
-			return stored !== undefined ?
-				stored : this.get( owner, jQuery.camelCase(key) );
-		}
-
-		// [*]When the key is not a string, or both a key and value
-		// are specified, set or extend (existing objects) with either:
-		//
-		//   1. An object of properties
-		//   2. A key and value
-		//
-		this.set( owner, key, value );
-
-		// Since the "set" path can have two possible entry points
-		// return the expected data based on which path was taken[*]
-		return value !== undefined ? value : key;
-	},
-	remove: function( owner, key ) {
-		var i, name, camel,
-			unlock = this.key( owner ),
-			cache = this.cache[ unlock ];
-
-		if ( key === undefined ) {
-			this.cache[ unlock ] = {};
-
-		} else {
-			// Support array or space separated string of keys
-			if ( jQuery.isArray( key ) ) {
-				// If "name" is an array of keys...
-				// When data is initially created, via ("key", "val") signature,
-				// keys will be converted to camelCase.
-				// Since there is no way to tell _how_ a key was added, remove
-				// both plain key and camelCase key. #12786
-				// This will only penalize the array argument path.
-				name = key.concat( key.map( jQuery.camelCase ) );
-			} else {
-				camel = jQuery.camelCase( key );
-				// Try the string as a key before any manipulation
-				if ( key in cache ) {
-					name = [ key, camel ];
-				} else {
-					// If a key with the spaces exists, use it.
-					// Otherwise, create an array by matching non-whitespace
-					name = camel;
-					name = name in cache ?
-						[ name ] : ( name.match( rnotwhite ) || [] );
-				}
-			}
-
-			i = name.length;
-			while ( i-- ) {
-				delete cache[ name[ i ] ];
-			}
-		}
-	},
-	hasData: function( owner ) {
-		return !jQuery.isEmptyObject(
-			this.cache[ owner[ this.expando ] ] || {}
-		);
-	},
-	discard: function( owner ) {
-		if ( owner[ this.expando ] ) {
-			delete this.cache[ owner[ this.expando ] ];
-		}
-	}
-};
-var data_priv = new Data();
-
-var data_user = new Data();
-
-
-
-//	Implementation Summary
-//
-//	1. Enforce API surface and semantic compatibility with 1.9.x branch
-//	2. Improve the module's maintainability by reducing the storage
-//		paths to a single mechanism.
-//	3. Use the same single mechanism to support "private" and "user" data.
-//	4. _Never_ expose "private" data to user code (TODO: Drop _data, _removeData)
-//	5. Avoid exposing implementation details on user objects (eg. expando properties)
-//	6. Provide a clear path for implementation upgrade to WeakMap in 2014
-
-var rbrace = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,
-	rmultiDash = /([A-Z])/g;
-
-function dataAttr( elem, key, data ) {
-	var name;
-
-	// If nothing was found internally, try to fetch any
-	// data from the HTML5 data-* attribute
-	if ( data === undefined && elem.nodeType === 1 ) {
-		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 :
-					// Only convert to a number if it doesn't change the string
-					+data + "" === data ? +data :
-					rbrace.test( data ) ? jQuery.parseJSON( data ) :
-					data;
-			} catch( e ) {}
-
-			// Make sure we set the data so it isn't changed later
-			data_user.set( elem, key, data );
-		} else {
-			data = undefined;
-		}
-	}
-	return data;
-}
-
-jQuery.extend({
-	hasData: function( elem ) {
-		return data_user.hasData( elem ) || data_priv.hasData( elem );
-	},
-
-	data: function( elem, name, data ) {
-		return data_user.access( elem, name, data );
-	},
-
-	removeData: function( elem, name ) {
-		data_user.remove( elem, name );
-	},
-
-	// TODO: Now that all calls to _data and _removeData have been replaced
-	// with direct calls to data_priv methods, these can be deprecated.
-	_data: function( elem, name, data ) {
-		return data_priv.access( elem, name, data );
-	},
-
-	_removeData: function( elem, name ) {
-		data_priv.remove( elem, name );
-	}
-});
-
-jQuery.fn.extend({
-	data: function( key, value ) {
-		var i, name, data,
-			elem = this[ 0 ],
-			attrs = elem && elem.attributes;
-
-		// Gets all values
-		if ( key === undefined ) {
-			if ( this.length ) {
-				data = data_user.get( elem );
-
-				if ( elem.nodeType === 1 && !data_priv.get( elem, "hasDataAttrs" ) ) {
-					i = attrs.length;
-					while ( i-- ) {
-
-						// Support: IE11+
-						// The attrs elements can be null (#14894)
-						if ( attrs[ i ] ) {
-							name = attrs[ i ].name;
-							if ( name.indexOf( "data-" ) === 0 ) {
-								name = jQuery.camelCase( name.slice(5) );
-								dataAttr( elem, name, data[ name ] );
-							}
-						}
-					}
-					data_priv.set( elem, "hasDataAttrs", true );
-				}
-			}
-
-			return data;
-		}
-
-		// Sets multiple values
-		if ( typeof key === "object" ) {
-			return this.each(function() {
-				data_user.set( this, key );
-			});
-		}
-
-		return access( this, function( value ) {
-			var data,
-				camelKey = jQuery.camelCase( key );
-
-			// The calling jQuery object (element matches) is not empty
-			// (and therefore has an element appears at this[ 0 ]) and the
-			// `value` parameter was not undefined. An empty jQuery object
-			// will result in `undefined` for elem = this[ 0 ] which will
-			// throw an exception if an attempt to read a data cache is made.
-			if ( elem && value === undefined ) {
-				// Attempt to get data from the cache
-				// with the key as-is
-				data = data_user.get( elem, key );
-				if ( data !== undefined ) {
-					return data;
-				}
-
-				// Attempt to get data from the cache
-				// with the key camelized
-				data = data_user.get( elem, camelKey );
-				if ( data !== undefined ) {
-					return data;
-				}
-
-				// Attempt to "discover" the data in
-				// HTML5 custom data-* attrs
-				data = dataAttr( elem, camelKey, undefined );
-				if ( data !== undefined ) {
-					return data;
-				}
-
-				// We tried really hard, but the data doesn't exist.
-				return;
-			}
-
-			// Set the data...
-			this.each(function() {
-				// First, attempt to store a copy or reference of any
-				// data that might've been store with a camelCased key.
-				var data = data_user.get( this, camelKey );
-
-				// For HTML5 data-* attribute interop, we have to
-				// store property names with dashes in a camelCase form.
-				// This might not apply to all properties...*
-				data_user.set( this, camelKey, value );
-
-				// *... In the case of properties that might _actually_
-				// have dashes, we need to also store a copy of that
-				// unchanged property.
-				if ( key.indexOf("-") !== -1 && data !== undefined ) {
-					data_user.set( this, key, value );
-				}
-			});
-		}, null, value, arguments.length > 1, null, true );
-	},
-
-	removeData: function( key ) {
-		return this.each(function() {
-			data_user.remove( this, key );
-		});
-	}
-});
-
-
-jQuery.extend({
-	queue: function( elem, type, data ) {
-		var queue;
-
-		if ( elem ) {
-			type = ( type || "fx" ) + "queue";
-			queue = data_priv.get( elem, type );
-
-			// Speed up dequeue by getting out quickly if this is just a lookup
-			if ( data ) {
-				if ( !queue || jQuery.isArray( data ) ) {
-					queue = data_priv.access( elem, type, jQuery.makeArray(data) );
-				} else {
-					queue.push( data );
-				}
-			}
-			return queue || [];
-		}
-	},
-
-	dequeue: function( elem, type ) {
-		type = type || "fx";
-
-		var queue = jQuery.queue( elem, type ),
-			startLength = queue.length,
-			fn = queue.shift(),
-			hooks = jQuery._queueHooks( elem, type ),
-			next = function() {
-				jQuery.dequeue( elem, type );
-			};
-
-		// If the fx queue is dequeued, always remove the progress sentinel
-		if ( fn === "inprogress" ) {
-			fn = queue.shift();
-			startLength--;
-		}
-
-		if ( fn ) {
-
-			// Add a progress sentinel to prevent the fx queue from being
-			// automatically dequeued
-			if ( type === "fx" ) {
-				queue.unshift( "inprogress" );
-			}
-
-			// Clear up the last queue stop function
-			delete hooks.stop;
-			fn.call( elem, next, hooks );
-		}
-
-		if ( !startLength && hooks ) {
-			hooks.empty.fire();
-		}
-	},
-
-	// Not public - generate a queueHooks object, or return the current one
-	_queueHooks: function( elem, type ) {
-		var key = type + "queueHooks";
-		return data_priv.get( elem, key ) || data_priv.access( elem, key, {
-			empty: jQuery.Callbacks("once memory").add(function() {
-				data_priv.remove( elem, [ type + "queue", key ] );
-			})
-		});
-	}
-});
-
-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 );
-
-				// Ensure a hooks for this queue
-				jQuery._queueHooks( this, type );
-
-				if ( type === "fx" && queue[0] !== "inprogress" ) {
-					jQuery.dequeue( this, type );
-				}
-			});
-	},
-	dequeue: function( type ) {
-		return this.each(function() {
-			jQuery.dequeue( this, type );
-		});
-	},
-	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, obj ) {
-		var tmp,
-			count = 1,
-			defer = jQuery.Deferred(),
-			elements = this,
-			i = this.length,
-			resolve = function() {
-				if ( !( --count ) ) {
-					defer.resolveWith( elements, [ elements ] );
-				}
-			};
-
-		if ( typeof type !== "string" ) {
-			obj = type;
-			type = undefined;
-		}
-		type = type || "fx";
-
-		while ( i-- ) {
-			tmp = data_priv.get( elements[ i ], type + "queueHooks" );
-			if ( tmp && tmp.empty ) {
-				count++;
-				tmp.empty.add( resolve );
-			}
-		}
-		resolve();
-		return defer.promise( obj );
-	}
-});
-var pnum = (/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/).source;
-
-var cssExpand = [ "Top", "Right", "Bottom", "Left" ];
-
-var isHidden = function( elem, el ) {
-		// isHidden might be called from jQuery#filter function;
-		// in that case, element will be second argument
-		elem = el || elem;
-		return jQuery.css( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem );
-	};
-
-var rcheckableType = (/^(?:checkbox|radio)$/i);
-
-
-
-(function() {
-	var fragment = document.createDocumentFragment(),
-		div = fragment.appendChild( document.createElement( "div" ) ),
-		input = document.createElement( "input" );
-
-	// Support: Safari<=5.1
-	// Check state lost if the name is set (#11217)
-	// Support: Windows Web Apps (WWA)
-	// `name` and `type` must use .setAttribute for WWA (#14901)
-	input.setAttribute( "type", "radio" );
-	input.setAttribute( "checked", "checked" );
-	input.setAttribute( "name", "t" );
-
-	div.appendChild( input );
-
-	// Support: Safari<=5.1, Android<4.2
-	// Older WebKit doesn't clone checked state correctly in fragments
-	support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked;
-
-	// Support: IE<=11+
-	// Make sure textarea (and checkbox) defaultValue is properly cloned
-	div.innerHTML = "<textarea>x</textarea>";
-	support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue;
-})();
-var strundefined = typeof undefined;
-
-
-
-support.focusinBubbles = "onfocusin" in window;
-
-
-var
-	rkeyEvent = /^key/,
-	rmouseEvent = /^(?:mouse|pointer|contextmenu)|click/,
-	rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
-	rtypenamespace = /^([^.]*)(?:\.(.+)|)$/;
-
-function returnTrue() {
-	return true;
-}
-
-function returnFalse() {
-	return false;
-}
-
-function safeActiveElement() {
-	try {
-		return document.activeElement;
-	} catch ( err ) { }
-}
-
-/*
- * Helper functions for managing events -- not part of the public interface.
- * Props to Dean Edwards' addEvent library for many of the ideas.
- */
-jQuery.event = {
-
-	global: {},
-
-	add: function( elem, types, handler, data, selector ) {
-
-		var handleObjIn, eventHandle, tmp,
-			events, t, handleObj,
-			special, handlers, type, namespaces, origType,
-			elemData = data_priv.get( elem );
-
-		// Don't attach events to noData or text/comment nodes (but allow plain objects)
-		if ( !elemData ) {
-			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
-		if ( !(events = elemData.events) ) {
-			events = elemData.events = {};
-		}
-		if ( !(eventHandle = elemData.handle) ) {
-			eventHandle = elemData.handle = 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 !== strundefined && jQuery.event.triggered !== e.type ?
-					jQuery.event.dispatch.apply( elem, arguments ) : undefined;
-			};
-		}
-
-		// Handle multiple events separated by a space
-		types = ( types || "" ).match( rnotwhite ) || [ "" ];
-		t = types.length;
-		while ( t-- ) {
-			tmp = rtypenamespace.exec( types[t] ) || [];
-			type = origType = tmp[1];
-			namespaces = ( tmp[2] || "" ).split( "." ).sort();
-
-			// There *must* be a type, no attaching namespace-only handlers
-			if ( !type ) {
-				continue;
-			}
-
-			// 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: origType,
-				data: data,
-				handler: handler,
-				guid: handler.guid,
-				selector: selector,
-				needsContext: selector && jQuery.expr.match.needsContext.test( selector ),
-				namespace: namespaces.join(".")
-			}, handleObjIn );
-
-			// Init the event handler queue if we're the first
-			if ( !(handlers = events[ type ]) ) {
-				handlers = events[ type ] = [];
-				handlers.delegateCount = 0;
-
-				// Only use addEventListener if the special events handler returns false
-				if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
-					if ( elem.addEventListener ) {
-						elem.addEventListener( type, eventHandle, false );
-					}
-				}
-			}
-
-			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;
-		}
-
-	},
-
-	// Detach an event or set of events from an element
-	remove: function( elem, types, handler, selector, mappedTypes ) {
-
-		var j, origCount, tmp,
-			events, t, handleObj,
-			special, handlers, type, namespaces, origType,
-			elemData = data_priv.hasData( elem ) && data_priv.get( elem );
-
-		if ( !elemData || !(events = elemData.events) ) {
-			return;
-		}
-
-		// Once for each type.namespace in types; type may be omitted
-		types = ( types || "" ).match( rnotwhite ) || [ "" ];
-		t = types.length;
-		while ( t-- ) {
-			tmp = rtypenamespace.exec( types[t] ) || [];
-			type = origType = tmp[1];
-			namespaces = ( tmp[2] || "" ).split( "." ).sort();
-
-			// 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;
-			handlers = events[ type ] || [];
-			tmp = tmp[2] && new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" );
-
-			// Remove matching events
-			origCount = j = handlers.length;
-			while ( j-- ) {
-				handleObj = handlers[ j ];
-
-				if ( ( mappedTypes || origType === handleObj.origType ) &&
-					( !handler || handler.guid === handleObj.guid ) &&
-					( !tmp || tmp.test( handleObj.namespace ) ) &&
-					( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) {
-					handlers.splice( j, 1 );
-
-					if ( handleObj.selector ) {
-						handlers.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 ( origCount && !handlers.length ) {
-				if ( !special.teardown || special.teardown.call( elem, namespaces, elemData.handle ) === false ) {
-					jQuery.removeEvent( elem, type, elemData.handle );
-				}
-
-				delete events[ type ];
-			}
-		}
-
-		// Remove the expando if it's no longer used
-		if ( jQuery.isEmptyObject( events ) ) {
-			delete elemData.handle;
-			data_priv.remove( elem, "events" );
-		}
-	},
-
-	trigger: function( event, data, elem, onlyHandlers ) {
-
-		var i, cur, tmp, bubbleType, ontype, handle, special,
-			eventPath = [ elem || document ],
-			type = hasOwn.call( event, "type" ) ? event.type : event,
-			namespaces = hasOwn.call( event, "namespace" ) ? event.namespace.split(".") : [];
-
-		cur = tmp = elem = elem || document;
-
-		// Don't do events on text and comment nodes
-		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
-			return;
-		}
-
-		// 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 ) {
-			// Namespaced trigger; create a regexp to match event type in handle()
-			namespaces = type.split(".");
-			type = namespaces.shift();
-			namespaces.sort();
-		}
-		ontype = type.indexOf(":") < 0 && "on" + type;
-
-		// Caller can pass in a jQuery.Event object, Object, or just an event type string
-		event = event[ jQuery.expando ] ?
-			event :
-			new jQuery.Event( type, typeof event === "object" && event );
-
-		// Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true)
-		event.isTrigger = onlyHandlers ? 2 : 3;
-		event.namespace = namespaces.join(".");
-		event.namespace_re = event.namespace ?
-			new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ) :
-			null;
-
-		// 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 ?
-			[ event ] :
-			jQuery.makeArray( data, [ event ] );
-
-		// Allow special events to draw outside the lines
-		special = jQuery.event.special[ type ] || {};
-		if ( !onlyHandlers && 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)
-		if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) {
-
-			bubbleType = special.delegateType || type;
-			if ( !rfocusMorph.test( bubbleType + type ) ) {
-				cur = cur.parentNode;
-			}
-			for ( ; cur; cur = cur.parentNode ) {
-				eventPath.push( cur );
-				tmp = cur;
-			}
-
-			// Only add window if we got to document (e.g., not plain obj or detached DOM)
-			if ( tmp === (elem.ownerDocument || document) ) {
-				eventPath.push( tmp.defaultView || tmp.parentWindow || window );
-			}
-		}
-
-		// Fire handlers on the event path
-		i = 0;
-		while ( (cur = eventPath[i++]) && !event.isPropagationStopped() ) {
-
-			event.type = i > 1 ?
-				bubbleType :
-				special.bindType || type;
-
-			// jQuery handler
-			handle = ( data_priv.get( cur, "events" ) || {} )[ event.type ] && data_priv.get( cur, "handle" );
-			if ( handle ) {
-				handle.apply( cur, data );
-			}
-
-			// Native handler
-			handle = ontype && cur[ ontype ];
-			if ( handle && handle.apply && jQuery.acceptData( cur ) ) {
-				event.result = handle.apply( cur, data );
-				if ( event.result === 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( eventPath.pop(), data ) === false) &&
-				jQuery.acceptData( elem ) ) {
-
-				// Call a native DOM method on the target with the same name name as the event.
-				// Don't do default actions on window, that's where global variables be (#6170)
-				if ( ontype && jQuery.isFunction( elem[ type ] ) && !jQuery.isWindow( elem ) ) {
-
-					// Don't re-trigger an onFOO event when we call its FOO() method
-					tmp = elem[ ontype ];
-
-					if ( tmp ) {
-						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 ( tmp ) {
-						elem[ ontype ] = tmp;
-					}
-				}
-			}
-		}
-
-		return event.result;
-	},
-
-	dispatch: function( event ) {
-
-		// Make a writable jQuery.Event from the native event object
-		event = jQuery.event.fix( event );
-
-		var i, j, ret, matched, handleObj,
-			handlerQueue = [],
-			args = slice.call( arguments ),
-			handlers = ( data_priv.get( this, "events" ) || {} )[ event.type ] || [],
-			special = jQuery.event.special[ event.type ] || {};
-
-		// 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
-		handlerQueue = jQuery.event.handlers.call( this, event, handlers );
-
-		// Run delegates first; they may want to stop propagation beneath us
-		i = 0;
-		while ( (matched = handlerQueue[ i++ ]) && !event.isPropagationStopped() ) {
-			event.currentTarget = matched.elem;
-
-			j = 0;
-			while ( (handleObj = matched.handlers[ j++ ]) && !event.isImmediatePropagationStopped() ) {
-
-				// Triggered event must either 1) have no namespace, or 2) have namespace(s)
-				// a subset or equal to those in the bound event (both can have no namespace).
-				if ( !event.namespace_re || event.namespace_re.test( handleObj.namespace ) ) {
-
-					event.handleObj = handleObj;
-					event.data = handleObj.data;
-
-					ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler )
-							.apply( matched.elem, args );
-
-					if ( ret !== undefined ) {
-						if ( (event.result = 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;
-	},
-
-	handlers: function( event, handlers ) {
-		var i, matches, sel, handleObj,
-			handlerQueue = [],
-			delegateCount = handlers.delegateCount,
-			cur = event.target;
-
-		// Find delegate handlers
-		// Black-hole SVG <use> instance trees (#13180)
-		// Avoid non-left-click bubbling in Firefox (#3861)
-		if ( delegateCount && cur.nodeType && (!event.button || event.type !== "click") ) {
-
-			for ( ; cur !== this; cur = cur.parentNode || this ) {
-
-				// Don't process clicks on disabled elements (#6911, #8165, #11382, #11764)
-				if ( cur.disabled !== true || event.type !== "click" ) {
-					matches = [];
-					for ( i = 0; i < delegateCount; i++ ) {
-						handleObj = handlers[ i ];
-
-						// Don't conflict with Object.prototype properties (#13203)
-						sel = handleObj.selector + " ";
-
-						if ( matches[ sel ] === undefined ) {
-							matches[ sel ] = handleObj.needsContext ?
-								jQuery( sel, this ).index( cur ) >= 0 :
-								jQuery.find( sel, this, null, [ cur ] ).length;
-						}
-						if ( matches[ sel ] ) {
-							matches.push( handleObj );
-						}
-					}
-					if ( matches.length ) {
-						handlerQueue.push({ elem: cur, handlers: matches });
-					}
-				}
-			}
-		}
-
-		// Add the remaining (directly-bound) handlers
-		if ( delegateCount < handlers.length ) {
-			handlerQueue.push({ elem: this, handlers: handlers.slice( delegateCount ) });
-		}
-
-		return handlerQueue;
-	},
-
-	// Includes some event props shared by KeyEvent and MouseEvent
-	props: "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 offsetX offsetY pageX pageY screenX screenY toElement".split(" "),
-		filter: function( event, original ) {
-			var eventDoc, doc, body,
-				button = original.button;
-
-			// 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 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, copy,
-			type = event.type,
-			originalEvent = event,
-			fixHook = this.fixHooks[ type ];
-
-		if ( !fixHook ) {
-			this.fixHooks[ type ] = fixHook =
-				rmouseEvent.test( type ) ? this.mouseHooks :
-				rkeyEvent.test( type ) ? this.keyHooks :
-				{};
-		}
-		copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props;
-
-		event = new jQuery.Event( originalEvent );
-
-		i = copy.length;
-		while ( i-- ) {
-			prop = copy[ i ];
-			event[ prop ] = originalEvent[ prop ];
-		}
-
-		// Support: Cordova 2.5 (WebKit) (#13255)
-		// All events should have a target; Cordova deviceready doesn't
-		if ( !event.target ) {
-			event.target = document;
-		}
-
-		// Support: Safari 6.0+, Chrome<28
-		// Target should not be a text node (#504, #13143)
-		if ( event.target.nodeType === 3 ) {
-			event.target = event.target.parentNode;
-		}
-
-		return fixHook.filter ? fixHook.filter( event, originalEvent ) : event;
-	},
-
-	special: {
-		load: {
-			// Prevent triggered image.load events from bubbling to window.load
-			noBubble: true
-		},
-		focus: {
-			// Fire native event if possible so blur/focus sequence is correct
-			trigger: function() {
-				if ( this !== safeActiveElement() && this.focus ) {
-					this.focus();
-					return false;
-				}
-			},
-			delegateType: "focusin"
-		},
-		blur: {
-			trigger: function() {
-				if ( this === safeActiveElement() && this.blur ) {
-					this.blur();
-					return false;
-				}
-			},
-			delegateType: "focusout"
-		},
-		click: {
-			// For checkbox, fire native event so checked state will be right
-			trigger: function() {
-				if ( this.type === "checkbox" && this.click && jQuery.nodeName( this, "input" ) ) {
-					this.click();
-					return false;
-				}
-			},
-
-			// For cross-browser consistency, don't fire native .click() on links
-			_default: function( event ) {
-				return jQuery.nodeName( event.target, "a" );
-			}
-		},
-
-		beforeunload: {
-			postDispatch: function( event ) {
-
-				// Support: Firefox 20+
-				// Firefox doesn't alert if the returnValue field is not set.
-				if ( event.result !== undefined && event.originalEvent ) {
-					event.originalEvent.returnValue = event.result;
-				}
-			}
-		}
-	},
-
-	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();
-		}
-	}
-};
-
-jQuery.removeEvent = function( elem, type, handle ) {
-	if ( elem.removeEventListener ) {
-		elem.removeEventListener( type, handle, false );
-	}
-};
-
-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.defaultPrevented === undefined &&
-				// Support: Android<4.0
-				src.returnValue === false ?
-			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;
-};
-
-// 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 = {
-	isDefaultPrevented: returnFalse,
-	isPropagationStopped: returnFalse,
-	isImmediatePropagationStopped: returnFalse,
-
-	preventDefault: function() {
-		var e = this.originalEvent;
-
-		this.isDefaultPrevented = returnTrue;
-
-		if ( e && e.preventDefault ) {
-			e.preventDefault();
-		}
-	},
-	stopPropagation: function() {
-		var e = this.originalEvent;
-
-		this.isPropagationStopped = returnTrue;
-
-		if ( e && e.stopPropagation ) {
-			e.stopPropagation();
-		}
-	},
-	stopImmediatePropagation: function() {
-		var e = this.originalEvent;
-
-		this.isImmediatePropagationStopped = returnTrue;
-
-		if ( e && e.stopImmediatePropagation ) {
-			e.stopImmediatePropagation();
-		}
-
-		this.stopPropagation();
-	}
-};
-
-// Create mouseenter/leave events using mouseover/out and event-time checks
-// Support: Chrome 15+
-jQuery.each({
-	mouseenter: "mouseover",
-	mouseleave: "mouseout",
-	pointerenter: "pointerover",
-	pointerleave: "pointerout"
-}, function( orig, fix ) {
-	jQuery.event.special[ orig ] = {
-		delegateType: fix,
-		bindType: fix,
-
-		handle: function( event ) {
-			var ret,
-				target = this,
-				related = event.relatedTarget,
-				handleObj = event.handleObj;
-
-			// 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;
-		}
-	};
-});
-
-// Support: Firefox, Chrome, Safari
-// Create "bubbling" focus and blur events
-if ( !support.focusinBubbles ) {
-	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
-
-		// Attach a single capturing handler on the document while someone wants focusin/focusout
-		var handler = function( event ) {
-				jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true );
-			};
-
-		jQuery.event.special[ fix ] = {
-			setup: function() {
-				var doc = this.ownerDocument || this,
-					attaches = data_priv.access( doc, fix );
-
-				if ( !attaches ) {
-					doc.addEventListener( orig, handler, true );
-				}
-				data_priv.access( doc, fix, ( attaches || 0 ) + 1 );
-			},
-			teardown: function() {
-				var doc = this.ownerDocument || this,
-					attaches = data_priv.access( doc, fix ) - 1;
-
-				if ( !attaches ) {
-					doc.removeEventListener( orig, handler, true );
-					data_priv.remove( doc, fix );
-
-				} else {
-					data_priv.access( doc, fix, attaches );
-				}
-			}
-		};
-	});
-}
-
-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" ) {
-				// ( 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 ) {
-		var handleObj, type;
-		if ( types && types.preventDefault && types.handleObj ) {
-			// ( event )  dispatched jQuery.Event
-			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 ( 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 );
-		});
-	},
-
-	trigger: function( type, data ) {
-		return this.each(function() {
-			jQuery.event.trigger( type, data, this );
-		});
-	},
-	triggerHandler: function( type, data ) {
-		var elem = this[0];
-		if ( elem ) {
-			return jQuery.event.trigger( type, data, elem, true );
-		}
-	}
-});
-
-
-var
-	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,
-	rtagName = /<([\w:]+)/,
-	rhtml = /<|&#?\w+;/,
-	rnoInnerhtml = /<(?:script|style|link)/i,
-	// checked="checked" or checked
-	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
-	rscriptType = /^$|\/(?:java|ecma)script/i,
-	rscriptTypeMasked = /^true\/(.*)/,
-	rcleanScript = /^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,
-
-	// We have to close these tags to support XHTML (#13200)
-	wrapMap = {
-
-		// Support: IE9
-		option: [ 1, "<select multiple='multiple'>", "</select>" ],
-
-		thead: [ 1, "<table>", "</table>" ],
-		col: [ 2, "<table><colgroup>", "</colgroup></table>" ],
-		tr: [ 2, "<table><tbody>", "</tbody></table>" ],
-		td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
-
-		_default: [ 0, "", "" ]
-	};
-
-// Support: IE9
-wrapMap.optgroup = wrapMap.option;
-
-wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
-wrapMap.th = wrapMap.td;
-
-// Support: 1.x compatibility
-// Manipulating tables requires a tbody
-function manipulationTarget( elem, content ) {
-	return jQuery.nodeName( elem, "table" ) &&
-		jQuery.nodeName( content.nodeType !== 11 ? content : content.firstChild, "tr" ) ?
-
-		elem.getElementsByTagName("tbody")[0] ||
-			elem.appendChild( elem.ownerDocument.createElement("tbody") ) :
-		elem;
-}
-
-// Replace/restore the type attribute of script elements for safe DOM manipulation
-function disableScript( elem ) {
-	elem.type = (elem.getAttribute("type") !== null) + "/" + elem.type;
-	return elem;
-}
-function restoreScript( elem ) {
-	var match = rscriptTypeMasked.exec( elem.type );
-
-	if ( match ) {
-		elem.type = match[ 1 ];
-	} else {
-		elem.removeAttribute("type");
-	}
-
-	return elem;
-}
-
-// Mark scripts as having already been evaluated
-function setGlobalEval( elems, refElements ) {
-	var i = 0,
-		l = elems.length;
-
-	for ( ; i < l; i++ ) {
-		data_priv.set(
-			elems[ i ], "globalEval", !refElements || data_priv.get( refElements[ i ], "globalEval" )
-		);
-	}
-}
-
-function cloneCopyEvent( src, dest ) {
-	var i, l, type, pdataOld, pdataCur, udataOld, udataCur, events;
-
-	if ( dest.nodeType !== 1 ) {
-		return;
-	}
-
-	// 1. Copy private data: events, handlers, etc.
-	if ( data_priv.hasData( src ) ) {
-		pdataOld = data_priv.access( src );
-		pdataCur = data_priv.set( dest, pdataOld );
-		events = pdataOld.events;
-
-		if ( events ) {
-			delete pdataCur.handle;
-			pdataCur.events = {};
-
-			for ( type in events ) {
-				for ( i = 0, l = events[ type ].length; i < l; i++ ) {
-					jQuery.event.add( dest, type, events[ type ][ i ] );
-				}
-			}
-		}
-	}
-
-	// 2. Copy user data
-	if ( data_user.hasData( src ) ) {
-		udataOld = data_user.access( src );
-		udataCur = jQuery.extend( {}, udataOld );
-
-		data_user.set( dest, udataCur );
-	}
-}
-
-function getAll( context, tag ) {
-	var ret = context.getElementsByTagName ? context.getElementsByTagName( tag || "*" ) :
-			context.querySelectorAll ? context.querySelectorAll( tag || "*" ) :
-			[];
-
-	return tag === undefined || tag && jQuery.nodeName( context, tag ) ?
-		jQuery.merge( [ context ], ret ) :
-		ret;
-}
-
-// Fix IE bugs, see support tests
-function fixInput( src, dest ) {
-	var nodeName = dest.nodeName.toLowerCase();
-
-	// Fails to persist the checked state of a cloned checkbox or radio button.
-	if ( nodeName === "input" && rcheckableType.test( src.type ) ) {
-		dest.checked = src.checked;
-
-	// Fails to return the selected option to the default selected state when cloning options
-	} else if ( nodeName === "input" || nodeName === "textarea" ) {
-		dest.defaultValue = src.defaultValue;
-	}
-}
-
-jQuery.extend({
-	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
-		var i, l, srcElements, destElements,
-			clone = elem.cloneNode( true ),
-			inPage = jQuery.contains( elem.ownerDocument, elem );
-
-		// Fix IE cloning issues
-		if ( !support.noCloneChecked && ( elem.nodeType === 1 || elem.nodeType === 11 ) &&
-				!jQuery.isXMLDoc( elem ) ) {
-
-			// We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2
-			destElements = getAll( clone );
-			srcElements = getAll( elem );
-
-			for ( i = 0, l = srcElements.length; i < l; i++ ) {
-				fixInput( srcElements[ i ], destElements[ i ] );
-			}
-		}
-
-		// Copy the events from the original to the clone
-		if ( dataAndEvents ) {
-			if ( deepDataAndEvents ) {
-				srcElements = srcElements || getAll( elem );
-				destElements = destElements || getAll( clone );
-
-				for ( i = 0, l = srcElements.length; i < l; i++ ) {
-					cloneCopyEvent( srcElements[ i ], destElements[ i ] );
-				}
-			} else {
-				cloneCopyEvent( elem, clone );
-			}
-		}
-
-		// Preserve script evaluation history
-		destElements = getAll( clone, "script" );
-		if ( destElements.length > 0 ) {
-			setGlobalEval( destElements, !inPage && getAll( elem, "script" ) );
-		}
-
-		// Return the cloned set
-		return clone;
-	},
-
-	buildFragment: function( elems, context, scripts, selection ) {
-		var elem, tmp, tag, wrap, contains, j,
-			fragment = context.createDocumentFragment(),
-			nodes = [],
-			i = 0,
-			l = elems.length;
-
-		for ( ; i < l; i++ ) {
-			elem = elems[ i ];
-
-			if ( elem || elem === 0 ) {
-
-				// Add nodes directly
-				if ( jQuery.type( elem ) === "object" ) {
-					// Support: QtWebKit, PhantomJS
-					// push.apply(_, arraylike) throws on ancient WebKit
-					jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem );
-
-				// Convert non-html into a text node
-				} else if ( !rhtml.test( elem ) ) {
-					nodes.push( context.createTextNode( elem ) );
-
-				// Convert html into DOM nodes
-				} else {
-					tmp = tmp || fragment.appendChild( context.createElement("div") );
-
-					// Deserialize a standard representation
-					tag = ( rtagName.exec( elem ) || [ "", "" ] )[ 1 ].toLowerCase();
-					wrap = wrapMap[ tag ] || wrapMap._default;
-					tmp.innerHTML = wrap[ 1 ] + elem.replace( rxhtmlTag, "<$1></$2>" ) + wrap[ 2 ];
-
-					// Descend through wrappers to the right content
-					j = wrap[ 0 ];
-					while ( j-- ) {
-						tmp = tmp.lastChild;
-					}
-
-					// Support: QtWebKit, PhantomJS
-					// push.apply(_, arraylike) throws on ancient WebKit
-					jQuery.merge( nodes, tmp.childNodes );
-
-					// Remember the top-level container
-					tmp = fragment.firstChild;
-
-					// Ensure the created nodes are orphaned (#12392)
-					tmp.textContent = "";
-				}
-			}
-		}
-
-		// Remove wrapper from fragment
-		fragment.textContent = "";
-
-		i = 0;
-		while ( (elem = nodes[ i++ ]) ) {
-
-			// #4087 - If origin and destination elements are the same, and this is
-			// that element, do not do anything
-			if ( selection && jQuery.inArray( elem, selection ) !== -1 ) {
-				continue;
-			}
-
-			contains = jQuery.contains( elem.ownerDocument, elem );
-
-			// Append to fragment
-			tmp = getAll( fragment.appendChild( elem ), "script" );
-
-			// Preserve script evaluation history
-			if ( contains ) {
-				setGlobalEval( tmp );
-			}
-
-			// Capture executables
-			if ( scripts ) {
-				j = 0;
-				while ( (elem = tmp[ j++ ]) ) {
-					if ( rscriptType.test( elem.type || "" ) ) {
-						scripts.push( elem );
-					}
-				}
-			}
-		}
-
-		return fragment;
-	},
-
-	cleanData: function( elems ) {
-		var data, elem, type, key,
-			special = jQuery.event.special,
-			i = 0;
-
-		for ( ; (elem = elems[ i ]) !== undefined; i++ ) {
-			if ( jQuery.acceptData( elem ) ) {
-				key = elem[ data_priv.expando ];
-
-				if ( key && (data = data_priv.cache[ key ]) ) {
-					if ( data.events ) {
-						for ( type in data.events ) {
-							if ( special[ type ] ) {
-								jQuery.event.remove( elem, type );
-
-							// This is a shortcut to avoid jQuery.event.remove's overhead
-							} else {
-								jQuery.removeEvent( elem, type, data.handle );
-							}
-						}
-					}
-					if ( data_priv.cache[ key ] ) {
-						// Discard any remaining `private` data
-						delete data_priv.cache[ key ];
-					}
-				}
-			}
-			// Discard any remaining `user` data
-			delete data_user.cache[ elem[ data_user.expando ] ];
-		}
-	}
-});
-
-jQuery.fn.extend({
-	text: function( value ) {
-		return access( this, function( value ) {
-			return value === undefined ?
-				jQuery.text( this ) :
-				this.empty().each(function() {
-					if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-						this.textContent = value;
-					}
-				});
-		}, null, value, arguments.length );
-	},
-
-	append: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-				var target = manipulationTarget( this, elem );
-				target.appendChild( elem );
-			}
-		});
-	},
-
-	prepend: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-				var target = manipulationTarget( this, elem );
-				target.insertBefore( elem, target.firstChild );
-			}
-		});
-	},
-
-	before: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.parentNode ) {
-				this.parentNode.insertBefore( elem, this );
-			}
-		});
-	},
-
-	after: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.parentNode ) {
-				this.parentNode.insertBefore( elem, this.nextSibling );
-			}
-		});
-	},
-
-	remove: function( selector, keepData /* Internal Use Only */ ) {
-		var elem,
-			elems = selector ? jQuery.filter( selector, this ) : this,
-			i = 0;
-
-		for ( ; (elem = elems[i]) != null; i++ ) {
-			if ( !keepData && elem.nodeType === 1 ) {
-				jQuery.cleanData( getAll( elem ) );
-			}
-
-			if ( elem.parentNode ) {
-				if ( keepData && jQuery.contains( elem.ownerDocument, elem ) ) {
-					setGlobalEval( getAll( elem, "script" ) );
-				}
-				elem.parentNode.removeChild( elem );
-			}
-		}
-
-		return this;
-	},
-
-	empty: function() {
-		var elem,
-			i = 0;
-
-		for ( ; (elem = this[i]) != null; i++ ) {
-			if ( elem.nodeType === 1 ) {
-
-				// Prevent memory leaks
-				jQuery.cleanData( getAll( elem, false ) );
-
-				// Remove any remaining nodes
-				elem.textContent = "";
-			}
-		}
-
-		return this;
-	},
-
-	clone: function( dataAndEvents, deepDataAndEvents ) {
-		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
-		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
-
-		return this.map(function() {
-			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
-		});
-	},
-
-	html: function( value ) {
-		return access( this, function( value ) {
-			var elem = this[ 0 ] || {},
-				i = 0,
-				l = this.length;
-
-			if ( value === undefined && elem.nodeType === 1 ) {
-				return elem.innerHTML;
-			}
-
-			// See if we can take a shortcut and just use innerHTML
-			if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
-				!wrapMap[ ( rtagName.exec( value ) || [ "", "" ] )[ 1 ].toLowerCase() ] ) {
-
-				value = value.replace( rxhtmlTag, "<$1></$2>" );
-
-				try {
-					for ( ; i < l; i++ ) {
-						elem = this[ i ] || {};
-
-						// Remove element nodes and prevent memory leaks
-						if ( elem.nodeType === 1 ) {
-							jQuery.cleanData( getAll( elem, false ) );
-							elem.innerHTML = value;
-						}
-					}
-
-					elem = 0;
-
-				// If using innerHTML throws an exception, use the fallback method
-				} catch( e ) {}
-			}
-
-			if ( elem ) {
-				this.empty().append( value );
-			}
-		}, null, value, arguments.length );
-	},
-
-	replaceWith: function() {
-		var arg = arguments[ 0 ];
-
-		// Make the changes, replacing each context element with the new content
-		this.domManip( arguments, function( elem ) {
-			arg = this.parentNode;
-
-			jQuery.cleanData( getAll( this ) );
-
-			if ( arg ) {
-				arg.replaceChild( elem, this );
-			}
-		});
-
-		// Force removal if there was no new content (e.g., from empty arguments)
-		return arg && (arg.length || arg.nodeType) ? this : this.remove();
-	},
-
-	detach: function( selector ) {
-		return this.remove( selector, true );
-	},
-
-	domManip: function( args, callback ) {
-
-		// Flatten any nested arrays
-		args = concat.apply( [], args );
-
-		var fragment, first, scripts, hasScripts, node, doc,
-			i = 0,
-			l = this.length,
-			set = this,
-			iNoClone = l - 1,
-			value = args[ 0 ],
-			isFunction = jQuery.isFunction( value );
-
-		// We can't cloneNode fragments that contain checked, in WebKit
-		if ( isFunction ||
-				( l > 1 && typeof value === "string" &&
-					!support.checkClone && rchecked.test( value ) ) ) {
-			return this.each(function( index ) {
-				var self = set.eq( index );
-				if ( isFunction ) {
-					args[ 0 ] = value.call( this, index, self.html() );
-				}
-				self.domManip( args, callback );
-			});
-		}
-
-		if ( l ) {
-			fragment = jQuery.buildFragment( args, this[ 0 ].ownerDocument, false, this );
-			first = fragment.firstChild;
-
-			if ( fragment.childNodes.length === 1 ) {
-				fragment = first;
-			}
-
-			if ( first ) {
-				scripts = jQuery.map( getAll( fragment, "script" ), disableScript );
-				hasScripts = scripts.length;
-
-				// Use the original fragment for the last item instead of the first because it can end up
-				// being emptied incorrectly in certain situations (#8070).
-				for ( ; i < l; i++ ) {
-					node = fragment;
-
-					if ( i !== iNoClone ) {
-						node = jQuery.clone( node, true, true );
-
-						// Keep references to cloned scripts for later restoration
-						if ( hasScripts ) {
-							// Support: QtWebKit
-							// jQuery.merge because push.apply(_, arraylike) throws
-							jQuery.merge( scripts, getAll( node, "script" ) );
-						}
-					}
-
-					callback.call( this[ i ], node, i );
-				}
-
-				if ( hasScripts ) {
-					doc = scripts[ scripts.length - 1 ].ownerDocument;
-
-					// Reenable scripts
-					jQuery.map( scripts, restoreScript );
-
-					// Evaluate executable scripts on first document insertion
-					for ( i = 0; i < hasScripts; i++ ) {
-						node = scripts[ i ];
-						if ( rscriptType.test( node.type || "" ) &&
-							!data_priv.access( node, "globalEval" ) && jQuery.contains( doc, node ) ) {
-
-							if ( node.src ) {
-								// Optional AJAX dependency, but won't run scripts if not present
-								if ( jQuery._evalUrl ) {
-									jQuery._evalUrl( node.src );
-								}
-							} else {
-								jQuery.globalEval( node.textContent.replace( rcleanScript, "" ) );
-							}
-						}
-					}
-				}
-			}
-		}
-
-		return this;
-	}
-});
-
-jQuery.each({
-	appendTo: "append",
-	prependTo: "prepend",
-	insertBefore: "before",
-	insertAfter: "after",
-	replaceAll: "replaceWith"
-}, function( name, original ) {
-	jQuery.fn[ name ] = function( selector ) {
-		var elems,
-			ret = [],
-			insert = jQuery( selector ),
-			last = insert.length - 1,
-			i = 0;
-
-		for ( ; i <= last; i++ ) {
-			elems = i === last ? this : this.clone( true );
-			jQuery( insert[ i ] )[ original ]( elems );
-
-			// Support: QtWebKit
-			// .get() because push.apply(_, arraylike) throws
-			push.apply( ret, elems.get() );
-		}
-
-		return this.pushStack( ret );
-	};
-});
-
-
-var iframe,
-	elemdisplay = {};
-
-/**
- * Retrieve the actual display of a element
- * @param {String} name nodeName of the element
- * @param {Object} doc Document object
- */
-// Called only from within defaultDisplay
-function actualDisplay( name, doc ) {
-	var style,
-		elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ),
-
-		// getDefaultComputedStyle might be reliably used only on attached element
-		display = window.getDefaultComputedStyle && ( style = window.getDefaultComputedStyle( elem[ 0 ] ) ) ?
-
-			// Use of this method is a temporary fix (more like optimization) until something better comes along,
-			// since it was removed from specification and supported only in FF
-			style.display : jQuery.css( elem[ 0 ], "display" );
-
-	// We don't have any data stored on the element,
-	// so use "detach" method as fast way to get rid of the element
-	elem.detach();
-
-	return display;
-}
-
-/**
- * Try to determine the default display value of an element
- * @param {String} nodeName
- */
-function defaultDisplay( nodeName ) {
-	var doc = document,
-		display = elemdisplay[ nodeName ];
-
-	if ( !display ) {
-		display = actualDisplay( nodeName, doc );
-
-		// If the simple way fails, read from inside an iframe
-		if ( display === "none" || !display ) {
-
-			// Use the already-created iframe if possible
-			iframe = (iframe || jQuery( "<iframe frameborder='0' width='0' height='0'/>" )).appendTo( doc.documentElement );
-
-			// Always write a new HTML skeleton so Webkit and Firefox don't choke on reuse
-			doc = iframe[ 0 ].contentDocument;
-
-			// Support: IE
-			doc.write();
-			doc.close();
-
-			display = actualDisplay( nodeName, doc );
-			iframe.detach();
-		}
-
-		// Store the correct default display
-		elemdisplay[ nodeName ] = display;
-	}
-
-	return display;
-}
-var rmargin = (/^margin/);
-
-var rnumnonpx = new RegExp( "^(" + pnum + ")(?!px)[a-z%]+$", "i" );
-
-var getStyles = function( elem ) {
-		// Support: IE<=11+, Firefox<=30+ (#15098, #14150)
-		// IE throws on elements created in popups
-		// FF meanwhile throws on frame elements through "defaultView.getComputedStyle"
-		if ( elem.ownerDocument.defaultView.opener ) {
-			return elem.ownerDocument.defaultView.getComputedStyle( elem, null );
-		}
-
-		return window.getComputedStyle( elem, null );
-	};
-
-
-
-function curCSS( elem, name, computed ) {
-	var width, minWidth, maxWidth, ret,
-		style = elem.style;
-
-	computed = computed || getStyles( elem );
-
-	// Support: IE9
-	// getPropertyValue is only needed for .css('filter') (#12537)
-	if ( computed ) {
-		ret = computed.getPropertyValue( name ) || computed[ name ];
-	}
-
-	if ( computed ) {
-
-		if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) {
-			ret = jQuery.style( elem, name );
-		}
-
-		// Support: iOS < 6
-		// A tribute to the "awesome hack by Dean Edwards"
-		// iOS < 6 (at least) returns percentage for a larger set of values, but width seems to be reliably pixels
-		// this is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values
-		if ( rnumnonpx.test( ret ) && rmargin.test( name ) ) {
-
-			// Remember the original values
-			width = style.width;
-			minWidth = style.minWidth;
-			maxWidth = style.maxWidth;
-
-			// Put in the new values to get a computed value out
-			style.minWidth = style.maxWidth = style.width = ret;
-			ret = computed.width;
-
-			// Revert the changed values
-			style.width = width;
-			style.minWidth = minWidth;
-			style.maxWidth = maxWidth;
-		}
-	}
-
-	return ret !== undefined ?
-		// Support: IE
-		// IE returns zIndex value as an integer.
-		ret + "" :
-		ret;
-}
-
-
-function addGetHookIf( conditionFn, hookFn ) {
-	// Define the hook, we'll check on the first run if it's really needed.
-	return {
-		get: function() {
-			if ( conditionFn() ) {
-				// Hook not needed (or it's not possible to use it due
-				// to missing dependency), remove it.
-				delete this.get;
-				return;
-			}
-
-			// Hook needed; redefine it so that the support test is not executed again.
-			return (this.get = hookFn).apply( this, arguments );
-		}
-	};
-}
-
-
-(function() {
-	var pixelPositionVal, boxSizingReliableVal,
-		docElem = document.documentElement,
-		container = document.createElement( "div" ),
-		div = document.createElement( "div" );
-
-	if ( !div.style ) {
-		return;
-	}
-
-	// Support: IE9-11+
-	// Style of cloned element affects source element cloned (#8908)
-	div.style.backgroundClip = "content-box";
-	div.cloneNode( true ).style.backgroundClip = "";
-	support.clearCloneStyle = div.style.backgroundClip === "content-box";
-
-	container.style.cssText = "border:0;width:0;height:0;top:0;left:-9999px;margin-top:1px;" +
-		"position:absolute";
-	container.appendChild( div );
-
-	// Executing both pixelPosition & boxSizingReliable tests require only one layout
-	// so they're executed at the same time to save the second computation.
-	function computePixelPositionAndBoxSizingReliable() {
-		div.style.cssText =
-			// Support: Firefox<29, Android 2.3
-			// Vendor-prefix box-sizing
-			"-webkit-box-sizing:border-box;-moz-box-sizing:border-box;" +
-			"box-sizing:border-box;display:block;margin-top:1%;top:1%;" +
-			"border:1px;padding:1px;width:4px;position:absolute";
-		div.innerHTML = "";
-		docElem.appendChild( container );
-
-		var divStyle = window.getComputedStyle( div, null );
-		pixelPositionVal = divStyle.top !== "1%";
-		boxSizingReliableVal = divStyle.width === "4px";
-
-		docElem.removeChild( container );
-	}
-
-	// Support: node.js jsdom
-	// Don't assume that getComputedStyle is a property of the global object
-	if ( window.getComputedStyle ) {
-		jQuery.extend( support, {
-			pixelPosition: function() {
-
-				// This test is executed only once but we still do memoizing
-				// since we can use the boxSizingReliable pre-computing.
-				// No need to check if the test was already performed, though.
-				computePixelPositionAndBoxSizingReliable();
-				return pixelPositionVal;
-			},
-			boxSizingReliable: function() {
-				if ( boxSizingReliableVal == null ) {
-					computePixelPositionAndBoxSizingReliable();
-				}
-				return boxSizingReliableVal;
-			},
-			reliableMarginRight: function() {
-
-				// Support: Android 2.3
-				// Check if div with explicit width and no margin-right incorrectly
-				// gets computed margin-right based on width of container. (#3333)
-				// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
-				// This support function is only executed once so no memoizing is needed.
-				var ret,
-					marginDiv = div.appendChild( document.createElement( "div" ) );
-
-				// Reset CSS: box-sizing; display; margin; border; padding
-				marginDiv.style.cssText = div.style.cssText =
-					// Support: Firefox<29, Android 2.3
-					// Vendor-prefix box-sizing
-					"-webkit-box-sizing:content-box;-moz-box-sizing:content-box;" +
-					"box-sizing:content-box;display:block;margin:0;border:0;padding:0";
-				marginDiv.style.marginRight = marginDiv.style.width = "0";
-				div.style.width = "1px";
-				docElem.appendChild( container );
-
-				ret = !parseFloat( window.getComputedStyle( marginDiv, null ).marginRight );
-
-				docElem.removeChild( container );
-				div.removeChild( marginDiv );
-
-				return ret;
-			}
-		});
-	}
-})();
-
-
-// A method for quickly swapping in/out CSS properties to get correct calculations.
-jQuery.swap = function( elem, options, callback, args ) {
-	var ret, name,
-		old = {};
-
-	// Remember the old values, and insert the new ones
-	for ( name in options ) {
-		old[ name ] = elem.style[ name ];
-		elem.style[ name ] = options[ name ];
-	}
-
-	ret = callback.apply( elem, args || [] );
-
-	// Revert the old values
-	for ( name in options ) {
-		elem.style[ name ] = old[ name ];
-	}
-
-	return ret;
-};
-
-
-var
-	// Swappable if display is none or starts with table except "table", "table-cell", or "table-caption"
-	// See here for display values: https://developer.mozilla.org/en-US/docs/CSS/display
-	rdisplayswap = /^(none|table(?!-c[ea]).+)/,
-	rnumsplit = new RegExp( "^(" + pnum + ")(.*)$", "i" ),
-	rrelNum = new RegExp( "^([+-])=(" + pnum + ")", "i" ),
-
-	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
-	cssNormalTransform = {
-		letterSpacing: "0",
-		fontWeight: "400"
-	},
-
-	cssPrefixes = [ "Webkit", "O", "Moz", "ms" ];
-
-// Return a css property mapped to a potentially vendor prefixed property
-function vendorPropName( style, name ) {
-
-	// Shortcut for names that are not vendor prefixed
-	if ( name in style ) {
-		return name;
-	}
-
-	// Check for vendor prefixed names
-	var capName = name[0].toUpperCase() + name.slice(1),
-		origName = name,
-		i = cssPrefixes.length;
-
-	while ( i-- ) {
-		name = cssPrefixes[ i ] + capName;
-		if ( name in style ) {
-			return name;
-		}
-	}
-
-	return origName;
-}
-
-function setPositiveNumber( elem, value, subtract ) {
-	var matches = rnumsplit.exec( value );
-	return matches ?
-		// Guard against undefined "subtract", e.g., when used as in cssHooks
-		Math.max( 0, matches[ 1 ] - ( subtract || 0 ) ) + ( matches[ 2 ] || "px" ) :
-		value;
-}
-
-function augmentWidthOrHeight( elem, name, extra, isBorderBox, styles ) {
-	var i = extra === ( isBorderBox ? "border" : "content" ) ?
-		// If we already have the right measurement, avoid augmentation
-		4 :
-		// Otherwise initialize for horizontal or vertical properties
-		name === "width" ? 1 : 0,
-
-		val = 0;
-
-	for ( ; i < 4; i += 2 ) {
-		// Both box models exclude margin, so add it if we want it
-		if ( extra === "margin" ) {
-			val += jQuery.css( elem, extra + cssExpand[ i ], true, styles );
-		}
-
-		if ( isBorderBox ) {
-			// border-box includes padding, so remove it if we want content
-			if ( extra === "content" ) {
-				val -= jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
-			}
-
-			// At this point, extra isn't border nor margin, so remove border
-			if ( extra !== "margin" ) {
-				val -= jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
-			}
-		} else {
-			// At this point, extra isn't content, so add padding
-			val += jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
-
-			// At this point, extra isn't content nor padding, so add border
-			if ( extra !== "padding" ) {
-				val += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
-			}
-		}
-	}
-
-	return val;
-}
-
-function getWidthOrHeight( elem, name, extra ) {
-
-	// Start with offset property, which is equivalent to the border-box value
-	var valueIsBorderBox = true,
-		val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
-		styles = getStyles( elem ),
-		isBorderBox = jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
-
-	// Some non-html elements return undefined for offsetWidth, so check for null/undefined
-	// svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
-	// MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
-	if ( val <= 0 || val == null ) {
-		// Fall back to computed then uncomputed css if necessary
-		val = curCSS( elem, name, styles );
-		if ( val < 0 || val == null ) {
-			val = elem.style[ name ];
-		}
-
-		// Computed unit is not pixels. Stop here and return.
-		if ( rnumnonpx.test(val) ) {
-			return val;
-		}
-
-		// Check for style in case a browser which returns unreliable values
-		// for getComputedStyle silently falls back to the reliable elem.style
-		valueIsBorderBox = isBorderBox &&
-			( support.boxSizingReliable() || val === elem.style[ name ] );
-
-		// Normalize "", auto, and prepare for extra
-		val = parseFloat( val ) || 0;
-	}
-
-	// Use the active box-sizing model to add/subtract irrelevant styles
-	return ( val +
-		augmentWidthOrHeight(
-			elem,
-			name,
-			extra || ( isBorderBox ? "border" : "content" ),
-			valueIsBorderBox,
-			styles
-		)
-	) + "px";
-}
-
-function showHide( elements, show ) {
-	var display, elem, hidden,
-		values = [],
-		index = 0,
-		length = elements.length;
-
-	for ( ; index < length; index++ ) {
-		elem = elements[ index ];
-		if ( !elem.style ) {
-			continue;
-		}
-
-		values[ index ] = data_priv.get( elem, "olddisplay" );
-		display = elem.style.display;
-		if ( show ) {
-			// Reset the inline display of this element to learn if it is
-			// being hidden by cascaded rules or not
-			if ( !values[ index ] && display === "none" ) {
-				elem.style.display = "";
-			}
-
-			// Set elements which have been overridden with display: none
-			// in a stylesheet to whatever the default browser style is
-			// for such an element
-			if ( elem.style.display === "" && isHidden( elem ) ) {
-				values[ index ] = data_priv.access( elem, "olddisplay", defaultDisplay(elem.nodeName) );
-			}
-		} else {
-			hidden = isHidden( elem );
-
-			if ( display !== "none" || !hidden ) {
-				data_priv.set( elem, "olddisplay", hidden ? display : jQuery.css( elem, "display" ) );
-			}
-		}
-	}
-
-	// Set the display of most of the elements in a second loop
-	// to avoid the constant reflow
-	for ( index = 0; index < length; index++ ) {
-		elem = elements[ index ];
-		if ( !elem.style ) {
-			continue;
-		}
-		if ( !show || elem.style.display === "none" || elem.style.display === "" ) {
-			elem.style.display = show ? values[ index ] || "" : "none";
-		}
-	}
-
-	return elements;
-}
-
-jQuery.extend({
-
-	// Add in style property hooks for overriding the default
-	// behavior of getting and setting a style property
-	cssHooks: {
-		opacity: {
-			get: function( elem, computed ) {
-				if ( computed ) {
-
-					// We should always get a number back from opacity
-					var ret = curCSS( elem, "opacity" );
-					return ret === "" ? "1" : ret;
-				}
-			}
-		}
-	},
-
-	// Don't automatically add "px" to these possibly-unitless properties
-	cssNumber: {
-		"columnCount": true,
-		"fillOpacity": true,
-		"flexGrow": true,
-		"flexShrink": true,
-		"fontWeight": true,
-		"lineHeight": true,
-		"opacity": true,
-		"order": true,
-		"orphans": true,
-		"widows": true,
-		"zIndex": true,
-		"zoom": true
-	},
-
-	// Add in properties whose names you wish to fix before
-	// setting or getting the value
-	cssProps: {
-		"float": "cssFloat"
-	},
-
-	// Get and set the style property on a DOM Node
-	style: function( elem, name, value, extra ) {
-
-		// Don't set styles on text and comment nodes
-		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
-			return;
-		}
-
-		// Make sure that we're working with the right name
-		var ret, type, hooks,
-			origName = jQuery.camelCase( name ),
-			style = elem.style;
-
-		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( style, origName ) );
-
-		// Gets hook for the prefixed version, then unprefixed version
-		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
-
-		// Check if we're setting a value
-		if ( value !== undefined ) {
-			type = typeof value;
-
-			// Convert "+=" or "-=" to relative numbers (#7345)
-			if ( type === "string" && (ret = rrelNum.exec( value )) ) {
-				value = ( ret[1] + 1 ) * ret[2] + parseFloat( jQuery.css( elem, name ) );
-				// Fixes bug #9237
-				type = "number";
-			}
-
-			// Make sure that null and NaN values aren't set (#7116)
-			if ( value == null || value !== value ) {
-				return;
-			}
-
-			// If a number, add 'px' to the (except for certain CSS properties)
-			if ( type === "number" && !jQuery.cssNumber[ origName ] ) {
-				value += "px";
-			}
-
-			// Support: IE9-11+
-			// background-* props affect original clone's values
-			if ( !support.clearCloneStyle && value === "" && name.indexOf( "background" ) === 0 ) {
-				style[ name ] = "inherit";
-			}
-
-			// If a hook was provided, use that value, otherwise just set the specified value
-			if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value, extra )) !== undefined ) {
-				style[ name ] = value;
-			}
-
-		} else {
-			// If a hook was provided get the non-computed value from there
-			if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) {
-				return ret;
-			}
-
-			// Otherwise just get the value from the style object
-			return style[ name ];
-		}
-	},
-
-	css: function( elem, name, extra, styles ) {
-		var val, num, hooks,
-			origName = jQuery.camelCase( name );
-
-		// Make sure that we're working with the right name
-		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( elem.style, origName ) );
-
-		// Try prefixed name followed by the unprefixed name
-		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
-
-		// If a hook was provided get the computed value from there
-		if ( hooks && "get" in hooks ) {
-			val = hooks.get( elem, true, extra );
-		}
-
-		// Otherwise, if a way to get the computed value exists, use that
-		if ( val === undefined ) {
-			val = curCSS( elem, name, styles );
-		}
-
-		// Convert "normal" to computed value
-		if ( val === "normal" && name in cssNormalTransform ) {
-			val = cssNormalTransform[ name ];
-		}
-
-		// Make numeric if forced or a qualifier was provided and val looks numeric
-		if ( extra === "" || extra ) {
-			num = parseFloat( val );
-			return extra === true || jQuery.isNumeric( num ) ? num || 0 : val;
-		}
-		return val;
-	}
-});
-
-jQuery.each([ "height", "width" ], function( i, name ) {
-	jQuery.cssHooks[ name ] = {
-		get: function( elem, computed, extra ) {
-			if ( computed ) {
-
-				// Certain elements can have dimension info if we invisibly show them
-				// but it must have a current display style that would benefit
-				return rdisplayswap.test( jQuery.css( elem, "display" ) ) && elem.offsetWidth === 0 ?
-					jQuery.swap( elem, cssShow, function() {
-						return getWidthOrHeight( elem, name, extra );
-					}) :
-					getWidthOrHeight( elem, name, extra );
-			}
-		},
-
-		set: function( elem, value, extra ) {
-			var styles = extra && getStyles( elem );
-			return setPositiveNumber( elem, value, extra ?
-				augmentWidthOrHeight(
-					elem,
-					name,
-					extra,
-					jQuery.css( elem, "boxSizing", false, styles ) === "border-box",
-					styles
-				) : 0
-			);
-		}
-	};
-});
-
-// Support: Android 2.3
-jQuery.cssHooks.marginRight = addGetHookIf( support.reliableMarginRight,
-	function( elem, computed ) {
-		if ( computed ) {
-			return jQuery.swap( elem, { "display": "inline-block" },
-				curCSS, [ elem, "marginRight" ] );
-		}
-	}
-);
-
-// These hooks are used by animate to expand properties
-jQuery.each({
-	margin: "",
-	padding: "",
-	border: "Width"
-}, function( prefix, suffix ) {
-	jQuery.cssHooks[ prefix + suffix ] = {
-		expand: function( value ) {
-			var i = 0,
-				expanded = {},
-
-				// Assumes a single number if not a string
-				parts = typeof value === "string" ? value.split(" ") : [ value ];
-
-			for ( ; i < 4; i++ ) {
-				expanded[ prefix + cssExpand[ i ] + suffix ] =
-					parts[ i ] || parts[ i - 2 ] || parts[ 0 ];
-			}
-
-			return expanded;
-		}
-	};
-
-	if ( !rmargin.test( prefix ) ) {
-		jQuery.cssHooks[ prefix + suffix ].set = setPositiveNumber;
-	}
-});
-
-jQuery.fn.extend({
-	css: function( name, value ) {
-		return access( this, function( elem, name, value ) {
-			var styles, len,
-				map = {},
-				i = 0;
-
-			if ( jQuery.isArray( name ) ) {
-				styles = getStyles( elem );
-				len = name.length;
-
-				for ( ; i < len; i++ ) {
-					map[ name[ i ] ] = jQuery.css( elem, name[ i ], false, styles );
-				}
-
-				return map;
-			}
-
-			return value !== undefined ?
-				jQuery.style( elem, name, value ) :
-				jQuery.css( elem, name );
-		}, name, value, arguments.length > 1 );
-	},
-	show: function() {
-		return showHide( this, true );
-	},
-	hide: function() {
-		return showHide( this );
-	},
-	toggle: function( state ) {
-		if ( typeof state === "boolean" ) {
-			return state ? this.show() : this.hide();
-		}
-
-		return this.each(function() {
-			if ( isHidden( this ) ) {
-				jQuery( this ).show();
-			} else {
-				jQuery( this ).hide();
-			}
-		});
-	}
-});
-
-
-function Tween( elem, options, prop, end, easing ) {
-	return new Tween.prototype.init( elem, options, prop, end, easing );
-}
-jQuery.Tween = Tween;
-
-Tween.prototype = {
-	constructor: Tween,
-	init: function( elem, options, prop, end, easing, unit ) {
-		this.elem = elem;
-		this.prop = prop;
-		this.easing = easing || "swing";
-		this.options = options;
-		this.start = this.now = this.cur();
-		this.end = end;
-		this.unit = unit || ( jQuery.cssNumber[ prop ] ? "" : "px" );
-	},
-	cur: function() {
-		var hooks = Tween.propHooks[ this.prop ];
-
-		return hooks && hooks.get ?
-			hooks.get( this ) :
-			Tween.propHooks._default.get( this );
-	},
-	run: function( percent ) {
-		var eased,
-			hooks = Tween.propHooks[ this.prop ];
-
-		if ( this.options.duration ) {
-			this.pos = eased = jQuery.easing[ this.easing ](
-				percent, this.options.duration * percent, 0, 1, this.options.duration
-			);
-		} else {
-			this.pos = eased = percent;
-		}
-		this.now = ( this.end - this.start ) * eased + this.start;
-
-		if ( this.options.step ) {
-			this.options.step.call( this.elem, this.now, this );
-		}
-
-		if ( hooks && hooks.set ) {
-			hooks.set( this );
-		} else {
-			Tween.propHooks._default.set( this );
-		}
-		return this;
-	}
-};
-
-Tween.prototype.init.prototype = Tween.prototype;
-
-Tween.propHooks = {
-	_default: {
-		get: function( tween ) {
-			var result;
-
-			if ( tween.elem[ tween.prop ] != null &&
-				(!tween.elem.style || tween.elem.style[ tween.prop ] == null) ) {
-				return tween.elem[ tween.prop ];
-			}
-
-			// Passing an empty string as a 3rd parameter to .css will automatically
-			// attempt a parseFloat and fallback to a string if the parse fails.
-			// Simple values such as "10px" are parsed to Float;
-			// complex values such as "rotate(1rad)" are returned as-is.
-			result = jQuery.css( tween.elem, tween.prop, "" );
-			// Empty strings, null, undefined and "auto" are converted to 0.
-			return !result || result === "auto" ? 0 : result;
-		},
-		set: function( tween ) {
-			// Use step hook for back compat.
-			// Use cssHook if its there.
-			// Use .style if available and use plain properties where available.
-			if ( jQuery.fx.step[ tween.prop ] ) {
-				jQuery.fx.step[ tween.prop ]( tween );
-			} else if ( tween.elem.style && ( tween.elem.style[ jQuery.cssProps[ tween.prop ] ] != null || jQuery.cssHooks[ tween.prop ] ) ) {
-				jQuery.style( tween.elem, tween.prop, tween.now + tween.unit );
-			} else {
-				tween.elem[ tween.prop ] = tween.now;
-			}
-		}
-	}
-};
-
-// Support: IE9
-// Panic based approach to setting things on disconnected nodes
-Tween.propHooks.scrollTop = Tween.propHooks.scrollLeft = {
-	set: function( tween ) {
-		if ( tween.elem.nodeType && tween.elem.parentNode ) {
-			tween.elem[ tween.prop ] = tween.now;
-		}
-	}
-};
-
-jQuery.easing = {
-	linear: function( p ) {
-		return p;
-	},
-	swing: function( p ) {
-		return 0.5 - Math.cos( p * Math.PI ) / 2;
-	}
-};
-
-jQuery.fx = Tween.prototype.init;
-
-// Back Compat <1.8 extension point
-jQuery.fx.step = {};
-
-
-
-
-var
-	fxNow, timerId,
-	rfxtypes = /^(?:toggle|show|hide)$/,
-	rfxnum = new RegExp( "^(?:([+-])=|)(" + pnum + ")([a-z%]*)$", "i" ),
-	rrun = /queueHooks$/,
-	animationPrefilters = [ defaultPrefilter ],
-	tweeners = {
-		"*": [ function( prop, value ) {
-			var tween = this.createTween( prop, value ),
-				target = tween.cur(),
-				parts = rfxnum.exec( value ),
-				unit = parts && parts[ 3 ] || ( jQuery.cssNumber[ prop ] ? "" : "px" ),
-
-				// Starting value computation is required for potential unit mismatches
-				start = ( jQuery.cssNumber[ prop ] || unit !== "px" && +target ) &&
-					rfxnum.exec( jQuery.css( tween.elem, prop ) ),
-				scale = 1,
-				maxIterations = 20;
-
-			if ( start && start[ 3 ] !== unit ) {
-				// Trust units reported by jQuery.css
-				unit = unit || start[ 3 ];
-
-				// Make sure we update the tween properties later on
-				parts = parts || [];
-
-				// Iteratively approximate from a nonzero starting point
-				start = +target || 1;
-
-				do {
-					// If previous iteration zeroed out, double until we get *something*.
-					// Use string for doubling so we don't accidentally see scale as unchanged below
-					scale = scale || ".5";
-
-					// Adjust and apply
-					start = start / scale;
-					jQuery.style( tween.elem, prop, start + unit );
-
-				// Update scale, tolerating zero or NaN from tween.cur(),
-				// break the loop if scale is unchanged or perfect, or if we've just had enough
-				} while ( scale !== (scale = tween.cur() / target) && scale !== 1 && --maxIterations );
-			}
-
-			// Update tween properties
-			if ( parts ) {
-				start = tween.start = +start || +target || 0;
-				tween.unit = unit;
-				// If a +=/-= token was provided, we're doing a relative animation
-				tween.end = parts[ 1 ] ?
-					start + ( parts[ 1 ] + 1 ) * parts[ 2 ] :
-					+parts[ 2 ];
-			}
-
-			return tween;
-		} ]
-	};
-
-// Animations created synchronously will run synchronously
-function createFxNow() {
-	setTimeout(function() {
-		fxNow = undefined;
-	});
-	return ( fxNow = jQuery.now() );
-}
-
-// Generate parameters to create a standard animation
-function genFx( type, includeWidth ) {
-	var which,
-		i = 0,
-		attrs = { height: type };
-
-	// If we include width, step value is 1 to do all cssExpand values,
-	// otherwise step value is 2 to skip over Left and Right
-	includeWidth = includeWidth ? 1 : 0;
-	for ( ; i < 4 ; i += 2 - includeWidth ) {
-		which = cssExpand[ i ];
-		attrs[ "margin" + which ] = attrs[ "padding" + which ] = type;
-	}
-
-	if ( includeWidth ) {
-		attrs.opacity = attrs.width = type;
-	}
-
-	return attrs;
-}
-
-function createTween( value, prop, animation ) {
-	var tween,
-		collection = ( tweeners[ prop ] || [] ).concat( tweeners[ "*" ] ),
-		index = 0,
-		length = collection.length;
-	for ( ; index < length; index++ ) {
-		if ( (tween = collection[ index ].call( animation, prop, value )) ) {
-
-			// We're done with this property
-			return tween;
-		}
-	}
-}
-
-function defaultPrefilter( elem, props, opts ) {
-	/* jshint validthis: true */
-	var prop, value, toggle, tween, hooks, oldfire, display, checkDisplay,
-		anim = this,
-		orig = {},
-		style = elem.style,
-		hidden = elem.nodeType && isHidden( elem ),
-		dataShow = data_priv.get( elem, "fxshow" );
-
-	// Handle queue: false promises
-	if ( !opts.queue ) {
-		hooks = jQuery._queueHooks( elem, "fx" );
-		if ( hooks.unqueued == null ) {
-			hooks.unqueued = 0;
-			oldfire = hooks.empty.fire;
-			hooks.empty.fire = function() {
-				if ( !hooks.unqueued ) {
-					oldfire();
-				}
-			};
-		}
-		hooks.unqueued++;
-
-		anim.always(function() {
-			// Ensure the complete handler is called before this completes
-			anim.always(function() {
-				hooks.unqueued--;
-				if ( !jQuery.queue( elem, "fx" ).length ) {
-					hooks.empty.fire();
-				}
-			});
-		});
-	}
-
-	// Height/width overflow pass
-	if ( elem.nodeType === 1 && ( "height" in props || "width" in props ) ) {
-		// Make sure that nothing sneaks out
-		// Record all 3 overflow attributes because IE9-10 do not
-		// change the overflow attribute when overflowX and
-		// overflowY are set to the same value
-		opts.overflow = [ style.overflow, style.overflowX, style.overflowY ];
-
-		// Set display property to inline-block for height/width
-		// animations on inline elements that are having width/height animated
-		display = jQuery.css( elem, "display" );
-
-		// Test default display if display is currently "none"
-		checkDisplay = display === "none" ?
-			data_priv.get( elem, "olddisplay" ) || defaultDisplay( elem.nodeName ) : display;
-
-		if ( checkDisplay === "inline" && jQuery.css( elem, "float" ) === "none" ) {
-			style.display = "inline-block";
-		}
-	}
-
-	if ( opts.overflow ) {
-		style.overflow = "hidden";
-		anim.always(function() {
-			style.overflow = opts.overflow[ 0 ];
-			style.overflowX = opts.overflow[ 1 ];
-			style.overflowY = opts.overflow[ 2 ];
-		});
-	}
-
-	// show/hide pass
-	for ( prop in props ) {
-		value = props[ prop ];
-		if ( rfxtypes.exec( value ) ) {
-			delete props[ prop ];
-			toggle = toggle || value === "toggle";
-			if ( value === ( hidden ? "hide" : "show" ) ) {
-
-				// If there is dataShow left over from a stopped hide or show and we are going to proceed with show, we should pretend to be hidden
-				if ( value === "show" && dataShow && dataShow[ prop ] !== undefined ) {
-					hidden = true;
-				} else {
-					continue;
-				}
-			}
-			orig[ prop ] = dataShow && dataShow[ prop ] || jQuery.style( elem, prop );
-
-		// Any non-fx value stops us from restoring the original display value
-		} else {
-			display = undefined;
-		}
-	}
-
-	if ( !jQuery.isEmptyObject( orig ) ) {
-		if ( dataShow ) {
-			if ( "hidden" in dataShow ) {
-				hidden = dataShow.hidden;
-			}
-		} else {
-			dataShow = data_priv.access( elem, "fxshow", {} );
-		}
-
-		// Store state if its toggle - enables .stop().toggle() to "reverse"
-		if ( toggle ) {
-			dataShow.hidden = !hidden;
-		}
-		if ( hidden ) {
-			jQuery( elem ).show();
-		} else {
-			anim.done(function() {
-				jQuery( elem ).hide();
-			});
-		}
-		anim.done(function() {
-			var prop;
-
-			data_priv.remove( elem, "fxshow" );
-			for ( prop in orig ) {
-				jQuery.style( elem, prop, orig[ prop ] );
-			}
-		});
-		for ( prop in orig ) {
-			tween = createTween( hidden ? dataShow[ prop ] : 0, prop, anim );
-
-			if ( !( prop in dataShow ) ) {
-				dataShow[ prop ] = tween.start;
-				if ( hidden ) {
-					tween.end = tween.start;
-					tween.start = prop === "width" || prop === "height" ? 1 : 0;
-				}
-			}
-		}
-
-	// If this is a noop like .hide().hide(), restore an overwritten display value
-	} else if ( (display === "none" ? defaultDisplay( elem.nodeName ) : display) === "inline" ) {
-		style.display = display;
-	}
-}
-
-function propFilter( props, specialEasing ) {
-	var index, name, easing, value, hooks;
-
-	// camelCase, specialEasing and expand cssHook pass
-	for ( index in props ) {
-		name = jQuery.camelCase( index );
-		easing = specialEasing[ name ];
-		value = props[ index ];
-		if ( jQuery.isArray( value ) ) {
-			easing = value[ 1 ];
-			value = props[ index ] = value[ 0 ];
-		}
-
-		if ( index !== name ) {
-			props[ name ] = value;
-			delete props[ index ];
-		}
-
-		hooks = jQuery.cssHooks[ name ];
-		if ( hooks && "expand" in hooks ) {
-			value = hooks.expand( value );
-			delete props[ name ];
-
-			// Not quite $.extend, this won't overwrite existing keys.
-			// Reusing 'index' because we have the correct "name"
-			for ( index in value ) {
-				if ( !( index in props ) ) {
-					props[ index ] = value[ index ];
-					specialEasing[ index ] = easing;
-				}
-			}
-		} else {
-			specialEasing[ name ] = easing;
-		}
-	}
-}
-
-function Animation( elem, properties, options ) {
-	var result,
-		stopped,
-		index = 0,
-		length = animationPrefilters.length,
-		deferred = jQuery.Deferred().always( function() {
-			// Don't match elem in the :animated selector
-			delete tick.elem;
-		}),
-		tick = function() {
-			if ( stopped ) {
-				return false;
-			}
-			var currentTime = fxNow || createFxNow(),
-				remaining = Math.max( 0, animation.startTime + animation.duration - currentTime ),
-				// Support: Android 2.3
-				// Archaic crash bug won't allow us to use `1 - ( 0.5 || 0 )` (#12497)
-				temp = remaining / animation.duration || 0,
-				percent = 1 - temp,
-				index = 0,
-				length = animation.tweens.length;
-
-			for ( ; index < length ; index++ ) {
-				animation.tweens[ index ].run( percent );
-			}
-
-			deferred.notifyWith( elem, [ animation, percent, remaining ]);
-
-			if ( percent < 1 && length ) {
-				return remaining;
-			} else {
-				deferred.resolveWith( elem, [ animation ] );
-				return false;
-			}
-		},
-		animation = deferred.promise({
-			elem: elem,
-			props: jQuery.extend( {}, properties ),
-			opts: jQuery.extend( true, { specialEasing: {} }, options ),
-			originalProperties: properties,
-			originalOptions: options,
-			startTime: fxNow || createFxNow(),
-			duration: options.duration,
-			tweens: [],
-			createTween: function( prop, end ) {
-				var tween = jQuery.Tween( elem, animation.opts, prop, end,
-						animation.opts.specialEasing[ prop ] || animation.opts.easing );
-				animation.tweens.push( tween );
-				return tween;
-			},
-			stop: function( gotoEnd ) {
-				var index = 0,
-					// If we are going to the end, we want to run all the tweens
-					// otherwise we skip this part
-					length = gotoEnd ? animation.tweens.length : 0;
-				if ( stopped ) {
-					return this;
-				}
-				stopped = true;
-				for ( ; index < length ; index++ ) {
-					animation.tweens[ index ].run( 1 );
-				}
-
-				// Resolve when we played the last frame; otherwise, reject
-				if ( gotoEnd ) {
-					deferred.resolveWith( elem, [ animation, gotoEnd ] );
-				} else {
-					deferred.rejectWith( elem, [ animation, gotoEnd ] );
-				}
-				return this;
-			}
-		}),
-		props = animation.props;
-
-	propFilter( props, animation.opts.specialEasing );
-
-	for ( ; index < length ; index++ ) {
-		result = animationPrefilters[ index ].call( animation, elem, props, animation.opts );
-		if ( result ) {
-			return result;
-		}
-	}
-
-	jQuery.map( props, createTween, animation );
-
-	if ( jQuery.isFunction( animation.opts.start ) ) {
-		animation.opts.start.call( elem, animation );
-	}
-
-	jQuery.fx.timer(
-		jQuery.extend( tick, {
-			elem: elem,
-			anim: animation,
-			queue: animation.opts.queue
-		})
-	);
-
-	// attach callbacks from options
-	return animation.progress( animation.opts.progress )
-		.done( animation.opts.done, animation.opts.complete )
-		.fail( animation.opts.fail )
-		.always( animation.opts.always );
-}
-
-jQuery.Animation = jQuery.extend( Animation, {
-
-	tweener: function( props, callback ) {
-		if ( jQuery.isFunction( props ) ) {
-			callback = props;
-			props = [ "*" ];
-		} else {
-			props = props.split(" ");
-		}
-
-		var prop,
-			index = 0,
-			length = props.length;
-
-		for ( ; index < length ; index++ ) {
-			prop = props[ index ];
-			tweeners[ prop ] = tweeners[ prop ] || [];
-			tweeners[ prop ].unshift( callback );
-		}
-	},
-
-	prefilter: function( callback, prepend ) {
-		if ( prepend ) {
-			animationPrefilters.unshift( callback );
-		} else {
-			animationPrefilters.push( callback );
-		}
-	}
-});
-
-jQuery.speed = function( speed, easing, fn ) {
-	var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : {
-		complete: fn || !fn && easing ||
-			jQuery.isFunction( speed ) && speed,
-		duration: speed,
-		easing: fn && easing || easing && !jQuery.isFunction( easing ) && easing
-	};
-
-	opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
-		opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[ opt.duration ] : jQuery.fx.speeds._default;
-
-	// Normalize opt.queue - true/undefined/null -> "fx"
-	if ( opt.queue == null || opt.queue === true ) {
-		opt.queue = "fx";
-	}
-
-	// Queueing
-	opt.old = opt.complete;
-
-	opt.complete = function() {
-		if ( jQuery.isFunction( opt.old ) ) {
-			opt.old.call( this );
-		}
-
-		if ( opt.queue ) {
-			jQuery.dequeue( this, opt.queue );
-		}
-	};
-
-	return opt;
-};
-
-jQuery.fn.extend({
-	fadeTo: function( speed, to, easing, callback ) {
-
-		// Show any hidden elements after setting opacity to 0
-		return this.filter( isHidden ).css( "opacity", 0 ).show()
-
-			// Animate to the value specified
-			.end().animate({ opacity: to }, speed, easing, callback );
-	},
-	animate: function( prop, speed, easing, callback ) {
-		var empty = jQuery.isEmptyObject( prop ),
-			optall = jQuery.speed( speed, easing, callback ),
-			doAnimation = function() {
-				// Operate on a copy of prop so per-property easing won't be lost
-				var anim = Animation( this, jQuery.extend( {}, prop ), optall );
-
-				// Empty animations, or finishing resolves immediately
-				if ( empty || data_priv.get( this, "finish" ) ) {
-					anim.stop( true );
-				}
-			};
-			doAnimation.finish = doAnimation;
-
-		return empty || optall.queue === false ?
-			this.each( doAnimation ) :
-			this.queue( optall.queue, doAnimation );
-	},
-	stop: function( type, clearQueue, gotoEnd ) {
-		var stopQueue = function( hooks ) {
-			var stop = hooks.stop;
-			delete hooks.stop;
-			stop( gotoEnd );
-		};
-
-		if ( typeof type !== "string" ) {
-			gotoEnd = clearQueue;
-			clearQueue = type;
-			type = undefined;
-		}
-		if ( clearQueue && type !== false ) {
-			this.queue( type || "fx", [] );
-		}
-
-		return this.each(function() {
-			var dequeue = true,
-				index = type != null && type + "queueHooks",
-				timers = jQuery.timers,
-				data = data_priv.get( this );
-
-			if ( index ) {
-				if ( data[ index ] && data[ index ].stop ) {
-					stopQueue( data[ index ] );
-				}
-			} else {
-				for ( index in data ) {
-					if ( data[ index ] && data[ index ].stop && rrun.test( index ) ) {
-						stopQueue( data[ index ] );
-					}
-				}
-			}
-
-			for ( index = timers.length; index--; ) {
-				if ( timers[ index ].elem === this && (type == null || timers[ index ].queue === type) ) {
-					timers[ index ].anim.stop( gotoEnd );
-					dequeue = false;
-					timers.splice( index, 1 );
-				}
-			}
-
-			// Start the next in the queue if the last step wasn't forced.
-			// Timers currently will call their complete callbacks, which
-			// will dequeue but only if they were gotoEnd.
-			if ( dequeue || !gotoEnd ) {
-				jQuery.dequeue( this, type );
-			}
-		});
-	},
-	finish: function( type ) {
-		if ( type !== false ) {
-			type = type || "fx";
-		}
-		return this.each(function() {
-			var index,
-				data = data_priv.get( this ),
-				queue = data[ type + "queue" ],
-				hooks = data[ type + "queueHooks" ],
-				timers = jQuery.timers,
-				length = queue ? queue.length : 0;
-
-			// Enable finishing flag on private data
-			data.finish = true;
-
-			// Empty the queue first
-			jQuery.queue( this, type, [] );
-
-			if ( hooks && hooks.stop ) {
-				hooks.stop.call( this, true );
-			}
-
-			// Look for any active animations, and finish them
-			for ( index = timers.length; index--; ) {
-				if ( timers[ index ].elem === this && timers[ index ].queue === type ) {
-					timers[ index ].anim.stop( true );
-					timers.splice( index, 1 );
-				}
-			}
-
-			// Look for any animations in the old queue and finish them
-			for ( index = 0; index < length; index++ ) {
-				if ( queue[ index ] && queue[ index ].finish ) {
-					queue[ index ].finish.call( this );
-				}
-			}
-
-			// Turn off finishing flag
-			delete data.finish;
-		});
-	}
-});
-
-jQuery.each([ "toggle", "show", "hide" ], function( i, name ) {
-	var cssFn = jQuery.fn[ name ];
-	jQuery.fn[ name ] = function( speed, easing, callback ) {
-		return speed == null || typeof speed === "boolean" ?
-			cssFn.apply( this, arguments ) :
-			this.animate( genFx( name, true ), speed, easing, callback );
-	};
-});
-
-// Generate shortcuts for custom animations
-jQuery.each({
-	slideDown: genFx("show"),
-	slideUp: genFx("hide"),
-	slideToggle: genFx("toggle"),
-	fadeIn: { opacity: "show" },
-	fadeOut: { opacity: "hide" },
-	fadeToggle: { opacity: "toggle" }
-}, function( name, props ) {
-	jQuery.fn[ name ] = function( speed, easing, callback ) {
-		return this.animate( props, speed, easing, callback );
-	};
-});
-
-jQuery.timers = [];
-jQuery.fx.tick = function() {
-	var timer,
-		i = 0,
-		timers = jQuery.timers;
-
-	fxNow = jQuery.now();
-
-	for ( ; i < timers.length; i++ ) {
-		timer = timers[ i ];
-		// Checks the timer has not already been removed
-		if ( !timer() && timers[ i ] === timer ) {
-			timers.splice( i--, 1 );
-		}
-	}
-
-	if ( !timers.length ) {
-		jQuery.fx.stop();
-	}
-	fxNow = undefined;
-};
-
-jQuery.fx.timer = function( timer ) {
-	jQuery.timers.push( timer );
-	if ( timer() ) {
-		jQuery.fx.start();
-	} else {
-		jQuery.timers.pop();
-	}
-};
-
-jQuery.fx.interval = 13;
-
-jQuery.fx.start = function() {
-	if ( !timerId ) {
-		timerId = setInterval( jQuery.fx.tick, jQuery.fx.interval );
-	}
-};
-
-jQuery.fx.stop = function() {
-	clearInterval( timerId );
-	timerId = null;
-};
-
-jQuery.fx.speeds = {
-	slow: 600,
-	fast: 200,
-	// Default speed
-	_default: 400
-};
-
-
-// Based off of the plugin by Clint Helfers, with permission.
-// http://blindsignals.com/index.php/2009/07/jquery-delay/
-jQuery.fn.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 );
-		};
-	});
-};
-
-
-(function() {
-	var input = document.createElement( "input" ),
-		select = document.createElement( "select" ),
-		opt = select.appendChild( document.createElement( "option" ) );
-
-	input.type = "checkbox";
-
-	// Support: iOS<=5.1, Android<=4.2+
-	// Default value for a checkbox should be "on"
-	support.checkOn = input.value !== "";
-
-	// Support: IE<=11+
-	// Must access selectedIndex to make default options select
-	support.optSelected = opt.selected;
-
-	// Support: Android<=2.3
-	// Options inside disabled selects are incorrectly marked as disabled
-	select.disabled = true;
-	support.optDisabled = !opt.disabled;
-
-	// Support: IE<=11+
-	// An input loses its value after becoming a radio
-	input = document.createElement( "input" );
-	input.value = "t";
-	input.type = "radio";
-	support.radioValue = input.value === "t";
-})();
-
-
-var nodeHook, boolHook,
-	attrHandle = jQuery.expr.attrHandle;
-
-jQuery.fn.extend({
-	attr: function( name, value ) {
-		return access( this, jQuery.attr, name, value, arguments.length > 1 );
-	},
-
-	removeAttr: function( name ) {
-		return this.each(function() {
-			jQuery.removeAttr( this, name );
-		});
-	}
-});
-
-jQuery.extend({
-	attr: function( elem, name, value ) {
-		var hooks, ret,
-			nType = elem.nodeType;
-
-		// don't get/set attributes on text, comment and attribute nodes
-		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
-
-		// Fallback to prop when attributes are not supported
-		if ( typeof elem.getAttribute === strundefined ) {
-			return jQuery.prop( elem, name, value );
-		}
-
-		// All attributes are lowercase
-		// Grab necessary hook if one is defined
-		if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) {
-			name = name.toLowerCase();
-			hooks = jQuery.attrHooks[ name ] ||
-				( jQuery.expr.match.bool.test( name ) ? boolHook : nodeHook );
-		}
-
-		if ( value !== undefined ) {
-
-			if ( value === null ) {
-				jQuery.removeAttr( elem, name );
-
-			} else if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
-				return ret;
-
-			} else {
-				elem.setAttribute( name, value + "" );
-				return value;
-			}
-
-		} else if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) {
-			return ret;
-
-		} else {
-			ret = jQuery.find.attr( elem, name );
-
-			// Non-existent attributes return null, we normalize to undefined
-			return ret == null ?
-				undefined :
-				ret;
-		}
-	},
-
-	removeAttr: function( elem, value ) {
-		var name, propName,
-			i = 0,
-			attrNames = value && value.match( rnotwhite );
-
-		if ( attrNames && elem.nodeType === 1 ) {
-			while ( (name = attrNames[i++]) ) {
-				propName = jQuery.propFix[ name ] || name;
-
-				// Boolean attributes get special treatment (#10870)
-				if ( jQuery.expr.match.bool.test( name ) ) {
-					// Set corresponding property to false
-					elem[ propName ] = false;
-				}
-
-				elem.removeAttribute( name );
-			}
-		}
-	},
-
-	attrHooks: {
-		type: {
-			set: function( elem, value ) {
-				if ( !support.radioValue && value === "radio" &&
-					jQuery.nodeName( elem, "input" ) ) {
-					var val = elem.value;
-					elem.setAttribute( "type", value );
-					if ( val ) {
-						elem.value = val;
-					}
-					return value;
-				}
-			}
-		}
-	}
-});
-
-// Hooks for boolean attributes
-boolHook = {
-	set: function( elem, value, name ) {
-		if ( value === false ) {
-			// Remove boolean attributes when set to false
-			jQuery.removeAttr( elem, name );
-		} else {
-			elem.setAttribute( name, name );
-		}
-		return name;
-	}
-};
-jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( i, name ) {
-	var getter = attrHandle[ name ] || jQuery.find.attr;
-
-	attrHandle[ name ] = function( elem, name, isXML ) {
-		var ret, handle;
-		if ( !isXML ) {
-			// Avoid an infinite loop by temporarily removing this function from the getter
-			handle = attrHandle[ name ];
-			attrHandle[ name ] = ret;
-			ret = getter( elem, name, isXML ) != null ?
-				name.toLowerCase() :
-				null;
-			attrHandle[ name ] = handle;
-		}
-		return ret;
-	};
-});
-
-
-
-
-var rfocusable = /^(?:input|select|textarea|button)$/i;
-
-jQuery.fn.extend({
-	prop: function( name, value ) {
-		return access( this, jQuery.prop, name, value, arguments.length > 1 );
-	},
-
-	removeProp: function( name ) {
-		return this.each(function() {
-			delete this[ jQuery.propFix[ name ] || name ];
-		});
-	}
-});
-
-jQuery.extend({
-	propFix: {
-		"for": "htmlFor",
-		"class": "className"
-	},
-
-	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 ) {
-			return hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ?
-				ret :
-				( elem[ name ] = value );
-
-		} else {
-			return hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ?
-				ret :
-				elem[ name ];
-		}
-	},
-
-	propHooks: {
-		tabIndex: {
-			get: function( elem ) {
-				return elem.hasAttribute( "tabindex" ) || rfocusable.test( elem.nodeName ) || elem.href ?
-					elem.tabIndex :
-					-1;
-			}
-		}
-	}
-});
-
-if ( !support.optSelected ) {
-	jQuery.propHooks.selected = {
-		get: function( elem ) {
-			var parent = elem.parentNode;
-			if ( parent && parent.parentNode ) {
-				parent.parentNode.selectedIndex;
-			}
-			return null;
-		}
-	};
-}
-
-jQuery.each([
-	"tabIndex",
-	"readOnly",
-	"maxLength",
-	"cellSpacing",
-	"cellPadding",
-	"rowSpan",
-	"colSpan",
-	"useMap",
-	"frameBorder",
-	"contentEditable"
-], function() {
-	jQuery.propFix[ this.toLowerCase() ] = this;
-});
-
-
-
-
-var rclass = /[\t\r\n\f]/g;
-
-jQuery.fn.extend({
-	addClass: function( value ) {
-		var classes, elem, cur, clazz, j, finalValue,
-			proceed = typeof value === "string" && value,
-			i = 0,
-			len = this.length;
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( j ) {
-				jQuery( this ).addClass( value.call( this, j, this.className ) );
-			});
-		}
-
-		if ( proceed ) {
-			// The disjunction here is for better compressibility (see removeClass)
-			classes = ( value || "" ).match( rnotwhite ) || [];
-
-			for ( ; i < len; i++ ) {
-				elem = this[ i ];
-				cur = elem.nodeType === 1 && ( elem.className ?
-					( " " + elem.className + " " ).replace( rclass, " " ) :
-					" "
-				);
-
-				if ( cur ) {
-					j = 0;
-					while ( (clazz = classes[j++]) ) {
-						if ( cur.indexOf( " " + clazz + " " ) < 0 ) {
-							cur += clazz + " ";
-						}
-					}
-
-					// only assign if different to avoid unneeded rendering.
-					finalValue = jQuery.trim( cur );
-					if ( elem.className !== finalValue ) {
-						elem.className = finalValue;
-					}
-				}
-			}
-		}
-
-		return this;
-	},
-
-	removeClass: function( value ) {
-		var classes, elem, cur, clazz, j, finalValue,
-			proceed = arguments.length === 0 || typeof value === "string" && value,
-			i = 0,
-			len = this.length;
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( j ) {
-				jQuery( this ).removeClass( value.call( this, j, this.className ) );
-			});
-		}
-		if ( proceed ) {
-			classes = ( value || "" ).match( rnotwhite ) || [];
-
-			for ( ; i < len; i++ ) {
-				elem = this[ i ];
-				// This expression is here for better compressibility (see addClass)
-				cur = elem.nodeType === 1 && ( elem.className ?
-					( " " + elem.className + " " ).replace( rclass, " " ) :
-					""
-				);
-
-				if ( cur ) {
-					j = 0;
-					while ( (clazz = classes[j++]) ) {
-						// Remove *all* instances
-						while ( cur.indexOf( " " + clazz + " " ) >= 0 ) {
-							cur = cur.replace( " " + clazz + " ", " " );
-						}
-					}
-
-					// Only assign if different to avoid unneeded rendering.
-					finalValue = value ? jQuery.trim( cur ) : "";
-					if ( elem.className !== finalValue ) {
-						elem.className = finalValue;
-					}
-				}
-			}
-		}
-
-		return this;
-	},
-
-	toggleClass: function( value, stateVal ) {
-		var type = typeof value;
-
-		if ( typeof stateVal === "boolean" && type === "string" ) {
-			return stateVal ? this.addClass( value ) : this.removeClass( value );
-		}
-
-		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 ),
-					classNames = value.match( rnotwhite ) || [];
-
-				while ( (className = classNames[ i++ ]) ) {
-					// Check each className given, space separated list
-					if ( self.hasClass( className ) ) {
-						self.removeClass( className );
-					} else {
-						self.addClass( className );
-					}
-				}
-
-			// Toggle whole class name
-			} else if ( type === strundefined || type === "boolean" ) {
-				if ( this.className ) {
-					// store className if set
-					data_priv.set( this, "__className__", this.className );
-				}
-
-				// If the element has a class name or if we're passed `false`,
-				// then remove the whole classname (if there was one, the above saved it).
-				// Otherwise bring back whatever was previously saved (if anything),
-				// falling back to the empty string if nothing was stored.
-				this.className = this.className || value === false ? "" : data_priv.get( 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 ) >= 0 ) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-});
-
-
-
-
-var rreturn = /\r/g;
-
-jQuery.fn.extend({
-	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 val;
-
-			if ( this.nodeType !== 1 ) {
-				return;
-			}
-
-			if ( isFunction ) {
-				val = value.call( this, i, jQuery( this ).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 ) {
-				var val = jQuery.find.attr( elem, "value" );
-				return val != null ?
-					val :
-					// Support: IE10-11+
-					// option.text throws exceptions (#14686, #14858)
-					jQuery.trim( jQuery.text( elem ) );
-			}
-		},
-		select: {
-			get: function( elem ) {
-				var value, option,
-					options = elem.options,
-					index = elem.selectedIndex,
-					one = elem.type === "select-one" || index < 0,
-					values = one ? null : [],
-					max = one ? index + 1 : options.length,
-					i = index < 0 ?
-						max :
-						one ? index : 0;
-
-				// Loop through all the selected options
-				for ( ; i < max; i++ ) {
-					option = options[ i ];
-
-					// IE6-9 doesn't update selected after form reset (#2551)
-					if ( ( option.selected || i === index ) &&
-							// Don't return options that are disabled or in a disabled optgroup
-							( 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 );
-					}
-				}
-
-				return values;
-			},
-
-			set: function( elem, value ) {
-				var optionSet, option,
-					options = elem.options,
-					values = jQuery.makeArray( value ),
-					i = options.length;
-
-				while ( i-- ) {
-					option = options[ i ];
-					if ( (option.selected = jQuery.inArray( option.value, values ) >= 0) ) {
-						optionSet = true;
-					}
-				}
-
-				// Force browsers to behave consistently when non-matching value is set
-				if ( !optionSet ) {
-					elem.selectedIndex = -1;
-				}
-				return values;
-			}
-		}
-	}
-});
-
-// Radios and checkboxes getter/setter
-jQuery.each([ "radio", "checkbox" ], function() {
-	jQuery.valHooks[ this ] = {
-		set: function( elem, value ) {
-			if ( jQuery.isArray( value ) ) {
-				return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 );
-			}
-		}
-	};
-	if ( !support.checkOn ) {
-		jQuery.valHooks[ this ].get = function( elem ) {
-			return elem.getAttribute("value") === null ? "on" : elem.value;
-		};
-	}
-});
-
-
-
-
-// Return jQuery for attributes-only inclusion
-
-
-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 ) {
-		return arguments.length > 0 ?
-			this.on( name, null, data, fn ) :
-			this.trigger( name );
-	};
-});
-
-jQuery.fn.extend({
-	hover: function( fnOver, fnOut ) {
-		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
-	},
-
-	bind: function( types, data, fn ) {
-		return this.on( types, null, data, fn );
-	},
-	unbind: function( types, fn ) {
-		return this.off( types, null, fn );
-	},
-
-	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 );
-	}
-});
-
-
-var nonce = jQuery.now();
-
-var rquery = (/\?/);
-
-
-
-// Support: Android 2.3
-// Workaround failure to string-cast null input
-jQuery.parseJSON = function( data ) {
-	return JSON.parse( data + "" );
-};
-
-
-// Cross-browser xml parsing
-jQuery.parseXML = function( data ) {
-	var xml, tmp;
-	if ( !data || typeof data !== "string" ) {
-		return null;
-	}
-
-	// Support: IE9
-	try {
-		tmp = new DOMParser();
-		xml = tmp.parseFromString( data, "text/xml" );
-	} catch ( e ) {
-		xml = undefined;
-	}
-
-	if ( !xml || xml.getElementsByTagName( "parsererror" ).length ) {
-		jQuery.error( "Invalid XML: " + data );
-	}
-	return xml;
-};
-
-
-var
-	rhash = /#.*$/,
-	rts = /([?&])_=[^&]*/,
-	rheaders = /^(.*?):[ \t]*([^\r\n]*)$/mg,
-	// #7653, #8125, #8152: local protocol detection
-	rlocalProtocol = /^(?:about|app|app-storage|.+-extension|file|res|widget):$/,
-	rnoContent = /^(?:GET|HEAD)$/,
-	rprotocol = /^\/\//,
-	rurl = /^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,
-
-	/* Prefilters
-	 * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
-	 * 2) These are called:
-	 *    - BEFORE asking for a transport
-	 *    - AFTER param serialization (s.data is a string if s.processData is true)
-	 * 3) key is the dataType
-	 * 4) the catchall symbol "*" can be used
-	 * 5) execution will start with transport dataType and THEN continue down to "*" if needed
-	 */
-	prefilters = {},
-
-	/* Transports bindings
-	 * 1) key is the dataType
-	 * 2) the catchall symbol "*" can be used
-	 * 3) selection will start with transport dataType and THEN go to "*" if needed
-	 */
-	transports = {},
-
-	// Avoid comment-prolog char sequence (#10098); must appease lint and evade compression
-	allTypes = "*/".concat( "*" ),
-
-	// Document location
-	ajaxLocation = window.location.href,
-
-	// Segment location into parts
-	ajaxLocParts = rurl.exec( ajaxLocation.toLowerCase() ) || [];
-
-// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
-function addToPrefiltersOrTransports( structure ) {
-
-	// dataTypeExpression is optional and defaults to "*"
-	return function( dataTypeExpression, func ) {
-
-		if ( typeof dataTypeExpression !== "string" ) {
-			func = dataTypeExpression;
-			dataTypeExpression = "*";
-		}
-
-		var dataType,
-			i = 0,
-			dataTypes = dataTypeExpression.toLowerCase().match( rnotwhite ) || [];
-
-		if ( jQuery.isFunction( func ) ) {
-			// For each dataType in the dataTypeExpression
-			while ( (dataType = dataTypes[i++]) ) {
-				// Prepend if requested
-				if ( dataType[0] === "+" ) {
-					dataType = dataType.slice( 1 ) || "*";
-					(structure[ dataType ] = structure[ dataType ] || []).unshift( func );
-
-				// Otherwise append
-				} else {
-					(structure[ dataType ] = structure[ dataType ] || []).push( func );
-				}
-			}
-		}
-	};
-}
-
-// Base inspection function for prefilters and transports
-function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR ) {
-
-	var inspected = {},
-		seekingTransport = ( structure === transports );
-
-	function inspect( dataType ) {
-		var selected;
-		inspected[ dataType ] = true;
-		jQuery.each( structure[ dataType ] || [], function( _, prefilterOrFactory ) {
-			var dataTypeOrTransport = prefilterOrFactory( options, originalOptions, jqXHR );
-			if ( typeof dataTypeOrTransport === "string" && !seekingTransport && !inspected[ dataTypeOrTransport ] ) {
-				options.dataTypes.unshift( dataTypeOrTransport );
-				inspect( dataTypeOrTransport );
-				return false;
-			} else if ( seekingTransport ) {
-				return !( selected = dataTypeOrTransport );
-			}
-		});
-		return selected;
-	}
-
-	return inspect( options.dataTypes[ 0 ] ) || !inspected[ "*" ] && inspect( "*" );
-}
-
-// A special extend for ajax options
-// that takes "flat" options (not to be deep extended)
-// Fixes #9887
-function ajaxExtend( target, src ) {
-	var key, deep,
-		flatOptions = jQuery.ajaxSettings.flatOptions || {};
-
-	for ( key in src ) {
-		if ( src[ key ] !== undefined ) {
-			( flatOptions[ key ] ? target : ( deep || (deep = {}) ) )[ key ] = src[ key ];
-		}
-	}
-	if ( deep ) {
-		jQuery.extend( true, target, deep );
-	}
-
-	return target;
-}
-
-/* Handles responses to an ajax request:
- * - finds the right dataType (mediates between content-type and expected dataType)
- * - returns the corresponding response
- */
-function ajaxHandleResponses( s, jqXHR, responses ) {
-
-	var ct, type, finalDataType, firstDataType,
-		contents = s.contents,
-		dataTypes = s.dataTypes;
-
-	// Remove auto dataType and get content-type in the process
-	while ( dataTypes[ 0 ] === "*" ) {
-		dataTypes.shift();
-		if ( ct === undefined ) {
-			ct = s.mimeType || jqXHR.getResponseHeader("Content-Type");
-		}
-	}
-
-	// Check if we're dealing with a known content-type
-	if ( ct ) {
-		for ( type in contents ) {
-			if ( contents[ type ] && contents[ type ].test( ct ) ) {
-				dataTypes.unshift( type );
-				break;
-			}
-		}
-	}
-
-	// Check to see if we have a response for the expected dataType
-	if ( dataTypes[ 0 ] in responses ) {
-		finalDataType = dataTypes[ 0 ];
-	} else {
-		// Try convertible dataTypes
-		for ( type in responses ) {
-			if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[0] ] ) {
-				finalDataType = type;
-				break;
-			}
-			if ( !firstDataType ) {
-				firstDataType = type;
-			}
-		}
-		// Or just use first one
-		finalDataType = finalDataType || firstDataType;
-	}
-
-	// If we found a dataType
-	// We add the dataType to the list if needed
-	// and return the corresponding response
-	if ( finalDataType ) {
-		if ( finalDataType !== dataTypes[ 0 ] ) {
-			dataTypes.unshift( finalDataType );
-		}
-		return responses[ finalDataType ];
-	}
-}
-
-/* Chain conversions given the request and the original response
- * Also sets the responseXXX fields on the jqXHR instance
- */
-function ajaxConvert( s, response, jqXHR, isSuccess ) {
-	var conv2, current, conv, tmp, prev,
-		converters = {},
-		// Work with a copy of dataTypes in case we need to modify it for conversion
-		dataTypes = s.dataTypes.slice();
-
-	// Create converters map with lowercased keys
-	if ( dataTypes[ 1 ] ) {
-		for ( conv in s.converters ) {
-			converters[ conv.toLowerCase() ] = s.converters[ conv ];
-		}
-	}
-
-	current = dataTypes.shift();
-
-	// Convert to each sequential dataType
-	while ( current ) {
-
-		if ( s.responseFields[ current ] ) {
-			jqXHR[ s.responseFields[ current ] ] = response;
-		}
-
-		// Apply the dataFilter if provided
-		if ( !prev && isSuccess && s.dataFilter ) {
-			response = s.dataFilter( response, s.dataType );
-		}
-
-		prev = current;
-		current = dataTypes.shift();
-
-		if ( current ) {
-
-		// There's only work to do if current dataType is non-auto
-			if ( current === "*" ) {
-
-				current = prev;
-
-			// Convert response if prev dataType is non-auto and differs from current
-			} else if ( prev !== "*" && prev !== current ) {
-
-				// Seek a direct converter
-				conv = converters[ prev + " " + current ] || converters[ "* " + current ];
-
-				// If none found, seek a pair
-				if ( !conv ) {
-					for ( conv2 in converters ) {
-
-						// If conv2 outputs current
-						tmp = conv2.split( " " );
-						if ( tmp[ 1 ] === current ) {
-
-							// If prev can be converted to accepted input
-							conv = converters[ prev + " " + tmp[ 0 ] ] ||
-								converters[ "* " + tmp[ 0 ] ];
-							if ( conv ) {
-								// Condense equivalence converters
-								if ( conv === true ) {
-									conv = converters[ conv2 ];
-
-								// Otherwise, insert the intermediate dataType
-								} else if ( converters[ conv2 ] !== true ) {
-									current = tmp[ 0 ];
-									dataTypes.unshift( tmp[ 1 ] );
-								}
-								break;
-							}
-						}
-					}
-				}
-
-				// Apply converter (if not an equivalence)
-				if ( conv !== true ) {
-
-					// Unless errors are allowed to bubble, catch and return them
-					if ( conv && s[ "throws" ] ) {
-						response = conv( response );
-					} else {
-						try {
-							response = conv( response );
-						} catch ( e ) {
-							return { state: "parsererror", error: conv ? e : "No conversion from " + prev + " to " + current };
-						}
-					}
-				}
-			}
-		}
-	}
-
-	return { state: "success", data: response };
-}
-
-jQuery.extend({
-
-	// Counter for holding the number of active queries
-	active: 0,
-
-	// Last-Modified header cache for next request
-	lastModified: {},
-	etag: {},
-
-	ajaxSettings: {
-		url: ajaxLocation,
-		type: "GET",
-		isLocal: rlocalProtocol.test( ajaxLocParts[ 1 ] ),
-		global: true,
-		processData: true,
-		async: true,
-		contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-		/*
-		timeout: 0,
-		data: null,
-		dataType: null,
-		username: null,
-		password: null,
-		cache: null,
-		throws: false,
-		traditional: false,
-		headers: {},
-		*/
-
-		accepts: {
-			"*": allTypes,
-			text: "text/plain",
-			html: "text/html",
-			xml: "application/xml, text/xml",
-			json: "application/json, text/javascript"
-		},
-
-		contents: {
-			xml: /xml/,
-			html: /html/,
-			json: /json/
-		},
-
-		responseFields: {
-			xml: "responseXML",
-			text: "responseText",
-			json: "responseJSON"
-		},
-
-		// Data converters
-		// Keys separate source (or catchall "*") and destination types with a single space
-		converters: {
-
-			// Convert anything to text
-			"* text": String,
-
-			// Text to html (true = no transformation)
-			"text html": true,
-
-			// Evaluate text as a json expression
-			"text json": jQuery.parseJSON,
-
-			// Parse text as xml
-			"text xml": jQuery.parseXML
-		},
-
-		// For options that shouldn't be deep extended:
-		// you can add your own custom options here if
-		// and when you create one that shouldn't be
-		// deep extended (see ajaxExtend)
-		flatOptions: {
-			url: true,
-			context: true
-		}
-	},
-
-	// Creates a full fledged settings object into target
-	// with both ajaxSettings and settings fields.
-	// If target is omitted, writes into ajaxSettings.
-	ajaxSetup: function( target, settings ) {
-		return settings ?
-
-			// Building a settings object
-			ajaxExtend( ajaxExtend( target, jQuery.ajaxSettings ), settings ) :
-
-			// Extending ajaxSettings
-			ajaxExtend( jQuery.ajaxSettings, target );
-	},
-
-	ajaxPrefilter: addToPrefiltersOrTransports( prefilters ),
-	ajaxTransport: addToPrefiltersOrTransports( transports ),
-
-	// Main method
-	ajax: function( url, options ) {
-
-		// If url is an object, simulate pre-1.5 signature
-		if ( typeof url === "object" ) {
-			options = url;
-			url = undefined;
-		}
-
-		// Force options to be an object
-		options = options || {};
-
-		var transport,
-			// URL without anti-cache param
-			cacheURL,
-			// Response headers
-			responseHeadersString,
-			responseHeaders,
-			// timeout handle
-			timeoutTimer,
-			// Cross-domain detection vars
-			parts,
-			// To know if global events are to be dispatched
-			fireGlobals,
-			// Loop variable
-			i,
-			// Create the final options object
-			s = jQuery.ajaxSetup( {}, options ),
-			// Callbacks context
-			callbackContext = s.context || s,
-			// Context for global events is callbackContext if it is a DOM node or jQuery collection
-			globalEventContext = s.context && ( callbackContext.nodeType || callbackContext.jquery ) ?
-				jQuery( callbackContext ) :
-				jQuery.event,
-			// Deferreds
-			deferred = jQuery.Deferred(),
-			completeDeferred = jQuery.Callbacks("once memory"),
-			// Status-dependent callbacks
-			statusCode = s.statusCode || {},
-			// Headers (they are sent all at once)
-			requestHeaders = {},
-			requestHeadersNames = {},
-			// The jqXHR state
-			state = 0,
-			// Default abort message
-			strAbort = "canceled",
-			// Fake xhr
-			jqXHR = {
-				readyState: 0,
-
-				// Builds headers hashtable if needed
-				getResponseHeader: function( key ) {
-					var match;
-					if ( state === 2 ) {
-						if ( !responseHeaders ) {
-							responseHeaders = {};
-							while ( (match = rheaders.exec( responseHeadersString )) ) {
-								responseHeaders[ match[1].toLowerCase() ] = match[ 2 ];
-							}
-						}
-						match = responseHeaders[ key.toLowerCase() ];
-					}
-					return match == null ? null : match;
-				},
-
-				// Raw string
-				getAllResponseHeaders: function() {
-					return state === 2 ? responseHeadersString : null;
-				},
-
-				// Caches the header
-				setRequestHeader: function( name, value ) {
-					var lname = name.toLowerCase();
-					if ( !state ) {
-						name = requestHeadersNames[ lname ] = requestHeadersNames[ lname ] || name;
-						requestHeaders[ name ] = value;
-					}
-					return this;
-				},
-
-				// Overrides response content-type header
-				overrideMimeType: function( type ) {
-					if ( !state ) {
-						s.mimeType = type;
-					}
-					return this;
-				},
-
-				// Status-dependent callbacks
-				statusCode: function( map ) {
-					var code;
-					if ( map ) {
-						if ( state < 2 ) {
-							for ( code in map ) {
-								// Lazy-add the new callback in a way that preserves old ones
-								statusCode[ code ] = [ statusCode[ code ], map[ code ] ];
-							}
-						} else {
-							// Execute the appropriate callbacks
-							jqXHR.always( map[ jqXHR.status ] );
-						}
-					}
-					return this;
-				},
-
-				// Cancel the request
-				abort: function( statusText ) {
-					var finalText = statusText || strAbort;
-					if ( transport ) {
-						transport.abort( finalText );
-					}
-					done( 0, finalText );
-					return this;
-				}
-			};
-
-		// Attach deferreds
-		deferred.promise( jqXHR ).complete = completeDeferred.add;
-		jqXHR.success = jqXHR.done;
-		jqXHR.error = jqXHR.fail;
-
-		// Remove hash character (#7531: and string promotion)
-		// Add protocol if not provided (prefilters might expect it)
-		// Handle falsy url in the settings object (#10093: consistency with old signature)
-		// We also use the url parameter if available
-		s.url = ( ( url || s.url || ajaxLocation ) + "" ).replace( rhash, "" )
-			.replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
-
-		// Alias method option to type as per ticket #12004
-		s.type = options.method || options.type || s.method || s.type;
-
-		// Extract dataTypes list
-		s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().match( rnotwhite ) || [ "" ];
-
-		// A cross-domain request is in order when we have a protocol:host:port mismatch
-		if ( s.crossDomain == null ) {
-			parts = rurl.exec( s.url.toLowerCase() );
-			s.crossDomain = !!( parts &&
-				( parts[ 1 ] !== ajaxLocParts[ 1 ] || parts[ 2 ] !== ajaxLocParts[ 2 ] ||
-					( parts[ 3 ] || ( parts[ 1 ] === "http:" ? "80" : "443" ) ) !==
-						( ajaxLocParts[ 3 ] || ( ajaxLocParts[ 1 ] === "http:" ? "80" : "443" ) ) )
-			);
-		}
-
-		// Convert data if not already a string
-		if ( s.data && s.processData && typeof s.data !== "string" ) {
-			s.data = jQuery.param( s.data, s.traditional );
-		}
-
-		// Apply prefilters
-		inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
-
-		// If request was aborted inside a prefilter, stop there
-		if ( state === 2 ) {
-			return jqXHR;
-		}
-
-		// We can fire global events as of now if asked to
-		// Don't fire events if jQuery.event is undefined in an AMD-usage scenario (#15118)
-		fireGlobals = jQuery.event && s.global;
-
-		// Watch for a new set of requests
-		if ( fireGlobals && jQuery.active++ === 0 ) {
-			jQuery.event.trigger("ajaxStart");
-		}
-
-		// Uppercase the type
-		s.type = s.type.toUpperCase();
-
-		// Determine if request has content
-		s.hasContent = !rnoContent.test( s.type );
-
-		// Save the URL in case we're toying with the If-Modified-Since
-		// and/or If-None-Match header later on
-		cacheURL = s.url;
-
-		// More options handling for requests with no content
-		if ( !s.hasContent ) {
-
-			// If data is available, append data to url
-			if ( s.data ) {
-				cacheURL = ( s.url += ( rquery.test( cacheURL ) ? "&" : "?" ) + s.data );
-				// #9682: remove data so that it's not used in an eventual retry
-				delete s.data;
-			}
-
-			// Add anti-cache in url if needed
-			if ( s.cache === false ) {
-				s.url = rts.test( cacheURL ) ?
-
-					// If there is already a '_' parameter, set its value
-					cacheURL.replace( rts, "$1_=" + nonce++ ) :
-
-					// Otherwise add one to the end
-					cacheURL + ( rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + nonce++;
-			}
-		}
-
-		// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-		if ( s.ifModified ) {
-			if ( jQuery.lastModified[ cacheURL ] ) {
-				jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ cacheURL ] );
-			}
-			if ( jQuery.etag[ cacheURL ] ) {
-				jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ cacheURL ] );
-			}
-		}
-
-		// Set the correct header, if data is being sent
-		if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
-			jqXHR.setRequestHeader( "Content-Type", s.contentType );
-		}
-
-		// Set the Accepts header for the server, depending on the dataType
-		jqXHR.setRequestHeader(
-			"Accept",
-			s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ?
-				s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) :
-				s.accepts[ "*" ]
-		);
-
-		// Check for headers option
-		for ( i in s.headers ) {
-			jqXHR.setRequestHeader( i, s.headers[ i ] );
-		}
-
-		// Allow custom headers/mimetypes and early abort
-		if ( s.beforeSend && ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
-			// Abort if not done already and return
-			return jqXHR.abort();
-		}
-
-		// Aborting is no longer a cancellation
-		strAbort = "abort";
-
-		// Install callbacks on deferreds
-		for ( i in { success: 1, error: 1, complete: 1 } ) {
-			jqXHR[ i ]( s[ i ] );
-		}
-
-		// Get transport
-		transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
-
-		// If no transport, we auto-abort
-		if ( !transport ) {
-			done( -1, "No Transport" );
-		} else {
-			jqXHR.readyState = 1;
-
-			// Send global event
-			if ( fireGlobals ) {
-				globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
-			}
-			// Timeout
-			if ( s.async && s.timeout > 0 ) {
-				timeoutTimer = setTimeout(function() {
-					jqXHR.abort("timeout");
-				}, s.timeout );
-			}
-
-			try {
-				state = 1;
-				transport.send( requestHeaders, done );
-			} catch ( e ) {
-				// Propagate exception as error if not done
-				if ( state < 2 ) {
-					done( -1, e );
-				// Simply rethrow otherwise
-				} else {
-					throw e;
-				}
-			}
-		}
-
-		// Callback for when everything is done
-		function done( status, nativeStatusText, responses, headers ) {
-			var isSuccess, success, error, response, modified,
-				statusText = nativeStatusText;
-
-			// Called once
-			if ( state === 2 ) {
-				return;
-			}
-
-			// State is "done" now
-			state = 2;
-
-			// Clear timeout if it exists
-			if ( timeoutTimer ) {
-				clearTimeout( timeoutTimer );
-			}
-
-			// Dereference transport for early garbage collection
-			// (no matter how long the jqXHR object will be used)
-			transport = undefined;
-
-			// Cache response headers
-			responseHeadersString = headers || "";
-
-			// Set readyState
-			jqXHR.readyState = status > 0 ? 4 : 0;
-
-			// Determine if successful
-			isSuccess = status >= 200 && status < 300 || status === 304;
-
-			// Get response data
-			if ( responses ) {
-				response = ajaxHandleResponses( s, jqXHR, responses );
-			}
-
-			// Convert no matter what (that way responseXXX fields are always set)
-			response = ajaxConvert( s, response, jqXHR, isSuccess );
-
-			// If successful, handle type chaining
-			if ( isSuccess ) {
-
-				// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-				if ( s.ifModified ) {
-					modified = jqXHR.getResponseHeader("Last-Modified");
-					if ( modified ) {
-						jQuery.lastModified[ cacheURL ] = modified;
-					}
-					modified = jqXHR.getResponseHeader("etag");
-					if ( modified ) {
-						jQuery.etag[ cacheURL ] = modified;
-					}
-				}
-
-				// if no content
-				if ( status === 204 || s.type === "HEAD" ) {
-					statusText = "nocontent";
-
-				// if not modified
-				} else if ( status === 304 ) {
-					statusText = "notmodified";
-
-				// If we have data, let's convert it
-				} else {
-					statusText = response.state;
-					success = response.data;
-					error = response.error;
-					isSuccess = !error;
-				}
-			} else {
-				// Extract error from statusText and normalize for non-aborts
-				error = statusText;
-				if ( status || !statusText ) {
-					statusText = "error";
-					if ( status < 0 ) {
-						status = 0;
-					}
-				}
-			}
-
-			// Set data for the fake xhr object
-			jqXHR.status = status;
-			jqXHR.statusText = ( nativeStatusText || statusText ) + "";
-
-			// Success/Error
-			if ( isSuccess ) {
-				deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] );
-			} else {
-				deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] );
-			}
-
-			// Status-dependent callbacks
-			jqXHR.statusCode( statusCode );
-			statusCode = undefined;
-
-			if ( fireGlobals ) {
-				globalEventContext.trigger( isSuccess ? "ajaxSuccess" : "ajaxError",
-					[ jqXHR, s, isSuccess ? success : error ] );
-			}
-
-			// Complete
-			completeDeferred.fireWith( callbackContext, [ jqXHR, statusText ] );
-
-			if ( fireGlobals ) {
-				globalEventContext.trigger( "ajaxComplete", [ jqXHR, s ] );
-				// Handle the global AJAX counter
-				if ( !( --jQuery.active ) ) {
-					jQuery.event.trigger("ajaxStop");
-				}
-			}
-		}
-
-		return jqXHR;
-	},
-
-	getJSON: function( url, data, callback ) {
-		return jQuery.get( url, data, callback, "json" );
-	},
-
-	getScript: function( url, callback ) {
-		return jQuery.get( url, undefined, callback, "script" );
-	}
-});
-
-jQuery.each( [ "get", "post" ], function( i, method ) {
-	jQuery[ method ] = function( url, data, callback, type ) {
-		// Shift arguments if data argument was omitted
-		if ( jQuery.isFunction( data ) ) {
-			type = type || callback;
-			callback = data;
-			data = undefined;
-		}
-
-		return jQuery.ajax({
-			url: url,
-			type: method,
-			dataType: type,
-			data: data,
-			success: callback
-		});
-	};
-});
-
-
-jQuery._evalUrl = function( url ) {
-	return jQuery.ajax({
-		url: url,
-		type: "GET",
-		dataType: "script",
-		async: false,
-		global: false,
-		"throws": true
-	});
-};
-
-
-jQuery.fn.extend({
-	wrapAll: function( html ) {
-		var wrap;
-
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function( i ) {
-				jQuery( this ).wrapAll( html.call(this, i) );
-			});
-		}
-
-		if ( this[ 0 ] ) {
-
-			// The elements to wrap the target around
-			wrap = jQuery( html, this[ 0 ].ownerDocument ).eq( 0 ).clone( true );
-
-			if ( this[ 0 ].parentNode ) {
-				wrap.insertBefore( this[ 0 ] );
-			}
-
-			wrap.map(function() {
-				var elem = this;
-
-				while ( elem.firstElementChild ) {
-					elem = elem.firstElementChild;
-				}
-
-				return elem;
-			}).append( this );
-		}
-
-		return this;
-	},
-
-	wrapInner: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function( i ) {
-				jQuery( this ).wrapInner( html.call(this, i) );
-			});
-		}
-
-		return this.each(function() {
-			var self = jQuery( this ),
-				contents = self.contents();
-
-			if ( contents.length ) {
-				contents.wrapAll( html );
-
-			} else {
-				self.append( html );
-			}
-		});
-	},
-
-	wrap: function( html ) {
-		var isFunction = jQuery.isFunction( html );
-
-		return this.each(function( i ) {
-			jQuery( this ).wrapAll( isFunction ? html.call(this, i) : html );
-		});
-	},
-
-	unwrap: function() {
-		return this.parent().each(function() {
-			if ( !jQuery.nodeName( this, "body" ) ) {
-				jQuery( this ).replaceWith( this.childNodes );
-			}
-		}).end();
-	}
-});
-
-
-jQuery.expr.filters.hidden = function( elem ) {
-	// Support: Opera <= 12.12
-	// Opera reports offsetWidths and offsetHeights less than zero on some elements
-	return elem.offsetWidth <= 0 && elem.offsetHeight <= 0;
-};
-jQuery.expr.filters.visible = function( elem ) {
-	return !jQuery.expr.filters.hidden( elem );
-};
-
-
-
-
-var r20 = /%20/g,
-	rbracket = /\[\]$/,
-	rCRLF = /\r?\n/g,
-	rsubmitterTypes = /^(?:submit|button|image|reset|file)$/i,
-	rsubmittable = /^(?:input|select|textarea|keygen)/i;
-
-function buildParams( prefix, obj, traditional, add ) {
-	var name;
-
-	if ( jQuery.isArray( obj ) ) {
-		// Serialize array item.
-		jQuery.each( obj, function( i, v ) {
-			if ( traditional || rbracket.test( prefix ) ) {
-				// Treat each array item as a scalar.
-				add( prefix, v );
-
-			} else {
-				// Item is non-scalar (array or object), encode its numeric index.
-				buildParams( prefix + "[" + ( typeof v === "object" ? i : "" ) + "]", v, traditional, add );
-			}
-		});
-
-	} else if ( !traditional && jQuery.type( obj ) === "object" ) {
-		// Serialize object item.
-		for ( name in obj ) {
-			buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
-		}
-
-	} else {
-		// Serialize scalar item.
-		add( prefix, obj );
-	}
-}
-
-// Serialize an array of form elements or a set of
-// key/values into a query string
-jQuery.param = function( a, traditional ) {
-	var prefix,
-		s = [],
-		add = function( key, value ) {
-			// If value is a function, invoke it and return its value
-			value = jQuery.isFunction( value ) ? value() : ( value == null ? "" : value );
-			s[ s.length ] = encodeURIComponent( key ) + "=" + encodeURIComponent( value );
-		};
-
-	// Set traditional to true for jQuery <= 1.3.2 behavior.
-	if ( traditional === undefined ) {
-		traditional = jQuery.ajaxSettings && jQuery.ajaxSettings.traditional;
-	}
-
-	// If an array was passed in, assume that it is an array of form elements.
-	if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
-		// Serialize the form elements
-		jQuery.each( a, function() {
-			add( this.name, this.value );
-		});
-
-	} else {
-		// If traditional, encode the "old" way (the way 1.3.2 or older
-		// did it), otherwise encode params recursively.
-		for ( prefix in a ) {
-			buildParams( prefix, a[ prefix ], traditional, add );
-		}
-	}
-
-	// Return the resulting serialization
-	return s.join( "&" ).replace( r20, "+" );
-};
-
-jQuery.fn.extend({
-	serialize: function() {
-		return jQuery.param( this.serializeArray() );
-	},
-	serializeArray: function() {
-		return this.map(function() {
-			// Can add propHook for "elements" to filter or add form elements
-			var elements = jQuery.prop( this, "elements" );
-			return elements ? jQuery.makeArray( elements ) : this;
-		})
-		.filter(function() {
-			var type = this.type;
-
-			// Use .is( ":disabled" ) so that fieldset[disabled] works
-			return this.name && !jQuery( this ).is( ":disabled" ) &&
-				rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) &&
-				( this.checked || !rcheckableType.test( type ) );
-		})
-		.map(function( i, elem ) {
-			var val = jQuery( this ).val();
-
-			return val == null ?
-				null :
-				jQuery.isArray( val ) ?
-					jQuery.map( val, function( val ) {
-						return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-					}) :
-					{ name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-		}).get();
-	}
-});
-
-
-jQuery.ajaxSettings.xhr = function() {
-	try {
-		return new XMLHttpRequest();
-	} catch( e ) {}
-};
-
-var xhrId = 0,
-	xhrCallbacks = {},
-	xhrSuccessStatus = {
-		// file protocol always yields status code 0, assume 200
-		0: 200,
-		// Support: IE9
-		// #1450: sometimes IE returns 1223 when it should be 204
-		1223: 204
-	},
-	xhrSupported = jQuery.ajaxSettings.xhr();
-
-// Support: IE9
-// Open requests must be manually aborted on unload (#5280)
-// See https://support.microsoft.com/kb/2856746 for more info
-if ( window.attachEvent ) {
-	window.attachEvent( "onunload", function() {
-		for ( var key in xhrCallbacks ) {
-			xhrCallbacks[ key ]();
-		}
-	});
-}
-
-support.cors = !!xhrSupported && ( "withCredentials" in xhrSupported );
-support.ajax = xhrSupported = !!xhrSupported;
-
-jQuery.ajaxTransport(function( options ) {
-	var callback;
-
-	// Cross domain only allowed if supported through XMLHttpRequest
-	if ( support.cors || xhrSupported && !options.crossDomain ) {
-		return {
-			send: function( headers, complete ) {
-				var i,
-					xhr = options.xhr(),
-					id = ++xhrId;
-
-				xhr.open( options.type, options.url, options.async, options.username, options.password );
-
-				// Apply custom fields if provided
-				if ( options.xhrFields ) {
-					for ( i in options.xhrFields ) {
-						xhr[ i ] = options.xhrFields[ i ];
-					}
-				}
-
-				// Override mime type if needed
-				if ( options.mimeType && xhr.overrideMimeType ) {
-					xhr.overrideMimeType( options.mimeType );
-				}
-
-				// X-Requested-With header
-				// For cross-domain requests, seeing as conditions for a preflight are
-				// akin to a jigsaw puzzle, we simply never set it to be sure.
-				// (it can always be set on a per-request basis or even using ajaxSetup)
-				// For same-domain requests, won't change header if already provided.
-				if ( !options.crossDomain && !headers["X-Requested-With"] ) {
-					headers["X-Requested-With"] = "XMLHttpRequest";
-				}
-
-				// Set headers
-				for ( i in headers ) {
-					xhr.setRequestHeader( i, headers[ i ] );
-				}
-
-				// Callback
-				callback = function( type ) {
-					return function() {
-						if ( callback ) {
-							delete xhrCallbacks[ id ];
-							callback = xhr.onload = xhr.onerror = null;
-
-							if ( type === "abort" ) {
-								xhr.abort();
-							} else if ( type === "error" ) {
-								complete(
-									// file: protocol always yields status 0; see #8605, #14207
-									xhr.status,
-									xhr.statusText
-								);
-							} else {
-								complete(
-									xhrSuccessStatus[ xhr.status ] || xhr.status,
-									xhr.statusText,
-									// Support: IE9
-									// Accessing binary-data responseText throws an exception
-									// (#11426)
-									typeof xhr.responseText === "string" ? {
-										text: xhr.responseText
-									} : undefined,
-									xhr.getAllResponseHeaders()
-								);
-							}
-						}
-					};
-				};
-
-				// Listen to events
-				xhr.onload = callback();
-				xhr.onerror = callback("error");
-
-				// Create the abort callback
-				callback = xhrCallbacks[ id ] = callback("abort");
-
-				try {
-					// Do send the request (this may raise an exception)
-					xhr.send( options.hasContent && options.data || null );
-				} catch ( e ) {
-					// #14683: Only rethrow if this hasn't been notified as an error yet
-					if ( callback ) {
-						throw e;
-					}
-				}
-			},
-
-			abort: function() {
-				if ( callback ) {
-					callback();
-				}
-			}
-		};
-	}
-});
-
-
-
-
-// Install script dataType
-jQuery.ajaxSetup({
-	accepts: {
-		script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"
-	},
-	contents: {
-		script: /(?:java|ecma)script/
-	},
-	converters: {
-		"text script": function( text ) {
-			jQuery.globalEval( text );
-			return text;
-		}
-	}
-});
-
-// Handle cache's special case and crossDomain
-jQuery.ajaxPrefilter( "script", function( s ) {
-	if ( s.cache === undefined ) {
-		s.cache = false;
-	}
-	if ( s.crossDomain ) {
-		s.type = "GET";
-	}
-});
-
-// Bind script tag hack transport
-jQuery.ajaxTransport( "script", function( s ) {
-	// This transport only deals with cross domain requests
-	if ( s.crossDomain ) {
-		var script, callback;
-		return {
-			send: function( _, complete ) {
-				script = jQuery("<script>").prop({
-					async: true,
-					charset: s.scriptCharset,
-					src: s.url
-				}).on(
-					"load error",
-					callback = function( evt ) {
-						script.remove();
-						callback = null;
-						if ( evt ) {
-							complete( evt.type === "error" ? 404 : 200, evt.type );
-						}
-					}
-				);
-				document.head.appendChild( script[ 0 ] );
-			},
-			abort: function() {
-				if ( callback ) {
-					callback();
-				}
-			}
-		};
-	}
-});
-
-
-
-
-var oldCallbacks = [],
-	rjsonp = /(=)\?(?=&|$)|\?\?/;
-
-// Default jsonp settings
-jQuery.ajaxSetup({
-	jsonp: "callback",
-	jsonpCallback: function() {
-		var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( nonce++ ) );
-		this[ callback ] = true;
-		return callback;
-	}
-});
-
-// Detect, normalize options and install callbacks for jsonp requests
-jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
-
-	var callbackName, overwritten, responseContainer,
-		jsonProp = s.jsonp !== false && ( rjsonp.test( s.url ) ?
-			"url" :
-			typeof s.data === "string" && !( s.contentType || "" ).indexOf("application/x-www-form-urlencoded") && rjsonp.test( s.data ) && "data"
-		);
-
-	// Handle iff the expected data type is "jsonp" or we have a parameter to set
-	if ( jsonProp || s.dataTypes[ 0 ] === "jsonp" ) {
-
-		// Get callback name, remembering preexisting value associated with it
-		callbackName = s.jsonpCallback = jQuery.isFunction( s.jsonpCallback ) ?
-			s.jsonpCallback() :
-			s.jsonpCallback;
-
-		// Insert callback into url or form data
-		if ( jsonProp ) {
-			s[ jsonProp ] = s[ jsonProp ].replace( rjsonp, "$1" + callbackName );
-		} else if ( s.jsonp !== false ) {
-			s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.jsonp + "=" + callbackName;
-		}
-
-		// Use data converter to retrieve json after script execution
-		s.converters["script json"] = function() {
-			if ( !responseContainer ) {
-				jQuery.error( callbackName + " was not called" );
-			}
-			return responseContainer[ 0 ];
-		};
-
-		// force json dataType
-		s.dataTypes[ 0 ] = "json";
-
-		// Install callback
-		overwritten = window[ callbackName ];
-		window[ callbackName ] = function() {
-			responseContainer = arguments;
-		};
-
-		// Clean-up function (fires after converters)
-		jqXHR.always(function() {
-			// Restore preexisting value
-			window[ callbackName ] = overwritten;
-
-			// Save back as free
-			if ( s[ callbackName ] ) {
-				// make sure that re-using the options doesn't screw things around
-				s.jsonpCallback = originalSettings.jsonpCallback;
-
-				// save the callback name for future use
-				oldCallbacks.push( callbackName );
-			}
-
-			// Call if it was a function and we have a response
-			if ( responseContainer && jQuery.isFunction( overwritten ) ) {
-				overwritten( responseContainer[ 0 ] );
-			}
-
-			responseContainer = overwritten = undefined;
-		});
-
-		// Delegate to script
-		return "script";
-	}
-});
-
-
-
-
-// data: string of html
-// context (optional): If specified, the fragment will be created in this context, defaults to document
-// keepScripts (optional): If true, will include scripts passed in the html string
-jQuery.parseHTML = function( data, context, keepScripts ) {
-	if ( !data || typeof data !== "string" ) {
-		return null;
-	}
-	if ( typeof context === "boolean" ) {
-		keepScripts = context;
-		context = false;
-	}
-	context = context || document;
-
-	var parsed = rsingleTag.exec( data ),
-		scripts = !keepScripts && [];
-
-	// Single tag
-	if ( parsed ) {
-		return [ context.createElement( parsed[1] ) ];
-	}
-
-	parsed = jQuery.buildFragment( [ data ], context, scripts );
-
-	if ( scripts && scripts.length ) {
-		jQuery( scripts ).remove();
-	}
-
-	return jQuery.merge( [], parsed.childNodes );
-};
-
-
-// Keep a copy of the old load method
-var _load = jQuery.fn.load;
-
-/**
- * Load a url into a page
- */
-jQuery.fn.load = function( url, params, callback ) {
-	if ( typeof url !== "string" && _load ) {
-		return _load.apply( this, arguments );
-	}
-
-	var selector, type, response,
-		self = this,
-		off = url.indexOf(" ");
-
-	if ( off >= 0 ) {
-		selector = jQuery.trim( url.slice( off ) );
-		url = url.slice( 0, off );
-	}
-
-	// If it's a function
-	if ( jQuery.isFunction( params ) ) {
-
-		// We assume that it's the callback
-		callback = params;
-		params = undefined;
-
-	// Otherwise, build a param string
-	} else if ( params && typeof params === "object" ) {
-		type = "POST";
-	}
-
-	// If we have elements to modify, make the request
-	if ( self.length > 0 ) {
-		jQuery.ajax({
-			url: url,
-
-			// if "type" variable is undefined, then "GET" method will be used
-			type: type,
-			dataType: "html",
-			data: params
-		}).done(function( responseText ) {
-
-			// Save response for use in complete callback
-			response = arguments;
-
-			self.html( selector ?
-
-				// If a selector was specified, locate the right elements in a dummy div
-				// Exclude scripts to avoid IE 'Permission Denied' errors
-				jQuery("<div>").append( jQuery.parseHTML( responseText ) ).find( selector ) :
-
-				// Otherwise use the full result
-				responseText );
-
-		}).complete( callback && function( jqXHR, status ) {
-			self.each( callback, response || [ jqXHR.responseText, status, jqXHR ] );
-		});
-	}
-
-	return this;
-};
-
-
-
-
-// Attach a bunch of functions for handling common AJAX events
-jQuery.each( [ "ajaxStart", "ajaxStop", "ajaxComplete", "ajaxError", "ajaxSuccess", "ajaxSend" ], function( i, type ) {
-	jQuery.fn[ type ] = function( fn ) {
-		return this.on( type, fn );
-	};
-});
-
-
-
-
-jQuery.expr.filters.animated = function( elem ) {
-	return jQuery.grep(jQuery.timers, function( fn ) {
-		return elem === fn.elem;
-	}).length;
-};
-
-
-
-
-var docElem = window.document.documentElement;
-
-/**
- * Gets a window from an element
- */
-function getWindow( elem ) {
-	return jQuery.isWindow( elem ) ? elem : elem.nodeType === 9 && elem.defaultView;
-}
-
-jQuery.offset = {
-	setOffset: function( elem, options, i ) {
-		var curPosition, curLeft, curCSSTop, curTop, curOffset, curCSSLeft, calculatePosition,
-			position = jQuery.css( elem, "position" ),
-			curElem = jQuery( elem ),
-			props = {};
-
-		// Set position first, in-case top/left are set even on static elem
-		if ( position === "static" ) {
-			elem.style.position = "relative";
-		}
-
-		curOffset = curElem.offset();
-		curCSSTop = jQuery.css( elem, "top" );
-		curCSSLeft = jQuery.css( elem, "left" );
-		calculatePosition = ( position === "absolute" || position === "fixed" ) &&
-			( curCSSTop + curCSSLeft ).indexOf("auto") > -1;
-
-		// Need to be able to calculate position if either
-		// top or left is auto and position is either absolute or fixed
-		if ( calculatePosition ) {
-			curPosition = curElem.position();
-			curTop = curPosition.top;
-			curLeft = curPosition.left;
-
-		} else {
-			curTop = parseFloat( curCSSTop ) || 0;
-			curLeft = parseFloat( curCSSLeft ) || 0;
-		}
-
-		if ( jQuery.isFunction( options ) ) {
-			options = options.call( elem, i, curOffset );
-		}
-
-		if ( options.top != null ) {
-			props.top = ( options.top - curOffset.top ) + curTop;
-		}
-		if ( options.left != null ) {
-			props.left = ( options.left - curOffset.left ) + curLeft;
-		}
-
-		if ( "using" in options ) {
-			options.using.call( elem, props );
-
-		} else {
-			curElem.css( props );
-		}
-	}
-};
-
-jQuery.fn.extend({
-	offset: function( options ) {
-		if ( arguments.length ) {
-			return options === undefined ?
-				this :
-				this.each(function( i ) {
-					jQuery.offset.setOffset( this, options, i );
-				});
-		}
-
-		var docElem, win,
-			elem = this[ 0 ],
-			box = { top: 0, left: 0 },
-			doc = elem && elem.ownerDocument;
-
-		if ( !doc ) {
-			return;
-		}
-
-		docElem = doc.documentElement;
-
-		// Make sure it's not a disconnected DOM node
-		if ( !jQuery.contains( docElem, elem ) ) {
-			return box;
-		}
-
-		// Support: BlackBerry 5, iOS 3 (original iPhone)
-		// If we don't have gBCR, just use 0,0 rather than error
-		if ( typeof elem.getBoundingClientRect !== strundefined ) {
-			box = elem.getBoundingClientRect();
-		}
-		win = getWindow( doc );
-		return {
-			top: box.top + win.pageYOffset - docElem.clientTop,
-			left: box.left + win.pageXOffset - docElem.clientLeft
-		};
-	},
-
-	position: function() {
-		if ( !this[ 0 ] ) {
-			return;
-		}
-
-		var offsetParent, offset,
-			elem = this[ 0 ],
-			parentOffset = { top: 0, left: 0 };
-
-		// Fixed elements are offset from window (parentOffset = {top:0, left: 0}, because it is its only offset parent
-		if ( jQuery.css( elem, "position" ) === "fixed" ) {
-			// Assume getBoundingClientRect is there when computed position is fixed
-			offset = elem.getBoundingClientRect();
-
-		} else {
-			// Get *real* offsetParent
-			offsetParent = this.offsetParent();
-
-			// Get correct offsets
-			offset = this.offset();
-			if ( !jQuery.nodeName( offsetParent[ 0 ], "html" ) ) {
-				parentOffset = offsetParent.offset();
-			}
-
-			// Add offsetParent borders
-			parentOffset.top += jQuery.css( offsetParent[ 0 ], "borderTopWidth", true );
-			parentOffset.left += jQuery.css( offsetParent[ 0 ], "borderLeftWidth", true );
-		}
-
-		// Subtract parent offsets and element margins
-		return {
-			top: offset.top - parentOffset.top - jQuery.css( elem, "marginTop", true ),
-			left: offset.left - parentOffset.left - jQuery.css( elem, "marginLeft", true )
-		};
-	},
-
-	offsetParent: function() {
-		return this.map(function() {
-			var offsetParent = this.offsetParent || docElem;
-
-			while ( offsetParent && ( !jQuery.nodeName( offsetParent, "html" ) && jQuery.css( offsetParent, "position" ) === "static" ) ) {
-				offsetParent = offsetParent.offsetParent;
-			}
-
-			return offsetParent || docElem;
-		});
-	}
-});
-
-// Create scrollLeft and scrollTop methods
-jQuery.each( { scrollLeft: "pageXOffset", scrollTop: "pageYOffset" }, function( method, prop ) {
-	var top = "pageYOffset" === prop;
-
-	jQuery.fn[ method ] = function( val ) {
-		return access( this, function( elem, method, val ) {
-			var win = getWindow( elem );
-
-			if ( val === undefined ) {
-				return win ? win[ prop ] : elem[ method ];
-			}
-
-			if ( win ) {
-				win.scrollTo(
-					!top ? val : window.pageXOffset,
-					top ? val : window.pageYOffset
-				);
-
-			} else {
-				elem[ method ] = val;
-			}
-		}, method, val, arguments.length, null );
-	};
-});
-
-// Support: Safari<7+, Chrome<37+
-// Add the top/left cssHooks using jQuery.fn.position
-// Webkit bug: https://bugs.webkit.org/show_bug.cgi?id=29084
-// Blink bug: https://code.google.com/p/chromium/issues/detail?id=229280
-// getComputedStyle returns percent when specified for top/left/bottom/right;
-// rather than make the css module depend on the offset module, just check for it here
-jQuery.each( [ "top", "left" ], function( i, prop ) {
-	jQuery.cssHooks[ prop ] = addGetHookIf( support.pixelPosition,
-		function( elem, computed ) {
-			if ( computed ) {
-				computed = curCSS( elem, prop );
-				// If curCSS returns percentage, fallback to offset
-				return rnumnonpx.test( computed ) ?
-					jQuery( elem ).position()[ prop ] + "px" :
-					computed;
-			}
-		}
-	);
-});
-
-
-// Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods
-jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
-	jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name }, function( defaultExtra, funcName ) {
-		// Margin is only for outerHeight, outerWidth
-		jQuery.fn[ funcName ] = function( margin, value ) {
-			var chainable = arguments.length && ( defaultExtra || typeof margin !== "boolean" ),
-				extra = defaultExtra || ( margin === true || value === true ? "margin" : "border" );
-
-			return access( this, function( elem, type, value ) {
-				var doc;
-
-				if ( jQuery.isWindow( elem ) ) {
-					// As of 5/8/2012 this will yield incorrect results for Mobile Safari, but there
-					// isn't a whole lot we can do. See pull request at this URL for discussion:
-					// https://github.com/jquery/jquery/pull/764
-					return elem.document.documentElement[ "client" + name ];
-				}
-
-				// Get document width or height
-				if ( elem.nodeType === 9 ) {
-					doc = elem.documentElement;
-
-					// Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height],
-					// whichever is greatest
-					return Math.max(
-						elem.body[ "scroll" + name ], doc[ "scroll" + name ],
-						elem.body[ "offset" + name ], doc[ "offset" + name ],
-						doc[ "client" + name ]
-					);
-				}
-
-				return value === undefined ?
-					// Get width or height on the element, requesting but not forcing parseFloat
-					jQuery.css( elem, type, extra ) :
-
-					// Set width or height on the element
-					jQuery.style( elem, type, value, extra );
-			}, type, chainable ? margin : undefined, chainable, null );
-		};
-	});
-});
-
-
-// The number of elements contained in the matched element set
-jQuery.fn.size = function() {
-	return this.length;
-};
-
-jQuery.fn.andSelf = jQuery.fn.addBack;
-
-
-
-
-// Register as a named AMD module, since jQuery can be concatenated with other
-// files that may use define, but not via a proper concatenation script that
-// understands anonymous AMD modules. A named AMD is safest and most robust
-// way to register. Lowercase jquery is used because AMD module names are
-// derived from file names, and jQuery is normally delivered in a lowercase
-// file name. Do this after creating the global so that if an AMD module wants
-// to call noConflict to hide this version of jQuery, it will work.
-
-// Note that for maximum portability, libraries that are not jQuery should
-// declare themselves as anonymous modules, and avoid setting a global if an
-// AMD loader is present. jQuery is a special case. For more information, see
-// https://github.com/jrburke/requirejs/wiki/Updating-existing-libraries#wiki-anon
-
-if ( typeof define === "function" && define.amd ) {
-	define( "jquery", [], function() {
-		return jQuery;
-	});
-}
-
-
-
-
-var
-	// Map over jQuery in case of overwrite
-	_jQuery = window.jQuery,
-
-	// Map over the $ in case of overwrite
-	_$ = window.$;
-
-jQuery.noConflict = function( deep ) {
-	if ( window.$ === jQuery ) {
-		window.$ = _$;
-	}
-
-	if ( deep && window.jQuery === jQuery ) {
-		window.jQuery = _jQuery;
-	}
-
-	return jQuery;
-};
-
-// Expose jQuery and $ identifiers, even in AMD
-// (#7102#comment:10, https://github.com/jquery/jquery/pull/557)
-// and CommonJS for browser emulators (#13566)
-if ( typeof noGlobal === strundefined ) {
-	window.jQuery = window.$ = jQuery;
-}
-
-
-
-
-return jQuery;
-
-}));
diff --git a/NewLife.Cube/Content/jweui/lib/weui.css b/NewLife.Cube/Content/jweui/lib/weui.css
deleted file mode 100644
index cba5b6b71e..0000000000
--- a/NewLife.Cube/Content/jweui/lib/weui.css
+++ /dev/null
@@ -1,2462 +0,0 @@
-/*!
- * WeUI v1.1.1 (https://github.com/weui/weui)
- * Copyright 2017 Tencent, Inc.
- * Licensed under the MIT license
- */
-html {
-  -ms-text-size-adjust: 100%;
-  -webkit-text-size-adjust: 100%;
-}
-body {
-  line-height: 1.6;
-  font-family: -apple-system-font, "Helvetica Neue", sans-serif;
-}
-* {
-  margin: 0;
-  padding: 0;
-}
-a img {
-  border: 0;
-}
-a {
-  text-decoration: none;
-  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-}
-@font-face {
-  font-weight: normal;
-  font-style: normal;
-  font-family: "weui";
-  src: url('data:application/octet-stream;base64,AAEAAAALAIAAAwAwR1NVQrD+s+0AAAE4AAAAQk9TLzJAKEx+AAABfAAAAFZjbWFw65cFHQAAAhwAAAJQZ2x5ZvCRR/EAAASUAAAKtGhlYWQMPROtAAAA4AAAADZoaGVhCCwD+gAAALwAAAAkaG10eEJo//8AAAHUAAAASGxvY2EYqhW4AAAEbAAAACZtYXhwASEAVQAAARgAAAAgbmFtZeNcHtgAAA9IAAAB5nBvc3T6bLhLAAARMAAAAOYAAQAAA+gAAABaA+j/////A+kAAQAAAAAAAAAAAAAAAAAAABIAAQAAAAEAACbZbxtfDzz1AAsD6AAAAADUm2dvAAAAANSbZ2///wAAA+kD6gAAAAgAAgAAAAAAAAABAAAAEgBJAAUAAAAAAAIAAAAKAAoAAAD/AAAAAAAAAAEAAAAKAB4ALAABREZMVAAIAAQAAAAAAAAAAQAAAAFsaWdhAAgAAAABAAAAAQAEAAQAAAABAAgAAQAGAAAAAQAAAAAAAQOwAZAABQAIAnoCvAAAAIwCegK8AAAB4AAxAQIAAAIABQMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUGZFZABA6gHqEQPoAAAAWgPqAAAAAAABAAAAAAAAAAAAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+j//wPoAAAD6AAAAAAABQAAAAMAAAAsAAAABAAAAXQAAQAAAAAAbgADAAEAAAAsAAMACgAAAXQABABCAAAABAAEAAEAAOoR//8AAOoB//8AAAABAAQAAAABAAIAAwAEAAUABgAHAAgACQAKAAsADAANAA4ADwAQABEAAAEGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAANwAAAAAAAAAEQAA6gEAAOoBAAAAAQAA6gIAAOoCAAAAAgAA6gMAAOoDAAAAAwAA6gQAAOoEAAAABAAA6gUAAOoFAAAABQAA6gYAAOoGAAAABgAA6gcAAOoHAAAABwAA6ggAAOoIAAAACAAA6gkAAOoJAAAACQAA6goAAOoKAAAACgAA6gsAAOoLAAAACwAA6gwAAOoMAAAADAAA6g0AAOoNAAAADQAA6g4AAOoOAAAADgAA6g8AAOoPAAAADwAA6hAAAOoQAAAAEAAA6hEAAOoRAAAAEQAAAAAARgCMANIBJAF4AcQCMgJgAqgC/ANIA6YD/gROBKAE9AVaAAAAAgAAAAADrwOtABQAKQAAASIHBgcGFBcWFxYyNzY3NjQnJicmAyInJicmNDc2NzYyFxYXFhQHBgcGAfV4Z2Q7PDw7ZGfwZmQ7PDw7ZGZ4bl5bNjc3Nlte215bNjc3NlteA608O2Rn8GdjOzw8O2Nn8GdkOzz8rzc1W17bXlw1Nzc1XF7bXls1NwAAAAACAAAAAAOzA7MAFwAtAAABIgcGBwYVFBcWFxYzMjc2NzY1NCcmJyYTBwYiLwEmNjsBETQ2OwEyFhURMzIWAe52Z2Q7PT07ZGd2fGpmOz4+O2ZpIXYOKA52Dg0XXQsHJgcLXRcNA7M+O2ZqfHZnZDs9PTtkZ3Z9aWY7Pv3wmhISmhIaARcICwsI/ukaAAMAAAAAA+UD5QAXACMALAAAASIHBgcGFRQXFhcWMzI3Njc2NTQnJicmAxQrASI1AzQ7ATIHJyImNDYyFhQGAe6Ecm9BRERBb3KEiXZxQkREQnF1aQIxAwgCQgMBIxIZGSQZGQPkREJxdomEcm9BRERBb3KEinVxQkT9HQICAWICAjEZIxkZIxkAAAAAAgAAAAADsQPkABkALgAAAQYHBgc2BREUFxYXFhc2NzY3NjURJBcmJyYTAQYvASY/ATYyHwEWNjclNjIfARYB9VVVQk+v/tFHPmxebGxdbT1I/tGvT0JVo/7VBASKAwMSAQUBcQEFAgESAgUBEQQD4xMYEhk3YP6sjnVlSD8cHD9IZXWOAVRgNxkSGP62/tkDA48EBBkCAVYCAQHlAQIQBAAAAAADAAAAAAOxA+QAGwAqADMAAAEGBwYHBgcGNxEUFxYXFhc2NzY3NjURJBcmJyYHMzIWFQMUBisBIicDNDYTIiY0NjIWFAYB9UFBODssO38gRz5sXmxsXW09SP7YqFBBVW80BAYMAwImBQELBh4PFhYeFRUD5A8SDhIOEikK/q2PdWRJPh0dPklkdY8BU141GRIY/AYE/sYCAwUBOgQG/kAVHxUVHxUAAAACAAAAAAPkA+QAFwAtAAABIgcGBwYVFBcWFxYzMjc2NzY1NCcmJyYTAQYiLwEmPwE2Mh8BFjI3ATYyHwEWAe6Ecm9BQ0NCbnODiXVxQkREQnF1kf6gAQUBowMDFgEFAYUCBQEBQwIFARUEA+NEQnF1iYNzbkJDQ0FvcoSJdXFCRP6j/qUBAagEBR4CAWYBAQENAgIVBAAAAAQAAAAAA68DrQAUACkAPwBDAAABIgcGBwYUFxYXFjI3Njc2NCcmJyYDIicmJyY0NzY3NjIXFhcWFAcGBwYTBQ4BLwEmBg8BBhYfARYyNwE+ASYiFzAfAQH1eGdkOzw8O2Rn8GZkOzw8O2RmeG5eWzY3NzZbXtteWzY3NzZbXmn+9gYSBmAGDwUDBQEGfQUQBgElBQELEBUBAQOtPDtkZ/BnYzs8PDtjZ/BnZDs8/K83NVte215cNTc3NVxe215bNTcCJt0FAQVJBQIGBAcRBoAGBQEhBQ8LBAEBAAABAAAAAAO7AzoAFwAAEy4BPwE+AR8BFjY3ATYWFycWFAcBBiInPQoGBwUHGgzLDCELAh0LHwsNCgr9uQoeCgGzCyEOCw0HCZMJAQoBvgkCCg0LHQv9sQsKAAAAAAIAAAAAA+UD5gAXACwAAAEiBwYHBhUUFxYXFjMyNzY3NjU0JyYnJhMHBi8BJicmNRM0NjsBMhYVExceAQHvhHJvQUNDQm5zg4l1cUJEREJxdVcQAwT6AwIEEAMCKwIDDsUCAQPlREJxdYmDc25CQ0NBb3KEiXVxQkT9VhwEAncCAgMGAXoCAwMC/q2FAgQAAAQAAAAAA68DrQADABgALQAzAAABMB8BAyIHBgcGFBcWFxYyNzY3NjQnJicmAyInJicmNDc2NzYyFxYXFhQHBgcGAyMVMzUjAuUBAfJ4Z2Q7PDw7ZGfwZmQ7PDw7ZGZ4bl5bNjc3Nlte215bNjc3NltemyT92QKDAQEBLDw7ZGfwZ2M7PDw7Y2fwZ2Q7PPyvNzVbXtteXDU3NzVcXtteWzU3AjH9JAAAAAMAAAAAA+QD5AAXACcAMAAAASIHBgcGFRQXFhcWMzI3Njc2NTQnJicmAzMyFhUDFAYrASImNQM0NhMiJjQ2MhYUBgHuhHJvQUNDQm5zg4l1cUJEREJxdZ42BAYMAwInAwMMBh8PFhYeFhYD40RCcXWJg3NuQkNDQW9yhIl1cUJE/vYGBf7AAgMDAgFABQb+NhYfFhYfFgAABAAAAAADwAPAAAgAEgAoAD0AAAEyNjQmIgYUFhcjFTMRIxUzNSMDIgcGBwYVFBYXFjMyNzY3NjU0Jy4BAyInJicmNDc2NzYyFxYXFhQHBgcGAfQYISEwISFRjzk5yTorhG5rPT99am+DdmhlPD4+PMyFbV5bNTc3NVte2l5bNTc3NVteAqAiLyIiLyI5Hf7EHBwCsT89a26Ed8w8Pj48ZWh2g29qffyjNzVbXtpeWzU3NzVbXtpeWzU3AAADAAAAAAOoA6gACwAgADUAAAEHJwcXBxc3FzcnNwMiBwYHBhQXFhcWMjc2NzY0JyYnJgMiJyYnJjQ3Njc2MhcWFxYUBwYHBgKOmpocmpocmpocmpq2dmZiOjs7OmJm7GZiOjs7OmJmdmtdWTQ2NjRZXdZdWTQ2NjRZXQKqmpocmpocmpocmpoBGTs6YmbsZmI6Ozs6YmbsZmI6O/zCNjRZXdZdWTQ2NjRZXdZdWTQ2AAMAAAAAA+kD6gAaAC8AMAAAAQYHBiMiJyYnJjQ3Njc2MhcWFxYVFAcGBwEHATI3Njc2NCcmJyYiBwYHBhQXFhcWMwKONUBCR21dWjU3NzVaXdpdWzU2GBcrASM5/eBXS0grKysrSEuuSkkqLCwqSUpXASMrFxg2NVtd2l1aNTc3NVpdbUdCQDX+3jkBGSsrSEuuSkkqLCwqSUquS0grKwAC//8AAAPoA+gAFAAwAAABIgcGBwYQFxYXFiA3Njc2ECcmJyYTFg4BIi8BBwYuATQ/AScmPgEWHwE3Nh4BBg8BAfSIdHFDRERDcXQBEHRxQ0REQ3F0SQoBFBsKoqgKGxMKqKIKARQbCqKoChsUAQqoA+hEQ3F0/vB0cUNERENxdAEQdHFDRP1jChsTCqiiCgEUGwqiqAobFAEKqKIKARQbCqIAAAIAAAAAA+QD5AAXADQAAAEiBwYHBhUUFxYXFjMyNzY3NjU0JyYnJhMUBiMFFxYUDwEGLwEuAT8BNh8BFhQPAQUyFh0BAe6Ecm9BQ0NCbnODiXVxQkREQnF1fwQC/pGDAQEVAwTsAgEC7AQEFAIBhAFwAgMD40RCcXWJg3NuQkNDQW9yhIl1cUJE/fYCAwuVAgQCFAQE0AIFAtEEBBQCBQGVCwMDJwAAAAUAAAAAA9QD0wAjACcANwBHAEgAAAERFAYjISImNREjIiY9ATQ2MyE1NDYzITIWHQEhMhYdARQGIyERIREHIgYVERQWOwEyNjURNCYjISIGFREUFjsBMjY1ETQmKwEDeyYb/XYbJkMJDQ0JAQYZEgEvExkBBgkNDQn9CQJc0QkNDQktCQ0NCf7sCQ0NCS0JDQ0JLQMi/TQbJiYbAswMCiwJDS4SGRkSLg0JLAoM/UwCtGsNCf5NCQ0NCQGzCQ0NCf5NCQ0NCQGzCQ0AAAAAEADGAAEAAAAAAAEABAAAAAEAAAAAAAIABwAEAAEAAAAAAAMABAALAAEAAAAAAAQABAAPAAEAAAAAAAUACwATAAEAAAAAAAYABAAeAAEAAAAAAAoAKwAiAAEAAAAAAAsAEwBNAAMAAQQJAAEACABgAAMAAQQJAAIADgBoAAMAAQQJAAMACAB2AAMAAQQJAAQACAB+AAMAAQQJAAUAFgCGAAMAAQQJAAYACACcAAMAAQQJAAoAVgCkAAMAAQQJAAsAJgD6d2V1aVJlZ3VsYXJ3ZXVpd2V1aVZlcnNpb24gMS4wd2V1aUdlbmVyYXRlZCBieSBzdmcydHRmIGZyb20gRm9udGVsbG8gcHJvamVjdC5odHRwOi8vZm9udGVsbG8uY29tAHcAZQB1AGkAUgBlAGcAdQBsAGEAcgB3AGUAdQBpAHcAZQB1AGkAVgBlAHIAcwBpAG8AbgAgADEALgAwAHcAZQB1AGkARwBlAG4AZQByAGEAdABlAGQAIABiAHkAIABzAHYAZwAyAHQAdABmACAAZgByAG8AbQAgAEYAbwBuAHQAZQBsAGwAbwAgAHAAcgBvAGoAZQBjAHQALgBoAHQAdABwADoALwAvAGYAbwBuAHQAZQBsAGwAbwAuAGMAbwBtAAAAAgAAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASAQIBAwEEAQUBBgEHAQgBCQEKAQsBDAENAQ4BDwEQAREBEgETAAZjaXJjbGUIZG93bmxvYWQEaW5mbwxzYWZlX3N1Y2Nlc3MJc2FmZV93YXJuB3N1Y2Nlc3MOc3VjY2Vzcy1jaXJjbGURc3VjY2Vzcy1uby1jaXJjbGUHd2FpdGluZw53YWl0aW5nLWNpcmNsZQR3YXJuC2luZm8tY2lyY2xlBmNhbmNlbAZzZWFyY2gFY2xlYXIEYmFjawZkZWxldGUAAAAA') format('truetype');
-}
-[class^="weui-icon-"],
-[class*=" weui-icon-"] {
-  display: inline-block;
-  vertical-align: middle;
-  font: normal normal normal 14px/1 "weui";
-  font-size: inherit;
-  text-rendering: auto;
-  -webkit-font-smoothing: antialiased;
-}
-[class^="weui-icon-"]:before,
-[class*=" weui-icon-"]:before {
-  display: inline-block;
-  margin-left: .2em;
-  margin-right: .2em;
-}
-.weui-icon-circle:before {
-  content: "\EA01";
-}
-/* '' */
-.weui-icon-download:before {
-  content: "\EA02";
-}
-/* '' */
-.weui-icon-info:before {
-  content: "\EA03";
-}
-/* '' */
-.weui-icon-safe-success:before {
-  content: "\EA04";
-}
-/* '' */
-.weui-icon-safe-warn:before {
-  content: "\EA05";
-}
-/* '' */
-.weui-icon-success:before {
-  content: "\EA06";
-}
-/* '' */
-.weui-icon-success-circle:before {
-  content: "\EA07";
-}
-/* '' */
-.weui-icon-success-no-circle:before {
-  content: "\EA08";
-}
-/* '' */
-.weui-icon-waiting:before {
-  content: "\EA09";
-}
-/* '' */
-.weui-icon-waiting-circle:before {
-  content: "\EA0A";
-}
-/* '' */
-.weui-icon-warn:before {
-  content: "\EA0B";
-}
-/* '' */
-.weui-icon-info-circle:before {
-  content: "\EA0C";
-}
-/* '' */
-.weui-icon-cancel:before {
-  content: "\EA0D";
-}
-/* '' */
-.weui-icon-search:before {
-  content: "\EA0E";
-}
-/* '' */
-.weui-icon-clear:before {
-  content: "\EA0F";
-}
-/* '' */
-.weui-icon-back:before {
-  content: "\EA10";
-}
-/* '' */
-.weui-icon-delete:before {
-  content: "\EA11";
-}
-/* '' */
-[class^="weui-icon_"]:before,
-[class*=" weui-icon_"]:before {
-  margin: 0;
-}
-.weui-icon-success {
-  font-size: 23px;
-  color: #09BB07;
-}
-.weui-icon-waiting {
-  font-size: 23px;
-  color: #10AEFF;
-}
-.weui-icon-warn {
-  font-size: 23px;
-  color: #F43530;
-}
-.weui-icon-info {
-  font-size: 23px;
-  color: #10AEFF;
-}
-.weui-icon-success-circle {
-  font-size: 23px;
-  color: #09BB07;
-}
-.weui-icon-success-no-circle {
-  font-size: 23px;
-  color: #09BB07;
-}
-.weui-icon-waiting-circle {
-  font-size: 23px;
-  color: #10AEFF;
-}
-.weui-icon-circle {
-  font-size: 23px;
-  color: #C9C9C9;
-}
-.weui-icon-download {
-  font-size: 23px;
-  color: #09BB07;
-}
-.weui-icon-info-circle {
-  font-size: 23px;
-  color: #09BB07;
-}
-.weui-icon-safe-success {
-  color: #09BB07;
-}
-.weui-icon-safe-warn {
-  color: #FFBE00;
-}
-.weui-icon-cancel {
-  color: #F43530;
-  font-size: 22px;
-}
-.weui-icon-search {
-  color: #B2B2B2;
-  font-size: 14px;
-}
-.weui-icon-clear {
-  color: #B2B2B2;
-  font-size: 14px;
-}
-.weui-icon-delete.weui-icon_gallery-delete {
-  color: #FFFFFF;
-  font-size: 22px;
-}
-.weui-icon_msg {
-  font-size: 93px;
-}
-.weui-icon_msg.weui-icon-warn {
-  color: #F76260;
-}
-.weui-icon_msg-primary {
-  font-size: 93px;
-}
-.weui-icon_msg-primary.weui-icon-warn {
-  color: #FFBE00;
-}
-.weui-btn {
-  position: relative;
-  display: block;
-  margin-left: auto;
-  margin-right: auto;
-  padding-left: 14px;
-  padding-right: 14px;
-  box-sizing: border-box;
-  font-size: 18px;
-  text-align: center;
-  text-decoration: none;
-  color: #FFFFFF;
-  line-height: 2.55555556;
-  border-radius: 5px;
-  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-  overflow: hidden;
-}
-.weui-btn:after {
-  content: " ";
-  width: 200%;
-  height: 200%;
-  position: absolute;
-  top: 0;
-  left: 0;
-  border: 1px solid rgba(0, 0, 0, 0.2);
-  -webkit-transform: scale(0.5);
-          transform: scale(0.5);
-  -webkit-transform-origin: 0 0;
-          transform-origin: 0 0;
-  box-sizing: border-box;
-  border-radius: 10px;
-}
-.weui-btn_inline {
-  display: inline-block;
-}
-.weui-btn_default {
-  color: #000000;
-  background-color: #F8F8F8;
-}
-.weui-btn_default:not(.weui-btn_disabled):visited {
-  color: #000000;
-}
-.weui-btn_default:not(.weui-btn_disabled):active {
-  color: rgba(0, 0, 0, 0.6);
-  background-color: #DEDEDE;
-}
-.weui-btn_primary {
-  background-color: #1AAD19;
-}
-.weui-btn_primary:not(.weui-btn_disabled):visited {
-  color: #FFFFFF;
-}
-.weui-btn_primary:not(.weui-btn_disabled):active {
-  color: rgba(255, 255, 255, 0.6);
-  background-color: #179B16;
-}
-.weui-btn_warn {
-  background-color: #E64340;
-}
-.weui-btn_warn:not(.weui-btn_disabled):visited {
-  color: #FFFFFF;
-}
-.weui-btn_warn:not(.weui-btn_disabled):active {
-  color: rgba(255, 255, 255, 0.6);
-  background-color: #CE3C39;
-}
-.weui-btn_disabled {
-  color: rgba(255, 255, 255, 0.6);
-}
-.weui-btn_disabled.weui-btn_default {
-  color: rgba(0, 0, 0, 0.3);
-  background-color: #F7F7F7;
-}
-.weui-btn_disabled.weui-btn_primary {
-  background-color: #9ED99D;
-}
-.weui-btn_disabled.weui-btn_warn {
-  background-color: #EC8B89;
-}
-.weui-btn_loading .weui-loading {
-  margin: -0.2em 0.34em 0 0;
-}
-.weui-btn_loading.weui-btn_primary,
-.weui-btn_loading.weui-btn_warn {
-  color: rgba(255, 255, 255, 0.6);
-}
-.weui-btn_loading.weui-btn_primary .weui-loading,
-.weui-btn_loading.weui-btn_warn .weui-loading {
-  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='120' height='120' viewBox='0 0 100 100'%3E%3Cpath fill='none' d='M0 0h100v100H0z'/%3E%3Crect xmlns='http://www.w3.org/2000/svg' width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.56)' rx='5' ry='5' transform='translate(0 -30)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.5)' rx='5' ry='5' transform='rotate(30 105.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.43)' rx='5' ry='5' transform='rotate(60 75.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.38)' rx='5' ry='5' transform='rotate(90 65 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.32)' rx='5' ry='5' transform='rotate(120 58.66 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.28)' rx='5' ry='5' transform='rotate(150 54.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.25)' rx='5' ry='5' transform='rotate(180 50 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.2)' rx='5' ry='5' transform='rotate(-150 45.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.17)' rx='5' ry='5' transform='rotate(-120 41.34 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.14)' rx='5' ry='5' transform='rotate(-90 35 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.1)' rx='5' ry='5' transform='rotate(-60 24.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.03)' rx='5' ry='5' transform='rotate(-30 -5.98 65)'/%3E%3C/svg%3E");
-}
-.weui-btn_loading.weui-btn_primary {
-  background-color: #179B16;
-}
-.weui-btn_loading.weui-btn_warn {
-  background-color: #CE3C39;
-}
-.weui-btn_plain-primary {
-  color: #1aad19;
-  border: 1px solid #1aad19;
-}
-.weui-btn_plain-primary:not(.weui-btn_plain-disabled):active {
-  color: rgba(26, 173, 25, 0.6);
-  border-color: rgba(26, 173, 25, 0.6);
-}
-.weui-btn_plain-primary:after {
-  border-width: 0;
-}
-.weui-btn_plain-default {
-  color: #353535;
-  border: 1px solid #353535;
-}
-.weui-btn_plain-default:not(.weui-btn_plain-disabled):active {
-  color: rgba(53, 53, 53, 0.6);
-  border-color: rgba(53, 53, 53, 0.6);
-}
-.weui-btn_plain-default:after {
-  border-width: 0;
-}
-.weui-btn_plain-disabled {
-  color: rgba(0, 0, 0, 0.2);
-  border-color: rgba(0, 0, 0, 0.2);
-}
-button.weui-btn,
-input.weui-btn {
-  width: 100%;
-  border-width: 0;
-  outline: 0;
-  -webkit-appearance: none;
-}
-button.weui-btn:focus,
-input.weui-btn:focus {
-  outline: 0;
-}
-button.weui-btn_inline,
-input.weui-btn_inline,
-button.weui-btn_mini,
-input.weui-btn_mini {
-  width: auto;
-}
-button.weui-btn_plain-primary,
-input.weui-btn_plain-primary,
-button.weui-btn_plain-default,
-input.weui-btn_plain-default {
-  border-width: 1px;
-  background-color: transparent;
-}
-.weui-btn_mini {
-  display: inline-block;
-  padding: 0 1.32em;
-  line-height: 2.3;
-  font-size: 13px;
-}
-/*gap between btn*/
-.weui-btn + .weui-btn {
-  margin-top: 15px;
-}
-.weui-btn.weui-btn_inline + .weui-btn.weui-btn_inline {
-  margin-top: auto;
-  margin-left: 15px;
-}
-.weui-btn-area {
-  margin: 1.17647059em 15px 0.3em;
-}
-.weui-btn-area_inline {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-}
-.weui-btn-area_inline .weui-btn {
-  margin-top: auto;
-  margin-right: 15px;
-  width: 100%;
-  -webkit-box-flex: 1;
-  -webkit-flex: 1;
-          flex: 1;
-}
-.weui-btn-area_inline .weui-btn:last-child {
-  margin-right: 0;
-}
-.weui-cells {
-  margin-top: 1.17647059em;
-  background-color: #FFFFFF;
-  line-height: 1.41176471;
-  font-size: 17px;
-  overflow: hidden;
-  position: relative;
-}
-.weui-cells:before {
-  content: " ";
-  position: absolute;
-  left: 0;
-  top: 0;
-  right: 0;
-  height: 1px;
-  border-top: 1px solid #D9D9D9;
-  color: #D9D9D9;
-  -webkit-transform-origin: 0 0;
-          transform-origin: 0 0;
-  -webkit-transform: scaleY(0.5);
-          transform: scaleY(0.5);
-}
-.weui-cells:after {
-  content: " ";
-  position: absolute;
-  left: 0;
-  bottom: 0;
-  right: 0;
-  height: 1px;
-  border-bottom: 1px solid #D9D9D9;
-  color: #D9D9D9;
-  -webkit-transform-origin: 0 100%;
-          transform-origin: 0 100%;
-  -webkit-transform: scaleY(0.5);
-          transform: scaleY(0.5);
-}
-.weui-cells__title {
-  margin-top: .77em;
-  margin-bottom: .3em;
-  padding-left: 15px;
-  padding-right: 15px;
-  color: #999999;
-  font-size: 14px;
-}
-.weui-cells__title + .weui-cells {
-  margin-top: 0;
-}
-.weui-cells__tips {
-  margin-top: .3em;
-  color: #999999;
-  padding-left: 15px;
-  padding-right: 15px;
-  font-size: 14px;
-}
-.weui-cell {
-  padding: 10px 15px;
-  position: relative;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-  -webkit-box-align: center;
-  -webkit-align-items: center;
-          align-items: center;
-}
-.weui-cell:before {
-  content: " ";
-  position: absolute;
-  left: 0;
-  top: 0;
-  right: 0;
-  height: 1px;
-  border-top: 1px solid #D9D9D9;
-  color: #D9D9D9;
-  -webkit-transform-origin: 0 0;
-          transform-origin: 0 0;
-  -webkit-transform: scaleY(0.5);
-          transform: scaleY(0.5);
-  left: 15px;
-}
-.weui-cell:first-child:before {
-  display: none;
-}
-.weui-cell_primary {
-  -webkit-box-align: start;
-  -webkit-align-items: flex-start;
-          align-items: flex-start;
-}
-.weui-cell__bd {
-  -webkit-box-flex: 1;
-  -webkit-flex: 1;
-          flex: 1;
-}
-.weui-cell__ft {
-  text-align: right;
-  color: #999999;
-}
-.weui-cell_access {
-  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-  color: inherit;
-}
-.weui-cell_access:active {
-  background-color: #ECECEC;
-}
-.weui-cell_access .weui-cell__ft {
-  padding-right: 13px;
-  position: relative;
-}
-.weui-cell_access .weui-cell__ft:after {
-  content: " ";
-  display: inline-block;
-  height: 6px;
-  width: 6px;
-  border-width: 2px 2px 0 0;
-  border-color: #C8C8CD;
-  border-style: solid;
-  -webkit-transform: matrix(0.71, 0.71, -0.71, 0.71, 0, 0);
-          transform: matrix(0.71, 0.71, -0.71, 0.71, 0, 0);
-  position: relative;
-  top: -2px;
-  position: absolute;
-  top: 50%;
-  margin-top: -4px;
-  right: 2px;
-}
-.weui-cell_link {
-  color: #586C94;
-  font-size: 14px;
-}
-.weui-cell_link:first-child:before {
-  display: block;
-}
-.weui-check__label {
-  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-}
-.weui-check__label:active {
-  background-color: #ECECEC;
-}
-.weui-check {
-  position: absolute;
-  left: -9999em;
-}
-.weui-cells_radio .weui-cell__ft {
-  padding-left: 0.35em;
-}
-.weui-cells_radio .weui-check:checked + .weui-icon-checked:before {
-  display: block;
-  content: '\EA08';
-  color: #09BB07;
-  font-size: 16px;
-}
-.weui-cells_checkbox .weui-cell__hd {
-  padding-right: 0.35em;
-}
-.weui-cells_checkbox .weui-icon-checked:before {
-  content: '\EA01';
-  color: #C9C9C9;
-  font-size: 23px;
-  display: block;
-}
-.weui-cells_checkbox .weui-check:checked + .weui-icon-checked:before {
-  content: '\EA06';
-  color: #09BB07;
-}
-.weui-label {
-  display: block;
-  width: 105px;
-  word-wrap: break-word;
-  word-break: break-all;
-}
-.weui-input {
-  width: 100%;
-  border: 0;
-  outline: 0;
-  -webkit-appearance: none;
-  background-color: transparent;
-  font-size: inherit;
-  color: inherit;
-  height: 1.41176471em;
-  line-height: 1.41176471;
-}
-.weui-input::-webkit-outer-spin-button,
-.weui-input::-webkit-inner-spin-button {
-  -webkit-appearance: none;
-  margin: 0;
-}
-.weui-textarea {
-  display: block;
-  border: 0;
-  resize: none;
-  width: 100%;
-  color: inherit;
-  font-size: 1em;
-  line-height: inherit;
-  outline: 0;
-}
-.weui-textarea-counter {
-  color: #B2B2B2;
-  text-align: right;
-}
-.weui-cell_warn .weui-textarea-counter {
-  color: #E64340;
-}
-.weui-toptips {
-  display: none;
-  position: fixed;
-  -webkit-transform: translateZ(0);
-          transform: translateZ(0);
-  top: 0;
-  left: 0;
-  right: 0;
-  padding: 5px;
-  font-size: 14px;
-  text-align: center;
-  color: #FFF;
-  z-index: 5000;
-  word-wrap: break-word;
-  word-break: break-all;
-}
-.weui-toptips_warn {
-  background-color: #E64340;
-}
-.weui-cells_form .weui-cell__ft {
-  font-size: 0;
-}
-.weui-cells_form .weui-icon-warn {
-  display: none;
-}
-.weui-cells_form input,
-.weui-cells_form textarea,
-.weui-cells_form label[for] {
-  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-}
-.weui-cell_warn {
-  color: #E64340;
-}
-.weui-cell_warn .weui-icon-warn {
-  display: inline-block;
-}
-.weui-form-preview {
-  position: relative;
-  background-color: #FFFFFF;
-}
-.weui-form-preview:before {
-  content: " ";
-  position: absolute;
-  left: 0;
-  top: 0;
-  right: 0;
-  height: 1px;
-  border-top: 1px solid #D9D9D9;
-  color: #D9D9D9;
-  -webkit-transform-origin: 0 0;
-          transform-origin: 0 0;
-  -webkit-transform: scaleY(0.5);
-          transform: scaleY(0.5);
-}
-.weui-form-preview:after {
-  content: " ";
-  position: absolute;
-  left: 0;
-  bottom: 0;
-  right: 0;
-  height: 1px;
-  border-bottom: 1px solid #D9D9D9;
-  color: #D9D9D9;
-  -webkit-transform-origin: 0 100%;
-          transform-origin: 0 100%;
-  -webkit-transform: scaleY(0.5);
-          transform: scaleY(0.5);
-}
-.weui-form-preview__hd {
-  position: relative;
-  padding: 10px 15px;
-  text-align: right;
-  line-height: 2.5em;
-}
-.weui-form-preview__hd:after {
-  content: " ";
-  position: absolute;
-  left: 0;
-  bottom: 0;
-  right: 0;
-  height: 1px;
-  border-bottom: 1px solid #D9D9D9;
-  color: #D9D9D9;
-  -webkit-transform-origin: 0 100%;
-          transform-origin: 0 100%;
-  -webkit-transform: scaleY(0.5);
-          transform: scaleY(0.5);
-  left: 15px;
-}
-.weui-form-preview__hd .weui-form-preview__value {
-  font-style: normal;
-  font-size: 1.6em;
-}
-.weui-form-preview__bd {
-  padding: 10px 15px;
-  font-size: .9em;
-  text-align: right;
-  color: #999999;
-  line-height: 2;
-}
-.weui-form-preview__ft {
-  position: relative;
-  line-height: 50px;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-}
-.weui-form-preview__ft:after {
-  content: " ";
-  position: absolute;
-  left: 0;
-  top: 0;
-  right: 0;
-  height: 1px;
-  border-top: 1px solid #D5D5D6;
-  color: #D5D5D6;
-  -webkit-transform-origin: 0 0;
-          transform-origin: 0 0;
-  -webkit-transform: scaleY(0.5);
-          transform: scaleY(0.5);
-}
-.weui-form-preview__item {
-  overflow: hidden;
-}
-.weui-form-preview__label {
-  float: left;
-  margin-right: 1em;
-  min-width: 4em;
-  color: #999999;
-  text-align: justify;
-  text-align-last: justify;
-}
-.weui-form-preview__value {
-  display: block;
-  overflow: hidden;
-  word-break: normal;
-  word-wrap: break-word;
-}
-.weui-form-preview__btn {
-  position: relative;
-  display: block;
-  -webkit-box-flex: 1;
-  -webkit-flex: 1;
-          flex: 1;
-  color: #3CC51F;
-  text-align: center;
-  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-}
-button.weui-form-preview__btn {
-  background-color: transparent;
-  border: 0;
-  outline: 0;
-  line-height: inherit;
-  font-size: inherit;
-}
-.weui-form-preview__btn:active {
-  background-color: #EEEEEE;
-}
-.weui-form-preview__btn:after {
-  content: " ";
-  position: absolute;
-  left: 0;
-  top: 0;
-  width: 1px;
-  bottom: 0;
-  border-left: 1px solid #D5D5D6;
-  color: #D5D5D6;
-  -webkit-transform-origin: 0 0;
-          transform-origin: 0 0;
-  -webkit-transform: scaleX(0.5);
-          transform: scaleX(0.5);
-}
-.weui-form-preview__btn:first-child:after {
-  display: none;
-}
-.weui-form-preview__btn_default {
-  color: #999999;
-}
-.weui-form-preview__btn_primary {
-  color: #0BB20C;
-}
-.weui-cell_select {
-  padding: 0;
-}
-.weui-cell_select .weui-select {
-  padding-right: 30px;
-}
-.weui-cell_select .weui-cell__bd:after {
-  content: " ";
-  display: inline-block;
-  height: 6px;
-  width: 6px;
-  border-width: 2px 2px 0 0;
-  border-color: #C8C8CD;
-  border-style: solid;
-  -webkit-transform: matrix(0.71, 0.71, -0.71, 0.71, 0, 0);
-          transform: matrix(0.71, 0.71, -0.71, 0.71, 0, 0);
-  position: relative;
-  top: -2px;
-  position: absolute;
-  top: 50%;
-  right: 15px;
-  margin-top: -4px;
-}
-.weui-select {
-  -webkit-appearance: none;
-  border: 0;
-  outline: 0;
-  background-color: transparent;
-  width: 100%;
-  font-size: inherit;
-  height: 44px;
-  line-height: 44px;
-  position: relative;
-  z-index: 1;
-  padding-left: 15px;
-}
-.weui-cell_select-before {
-  padding-right: 15px;
-}
-.weui-cell_select-before .weui-select {
-  width: 105px;
-  box-sizing: border-box;
-}
-.weui-cell_select-before .weui-cell__hd {
-  position: relative;
-}
-.weui-cell_select-before .weui-cell__hd:after {
-  content: " ";
-  position: absolute;
-  right: 0;
-  top: 0;
-  width: 1px;
-  bottom: 0;
-  border-right: 1px solid #D9D9D9;
-  color: #D9D9D9;
-  -webkit-transform-origin: 100% 0;
-          transform-origin: 100% 0;
-  -webkit-transform: scaleX(0.5);
-          transform: scaleX(0.5);
-}
-.weui-cell_select-before .weui-cell__hd:before {
-  content: " ";
-  display: inline-block;
-  height: 6px;
-  width: 6px;
-  border-width: 2px 2px 0 0;
-  border-color: #C8C8CD;
-  border-style: solid;
-  -webkit-transform: matrix(0.71, 0.71, -0.71, 0.71, 0, 0);
-          transform: matrix(0.71, 0.71, -0.71, 0.71, 0, 0);
-  position: relative;
-  top: -2px;
-  position: absolute;
-  top: 50%;
-  right: 15px;
-  margin-top: -4px;
-}
-.weui-cell_select-before .weui-cell__bd {
-  padding-left: 15px;
-}
-.weui-cell_select-before .weui-cell__bd:after {
-  display: none;
-}
-.weui-cell_select-after {
-  padding-left: 15px;
-}
-.weui-cell_select-after .weui-select {
-  padding-left: 0;
-}
-.weui-cell_vcode {
-  padding-top: 0;
-  padding-right: 0;
-  padding-bottom: 0;
-}
-.weui-vcode-img {
-  margin-left: 5px;
-  height: 44px;
-  vertical-align: middle;
-}
-.weui-vcode-btn {
-  display: inline-block;
-  height: 44px;
-  margin-left: 5px;
-  padding: 0 0.6em 0 0.7em;
-  border-left: 1px solid #E5E5E5;
-  line-height: 44px;
-  vertical-align: middle;
-  font-size: 17px;
-  color: #3CC51F;
-}
-button.weui-vcode-btn {
-  background-color: transparent;
-  border-top: 0;
-  border-right: 0;
-  border-bottom: 0;
-  outline: 0;
-}
-.weui-vcode-btn:active {
-  color: #52a341;
-}
-.weui-gallery {
-  display: none;
-  position: fixed;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  background-color: #000000;
-  z-index: 1000;
-}
-.weui-gallery__img {
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 60px;
-  left: 0;
-  background: center center no-repeat;
-  background-size: contain;
-}
-.weui-gallery__opr {
-  position: absolute;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  background-color: #0D0D0D;
-  color: #FFFFFF;
-  line-height: 60px;
-  text-align: center;
-}
-.weui-gallery__del {
-  display: block;
-}
-.weui-cell_switch {
-  padding-top: 6px;
-  padding-bottom: 6px;
-}
-.weui-switch {
-  -webkit-appearance: none;
-          appearance: none;
-}
-.weui-switch,
-.weui-switch-cp__box {
-  position: relative;
-  width: 52px;
-  height: 32px;
-  border: 1px solid #DFDFDF;
-  outline: 0;
-  border-radius: 16px;
-  box-sizing: border-box;
-  background-color: #DFDFDF;
-  -webkit-transition: background-color 0.1s, border 0.1s;
-  transition: background-color 0.1s, border 0.1s;
-}
-.weui-switch:before,
-.weui-switch-cp__box:before {
-  content: " ";
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 50px;
-  height: 30px;
-  border-radius: 15px;
-  background-color: #FDFDFD;
-  -webkit-transition: -webkit-transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
-  transition: -webkit-transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
-  transition: transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
-  transition: transform 0.35s cubic-bezier(0.45, 1, 0.4, 1), -webkit-transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
-}
-.weui-switch:after,
-.weui-switch-cp__box:after {
-  content: " ";
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 30px;
-  height: 30px;
-  border-radius: 15px;
-  background-color: #FFFFFF;
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
-  -webkit-transition: -webkit-transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
-  transition: -webkit-transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
-  transition: transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
-  transition: transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35), -webkit-transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
-}
-.weui-switch:checked,
-.weui-switch-cp__input:checked ~ .weui-switch-cp__box {
-  border-color: #04BE02;
-  background-color: #04BE02;
-}
-.weui-switch:checked:before,
-.weui-switch-cp__input:checked ~ .weui-switch-cp__box:before {
-  -webkit-transform: scale(0);
-          transform: scale(0);
-}
-.weui-switch:checked:after,
-.weui-switch-cp__input:checked ~ .weui-switch-cp__box:after {
-  -webkit-transform: translateX(20px);
-          transform: translateX(20px);
-}
-.weui-switch-cp__input {
-  position: absolute;
-  left: -9999px;
-}
-.weui-switch-cp__box {
-  display: block;
-}
-.weui-uploader__hd {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-  padding-bottom: 10px;
-  -webkit-box-align: center;
-  -webkit-align-items: center;
-          align-items: center;
-}
-.weui-uploader__title {
-  -webkit-box-flex: 1;
-  -webkit-flex: 1;
-          flex: 1;
-}
-.weui-uploader__info {
-  color: #B2B2B2;
-}
-.weui-uploader__bd {
-  margin-bottom: -4px;
-  margin-right: -9px;
-  overflow: hidden;
-}
-.weui-uploader__files {
-  list-style: none;
-}
-.weui-uploader__file {
-  float: left;
-  margin-right: 9px;
-  margin-bottom: 9px;
-  width: 79px;
-  height: 79px;
-  background: no-repeat center center;
-  background-size: cover;
-}
-.weui-uploader__file_status {
-  position: relative;
-}
-.weui-uploader__file_status:before {
-  content: " ";
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  background-color: rgba(0, 0, 0, 0.5);
-}
-.weui-uploader__file_status .weui-uploader__file-content {
-  display: block;
-}
-.weui-uploader__file-content {
-  display: none;
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  -webkit-transform: translate(-50%, -50%);
-          transform: translate(-50%, -50%);
-  color: #FFFFFF;
-}
-.weui-uploader__file-content .weui-icon-warn {
-  display: inline-block;
-}
-.weui-uploader__input-box {
-  float: left;
-  position: relative;
-  margin-right: 9px;
-  margin-bottom: 9px;
-  width: 77px;
-  height: 77px;
-  border: 1px solid #D9D9D9;
-}
-.weui-uploader__input-box:before,
-.weui-uploader__input-box:after {
-  content: " ";
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  -webkit-transform: translate(-50%, -50%);
-          transform: translate(-50%, -50%);
-  background-color: #D9D9D9;
-}
-.weui-uploader__input-box:before {
-  width: 2px;
-  height: 39.5px;
-}
-.weui-uploader__input-box:after {
-  width: 39.5px;
-  height: 2px;
-}
-.weui-uploader__input-box:active {
-  border-color: #999999;
-}
-.weui-uploader__input-box:active:before,
-.weui-uploader__input-box:active:after {
-  background-color: #999999;
-}
-.weui-uploader__input {
-  position: absolute;
-  z-index: 1;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  opacity: 0;
-  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-}
-.weui-msg {
-  padding-top: 36px;
-  text-align: center;
-}
-.weui-msg__icon-area {
-  margin-bottom: 30px;
-}
-.weui-msg__text-area {
-  margin-bottom: 25px;
-  padding: 0 20px;
-}
-.weui-msg__text-area a {
-  color: #586C94;
-}
-.weui-msg__title {
-  margin-bottom: 5px;
-  font-weight: 400;
-  font-size: 20px;
-}
-.weui-msg__desc {
-  font-size: 14px;
-  color: #999999;
-}
-.weui-msg__opr-area {
-  margin-bottom: 25px;
-}
-.weui-msg__extra-area {
-  margin-bottom: 15px;
-  font-size: 14px;
-  color: #999999;
-}
-.weui-msg__extra-area a {
-  color: #586C94;
-}
-@media screen and (min-height: 438px) {
-  .weui-msg__extra-area {
-    position: fixed;
-    left: 0;
-    bottom: 0;
-    width: 100%;
-    text-align: center;
-  }
-}
-.weui-article {
-  padding: 20px 15px;
-  font-size: 15px;
-}
-.weui-article section {
-  margin-bottom: 1.5em;
-}
-.weui-article h1 {
-  font-size: 18px;
-  font-weight: 400;
-  margin-bottom: .9em;
-}
-.weui-article h2 {
-  font-size: 16px;
-  font-weight: 400;
-  margin-bottom: .34em;
-}
-.weui-article h3 {
-  font-weight: 400;
-  font-size: 15px;
-  margin-bottom: .34em;
-}
-.weui-article * {
-  max-width: 100%;
-  box-sizing: border-box;
-  word-wrap: break-word;
-}
-.weui-article p {
-  margin: 0 0 .8em;
-}
-.weui-tabbar {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-  position: absolute;
-  z-index: 500;
-  bottom: 0;
-  width: 100%;
-  background-color: #F7F7FA;
-}
-.weui-tabbar:before {
-  content: " ";
-  position: absolute;
-  left: 0;
-  top: 0;
-  right: 0;
-  height: 1px;
-  border-top: 1px solid #C0BFC4;
-  color: #C0BFC4;
-  -webkit-transform-origin: 0 0;
-          transform-origin: 0 0;
-  -webkit-transform: scaleY(0.5);
-          transform: scaleY(0.5);
-}
-.weui-tabbar__item {
-  display: block;
-  -webkit-box-flex: 1;
-  -webkit-flex: 1;
-          flex: 1;
-  padding: 5px 0 0;
-  font-size: 0;
-  color: #999999;
-  text-align: center;
-  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-}
-.weui-tabbar__item.weui-bar__item_on .weui-tabbar__icon,
-.weui-tabbar__item.weui-bar__item_on .weui-tabbar__icon > i,
-.weui-tabbar__item.weui-bar__item_on .weui-tabbar__label {
-  color: #09BB07;
-}
-.weui-tabbar__icon {
-  display: inline-block;
-  width: 27px;
-  height: 27px;
-}
-i.weui-tabbar__icon,
-.weui-tabbar__icon > i {
-  font-size: 24px;
-  color: #999999;
-}
-.weui-tabbar__icon img {
-  width: 100%;
-  height: 100%;
-}
-.weui-tabbar__label {
-  text-align: center;
-  color: #999999;
-  font-size: 10px;
-  line-height: 1.8;
-}
-.weui-navbar {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-  position: absolute;
-  z-index: 500;
-  top: 0;
-  width: 100%;
-  background-color: #FAFAFA;
-}
-.weui-navbar:after {
-  content: " ";
-  position: absolute;
-  left: 0;
-  bottom: 0;
-  right: 0;
-  height: 1px;
-  border-bottom: 1px solid #CCCCCC;
-  color: #CCCCCC;
-  -webkit-transform-origin: 0 100%;
-          transform-origin: 0 100%;
-  -webkit-transform: scaleY(0.5);
-          transform: scaleY(0.5);
-}
-.weui-navbar + .weui-tab__panel {
-  padding-top: 50px;
-  padding-bottom: 0;
-}
-.weui-navbar__item {
-  position: relative;
-  display: block;
-  -webkit-box-flex: 1;
-  -webkit-flex: 1;
-          flex: 1;
-  padding: 13px 0;
-  text-align: center;
-  font-size: 15px;
-  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-}
-.weui-navbar__item:active {
-  background-color: #EDEDED;
-}
-.weui-navbar__item.weui-bar__item_on {
-  background-color: #EAEAEA;
-}
-.weui-navbar__item:after {
-  content: " ";
-  position: absolute;
-  right: 0;
-  top: 0;
-  width: 1px;
-  bottom: 0;
-  border-right: 1px solid #CCCCCC;
-  color: #CCCCCC;
-  -webkit-transform-origin: 100% 0;
-          transform-origin: 100% 0;
-  -webkit-transform: scaleX(0.5);
-          transform: scaleX(0.5);
-}
-.weui-navbar__item:last-child:after {
-  display: none;
-}
-.weui-tab {
-  position: relative;
-  height: 100%;
-}
-.weui-tab__panel {
-  box-sizing: border-box;
-  height: 100%;
-  padding-bottom: 50px;
-  overflow: auto;
-  -webkit-overflow-scrolling: touch;
-}
-.weui-tab__content {
-  display: none;
-}
-.weui-progress {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-  -webkit-box-align: center;
-  -webkit-align-items: center;
-          align-items: center;
-}
-.weui-progress__bar {
-  background-color: #EBEBEB;
-  height: 3px;
-  -webkit-box-flex: 1;
-  -webkit-flex: 1;
-          flex: 1;
-}
-.weui-progress__inner-bar {
-  width: 0;
-  height: 100%;
-  background-color: #09BB07;
-}
-.weui-progress__opr {
-  display: block;
-  margin-left: 15px;
-  font-size: 0;
-}
-.weui-panel {
-  background-color: #FFFFFF;
-  margin-top: 10px;
-  position: relative;
-  overflow: hidden;
-}
-.weui-panel:first-child {
-  margin-top: 0;
-}
-.weui-panel:before {
-  content: " ";
-  position: absolute;
-  left: 0;
-  top: 0;
-  right: 0;
-  height: 1px;
-  border-top: 1px solid #E5E5E5;
-  color: #E5E5E5;
-  -webkit-transform-origin: 0 0;
-          transform-origin: 0 0;
-  -webkit-transform: scaleY(0.5);
-          transform: scaleY(0.5);
-}
-.weui-panel:after {
-  content: " ";
-  position: absolute;
-  left: 0;
-  bottom: 0;
-  right: 0;
-  height: 1px;
-  border-bottom: 1px solid #E5E5E5;
-  color: #E5E5E5;
-  -webkit-transform-origin: 0 100%;
-          transform-origin: 0 100%;
-  -webkit-transform: scaleY(0.5);
-          transform: scaleY(0.5);
-}
-.weui-panel__hd {
-  padding: 14px 15px 10px;
-  color: #999999;
-  font-size: 13px;
-  position: relative;
-}
-.weui-panel__hd:after {
-  content: " ";
-  position: absolute;
-  left: 0;
-  bottom: 0;
-  right: 0;
-  height: 1px;
-  border-bottom: 1px solid #E5E5E5;
-  color: #E5E5E5;
-  -webkit-transform-origin: 0 100%;
-          transform-origin: 0 100%;
-  -webkit-transform: scaleY(0.5);
-          transform: scaleY(0.5);
-  left: 15px;
-}
-.weui-media-box {
-  padding: 15px;
-  position: relative;
-}
-.weui-media-box:before {
-  content: " ";
-  position: absolute;
-  left: 0;
-  top: 0;
-  right: 0;
-  height: 1px;
-  border-top: 1px solid #E5E5E5;
-  color: #E5E5E5;
-  -webkit-transform-origin: 0 0;
-          transform-origin: 0 0;
-  -webkit-transform: scaleY(0.5);
-          transform: scaleY(0.5);
-  left: 15px;
-}
-.weui-media-box:first-child:before {
-  display: none;
-}
-a.weui-media-box {
-  color: #000000;
-  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-}
-a.weui-media-box:active {
-  background-color: #ECECEC;
-}
-.weui-media-box__title {
-  font-weight: 400;
-  font-size: 17px;
-  width: auto;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  word-wrap: normal;
-  word-wrap: break-word;
-  word-break: break-all;
-}
-.weui-media-box__desc {
-  color: #999999;
-  font-size: 13px;
-  line-height: 1.2;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-  -webkit-line-clamp: 2;
-}
-.weui-media-box__info {
-  margin-top: 15px;
-  padding-bottom: 5px;
-  font-size: 13px;
-  color: #CECECE;
-  line-height: 1em;
-  list-style: none;
-  overflow: hidden;
-}
-.weui-media-box__info__meta {
-  float: left;
-  padding-right: 1em;
-}
-.weui-media-box__info__meta_extra {
-  padding-left: 1em;
-  border-left: 1px solid #CECECE;
-}
-.weui-media-box_text .weui-media-box__title {
-  margin-bottom: 8px;
-}
-.weui-media-box_appmsg {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-  -webkit-box-align: center;
-  -webkit-align-items: center;
-          align-items: center;
-}
-.weui-media-box_appmsg .weui-media-box__hd {
-  margin-right: .8em;
-  width: 60px;
-  height: 60px;
-  line-height: 60px;
-  text-align: center;
-}
-.weui-media-box_appmsg .weui-media-box__thumb {
-  width: 100%;
-  max-height: 100%;
-  vertical-align: top;
-}
-.weui-media-box_appmsg .weui-media-box__bd {
-  -webkit-box-flex: 1;
-  -webkit-flex: 1;
-          flex: 1;
-  min-width: 0;
-}
-.weui-media-box_small-appmsg {
-  padding: 0;
-}
-.weui-media-box_small-appmsg .weui-cells {
-  margin-top: 0;
-}
-.weui-media-box_small-appmsg .weui-cells:before {
-  display: none;
-}
-.weui-grids {
-  position: relative;
-  overflow: hidden;
-}
-.weui-grids:before {
-  content: " ";
-  position: absolute;
-  left: 0;
-  top: 0;
-  right: 0;
-  height: 1px;
-  border-top: 1px solid #D9D9D9;
-  color: #D9D9D9;
-  -webkit-transform-origin: 0 0;
-          transform-origin: 0 0;
-  -webkit-transform: scaleY(0.5);
-          transform: scaleY(0.5);
-}
-.weui-grids:after {
-  content: " ";
-  position: absolute;
-  left: 0;
-  top: 0;
-  width: 1px;
-  bottom: 0;
-  border-left: 1px solid #D9D9D9;
-  color: #D9D9D9;
-  -webkit-transform-origin: 0 0;
-          transform-origin: 0 0;
-  -webkit-transform: scaleX(0.5);
-          transform: scaleX(0.5);
-}
-.weui-grid {
-  position: relative;
-  float: left;
-  padding: 20px 10px;
-  width: 33.33333333%;
-  box-sizing: border-box;
-}
-.weui-grid:before {
-  content: " ";
-  position: absolute;
-  right: 0;
-  top: 0;
-  width: 1px;
-  bottom: 0;
-  border-right: 1px solid #D9D9D9;
-  color: #D9D9D9;
-  -webkit-transform-origin: 100% 0;
-          transform-origin: 100% 0;
-  -webkit-transform: scaleX(0.5);
-          transform: scaleX(0.5);
-}
-.weui-grid:after {
-  content: " ";
-  position: absolute;
-  left: 0;
-  bottom: 0;
-  right: 0;
-  height: 1px;
-  border-bottom: 1px solid #D9D9D9;
-  color: #D9D9D9;
-  -webkit-transform-origin: 0 100%;
-          transform-origin: 0 100%;
-  -webkit-transform: scaleY(0.5);
-          transform: scaleY(0.5);
-}
-.weui-grid:active {
-  background-color: #ECECEC;
-}
-.weui-grid__icon {
-  width: 28px;
-  height: 28px;
-  margin: 0 auto;
-}
-.weui-grid__icon img {
-  display: block;
-  width: 100%;
-  height: 100%;
-}
-.weui-grid__icon + .weui-grid__label {
-  margin-top: 5px;
-}
-.weui-grid__label {
-  display: block;
-  text-align: center;
-  color: #000000;
-  font-size: 14px;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  overflow: hidden;
-}
-.weui-footer {
-  color: #999999;
-  font-size: 14px;
-  text-align: center;
-}
-.weui-footer a {
-  color: #586C94;
-}
-.weui-footer_fixed-bottom {
-  position: fixed;
-  bottom: .52em;
-  left: 0;
-  right: 0;
-}
-.weui-footer__links {
-  font-size: 0;
-}
-.weui-footer__link {
-  display: inline-block;
-  vertical-align: top;
-  margin: 0 .62em;
-  position: relative;
-  font-size: 14px;
-}
-.weui-footer__link:before {
-  content: " ";
-  position: absolute;
-  left: 0;
-  top: 0;
-  width: 1px;
-  bottom: 0;
-  border-left: 1px solid #C7C7C7;
-  color: #C7C7C7;
-  -webkit-transform-origin: 0 0;
-          transform-origin: 0 0;
-  -webkit-transform: scaleX(0.5);
-          transform: scaleX(0.5);
-  left: -0.65em;
-  top: .36em;
-  bottom: .36em;
-}
-.weui-footer__link:first-child:before {
-  display: none;
-}
-.weui-footer__text {
-  padding: 0 .34em;
-  font-size: 12px;
-}
-.weui-flex {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-}
-.weui-flex__item {
-  -webkit-box-flex: 1;
-  -webkit-flex: 1;
-          flex: 1;
-}
-.weui-dialog {
-  position: fixed;
-  z-index: 5000;
-  width: 80%;
-  max-width: 300px;
-  top: 50%;
-  left: 50%;
-  -webkit-transform: translate(-50%, -50%);
-          transform: translate(-50%, -50%);
-  background-color: #FFFFFF;
-  text-align: center;
-  border-radius: 3px;
-  overflow: hidden;
-}
-.weui-dialog__hd {
-  padding: 1.3em 1.6em 0.5em;
-}
-.weui-dialog__title {
-  font-weight: 400;
-  font-size: 18px;
-}
-.weui-dialog__bd {
-  padding: 0 1.6em 0.8em;
-  min-height: 40px;
-  font-size: 15px;
-  line-height: 1.3;
-  word-wrap: break-word;
-  word-break: break-all;
-  color: #999999;
-}
-.weui-dialog__bd:first-child {
-  padding: 2.7em 20px 1.7em;
-  color: #353535;
-}
-.weui-dialog__ft {
-  position: relative;
-  line-height: 48px;
-  font-size: 18px;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-}
-.weui-dialog__ft:after {
-  content: " ";
-  position: absolute;
-  left: 0;
-  top: 0;
-  right: 0;
-  height: 1px;
-  border-top: 1px solid #D5D5D6;
-  color: #D5D5D6;
-  -webkit-transform-origin: 0 0;
-          transform-origin: 0 0;
-  -webkit-transform: scaleY(0.5);
-          transform: scaleY(0.5);
-}
-.weui-dialog__btn {
-  display: block;
-  -webkit-box-flex: 1;
-  -webkit-flex: 1;
-          flex: 1;
-  color: #3CC51F;
-  text-decoration: none;
-  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-  position: relative;
-}
-.weui-dialog__btn:active {
-  background-color: #EEEEEE;
-}
-.weui-dialog__btn:after {
-  content: " ";
-  position: absolute;
-  left: 0;
-  top: 0;
-  width: 1px;
-  bottom: 0;
-  border-left: 1px solid #D5D5D6;
-  color: #D5D5D6;
-  -webkit-transform-origin: 0 0;
-          transform-origin: 0 0;
-  -webkit-transform: scaleX(0.5);
-          transform: scaleX(0.5);
-}
-.weui-dialog__btn:first-child:after {
-  display: none;
-}
-.weui-dialog__btn_default {
-  color: #353535;
-}
-.weui-dialog__btn_primary {
-  color: #0BB20C;
-}
-.weui-skin_android .weui-dialog {
-  text-align: left;
-  box-shadow: 0 6px 30px 0 rgba(0, 0, 0, 0.1);
-}
-.weui-skin_android .weui-dialog__title {
-  font-size: 21px;
-}
-.weui-skin_android .weui-dialog__hd {
-  text-align: left;
-}
-.weui-skin_android .weui-dialog__bd {
-  color: #999999;
-  padding: 0.25em 1.6em 2em;
-  font-size: 17px;
-  text-align: left;
-}
-.weui-skin_android .weui-dialog__bd:first-child {
-  padding: 1.6em 1.6em 2em;
-  color: #353535;
-}
-.weui-skin_android .weui-dialog__ft {
-  display: block;
-  text-align: right;
-  line-height: 42px;
-  font-size: 16px;
-  padding: 0 1.6em 0.7em;
-}
-.weui-skin_android .weui-dialog__ft:after {
-  display: none;
-}
-.weui-skin_android .weui-dialog__btn {
-  display: inline-block;
-  vertical-align: top;
-  padding: 0 .8em;
-}
-.weui-skin_android .weui-dialog__btn:after {
-  display: none;
-}
-.weui-skin_android .weui-dialog__btn:active {
-  background-color: rgba(0, 0, 0, 0.06);
-}
-.weui-skin_android .weui-dialog__btn:visited {
-  background-color: rgba(0, 0, 0, 0.06);
-}
-.weui-skin_android .weui-dialog__btn:last-child {
-  margin-right: -0.8em;
-}
-.weui-skin_android .weui-dialog__btn_default {
-  color: #808080;
-}
-@media screen and (min-width: 1024px) {
-  .weui-dialog {
-    width: 35%;
-  }
-}
-.weui-toast {
-  position: fixed;
-  z-index: 5000;
-  width: 7.6em;
-  min-height: 7.6em;
-  top: 180px;
-  left: 50%;
-  margin-left: -3.8em;
-  background: rgba(17, 17, 17, 0.7);
-  text-align: center;
-  border-radius: 5px;
-  color: #FFFFFF;
-}
-.weui-icon_toast {
-  margin: 22px 0 0;
-  display: block;
-}
-.weui-icon_toast.weui-icon-success-no-circle:before {
-  color: #FFFFFF;
-  font-size: 55px;
-}
-.weui-icon_toast.weui-loading {
-  margin: 30px 0 0;
-  width: 38px;
-  height: 38px;
-  vertical-align: baseline;
-}
-.weui-toast__content {
-  margin: 0 0 15px;
-}
-.weui-mask {
-  position: fixed;
-  z-index: 1000;
-  top: 0;
-  right: 0;
-  left: 0;
-  bottom: 0;
-  background: rgba(0, 0, 0, 0.6);
-}
-.weui-mask_transparent {
-  position: fixed;
-  z-index: 1000;
-  top: 0;
-  right: 0;
-  left: 0;
-  bottom: 0;
-}
-.weui-actionsheet {
-  position: fixed;
-  left: 0;
-  bottom: 0;
-  -webkit-transform: translate(0, 100%);
-          transform: translate(0, 100%);
-  -webkit-backface-visibility: hidden;
-          backface-visibility: hidden;
-  z-index: 5000;
-  width: 100%;
-  background-color: #EFEFF4;
-  -webkit-transition: -webkit-transform .3s;
-  transition: -webkit-transform .3s;
-  transition: transform .3s;
-  transition: transform .3s, -webkit-transform .3s;
-}
-.weui-actionsheet__menu {
-  background-color: #FFFFFF;
-}
-.weui-actionsheet__action {
-  margin-top: 6px;
-  background-color: #FFFFFF;
-}
-.weui-actionsheet__cell {
-  position: relative;
-  padding: 10px 0;
-  text-align: center;
-  font-size: 18px;
-}
-.weui-actionsheet__cell:before {
-  content: " ";
-  position: absolute;
-  left: 0;
-  top: 0;
-  right: 0;
-  height: 1px;
-  border-top: 1px solid #D9D9D9;
-  color: #D9D9D9;
-  -webkit-transform-origin: 0 0;
-          transform-origin: 0 0;
-  -webkit-transform: scaleY(0.5);
-          transform: scaleY(0.5);
-}
-.weui-actionsheet__cell:active {
-  background-color: #ECECEC;
-}
-.weui-actionsheet__cell:first-child:before {
-  display: none;
-}
-.weui-skin_android .weui-actionsheet {
-  position: fixed;
-  left: 50%;
-  top: 50%;
-  bottom: auto;
-  -webkit-transform: translate(-50%, -50%);
-          transform: translate(-50%, -50%);
-  width: 274px;
-  box-sizing: border-box;
-  -webkit-backface-visibility: hidden;
-          backface-visibility: hidden;
-  background: transparent;
-  -webkit-transition: -webkit-transform .3s;
-  transition: -webkit-transform .3s;
-  transition: transform .3s;
-  transition: transform .3s, -webkit-transform .3s;
-}
-.weui-skin_android .weui-actionsheet__action {
-  display: none;
-}
-.weui-skin_android .weui-actionsheet__menu {
-  border-radius: 2px;
-  box-shadow: 0 6px 30px 0 rgba(0, 0, 0, 0.1);
-}
-.weui-skin_android .weui-actionsheet__cell {
-  padding: 13px 24px;
-  font-size: 16px;
-  line-height: 1.4;
-  text-align: left;
-}
-.weui-skin_android .weui-actionsheet__cell:first-child {
-  border-top-left-radius: 2px;
-  border-top-right-radius: 2px;
-}
-.weui-skin_android .weui-actionsheet__cell:last-child {
-  border-bottom-left-radius: 2px;
-  border-bottom-right-radius: 2px;
-}
-.weui-actionsheet_toggle {
-  -webkit-transform: translate(0, 0);
-          transform: translate(0, 0);
-}
-.weui-loadmore {
-  width: 65%;
-  margin: 1.5em auto;
-  line-height: 1.6em;
-  font-size: 14px;
-  text-align: center;
-}
-.weui-loadmore__tips {
-  display: inline-block;
-  vertical-align: middle;
-}
-.weui-loadmore_line {
-  border-top: 1px solid #E5E5E5;
-  margin-top: 2.4em;
-}
-.weui-loadmore_line .weui-loadmore__tips {
-  position: relative;
-  top: -0.9em;
-  padding: 0 .55em;
-  background-color: #FFFFFF;
-  color: #999999;
-}
-.weui-loadmore_dot .weui-loadmore__tips {
-  padding: 0 .16em;
-}
-.weui-loadmore_dot .weui-loadmore__tips:before {
-  content: " ";
-  width: 4px;
-  height: 4px;
-  border-radius: 50%;
-  background-color: #E5E5E5;
-  display: inline-block;
-  position: relative;
-  vertical-align: 0;
-  top: -0.16em;
-}
-.weui-badge {
-  display: inline-block;
-  padding: .15em .4em;
-  min-width: 8px;
-  border-radius: 18px;
-  background-color: #F43530;
-  color: #FFFFFF;
-  line-height: 1.2;
-  text-align: center;
-  font-size: 12px;
-  vertical-align: middle;
-}
-.weui-badge_dot {
-  padding: .4em;
-  min-width: 0;
-}
-.weui-search-bar {
-  position: relative;
-  padding: 8px 10px;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-  box-sizing: border-box;
-  background-color: #EFEFF4;
-}
-.weui-search-bar:before {
-  content: " ";
-  position: absolute;
-  left: 0;
-  top: 0;
-  right: 0;
-  height: 1px;
-  border-top: 1px solid #D7D6DC;
-  color: #D7D6DC;
-  -webkit-transform-origin: 0 0;
-          transform-origin: 0 0;
-  -webkit-transform: scaleY(0.5);
-          transform: scaleY(0.5);
-}
-.weui-search-bar:after {
-  content: " ";
-  position: absolute;
-  left: 0;
-  bottom: 0;
-  right: 0;
-  height: 1px;
-  border-bottom: 1px solid #D7D6DC;
-  color: #D7D6DC;
-  -webkit-transform-origin: 0 100%;
-          transform-origin: 0 100%;
-  -webkit-transform: scaleY(0.5);
-          transform: scaleY(0.5);
-}
-.weui-search-bar.weui-search-bar_focusing .weui-search-bar__cancel-btn {
-  display: block;
-}
-.weui-search-bar.weui-search-bar_focusing .weui-search-bar__label {
-  display: none;
-}
-.weui-search-bar__form {
-  position: relative;
-  -webkit-box-flex: 1;
-  -webkit-flex: auto;
-          flex: auto;
-  background-color: #EFEFF4;
-}
-.weui-search-bar__form:after {
-  content: '';
-  position: absolute;
-  left: 0;
-  top: 0;
-  width: 200%;
-  height: 200%;
-  -webkit-transform: scale(0.5);
-          transform: scale(0.5);
-  -webkit-transform-origin: 0 0;
-          transform-origin: 0 0;
-  border-radius: 10px;
-  border: 1px solid #E6E6EA;
-  box-sizing: border-box;
-  background: #FFFFFF;
-}
-.weui-search-bar__box {
-  position: relative;
-  padding-left: 30px;
-  padding-right: 30px;
-  height: 100%;
-  width: 100%;
-  box-sizing: border-box;
-  z-index: 1;
-}
-.weui-search-bar__box .weui-search-bar__input {
-  padding: 4px 0;
-  width: 100%;
-  height: 1.42857143em;
-  border: 0;
-  font-size: 14px;
-  line-height: 1.42857143em;
-  box-sizing: content-box;
-  background: transparent;
-}
-.weui-search-bar__box .weui-search-bar__input:focus {
-  outline: none;
-}
-.weui-search-bar__box .weui-icon-search {
-  position: absolute;
-  left: 10px;
-  top: 0;
-  line-height: 28px;
-}
-.weui-search-bar__box .weui-icon-clear {
-  position: absolute;
-  top: 0;
-  right: 0;
-  padding: 0 10px;
-  line-height: 28px;
-}
-.weui-search-bar__label {
-  position: absolute;
-  top: 1px;
-  right: 1px;
-  bottom: 1px;
-  left: 1px;
-  z-index: 2;
-  border-radius: 3px;
-  text-align: center;
-  color: #9B9B9B;
-  background: #FFFFFF;
-}
-.weui-search-bar__label span {
-  display: inline-block;
-  font-size: 14px;
-  vertical-align: middle;
-}
-.weui-search-bar__label .weui-icon-search {
-  margin-right: 5px;
-}
-.weui-search-bar__cancel-btn {
-  display: none;
-  margin-left: 10px;
-  line-height: 28px;
-  color: #09BB07;
-  white-space: nowrap;
-}
-.weui-search-bar__input:not(:valid) ~ .weui-icon-clear {
-  display: none;
-}
-input[type="search"]::-webkit-search-decoration,
-input[type="search"]::-webkit-search-cancel-button,
-input[type="search"]::-webkit-search-results-button,
-input[type="search"]::-webkit-search-results-decoration {
-  display: none;
-}
-.weui-picker {
-  position: fixed;
-  width: 100%;
-  left: 0;
-  bottom: 0;
-  z-index: 5000;
-  -webkit-backface-visibility: hidden;
-          backface-visibility: hidden;
-  -webkit-transform: translate(0, 100%);
-          transform: translate(0, 100%);
-  -webkit-transition: -webkit-transform .3s;
-  transition: -webkit-transform .3s;
-  transition: transform .3s;
-  transition: transform .3s, -webkit-transform .3s;
-}
-.weui-picker__hd {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-  padding: 10px 15px;
-  background-color: #fbf9fe;
-  position: relative;
-  text-align: center;
-}
-.weui-picker__hd:after {
-  content: " ";
-  position: absolute;
-  left: 0;
-  bottom: 0;
-  right: 0;
-  height: 1px;
-  border-bottom: 1px solid #E5E5E5;
-  color: #E5E5E5;
-  -webkit-transform-origin: 0 100%;
-          transform-origin: 0 100%;
-  -webkit-transform: scaleY(0.5);
-          transform: scaleY(0.5);
-}
-.weui-picker__action {
-  display: block;
-  -webkit-box-flex: 1;
-  -webkit-flex: 1;
-          flex: 1;
-  color: #586C94;
-}
-.weui-picker__action:first-child {
-  text-align: left;
-}
-.weui-picker__action:last-child {
-  text-align: right;
-}
-.weui-picker__bd {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-  position: relative;
-  background-color: #fff;
-  height: 238px;
-  overflow: hidden;
-}
-.weui-picker__group {
-  -webkit-box-flex: 1;
-  -webkit-flex: 1;
-          flex: 1;
-  position: relative;
-  height: 100%;
-}
-.weui-picker__mask {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  margin: 0 auto;
-  z-index: 3;
-  background: -webkit-linear-gradient(top, rgba(255, 255, 255, 0.95), rgba(255, 255, 255, 0.6)), -webkit-linear-gradient(bottom, rgba(255, 255, 255, 0.95), rgba(255, 255, 255, 0.6));
-  background: linear-gradient(180deg, rgba(255, 255, 255, 0.95), rgba(255, 255, 255, 0.6)), linear-gradient(0deg, rgba(255, 255, 255, 0.95), rgba(255, 255, 255, 0.6));
-  background-position: top, bottom;
-  background-size: 100% 102px;
-  background-repeat: no-repeat;
-  -webkit-transform: translateZ(0);
-          transform: translateZ(0);
-}
-.weui-picker__indicator {
-  width: 100%;
-  height: 34px;
-  position: absolute;
-  left: 0;
-  top: 102px;
-  z-index: 3;
-}
-.weui-picker__indicator:before {
-  content: " ";
-  position: absolute;
-  left: 0;
-  top: 0;
-  right: 0;
-  height: 1px;
-  border-top: 1px solid #E5E5E5;
-  color: #E5E5E5;
-  -webkit-transform-origin: 0 0;
-          transform-origin: 0 0;
-  -webkit-transform: scaleY(0.5);
-          transform: scaleY(0.5);
-}
-.weui-picker__indicator:after {
-  content: " ";
-  position: absolute;
-  left: 0;
-  bottom: 0;
-  right: 0;
-  height: 1px;
-  border-bottom: 1px solid #E5E5E5;
-  color: #E5E5E5;
-  -webkit-transform-origin: 0 100%;
-          transform-origin: 0 100%;
-  -webkit-transform: scaleY(0.5);
-          transform: scaleY(0.5);
-}
-.weui-picker__content {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-}
-.weui-picker__item {
-  padding: 5px 0 4px;
-  text-align: center;
-  color: #000;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  overflow: hidden;
-}
-.weui-picker__item_disabled {
-  color: #999999;
-}
-@-webkit-keyframes slideUp {
-  from {
-    -webkit-transform: translate3d(0, 100%, 0);
-            transform: translate3d(0, 100%, 0);
-  }
-  to {
-    -webkit-transform: translate3d(0, 0, 0);
-            transform: translate3d(0, 0, 0);
-  }
-}
-@keyframes slideUp {
-  from {
-    -webkit-transform: translate3d(0, 100%, 0);
-            transform: translate3d(0, 100%, 0);
-  }
-  to {
-    -webkit-transform: translate3d(0, 0, 0);
-            transform: translate3d(0, 0, 0);
-  }
-}
-.weui-animate-slide-up {
-  -webkit-animation: slideUp ease .3s forwards;
-          animation: slideUp ease .3s forwards;
-}
-@-webkit-keyframes slideDown {
-  from {
-    -webkit-transform: translate3d(0, 0, 0);
-            transform: translate3d(0, 0, 0);
-  }
-  to {
-    -webkit-transform: translate3d(0, 100%, 0);
-            transform: translate3d(0, 100%, 0);
-  }
-}
-@keyframes slideDown {
-  from {
-    -webkit-transform: translate3d(0, 0, 0);
-            transform: translate3d(0, 0, 0);
-  }
-  to {
-    -webkit-transform: translate3d(0, 100%, 0);
-            transform: translate3d(0, 100%, 0);
-  }
-}
-.weui-animate-slide-down {
-  -webkit-animation: slideDown ease .3s forwards;
-          animation: slideDown ease .3s forwards;
-}
-@-webkit-keyframes fadeIn {
-  from {
-    opacity: 0;
-  }
-  to {
-    opacity: 1;
-  }
-}
-@keyframes fadeIn {
-  from {
-    opacity: 0;
-  }
-  to {
-    opacity: 1;
-  }
-}
-.weui-animate-fade-in {
-  -webkit-animation: fadeIn ease .3s forwards;
-          animation: fadeIn ease .3s forwards;
-}
-@-webkit-keyframes fadeOut {
-  from {
-    opacity: 1;
-  }
-  to {
-    opacity: 0;
-  }
-}
-@keyframes fadeOut {
-  from {
-    opacity: 1;
-  }
-  to {
-    opacity: 0;
-  }
-}
-.weui-animate-fade-out {
-  -webkit-animation: fadeOut ease .3s forwards;
-          animation: fadeOut ease .3s forwards;
-}
-.weui-agree {
-  display: block;
-  padding: .5em 15px;
-  font-size: 13px;
-}
-.weui-agree a {
-  color: #586C94;
-}
-.weui-agree__text {
-  color: #999999;
-}
-.weui-agree__checkbox {
-  -webkit-appearance: none;
-          appearance: none;
-  outline: 0;
-  font-size: 0;
-  border: 1px solid #D1D1D1;
-  background-color: #FFFFFF;
-  border-radius: 3px;
-  width: 13px;
-  height: 13px;
-  position: relative;
-  vertical-align: 0;
-  top: 2px;
-}
-.weui-agree__checkbox:checked:before {
-  font-family: "weui";
-  font-style: normal;
-  font-weight: normal;
-  font-variant: normal;
-  text-transform: none;
-  text-align: center;
-  speak: none;
-  display: inline-block;
-  vertical-align: middle;
-  text-decoration: inherit;
-  content: "\EA08";
-  color: #09BB07;
-  font-size: 13px;
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  -webkit-transform: translate(-50%, -48%) scale(0.73);
-          transform: translate(-50%, -48%) scale(0.73);
-}
-.weui-agree__checkbox:disabled {
-  background-color: #E1E1E1;
-}
-.weui-agree__checkbox:disabled:before {
-  color: #ADADAD;
-}
-.weui-loading {
-  width: 20px;
-  height: 20px;
-  display: inline-block;
-  vertical-align: middle;
-  -webkit-animation: weuiLoading 1s steps(12, end) infinite;
-          animation: weuiLoading 1s steps(12, end) infinite;
-  background: transparent url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMjAiIGhlaWdodD0iMTIwIiB2aWV3Qm94PSIwIDAgMTAwIDEwMCI+PHBhdGggZmlsbD0ibm9uZSIgZD0iTTAgMGgxMDB2MTAwSDB6Ii8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTlFOUU5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTMwKSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iIzk4OTY5NyIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgzMCAxMDUuOTggNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjOUI5OTlBIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDYwIDc1Ljk4IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0EzQTFBMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSg5MCA2NSA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNBQkE5QUEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoMTIwIDU4LjY2IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0IyQjJCMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgxNTAgNTQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjQkFCOEI5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDE4MCA1MCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDMkMwQzEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTE1MCA0NS45OCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDQkNCQ0IiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTEyMCA0MS4zNCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNEMkQyRDIiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTkwIDM1IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0RBREFEQSIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgtNjAgMjQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTJFMkUyIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKC0zMCAtNS45OCA2NSkiLz48L3N2Zz4=) no-repeat;
-  background-size: 100%;
-}
-.weui-loading.weui-loading_transparent {
-  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='120' height='120' viewBox='0 0 100 100'%3E%3Cpath fill='none' d='M0 0h100v100H0z'/%3E%3Crect xmlns='http://www.w3.org/2000/svg' width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.56)' rx='5' ry='5' transform='translate(0 -30)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.5)' rx='5' ry='5' transform='rotate(30 105.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.43)' rx='5' ry='5' transform='rotate(60 75.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.38)' rx='5' ry='5' transform='rotate(90 65 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.32)' rx='5' ry='5' transform='rotate(120 58.66 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.28)' rx='5' ry='5' transform='rotate(150 54.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.25)' rx='5' ry='5' transform='rotate(180 50 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.2)' rx='5' ry='5' transform='rotate(-150 45.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.17)' rx='5' ry='5' transform='rotate(-120 41.34 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.14)' rx='5' ry='5' transform='rotate(-90 35 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.1)' rx='5' ry='5' transform='rotate(-60 24.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.03)' rx='5' ry='5' transform='rotate(-30 -5.98 65)'/%3E%3C/svg%3E");
-}
-@-webkit-keyframes weuiLoading {
-  0% {
-    -webkit-transform: rotate3d(0, 0, 1, 0deg);
-            transform: rotate3d(0, 0, 1, 0deg);
-  }
-  100% {
-    -webkit-transform: rotate3d(0, 0, 1, 360deg);
-            transform: rotate3d(0, 0, 1, 360deg);
-  }
-}
-@keyframes weuiLoading {
-  0% {
-    -webkit-transform: rotate3d(0, 0, 1, 0deg);
-            transform: rotate3d(0, 0, 1, 0deg);
-  }
-  100% {
-    -webkit-transform: rotate3d(0, 0, 1, 360deg);
-            transform: rotate3d(0, 0, 1, 360deg);
-  }
-}
-.weui-slider {
-  padding: 15px 18px;
-  -webkit-user-select: none;
-          user-select: none;
-}
-.weui-slider__inner {
-  position: relative;
-  height: 2px;
-  background-color: #E9E9E9;
-}
-.weui-slider__track {
-  height: 2px;
-  background-color: #1AAD19;
-  width: 0;
-}
-.weui-slider__handler {
-  position: absolute;
-  left: 0;
-  top: 50%;
-  width: 28px;
-  height: 28px;
-  margin-left: -14px;
-  margin-top: -14px;
-  border-radius: 50%;
-  background-color: #FFFFFF;
-  box-shadow: 0 0 4px rgba(0, 0, 0, 0.2);
-}
-.weui-slider-box {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-  -webkit-box-align: center;
-  -webkit-align-items: center;
-          align-items: center;
-}
-.weui-slider-box .weui-slider {
-  -webkit-box-flex: 1;
-  -webkit-flex: 1;
-          flex: 1;
-}
-.weui-slider-box__value {
-  margin-left: .5em;
-  min-width: 24px;
-  color: #888888;
-  text-align: center;
-  font-size: 14px;
-}
-
-/*# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["style/base/reset.less","style/weui.css","style/base/mixin/mobile.less","style/icon/weui-font.less","style/icon/weui-icon_font.less","style/widget/weui-button/weui-btn_global.less","style/widget/weui-button/weui-btn_default.less","style/widget/weui-button/weui-btn_primary.less","style/widget/weui-button/weui-btn_warn.less","style/widget/weui-button/weui-btn_disabled.less","style/widget/weui-button/weui-btn_loading.less","style/widget/weui-button/weui-btn_plain.less","style/widget/weui-button/weui-button.less","style/widget/weui-cell/weui-cell_global.less","style/base/mixin/setOnepx.less","style/widget/weui-cell/weui-access.less","style/base/mixin/setArrow.less","style/widget/weui-cell/weui-check/weui-check_common.less","style/widget/weui-cell/weui-check/weui-radio.less","style/widget/weui-cell/weui-check/weui-checkbox.less","style/widget/weui-cell/weui-form/weui-form_common.less","style/base/mixin/text.less","style/widget/weui-cell/weui-form/weui-form-preview.less","style/widget/weui-cell/weui-form/weui-select.less","style/widget/weui-cell/weui-form/weui-vcode.less","style/widget/weui-cell/weui-gallery.less","style/widget/weui-cell/weui-switch.less","style/widget/weui-cell/weui-uploader.less","style/widget/weui-page/weui-msg.less","style/widget/weui-page/weui-article.less","style/widget/weui-tab/weui-tabbar.less","style/widget/weui-tab/weui-navbar.less","style/widget/weui-tab/weui-tab.less","style/widget/weui-progress/weui-progress.less","style/widget/weui-panel/weui-panel.less","style/widget/weui-media-box/weui-media-box.less","style/widget/weui-grid/weui-grid.less","style/widget/weui-footer/weui-footer.less","style/widget/weui-flex/weui-flex.less","style/widget/weui-tips/weui-dialog.less","style/widget/weui-tips/weui-toast.less","style/widget/weui-tips/weui-mask.less","style/widget/weui-tips/weui-actionsheet.less","style/widget/weui-tips/weui-loadmore.less","style/widget/weui-tips/weui-badge.less","style/widget/weui-searchbar/weui-searchbar.less","style/widget/weui-picker/weui-picker.less","style/widget/weui-animate/weui-animate.less","style/widget/weui-agree/weui-agree.less","style/widget/weui-loading/weui-loading.less","style/widget/weui-slider/weui-slider.less"],"names":[],"mappings":";;;;;AAEA;EACI,2BAAA;EACA,+BAAA;CCDH;ADID;EACI,iBAAA;EACA,8DAAA;CCFH;ADKD;EACI,UAAA;EACA,WAAA;CCHH;ADMD;EACI,UAAA;CCJH;ADOD;EACI,sBAAA;EErBA,8CAAA;CDiBH;AElBD;EACI,oBAAA;EACA,mBAAA;EACA,oBAAA;EACA,qmMAAA;CFoBH;AEhBD;;EACI,sBAAA;EACA,uBAAA;EACA,yCAAA;EACA,mBAAA;EACA,qBAAA;EACA,oCAAA;CFmBH;AElBG;;EAEI,sBAAA;EACA,kBAAA;EACA,mBAAA;CFoBP;AEhBD;EAA2B,iBAAA;CFmB1B;AACD,SAAS;AEnBT;EAA6B,iBAAA;CFsB5B;AACD,SAAS;AEtBT;EAAyB,iBAAA;CFyBxB;AACD,SAAS;AEzBT;EAAiC,iBAAA;CF4BhC;AACD,SAAS;AE5BT;EAA8B,iBAAA;CF+B7B;AACD,SAAS;AE/BT;EAA4B,iBAAA;CFkC3B;AACD,SAAS;AElCT;EAAmC,iBAAA;CFqClC;AACD,SAAS;AErCT;EAAsC,iBAAA;CFwCrC;AACD,SAAS;AExCT;EAA4B,iBAAA;CF2C3B;AACD,SAAS;AE3CT;EAAmC,iBAAA;CF8ClC;AACD,SAAS;AE9CT;EAAyB,iBAAA;CFiDxB;AACD,SAAS;AEjDT;EAAgC,iBAAA;CFoD/B;AACD,SAAS;AEpDT;EAA2B,iBAAA;CFuD1B;AACD,SAAS;AEvDT;EAA2B,iBAAA;CF0D1B;AACD,SAAS;AE1DT;EAA0B,iBAAA;CF6DzB;AACD,SAAS;AE7DT;EAAyB,iBAAA;CFgExB;AACD,SAAS;AEhET;EAA2B,iBAAA;CFmE1B;AACD,SAAS;AGzGT;;EACI,UAAA;CH4GH;AG1GD;EACI,gBAAA;EACA,eAAA;CH4GH;AG1GD;EACI,gBAAA;EACA,eAAA;CH4GH;AG1GD;EACI,gBAAA;EACA,eAAA;CH4GH;AG1GD;EACI,gBAAA;EACA,eAAA;CH4GH;AGzGD;EACI,gBAAA;EACA,eAAA;CH2GH;AGzGD;EACI,gBAAA;EACA,eAAA;CH2GH;AGzGD;EACI,gBAAA;EACA,eAAA;CH2GH;AGzGD;EACI,gBAAA;EACA,eAAA;CH2GH;AGzGD;EACI,gBAAA;EACA,eAAA;CH2GH;AGxGD;EACI,gBAAA;EACA,eAAA;CH0GH;AGvGD;EACI,eAAA;CHyGH;AGvGD;EACI,eAAA;CHyGH;AGtGD;EACI,eAAA;EACA,gBAAA;CHwGH;AGrGD;EACI,eAAA;EACA,gBAAA;CHuGH;AGpGD;EACI,eAAA;EACA,gBAAA;CHsGH;AGlGG;EACI,eAAA;EACA,gBAAA;CHoGP;AGhGD;EACI,gBAAA;CHkGH;AGjGG;EACI,eAAA;CHmGP;AGhGD;EACI,gBAAA;CHkGH;AGjGG;EACI,eAAA;CHmGP;AIvLD;EACI,mBAAA;EACA,eAAA;EACA,kBAAA;EACA,mBAAA;EACA,mBAAA;EACA,oBAAA;EACA,uBAAA;EACA,gBAAA;EACA,mBAAA;EACA,sBAAA;EACA,eAAA;EACA,wBAAA;EACA,mBAAA;EHdA,8CAAA;EGgBA,iBAAA;CJyLH;AIxLG;EACI,aAAA;EACA,YAAA;EACA,aAAA;EACA,mBAAA;EACA,OAAA;EACA,QAAA;EACA,qCAAA;EACA,8BAAA;UAAA,sBAAA;EACA,8BAAA;UAAA,sBAAA;EACA,uBAAA;EACA,oBAAA;CJ0LP;AIvLD;EACI,sBAAA;CJyLH;AKxND;EACI,eAAA;EACA,0BAAA;CL0NH;AKzNG;EACI,eAAA;CL2NP;AKzNG;EACI,0BAAA;EACA,0BAAA;CL2NP;AMnOD;EACI,0BAAA;CNqOH;AMpOG;EACI,eAAA;CNsOP;AMpOG;EACI,gCAAA;EACA,0BAAA;CNsOP;AO7OD;EACI,0BAAA;CP+OH;AO9OG;EACI,eAAA;CPgPP;AO9OG;EACI,gCAAA;EACA,0BAAA;CPgPP;AQvPD;EACI,gCAAA;CRyPH;AQxPG;EACI,0BAAA;EACA,0BAAA;CR0PP;AQxPG;EACI,0BAAA;CR0PP;AQxPG;EACI,0BAAA;CR0PP;ASpQD;EAEE,0BAAA;CTqQD;ASnQG;;EACI,gCAAA;CTsQP;ASvQG;;EAGD,0rDAAA;CTwQF;ASrQA;EACO,0BAAA;CTuQP;ASrQA;EACO,0BAAA;CTuQP;AUrRD;EACI,eAAA;EACA,0BAAA;CVuRH;AUtRG;EACI,8BAAA;EACA,qCAAA;CVwRP;AUtRG;EACI,gBAAA;CVwRP;AUpRD;EACI,eAAA;EACA,0BAAA;CVsRH;AUrRG;EACI,6BAAA;EACA,oCAAA;CVuRP;AUrRG;EACI,gBAAA;CVuRP;AUpRD;EACI,0BAAA;EACA,iCAAA;CVsRH;AWvSG;;EACI,YAAA;EACA,gBAAA;EACA,WAAA;EACA,yBAAA;CX0SP;AWzSO;;EACI,WAAA;CX4SX;AWzSG;;;;EACI,YAAA;CX8SP;AW5SG;;;;EACI,kBAAA;EACA,8BAAA;CXiTP;AW7SD;EACI,sBAAA;EACA,kBAAA;EACA,iBAAA;EACA,gBAAA;CX+SH;AACD,mBAAmB;AW3SnB;EACI,iBAAA;CX6SH;AW1SD;EACI,iBAAA;EACA,kBAAA;CX4SH;AWzSD;EACI,gCAAA;CX2SH;AWzSD;EACI,qBAAA;EAAA,sBAAA;EAAA,cAAA;CX2SH;AW5SD;EAGQ,iBAAA;EACA,mBAAA;EACA,YAAA;EACA,oBAAA;EAAA,gBAAA;UAAA,QAAA;CX4SP;AW3SO;EACI,gBAAA;CX6SX;AYpWD;EACI,yBAAA;EACA,0BAAA;EACA,wBAAA;EACA,gBAAA;EAEA,iBAAA;EAGA,mBAAA;CZmWH;AYlWG;ECXA,aAAA;EACA,mBAAA;EACA,QAAA;EACA,OAAA;EACA,SAAA;EACA,YAAA;EACA,8BAAA;EACA,eAAA;EACA,8BAAA;UAAA,sBAAA;EACA,+BAAA;UAAA,uBAAA;CbgXH;AY3WG;ECDA,aAAA;EACA,mBAAA;EACA,QAAA;EACA,UAAA;EACA,SAAA;EACA,YAAA;EACA,iCAAA;EACA,eAAA;EACA,iCAAA;UAAA,yBAAA;EACA,+BAAA;UAAA,uBAAA;Cb+WH;AYlXD;EACI,kBAAA;EACA,oBAAA;EACA,mBAAA;EACA,oBAAA;EACA,eAAA;EACA,gBAAA;CZoXH;AYlXG;EACI,cAAA;CZoXP;AYhXD;EACI,iBAAA;EACA,eAAA;EACA,mBAAA;EACA,oBAAA;EACA,gBAAA;CZkXH;AY/WD;EACI,mBAAA;EACA,mBAAA;EACA,qBAAA;EAAA,sBAAA;EAAA,cAAA;EACA,0BAAA;EAAA,4BAAA;UAAA,oBAAA;CZiXH;AYhXG;EC7CA,aAAA;EACA,mBAAA;EACA,QAAA;EACA,OAAA;EACA,SAAA;EACA,YAAA;EACA,8BAAA;EACA,eAAA;EACA,8BAAA;UAAA,sBAAA;EACA,+BAAA;UAAA,uBAAA;EDsCI,WAAA;CZ2XP;AYxXO;EACI,cAAA;CZ0XX;AYtXD;EACI,yBAAA;EAAA,gCAAA;UAAA,wBAAA;CZwXH;AYtXD;EACI,oBAAA;EAAA,gBAAA;UAAA,QAAA;CZwXH;AYtXD;EACI,kBAAA;EACA,eAAA;CZwXH;ActbD;EbDI,8CAAA;EaGA,eAAA;CdwbH;AcvbG;EACI,0BAAA;CdybP;Ac7bD;EAOQ,oBAAA;EACA,mBAAA;CdybP;AcxbO;EACI,aAAA;ECXR,sBAAA;EACA,YAAA;EACA,WAAA;EACA,0BAAA;EACA,sBAAA;EACA,oBAAA;EAUA,yDAAA;UAAA,iDAAA;EAEA,mBAAA;EACA,UAAA;EDLQ,mBAAA;EACA,SAAA;EACA,iBAAA;EACA,WAAA;CdkcX;Ac9bD;EACI,eAAA;EACA,gBAAA;CdgcH;Ac5bO;EACI,eAAA;Cd8bX;AgBxdD;EfDI,8CAAA;CD4dH;AgBzdG;EACI,0BAAA;ChB2dP;AgBvdD;EACI,mBAAA;EACA,cAAA;ChBydH;AiBjeD;EAEQ,qBAAA;CjBkeP;AiB1de;EACI,eAAA;EACA,iBAAA;EACA,eAAA;EACA,gBAAA;CjB4dnB;AkB3eD;EAEQ,sBAAA;ClB4eP;AkBzeO;EACI,iBAAA;EACA,eAAA;EACA,gBAAA;EACA,eAAA;ClB2eX;AkBhee;EACI,iBAAA;EACA,eAAA;ClBkenB;AmBxfD;EACE,eAAA;EACA,aAAA;ECYE,sBAAA;EACA,sBAAA;CpB+eH;AmBzfD;EACI,YAAA;EACA,UAAA;EACA,WAAA;EACA,yBAAA;EACA,8BAAA;EACA,mBAAA;EACA,eAAA;EACA,qBAAA;EACA,wBAAA;CnB2fH;AmBxfG;;EACI,yBAAA;EACA,UAAA;CnB2fP;AmBxfD;EACI,eAAA;EACA,UAAA;EACA,aAAA;EACA,YAAA;EACA,eAAA;EACA,eAAA;EACA,qBAAA;EACA,WAAA;CnB0fH;AmBvfD;EACI,eAAA;EACA,kBAAA;CnByfH;AmBxfG;EACI,eAAA;CnB0fP;AmBtfD;EACI,cAAA;EACA,gBAAA;EACA,iCAAA;UAAA,yBAAA;EACA,OAAA;EACA,QAAA;EACA,SAAA;EACA,aAAA;EACA,gBAAA;EACA,mBAAA;EACA,YAAA;EACA,cAAA;ECtCA,sBAAA;EACA,sBAAA;CpB+hBH;AmBvfD;EACI,0BAAA;CnByfH;AmBvfD;EAEQ,aAAA;CnBwfP;AmB1fD;EAKQ,cAAA;CnBwfP;AmB7fD;;;ElB3DI,8CAAA;CD6jBH;AmBvfD;EACI,eAAA;CnByfH;AmB1fD;EAEoB,sBAAA;CnB2fnB;AqBlkBD;EACI,mBAAA;EACA,0BAAA;CrBokBH;AqBnkBG;ERJA,aAAA;EACA,mBAAA;EACA,QAAA;EACA,OAAA;EACA,SAAA;EACA,YAAA;EACA,8BAAA;EACA,eAAA;EACA,8BAAA;UAAA,sBAAA;EACA,+BAAA;UAAA,uBAAA;Cb0kBH;AqB5kBG;ERMA,aAAA;EACA,mBAAA;EACA,QAAA;EACA,UAAA;EACA,SAAA;EACA,YAAA;EACA,iCAAA;EACA,eAAA;EACA,iCAAA;UAAA,yBAAA;EACA,+BAAA;UAAA,uBAAA;CbykBH;AqBplBD;EACI,mBAAA;EACA,mBAAA;EACA,kBAAA;EACA,mBAAA;CrBslBH;AqBrlBG;ERHA,aAAA;EACA,mBAAA;EACA,QAAA;EACA,UAAA;EACA,SAAA;EACA,YAAA;EACA,iCAAA;EACA,eAAA;EACA,iCAAA;UAAA,yBAAA;EACA,+BAAA;UAAA,uBAAA;EQJI,WAAA;CrBgmBP;AqBvmBD;EAUQ,mBAAA;EACA,iBAAA;CrBgmBP;AqB7lBD;EACI,mBAAA;EACA,gBAAA;EACA,kBAAA;EACA,eAAA;EACA,eAAA;CrB+lBH;AqB7lBD;EACI,mBAAA;EACA,kBAAA;EACA,qBAAA;EAAA,sBAAA;EAAA,cAAA;CrB+lBH;AqB9lBG;ERpCA,aAAA;EACA,mBAAA;EACA,QAAA;EACA,OAAA;EACA,SAAA;EACA,YAAA;EACA,8BAAA;EACA,eAAA;EACA,8BAAA;UAAA,sBAAA;EACA,+BAAA;UAAA,uBAAA;CbqoBH;AqBtmBD;EACI,iBAAA;CrBwmBH;AqBtmBD;EACI,YAAA;EACA,kBAAA;EACA,eAAA;EACA,eAAA;EACA,oBAAA;EACA,yBAAA;CrBwmBH;AqBtmBD;EACI,eAAA;EACA,iBAAA;EACA,mBAAA;EACA,sBAAA;CrBwmBH;AqBtmBD;EACI,mBAAA;EACA,eAAA;EACA,oBAAA;EAAA,gBAAA;UAAA,QAAA;EACA,eAAA;EACA,mBAAA;EpB9DA,8CAAA;CDuqBH;AqBvmBG;EACI,8BAAA;EACA,UAAA;EACA,WAAA;EACA,qBAAA;EACA,mBAAA;CrBymBP;AqBvmBG;EACI,0BAAA;CrBymBP;AqBvmBG;ERhDA,aAAA;EACA,mBAAA;EACA,QAAA;EACA,OAAA;EACA,WAAA;EACA,UAAA;EACA,+BAAA;EACA,eAAA;EACA,8BAAA;UAAA,sBAAA;EACA,+BAAA;UAAA,uBAAA;Cb0pBH;AqB/mBO;EACI,cAAA;CrBinBX;AqB7mBD;EACI,eAAA;CrB+mBH;AqB7mBD;EACI,eAAA;CrB+mBH;AsBrsBD;EACI,WAAA;CtBusBH;AsBxsBD;EAGQ,oBAAA;CtBwsBP;AsBrsBO;EACI,aAAA;EPRR,sBAAA;EACA,YAAA;EACA,WAAA;EACA,0BAAA;EACA,sBAAA;EACA,oBAAA;EAUA,yDAAA;UAAA,iDAAA;EAEA,mBAAA;EACA,UAAA;EOPQ,mBAAA;EACA,SAAA;EACA,YAAA;EACA,iBAAA;CtB8sBX;AsBzsBD;EACI,yBAAA;EACA,UAAA;EACA,WAAA;EACA,8BAAA;EACA,YAAA;EACA,mBAAA;EACA,aAAA;EACA,kBAAA;EACA,mBAAA;EACA,WAAA;EACA,mBAAA;CtB2sBH;AsBxsBD;EACI,oBAAA;CtB0sBH;AsB3sBD;EAGQ,aAAA;EACA,uBAAA;CtB2sBP;AsB/sBD;EAOQ,mBAAA;CtB2sBP;AsB1sBO;ETFJ,aAAA;EACA,mBAAA;EACA,SAAA;EACA,OAAA;EACA,WAAA;EACA,UAAA;EACA,gCAAA;EACA,eAAA;EACA,iCAAA;UAAA,yBAAA;EACA,+BAAA;UAAA,uBAAA;Cb+sBH;AsBntBO;EACI,aAAA;EP7CR,sBAAA;EACA,YAAA;EACA,WAAA;EACA,0BAAA;EACA,sBAAA;EACA,oBAAA;EAUA,yDAAA;UAAA,iDAAA;EAEA,mBAAA;EACA,UAAA;EO8BQ,mBAAA;EACA,SAAA;EACA,YAAA;EACA,iBAAA;CtB4tBX;AsB9uBD;EAsBQ,mBAAA;CtB2tBP;AsB1tBO;EACI,cAAA;CtB4tBX;AsBvtBD;EACI,mBAAA;CtBytBH;AsB1tBD;EAGQ,gBAAA;CtB0tBP;AuB1xBD;EACI,eAAA;EACA,iBAAA;EACA,kBAAA;CvB4xBH;AuB1xBD;EACI,iBAAA;EACA,aAAA;EACA,uBAAA;CvB4xBH;AuBzxBD;EACI,sBAAA;EACA,aAAA;EACA,iBAAA;EACA,yBAAA;EACA,+BAAA;EACA,kBAAA;EACA,uBAAA;EACA,gBAAA;EACA,eAAA;CvB2xBH;AuB1xBG;EACI,8BAAA;EACA,cAAA;EACA,gBAAA;EACA,iBAAA;EACA,WAAA;CvB4xBP;AuB1xBG;EACI,eAAA;CvB4xBP;AwBxzBD;EACI,cAAA;EACA,gBAAA;EACA,OAAA;EACA,SAAA;EACA,UAAA;EACA,QAAA;EACA,0BAAA;EACA,cAAA;CxB0zBH;AwBxzBD;EACI,mBAAA;EACA,OAAA;EACA,SAAA;EACA,aAAA;EACA,QAAA;EACA,oCAAA;EACA,yBAAA;CxB0zBH;AwBxzBD;EACI,mBAAA;EACA,SAAA;EACA,UAAA;EACA,QAAA;EACA,0BAAA;EACA,eAAA;EACA,kBAAA;EACA,mBAAA;CxB0zBH;AwBxzBD;EACI,eAAA;CxB0zBH;AyBz1BD;EACI,iBAAA;EACA,oBAAA;CzB21BH;AyBz1BD;EACI,yBAAA;UAAA,iBAAA;CzB21BH;AyBz1BD;;EAEI,mBAAA;EACA,YAAA;EACA,aAAA;EACA,0BAAA;EACA,WAAA;EACA,oBAAA;EACA,uBAAA;EACA,0BAAA;EACA,uDAAA;EAAA,+CAAA;CzB21BH;AyBz1BG;;EACI,aAAA;EACA,mBAAA;EACA,OAAA;EACA,QAAA;EACA,YAAA;EACA,aAAA;EACA,oBAAA;EACA,0BAAA;EACA,0EAAA;EAAA,kEAAA;EAAA,0DAAA;EAAA,iHAAA;CzB41BP;AyB11BG;;EACI,aAAA;EACA,mBAAA;EACA,OAAA;EACA,QAAA;EACA,YAAA;EACA,aAAA;EACA,oBAAA;EACA,0BAAA;EACA,yCAAA;EACA,+EAAA;EAAA,uEAAA;EAAA,+DAAA;EAAA,2HAAA;CzB61BP;AyB11BD;;EAEI,sBAAA;EACA,0BAAA;CzB41BH;AyB31BG;;EACI,4BAAA;UAAA,oBAAA;CzB81BP;AyB51BG;;EACI,oCAAA;UAAA,4BAAA;CzB+1BP;AyB11BD;EACI,mBAAA;EACA,cAAA;CzB41BH;AyB11BD;EACI,eAAA;CzB41BH;A0Bx5BD;EACI,qBAAA;EAAA,sBAAA;EAAA,cAAA;EACA,qBAAA;EACA,0BAAA;EAAA,4BAAA;UAAA,oBAAA;C1B05BH;A0Bx5BD;EACI,oBAAA;EAAA,gBAAA;UAAA,QAAA;C1B05BH;A0Bx5BD;EACI,eAAA;C1B05BH;A0Bv5BD;EACI,oBAAA;EACA,mBAAA;EACA,iBAAA;C1By5BH;A0Bv5BD;EACI,iBAAA;C1By5BH;A0Bv5BD;EACI,YAAA;EACA,kBAAA;EACA,mBAAA;EACA,YAAA;EACA,aAAA;EACA,oCAAA;EACA,uBAAA;C1By5BH;A0Bv5BD;EACI,mBAAA;C1By5BH;A0Bx5BG;EACI,aAAA;EACA,mBAAA;EACA,OAAA;EACA,SAAA;EACA,UAAA;EACA,QAAA;EACA,qCAAA;C1B05BP;A0Bn6BD;EAYQ,eAAA;C1B05BP;A0Bv5BD;EACI,cAAA;EACA,mBAAA;EACA,SAAA;EACA,UAAA;EACA,yCAAA;UAAA,iCAAA;EACA,eAAA;C1By5BH;A0B/5BD;EAQQ,sBAAA;C1B05BP;A0Bv5BD;EACI,YAAA;EACA,mBAAA;EACA,kBAAA;EACA,mBAAA;EACA,YAAA;EACA,aAAA;EACA,0BAAA;C1By5BH;A0Bx5BG;;EACI,aAAA;EACA,mBAAA;EACA,SAAA;EACA,UAAA;EACA,yCAAA;UAAA,iCAAA;EACA,0BAAA;C1B25BP;A0Bz5BG;EACI,WAAA;EACA,eAAA;C1B25BP;A0Bz5BG;EACI,cAAA;EACA,YAAA;C1B25BP;A0Bz5BG;EACI,sBAAA;C1B25BP;A0B15BO;;EACI,0BAAA;C1B65BX;A0Bz5BD;EACI,mBAAA;EACA,WAAA;EACA,OAAA;EACA,QAAA;EACA,YAAA;EACA,aAAA;EACA,WAAA;EzB/FA,8CAAA;CD2/BH;A2Bz/BD;EACI,kBAAA;EACA,mBAAA;C3B2/BH;A2Bz/BD;EACI,oBAAA;C3B2/BH;A2Bz/BD;EACI,oBAAA;EACA,gBAAA;C3B2/BH;A2Bz/BD;EACI,eAAA;C3B2/BH;A2Bz/BD;EACI,mBAAA;EACA,iBAAA;EACA,gBAAA;C3B2/BH;A2Bz/BD;EACI,gBAAA;EACA,eAAA;C3B2/BH;A2Bz/BD;EACI,oBAAA;C3B2/BH;A2Bz/BD;EACI,oBAAA;EACA,gBAAA;EACA,eAAA;C3B2/BH;A2B9/BD;EAIM,eAAA;C3B6/BL;A2B1/BD;EACI;IACI,gBAAA;IACA,QAAA;IACA,UAAA;IACA,YAAA;IACA,mBAAA;G3B4/BL;CACF;A4BriCD;EACI,mBAAA;EACA,gBAAA;C5BuiCH;A4BziCD;EAIQ,qBAAA;C5BwiCP;A4B5iCD;EAOQ,gBAAA;EACA,iBAAA;EACA,oBAAA;C5BwiCP;A4BjjCD;EAYQ,gBAAA;EACA,iBAAA;EACA,qBAAA;C5BwiCP;A4BtjCD;EAiBQ,iBAAA;EACA,gBAAA;EACA,qBAAA;C5BwiCP;A4B3jCD;EAsBQ,gBAAA;EACA,uBAAA;EACA,sBAAA;C5BwiCP;A4BhkCD;EA2BQ,iBAAA;C5BwiCP;A6BnkCD;EACI,qBAAA;EAAA,sBAAA;EAAA,cAAA;EACA,mBAAA;EACA,aAAA;EACA,UAAA;EACA,YAAA;EACA,0BAAA;C7BqkCH;A6BnkCG;EhBTA,aAAA;EACA,mBAAA;EACA,QAAA;EACA,OAAA;EACA,SAAA;EACA,YAAA;EACA,8BAAA;EACA,eAAA;EACA,8BAAA;UAAA,sBAAA;EACA,+BAAA;UAAA,uBAAA;Cb+kCH;A6B1kCD;EACI,eAAA;EACA,oBAAA;EAAA,gBAAA;UAAA,QAAA;EACA,iBAAA;EACA,aAAA;EACA,eAAA;EACA,mBAAA;E5BpBA,8CAAA;CDimCH;A6B1kCG;;;EAIQ,eAAA;C7B2kCX;A6BtkCD;EACI,sBAAA;EACA,YAAA;EACA,aAAA;C7BwkCH;A6BtkCG;;EAEI,gBAAA;EACA,eAAA;C7BwkCP;A6BhlCD;EAYQ,YAAA;EACA,aAAA;C7BukCP;A6BnkCD;EACI,mBAAA;EACA,eAAA;EACA,gBAAA;EACA,iBAAA;C7BqkCH;A8BznCD;EACI,qBAAA;EAAA,sBAAA;EAAA,cAAA;EACA,mBAAA;EACA,aAAA;EACA,OAAA;EACA,YAAA;EACA,0BAAA;C9B2nCH;A8BznCG;EjBIA,aAAA;EACA,mBAAA;EACA,QAAA;EACA,UAAA;EACA,SAAA;EACA,YAAA;EACA,iCAAA;EACA,eAAA;EACA,iCAAA;UAAA,yBAAA;EACA,+BAAA;UAAA,uBAAA;CbwnCH;A8BjoCG;EACI,kBAAA;EACA,kBAAA;C9BmoCP;A8B/nCD;EACI,mBAAA;EACA,eAAA;EACA,oBAAA;EAAA,gBAAA;UAAA,QAAA;EACA,gBAAA;EACA,mBAAA;EACA,gBAAA;E7BzBA,8CAAA;CD2pCH;A8B/nCG;EACI,0BAAA;C9BioCP;A8B9nCG;EACI,0BAAA;C9BgoCP;A8B7nCG;EjBGA,aAAA;EACA,mBAAA;EACA,SAAA;EACA,OAAA;EACA,WAAA;EACA,UAAA;EACA,gCAAA;EACA,eAAA;EACA,iCAAA;UAAA,yBAAA;EACA,+BAAA;UAAA,uBAAA;Cb6nCH;A8BpoCO;EACI,cAAA;C9BsoCX;A+B7qCD;EACI,mBAAA;EACA,aAAA;C/B+qCH;A+B5qCD;EACI,uBAAA;EACA,aAAA;EACA,qBAAA;EACA,eAAA;EACA,kCAAA;C/B8qCH;A+B5qCD;EACI,cAAA;C/B8qCH;AgC7rCD;EACI,qBAAA;EAAA,sBAAA;EAAA,cAAA;EACA,0BAAA;EAAA,4BAAA;UAAA,oBAAA;ChC+rCH;AgC5rCD;EACI,0BAAA;EACA,YAAA;EACA,oBAAA;EAAA,gBAAA;UAAA,QAAA;ChC8rCH;AgC3rCD;EACI,SAAA;EACA,aAAA;EACA,0BAAA;ChC6rCH;AgC1rCD;EACI,eAAA;EACA,kBAAA;EACA,aAAA;ChC4rCH;AiC/sCD;EACI,0BAAA;EACA,iBAAA;EAKA,mBAAA;EACA,iBAAA;CjC6sCH;AiCltCG;EACI,cAAA;CjCotCP;AiC/sCG;EpBXA,aAAA;EACA,mBAAA;EACA,QAAA;EACA,OAAA;EACA,SAAA;EACA,YAAA;EACA,8BAAA;EACA,eAAA;EACA,8BAAA;UAAA,sBAAA;EACA,+BAAA;UAAA,uBAAA;Cb6tCH;AiCxtCG;EpBDA,aAAA;EACA,mBAAA;EACA,QAAA;EACA,UAAA;EACA,SAAA;EACA,YAAA;EACA,iCAAA;EACA,eAAA;EACA,iCAAA;UAAA,yBAAA;EACA,+BAAA;UAAA,uBAAA;Cb4tCH;AiC/tCD;EACI,wBAAA;EACA,eAAA;EACA,gBAAA;EACA,mBAAA;CjCiuCH;AiChuCG;EpBXA,aAAA;EACA,mBAAA;EACA,QAAA;EACA,UAAA;EACA,SAAA;EACA,YAAA;EACA,iCAAA;EACA,eAAA;EACA,iCAAA;UAAA,yBAAA;EACA,+BAAA;UAAA,uBAAA;EoBII,WAAA;CjC2uCP;AkCpwCD;EACI,cAAA;EACA,mBAAA;ClCswCH;AkCrwCG;ErBJA,aAAA;EACA,mBAAA;EACA,QAAA;EACA,OAAA;EACA,SAAA;EACA,YAAA;EACA,8BAAA;EACA,eAAA;EACA,8BAAA;UAAA,sBAAA;EACA,+BAAA;UAAA,uBAAA;EqBHI,WAAA;ClCgxCP;AkC7wCO;EACI,cAAA;ClC+wCX;AkC3wCG;EACI,eAAA;EjCfJ,8CAAA;CD6xCH;AkC5wCO;EACI,0BAAA;ClC8wCX;AkC1wCD;EACI,iBAAA;EACA,gBAAA;EdxBA,YAAA;EACA,iBAAA;EACA,wBAAA;EACA,oBAAA;EACA,kBAAA;EcsBA,sBAAA;EACA,sBAAA;ClCgxCH;AkC9wCD;EACI,eAAA;EACA,gBAAA;EACA,iBAAA;EdxBA,iBAAA;EACA,wBAAA;EACA,qBAAA;EACA,6BAAA;EACA,sBAAA;CpByyCH;AkClxCD;EACI,iBAAA;EACA,oBAAA;EACA,gBAAA;EACA,eAAA;EACA,iBAAA;EACA,iBAAA;EACA,iBAAA;ClCoxCH;AkClxCD;EACI,YAAA;EACA,mBAAA;ClCoxCH;AkClxCD;EACI,kBAAA;EACA,+BAAA;ClCoxCH;AkClxCD;EAEQ,mBAAA;ClCmxCP;AkChxCD;EACI,qBAAA;EAAA,sBAAA;EAAA,cAAA;EACA,0BAAA;EAAA,4BAAA;UAAA,oBAAA;ClCkxCH;AkCpxCD;EAIQ,mBAAA;EACA,YAAA;EACA,aAAA;EACA,kBAAA;EACA,mBAAA;ClCmxCP;AkC3xCD;EAWQ,YAAA;EACA,iBAAA;EACA,oBAAA;ClCmxCP;AkChyCD;EAgBQ,oBAAA;EAAA,gBAAA;UAAA,QAAA;EACA,aAAA;ClCmxCP;AkChxCD;EACI,WAAA;ClCkxCH;AkCnxCD;EAGQ,cAAA;ClCmxCP;AkClxCO;EACI,cAAA;ClCoxCX;AmCr2CD;EACI,mBAAA;EACA,iBAAA;CnCu2CH;AmCr2CG;EtBLA,aAAA;EACA,mBAAA;EACA,QAAA;EACA,OAAA;EACA,SAAA;EACA,YAAA;EACA,8BAAA;EACA,eAAA;EACA,8BAAA;UAAA,sBAAA;EACA,+BAAA;UAAA,uBAAA;Cb62CH;AmC92CG;EtBkBA,aAAA;EACA,mBAAA;EACA,QAAA;EACA,OAAA;EACA,WAAA;EACA,UAAA;EACA,+BAAA;EACA,eAAA;EACA,8BAAA;UAAA,sBAAA;EACA,+BAAA;UAAA,uBAAA;Cb+1CH;AmCr3CD;EACI,mBAAA;EACA,YAAA;EACA,mBAAA;EACA,oBAAA;EACA,uBAAA;CnCu3CH;AmCr3CG;EtBmBA,aAAA;EACA,mBAAA;EACA,SAAA;EACA,OAAA;EACA,WAAA;EACA,UAAA;EACA,gCAAA;EACA,eAAA;EACA,iCAAA;UAAA,yBAAA;EACA,+BAAA;UAAA,uBAAA;Cbq2CH;AmC93CG;EtBVA,aAAA;EACA,mBAAA;EACA,QAAA;EACA,UAAA;EACA,SAAA;EACA,YAAA;EACA,iCAAA;EACA,eAAA;EACA,iCAAA;UAAA,yBAAA;EACA,+BAAA;UAAA,uBAAA;Cb24CH;AmCt4CG;EACI,0BAAA;CnCw4CP;AmCp4CD;EACI,YAAA;EACA,aAAA;EACA,eAAA;CnCs4CH;AmCz4CD;EAMQ,eAAA;EACA,YAAA;EACA,aAAA;CnCs4CP;AmCn4CG;EACI,gBAAA;CnCq4CP;AmCj4CD;EACI,eAAA;EACA,mBAAA;EACA,eAAA;EACA,gBAAA;EACA,oBAAA;EACA,wBAAA;EACA,iBAAA;CnCm4CH;AoCz7CD;EACI,eAAA;EACA,gBAAA;EACA,mBAAA;CpC27CH;AoC97CD;EAKQ,eAAA;CpC47CP;AoCz7CD;EACI,gBAAA;EACA,cAAA;EACA,QAAA;EACA,SAAA;CpC27CH;AoCz7CD;EACI,aAAA;CpC27CH;AoCz7CD;EACI,sBAAA;EACA,oBAAA;EACA,gBAAA;EACA,mBAAA;EACA,gBAAA;CpC27CH;AoC17CG;EvBEA,aAAA;EACA,mBAAA;EACA,QAAA;EACA,OAAA;EACA,WAAA;EACA,UAAA;EACA,+BAAA;EACA,eAAA;EACA,8BAAA;UAAA,sBAAA;EACA,+BAAA;UAAA,uBAAA;EuBTI,cAAA;EACA,WAAA;EACA,cAAA;CpCq8CP;AoCl8CO;EACI,cAAA;CpCo8CX;AoCh8CD;EACI,iBAAA;EACA,gBAAA;CpCk8CH;AqCv+CD;EACI,qBAAA;EAAA,sBAAA;EAAA,cAAA;CrCy+CH;AqCv+CD;EACI,oBAAA;EAAA,gBAAA;UAAA,QAAA;CrCy+CH;AsC7+CD;EACI,gBAAA;EACA,cAAA;EACA,WAAA;EACA,iBAAA;EACA,SAAA;EACA,UAAA;EACA,yCAAA;UAAA,iCAAA;EAEA,0BAAA;EACA,mBAAA;EACA,mBAAA;EACA,iBAAA;CtC8+CH;AsC5+CD;EACI,2BAAA;CtC8+CH;AsC5+CD;EACI,iBAAA;EACA,gBAAA;CtC8+CH;AsC5+CD;EACI,uBAAA;EACA,iBAAA;EACA,gBAAA;EACA,iBAAA;EACA,sBAAA;EACA,sBAAA;EACA,eAAA;CtC8+CH;AsC7+CG;EACI,0BAAA;EACA,eAAA;CtC++CP;AsC5+CD;EACI,mBAAA;EACA,kBAAA;EACA,gBAAA;EACA,qBAAA;EAAA,sBAAA;EAAA,cAAA;CtC8+CH;AsC7+CG;EzBxCA,aAAA;EACA,mBAAA;EACA,QAAA;EACA,OAAA;EACA,SAAA;EACA,YAAA;EACA,8BAAA;EACA,eAAA;EACA,8BAAA;UAAA,sBAAA;EACA,+BAAA;UAAA,uBAAA;CbwhDH;AsCp/CD;EACI,eAAA;EACA,oBAAA;EAAA,gBAAA;UAAA,QAAA;EACA,eAAA;EACA,sBAAA;ErCjDA,8CAAA;EqCuDA,mBAAA;CtCk/CH;AsCt/CG;EACI,0BAAA;CtCw/CP;AsCp/CG;EzB9BA,aAAA;EACA,mBAAA;EACA,QAAA;EACA,OAAA;EACA,WAAA;EACA,UAAA;EACA,+BAAA;EACA,eAAA;EACA,8BAAA;UAAA,sBAAA;EACA,+BAAA;UAAA,uBAAA;CbqhDH;AsC3/CO;EACI,cAAA;CtC6/CX;AsCz/CD;EACI,eAAA;CtC2/CH;AsCz/CD;EACI,eAAA;CtC2/CH;AsCx/CD;EAEQ,iBAAA;EACA,4CAAA;CtCy/CP;AsC5/CD;EAMQ,gBAAA;CtCy/CP;AsC//CD;EASQ,iBAAA;CtCy/CP;AsClgDD;EAYQ,eAAA;EACA,0BAAA;EACA,gBAAA;EACA,iBAAA;CtCy/CP;AsCx/CO;EACI,yBAAA;EACA,eAAA;CtC0/CX;AsC5gDD;EAsBQ,eAAA;EACA,kBAAA;EACA,kBAAA;EACA,gBAAA;EACA,uBAAA;CtCy/CP;AsCx/CO;EACI,cAAA;CtC0/CX;AsCthDD;EAgCQ,sBAAA;EACA,oBAAA;EACA,gBAAA;CtCy/CP;AsCx/CO;EACI,cAAA;CtC0/CX;AsCv/CO;EACI,sCAAA;CtCy/CX;AsCv/CO;EACI,sCAAA;CtCy/CX;AsCv/CO;EACI,qBAAA;CtCy/CX;AsCviDD;EAkDQ,eAAA;CtCw/CP;AsCp/CD;EACI;IACI,WAAA;GtCs/CL;CACF;AuCvnDD;EACI,gBAAA;EACA,cAAA;EACA,aAAA;EACA,kBAAA;EACA,WAAA;EACA,UAAA;EACA,oBAAA;EACA,kCAAA;EACA,mBAAA;EACA,mBAAA;EACA,eAAA;CvCynDH;AuCvnDD;EACI,iBAAA;EACA,eAAA;CvCynDH;AuCvnDK;EACI,eAAA;EACA,gBAAA;CvCynDT;AuCtnDG;EACE,iBAAA;EACA,YAAA;EACA,aAAA;EACA,yBAAA;CvCwnDL;AuCpnDD;EACI,iBAAA;CvCsnDH;AwCrpDD;EACI,gBAAA;EACA,cAAA;EACA,OAAA;EACA,SAAA;EACA,QAAA;EACA,UAAA;EACA,+BAAA;CxCupDH;AwCppDD;EACI,gBAAA;EACA,cAAA;EACA,OAAA;EACA,SAAA;EACA,QAAA;EACA,UAAA;CxCspDH;AyCrqDD;EACI,gBAAA;EACA,QAAA;EACA,UAAA;EACA,sCAAA;UAAA,8BAAA;EACA,oCAAA;UAAA,4BAAA;EACA,cAAA;EACA,YAAA;EACA,0BAAA;EAEA,0CAAA;EAAA,kCAAA;EAAA,0BAAA;EAAA,iDAAA;CzCsqDH;AyCpqDD;EACI,0BAAA;CzCsqDH;AyCpqDD;EACI,gBAAA;EACA,0BAAA;CzCsqDH;AyCpqDD;EACI,mBAAA;EACA,gBAAA;EACA,mBAAA;EACA,gBAAA;CzCsqDH;AyCrqDG;E5B1BA,aAAA;EACA,mBAAA;EACA,QAAA;EACA,OAAA;EACA,SAAA;EACA,YAAA;EACA,8BAAA;EACA,eAAA;EACA,8BAAA;UAAA,sBAAA;EACA,+BAAA;UAAA,uBAAA;CbksDH;AyC9qDG;EACI,0BAAA;CzCgrDP;AyC7qDO;EACI,cAAA;CzC+qDX;AyCxqDD;EAEQ,gBAAA;EACA,UAAA;EACA,SAAA;EACA,aAAA;EACA,yCAAA;UAAA,iCAAA;EAEA,aAAA;EACA,uBAAA;EACA,oCAAA;UAAA,4BAAA;EACA,wBAAA;EAEA,0CAAA;EAAA,kCAAA;EAAA,0BAAA;EAAA,iDAAA;CzCuqDP;AyCprDD;EAgBQ,cAAA;CzCuqDP;AyCvrDD;EAmBQ,mBAAA;EACA,4CAAA;CzCuqDP;AyC3rDD;EAuBQ,mBAAA;EACA,gBAAA;EACA,iBAAA;EACA,iBAAA;CzCuqDP;AyCtqDO;EACI,4BAAA;EACA,6BAAA;CzCwqDX;AyCtqDO;EACI,+BAAA;EACA,gCAAA;CzCwqDX;AyClqDD;EACI,mCAAA;UAAA,2BAAA;CzCoqDH;A0CpvDD;EACI,WAAA;EACA,mBAAA;EACA,mBAAA;EACA,gBAAA;EACA,mBAAA;C1CsvDH;A0CpvDD;EACI,sBAAA;EACA,uBAAA;C1CsvDH;A0CnvDD;EACI,8BAAA;EACA,kBAAA;C1CqvDH;A0CvvDD;EAIQ,mBAAA;EACA,YAAA;EACA,iBAAA;EACA,0BAAA;EACA,eAAA;C1CsvDP;A0CnvDD;EAEQ,iBAAA;C1CovDP;A0CnvDO;EACI,aAAA;EACA,WAAA;EACA,YAAA;EACA,mBAAA;EACA,0BAAA;EACA,sBAAA;EACA,mBAAA;EACA,kBAAA;EACA,aAAA;C1CqvDX;A2CxxDD;EACI,sBAAA;EACA,oBAAA;EACA,eAAA;EACA,oBAAA;EACA,0BAAA;EACA,eAAA;EACA,iBAAA;EACA,mBAAA;EACA,gBAAA;EACA,uBAAA;C3C0xDH;A2CxxDD;EACI,cAAA;EACA,aAAA;C3C0xDH;A4CzyDD;EACI,mBAAA;EACA,kBAAA;EACA,qBAAA;EAAA,sBAAA;EAAA,cAAA;EACA,uBAAA;EACA,0BAAA;C5C2yDH;A4C1yDG;E/BNA,aAAA;EACA,mBAAA;EACA,QAAA;EACA,OAAA;EACA,SAAA;EACA,YAAA;EACA,8BAAA;EACA,eAAA;EACA,8BAAA;UAAA,sBAAA;EACA,+BAAA;UAAA,uBAAA;CbmzDH;A4CnzDG;E/BIA,aAAA;EACA,mBAAA;EACA,QAAA;EACA,UAAA;EACA,SAAA;EACA,YAAA;EACA,iCAAA;EACA,eAAA;EACA,iCAAA;UAAA,yBAAA;EACA,+BAAA;UAAA,uBAAA;CbkzDH;A4C5zDG;EAEQ,eAAA;C5C6zDX;A4C/zDG;EAKQ,cAAA;C5C6zDX;A4CzzDD;EACI,mBAAA;EACA,oBAAA;EAAA,mBAAA;UAAA,WAAA;EACA,0BAAA;C5C2zDH;A4C1zDG;EACI,YAAA;EACA,mBAAA;EACA,QAAA;EACA,OAAA;EACA,YAAA;EACA,aAAA;EACA,8BAAA;UAAA,sBAAA;EACA,8BAAA;UAAA,sBAAA;EACA,oBAAA;EACA,0BAAA;EACA,uBAAA;EACA,oBAAA;C5C4zDP;A4CzzDD;EACI,mBAAA;EACA,mBAAA;EACA,oBAAA;EACA,aAAA;EACA,YAAA;EACA,uBAAA;EACA,WAAA;C5C2zDH;A4Cl0DD;EASQ,eAAA;EACA,YAAA;EACA,qBAAA;EACA,UAAA;EACA,gBAAA;EACA,0BAAA;EACA,wBAAA;EACA,wBAAA;C5C4zDP;A4C3zDO;EACI,cAAA;C5C6zDX;A4C/0DD;EAsBQ,mBAAA;EACA,WAAA;EACA,OAAA;EACA,kBAAA;C5C4zDP;A4Cr1DD;EA4BQ,mBAAA;EACA,OAAA;EACA,SAAA;EACA,gBAAA;EACA,kBAAA;C5C4zDP;A4CzzDD;EACI,mBAAA;EACA,SAAA;EACA,WAAA;EACA,YAAA;EACA,UAAA;EACA,WAAA;EACA,mBAAA;EACA,mBAAA;EACA,eAAA;EACA,oBAAA;C5C2zDH;A4Cr0DD;EAYQ,sBAAA;EACA,gBAAA;EACA,uBAAA;C5C4zDP;A4C10DD;EAiBQ,kBAAA;C5C4zDP;A4CzzDD;EACI,cAAA;EACA,kBAAA;EACA,kBAAA;EACA,eAAA;EACA,oBAAA;C5C2zDH;A4CzzDD;EACI,cAAA;C5C2zDH;A4CvzDD;;;;EAII,cAAA;C5CyzDH;A6Cv6DD;EACI,gBAAA;EACA,YAAA;EACA,QAAA;EACA,UAAA;EACA,cAAA;EACA,oCAAA;UAAA,4BAAA;EACA,sCAAA;UAAA,8BAAA;EAEA,0CAAA;EAAA,kCAAA;EAAA,0BAAA;EAAA,iDAAA;C7Cw6DH;A6Cr6DD;EACI,qBAAA;EAAA,sBAAA;EAAA,cAAA;EACA,mBAAA;EACA,0BAAA;EACA,mBAAA;EACA,mBAAA;C7Cu6DH;A6Ct6DG;EhCNA,aAAA;EACA,mBAAA;EACA,QAAA;EACA,UAAA;EACA,SAAA;EACA,YAAA;EACA,iCAAA;EACA,eAAA;EACA,iCAAA;UAAA,yBAAA;EACA,+BAAA;UAAA,uBAAA;Cb+6DH;A6C76DD;EACI,eAAA;EACA,oBAAA;EAAA,gBAAA;UAAA,QAAA;EACA,eAAA;C7C+6DH;A6C76DG;EACI,iBAAA;C7C+6DP;A6C76DG;EACI,kBAAA;C7C+6DP;A6C36DD;EACI,qBAAA;EAAA,sBAAA;EAAA,cAAA;EACA,mBAAA;EACA,uBAAA;EACA,cAAA;EACA,iBAAA;C7C66DH;A6C16DD;EACI,oBAAA;EAAA,gBAAA;UAAA,QAAA;EACA,mBAAA;EACA,aAAA;C7C46DH;A6Cx6DD;EACI,mBAAA;EACA,OAAA;EACA,QAAA;EACA,YAAA;EACA,aAAA;EACA,eAAA;EACA,WAAA;EACA,oLAAA;EAAA,qKAAA;EACA,iCAAA;EACA,4BAAA;EACA,6BAAA;EACA,iCAAA;UAAA,yBAAA;C7C06DH;A6Cv6DD;EACI,YAAA;EACA,aAAA;EACA,mBAAA;EACA,QAAA;EACA,WAAA;EACA,WAAA;C7Cy6DH;A6Cx6DG;EhC1EA,aAAA;EACA,mBAAA;EACA,QAAA;EACA,OAAA;EACA,SAAA;EACA,YAAA;EACA,8BAAA;EACA,eAAA;EACA,8BAAA;UAAA,sBAAA;EACA,+BAAA;UAAA,uBAAA;Cbq/DH;A6Cj7DG;EhChEA,aAAA;EACA,mBAAA;EACA,QAAA;EACA,UAAA;EACA,SAAA;EACA,YAAA;EACA,iCAAA;EACA,eAAA;EACA,iCAAA;UAAA,yBAAA;EACA,+BAAA;UAAA,uBAAA;Cbo/DH;A6Cx7DD;EACI,mBAAA;EACA,OAAA;EACA,QAAA;EACA,YAAA;C7C07DH;A6Cv7DD;EACI,mBAAA;EACA,mBAAA;EACA,YAAA;EACA,wBAAA;EACA,oBAAA;EACA,iBAAA;C7Cy7DH;A6Ct7DD;EACI,eAAA;C7Cw7DH;A8C1hED;EACI;IACI,2CAAA;YAAA,mCAAA;G9C4hEL;E8CzhEC;IACI,wCAAA;YAAA,gCAAA;G9C2hEL;CACF;A8CliED;EACI;IACI,2CAAA;YAAA,mCAAA;G9C4hEL;E8CzhEC;IACI,wCAAA;YAAA,gCAAA;G9C2hEL;CACF;A8CxhED;EACI,6CAAA;UAAA,qCAAA;C9C0hEH;A8CvhED;EACI;IACI,wCAAA;YAAA,gCAAA;G9CyhEL;E8CthEC;IACI,2CAAA;YAAA,mCAAA;G9CwhEL;CACF;A8C/hED;EACI;IACI,wCAAA;YAAA,gCAAA;G9CyhEL;E8CthEC;IACI,2CAAA;YAAA,mCAAA;G9CwhEL;CACF;A8CrhED;EACI,+CAAA;UAAA,uCAAA;C9CuhEH;A8CphED;EACI;IACI,WAAA;G9CshEL;E8CphEC;IACI,WAAA;G9CshEL;CACF;A8C5hED;EACI;IACI,WAAA;G9CshEL;E8CphEC;IACI,WAAA;G9CshEL;CACF;A8CnhED;EACI,4CAAA;UAAA,oCAAA;C9CqhEH;A8ClhED;EACI;IACI,WAAA;G9CohEL;E8ClhEC;IACI,WAAA;G9CohEL;CACF;A8C1hED;EACI;IACI,WAAA;G9CohEL;E8ClhEC;IACI,WAAA;G9CohEL;CACF;A8CjhED;EACI,6CAAA;UAAA,qCAAA;C9CmhEH;A+CtkED;EACI,eAAA;EACA,mBAAA;EACA,gBAAA;C/CwkEH;A+C3kED;EAMQ,eAAA;C/CwkEP;A+CrkED;EACI,eAAA;C/CukEH;A+CrkED;EACI,yBAAA;UAAA,iBAAA;EACA,WAAA;EACA,aAAA;EAEA,0BAAA;EACA,0BAAA;EACA,mBAAA;EACA,YAAA;EACA,aAAA;EACA,mBAAA;EAEA,kBAAA;EACA,SAAA;C/CqkEH;A+ClkEO;EACI,oBAAA;EACA,mBAAA;EACA,oBAAA;EACA,qBAAA;EACA,qBAAA;EACA,mBAAA;EACA,YAAA;EACA,sBAAA;EACA,uBAAA;EACA,yBAAA;EACA,iBAAA;EACA,eAAA;EACA,gBAAA;EAEA,mBAAA;EACA,SAAA;EACA,UAAA;EACA,qDAAA;UAAA,6CAAA;C/CmkEX;A+ChkEG;EACI,0BAAA;C/CkkEP;A+CjkEO;EACI,eAAA;C/CmkEX;AgDvnED;EACE,YAAA;EACA,aAAA;EACA,sBAAA;EACA,uBAAA;EACA,0DAAA;UAAA,kDAAA;EACA,k5DAAA;EACA,sBAAA;ChDynED;AgDxnEC;EACC,0rDAAA;ChD0nEF;AgDtnED;EACE;IACE,2CAAA;YAAA,mCAAA;GhDwnED;EgDrnED;IACE,6CAAA;YAAA,qCAAA;GhDunED;CACF;AgDpnED;EACE;IACE,2CAAA;YAAA,mCAAA;GhDsnED;EgDnnED;IACE,6CAAA;YAAA,qCAAA;GhDqnED;CACF;AiDnpED;EACI,mBAAA;EACA,0BAAA;UAAA,kBAAA;CjDqpEH;AiDlpED;EACI,mBAAA;EACA,YAAA;EACA,0BAAA;CjDopEH;AiDjpED;EACI,YAAA;EACA,0BAAA;EACA,SAAA;CjDmpEH;AiDhpED;EACI,mBAAA;EACA,QAAA;EACA,SAAA;EACA,YAAA;EACA,aAAA;EACA,mBAAA;EACA,kBAAA;EACA,mBAAA;EACA,0BAAA;EACA,uCAAA;CjDkpEH;AiD9oED;EACI,qBAAA;EAAA,sBAAA;EAAA,cAAA;EACA,0BAAA;EAAA,4BAAA;UAAA,oBAAA;CjDgpEH;AiDlpED;EAIQ,oBAAA;EAAA,gBAAA;UAAA,QAAA;CjDipEP;AiD9oED;EACI,kBAAA;EACA,gBAAA;EACA,eAAA;EACA,mBAAA;EACA,gBAAA;CjDgpEH","file":"style/weui.css","sourcesContent":["@import \"fn\";\n\nhtml {\n    -ms-text-size-adjust: 100%;\n    -webkit-text-size-adjust: 100%;\n}\n\nbody {\n    line-height: 1.6;\n    font-family: @weuiFontDefault;\n}\n\n* {\n    margin: 0;\n    padding: 0;\n}\n\na img {\n    border: 0;\n}\n\na {\n    text-decoration: none;\n    .setTapColor();\n}","html {\n  -ms-text-size-adjust: 100%;\n  -webkit-text-size-adjust: 100%;\n}\nbody {\n  line-height: 1.6;\n  font-family: -apple-system-font, \"Helvetica Neue\", sans-serif;\n}\n* {\n  margin: 0;\n  padding: 0;\n}\na img {\n  border: 0;\n}\na {\n  text-decoration: none;\n  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);\n}\n@font-face {\n  font-weight: normal;\n  font-style: normal;\n  font-family: \"weui\";\n  src: url('data:application/octet-stream;base64,AAEAAAALAIAAAwAwR1NVQrD+s+0AAAE4AAAAQk9TLzJAKEx+AAABfAAAAFZjbWFw65cFHQAAAhwAAAJQZ2x5ZvCRR/EAAASUAAAKtGhlYWQMPROtAAAA4AAAADZoaGVhCCwD+gAAALwAAAAkaG10eEJo//8AAAHUAAAASGxvY2EYqhW4AAAEbAAAACZtYXhwASEAVQAAARgAAAAgbmFtZeNcHtgAAA9IAAAB5nBvc3T6bLhLAAARMAAAAOYAAQAAA+gAAABaA+j/////A+kAAQAAAAAAAAAAAAAAAAAAABIAAQAAAAEAACbZbxtfDzz1AAsD6AAAAADUm2dvAAAAANSbZ2///wAAA+kD6gAAAAgAAgAAAAAAAAABAAAAEgBJAAUAAAAAAAIAAAAKAAoAAAD/AAAAAAAAAAEAAAAKAB4ALAABREZMVAAIAAQAAAAAAAAAAQAAAAFsaWdhAAgAAAABAAAAAQAEAAQAAAABAAgAAQAGAAAAAQAAAAAAAQOwAZAABQAIAnoCvAAAAIwCegK8AAAB4AAxAQIAAAIABQMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUGZFZABA6gHqEQPoAAAAWgPqAAAAAAABAAAAAAAAAAAAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+j//wPoAAAD6AAAAAAABQAAAAMAAAAsAAAABAAAAXQAAQAAAAAAbgADAAEAAAAsAAMACgAAAXQABABCAAAABAAEAAEAAOoR//8AAOoB//8AAAABAAQAAAABAAIAAwAEAAUABgAHAAgACQAKAAsADAANAA4ADwAQABEAAAEGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAANwAAAAAAAAAEQAA6gEAAOoBAAAAAQAA6gIAAOoCAAAAAgAA6gMAAOoDAAAAAwAA6gQAAOoEAAAABAAA6gUAAOoFAAAABQAA6gYAAOoGAAAABgAA6gcAAOoHAAAABwAA6ggAAOoIAAAACAAA6gkAAOoJAAAACQAA6goAAOoKAAAACgAA6gsAAOoLAAAACwAA6gwAAOoMAAAADAAA6g0AAOoNAAAADQAA6g4AAOoOAAAADgAA6g8AAOoPAAAADwAA6hAAAOoQAAAAEAAA6hEAAOoRAAAAEQAAAAAARgCMANIBJAF4AcQCMgJgAqgC/ANIA6YD/gROBKAE9AVaAAAAAgAAAAADrwOtABQAKQAAASIHBgcGFBcWFxYyNzY3NjQnJicmAyInJicmNDc2NzYyFxYXFhQHBgcGAfV4Z2Q7PDw7ZGfwZmQ7PDw7ZGZ4bl5bNjc3Nlte215bNjc3NlteA608O2Rn8GdjOzw8O2Nn8GdkOzz8rzc1W17bXlw1Nzc1XF7bXls1NwAAAAACAAAAAAOzA7MAFwAtAAABIgcGBwYVFBcWFxYzMjc2NzY1NCcmJyYTBwYiLwEmNjsBETQ2OwEyFhURMzIWAe52Z2Q7PT07ZGd2fGpmOz4+O2ZpIXYOKA52Dg0XXQsHJgcLXRcNA7M+O2ZqfHZnZDs9PTtkZ3Z9aWY7Pv3wmhISmhIaARcICwsI/ukaAAMAAAAAA+UD5QAXACMALAAAASIHBgcGFRQXFhcWMzI3Njc2NTQnJicmAxQrASI1AzQ7ATIHJyImNDYyFhQGAe6Ecm9BRERBb3KEiXZxQkREQnF1aQIxAwgCQgMBIxIZGSQZGQPkREJxdomEcm9BRERBb3KEinVxQkT9HQICAWICAjEZIxkZIxkAAAAAAgAAAAADsQPkABkALgAAAQYHBgc2BREUFxYXFhc2NzY3NjURJBcmJyYTAQYvASY/ATYyHwEWNjclNjIfARYB9VVVQk+v/tFHPmxebGxdbT1I/tGvT0JVo/7VBASKAwMSAQUBcQEFAgESAgUBEQQD4xMYEhk3YP6sjnVlSD8cHD9IZXWOAVRgNxkSGP62/tkDA48EBBkCAVYCAQHlAQIQBAAAAAADAAAAAAOxA+QAGwAqADMAAAEGBwYHBgcGNxEUFxYXFhc2NzY3NjURJBcmJyYHMzIWFQMUBisBIicDNDYTIiY0NjIWFAYB9UFBODssO38gRz5sXmxsXW09SP7YqFBBVW80BAYMAwImBQELBh4PFhYeFRUD5A8SDhIOEikK/q2PdWRJPh0dPklkdY8BU141GRIY/AYE/sYCAwUBOgQG/kAVHxUVHxUAAAACAAAAAAPkA+QAFwAtAAABIgcGBwYVFBcWFxYzMjc2NzY1NCcmJyYTAQYiLwEmPwE2Mh8BFjI3ATYyHwEWAe6Ecm9BQ0NCbnODiXVxQkREQnF1kf6gAQUBowMDFgEFAYUCBQEBQwIFARUEA+NEQnF1iYNzbkJDQ0FvcoSJdXFCRP6j/qUBAagEBR4CAWYBAQENAgIVBAAAAAQAAAAAA68DrQAUACkAPwBDAAABIgcGBwYUFxYXFjI3Njc2NCcmJyYDIicmJyY0NzY3NjIXFhcWFAcGBwYTBQ4BLwEmBg8BBhYfARYyNwE+ASYiFzAfAQH1eGdkOzw8O2Rn8GZkOzw8O2RmeG5eWzY3NzZbXtteWzY3NzZbXmn+9gYSBmAGDwUDBQEGfQUQBgElBQELEBUBAQOtPDtkZ/BnYzs8PDtjZ/BnZDs8/K83NVte215cNTc3NVxe215bNTcCJt0FAQVJBQIGBAcRBoAGBQEhBQ8LBAEBAAABAAAAAAO7AzoAFwAAEy4BPwE+AR8BFjY3ATYWFycWFAcBBiInPQoGBwUHGgzLDCELAh0LHwsNCgr9uQoeCgGzCyEOCw0HCZMJAQoBvgkCCg0LHQv9sQsKAAAAAAIAAAAAA+UD5gAXACwAAAEiBwYHBhUUFxYXFjMyNzY3NjU0JyYnJhMHBi8BJicmNRM0NjsBMhYVExceAQHvhHJvQUNDQm5zg4l1cUJEREJxdVcQAwT6AwIEEAMCKwIDDsUCAQPlREJxdYmDc25CQ0NBb3KEiXVxQkT9VhwEAncCAgMGAXoCAwMC/q2FAgQAAAQAAAAAA68DrQADABgALQAzAAABMB8BAyIHBgcGFBcWFxYyNzY3NjQnJicmAyInJicmNDc2NzYyFxYXFhQHBgcGAyMVMzUjAuUBAfJ4Z2Q7PDw7ZGfwZmQ7PDw7ZGZ4bl5bNjc3Nlte215bNjc3NltemyT92QKDAQEBLDw7ZGfwZ2M7PDw7Y2fwZ2Q7PPyvNzVbXtteXDU3NzVcXtteWzU3AjH9JAAAAAMAAAAAA+QD5AAXACcAMAAAASIHBgcGFRQXFhcWMzI3Njc2NTQnJicmAzMyFhUDFAYrASImNQM0NhMiJjQ2MhYUBgHuhHJvQUNDQm5zg4l1cUJEREJxdZ42BAYMAwInAwMMBh8PFhYeFhYD40RCcXWJg3NuQkNDQW9yhIl1cUJE/vYGBf7AAgMDAgFABQb+NhYfFhYfFgAABAAAAAADwAPAAAgAEgAoAD0AAAEyNjQmIgYUFhcjFTMRIxUzNSMDIgcGBwYVFBYXFjMyNzY3NjU0Jy4BAyInJicmNDc2NzYyFxYXFhQHBgcGAfQYISEwISFRjzk5yTorhG5rPT99am+DdmhlPD4+PMyFbV5bNTc3NVte2l5bNTc3NVteAqAiLyIiLyI5Hf7EHBwCsT89a26Ed8w8Pj48ZWh2g29qffyjNzVbXtpeWzU3NzVbXtpeWzU3AAADAAAAAAOoA6gACwAgADUAAAEHJwcXBxc3FzcnNwMiBwYHBhQXFhcWMjc2NzY0JyYnJgMiJyYnJjQ3Njc2MhcWFxYUBwYHBgKOmpocmpocmpocmpq2dmZiOjs7OmJm7GZiOjs7OmJmdmtdWTQ2NjRZXdZdWTQ2NjRZXQKqmpocmpocmpocmpoBGTs6YmbsZmI6Ozs6YmbsZmI6O/zCNjRZXdZdWTQ2NjRZXdZdWTQ2AAMAAAAAA+kD6gAaAC8AMAAAAQYHBiMiJyYnJjQ3Njc2MhcWFxYVFAcGBwEHATI3Njc2NCcmJyYiBwYHBhQXFhcWMwKONUBCR21dWjU3NzVaXdpdWzU2GBcrASM5/eBXS0grKysrSEuuSkkqLCwqSUpXASMrFxg2NVtd2l1aNTc3NVpdbUdCQDX+3jkBGSsrSEuuSkkqLCwqSUquS0grKwAC//8AAAPoA+gAFAAwAAABIgcGBwYQFxYXFiA3Njc2ECcmJyYTFg4BIi8BBwYuATQ/AScmPgEWHwE3Nh4BBg8BAfSIdHFDRERDcXQBEHRxQ0REQ3F0SQoBFBsKoqgKGxMKqKIKARQbCqKoChsUAQqoA+hEQ3F0/vB0cUNERENxdAEQdHFDRP1jChsTCqiiCgEUGwqiqAobFAEKqKIKARQbCqIAAAIAAAAAA+QD5AAXADQAAAEiBwYHBhUUFxYXFjMyNzY3NjU0JyYnJhMUBiMFFxYUDwEGLwEuAT8BNh8BFhQPAQUyFh0BAe6Ecm9BQ0NCbnODiXVxQkREQnF1fwQC/pGDAQEVAwTsAgEC7AQEFAIBhAFwAgMD40RCcXWJg3NuQkNDQW9yhIl1cUJE/fYCAwuVAgQCFAQE0AIFAtEEBBQCBQGVCwMDJwAAAAUAAAAAA9QD0wAjACcANwBHAEgAAAERFAYjISImNREjIiY9ATQ2MyE1NDYzITIWHQEhMhYdARQGIyERIREHIgYVERQWOwEyNjURNCYjISIGFREUFjsBMjY1ETQmKwEDeyYb/XYbJkMJDQ0JAQYZEgEvExkBBgkNDQn9CQJc0QkNDQktCQ0NCf7sCQ0NCS0JDQ0JLQMi/TQbJiYbAswMCiwJDS4SGRkSLg0JLAoM/UwCtGsNCf5NCQ0NCQGzCQ0NCf5NCQ0NCQGzCQ0AAAAAEADGAAEAAAAAAAEABAAAAAEAAAAAAAIABwAEAAEAAAAAAAMABAALAAEAAAAAAAQABAAPAAEAAAAAAAUACwATAAEAAAAAAAYABAAeAAEAAAAAAAoAKwAiAAEAAAAAAAsAEwBNAAMAAQQJAAEACABgAAMAAQQJAAIADgBoAAMAAQQJAAMACAB2AAMAAQQJAAQACAB+AAMAAQQJAAUAFgCGAAMAAQQJAAYACACcAAMAAQQJAAoAVgCkAAMAAQQJAAsAJgD6d2V1aVJlZ3VsYXJ3ZXVpd2V1aVZlcnNpb24gMS4wd2V1aUdlbmVyYXRlZCBieSBzdmcydHRmIGZyb20gRm9udGVsbG8gcHJvamVjdC5odHRwOi8vZm9udGVsbG8uY29tAHcAZQB1AGkAUgBlAGcAdQBsAGEAcgB3AGUAdQBpAHcAZQB1AGkAVgBlAHIAcwBpAG8AbgAgADEALgAwAHcAZQB1AGkARwBlAG4AZQByAGEAdABlAGQAIABiAHkAIABzAHYAZwAyAHQAdABmACAAZgByAG8AbQAgAEYAbwBuAHQAZQBsAGwAbwAgAHAAcgBvAGoAZQBjAHQALgBoAHQAdABwADoALwAvAGYAbwBuAHQAZQBsAGwAbwAuAGMAbwBtAAAAAgAAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASAQIBAwEEAQUBBgEHAQgBCQEKAQsBDAENAQ4BDwEQAREBEgETAAZjaXJjbGUIZG93bmxvYWQEaW5mbwxzYWZlX3N1Y2Nlc3MJc2FmZV93YXJuB3N1Y2Nlc3MOc3VjY2Vzcy1jaXJjbGURc3VjY2Vzcy1uby1jaXJjbGUHd2FpdGluZw53YWl0aW5nLWNpcmNsZQR3YXJuC2luZm8tY2lyY2xlBmNhbmNlbAZzZWFyY2gFY2xlYXIEYmFjawZkZWxldGUAAAAA') format('truetype');\n}\n[class^=\"weui-icon-\"],\n[class*=\" weui-icon-\"] {\n  display: inline-block;\n  vertical-align: middle;\n  font: normal normal normal 14px/1 \"weui\";\n  font-size: inherit;\n  text-rendering: auto;\n  -webkit-font-smoothing: antialiased;\n}\n[class^=\"weui-icon-\"]:before,\n[class*=\" weui-icon-\"]:before {\n  display: inline-block;\n  margin-left: .2em;\n  margin-right: .2em;\n}\n.weui-icon-circle:before {\n  content: \"\\EA01\";\n}\n/* '' */\n.weui-icon-download:before {\n  content: \"\\EA02\";\n}\n/* '' */\n.weui-icon-info:before {\n  content: \"\\EA03\";\n}\n/* '' */\n.weui-icon-safe-success:before {\n  content: \"\\EA04\";\n}\n/* '' */\n.weui-icon-safe-warn:before {\n  content: \"\\EA05\";\n}\n/* '' */\n.weui-icon-success:before {\n  content: \"\\EA06\";\n}\n/* '' */\n.weui-icon-success-circle:before {\n  content: \"\\EA07\";\n}\n/* '' */\n.weui-icon-success-no-circle:before {\n  content: \"\\EA08\";\n}\n/* '' */\n.weui-icon-waiting:before {\n  content: \"\\EA09\";\n}\n/* '' */\n.weui-icon-waiting-circle:before {\n  content: \"\\EA0A\";\n}\n/* '' */\n.weui-icon-warn:before {\n  content: \"\\EA0B\";\n}\n/* '' */\n.weui-icon-info-circle:before {\n  content: \"\\EA0C\";\n}\n/* '' */\n.weui-icon-cancel:before {\n  content: \"\\EA0D\";\n}\n/* '' */\n.weui-icon-search:before {\n  content: \"\\EA0E\";\n}\n/* '' */\n.weui-icon-clear:before {\n  content: \"\\EA0F\";\n}\n/* '' */\n.weui-icon-back:before {\n  content: \"\\EA10\";\n}\n/* '' */\n.weui-icon-delete:before {\n  content: \"\\EA11\";\n}\n/* '' */\n[class^=\"weui-icon_\"]:before,\n[class*=\" weui-icon_\"]:before {\n  margin: 0;\n}\n.weui-icon-success {\n  font-size: 23px;\n  color: #09BB07;\n}\n.weui-icon-waiting {\n  font-size: 23px;\n  color: #10AEFF;\n}\n.weui-icon-warn {\n  font-size: 23px;\n  color: #F43530;\n}\n.weui-icon-info {\n  font-size: 23px;\n  color: #10AEFF;\n}\n.weui-icon-success-circle {\n  font-size: 23px;\n  color: #09BB07;\n}\n.weui-icon-success-no-circle {\n  font-size: 23px;\n  color: #09BB07;\n}\n.weui-icon-waiting-circle {\n  font-size: 23px;\n  color: #10AEFF;\n}\n.weui-icon-circle {\n  font-size: 23px;\n  color: #C9C9C9;\n}\n.weui-icon-download {\n  font-size: 23px;\n  color: #09BB07;\n}\n.weui-icon-info-circle {\n  font-size: 23px;\n  color: #09BB07;\n}\n.weui-icon-safe-success {\n  color: #09BB07;\n}\n.weui-icon-safe-warn {\n  color: #FFBE00;\n}\n.weui-icon-cancel {\n  color: #F43530;\n  font-size: 22px;\n}\n.weui-icon-search {\n  color: #B2B2B2;\n  font-size: 14px;\n}\n.weui-icon-clear {\n  color: #B2B2B2;\n  font-size: 14px;\n}\n.weui-icon-delete.weui-icon_gallery-delete {\n  color: #FFFFFF;\n  font-size: 22px;\n}\n.weui-icon_msg {\n  font-size: 93px;\n}\n.weui-icon_msg.weui-icon-warn {\n  color: #F76260;\n}\n.weui-icon_msg-primary {\n  font-size: 93px;\n}\n.weui-icon_msg-primary.weui-icon-warn {\n  color: #FFBE00;\n}\n.weui-btn {\n  position: relative;\n  display: block;\n  margin-left: auto;\n  margin-right: auto;\n  padding-left: 14px;\n  padding-right: 14px;\n  box-sizing: border-box;\n  font-size: 18px;\n  text-align: center;\n  text-decoration: none;\n  color: #FFFFFF;\n  line-height: 2.55555556;\n  border-radius: 5px;\n  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);\n  overflow: hidden;\n}\n.weui-btn:after {\n  content: \" \";\n  width: 200%;\n  height: 200%;\n  position: absolute;\n  top: 0;\n  left: 0;\n  border: 1px solid rgba(0, 0, 0, 0.2);\n  transform: scale(0.5);\n  transform-origin: 0 0;\n  box-sizing: border-box;\n  border-radius: 10px;\n}\n.weui-btn_inline {\n  display: inline-block;\n}\n.weui-btn_default {\n  color: #000000;\n  background-color: #F8F8F8;\n}\n.weui-btn_default:not(.weui-btn_disabled):visited {\n  color: #000000;\n}\n.weui-btn_default:not(.weui-btn_disabled):active {\n  color: rgba(0, 0, 0, 0.6);\n  background-color: #DEDEDE;\n}\n.weui-btn_primary {\n  background-color: #1AAD19;\n}\n.weui-btn_primary:not(.weui-btn_disabled):visited {\n  color: #FFFFFF;\n}\n.weui-btn_primary:not(.weui-btn_disabled):active {\n  color: rgba(255, 255, 255, 0.6);\n  background-color: #179B16;\n}\n.weui-btn_warn {\n  background-color: #E64340;\n}\n.weui-btn_warn:not(.weui-btn_disabled):visited {\n  color: #FFFFFF;\n}\n.weui-btn_warn:not(.weui-btn_disabled):active {\n  color: rgba(255, 255, 255, 0.6);\n  background-color: #CE3C39;\n}\n.weui-btn_disabled {\n  color: rgba(255, 255, 255, 0.6);\n}\n.weui-btn_disabled.weui-btn_default {\n  color: rgba(0, 0, 0, 0.3);\n  background-color: #F7F7F7;\n}\n.weui-btn_disabled.weui-btn_primary {\n  background-color: #9ED99D;\n}\n.weui-btn_disabled.weui-btn_warn {\n  background-color: #EC8B89;\n}\n.weui-btn_loading .weui-loading {\n  margin: -0.2em 0.34em 0 0;\n}\n.weui-btn_loading.weui-btn_primary,\n.weui-btn_loading.weui-btn_warn {\n  color: rgba(255, 255, 255, 0.6);\n}\n.weui-btn_loading.weui-btn_primary .weui-loading,\n.weui-btn_loading.weui-btn_warn .weui-loading {\n  background-image: url(\"data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='120' height='120' viewBox='0 0 100 100'%3E%3Cpath fill='none' d='M0 0h100v100H0z'/%3E%3Crect xmlns='http://www.w3.org/2000/svg' width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.56)' rx='5' ry='5' transform='translate(0 -30)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.5)' rx='5' ry='5' transform='rotate(30 105.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.43)' rx='5' ry='5' transform='rotate(60 75.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.38)' rx='5' ry='5' transform='rotate(90 65 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.32)' rx='5' ry='5' transform='rotate(120 58.66 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.28)' rx='5' ry='5' transform='rotate(150 54.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.25)' rx='5' ry='5' transform='rotate(180 50 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.2)' rx='5' ry='5' transform='rotate(-150 45.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.17)' rx='5' ry='5' transform='rotate(-120 41.34 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.14)' rx='5' ry='5' transform='rotate(-90 35 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.1)' rx='5' ry='5' transform='rotate(-60 24.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.03)' rx='5' ry='5' transform='rotate(-30 -5.98 65)'/%3E%3C/svg%3E\");\n}\n.weui-btn_loading.weui-btn_primary {\n  background-color: #179B16;\n}\n.weui-btn_loading.weui-btn_warn {\n  background-color: #CE3C39;\n}\n.weui-btn_plain-primary {\n  color: #1aad19;\n  border: 1px solid #1aad19;\n}\n.weui-btn_plain-primary:not(.weui-btn_plain-disabled):active {\n  color: rgba(26, 173, 25, 0.6);\n  border-color: rgba(26, 173, 25, 0.6);\n}\n.weui-btn_plain-primary:after {\n  border-width: 0;\n}\n.weui-btn_plain-default {\n  color: #353535;\n  border: 1px solid #353535;\n}\n.weui-btn_plain-default:not(.weui-btn_plain-disabled):active {\n  color: rgba(53, 53, 53, 0.6);\n  border-color: rgba(53, 53, 53, 0.6);\n}\n.weui-btn_plain-default:after {\n  border-width: 0;\n}\n.weui-btn_plain-disabled {\n  color: rgba(0, 0, 0, 0.2);\n  border-color: rgba(0, 0, 0, 0.2);\n}\nbutton.weui-btn,\ninput.weui-btn {\n  width: 100%;\n  border-width: 0;\n  outline: 0;\n  -webkit-appearance: none;\n}\nbutton.weui-btn:focus,\ninput.weui-btn:focus {\n  outline: 0;\n}\nbutton.weui-btn_inline,\ninput.weui-btn_inline,\nbutton.weui-btn_mini,\ninput.weui-btn_mini {\n  width: auto;\n}\nbutton.weui-btn_plain-primary,\ninput.weui-btn_plain-primary,\nbutton.weui-btn_plain-default,\ninput.weui-btn_plain-default {\n  border-width: 1px;\n  background-color: transparent;\n}\n.weui-btn_mini {\n  display: inline-block;\n  padding: 0 1.32em;\n  line-height: 2.3;\n  font-size: 13px;\n}\n/*gap between btn*/\n.weui-btn + .weui-btn {\n  margin-top: 15px;\n}\n.weui-btn.weui-btn_inline + .weui-btn.weui-btn_inline {\n  margin-top: auto;\n  margin-left: 15px;\n}\n.weui-btn-area {\n  margin: 1.17647059em 15px 0.3em;\n}\n.weui-btn-area_inline {\n  display: flex;\n}\n.weui-btn-area_inline .weui-btn {\n  margin-top: auto;\n  margin-right: 15px;\n  width: 100%;\n  flex: 1;\n}\n.weui-btn-area_inline .weui-btn:last-child {\n  margin-right: 0;\n}\n.weui-cells {\n  margin-top: 1.17647059em;\n  background-color: #FFFFFF;\n  line-height: 1.41176471;\n  font-size: 17px;\n  overflow: hidden;\n  position: relative;\n}\n.weui-cells:before {\n  content: \" \";\n  position: absolute;\n  left: 0;\n  top: 0;\n  right: 0;\n  height: 1px;\n  border-top: 1px solid #D9D9D9;\n  color: #D9D9D9;\n  transform-origin: 0 0;\n  transform: scaleY(0.5);\n}\n.weui-cells:after {\n  content: \" \";\n  position: absolute;\n  left: 0;\n  bottom: 0;\n  right: 0;\n  height: 1px;\n  border-bottom: 1px solid #D9D9D9;\n  color: #D9D9D9;\n  transform-origin: 0 100%;\n  transform: scaleY(0.5);\n}\n.weui-cells__title {\n  margin-top: .77em;\n  margin-bottom: .3em;\n  padding-left: 15px;\n  padding-right: 15px;\n  color: #999999;\n  font-size: 14px;\n}\n.weui-cells__title + .weui-cells {\n  margin-top: 0;\n}\n.weui-cells__tips {\n  margin-top: .3em;\n  color: #999999;\n  padding-left: 15px;\n  padding-right: 15px;\n  font-size: 14px;\n}\n.weui-cell {\n  padding: 10px 15px;\n  position: relative;\n  display: flex;\n  align-items: center;\n}\n.weui-cell:before {\n  content: \" \";\n  position: absolute;\n  left: 0;\n  top: 0;\n  right: 0;\n  height: 1px;\n  border-top: 1px solid #D9D9D9;\n  color: #D9D9D9;\n  transform-origin: 0 0;\n  transform: scaleY(0.5);\n  left: 15px;\n}\n.weui-cell:first-child:before {\n  display: none;\n}\n.weui-cell_primary {\n  align-items: flex-start;\n}\n.weui-cell__bd {\n  flex: 1;\n}\n.weui-cell__ft {\n  text-align: right;\n  color: #999999;\n}\n.weui-cell_access {\n  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);\n  color: inherit;\n}\n.weui-cell_access:active {\n  background-color: #ECECEC;\n}\n.weui-cell_access .weui-cell__ft {\n  padding-right: 13px;\n  position: relative;\n}\n.weui-cell_access .weui-cell__ft:after {\n  content: \" \";\n  display: inline-block;\n  height: 6px;\n  width: 6px;\n  border-width: 2px 2px 0 0;\n  border-color: #C8C8CD;\n  border-style: solid;\n  transform: matrix(0.71, 0.71, -0.71, 0.71, 0, 0);\n  position: relative;\n  top: -2px;\n  position: absolute;\n  top: 50%;\n  margin-top: -4px;\n  right: 2px;\n}\n.weui-cell_link {\n  color: #586C94;\n  font-size: 14px;\n}\n.weui-cell_link:first-child:before {\n  display: block;\n}\n.weui-check__label {\n  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);\n}\n.weui-check__label:active {\n  background-color: #ECECEC;\n}\n.weui-check {\n  position: absolute;\n  left: -9999em;\n}\n.weui-cells_radio .weui-cell__ft {\n  padding-left: 0.35em;\n}\n.weui-cells_radio .weui-check:checked + .weui-icon-checked:before {\n  display: block;\n  content: '\\EA08';\n  color: #09BB07;\n  font-size: 16px;\n}\n.weui-cells_checkbox .weui-cell__hd {\n  padding-right: 0.35em;\n}\n.weui-cells_checkbox .weui-icon-checked:before {\n  content: '\\EA01';\n  color: #C9C9C9;\n  font-size: 23px;\n  display: block;\n}\n.weui-cells_checkbox .weui-check:checked + .weui-icon-checked:before {\n  content: '\\EA06';\n  color: #09BB07;\n}\n.weui-label {\n  display: block;\n  width: 105px;\n  word-wrap: break-word;\n  word-break: break-all;\n}\n.weui-input {\n  width: 100%;\n  border: 0;\n  outline: 0;\n  -webkit-appearance: none;\n  background-color: transparent;\n  font-size: inherit;\n  color: inherit;\n  height: 1.41176471em;\n  line-height: 1.41176471;\n}\n.weui-input::-webkit-outer-spin-button,\n.weui-input::-webkit-inner-spin-button {\n  -webkit-appearance: none;\n  margin: 0;\n}\n.weui-textarea {\n  display: block;\n  border: 0;\n  resize: none;\n  width: 100%;\n  color: inherit;\n  font-size: 1em;\n  line-height: inherit;\n  outline: 0;\n}\n.weui-textarea-counter {\n  color: #B2B2B2;\n  text-align: right;\n}\n.weui-cell_warn .weui-textarea-counter {\n  color: #E64340;\n}\n.weui-toptips {\n  display: none;\n  position: fixed;\n  transform: translateZ(0);\n  top: 0;\n  left: 0;\n  right: 0;\n  padding: 5px;\n  font-size: 14px;\n  text-align: center;\n  color: #FFF;\n  z-index: 5000;\n  word-wrap: break-word;\n  word-break: break-all;\n}\n.weui-toptips_warn {\n  background-color: #E64340;\n}\n.weui-cells_form .weui-cell__ft {\n  font-size: 0;\n}\n.weui-cells_form .weui-icon-warn {\n  display: none;\n}\n.weui-cells_form input,\n.weui-cells_form textarea,\n.weui-cells_form label[for] {\n  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);\n}\n.weui-cell_warn {\n  color: #E64340;\n}\n.weui-cell_warn .weui-icon-warn {\n  display: inline-block;\n}\n.weui-form-preview {\n  position: relative;\n  background-color: #FFFFFF;\n}\n.weui-form-preview:before {\n  content: \" \";\n  position: absolute;\n  left: 0;\n  top: 0;\n  right: 0;\n  height: 1px;\n  border-top: 1px solid #D9D9D9;\n  color: #D9D9D9;\n  transform-origin: 0 0;\n  transform: scaleY(0.5);\n}\n.weui-form-preview:after {\n  content: \" \";\n  position: absolute;\n  left: 0;\n  bottom: 0;\n  right: 0;\n  height: 1px;\n  border-bottom: 1px solid #D9D9D9;\n  color: #D9D9D9;\n  transform-origin: 0 100%;\n  transform: scaleY(0.5);\n}\n.weui-form-preview__hd {\n  position: relative;\n  padding: 10px 15px;\n  text-align: right;\n  line-height: 2.5em;\n}\n.weui-form-preview__hd:after {\n  content: \" \";\n  position: absolute;\n  left: 0;\n  bottom: 0;\n  right: 0;\n  height: 1px;\n  border-bottom: 1px solid #D9D9D9;\n  color: #D9D9D9;\n  transform-origin: 0 100%;\n  transform: scaleY(0.5);\n  left: 15px;\n}\n.weui-form-preview__hd .weui-form-preview__value {\n  font-style: normal;\n  font-size: 1.6em;\n}\n.weui-form-preview__bd {\n  padding: 10px 15px;\n  font-size: .9em;\n  text-align: right;\n  color: #999999;\n  line-height: 2;\n}\n.weui-form-preview__ft {\n  position: relative;\n  line-height: 50px;\n  display: flex;\n}\n.weui-form-preview__ft:after {\n  content: \" \";\n  position: absolute;\n  left: 0;\n  top: 0;\n  right: 0;\n  height: 1px;\n  border-top: 1px solid #D5D5D6;\n  color: #D5D5D6;\n  transform-origin: 0 0;\n  transform: scaleY(0.5);\n}\n.weui-form-preview__item {\n  overflow: hidden;\n}\n.weui-form-preview__label {\n  float: left;\n  margin-right: 1em;\n  min-width: 4em;\n  color: #999999;\n  text-align: justify;\n  text-align-last: justify;\n}\n.weui-form-preview__value {\n  display: block;\n  overflow: hidden;\n  word-break: normal;\n  word-wrap: break-word;\n}\n.weui-form-preview__btn {\n  position: relative;\n  display: block;\n  flex: 1;\n  color: #3CC51F;\n  text-align: center;\n  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);\n}\nbutton.weui-form-preview__btn {\n  background-color: transparent;\n  border: 0;\n  outline: 0;\n  line-height: inherit;\n  font-size: inherit;\n}\n.weui-form-preview__btn:active {\n  background-color: #EEEEEE;\n}\n.weui-form-preview__btn:after {\n  content: \" \";\n  position: absolute;\n  left: 0;\n  top: 0;\n  width: 1px;\n  bottom: 0;\n  border-left: 1px solid #D5D5D6;\n  color: #D5D5D6;\n  transform-origin: 0 0;\n  transform: scaleX(0.5);\n}\n.weui-form-preview__btn:first-child:after {\n  display: none;\n}\n.weui-form-preview__btn_default {\n  color: #999999;\n}\n.weui-form-preview__btn_primary {\n  color: #0BB20C;\n}\n.weui-cell_select {\n  padding: 0;\n}\n.weui-cell_select .weui-select {\n  padding-right: 30px;\n}\n.weui-cell_select .weui-cell__bd:after {\n  content: \" \";\n  display: inline-block;\n  height: 6px;\n  width: 6px;\n  border-width: 2px 2px 0 0;\n  border-color: #C8C8CD;\n  border-style: solid;\n  transform: matrix(0.71, 0.71, -0.71, 0.71, 0, 0);\n  position: relative;\n  top: -2px;\n  position: absolute;\n  top: 50%;\n  right: 15px;\n  margin-top: -4px;\n}\n.weui-select {\n  -webkit-appearance: none;\n  border: 0;\n  outline: 0;\n  background-color: transparent;\n  width: 100%;\n  font-size: inherit;\n  height: 44px;\n  line-height: 44px;\n  position: relative;\n  z-index: 1;\n  padding-left: 15px;\n}\n.weui-cell_select-before {\n  padding-right: 15px;\n}\n.weui-cell_select-before .weui-select {\n  width: 105px;\n  box-sizing: border-box;\n}\n.weui-cell_select-before .weui-cell__hd {\n  position: relative;\n}\n.weui-cell_select-before .weui-cell__hd:after {\n  content: \" \";\n  position: absolute;\n  right: 0;\n  top: 0;\n  width: 1px;\n  bottom: 0;\n  border-right: 1px solid #D9D9D9;\n  color: #D9D9D9;\n  transform-origin: 100% 0;\n  transform: scaleX(0.5);\n}\n.weui-cell_select-before .weui-cell__hd:before {\n  content: \" \";\n  display: inline-block;\n  height: 6px;\n  width: 6px;\n  border-width: 2px 2px 0 0;\n  border-color: #C8C8CD;\n  border-style: solid;\n  transform: matrix(0.71, 0.71, -0.71, 0.71, 0, 0);\n  position: relative;\n  top: -2px;\n  position: absolute;\n  top: 50%;\n  right: 15px;\n  margin-top: -4px;\n}\n.weui-cell_select-before .weui-cell__bd {\n  padding-left: 15px;\n}\n.weui-cell_select-before .weui-cell__bd:after {\n  display: none;\n}\n.weui-cell_select-after {\n  padding-left: 15px;\n}\n.weui-cell_select-after .weui-select {\n  padding-left: 0;\n}\n.weui-cell_vcode {\n  padding-top: 0;\n  padding-right: 0;\n  padding-bottom: 0;\n}\n.weui-vcode-img {\n  margin-left: 5px;\n  height: 44px;\n  vertical-align: middle;\n}\n.weui-vcode-btn {\n  display: inline-block;\n  height: 44px;\n  margin-left: 5px;\n  padding: 0 0.6em 0 0.7em;\n  border-left: 1px solid #E5E5E5;\n  line-height: 44px;\n  vertical-align: middle;\n  font-size: 17px;\n  color: #3CC51F;\n}\nbutton.weui-vcode-btn {\n  background-color: transparent;\n  border-top: 0;\n  border-right: 0;\n  border-bottom: 0;\n  outline: 0;\n}\n.weui-vcode-btn:active {\n  color: #52a341;\n}\n.weui-gallery {\n  display: none;\n  position: fixed;\n  top: 0;\n  right: 0;\n  bottom: 0;\n  left: 0;\n  background-color: #000000;\n  z-index: 1000;\n}\n.weui-gallery__img {\n  position: absolute;\n  top: 0;\n  right: 0;\n  bottom: 60px;\n  left: 0;\n  background: center center no-repeat;\n  background-size: contain;\n}\n.weui-gallery__opr {\n  position: absolute;\n  right: 0;\n  bottom: 0;\n  left: 0;\n  background-color: #0D0D0D;\n  color: #FFFFFF;\n  line-height: 60px;\n  text-align: center;\n}\n.weui-gallery__del {\n  display: block;\n}\n.weui-cell_switch {\n  padding-top: 6px;\n  padding-bottom: 6px;\n}\n.weui-switch {\n  appearance: none;\n}\n.weui-switch,\n.weui-switch-cp__box {\n  position: relative;\n  width: 52px;\n  height: 32px;\n  border: 1px solid #DFDFDF;\n  outline: 0;\n  border-radius: 16px;\n  box-sizing: border-box;\n  background-color: #DFDFDF;\n  transition: background-color 0.1s, border 0.1s;\n}\n.weui-switch:before,\n.weui-switch-cp__box:before {\n  content: \" \";\n  position: absolute;\n  top: 0;\n  left: 0;\n  width: 50px;\n  height: 30px;\n  border-radius: 15px;\n  background-color: #FDFDFD;\n  transition: transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);\n}\n.weui-switch:after,\n.weui-switch-cp__box:after {\n  content: \" \";\n  position: absolute;\n  top: 0;\n  left: 0;\n  width: 30px;\n  height: 30px;\n  border-radius: 15px;\n  background-color: #FFFFFF;\n  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);\n  transition: transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);\n}\n.weui-switch:checked,\n.weui-switch-cp__input:checked ~ .weui-switch-cp__box {\n  border-color: #04BE02;\n  background-color: #04BE02;\n}\n.weui-switch:checked:before,\n.weui-switch-cp__input:checked ~ .weui-switch-cp__box:before {\n  transform: scale(0);\n}\n.weui-switch:checked:after,\n.weui-switch-cp__input:checked ~ .weui-switch-cp__box:after {\n  transform: translateX(20px);\n}\n.weui-switch-cp__input {\n  position: absolute;\n  left: -9999px;\n}\n.weui-switch-cp__box {\n  display: block;\n}\n.weui-uploader__hd {\n  display: flex;\n  padding-bottom: 10px;\n  align-items: center;\n}\n.weui-uploader__title {\n  flex: 1;\n}\n.weui-uploader__info {\n  color: #B2B2B2;\n}\n.weui-uploader__bd {\n  margin-bottom: -4px;\n  margin-right: -9px;\n  overflow: hidden;\n}\n.weui-uploader__files {\n  list-style: none;\n}\n.weui-uploader__file {\n  float: left;\n  margin-right: 9px;\n  margin-bottom: 9px;\n  width: 79px;\n  height: 79px;\n  background: no-repeat center center;\n  background-size: cover;\n}\n.weui-uploader__file_status {\n  position: relative;\n}\n.weui-uploader__file_status:before {\n  content: \" \";\n  position: absolute;\n  top: 0;\n  right: 0;\n  bottom: 0;\n  left: 0;\n  background-color: rgba(0, 0, 0, 0.5);\n}\n.weui-uploader__file_status .weui-uploader__file-content {\n  display: block;\n}\n.weui-uploader__file-content {\n  display: none;\n  position: absolute;\n  top: 50%;\n  left: 50%;\n  transform: translate(-50%, -50%);\n  color: #FFFFFF;\n}\n.weui-uploader__file-content .weui-icon-warn {\n  display: inline-block;\n}\n.weui-uploader__input-box {\n  float: left;\n  position: relative;\n  margin-right: 9px;\n  margin-bottom: 9px;\n  width: 77px;\n  height: 77px;\n  border: 1px solid #D9D9D9;\n}\n.weui-uploader__input-box:before,\n.weui-uploader__input-box:after {\n  content: \" \";\n  position: absolute;\n  top: 50%;\n  left: 50%;\n  transform: translate(-50%, -50%);\n  background-color: #D9D9D9;\n}\n.weui-uploader__input-box:before {\n  width: 2px;\n  height: 39.5px;\n}\n.weui-uploader__input-box:after {\n  width: 39.5px;\n  height: 2px;\n}\n.weui-uploader__input-box:active {\n  border-color: #999999;\n}\n.weui-uploader__input-box:active:before,\n.weui-uploader__input-box:active:after {\n  background-color: #999999;\n}\n.weui-uploader__input {\n  position: absolute;\n  z-index: 1;\n  top: 0;\n  left: 0;\n  width: 100%;\n  height: 100%;\n  opacity: 0;\n  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);\n}\n.weui-msg {\n  padding-top: 36px;\n  text-align: center;\n}\n.weui-msg__icon-area {\n  margin-bottom: 30px;\n}\n.weui-msg__text-area {\n  margin-bottom: 25px;\n  padding: 0 20px;\n}\n.weui-msg__text-area a {\n  color: #586C94;\n}\n.weui-msg__title {\n  margin-bottom: 5px;\n  font-weight: 400;\n  font-size: 20px;\n}\n.weui-msg__desc {\n  font-size: 14px;\n  color: #999999;\n}\n.weui-msg__opr-area {\n  margin-bottom: 25px;\n}\n.weui-msg__extra-area {\n  margin-bottom: 15px;\n  font-size: 14px;\n  color: #999999;\n}\n.weui-msg__extra-area a {\n  color: #586C94;\n}\n@media screen and (min-height: 438px) {\n  .weui-msg__extra-area {\n    position: fixed;\n    left: 0;\n    bottom: 0;\n    width: 100%;\n    text-align: center;\n  }\n}\n.weui-article {\n  padding: 20px 15px;\n  font-size: 15px;\n}\n.weui-article section {\n  margin-bottom: 1.5em;\n}\n.weui-article h1 {\n  font-size: 18px;\n  font-weight: 400;\n  margin-bottom: .9em;\n}\n.weui-article h2 {\n  font-size: 16px;\n  font-weight: 400;\n  margin-bottom: .34em;\n}\n.weui-article h3 {\n  font-weight: 400;\n  font-size: 15px;\n  margin-bottom: .34em;\n}\n.weui-article * {\n  max-width: 100%;\n  box-sizing: border-box;\n  word-wrap: break-word;\n}\n.weui-article p {\n  margin: 0 0 .8em;\n}\n.weui-tabbar {\n  display: flex;\n  position: absolute;\n  z-index: 500;\n  bottom: 0;\n  width: 100%;\n  background-color: #F7F7FA;\n}\n.weui-tabbar:before {\n  content: \" \";\n  position: absolute;\n  left: 0;\n  top: 0;\n  right: 0;\n  height: 1px;\n  border-top: 1px solid #C0BFC4;\n  color: #C0BFC4;\n  transform-origin: 0 0;\n  transform: scaleY(0.5);\n}\n.weui-tabbar__item {\n  display: block;\n  flex: 1;\n  padding: 5px 0 0;\n  font-size: 0;\n  color: #999999;\n  text-align: center;\n  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);\n}\n.weui-tabbar__item.weui-bar__item_on .weui-tabbar__icon,\n.weui-tabbar__item.weui-bar__item_on .weui-tabbar__icon > i,\n.weui-tabbar__item.weui-bar__item_on .weui-tabbar__label {\n  color: #09BB07;\n}\n.weui-tabbar__icon {\n  display: inline-block;\n  width: 27px;\n  height: 27px;\n}\ni.weui-tabbar__icon,\n.weui-tabbar__icon > i {\n  font-size: 24px;\n  color: #999999;\n}\n.weui-tabbar__icon img {\n  width: 100%;\n  height: 100%;\n}\n.weui-tabbar__label {\n  text-align: center;\n  color: #999999;\n  font-size: 10px;\n  line-height: 1.8;\n}\n.weui-navbar {\n  display: flex;\n  position: absolute;\n  z-index: 500;\n  top: 0;\n  width: 100%;\n  background-color: #FAFAFA;\n}\n.weui-navbar:after {\n  content: \" \";\n  position: absolute;\n  left: 0;\n  bottom: 0;\n  right: 0;\n  height: 1px;\n  border-bottom: 1px solid #CCCCCC;\n  color: #CCCCCC;\n  transform-origin: 0 100%;\n  transform: scaleY(0.5);\n}\n.weui-navbar + .weui-tab__panel {\n  padding-top: 50px;\n  padding-bottom: 0;\n}\n.weui-navbar__item {\n  position: relative;\n  display: block;\n  flex: 1;\n  padding: 13px 0;\n  text-align: center;\n  font-size: 15px;\n  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);\n}\n.weui-navbar__item:active {\n  background-color: #EDEDED;\n}\n.weui-navbar__item.weui-bar__item_on {\n  background-color: #EAEAEA;\n}\n.weui-navbar__item:after {\n  content: \" \";\n  position: absolute;\n  right: 0;\n  top: 0;\n  width: 1px;\n  bottom: 0;\n  border-right: 1px solid #CCCCCC;\n  color: #CCCCCC;\n  transform-origin: 100% 0;\n  transform: scaleX(0.5);\n}\n.weui-navbar__item:last-child:after {\n  display: none;\n}\n.weui-tab {\n  position: relative;\n  height: 100%;\n}\n.weui-tab__panel {\n  box-sizing: border-box;\n  height: 100%;\n  padding-bottom: 50px;\n  overflow: auto;\n  -webkit-overflow-scrolling: touch;\n}\n.weui-tab__content {\n  display: none;\n}\n.weui-progress {\n  display: flex;\n  align-items: center;\n}\n.weui-progress__bar {\n  background-color: #EBEBEB;\n  height: 3px;\n  flex: 1;\n}\n.weui-progress__inner-bar {\n  width: 0;\n  height: 100%;\n  background-color: #09BB07;\n}\n.weui-progress__opr {\n  display: block;\n  margin-left: 15px;\n  font-size: 0;\n}\n.weui-panel {\n  background-color: #FFFFFF;\n  margin-top: 10px;\n  position: relative;\n  overflow: hidden;\n}\n.weui-panel:first-child {\n  margin-top: 0;\n}\n.weui-panel:before {\n  content: \" \";\n  position: absolute;\n  left: 0;\n  top: 0;\n  right: 0;\n  height: 1px;\n  border-top: 1px solid #E5E5E5;\n  color: #E5E5E5;\n  transform-origin: 0 0;\n  transform: scaleY(0.5);\n}\n.weui-panel:after {\n  content: \" \";\n  position: absolute;\n  left: 0;\n  bottom: 0;\n  right: 0;\n  height: 1px;\n  border-bottom: 1px solid #E5E5E5;\n  color: #E5E5E5;\n  transform-origin: 0 100%;\n  transform: scaleY(0.5);\n}\n.weui-panel__hd {\n  padding: 14px 15px 10px;\n  color: #999999;\n  font-size: 13px;\n  position: relative;\n}\n.weui-panel__hd:after {\n  content: \" \";\n  position: absolute;\n  left: 0;\n  bottom: 0;\n  right: 0;\n  height: 1px;\n  border-bottom: 1px solid #E5E5E5;\n  color: #E5E5E5;\n  transform-origin: 0 100%;\n  transform: scaleY(0.5);\n  left: 15px;\n}\n.weui-media-box {\n  padding: 15px;\n  position: relative;\n}\n.weui-media-box:before {\n  content: \" \";\n  position: absolute;\n  left: 0;\n  top: 0;\n  right: 0;\n  height: 1px;\n  border-top: 1px solid #E5E5E5;\n  color: #E5E5E5;\n  transform-origin: 0 0;\n  transform: scaleY(0.5);\n  left: 15px;\n}\n.weui-media-box:first-child:before {\n  display: none;\n}\na.weui-media-box {\n  color: #000000;\n  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);\n}\na.weui-media-box:active {\n  background-color: #ECECEC;\n}\n.weui-media-box__title {\n  font-weight: 400;\n  font-size: 17px;\n  width: auto;\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  word-wrap: normal;\n  word-wrap: break-word;\n  word-break: break-all;\n}\n.weui-media-box__desc {\n  color: #999999;\n  font-size: 13px;\n  line-height: 1.2;\n  overflow: hidden;\n  text-overflow: ellipsis;\n  display: -webkit-box;\n  -webkit-box-orient: vertical;\n  -webkit-line-clamp: 2;\n}\n.weui-media-box__info {\n  margin-top: 15px;\n  padding-bottom: 5px;\n  font-size: 13px;\n  color: #CECECE;\n  line-height: 1em;\n  list-style: none;\n  overflow: hidden;\n}\n.weui-media-box__info__meta {\n  float: left;\n  padding-right: 1em;\n}\n.weui-media-box__info__meta_extra {\n  padding-left: 1em;\n  border-left: 1px solid #CECECE;\n}\n.weui-media-box_text .weui-media-box__title {\n  margin-bottom: 8px;\n}\n.weui-media-box_appmsg {\n  display: flex;\n  align-items: center;\n}\n.weui-media-box_appmsg .weui-media-box__hd {\n  margin-right: .8em;\n  width: 60px;\n  height: 60px;\n  line-height: 60px;\n  text-align: center;\n}\n.weui-media-box_appmsg .weui-media-box__thumb {\n  width: 100%;\n  max-height: 100%;\n  vertical-align: top;\n}\n.weui-media-box_appmsg .weui-media-box__bd {\n  flex: 1;\n  min-width: 0;\n}\n.weui-media-box_small-appmsg {\n  padding: 0;\n}\n.weui-media-box_small-appmsg .weui-cells {\n  margin-top: 0;\n}\n.weui-media-box_small-appmsg .weui-cells:before {\n  display: none;\n}\n.weui-grids {\n  position: relative;\n  overflow: hidden;\n}\n.weui-grids:before {\n  content: \" \";\n  position: absolute;\n  left: 0;\n  top: 0;\n  right: 0;\n  height: 1px;\n  border-top: 1px solid #D9D9D9;\n  color: #D9D9D9;\n  transform-origin: 0 0;\n  transform: scaleY(0.5);\n}\n.weui-grids:after {\n  content: \" \";\n  position: absolute;\n  left: 0;\n  top: 0;\n  width: 1px;\n  bottom: 0;\n  border-left: 1px solid #D9D9D9;\n  color: #D9D9D9;\n  transform-origin: 0 0;\n  transform: scaleX(0.5);\n}\n.weui-grid {\n  position: relative;\n  float: left;\n  padding: 20px 10px;\n  width: 33.33333333%;\n  box-sizing: border-box;\n}\n.weui-grid:before {\n  content: \" \";\n  position: absolute;\n  right: 0;\n  top: 0;\n  width: 1px;\n  bottom: 0;\n  border-right: 1px solid #D9D9D9;\n  color: #D9D9D9;\n  transform-origin: 100% 0;\n  transform: scaleX(0.5);\n}\n.weui-grid:after {\n  content: \" \";\n  position: absolute;\n  left: 0;\n  bottom: 0;\n  right: 0;\n  height: 1px;\n  border-bottom: 1px solid #D9D9D9;\n  color: #D9D9D9;\n  transform-origin: 0 100%;\n  transform: scaleY(0.5);\n}\n.weui-grid:active {\n  background-color: #ECECEC;\n}\n.weui-grid__icon {\n  width: 28px;\n  height: 28px;\n  margin: 0 auto;\n}\n.weui-grid__icon img {\n  display: block;\n  width: 100%;\n  height: 100%;\n}\n.weui-grid__icon + .weui-grid__label {\n  margin-top: 5px;\n}\n.weui-grid__label {\n  display: block;\n  text-align: center;\n  color: #000000;\n  font-size: 14px;\n  white-space: nowrap;\n  text-overflow: ellipsis;\n  overflow: hidden;\n}\n.weui-footer {\n  color: #999999;\n  font-size: 14px;\n  text-align: center;\n}\n.weui-footer a {\n  color: #586C94;\n}\n.weui-footer_fixed-bottom {\n  position: fixed;\n  bottom: .52em;\n  left: 0;\n  right: 0;\n}\n.weui-footer__links {\n  font-size: 0;\n}\n.weui-footer__link {\n  display: inline-block;\n  vertical-align: top;\n  margin: 0 .62em;\n  position: relative;\n  font-size: 14px;\n}\n.weui-footer__link:before {\n  content: \" \";\n  position: absolute;\n  left: 0;\n  top: 0;\n  width: 1px;\n  bottom: 0;\n  border-left: 1px solid #C7C7C7;\n  color: #C7C7C7;\n  transform-origin: 0 0;\n  transform: scaleX(0.5);\n  left: -0.65em;\n  top: .36em;\n  bottom: .36em;\n}\n.weui-footer__link:first-child:before {\n  display: none;\n}\n.weui-footer__text {\n  padding: 0 .34em;\n  font-size: 12px;\n}\n.weui-flex {\n  display: flex;\n}\n.weui-flex__item {\n  flex: 1;\n}\n.weui-dialog {\n  position: fixed;\n  z-index: 5000;\n  width: 80%;\n  max-width: 300px;\n  top: 50%;\n  left: 50%;\n  transform: translate(-50%, -50%);\n  background-color: #FFFFFF;\n  text-align: center;\n  border-radius: 3px;\n  overflow: hidden;\n}\n.weui-dialog__hd {\n  padding: 1.3em 1.6em 0.5em;\n}\n.weui-dialog__title {\n  font-weight: 400;\n  font-size: 18px;\n}\n.weui-dialog__bd {\n  padding: 0 1.6em 0.8em;\n  min-height: 40px;\n  font-size: 15px;\n  line-height: 1.3;\n  word-wrap: break-word;\n  word-break: break-all;\n  color: #999999;\n}\n.weui-dialog__bd:first-child {\n  padding: 2.7em 20px 1.7em;\n  color: #353535;\n}\n.weui-dialog__ft {\n  position: relative;\n  line-height: 48px;\n  font-size: 18px;\n  display: flex;\n}\n.weui-dialog__ft:after {\n  content: \" \";\n  position: absolute;\n  left: 0;\n  top: 0;\n  right: 0;\n  height: 1px;\n  border-top: 1px solid #D5D5D6;\n  color: #D5D5D6;\n  transform-origin: 0 0;\n  transform: scaleY(0.5);\n}\n.weui-dialog__btn {\n  display: block;\n  flex: 1;\n  color: #3CC51F;\n  text-decoration: none;\n  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);\n  position: relative;\n}\n.weui-dialog__btn:active {\n  background-color: #EEEEEE;\n}\n.weui-dialog__btn:after {\n  content: \" \";\n  position: absolute;\n  left: 0;\n  top: 0;\n  width: 1px;\n  bottom: 0;\n  border-left: 1px solid #D5D5D6;\n  color: #D5D5D6;\n  transform-origin: 0 0;\n  transform: scaleX(0.5);\n}\n.weui-dialog__btn:first-child:after {\n  display: none;\n}\n.weui-dialog__btn_default {\n  color: #353535;\n}\n.weui-dialog__btn_primary {\n  color: #0BB20C;\n}\n.weui-skin_android .weui-dialog {\n  text-align: left;\n  box-shadow: 0 6px 30px 0 rgba(0, 0, 0, 0.1);\n}\n.weui-skin_android .weui-dialog__title {\n  font-size: 21px;\n}\n.weui-skin_android .weui-dialog__hd {\n  text-align: left;\n}\n.weui-skin_android .weui-dialog__bd {\n  color: #999999;\n  padding: 0.25em 1.6em 2em;\n  font-size: 17px;\n  text-align: left;\n}\n.weui-skin_android .weui-dialog__bd:first-child {\n  padding: 1.6em 1.6em 2em;\n  color: #353535;\n}\n.weui-skin_android .weui-dialog__ft {\n  display: block;\n  text-align: right;\n  line-height: 42px;\n  font-size: 16px;\n  padding: 0 1.6em 0.7em;\n}\n.weui-skin_android .weui-dialog__ft:after {\n  display: none;\n}\n.weui-skin_android .weui-dialog__btn {\n  display: inline-block;\n  vertical-align: top;\n  padding: 0 .8em;\n}\n.weui-skin_android .weui-dialog__btn:after {\n  display: none;\n}\n.weui-skin_android .weui-dialog__btn:active {\n  background-color: rgba(0, 0, 0, 0.06);\n}\n.weui-skin_android .weui-dialog__btn:visited {\n  background-color: rgba(0, 0, 0, 0.06);\n}\n.weui-skin_android .weui-dialog__btn:last-child {\n  margin-right: -0.8em;\n}\n.weui-skin_android .weui-dialog__btn_default {\n  color: #808080;\n}\n@media screen and (min-width: 1024px) {\n  .weui-dialog {\n    width: 35%;\n  }\n}\n.weui-toast {\n  position: fixed;\n  z-index: 5000;\n  width: 7.6em;\n  min-height: 7.6em;\n  top: 180px;\n  left: 50%;\n  margin-left: -3.8em;\n  background: rgba(17, 17, 17, 0.7);\n  text-align: center;\n  border-radius: 5px;\n  color: #FFFFFF;\n}\n.weui-icon_toast {\n  margin: 22px 0 0;\n  display: block;\n}\n.weui-icon_toast.weui-icon-success-no-circle:before {\n  color: #FFFFFF;\n  font-size: 55px;\n}\n.weui-icon_toast.weui-loading {\n  margin: 30px 0 0;\n  width: 38px;\n  height: 38px;\n  vertical-align: baseline;\n}\n.weui-toast__content {\n  margin: 0 0 15px;\n}\n.weui-mask {\n  position: fixed;\n  z-index: 1000;\n  top: 0;\n  right: 0;\n  left: 0;\n  bottom: 0;\n  background: rgba(0, 0, 0, 0.6);\n}\n.weui-mask_transparent {\n  position: fixed;\n  z-index: 1000;\n  top: 0;\n  right: 0;\n  left: 0;\n  bottom: 0;\n}\n.weui-actionsheet {\n  position: fixed;\n  left: 0;\n  bottom: 0;\n  transform: translate(0, 100%);\n  backface-visibility: hidden;\n  z-index: 5000;\n  width: 100%;\n  background-color: #EFEFF4;\n  transition: transform .3s;\n}\n.weui-actionsheet__menu {\n  background-color: #FFFFFF;\n}\n.weui-actionsheet__action {\n  margin-top: 6px;\n  background-color: #FFFFFF;\n}\n.weui-actionsheet__cell {\n  position: relative;\n  padding: 10px 0;\n  text-align: center;\n  font-size: 18px;\n}\n.weui-actionsheet__cell:before {\n  content: \" \";\n  position: absolute;\n  left: 0;\n  top: 0;\n  right: 0;\n  height: 1px;\n  border-top: 1px solid #D9D9D9;\n  color: #D9D9D9;\n  transform-origin: 0 0;\n  transform: scaleY(0.5);\n}\n.weui-actionsheet__cell:active {\n  background-color: #ECECEC;\n}\n.weui-actionsheet__cell:first-child:before {\n  display: none;\n}\n.weui-skin_android .weui-actionsheet {\n  position: fixed;\n  left: 50%;\n  top: 50%;\n  bottom: auto;\n  transform: translate(-50%, -50%);\n  width: 274px;\n  box-sizing: border-box;\n  backface-visibility: hidden;\n  background: transparent;\n  transition: transform .3s;\n}\n.weui-skin_android .weui-actionsheet__action {\n  display: none;\n}\n.weui-skin_android .weui-actionsheet__menu {\n  border-radius: 2px;\n  box-shadow: 0 6px 30px 0 rgba(0, 0, 0, 0.1);\n}\n.weui-skin_android .weui-actionsheet__cell {\n  padding: 13px 24px;\n  font-size: 16px;\n  line-height: 1.4;\n  text-align: left;\n}\n.weui-skin_android .weui-actionsheet__cell:first-child {\n  border-top-left-radius: 2px;\n  border-top-right-radius: 2px;\n}\n.weui-skin_android .weui-actionsheet__cell:last-child {\n  border-bottom-left-radius: 2px;\n  border-bottom-right-radius: 2px;\n}\n.weui-actionsheet_toggle {\n  transform: translate(0, 0);\n}\n.weui-loadmore {\n  width: 65%;\n  margin: 1.5em auto;\n  line-height: 1.6em;\n  font-size: 14px;\n  text-align: center;\n}\n.weui-loadmore__tips {\n  display: inline-block;\n  vertical-align: middle;\n}\n.weui-loadmore_line {\n  border-top: 1px solid #E5E5E5;\n  margin-top: 2.4em;\n}\n.weui-loadmore_line .weui-loadmore__tips {\n  position: relative;\n  top: -0.9em;\n  padding: 0 .55em;\n  background-color: #FFFFFF;\n  color: #999999;\n}\n.weui-loadmore_dot .weui-loadmore__tips {\n  padding: 0 .16em;\n}\n.weui-loadmore_dot .weui-loadmore__tips:before {\n  content: \" \";\n  width: 4px;\n  height: 4px;\n  border-radius: 50%;\n  background-color: #E5E5E5;\n  display: inline-block;\n  position: relative;\n  vertical-align: 0;\n  top: -0.16em;\n}\n.weui-badge {\n  display: inline-block;\n  padding: .15em .4em;\n  min-width: 8px;\n  border-radius: 18px;\n  background-color: #F43530;\n  color: #FFFFFF;\n  line-height: 1.2;\n  text-align: center;\n  font-size: 12px;\n  vertical-align: middle;\n}\n.weui-badge_dot {\n  padding: .4em;\n  min-width: 0;\n}\n.weui-search-bar {\n  position: relative;\n  padding: 8px 10px;\n  display: flex;\n  box-sizing: border-box;\n  background-color: #EFEFF4;\n}\n.weui-search-bar:before {\n  content: \" \";\n  position: absolute;\n  left: 0;\n  top: 0;\n  right: 0;\n  height: 1px;\n  border-top: 1px solid #D7D6DC;\n  color: #D7D6DC;\n  transform-origin: 0 0;\n  transform: scaleY(0.5);\n}\n.weui-search-bar:after {\n  content: \" \";\n  position: absolute;\n  left: 0;\n  bottom: 0;\n  right: 0;\n  height: 1px;\n  border-bottom: 1px solid #D7D6DC;\n  color: #D7D6DC;\n  transform-origin: 0 100%;\n  transform: scaleY(0.5);\n}\n.weui-search-bar.weui-search-bar_focusing .weui-search-bar__cancel-btn {\n  display: block;\n}\n.weui-search-bar.weui-search-bar_focusing .weui-search-bar__label {\n  display: none;\n}\n.weui-search-bar__form {\n  position: relative;\n  flex: auto;\n  background-color: #EFEFF4;\n}\n.weui-search-bar__form:after {\n  content: '';\n  position: absolute;\n  left: 0;\n  top: 0;\n  width: 200%;\n  height: 200%;\n  transform: scale(0.5);\n  transform-origin: 0 0;\n  border-radius: 10px;\n  border: 1px solid #E6E6EA;\n  box-sizing: border-box;\n  background: #FFFFFF;\n}\n.weui-search-bar__box {\n  position: relative;\n  padding-left: 30px;\n  padding-right: 30px;\n  height: 100%;\n  width: 100%;\n  box-sizing: border-box;\n  z-index: 1;\n}\n.weui-search-bar__box .weui-search-bar__input {\n  padding: 4px 0;\n  width: 100%;\n  height: 1.42857143em;\n  border: 0;\n  font-size: 14px;\n  line-height: 1.42857143em;\n  box-sizing: content-box;\n  background: transparent;\n}\n.weui-search-bar__box .weui-search-bar__input:focus {\n  outline: none;\n}\n.weui-search-bar__box .weui-icon-search {\n  position: absolute;\n  left: 10px;\n  top: 0;\n  line-height: 28px;\n}\n.weui-search-bar__box .weui-icon-clear {\n  position: absolute;\n  top: 0;\n  right: 0;\n  padding: 0 10px;\n  line-height: 28px;\n}\n.weui-search-bar__label {\n  position: absolute;\n  top: 1px;\n  right: 1px;\n  bottom: 1px;\n  left: 1px;\n  z-index: 2;\n  border-radius: 3px;\n  text-align: center;\n  color: #9B9B9B;\n  background: #FFFFFF;\n}\n.weui-search-bar__label span {\n  display: inline-block;\n  font-size: 14px;\n  vertical-align: middle;\n}\n.weui-search-bar__label .weui-icon-search {\n  margin-right: 5px;\n}\n.weui-search-bar__cancel-btn {\n  display: none;\n  margin-left: 10px;\n  line-height: 28px;\n  color: #09BB07;\n  white-space: nowrap;\n}\n.weui-search-bar__input:not(:valid) ~ .weui-icon-clear {\n  display: none;\n}\ninput[type=\"search\"]::-webkit-search-decoration,\ninput[type=\"search\"]::-webkit-search-cancel-button,\ninput[type=\"search\"]::-webkit-search-results-button,\ninput[type=\"search\"]::-webkit-search-results-decoration {\n  display: none;\n}\n.weui-picker {\n  position: fixed;\n  width: 100%;\n  left: 0;\n  bottom: 0;\n  z-index: 5000;\n  backface-visibility: hidden;\n  transform: translate(0, 100%);\n  transition: transform .3s;\n}\n.weui-picker__hd {\n  display: flex;\n  padding: 10px 15px;\n  background-color: #fbf9fe;\n  position: relative;\n  text-align: center;\n}\n.weui-picker__hd:after {\n  content: \" \";\n  position: absolute;\n  left: 0;\n  bottom: 0;\n  right: 0;\n  height: 1px;\n  border-bottom: 1px solid #E5E5E5;\n  color: #E5E5E5;\n  transform-origin: 0 100%;\n  transform: scaleY(0.5);\n}\n.weui-picker__action {\n  display: block;\n  flex: 1;\n  color: #586C94;\n}\n.weui-picker__action:first-child {\n  text-align: left;\n}\n.weui-picker__action:last-child {\n  text-align: right;\n}\n.weui-picker__bd {\n  display: flex;\n  position: relative;\n  background-color: #fff;\n  height: 238px;\n  overflow: hidden;\n}\n.weui-picker__group {\n  flex: 1;\n  position: relative;\n  height: 100%;\n}\n.weui-picker__mask {\n  position: absolute;\n  top: 0;\n  left: 0;\n  width: 100%;\n  height: 100%;\n  margin: 0 auto;\n  z-index: 3;\n  background: linear-gradient(180deg, rgba(255, 255, 255, 0.95), rgba(255, 255, 255, 0.6)), linear-gradient(0deg, rgba(255, 255, 255, 0.95), rgba(255, 255, 255, 0.6));\n  background-position: top, bottom;\n  background-size: 100% 102px;\n  background-repeat: no-repeat;\n  transform: translateZ(0);\n}\n.weui-picker__indicator {\n  width: 100%;\n  height: 34px;\n  position: absolute;\n  left: 0;\n  top: 102px;\n  z-index: 3;\n}\n.weui-picker__indicator:before {\n  content: \" \";\n  position: absolute;\n  left: 0;\n  top: 0;\n  right: 0;\n  height: 1px;\n  border-top: 1px solid #E5E5E5;\n  color: #E5E5E5;\n  transform-origin: 0 0;\n  transform: scaleY(0.5);\n}\n.weui-picker__indicator:after {\n  content: \" \";\n  position: absolute;\n  left: 0;\n  bottom: 0;\n  right: 0;\n  height: 1px;\n  border-bottom: 1px solid #E5E5E5;\n  color: #E5E5E5;\n  transform-origin: 0 100%;\n  transform: scaleY(0.5);\n}\n.weui-picker__content {\n  position: absolute;\n  top: 0;\n  left: 0;\n  width: 100%;\n}\n.weui-picker__item {\n  padding: 5px 0 4px;\n  text-align: center;\n  color: #000;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  overflow: hidden;\n}\n.weui-picker__item_disabled {\n  color: #999999;\n}\n@keyframes slideUp {\n  from {\n    transform: translate3d(0, 100%, 0);\n  }\n  to {\n    transform: translate3d(0, 0, 0);\n  }\n}\n.weui-animate-slide-up {\n  animation: slideUp ease .3s forwards;\n}\n@keyframes slideDown {\n  from {\n    transform: translate3d(0, 0, 0);\n  }\n  to {\n    transform: translate3d(0, 100%, 0);\n  }\n}\n.weui-animate-slide-down {\n  animation: slideDown ease .3s forwards;\n}\n@keyframes fadeIn {\n  from {\n    opacity: 0;\n  }\n  to {\n    opacity: 1;\n  }\n}\n.weui-animate-fade-in {\n  animation: fadeIn ease .3s forwards;\n}\n@keyframes fadeOut {\n  from {\n    opacity: 1;\n  }\n  to {\n    opacity: 0;\n  }\n}\n.weui-animate-fade-out {\n  animation: fadeOut ease .3s forwards;\n}\n.weui-agree {\n  display: block;\n  padding: .5em 15px;\n  font-size: 13px;\n}\n.weui-agree a {\n  color: #586C94;\n}\n.weui-agree__text {\n  color: #999999;\n}\n.weui-agree__checkbox {\n  appearance: none;\n  outline: 0;\n  font-size: 0;\n  border: 1px solid #D1D1D1;\n  background-color: #FFFFFF;\n  border-radius: 3px;\n  width: 13px;\n  height: 13px;\n  position: relative;\n  vertical-align: 0;\n  top: 2px;\n}\n.weui-agree__checkbox:checked:before {\n  font-family: \"weui\";\n  font-style: normal;\n  font-weight: normal;\n  font-variant: normal;\n  text-transform: none;\n  text-align: center;\n  speak: none;\n  display: inline-block;\n  vertical-align: middle;\n  text-decoration: inherit;\n  content: \"\\EA08\";\n  color: #09BB07;\n  font-size: 13px;\n  position: absolute;\n  top: 50%;\n  left: 50%;\n  transform: translate(-50%, -48%) scale(0.73);\n}\n.weui-agree__checkbox:disabled {\n  background-color: #E1E1E1;\n}\n.weui-agree__checkbox:disabled:before {\n  color: #ADADAD;\n}\n.weui-loading {\n  width: 20px;\n  height: 20px;\n  display: inline-block;\n  vertical-align: middle;\n  animation: weuiLoading 1s steps(12, end) infinite;\n  background: transparent url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMjAiIGhlaWdodD0iMTIwIiB2aWV3Qm94PSIwIDAgMTAwIDEwMCI+PHBhdGggZmlsbD0ibm9uZSIgZD0iTTAgMGgxMDB2MTAwSDB6Ii8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTlFOUU5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTMwKSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iIzk4OTY5NyIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgzMCAxMDUuOTggNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjOUI5OTlBIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDYwIDc1Ljk4IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0EzQTFBMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSg5MCA2NSA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNBQkE5QUEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoMTIwIDU4LjY2IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0IyQjJCMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgxNTAgNTQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjQkFCOEI5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDE4MCA1MCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDMkMwQzEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTE1MCA0NS45OCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDQkNCQ0IiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTEyMCA0MS4zNCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNEMkQyRDIiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTkwIDM1IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0RBREFEQSIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgtNjAgMjQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTJFMkUyIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKC0zMCAtNS45OCA2NSkiLz48L3N2Zz4=) no-repeat;\n  background-size: 100%;\n}\n.weui-loading.weui-loading_transparent {\n  background-image: url(\"data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='120' height='120' viewBox='0 0 100 100'%3E%3Cpath fill='none' d='M0 0h100v100H0z'/%3E%3Crect xmlns='http://www.w3.org/2000/svg' width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.56)' rx='5' ry='5' transform='translate(0 -30)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.5)' rx='5' ry='5' transform='rotate(30 105.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.43)' rx='5' ry='5' transform='rotate(60 75.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.38)' rx='5' ry='5' transform='rotate(90 65 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.32)' rx='5' ry='5' transform='rotate(120 58.66 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.28)' rx='5' ry='5' transform='rotate(150 54.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.25)' rx='5' ry='5' transform='rotate(180 50 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.2)' rx='5' ry='5' transform='rotate(-150 45.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.17)' rx='5' ry='5' transform='rotate(-120 41.34 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.14)' rx='5' ry='5' transform='rotate(-90 35 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.1)' rx='5' ry='5' transform='rotate(-60 24.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.03)' rx='5' ry='5' transform='rotate(-30 -5.98 65)'/%3E%3C/svg%3E\");\n}\n@-webkit-keyframes weuiLoading {\n  0% {\n    transform: rotate3d(0, 0, 1, 0deg);\n  }\n  100% {\n    transform: rotate3d(0, 0, 1, 360deg);\n  }\n}\n@keyframes weuiLoading {\n  0% {\n    transform: rotate3d(0, 0, 1, 0deg);\n  }\n  100% {\n    transform: rotate3d(0, 0, 1, 360deg);\n  }\n}\n.weui-slider {\n  padding: 15px 18px;\n  user-select: none;\n}\n.weui-slider__inner {\n  position: relative;\n  height: 2px;\n  background-color: #E9E9E9;\n}\n.weui-slider__track {\n  height: 2px;\n  background-color: #1AAD19;\n  width: 0;\n}\n.weui-slider__handler {\n  position: absolute;\n  left: 0;\n  top: 50%;\n  width: 28px;\n  height: 28px;\n  margin-left: -14px;\n  margin-top: -14px;\n  border-radius: 50%;\n  background-color: #FFFFFF;\n  box-shadow: 0 0 4px rgba(0, 0, 0, 0.2);\n}\n.weui-slider-box {\n  display: flex;\n  align-items: center;\n}\n.weui-slider-box .weui-slider {\n  flex: 1;\n}\n.weui-slider-box__value {\n  margin-left: .5em;\n  min-width: 24px;\n  color: #888888;\n  text-align: center;\n  font-size: 14px;\n}\n",".setTapColor(@c:rgba(0,0,0,0)) {\n    -webkit-tap-highlight-color: @c;\n}\n\n\n\n\n","@font-face {\n    font-weight: normal;\n    font-style: normal;\n    font-family: \"weui\";\n    src: url('data:application/octet-stream;base64,AAEAAAALAIAAAwAwR1NVQrD+s+0AAAE4AAAAQk9TLzJAKEx+AAABfAAAAFZjbWFw65cFHQAAAhwAAAJQZ2x5ZvCRR/EAAASUAAAKtGhlYWQMPROtAAAA4AAAADZoaGVhCCwD+gAAALwAAAAkaG10eEJo//8AAAHUAAAASGxvY2EYqhW4AAAEbAAAACZtYXhwASEAVQAAARgAAAAgbmFtZeNcHtgAAA9IAAAB5nBvc3T6bLhLAAARMAAAAOYAAQAAA+gAAABaA+j/////A+kAAQAAAAAAAAAAAAAAAAAAABIAAQAAAAEAACbZbxtfDzz1AAsD6AAAAADUm2dvAAAAANSbZ2///wAAA+kD6gAAAAgAAgAAAAAAAAABAAAAEgBJAAUAAAAAAAIAAAAKAAoAAAD/AAAAAAAAAAEAAAAKAB4ALAABREZMVAAIAAQAAAAAAAAAAQAAAAFsaWdhAAgAAAABAAAAAQAEAAQAAAABAAgAAQAGAAAAAQAAAAAAAQOwAZAABQAIAnoCvAAAAIwCegK8AAAB4AAxAQIAAAIABQMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUGZFZABA6gHqEQPoAAAAWgPqAAAAAAABAAAAAAAAAAAAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+j//wPoAAAD6AAAAAAABQAAAAMAAAAsAAAABAAAAXQAAQAAAAAAbgADAAEAAAAsAAMACgAAAXQABABCAAAABAAEAAEAAOoR//8AAOoB//8AAAABAAQAAAABAAIAAwAEAAUABgAHAAgACQAKAAsADAANAA4ADwAQABEAAAEGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAANwAAAAAAAAAEQAA6gEAAOoBAAAAAQAA6gIAAOoCAAAAAgAA6gMAAOoDAAAAAwAA6gQAAOoEAAAABAAA6gUAAOoFAAAABQAA6gYAAOoGAAAABgAA6gcAAOoHAAAABwAA6ggAAOoIAAAACAAA6gkAAOoJAAAACQAA6goAAOoKAAAACgAA6gsAAOoLAAAACwAA6gwAAOoMAAAADAAA6g0AAOoNAAAADQAA6g4AAOoOAAAADgAA6g8AAOoPAAAADwAA6hAAAOoQAAAAEAAA6hEAAOoRAAAAEQAAAAAARgCMANIBJAF4AcQCMgJgAqgC/ANIA6YD/gROBKAE9AVaAAAAAgAAAAADrwOtABQAKQAAASIHBgcGFBcWFxYyNzY3NjQnJicmAyInJicmNDc2NzYyFxYXFhQHBgcGAfV4Z2Q7PDw7ZGfwZmQ7PDw7ZGZ4bl5bNjc3Nlte215bNjc3NlteA608O2Rn8GdjOzw8O2Nn8GdkOzz8rzc1W17bXlw1Nzc1XF7bXls1NwAAAAACAAAAAAOzA7MAFwAtAAABIgcGBwYVFBcWFxYzMjc2NzY1NCcmJyYTBwYiLwEmNjsBETQ2OwEyFhURMzIWAe52Z2Q7PT07ZGd2fGpmOz4+O2ZpIXYOKA52Dg0XXQsHJgcLXRcNA7M+O2ZqfHZnZDs9PTtkZ3Z9aWY7Pv3wmhISmhIaARcICwsI/ukaAAMAAAAAA+UD5QAXACMALAAAASIHBgcGFRQXFhcWMzI3Njc2NTQnJicmAxQrASI1AzQ7ATIHJyImNDYyFhQGAe6Ecm9BRERBb3KEiXZxQkREQnF1aQIxAwgCQgMBIxIZGSQZGQPkREJxdomEcm9BRERBb3KEinVxQkT9HQICAWICAjEZIxkZIxkAAAAAAgAAAAADsQPkABkALgAAAQYHBgc2BREUFxYXFhc2NzY3NjURJBcmJyYTAQYvASY/ATYyHwEWNjclNjIfARYB9VVVQk+v/tFHPmxebGxdbT1I/tGvT0JVo/7VBASKAwMSAQUBcQEFAgESAgUBEQQD4xMYEhk3YP6sjnVlSD8cHD9IZXWOAVRgNxkSGP62/tkDA48EBBkCAVYCAQHlAQIQBAAAAAADAAAAAAOxA+QAGwAqADMAAAEGBwYHBgcGNxEUFxYXFhc2NzY3NjURJBcmJyYHMzIWFQMUBisBIicDNDYTIiY0NjIWFAYB9UFBODssO38gRz5sXmxsXW09SP7YqFBBVW80BAYMAwImBQELBh4PFhYeFRUD5A8SDhIOEikK/q2PdWRJPh0dPklkdY8BU141GRIY/AYE/sYCAwUBOgQG/kAVHxUVHxUAAAACAAAAAAPkA+QAFwAtAAABIgcGBwYVFBcWFxYzMjc2NzY1NCcmJyYTAQYiLwEmPwE2Mh8BFjI3ATYyHwEWAe6Ecm9BQ0NCbnODiXVxQkREQnF1kf6gAQUBowMDFgEFAYUCBQEBQwIFARUEA+NEQnF1iYNzbkJDQ0FvcoSJdXFCRP6j/qUBAagEBR4CAWYBAQENAgIVBAAAAAQAAAAAA68DrQAUACkAPwBDAAABIgcGBwYUFxYXFjI3Njc2NCcmJyYDIicmJyY0NzY3NjIXFhcWFAcGBwYTBQ4BLwEmBg8BBhYfARYyNwE+ASYiFzAfAQH1eGdkOzw8O2Rn8GZkOzw8O2RmeG5eWzY3NzZbXtteWzY3NzZbXmn+9gYSBmAGDwUDBQEGfQUQBgElBQELEBUBAQOtPDtkZ/BnYzs8PDtjZ/BnZDs8/K83NVte215cNTc3NVxe215bNTcCJt0FAQVJBQIGBAcRBoAGBQEhBQ8LBAEBAAABAAAAAAO7AzoAFwAAEy4BPwE+AR8BFjY3ATYWFycWFAcBBiInPQoGBwUHGgzLDCELAh0LHwsNCgr9uQoeCgGzCyEOCw0HCZMJAQoBvgkCCg0LHQv9sQsKAAAAAAIAAAAAA+UD5gAXACwAAAEiBwYHBhUUFxYXFjMyNzY3NjU0JyYnJhMHBi8BJicmNRM0NjsBMhYVExceAQHvhHJvQUNDQm5zg4l1cUJEREJxdVcQAwT6AwIEEAMCKwIDDsUCAQPlREJxdYmDc25CQ0NBb3KEiXVxQkT9VhwEAncCAgMGAXoCAwMC/q2FAgQAAAQAAAAAA68DrQADABgALQAzAAABMB8BAyIHBgcGFBcWFxYyNzY3NjQnJicmAyInJicmNDc2NzYyFxYXFhQHBgcGAyMVMzUjAuUBAfJ4Z2Q7PDw7ZGfwZmQ7PDw7ZGZ4bl5bNjc3Nlte215bNjc3NltemyT92QKDAQEBLDw7ZGfwZ2M7PDw7Y2fwZ2Q7PPyvNzVbXtteXDU3NzVcXtteWzU3AjH9JAAAAAMAAAAAA+QD5AAXACcAMAAAASIHBgcGFRQXFhcWMzI3Njc2NTQnJicmAzMyFhUDFAYrASImNQM0NhMiJjQ2MhYUBgHuhHJvQUNDQm5zg4l1cUJEREJxdZ42BAYMAwInAwMMBh8PFhYeFhYD40RCcXWJg3NuQkNDQW9yhIl1cUJE/vYGBf7AAgMDAgFABQb+NhYfFhYfFgAABAAAAAADwAPAAAgAEgAoAD0AAAEyNjQmIgYUFhcjFTMRIxUzNSMDIgcGBwYVFBYXFjMyNzY3NjU0Jy4BAyInJicmNDc2NzYyFxYXFhQHBgcGAfQYISEwISFRjzk5yTorhG5rPT99am+DdmhlPD4+PMyFbV5bNTc3NVte2l5bNTc3NVteAqAiLyIiLyI5Hf7EHBwCsT89a26Ed8w8Pj48ZWh2g29qffyjNzVbXtpeWzU3NzVbXtpeWzU3AAADAAAAAAOoA6gACwAgADUAAAEHJwcXBxc3FzcnNwMiBwYHBhQXFhcWMjc2NzY0JyYnJgMiJyYnJjQ3Njc2MhcWFxYUBwYHBgKOmpocmpocmpocmpq2dmZiOjs7OmJm7GZiOjs7OmJmdmtdWTQ2NjRZXdZdWTQ2NjRZXQKqmpocmpocmpocmpoBGTs6YmbsZmI6Ozs6YmbsZmI6O/zCNjRZXdZdWTQ2NjRZXdZdWTQ2AAMAAAAAA+kD6gAaAC8AMAAAAQYHBiMiJyYnJjQ3Njc2MhcWFxYVFAcGBwEHATI3Njc2NCcmJyYiBwYHBhQXFhcWMwKONUBCR21dWjU3NzVaXdpdWzU2GBcrASM5/eBXS0grKysrSEuuSkkqLCwqSUpXASMrFxg2NVtd2l1aNTc3NVpdbUdCQDX+3jkBGSsrSEuuSkkqLCwqSUquS0grKwAC//8AAAPoA+gAFAAwAAABIgcGBwYQFxYXFiA3Njc2ECcmJyYTFg4BIi8BBwYuATQ/AScmPgEWHwE3Nh4BBg8BAfSIdHFDRERDcXQBEHRxQ0REQ3F0SQoBFBsKoqgKGxMKqKIKARQbCqKoChsUAQqoA+hEQ3F0/vB0cUNERENxdAEQdHFDRP1jChsTCqiiCgEUGwqiqAobFAEKqKIKARQbCqIAAAIAAAAAA+QD5AAXADQAAAEiBwYHBhUUFxYXFjMyNzY3NjU0JyYnJhMUBiMFFxYUDwEGLwEuAT8BNh8BFhQPAQUyFh0BAe6Ecm9BQ0NCbnODiXVxQkREQnF1fwQC/pGDAQEVAwTsAgEC7AQEFAIBhAFwAgMD40RCcXWJg3NuQkNDQW9yhIl1cUJE/fYCAwuVAgQCFAQE0AIFAtEEBBQCBQGVCwMDJwAAAAUAAAAAA9QD0wAjACcANwBHAEgAAAERFAYjISImNREjIiY9ATQ2MyE1NDYzITIWHQEhMhYdARQGIyERIREHIgYVERQWOwEyNjURNCYjISIGFREUFjsBMjY1ETQmKwEDeyYb/XYbJkMJDQ0JAQYZEgEvExkBBgkNDQn9CQJc0QkNDQktCQ0NCf7sCQ0NCS0JDQ0JLQMi/TQbJiYbAswMCiwJDS4SGRkSLg0JLAoM/UwCtGsNCf5NCQ0NCQGzCQ0NCf5NCQ0NCQGzCQ0AAAAAEADGAAEAAAAAAAEABAAAAAEAAAAAAAIABwAEAAEAAAAAAAMABAALAAEAAAAAAAQABAAPAAEAAAAAAAUACwATAAEAAAAAAAYABAAeAAEAAAAAAAoAKwAiAAEAAAAAAAsAEwBNAAMAAQQJAAEACABgAAMAAQQJAAIADgBoAAMAAQQJAAMACAB2AAMAAQQJAAQACAB+AAMAAQQJAAUAFgCGAAMAAQQJAAYACACcAAMAAQQJAAoAVgCkAAMAAQQJAAsAJgD6d2V1aVJlZ3VsYXJ3ZXVpd2V1aVZlcnNpb24gMS4wd2V1aUdlbmVyYXRlZCBieSBzdmcydHRmIGZyb20gRm9udGVsbG8gcHJvamVjdC5odHRwOi8vZm9udGVsbG8uY29tAHcAZQB1AGkAUgBlAGcAdQBsAGEAcgB3AGUAdQBpAHcAZQB1AGkAVgBlAHIAcwBpAG8AbgAgADEALgAwAHcAZQB1AGkARwBlAG4AZQByAGEAdABlAGQAIABiAHkAIABzAHYAZwAyAHQAdABmACAAZgByAG8AbQAgAEYAbwBuAHQAZQBsAGwAbwAgAHAAcgBvAGoAZQBjAHQALgBoAHQAdABwADoALwAvAGYAbwBuAHQAZQBsAGwAbwAuAGMAbwBtAAAAAgAAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASAQIBAwEEAQUBBgEHAQgBCQEKAQsBDAENAQ4BDwEQAREBEgETAAZjaXJjbGUIZG93bmxvYWQEaW5mbwxzYWZlX3N1Y2Nlc3MJc2FmZV93YXJuB3N1Y2Nlc3MOc3VjY2Vzcy1jaXJjbGURc3VjY2Vzcy1uby1jaXJjbGUHd2FpdGluZw53YWl0aW5nLWNpcmNsZQR3YXJuC2luZm8tY2lyY2xlBmNhbmNlbAZzZWFyY2gFY2xlYXIEYmFjawZkZWxldGUAAAAA') format('truetype');\n}\n\n\n[class^=\"weui-icon-\"], [class*=\" weui-icon-\"] {\n    display: inline-block;\n    vertical-align: middle;\n    font: normal normal normal 14px/1 \"weui\";\n    font-size: inherit;\n    text-rendering: auto;\n    -webkit-font-smoothing: antialiased;\n    &:before{\n        // 平滑升级\n        display: inline-block;\n        margin-left: .2em;\n        margin-right: .2em;\n    }\n}\n\n.weui-icon-circle:before { content: \"\\EA01\" } /* '' */\n.weui-icon-download:before { content: \"\\EA02\" } /* '' */\n.weui-icon-info:before { content: \"\\EA03\" } /* '' */\n.weui-icon-safe-success:before { content: \"\\EA04\" } /* '' */\n.weui-icon-safe-warn:before { content: \"\\EA05\" } /* '' */\n.weui-icon-success:before { content: \"\\EA06\" } /* '' */\n.weui-icon-success-circle:before { content: \"\\EA07\" } /* '' */\n.weui-icon-success-no-circle:before { content: \"\\EA08\" } /* '' */\n.weui-icon-waiting:before { content: \"\\EA09\" } /* '' */\n.weui-icon-waiting-circle:before { content: \"\\EA0A\" } /* '' */\n.weui-icon-warn:before { content: \"\\EA0B\" } /* '' */\n.weui-icon-info-circle:before { content: \"\\EA0C\" } /* '' */\n.weui-icon-cancel:before { content: \"\\EA0D\" } /* '' */\n.weui-icon-search:before { content: \"\\EA0E\" } /* '' */\n.weui-icon-clear:before { content: \"\\EA0F\" } /* '' */\n.weui-icon-back:before { content: \"\\EA10\" } /* '' */\n.weui-icon-delete:before { content: \"\\EA11\" } /* '' */\n","@import \"weui-font\";\n\n[class^=\"weui-icon_\"]:before, [class*=\" weui-icon_\"]:before {\n    margin: 0;\n}\n.weui-icon-success {\n    font-size: 23px;\n    color: #09BB07;\n}\n.weui-icon-waiting {\n    font-size: 23px;\n    color: #10AEFF;\n}\n.weui-icon-warn {\n    font-size: 23px;\n    color: #F43530;\n}\n.weui-icon-info {\n    font-size: 23px;\n    color: #10AEFF;\n}\n\n.weui-icon-success-circle {\n    font-size: 23px;\n    color: #09BB07;\n}\n.weui-icon-success-no-circle {\n    font-size: 23px;\n    color: #09BB07;\n}\n.weui-icon-waiting-circle {\n    font-size: 23px;\n    color: #10AEFF;\n}\n.weui-icon-circle {\n    font-size: 23px;\n    color: #C9C9C9;\n}\n.weui-icon-download {\n    font-size: 23px;\n    color: #09BB07;\n}\n\n.weui-icon-info-circle {\n    font-size: 23px;\n    color: #09BB07;\n}\n\n.weui-icon-safe-success {\n    color: #09BB07;\n}\n.weui-icon-safe-warn {\n    color: #FFBE00;\n}\n\n.weui-icon-cancel {\n    color: #F43530;\n    font-size: 22px;\n}\n\n.weui-icon-search {\n    color: #B2B2B2;\n    font-size: 14px;\n}\n\n.weui-icon-clear {\n    color: #B2B2B2;\n    font-size: 14px;\n}\n\n.weui-icon-delete {\n    &.weui-icon_gallery-delete{\n        color:#FFFFFF;\n        font-size:22px;\n    }\n}\n\n.weui-icon_msg {\n    font-size: 93px;\n    &.weui-icon-warn {\n        color: #F76260;\n    }\n}\n.weui-icon_msg-primary {\n    font-size: 93px;\n    &.weui-icon-warn {\n        color: #FFBE00;\n    }\n}\n","@import \"../../base/fn\";\n\n.weui-btn {\n    position: relative;\n    display: block;\n    margin-left: auto;\n    margin-right: auto;\n    padding-left: 14px;\n    padding-right: 14px;\n    box-sizing: border-box;\n    font-size: @weuiBtnFontSize;\n    text-align: center;\n    text-decoration: none;\n    color: @weuiBtnFontColor;\n    line-height: unit(@weuiBtnHeight/@weuiBtnFontSize);\n    border-radius: @weuiBtnBorderRadius;\n    .setTapColor();\n    overflow: hidden;\n    &:after {\n        content: \" \";\n        width: 200%;\n        height: 200%;\n        position: absolute;\n        top: 0;\n        left: 0;\n        border: 1px solid rgba(0, 0, 0, .2);\n        transform: scale(.5);\n        transform-origin: 0 0;\n        box-sizing: border-box;\n        border-radius: @weuiBtnBorderRadius*2;\n    }\n}\n.weui-btn_inline {\n    display: inline-block;\n}","@import \"../../base/fn\";\n\n.weui-btn_default {\n    color: @weuiBtnDefaultFontColor;\n    background-color: @weuiBtnDefaultBg;\n    &:not(.weui-btn_disabled):visited {\n        color: @weuiBtnDefaultFontColor;\n    }\n    &:not(.weui-btn_disabled):active {\n        color: @weuiBtnDefaultActiveFontColor;\n        background-color: @weuiBtnDefaultActiveBg;\n    }\n}","@import \"../../base/fn\";\n\n.weui-btn_primary {\n    background-color: @weuiBtnPrimaryBg;\n    &:not(.weui-btn_disabled):visited {\n        color: @weuiBtnFontColor;\n    }\n    &:not(.weui-btn_disabled):active {\n        color: @weuiBtnActiveFontColor;\n        background-color: @weuiBtnPrimaryActiveBg;\n    }\n}\n","@import \"../../base/fn\";\n\n.weui-btn_warn {\n    background-color: @weuiBtnWarnBg;\n    &:not(.weui-btn_disabled):visited {\n        color: @weuiBtnFontColor;\n    }\n    &:not(.weui-btn_disabled):active {\n        color: @weuiBtnActiveFontColor;\n        background-color: @weuiBtnWarnActiveBg;\n    }\n}\n","@import \"../../base/fn\";\n\n.weui-btn_disabled {\n    color: @weuiBtnDisabledFontColor;\n    &.weui-btn_default {\n        color: @weuiBtnDefaultDisabledFontColor;\n        background-color: @weuiBtnDefaultDisabledBg;\n    }\n    &.weui-btn_primary {\n        background-color: @weuiBtnPrimaryDisabledBg;\n    }\n    &.weui-btn_warn {\n        background-color: @weuiBtnwarnDisabledBg;\n    }\n}\n","@import \"../../base/fn\";\n\n.weui-btn_loading{\n\t.weui-loading{\n\t\tmargin:-.2em .34em 0 0;\n\t}\n    &.weui-btn_primary, &.weui-btn_warn {\n        color: @weuiBtnActiveFontColor;\n\t\t.weui-loading{\n\t\t\tbackground-image:url(\"data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='120' height='120' viewBox='0 0 100 100'%3E%3Cpath fill='none' d='M0 0h100v100H0z'/%3E%3Crect xmlns='http://www.w3.org/2000/svg' width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.56)' rx='5' ry='5' transform='translate(0 -30)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.5)' rx='5' ry='5' transform='rotate(30 105.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.43)' rx='5' ry='5' transform='rotate(60 75.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.38)' rx='5' ry='5' transform='rotate(90 65 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.32)' rx='5' ry='5' transform='rotate(120 58.66 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.28)' rx='5' ry='5' transform='rotate(150 54.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.25)' rx='5' ry='5' transform='rotate(180 50 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.2)' rx='5' ry='5' transform='rotate(-150 45.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.17)' rx='5' ry='5' transform='rotate(-120 41.34 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.14)' rx='5' ry='5' transform='rotate(-90 35 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.1)' rx='5' ry='5' transform='rotate(-60 24.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.03)' rx='5' ry='5' transform='rotate(-30 -5.98 65)'/%3E%3C/svg%3E\");\n\t\t}\n    }\n\t&.weui-btn_primary{\n        background-color: @weuiBtnPrimaryActiveBg;\n\t}\n\t&.weui-btn_warn{\n        background-color: @weuiBtnWarnActiveBg;\n\t}\n}\n","@import \"../../base/fn\";\n\n.weui-btn_plain-primary {\n    color: @weuiBtnPlainPrimaryColor;\n    border: 1px solid @weuiBtnPlainPrimaryBorderColor;\n    &:not(.weui-btn_plain-disabled):active {\n        color:@weuiBtnPlainPrimaryActiveColor;\n        border-color: @weuiBtnPlainPrimaryActiveBorderColor;\n    }\n    &:after {\n        border-width: 0;\n    }\n}\n\n.weui-btn_plain-default {\n    color: @weuiBtnPlainDefaultColor;\n    border: 1px solid @weuiBtnPlainDefaultBorderColor;\n    &:not(.weui-btn_plain-disabled):active {\n        color:@weuiBtnPlainDefaultActiveColor;\n        border-color: @weuiBtnPlainDefaultActiveBorderColor;\n    }\n    &:after {\n        border-width: 0;\n    }\n}\n.weui-btn_plain-disabled{\n    color:rgba(0,0,0,.2);\n    border-color:rgba(0,0,0,.2);\n}","@import \"../../base/fn\";\n@import \"weui-btn_global\";\n@import \"weui-btn_default\";\n@import \"weui-btn_primary\";\n@import \"weui-btn_warn\";\n@import \"weui-btn_disabled\";\n@import \"weui-btn_loading\";\n@import \"weui-btn_plain\";\n\nbutton, input {\n    &.weui-btn {\n        width: 100%;\n        border-width: 0;\n        outline: 0;\n        -webkit-appearance: none;\n        &:focus {\n            outline: 0;\n        }\n    }\n    &.weui-btn_inline,&.weui-btn_mini {\n        width: auto;\n    }\n    &.weui-btn_plain-primary,&.weui-btn_plain-default{\n        border-width: 1px;\n        background-color: transparent;\n    }\n}\n\n.weui-btn_mini {\n    display: inline-block;\n    padding: 0 1.32em;\n    line-height: @weuiBtnMiniHeight;\n    font-size: @weuiBtnMiniFontSize;\n}\n\n\n/*gap between btn*/\n.weui-btn + .weui-btn {\n    margin-top: @weuiBtnDefaultGap;\n}\n\n.weui-btn.weui-btn_inline + .weui-btn.weui-btn_inline {\n    margin-top: auto;\n    margin-left: @weuiBtnDefaultGap;\n}\n\n.weui-btn-area {\n    margin: @weuiCellsMarginTop @weuiBtnDefaultGap .3em; \n}\n.weui-btn-area_inline {\n    display: flex;\n    .weui-btn {\n        margin-top: auto;\n        margin-right: @weuiBtnDefaultGap;\n        width: 100%;\n        flex: 1;\n        &:last-child {\n            margin-right: 0;\n        }\n    }\n}\n","@import \"../../base/fn\";\n\n.weui-cells {\n    margin-top: @weuiCellsMarginTop;\n    background-color: @weuiCellBg;\n    line-height: @weuiCellLineHeight;\n    font-size: @weuiCellFontSize; //cell中间有效高度23px，跟客户端默认图标尺寸一致\n\n    overflow: hidden; //因为每个cell的border使用before元素left搞的，ie下伪元素的containing block估计跟标准不同，在cell上用oh不生效\n\n    // onepx\n    position: relative;\n    &:before {\n        .setTopLine(@weuiCellBorderColor);\n    }\n    &:after {\n        .setBottomLine(@weuiCellBorderColor);\n    }\n}\n\n.weui-cells__title {\n    margin-top: .77em; // 15px - 行高\n    margin-bottom: .3em; // 8px - 行高\n    padding-left: @weuiCellGapH;\n    padding-right: @weuiCellGapH;\n    color: @weuiTextColorGray;\n    font-size: @weuiCellTipsFontSize;\n\n    & + .weui-cells {\n        margin-top: 0;\n    }\n}\n\n.weui-cells__tips {\n    margin-top: .3em; // 8px - 行高\n    color: @weuiTextColorGray;\n    padding-left: @weuiCellGapH;\n    padding-right: @weuiCellGapH;\n    font-size: @weuiCellTipsFontSize;\n}\n\n.weui-cell {\n    padding: @weuiCellGapV @weuiCellGapH;\n    position: relative; //这个是为了兼容cells容器onepx方案被before挡住而做的\n    display: flex;\n    align-items: center;\n    &:before {\n        .setTopLine(@weuiCellBorderColor);\n        left: @weuiCellGapH;\n    }\n    &:first-child {\n        &:before {\n            display: none;\n        }\n    }\n}\n.weui-cell_primary{\n    align-items: flex-start;\n}\n.weui-cell__bd{\n    flex: 1;\n}\n.weui-cell__ft {\n    text-align: right;\n    color: @weuiTextColorGray;\n}",".setTopLine(@c: #C7C7C7) {\n    content: \" \";\n    position: absolute;\n    left: 0;\n    top: 0;\n    right: 0;\n    height: 1px;\n    border-top: 1px solid @c;\n    color: @c;\n    transform-origin: 0 0;\n    transform: scaleY(0.5);\n}\n\n.setBottomLine(@c: #C7C7C7) {\n    content: \" \";\n    position: absolute;\n    left: 0;\n    bottom: 0;\n    right: 0;\n    height: 1px;\n    border-bottom: 1px solid @c;\n    color: @c;\n    transform-origin: 0 100%;\n    transform: scaleY(0.5);\n}\n\n.setLeftLine(@c: #C7C7C7) {\n    content: \" \";\n    position: absolute;\n    left: 0;\n    top: 0;\n    width: 1px;\n    bottom: 0;\n    border-left: 1px solid @c;\n    color: @c;\n    transform-origin: 0 0;\n    transform: scaleX(0.5);\n}\n\n.setRightLine(@c: #C7C7C7) {\n    content: \" \";\n    position: absolute;\n    right: 0;\n    top: 0;\n    width: 1px;\n    bottom: 0;\n    border-right: 1px solid @c;\n    color: @c;\n    transform-origin: 100% 0;\n    transform: scaleX(0.5);\n}","@import \"../../base/fn\";\n\n.weui-cell_access {\n    .setTapColor();\n    color: inherit;\n    &:active {\n        background-color: #ECECEC;\n    }\n    .weui-cell__ft {\n        padding-right: 13px;\n        position: relative;\n        &:after {\n            content: \" \";\n            .setArrow(right, 6px, #C8C8CD, 2px);\n            position: absolute;\n            top: 50%;\n            margin-top: -4px;\n            right: 2px;\n        }\n    }\n}\n.weui-cell_link{\n    color: @weuiLinkColorDefault;\n    font-size: 14px;\n\n    // 由于weui-cell:first-child的:before为隐藏，所以这里要重新显示出来\n    &:first-child{\n        &:before{\n            display: block;\n        }\n    }\n}\n","._setArrow(@arrowsize, @borderColor, @borderWidth){\n    display: inline-block;\n    height: @arrowsize;\n    width: @arrowsize;\n    border-width: @borderWidth @borderWidth 0 0;\n    border-color: @borderColor;\n    border-style: solid;\n}\n\n.setArrow(@direction, @arrowsize, @borderColor, @borderWidth) when (@direction = top) {\n    ._setArrow(@arrowsize, @borderColor, @borderWidth);\n    transform: matrix(0.71,-0.71,0.71,0.71,0,0); // rotate(-45deg)\n}\n\n.setArrow(@direction, @arrowsize, @borderColor,@borderWidth) when (@direction = right) {\n    ._setArrow(@arrowsize, @borderColor, @borderWidth);\n    transform: matrix(0.71,0.71,-0.71,0.71,0,0); // rotate(45deg);\n\n    position: relative;\n    top: -2px;\n}\n\n.setArrow(@direction, @arrowsize, @borderColor,@borderWidth) when (@direction = down) {\n    ._setArrow(@arrowsize, @borderColor, @borderWidth);\n    transform: matrix(-0.71,0.71,-0.71,-0.71,0,0); // rotate(135deg);\n\n    position: relative;\n    top: -3px;\n}\n\n.setArrow(@direction, @arrowsize, @borderColor,@borderWidth) when (@direction = left) {\n    ._setArrow(@arrowsize, @borderColor, @borderWidth);\n    transform: matrix(-0.71,-0.71,0.71,-0.71,0,0); // rotate(-135deg);\n\n    position: relative;\n    top: -2px;\n}","@import \"../../../base/fn\";\n\n.weui-check__label {\n    .setTapColor();\n    &:active {\n        background-color: #ECECEC;\n    }\n}\n\n.weui-check{\n    position: absolute;\n    left: -9999em;\n}\n","@import \"../../../base/fn\";\n\n// method2 accessbility\n.weui-cells_radio{\n    .weui-cell__ft {\n        padding-left: @weuiCellInnerGapH;\n    }\n}\n.weui-check {\n    // radio\n    .weui-cells_radio & {\n        &:checked {\n            & + .weui-icon-checked {\n                &:before {\n                    display: block;\n                    content: '\\EA08';\n                    color: #09BB07;\n                    font-size: 16px;\n                }\n            }\n        }\n    }\n}","@import \"../../../base/fn\";\n\n.weui-cells_checkbox {\n    .weui-cell__hd {\n        padding-right: @weuiCellInnerGapH;\n    }\n    .weui-icon-checked {\n        &:before {\n            content: '\\EA01';\n            color: #C9C9C9;\n            font-size: 23px;\n            display: block;\n        }\n    }\n}\n\n// method2 accessbility\n.weui-check {\n    // checkbox\n    .weui-cells_checkbox & {\n        &:checked {\n            & + .weui-icon-checked {\n                &:before {\n                    content: '\\EA06';\n                    color: #09BB07;\n                }\n            }\n        }\n    }\n}","@import \"../../../base/fn\";\n\n.weui-label{\n  display:block;\n  width:@weuiCellLabelWidth;\n  .text_wrap();\n}\n.weui-input {\n    width: 100%;\n    border: 0;\n    outline: 0;\n    -webkit-appearance: none;\n    background-color: transparent;\n    font-size: inherit;\n    color: inherit;\n    height: unit(@weuiCellLineHeight, em);\n    line-height: @weuiCellLineHeight;\n\n    // hides the spin-button\n    &::-webkit-outer-spin-button, &::-webkit-inner-spin-button{\n        -webkit-appearance: none;\n        margin: 0;\n    }\n}\n.weui-textarea {\n    display: block;\n    border: 0;\n    resize: none;\n    width: 100%;\n    color: inherit;\n    font-size: 1em;\n    line-height: inherit;\n    outline: 0;\n}\n\n.weui-textarea-counter{\n    color: @weuiTextColorTips;\n    text-align: right;\n    .weui-cell_warn &{\n        color: @weuiTextColorWarn;\n    }\n}\n\n.weui-toptips {\n    display:none;\n    position: fixed;\n    transform: translateZ(0);\n    top: 0;\n    left: 0;\n    right: 0;\n    padding:5px;\n    font-size:14px;\n    text-align: center;\n    color: #FFF;\n    z-index: 5000;\n    .text_wrap();\n}\n.weui-toptips_warn {\n    background-color: @weuiColorWarn;\n}\n.weui-cells_form {\n    .weui-cell__ft{\n        font-size:0;\n    }\n    .weui-icon-warn{\n        display:none;\n    }\n    input, textarea, label[for]{\n        .setTapColor();\n    }\n}\n.weui-cell_warn{\n    color:@weuiTextColorWarn;\n    .weui-icon-warn{display:inline-block;}\n}\n",".ellipsis(@w:auto) {\n    width: @w;\n    overflow: hidden;\n    text-overflow: ellipsis;\n    white-space: nowrap;\n    word-wrap: normal;\n}\n\n.ellipsisLn(@line) {\n    overflow: hidden;\n    text-overflow: ellipsis;\n    display: -webkit-box;\n    -webkit-box-orient: vertical;\n    -webkit-line-clamp: @line;\n}\n.text_wrap() {\n    word-wrap:break-word;\n    word-break:break-all;\n}\n.hyphens() {\n    word-wrap:break-word;\n    -webkit-hyphens:auto;\n    hyphens:auto;\n}","@import \"../../../base/fn\";\n\n.weui-form-preview{\n    position: relative;\n    background-color: #FFFFFF;\n    &:before{\n        .setTopLine(@weuiCellBorderColor);\n    }\n    &:after{\n        .setBottomLine(@weuiCellBorderColor);\n    }\n}\n.weui-form-preview__hd{\n    position: relative;\n    padding: @weuiCellGapV @weuiCellGapH;\n    text-align: right;\n    line-height: 2.5em;\n    &:after{\n        .setBottomLine(@weuiCellBorderColor);\n        left: @weuiCellGapH;\n    }\n    .weui-form-preview__value{\n        font-style: normal;\n        font-size: 1.6em;\n    }\n}\n.weui-form-preview__bd{\n    padding: @weuiCellGapV @weuiCellGapH;\n    font-size: .9em;\n    text-align: right;\n    color: @weuiTextColorGray;\n    line-height: 2;\n}\n.weui-form-preview__ft{\n    position: relative;\n    line-height: 50px;\n    display: flex;\n    &:after {\n        .setTopLine(@weuiDialogLineColor);\n    }\n}\n.weui-form-preview__item{\n    overflow: hidden;\n}\n.weui-form-preview__label{\n    float: left;\n    margin-right: 1em;\n    min-width: 4em;\n    color: @weuiTextColorGray;\n    text-align: justify;\n    text-align-last: justify;\n}\n.weui-form-preview__value{\n    display: block;\n    overflow: hidden;\n    word-break:normal;\n    word-wrap: break-word;\n}\n.weui-form-preview__btn {\n    position: relative;\n    display: block;\n    flex: 1;\n    color: @weuiDialogLinkColor;\n    text-align: center;\n    .setTapColor();\n    button&{\n        background-color: transparent;\n        border: 0;\n        outline: 0;\n        line-height: inherit;\n        font-size: inherit;\n    }\n    &:active {\n        background-color: @weuiDialogLinkActiveBc;\n    }\n    &:after {\n        .setLeftLine(@weuiDialogLineColor);\n    }\n    &:first-child {\n        &:after {\n            display: none;\n        }\n    }\n}\n.weui-form-preview__btn_default {\n    color: @weuiTextColorGray;\n}\n.weui-form-preview__btn_primary {\n    color: #0BB20C;\n}","@import \"../../../base/fn\";\n\n.weui-cell_select {\n    padding: 0;\n    .weui-select {\n        padding-right: 30px;\n    }\n    .weui-cell__bd{\n        &:after{\n            content: \" \";\n            .setArrow(right, 6px, #C8C8CD, 2px);\n\n            position: absolute;\n            top: 50%;\n            right: @weuiCellGapH;\n            margin-top: -4px;\n        }\n    }\n}\n\n.weui-select {\n    -webkit-appearance: none;\n    border: 0;\n    outline: 0;\n    background-color: transparent;\n    width: 100%;\n    font-size: inherit;\n    height: @weuiCellHeight;\n    line-height: @weuiCellHeight;\n    position: relative;\n    z-index: 1;\n    padding-left: @weuiCellGapH;\n}\n\n.weui-cell_select-before {\n    padding-right:@weuiCellGapH;\n    .weui-select{\n        width:@weuiCellLabelWidth;\n        box-sizing: border-box;\n    }\n    .weui-cell__hd {\n        position:relative;\n        &:after {\n            .setRightLine(@weuiCellBorderColor);\n        }\n        &:before{\n            content: \" \";\n            .setArrow(right, 6px, #C8C8CD, 2px);\n\n            position: absolute;\n            top: 50%;\n            right: @weuiCellGapH;\n            margin-top: -4px;\n        }\n    }\n    .weui-cell__bd {\n        padding-left:@weuiCellGapH;\n        &:after{\n            display:none;\n        }\n    }\n}\n\n.weui-cell_select-after {\n    padding-left:@weuiCellGapH;\n    .weui-select {\n        padding-left:0;\n    }\n}","@import \"../../../base/fn\";\n\n.weui-cell_vcode {\n    padding-top: 0;\n    padding-right: 0;\n    padding-bottom: 0;\n}\n.weui-vcode-img{\n    margin-left: 5px;\n    height: @weuiCellHeight;\n    vertical-align: middle;\n}\n\n.weui-vcode-btn {\n    display: inline-block;\n    height: @weuiCellHeight;\n    margin-left: 5px;\n    padding: 0 0.6em 0 0.7em;\n    border-left: 1px solid @weuiLineColorLight;\n    line-height: @weuiCellHeight;\n    vertical-align: middle;\n    font-size: @weuiCellFontSize;\n    color: @weuiDialogLinkColor;\n    button&{\n        background-color: transparent;\n        border-top: 0;\n        border-right: 0;\n        border-bottom: 0;\n        outline: 0;\n    }\n    &:active {\n        color: desaturate(@weuiDialogLinkColor, 30%);\n    }\n}","@import \"../../base/fn\";\n\n@weuiGalleryOprHeight: 60px;\n.weui-gallery {\n    display: none;\n    position: fixed;\n    top: 0;\n    right: 0;\n    bottom: 0;\n    left: 0;\n    background-color: #000000;\n    z-index: 1000;\n}\n.weui-gallery__img {\n    position: absolute;\n    top: 0;\n    right: 0;\n    bottom: @weuiGalleryOprHeight;\n    left: 0;\n    background: center center no-repeat;\n    background-size: contain;\n}\n.weui-gallery__opr {\n    position: absolute;\n    right: 0;\n    bottom: 0;\n    left: 0;\n    background-color: #0D0D0D;\n    color: #FFFFFF;\n    line-height: @weuiGalleryOprHeight;\n    text-align: center;\n}\n.weui-gallery__del {\n    display: block;\n}","@import \"../../base/fn\";\n\n.weui-cell_switch{\n    padding-top: (@weuiCellHeight - @weuiSwitchHeight) / 2;\n    padding-bottom: (@weuiCellHeight - @weuiSwitchHeight) / 2;\n}\n.weui-switch{\n    appearance: none;\n}\n.weui-switch,\n.weui-switch-cp__box{\n    position: relative;\n    width: 52px;\n    height: @weuiSwitchHeight;\n    border: 1px solid #DFDFDF;\n    outline: 0;\n    border-radius: 16px;\n    box-sizing: border-box;\n    background-color: #DFDFDF;\n    transition: background-color .1s, border .1s;\n\n    &:before{\n        content: \" \";\n        position: absolute;\n        top: 0;\n        left: 0;\n        width: 50px;\n        height: @weuiSwitchHeight - 2;\n        border-radius: 15px;\n        background-color: #FDFDFD;\n        transition:transform .35s cubic-bezier(0.45, 1, 0.4, 1);\n    }\n    &:after{\n        content: \" \";\n        position: absolute;\n        top: 0;\n        left: 0;\n        width: @weuiSwitchHeight - 2;\n        height: @weuiSwitchHeight - 2;\n        border-radius: 15px;\n        background-color: #FFFFFF;\n        box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);\n        transition:transform .35s cubic-bezier(0.4, 0.4, 0.25, 1.35);\n    }\n}\n.weui-switch:checked,\n.weui-switch-cp__input:checked ~ .weui-switch-cp__box{\n    border-color: #04BE02;\n    background-color: #04BE02;\n    &:before {\n        transform: scale(0);\n    }\n    &:after {\n        transform: translateX(20px);\n    }\n}\n\n// 兼容IE Edge的版本\n.weui-switch-cp__input{\n    position: absolute;\n    left: -9999px;\n}\n.weui-switch-cp__box{\n    display: block;\n}","@import \"../../base/fn\";\n\n.weui-uploader{}\n.weui-uploader__hd{\n    display: flex;\n    padding-bottom: @weuiCellGapV;\n    align-items: center;\n}\n.weui-uploader__title{\n    flex: 1;\n}\n.weui-uploader__info{\n    color: @weuiTextColorTips;\n}\n\n.weui-uploader__bd{\n    margin-bottom: @weuiCellGapH - (@weuiCellGapV + @weuiUploaderFileSpacing);\n    margin-right: -@weuiUploaderFileSpacing;\n    overflow: hidden;\n}\n.weui-uploader__files{\n    list-style: none;\n}\n.weui-uploader__file{\n    float: left;\n    margin-right: @weuiUploaderFileSpacing;\n    margin-bottom: @weuiUploaderFileSpacing;\n    width: @weuiUploaderSize;\n    height: @weuiUploaderSize;\n    background: no-repeat center center;\n    background-size: cover;\n}\n.weui-uploader__file_status{\n    position: relative;\n    &:before{\n        content: \" \";\n        position: absolute;\n        top: 0;\n        right: 0;\n        bottom: 0;\n        left: 0;\n        background-color: rgba(0, 0, 0, .5);\n    }\n    .weui-uploader__file-content{\n        display: block;\n    }\n}\n.weui-uploader__file-content{\n    display: none;\n    position: absolute;\n    top: 50%;\n    left: 50%;\n    transform: translate(-50%, -50%);\n    color: #FFFFFF;\n    .weui-icon-warn{\n        display: inline-block;\n    }\n}\n.weui-uploader__input-box{\n    float:left;\n    position: relative;\n    margin-right: @weuiUploaderFileSpacing;\n    margin-bottom: @weuiUploaderFileSpacing;\n    width: @weuiUploaderSize - @weuiUploaderBorderWidth * 2;\n    height: @weuiUploaderSize - @weuiUploaderBorderWidth * 2;\n    border: @weuiUploaderBorderWidth solid @weuiUploaderBorderColor;\n    &:before, &:after{\n        content: \" \";\n        position: absolute;\n        top: 50%;\n        left: 50%;\n        transform: translate(-50%, -50%);\n        background-color: @weuiUploaderBorderColor;\n    }\n    &:before{\n        width: @weuiUploaderBorderWidth + 1;\n        height: @weuiUploaderSize / 2;\n    }\n    &:after{\n        width: @weuiUploaderSize / 2;\n        height: @weuiUploaderBorderWidth + 1;\n    }\n    &:active{\n        border-color: @weuiUploaderActiveBorderColor;\n        &:before, &:after{\n            background-color: @weuiUploaderActiveBorderColor;\n        }\n    }\n}\n.weui-uploader__input{\n    position: absolute;\n    z-index: 1;\n    top: 0;\n    left: 0;\n    width: 100%;\n    height: 100%;\n    opacity: 0;\n    .setTapColor();\n}","@import \"../../base/fn\";\n@import \"../weui-button/weui-button\";\n\n.weui-msg {\n    padding-top: @weuiMsgPaddingTop;\n    text-align: center;\n}\n.weui-msg__icon-area {\n    margin-bottom: @weuiMsgIconGap;\n}\n.weui-msg__text-area {\n    margin-bottom: @weuiMsgTextGap;\n    padding:0 20px;\n}\n.weui-msg__text-area a{\n    color:@weuiLinkColorDefault;\n}\n.weui-msg__title {\n    margin-bottom: @weuiMsgTitleGap;\n    font-weight: 400;\n    font-size: 20px;\n}\n.weui-msg__desc {\n    font-size: 14px;\n    color: @weuiTextColorGray;\n}\n.weui-msg__opr-area {\n    margin-bottom: @weuiMsgOprGap;\n}\n.weui-msg__extra-area {\n    margin-bottom: @weuiMsgExtraAreaGap;\n    font-size: 14px;\n    color: @weuiTextColorGray;\n    a{color: @weuiLinkColorDefault;}\n}\n\n@media screen and (min-height: @weuiMsgExtraAreaOfMinHeight) {\n    .weui-msg__extra-area {\n        position: fixed;\n        left: 0;\n        bottom: 0;\n        width: 100%;\n        text-align: center;\n    }\n}","@import \"../../base/fn\";\n\n.weui-article {\n    padding: 20px 15px;\n    font-size: 15px;\n    section {\n        margin-bottom: 1.5em;\n    }\n    h1 {\n        font-size: 18px;\n        font-weight:400;\n        margin-bottom: .9em;\n    }\n    h2 {\n        font-size: 16px;\n        font-weight:400;\n        margin-bottom: .34em;\n    }\n    h3 {\n        font-weight:400;\n        font-size: 15px;\n        margin-bottom: .34em;\n    }\n    * {\n        max-width: 100%;\n        box-sizing: border-box;\n        word-wrap: break-word;\n    }\n    p {\n        margin: 0 0 .8em;\n    }\n}","@import \"../../base/fn\";\n\n.weui-tabbar {\n    display: flex;\n    position: absolute;\n    z-index: 500;\n    bottom: 0;\n    width: 100%;\n    background-color: #F7F7FA;\n\n    &:before {\n        .setTopLine(#C0BFC4);\n    }\n}\n\n.weui-tabbar__item {\n    display: block;\n    flex: 1;\n    padding: 5px 0 0;\n    font-size: 0;\n    color: @weuiTextColorGray;\n    text-align: center;\n    .setTapColor();\n\n    &.weui-bar__item_on {\n        .weui-tabbar__icon,\n        .weui-tabbar__icon > i,\n        .weui-tabbar__label {\n            color: #09BB07;\n        }\n    }\n}\n\n.weui-tabbar__icon {\n    display: inline-block;\n    width: 27px;\n    height: 27px;\n\n    i&,\n    > i {\n        font-size: 24px;\n        color: @weuiTextColorGray;\n    }\n\n    img {\n        width: 100%;\n        height: 100%;\n    }\n}\n\n.weui-tabbar__label {\n    text-align: center;\n    color: @weuiTextColorGray;\n    font-size: 10px;\n    line-height: 1.8;\n}","@import \"../../base/fn\";\n\n.weui-navbar {\n    display: flex;\n    position: absolute;\n    z-index: 500;\n    top: 0;\n    width: 100%;\n    background-color: #FAFAFA;\n\n    &:after {\n        .setBottomLine(#CCCCCC);\n    }\n\n    & + .weui-tab__panel {\n        padding-top: 50px;\n        padding-bottom: 0;\n    }\n}\n\n.weui-navbar__item {\n    position: relative;\n    display: block;\n    flex: 1;\n    padding: 13px 0;\n    text-align: center;\n    font-size: 15px;\n    .setTapColor();\n\n    &:active {\n        background-color: #EDEDED;\n    }\n\n    &.weui-bar__item_on {\n        background-color: #EAEAEA;\n    }\n\n    &:after {\n        .setRightLine(#CCCCCC);\n    }\n\n    &:last-child {\n        &:after {\n            display: none;\n        }\n    }\n}","@import \"../../base/fn\";\n@import \"weui-tabbar\";\n@import \"weui-navbar\";\n\n.weui-tab {\n    position: relative;\n    height: 100%;\n}\n\n.weui-tab__panel {\n    box-sizing: border-box;\n    height: 100%;\n    padding-bottom: 50px;\n    overflow: auto;\n    -webkit-overflow-scrolling: touch;\n}\n.weui-tab__content{\n    display: none;\n}","@import \"../../base/fn\";\n\n.weui-progress {\n    display: flex;\n    align-items: center;\n}\n\n.weui-progress__bar {\n    background-color: @weuiProgressBg;\n    height: @weuiProgressHeight;\n    flex: 1;\n}\n\n.weui-progress__inner-bar {\n    width: 0;\n    height: 100%;\n    background-color: @weuiProgressColor;\n}\n\n.weui-progress__opr {\n    display: block;\n    margin-left: 15px;\n    font-size: 0;\n}","@import \"../../base/fn\";\n\n\n.weui-panel {\n    background-color: #FFFFFF;\n    margin-top: 10px;\n    &:first-child {\n        margin-top: 0;\n    }\n\n    position: relative;\n    overflow: hidden;\n    &:before {\n        .setTopLine(@weuiLineColorLight);\n    }\n    &:after {\n        .setBottomLine(@weuiLineColorLight);\n    }\n}\n\n.weui-panel__hd {\n    padding: 14px 15px 10px;\n    color: @weuiTextColorGray;\n    font-size: 13px;\n    position: relative;\n    &:after {\n        .setBottomLine(@weuiLineColorLight);\n        left: 15px;\n    }\n}\n\n\n\n\n","@import \"../../base/fn\";\n\n.weui-media-box {\n    padding: 15px;\n    position: relative;\n    &:before {\n        .setTopLine(@weuiLineColorLight);\n        left: 15px;\n    }\n    &:first-child {\n        &:before {\n            display: none\n        }\n    }\n\n    a&{\n        color:#000000;\n        .setTapColor();\n        &:active{\n            background-color:#ECECEC;\n        }\n    }\n}\n.weui-media-box__title {\n    font-weight: 400;\n    font-size: 17px;\n    .ellipsis();\n    word-wrap: break-word;\n    word-break: break-all;\n}\n.weui-media-box__desc {\n    color: @weuiTextColorGray;\n    font-size: 13px;\n    line-height: 1.2;\n    .ellipsisLn(2);\n}\n.weui-media-box__info {\n    margin-top: 15px;\n    padding-bottom: 5px;\n    font-size: 13px;\n    color: #CECECE;\n    line-height: 1em;\n    list-style: none;\n    overflow: hidden;\n}\n.weui-media-box__info__meta {\n    float: left;\n    padding-right: 1em;\n}\n.weui-media-box__info__meta_extra {\n    padding-left: 1em;\n    border-left: 1px solid #CECECE;\n}\n.weui-media-box_text {\n    .weui-media-box__title {\n        margin-bottom: 8px;\n    }\n}\n.weui-media-box_appmsg {\n    display: flex;\n    align-items: center;\n    .weui-media-box__hd {\n        margin-right: .8em;\n        width: 60px;\n        height: 60px;\n        line-height: 60px;\n        text-align: center;\n    }\n    .weui-media-box__thumb {\n        width: 100%;\n        max-height: 100%;\n        vertical-align: top;\n    }\n    .weui-media-box__bd {\n        flex: 1;\n        min-width: 0;\n    }\n}\n.weui-media-box_small-appmsg {\n    padding: 0;\n    .weui-cells {\n        margin-top: 0;\n        &:before {\n            display: none;\n        }\n    }\n}","@import \"../../base/fn\";\n\n.weui-grids {\n    position: relative;\n    overflow: hidden;\n\n    &:before {\n        .setTopLine(@weuiGridBorderColor);\n    }\n    &:after {\n        .setLeftLine(@weuiGridBorderColor);\n    }\n}\n\n.weui-grid {\n    position: relative;\n    float: left;\n    padding: 20px 10px;\n    width: 100% / @weuiGridColumnCount;\n    box-sizing: border-box;\n\n    &:before {\n        .setRightLine(@weuiGridBorderColor);\n    }\n    &:after {\n        .setBottomLine(@weuiGridBorderColor);\n    }\n\n    &:active {\n        background-color: @weuiBgColorActive;\n    }\n}\n\n.weui-grid__icon {\n    width: @weuiGridIconSize;\n    height: @weuiGridIconSize;\n    margin: 0 auto;\n\n    img {\n        display: block;\n        width: 100%;\n        height: 100%;\n    }\n\n    & + .weui-grid__label{\n        margin-top: 5px;\n    }\n}\n\n.weui-grid__label {\n    display: block;\n    text-align: center;\n    color: @weuiTextColorTitle;\n    font-size: @weuiGridFontSize;\n    white-space: nowrap;\n    text-overflow: ellipsis;\n    overflow: hidden;\n}\n","@import \"../../base/fn\";\n\n.weui-footer {\n    color: @weuiTextColorGray;\n    font-size: 14px;\n    text-align: center;\n    a{\n        color: @weuiLinkColorDefault;\n    }\n}\n.weui-footer_fixed-bottom{\n    position: fixed;\n    bottom: .52em;\n    left: 0;\n    right: 0;\n}\n.weui-footer__links{\n    font-size: 0;\n}\n.weui-footer__link{\n    display: inline-block;\n    vertical-align: top;\n    margin: 0 .62em;\n    position: relative;\n    font-size: 14px;\n    &:before{\n        .setLeftLine();\n        left: -.65em;\n        top: .36em;\n        bottom: .36em;\n    }\n    &:first-child{\n        &:before{\n            display: none;\n        }\n    }\n}\n.weui-footer__text{\n    padding: 0 .34em;\n    font-size: 12px;\n}","@import \"../../base/fn\";\n\n.weui-flex {\n    display: flex;\n}\n.weui-flex__item{\n    flex: 1;\n}","@import \"../../base/fn\";\n\n.weui-dialog {\n    position: fixed;\n    z-index: 5000;\n    width: 80%;\n    max-width: 300px;\n    top: 50%;\n    left: 50%;\n    transform: translate(-50%, -50%);\n\n    background-color: @weuiDialogBackgroundColor;\n    text-align: center;\n    border-radius: 3px;\n    overflow: hidden;\n}\n.weui-dialog__hd {\n    padding: 1.3em @weuiDialogGapWidth .5em;\n}\n.weui-dialog__title {\n    font-weight: 400;\n    font-size: 18px;\n}\n.weui-dialog__bd {\n    padding: 0 @weuiDialogGapWidth .8em;\n    min-height: 40px;\n    font-size: 15px;\n    line-height: 1.3;\n    word-wrap: break-word;\n    word-break: break-all;\n    color: @weuiTextColorGray;\n    &:first-child{\n        padding:2.7em 20px 1.7em;\n        color:#353535;\n    }\n}\n.weui-dialog__ft {\n    position: relative;\n    line-height: 48px;\n    font-size: 18px;\n    display: flex;\n    &:after {\n        content: \" \";\n        .setTopLine(@weuiDialogLineColor);\n    }\n}\n.weui-dialog__btn {\n    display: block;\n    flex: 1;\n    color: @weuiDialogLinkColor;\n    text-decoration: none;\n    .setTapColor();\n    &:active {\n        background-color: @weuiDialogLinkActiveBc;\n    }\n\n    position: relative;\n    &:after {\n        content: \" \";\n        .setLeftLine(@weuiDialogLineColor);\n    }\n    &:first-child {\n        &:after {\n            display: none;\n        }\n    }\n}\n.weui-dialog__btn_default {\n    color: #353535;\n}\n.weui-dialog__btn_primary {\n    color: #0BB20C;\n}\n\n.weui-skin_android{\n    .weui-dialog {\n        text-align: left;\n        box-shadow: 0 6px 30px 0 rgba(0, 0, 0, .1);\n    }\n    .weui-dialog__title{\n        font-size: 21px;\n    }\n    .weui-dialog__hd{\n        text-align: left;\n    }\n    .weui-dialog__bd{\n        color:@weuiTextColorGray;\n        padding:.25em @weuiDialogGapWidth 2em;\n        font-size: 17px;\n        text-align: left;\n        &:first-child{\n            padding:1.6em @weuiDialogGapWidth 2em;\n            color:#353535;\n        }\n    }\n    .weui-dialog__ft{\n        display: block;\n        text-align: right;\n        line-height: 42px;\n        font-size: 16px;\n        padding:0 @weuiDialogGapWidth .7em;\n        &:after{\n            display: none;\n        }\n    }\n    .weui-dialog__btn{\n        display: inline-block;\n        vertical-align: top;\n        padding:0 .8em;\n        &:after{\n            display: none;\n        }\n\n        &:active{\n            background-color: rgba(0,0,0,.06);\n        }\n        &:visited{\n            background-color: rgba(0,0,0,.06);\n        }\n        &:last-child{\n            margin-right: -.8em;\n        }\n    }\n    .weui-dialog__btn_default {\n        color: #808080;\n    }\n}\n\n@media screen and (min-width: 1024px) {\n    .weui-dialog {\n        width: 35%;\n    }\n}\n","@import \"../../base/fn\";\n\n.weui-toast {\n    position: fixed;\n    z-index: 5000;\n    width: 7.6em;\n    min-height: 7.6em;\n    top: 180px;\n    left: 50%;\n    margin-left: -3.8em;\n    background: rgba(17,17,17,0.7);\n    text-align: center;\n    border-radius: 5px;\n    color: #FFFFFF;\n}\n.weui-icon_toast {\n    margin: 22px 0 0;\n    display: block;\n    &.weui-icon-success-no-circle{\n      &:before {\n          color: #FFFFFF;\n          font-size: 55px;\n      }\n    }\n    &.weui-loading{\n      margin:30px 0 0;\n      width:38px;\n      height:38px;\n      vertical-align: baseline;\n    }\n}\n\n.weui-toast__content {\n    margin: 0 0 15px;\n}\n","@import \"../../base/fn\";\n\n.weui-mask {\n    position: fixed;\n    z-index: 1000;\n    top: 0;\n    right: 0;\n    left: 0;\n    bottom: 0;\n    background: rgba(0, 0, 0, .6);\n}\n\n.weui-mask_transparent{\n    position: fixed;\n    z-index: 1000;\n    top: 0;\n    right: 0;\n    left: 0;\n    bottom: 0;\n}","@import \"../../base/fn\";\n@weuiActionSheetAndroidBorderRadius: 2px;\n\n.weui-actionsheet {\n    position: fixed;\n    left: 0;\n    bottom: 0;\n    transform: translate(0, 100%);\n    backface-visibility: hidden;\n    z-index: 5000;\n    width: 100%;\n    background-color: @weuiBgColorDefault;\n    //slide up animation\n    transition: transform .3s;\n}\n.weui-actionsheet__menu{\n    background-color: #FFFFFF;\n}\n.weui-actionsheet__action {\n    margin-top: 6px;\n    background-color: #FFFFFF;\n}\n.weui-actionsheet__cell {\n    position: relative;\n    padding: 10px 0;\n    text-align: center;\n    font-size: 18px;\n    &:before {\n        .setTopLine(@weuiCellBorderColor);\n    }\n    &:active{\n        background-color: @weuiBgColorActive;\n    }\n    &:first-child{\n        &:before{\n            display: none;\n        }\n    }\n}\n\n\n//android actionSheet\n.weui-skin_android{\n    .weui-actionsheet {\n        position: fixed;\n        left: 50%;\n        top: 50%;\n        bottom: auto;\n        transform: translate(-50%, -50%);\n        //padding: 0 40px;\n        width: 274px;\n        box-sizing: border-box;\n        backface-visibility: hidden;\n        background: transparent;\n        //slide up animation\n        transition: transform .3s;\n    }\n    .weui-actionsheet__action{\n        display: none;\n    }\n    .weui-actionsheet__menu {\n        border-radius: @weuiActionSheetAndroidBorderRadius;\n        box-shadow: 0 6px 30px 0 rgba(0,0,0,.1);\n    }\n    .weui-actionsheet__cell {\n        padding: 13px 24px;\n        font-size: 16px;\n        line-height: 1.4;\n        text-align: left;\n        &:first-child {\n            border-top-left-radius: @weuiActionSheetAndroidBorderRadius;\n            border-top-right-radius: @weuiActionSheetAndroidBorderRadius;\n        }\n        &:last-child {\n            border-bottom-left-radius: @weuiActionSheetAndroidBorderRadius;\n            border-bottom-right-radius: @weuiActionSheetAndroidBorderRadius;\n        }\n    }\n}\n\n//actionSheet aniamtion\n.weui-actionsheet_toggle{\n    transform: translate(0, 0);\n}","@import \"../../base/fn\";\n\n.weui-loadmore{\n    width: 65%;\n    margin:1.5em auto;\n    line-height: 1.6em;\n    font-size:14px;\n    text-align: center;\n}\n.weui-loadmore__tips{\n    display: inline-block;\n    vertical-align: middle;\n}\n\n.weui-loadmore_line{\n    border-top:1px solid @weuiLineColorLight;\n    margin-top:2.4em;\n    .weui-loadmore__tips{\n        position: relative;\n        top:-.9em;\n        padding:0 .55em;\n        background-color: #FFFFFF;\n        color:@weuiTextColorGray;\n    }\n}\n.weui-loadmore_dot{\n    .weui-loadmore__tips{\n        padding:0 .16em;\n        &:before{\n            content: \" \";\n            width:4px;\n            height:4px;\n            border-radius:50%;\n            background-color: @weuiLineColorLight;\n            display: inline-block;\n            position: relative;\n            vertical-align: 0;\n            top:-.16em;\n        }\n    }\n}","@import \"../../base/fn\";\n\n.weui-badge {\n    display: inline-block;\n    padding: .15em .4em;\n    min-width: 8px;\n    border-radius: 18px;\n    background-color: #F43530;\n    color: #FFFFFF;\n    line-height: 1.2;\n    text-align: center;\n    font-size: 12px;\n    vertical-align: middle;\n}\n.weui-badge_dot {\n    padding: .4em;\n    min-width: 0;\n}","@import \"../../base/fn\";\n.weui-search-bar {\n    position: relative;\n    padding: 8px 10px;\n    display: flex;\n    box-sizing: border-box;\n    background-color: #EFEFF4;\n    &:before {\n        .setTopLine(#D7D6DC);\n    }\n    &:after {\n        .setBottomLine(#D7D6DC);\n    }\n    &.weui-search-bar_focusing{\n        .weui-search-bar__cancel-btn{\n            display: block;\n        }\n        .weui-search-bar__label{\n            display: none;\n        }\n    }\n}\n.weui-search-bar__form {\n    position: relative;\n    flex: auto;\n    background-color: #EFEFF4;\n    &:after{\n        content: '';\n        position: absolute;\n        left: 0;\n        top:0;\n        width: 200%;\n        height: 200%;\n        transform: scale(.5);\n        transform-origin: 0 0;\n        border-radius: 10px;\n        border: 1px solid #E6E6EA;\n        box-sizing: border-box;\n        background: #FFFFFF;\n    }\n}\n.weui-search-bar__box {\n    position: relative;\n    padding-left: 30px;\n    padding-right: 30px;\n    height: 100%;\n    width: 100%;\n    box-sizing: border-box;\n    z-index: 1;\n    .weui-search-bar__input {\n        padding: 4px 0;\n        width: 100%;\n        height: 20/14em;\n        border: 0;\n        font-size: 14px;\n        line-height: 20/14em;\n        box-sizing: content-box;\n        background: transparent;\n        &:focus {\n            outline: none;\n        }\n    }\n    .weui-icon-search {\n        position: absolute;\n        left: 10px;\n        top: 0;\n        line-height: 28px;\n    }\n    .weui-icon-clear {\n        position: absolute;\n        top: 0;\n        right: 0;\n        padding: 0 10px;\n        line-height: 28px;\n    }\n}\n.weui-search-bar__label {\n    position: absolute;\n    top: 1px;\n    right: 1px;\n    bottom: 1px;\n    left: 1px;\n    z-index: 2;\n    border-radius: 3px;\n    text-align: center;\n    color: #9B9B9B;\n    background: #FFFFFF;\n    span {\n        display: inline-block;\n        font-size: 14px;\n        vertical-align: middle;\n    }\n    .weui-icon-search {\n        margin-right: 5px;\n    }\n}\n.weui-search-bar__cancel-btn {\n    display: none;\n    margin-left: 10px;\n    line-height: 28px;\n    color: #09BB07;\n    white-space: nowrap;\n}\n.weui-search-bar__input:not(:valid) ~ .weui-icon-clear {\n    display: none;\n}\n\n//干掉input[search]默认的clear button\ninput[type=\"search\"]::-webkit-search-decoration,\ninput[type=\"search\"]::-webkit-search-cancel-button,\ninput[type=\"search\"]::-webkit-search-results-button,\ninput[type=\"search\"]::-webkit-search-results-decoration {\n    display: none;\n}","@import \"../../base/fn\";\n\n.weui-picker {\n    position: fixed;\n    width: 100%;\n    left: 0;\n    bottom: 0;\n    z-index: 5000;\n    backface-visibility: hidden;\n    transform: translate(0, 100%);\n    //slide up animation\n    transition: transform .3s;\n}\n\n.weui-picker__hd {\n    display: flex;\n    padding: 10px 15px;\n    background-color: #fbf9fe;\n    position: relative;\n    text-align: center;\n    &:after {\n        .setBottomLine(@weuiLineColorLight);\n    }\n}\n\n.weui-picker__action {\n    display: block;\n    flex: 1;\n    color: @weuiLinkColorDefault;\n\n    &:first-child {\n        text-align: left;\n    }\n    &:last-child {\n        text-align: right;\n    }\n}\n\n.weui-picker__bd {\n    display: flex;\n    position: relative;\n    background-color: #fff;\n    height: 238px;\n    overflow: hidden;\n}\n\n.weui-picker__group {\n    flex: 1;\n    position: relative;\n    height: 100%;\n    //-webkit-mask-box-image: -webkit-linear-gradient(bottom,transparent,transparent 5%,#fff 50%,#fff 50%,transparent 95%,transparent);\n}\n\n.weui-picker__mask {\n    position: absolute;\n    top: 0;\n    left: 0;\n    width: 100%;\n    height: 100%;\n    margin: 0 auto;\n    z-index: 3;\n    background: linear-gradient(180deg, hsla(0, 0%, 100%, .95), hsla(0, 0%, 100%, .6)), linear-gradient(0deg, hsla(0, 0%, 100%, .95), hsla(0, 0%, 100%, .6));\n    background-position: top, bottom;\n    background-size: 100% 102px;\n    background-repeat: no-repeat;\n    transform: translateZ(0);\n}\n\n.weui-picker__indicator {\n    width: 100%;\n    height: 34px;\n    position: absolute;\n    left: 0;\n    top: 102px;\n    z-index: 3;\n    &:before {\n        .setTopLine(@weuiLineColorLight);\n    }\n    &:after {\n        .setBottomLine(@weuiLineColorLight);\n    }\n}\n\n.weui-picker__content {\n    position: absolute;\n    top: 0;\n    left: 0;\n    width: 100%;\n}\n\n.weui-picker__item {\n    padding: 5px 0 4px;\n    text-align: center;\n    color: #000;\n    text-overflow: ellipsis;\n    white-space: nowrap;\n    overflow: hidden;\n}\n\n.weui-picker__item_disabled {\n    color: @weuiTextColorGray;\n}","@import \"../../base/fn\";\n\n@keyframes slideUp {\n    from {\n        transform: translate3d(0, 100%, 0);\n    }\n\n    to {\n        transform: translate3d(0, 0, 0);\n    }\n}\n\n.weui-animate-slide-up {\n    animation: slideUp ease .3s forwards;\n}\n\n@keyframes slideDown {\n    from {\n        transform: translate3d(0, 0, 0);\n    }\n\n    to {\n        transform: translate3d(0, 100%, 0);\n    }\n}\n\n.weui-animate-slide-down {\n    animation: slideDown ease .3s forwards;\n}\n\n@keyframes fadeIn {\n    from {\n        opacity: 0;\n    }\n    to {\n        opacity: 1;\n    }\n}\n\n.weui-animate-fade-in {\n    animation: fadeIn ease .3s forwards;\n}\n\n@keyframes fadeOut {\n    from {\n        opacity: 1;\n    }\n    to {\n        opacity: 0;\n    }\n}\n\n.weui-animate-fade-out {\n    animation: fadeOut ease .3s forwards;\n}","@import \"../../base/fn\";\n\n.weui-agree{\n    display: block;\n    padding: .5em 15px;\n    font-size :13px;\n\n    a{\n        color: @weuiLinkColorDefault;\n    }\n}\n.weui-agree__text{\n    color: @weuiTextColorGray;\n}\n.weui-agree__checkbox{\n    appearance: none;\n    outline: 0;\n    font-size: 0;\n\n    border: 1px solid #D1D1D1;\n    background-color: #FFFFFF;\n    border-radius: 3px;\n    width: 13px;\n    height: 13px;\n    position: relative;\n\n    vertical-align: 0;\n    top: 2px;\n\n    &:checked{\n        &:before{\n            font-family: \"weui\";\n            font-style: normal;\n            font-weight: normal;\n            font-variant: normal;\n            text-transform: none;\n            text-align: center;\n            speak: none;\n            display: inline-block;\n            vertical-align: middle;\n            text-decoration: inherit;\n            content: \"\\EA08\";\n            color: #09BB07;\n            font-size: 13px;\n\n            position: absolute;\n            top: 50%;\n            left: 50%;\n            transform: translate(-50%,-48%) scale(.73);\n        }\n    }\n    &:disabled{\n        background-color:#E1E1E1;\n        &:before{\n            color:#ADADAD;\n        }\n    }\n}","@import \"../../base/fn\";\n\n.weui-loading {\n  width:20px;\n  height:20px;\n  display: inline-block;\n  vertical-align: middle;\n  animation: weuiLoading 1s steps(12, end) infinite;\n  background: transparent url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMjAiIGhlaWdodD0iMTIwIiB2aWV3Qm94PSIwIDAgMTAwIDEwMCI+PHBhdGggZmlsbD0ibm9uZSIgZD0iTTAgMGgxMDB2MTAwSDB6Ii8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTlFOUU5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTMwKSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iIzk4OTY5NyIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgzMCAxMDUuOTggNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjOUI5OTlBIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDYwIDc1Ljk4IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0EzQTFBMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSg5MCA2NSA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNBQkE5QUEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoMTIwIDU4LjY2IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0IyQjJCMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgxNTAgNTQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjQkFCOEI5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDE4MCA1MCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDMkMwQzEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTE1MCA0NS45OCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDQkNCQ0IiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTEyMCA0MS4zNCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNEMkQyRDIiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTkwIDM1IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0RBREFEQSIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgtNjAgMjQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTJFMkUyIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKC0zMCAtNS45OCA2NSkiLz48L3N2Zz4=) no-repeat;\n  background-size: 100%;\n  &.weui-loading_transparent{\n  \tbackground-image:url(\"data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='120' height='120' viewBox='0 0 100 100'%3E%3Cpath fill='none' d='M0 0h100v100H0z'/%3E%3Crect xmlns='http://www.w3.org/2000/svg' width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.56)' rx='5' ry='5' transform='translate(0 -30)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.5)' rx='5' ry='5' transform='rotate(30 105.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.43)' rx='5' ry='5' transform='rotate(60 75.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.38)' rx='5' ry='5' transform='rotate(90 65 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.32)' rx='5' ry='5' transform='rotate(120 58.66 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.28)' rx='5' ry='5' transform='rotate(150 54.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.25)' rx='5' ry='5' transform='rotate(180 50 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.2)' rx='5' ry='5' transform='rotate(-150 45.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.17)' rx='5' ry='5' transform='rotate(-120 41.34 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.14)' rx='5' ry='5' transform='rotate(-90 35 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.1)' rx='5' ry='5' transform='rotate(-60 24.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.03)' rx='5' ry='5' transform='rotate(-30 -5.98 65)'/%3E%3C/svg%3E\");\n  }\n}\n\n@-webkit-keyframes weuiLoading {\n  0% {\n    transform: rotate3d(0, 0, 1, 0deg);\n  }\n\n  100% {\n    transform: rotate3d(0, 0, 1, 360deg);\n  }\n}\n\n@keyframes weuiLoading {\n  0% {\n    transform: rotate3d(0, 0, 1, 0deg);\n  }\n\n  100% {\n    transform: rotate3d(0, 0, 1, 360deg);\n  }\n}\n","@import \"../../base/fn\";\n\n.weui-slider {\n    padding: 15px 18px;\n    user-select: none;\n}\n\n.weui-slider__inner {\n    position: relative;\n    height: 2px;\n    background-color: #E9E9E9;\n}\n\n.weui-slider__track {\n    height: 2px;\n    background-color: @weuiColorPrimary;\n    width: 0;\n}\n\n.weui-slider__handler {\n    position: absolute;\n    left: 0;\n    top: 50%;\n    width: 28px;\n    height: 28px;\n    margin-left: -14px;\n    margin-top: -14px;\n    border-radius: 50%;\n    background-color: #FFFFFF;\n    box-shadow: 0 0 4px rgba(0, 0, 0, .2);\n}\n\n\n.weui-slider-box{\n    display: flex;\n    align-items: center;\n    .weui-slider{\n        flex: 1;\n    }\n}\n.weui-slider-box__value {\n    margin-left: .5em;\n    min-width: 24px;\n    color: #888888;\n    text-align: center;\n    font-size: 14px;\n}"]} */
diff --git a/NewLife.Cube/Content/jweui/lib/weui.min.css b/NewLife.Cube/Content/jweui/lib/weui.min.css
deleted file mode 100644
index dee6541b7b..0000000000
--- a/NewLife.Cube/Content/jweui/lib/weui.min.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*!
- * WeUI v1.1.1 (https://github.com/weui/weui)
- * Copyright 2017 Tencent, Inc.
- * Licensed under the MIT license
- */html{-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{line-height:1.6;font-family:-apple-system-font,Helvetica Neue,sans-serif}*{margin:0;padding:0}a img{border:0}a{text-decoration:none;-webkit-tap-highlight-color:rgba(0,0,0,0)}@font-face{font-weight:400;font-style:normal;font-family:weui;src:url("data:application/octet-stream;base64,AAEAAAALAIAAAwAwR1NVQrD+s+0AAAE4AAAAQk9TLzJAKEx+AAABfAAAAFZjbWFw65cFHQAAAhwAAAJQZ2x5ZvCRR/EAAASUAAAKtGhlYWQMPROtAAAA4AAAADZoaGVhCCwD+gAAALwAAAAkaG10eEJo//8AAAHUAAAASGxvY2EYqhW4AAAEbAAAACZtYXhwASEAVQAAARgAAAAgbmFtZeNcHtgAAA9IAAAB5nBvc3T6bLhLAAARMAAAAOYAAQAAA+gAAABaA+j/////A+kAAQAAAAAAAAAAAAAAAAAAABIAAQAAAAEAACbZbxtfDzz1AAsD6AAAAADUm2dvAAAAANSbZ2///wAAA+kD6gAAAAgAAgAAAAAAAAABAAAAEgBJAAUAAAAAAAIAAAAKAAoAAAD/AAAAAAAAAAEAAAAKAB4ALAABREZMVAAIAAQAAAAAAAAAAQAAAAFsaWdhAAgAAAABAAAAAQAEAAQAAAABAAgAAQAGAAAAAQAAAAAAAQOwAZAABQAIAnoCvAAAAIwCegK8AAAB4AAxAQIAAAIABQMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUGZFZABA6gHqEQPoAAAAWgPqAAAAAAABAAAAAAAAAAAAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+j//wPoAAAD6AAAAAAABQAAAAMAAAAsAAAABAAAAXQAAQAAAAAAbgADAAEAAAAsAAMACgAAAXQABABCAAAABAAEAAEAAOoR//8AAOoB//8AAAABAAQAAAABAAIAAwAEAAUABgAHAAgACQAKAAsADAANAA4ADwAQABEAAAEGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAANwAAAAAAAAAEQAA6gEAAOoBAAAAAQAA6gIAAOoCAAAAAgAA6gMAAOoDAAAAAwAA6gQAAOoEAAAABAAA6gUAAOoFAAAABQAA6gYAAOoGAAAABgAA6gcAAOoHAAAABwAA6ggAAOoIAAAACAAA6gkAAOoJAAAACQAA6goAAOoKAAAACgAA6gsAAOoLAAAACwAA6gwAAOoMAAAADAAA6g0AAOoNAAAADQAA6g4AAOoOAAAADgAA6g8AAOoPAAAADwAA6hAAAOoQAAAAEAAA6hEAAOoRAAAAEQAAAAAARgCMANIBJAF4AcQCMgJgAqgC/ANIA6YD/gROBKAE9AVaAAAAAgAAAAADrwOtABQAKQAAASIHBgcGFBcWFxYyNzY3NjQnJicmAyInJicmNDc2NzYyFxYXFhQHBgcGAfV4Z2Q7PDw7ZGfwZmQ7PDw7ZGZ4bl5bNjc3Nlte215bNjc3NlteA608O2Rn8GdjOzw8O2Nn8GdkOzz8rzc1W17bXlw1Nzc1XF7bXls1NwAAAAACAAAAAAOzA7MAFwAtAAABIgcGBwYVFBcWFxYzMjc2NzY1NCcmJyYTBwYiLwEmNjsBETQ2OwEyFhURMzIWAe52Z2Q7PT07ZGd2fGpmOz4+O2ZpIXYOKA52Dg0XXQsHJgcLXRcNA7M+O2ZqfHZnZDs9PTtkZ3Z9aWY7Pv3wmhISmhIaARcICwsI/ukaAAMAAAAAA+UD5QAXACMALAAAASIHBgcGFRQXFhcWMzI3Njc2NTQnJicmAxQrASI1AzQ7ATIHJyImNDYyFhQGAe6Ecm9BRERBb3KEiXZxQkREQnF1aQIxAwgCQgMBIxIZGSQZGQPkREJxdomEcm9BRERBb3KEinVxQkT9HQICAWICAjEZIxkZIxkAAAAAAgAAAAADsQPkABkALgAAAQYHBgc2BREUFxYXFhc2NzY3NjURJBcmJyYTAQYvASY/ATYyHwEWNjclNjIfARYB9VVVQk+v/tFHPmxebGxdbT1I/tGvT0JVo/7VBASKAwMSAQUBcQEFAgESAgUBEQQD4xMYEhk3YP6sjnVlSD8cHD9IZXWOAVRgNxkSGP62/tkDA48EBBkCAVYCAQHlAQIQBAAAAAADAAAAAAOxA+QAGwAqADMAAAEGBwYHBgcGNxEUFxYXFhc2NzY3NjURJBcmJyYHMzIWFQMUBisBIicDNDYTIiY0NjIWFAYB9UFBODssO38gRz5sXmxsXW09SP7YqFBBVW80BAYMAwImBQELBh4PFhYeFRUD5A8SDhIOEikK/q2PdWRJPh0dPklkdY8BU141GRIY/AYE/sYCAwUBOgQG/kAVHxUVHxUAAAACAAAAAAPkA+QAFwAtAAABIgcGBwYVFBcWFxYzMjc2NzY1NCcmJyYTAQYiLwEmPwE2Mh8BFjI3ATYyHwEWAe6Ecm9BQ0NCbnODiXVxQkREQnF1kf6gAQUBowMDFgEFAYUCBQEBQwIFARUEA+NEQnF1iYNzbkJDQ0FvcoSJdXFCRP6j/qUBAagEBR4CAWYBAQENAgIVBAAAAAQAAAAAA68DrQAUACkAPwBDAAABIgcGBwYUFxYXFjI3Njc2NCcmJyYDIicmJyY0NzY3NjIXFhcWFAcGBwYTBQ4BLwEmBg8BBhYfARYyNwE+ASYiFzAfAQH1eGdkOzw8O2Rn8GZkOzw8O2RmeG5eWzY3NzZbXtteWzY3NzZbXmn+9gYSBmAGDwUDBQEGfQUQBgElBQELEBUBAQOtPDtkZ/BnYzs8PDtjZ/BnZDs8/K83NVte215cNTc3NVxe215bNTcCJt0FAQVJBQIGBAcRBoAGBQEhBQ8LBAEBAAABAAAAAAO7AzoAFwAAEy4BPwE+AR8BFjY3ATYWFycWFAcBBiInPQoGBwUHGgzLDCELAh0LHwsNCgr9uQoeCgGzCyEOCw0HCZMJAQoBvgkCCg0LHQv9sQsKAAAAAAIAAAAAA+UD5gAXACwAAAEiBwYHBhUUFxYXFjMyNzY3NjU0JyYnJhMHBi8BJicmNRM0NjsBMhYVExceAQHvhHJvQUNDQm5zg4l1cUJEREJxdVcQAwT6AwIEEAMCKwIDDsUCAQPlREJxdYmDc25CQ0NBb3KEiXVxQkT9VhwEAncCAgMGAXoCAwMC/q2FAgQAAAQAAAAAA68DrQADABgALQAzAAABMB8BAyIHBgcGFBcWFxYyNzY3NjQnJicmAyInJicmNDc2NzYyFxYXFhQHBgcGAyMVMzUjAuUBAfJ4Z2Q7PDw7ZGfwZmQ7PDw7ZGZ4bl5bNjc3Nlte215bNjc3NltemyT92QKDAQEBLDw7ZGfwZ2M7PDw7Y2fwZ2Q7PPyvNzVbXtteXDU3NzVcXtteWzU3AjH9JAAAAAMAAAAAA+QD5AAXACcAMAAAASIHBgcGFRQXFhcWMzI3Njc2NTQnJicmAzMyFhUDFAYrASImNQM0NhMiJjQ2MhYUBgHuhHJvQUNDQm5zg4l1cUJEREJxdZ42BAYMAwInAwMMBh8PFhYeFhYD40RCcXWJg3NuQkNDQW9yhIl1cUJE/vYGBf7AAgMDAgFABQb+NhYfFhYfFgAABAAAAAADwAPAAAgAEgAoAD0AAAEyNjQmIgYUFhcjFTMRIxUzNSMDIgcGBwYVFBYXFjMyNzY3NjU0Jy4BAyInJicmNDc2NzYyFxYXFhQHBgcGAfQYISEwISFRjzk5yTorhG5rPT99am+DdmhlPD4+PMyFbV5bNTc3NVte2l5bNTc3NVteAqAiLyIiLyI5Hf7EHBwCsT89a26Ed8w8Pj48ZWh2g29qffyjNzVbXtpeWzU3NzVbXtpeWzU3AAADAAAAAAOoA6gACwAgADUAAAEHJwcXBxc3FzcnNwMiBwYHBhQXFhcWMjc2NzY0JyYnJgMiJyYnJjQ3Njc2MhcWFxYUBwYHBgKOmpocmpocmpocmpq2dmZiOjs7OmJm7GZiOjs7OmJmdmtdWTQ2NjRZXdZdWTQ2NjRZXQKqmpocmpocmpocmpoBGTs6YmbsZmI6Ozs6YmbsZmI6O/zCNjRZXdZdWTQ2NjRZXdZdWTQ2AAMAAAAAA+kD6gAaAC8AMAAAAQYHBiMiJyYnJjQ3Njc2MhcWFxYVFAcGBwEHATI3Njc2NCcmJyYiBwYHBhQXFhcWMwKONUBCR21dWjU3NzVaXdpdWzU2GBcrASM5/eBXS0grKysrSEuuSkkqLCwqSUpXASMrFxg2NVtd2l1aNTc3NVpdbUdCQDX+3jkBGSsrSEuuSkkqLCwqSUquS0grKwAC//8AAAPoA+gAFAAwAAABIgcGBwYQFxYXFiA3Njc2ECcmJyYTFg4BIi8BBwYuATQ/AScmPgEWHwE3Nh4BBg8BAfSIdHFDRERDcXQBEHRxQ0REQ3F0SQoBFBsKoqgKGxMKqKIKARQbCqKoChsUAQqoA+hEQ3F0/vB0cUNERENxdAEQdHFDRP1jChsTCqiiCgEUGwqiqAobFAEKqKIKARQbCqIAAAIAAAAAA+QD5AAXADQAAAEiBwYHBhUUFxYXFjMyNzY3NjU0JyYnJhMUBiMFFxYUDwEGLwEuAT8BNh8BFhQPAQUyFh0BAe6Ecm9BQ0NCbnODiXVxQkREQnF1fwQC/pGDAQEVAwTsAgEC7AQEFAIBhAFwAgMD40RCcXWJg3NuQkNDQW9yhIl1cUJE/fYCAwuVAgQCFAQE0AIFAtEEBBQCBQGVCwMDJwAAAAUAAAAAA9QD0wAjACcANwBHAEgAAAERFAYjISImNREjIiY9ATQ2MyE1NDYzITIWHQEhMhYdARQGIyERIREHIgYVERQWOwEyNjURNCYjISIGFREUFjsBMjY1ETQmKwEDeyYb/XYbJkMJDQ0JAQYZEgEvExkBBgkNDQn9CQJc0QkNDQktCQ0NCf7sCQ0NCS0JDQ0JLQMi/TQbJiYbAswMCiwJDS4SGRkSLg0JLAoM/UwCtGsNCf5NCQ0NCQGzCQ0NCf5NCQ0NCQGzCQ0AAAAAEADGAAEAAAAAAAEABAAAAAEAAAAAAAIABwAEAAEAAAAAAAMABAALAAEAAAAAAAQABAAPAAEAAAAAAAUACwATAAEAAAAAAAYABAAeAAEAAAAAAAoAKwAiAAEAAAAAAAsAEwBNAAMAAQQJAAEACABgAAMAAQQJAAIADgBoAAMAAQQJAAMACAB2AAMAAQQJAAQACAB+AAMAAQQJAAUAFgCGAAMAAQQJAAYACACcAAMAAQQJAAoAVgCkAAMAAQQJAAsAJgD6d2V1aVJlZ3VsYXJ3ZXVpd2V1aVZlcnNpb24gMS4wd2V1aUdlbmVyYXRlZCBieSBzdmcydHRmIGZyb20gRm9udGVsbG8gcHJvamVjdC5odHRwOi8vZm9udGVsbG8uY29tAHcAZQB1AGkAUgBlAGcAdQBsAGEAcgB3AGUAdQBpAHcAZQB1AGkAVgBlAHIAcwBpAG8AbgAgADEALgAwAHcAZQB1AGkARwBlAG4AZQByAGEAdABlAGQAIABiAHkAIABzAHYAZwAyAHQAdABmACAAZgByAG8AbQAgAEYAbwBuAHQAZQBsAGwAbwAgAHAAcgBvAGoAZQBjAHQALgBoAHQAdABwADoALwAvAGYAbwBuAHQAZQBsAGwAbwAuAGMAbwBtAAAAAgAAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASAQIBAwEEAQUBBgEHAQgBCQEKAQsBDAENAQ4BDwEQAREBEgETAAZjaXJjbGUIZG93bmxvYWQEaW5mbwxzYWZlX3N1Y2Nlc3MJc2FmZV93YXJuB3N1Y2Nlc3MOc3VjY2Vzcy1jaXJjbGURc3VjY2Vzcy1uby1jaXJjbGUHd2FpdGluZw53YWl0aW5nLWNpcmNsZQR3YXJuC2luZm8tY2lyY2xlBmNhbmNlbAZzZWFyY2gFY2xlYXIEYmFjawZkZWxldGUAAAAA") format("truetype")}[class*=" weui-icon-"],[class^=weui-icon-]{display:inline-block;vertical-align:middle;font:normal normal normal 14px/1 weui;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased}[class*=" weui-icon-"]:before,[class^=weui-icon-]:before{display:inline-block;margin-left:.2em;margin-right:.2em}.weui-icon-circle:before{content:"\EA01"}.weui-icon-download:before{content:"\EA02"}.weui-icon-info:before{content:"\EA03"}.weui-icon-safe-success:before{content:"\EA04"}.weui-icon-safe-warn:before{content:"\EA05"}.weui-icon-success:before{content:"\EA06"}.weui-icon-success-circle:before{content:"\EA07"}.weui-icon-success-no-circle:before{content:"\EA08"}.weui-icon-waiting:before{content:"\EA09"}.weui-icon-waiting-circle:before{content:"\EA0A"}.weui-icon-warn:before{content:"\EA0B"}.weui-icon-info-circle:before{content:"\EA0C"}.weui-icon-cancel:before{content:"\EA0D"}.weui-icon-search:before{content:"\EA0E"}.weui-icon-clear:before{content:"\EA0F"}.weui-icon-back:before{content:"\EA10"}.weui-icon-delete:before{content:"\EA11"}[class*=" weui-icon_"]:before,[class^=weui-icon_]:before{margin:0}.weui-icon-success{font-size:23px;color:#09bb07}.weui-icon-waiting{font-size:23px;color:#10aeff}.weui-icon-warn{font-size:23px;color:#f43530}.weui-icon-info{font-size:23px;color:#10aeff}.weui-icon-success-circle,.weui-icon-success-no-circle{font-size:23px;color:#09bb07}.weui-icon-waiting-circle{font-size:23px;color:#10aeff}.weui-icon-circle{font-size:23px;color:#c9c9c9}.weui-icon-download,.weui-icon-info-circle{font-size:23px;color:#09bb07}.weui-icon-safe-success{color:#09bb07}.weui-icon-safe-warn{color:#ffbe00}.weui-icon-cancel{color:#f43530;font-size:22px}.weui-icon-clear,.weui-icon-search{color:#b2b2b2;font-size:14px}.weui-icon-delete.weui-icon_gallery-delete{color:#fff;font-size:22px}.weui-icon_msg{font-size:93px}.weui-icon_msg.weui-icon-warn{color:#f76260}.weui-icon_msg-primary{font-size:93px}.weui-icon_msg-primary.weui-icon-warn{color:#ffbe00}.weui-btn{position:relative;display:block;margin-left:auto;margin-right:auto;padding-left:14px;padding-right:14px;box-sizing:border-box;font-size:18px;text-align:center;text-decoration:none;color:#fff;line-height:2.55555556;border-radius:5px;-webkit-tap-highlight-color:rgba(0,0,0,0);overflow:hidden}.weui-btn:after{content:" ";width:200%;height:200%;position:absolute;top:0;left:0;border:1px solid rgba(0,0,0,.2);-webkit-transform:scale(.5);transform:scale(.5);-webkit-transform-origin:0 0;transform-origin:0 0;box-sizing:border-box;border-radius:10px}.weui-btn_inline{display:inline-block}.weui-btn_default{color:#000;background-color:#f8f8f8}.weui-btn_default:not(.weui-btn_disabled):visited{color:#000}.weui-btn_default:not(.weui-btn_disabled):active{color:rgba(0,0,0,.6);background-color:#dedede}.weui-btn_primary{background-color:#1aad19}.weui-btn_primary:not(.weui-btn_disabled):visited{color:#fff}.weui-btn_primary:not(.weui-btn_disabled):active{color:hsla(0,0%,100%,.6);background-color:#179b16}.weui-btn_warn{background-color:#e64340}.weui-btn_warn:not(.weui-btn_disabled):visited{color:#fff}.weui-btn_warn:not(.weui-btn_disabled):active{color:hsla(0,0%,100%,.6);background-color:#ce3c39}.weui-btn_disabled{color:hsla(0,0%,100%,.6)}.weui-btn_disabled.weui-btn_default{color:rgba(0,0,0,.3);background-color:#f7f7f7}.weui-btn_disabled.weui-btn_primary{background-color:#9ed99d}.weui-btn_disabled.weui-btn_warn{background-color:#ec8b89}.weui-btn_loading .weui-loading{margin:-.2em .34em 0 0}.weui-btn_loading.weui-btn_primary,.weui-btn_loading.weui-btn_warn{color:hsla(0,0%,100%,.6)}.weui-btn_loading.weui-btn_primary .weui-loading,.weui-btn_loading.weui-btn_warn .weui-loading{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='120' height='120' viewBox='0 0 100 100'%3E%3Cpath fill='none' d='M0 0h100v100H0z'/%3E%3Crect xmlns='http://www.w3.org/2000/svg' width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.56)' rx='5' ry='5' transform='translate(0 -30)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.5)' rx='5' ry='5' transform='rotate(30 105.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.43)' rx='5' ry='5' transform='rotate(60 75.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.38)' rx='5' ry='5' transform='rotate(90 65 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.32)' rx='5' ry='5' transform='rotate(120 58.66 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.28)' rx='5' ry='5' transform='rotate(150 54.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.25)' rx='5' ry='5' transform='rotate(180 50 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.2)' rx='5' ry='5' transform='rotate(-150 45.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.17)' rx='5' ry='5' transform='rotate(-120 41.34 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.14)' rx='5' ry='5' transform='rotate(-90 35 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.1)' rx='5' ry='5' transform='rotate(-60 24.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.03)' rx='5' ry='5' transform='rotate(-30 -5.98 65)'/%3E%3C/svg%3E")}.weui-btn_loading.weui-btn_primary{background-color:#179b16}.weui-btn_loading.weui-btn_warn{background-color:#ce3c39}.weui-btn_plain-primary{color:#1aad19;border:1px solid #1aad19}.weui-btn_plain-primary:not(.weui-btn_plain-disabled):active{color:rgba(26,173,25,.6);border-color:rgba(26,173,25,.6)}.weui-btn_plain-primary:after{border-width:0}.weui-btn_plain-default{color:#353535;border:1px solid #353535}.weui-btn_plain-default:not(.weui-btn_plain-disabled):active{color:rgba(53,53,53,.6);border-color:rgba(53,53,53,.6)}.weui-btn_plain-default:after{border-width:0}.weui-btn_plain-disabled{color:rgba(0,0,0,.2);border-color:rgba(0,0,0,.2)}button.weui-btn,input.weui-btn{width:100%;border-width:0;outline:0;-webkit-appearance:none}button.weui-btn:focus,input.weui-btn:focus{outline:0}button.weui-btn_inline,button.weui-btn_mini,input.weui-btn_inline,input.weui-btn_mini{width:auto}button.weui-btn_plain-default,button.weui-btn_plain-primary,input.weui-btn_plain-default,input.weui-btn_plain-primary{border-width:1px;background-color:transparent}.weui-btn_mini{display:inline-block;padding:0 1.32em;line-height:2.3;font-size:13px}.weui-btn+.weui-btn{margin-top:15px}.weui-btn.weui-btn_inline+.weui-btn.weui-btn_inline{margin-top:auto;margin-left:15px}.weui-btn-area{margin:1.17647059em 15px .3em}.weui-btn-area_inline{display:-webkit-box;display:-webkit-flex;display:flex}.weui-btn-area_inline .weui-btn{margin-top:auto;margin-right:15px;width:100%;-webkit-box-flex:1;-webkit-flex:1;flex:1}.weui-btn-area_inline .weui-btn:last-child{margin-right:0}.weui-cells{margin-top:1.17647059em;background-color:#fff;line-height:1.41176471;font-size:17px;overflow:hidden;position:relative}.weui-cells:before{top:0;border-top:1px solid #d9d9d9;-webkit-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.weui-cells:after,.weui-cells:before{content:" ";position:absolute;left:0;right:0;height:1px;color:#d9d9d9}.weui-cells:after{bottom:0;border-bottom:1px solid #d9d9d9;-webkit-transform-origin:0 100%;transform-origin:0 100%;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.weui-cells__title{margin-top:.77em;margin-bottom:.3em;padding-left:15px;padding-right:15px;color:#999;font-size:14px}.weui-cells__title+.weui-cells{margin-top:0}.weui-cells__tips{margin-top:.3em;color:#999;padding-left:15px;padding-right:15px;font-size:14px}.weui-cell{padding:10px 15px;position:relative;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.weui-cell:before{content:" ";position:absolute;left:0;top:0;right:0;height:1px;border-top:1px solid #d9d9d9;color:#d9d9d9;-webkit-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scaleY(.5);transform:scaleY(.5);left:15px}.weui-cell:first-child:before{display:none}.weui-cell_primary{-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start}.weui-cell__bd{-webkit-box-flex:1;-webkit-flex:1;flex:1}.weui-cell__ft{text-align:right;color:#999}.weui-cell_access{-webkit-tap-highlight-color:rgba(0,0,0,0);color:inherit}.weui-cell_access:active{background-color:#ececec}.weui-cell_access .weui-cell__ft{padding-right:13px;position:relative}.weui-cell_access .weui-cell__ft:after{content:" ";display:inline-block;height:6px;width:6px;border-width:2px 2px 0 0;border-color:#c8c8cd;border-style:solid;-webkit-transform:matrix(.71,.71,-.71,.71,0,0);transform:matrix(.71,.71,-.71,.71,0,0);position:relative;top:-2px;position:absolute;top:50%;margin-top:-4px;right:2px}.weui-cell_link{color:#586c94;font-size:14px}.weui-cell_link:first-child:before{display:block}.weui-check__label{-webkit-tap-highlight-color:rgba(0,0,0,0)}.weui-check__label:active{background-color:#ececec}.weui-check{position:absolute;left:-9999em}.weui-cells_radio .weui-cell__ft{padding-left:.35em}.weui-cells_radio .weui-check:checked+.weui-icon-checked:before{display:block;content:"\EA08";color:#09bb07;font-size:16px}.weui-cells_checkbox .weui-cell__hd{padding-right:.35em}.weui-cells_checkbox .weui-icon-checked:before{content:"\EA01";color:#c9c9c9;font-size:23px;display:block}.weui-cells_checkbox .weui-check:checked+.weui-icon-checked:before{content:"\EA06";color:#09bb07}.weui-label{display:block;width:105px;word-wrap:break-word;word-break:break-all}.weui-input{width:100%;border:0;outline:0;-webkit-appearance:none;background-color:transparent;font-size:inherit;color:inherit;height:1.41176471em;line-height:1.41176471}.weui-input::-webkit-inner-spin-button,.weui-input::-webkit-outer-spin-button{-webkit-appearance:none;margin:0}.weui-textarea{display:block;border:0;resize:none;width:100%;color:inherit;font-size:1em;line-height:inherit;outline:0}.weui-textarea-counter{color:#b2b2b2;text-align:right}.weui-cell_warn .weui-textarea-counter{color:#e64340}.weui-toptips{display:none;position:fixed;-webkit-transform:translateZ(0);transform:translateZ(0);top:0;left:0;right:0;padding:5px;font-size:14px;text-align:center;color:#fff;z-index:5000;word-wrap:break-word;word-break:break-all}.weui-toptips_warn{background-color:#e64340}.weui-cells_form .weui-cell__ft{font-size:0}.weui-cells_form .weui-icon-warn{display:none}.weui-cells_form input,.weui-cells_form label[for],.weui-cells_form textarea{-webkit-tap-highlight-color:rgba(0,0,0,0)}.weui-cell_warn{color:#e64340}.weui-cell_warn .weui-icon-warn{display:inline-block}.weui-form-preview{position:relative;background-color:#fff}.weui-form-preview:before{top:0;border-top:1px solid #d9d9d9;-webkit-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.weui-form-preview:after,.weui-form-preview:before{content:" ";position:absolute;left:0;right:0;height:1px;color:#d9d9d9}.weui-form-preview:after{bottom:0;border-bottom:1px solid #d9d9d9;-webkit-transform-origin:0 100%;transform-origin:0 100%;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.weui-form-preview__hd{position:relative;padding:10px 15px;text-align:right;line-height:2.5em}.weui-form-preview__hd:after{content:" ";position:absolute;left:0;bottom:0;right:0;height:1px;border-bottom:1px solid #d9d9d9;color:#d9d9d9;-webkit-transform-origin:0 100%;transform-origin:0 100%;-webkit-transform:scaleY(.5);transform:scaleY(.5);left:15px}.weui-form-preview__hd .weui-form-preview__value{font-style:normal;font-size:1.6em}.weui-form-preview__bd{padding:10px 15px;font-size:.9em;text-align:right;color:#999;line-height:2}.weui-form-preview__ft{position:relative;line-height:50px;display:-webkit-box;display:-webkit-flex;display:flex}.weui-form-preview__ft:after{content:" ";position:absolute;left:0;top:0;right:0;height:1px;border-top:1px solid #d5d5d6;color:#d5d5d6;-webkit-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.weui-form-preview__item{overflow:hidden}.weui-form-preview__label{float:left;margin-right:1em;min-width:4em;color:#999;text-align:justify;text-align-last:justify}.weui-form-preview__value{display:block;overflow:hidden;word-break:normal;word-wrap:break-word}.weui-form-preview__btn{position:relative;display:block;-webkit-box-flex:1;-webkit-flex:1;flex:1;color:#3cc51f;text-align:center;-webkit-tap-highlight-color:rgba(0,0,0,0)}button.weui-form-preview__btn{background-color:transparent;border:0;outline:0;line-height:inherit;font-size:inherit}.weui-form-preview__btn:active{background-color:#eee}.weui-form-preview__btn:after{content:" ";position:absolute;left:0;top:0;width:1px;bottom:0;border-left:1px solid #d5d5d6;color:#d5d5d6;-webkit-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scaleX(.5);transform:scaleX(.5)}.weui-form-preview__btn:first-child:after{display:none}.weui-form-preview__btn_default{color:#999}.weui-form-preview__btn_primary{color:#0bb20c}.weui-cell_select{padding:0}.weui-cell_select .weui-select{padding-right:30px}.weui-cell_select .weui-cell__bd:after{content:" ";display:inline-block;height:6px;width:6px;border-width:2px 2px 0 0;border-color:#c8c8cd;border-style:solid;-webkit-transform:matrix(.71,.71,-.71,.71,0,0);transform:matrix(.71,.71,-.71,.71,0,0);position:relative;top:-2px;position:absolute;top:50%;right:15px;margin-top:-4px}.weui-select{-webkit-appearance:none;border:0;outline:0;background-color:transparent;width:100%;font-size:inherit;height:44px;line-height:44px;position:relative;z-index:1;padding-left:15px}.weui-cell_select-before{padding-right:15px}.weui-cell_select-before .weui-select{width:105px;box-sizing:border-box}.weui-cell_select-before .weui-cell__hd{position:relative}.weui-cell_select-before .weui-cell__hd:after{content:" ";position:absolute;right:0;top:0;width:1px;bottom:0;border-right:1px solid #d9d9d9;color:#d9d9d9;-webkit-transform-origin:100% 0;transform-origin:100% 0;-webkit-transform:scaleX(.5);transform:scaleX(.5)}.weui-cell_select-before .weui-cell__hd:before{content:" ";display:inline-block;height:6px;width:6px;border-width:2px 2px 0 0;border-color:#c8c8cd;border-style:solid;-webkit-transform:matrix(.71,.71,-.71,.71,0,0);transform:matrix(.71,.71,-.71,.71,0,0);position:relative;top:-2px;position:absolute;top:50%;right:15px;margin-top:-4px}.weui-cell_select-before .weui-cell__bd{padding-left:15px}.weui-cell_select-before .weui-cell__bd:after{display:none}.weui-cell_select-after{padding-left:15px}.weui-cell_select-after .weui-select{padding-left:0}.weui-cell_vcode{padding-top:0;padding-right:0;padding-bottom:0}.weui-vcode-btn,.weui-vcode-img{margin-left:5px;height:44px;vertical-align:middle}.weui-vcode-btn{display:inline-block;padding:0 .6em 0 .7em;border-left:1px solid #e5e5e5;line-height:44px;font-size:17px;color:#3cc51f}button.weui-vcode-btn{background-color:transparent;border-top:0;border-right:0;border-bottom:0;outline:0}.weui-vcode-btn:active{color:#52a341}.weui-gallery{display:none;position:fixed;top:0;right:0;bottom:0;left:0;background-color:#000;z-index:1000}.weui-gallery__img{position:absolute;top:0;right:0;bottom:60px;left:0;background:50% no-repeat;background-size:contain}.weui-gallery__opr{position:absolute;right:0;bottom:0;left:0;background-color:#0d0d0d;color:#fff;line-height:60px;text-align:center}.weui-gallery__del{display:block}.weui-cell_switch{padding-top:6px;padding-bottom:6px}.weui-switch{-webkit-appearance:none;appearance:none}.weui-switch,.weui-switch-cp__box{position:relative;width:52px;height:32px;border:1px solid #dfdfdf;outline:0;border-radius:16px;box-sizing:border-box;background-color:#dfdfdf;-webkit-transition:background-color .1s,border .1s;transition:background-color .1s,border .1s}.weui-switch-cp__box:before,.weui-switch:before{content:" ";position:absolute;top:0;left:0;width:50px;height:30px;border-radius:15px;background-color:#fdfdfd;-webkit-transition:-webkit-transform .35s cubic-bezier(.45,1,.4,1);transition:-webkit-transform .35s cubic-bezier(.45,1,.4,1);transition:transform .35s cubic-bezier(.45,1,.4,1);transition:transform .35s cubic-bezier(.45,1,.4,1),-webkit-transform .35s cubic-bezier(.45,1,.4,1)}.weui-switch-cp__box:after,.weui-switch:after{content:" ";position:absolute;top:0;left:0;width:30px;height:30px;border-radius:15px;background-color:#fff;box-shadow:0 1px 3px rgba(0,0,0,.4);-webkit-transition:-webkit-transform .35s cubic-bezier(.4,.4,.25,1.35);transition:-webkit-transform .35s cubic-bezier(.4,.4,.25,1.35);transition:transform .35s cubic-bezier(.4,.4,.25,1.35);transition:transform .35s cubic-bezier(.4,.4,.25,1.35),-webkit-transform .35s cubic-bezier(.4,.4,.25,1.35)}.weui-switch-cp__input:checked~.weui-switch-cp__box,.weui-switch:checked{border-color:#04be02;background-color:#04be02}.weui-switch-cp__input:checked~.weui-switch-cp__box:before,.weui-switch:checked:before{-webkit-transform:scale(0);transform:scale(0)}.weui-switch-cp__input:checked~.weui-switch-cp__box:after,.weui-switch:checked:after{-webkit-transform:translateX(20px);transform:translateX(20px)}.weui-switch-cp__input{position:absolute;left:-9999px}.weui-switch-cp__box{display:block}.weui-uploader__hd{display:-webkit-box;display:-webkit-flex;display:flex;padding-bottom:10px;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.weui-uploader__title{-webkit-box-flex:1;-webkit-flex:1;flex:1}.weui-uploader__info{color:#b2b2b2}.weui-uploader__bd{margin-bottom:-4px;margin-right:-9px;overflow:hidden}.weui-uploader__files{list-style:none}.weui-uploader__file{float:left;margin-right:9px;margin-bottom:9px;width:79px;height:79px;background:no-repeat 50%;background-size:cover}.weui-uploader__file_status{position:relative}.weui-uploader__file_status:before{content:" ";position:absolute;top:0;right:0;bottom:0;left:0;background-color:rgba(0,0,0,.5)}.weui-uploader__file_status .weui-uploader__file-content{display:block}.weui-uploader__file-content{display:none;position:absolute;top:50%;left:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);color:#fff}.weui-uploader__file-content .weui-icon-warn{display:inline-block}.weui-uploader__input-box{float:left;position:relative;margin-right:9px;margin-bottom:9px;width:77px;height:77px;border:1px solid #d9d9d9}.weui-uploader__input-box:after,.weui-uploader__input-box:before{content:" ";position:absolute;top:50%;left:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);background-color:#d9d9d9}.weui-uploader__input-box:before{width:2px;height:39.5px}.weui-uploader__input-box:after{width:39.5px;height:2px}.weui-uploader__input-box:active{border-color:#999}.weui-uploader__input-box:active:after,.weui-uploader__input-box:active:before{background-color:#999}.weui-uploader__input{position:absolute;z-index:1;top:0;left:0;width:100%;height:100%;opacity:0;-webkit-tap-highlight-color:rgba(0,0,0,0)}.weui-msg{padding-top:36px;text-align:center}.weui-msg__icon-area{margin-bottom:30px}.weui-msg__text-area{margin-bottom:25px;padding:0 20px}.weui-msg__text-area a{color:#586c94}.weui-msg__title{margin-bottom:5px;font-weight:400;font-size:20px}.weui-msg__desc{font-size:14px;color:#999}.weui-msg__opr-area{margin-bottom:25px}.weui-msg__extra-area{margin-bottom:15px;font-size:14px;color:#999}.weui-msg__extra-area a{color:#586c94}@media screen and (min-height:438px){.weui-msg__extra-area{position:fixed;left:0;bottom:0;width:100%;text-align:center}}.weui-article{padding:20px 15px;font-size:15px}.weui-article section{margin-bottom:1.5em}.weui-article h1{font-size:18px;font-weight:400;margin-bottom:.9em}.weui-article h2{font-size:16px}.weui-article h2,.weui-article h3{font-weight:400;margin-bottom:.34em}.weui-article h3{font-size:15px}.weui-article *{max-width:100%;box-sizing:border-box;word-wrap:break-word}.weui-article p{margin:0 0 .8em}.weui-tabbar{display:-webkit-box;display:-webkit-flex;display:flex;position:absolute;z-index:500;bottom:0;width:100%;background-color:#f7f7fa}.weui-tabbar:before{content:" ";position:absolute;left:0;top:0;right:0;height:1px;border-top:1px solid #c0bfc4;color:#c0bfc4;-webkit-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.weui-tabbar__item{display:block;-webkit-box-flex:1;-webkit-flex:1;flex:1;padding:5px 0 0;font-size:0;color:#999;text-align:center;-webkit-tap-highlight-color:rgba(0,0,0,0)}.weui-tabbar__item.weui-bar__item_on .weui-tabbar__icon,.weui-tabbar__item.weui-bar__item_on .weui-tabbar__icon>i,.weui-tabbar__item.weui-bar__item_on .weui-tabbar__label{color:#09bb07}.weui-tabbar__icon{display:inline-block;width:27px;height:27px}.weui-tabbar__icon>i,i.weui-tabbar__icon{font-size:24px;color:#999}.weui-tabbar__icon img{width:100%;height:100%}.weui-tabbar__label{text-align:center;color:#999;font-size:10px;line-height:1.8}.weui-navbar{display:-webkit-box;display:-webkit-flex;display:flex;position:absolute;z-index:500;top:0;width:100%;background-color:#fafafa}.weui-navbar:after{content:" ";position:absolute;left:0;bottom:0;right:0;height:1px;border-bottom:1px solid #ccc;color:#ccc;-webkit-transform-origin:0 100%;transform-origin:0 100%;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.weui-navbar+.weui-tab__panel{padding-top:50px;padding-bottom:0}.weui-navbar__item{position:relative;display:block;-webkit-box-flex:1;-webkit-flex:1;flex:1;padding:13px 0;text-align:center;font-size:15px;-webkit-tap-highlight-color:rgba(0,0,0,0)}.weui-navbar__item:active{background-color:#ededed}.weui-navbar__item.weui-bar__item_on{background-color:#eaeaea}.weui-navbar__item:after{content:" ";position:absolute;right:0;top:0;width:1px;bottom:0;border-right:1px solid #ccc;color:#ccc;-webkit-transform-origin:100% 0;transform-origin:100% 0;-webkit-transform:scaleX(.5);transform:scaleX(.5)}.weui-navbar__item:last-child:after{display:none}.weui-tab{position:relative;height:100%}.weui-tab__panel{box-sizing:border-box;height:100%;padding-bottom:50px;overflow:auto;-webkit-overflow-scrolling:touch}.weui-tab__content{display:none}.weui-progress{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.weui-progress__bar{background-color:#ebebeb;height:3px;-webkit-box-flex:1;-webkit-flex:1;flex:1}.weui-progress__inner-bar{width:0;height:100%;background-color:#09bb07}.weui-progress__opr{display:block;margin-left:15px;font-size:0}.weui-panel{background-color:#fff;margin-top:10px;position:relative;overflow:hidden}.weui-panel:first-child{margin-top:0}.weui-panel:before{top:0;border-top:1px solid #e5e5e5;-webkit-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.weui-panel:after,.weui-panel:before{content:" ";position:absolute;left:0;right:0;height:1px;color:#e5e5e5}.weui-panel:after{bottom:0;border-bottom:1px solid #e5e5e5;-webkit-transform-origin:0 100%;transform-origin:0 100%;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.weui-panel__hd{padding:14px 15px 10px;color:#999;font-size:13px;position:relative}.weui-panel__hd:after{content:" ";position:absolute;left:0;bottom:0;right:0;height:1px;border-bottom:1px solid #e5e5e5;color:#e5e5e5;-webkit-transform-origin:0 100%;transform-origin:0 100%;-webkit-transform:scaleY(.5);transform:scaleY(.5);left:15px}.weui-media-box{padding:15px;position:relative}.weui-media-box:before{content:" ";position:absolute;left:0;top:0;right:0;height:1px;border-top:1px solid #e5e5e5;color:#e5e5e5;-webkit-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scaleY(.5);transform:scaleY(.5);left:15px}.weui-media-box:first-child:before{display:none}a.weui-media-box{color:#000;-webkit-tap-highlight-color:rgba(0,0,0,0)}a.weui-media-box:active{background-color:#ececec}.weui-media-box__title{font-weight:400;font-size:17px;width:auto;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;word-wrap:normal;word-wrap:break-word;word-break:break-all}.weui-media-box__desc{color:#999;font-size:13px;line-height:1.2;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2}.weui-media-box__info{margin-top:15px;padding-bottom:5px;font-size:13px;color:#cecece;line-height:1em;list-style:none;overflow:hidden}.weui-media-box__info__meta{float:left;padding-right:1em}.weui-media-box__info__meta_extra{padding-left:1em;border-left:1px solid #cecece}.weui-media-box_text .weui-media-box__title{margin-bottom:8px}.weui-media-box_appmsg{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.weui-media-box_appmsg .weui-media-box__hd{margin-right:.8em;width:60px;height:60px;line-height:60px;text-align:center}.weui-media-box_appmsg .weui-media-box__thumb{width:100%;max-height:100%;vertical-align:top}.weui-media-box_appmsg .weui-media-box__bd{-webkit-box-flex:1;-webkit-flex:1;flex:1;min-width:0}.weui-media-box_small-appmsg{padding:0}.weui-media-box_small-appmsg .weui-cells{margin-top:0}.weui-media-box_small-appmsg .weui-cells:before{display:none}.weui-grids{position:relative;overflow:hidden}.weui-grids:before{right:0;height:1px;border-top:1px solid #d9d9d9;-webkit-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.weui-grids:after,.weui-grids:before{content:" ";position:absolute;left:0;top:0;color:#d9d9d9}.weui-grids:after{width:1px;bottom:0;border-left:1px solid #d9d9d9;-webkit-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scaleX(.5);transform:scaleX(.5)}.weui-grid{position:relative;float:left;padding:20px 10px;width:33.33333333%;box-sizing:border-box}.weui-grid:before{top:0;width:1px;border-right:1px solid #d9d9d9;-webkit-transform-origin:100% 0;transform-origin:100% 0;-webkit-transform:scaleX(.5);transform:scaleX(.5)}.weui-grid:after,.weui-grid:before{content:" ";position:absolute;right:0;bottom:0;color:#d9d9d9}.weui-grid:after{left:0;height:1px;border-bottom:1px solid #d9d9d9;-webkit-transform-origin:0 100%;transform-origin:0 100%;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.weui-grid:active{background-color:#ececec}.weui-grid__icon{width:28px;height:28px;margin:0 auto}.weui-grid__icon img{display:block;width:100%;height:100%}.weui-grid__icon+.weui-grid__label{margin-top:5px}.weui-grid__label{display:block;color:#000;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.weui-footer,.weui-grid__label{text-align:center;font-size:14px}.weui-footer{color:#999}.weui-footer a{color:#586c94}.weui-footer_fixed-bottom{position:fixed;bottom:.52em;left:0;right:0}.weui-footer__links{font-size:0}.weui-footer__link{display:inline-block;vertical-align:top;margin:0 .62em;position:relative;font-size:14px}.weui-footer__link:before{content:" ";position:absolute;left:0;top:0;width:1px;bottom:0;border-left:1px solid #c7c7c7;color:#c7c7c7;-webkit-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scaleX(.5);transform:scaleX(.5);left:-.65em;top:.36em;bottom:.36em}.weui-footer__link:first-child:before{display:none}.weui-footer__text{padding:0 .34em;font-size:12px}.weui-flex{display:-webkit-box;display:-webkit-flex;display:flex}.weui-flex__item{-webkit-box-flex:1;-webkit-flex:1;flex:1}.weui-dialog{position:fixed;z-index:5000;width:80%;max-width:300px;top:50%;left:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);background-color:#fff;text-align:center;border-radius:3px;overflow:hidden}.weui-dialog__hd{padding:1.3em 1.6em .5em}.weui-dialog__title{font-weight:400;font-size:18px}.weui-dialog__bd{padding:0 1.6em .8em;min-height:40px;font-size:15px;line-height:1.3;word-wrap:break-word;word-break:break-all;color:#999}.weui-dialog__bd:first-child{padding:2.7em 20px 1.7em;color:#353535}.weui-dialog__ft{position:relative;line-height:48px;font-size:18px;display:-webkit-box;display:-webkit-flex;display:flex}.weui-dialog__ft:after{content:" ";position:absolute;left:0;top:0;right:0;height:1px;border-top:1px solid #d5d5d6;color:#d5d5d6;-webkit-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.weui-dialog__btn{display:block;-webkit-box-flex:1;-webkit-flex:1;flex:1;color:#3cc51f;text-decoration:none;-webkit-tap-highlight-color:rgba(0,0,0,0);position:relative}.weui-dialog__btn:active{background-color:#eee}.weui-dialog__btn:after{content:" ";position:absolute;left:0;top:0;width:1px;bottom:0;border-left:1px solid #d5d5d6;color:#d5d5d6;-webkit-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scaleX(.5);transform:scaleX(.5)}.weui-dialog__btn:first-child:after{display:none}.weui-dialog__btn_default{color:#353535}.weui-dialog__btn_primary{color:#0bb20c}.weui-skin_android .weui-dialog{text-align:left;box-shadow:0 6px 30px 0 rgba(0,0,0,.1)}.weui-skin_android .weui-dialog__title{font-size:21px}.weui-skin_android .weui-dialog__hd{text-align:left}.weui-skin_android .weui-dialog__bd{color:#999;padding:.25em 1.6em 2em;font-size:17px;text-align:left}.weui-skin_android .weui-dialog__bd:first-child{padding:1.6em 1.6em 2em;color:#353535}.weui-skin_android .weui-dialog__ft{display:block;text-align:right;line-height:42px;font-size:16px;padding:0 1.6em .7em}.weui-skin_android .weui-dialog__ft:after{display:none}.weui-skin_android .weui-dialog__btn{display:inline-block;vertical-align:top;padding:0 .8em}.weui-skin_android .weui-dialog__btn:after{display:none}.weui-skin_android .weui-dialog__btn:active,.weui-skin_android .weui-dialog__btn:visited{background-color:rgba(0,0,0,.06)}.weui-skin_android .weui-dialog__btn:last-child{margin-right:-.8em}.weui-skin_android .weui-dialog__btn_default{color:gray}@media screen and (min-width:1024px){.weui-dialog{width:35%}}.weui-toast{position:fixed;z-index:5000;width:7.6em;min-height:7.6em;top:180px;left:50%;margin-left:-3.8em;background:hsla(0,0%,7%,.7);text-align:center;border-radius:5px;color:#fff}.weui-icon_toast{margin:22px 0 0;display:block}.weui-icon_toast.weui-icon-success-no-circle:before{color:#fff;font-size:55px}.weui-icon_toast.weui-loading{margin:30px 0 0;width:38px;height:38px;vertical-align:baseline}.weui-toast__content{margin:0 0 15px}.weui-mask{background:rgba(0,0,0,.6)}.weui-mask,.weui-mask_transparent{position:fixed;z-index:1000;top:0;right:0;left:0;bottom:0}.weui-actionsheet{position:fixed;left:0;bottom:0;-webkit-transform:translateY(100%);transform:translateY(100%);-webkit-backface-visibility:hidden;backface-visibility:hidden;z-index:5000;width:100%;background-color:#efeff4;-webkit-transition:-webkit-transform .3s;transition:-webkit-transform .3s;transition:transform .3s;transition:transform .3s,-webkit-transform .3s}.weui-actionsheet__menu{background-color:#fff}.weui-actionsheet__action{margin-top:6px;background-color:#fff}.weui-actionsheet__cell{position:relative;padding:10px 0;text-align:center;font-size:18px}.weui-actionsheet__cell:before{content:" ";position:absolute;left:0;top:0;right:0;height:1px;border-top:1px solid #d9d9d9;color:#d9d9d9;-webkit-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.weui-actionsheet__cell:active{background-color:#ececec}.weui-actionsheet__cell:first-child:before{display:none}.weui-skin_android .weui-actionsheet{position:fixed;left:50%;top:50%;bottom:auto;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);width:274px;box-sizing:border-box;-webkit-backface-visibility:hidden;backface-visibility:hidden;background:transparent;-webkit-transition:-webkit-transform .3s;transition:-webkit-transform .3s;transition:transform .3s;transition:transform .3s,-webkit-transform .3s}.weui-skin_android .weui-actionsheet__action{display:none}.weui-skin_android .weui-actionsheet__menu{border-radius:2px;box-shadow:0 6px 30px 0 rgba(0,0,0,.1)}.weui-skin_android .weui-actionsheet__cell{padding:13px 24px;font-size:16px;line-height:1.4;text-align:left}.weui-skin_android .weui-actionsheet__cell:first-child{border-top-left-radius:2px;border-top-right-radius:2px}.weui-skin_android .weui-actionsheet__cell:last-child{border-bottom-left-radius:2px;border-bottom-right-radius:2px}.weui-actionsheet_toggle{-webkit-transform:translate(0);transform:translate(0)}.weui-loadmore{width:65%;margin:1.5em auto;line-height:1.6em;font-size:14px;text-align:center}.weui-loadmore__tips{display:inline-block;vertical-align:middle}.weui-loadmore_line{border-top:1px solid #e5e5e5;margin-top:2.4em}.weui-loadmore_line .weui-loadmore__tips{position:relative;top:-.9em;padding:0 .55em;background-color:#fff;color:#999}.weui-loadmore_dot .weui-loadmore__tips{padding:0 .16em}.weui-loadmore_dot .weui-loadmore__tips:before{content:" ";width:4px;height:4px;border-radius:50%;background-color:#e5e5e5;display:inline-block;position:relative;vertical-align:0;top:-.16em}.weui-badge{display:inline-block;padding:.15em .4em;min-width:8px;border-radius:18px;background-color:#f43530;color:#fff;line-height:1.2;text-align:center;font-size:12px;vertical-align:middle}.weui-badge_dot{padding:.4em;min-width:0}.weui-search-bar{position:relative;padding:8px 10px;display:-webkit-box;display:-webkit-flex;display:flex;box-sizing:border-box;background-color:#efeff4}.weui-search-bar:before{top:0;border-top:1px solid #d7d6dc;-webkit-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.weui-search-bar:after,.weui-search-bar:before{content:" ";position:absolute;left:0;right:0;height:1px;color:#d7d6dc}.weui-search-bar:after{bottom:0;border-bottom:1px solid #d7d6dc;-webkit-transform-origin:0 100%;transform-origin:0 100%;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.weui-search-bar.weui-search-bar_focusing .weui-search-bar__cancel-btn{display:block}.weui-search-bar.weui-search-bar_focusing .weui-search-bar__label{display:none}.weui-search-bar__form{position:relative;-webkit-box-flex:1;-webkit-flex:auto;flex:auto;background-color:#efeff4}.weui-search-bar__form:after{content:"";position:absolute;left:0;top:0;width:200%;height:200%;-webkit-transform:scale(.5);transform:scale(.5);-webkit-transform-origin:0 0;transform-origin:0 0;border-radius:10px;border:1px solid #e6e6ea;box-sizing:border-box;background:#fff}.weui-search-bar__box{position:relative;padding-left:30px;padding-right:30px;height:100%;width:100%;box-sizing:border-box;z-index:1}.weui-search-bar__box .weui-search-bar__input{padding:4px 0;width:100%;height:1.42857143em;border:0;font-size:14px;line-height:1.42857143em;box-sizing:content-box;background:transparent}.weui-search-bar__box .weui-search-bar__input:focus{outline:none}.weui-search-bar__box .weui-icon-search{position:absolute;left:10px;top:0;line-height:28px}.weui-search-bar__box .weui-icon-clear{position:absolute;top:0;right:0;padding:0 10px;line-height:28px}.weui-search-bar__label{position:absolute;top:1px;right:1px;bottom:1px;left:1px;z-index:2;border-radius:3px;text-align:center;color:#9b9b9b;background:#fff}.weui-search-bar__label span{display:inline-block;font-size:14px;vertical-align:middle}.weui-search-bar__label .weui-icon-search{margin-right:5px}.weui-search-bar__cancel-btn{display:none;margin-left:10px;line-height:28px;color:#09bb07;white-space:nowrap}.weui-search-bar__input:not(:valid)~.weui-icon-clear{display:none}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration,input[type=search]::-webkit-search-results-button,input[type=search]::-webkit-search-results-decoration{display:none}.weui-picker{position:fixed;width:100%;left:0;bottom:0;z-index:5000;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-transform:translateY(100%);transform:translateY(100%);-webkit-transition:-webkit-transform .3s;transition:-webkit-transform .3s;transition:transform .3s;transition:transform .3s,-webkit-transform .3s}.weui-picker__hd{display:-webkit-box;display:-webkit-flex;display:flex;padding:10px 15px;background-color:#fbf9fe;position:relative;text-align:center}.weui-picker__hd:after{content:" ";position:absolute;left:0;bottom:0;right:0;height:1px;border-bottom:1px solid #e5e5e5;color:#e5e5e5;-webkit-transform-origin:0 100%;transform-origin:0 100%;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.weui-picker__action{display:block;-webkit-box-flex:1;-webkit-flex:1;flex:1;color:#586c94}.weui-picker__action:first-child{text-align:left}.weui-picker__action:last-child{text-align:right}.weui-picker__bd{display:-webkit-box;display:-webkit-flex;display:flex;position:relative;background-color:#fff;height:238px;overflow:hidden}.weui-picker__group{-webkit-box-flex:1;-webkit-flex:1;flex:1;position:relative;height:100%}.weui-picker__mask{top:0;height:100%;margin:0 auto;background:-webkit-linear-gradient(top,hsla(0,0%,100%,.95),hsla(0,0%,100%,.6)),-webkit-linear-gradient(bottom,hsla(0,0%,100%,.95),hsla(0,0%,100%,.6));background:linear-gradient(180deg,hsla(0,0%,100%,.95),hsla(0,0%,100%,.6)),linear-gradient(0deg,hsla(0,0%,100%,.95),hsla(0,0%,100%,.6));background-position:top,bottom;background-size:100% 102px;background-repeat:no-repeat;-webkit-transform:translateZ(0);transform:translateZ(0)}.weui-picker__indicator,.weui-picker__mask{position:absolute;left:0;width:100%;z-index:3}.weui-picker__indicator{height:34px;top:102px}.weui-picker__indicator:before{top:0;border-top:1px solid #e5e5e5;-webkit-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.weui-picker__indicator:after,.weui-picker__indicator:before{content:" ";position:absolute;left:0;right:0;height:1px;color:#e5e5e5}.weui-picker__indicator:after{bottom:0;border-bottom:1px solid #e5e5e5;-webkit-transform-origin:0 100%;transform-origin:0 100%;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.weui-picker__content{position:absolute;top:0;left:0;width:100%}.weui-picker__item{padding:5px 0 4px;text-align:center;color:#000;text-overflow:ellipsis;white-space:nowrap;overflow:hidden}.weui-picker__item_disabled{color:#999}@-webkit-keyframes a{0%{-webkit-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0)}to{-webkit-transform:translateZ(0);transform:translateZ(0)}}@keyframes a{0%{-webkit-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0)}to{-webkit-transform:translateZ(0);transform:translateZ(0)}}.weui-animate-slide-up{-webkit-animation:a ease .3s forwards;animation:a ease .3s forwards}@-webkit-keyframes b{0%{-webkit-transform:translateZ(0);transform:translateZ(0)}to{-webkit-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0)}}@keyframes b{0%{-webkit-transform:translateZ(0);transform:translateZ(0)}to{-webkit-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0)}}.weui-animate-slide-down{-webkit-animation:b ease .3s forwards;animation:b ease .3s forwards}@-webkit-keyframes c{0%{opacity:0}to{opacity:1}}@keyframes c{0%{opacity:0}to{opacity:1}}.weui-animate-fade-in{-webkit-animation:c ease .3s forwards;animation:c ease .3s forwards}@-webkit-keyframes d{0%{opacity:1}to{opacity:0}}@keyframes d{0%{opacity:1}to{opacity:0}}.weui-animate-fade-out{-webkit-animation:d ease .3s forwards;animation:d ease .3s forwards}.weui-agree{display:block;padding:.5em 15px;font-size:13px}.weui-agree a{color:#586c94}.weui-agree__text{color:#999}.weui-agree__checkbox{-webkit-appearance:none;appearance:none;outline:0;font-size:0;border:1px solid #d1d1d1;background-color:#fff;border-radius:3px;width:13px;height:13px;position:relative;vertical-align:0;top:2px}.weui-agree__checkbox:checked:before{font-family:weui;font-style:normal;font-weight:400;font-variant:normal;text-transform:none;text-align:center;speak:none;display:inline-block;vertical-align:middle;text-decoration:inherit;content:"\EA08";color:#09bb07;font-size:13px;position:absolute;top:50%;left:50%;-webkit-transform:translate(-50%,-48%) scale(.73);transform:translate(-50%,-48%) scale(.73)}.weui-agree__checkbox:disabled{background-color:#e1e1e1}.weui-agree__checkbox:disabled:before{color:#adadad}.weui-loading{width:20px;height:20px;display:inline-block;vertical-align:middle;-webkit-animation:e 1s steps(12) infinite;animation:e 1s steps(12) infinite;background:transparent url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMjAiIGhlaWdodD0iMTIwIiB2aWV3Qm94PSIwIDAgMTAwIDEwMCI+PHBhdGggZmlsbD0ibm9uZSIgZD0iTTAgMGgxMDB2MTAwSDB6Ii8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTlFOUU5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTMwKSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iIzk4OTY5NyIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgzMCAxMDUuOTggNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjOUI5OTlBIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDYwIDc1Ljk4IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0EzQTFBMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSg5MCA2NSA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNBQkE5QUEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoMTIwIDU4LjY2IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0IyQjJCMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgxNTAgNTQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjQkFCOEI5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDE4MCA1MCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDMkMwQzEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTE1MCA0NS45OCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDQkNCQ0IiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTEyMCA0MS4zNCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNEMkQyRDIiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTkwIDM1IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0RBREFEQSIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgtNjAgMjQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTJFMkUyIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKC0zMCAtNS45OCA2NSkiLz48L3N2Zz4=) no-repeat;background-size:100%}.weui-loading.weui-loading_transparent{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='120' height='120' viewBox='0 0 100 100'%3E%3Cpath fill='none' d='M0 0h100v100H0z'/%3E%3Crect xmlns='http://www.w3.org/2000/svg' width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.56)' rx='5' ry='5' transform='translate(0 -30)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.5)' rx='5' ry='5' transform='rotate(30 105.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.43)' rx='5' ry='5' transform='rotate(60 75.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.38)' rx='5' ry='5' transform='rotate(90 65 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.32)' rx='5' ry='5' transform='rotate(120 58.66 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.28)' rx='5' ry='5' transform='rotate(150 54.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.25)' rx='5' ry='5' transform='rotate(180 50 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.2)' rx='5' ry='5' transform='rotate(-150 45.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.17)' rx='5' ry='5' transform='rotate(-120 41.34 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.14)' rx='5' ry='5' transform='rotate(-90 35 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.1)' rx='5' ry='5' transform='rotate(-60 24.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.03)' rx='5' ry='5' transform='rotate(-30 -5.98 65)'/%3E%3C/svg%3E")}@-webkit-keyframes e{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}@keyframes e{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}.weui-slider{padding:15px 18px;-webkit-user-select:none;user-select:none}.weui-slider__inner{position:relative;height:2px;background-color:#e9e9e9}.weui-slider__track{height:2px;background-color:#1aad19;width:0}.weui-slider__handler{position:absolute;left:0;top:50%;width:28px;height:28px;margin-left:-14px;margin-top:-14px;border-radius:50%;background-color:#fff;box-shadow:0 0 4px rgba(0,0,0,.2)}.weui-slider-box{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.weui-slider-box .weui-slider{-webkit-box-flex:1;-webkit-flex:1;flex:1}.weui-slider-box__value{margin-left:.5em;min-width:24px;color:#888;text-align:center;font-size:14px}
\ No newline at end of file
diff --git a/NewLife.Cube/Content/jweui/lib/zepto.js b/NewLife.Cube/Content/jweui/lib/zepto.js
deleted file mode 100644
index ee30e993c6..0000000000
--- a/NewLife.Cube/Content/jweui/lib/zepto.js
+++ /dev/null
@@ -1,1587 +0,0 @@
-/* Zepto v1.1.6 - zepto event ajax form ie - zeptojs.com/license */
-
-var Zepto = (function() {
-  var undefined, key, $, classList, emptyArray = [], slice = emptyArray.slice, filter = emptyArray.filter,
-    document = window.document,
-    elementDisplay = {}, classCache = {},
-    cssNumber = { 'column-count': 1, 'columns': 1, 'font-weight': 1, 'line-height': 1,'opacity': 1, 'z-index': 1, 'zoom': 1 },
-    fragmentRE = /^\s*<(\w+|!)[^>]*>/,
-    singleTagRE = /^<(\w+)\s*\/?>(?:<\/\1>|)$/,
-    tagExpanderRE = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,
-    rootNodeRE = /^(?:body|html)$/i,
-    capitalRE = /([A-Z])/g,
-
-    // special attributes that should be get/set via method calls
-    methodAttributes = ['val', 'css', 'html', 'text', 'data', 'width', 'height', 'offset'],
-
-    adjacencyOperators = [ 'after', 'prepend', 'before', 'append' ],
-    table = document.createElement('table'),
-    tableRow = document.createElement('tr'),
-    containers = {
-      'tr': document.createElement('tbody'),
-      'tbody': table, 'thead': table, 'tfoot': table,
-      'td': tableRow, 'th': tableRow,
-      '*': document.createElement('div')
-    },
-    readyRE = /complete|loaded|interactive/,
-    simpleSelectorRE = /^[\w-]*$/,
-    class2type = {},
-    toString = class2type.toString,
-    zepto = {},
-    camelize, uniq,
-    tempParent = document.createElement('div'),
-    propMap = {
-      'tabindex': 'tabIndex',
-      'readonly': 'readOnly',
-      'for': 'htmlFor',
-      'class': 'className',
-      'maxlength': 'maxLength',
-      'cellspacing': 'cellSpacing',
-      'cellpadding': 'cellPadding',
-      'rowspan': 'rowSpan',
-      'colspan': 'colSpan',
-      'usemap': 'useMap',
-      'frameborder': 'frameBorder',
-      'contenteditable': 'contentEditable'
-    },
-    isArray = Array.isArray ||
-      function(object){ return object instanceof Array }
-
-  zepto.matches = function(element, selector) {
-    if (!selector || !element || element.nodeType !== 1) return false
-    var matchesSelector = element.webkitMatchesSelector || element.mozMatchesSelector ||
-                          element.oMatchesSelector || element.matchesSelector
-    if (matchesSelector) return matchesSelector.call(element, selector)
-    // fall back to performing a selector:
-    var match, parent = element.parentNode, temp = !parent
-    if (temp) (parent = tempParent).appendChild(element)
-    match = ~zepto.qsa(parent, selector).indexOf(element)
-    temp && tempParent.removeChild(element)
-    return match
-  }
-
-  function type(obj) {
-    return obj == null ? String(obj) :
-      class2type[toString.call(obj)] || "object"
-  }
-
-  function isFunction(value) { return type(value) == "function" }
-  function isWindow(obj)     { return obj != null && obj == obj.window }
-  function isDocument(obj)   { return obj != null && obj.nodeType == obj.DOCUMENT_NODE }
-  function isObject(obj)     { return type(obj) == "object" }
-  function isPlainObject(obj) {
-    return isObject(obj) && !isWindow(obj) && Object.getPrototypeOf(obj) == Object.prototype
-  }
-  function likeArray(obj) { return typeof obj.length == 'number' }
-
-  function compact(array) { return filter.call(array, function(item){ return item != null }) }
-  function flatten(array) { return array.length > 0 ? $.fn.concat.apply([], array) : array }
-  camelize = function(str){ return str.replace(/-+(.)?/g, function(match, chr){ return chr ? chr.toUpperCase() : '' }) }
-  function dasherize(str) {
-    return str.replace(/::/g, '/')
-           .replace(/([A-Z]+)([A-Z][a-z])/g, '$1_$2')
-           .replace(/([a-z\d])([A-Z])/g, '$1_$2')
-           .replace(/_/g, '-')
-           .toLowerCase()
-  }
-  uniq = function(array){ return filter.call(array, function(item, idx){ return array.indexOf(item) == idx }) }
-
-  function classRE(name) {
-    return name in classCache ?
-      classCache[name] : (classCache[name] = new RegExp('(^|\\s)' + name + '(\\s|$)'))
-  }
-
-  function maybeAddPx(name, value) {
-    return (typeof value == "number" && !cssNumber[dasherize(name)]) ? value + "px" : value
-  }
-
-  function defaultDisplay(nodeName) {
-    var element, display
-    if (!elementDisplay[nodeName]) {
-      element = document.createElement(nodeName)
-      document.body.appendChild(element)
-      display = getComputedStyle(element, '').getPropertyValue("display")
-      element.parentNode.removeChild(element)
-      display == "none" && (display = "block")
-      elementDisplay[nodeName] = display
-    }
-    return elementDisplay[nodeName]
-  }
-
-  function children(element) {
-    return 'children' in element ?
-      slice.call(element.children) :
-      $.map(element.childNodes, function(node){ if (node.nodeType == 1) return node })
-  }
-
-  // `$.zepto.fragment` takes a html string and an optional tag name
-  // to generate DOM nodes nodes from the given html string.
-  // The generated DOM nodes are returned as an array.
-  // This function can be overriden in plugins for example to make
-  // it compatible with browsers that don't support the DOM fully.
-  zepto.fragment = function(html, name, properties) {
-    var dom, nodes, container
-
-    // A special case optimization for a single tag
-    if (singleTagRE.test(html)) dom = $(document.createElement(RegExp.$1))
-
-    if (!dom) {
-      if (html.replace) html = html.replace(tagExpanderRE, "<$1></$2>")
-      if (name === undefined) name = fragmentRE.test(html) && RegExp.$1
-      if (!(name in containers)) name = '*'
-
-      container = containers[name]
-      container.innerHTML = '' + html
-      dom = $.each(slice.call(container.childNodes), function(){
-        container.removeChild(this)
-      })
-    }
-
-    if (isPlainObject(properties)) {
-      nodes = $(dom)
-      $.each(properties, function(key, value) {
-        if (methodAttributes.indexOf(key) > -1) nodes[key](value)
-        else nodes.attr(key, value)
-      })
-    }
-
-    return dom
-  }
-
-  // `$.zepto.Z` swaps out the prototype of the given `dom` array
-  // of nodes with `$.fn` and thus supplying all the Zepto functions
-  // to the array. Note that `__proto__` is not supported on Internet
-  // Explorer. This method can be overriden in plugins.
-  zepto.Z = function(dom, selector) {
-    dom = dom || []
-    dom.__proto__ = $.fn
-    dom.selector = selector || ''
-    return dom
-  }
-
-  // `$.zepto.isZ` should return `true` if the given object is a Zepto
-  // collection. This method can be overriden in plugins.
-  zepto.isZ = function(object) {
-    return object instanceof zepto.Z
-  }
-
-  // `$.zepto.init` is Zepto's counterpart to jQuery's `$.fn.init` and
-  // takes a CSS selector and an optional context (and handles various
-  // special cases).
-  // This method can be overriden in plugins.
-  zepto.init = function(selector, context) {
-    var dom
-    // If nothing given, return an empty Zepto collection
-    if (!selector) return zepto.Z()
-    // Optimize for string selectors
-    else if (typeof selector == 'string') {
-      selector = selector.trim()
-      // If it's a html fragment, create nodes from it
-      // Note: In both Chrome 21 and Firefox 15, DOM error 12
-      // is thrown if the fragment doesn't begin with <
-      if (selector[0] == '<' && fragmentRE.test(selector))
-        dom = zepto.fragment(selector, RegExp.$1, context), selector = null
-      // If there's a context, create a collection on that context first, and select
-      // nodes from there
-      else if (context !== undefined) return $(context).find(selector)
-      // If it's a CSS selector, use it to select nodes.
-      else dom = zepto.qsa(document, selector)
-    }
-    // If a function is given, call it when the DOM is ready
-    else if (isFunction(selector)) return $(document).ready(selector)
-    // If a Zepto collection is given, just return it
-    else if (zepto.isZ(selector)) return selector
-    else {
-      // normalize array if an array of nodes is given
-      if (isArray(selector)) dom = compact(selector)
-      // Wrap DOM nodes.
-      else if (isObject(selector))
-        dom = [selector], selector = null
-      // If it's a html fragment, create nodes from it
-      else if (fragmentRE.test(selector))
-        dom = zepto.fragment(selector.trim(), RegExp.$1, context), selector = null
-      // If there's a context, create a collection on that context first, and select
-      // nodes from there
-      else if (context !== undefined) return $(context).find(selector)
-      // And last but no least, if it's a CSS selector, use it to select nodes.
-      else dom = zepto.qsa(document, selector)
-    }
-    // create a new Zepto collection from the nodes found
-    return zepto.Z(dom, selector)
-  }
-
-  // `$` will be the base `Zepto` object. When calling this
-  // function just call `$.zepto.init, which makes the implementation
-  // details of selecting nodes and creating Zepto collections
-  // patchable in plugins.
-  $ = function(selector, context){
-    return zepto.init(selector, context)
-  }
-
-  function extend(target, source, deep) {
-    for (key in source)
-      if (deep && (isPlainObject(source[key]) || isArray(source[key]))) {
-        if (isPlainObject(source[key]) && !isPlainObject(target[key]))
-          target[key] = {}
-        if (isArray(source[key]) && !isArray(target[key]))
-          target[key] = []
-        extend(target[key], source[key], deep)
-      }
-      else if (source[key] !== undefined) target[key] = source[key]
-  }
-
-  // Copy all but undefined properties from one or more
-  // objects to the `target` object.
-  $.extend = function(target){
-    var deep, args = slice.call(arguments, 1)
-    if (typeof target == 'boolean') {
-      deep = target
-      target = args.shift()
-    }
-    args.forEach(function(arg){ extend(target, arg, deep) })
-    return target
-  }
-
-  // `$.zepto.qsa` is Zepto's CSS selector implementation which
-  // uses `document.querySelectorAll` and optimizes for some special cases, like `#id`.
-  // This method can be overriden in plugins.
-  zepto.qsa = function(element, selector){
-    var found,
-        maybeID = selector[0] == '#',
-        maybeClass = !maybeID && selector[0] == '.',
-        nameOnly = maybeID || maybeClass ? selector.slice(1) : selector, // Ensure that a 1 char tag name still gets checked
-        isSimple = simpleSelectorRE.test(nameOnly)
-    return (isDocument(element) && isSimple && maybeID) ?
-      ( (found = element.getElementById(nameOnly)) ? [found] : [] ) :
-      (element.nodeType !== 1 && element.nodeType !== 9) ? [] :
-      slice.call(
-        isSimple && !maybeID ?
-          maybeClass ? element.getElementsByClassName(nameOnly) : // If it's simple, it could be a class
-          element.getElementsByTagName(selector) : // Or a tag
-          element.querySelectorAll(selector) // Or it's not simple, and we need to query all
-      )
-  }
-
-  function filtered(nodes, selector) {
-    return selector == null ? $(nodes) : $(nodes).filter(selector)
-  }
-
-  $.contains = document.documentElement.contains ?
-    function(parent, node) {
-      return parent !== node && parent.contains(node)
-    } :
-    function(parent, node) {
-      while (node && (node = node.parentNode))
-        if (node === parent) return true
-      return false
-    }
-
-  function funcArg(context, arg, idx, payload) {
-    return isFunction(arg) ? arg.call(context, idx, payload) : arg
-  }
-
-  function setAttribute(node, name, value) {
-    value == null ? node.removeAttribute(name) : node.setAttribute(name, value)
-  }
-
-  // access className property while respecting SVGAnimatedString
-  function className(node, value){
-    var klass = node.className || '',
-        svg   = klass && klass.baseVal !== undefined
-
-    if (value === undefined) return svg ? klass.baseVal : klass
-    svg ? (klass.baseVal = value) : (node.className = value)
-  }
-
-  // "true"  => true
-  // "false" => false
-  // "null"  => null
-  // "42"    => 42
-  // "42.5"  => 42.5
-  // "08"    => "08"
-  // JSON    => parse if valid
-  // String  => self
-  function deserializeValue(value) {
-    try {
-      return value ?
-        value == "true" ||
-        ( value == "false" ? false :
-          value == "null" ? null :
-          +value + "" == value ? +value :
-          /^[\[\{]/.test(value) ? $.parseJSON(value) :
-          value )
-        : value
-    } catch(e) {
-      return value
-    }
-  }
-
-  $.type = type
-  $.isFunction = isFunction
-  $.isWindow = isWindow
-  $.isArray = isArray
-  $.isPlainObject = isPlainObject
-
-  $.isEmptyObject = function(obj) {
-    var name
-    for (name in obj) return false
-    return true
-  }
-
-  $.inArray = function(elem, array, i){
-    return emptyArray.indexOf.call(array, elem, i)
-  }
-
-  $.camelCase = camelize
-  $.trim = function(str) {
-    return str == null ? "" : String.prototype.trim.call(str)
-  }
-
-  // plugin compatibility
-  $.uuid = 0
-  $.support = { }
-  $.expr = { }
-
-  $.map = function(elements, callback){
-    var value, values = [], i, key
-    if (likeArray(elements))
-      for (i = 0; i < elements.length; i++) {
-        value = callback(elements[i], i)
-        if (value != null) values.push(value)
-      }
-    else
-      for (key in elements) {
-        value = callback(elements[key], key)
-        if (value != null) values.push(value)
-      }
-    return flatten(values)
-  }
-
-  $.each = function(elements, callback){
-    var i, key
-    if (likeArray(elements)) {
-      for (i = 0; i < elements.length; i++)
-        if (callback.call(elements[i], i, elements[i]) === false) return elements
-    } else {
-      for (key in elements)
-        if (callback.call(elements[key], key, elements[key]) === false) return elements
-    }
-
-    return elements
-  }
-
-  $.grep = function(elements, callback){
-    return filter.call(elements, callback)
-  }
-
-  if (window.JSON) $.parseJSON = JSON.parse
-
-  // Populate the class2type map
-  $.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function(i, name) {
-    class2type[ "[object " + name + "]" ] = name.toLowerCase()
-  })
-
-  // Define methods that will be available on all
-  // Zepto collections
-  $.fn = {
-    // Because a collection acts like an array
-    // copy over these useful array functions.
-    forEach: emptyArray.forEach,
-    reduce: emptyArray.reduce,
-    push: emptyArray.push,
-    sort: emptyArray.sort,
-    indexOf: emptyArray.indexOf,
-    concat: emptyArray.concat,
-
-    // `map` and `slice` in the jQuery API work differently
-    // from their array counterparts
-    map: function(fn){
-      return $($.map(this, function(el, i){ return fn.call(el, i, el) }))
-    },
-    slice: function(){
-      return $(slice.apply(this, arguments))
-    },
-
-    ready: function(callback){
-      // need to check if document.body exists for IE as that browser reports
-      // document ready when it hasn't yet created the body element
-      if (readyRE.test(document.readyState) && document.body) callback($)
-      else document.addEventListener('DOMContentLoaded', function(){ callback($) }, false)
-      return this
-    },
-    get: function(idx){
-      return idx === undefined ? slice.call(this) : this[idx >= 0 ? idx : idx + this.length]
-    },
-    toArray: function(){ return this.get() },
-    size: function(){
-      return this.length
-    },
-    remove: function(){
-      return this.each(function(){
-        if (this.parentNode != null)
-          this.parentNode.removeChild(this)
-      })
-    },
-    each: function(callback){
-      emptyArray.every.call(this, function(el, idx){
-        return callback.call(el, idx, el) !== false
-      })
-      return this
-    },
-    filter: function(selector){
-      if (isFunction(selector)) return this.not(this.not(selector))
-      return $(filter.call(this, function(element){
-        return zepto.matches(element, selector)
-      }))
-    },
-    add: function(selector,context){
-      return $(uniq(this.concat($(selector,context))))
-    },
-    is: function(selector){
-      return this.length > 0 && zepto.matches(this[0], selector)
-    },
-    not: function(selector){
-      var nodes=[]
-      if (isFunction(selector) && selector.call !== undefined)
-        this.each(function(idx){
-          if (!selector.call(this,idx)) nodes.push(this)
-        })
-      else {
-        var excludes = typeof selector == 'string' ? this.filter(selector) :
-          (likeArray(selector) && isFunction(selector.item)) ? slice.call(selector) : $(selector)
-        this.forEach(function(el){
-          if (excludes.indexOf(el) < 0) nodes.push(el)
-        })
-      }
-      return $(nodes)
-    },
-    has: function(selector){
-      return this.filter(function(){
-        return isObject(selector) ?
-          $.contains(this, selector) :
-          $(this).find(selector).size()
-      })
-    },
-    eq: function(idx){
-      return idx === -1 ? this.slice(idx) : this.slice(idx, + idx + 1)
-    },
-    first: function(){
-      var el = this[0]
-      return el && !isObject(el) ? el : $(el)
-    },
-    last: function(){
-      var el = this[this.length - 1]
-      return el && !isObject(el) ? el : $(el)
-    },
-    find: function(selector){
-      var result, $this = this
-      if (!selector) result = $()
-      else if (typeof selector == 'object')
-        result = $(selector).filter(function(){
-          var node = this
-          return emptyArray.some.call($this, function(parent){
-            return $.contains(parent, node)
-          })
-        })
-      else if (this.length == 1) result = $(zepto.qsa(this[0], selector))
-      else result = this.map(function(){ return zepto.qsa(this, selector) })
-      return result
-    },
-    closest: function(selector, context){
-      var node = this[0], collection = false
-      if (typeof selector == 'object') collection = $(selector)
-      while (node && !(collection ? collection.indexOf(node) >= 0 : zepto.matches(node, selector)))
-        node = node !== context && !isDocument(node) && node.parentNode
-      return $(node)
-    },
-    parents: function(selector){
-      var ancestors = [], nodes = this
-      while (nodes.length > 0)
-        nodes = $.map(nodes, function(node){
-          if ((node = node.parentNode) && !isDocument(node) && ancestors.indexOf(node) < 0) {
-            ancestors.push(node)
-            return node
-          }
-        })
-      return filtered(ancestors, selector)
-    },
-    parent: function(selector){
-      return filtered(uniq(this.pluck('parentNode')), selector)
-    },
-    children: function(selector){
-      return filtered(this.map(function(){ return children(this) }), selector)
-    },
-    contents: function() {
-      return this.map(function() { return slice.call(this.childNodes) })
-    },
-    siblings: function(selector){
-      return filtered(this.map(function(i, el){
-        return filter.call(children(el.parentNode), function(child){ return child!==el })
-      }), selector)
-    },
-    empty: function(){
-      return this.each(function(){ this.innerHTML = '' })
-    },
-    // `pluck` is borrowed from Prototype.js
-    pluck: function(property){
-      return $.map(this, function(el){ return el[property] })
-    },
-    show: function(){
-      return this.each(function(){
-        this.style.display == "none" && (this.style.display = '')
-        if (getComputedStyle(this, '').getPropertyValue("display") == "none")
-          this.style.display = defaultDisplay(this.nodeName)
-      })
-    },
-    replaceWith: function(newContent){
-      return this.before(newContent).remove()
-    },
-    wrap: function(structure){
-      var func = isFunction(structure)
-      if (this[0] && !func)
-        var dom   = $(structure).get(0),
-            clone = dom.parentNode || this.length > 1
-
-      return this.each(function(index){
-        $(this).wrapAll(
-          func ? structure.call(this, index) :
-            clone ? dom.cloneNode(true) : dom
-        )
-      })
-    },
-    wrapAll: function(structure){
-      if (this[0]) {
-        $(this[0]).before(structure = $(structure))
-        var children
-        // drill down to the inmost element
-        while ((children = structure.children()).length) structure = children.first()
-        $(structure).append(this)
-      }
-      return this
-    },
-    wrapInner: function(structure){
-      var func = isFunction(structure)
-      return this.each(function(index){
-        var self = $(this), contents = self.contents(),
-            dom  = func ? structure.call(this, index) : structure
-        contents.length ? contents.wrapAll(dom) : self.append(dom)
-      })
-    },
-    unwrap: function(){
-      this.parent().each(function(){
-        $(this).replaceWith($(this).children())
-      })
-      return this
-    },
-    clone: function(){
-      return this.map(function(){ return this.cloneNode(true) })
-    },
-    hide: function(){
-      return this.css("display", "none")
-    },
-    toggle: function(setting){
-      return this.each(function(){
-        var el = $(this)
-        ;(setting === undefined ? el.css("display") == "none" : setting) ? el.show() : el.hide()
-      })
-    },
-    prev: function(selector){ return $(this.pluck('previousElementSibling')).filter(selector || '*') },
-    next: function(selector){ return $(this.pluck('nextElementSibling')).filter(selector || '*') },
-    html: function(html){
-      return 0 in arguments ?
-        this.each(function(idx){
-          var originHtml = this.innerHTML
-          $(this).empty().append( funcArg(this, html, idx, originHtml) )
-        }) :
-        (0 in this ? this[0].innerHTML : null)
-    },
-    text: function(text){
-      return 0 in arguments ?
-        this.each(function(idx){
-          var newText = funcArg(this, text, idx, this.textContent)
-          this.textContent = newText == null ? '' : ''+newText
-        }) :
-        (0 in this ? this[0].textContent : null)
-    },
-    attr: function(name, value){
-      var result
-      return (typeof name == 'string' && !(1 in arguments)) ?
-        (!this.length || this[0].nodeType !== 1 ? undefined :
-          (!(result = this[0].getAttribute(name)) && name in this[0]) ? this[0][name] : result
-        ) :
-        this.each(function(idx){
-          if (this.nodeType !== 1) return
-          if (isObject(name)) for (key in name) setAttribute(this, key, name[key])
-          else setAttribute(this, name, funcArg(this, value, idx, this.getAttribute(name)))
-        })
-    },
-    removeAttr: function(name){
-      return this.each(function(){ this.nodeType === 1 && name.split(' ').forEach(function(attribute){
-        setAttribute(this, attribute)
-      }, this)})
-    },
-    prop: function(name, value){
-      name = propMap[name] || name
-      return (1 in arguments) ?
-        this.each(function(idx){
-          this[name] = funcArg(this, value, idx, this[name])
-        }) :
-        (this[0] && this[0][name])
-    },
-    data: function(name, value){
-      var attrName = 'data-' + name.replace(capitalRE, '-$1').toLowerCase()
-
-      var data = (1 in arguments) ?
-        this.attr(attrName, value) :
-        this.attr(attrName)
-
-      return data !== null ? deserializeValue(data) : undefined
-    },
-    val: function(value){
-      return 0 in arguments ?
-        this.each(function(idx){
-          this.value = funcArg(this, value, idx, this.value)
-        }) :
-        (this[0] && (this[0].multiple ?
-           $(this[0]).find('option').filter(function(){ return this.selected }).pluck('value') :
-           this[0].value)
-        )
-    },
-    offset: function(coordinates){
-      if (coordinates) return this.each(function(index){
-        var $this = $(this),
-            coords = funcArg(this, coordinates, index, $this.offset()),
-            parentOffset = $this.offsetParent().offset(),
-            props = {
-              top:  coords.top  - parentOffset.top,
-              left: coords.left - parentOffset.left
-            }
-
-        if ($this.css('position') == 'static') props['position'] = 'relative'
-        $this.css(props)
-      })
-      if (!this.length) return null
-      var obj = this[0].getBoundingClientRect()
-      return {
-        left: obj.left + window.pageXOffset,
-        top: obj.top + window.pageYOffset,
-        width: Math.round(obj.width),
-        height: Math.round(obj.height)
-      }
-    },
-    css: function(property, value){
-      if (arguments.length < 2) {
-        var computedStyle, element = this[0]
-        if(!element) return
-        computedStyle = getComputedStyle(element, '')
-        if (typeof property == 'string')
-          return element.style[camelize(property)] || computedStyle.getPropertyValue(property)
-        else if (isArray(property)) {
-          var props = {}
-          $.each(property, function(_, prop){
-            props[prop] = (element.style[camelize(prop)] || computedStyle.getPropertyValue(prop))
-          })
-          return props
-        }
-      }
-
-      var css = ''
-      if (type(property) == 'string') {
-        if (!value && value !== 0)
-          this.each(function(){ this.style.removeProperty(dasherize(property)) })
-        else
-          css = dasherize(property) + ":" + maybeAddPx(property, value)
-      } else {
-        for (key in property)
-          if (!property[key] && property[key] !== 0)
-            this.each(function(){ this.style.removeProperty(dasherize(key)) })
-          else
-            css += dasherize(key) + ':' + maybeAddPx(key, property[key]) + ';'
-      }
-
-      return this.each(function(){ this.style.cssText += ';' + css })
-    },
-    index: function(element){
-      return element ? this.indexOf($(element)[0]) : this.parent().children().indexOf(this[0])
-    },
-    hasClass: function(name){
-      if (!name) return false
-      return emptyArray.some.call(this, function(el){
-        return this.test(className(el))
-      }, classRE(name))
-    },
-    addClass: function(name){
-      if (!name) return this
-      return this.each(function(idx){
-        if (!('className' in this)) return
-        classList = []
-        var cls = className(this), newName = funcArg(this, name, idx, cls)
-        newName.split(/\s+/g).forEach(function(klass){
-          if (!$(this).hasClass(klass)) classList.push(klass)
-        }, this)
-        classList.length && className(this, cls + (cls ? " " : "") + classList.join(" "))
-      })
-    },
-    removeClass: function(name){
-      return this.each(function(idx){
-        if (!('className' in this)) return
-        if (name === undefined) return className(this, '')
-        classList = className(this)
-        funcArg(this, name, idx, classList).split(/\s+/g).forEach(function(klass){
-          classList = classList.replace(classRE(klass), " ")
-        })
-        className(this, classList.trim())
-      })
-    },
-    toggleClass: function(name, when){
-      if (!name) return this
-      return this.each(function(idx){
-        var $this = $(this), names = funcArg(this, name, idx, className(this))
-        names.split(/\s+/g).forEach(function(klass){
-          (when === undefined ? !$this.hasClass(klass) : when) ?
-            $this.addClass(klass) : $this.removeClass(klass)
-        })
-      })
-    },
-    scrollTop: function(value){
-      if (!this.length) return
-      var hasScrollTop = 'scrollTop' in this[0]
-      if (value === undefined) return hasScrollTop ? this[0].scrollTop : this[0].pageYOffset
-      return this.each(hasScrollTop ?
-        function(){ this.scrollTop = value } :
-        function(){ this.scrollTo(this.scrollX, value) })
-    },
-    scrollLeft: function(value){
-      if (!this.length) return
-      var hasScrollLeft = 'scrollLeft' in this[0]
-      if (value === undefined) return hasScrollLeft ? this[0].scrollLeft : this[0].pageXOffset
-      return this.each(hasScrollLeft ?
-        function(){ this.scrollLeft = value } :
-        function(){ this.scrollTo(value, this.scrollY) })
-    },
-    position: function() {
-      if (!this.length) return
-
-      var elem = this[0],
-        // Get *real* offsetParent
-        offsetParent = this.offsetParent(),
-        // Get correct offsets
-        offset       = this.offset(),
-        parentOffset = rootNodeRE.test(offsetParent[0].nodeName) ? { top: 0, left: 0 } : offsetParent.offset()
-
-      // Subtract element margins
-      // note: when an element has margin: auto the offsetLeft and marginLeft
-      // are the same in Safari causing offset.left to incorrectly be 0
-      offset.top  -= parseFloat( $(elem).css('margin-top') ) || 0
-      offset.left -= parseFloat( $(elem).css('margin-left') ) || 0
-
-      // Add offsetParent borders
-      parentOffset.top  += parseFloat( $(offsetParent[0]).css('border-top-width') ) || 0
-      parentOffset.left += parseFloat( $(offsetParent[0]).css('border-left-width') ) || 0
-
-      // Subtract the two offsets
-      return {
-        top:  offset.top  - parentOffset.top,
-        left: offset.left - parentOffset.left
-      }
-    },
-    offsetParent: function() {
-      return this.map(function(){
-        var parent = this.offsetParent || document.body
-        while (parent && !rootNodeRE.test(parent.nodeName) && $(parent).css("position") == "static")
-          parent = parent.offsetParent
-        return parent
-      })
-    }
-  }
-
-  // for now
-  $.fn.detach = $.fn.remove
-
-  // Generate the `width` and `height` functions
-  ;['width', 'height'].forEach(function(dimension){
-    var dimensionProperty =
-      dimension.replace(/./, function(m){ return m[0].toUpperCase() })
-
-    $.fn[dimension] = function(value){
-      var offset, el = this[0]
-      if (value === undefined) return isWindow(el) ? el['inner' + dimensionProperty] :
-        isDocument(el) ? el.documentElement['scroll' + dimensionProperty] :
-        (offset = this.offset()) && offset[dimension]
-      else return this.each(function(idx){
-        el = $(this)
-        el.css(dimension, funcArg(this, value, idx, el[dimension]()))
-      })
-    }
-  })
-
-  function traverseNode(node, fun) {
-    fun(node)
-    for (var i = 0, len = node.childNodes.length; i < len; i++)
-      traverseNode(node.childNodes[i], fun)
-  }
-
-  // Generate the `after`, `prepend`, `before`, `append`,
-  // `insertAfter`, `insertBefore`, `appendTo`, and `prependTo` methods.
-  adjacencyOperators.forEach(function(operator, operatorIndex) {
-    var inside = operatorIndex % 2 //=> prepend, append
-
-    $.fn[operator] = function(){
-      // arguments can be nodes, arrays of nodes, Zepto objects and HTML strings
-      var argType, nodes = $.map(arguments, function(arg) {
-            argType = type(arg)
-            return argType == "object" || argType == "array" || arg == null ?
-              arg : zepto.fragment(arg)
-          }),
-          parent, copyByClone = this.length > 1
-      if (nodes.length < 1) return this
-
-      return this.each(function(_, target){
-        parent = inside ? target : target.parentNode
-
-        // convert all methods to a "before" operation
-        target = operatorIndex == 0 ? target.nextSibling :
-                 operatorIndex == 1 ? target.firstChild :
-                 operatorIndex == 2 ? target :
-                 null
-
-        var parentInDocument = $.contains(document.documentElement, parent)
-
-        nodes.forEach(function(node){
-          if (copyByClone) node = node.cloneNode(true)
-          else if (!parent) return $(node).remove()
-
-          parent.insertBefore(node, target)
-          if (parentInDocument) traverseNode(node, function(el){
-            if (el.nodeName != null && el.nodeName.toUpperCase() === 'SCRIPT' &&
-               (!el.type || el.type === 'text/javascript') && !el.src)
-              window['eval'].call(window, el.innerHTML)
-          })
-        })
-      })
-    }
-
-    // after    => insertAfter
-    // prepend  => prependTo
-    // before   => insertBefore
-    // append   => appendTo
-    $.fn[inside ? operator+'To' : 'insert'+(operatorIndex ? 'Before' : 'After')] = function(html){
-      $(html)[operator](this)
-      return this
-    }
-  })
-
-  zepto.Z.prototype = $.fn
-
-  // Export internal API functions in the `$.zepto` namespace
-  zepto.uniq = uniq
-  zepto.deserializeValue = deserializeValue
-  $.zepto = zepto
-
-  return $
-})()
-
-window.Zepto = Zepto
-window.$ === undefined && (window.$ = Zepto)
-
-;(function($){
-  var _zid = 1, undefined,
-      slice = Array.prototype.slice,
-      isFunction = $.isFunction,
-      isString = function(obj){ return typeof obj == 'string' },
-      handlers = {},
-      specialEvents={},
-      focusinSupported = 'onfocusin' in window,
-      focus = { focus: 'focusin', blur: 'focusout' },
-      hover = { mouseenter: 'mouseover', mouseleave: 'mouseout' }
-
-  specialEvents.click = specialEvents.mousedown = specialEvents.mouseup = specialEvents.mousemove = 'MouseEvents'
-
-  function zid(element) {
-    return element._zid || (element._zid = _zid++)
-  }
-  function findHandlers(element, event, fn, selector) {
-    event = parse(event)
-    if (event.ns) var matcher = matcherFor(event.ns)
-    return (handlers[zid(element)] || []).filter(function(handler) {
-      return handler
-        && (!event.e  || handler.e == event.e)
-        && (!event.ns || matcher.test(handler.ns))
-        && (!fn       || zid(handler.fn) === zid(fn))
-        && (!selector || handler.sel == selector)
-    })
-  }
-  function parse(event) {
-    var parts = ('' + event).split('.')
-    return {e: parts[0], ns: parts.slice(1).sort().join(' ')}
-  }
-  function matcherFor(ns) {
-    return new RegExp('(?:^| )' + ns.replace(' ', ' .* ?') + '(?: |$)')
-  }
-
-  function eventCapture(handler, captureSetting) {
-    return handler.del &&
-      (!focusinSupported && (handler.e in focus)) ||
-      !!captureSetting
-  }
-
-  function realEvent(type) {
-    return hover[type] || (focusinSupported && focus[type]) || type
-  }
-
-  function add(element, events, fn, data, selector, delegator, capture){
-    var id = zid(element), set = (handlers[id] || (handlers[id] = []))
-    events.split(/\s/).forEach(function(event){
-      if (event == 'ready') return $(document).ready(fn)
-      var handler   = parse(event)
-      handler.fn    = fn
-      handler.sel   = selector
-      // emulate mouseenter, mouseleave
-      if (handler.e in hover) fn = function(e){
-        var related = e.relatedTarget
-        if (!related || (related !== this && !$.contains(this, related)))
-          return handler.fn.apply(this, arguments)
-      }
-      handler.del   = delegator
-      var callback  = delegator || fn
-      handler.proxy = function(e){
-        e = compatible(e)
-        if (e.isImmediatePropagationStopped()) return
-        e.data = data
-        var result = callback.apply(element, e._args == undefined ? [e] : [e].concat(e._args))
-        if (result === false) e.preventDefault(), e.stopPropagation()
-        return result
-      }
-      handler.i = set.length
-      set.push(handler)
-      if ('addEventListener' in element)
-        element.addEventListener(realEvent(handler.e), handler.proxy, eventCapture(handler, capture))
-    })
-  }
-  function remove(element, events, fn, selector, capture){
-    var id = zid(element)
-    ;(events || '').split(/\s/).forEach(function(event){
-      findHandlers(element, event, fn, selector).forEach(function(handler){
-        delete handlers[id][handler.i]
-      if ('removeEventListener' in element)
-        element.removeEventListener(realEvent(handler.e), handler.proxy, eventCapture(handler, capture))
-      })
-    })
-  }
-
-  $.event = { add: add, remove: remove }
-
-  $.proxy = function(fn, context) {
-    var args = (2 in arguments) && slice.call(arguments, 2)
-    if (isFunction(fn)) {
-      var proxyFn = function(){ return fn.apply(context, args ? args.concat(slice.call(arguments)) : arguments) }
-      proxyFn._zid = zid(fn)
-      return proxyFn
-    } else if (isString(context)) {
-      if (args) {
-        args.unshift(fn[context], fn)
-        return $.proxy.apply(null, args)
-      } else {
-        return $.proxy(fn[context], fn)
-      }
-    } else {
-      throw new TypeError("expected function")
-    }
-  }
-
-  $.fn.bind = function(event, data, callback){
-    return this.on(event, data, callback)
-  }
-  $.fn.unbind = function(event, callback){
-    return this.off(event, callback)
-  }
-  $.fn.one = function(event, selector, data, callback){
-    return this.on(event, selector, data, callback, 1)
-  }
-
-  var returnTrue = function(){return true},
-      returnFalse = function(){return false},
-      ignoreProperties = /^([A-Z]|returnValue$|layer[XY]$)/,
-      eventMethods = {
-        preventDefault: 'isDefaultPrevented',
-        stopImmediatePropagation: 'isImmediatePropagationStopped',
-        stopPropagation: 'isPropagationStopped'
-      }
-
-  function compatible(event, source) {
-    if (source || !event.isDefaultPrevented) {
-      source || (source = event)
-
-      $.each(eventMethods, function(name, predicate) {
-        var sourceMethod = source[name]
-        event[name] = function(){
-          this[predicate] = returnTrue
-          return sourceMethod && sourceMethod.apply(source, arguments)
-        }
-        event[predicate] = returnFalse
-      })
-
-      if (source.defaultPrevented !== undefined ? source.defaultPrevented :
-          'returnValue' in source ? source.returnValue === false :
-          source.getPreventDefault && source.getPreventDefault())
-        event.isDefaultPrevented = returnTrue
-    }
-    return event
-  }
-
-  function createProxy(event) {
-    var key, proxy = { originalEvent: event }
-    for (key in event)
-      if (!ignoreProperties.test(key) && event[key] !== undefined) proxy[key] = event[key]
-
-    return compatible(proxy, event)
-  }
-
-  $.fn.delegate = function(selector, event, callback){
-    return this.on(event, selector, callback)
-  }
-  $.fn.undelegate = function(selector, event, callback){
-    return this.off(event, selector, callback)
-  }
-
-  $.fn.live = function(event, callback){
-    $(document.body).delegate(this.selector, event, callback)
-    return this
-  }
-  $.fn.die = function(event, callback){
-    $(document.body).undelegate(this.selector, event, callback)
-    return this
-  }
-
-  $.fn.on = function(event, selector, data, callback, one){
-    var autoRemove, delegator, $this = this
-    if (event && !isString(event)) {
-      $.each(event, function(type, fn){
-        $this.on(type, selector, data, fn, one)
-      })
-      return $this
-    }
-
-    if (!isString(selector) && !isFunction(callback) && callback !== false)
-      callback = data, data = selector, selector = undefined
-    if (isFunction(data) || data === false)
-      callback = data, data = undefined
-
-    if (callback === false) callback = returnFalse
-
-    return $this.each(function(_, element){
-      if (one) autoRemove = function(e){
-        remove(element, e.type, callback)
-        return callback.apply(this, arguments)
-      }
-
-      if (selector) delegator = function(e){
-        var evt, match = $(e.target).closest(selector, element).get(0)
-        if (match && match !== element) {
-          evt = $.extend(createProxy(e), {currentTarget: match, liveFired: element})
-          return (autoRemove || callback).apply(match, [evt].concat(slice.call(arguments, 1)))
-        }
-      }
-
-      add(element, event, callback, data, selector, delegator || autoRemove)
-    })
-  }
-  $.fn.off = function(event, selector, callback){
-    var $this = this
-    if (event && !isString(event)) {
-      $.each(event, function(type, fn){
-        $this.off(type, selector, fn)
-      })
-      return $this
-    }
-
-    if (!isString(selector) && !isFunction(callback) && callback !== false)
-      callback = selector, selector = undefined
-
-    if (callback === false) callback = returnFalse
-
-    return $this.each(function(){
-      remove(this, event, callback, selector)
-    })
-  }
-
-  $.fn.trigger = function(event, args){
-    event = (isString(event) || $.isPlainObject(event)) ? $.Event(event) : compatible(event)
-    event._args = args
-    return this.each(function(){
-      // handle focus(), blur() by calling them directly
-      if (event.type in focus && typeof this[event.type] == "function") this[event.type]()
-      // items in the collection might not be DOM elements
-      else if ('dispatchEvent' in this) this.dispatchEvent(event)
-      else $(this).triggerHandler(event, args)
-    })
-  }
-
-  // triggers event handlers on current element just as if an event occurred,
-  // doesn't trigger an actual event, doesn't bubble
-  $.fn.triggerHandler = function(event, args){
-    var e, result
-    this.each(function(i, element){
-      e = createProxy(isString(event) ? $.Event(event) : event)
-      e._args = args
-      e.target = element
-      $.each(findHandlers(element, event.type || event), function(i, handler){
-        result = handler.proxy(e)
-        if (e.isImmediatePropagationStopped()) return false
-      })
-    })
-    return result
-  }
-
-  // shortcut methods for `.bind(event, fn)` for each event type
-  ;('focusin focusout focus blur load resize scroll unload click dblclick '+
-  'mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave '+
-  'change select keydown keypress keyup error').split(' ').forEach(function(event) {
-    $.fn[event] = function(callback) {
-      return (0 in arguments) ?
-        this.bind(event, callback) :
-        this.trigger(event)
-    }
-  })
-
-  $.Event = function(type, props) {
-    if (!isString(type)) props = type, type = props.type
-    var event = document.createEvent(specialEvents[type] || 'Events'), bubbles = true
-    if (props) for (var name in props) (name == 'bubbles') ? (bubbles = !!props[name]) : (event[name] = props[name])
-    event.initEvent(type, bubbles, true)
-    return compatible(event)
-  }
-
-})(Zepto)
-
-;(function($){
-  var jsonpID = 0,
-      document = window.document,
-      key,
-      name,
-      rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
-      scriptTypeRE = /^(?:text|application)\/javascript/i,
-      xmlTypeRE = /^(?:text|application)\/xml/i,
-      jsonType = 'application/json',
-      htmlType = 'text/html',
-      blankRE = /^\s*$/,
-      originAnchor = document.createElement('a')
-
-  originAnchor.href = window.location.href
-
-  // trigger a custom event and return false if it was cancelled
-  function triggerAndReturn(context, eventName, data) {
-    var event = $.Event(eventName)
-    $(context).trigger(event, data)
-    return !event.isDefaultPrevented()
-  }
-
-  // trigger an Ajax "global" event
-  function triggerGlobal(settings, context, eventName, data) {
-    if (settings.global) return triggerAndReturn(context || document, eventName, data)
-  }
-
-  // Number of active Ajax requests
-  $.active = 0
-
-  function ajaxStart(settings) {
-    if (settings.global && $.active++ === 0) triggerGlobal(settings, null, 'ajaxStart')
-  }
-  function ajaxStop(settings) {
-    if (settings.global && !(--$.active)) triggerGlobal(settings, null, 'ajaxStop')
-  }
-
-  // triggers an extra global event "ajaxBeforeSend" that's like "ajaxSend" but cancelable
-  function ajaxBeforeSend(xhr, settings) {
-    var context = settings.context
-    if (settings.beforeSend.call(context, xhr, settings) === false ||
-        triggerGlobal(settings, context, 'ajaxBeforeSend', [xhr, settings]) === false)
-      return false
-
-    triggerGlobal(settings, context, 'ajaxSend', [xhr, settings])
-  }
-  function ajaxSuccess(data, xhr, settings, deferred) {
-    var context = settings.context, status = 'success'
-    settings.success.call(context, data, status, xhr)
-    if (deferred) deferred.resolveWith(context, [data, status, xhr])
-    triggerGlobal(settings, context, 'ajaxSuccess', [xhr, settings, data])
-    ajaxComplete(status, xhr, settings)
-  }
-  // type: "timeout", "error", "abort", "parsererror"
-  function ajaxError(error, type, xhr, settings, deferred) {
-    var context = settings.context
-    settings.error.call(context, xhr, type, error)
-    if (deferred) deferred.rejectWith(context, [xhr, type, error])
-    triggerGlobal(settings, context, 'ajaxError', [xhr, settings, error || type])
-    ajaxComplete(type, xhr, settings)
-  }
-  // status: "success", "notmodified", "error", "timeout", "abort", "parsererror"
-  function ajaxComplete(status, xhr, settings) {
-    var context = settings.context
-    settings.complete.call(context, xhr, status)
-    triggerGlobal(settings, context, 'ajaxComplete', [xhr, settings])
-    ajaxStop(settings)
-  }
-
-  // Empty function, used as default callback
-  function empty() {}
-
-  $.ajaxJSONP = function(options, deferred){
-    if (!('type' in options)) return $.ajax(options)
-
-    var _callbackName = options.jsonpCallback,
-      callbackName = ($.isFunction(_callbackName) ?
-        _callbackName() : _callbackName) || ('jsonp' + (++jsonpID)),
-      script = document.createElement('script'),
-      originalCallback = window[callbackName],
-      responseData,
-      abort = function(errorType) {
-        $(script).triggerHandler('error', errorType || 'abort')
-      },
-      xhr = { abort: abort }, abortTimeout
-
-    if (deferred) deferred.promise(xhr)
-
-    $(script).on('load error', function(e, errorType){
-      clearTimeout(abortTimeout)
-      $(script).off().remove()
-
-      if (e.type == 'error' || !responseData) {
-        ajaxError(null, errorType || 'error', xhr, options, deferred)
-      } else {
-        ajaxSuccess(responseData[0], xhr, options, deferred)
-      }
-
-      window[callbackName] = originalCallback
-      if (responseData && $.isFunction(originalCallback))
-        originalCallback(responseData[0])
-
-      originalCallback = responseData = undefined
-    })
-
-    if (ajaxBeforeSend(xhr, options) === false) {
-      abort('abort')
-      return xhr
-    }
-
-    window[callbackName] = function(){
-      responseData = arguments
-    }
-
-    script.src = options.url.replace(/\?(.+)=\?/, '?$1=' + callbackName)
-    document.head.appendChild(script)
-
-    if (options.timeout > 0) abortTimeout = setTimeout(function(){
-      abort('timeout')
-    }, options.timeout)
-
-    return xhr
-  }
-
-  $.ajaxSettings = {
-    // Default type of request
-    type: 'GET',
-    // Callback that is executed before request
-    beforeSend: empty,
-    // Callback that is executed if the request succeeds
-    success: empty,
-    // Callback that is executed the the server drops error
-    error: empty,
-    // Callback that is executed on request complete (both: error and success)
-    complete: empty,
-    // The context for the callbacks
-    context: null,
-    // Whether to trigger "global" Ajax events
-    global: true,
-    // Transport
-    xhr: function () {
-      return new window.XMLHttpRequest()
-    },
-    // MIME types mapping
-    // IIS returns Javascript as "application/x-javascript"
-    accepts: {
-      script: 'text/javascript, application/javascript, application/x-javascript',
-      json:   jsonType,
-      xml:    'application/xml, text/xml',
-      html:   htmlType,
-      text:   'text/plain'
-    },
-    // Whether the request is to another domain
-    crossDomain: false,
-    // Default timeout
-    timeout: 0,
-    // Whether data should be serialized to string
-    processData: true,
-    // Whether the browser should be allowed to cache GET responses
-    cache: true
-  }
-
-  function mimeToDataType(mime) {
-    if (mime) mime = mime.split(';', 2)[0]
-    return mime && ( mime == htmlType ? 'html' :
-      mime == jsonType ? 'json' :
-      scriptTypeRE.test(mime) ? 'script' :
-      xmlTypeRE.test(mime) && 'xml' ) || 'text'
-  }
-
-  function appendQuery(url, query) {
-    if (query == '') return url
-    return (url + '&' + query).replace(/[&?]{1,2}/, '?')
-  }
-
-  // serialize payload and append it to the URL for GET requests
-  function serializeData(options) {
-    if (options.processData && options.data && $.type(options.data) != "string")
-      options.data = $.param(options.data, options.traditional)
-    if (options.data && (!options.type || options.type.toUpperCase() == 'GET'))
-      options.url = appendQuery(options.url, options.data), options.data = undefined
-  }
-
-  $.ajax = function(options){
-    var settings = $.extend({}, options || {}),
-        deferred = $.Deferred && $.Deferred(),
-        urlAnchor
-    for (key in $.ajaxSettings) if (settings[key] === undefined) settings[key] = $.ajaxSettings[key]
-
-    ajaxStart(settings)
-
-    if (!settings.crossDomain) {
-      urlAnchor = document.createElement('a')
-      urlAnchor.href = settings.url
-      urlAnchor.href = urlAnchor.href
-      settings.crossDomain = (originAnchor.protocol + '//' + originAnchor.host) !== (urlAnchor.protocol + '//' + urlAnchor.host)
-    }
-
-    if (!settings.url) settings.url = window.location.toString()
-    serializeData(settings)
-
-    var dataType = settings.dataType, hasPlaceholder = /\?.+=\?/.test(settings.url)
-    if (hasPlaceholder) dataType = 'jsonp'
-
-    if (settings.cache === false || (
-         (!options || options.cache !== true) &&
-         ('script' == dataType || 'jsonp' == dataType)
-        ))
-      settings.url = appendQuery(settings.url, '_=' + Date.now())
-
-    if ('jsonp' == dataType) {
-      if (!hasPlaceholder)
-        settings.url = appendQuery(settings.url,
-          settings.jsonp ? (settings.jsonp + '=?') : settings.jsonp === false ? '' : 'callback=?')
-      return $.ajaxJSONP(settings, deferred)
-    }
-
-    var mime = settings.accepts[dataType],
-        headers = { },
-        setHeader = function(name, value) { headers[name.toLowerCase()] = [name, value] },
-        protocol = /^([\w-]+:)\/\//.test(settings.url) ? RegExp.$1 : window.location.protocol,
-        xhr = settings.xhr(),
-        nativeSetHeader = xhr.setRequestHeader,
-        abortTimeout
-
-    if (deferred) deferred.promise(xhr)
-
-    if (!settings.crossDomain) setHeader('X-Requested-With', 'XMLHttpRequest')
-    setHeader('Accept', mime || '*/*')
-    if (mime = settings.mimeType || mime) {
-      if (mime.indexOf(',') > -1) mime = mime.split(',', 2)[0]
-      xhr.overrideMimeType && xhr.overrideMimeType(mime)
-    }
-    if (settings.contentType || (settings.contentType !== false && settings.data && settings.type.toUpperCase() != 'GET'))
-      setHeader('Content-Type', settings.contentType || 'application/x-www-form-urlencoded')
-
-    if (settings.headers) for (name in settings.headers) setHeader(name, settings.headers[name])
-    xhr.setRequestHeader = setHeader
-
-    xhr.onreadystatechange = function(){
-      if (xhr.readyState == 4) {
-        xhr.onreadystatechange = empty
-        clearTimeout(abortTimeout)
-        var result, error = false
-        if ((xhr.status >= 200 && xhr.status < 300) || xhr.status == 304 || (xhr.status == 0 && protocol == 'file:')) {
-          dataType = dataType || mimeToDataType(settings.mimeType || xhr.getResponseHeader('content-type'))
-          result = xhr.responseText
-
-          try {
-            // http://perfectionkills.com/global-eval-what-are-the-options/
-            if (dataType == 'script')    (1,eval)(result)
-            else if (dataType == 'xml')  result = xhr.responseXML
-            else if (dataType == 'json') result = blankRE.test(result) ? null : $.parseJSON(result)
-          } catch (e) { error = e }
-
-          if (error) ajaxError(error, 'parsererror', xhr, settings, deferred)
-          else ajaxSuccess(result, xhr, settings, deferred)
-        } else {
-          ajaxError(xhr.statusText || null, xhr.status ? 'error' : 'abort', xhr, settings, deferred)
-        }
-      }
-    }
-
-    if (ajaxBeforeSend(xhr, settings) === false) {
-      xhr.abort()
-      ajaxError(null, 'abort', xhr, settings, deferred)
-      return xhr
-    }
-
-    if (settings.xhrFields) for (name in settings.xhrFields) xhr[name] = settings.xhrFields[name]
-
-    var async = 'async' in settings ? settings.async : true
-    xhr.open(settings.type, settings.url, async, settings.username, settings.password)
-
-    for (name in headers) nativeSetHeader.apply(xhr, headers[name])
-
-    if (settings.timeout > 0) abortTimeout = setTimeout(function(){
-        xhr.onreadystatechange = empty
-        xhr.abort()
-        ajaxError(null, 'timeout', xhr, settings, deferred)
-      }, settings.timeout)
-
-    // avoid sending empty string (#319)
-    xhr.send(settings.data ? settings.data : null)
-    return xhr
-  }
-
-  // handle optional data/success arguments
-  function parseArguments(url, data, success, dataType) {
-    if ($.isFunction(data)) dataType = success, success = data, data = undefined
-    if (!$.isFunction(success)) dataType = success, success = undefined
-    return {
-      url: url
-    , data: data
-    , success: success
-    , dataType: dataType
-    }
-  }
-
-  $.get = function(/* url, data, success, dataType */){
-    return $.ajax(parseArguments.apply(null, arguments))
-  }
-
-  $.post = function(/* url, data, success, dataType */){
-    var options = parseArguments.apply(null, arguments)
-    options.type = 'POST'
-    return $.ajax(options)
-  }
-
-  $.getJSON = function(/* url, data, success */){
-    var options = parseArguments.apply(null, arguments)
-    options.dataType = 'json'
-    return $.ajax(options)
-  }
-
-  $.fn.load = function(url, data, success){
-    if (!this.length) return this
-    var self = this, parts = url.split(/\s/), selector,
-        options = parseArguments(url, data, success),
-        callback = options.success
-    if (parts.length > 1) options.url = parts[0], selector = parts[1]
-    options.success = function(response){
-      self.html(selector ?
-        $('<div>').html(response.replace(rscript, "")).find(selector)
-        : response)
-      callback && callback.apply(self, arguments)
-    }
-    $.ajax(options)
-    return this
-  }
-
-  var escape = encodeURIComponent
-
-  function serialize(params, obj, traditional, scope){
-    var type, array = $.isArray(obj), hash = $.isPlainObject(obj)
-    $.each(obj, function(key, value) {
-      type = $.type(value)
-      if (scope) key = traditional ? scope :
-        scope + '[' + (hash || type == 'object' || type == 'array' ? key : '') + ']'
-      // handle data in serializeArray() format
-      if (!scope && array) params.add(value.name, value.value)
-      // recurse into nested objects
-      else if (type == "array" || (!traditional && type == "object"))
-        serialize(params, value, traditional, key)
-      else params.add(key, value)
-    })
-  }
-
-  $.param = function(obj, traditional){
-    var params = []
-    params.add = function(key, value) {
-      if ($.isFunction(value)) value = value()
-      if (value == null) value = ""
-      this.push(escape(key) + '=' + escape(value))
-    }
-    serialize(params, obj, traditional)
-    return params.join('&').replace(/%20/g, '+')
-  }
-})(Zepto)
-
-;(function($){
-  $.fn.serializeArray = function() {
-    var name, type, result = [],
-      add = function(value) {
-        if (value.forEach) return value.forEach(add)
-        result.push({ name: name, value: value })
-      }
-    if (this[0]) $.each(this[0].elements, function(_, field){
-      type = field.type, name = field.name
-      if (name && field.nodeName.toLowerCase() != 'fieldset' &&
-        !field.disabled && type != 'submit' && type != 'reset' && type != 'button' && type != 'file' &&
-        ((type != 'radio' && type != 'checkbox') || field.checked))
-          add($(field).val())
-    })
-    return result
-  }
-
-  $.fn.serialize = function(){
-    var result = []
-    this.serializeArray().forEach(function(elm){
-      result.push(encodeURIComponent(elm.name) + '=' + encodeURIComponent(elm.value))
-    })
-    return result.join('&')
-  }
-
-  $.fn.submit = function(callback) {
-    if (0 in arguments) this.bind('submit', callback)
-    else if (this.length) {
-      var event = $.Event('submit')
-      this.eq(0).trigger(event)
-      if (!event.isDefaultPrevented()) this.get(0).submit()
-    }
-    return this
-  }
-
-})(Zepto)
-
-;(function($){
-  // __proto__ doesn't exist on IE<11, so redefine
-  // the Z function to use object extension instead
-  if (!('__proto__' in {})) {
-    $.extend($.zepto, {
-      Z: function(dom, selector){
-        dom = dom || []
-        $.extend(dom, $.fn)
-        dom.selector = selector || ''
-        dom.__Z = true
-        return dom
-      },
-      // this is a kludge but works
-      isZ: function(object){
-        return $.type(object) === 'array' && '__Z' in object
-      }
-    })
-  }
-
-  // getComputedStyle shouldn't freak out when called
-  // without a valid element as argument
-  try {
-    getComputedStyle(undefined)
-  } catch(e) {
-    var nativeGetComputedStyle = getComputedStyle;
-    window.getComputedStyle = function(element){
-      try {
-        return nativeGetComputedStyle(element)
-      } catch(e) {
-        return null
-      }
-    }
-  }
-})(Zepto)
diff --git a/NewLife.Cube/Controllers/HomeController.cs b/NewLife.Cube/Controllers/HomeController.cs
deleted file mode 100644
index 9e1cee1310..0000000000
--- a/NewLife.Cube/Controllers/HomeController.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-﻿using System.Web.Mvc;
-
-namespace NewLife.Cube.Controllers
-{
-    /// <summary>主页面</summary>
-    //[AllowAnonymous]
-    public class CubeHomeController : Controller
-    {
-        /// <summary>主页面</summary>
-        /// <returns></returns>
-        public ActionResult Index()
-        {
-            ViewBag.Message = "主页面";
-
-            return View();
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Controllers/SsoController.cs b/NewLife.Cube/Controllers/SsoController.cs
deleted file mode 100644
index b894b4c8e6..0000000000
--- a/NewLife.Cube/Controllers/SsoController.cs
+++ /dev/null
@@ -1,429 +0,0 @@
-﻿using System;
-using System.IO;
-using System.Linq;
-using System.Web.Mvc;
-using NewLife.Cube.Entity;
-using NewLife.Cube.Web;
-using NewLife.Log;
-using NewLife.Model;
-using NewLife.Web;
-using XCode.Membership;
-
-/*
- * 魔方OAuth在禁用本地登录，且只设置一个第三方登录时，形成单点登录。
- * 
- * 验证流程：
- *      进入登录页~/Admin/User/Login
- *      if 允许本地登录
- *          输入密码登录 或 选择第三方登录
- *      else if 多个第三方登录
- *          选择第三方登录
- *      else
- *          直接跳转唯一的第三方登录
- *      登录完成
- *      if 有绑定用户
- *          登录完成，跳转来源页
- *      else
- *          进入绑定流程
- * 
- * 绑定流程：
- *      if 本地已登录
- *          第三方绑定到当前已登录本地用户
- *      else 允许本地登录
- *          显示登录框，输入密码登录后绑定（暂不支持）
- *          或 直接进入，自动注册本地用户
- *      else
- *          直接进入，自动注册本地用户
- */
-
-namespace NewLife.Cube.Controllers
-{
-    /// <summary>单点登录控制器</summary>
-    public class SsoController : Controller
-    {
-        /// <summary>当前提供者</summary>
-        public static SsoProvider Provider { get; set; }
-
-        static SsoController()
-        {
-            // 注册单点登录
-            var oc = ObjectContainer.Current;
-            oc.Register<SsoProvider, SsoProvider>();
-
-            Provider = ObjectContainer.Current.ResolveInstance<SsoProvider>();
-
-            //OAuthServer.Instance.Log = XTrace.Log;
-            OAuthServer.Instance.Log = LogProvider.Provider.AsLog("OAuth");
-        }
-
-        /// <summary>首页</summary>
-        /// <returns></returns>
-        [AllowAnonymous]
-        public virtual ActionResult Index() => Redirect("~/");
-
-        /// <summary>发生错误时</summary>
-        /// <param name="filterContext"></param>
-        protected override void OnException(ExceptionContext filterContext)
-        {
-            if (!filterContext.ExceptionHandled)
-            {
-                var vr = new ViewResult
-                {
-                    ViewName = "CubeError"
-                };
-                vr.ViewBag.Context = filterContext;
-
-                filterContext.Result = vr;
-                filterContext.ExceptionHandled = true;
-            }
-
-            base.OnException(filterContext);
-        }
-
-        #region 单点登录客户端
-        /// <summary>第三方登录</summary>
-        /// <param name="name"></param>
-        /// <returns></returns>
-        [AllowAnonymous]
-        public virtual ActionResult Login(String name)
-        {
-            var prov = Provider;
-            var client = prov.GetClient(name);
-            var rurl = prov.GetReturnUrl(Request, true);
-            var redirect = prov.GetRedirect(Request, rurl);
-
-            var state = Request["state"];
-            if (!state.IsNullOrEmpty())
-                state = client.Name + "_" + state;
-            else
-                state = client.Name;
-
-            var url = client.Authorize(redirect, state);
-
-            return Redirect(url);
-        }
-
-        /// <summary>第三方登录完成后跳转到此</summary>
-        /// <param name="code"></param>
-        /// <param name="state"></param>
-        /// <returns></returns>
-        [AllowAnonymous]
-        public virtual ActionResult LoginInfo(String code, String state)
-        {
-            var name = state + "";
-            var p = name.IndexOf('_');
-            if (p > 0)
-            {
-                name = state.Substring(0, p);
-                state = state.Substring(p + 1);
-            }
-
-            var prov = Provider;
-            var client = prov.GetClient(name);
-
-            client.WriteLog("LoginInfo name={0} code={1} state={2}", name, code, state);
-
-            // 构造redirect_uri，部分提供商（百度）要求获取AccessToken的时候也要传递
-            var redirect = prov.GetRedirect(Request);
-            client.Authorize(redirect);
-
-            var returnUrl = prov.GetReturnUrl(Request, false);
-
-            try
-            {
-                // 获取访问令牌
-                var html = client.GetAccessToken(code);
-
-                // 如果拿不到访问令牌或用户信息，则重新跳转
-                if (client.AccessToken.IsNullOrEmpty() && client.OpenID.IsNullOrEmpty() && client.UserID == 0)
-                {
-                    // 如果拿不到访问令牌，刷新一次，然后报错
-                    if (state.EqualIgnoreCase("refresh"))
-                    {
-                        if (client.Log == null) XTrace.WriteLine(html);
-
-                        throw new InvalidOperationException("内部错误，无法获取令牌");
-                    }
-
-                    XTrace.WriteLine("拿不到访问令牌，重新跳转 code={0} state={1}", code, state);
-
-                    return RedirectToAction("Login", new { name = client.Name, r = returnUrl, state = "refresh" });
-                }
-
-                // 获取OpenID。部分提供商不需要
-                if (!client.OpenIDUrl.IsNullOrEmpty()) client.GetOpenID();
-                // 获取用户信息
-                if (!client.UserUrl.IsNullOrEmpty()) client.GetUserInfo();
-
-                var url = prov.OnLogin(client, HttpContext);
-
-                // 标记登录提供商
-                Session["Cube_Sso"] = client.Name;
-                Session["Cube_Sso_Client"] = client;
-
-                if (!returnUrl.IsNullOrEmpty()) url = returnUrl;
-
-                return Redirect(url);
-            }
-            catch (Exception ex)
-            {
-                XTrace.WriteException(ex.GetTrue());
-                //throw;
-
-                if (!state.EqualIgnoreCase("refresh")) return RedirectToAction("Login", new { name = client.Name, r = returnUrl, state = "refresh" });
-
-                var inf = new HandleErrorInfo(ex, "Sso", nameof(LoginInfo));
-                return View("CubeError", inf);
-            }
-        }
-
-        /// <summary>注销登录</summary>
-        /// <remarks>
-        /// 子系统引导用户跳转到这里注销登录。
-        /// </remarks>
-        /// <returns></returns>
-        [AllowAnonymous]
-        public virtual ActionResult Logout()
-        {
-            // 先读Session，待会会清空
-            var client = Session["Cube_Sso_Client"] as OAuthClient;
-
-            var prv = Provider;
-            prv?.Logout();
-
-            var url = "";
-
-            // 准备跳转到验证中心
-            if (client != null)
-            {
-                if (!client.LogoutUrl.IsNullOrEmpty())
-                {
-                    // 准备返回地址
-                    url = Request["r"];
-                    if (url.IsNullOrEmpty()) url = prv.SuccessUrl;
-
-                    var state = Request["state"];
-                    if (!state.IsNullOrEmpty())
-                        state = client.Name + "_" + state;
-                    else
-                        state = client.Name;
-
-                    // 跳转到验证中心注销地址
-                    url = client.Logout(url, state, Request.GetRawUrl());
-
-                    return Redirect(url);
-                }
-            }
-
-            url = Provider?.GetReturnUrl(Request, false);
-            if (url.IsNullOrEmpty()) url = "~/";
-
-            return Redirect(url);
-        }
-
-        /// <summary>绑定</summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        public virtual ActionResult Bind(String id)
-        {
-            var prov = Provider;
-
-            var user = prov.Current;
-            if (user == null) throw new Exception("未登录！");
-
-            var client = prov.GetClient(id);
-            var redirect = prov.GetRedirect(Request, Request.UrlReferrer + "");
-            // 附加绑定动作
-            redirect += "&sso_action=bind";
-            var url = client.Authorize(redirect, client.Name);
-
-            return Redirect(url);
-        }
-
-        /// <summary>取消绑定</summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        public virtual ActionResult UnBind(String id)
-        {
-            var user = Provider.Current;
-            if (user == null) throw new Exception("未登录！");
-
-            var binds = UserConnect.FindAllByUserID(user.ID);
-
-            var uc = binds.FirstOrDefault(e => e.Provider.EqualIgnoreCase(id));
-            if (uc != null)
-            {
-                uc.Enable = false;
-                uc.Save();
-            }
-
-            var url = Request.UrlReferrer + "";
-            if (url.IsNullOrEmpty()) url = "/";
-
-            return Redirect(url);
-        }
-        #endregion
-
-        #region 单点登录服务端
-        /// <summary>1，验证用户身份</summary>
-        /// <remarks>
-        /// 子系统需要验证访问者身份时，引导用户跳转到这里。
-        /// 用户登录完成后，得到一个独一无二的code，并跳转回去子系统。
-        /// </remarks>
-        /// <param name="client_id">应用标识</param>
-        /// <param name="redirect_uri">回调地址</param>
-        /// <param name="response_type">响应类型。默认code</param>
-        /// <param name="scope">授权域</param>
-        /// <param name="state">用户状态数据</param>
-        /// <returns></returns>
-        [AllowAnonymous]
-        public virtual ActionResult Authorize(String client_id, String redirect_uri, String response_type = null, String scope = null, String state = null)
-        {
-            if (client_id.IsNullOrEmpty()) throw new ArgumentNullException(nameof(client_id));
-            if (redirect_uri.IsNullOrEmpty()) throw new ArgumentNullException(nameof(redirect_uri));
-            if (response_type.IsNullOrEmpty()) response_type = "code";
-
-            // 判断合法性，然后跳转到登录页面，登录完成后跳转回来
-            var sso = OAuthServer.Instance;
-            var key = sso.Authorize(client_id, redirect_uri, response_type, scope, state);
-
-            var prov = Provider;
-            var url = "";
-
-            // 如果已经登录，直接返回。否则跳到登录页面
-            var user = prov?.Current;
-            if (user != null)
-                url = sso.GetResult(key, user);
-            else
-                url = prov.LoginUrl.AppendReturn("~/Sso/Auth2/" + key);
-
-            return Redirect(url);
-        }
-
-        /// <summary>2，用户登录成功后返回这里</summary>
-        /// <remarks>
-        /// 构建身份验证结构，返回code给子系统
-        /// </remarks>
-        /// <returns></returns>
-        [AllowAnonymous]
-        public virtual ActionResult Auth2(Int32 id)
-        {
-            if (id <= 0) throw new ArgumentNullException(nameof(id));
-
-            var sso = OAuthServer.Instance;
-
-            var user = Provider?.Current;
-            if (user == null) throw new InvalidOperationException("未登录！");
-
-            // 返回给子系统的数据：
-            // code 授权码，子系统凭借该代码来索取用户信息
-            // state 子系统传过来的用户状态数据，原样返回
-
-            var url = sso.GetResult(id, user);
-
-            return Redirect(url);
-        }
-
-        /// <summary>3，根据code获取令牌</summary>
-        /// <remarks>
-        /// 子系统根据验证用户身份时得到的code，直接在服务器间请求本系统。
-        /// 传递应用标识和密钥，主要是为了向本系统表明其合法身份。
-        /// </remarks>
-        /// <param name="client_id">应用标识</param>
-        /// <param name="client_secret">密钥</param>
-        /// <param name="code">代码</param>
-        /// <param name="grant_type">授权类型。</param>
-        /// <returns></returns>
-        [AllowAnonymous]
-        public virtual ActionResult Access_Token(String client_id, String client_secret, String code, String grant_type = null)
-        {
-            if (client_id.IsNullOrEmpty()) throw new ArgumentNullException(nameof(client_id));
-            if (client_secret.IsNullOrEmpty()) throw new ArgumentNullException(nameof(client_secret));
-            if (code.IsNullOrEmpty()) throw new ArgumentNullException(nameof(code));
-            if (grant_type.IsNullOrEmpty()) grant_type = "authorization_code";
-
-            // 返回给子系统的数据：
-            // access_token 访问令牌
-            // expires_in 有效期
-            // refresh_token 刷新令牌
-            // openid 用户唯一标识
-
-            var sso = OAuthServer.Instance;
-            try
-            {
-                var rs = Provider.GetAccessToken(sso, code);
-
-                // 返回UserInfo告知客户端可以请求用户信息
-                return Json(rs, JsonRequestBehavior.AllowGet);
-            }
-            catch (Exception ex)
-            {
-                XTrace.WriteLine($"Access_Token client_id={client_id} client_secret={client_secret} code={code}");
-                XTrace.WriteException(ex);
-                return Json(new { error = ex.GetTrue().Message }, JsonRequestBehavior.AllowGet);
-            }
-        }
-
-        /// <summary>3，根据token获取用户信息</summary>
-        /// <param name="access_token">访问令牌</param>
-        /// <returns></returns>
-        [AllowAnonymous]
-        public virtual ActionResult UserInfo(String access_token)
-        {
-            if (access_token.IsNullOrEmpty()) throw new ArgumentNullException(nameof(access_token));
-
-            var sso = OAuthServer.Instance;
-            IManageUser user = null;
-
-            var msg = "";
-            try
-            {
-                user = Provider?.GetUser(sso, access_token);
-                if (user == null) throw new Exception("用户不存在");
-
-                var rs = Provider.GetUserInfo(sso, access_token, user);
-                return Json(rs, JsonRequestBehavior.AllowGet);
-            }
-            catch (Exception ex)
-            {
-                msg = ex.GetTrue().Message;
-
-                XTrace.WriteLine($"UserInfo {access_token}");
-                XTrace.WriteException(ex);
-                return Json(new { error = ex.GetTrue().Message }, JsonRequestBehavior.AllowGet);
-            }
-            finally
-            {
-                sso.WriteLog("UserInfo {0} access_token={1} msg={2}", user, access_token, msg);
-            }
-        }
-        #endregion
-
-        #region 辅助
-        /// <summary>获取用户头像</summary>
-        /// <param name="id">用户编号</param>
-        /// <returns></returns>
-        [AllowAnonymous]
-        public virtual ActionResult Avatar(Int32 id)
-        {
-            if (id <= 0) throw new ArgumentNullException(nameof(id));
-
-            var prv = Provider;
-            if (prv == null) throw new ArgumentNullException(nameof(Provider));
-
-            var set = Setting.Current;
-            var av = set.AvatarPath.CombinePath(id + "").GetFullPath();
-            if (!System.IO.File.Exists(av))
-            {
-                var user = prv.Provider?.FindByID(id);
-                if (user == null) throw new Exception("用户不存在 " + id);
-
-                prv.FetchAvatar(user);
-            }
-            if (!System.IO.File.Exists(av)) throw new Exception("用户头像不存在 " + id);
-
-            return File(av, "image");
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Controllers/WSController.cs b/NewLife.Cube/Controllers/WSController.cs
deleted file mode 100644
index 708f31f94c..0000000000
--- a/NewLife.Cube/Controllers/WSController.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-﻿using System;
-using System.Net;
-using System.Net.Http;
-using System.Net.WebSockets;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Web;
-using System.Web.Http;
-using System.Web.WebSockets;
-using NewLife.Log;
-
-namespace NewLife.Cube.Controllers
-{
-    /// <summary>WebSocket控制器</summary>
-    public class WSController : ApiController
-    {
-        /// <summary>获取</summary>
-        /// <returns></returns>
-        public HttpResponseMessage Get()
-        {
-            if (HttpContext.Current.IsWebSocketRequest)
-                HttpContext.Current.AcceptWebSocketRequest(Process);
-
-            return new HttpResponseMessage(HttpStatusCode.SwitchingProtocols);
-        }
-
-        private async Task Process(AspNetWebSocketContext arg)
-        {
-            var socket = arg.WebSocket;
-            while (true)
-            {
-                var buffer = new ArraySegment<Byte>(new Byte[1024]);
-                var result = await socket.ReceiveAsync(buffer, CancellationToken.None);
-                if (socket.State != WebSocketState.Open) break;
-
-                var msg = buffer.Array.ToStr(null, 0, result.Count);
-                XTrace.WriteLine("WebSocket [{0}] 收到：{1}", arg.UserHostName, msg);
-
-                var str = "收到：" + msg + " @" + DateTime.Now.ToFullString();
-                buffer = new ArraySegment<Byte>(str.GetBytes());
-                await socket.SendAsync(buffer, WebSocketMessageType.Text, true, CancellationToken.None);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Entity/Config/Core.config b/NewLife.Cube/Entity/Config/Core.config
deleted file mode 100644
index 975578be39..0000000000
--- a/NewLife.Cube/Entity/Config/Core.config
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--核心设置-->
-<Setting>
-  <!--全局调试。XTrace.Debug-->
-  <Debug>true</Debug>
-  <!--日志等级。只输出大于等于该级别的日志-->
-  <LogLevel>Info</LogLevel>
-  <!--文件日志目录-->
-  <LogPath>Log</LogPath>
-  <!--网络日志。本地子网日志广播255.255.255.255:514-->
-  <NetworkLog></NetworkLog>
-  <!--日志文件格式。默认{0:yyyy_MM_dd}.log-->
-  <LogFileFormat>{0:yyyy_MM_dd}.log</LogFileFormat>
-  <!--临时目录-->
-  <TempPath>XTemp</TempPath>
-  <!--插件目录-->
-  <PluginPath>Plugins</PluginPath>
-  <!--插件服务器。将从该网页上根据关键字分析链接并下载插件-->
-  <PluginServer>http://x.newlifex.com/</PluginServer>
-  <!--插件缓存目录。默认位于系统盘的X\Cache-->
-  <PluginCache>C:\X\Cache</PluginCache>
-</Setting>
\ No newline at end of file
diff --git a/NewLife.Cube/Entity/Config/XCode.config b/NewLife.Cube/Entity/Config/XCode.config
deleted file mode 100644
index da581975f7..0000000000
--- a/NewLife.Cube/Entity/Config/XCode.config
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--XCode设置-->
-<Setting>
-  <!--调试-->
-  <Debug>true</Debug>
-  <!--输出SQL。是否输出SQL语句，默认启用-->
-  <ShowSQL>true</ShowSQL>
-  <!--SQL目录。设置SQL输出的单独目录，默认为空，SQL输出到当前日志中。生产环境建议输出到站点外单独的SqlLog目录-->
-  <SQLPath></SQLPath>
-  <!--SQL执行时间。跟踪SQL执行时间，大于该阀值将输出日志，默认1000毫秒-->
-  <TraceSQLTime>1000</TraceSQLTime>
-  <!--连接映射。连接名映射#，表名映射@，把实体类中的Test2和Test3连接名映射到Test去-->
-  <ConnMaps></ConnMaps>
-  <!--参数化添删改查。默认关闭-->
-  <UserParameter>false</UserParameter>
-  <!--SQLite默认目录。没有设置连接字符串的连接默认创建SQLite连接，数据库放在该目录-->
-  <SQLiteDbPath>.</SQLiteDbPath>
-  <!--备份目录。备份数据库时存放的目录-->
-  <BackupPath>Backup</BackupPath>
-  <!--命令超时。查询执行超时时间，默认0秒不限制-->
-  <CommandTimeout>0</CommandTimeout>
-  <!--实体缓存过期。默认10秒-->
-  <EntityCacheExpire>10</EntityCacheExpire>
-  <!--单对象缓存过期。默认10秒-->
-  <SingleCacheExpire>10</SingleCacheExpire>
-  <!--扩展属性过期。默认10秒-->
-  <ExtendExpire>10</ExtendExpire>
-  <!--反向工程。Off 关闭；ReadOnly 只读不执行；On 打开，仅新建；Full 完全，修改删除-->
-  <Migration>On</Migration>
-</Setting>
\ No newline at end of file
diff --git a/NewLife.Cube/Entity/Cube.xml b/NewLife.Cube/Entity/Cube.xml
deleted file mode 100644
index 177e5cf37f..0000000000
--- a/NewLife.Cube/Entity/Cube.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Tables Version="9.7.6702.39882" NameSpace="NewLife.Cube.Entity" ConnName="Cube" Output="" BaseClass="Entity">
-  <Table Name="UserConnect" Description="用户链接。第三方绑定" ConnName="Membership">
-    <Columns>
-      <Column Name="ID" DataType="Int32" Identity="True" PrimaryKey="True" Description="编号" />
-      <Column Name="Provider" DataType="String" Description="提供商" />
-      <Column Name="UserID" DataType="Int32" Description="用户。本地用户" />
-      <Column Name="OpenID" DataType="String" Description="身份标识。用户名、OpenID" />
-      <Column Name="LinkID" DataType="Int64" Description="用户编号。第三方用户编号" />
-      <Column Name="NickName" DataType="String" Description="昵称" />
-      <Column Name="Avatar" DataType="String" Length="200" Description="头像" />
-      <Column Name="AccessToken" DataType="String" Length="500" Description="访问令牌" />
-      <Column Name="RefreshToken" DataType="String" Length="500" Description="刷新令牌" />
-      <Column Name="Expire" DataType="DateTime" Description="过期时间" />
-      <Column Name="Enable" DataType="Boolean" Description="启用" />
-      <Column Name="CreateUserID" DataType="Int32" Description="创建用户" />
-      <Column Name="CreateIP" DataType="String" Description="创建地址" />
-      <Column Name="CreateTime" DataType="DateTime" Description="创建时间" />
-      <Column Name="UpdateUserID" DataType="Int32" Description="更新用户" />
-      <Column Name="UpdateIP" DataType="String" Description="更新地址" />
-      <Column Name="UpdateTime" DataType="DateTime" Description="更新时间" />
-      <Column Name="Remark" DataType="String" Length="500" Description="备注" />
-    </Columns>
-    <Indexes>
-      <Index Columns="Provider,OpenID" Unique="True" />
-      <Index Columns="UserID" />
-    </Indexes>
-  </Table>
-  <Table Name="UserToken" Description="用户令牌。授权其他人直接拥有指定用户的身份，支持有效期，支持数据接口" ConnName="Membership">
-    <Columns>
-      <Column Name="ID" DataType="Int32" Identity="True" PrimaryKey="True" Description="编号" />
-      <Column Name="Token" DataType="String" Description="令牌" />
-      <Column Name="Url" DataType="String" Length="200" Description="地址。锁定该令牌只能访问该资源路径" />
-      <Column Name="UserID" DataType="Int32" Description="用户。本地用户" />
-      <Column Name="Expire" DataType="DateTime" Description="过期时间" />
-      <Column Name="Enable" DataType="Boolean" Description="启用" />
-      <Column Name="Times" DataType="Int32" Description="次数。该令牌使用次数" />
-      <Column Name="LastIP" DataType="String" Description="最后地址" />
-      <Column Name="LastTime" DataType="DateTime" Description="最后时间" />
-      <Column Name="CreateUserID" DataType="Int32" Description="创建用户" />
-      <Column Name="CreateIP" DataType="String" Description="创建地址" />
-      <Column Name="CreateTime" DataType="DateTime" Description="创建时间" />
-      <Column Name="UpdateUserID" DataType="Int32" Description="更新用户" />
-      <Column Name="UpdateIP" DataType="String" Description="更新地址" />
-      <Column Name="UpdateTime" DataType="DateTime" Description="更新时间" />
-      <Column Name="Remark" DataType="String" Length="500" Description="备注" />
-    </Columns>
-    <Indexes>
-      <Index Columns="Token" Unique="True" />
-      <Index Columns="UserID" />
-    </Indexes>
-  </Table>
-</Tables>
\ No newline at end of file
diff --git a/NewLife.Cube/Entity/XCoder.cs b/NewLife.Cube/Entity/XCoder.cs
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/NewLife.Cube/Entity/XCoder.tt b/NewLife.Cube/Entity/XCoder.tt
deleted file mode 100644
index d4df758e4e..0000000000
--- a/NewLife.Cube/Entity/XCoder.tt
+++ /dev/null
@@ -1,13 +0,0 @@
-﻿<#@ template language="C#" hostSpecific="true" debug="true" #>
-<#@ assembly name="$(SolutionDir)\..\Bin\NewLife.Core.dll" #>
-<#@ assembly name="$(SolutionDir)\..\Bin\XCode.dll" #>
-<#@ import namespace="System.Diagnostics" #>
-<#@ import namespace="System.IO" #>
-<#@ import namespace="XCode.Code" #>
-<#@ output extension=".log" #>
-<#
-    // 设置当前工作目录
-	PathHelper.BaseDirectory = Host.ResolvePath(".");
-	// 导入模型文件并生成实体类，模型文件、输出目录、命名空间、连接名
-	EntityBuilder.Build();
-#>
\ No newline at end of file
diff --git "a/NewLife.Cube/Entity/\347\224\250\346\210\267\344\273\244\347\211\214.Biz.cs" "b/NewLife.Cube/Entity/\347\224\250\346\210\267\344\273\244\347\211\214.Biz.cs"
deleted file mode 100644
index 651d7ff952..0000000000
--- "a/NewLife.Cube/Entity/\347\224\250\346\210\267\344\273\244\347\211\214.Biz.cs"
+++ /dev/null
@@ -1,136 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using NewLife.Web;
-using XCode;
-using XCode.Membership;
-
-namespace NewLife.Cube.Entity
-{
-    /// <summary>用户令牌。授权其他人直接拥有指定用户的身份，支持有效期，支持数据接口</summary>
-    [ModelCheckMode(ModelCheckModes.CheckTableWhenFirstUse)]
-    public partial class UserToken : Entity<UserToken>
-    {
-        #region 对象操作
-        static UserToken()
-        {
-            // 累加字段
-            //Meta.Factory.AdditionalFields.Add(__.Logins);
-
-            // 过滤器 UserModule、TimeModule、IPModule
-            Meta.Modules.Add<UserModule>();
-            Meta.Modules.Add<TimeModule>();
-            Meta.Modules.Add<IPModule>();
-
-
-            var sc = Meta.SingleCache;
-            sc.FindSlaveKeyMethod = k => Find(_.Token == k);
-            sc.GetSlaveKeyMethod = e => e.Token;
-            sc.SlaveKeyIgnoreCase = true;
-        }
-
-        /// <summary>检查参数</summary>
-        /// <param name="isNew"></param>
-        public override void Valid(Boolean isNew)
-        {
-            if (UserID <= 0) throw new ArgumentNullException(nameof(UserID));
-        }
-        #endregion
-
-        #region 扩展属性
-        #endregion
-
-        #region 扩展查询
-        /// <summary>根据编号查找</summary>
-        /// <param name="id">编号</param>
-        /// <returns>实体对象</returns>
-        public static UserToken FindByID(Int32 id)
-        {
-            if (id <= 0) return null;
-
-            // 实体缓存
-            if (Meta.Session.Count < 1000) return Meta.Cache.Find(e => e.ID == id);
-
-            // 单对象缓存
-            //return Meta.SingleCache[id];
-
-            return Find(_.ID == id);
-        }
-
-        /// <summary>根据令牌查找</summary>
-        /// <param name="token">令牌</param>
-        /// <returns>实体对象</returns>
-        public static UserToken FindByToken(String token)
-        {
-            if (token.IsNullOrEmpty()) return null;
-
-            // 实体缓存
-            if (Meta.Session.Count < 1000) return Meta.Cache.Find(e => e.Token == token);
-
-            //return Find(_.Token == token);
-            return Meta.SingleCache[token] as UserToken;
-        }
-
-        /// <summary>根据用户查找</summary>
-        /// <param name="userid">用户</param>
-        /// <returns>实体列表</returns>
-        public static IList<UserToken> FindAllByUserID(Int32 userid)
-        {
-            // 实体缓存
-            if (Meta.Session.Count < 1000) return Meta.Cache.FindAll(e => e.UserID == userid);
-
-            return FindAll(_.UserID == userid);
-        }
-        #endregion
-
-        #region 高级查询
-        /// <summary>高级查询</summary>
-        /// <param name="token"></param>
-        /// <param name="userid"></param>
-        /// <param name="isEnable"></param>
-        /// <param name="start"></param>
-        /// <param name="end"></param>
-        /// <param name="p"></param>
-        /// <returns></returns>
-        public static IList<UserToken> Search(String token, Int32 userid, Boolean? isEnable, DateTime start, DateTime end, Pager p)
-        {
-            var exp = _.Expire.Between(start, end);
-            if (userid >= 0) exp &= _.UserID == userid;
-            if (isEnable != null) exp &= _.Enable == isEnable;
-            if (!token.IsNullOrEmpty()) exp &= _.Token == token;
-
-            return FindAll(exp, p);
-        }
-        #endregion
-
-        #region 业务操作
-        /// <summary>验证token是否可用</summary>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        public static IUser Valid(String token)
-        {
-            if (token.IsNullOrEmpty()) throw new Exception("缺少令牌token");
-
-            var ut = UserToken.FindByToken(token);
-            if (ut == null) throw new Exception("无效令牌token");
-
-            ut.Times++;
-            ut.LastIP = WebHelper.UserHost;
-            ut.LastTime = DateTime.Now;
-            ut.SaveAsync(5000);
-
-            if (!ut.Enable || ut.UserID <= 0) throw new Exception("令牌已停用");
-
-            if (ut.Expire.Year > 2000 && ut.Expire < DateTime.Now) throw new Exception("令牌已过期");
-
-            var user = ManageProvider.Provider.FindByID(ut.UserID) as IUser;
-            if (user == null || !user.Enable) throw new Exception("无效令牌身份");
-
-            // 拥有系统角色
-            if (!user.Roles.Any(r => r.IsSystem)) throw new Exception("无权查看该数据");
-
-            return user;
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git "a/NewLife.Cube/Entity/\347\224\250\346\210\267\344\273\244\347\211\214.cs" "b/NewLife.Cube/Entity/\347\224\250\346\210\267\344\273\244\347\211\214.cs"
deleted file mode 100644
index 1cdc2390f5..0000000000
--- "a/NewLife.Cube/Entity/\347\224\250\346\210\267\344\273\244\347\211\214.cs"
+++ /dev/null
@@ -1,373 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using XCode;
-using XCode.Configuration;
-using XCode.DataAccessLayer;
-
-namespace NewLife.Cube.Entity
-{
-    /// <summary>用户令牌。授权其他人直接拥有指定用户的身份，支持有效期，支持数据接口</summary>
-    [Serializable]
-    [DataObject]
-    [Description("用户令牌。授权其他人直接拥有指定用户的身份，支持有效期，支持数据接口")]
-    [BindIndex("IU_UserToken_Token", true, "Token")]
-    [BindIndex("IX_UserToken_UserID", false, "UserID")]
-    [BindTable("UserToken", Description = "用户令牌。授权其他人直接拥有指定用户的身份，支持有效期，支持数据接口", ConnName = "Membership", DbType = DatabaseType.None)]
-    public partial class UserToken : IUserToken
-    {
-        #region 属性
-        private Int32 _ID;
-        /// <summary>编号</summary>
-        [DisplayName("编号")]
-        [Description("编号")]
-        [DataObjectField(true, true, false, 0)]
-        [BindColumn("ID", "编号", "")]
-        public Int32 ID { get { return _ID; } set { if (OnPropertyChanging(__.ID, value)) { _ID = value; OnPropertyChanged(__.ID); } } }
-
-        private String _Token;
-        /// <summary>令牌</summary>
-        [DisplayName("令牌")]
-        [Description("令牌")]
-        [DataObjectField(false, false, true, 50)]
-        [BindColumn("Token", "令牌", "")]
-        public String Token { get { return _Token; } set { if (OnPropertyChanging(__.Token, value)) { _Token = value; OnPropertyChanged(__.Token); } } }
-
-        private String _Url;
-        /// <summary>地址。锁定该令牌只能访问该资源路径</summary>
-        [DisplayName("地址")]
-        [Description("地址。锁定该令牌只能访问该资源路径")]
-        [DataObjectField(false, false, true, 200)]
-        [BindColumn("Url", "地址。锁定该令牌只能访问该资源路径", "")]
-        public String Url { get { return _Url; } set { if (OnPropertyChanging(__.Url, value)) { _Url = value; OnPropertyChanged(__.Url); } } }
-
-        private Int32 _UserID;
-        /// <summary>用户。本地用户</summary>
-        [DisplayName("用户")]
-        [Description("用户。本地用户")]
-        [DataObjectField(false, false, false, 0)]
-        [BindColumn("UserID", "用户。本地用户", "")]
-        public Int32 UserID { get { return _UserID; } set { if (OnPropertyChanging(__.UserID, value)) { _UserID = value; OnPropertyChanged(__.UserID); } } }
-
-        private DateTime _Expire;
-        /// <summary>过期时间</summary>
-        [DisplayName("过期时间")]
-        [Description("过期时间")]
-        [DataObjectField(false, false, true, 0)]
-        [BindColumn("Expire", "过期时间", "")]
-        public DateTime Expire { get { return _Expire; } set { if (OnPropertyChanging(__.Expire, value)) { _Expire = value; OnPropertyChanged(__.Expire); } } }
-
-        private Boolean _Enable;
-        /// <summary>启用</summary>
-        [DisplayName("启用")]
-        [Description("启用")]
-        [DataObjectField(false, false, false, 0)]
-        [BindColumn("Enable", "启用", "")]
-        public Boolean Enable { get { return _Enable; } set { if (OnPropertyChanging(__.Enable, value)) { _Enable = value; OnPropertyChanged(__.Enable); } } }
-
-        private Int32 _Times;
-        /// <summary>次数。该令牌使用次数</summary>
-        [DisplayName("次数")]
-        [Description("次数。该令牌使用次数")]
-        [DataObjectField(false, false, false, 0)]
-        [BindColumn("Times", "次数。该令牌使用次数", "")]
-        public Int32 Times { get { return _Times; } set { if (OnPropertyChanging(__.Times, value)) { _Times = value; OnPropertyChanged(__.Times); } } }
-
-        private String _LastIP;
-        /// <summary>最后地址</summary>
-        [DisplayName("最后地址")]
-        [Description("最后地址")]
-        [DataObjectField(false, false, true, 50)]
-        [BindColumn("LastIP", "最后地址", "")]
-        public String LastIP { get { return _LastIP; } set { if (OnPropertyChanging(__.LastIP, value)) { _LastIP = value; OnPropertyChanged(__.LastIP); } } }
-
-        private DateTime _LastTime;
-        /// <summary>最后时间</summary>
-        [DisplayName("最后时间")]
-        [Description("最后时间")]
-        [DataObjectField(false, false, true, 0)]
-        [BindColumn("LastTime", "最后时间", "")]
-        public DateTime LastTime { get { return _LastTime; } set { if (OnPropertyChanging(__.LastTime, value)) { _LastTime = value; OnPropertyChanged(__.LastTime); } } }
-
-        private Int32 _CreateUserID;
-        /// <summary>创建用户</summary>
-        [DisplayName("创建用户")]
-        [Description("创建用户")]
-        [DataObjectField(false, false, false, 0)]
-        [BindColumn("CreateUserID", "创建用户", "")]
-        public Int32 CreateUserID { get { return _CreateUserID; } set { if (OnPropertyChanging(__.CreateUserID, value)) { _CreateUserID = value; OnPropertyChanged(__.CreateUserID); } } }
-
-        private String _CreateIP;
-        /// <summary>创建地址</summary>
-        [DisplayName("创建地址")]
-        [Description("创建地址")]
-        [DataObjectField(false, false, true, 50)]
-        [BindColumn("CreateIP", "创建地址", "")]
-        public String CreateIP { get { return _CreateIP; } set { if (OnPropertyChanging(__.CreateIP, value)) { _CreateIP = value; OnPropertyChanged(__.CreateIP); } } }
-
-        private DateTime _CreateTime;
-        /// <summary>创建时间</summary>
-        [DisplayName("创建时间")]
-        [Description("创建时间")]
-        [DataObjectField(false, false, true, 0)]
-        [BindColumn("CreateTime", "创建时间", "")]
-        public DateTime CreateTime { get { return _CreateTime; } set { if (OnPropertyChanging(__.CreateTime, value)) { _CreateTime = value; OnPropertyChanged(__.CreateTime); } } }
-
-        private Int32 _UpdateUserID;
-        /// <summary>更新用户</summary>
-        [DisplayName("更新用户")]
-        [Description("更新用户")]
-        [DataObjectField(false, false, false, 0)]
-        [BindColumn("UpdateUserID", "更新用户", "")]
-        public Int32 UpdateUserID { get { return _UpdateUserID; } set { if (OnPropertyChanging(__.UpdateUserID, value)) { _UpdateUserID = value; OnPropertyChanged(__.UpdateUserID); } } }
-
-        private String _UpdateIP;
-        /// <summary>更新地址</summary>
-        [DisplayName("更新地址")]
-        [Description("更新地址")]
-        [DataObjectField(false, false, true, 50)]
-        [BindColumn("UpdateIP", "更新地址", "")]
-        public String UpdateIP { get { return _UpdateIP; } set { if (OnPropertyChanging(__.UpdateIP, value)) { _UpdateIP = value; OnPropertyChanged(__.UpdateIP); } } }
-
-        private DateTime _UpdateTime;
-        /// <summary>更新时间</summary>
-        [DisplayName("更新时间")]
-        [Description("更新时间")]
-        [DataObjectField(false, false, true, 0)]
-        [BindColumn("UpdateTime", "更新时间", "")]
-        public DateTime UpdateTime { get { return _UpdateTime; } set { if (OnPropertyChanging(__.UpdateTime, value)) { _UpdateTime = value; OnPropertyChanged(__.UpdateTime); } } }
-
-        private String _Remark;
-        /// <summary>备注</summary>
-        [DisplayName("备注")]
-        [Description("备注")]
-        [DataObjectField(false, false, true, 500)]
-        [BindColumn("Remark", "备注", "")]
-        public String Remark { get { return _Remark; } set { if (OnPropertyChanging(__.Remark, value)) { _Remark = value; OnPropertyChanged(__.Remark); } } }
-        #endregion
-
-        #region 获取/设置 字段值
-        /// <summary>获取/设置 字段值</summary>
-        /// <param name="name">字段名</param>
-        /// <returns></returns>
-        public override Object this[String name]
-        {
-            get
-            {
-                switch (name)
-                {
-                    case __.ID : return _ID;
-                    case __.Token : return _Token;
-                    case __.Url : return _Url;
-                    case __.UserID : return _UserID;
-                    case __.Expire : return _Expire;
-                    case __.Enable : return _Enable;
-                    case __.Times : return _Times;
-                    case __.LastIP : return _LastIP;
-                    case __.LastTime : return _LastTime;
-                    case __.CreateUserID : return _CreateUserID;
-                    case __.CreateIP : return _CreateIP;
-                    case __.CreateTime : return _CreateTime;
-                    case __.UpdateUserID : return _UpdateUserID;
-                    case __.UpdateIP : return _UpdateIP;
-                    case __.UpdateTime : return _UpdateTime;
-                    case __.Remark : return _Remark;
-                    default: return base[name];
-                }
-            }
-            set
-            {
-                switch (name)
-                {
-                    case __.ID : _ID = Convert.ToInt32(value); break;
-                    case __.Token : _Token = Convert.ToString(value); break;
-                    case __.Url : _Url = Convert.ToString(value); break;
-                    case __.UserID : _UserID = Convert.ToInt32(value); break;
-                    case __.Expire : _Expire = Convert.ToDateTime(value); break;
-                    case __.Enable : _Enable = Convert.ToBoolean(value); break;
-                    case __.Times : _Times = Convert.ToInt32(value); break;
-                    case __.LastIP : _LastIP = Convert.ToString(value); break;
-                    case __.LastTime : _LastTime = Convert.ToDateTime(value); break;
-                    case __.CreateUserID : _CreateUserID = Convert.ToInt32(value); break;
-                    case __.CreateIP : _CreateIP = Convert.ToString(value); break;
-                    case __.CreateTime : _CreateTime = Convert.ToDateTime(value); break;
-                    case __.UpdateUserID : _UpdateUserID = Convert.ToInt32(value); break;
-                    case __.UpdateIP : _UpdateIP = Convert.ToString(value); break;
-                    case __.UpdateTime : _UpdateTime = Convert.ToDateTime(value); break;
-                    case __.Remark : _Remark = Convert.ToString(value); break;
-                    default: base[name] = value; break;
-                }
-            }
-        }
-        #endregion
-
-        #region 字段名
-        /// <summary>取得用户令牌字段信息的快捷方式</summary>
-        public partial class _
-        {
-            /// <summary>编号</summary>
-            public static readonly Field ID = FindByName(__.ID);
-
-            /// <summary>令牌</summary>
-            public static readonly Field Token = FindByName(__.Token);
-
-            /// <summary>地址。锁定该令牌只能访问该资源路径</summary>
-            public static readonly Field Url = FindByName(__.Url);
-
-            /// <summary>用户。本地用户</summary>
-            public static readonly Field UserID = FindByName(__.UserID);
-
-            /// <summary>过期时间</summary>
-            public static readonly Field Expire = FindByName(__.Expire);
-
-            /// <summary>启用</summary>
-            public static readonly Field Enable = FindByName(__.Enable);
-
-            /// <summary>次数。该令牌使用次数</summary>
-            public static readonly Field Times = FindByName(__.Times);
-
-            /// <summary>最后地址</summary>
-            public static readonly Field LastIP = FindByName(__.LastIP);
-
-            /// <summary>最后时间</summary>
-            public static readonly Field LastTime = FindByName(__.LastTime);
-
-            /// <summary>创建用户</summary>
-            public static readonly Field CreateUserID = FindByName(__.CreateUserID);
-
-            /// <summary>创建地址</summary>
-            public static readonly Field CreateIP = FindByName(__.CreateIP);
-
-            /// <summary>创建时间</summary>
-            public static readonly Field CreateTime = FindByName(__.CreateTime);
-
-            /// <summary>更新用户</summary>
-            public static readonly Field UpdateUserID = FindByName(__.UpdateUserID);
-
-            /// <summary>更新地址</summary>
-            public static readonly Field UpdateIP = FindByName(__.UpdateIP);
-
-            /// <summary>更新时间</summary>
-            public static readonly Field UpdateTime = FindByName(__.UpdateTime);
-
-            /// <summary>备注</summary>
-            public static readonly Field Remark = FindByName(__.Remark);
-
-            static Field FindByName(String name) { return Meta.Table.FindByName(name); }
-        }
-
-        /// <summary>取得用户令牌字段名称的快捷方式</summary>
-        public partial class __
-        {
-            /// <summary>编号</summary>
-            public const String ID = "ID";
-
-            /// <summary>令牌</summary>
-            public const String Token = "Token";
-
-            /// <summary>地址。锁定该令牌只能访问该资源路径</summary>
-            public const String Url = "Url";
-
-            /// <summary>用户。本地用户</summary>
-            public const String UserID = "UserID";
-
-            /// <summary>过期时间</summary>
-            public const String Expire = "Expire";
-
-            /// <summary>启用</summary>
-            public const String Enable = "Enable";
-
-            /// <summary>次数。该令牌使用次数</summary>
-            public const String Times = "Times";
-
-            /// <summary>最后地址</summary>
-            public const String LastIP = "LastIP";
-
-            /// <summary>最后时间</summary>
-            public const String LastTime = "LastTime";
-
-            /// <summary>创建用户</summary>
-            public const String CreateUserID = "CreateUserID";
-
-            /// <summary>创建地址</summary>
-            public const String CreateIP = "CreateIP";
-
-            /// <summary>创建时间</summary>
-            public const String CreateTime = "CreateTime";
-
-            /// <summary>更新用户</summary>
-            public const String UpdateUserID = "UpdateUserID";
-
-            /// <summary>更新地址</summary>
-            public const String UpdateIP = "UpdateIP";
-
-            /// <summary>更新时间</summary>
-            public const String UpdateTime = "UpdateTime";
-
-            /// <summary>备注</summary>
-            public const String Remark = "Remark";
-        }
-        #endregion
-    }
-
-    /// <summary>用户令牌。授权其他人直接拥有指定用户的身份，支持有效期，支持数据接口接口</summary>
-    public partial interface IUserToken
-    {
-        #region 属性
-        /// <summary>编号</summary>
-        Int32 ID { get; set; }
-
-        /// <summary>令牌</summary>
-        String Token { get; set; }
-
-        /// <summary>地址。锁定该令牌只能访问该资源路径</summary>
-        String Url { get; set; }
-
-        /// <summary>用户。本地用户</summary>
-        Int32 UserID { get; set; }
-
-        /// <summary>过期时间</summary>
-        DateTime Expire { get; set; }
-
-        /// <summary>启用</summary>
-        Boolean Enable { get; set; }
-
-        /// <summary>次数。该令牌使用次数</summary>
-        Int32 Times { get; set; }
-
-        /// <summary>最后地址</summary>
-        String LastIP { get; set; }
-
-        /// <summary>最后时间</summary>
-        DateTime LastTime { get; set; }
-
-        /// <summary>创建用户</summary>
-        Int32 CreateUserID { get; set; }
-
-        /// <summary>创建地址</summary>
-        String CreateIP { get; set; }
-
-        /// <summary>创建时间</summary>
-        DateTime CreateTime { get; set; }
-
-        /// <summary>更新用户</summary>
-        Int32 UpdateUserID { get; set; }
-
-        /// <summary>更新地址</summary>
-        String UpdateIP { get; set; }
-
-        /// <summary>更新时间</summary>
-        DateTime UpdateTime { get; set; }
-
-        /// <summary>备注</summary>
-        String Remark { get; set; }
-        #endregion
-
-        #region 获取/设置 字段值
-        /// <summary>获取/设置 字段值</summary>
-        /// <param name="name">字段名</param>
-        /// <returns></returns>
-        Object this[String name] { get; set; }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git "a/NewLife.Cube/Entity/\347\224\250\346\210\267\345\234\250\347\272\277.Biz.cs" "b/NewLife.Cube/Entity/\347\224\250\346\210\267\345\234\250\347\272\277.Biz.cs"
deleted file mode 100644
index f2c16fd626..0000000000
--- "a/NewLife.Cube/Entity/\347\224\250\346\210\267\345\234\250\347\272\277.Biz.cs"
+++ /dev/null
@@ -1,213 +0,0 @@
-﻿/*
- * XCoder v6.9.6383.25987
- * 作者：nnhy/STONE-PC
- * 时间：2017-07-05 15:34:41
- * 版权：版权所有 (C) 新生命开发团队 2002~2017
-*/
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using NewLife.Data;
-using NewLife.Model;
-using NewLife.Threading;
-
-namespace XCode.Membership
-{
-    /// <summary>用户在线</summary>
-    public partial class UserOnline : Entity<UserOnline>
-    {
-        #region 对象操作
-        static UserOnline()
-        {
-            // 用于引发基类的静态构造函数，所有层次的泛型实体类都应该有一个
-            var entity = new UserOnline();
-
-            Meta.Modules.Add<TimeModule>();
-            Meta.Modules.Add<IPModule>();
-
-            var df = Meta.Factory.AdditionalFields;
-            df.Add(__.Times);
-            df.Add(__.OnlineTime);
-
-            var sc = Meta.SingleCache;
-            if (sc.Expire < 20 * 60) sc.Expire = 20 * 60;
-            sc.FindSlaveKeyMethod = k => Find(__.SessionID, k);
-            sc.GetSlaveKeyMethod = e => e.SessionID;
-
-#if !DEBUG
-            // 关闭SQL日志
-            Meta.Session.Dal.Db.ShowSQL = false;
-#endif
-        }
-
-        /// <summary>验证数据，通过抛出异常的方式提示验证失败。</summary>
-        /// <param name="isNew"></param>
-        public override void Valid(Boolean isNew)
-        {
-        }
-        #endregion
-
-        #region 扩展属性
-        /// <summary>物理地址</summary>
-        [DisplayName("物理地址")]
-        //[Map(__.CreateIP)]
-        public String CreateAddress { get { return CreateIP.IPToAddress(); } }
-        #endregion
-
-        #region 扩展查询
-        /// <summary>根据会话编号查找</summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        public static UserOnline FindByID(Int32 id)
-        {
-            if (id <= 0) return null;
-
-            return Meta.SingleCache[id];
-            //return Find(__.ID, id);
-        }
-
-        /// <summary>根据会话编号查找</summary>
-        /// <param name="sessionid"></param>
-        /// <returns></returns>
-        public static UserOnline FindBySessionID(String sessionid)
-        {
-            if (sessionid.IsNullOrEmpty()) return null;
-
-            return Meta.SingleCache.GetItemWithSlaveKey(sessionid) as UserOnline;
-            //return Find(__.SessionID, sessionid);
-        }
-
-        /// <summary>根据用户编号查找</summary>
-        /// <param name="userid"></param>
-        /// <returns></returns>
-        public static IList<UserOnline> FindAllByUserID(Int32 userid)
-        {
-            if (userid <= 0) return new List<UserOnline>();
-
-            return FindAll(__.UserID, userid);
-        }
-        #endregion
-
-        #region 高级查询
-        // 以下为自定义高级查询的例子
-
-        /// <summary>查询满足条件的记录集，分页、排序</summary>
-        /// <param name="userid">用户编号</param>
-        /// <param name="start">开始时间</param>
-        /// <param name="end">结束时间</param>
-        /// <param name="key">关键字</param>
-        /// <param name="param">分页排序参数，同时返回满足条件的总记录数</param>
-        /// <returns>实体集</returns>
-        public static IList<UserOnline> Search(Int32 userid, DateTime start, DateTime end, String key, PageParameter param)
-        {
-            // WhereExpression重载&和|运算符，作为And和Or的替代
-            // SearchWhereByKeys系列方法用于构建针对字符串字段的模糊搜索，第二个参数可指定要搜索的字段
-            var exp = SearchWhereByKeys(key, null, null);
-
-            // 以下仅为演示，Field（继承自FieldItem）重载了==、!=、>、<、>=、<=等运算符
-            //if (userid > 0) exp &= _.OperatorID == userid;
-            //if (isSign != null) exp &= _.IsSign == isSign.Value;
-            //exp &= _.OccurTime.Between(start, end); // 大于等于start，小于end，当start/end大于MinValue时有效
-
-            return FindAll(exp, param);
-        }
-        #endregion
-
-        #region 扩展操作
-        #endregion
-
-        #region 业务
-        /// <summary>设置会话状态</summary>
-        /// <param name="sessionid"></param>
-        /// <param name="page"></param>
-        /// <param name="status"></param>
-        /// <param name="userid"></param>
-        /// <param name="name"></param>
-        /// <param name="ip"></param>
-        /// <returns></returns>
-        public static UserOnline SetStatus(String sessionid, String page, String status, Int32 userid = 0, String name = null, String ip = null)
-        {
-            var entity = FindBySessionID(sessionid) ?? new UserOnline();
-            entity.SessionID = sessionid;
-            entity.Page = page;
-            entity.Status = status;
-
-            entity.Times++;
-            if (userid > 0) entity.UserID = userid;
-            if (!name.IsNullOrEmpty()) entity.Name = name;
-
-            // 累加在线时间
-            entity.UpdateTime = DateTime.Now;
-            if (entity.ID == 0)
-            {
-                entity.CreateIP = ip;
-                entity.CreateTime = DateTime.Now;
-                entity.Insert();
-            }
-            else
-            {
-                entity.OnlineTime = (Int32)(entity.UpdateTime - entity.CreateTime).TotalSeconds;
-                entity.SaveAsync();
-            }
-
-            return entity;
-        }
-
-#if !__CORE__
-        private static TimerX _timer;
-
-        /// <summary>设置网页会话状态</summary>
-        /// <param name="sessionid"></param>
-        /// <param name="page"></param>
-        /// <param name="status"></param>
-        /// <param name="user"></param>
-        /// <param name="ip"></param>
-        /// <returns></returns>
-        public static UserOnline SetWebStatus(String sessionid, String page, String status, IManageUser user, String ip)
-        {
-            // 网页使用一个定时器来清理过期
-            if (_timer == null)
-            {
-                lock (typeof(UserOnline))
-                {
-                    if (_timer == null) _timer = new TimerX(s => ClearExpire(), null, 0, 30 * 1000) { Async = true };
-                }
-            }
-
-            if (user == null) return SetStatus(sessionid, page, status, 0, null, ip);
-
-            user.Online = true;
-            (user as IEntity).SaveAsync(1000);
-
-            return SetStatus(sessionid, page, status, user.ID, user + "", ip);
-        }
-#endif
-
-        /// <summary>删除过期，指定过期时间</summary>
-        /// <param name="secTimeout">超时时间，20 * 60秒</param>
-        /// <returns></returns>
-        public static IList<UserOnline> ClearExpire(Int32 secTimeout = 20 * 60)
-        {
-            if (Meta.Count == 0) return new List<UserOnline>();
-
-            // 10分钟不活跃将会被删除
-            var exp = _.UpdateTime < DateTime.Now.AddSeconds(-secTimeout);
-            var list = FindAll(exp, null, null, 0, 0);
-            list.Delete();
-
-            // 设置离线
-            foreach (var item in list)
-            {
-                var user = ManageProvider.Provider.FindByID(item.UserID);
-                if (user != null)
-                {
-                    user.Online = false;
-                    user.Save();
-                }
-            }
-
-            return list;
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git "a/NewLife.Cube/Entity/\347\224\250\346\210\267\345\234\250\347\272\277.cs" "b/NewLife.Cube/Entity/\347\224\250\346\210\267\345\234\250\347\272\277.cs"
deleted file mode 100644
index da560552e0..0000000000
--- "a/NewLife.Cube/Entity/\347\224\250\346\210\267\345\234\250\347\272\277.cs"
+++ /dev/null
@@ -1,279 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using XCode;
-using XCode.Configuration;
-using XCode.DataAccessLayer;
-
-namespace XCode.Membership
-{
-    /// <summary>用户在线</summary>
-    [Serializable]
-    [DataObject]
-    [Description("用户在线")]
-    [BindIndex("IX_UserOnline_UserID", false, "UserID")]
-    [BindIndex("IX_UserOnline_SessionID", false, "SessionID")]
-    [BindIndex("IX_UserOnline_CreateTime", false, "CreateTime")]
-    [BindTable("UserOnline", Description = "用户在线", ConnName = "Log", DbType = DatabaseType.None)]
-    public partial class UserOnline : IUserOnline
-    {
-        #region 属性
-        private Int32 _ID;
-        /// <summary>编号</summary>
-        [DisplayName("编号")]
-        [Description("编号")]
-        [DataObjectField(true, true, false, 0)]
-        [BindColumn("ID", "编号", "")]
-        public Int32 ID { get { return _ID; } set { if (OnPropertyChanging(__.ID, value)) { _ID = value; OnPropertyChanged(__.ID); } } }
-
-        private Int32 _UserID;
-        /// <summary>用户</summary>
-        [DisplayName("用户")]
-        [Description("用户")]
-        [DataObjectField(false, false, false, 0)]
-        [BindColumn("UserID", "用户", "")]
-        public Int32 UserID { get { return _UserID; } set { if (OnPropertyChanging(__.UserID, value)) { _UserID = value; OnPropertyChanged(__.UserID); } } }
-
-        private String _Name;
-        /// <summary>名称</summary>
-        [DisplayName("名称")]
-        [Description("名称")]
-        [DataObjectField(false, false, true, 50)]
-        [BindColumn("Name", "名称", "", Master = true)]
-        public String Name { get { return _Name; } set { if (OnPropertyChanging(__.Name, value)) { _Name = value; OnPropertyChanged(__.Name); } } }
-
-        private String _SessionID;
-        /// <summary>会话。Web的SessionID或Server的会话编号</summary>
-        [DisplayName("会话")]
-        [Description("会话。Web的SessionID或Server的会话编号")]
-        [DataObjectField(false, false, true, 50)]
-        [BindColumn("SessionID", "会话。Web的SessionID或Server的会话编号", "")]
-        public String SessionID { get { return _SessionID; } set { if (OnPropertyChanging(__.SessionID, value)) { _SessionID = value; OnPropertyChanged(__.SessionID); } } }
-
-        private Int32 _Times;
-        /// <summary>次数</summary>
-        [DisplayName("次数")]
-        [Description("次数")]
-        [DataObjectField(false, false, false, 0)]
-        [BindColumn("Times", "次数", "")]
-        public Int32 Times { get { return _Times; } set { if (OnPropertyChanging(__.Times, value)) { _Times = value; OnPropertyChanged(__.Times); } } }
-
-        private String _Page;
-        /// <summary>页面</summary>
-        [DisplayName("页面")]
-        [Description("页面")]
-        [DataObjectField(false, false, true, 50)]
-        [BindColumn("Page", "页面", "")]
-        public String Page { get { return _Page; } set { if (OnPropertyChanging(__.Page, value)) { _Page = value; OnPropertyChanged(__.Page); } } }
-
-        private String _Status;
-        /// <summary>状态</summary>
-        [DisplayName("状态")]
-        [Description("状态")]
-        [DataObjectField(false, false, true, 200)]
-        [BindColumn("Status", "状态", "")]
-        public String Status { get { return _Status; } set { if (OnPropertyChanging(__.Status, value)) { _Status = value; OnPropertyChanged(__.Status); } } }
-
-        private Int32 _OnlineTime;
-        /// <summary>在线时间。本次在线总时间，秒</summary>
-        [DisplayName("在线时间")]
-        [Description("在线时间。本次在线总时间，秒")]
-        [DataObjectField(false, false, false, 0)]
-        [BindColumn("OnlineTime", "在线时间。本次在线总时间，秒", "")]
-        public Int32 OnlineTime { get { return _OnlineTime; } set { if (OnPropertyChanging(__.OnlineTime, value)) { _OnlineTime = value; OnPropertyChanged(__.OnlineTime); } } }
-
-        private String _CreateIP;
-        /// <summary>创建地址</summary>
-        [DisplayName("创建地址")]
-        [Description("创建地址")]
-        [DataObjectField(false, false, true, 50)]
-        [BindColumn("CreateIP", "创建地址", "")]
-        public String CreateIP { get { return _CreateIP; } set { if (OnPropertyChanging(__.CreateIP, value)) { _CreateIP = value; OnPropertyChanged(__.CreateIP); } } }
-
-        private DateTime _CreateTime;
-        /// <summary>创建时间</summary>
-        [DisplayName("创建时间")]
-        [Description("创建时间")]
-        [DataObjectField(false, false, true, 0)]
-        [BindColumn("CreateTime", "创建时间", "")]
-        public DateTime CreateTime { get { return _CreateTime; } set { if (OnPropertyChanging(__.CreateTime, value)) { _CreateTime = value; OnPropertyChanged(__.CreateTime); } } }
-
-        private DateTime _UpdateTime;
-        /// <summary>修改时间</summary>
-        [DisplayName("修改时间")]
-        [Description("修改时间")]
-        [DataObjectField(false, false, true, 0)]
-        [BindColumn("UpdateTime", "修改时间", "")]
-        public DateTime UpdateTime { get { return _UpdateTime; } set { if (OnPropertyChanging(__.UpdateTime, value)) { _UpdateTime = value; OnPropertyChanged(__.UpdateTime); } } }
-        #endregion
-
-        #region 获取/设置 字段值
-        /// <summary>获取/设置 字段值</summary>
-        /// <param name="name">字段名</param>
-        /// <returns></returns>
-        public override Object this[String name]
-        {
-            get
-            {
-                switch (name)
-                {
-                    case __.ID : return _ID;
-                    case __.UserID : return _UserID;
-                    case __.Name : return _Name;
-                    case __.SessionID : return _SessionID;
-                    case __.Times : return _Times;
-                    case __.Page : return _Page;
-                    case __.Status : return _Status;
-                    case __.OnlineTime : return _OnlineTime;
-                    case __.CreateIP : return _CreateIP;
-                    case __.CreateTime : return _CreateTime;
-                    case __.UpdateTime : return _UpdateTime;
-                    default: return base[name];
-                }
-            }
-            set
-            {
-                switch (name)
-                {
-                    case __.ID : _ID = Convert.ToInt32(value); break;
-                    case __.UserID : _UserID = Convert.ToInt32(value); break;
-                    case __.Name : _Name = Convert.ToString(value); break;
-                    case __.SessionID : _SessionID = Convert.ToString(value); break;
-                    case __.Times : _Times = Convert.ToInt32(value); break;
-                    case __.Page : _Page = Convert.ToString(value); break;
-                    case __.Status : _Status = Convert.ToString(value); break;
-                    case __.OnlineTime : _OnlineTime = Convert.ToInt32(value); break;
-                    case __.CreateIP : _CreateIP = Convert.ToString(value); break;
-                    case __.CreateTime : _CreateTime = Convert.ToDateTime(value); break;
-                    case __.UpdateTime : _UpdateTime = Convert.ToDateTime(value); break;
-                    default: base[name] = value; break;
-                }
-            }
-        }
-        #endregion
-
-        #region 字段名
-        /// <summary>取得用户在线字段信息的快捷方式</summary>
-        public partial class _
-        {
-            /// <summary>编号</summary>
-            public static readonly Field ID = FindByName(__.ID);
-
-            /// <summary>用户</summary>
-            public static readonly Field UserID = FindByName(__.UserID);
-
-            /// <summary>名称</summary>
-            public static readonly Field Name = FindByName(__.Name);
-
-            /// <summary>会话。Web的SessionID或Server的会话编号</summary>
-            public static readonly Field SessionID = FindByName(__.SessionID);
-
-            /// <summary>次数</summary>
-            public static readonly Field Times = FindByName(__.Times);
-
-            /// <summary>页面</summary>
-            public static readonly Field Page = FindByName(__.Page);
-
-            /// <summary>状态</summary>
-            public static readonly Field Status = FindByName(__.Status);
-
-            /// <summary>在线时间。本次在线总时间，秒</summary>
-            public static readonly Field OnlineTime = FindByName(__.OnlineTime);
-
-            /// <summary>创建地址</summary>
-            public static readonly Field CreateIP = FindByName(__.CreateIP);
-
-            /// <summary>创建时间</summary>
-            public static readonly Field CreateTime = FindByName(__.CreateTime);
-
-            /// <summary>修改时间</summary>
-            public static readonly Field UpdateTime = FindByName(__.UpdateTime);
-
-            static Field FindByName(String name) { return Meta.Table.FindByName(name); }
-        }
-
-        /// <summary>取得用户在线字段名称的快捷方式</summary>
-        public partial class __
-        {
-            /// <summary>编号</summary>
-            public const String ID = "ID";
-
-            /// <summary>用户</summary>
-            public const String UserID = "UserID";
-
-            /// <summary>名称</summary>
-            public const String Name = "Name";
-
-            /// <summary>会话。Web的SessionID或Server的会话编号</summary>
-            public const String SessionID = "SessionID";
-
-            /// <summary>次数</summary>
-            public const String Times = "Times";
-
-            /// <summary>页面</summary>
-            public const String Page = "Page";
-
-            /// <summary>状态</summary>
-            public const String Status = "Status";
-
-            /// <summary>在线时间。本次在线总时间，秒</summary>
-            public const String OnlineTime = "OnlineTime";
-
-            /// <summary>创建地址</summary>
-            public const String CreateIP = "CreateIP";
-
-            /// <summary>创建时间</summary>
-            public const String CreateTime = "CreateTime";
-
-            /// <summary>修改时间</summary>
-            public const String UpdateTime = "UpdateTime";
-        }
-        #endregion
-    }
-
-    /// <summary>用户在线接口</summary>
-    public partial interface IUserOnline
-    {
-        #region 属性
-        /// <summary>编号</summary>
-        Int32 ID { get; set; }
-
-        /// <summary>用户</summary>
-        Int32 UserID { get; set; }
-
-        /// <summary>名称</summary>
-        String Name { get; set; }
-
-        /// <summary>会话。Web的SessionID或Server的会话编号</summary>
-        String SessionID { get; set; }
-
-        /// <summary>次数</summary>
-        Int32 Times { get; set; }
-
-        /// <summary>页面</summary>
-        String Page { get; set; }
-
-        /// <summary>状态</summary>
-        String Status { get; set; }
-
-        /// <summary>在线时间。本次在线总时间，秒</summary>
-        Int32 OnlineTime { get; set; }
-
-        /// <summary>创建地址</summary>
-        String CreateIP { get; set; }
-
-        /// <summary>创建时间</summary>
-        DateTime CreateTime { get; set; }
-
-        /// <summary>修改时间</summary>
-        DateTime UpdateTime { get; set; }
-        #endregion
-
-        #region 获取/设置 字段值
-        /// <summary>获取/设置 字段值</summary>
-        /// <param name="name">字段名</param>
-        /// <returns></returns>
-        Object this[String name] { get; set; }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git "a/NewLife.Cube/Entity/\347\224\250\346\210\267\351\223\276\346\216\245.Biz.cs" "b/NewLife.Cube/Entity/\347\224\250\346\210\267\351\223\276\346\216\245.Biz.cs"
deleted file mode 100644
index 3c8eddbff0..0000000000
--- "a/NewLife.Cube/Entity/\347\224\250\346\210\267\351\223\276\346\216\245.Biz.cs"
+++ /dev/null
@@ -1,169 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using NewLife.Serialization;
-using NewLife.Web;
-using XCode;
-using XCode.Membership;
-
-namespace NewLife.Cube.Entity
-{
-    /// <summary>用户链接。第三方绑定</summary>
-    [ModelCheckMode(ModelCheckModes.CheckTableWhenFirstUse)]
-    public partial class UserConnect : Entity<UserConnect>
-    {
-        #region 对象操作
-        static UserConnect()
-        {
-            // 累加字段
-            //Meta.Factory.AdditionalFields.Add(__.Logins);
-
-            // 过滤器 UserModule、TimeModule、IPModule
-            Meta.Modules.Add<UserModule>();
-            Meta.Modules.Add<TimeModule>();
-            Meta.Modules.Add<IPModule>();
-        }
-
-        /// <summary>验证数据，通过抛出异常的方式提示验证失败。</summary>
-        /// <param name="isNew">是否插入</param>
-        public override void Valid(Boolean isNew)
-        {
-            // 如果没有脏数据，则不需要进行任何处理
-            if (!HasDirty) return;
-
-            // 在新插入数据或者修改了指定字段时进行修正
-            // 处理当前已登录用户信息，可以由UserModule过滤器代劳
-            /*var user = ManageProvider.User;
-            if (user != null)
-            {
-                if (isNew && !Dirtys[nameof(CreateUserID)) nameof(CreateUserID) = user.ID;
-                if (!Dirtys[nameof(UpdateUserID)]) nameof(UpdateUserID) = user.ID;
-            }*/
-            //if (isNew && !Dirtys[nameof(CreateTime)]) nameof(CreateTime) = DateTime.Now;
-            //if (!Dirtys[nameof(UpdateTime)]) nameof(UpdateTime) = DateTime.Now;
-            //if (isNew && !Dirtys[nameof(CreateIP)]) nameof(CreateIP) = WebHelper.UserHost;
-            //if (!Dirtys[nameof(UpdateIP)]) nameof(UpdateIP) = WebHelper.UserHost;
-
-            // 检查唯一索引
-            // CheckExist(isNew, __.Provider, __.UserID);
-        }
-
-        ///// <summary>首次连接数据库时初始化数据，仅用于实体类重载，用户不应该调用该方法</summary>
-        //[EditorBrowsable(EditorBrowsableState.Never)]
-        //protected override void InitData()
-        //{
-        //    // InitData一般用于当数据表没有数据时添加一些默认数据，该实体类的任何第一次数据库操作都会触发该方法，默认异步调用
-        //    if (Meta.Session.Count > 0) return;
-
-        //    if (XTrace.Debug) XTrace.WriteLine("开始初始化UserConnect[用户链接]数据……");
-
-        //    var entity = new UserConnect();
-        //    entity.ID = 0;
-        //    entity.Provider = "abc";
-        //    entity.UserID = 0;
-        //    entity.OpenID = "abc";
-        //    entity.LinkID = 0;
-        //    entity.NickName = "abc";
-        //    entity.Avatar = "abc";
-        //    entity.AccessToken = "abc";
-        //    entity.RefreshToken = "abc";
-        //    entity.Expire = DateTime.Now;
-        //    entity.Enable = true;
-        //    entity.CreateUserID = 0;
-        //    entity.CreateIP = "abc";
-        //    entity.CreateTime = DateTime.Now;
-        //    entity.UpdateUserID = 0;
-        //    entity.UpdateIP = "abc";
-        //    entity.UpdateTime = DateTime.Now;
-        //    entity.Remark = "abc";
-        //    entity.Insert();
-
-        //    if (XTrace.Debug) XTrace.WriteLine("完成初始化UserConnect[用户链接]数据！");
-        //}
-
-        ///// <summary>已重载。基类先调用Valid(true)验证数据，然后在事务保护内调用OnInsert</summary>
-        ///// <returns></returns>
-        //public override Int32 Insert()
-        //{
-        //    return base.Insert();
-        //}
-
-        ///// <summary>已重载。在事务保护范围内处理业务，位于Valid之后</summary>
-        ///// <returns></returns>
-        //protected override Int32 OnDelete()
-        //{
-        //    return base.OnDelete();
-        //}
-        #endregion
-
-        #region 扩展属性
-        #endregion
-
-        #region 扩展查询
-        /// <summary>根据编号查找</summary>
-        /// <param name="id">编号</param>
-        /// <returns>实体对象</returns>
-        public static UserConnect FindByID(Int32 id)
-        {
-            if (id <= 0) return null;
-
-            // 实体缓存
-            if (Meta.Session.Count < 1000) return Meta.Cache.Find(e => e.ID == id);
-
-            // 单对象缓存
-            //return Meta.SingleCache[id];
-
-            return Find(_.ID == id);
-        }
-
-        /// <summary>根据提供商、用户查找</summary>
-        /// <param name="provider">提供商</param>
-        /// <param name="openid">身份标识</param>
-        /// <returns>实体对象</returns>
-        public static UserConnect FindByProviderAndOpenID(String provider, String openid)
-        {
-            //// 实体缓存
-            //if (Meta.Session.Count < 1000) return Meta.Cache.Find(e => e.Provider == provider && e.OpenID == openid);
-
-            return Find(_.Provider == provider & _.OpenID == openid);
-        }
-
-        /// <summary>根据用户查找</summary>
-        /// <param name="userid">用户</param>
-        /// <returns>实体列表</returns>
-        public static IList<UserConnect> FindAllByUserID(Int32 userid)
-        {
-            //// 实体缓存
-            //if (Meta.Session.Count < 1000) return Meta.Cache.FindAll(e => e.UserID == userid);
-
-            return FindAll(_.UserID == userid);
-        }
-        #endregion
-
-        #region 高级查询
-        #endregion
-
-        #region 业务操作
-        /// <summary>填充用户</summary>
-        /// <param name="client"></param>
-        public virtual void Fill(OAuthClient client)
-        {
-            var uc = this;
-            if (!client.NickName.IsNullOrEmpty()) uc.NickName = client.NickName;
-            if (!client.Avatar.IsNullOrEmpty()) uc.Avatar = client.Avatar;
-
-            uc.LinkID = client.UserID;
-            //ub.OpenID = client.OpenID;
-            uc.AccessToken = client.AccessToken;
-            uc.RefreshToken = client.RefreshToken;
-            uc.Expire = client.Expire;
-
-            if (client.Items != null)
-            {
-                if (client.Items.ContainsKey("mood_message")) client.Items["mood_message"] = "";
-
-                uc.Remark = client.Items.ToJson();
-            }
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git "a/NewLife.Cube/Entity/\347\224\250\346\210\267\351\223\276\346\216\245.cs" "b/NewLife.Cube/Entity/\347\224\250\346\210\267\351\223\276\346\216\245.cs"
deleted file mode 100644
index c9978ae4db..0000000000
--- "a/NewLife.Cube/Entity/\347\224\250\346\210\267\351\223\276\346\216\245.cs"
+++ /dev/null
@@ -1,411 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using XCode;
-using XCode.Configuration;
-using XCode.DataAccessLayer;
-
-namespace NewLife.Cube.Entity
-{
-    /// <summary>用户链接。第三方绑定</summary>
-    [Serializable]
-    [DataObject]
-    [Description("用户链接。第三方绑定")]
-    [BindIndex("IU_UserConnect_Provider_OpenID", true, "Provider,OpenID")]
-    [BindIndex("IX_UserConnect_UserID", false, "UserID")]
-    [BindTable("UserConnect", Description = "用户链接。第三方绑定", ConnName = "Membership", DbType = DatabaseType.None)]
-    public partial class UserConnect : IUserConnect
-    {
-        #region 属性
-        private Int32 _ID;
-        /// <summary>编号</summary>
-        [DisplayName("编号")]
-        [Description("编号")]
-        [DataObjectField(true, true, false, 0)]
-        [BindColumn("ID", "编号", "")]
-        public Int32 ID { get { return _ID; } set { if (OnPropertyChanging(__.ID, value)) { _ID = value; OnPropertyChanged(__.ID); } } }
-
-        private String _Provider;
-        /// <summary>提供商</summary>
-        [DisplayName("提供商")]
-        [Description("提供商")]
-        [DataObjectField(false, false, true, 50)]
-        [BindColumn("Provider", "提供商", "")]
-        public String Provider { get { return _Provider; } set { if (OnPropertyChanging(__.Provider, value)) { _Provider = value; OnPropertyChanged(__.Provider); } } }
-
-        private Int32 _UserID;
-        /// <summary>用户。本地用户</summary>
-        [DisplayName("用户")]
-        [Description("用户。本地用户")]
-        [DataObjectField(false, false, false, 0)]
-        [BindColumn("UserID", "用户。本地用户", "")]
-        public Int32 UserID { get { return _UserID; } set { if (OnPropertyChanging(__.UserID, value)) { _UserID = value; OnPropertyChanged(__.UserID); } } }
-
-        private String _OpenID;
-        /// <summary>身份标识。用户名、OpenID</summary>
-        [DisplayName("身份标识")]
-        [Description("身份标识。用户名、OpenID")]
-        [DataObjectField(false, false, true, 50)]
-        [BindColumn("OpenID", "身份标识。用户名、OpenID", "")]
-        public String OpenID { get { return _OpenID; } set { if (OnPropertyChanging(__.OpenID, value)) { _OpenID = value; OnPropertyChanged(__.OpenID); } } }
-
-        private Int64 _LinkID;
-        /// <summary>用户编号。第三方用户编号</summary>
-        [DisplayName("用户编号")]
-        [Description("用户编号。第三方用户编号")]
-        [DataObjectField(false, false, false, 0)]
-        [BindColumn("LinkID", "用户编号。第三方用户编号", "")]
-        public Int64 LinkID { get { return _LinkID; } set { if (OnPropertyChanging(__.LinkID, value)) { _LinkID = value; OnPropertyChanged(__.LinkID); } } }
-
-        private String _NickName;
-        /// <summary>昵称</summary>
-        [DisplayName("昵称")]
-        [Description("昵称")]
-        [DataObjectField(false, false, true, 50)]
-        [BindColumn("NickName", "昵称", "")]
-        public String NickName { get { return _NickName; } set { if (OnPropertyChanging(__.NickName, value)) { _NickName = value; OnPropertyChanged(__.NickName); } } }
-
-        private String _Avatar;
-        /// <summary>头像</summary>
-        [DisplayName("头像")]
-        [Description("头像")]
-        [DataObjectField(false, false, true, 200)]
-        [BindColumn("Avatar", "头像", "")]
-        public String Avatar { get { return _Avatar; } set { if (OnPropertyChanging(__.Avatar, value)) { _Avatar = value; OnPropertyChanged(__.Avatar); } } }
-
-        private String _AccessToken;
-        /// <summary>访问令牌</summary>
-        [DisplayName("访问令牌")]
-        [Description("访问令牌")]
-        [DataObjectField(false, false, true, 500)]
-        [BindColumn("AccessToken", "访问令牌", "")]
-        public String AccessToken { get { return _AccessToken; } set { if (OnPropertyChanging(__.AccessToken, value)) { _AccessToken = value; OnPropertyChanged(__.AccessToken); } } }
-
-        private String _RefreshToken;
-        /// <summary>刷新令牌</summary>
-        [DisplayName("刷新令牌")]
-        [Description("刷新令牌")]
-        [DataObjectField(false, false, true, 500)]
-        [BindColumn("RefreshToken", "刷新令牌", "")]
-        public String RefreshToken { get { return _RefreshToken; } set { if (OnPropertyChanging(__.RefreshToken, value)) { _RefreshToken = value; OnPropertyChanged(__.RefreshToken); } } }
-
-        private DateTime _Expire;
-        /// <summary>过期时间</summary>
-        [DisplayName("过期时间")]
-        [Description("过期时间")]
-        [DataObjectField(false, false, true, 0)]
-        [BindColumn("Expire", "过期时间", "")]
-        public DateTime Expire { get { return _Expire; } set { if (OnPropertyChanging(__.Expire, value)) { _Expire = value; OnPropertyChanged(__.Expire); } } }
-
-        private Boolean _Enable;
-        /// <summary>启用</summary>
-        [DisplayName("启用")]
-        [Description("启用")]
-        [DataObjectField(false, false, false, 0)]
-        [BindColumn("Enable", "启用", "")]
-        public Boolean Enable { get { return _Enable; } set { if (OnPropertyChanging(__.Enable, value)) { _Enable = value; OnPropertyChanged(__.Enable); } } }
-
-        private Int32 _CreateUserID;
-        /// <summary>创建用户</summary>
-        [DisplayName("创建用户")]
-        [Description("创建用户")]
-        [DataObjectField(false, false, false, 0)]
-        [BindColumn("CreateUserID", "创建用户", "")]
-        public Int32 CreateUserID { get { return _CreateUserID; } set { if (OnPropertyChanging(__.CreateUserID, value)) { _CreateUserID = value; OnPropertyChanged(__.CreateUserID); } } }
-
-        private String _CreateIP;
-        /// <summary>创建地址</summary>
-        [DisplayName("创建地址")]
-        [Description("创建地址")]
-        [DataObjectField(false, false, true, 50)]
-        [BindColumn("CreateIP", "创建地址", "")]
-        public String CreateIP { get { return _CreateIP; } set { if (OnPropertyChanging(__.CreateIP, value)) { _CreateIP = value; OnPropertyChanged(__.CreateIP); } } }
-
-        private DateTime _CreateTime;
-        /// <summary>创建时间</summary>
-        [DisplayName("创建时间")]
-        [Description("创建时间")]
-        [DataObjectField(false, false, true, 0)]
-        [BindColumn("CreateTime", "创建时间", "")]
-        public DateTime CreateTime { get { return _CreateTime; } set { if (OnPropertyChanging(__.CreateTime, value)) { _CreateTime = value; OnPropertyChanged(__.CreateTime); } } }
-
-        private Int32 _UpdateUserID;
-        /// <summary>更新用户</summary>
-        [DisplayName("更新用户")]
-        [Description("更新用户")]
-        [DataObjectField(false, false, false, 0)]
-        [BindColumn("UpdateUserID", "更新用户", "")]
-        public Int32 UpdateUserID { get { return _UpdateUserID; } set { if (OnPropertyChanging(__.UpdateUserID, value)) { _UpdateUserID = value; OnPropertyChanged(__.UpdateUserID); } } }
-
-        private String _UpdateIP;
-        /// <summary>更新地址</summary>
-        [DisplayName("更新地址")]
-        [Description("更新地址")]
-        [DataObjectField(false, false, true, 50)]
-        [BindColumn("UpdateIP", "更新地址", "")]
-        public String UpdateIP { get { return _UpdateIP; } set { if (OnPropertyChanging(__.UpdateIP, value)) { _UpdateIP = value; OnPropertyChanged(__.UpdateIP); } } }
-
-        private DateTime _UpdateTime;
-        /// <summary>更新时间</summary>
-        [DisplayName("更新时间")]
-        [Description("更新时间")]
-        [DataObjectField(false, false, true, 0)]
-        [BindColumn("UpdateTime", "更新时间", "")]
-        public DateTime UpdateTime { get { return _UpdateTime; } set { if (OnPropertyChanging(__.UpdateTime, value)) { _UpdateTime = value; OnPropertyChanged(__.UpdateTime); } } }
-
-        private String _Remark;
-        /// <summary>备注</summary>
-        [DisplayName("备注")]
-        [Description("备注")]
-        [DataObjectField(false, false, true, 500)]
-        [BindColumn("Remark", "备注", "")]
-        public String Remark { get { return _Remark; } set { if (OnPropertyChanging(__.Remark, value)) { _Remark = value; OnPropertyChanged(__.Remark); } } }
-        #endregion
-
-        #region 获取/设置 字段值
-        /// <summary>获取/设置 字段值</summary>
-        /// <param name="name">字段名</param>
-        /// <returns></returns>
-        public override Object this[String name]
-        {
-            get
-            {
-                switch (name)
-                {
-                    case __.ID : return _ID;
-                    case __.Provider : return _Provider;
-                    case __.UserID : return _UserID;
-                    case __.OpenID : return _OpenID;
-                    case __.LinkID : return _LinkID;
-                    case __.NickName : return _NickName;
-                    case __.Avatar : return _Avatar;
-                    case __.AccessToken : return _AccessToken;
-                    case __.RefreshToken : return _RefreshToken;
-                    case __.Expire : return _Expire;
-                    case __.Enable : return _Enable;
-                    case __.CreateUserID : return _CreateUserID;
-                    case __.CreateIP : return _CreateIP;
-                    case __.CreateTime : return _CreateTime;
-                    case __.UpdateUserID : return _UpdateUserID;
-                    case __.UpdateIP : return _UpdateIP;
-                    case __.UpdateTime : return _UpdateTime;
-                    case __.Remark : return _Remark;
-                    default: return base[name];
-                }
-            }
-            set
-            {
-                switch (name)
-                {
-                    case __.ID : _ID = Convert.ToInt32(value); break;
-                    case __.Provider : _Provider = Convert.ToString(value); break;
-                    case __.UserID : _UserID = Convert.ToInt32(value); break;
-                    case __.OpenID : _OpenID = Convert.ToString(value); break;
-                    case __.LinkID : _LinkID = Convert.ToInt64(value); break;
-                    case __.NickName : _NickName = Convert.ToString(value); break;
-                    case __.Avatar : _Avatar = Convert.ToString(value); break;
-                    case __.AccessToken : _AccessToken = Convert.ToString(value); break;
-                    case __.RefreshToken : _RefreshToken = Convert.ToString(value); break;
-                    case __.Expire : _Expire = Convert.ToDateTime(value); break;
-                    case __.Enable : _Enable = Convert.ToBoolean(value); break;
-                    case __.CreateUserID : _CreateUserID = Convert.ToInt32(value); break;
-                    case __.CreateIP : _CreateIP = Convert.ToString(value); break;
-                    case __.CreateTime : _CreateTime = Convert.ToDateTime(value); break;
-                    case __.UpdateUserID : _UpdateUserID = Convert.ToInt32(value); break;
-                    case __.UpdateIP : _UpdateIP = Convert.ToString(value); break;
-                    case __.UpdateTime : _UpdateTime = Convert.ToDateTime(value); break;
-                    case __.Remark : _Remark = Convert.ToString(value); break;
-                    default: base[name] = value; break;
-                }
-            }
-        }
-        #endregion
-
-        #region 字段名
-        /// <summary>取得用户链接字段信息的快捷方式</summary>
-        public partial class _
-        {
-            /// <summary>编号</summary>
-            public static readonly Field ID = FindByName(__.ID);
-
-            /// <summary>提供商</summary>
-            public static readonly Field Provider = FindByName(__.Provider);
-
-            /// <summary>用户。本地用户</summary>
-            public static readonly Field UserID = FindByName(__.UserID);
-
-            /// <summary>身份标识。用户名、OpenID</summary>
-            public static readonly Field OpenID = FindByName(__.OpenID);
-
-            /// <summary>用户编号。第三方用户编号</summary>
-            public static readonly Field LinkID = FindByName(__.LinkID);
-
-            /// <summary>昵称</summary>
-            public static readonly Field NickName = FindByName(__.NickName);
-
-            /// <summary>头像</summary>
-            public static readonly Field Avatar = FindByName(__.Avatar);
-
-            /// <summary>访问令牌</summary>
-            public static readonly Field AccessToken = FindByName(__.AccessToken);
-
-            /// <summary>刷新令牌</summary>
-            public static readonly Field RefreshToken = FindByName(__.RefreshToken);
-
-            /// <summary>过期时间</summary>
-            public static readonly Field Expire = FindByName(__.Expire);
-
-            /// <summary>启用</summary>
-            public static readonly Field Enable = FindByName(__.Enable);
-
-            /// <summary>创建用户</summary>
-            public static readonly Field CreateUserID = FindByName(__.CreateUserID);
-
-            /// <summary>创建地址</summary>
-            public static readonly Field CreateIP = FindByName(__.CreateIP);
-
-            /// <summary>创建时间</summary>
-            public static readonly Field CreateTime = FindByName(__.CreateTime);
-
-            /// <summary>更新用户</summary>
-            public static readonly Field UpdateUserID = FindByName(__.UpdateUserID);
-
-            /// <summary>更新地址</summary>
-            public static readonly Field UpdateIP = FindByName(__.UpdateIP);
-
-            /// <summary>更新时间</summary>
-            public static readonly Field UpdateTime = FindByName(__.UpdateTime);
-
-            /// <summary>备注</summary>
-            public static readonly Field Remark = FindByName(__.Remark);
-
-            static Field FindByName(String name) { return Meta.Table.FindByName(name); }
-        }
-
-        /// <summary>取得用户链接字段名称的快捷方式</summary>
-        public partial class __
-        {
-            /// <summary>编号</summary>
-            public const String ID = "ID";
-
-            /// <summary>提供商</summary>
-            public const String Provider = "Provider";
-
-            /// <summary>用户。本地用户</summary>
-            public const String UserID = "UserID";
-
-            /// <summary>身份标识。用户名、OpenID</summary>
-            public const String OpenID = "OpenID";
-
-            /// <summary>用户编号。第三方用户编号</summary>
-            public const String LinkID = "LinkID";
-
-            /// <summary>昵称</summary>
-            public const String NickName = "NickName";
-
-            /// <summary>头像</summary>
-            public const String Avatar = "Avatar";
-
-            /// <summary>访问令牌</summary>
-            public const String AccessToken = "AccessToken";
-
-            /// <summary>刷新令牌</summary>
-            public const String RefreshToken = "RefreshToken";
-
-            /// <summary>过期时间</summary>
-            public const String Expire = "Expire";
-
-            /// <summary>启用</summary>
-            public const String Enable = "Enable";
-
-            /// <summary>创建用户</summary>
-            public const String CreateUserID = "CreateUserID";
-
-            /// <summary>创建地址</summary>
-            public const String CreateIP = "CreateIP";
-
-            /// <summary>创建时间</summary>
-            public const String CreateTime = "CreateTime";
-
-            /// <summary>更新用户</summary>
-            public const String UpdateUserID = "UpdateUserID";
-
-            /// <summary>更新地址</summary>
-            public const String UpdateIP = "UpdateIP";
-
-            /// <summary>更新时间</summary>
-            public const String UpdateTime = "UpdateTime";
-
-            /// <summary>备注</summary>
-            public const String Remark = "Remark";
-        }
-        #endregion
-    }
-
-    /// <summary>用户链接。第三方绑定接口</summary>
-    public partial interface IUserConnect
-    {
-        #region 属性
-        /// <summary>编号</summary>
-        Int32 ID { get; set; }
-
-        /// <summary>提供商</summary>
-        String Provider { get; set; }
-
-        /// <summary>用户。本地用户</summary>
-        Int32 UserID { get; set; }
-
-        /// <summary>身份标识。用户名、OpenID</summary>
-        String OpenID { get; set; }
-
-        /// <summary>用户编号。第三方用户编号</summary>
-        Int64 LinkID { get; set; }
-
-        /// <summary>昵称</summary>
-        String NickName { get; set; }
-
-        /// <summary>头像</summary>
-        String Avatar { get; set; }
-
-        /// <summary>访问令牌</summary>
-        String AccessToken { get; set; }
-
-        /// <summary>刷新令牌</summary>
-        String RefreshToken { get; set; }
-
-        /// <summary>过期时间</summary>
-        DateTime Expire { get; set; }
-
-        /// <summary>启用</summary>
-        Boolean Enable { get; set; }
-
-        /// <summary>创建用户</summary>
-        Int32 CreateUserID { get; set; }
-
-        /// <summary>创建地址</summary>
-        String CreateIP { get; set; }
-
-        /// <summary>创建时间</summary>
-        DateTime CreateTime { get; set; }
-
-        /// <summary>更新用户</summary>
-        Int32 UpdateUserID { get; set; }
-
-        /// <summary>更新地址</summary>
-        String UpdateIP { get; set; }
-
-        /// <summary>更新时间</summary>
-        DateTime UpdateTime { get; set; }
-
-        /// <summary>备注</summary>
-        String Remark { get; set; }
-        #endregion
-
-        #region 获取/设置 字段值
-        /// <summary>获取/设置 字段值</summary>
-        /// <param name="name">字段名</param>
-        /// <returns></returns>
-        Object this[String name] { get; set; }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git "a/NewLife.Cube/Entity/\350\256\277\351\227\256\347\273\237\350\256\241.Biz.cs" "b/NewLife.Cube/Entity/\350\256\277\351\227\256\347\273\237\350\256\241.Biz.cs"
deleted file mode 100644
index 89f4b55d59..0000000000
--- "a/NewLife.Cube/Entity/\350\256\277\351\227\256\347\273\237\350\256\241.Biz.cs"
+++ /dev/null
@@ -1,283 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using NewLife.Collections;
-using NewLife.Data;
-using XCode;
-using XCode.Cache;
-using XCode.Statistics;
-
-namespace XCode.Membership
-{
-    /// <summary>访问统计模型</summary>
-    public class VisitStatModel : StatModel<VisitStatModel>
-    {
-        #region 属性
-        /// <summary>页面</summary>
-        public String Page { get; set; }
-
-        /// <summary>标题</summary>
-        public String Title { get; set; }
-
-        /// <summary>耗时</summary>
-        public Int32 Cost { get; set; }
-
-        /// <summary>用户</summary>
-        public String User { get; set; }
-
-        /// <summary>IP地址</summary>
-        public String IP { get; set; }
-
-        /// <summary>错误</summary>
-        public String Error { get; set; }
-        #endregion
-
-        #region 相等比较
-        /// <summary>相等</summary>
-        /// <param name="obj"></param>
-        /// <returns></returns>
-        public override Boolean Equals(Object obj)
-        {
-            if (!base.Equals(obj)) return false;
-
-            if (obj is VisitStatModel model) return Page + "" == model.Page + "";
-
-            return false;
-        }
-
-        /// <summary>获取哈希</summary>
-        /// <returns></returns>
-        public override Int32 GetHashCode() => base.GetHashCode() ^ Page.GetHashCode();
-        #endregion
-    }
-
-    /// <summary>访问统计</summary>
-    public partial class VisitStat : Entity<VisitStat>, IStat
-    {
-        #region 对象操作
-        static VisitStat()
-        {
-            // 累加字段
-            var df = Meta.Factory.AdditionalFields;
-            df.Add(__.Times);
-            df.Add(__.Users);
-            df.Add(__.IPs);
-            df.Add(__.Error);
-
-            // 过滤器 UserModule、TimeModule、IPModule
-            Meta.Modules.Add<TimeModule>();
-
-            //// 单对象缓存从键
-            //var sc = Meta.SingleCache;
-            //if (sc.Expire < 20 * 60) sc.Expire = 20 * 60;
-            //sc.FindSlaveKeyMethod = k => FindByModel(GetModel(k), false);
-            //sc.GetSlaveKeyMethod = e => GetKey(e.ToModel());
-
-#if !DEBUG
-            // 关闭SQL日志
-            Meta.Session.Dal.Db.ShowSQL = false;
-#endif
-        }
-        #endregion
-
-        #region 扩展属性
-        #endregion
-
-        #region 扩展查询
-        /// <summary>根据编号查找</summary>
-        /// <param name="id">编号</param>
-        /// <returns>实体对象</returns>
-        public static VisitStat FindByID(Int32 id)
-        {
-            if (id <= 0) return null;
-
-            //// 实体缓存
-            //if (Meta.Count < 1000) return Meta.Cache.Find(e => e.ID == id);
-
-            // 单对象缓存
-            return Meta.SingleCache[id];
-
-            //return Find(_.ID == id);
-        }
-
-        private static DictionaryCache<VisitStatModel, VisitStat> _cache = new DictionaryCache<VisitStatModel, VisitStat> { Expire = 20 * 60, Period = 60 };
-        /// <summary>根据模型查找</summary>
-        /// <param name="model"></param>
-        /// <param name="cache"></param>
-        /// <returns></returns>
-        public static VisitStat FindByModel(VisitStatModel model, Boolean cache)
-        {
-            if (model == null) return null;
-
-            //if (cache) return Meta.SingleCache.GetItemWithSlaveKey(GetKey(model)) as VisitStat;
-            if (cache)
-            {
-                if (_cache.FindMethod == null) _cache.FindMethod = m => FindByModel(m, false);
-
-                return _cache[model];
-            }
-
-            var exp = new WhereExpression();
-            exp &= _.Level == model.Level;
-            if (model.Level > 0 && model.Time > DateTime.MinValue) exp &= _.Time == model.GetDate(model.Level);
-            exp &= _.Page == model.Page;
-
-            return Find(exp);
-        }
-        #endregion
-
-        #region 高级查询
-        /// <summary>高级查询访问统计</summary>
-        /// <param name="model"></param>
-        /// <param name="start"></param>
-        /// <param name="end"></param>
-        /// <param name="param"></param>
-        /// <returns></returns>
-        public static IList<VisitStat> Search(VisitStatModel model, DateTime start, DateTime end, PageParameter param)
-        {
-            var exp = new WhereExpression();
-            if (model.Level >= 0) exp &= _.Level == model.Level;
-            if (model.Level > 0 && model.Time > DateTime.MinValue) exp &= _.Time == model.GetDate(model.Level);
-            if (!model.Page.IsNullOrEmpty()) exp &= _.Page == model.Page;
-
-            exp &= _.CreateTime.Between(start, end);
-
-            return FindAll(exp, param);
-        }
-
-        static FieldCache<VisitStat> PageCache = new FieldCache<VisitStat>(_.Page);
-
-        /// <summary>查找所有</summary>
-        /// <returns></returns>
-        public static IList<VisitStat> FindAllPage()
-        {
-            return PageCache.Entities;
-        }
-
-        /// <summary>获取所有名称</summary>
-        /// <returns></returns>
-        public static IDictionary<String, String> FindAllPageName()
-        {
-            return PageCache.FindAllName();
-        }
-        #endregion
-
-        #region 业务操作
-        /// <summary>业务统计</summary>
-        /// <param name="model">模型</param>
-        /// <param name="levels">要统计的层级</param>
-        /// <returns></returns>
-        public static void Process(VisitStatModel model, params StatLevels[] levels)
-        {
-            model = model.Clone();
-
-            if (levels == null || levels.Length == 0) levels = new[] { StatLevels.Day, StatLevels.Month, StatLevels.Year, StatLevels.All };
-
-            // 当前
-            var list = model.Split(levels);
-
-            // 全局
-            if (!model.Page.IsNullOrEmpty())
-            {
-                model.Page = "全部";
-
-                list.AddRange(model.Split(levels));
-            }
-
-            // 并行处理
-            Parallel.ForEach(list, m => ProcessItem(m as VisitStatModel));
-        }
-
-        private static VisitStat ProcessItem(VisitStatModel model)
-        {
-            var st = StatHelper.GetOrAdd(model, FindByModel, e =>
-            {
-                e.Page = model.Page;
-            });
-            if (st == null) return null;
-
-            // 历史平均
-            st.Cost = (Int32)(((Int64)st.Cost * st.Times + model.Cost) / (st.Times + 1));
-            if (model.Cost > st.MaxCost) st.MaxCost = model.Cost;
-
-            if (!model.Title.IsNullOrEmpty()) st.Title = model.Title;
-            st.Times++;
-
-            if (!model.Error.IsNullOrEmpty()) st.Error++;
-
-            var user = model.User;
-            var ip = model.IP;
-            if (!user.IsNullOrEmpty() || !ip.IsNullOrEmpty())
-            {
-                // 计算用户和IP，合并在Remark里面
-                var ss = new HashSet<String>((st.Remark + "").Split(","));
-                if (!user.IsNullOrEmpty() && !ss.Contains(user))
-                {
-                    st.Users++;
-                    ss.Add(user + "");
-                }
-                if (!ip.IsNullOrEmpty() && !ss.Contains(ip))
-                {
-                    st.IPs++;
-                    ss.Add(ip);
-                }
-                // 如果超长，砍掉前面
-                var ds = ss as IEnumerable<String>;
-                var k = 1;
-                while (true)
-                {
-                    var str = ds.Join(",");
-                    if (str.Length <= _.Remark.Length)
-                    {
-                        st.Remark = str;
-                        break;
-                    }
-
-                    ds = ss.Skip(k++);
-                }
-            }
-
-            st.SaveAsync(5_000);
-
-            return st;
-        }
-        #endregion
-
-        #region 辅助
-        ///// <summary>实体转模型</summary>
-        ///// <returns></returns>
-        //public VisitStatModel ToModel()
-        //{
-        //    var model = new VisitStatModel
-        //    {
-        //        Page = Page,
-        //        Level = Level,
-        //        Time = Time,
-        //    };
-
-        //    return model;
-        //}
-
-        //private static String GetKey(VisitStatModel model)
-        //{
-        //    return $"{model.Page}_{(Int32)model.Level}_{model.Time.ToFullString()}";
-        //}
-
-        //private static VisitStatModel GetModel(String key)
-        //{
-        //    var ks = key.Split("_");
-        //    if (ks.Length < 3) return null;
-
-        //    var model = new VisitStatModel
-        //    {
-        //        Page = ks[0],
-        //        Level = (StatLevels)ks[1].ToInt(),
-        //        Time = ks[2].ToDateTime(),
-        //    };
-
-        //    return model;
-        //}
-        #endregion
-    }
-}
\ No newline at end of file
diff --git "a/NewLife.Cube/Entity/\350\256\277\351\227\256\347\273\237\350\256\241.cs" "b/NewLife.Cube/Entity/\350\256\277\351\227\256\347\273\237\350\256\241.cs"
deleted file mode 100644
index ad57b4eeea..0000000000
--- "a/NewLife.Cube/Entity/\350\256\277\351\227\256\347\273\237\350\256\241.cs"
+++ /dev/null
@@ -1,335 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using XCode;
-using XCode.Configuration;
-using XCode.DataAccessLayer;
-
-namespace XCode.Membership
-{
-    /// <summary>访问统计</summary>
-    [Serializable]
-    [DataObject]
-    [Description("访问统计")]
-    [BindIndex("IU_VisitStat_Page_Level_Time", true, "Page,Level,Time")]
-    [BindIndex("IX_VisitStat_Level_Time", false, "Level,Time")]
-    [BindTable("VisitStat", Description = "访问统计", ConnName = "Log", DbType = DatabaseType.None)]
-    public partial class VisitStat : IVisitStat
-    {
-        #region 属性
-        private Int32 _ID;
-        /// <summary>编号</summary>
-        [DisplayName("编号")]
-        [Description("编号")]
-        [DataObjectField(true, true, false, 0)]
-        [BindColumn("ID", "编号", "")]
-        public Int32 ID { get { return _ID; } set { if (OnPropertyChanging(__.ID, value)) { _ID = value; OnPropertyChanged(__.ID); } } }
-
-        private XCode.Statistics.StatLevels _Level;
-        /// <summary>层级</summary>
-        [DisplayName("层级")]
-        [Description("层级")]
-        [DataObjectField(false, false, false, 0)]
-        [BindColumn("Level", "层级", "")]
-        public XCode.Statistics.StatLevels Level { get { return _Level; } set { if (OnPropertyChanging(__.Level, value)) { _Level = value; OnPropertyChanged(__.Level); } } }
-
-        private DateTime _Time;
-        /// <summary>时间</summary>
-        [DisplayName("时间")]
-        [Description("时间")]
-        [DataObjectField(false, false, true, 0)]
-        [BindColumn("Time", "时间", "")]
-        public DateTime Time { get { return _Time; } set { if (OnPropertyChanging(__.Time, value)) { _Time = value; OnPropertyChanged(__.Time); } } }
-
-        private String _Page;
-        /// <summary>页面</summary>
-        [DisplayName("页面")]
-        [Description("页面")]
-        [DataObjectField(false, false, false, 50)]
-        [BindColumn("Page", "页面", "")]
-        public String Page { get { return _Page; } set { if (OnPropertyChanging(__.Page, value)) { _Page = value; OnPropertyChanged(__.Page); } } }
-
-        private String _Title;
-        /// <summary>标题</summary>
-        [DisplayName("标题")]
-        [Description("标题")]
-        [DataObjectField(false, false, true, 50)]
-        [BindColumn("Title", "标题", "", Master = true)]
-        public String Title { get { return _Title; } set { if (OnPropertyChanging(__.Title, value)) { _Title = value; OnPropertyChanged(__.Title); } } }
-
-        private Int32 _Times;
-        /// <summary>次数</summary>
-        [DisplayName("次数")]
-        [Description("次数")]
-        [DataObjectField(false, false, false, 0)]
-        [BindColumn("Times", "次数", "")]
-        public Int32 Times { get { return _Times; } set { if (OnPropertyChanging(__.Times, value)) { _Times = value; OnPropertyChanged(__.Times); } } }
-
-        private Int32 _Users;
-        /// <summary>用户</summary>
-        [DisplayName("用户")]
-        [Description("用户")]
-        [DataObjectField(false, false, false, 0)]
-        [BindColumn("Users", "用户", "")]
-        public Int32 Users { get { return _Users; } set { if (OnPropertyChanging(__.Users, value)) { _Users = value; OnPropertyChanged(__.Users); } } }
-
-        private Int32 _IPs;
-        /// <summary>IP</summary>
-        [DisplayName("IP")]
-        [Description("IP")]
-        [DataObjectField(false, false, false, 0)]
-        [BindColumn("IPs", "IP", "")]
-        public Int32 IPs { get { return _IPs; } set { if (OnPropertyChanging(__.IPs, value)) { _IPs = value; OnPropertyChanged(__.IPs); } } }
-
-        private Int32 _Error;
-        /// <summary>错误</summary>
-        [DisplayName("错误")]
-        [Description("错误")]
-        [DataObjectField(false, false, false, 0)]
-        [BindColumn("Error", "错误", "")]
-        public Int32 Error { get { return _Error; } set { if (OnPropertyChanging(__.Error, value)) { _Error = value; OnPropertyChanged(__.Error); } } }
-
-        private Int32 _Cost;
-        /// <summary>耗时。毫秒</summary>
-        [DisplayName("耗时")]
-        [Description("耗时。毫秒")]
-        [DataObjectField(false, false, false, 0)]
-        [BindColumn("Cost", "耗时。毫秒", "")]
-        public Int32 Cost { get { return _Cost; } set { if (OnPropertyChanging(__.Cost, value)) { _Cost = value; OnPropertyChanged(__.Cost); } } }
-
-        private Int32 _MaxCost;
-        /// <summary>最大耗时。毫秒</summary>
-        [DisplayName("最大耗时")]
-        [Description("最大耗时。毫秒")]
-        [DataObjectField(false, false, false, 0)]
-        [BindColumn("MaxCost", "最大耗时。毫秒", "")]
-        public Int32 MaxCost { get { return _MaxCost; } set { if (OnPropertyChanging(__.MaxCost, value)) { _MaxCost = value; OnPropertyChanged(__.MaxCost); } } }
-
-        private DateTime _CreateTime;
-        /// <summary>创建时间</summary>
-        [DisplayName("创建时间")]
-        [Description("创建时间")]
-        [DataObjectField(false, false, true, 0)]
-        [BindColumn("CreateTime", "创建时间", "")]
-        public DateTime CreateTime { get { return _CreateTime; } set { if (OnPropertyChanging(__.CreateTime, value)) { _CreateTime = value; OnPropertyChanged(__.CreateTime); } } }
-
-        private DateTime _UpdateTime;
-        /// <summary>更新时间</summary>
-        [DisplayName("更新时间")]
-        [Description("更新时间")]
-        [DataObjectField(false, false, true, 0)]
-        [BindColumn("UpdateTime", "更新时间", "")]
-        public DateTime UpdateTime { get { return _UpdateTime; } set { if (OnPropertyChanging(__.UpdateTime, value)) { _UpdateTime = value; OnPropertyChanged(__.UpdateTime); } } }
-
-        private String _Remark;
-        /// <summary>详细信息</summary>
-        [DisplayName("详细信息")]
-        [Description("详细信息")]
-        [DataObjectField(false, false, true, 500)]
-        [BindColumn("Remark", "详细信息", "")]
-        public String Remark { get { return _Remark; } set { if (OnPropertyChanging(__.Remark, value)) { _Remark = value; OnPropertyChanged(__.Remark); } } }
-        #endregion
-
-        #region 获取/设置 字段值
-        /// <summary>获取/设置 字段值</summary>
-        /// <param name="name">字段名</param>
-        /// <returns></returns>
-        public override Object this[String name]
-        {
-            get
-            {
-                switch (name)
-                {
-                    case __.ID : return _ID;
-                    case __.Level : return _Level;
-                    case __.Time : return _Time;
-                    case __.Page : return _Page;
-                    case __.Title : return _Title;
-                    case __.Times : return _Times;
-                    case __.Users : return _Users;
-                    case __.IPs : return _IPs;
-                    case __.Error : return _Error;
-                    case __.Cost : return _Cost;
-                    case __.MaxCost : return _MaxCost;
-                    case __.CreateTime : return _CreateTime;
-                    case __.UpdateTime : return _UpdateTime;
-                    case __.Remark : return _Remark;
-                    default: return base[name];
-                }
-            }
-            set
-            {
-                switch (name)
-                {
-                    case __.ID : _ID = Convert.ToInt32(value); break;
-                    case __.Level : _Level = (XCode.Statistics.StatLevels)Convert.ToInt32(value); break;
-                    case __.Time : _Time = Convert.ToDateTime(value); break;
-                    case __.Page : _Page = Convert.ToString(value); break;
-                    case __.Title : _Title = Convert.ToString(value); break;
-                    case __.Times : _Times = Convert.ToInt32(value); break;
-                    case __.Users : _Users = Convert.ToInt32(value); break;
-                    case __.IPs : _IPs = Convert.ToInt32(value); break;
-                    case __.Error : _Error = Convert.ToInt32(value); break;
-                    case __.Cost : _Cost = Convert.ToInt32(value); break;
-                    case __.MaxCost : _MaxCost = Convert.ToInt32(value); break;
-                    case __.CreateTime : _CreateTime = Convert.ToDateTime(value); break;
-                    case __.UpdateTime : _UpdateTime = Convert.ToDateTime(value); break;
-                    case __.Remark : _Remark = Convert.ToString(value); break;
-                    default: base[name] = value; break;
-                }
-            }
-        }
-        #endregion
-
-        #region 字段名
-        /// <summary>取得访问统计字段信息的快捷方式</summary>
-        public partial class _
-        {
-            /// <summary>编号</summary>
-            public static readonly Field ID = FindByName(__.ID);
-
-            /// <summary>层级</summary>
-            public static readonly Field Level = FindByName(__.Level);
-
-            /// <summary>时间</summary>
-            public static readonly Field Time = FindByName(__.Time);
-
-            /// <summary>页面</summary>
-            public static readonly Field Page = FindByName(__.Page);
-
-            /// <summary>标题</summary>
-            public static readonly Field Title = FindByName(__.Title);
-
-            /// <summary>次数</summary>
-            public static readonly Field Times = FindByName(__.Times);
-
-            /// <summary>用户</summary>
-            public static readonly Field Users = FindByName(__.Users);
-
-            /// <summary>IP</summary>
-            public static readonly Field IPs = FindByName(__.IPs);
-
-            /// <summary>错误</summary>
-            public static readonly Field Error = FindByName(__.Error);
-
-            /// <summary>耗时。毫秒</summary>
-            public static readonly Field Cost = FindByName(__.Cost);
-
-            /// <summary>最大耗时。毫秒</summary>
-            public static readonly Field MaxCost = FindByName(__.MaxCost);
-
-            /// <summary>创建时间</summary>
-            public static readonly Field CreateTime = FindByName(__.CreateTime);
-
-            /// <summary>更新时间</summary>
-            public static readonly Field UpdateTime = FindByName(__.UpdateTime);
-
-            /// <summary>详细信息</summary>
-            public static readonly Field Remark = FindByName(__.Remark);
-
-            static Field FindByName(String name) { return Meta.Table.FindByName(name); }
-        }
-
-        /// <summary>取得访问统计字段名称的快捷方式</summary>
-        public partial class __
-        {
-            /// <summary>编号</summary>
-            public const String ID = "ID";
-
-            /// <summary>层级</summary>
-            public const String Level = "Level";
-
-            /// <summary>时间</summary>
-            public const String Time = "Time";
-
-            /// <summary>页面</summary>
-            public const String Page = "Page";
-
-            /// <summary>标题</summary>
-            public const String Title = "Title";
-
-            /// <summary>次数</summary>
-            public const String Times = "Times";
-
-            /// <summary>用户</summary>
-            public const String Users = "Users";
-
-            /// <summary>IP</summary>
-            public const String IPs = "IPs";
-
-            /// <summary>错误</summary>
-            public const String Error = "Error";
-
-            /// <summary>耗时。毫秒</summary>
-            public const String Cost = "Cost";
-
-            /// <summary>最大耗时。毫秒</summary>
-            public const String MaxCost = "MaxCost";
-
-            /// <summary>创建时间</summary>
-            public const String CreateTime = "CreateTime";
-
-            /// <summary>更新时间</summary>
-            public const String UpdateTime = "UpdateTime";
-
-            /// <summary>详细信息</summary>
-            public const String Remark = "Remark";
-        }
-        #endregion
-    }
-
-    /// <summary>访问统计接口</summary>
-    public partial interface IVisitStat
-    {
-        #region 属性
-        /// <summary>编号</summary>
-        Int32 ID { get; set; }
-
-        /// <summary>层级</summary>
-        XCode.Statistics.StatLevels Level { get; set; }
-
-        /// <summary>时间</summary>
-        DateTime Time { get; set; }
-
-        /// <summary>页面</summary>
-        String Page { get; set; }
-
-        /// <summary>标题</summary>
-        String Title { get; set; }
-
-        /// <summary>次数</summary>
-        Int32 Times { get; set; }
-
-        /// <summary>用户</summary>
-        Int32 Users { get; set; }
-
-        /// <summary>IP</summary>
-        Int32 IPs { get; set; }
-
-        /// <summary>错误</summary>
-        Int32 Error { get; set; }
-
-        /// <summary>耗时。毫秒</summary>
-        Int32 Cost { get; set; }
-
-        /// <summary>最大耗时。毫秒</summary>
-        Int32 MaxCost { get; set; }
-
-        /// <summary>创建时间</summary>
-        DateTime CreateTime { get; set; }
-
-        /// <summary>更新时间</summary>
-        DateTime UpdateTime { get; set; }
-
-        /// <summary>详细信息</summary>
-        String Remark { get; set; }
-        #endregion
-
-        #region 获取/设置 字段值
-        /// <summary>获取/设置 字段值</summary>
-        /// <param name="name">字段名</param>
-        /// <returns></returns>
-        Object this[String name] { get; set; }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Global.asax b/NewLife.Cube/Global.asax
deleted file mode 100644
index ccf4b8aa05..0000000000
--- a/NewLife.Cube/Global.asax
+++ /dev/null
@@ -1 +0,0 @@
-﻿<%@ Application Codebehind="Global.asax.cs" Inherits="NewLife.Cube.MvcApplication" Language="C#" %>
diff --git a/NewLife.Cube/Global.asax.cs b/NewLife.Cube/Global.asax.cs
deleted file mode 100644
index 2aeff2618b..0000000000
--- a/NewLife.Cube/Global.asax.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-﻿using System.Web.Mvc;
-using System.Web.Routing;
-using NewLife.Log;
-
-namespace NewLife.Cube
-{
-    /// <summary>
-    /// 注意: 有关启用 IIS6 或 IIS7 经典模式的说明，
-    /// 请访问 http://go.microsoft.com/?LinkId=9394801
-    /// </summary>
-
-    public class MvcApplication : System.Web.HttpApplication
-    {
-        /// <summary>应用程序启动</summary>
-        protected void Application_Start()
-        {
-            XTrace.WriteLine("系统启动");
-
-            AreaRegistration.RegisterAllAreas();
-
-            RouteConfig.RegisterRoutes(RouteTable.Routes);
-            //BundleConfig.RegisterBundles(BundleTable.Bundles);
-            //XCode.Cache.CacheBase.Debug = true;
-
-            XTrace.WriteLine("系统启动完成");
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/NewLife.Cube.csproj b/NewLife.Cube/NewLife.Cube.csproj
deleted file mode 100644
index dc7d0c7b22..0000000000
--- a/NewLife.Cube/NewLife.Cube.csproj
+++ /dev/null
@@ -1,996 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>
-    </ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{7AC0E99B-CFD8-4B59-8838-503EAA30523F}</ProjectGuid>
-    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>NewLife.Cube</RootNamespace>
-    <AssemblyName>NewLife.Cube</AssemblyName>
-    <MvcBuildViews>false</MvcBuildViews>
-    <UseIISExpress>true</UseIISExpress>
-    <IISExpressSSLPort />
-    <IISExpressAnonymousAuthentication />
-    <IISExpressWindowsAuthentication />
-    <IISExpressUseClassicPipelineMode />
-    <MvcProjectUpgradeChecked>true</MvcProjectUpgradeChecked>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>15.0</OldToolsVersion>
-    <Use64BitIISExpress />
-    <UseGlobalApplicationHostFile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>Bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>Bin\NewLife.Cube.XML</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>Bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DocumentationFile>Bin\NewLife.Cube.XML</DocumentationFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="NewLife.Core">
-      <HintPath>..\..\Bin\net45\NewLife.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.IO.Compression.FileSystem" />
-    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.Helpers.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Mvc, Version=5.2.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.6\lib\net45\System.Web.Mvc.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.Razor.3.2.6\lib\net45\System.Web.Razor.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.WebPages.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Web.Routing" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Web.Services" />
-    <Reference Include="XCode">
-      <HintPath>..\..\Bin\net45\XCode.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Areas\Admin\AdminAreaRegistration.cs" />
-    <Compile Include="Areas\Admin\Controllers\DbController.cs" />
-    <Compile Include="Areas\Admin\Controllers\FileController.cs" />
-    <Compile Include="Areas\Admin\Controllers\UserTokenController.cs" />
-    <Compile Include="Areas\Admin\Controllers\UserConnectController.cs" />
-    <Compile Include="Areas\Admin\Controllers\VisitStatController.cs" />
-    <Compile Include="Areas\Admin\Controllers\RoleController.cs" />
-    <Compile Include="Areas\Admin\Controllers\LogController.cs" />
-    <Compile Include="Areas\Admin\Controllers\MenuController.cs" />
-    <Compile Include="Areas\Admin\Controllers\CoreController.cs" />
-    <Compile Include="Areas\Admin\Controllers\CubeController.cs" />
-    <Compile Include="Areas\Admin\Controllers\UserOnlineController.cs" />
-    <Compile Include="Areas\Admin\Controllers\XCodeController.cs" />
-    <Compile Include="Areas\Admin\Controllers\SysController.cs" />
-    <Compile Include="Areas\Admin\Controllers\UserController.cs" />
-    <Compile Include="Areas\Admin\Index\IndexController.cs" />
-    <Compile Include="Areas\Admin\Models\FileItem.cs" />
-    <Compile Include="Areas\Admin\Models\DbItem.cs" />
-    <Compile Include="Areas\Admin\Views\Db\Index.generated.cs">
-      <DependentUpon>Index.cshtml</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Areas\Admin\Views\File\Index.generated.cs">
-      <DependentUpon>Index.cshtml</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Areas\Admin\Views\Index\Index.generated.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Index.cshtml</DependentUpon>
-    </Compile>
-    <Compile Include="Areas\Admin\Views\Index\Assembly.generated.cs">
-      <DependentUpon>Assembly.cshtml</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Areas\Admin\Views\Index\Session.generated.cs">
-      <DependentUpon>Session.cshtml</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Areas\Admin\Views\Index\Cache.generated.cs">
-      <DependentUpon>Cache.cshtml</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Areas\Admin\Views\Index\ServerVar.generated.cs">
-      <DependentUpon>ServerVar.cshtml</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Areas\Admin\Views\Index\ProcessModules.generated.cs">
-      <DependentUpon>ProcessModules.cshtml</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Areas\Admin\Views\Index\Main.generated.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Main.cshtml</DependentUpon>
-    </Compile>
-    <Compile Include="Areas\Admin\Views\Index\_Left_Item.generated.cs">
-      <DependentUpon>_Left_Item.cshtml</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Areas\Admin\Views\Index\_Left.generated.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>_Left.cshtml</DependentUpon>
-    </Compile>
-    <Compile Include="Areas\Admin\Views\Index\_Navbar.generated.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>_Navbar.cshtml</DependentUpon>
-    </Compile>
-    <Compile Include="Areas\Admin\Views\Log\_List_Data.generated.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>_List_Data.cshtml</DependentUpon>
-    </Compile>
-    <Compile Include="Areas\Admin\Views\Log\_List_Search.generated.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>_List_Search.cshtml</DependentUpon>
-    </Compile>
-    <Compile Include="Areas\Admin\Views\Menu\_ListTree_Data.generated.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>_ListTree_Data.cshtml</DependentUpon>
-    </Compile>
-    <Compile Include="Areas\Admin\Views\Role\_Form_Group.generated.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>_Form_Group.cshtml</DependentUpon>
-    </Compile>
-    <Compile Include="Areas\Admin\Views\Role\SetPermission.generated.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>SetPermission.cshtml</DependentUpon>
-    </Compile>
-    <Compile Include="Areas\Admin\Views\Role\_List_Data.generated.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>_List_Data.cshtml</DependentUpon>
-    </Compile>
-    <Compile Include="Areas\Admin\Views\Shared\_Object_Nav.generated.cs">
-      <DependentUpon>_Object_Nav.cshtml</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Areas\Admin\Views\UserOnline\_List_Data.generated.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>_List_Data.cshtml</DependentUpon>
-    </Compile>
-    <Compile Include="Areas\Admin\Views\UserToken\_List_Data.generated.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>_List_Data.cshtml</DependentUpon>
-    </Compile>
-    <Compile Include="Areas\Admin\Views\User\Login.generated.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Login.cshtml</DependentUpon>
-    </Compile>
-    <Compile Include="Areas\Admin\Views\User\Info.generated.cs">
-      <DependentUpon>Info.cshtml</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Areas\Admin\Views\User\_Form_Action.generated.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>_Form_Action.cshtml</DependentUpon>
-    </Compile>
-    <Compile Include="Areas\Admin\Views\User\_List_Data.generated.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>_List_Data.cshtml</DependentUpon>
-    </Compile>
-    <Compile Include="Areas\Admin\Views\User\_List_Search.generated.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>_List_Search.cshtml</DependentUpon>
-    </Compile>
-    <Compile Include="Areas\Admin\Views\User\_List_Toolbar_Batch.generated.cs">
-      <DependentUpon>_List_Toolbar_Batch.cshtml</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Areas\Admin\Views\User\_Login_Forgot.generated.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>_Login_Forgot.cshtml</DependentUpon>
-    </Compile>
-    <Compile Include="Areas\Admin\Views\User\_Login_Login3.generated.cs">
-      <DependentUpon>_Login_Login3.cshtml</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Areas\Admin\Views\User\_Login_Login.generated.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>_Login_Login.cshtml</DependentUpon>
-    </Compile>
-    <Compile Include="Areas\Admin\Views\User\_Login_Register.generated.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>_Login_Register.cshtml</DependentUpon>
-    </Compile>
-    <Compile Include="Areas\Admin\Views\VisitStat\_List_Data.generated.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>_List_Data.cshtml</DependentUpon>
-    </Compile>
-    <Compile Include="Areas\Admin\Views\VisitStat\_List_Search.generated.cs">
-      <DependentUpon>_List_Search.cshtml</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Areas\Admin\Views\_ViewStart.generated.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>_ViewStart.cshtml</DependentUpon>
-    </Compile>
-    <Compile Include="Common\BootstrapJs.cs" />
-    <Compile Include="Common\ControllerHelper.cs" />
-    <Compile Include="Common\EntityTreeController.cs" />
-    <Compile Include="Common\CubeModule.cs" />
-    <Compile Include="Common\NoPermissionException.cs" />
-    <Compile Include="Common\ObjectController.cs" />
-    <Compile Include="Common\ControllerBaseX.cs" />
-    <Compile Include="Common\DbRunTimeModule.cs" />
-    <Compile Include="Common\FieldCollection.cs" />
-    <Compile Include="Common\HtmlExtensions.cs" />
-    <Compile Include="Common\RazorViewEngineX.cs" />
-    <Compile Include="App_Start\RouteConfig.cs" />
-    <Compile Include="Common\AreaRegistrationBase.cs" />
-    <Compile Include="Common\EntityModelBinder.cs" />
-    <Compile Include="Common\MembershipExtensions.cs" />
-    <Compile Include="Common\EntityController.cs" />
-    <Compile Include="Common\ConfigController.cs" />
-    <Compile Include="Common\ViewHelper.cs" />
-    <Compile Include="Common\EntityAuthorizeAttribute.cs" />
-    <Compile Include="Common\MvcHandleErrorAttribute.cs" />
-    <Compile Include="Common\WeuiJS.cs" />
-    <Compile Include="Controllers\HomeController.cs" />
-    <Compile Include="Controllers\SsoController.cs" />
-    <Compile Include="Entity\用户令牌.Biz.cs" />
-    <Compile Include="Entity\用户令牌.cs" />
-    <Compile Include="Entity\用户链接.Biz.cs" />
-    <Compile Include="Entity\用户链接.cs" />
-    <Compile Include="Global.asax.cs">
-      <DependentUpon>Global.asax</DependentUpon>
-    </Compile>
-    <Compile Include="PreApplicationStartCode.cs" />
-    <Compile Include="Precompiled\AssemblyExtensions.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Precompiled\FrontendController.cs" />
-    <Compile Include="Precompiled\ViewCacheDependencyManager.cs" />
-    <Compile Include="Precompiled\ViewCacheDependency.cs" />
-    <Compile Include="Precompiled\ViewFile.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Precompiled\CompositePrecompiledMvcEngine.cs" />
-    <Compile Include="Precompiled\PrecompiledMvcEngine.cs" />
-    <Compile Include="Precompiled\PrecompiledMvcView.cs" />
-    <Compile Include="Precompiled\PrecompiledViewAssembly.cs" />
-    <Compile Include="Precompiled\PrecompiledViewLocationCache.cs" />
-    <Compile Include="Setting.cs" />
-    <Compile Include="Views\CubeHome\Index.generated.cs">
-      <DependentUpon>Index.cshtml</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Views\Home\Index.generated.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Index.cshtml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Shared\_Form_Body.generated.cs">
-      <DependentUpon>_Form_Body.cshtml</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Views\Shared\_Form_Group.generated.cs">
-      <DependentUpon>_Form_Group.cshtml</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Include="Views\Shared\_Object_Nav.generated.cs">
-      <DependentUpon>_Object_Nav.cshtml</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Views\Shared\_StatLevel.generated.cs">
-      <DependentUpon>_StatLevel.cshtml</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Views\Shared\_DateRange.generated.cs">
-      <DependentUpon>_DateRange.cshtml</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Views\Shared\ListTree.generated.cs">
-      <DependentUpon>ListTree.cshtml</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Views\Shared\NoPermission.generated.cs">
-      <DependentUpon>NoPermission.cshtml</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Views\Shared\CubeError.generated.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>CubeError.cshtml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Shared\Form.generated.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Form.cshtml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Shared\List.generated.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>List.cshtml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Shared\ObjectForm.generated.cs">
-      <DependentUpon>ObjectForm.cshtml</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Views\Shared\_Ace_Layout.generated.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>_Ace_Layout.cshtml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Shared\_Form_Action.generated.cs">
-      <DependentUpon>_Form_Action.cshtml</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Views\Shared\_Form_Footer.generated.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>_Form_Footer.cshtml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Shared\_Form_Header.generated.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>_Form_Header.cshtml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Shared\_Form_Item.generated.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>_Form_Item.cshtml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Shared\_Ace_Layout_Nav.generated.cs">
-      <DependentUpon>_Ace_Layout_Nav.cshtml</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Views\Shared\_Layout.generated.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>_Layout.cshtml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Shared\_Layout_Footer.generated.cs">
-      <DependentUpon>_Layout_Footer.cshtml</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Views\Shared\_Layout_Header.generated.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>_Layout_Header.cshtml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Shared\_ListTree_Data.generated.cs">
-      <DependentUpon>_ListTree_Data.cshtml</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Views\Shared\_List_Data.generated.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>_List_Data.cshtml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Shared\_List_Data_Action.generated.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>_List_Data_Action.cshtml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Shared\_List_Data_Item_First.generated.cs">
-      <DependentUpon>_List_Data_Item_First.cshtml</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Views\Shared\_List_Data_Item.generated.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>_List_Data_Item.cshtml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Shared\_List_Pager.generated.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>_List_Pager.cshtml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Shared\_List_Pager1.generated.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>_List_Pager1.cshtml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Shared\_List_Toolbar.generated.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>_List_Toolbar.cshtml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Shared\_List_Search.generated.cs">
-      <DependentUpon>_List_Search.cshtml</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Views\Shared\_List_Toolbar_Batch.generated.cs">
-      <DependentUpon>_List_Toolbar_Batch.cshtml</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Views\Shared\_List_Toolbar_Search.generated.cs">
-      <DependentUpon>_List_Toolbar_Search.cshtml</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Views\Shared\_List_Toolbar_Adv.generated.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>_List_Toolbar_Adv.cshtml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\_ViewStart.generated.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>_ViewStart.cshtml</DependentUpon>
-    </Compile>
-    <Compile Include="Web\OAuthHelper.cs" />
-    <Compile Include="Web\SsoProvider.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Areas\Admin\Views\Db\Index.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>Index.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Areas\Admin\Views\Role\_List_Data.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_List_Data.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Areas\Admin\Views\Menu\_ListTree_Data.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_ListTree_Data.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Areas\Admin\Views\Shared\_Object_Nav.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_Object_Nav.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Areas\Admin\Views\UserOnline\_List_Data.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_List_Data.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Areas\Admin\Views\UserToken\_List_Data.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_List_Data.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Areas\Admin\Views\VisitStat\_List_Data.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_List_Data.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Areas\Admin\Views\VisitStat\_List_Search.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_List_Search.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Areas\Admin\Views\Index\ProcessModules.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>ProcessModules.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Areas\Admin\Views\Index\Assembly.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>Assembly.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Areas\Admin\Views\Index\Session.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>Session.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Areas\Admin\Views\Index\Cache.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>Cache.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Areas\Admin\Views\Index\ServerVar.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>ServerVar.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Areas\Admin\Views\User\_List_Toolbar_Batch.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_List_Toolbar_Batch.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Areas\Admin\Views\Log\_List_Data.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_List_Data.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Areas\Admin\Views\User\_Login_Login3.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_Login_Login3.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Areas\Admin\Views\User\_List_Data.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_List_Data.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Content\jweui\css\demos.css" />
-    <None Include="Content\jweui\css\jquery-weui.css" />
-    <None Include="Content\jweui\css\jquery-weui.min.css" />
-    <None Include="Content\jweui\images\icon_nav_actionSheet.png" />
-    <None Include="Content\jweui\images\icon_nav_article.png" />
-    <None Include="Content\jweui\images\icon_nav_button.png" />
-    <None Include="Content\jweui\images\icon_nav_calendar.png" />
-    <None Include="Content\jweui\images\icon_nav_cell.png" />
-    <None Include="Content\jweui\images\icon_nav_city.png" />
-    <None Include="Content\jweui\images\icon_nav_datetime.png" />
-    <None Include="Content\jweui\images\icon_nav_dialog.png" />
-    <None Include="Content\jweui\images\icon_nav_icons.png" />
-    <None Include="Content\jweui\images\icon_nav_msg.png" />
-    <None Include="Content\jweui\images\icon_nav_new.png" />
-    <None Include="Content\jweui\images\icon_nav_noti.png" />
-    <None Include="Content\jweui\images\icon_nav_panel.png" />
-    <None Include="Content\jweui\images\icon_nav_photo.png" />
-    <None Include="Content\jweui\images\icon_nav_picker.png" />
-    <None Include="Content\jweui\images\icon_nav_progress.png" />
-    <None Include="Content\jweui\images\icon_nav_ptr.png" />
-    <None Include="Content\jweui\images\icon_nav_search_bar.png" />
-    <None Include="Content\jweui\images\icon_nav_select.png" />
-    <None Include="Content\jweui\images\icon_nav_swiper.png" />
-    <None Include="Content\jweui\images\icon_nav_tab.png" />
-    <None Include="Content\jweui\images\icon_nav_toast.png" />
-    <None Include="Content\jweui\images\icon_nav_up.png" />
-    <None Include="Content\jweui\images\pic_160.png" />
-    <None Include="Content\jweui\images\pic_article.png" />
-    <None Include="Content\jweui\images\present.png" />
-    <None Include="Content\jweui\images\swiper-1.jpg" />
-    <None Include="Content\jweui\images\swiper-2.jpg" />
-    <None Include="Content\jweui\images\swiper-3.jpg" />
-    <None Include="Content\jweui\images\swiper-4.jpg" />
-    <None Include="Content\jweui\images\vcode.jpg" />
-    <None Include="Content\jweui\js\city-picker.js" />
-    <None Include="Content\jweui\js\city-picker.min.js" />
-    <None Include="Content\jweui\js\jquery-weui.js" />
-    <None Include="Content\jweui\js\jquery-weui.min.js" />
-    <None Include="Content\jweui\js\swiper.js" />
-    <None Include="Content\jweui\js\swiper.min.js" />
-    <None Include="Content\jweui\lib\fastclick.js" />
-    <None Include="Content\jweui\lib\jquery-2.1.4.js" />
-    <None Include="Content\jweui\lib\weui.css" />
-    <None Include="Content\jweui\lib\weui.min.css" />
-    <None Include="Content\jweui\lib\zepto.js" />
-    <Content Include="Content\images\logo\alipay.png" />
-    <Content Include="Content\images\logo\Baidu.png" />
-    <Content Include="Content\images\logo\github.png" />
-    <Content Include="Content\images\logo\qq.png" />
-    <Content Include="Content\images\logo\Taobao.png" />
-    <Content Include="Content\images\logo\Weibo.png" />
-    <Content Include="Content\images\logo\Weixin.png" />
-    <Content Include="Entity\XCoder.log">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>XCoder.tt</DependentUpon>
-    </Content>
-    <None Include="index.html" />
-    <None Include="Content\bootstrap\js\bootstrap.js" />
-    <None Include="Entity\Cube.xml">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="Entity\XCoder.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>XCoder.log</LastGenOutput>
-    </None>
-    <None Include="Scripts\ApiClient.js" />
-    <None Include="Scripts\WebSocketX.js" />
-    <None Include="Areas\Admin\Views\File\Index.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>Index.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Areas\Admin\Views\User\_Form_Action.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_Form_Action.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Content\ace\css\ace-fonts.min.css" />
-    <None Include="Content\ace\css\ace-ie.min.css" />
-    <None Include="Content\ace\css\ace-part2.min.css" />
-    <None Include="Content\ace\css\ace-skins.min.css" />
-    <None Include="Content\ace\css\ace.min.css" />
-    <None Include="Content\ace\css\images\meteorshower2.jpg" />
-    <None Include="Content\ace\css\images\pattern.jpg" />
-    <None Include="Content\ace\js\ace-elements.min.js" />
-    <None Include="Content\ace\js\ace-extra.min.js" />
-    <None Include="Content\ace\js\ace.min.js" />
-    <None Include="Content\ace\js\additional-methods.min.js" />
-    <None Include="Content\ace\js\bootbox.min.js" />
-    <None Include="Content\ace\js\chosen.jquery.min.js" />
-    <None Include="Content\ace\js\dropzone.min.js" />
-    <None Include="Content\ace\js\excanvas.min.js" />
-    <None Include="Content\ace\js\fullcalendar.min.js" />
-    <None Include="Content\ace\js\pace.min.js" />
-    <None Include="Content\ace\js\prettify.min.js" />
-    <None Include="Content\ace\js\select2.min.js" />
-    <None Include="Content\ace\js\spin.min.js" />
-    <None Include="Content\ace\js\typeahead.jquery.min.js" />
-    <None Include="Content\artDialog\css\ui-dialog.css" />
-    <None Include="Content\artDialog\dist\dialog-min.js" />
-    <None Include="Content\artDialog\dist\dialog-plus-min.js" />
-    <None Include="Content\bootstrap-switch\bootstrap-switch.min.css" />
-    <None Include="Content\bootstrap-switch\bootstrap-switch.min.js" />
-    <None Include="Content\bootstrap\css\bootstrap-multiselect.css" />
-    <None Include="Content\bootstrap\css\bootstrap-responsive.min.css" />
-    <None Include="Content\bootstrap\css\font-awesome.min.css" />
-    <None Include="Content\bootstrap\fonts\fontawesome-webfont.svg" />
-    <None Include="Content\bootstrap\js\bootstrap-colorpicker.min.js" />
-    <None Include="Content\bootstrap\js\bootstrap-multiselect.min.js" />
-    <None Include="Content\bootstrap\js\bootstrap-tag.min.js" />
-    <None Include="Content\bootstrap\js\bootstrap-wysiwyg.min.js" />
-    <None Include="Content\DateTimePicker\bootstrap-datetimepicker.css" />
-    <None Include="Content\DateTimePicker\bootstrap-datetimepicker.js" />
-    <None Include="Content\DateTimePicker\bootstrap-datetimepicker.min.css" />
-    <None Include="Content\DateTimePicker\bootstrap-datetimepicker.min.js" />
-    <None Include="Content\DateTimePicker\locales\bootstrap-datetimepicker.es.js" />
-    <None Include="Content\DateTimePicker\locales\bootstrap-datetimepicker.zh-CN.js" />
-    <None Include="Content\DateTimePicker\locales\bootstrap-datetimepicker.zh-TW.js" />
-    <None Include="Content\bootstrap\css\bootstrap-theme.min.css" />
-    <None Include="Content\bootstrap\css\bootstrap.min.css" />
-    <None Include="Content\bootstrap\fonts\glyphicons-halflings-regular.svg" />
-    <None Include="Content\bootstrap\js\bootstrap.min.js" />
-    <None Include="Content\Cube.js" />
-    <None Include="Content\js\html5shiv.min.js" />
-    <None Include="Content\js\jquery-2.1.3.min.js" />
-    <None Include="Content\js\jquery-ui.custom.min.js" />
-    <None Include="Content\js\jquery-ui.min.js" />
-    <None Include="Content\js\jquery.autosize.min.js" />
-    <None Include="Content\js\jquery.bootstrap-duallistbox.min.js" />
-    <None Include="Content\js\jquery.colorbox.min.js" />
-    <None Include="Content\js\jquery.easypiechart.min.js" />
-    <None Include="Content\js\jquery.gritter.min.js" />
-    <None Include="Content\js\jquery.hotkeys.min.js" />
-    <None Include="Content\js\jquery.inputlimiter.1.3.1.min.js" />
-    <None Include="Content\js\jquery.knob.min.js" />
-    <None Include="Content\js\jquery.maskedinput.min.js" />
-    <None Include="Content\js\jquery.min.js" />
-    <None Include="Content\js\jquery.mobile.custom.min.js" />
-    <None Include="Content\js\jquery.mousewheel.min.js" />
-    <None Include="Content\js\jquery.nestable.min.js" />
-    <None Include="Content\js\jquery.raty.min.js" />
-    <None Include="Content\js\jquery.slimscroll.min.js" />
-    <None Include="Content\js\jquery.sparkline.min.js" />
-    <None Include="Content\js\jquery.ui.touch-punch.min.js" />
-    <None Include="Content\js\jquery.validate.min.js" />
-    <None Include="Content\js\jquery1x.min.js" />
-    <None Include="Content\js\respond.min.js" />
-    <EmbeddedResource Include="favicon.ico" />
-    <None Include="Areas\Admin\Views\Log\_List_Search.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_List_Search.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Areas\Admin\Views\Index\_Left_Item.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_Left_Item.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Areas\Admin\Views\User\Login.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>Login.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Areas\Admin\Views\User\Info.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>Info.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Areas\Admin\Views\User\_List_Search.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_List_Search.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Content\bootstrap\fonts\glyphicons-halflings-regular.eot" />
-    <None Include="Content\bootstrap\fonts\glyphicons-halflings-regular.ttf" />
-    <None Include="Content\bootstrap\fonts\glyphicons-halflings-regular.woff" />
-    <None Include="Content\bootstrap\fonts\glyphicons-halflings-regular.woff2" />
-    <None Include="Content\bootstrap\fonts\fontawesome-webfont.eot" />
-    <None Include="Content\bootstrap\fonts\fontawesome-webfont.ttf" />
-    <None Include="Content\bootstrap\fonts\fontawesome-webfont.woff" />
-    <None Include="Content\bootstrap\fonts\FontAwesome.otf" />
-    <None Include="Content\ace\fonts\OpenSans-300.woff" />
-    <None Include="Content\ace\fonts\OpenSans-400.woff" />
-    <None Include="Areas\Admin\Views\Role\_Form_Group.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_Form_Group.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Areas\Admin\Views\Role\SetPermission.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>SetPermission.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Areas\Admin\Views\User\_Login_Login.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_Login_Login.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Areas\Admin\Views\User\_Login_Forgot.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_Login_Forgot.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Areas\Admin\Views\User\_Login_Register.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_Login_Register.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Content\artDialog\dist\dialog.new.life.js" />
-    <None Include="Global.asax" />
-    <None Include="Areas\Admin\Views\_ViewStart.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_ViewStart.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Views\Home\Index.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>Index.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Views\CubeHome\Index.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>Index.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Views\Shared\_Form_Group.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_Form_Group.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Views\Shared\_Object_Nav.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_Object_Nav.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Views\Shared\_Form_Body.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_Form_Body.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Views\Shared\_StatLevel.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_StatLevel.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Views\Shared\_DateRange.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_DateRange.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Views\Shared\ListTree.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>ListTree.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Views\Shared\NoPermission.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>NoPermission.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Views\Shared\ObjectForm.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>ObjectForm.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Views\Shared\_Ace_Layout.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_Ace_Layout.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Areas\Admin\Views\Index\Index.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>Index.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Areas\Admin\Views\Index\_Left.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_Left.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Areas\Admin\Views\Index\_Navbar.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_Navbar.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Areas\Admin\Views\Index\Main.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>Main.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Views\Shared\Form.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>Form.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Views\Shared\List.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>List.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Properties\PublishProfiles\Cube.pubxml" />
-    <None Include="Scripts\jquery-1.8.2.intellisense.js" />
-    <None Include="Scripts\jquery.unobtrusive-ajax.js" />
-    <None Include="Scripts\jquery.unobtrusive-ajax.min.js" />
-    <None Include="Scripts\jquery.validate.unobtrusive.js" />
-    <None Include="Scripts\jquery.validate.unobtrusive.min.js" />
-    <None Include="Scripts\modernizr-2.6.2.js" />
-    <Content Include="Web.config">
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Include="Web.Debug.config">
-      <DependentUpon>Web.config</DependentUpon>
-    </Content>
-    <Content Include="Web.Release.config">
-      <DependentUpon>Web.config</DependentUpon>
-    </Content>
-    <None Include="Content\Cube.css" />
-    <None Include="Scripts\_references.js" />
-    <None Include="Views\Shared\_Form_Action.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_Form_Action.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Views\Shared\_Form_Footer.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_Form_Footer.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Views\Shared\_Form_Header.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_Form_Header.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Views\Shared\_Layout.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_Layout.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Views\Shared\_Ace_Layout_Nav.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_Ace_Layout_Nav.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Views\Shared\_Layout_Footer.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_Layout_Footer.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Views\Shared\_Layout_Header.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_Layout_Header.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Views\Shared\_ListTree_Data.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_ListTree_Data.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Views\Shared\_List_Data_Item_First.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_List_Data_Item_First.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Views\Shared\_List_Search.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_List_Search.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Views\Shared\_List_Toolbar_Batch.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_List_Toolbar_Batch.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Views\Shared\_List_Toolbar_Search.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_List_Toolbar_Search.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Views\Shared\_List_Toolbar_Adv.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_List_Toolbar_Adv.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Views\_ViewStart.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_ViewStart.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Views\Shared\CubeError.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>CubeError.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Views\Shared\_List_Pager.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_List_Pager.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Views\Shared\_List_Data.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_List_Data.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Views\Shared\_List_Data_Item.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_List_Data_Item.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Views\Shared\_List_Data_Action.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_List_Data_Action.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Views\Shared\_Form_Item.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_Form_Item.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Views\Shared\_List_Toolbar.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_List_Toolbar.generated.cs</LastGenOutput>
-    </None>
-    <None Include="Views\Shared\_List_Pager1.cshtml">
-      <Generator>RazorGenerator</Generator>
-      <LastGenOutput>_List_Pager1.generated.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
-  </ItemGroup>
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v12.0</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="'$(Solutions.VSVersion)' == '8.0'" />
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.targets" Condition="'$(Solutions.VSVersion)' == '9.0'" />
-  <Target Name="MvcBuildViews" AfterTargets="AfterBuild" Condition="'$(MvcBuildViews)'=='true'">
-    <AspNetCompiler VirtualPath="temp" PhysicalPath="$(WebProjectOutputDir)" />
-  </Target>
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <SaveServerSettingsInUserFile>True</SaveServerSettingsInUserFile>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
-  <PropertyGroup>
-  </PropertyGroup>
-  <PropertyGroup>
-    <PostBuildEvent>
-      md "$(ProjectDir)..\..\Bin"
-      copy "$(TargetDir)$(TargetName)".* "$(ProjectDir)..\..\Bin\" /y
-      del "$(ProjectDir)..\..\Bin\NewLife.Cube.dll.config" /q
-</PostBuildEvent>
-  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target> -->
-</Project>
\ No newline at end of file
diff --git a/NewLife.Cube/PreApplicationStartCode.cs b/NewLife.Cube/PreApplicationStartCode.cs
deleted file mode 100644
index d35f2969fd..0000000000
--- a/NewLife.Cube/PreApplicationStartCode.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-﻿using System;
-using System.Web;
-using NewLife.Web;
-using XCode.Web;
-
-namespace NewLife.Cube
-{
-    /// <summary>应用启动代码</summary>
-    public static class PreApplicationStartCode
-    {
-        private static Boolean _startWasCalled;
-
-        /// <summary>Registers pre-application start code for web pages.</summary>
-        public static void Start()
-        {
-            if (_startWasCalled) return;
-            _startWasCalled = true;
-
-#if !NET4
-            HttpApplication.RegisterModule(typeof(ErrorModule));
-            HttpApplication.RegisterModule(typeof(DbRunTimeModule));
-
-            var set = Setting.Current;
-            if (set.WebOnline || set.WebBehavior || set.WebStatistics)
-            {
-                UserBehaviorModule.WebOnline = set.WebOnline;
-                UserBehaviorModule.WebBehavior = set.WebBehavior;
-                UserBehaviorModule.WebStatistics = set.WebStatistics;
-                HttpApplication.RegisterModule(typeof(UserBehaviorModule));
-            }
-
-            if (set.ForceSSL) HttpApplication.RegisterModule(typeof(CubeModule));
-#endif
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Precompiled/AssemblyExtensions.cs b/NewLife.Cube/Precompiled/AssemblyExtensions.cs
deleted file mode 100644
index fc73ead66c..0000000000
--- a/NewLife.Cube/Precompiled/AssemblyExtensions.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-﻿using System;
-using System.IO;
-using System.Reflection;
-using System.Security;
-
-namespace NewLife.Cube.Precompiled
-{
-    /// <summary>程序集的扩展方法</summary>
-	internal static class AssemblyExtensions
-	{
-		public static DateTime GetLastWriteTimeUtc(this Assembly assembly, DateTime fallback)
-		{
-			String text = null;
-			try
-			{
-				text = assembly.Location;
-			}
-			catch (SecurityException)
-			{
-				Uri uri;
-				if (!String.IsNullOrEmpty(assembly.CodeBase) && Uri.TryCreate(assembly.CodeBase, UriKind.Absolute, out uri) && uri.IsFile)
-				{
-					text = uri.LocalPath;
-				}
-			}
-			DateTime result;
-			if (String.IsNullOrEmpty(text))
-			{
-				result = fallback;
-			}
-			else
-			{
-				DateTime dateTime;
-				try
-				{
-					dateTime = File.GetLastWriteTimeUtc(text);
-					if (dateTime.Year == 1601)
-					{
-						dateTime = fallback;
-					}
-				}
-				catch (UnauthorizedAccessException)
-				{
-					dateTime = fallback;
-				}
-				catch (PathTooLongException)
-				{
-					dateTime = fallback;
-				}
-				catch (NotSupportedException)
-				{
-					dateTime = fallback;
-				}
-				result = dateTime;
-			}
-			return result;
-		}
-	}
-}
diff --git a/NewLife.Cube/Precompiled/CompositePrecompiledMvcEngine.cs b/NewLife.Cube/Precompiled/CompositePrecompiledMvcEngine.cs
deleted file mode 100644
index 470c833184..0000000000
--- a/NewLife.Cube/Precompiled/CompositePrecompiledMvcEngine.cs
+++ /dev/null
@@ -1,161 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Web.Compilation;
-using System.Web.Mvc;
-using System.Web.WebPages;
-
-namespace NewLife.Cube.Precompiled
-{
-    /// <summary>复合预编译Mvc引擎</summary>
-    public class CompositePrecompiledMvcEngine : BuildManagerViewEngine, IVirtualPathFactory
-    {
-        private struct ViewMapping
-        {
-            public Type Type { get; set; }
-
-            public PrecompiledViewAssembly ViewAssembly { get; set; }
-        }
-        private readonly IDictionary<String, ViewMapping> _mappings = new Dictionary<String, ViewMapping>(StringComparer.OrdinalIgnoreCase);
-        //private readonly IViewPageActivator _viewPageActivator;
-
-        /// <summary>复合预编译Mvc引擎</summary>
-        /// <param name="viewAssemblies"></param>
-        public CompositePrecompiledMvcEngine(params PrecompiledViewAssembly[] viewAssemblies) : this(viewAssemblies, null) { }
-
-        /// <summary>复合预编译Mvc引擎</summary>
-        /// <param name="viewAssemblies"></param>
-        /// <param name="viewPageActivator"></param>
-        public CompositePrecompiledMvcEngine(IEnumerable<PrecompiledViewAssembly> viewAssemblies, IViewPageActivator viewPageActivator)
-            : base(viewPageActivator)
-        {
-            AreaViewLocationFormats = new String[]
-			{
-				"~/Areas/{2}/Views/{1}/{0}.cshtml",
-				"~/Areas/{2}/Views/Shared/{0}.cshtml"
-			};
-            AreaMasterLocationFormats = new String[]
-			{
-				"~/Areas/{2}/Views/{1}/{0}.cshtml",
-				"~/Areas/{2}/Views/Shared/{0}.cshtml"
-			};
-            AreaPartialViewLocationFormats = new String[]
-			{
-				"~/Areas/{2}/Views/{1}/{0}.cshtml",
-				"~/Areas/{2}/Views/Shared/{0}.cshtml"
-			};
-            ViewLocationFormats = new String[]
-			{
-				"~/Views/{1}/{0}.cshtml",
-				"~/Views/Shared/{0}.cshtml"
-			};
-            MasterLocationFormats = new String[]
-			{
-				"~/Views/{1}/{0}.cshtml",
-				"~/Views/Shared/{0}.cshtml"
-			};
-            PartialViewLocationFormats = new String[]
-			{
-				"~/Views/{1}/{0}.cshtml",
-				"~/Views/Shared/{0}.cshtml"
-			};
-            FileExtensions = new String[]
-			{
-				"cshtml"
-			};
-            foreach (var asm in viewAssemblies)
-            {
-                foreach (var type in asm.GetTypeMappings())
-                {
-                    _mappings[type.Key] = new ViewMapping
-                    {
-                        Type = type.Value,
-                        ViewAssembly = asm
-                    };
-                }
-            }
-            //_viewPageActivator = (viewPageActivator ?? (DependencyResolver.Current.GetService<IViewPageActivator>() ?? DefaultViewPageActivator.Current));
-        }
-
-        /// <summary>文件是否存在。如果存在，则由当前引擎创建视图</summary>
-        /// <param name="controllerContext"></param>
-        /// <param name="virtualPath"></param>
-        /// <returns></returns>
-        protected override Boolean FileExists(ControllerContext controllerContext, String virtualPath)
-        {
-            ViewMapping viewMapping;
-            // 如果映射表不存在，就不要掺合啦
-            if (!_mappings.TryGetValue(virtualPath, out viewMapping)) return false;
-
-            //if (!Exists(virtualPath)) return false;
-
-            var asm = viewMapping.ViewAssembly;
-            // 两个条件任意一个满足即可使用物理文件
-            // 如果不要求取代物理文件，并且虚拟文件存在，则使用物理文件创建
-            if (!asm.PreemptPhysicalFiles && VirtualPathProvider.FileExists(virtualPath)) return false;
-
-            // 如果使用较新的物理文件，且物理文件的确较新，则使用物理文件创建
-            if (asm.UsePhysicalViewsIfNewer && asm.IsPhysicalFileNewer(virtualPath)) return false;
-
-            return true;
-        }
-
-        /// <summary>创建分部视图</summary>
-        /// <param name="controllerContext"></param>
-        /// <param name="partialPath"></param>
-        /// <returns></returns>
-        protected override IView CreatePartialView(ControllerContext controllerContext, String partialPath)
-        {
-            return CreateViewInternal(partialPath, null, false);
-        }
-
-        /// <summary>创建视图</summary>
-        /// <param name="controllerContext"></param>
-        /// <param name="viewPath"></param>
-        /// <param name="masterPath"></param>
-        /// <returns></returns>
-        protected override IView CreateView(ControllerContext controllerContext, String viewPath, String masterPath)
-        {
-            return CreateViewInternal(viewPath, masterPath, true);
-        }
-
-        private IView CreateViewInternal(String viewPath, String masterPath, Boolean runViewStartPages)
-        {
-            ViewMapping viewMapping;
-            if (!_mappings.TryGetValue(viewPath, out viewMapping)) return null;
-
-            return new PrecompiledMvcView(viewPath, masterPath, viewMapping.Type, runViewStartPages, FileExtensions, ViewPageActivator);
-        }
-
-        /// <summary>创建实例。Start和Layout会调用这里</summary>
-        /// <param name="virtualPath"></param>
-        /// <returns></returns>
-        public Object CreateInstance(String virtualPath)
-        {
-            ViewMapping viewMapping;
-
-            // 如果没有该映射，则直接返回空
-            if (!_mappings.TryGetValue(virtualPath, out viewMapping)) return null;
-
-            var asm = viewMapping.ViewAssembly;
-            // 两个条件任意一个满足即可使用物理文件
-            // 如果不要求取代物理文件，并且虚拟文件存在，则使用物理文件创建
-            if (!asm.PreemptPhysicalFiles && VirtualPathProvider.FileExists(virtualPath))
-                return BuildManager.CreateInstanceFromVirtualPath(virtualPath, typeof(WebPageRenderingBase));
-
-            // 如果使用较新的物理文件，且物理文件的确较新，则使用物理文件创建
-            if (asm.UsePhysicalViewsIfNewer && asm.IsPhysicalFileNewer(virtualPath))
-                return BuildManager.CreateInstanceFromVirtualPath(virtualPath, typeof(WebViewPage));
-
-            // 最后使用内嵌类创建
-            return ViewPageActivator.Create(null, viewMapping.Type);
-        }
-
-        /// <summary>是否存在</summary>
-        /// <param name="virtualPath"></param>
-        /// <returns></returns>
-        public Boolean Exists(String virtualPath)
-        {
-            return _mappings.ContainsKey(virtualPath);
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Precompiled/DefaultViewPageActivator.cs b/NewLife.Cube/Precompiled/DefaultViewPageActivator.cs
deleted file mode 100644
index 0f915c38c2..0000000000
--- a/NewLife.Cube/Precompiled/DefaultViewPageActivator.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-﻿using System;
-using System.Web.Mvc;
-
-namespace NewLife.Cube.Precompiled
-{
-    /// <summary>视图页注册器</summary>
-    internal class DefaultViewPageActivator : IViewPageActivator
-    {
-        private static class Nested
-        {
-            internal static readonly DefaultViewPageActivator Instance;
-            static Nested()
-            {
-                Instance = new DefaultViewPageActivator();
-            }
-        }
-
-        private readonly Func<IDependencyResolver> _resolverThunk;
-
-        /// <summary>当前注册器</summary>
-        public static DefaultViewPageActivator Current { get { return Nested.Instance; } }
-
-        public DefaultViewPageActivator() : this(null) { }
-
-        public DefaultViewPageActivator(IDependencyResolver resolver)
-        {
-            if (resolver == null)
-            {
-                _resolverThunk = (() => DependencyResolver.Current);
-            }
-            else
-            {
-                _resolverThunk = (() => resolver);
-            }
-        }
-
-        /// <summary>创建视图实例</summary>
-        /// <param name="controllerContext"></param>
-        /// <param name="type"></param>
-        /// <returns></returns>
-        public Object Create(ControllerContext controllerContext, Type type)
-        {
-            return _resolverThunk().GetService(type) ?? Activator.CreateInstance(type);
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Precompiled/FrontendController.cs b/NewLife.Cube/Precompiled/FrontendController.cs
deleted file mode 100644
index e9c48c3b7c..0000000000
--- a/NewLife.Cube/Precompiled/FrontendController.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Web;
-using System.Web.Hosting;
-using System.Web.Mvc;
-
-namespace NewLife.Cube.Precompiled
-{
-    /// <summary>前端控制器</summary>
-    public class FrontendController : Controller
-    {
-        /// <summary>默认</summary>
-        /// <returns></returns>
-        public ActionResult Default()
-        {
-            var actionName = (RouteData.Values["viewName"] ?? "Default").ToString();
-            return View(actionName);
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Precompiled/Pages.cs b/NewLife.Cube/Precompiled/Pages.cs
deleted file mode 100644
index cd5e9966ae..0000000000
--- a/NewLife.Cube/Precompiled/Pages.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-﻿using System;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Web;
-
-namespace NewLife.Cube.Precompiled
-{
-    /// <summary>页面助手类</summary>
-    public static class Pages
-    {
-        /// <summary>路径是否存在</summary>
-        /// <param name="virtualPath"></param>
-        /// <returns></returns>
-        public static Boolean IsExistByVirtualPath(String virtualPath)
-        {
-            if (virtualPath.StartsWith("~/")) virtualPath = virtualPath.Substring(1);
-
-            var assembly = Assembly.LoadFrom(HttpContext.Current.Server.MapPath("~/bin") + "\\Falafel.Resources.dll");
-            virtualPath = "Falafel.Resources" + virtualPath.Replace('/', '.');
-
-            var result = String.Empty;
-            if (virtualPath.EndsWith("/"))
-                result = assembly.GetManifestResourceNames().First();
-            else
-                result = assembly.GetManifestResourceNames().FirstOrDefault(i => i.ToLower() == virtualPath.ToLower());
-
-            return !result.IsNullOrEmpty();
-        }
-
-        /// <summary>根据路径获取页面模版</summary>
-        /// <param name="virtualPath"></param>
-        /// <returns></returns>
-        public static String GetByVirtualPath(String virtualPath)
-        {
-            if (virtualPath.StartsWith("~/")) virtualPath = virtualPath.Substring(1);
-
-            var assembly = Assembly.LoadFrom(HttpContext.Current.Server.MapPath("~/bin") + "\\Falafel.Resources.dll");
-            virtualPath = "Falafel.Resources" + virtualPath.Replace('/', '.');
-            virtualPath = assembly.GetManifestResourceNames().FirstOrDefault(i => i.ToLower() == virtualPath.ToLower());
-
-            using (var stream = assembly.GetManifestResourceStream(virtualPath))
-            {
-                using (var reader = new StreamReader(stream))
-                {
-                    return reader.ReadToEnd();
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Precompiled/PrecompiledMvcEngine.cs b/NewLife.Cube/Precompiled/PrecompiledMvcEngine.cs
deleted file mode 100644
index 7d08916f81..0000000000
--- a/NewLife.Cube/Precompiled/PrecompiledMvcEngine.cs
+++ /dev/null
@@ -1,233 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Web;
-using System.Web.Compilation;
-using System.Web.Hosting;
-using System.Web.Mvc;
-using System.Web.WebPages;
-using NewLife.Reflection;
-
-namespace NewLife.Cube.Precompiled
-{
-    /// <summary>预编译Mvc引擎</summary>
-    public class PrecompiledMvcEngine : BuildManagerViewEngine, IVirtualPathFactory
-    {
-        private readonly IDictionary<String, Type> _mappings;
-        private readonly String _baseVirtualPath;
-        private readonly Lazy<DateTime> _assemblyLastWriteTime;
-        //private readonly IViewPageActivator _viewPageActivator;
-
-        /// <summary>取代物理文件，优先内嵌类</summary>
-        public Boolean PreemptPhysicalFiles { get; set; }
-
-        /// <summary>使用更新的物理文件</summary>
-        public Boolean UsePhysicalViewsIfNewer { get; set; }
-
-        /// <summary>实例化预编译Mvc引擎</summary>
-        /// <param name="assembly"></param>
-        public PrecompiledMvcEngine(Assembly assembly) : this(assembly, null) { }
-
-        /// <summary>实例化预编译Mvc引擎</summary>
-        /// <param name="assembly"></param>
-        /// <param name="baseVirtualPath"></param>
-        public PrecompiledMvcEngine(Assembly assembly, String baseVirtualPath) : this(assembly, baseVirtualPath, null) { }
-
-        /// <summary>实例化预编译Mvc引擎</summary>
-        /// <param name="assembly"></param>
-        /// <param name="baseVirtualPath"></param>
-        /// <param name="viewPageActivator"></param>
-        public PrecompiledMvcEngine(Assembly assembly, String baseVirtualPath, IViewPageActivator viewPageActivator)
-            : base(viewPageActivator)
-        {
-            // 为了实现物理文件“重载覆盖”的效果，强制使用物理文件
-            PreemptPhysicalFiles = false;
-            UsePhysicalViewsIfNewer = false;
-
-            _assemblyLastWriteTime = new Lazy<DateTime>(() => assembly.GetLastWriteTimeUtc(DateTime.MaxValue));
-            _baseVirtualPath = NormalizeBaseVirtualPath(baseVirtualPath);
-            AreaViewLocationFormats = new String[]
-            {
-                "~/Areas/{2}/Views/{1}/{0}.cshtml",
-                "~/Areas/{2}/Views/Shared/{0}.cshtml"
-            };
-            AreaMasterLocationFormats = new String[]
-            {
-                "~/Areas/{2}/Views/{1}/{0}.cshtml",
-                "~/Areas/{2}/Views/Shared/{0}.cshtml"
-            };
-            AreaPartialViewLocationFormats = new String[]
-            {
-                "~/Areas/{2}/Views/{1}/{0}.cshtml",
-                "~/Areas/{2}/Views/Shared/{0}.cshtml"
-            };
-            ViewLocationFormats = new String[]
-            {
-                "~/Views/{1}/{0}.cshtml",
-                "~/Views/Shared/{0}.cshtml"
-            };
-            MasterLocationFormats = new String[]
-            {
-                "~/Views/{1}/{0}.cshtml",
-                "~/Views/Shared/{0}.cshtml"
-            };
-            PartialViewLocationFormats = new String[]
-            {
-                "~/Views/{1}/{0}.cshtml",
-                "~/Views/Shared/{0}.cshtml"
-            };
-            FileExtensions = new String[]
-            {
-                "cshtml"
-            };
-            _mappings = GetTypeMappings(assembly, _baseVirtualPath);
-            ViewLocationCache = new PrecompiledViewLocationCache(assembly.FullName, ViewLocationCache);
-            //_viewPageActivator = (viewPageActivator ?? (DependencyResolver.Current.GetService<IViewPageActivator>() ?? DefaultViewPageActivator.Current));
-        }
-
-        /// <summary>文件是否存在。如果存在，则由当前引擎创建视图</summary>
-        /// <param name="controllerContext"></param>
-        /// <param name="virtualPath"></param>
-        /// <returns></returns>
-        protected override Boolean FileExists(ControllerContext controllerContext, String virtualPath)
-        {
-            virtualPath = EnsureVirtualPathPrefix(virtualPath);
-
-            // 如果映射表不存在，就不要掺合啦
-            if (!Exists(virtualPath)) return false;
-
-            // 两个条件任意一个满足即可使用物理文件
-            // 如果不要求取代物理文件，并且虚拟文件存在，则使用物理文件创建
-            if (!PreemptPhysicalFiles && VirtualPathProvider.FileExists(virtualPath)) return false;
-
-            // 如果使用较新的物理文件，且物理文件的确较新，则使用物理文件创建
-            if (UsePhysicalViewsIfNewer && IsPhysicalFileNewer(virtualPath)) return false;
-
-            return true;
-        }
-
-        /// <summary>创建分部视图</summary>
-        /// <param name="controllerContext"></param>
-        /// <param name="partialPath"></param>
-        /// <returns></returns>
-        protected override IView CreatePartialView(ControllerContext controllerContext, String partialPath)
-        {
-            partialPath = EnsureVirtualPathPrefix(partialPath);
-            return CreateViewInternal(partialPath, null, false);
-        }
-
-        /// <summary>创建视图</summary>
-        /// <param name="controllerContext"></param>
-        /// <param name="viewPath"></param>
-        /// <param name="masterPath"></param>
-        /// <returns></returns>
-        protected override IView CreateView(ControllerContext controllerContext, String viewPath, String masterPath)
-        {
-            viewPath = EnsureVirtualPathPrefix(viewPath);
-            return CreateViewInternal(viewPath, masterPath, true);
-        }
-
-        private IView CreateViewInternal(String viewPath, String masterPath, Boolean runViewStartPages)
-        {
-            Type type;
-            if (!_mappings.TryGetValue(viewPath, out type)) return null;
-
-            return new PrecompiledMvcView(viewPath, masterPath, type, runViewStartPages, FileExtensions, ViewPageActivator);
-        }
-
-        /// <summary>创建实例。Start和Layout会调用这里</summary>
-        /// <param name="virtualPath"></param>
-        /// <returns></returns>
-        public Object CreateInstance(String virtualPath)
-        {
-            virtualPath = EnsureVirtualPathPrefix(virtualPath);
-
-            // 两个条件任意一个满足即可使用物理文件
-            // 如果不要求取代物理文件，并且虚拟文件存在，则使用物理文件创建
-            if (!PreemptPhysicalFiles && VirtualPathProvider.FileExists(virtualPath))
-                return BuildManager.CreateInstanceFromVirtualPath(virtualPath, typeof(WebPageRenderingBase));
-
-            // 如果使用较新的物理文件，且物理文件的确较新，则使用物理文件创建
-            if (UsePhysicalViewsIfNewer && IsPhysicalFileNewer(virtualPath))
-                return BuildManager.CreateInstanceFromVirtualPath(virtualPath, typeof(WebViewPage));
-
-            // 最后使用内嵌类创建
-            Type type;
-            if (_mappings.TryGetValue(virtualPath, out type))
-                return ViewPageActivator.Create(null, type);
-
-            return null;
-        }
-
-        /// <summary>是否存在</summary>
-        /// <param name="virtualPath"></param>
-        /// <returns></returns>
-        public Boolean Exists(String virtualPath)
-        {
-            virtualPath = EnsureVirtualPathPrefix(virtualPath);
-            return _mappings.ContainsKey(virtualPath);
-        }
-
-        private Boolean IsPhysicalFileNewer(String virtualPath)
-        {
-            return IsPhysicalFileNewer(virtualPath, _baseVirtualPath, _assemblyLastWriteTime);
-        }
-
-        /// <summary>是否物理文件更新</summary>
-        /// <param name="virtualPath"></param>
-        /// <param name="baseVirtualPath"></param>
-        /// <param name="assemblyLastWriteTime"></param>
-        /// <returns></returns>
-        internal static Boolean IsPhysicalFileNewer(String virtualPath, String baseVirtualPath, Lazy<DateTime> assemblyLastWriteTime)
-        {
-            if (!virtualPath.StartsWithIgnoreCase(baseVirtualPath + "")) return false;
-
-            if (!String.IsNullOrEmpty(baseVirtualPath)) virtualPath = "~/" + virtualPath.Substring(baseVirtualPath.Length);
-
-            var path = HostingEnvironment.MapPath(virtualPath);
-            return File.Exists(path) && File.GetLastWriteTimeUtc(path) > assemblyLastWriteTime.Value;
-        }
-
-        private static String EnsureVirtualPathPrefix(String virtualPath)
-        {
-            if (!String.IsNullOrEmpty(virtualPath))
-            {
-                if (!virtualPath.StartsWith("~/", StringComparison.Ordinal))
-                    virtualPath = "~/" + virtualPath.TrimStart('/', '~');
-            }
-            return virtualPath;
-        }
-
-        internal static String NormalizeBaseVirtualPath(String virtualPath)
-        {
-            if (!String.IsNullOrEmpty(virtualPath))
-                virtualPath = EnsureVirtualPathPrefix(virtualPath).EnsureEnd("/");
-
-            return virtualPath;
-        }
-
-        private static String CombineVirtualPaths(String baseVirtualPath, String virtualPath)
-        {
-            if (!String.IsNullOrEmpty(baseVirtualPath))
-                return VirtualPathUtility.Combine(baseVirtualPath, virtualPath.Substring(2));
-            else
-                return virtualPath;
-        }
-
-        /// <summary>遍历获取所有类型映射</summary>
-        /// <param name="asm"></param>
-        /// <param name="baseVirtualPath"></param>
-        /// <returns></returns>
-        public static IDictionary<String, Type> GetTypeMappings(Assembly asm, String baseVirtualPath)
-        {
-            return (
-                from type in asm.GetTypes()
-                where type.As<WebPageRenderingBase>()
-                let pageVirtualPath = type.GetCustomAttributes(false).OfType<PageVirtualPathAttribute>().FirstOrDefault()
-                where pageVirtualPath != null
-                select new KeyValuePair<String, Type>(CombineVirtualPaths(baseVirtualPath, pageVirtualPath.VirtualPath), type)).ToDictionary(t => t.Key, t => t.Value, StringComparer.OrdinalIgnoreCase);
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Precompiled/PrecompiledMvcView.cs b/NewLife.Cube/Precompiled/PrecompiledMvcView.cs
deleted file mode 100644
index 74bef6f929..0000000000
--- a/NewLife.Cube/Precompiled/PrecompiledMvcView.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
-using System.Web.Mvc;
-using System.Web.WebPages;
-
-namespace NewLife.Cube.Precompiled
-{
-    /// <summary>预编译视图</summary>
-    public class PrecompiledMvcView : IView
-    {
-        private static Lazy<Action<WebViewPage, String>> _overriddenLayoutSetter = new Lazy<Action<WebViewPage, String>>(() => CreateOverriddenLayoutSetterDelegate());
-        private readonly Type _type;
-        private readonly String _virtualPath;
-        private readonly String _masterPath;
-        private readonly IViewPageActivator _viewPageActivator;
-
-        /// <summary>是否运行视图开始页ViewStart</summary>
-        public Boolean RunViewStartPages { get; private set; }
-
-        /// <summary>视图开始页扩展</summary>
-        public IEnumerable<String> ViewStartFileExtensions { get; private set; }
-
-        /// <summary>虚拟路径</summary>
-        public String VirtualPath { get { return _virtualPath; } }
-
-        ///// <summary>实例化预编译视图</summary>
-        ///// <param name="virtualPath"></param>
-        ///// <param name="type"></param>
-        ///// <param name="runViewStartPages"></param>
-        ///// <param name="fileExtension"></param>
-        //public PrecompiledMvcView(String virtualPath, Type type, Boolean runViewStartPages, IEnumerable<String> fileExtension) : this(virtualPath, null, type, runViewStartPages, fileExtension) { }
-
-        ///// <summary>实例化预编译视图</summary>
-        ///// <param name="virtualPath"></param>
-        ///// <param name="masterPath"></param>
-        ///// <param name="type"></param>
-        ///// <param name="runViewStartPages"></param>
-        ///// <param name="fileExtension"></param>
-        //public PrecompiledMvcView(String virtualPath, String masterPath, Type type, Boolean runViewStartPages, IEnumerable<String> fileExtension) : this(virtualPath, masterPath, type, runViewStartPages, fileExtension, null) { }
-
-        /// <summary>实例化预编译视图</summary>
-        /// <param name="virtualPath"></param>
-        /// <param name="masterPath"></param>
-        /// <param name="type"></param>
-        /// <param name="runViewStartPages"></param>
-        /// <param name="fileExtension"></param>
-        /// <param name="viewPageActivator"></param>
-        public PrecompiledMvcView(String virtualPath, String masterPath, Type type, Boolean runViewStartPages, IEnumerable<String> fileExtension, IViewPageActivator viewPageActivator)
-        {
-            _type = type;
-            _virtualPath = virtualPath;
-            _masterPath = masterPath;
-            RunViewStartPages = runViewStartPages;
-            ViewStartFileExtensions = fileExtension;
-            //_viewPageActivator = (viewPageActivator ?? (DependencyResolver.Current.GetService<IViewPageActivator>() ?? DefaultViewPageActivator.Current));
-            _viewPageActivator = viewPageActivator;
-        }
-
-        /// <summary>生成视图内容</summary>
-        /// <param name="viewContext"></param>
-        /// <param name="writer"></param>
-        public void Render(ViewContext viewContext, TextWriter writer)
-        {
-            var webViewPage = _viewPageActivator.Create(viewContext.Controller.ControllerContext, _type) as WebViewPage;
-            if (webViewPage == null) throw new InvalidOperationException("无效视图类型");
-
-            if (!String.IsNullOrEmpty(_masterPath))
-            {
-                _overriddenLayoutSetter.Value(webViewPage, _masterPath);
-            }
-            webViewPage.VirtualPath = _virtualPath;
-            webViewPage.ViewContext = viewContext;
-            webViewPage.ViewData = viewContext.ViewData;
-            webViewPage.InitHelpers();
-
-            WebPageRenderingBase startPage = null;
-            if (RunViewStartPages) startPage = StartPage.GetStartPage(webViewPage, "_ViewStart", ViewStartFileExtensions);
-
-            var pageContext = new WebPageContext(viewContext.HttpContext, webViewPage, null);
-            webViewPage.ExecutePageHierarchy(pageContext, writer, startPage);
-        }
-
-        private static Action<WebViewPage, String> CreateOverriddenLayoutSetterDelegate()
-        {
-            var property = typeof(WebViewPage).GetProperty("OverridenLayoutPath", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
-            if (property == null)
-                throw new NotSupportedException("The WebViewPage internal property \"OverridenLayoutPath\" does not exist, probably due to an unsupported run-time version.");
-
-            var setMethod = property.GetSetMethod(true);
-            if (setMethod == null)
-                throw new NotSupportedException("The WebViewPage internal property \"OverridenLayoutPath\" exists but is missing a set method, probably due to an unsupported run-time version.");
-
-            return (Action<WebViewPage, String>)Delegate.CreateDelegate(typeof(Action<WebViewPage, String>), setMethod, true);
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Precompiled/PrecompiledViewAssembly.cs b/NewLife.Cube/Precompiled/PrecompiledViewAssembly.cs
deleted file mode 100644
index ba76dc8109..0000000000
--- a/NewLife.Cube/Precompiled/PrecompiledViewAssembly.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Reflection;
-
-namespace NewLife.Cube.Precompiled
-{
-    /// <summary>预编译视图程序集</summary>
-    public class PrecompiledViewAssembly
-    {
-        private readonly String _baseVirtualPath;
-        private readonly Assembly _assembly;
-        private readonly Lazy<DateTime> _assemblyLastWriteTime;
-
-        /// <summary>取代物理文件，优先内嵌类</summary>
-        public Boolean PreemptPhysicalFiles { get; set; }
-
-        /// <summary>仅在物理文件较新时使用物理文件</summary>
-        public Boolean UsePhysicalViewsIfNewer { get; set; }
-
-        /// <summary>实例化预编译视图程序集</summary>
-        /// <param name="assembly"></param>
-        public PrecompiledViewAssembly(Assembly assembly) : this(assembly, null) { }
-
-        /// <summary>实例化预编译视图程序集</summary>
-        /// <param name="assembly"></param>
-        /// <param name="baseVirtualPath"></param>
-        public PrecompiledViewAssembly(Assembly assembly, String baseVirtualPath)
-        {
-            if (assembly == null) throw new ArgumentNullException("assembly");
-
-            // 为了实现物理文件“重载覆盖”的效果，强制使用物理文件
-            PreemptPhysicalFiles = false;
-            UsePhysicalViewsIfNewer = false;
-
-            _baseVirtualPath = PrecompiledMvcEngine.NormalizeBaseVirtualPath(baseVirtualPath);
-            _assembly = assembly;
-            _assemblyLastWriteTime = new Lazy<DateTime>(() => _assembly.GetLastWriteTimeUtc(DateTime.MaxValue));
-        }
-
-        /// <summary>为指定类型所在程序集创建实例</summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="baseVirtualPath"></param>
-        /// <param name="usePhysicalViewsIfNewer"></param>
-        /// <param name="preemptPhysicalFiles"></param>
-        /// <returns></returns>
-        public static PrecompiledViewAssembly OfType<T>(String baseVirtualPath, Boolean usePhysicalViewsIfNewer = false, Boolean preemptPhysicalFiles = false)
-        {
-            return new PrecompiledViewAssembly(typeof(T).Assembly, baseVirtualPath)
-            {
-                UsePhysicalViewsIfNewer = usePhysicalViewsIfNewer,
-                PreemptPhysicalFiles = preemptPhysicalFiles
-            };
-        }
-
-        /// <summary>为指定类型所在程序集创建实例</summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="usePhysicalViewsIfNewer"></param>
-        /// <param name="preemptPhysicalFiles"></param>
-        /// <returns></returns>
-        public static PrecompiledViewAssembly OfType<T>(Boolean usePhysicalViewsIfNewer = false, Boolean preemptPhysicalFiles = false)
-        {
-            return new PrecompiledViewAssembly(typeof(T).Assembly)
-            {
-                UsePhysicalViewsIfNewer = usePhysicalViewsIfNewer,
-                PreemptPhysicalFiles = preemptPhysicalFiles
-            };
-        }
-
-        /// <summary>遍历获取所有类型映射</summary>
-        /// <returns></returns>
-        public IDictionary<String, Type> GetTypeMappings()
-        {
-            return PrecompiledMvcEngine.GetTypeMappings(_assembly, _baseVirtualPath);
-        }
-
-        /// <summary>物理文件是否更新</summary>
-        /// <param name="virtualPath"></param>
-        /// <returns></returns>
-        public Boolean IsPhysicalFileNewer(String virtualPath)
-        {
-            return PrecompiledMvcEngine.IsPhysicalFileNewer(virtualPath, _baseVirtualPath, _assemblyLastWriteTime);
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Precompiled/PrecompiledViewLocationCache.cs b/NewLife.Cube/Precompiled/PrecompiledViewLocationCache.cs
deleted file mode 100644
index 97b2e2ffcf..0000000000
--- a/NewLife.Cube/Precompiled/PrecompiledViewLocationCache.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-﻿using System;
-using System.Web;
-using System.Web.Mvc;
-
-namespace NewLife.Cube.Precompiled
-{
-    /// <summary>预编译视图程序集缓存</summary>
-	public class PrecompiledViewLocationCache : IViewLocationCache
-	{
-		private readonly String _assemblyName;
-		private readonly IViewLocationCache _innerCache;
-
-        /// <summary>实例化</summary>
-        /// <param name="assemblyName"></param>
-        /// <param name="innerCache"></param>
-		public PrecompiledViewLocationCache(String assemblyName, IViewLocationCache innerCache)
-		{
-			_assemblyName = assemblyName;
-			_innerCache = innerCache;
-		}
-
-        /// <summary>获取视图位置</summary>
-        /// <param name="httpContext"></param>
-        /// <param name="key"></param>
-        /// <returns></returns>
-		public String GetViewLocation(HttpContextBase httpContext, String key)
-		{
-			key = _assemblyName + "::" + key;
-			return _innerCache.GetViewLocation(httpContext, key);
-		}
-
-        /// <summary>插入视图位置</summary>
-        /// <param name="httpContext"></param>
-        /// <param name="key"></param>
-        /// <param name="virtualPath"></param>
-		public void InsertViewLocation(HttpContextBase httpContext, String key, String virtualPath)
-		{
-			key = _assemblyName + "::" + key;
-			_innerCache.InsertViewLocation(httpContext, key, virtualPath);
-		}
-	}
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Precompiled/ViewCacheDependency.cs b/NewLife.Cube/Precompiled/ViewCacheDependency.cs
deleted file mode 100644
index d5a1b84535..0000000000
--- a/NewLife.Cube/Precompiled/ViewCacheDependency.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.Caching;
-
-namespace NewLife.Cube.Precompiled
-{
-    /// <summary>视图缓存依赖</summary>
-    public class ViewCacheDependency : CacheDependency
-    {
-        /// <summary>实例化缓存依赖</summary>
-        /// <param name="virtualPath"></param>
-        public ViewCacheDependency(String virtualPath)
-        {
-            base.SetUtcLastModified(DateTime.UtcNow);
-        }
-
-        /// <summary>验证</summary>
-        public void Invalidate()
-        {
-            base.NotifyDependencyChanged(this, EventArgs.Empty);
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Precompiled/ViewCacheDependencyManager.cs b/NewLife.Cube/Precompiled/ViewCacheDependencyManager.cs
deleted file mode 100644
index 803b955078..0000000000
--- a/NewLife.Cube/Precompiled/ViewCacheDependencyManager.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.Caching;
-
-namespace NewLife.Cube.Precompiled
-{
-    /// <summary>视图缓存依赖管理</summary>
-    public class ViewCacheDependencyManager
-    {
-        private static Dictionary<String, ViewCacheDependency> dependencies = new Dictionary<String, ViewCacheDependency>();
-        private static volatile ViewCacheDependencyManager instance;
-        private static Object syncRoot = new Object();
-        private ViewCacheDependencyManager() { }
-
-        /// <summary>实例</summary>
-        public static ViewCacheDependencyManager Instance
-        {
-            get
-            {
-                if (instance == null)
-                {
-                    lock (syncRoot)
-                    {
-                        if (instance == null)
-                        {
-                            instance = new ViewCacheDependencyManager();
-                        }
-                    }
-                }
-                return instance;
-            }
-        }
-
-        /// <summary>获取缓存依赖</summary>
-        /// <param name="virtualPath"></param>
-        /// <returns></returns>
-        public CacheDependency Get(String virtualPath)
-        {
-            if (!dependencies.ContainsKey(virtualPath))
-                dependencies.Add(virtualPath, new ViewCacheDependency(virtualPath));
-
-            return dependencies[virtualPath];
-        }
-
-        /// <summary>验证</summary>
-        /// <param name="virtualPath"></param>
-        public void Invalidate(String virtualPath)
-        {
-            if (dependencies.ContainsKey(virtualPath))
-            {
-                var dependency = dependencies[virtualPath];
-                dependency.Invalidate();
-                dependency.Dispose();
-                dependencies.Remove(virtualPath);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Precompiled/ViewFile.cs b/NewLife.Cube/Precompiled/ViewFile.cs
deleted file mode 100644
index 650bc11bd3..0000000000
--- a/NewLife.Cube/Precompiled/ViewFile.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Web;
-using System.Web.Hosting;
-
-namespace NewLife.Cube.Precompiled
-{
-    /// <summary>视图文件</summary>
-    public class ViewFile : VirtualFile
-    {
-        private String path;
-
-        /// <summary>实例化视图文件</summary>
-        /// <param name="virtualPath"></param>
-        public ViewFile(String virtualPath)
-            : base(virtualPath)
-        {
-            path = virtualPath;
-        }
-
-        /// <summary>打开视图文件</summary>
-        /// <returns></returns>
-        public override Stream Open()
-        {
-            if (string.IsNullOrEmpty(path))
-                return new MemoryStream();
-
-            //string content = Falafel.Providers.Pages.GetByVirtualPath(path);
-            //if (string.IsNullOrEmpty(content))
-            return new MemoryStream();
-
-            //return new MemoryStream(ASCIIEncoding.UTF8.GetBytes(content));
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Precompiled/ViewPathProvider.cs b/NewLife.Cube/Precompiled/ViewPathProvider.cs
deleted file mode 100644
index d67fd6cbc6..0000000000
--- a/NewLife.Cube/Precompiled/ViewPathProvider.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.Caching;
-using System.Web.Hosting;
-
-namespace NewLife.Cube.Precompiled
-{
-    /// <summary>视图路径提供者</summary>
-    public class ViewPathProvider : VirtualPathProvider
-    {
-        /// <summary>文件是否存在</summary>
-        /// <param name="virtualPath"></param>
-        /// <returns></returns>
-        public override Boolean FileExists(String virtualPath)
-        {
-            return Pages.IsExistByVirtualPath(virtualPath) || base.FileExists(virtualPath);
-        }
-
-        /// <summary>获取视图文件</summary>
-        /// <param name="virtualPath"></param>
-        /// <returns></returns>
-        public override VirtualFile GetFile(String virtualPath)
-        {
-            if (Pages.IsExistByVirtualPath(virtualPath))
-            {
-                return new ViewFile(virtualPath);
-            }
-            return base.GetFile(virtualPath);
-        }
-
-        /// <summary>获取缓存依赖</summary>
-        /// <param name="virtualPath"></param>
-        /// <param name="virtualPathDependencies"></param>
-        /// <param name="utcStart"></param>
-        /// <returns></returns>
-        public override CacheDependency GetCacheDependency(String virtualPath, System.Collections.IEnumerable virtualPathDependencies, DateTime utcStart)
-        {
-            if (Pages.IsExistByVirtualPath(virtualPath))
-                return ViewCacheDependencyManager.Instance.Get(virtualPath);
-
-            return Previous.GetCacheDependency(virtualPath, virtualPathDependencies, utcStart);
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Properties/AssemblyInfo.cs b/NewLife.Cube/Properties/AssemblyInfo.cs
deleted file mode 100644
index 2e17907bdd..0000000000
--- a/NewLife.Cube/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-﻿using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Web;
-using NewLife.Cube;
-
-// 有关程序集的常规信息通过下列特性集
-// 控制。更改这些特性值可修改
-// 与程序集关联的信息。
-[assembly: AssemblyTitle("魔方平台")]
-[assembly: AssemblyDescription("Mvc权限管理后台，支持模版视图重载覆盖")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyProduct("NewLife.Cube")]
-[assembly: AssemblyCompany("新生命开发团队")]
-[assembly: AssemblyCopyright("©2002-2018 新生命开发团队 http://git.newlifex.com/NewLife/X/Tree/master/NewLife.Cube")]
-[assembly: AssemblyTrademark("四叶草")]
-[assembly: AssemblyCulture("")]
-
-// 将 ComVisible 设置为 false 会使此程序集中的类型
-// 对 COM 组件不可见。如果需要从 COM 访问此程序集中的某个类型，
-// 请针对该类型将 ComVisible 特性设置为 true。
-[assembly: ComVisible(false)]
-
-// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
-[assembly: Guid("f3362f22-bdbe-4345-9436-4ed577113c3c")]
-
-[assembly: RuntimeCompatibility(WrapNonExceptionThrows = true)]
-[assembly: PreApplicationStartMethod(typeof(PreApplicationStartCode), "Start")]
-
-// 程序集的版本信息由下列四个值组成:
-//
-//      主版本
-//      次版本
-//      内部版本号
-//      修订号
-//
-// 可以指定所有这些值，也可以使用“修订号”和“内部版本号”的默认值，
-// 方法是按如下所示使用“*”:
-[assembly: AssemblyVersion("2.3.*")]
-[assembly: AssemblyFileVersion("2.3.2018.0403")]
-
-/*
- * v2.3.2018.0403   支持数据权限，控制器重载ValidPermission
- * 
- * v2.2.2018.0326   重构权限体系，支持多角色
- * 
- * v2.1.2018.0211   集成OAuth客户端服务端，支持QQ、百度、GitHub等
- * 
- * v2.0.2017.1126   借助Ajax支持高级操作，如：删除选中、批量启用禁用等
- * 
- * v1.3.2016.1206   增加文件管理，增强数据字段映射
- * 
- * v1.2.2016.0325   自动检查并下载魔方资源
- * 
- * v1.1.2016.0301   魔方与XCode相互配合，趋于完善，完成了CMX和其它多个项目
- * 
- * v1.0.2015.0511   完善权限体系，支持控制器自定义菜单和权限子项
- * 
- * v1.0.2015.0403   建立魔方
- */
diff --git a/NewLife.Cube/Properties/PublishProfiles/Cube.pubxml b/NewLife.Cube/Properties/PublishProfiles/Cube.pubxml
deleted file mode 100644
index b689ed5cee..0000000000
--- a/NewLife.Cube/Properties/PublishProfiles/Cube.pubxml
+++ /dev/null
@@ -1,24 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<!--
-您 Web 项目的发布/打包进程将使用此文件。您可以通过编辑此 MSBuild 文件
-来自定义该进程的行为。若要了解与此相关的详细信息，请访问 http://go.microsoft.com/fwlink/?LinkID=208121。
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <WebPublishMethod>FileSystem</WebPublishMethod>
-    <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
-    <LastUsedPlatform>Any CPU</LastUsedPlatform>
-    <SiteUrlToLaunchAfterPublish />
-    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
-    <ExcludeApp_Data>True</ExcludeApp_Data>
-    <publishUrl>..\..\NewLife.Cube</publishUrl>
-    <DeleteExistingFiles>True</DeleteExistingFiles>
-    <PrecompileBeforePublish>True</PrecompileBeforePublish>
-    <EnableUpdateable>False</EnableUpdateable>
-    <DebugSymbols>False</DebugSymbols>
-    <WDPMergeOption>MergeAllOutputsToASingleAssembly</WDPMergeOption>
-    <UseMerge>True</UseMerge>
-    <SingleAssemblyName>Cube</SingleAssemblyName>
-    <DeleteAppCodeCompiledFiles>True</DeleteAppCodeCompiledFiles>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/NewLife.Cube/README.md b/NewLife.Cube/README.md
deleted file mode 100644
index fdd67f804f..0000000000
--- a/NewLife.Cube/README.md
+++ /dev/null
@@ -1,43 +0,0 @@
-﻿## 魔方 NewLife.Cube
-魔方 是一个基于 ASP.NET MVC 的 用户权限管理平台，可作为各种信息管理系统的基础框架。
-
-演示：[http://cube.newlifex.com](http://cube.newlifex.com) [源码](https://git.newlifex.com/Stone/CubeDemo)  
-
-源码： https://git.newlifex.com/NewLife/X/Tree/master/NewLife.Cube  
-海外： https://github.com/NewLifeX/X/tree/master/NewLife.Cube  
-
----
-### 特性
-* 通用权限管理，用户、角色、菜单、权限，支持控制器Action权限控制
-* 多数据库，支持 `SQLite / Sql Server / Oracle / MySql / SqlCe / Access` 
-* 免部署，系统自动创建数据库表结构，以及初始化数据，无需人工干涉
-* 强大的视图引擎，支持子项目视图重写父项目相同位置视图，任意覆盖修改默认界面
-
----
-### 系统要求
-* [IIS 7.0](http://www.iis.net/learn)
-* [.NET Framework 4.5](http://www.microsoft.com/en-us/download/details.aspx?id=30653)
-* [ASP.NET MVC 5](http://www.asp.net/mvc/tutorials/mvc-5)
-* [SQLite](http://system.data.sqlite.org/index.html/doc/trunk/www/downloads.wiki) / Sql Server / Oracle / MySql / SqlCe / Access
-
----
-### 安装
-* 在 *Visual Studio* 中新建MVC5项目
-* 通过 *NuGet* 引用`NewLife.Cube`，或自己编译最新的[X组件](https://git.newlifex.com/NewLife/X)源码
-* 在`Web.config`的`<connectionStrings>`段设置名为`Membership`的连接字符串，用户角色权限菜单等存储在该数据库
-* 系统自动识别数据库类型，默认`\<add name="Membership" connectionString="Data Source=~\App_Data\Membership.db" providerName="Sqlite"/>`
-* 编译项目，项目上点击鼠标右键，`查看`，`在浏览器中查看`，运行魔方平台
-* 系统为`SQLite`/`Oracle`/`MySql`/`SqlCe`数据库自动下载匹配（`x86/x64`）的数据库驱动文件，驱动下载地址可在`Config\Core.config`中修改`PluginServer`
-* 系统自动下载脚本样式表等资源文件，下载地址可在`Config/Cube.config`中修改`PluginServer`
-* 默认登录用户名是`admin`，密码是`admin`
-* 推荐安装 *Visual Studio* 插件 *Razor Generator*，给`.cshtml`文件设置`自定义工具``RazorGenerator`，可以把`.cshtml`编译生成到`DLL`里面
-* 项目发布时只需要拷贝`Bin`、`web.config`、`Global.asax`，以及其它自己添加的资源文件
-
----
-### 教程
-[【演示】教务系统](http://cube.newlifex.com)  
-[【源码】教务系统](https://git.newlifex.com/Stone/CubeDemo)  
-
-[【教程】魔方平台NewLife.Cube基础教程（附例程源码）](http://www.newlifex.com/showtopic-1483.aspx)  
-[【教程】魔方平台NewLife.Cube模板结构详解](http://www.newlifex.com/showtopic-1491.aspx)  
-
diff --git a/NewLife.Cube/Scripts/ApiClient.js b/NewLife.Cube/Scripts/ApiClient.js
deleted file mode 100644
index 3628557108..0000000000
--- a/NewLife.Cube/Scripts/ApiClient.js
+++ /dev/null
@@ -1,191 +0,0 @@
-﻿/*
-使用流程：
-1，实例化
-2，设置用户名密码
-3，打开链接
-4，自动登录
-5，定时心跳
-6，调用业务动作
-*/
-
-var ApiClient = (function (uri) {
-    var ApiClient = function (uri) {
-        return new ApiClient.fn.init(uri);
-    }
-
-    ApiClient.fn = ApiClient.prototype = {
-        constructor: ApiClient,
-        init: function (uri) {
-            this.Uri = uri;
-            this.Socket = null;
-            this.OnReceive = null;
-        },
-
-        // 用户名密码
-        UserName: null,
-        PassWord: null,
-
-        // 打开连接
-        Open: function (callback) {
-            var self = this;
-
-            var ws = self.Socket;
-            // 如果已打开，直接返回
-            if (ws && ws.readyState === WebSocket.OPEN) return true;
-
-            console.log('Open ' + self.Uri);
-
-            // 建立连接完成后，设置其它参数
-            ws = new WebSocket(self.Uri);
-            ws.onopen = function (evt) {
-                console.log("已经建立连接");
-
-                ws.onclose = function (evt) {
-                    console.log("已经关闭连接");
-                };
-                ws.onmessage = function (evt) {
-                    self.onMessage(evt);
-                };
-                ws.onerror = function (evt) {
-                    console.log(evt.message);
-
-                    self.Socket = null;
-                };
-
-                self.Socket = ws;
-
-                if (callback) callback();
-
-                // 异步登录。注意this作用域
-                if (self.UserName) setTimeout(function () { self.Login(); }, 100);
-            };
-
-            return true;
-        },
-
-        // 关闭
-        Close: function () {
-            var self = this;
-
-            if (self._timer > 0) clearInterval(self._timer);
-
-            self.Socket = null;
-        },
-
-        // 获取Socket
-        getSocket: function () {
-            var ws = this.Socket;
-            if (ws && ws.readyState === WebSocket.OPEN) return ws;
-
-            //return this.Open() ? this.Socket : null;
-            return null;
-        },
-
-        // 注册动作到指定函数
-        requestCallbacks: {},
-        Register: function (action, callback) {
-            this.requestCallbacks[action] = callback;
-        },
-
-        // 处理请求和响应的委托
-        responseCallback: null,
-        // 收到数据
-        onMessage: function (evt) {
-            evt.stopPropagation()
-            evt.preventDefault()
-            console.log(evt.data);
-
-            // 响应
-            var msg = JSON.parse(evt.data);
-            if (msg) {
-                if (msg.action) {
-                    this.Process(msg);
-                } else if (msg.code) {
-                    if (this.responseCallback) this.responseCallback(msg);
-                }
-                return;
-            }
-            if (this.OnReceive) this.OnReceive(evt.data);
-        },
-
-        // 处理收到的请求
-        Process: function (msg) {
-            if (this.requestCallbacks) {
-                var callback = this.requestCallbacks[msg.action];
-                if (callback) {
-                    var code = 0;
-                    var result = null;
-                    try {
-                        result = callback(msg.args);
-                    } catch (e) {
-                        code = -1;
-                        result = e + '';
-                    }
-
-                    // 发出响应
-                    if (code != 0 || result != null) {
-                        var msg = { code: code, result: result };
-
-                        // 发出json字符串
-                        this.Send(JSON.stringify(msg));
-                    }
-                }
-            }
-        },
-
-        // 发送数据
-        Send: function (data) {
-            var self = this;
-
-            console.log('Send ' + data);
-
-            var ws = self.getSocket();
-            if (ws) return ws.send(data);
-
-            self.Open(function () {
-                var ws = self.getSocket();
-                if (ws) return ws.send(data);
-            });
-
-            return true;
-        },
-
-        // 调用动作，并在收到响应时调用回调函数
-        Invoke: function (action, args, callback) {
-            var msg = { action: action, args: args };
-
-            // 设定响应拦截委托
-            this.responseCallback = callback;
-
-            // 发出json字符串
-            this.Send(JSON.stringify(msg));
-        },
-
-        // 登录
-        _timer: 0,
-        Login: function (callback) {
-            var self = this;
-
-            // 构造调用参数
-            var args = { user: self.UserName, pass: self.PassWord };
-            //console.log('Login ' + args);
-
-            // 发送请求
-            self.Invoke('Login', args, function (msg) {
-                if (callback) callback(msg);
-
-                // 定时心跳
-                if (msg.Code == 0 && !self._timer) self._timer = setInterval(function () { self.Ping(); }, 30000);
-            });
-        },
-
-        // 心跳
-        Ping: function () {
-            this.Invoke('Ping');
-        },
-    }
-
-    ApiClient.fn.init.prototype = ApiClient.fn;
-
-    return ApiClient;
-})();
\ No newline at end of file
diff --git a/NewLife.Cube/Scripts/WebSocketX.js b/NewLife.Cube/Scripts/WebSocketX.js
deleted file mode 100644
index e616f1a708..0000000000
--- a/NewLife.Cube/Scripts/WebSocketX.js
+++ /dev/null
@@ -1,165 +0,0 @@
-﻿; (function (root, factory) {
-    var ws = factory(root);
-    if (typeof define === 'function' && define.amd) {
-        define([], factory);
-    } else if (typeof module !== 'undefined' && module.exports) {
-        module.exports = factory();
-    } else {
-        root.ws = factory();
-    }
-}(this, function (root, undefined) {
-
-    if (!('WebSocket' in window)) return;
-
-    var _handlers = {}, wsocket,
-        eventTarget = document.createElement('div'),
-        settings = {
-            //是否自动重连
-            automaticOpen: true,
-            //自动重连延迟重连速度速度
-            reconnectDecay: 1.5
-        },
-        func = function () { },
-        //对外泄露 API 😄
-        _api = {
-            CONNECTING: WebSocket.CONNECTING,
-            OPEN: WebSocket.OPEN,
-            CLOSING: WebSocket.CLOSING,
-            CLOSED: WebSocket.CLOSED
-        };
-
-    /**
-     * [ws]
-     * @param  参数 url 为建立连接的URL
-     * @param  参数 protocols 为服务器选择的子协定
-     * @param  参数 options 初始化定义参数   
-     */
-    function ws(url, protocols, options) {
-        var self = this;
-        //websocket url
-        this.url = url;
-        //websocket 状态
-        this.readyState = WebSocket.CONNECTING;
-
-        /**
-         * 服务器选择的子协定，这是建立 WebSocket 对象时 protocols 参数里的其中一个字符串。
-         */
-        this.protocol = protocols ? protocols : null;
-
-        // 绑定选项定义设置
-        if (!options) { options = {}; }
-        for (var key in settings) {
-            if (typeof options[key] !== 'undefined') this[key] = options[key];
-            else this[key] = settings[key];
-        }
-
-        // 公开 API
-        for (var a in _api) this[a] = _api[a];
-
-        //用事件处理程序
-        eventTarget.addEventListener('open', function (event) { self !== window && self.onopen(event); });
-        eventTarget.addEventListener('close', function (event) { self !== window && self.onclose(event); });
-        eventTarget.addEventListener('connecting', function (event) { self !== window && self.onconnecting(event); });
-        eventTarget.addEventListener('message', function (event) { self !== window && self.onmessage(event); });
-        eventTarget.addEventListener('error', function (event) { self !== window && self.onerror(event); });
-
-        // 公开事件目标的API
-        this.addEventListener = eventTarget.addEventListener.bind(eventTarget);
-        this.removeEventListener = eventTarget.removeEventListener.bind(eventTarget);
-        this.dispatchEvent = eventTarget.dispatchEvent.bind(eventTarget);
-
-
-        if (this.automaticOpen === true && this !== window) this.open();
-        return this;
-    }
-
-
-    /**
-     * [generateEvent 该函数产生一个事件，与标准兼容，兼容的浏览器和IE9 - IE11？]
-     * http://stackoverflow.com/questions/19345392/why-arent-my-parameters-getting-passed-through-to-a-dispatched-event/19345563#19345563
-     * https://msdn.microsoft.com/library/ff975299(v=vs.85).aspx
-     * @param eventName 位字符串类型的事件名字
-     * @param 参数的args对象的可选对象，该事件将使用
-     */
-    function generateEvent(eventName, args) {
-        var evt = document.createEvent("CustomEvent");
-        evt.initCustomEvent(eventName, false, false, args);
-        return evt;
-    }
-
-    ws.prototype.onconnecting = func;
-    ws.prototype.onerror = func;
-    ws.prototype.onopen = func;
-    ws.prototype.onmessage = func;
-
-    /**
-     * [send 发送 websocket 消息]
-     * @param 参数 data 为发消息的内容
-     */
-    ws.prototype.send = function (data) {
-        if (this.wsocket) this.wsocket.send(data);
-        else {
-            throw 'INVALID_STATE_ERR : Pausing to reconnect websocket';
-        }
-    };
-    ws.prototype.invoke=function(action, args, callback) {
-        var msg = { action: action, args: args };
-        if (this.wsocket) this.wsocket.send(JSON.stringify(msg));
-        else {
-            throw 'INVALID_STATE_ERR : Pausing to reconnect websocket';
-        }
-    }
-
-    /**
-     * [close 关闭 websocket 连接。]
-     * 如果已经关闭了连接，此方法不起作用。
-     * 
-     * 错误代码参考：https://developer.mozilla.org/en-US/docs/Web/API/CloseEvent
-     * @param 参数 code 为错误代码 1000为正常关闭
-     * @param 参数 reason 为错误理由
-     */
-    ws.prototype.close = function (code, reason) {
-        // 默认CLOSE_NORMAL代码
-        if (typeof code === 'undefined') code = 1000;
-        if (this.wsocket) this.wsocket.close(code, reason);
-    };
-
-
-    /**
-     * [open 打开建立 websocket 握手连接]
-     */
-    ws.prototype.open = function () {
-        var self = this;
-        wsocket = new WebSocket(this.url, this.protocol || []);
-        eventTarget.dispatchEvent(generateEvent('connecting'));
-        wsocket.onopen = function (event) {
-            self.protocol = ws.protocol;
-            self.readyState = WebSocket.OPEN;
-
-            var e = generateEvent('open');
-            eventTarget.dispatchEvent(e);
-        };
-        wsocket.onclose = function (event) {
-            self.readyState = WebSocket.CLOSED;
-            var e = generateEvent('connecting');
-            e.code = event.code;
-            e.reason = event.reason;
-            e.wasClean = event.wasClean;
-            eventTarget.dispatchEvent(e);
-
-            eventTarget.dispatchEvent(generateEvent('close'));
-        };
-        wsocket.onmessage = function (event) {
-            var e = generateEvent('message');
-            e.data = event.data;
-            eventTarget.dispatchEvent(e);
-        };
-        wsocket.onerror = function (event) {
-            var e = generateEvent('error');
-            eventTarget.dispatchEvent(e);
-        };
-        this.wsocket = wsocket;
-        return this;
-    };
-    return ws;
-}));
\ No newline at end of file
diff --git a/NewLife.Cube/Scripts/_references.js b/NewLife.Cube/Scripts/_references.js
deleted file mode 100644
index 7a99f3f875..0000000000
Binary files a/NewLife.Cube/Scripts/_references.js and /dev/null differ
diff --git a/NewLife.Cube/Scripts/jquery-1.8.2.intellisense.js b/NewLife.Cube/Scripts/jquery-1.8.2.intellisense.js
deleted file mode 100644
index 8713911932..0000000000
--- a/NewLife.Cube/Scripts/jquery-1.8.2.intellisense.js
+++ /dev/null
@@ -1,2508 +0,0 @@
-/* NUGET: BEGIN LICENSE TEXT
- *
- * Microsoft grants you the right to use these script files for the sole
- * purpose of either: (i) interacting through your browser with the Microsoft
- * website or online service, subject to the applicable licensing or use
- * terms; or (ii) using the files as included with a Microsoft product subject
- * to that product's license terms. Microsoft reserves all other rights to the
- * files not expressly granted by Microsoft, whether by implication, estoppel
- * or otherwise. Insofar as a script file is dual licensed under GPL,
- * Microsoft neither took the code under GPL nor distributes it thereunder but
- * under the terms set out in this paragraph. All notices and licenses
- * below are for informational purposes only.
- *
- * NUGET: END LICENSE TEXT */
-intellisense.annotate(jQuery, {
-  'ajax': function() {
-    /// <signature>
-    ///   <summary>Perform an asynchronous HTTP (Ajax) request.</summary>
-    ///   <param name="url" type="String">A string containing the URL to which the request is sent.</param>
-    ///   <param name="settings" type="Object">A set of key/value pairs that configure the Ajax request. All settings are optional. A default can be set for any option with $.ajaxSetup(). See jQuery.ajax( settings ) below for a complete list of all settings.</param>
-    ///   <returns type="jqXHR" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Perform an asynchronous HTTP (Ajax) request.</summary>
-    ///   <param name="settings" type="Object">A set of key/value pairs that configure the Ajax request. All settings are optional. A default can be set for any option with $.ajaxSetup().</param>
-    ///   <returns type="jqXHR" />
-    /// </signature>
-  },
-  'ajaxPrefilter': function() {
-    /// <signature>
-    ///   <summary>Handle custom Ajax options or modify existing options before each request is sent and before they are processed by $.ajax().</summary>
-    ///   <param name="dataTypes" type="String">An optional string containing one or more space-separated dataTypes</param>
-    ///   <param name="handler(options, originalOptions, jqXHR)" type="Function">A handler to set default values for future Ajax requests.</param>
-    /// </signature>
-  },
-  'ajaxSetup': function() {
-    /// <signature>
-    ///   <summary>Set default values for future Ajax requests.</summary>
-    ///   <param name="options" type="Object">A set of key/value pairs that configure the default Ajax request. All options are optional.</param>
-    /// </signature>
-  },
-  'boxModel': function() {
-    /// <summary>Deprecated in jQuery 1.3 (see jQuery.support). States if the current page, in the user's browser, is being rendered using the W3C CSS Box Model.</summary>
-    /// <returns type="Boolean" />
-  },
-  'browser': function() {
-    /// <summary>Contains flags for the useragent, read from navigator.userAgent. We recommend against using this property; please try to use feature detection instead (see jQuery.support). jQuery.browser may be moved to a plugin in a future release of jQuery.</summary>
-    /// <returns type="Map" />
-  },
-  'browser.version': function() {
-    /// <summary>The version number of the rendering engine for the user's browser.</summary>
-    /// <returns type="String" />
-  },
-  'Callbacks': function() {
-    /// <signature>
-    ///   <summary>A multi-purpose callbacks list object that provides a powerful way to manage callback lists.</summary>
-    ///   <param name="flags" type="String">An optional list of space-separated flags that change how the callback list behaves.</param>
-    /// </signature>
-  },
-  'contains': function() {
-    /// <signature>
-    ///   <summary>Check to see if a DOM element is within another DOM element.</summary>
-    ///   <param name="container" type="Element">The DOM element that may contain the other element.</param>
-    ///   <param name="contained" type="Element">The DOM element that may be contained by the other element.</param>
-    ///   <returns type="Boolean" />
-    /// </signature>
-  },
-  'cssHooks': function() {
-    /// <summary>Hook directly into jQuery to override how particular CSS properties are retrieved or set, normalize CSS property naming, or create custom properties.</summary>
-    /// <returns type="Object" />
-  },
-  'data': function() {
-    /// <signature>
-    ///   <summary>Returns value at named data store for the element, as set by jQuery.data(element, name, value), or the full data store for the element.</summary>
-    ///   <param name="element" type="Element">The DOM element to query for the data.</param>
-    ///   <param name="key" type="String">Name of the data stored.</param>
-    ///   <returns type="Object" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Returns value at named data store for the element, as set by jQuery.data(element, name, value), or the full data store for the element.</summary>
-    ///   <param name="element" type="Element">The DOM element to query for the data.</param>
-    ///   <returns type="Object" />
-    /// </signature>
-  },
-  'dequeue': function() {
-    /// <signature>
-    ///   <summary>Execute the next function on the queue for the matched element.</summary>
-    ///   <param name="element" type="Element">A DOM element from which to remove and execute a queued function.</param>
-    ///   <param name="queueName" type="String">A string containing the name of the queue. Defaults to fx, the standard effects queue.</param>
-    /// </signature>
-  },
-  'each': function() {
-    /// <signature>
-    ///   <summary>A generic iterator function, which can be used to seamlessly iterate over both objects and arrays. Arrays and array-like objects with a length property (such as a function's arguments object) are iterated by numeric index, from 0 to length-1. Other objects are iterated via their named properties.</summary>
-    ///   <param name="collection" type="Object">The object or array to iterate over.</param>
-    ///   <param name="callback(indexInArray, valueOfElement)" type="Function">The function that will be executed on every object.</param>
-    ///   <returns type="Object" />
-    /// </signature>
-  },
-  'error': function() {
-    /// <signature>
-    ///   <summary>Takes a string and throws an exception containing it.</summary>
-    ///   <param name="message" type="String">The message to send out.</param>
-    /// </signature>
-  },
-  'extend': function() {
-    /// <signature>
-    ///   <summary>Merge the contents of two or more objects together into the first object.</summary>
-    ///   <param name="target" type="Object">An object that will receive the new properties if additional objects are passed in or that will extend the jQuery namespace if it is the sole argument.</param>
-    ///   <param name="object1" type="Object">An object containing additional properties to merge in.</param>
-    ///   <param name="objectN" type="Object">Additional objects containing properties to merge in.</param>
-    ///   <returns type="Object" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Merge the contents of two or more objects together into the first object.</summary>
-    ///   <param name="deep" type="Boolean">If true, the merge becomes recursive (aka. deep copy).</param>
-    ///   <param name="target" type="Object">The object to extend. It will receive the new properties.</param>
-    ///   <param name="object1" type="Object">An object containing additional properties to merge in.</param>
-    ///   <param name="objectN" type="Object">Additional objects containing properties to merge in.</param>
-    ///   <returns type="Object" />
-    /// </signature>
-  },
-  'get': function() {
-    /// <signature>
-    ///   <summary>Load data from the server using a HTTP GET request.</summary>
-    ///   <param name="url" type="String">A string containing the URL to which the request is sent.</param>
-    ///   <param name="data" type="String">A map or string that is sent to the server with the request.</param>
-    ///   <param name="success(data, textStatus, jqXHR)" type="Function">A callback function that is executed if the request succeeds.</param>
-    ///   <param name="dataType" type="String">The type of data expected from the server. Default: Intelligent Guess (xml, json, script, or html).</param>
-    ///   <returns type="jqXHR" />
-    /// </signature>
-  },
-  'getJSON': function() {
-    /// <signature>
-    ///   <summary>Load JSON-encoded data from the server using a GET HTTP request.</summary>
-    ///   <param name="url" type="String">A string containing the URL to which the request is sent.</param>
-    ///   <param name="data" type="Object">A map or string that is sent to the server with the request.</param>
-    ///   <param name="success(data, textStatus, jqXHR)" type="Function">A callback function that is executed if the request succeeds.</param>
-    ///   <returns type="jqXHR" />
-    /// </signature>
-  },
-  'getScript': function() {
-    /// <signature>
-    ///   <summary>Load a JavaScript file from the server using a GET HTTP request, then execute it.</summary>
-    ///   <param name="url" type="String">A string containing the URL to which the request is sent.</param>
-    ///   <param name="success(script, textStatus, jqXHR)" type="Function">A callback function that is executed if the request succeeds.</param>
-    ///   <returns type="jqXHR" />
-    /// </signature>
-  },
-  'globalEval': function() {
-    /// <signature>
-    ///   <summary>Execute some JavaScript code globally.</summary>
-    ///   <param name="code" type="String">The JavaScript code to execute.</param>
-    /// </signature>
-  },
-  'grep': function() {
-    /// <signature>
-    ///   <summary>Finds the elements of an array which satisfy a filter function. The original array is not affected.</summary>
-    ///   <param name="array" type="Array">The array to search through.</param>
-    ///   <param name="function(elementOfArray, indexInArray)" type="Function">The function to process each item against.  The first argument to the function is the item, and the second argument is the index.  The function should return a Boolean value.  this will be the global window object.</param>
-    ///   <param name="invert" type="Boolean">If "invert" is false, or not provided, then the function returns an array consisting of all elements for which "callback" returns true.  If "invert" is true, then the function returns an array consisting of all elements for which "callback" returns false.</param>
-    ///   <returns type="Array" />
-    /// </signature>
-  },
-  'hasData': function() {
-    /// <signature>
-    ///   <summary>Determine whether an element has any jQuery data associated with it.</summary>
-    ///   <param name="element" type="Element">A DOM element to be checked for data.</param>
-    ///   <returns type="Boolean" />
-    /// </signature>
-  },
-  'holdReady': function() {
-    /// <signature>
-    ///   <summary>Holds or releases the execution of jQuery's ready event.</summary>
-    ///   <param name="hold" type="Boolean">Indicates whether the ready hold is being requested or released</param>
-    /// </signature>
-  },
-  'inArray': function() {
-    /// <signature>
-    ///   <summary>Search for a specified value within an array and return its index (or -1 if not found).</summary>
-    ///   <param name="value" type="Object">The value to search for.</param>
-    ///   <param name="array" type="Array">An array through which to search.</param>
-    ///   <param name="fromIndex" type="Number">The index of the array at which to begin the search. The default is 0, which will search the whole array.</param>
-    ///   <returns type="Number" />
-    /// </signature>
-  },
-  'isArray': function() {
-    /// <signature>
-    ///   <summary>Determine whether the argument is an array.</summary>
-    ///   <param name="obj" type="Object">Object to test whether or not it is an array.</param>
-    ///   <returns type="boolean" />
-    /// </signature>
-  },
-  'isEmptyObject': function() {
-    /// <signature>
-    ///   <summary>Check to see if an object is empty (contains no properties).</summary>
-    ///   <param name="object" type="Object">The object that will be checked to see if it's empty.</param>
-    ///   <returns type="Boolean" />
-    /// </signature>
-  },
-  'isFunction': function() {
-    /// <signature>
-    ///   <summary>Determine if the argument passed is a Javascript function object.</summary>
-    ///   <param name="obj" type="Object">Object to test whether or not it is a function.</param>
-    ///   <returns type="boolean" />
-    /// </signature>
-  },
-  'isNumeric': function() {
-    /// <signature>
-    ///   <summary>Determines whether its argument is a number.</summary>
-    ///   <param name="value" type="Object">The value to be tested.</param>
-    ///   <returns type="Boolean" />
-    /// </signature>
-  },
-  'isPlainObject': function() {
-    /// <signature>
-    ///   <summary>Check to see if an object is a plain object (created using "{}" or "new Object").</summary>
-    ///   <param name="object" type="Object">The object that will be checked to see if it's a plain object.</param>
-    ///   <returns type="Boolean" />
-    /// </signature>
-  },
-  'isWindow': function() {
-    /// <signature>
-    ///   <summary>Determine whether the argument is a window.</summary>
-    ///   <param name="obj" type="Object">Object to test whether or not it is a window.</param>
-    ///   <returns type="boolean" />
-    /// </signature>
-  },
-  'isXMLDoc': function() {
-    /// <signature>
-    ///   <summary>Check to see if a DOM node is within an XML document (or is an XML document).</summary>
-    ///   <param name="node" type="Element">The DOM node that will be checked to see if it's in an XML document.</param>
-    ///   <returns type="Boolean" />
-    /// </signature>
-  },
-  'makeArray': function() {
-    /// <signature>
-    ///   <summary>Convert an array-like object into a true JavaScript array.</summary>
-    ///   <param name="obj" type="Object">Any object to turn into a native Array.</param>
-    ///   <returns type="Array" />
-    /// </signature>
-  },
-  'map': function() {
-    /// <signature>
-    ///   <summary>Translate all items in an array or object to new array of items.</summary>
-    ///   <param name="array" type="Array">The Array to translate.</param>
-    ///   <param name="callback(elementOfArray, indexInArray)" type="Function">The function to process each item against.  The first argument to the function is the array item, the second argument is the index in array The function can return any value. Within the function, this refers to the global (window) object.</param>
-    ///   <returns type="Array" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Translate all items in an array or object to new array of items.</summary>
-    ///   <param name="arrayOrObject" type="Object">The Array or Object to translate.</param>
-    ///   <param name="callback( value, indexOrKey )" type="Function">The function to process each item against.  The first argument to the function is the value; the second argument is the index or key of the array or object property. The function can return any value to add to the array. A returned array will be flattened into the resulting array. Within the function, this refers to the global (window) object.</param>
-    ///   <returns type="Array" />
-    /// </signature>
-  },
-  'merge': function() {
-    /// <signature>
-    ///   <summary>Merge the contents of two arrays together into the first array.</summary>
-    ///   <param name="first" type="Array">The first array to merge, the elements of second added.</param>
-    ///   <param name="second" type="Array">The second array to merge into the first, unaltered.</param>
-    ///   <returns type="Array" />
-    /// </signature>
-  },
-  'noConflict': function() {
-    /// <signature>
-    ///   <summary>Relinquish jQuery's control of the $ variable.</summary>
-    ///   <param name="removeAll" type="Boolean">A Boolean indicating whether to remove all jQuery variables from the global scope (including jQuery itself).</param>
-    ///   <returns type="Object" />
-    /// </signature>
-  },
-  'noop': function() {
-    /// <summary>An empty function.</summary>
-    /// <returns type="Function" />
-  },
-  'now': function() {
-    /// <summary>Return a number representing the current time.</summary>
-    /// <returns type="Number" />
-  },
-  'param': function() {
-    /// <signature>
-    ///   <summary>Create a serialized representation of an array or object, suitable for use in a URL query string or Ajax request.</summary>
-    ///   <param name="obj" type="Object">An array or object to serialize.</param>
-    ///   <returns type="String" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Create a serialized representation of an array or object, suitable for use in a URL query string or Ajax request.</summary>
-    ///   <param name="obj" type="Object">An array or object to serialize.</param>
-    ///   <param name="traditional" type="Boolean">A Boolean indicating whether to perform a traditional "shallow" serialization.</param>
-    ///   <returns type="String" />
-    /// </signature>
-  },
-  'parseJSON': function() {
-    /// <signature>
-    ///   <summary>Takes a well-formed JSON string and returns the resulting JavaScript object.</summary>
-    ///   <param name="json" type="String">The JSON string to parse.</param>
-    ///   <returns type="Object" />
-    /// </signature>
-  },
-  'parseXML': function() {
-    /// <signature>
-    ///   <summary>Parses a string into an XML document.</summary>
-    ///   <param name="data" type="String">a well-formed XML string to be parsed</param>
-    ///   <returns type="XMLDocument" />
-    /// </signature>
-  },
-  'post': function() {
-    /// <signature>
-    ///   <summary>Load data from the server using a HTTP POST request.</summary>
-    ///   <param name="url" type="String">A string containing the URL to which the request is sent.</param>
-    ///   <param name="data" type="String">A map or string that is sent to the server with the request.</param>
-    ///   <param name="success(data, textStatus, jqXHR)" type="Function">A callback function that is executed if the request succeeds.</param>
-    ///   <param name="dataType" type="String">The type of data expected from the server. Default: Intelligent Guess (xml, json, script, text, html).</param>
-    ///   <returns type="jqXHR" />
-    /// </signature>
-  },
-  'proxy': function() {
-    /// <signature>
-    ///   <summary>Takes a function and returns a new one that will always have a particular context.</summary>
-    ///   <param name="function" type="Function">The function whose context will be changed.</param>
-    ///   <param name="context" type="Object">The object to which the context (this) of the function should be set.</param>
-    ///   <returns type="Function" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Takes a function and returns a new one that will always have a particular context.</summary>
-    ///   <param name="context" type="Object">The object to which the context of the function should be set.</param>
-    ///   <param name="name" type="String">The name of the function whose context will be changed (should be a property of the context object).</param>
-    ///   <returns type="Function" />
-    /// </signature>
-  },
-  'queue': function() {
-    /// <signature>
-    ///   <summary>Manipulate the queue of functions to be executed on the matched element.</summary>
-    ///   <param name="element" type="Element">A DOM element where the array of queued functions is attached.</param>
-    ///   <param name="queueName" type="String">A string containing the name of the queue. Defaults to fx, the standard effects queue.</param>
-    ///   <param name="newQueue" type="Array">An array of functions to replace the current queue contents.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Manipulate the queue of functions to be executed on the matched element.</summary>
-    ///   <param name="element" type="Element">A DOM element on which to add a queued function.</param>
-    ///   <param name="queueName" type="String">A string containing the name of the queue. Defaults to fx, the standard effects queue.</param>
-    ///   <param name="callback()" type="Function">The new function to add to the queue.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'removeData': function() {
-    /// <signature>
-    ///   <summary>Remove a previously-stored piece of data.</summary>
-    ///   <param name="element" type="Element">A DOM element from which to remove data.</param>
-    ///   <param name="name" type="String">A string naming the piece of data to remove.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'sub': function() {
-    /// <summary>Creates a new copy of jQuery whose properties and methods can be modified without affecting the original jQuery object.</summary>
-    /// <returns type="jQuery" />
-  },
-  'support': function() {
-    /// <summary>A collection of properties that represent the presence of different browser features or bugs. Primarily intended for jQuery's internal use; specific properties may be removed when they are no longer needed internally to improve page startup performance.</summary>
-    /// <returns type="Object" />
-  },
-  'trim': function() {
-    /// <signature>
-    ///   <summary>Remove the whitespace from the beginning and end of a string.</summary>
-    ///   <param name="str" type="String">The string to trim.</param>
-    ///   <returns type="String" />
-    /// </signature>
-  },
-  'type': function() {
-    /// <signature>
-    ///   <summary>Determine the internal JavaScript [[Class]] of an object.</summary>
-    ///   <param name="obj" type="Object">Object to get the internal JavaScript [[Class]] of.</param>
-    ///   <returns type="String" />
-    /// </signature>
-  },
-  'unique': function() {
-    /// <signature>
-    ///   <summary>Sorts an array of DOM elements, in place, with the duplicates removed. Note that this only works on arrays of DOM elements, not strings or numbers.</summary>
-    ///   <param name="array" type="Array">The Array of DOM elements.</param>
-    ///   <returns type="Array" />
-    /// </signature>
-  },
-  'when': function() {
-    /// <signature>
-    ///   <summary>Provides a way to execute callback functions based on one or more objects, usually Deferred objects that represent asynchronous events.</summary>
-    ///   <param name="deferreds" type="Deferred">One or more Deferred objects, or plain JavaScript objects.</param>
-    ///   <returns type="Promise" />
-    /// </signature>
-  },
-});
-
-var _1228819969 = jQuery.Callbacks;
-jQuery.Callbacks = function(flags) {
-var _object = _1228819969(flags);
-intellisense.annotate(_object, {
-  'add': function() {
-    /// <signature>
-    ///   <summary>Add a callback or a collection of callbacks to a callback list.</summary>
-    ///   <param name="callbacks" type="Function">A function, or array of functions, that are to be added to the callback list.</param>
-    /// </signature>
-  },
-  'disable': function() {
-    /// <summary>Disable a callback list from doing anything more.</summary>
-  },
-  'empty': function() {
-    /// <summary>Remove all of the callbacks from a list.</summary>
-  },
-  'fire': function() {
-    /// <signature>
-    ///   <summary>Call all of the callbacks with the given arguments</summary>
-    ///   <param name="arguments" type="">The argument or list of arguments to pass back to the callback list.</param>
-    /// </signature>
-  },
-  'fired': function() {
-    /// <summary>Determine if the callbacks have already been called at least once.</summary>
-    /// <returns type="Boolean" />
-  },
-  'fireWith': function() {
-    /// <signature>
-    ///   <summary>Call all callbacks in a list with the given context and arguments.</summary>
-    ///   <param name="context" type="">A reference to the context in which the callbacks in the list should be fired.</param>
-    ///   <param name="args" type="">An argument, or array of arguments, to pass to the callbacks in the list.</param>
-    /// </signature>
-  },
-  'has': function() {
-    /// <signature>
-    ///   <summary>Determine whether a supplied callback is in a list</summary>
-    ///   <param name="callback" type="Function">The callback to search for.</param>
-    ///   <returns type="Boolean" />
-    /// </signature>
-  },
-  'lock': function() {
-    /// <summary>Lock a callback list in its current state.</summary>
-  },
-  'locked': function() {
-    /// <summary>Determine if the callbacks list has been locked.</summary>
-    /// <returns type="Boolean" />
-  },
-  'remove': function() {
-    /// <signature>
-    ///   <summary>Remove a callback or a collection of callbacks from a callback list.</summary>
-    ///   <param name="callbacks" type="Function">A function, or array of functions, that are to be removed from the callback list.</param>
-    /// </signature>
-  },
-});
-
-return _object;
-};
-intellisense.redirectDefinition(jQuery.Callbacks, _1228819969);
-
-var _731531622 = jQuery.Deferred;
-jQuery.Deferred = function(func) {
-var _object = _731531622(func);
-intellisense.annotate(_object, {
-  'always': function() {
-    /// <signature>
-    ///   <summary>Add handlers to be called when the Deferred object is either resolved or rejected.</summary>
-    ///   <param name="alwaysCallbacks" type="Function">A function, or array of functions, that is called when the Deferred is resolved or rejected.</param>
-    ///   <param name="alwaysCallbacks" type="Function">Optional additional functions, or arrays of functions, that are called when the Deferred is resolved or rejected.</param>
-    ///   <returns type="Deferred" />
-    /// </signature>
-  },
-  'done': function() {
-    /// <signature>
-    ///   <summary>Add handlers to be called when the Deferred object is resolved.</summary>
-    ///   <param name="doneCallbacks" type="Function">A function, or array of functions, that are called when the Deferred is resolved.</param>
-    ///   <param name="doneCallbacks" type="Function">Optional additional functions, or arrays of functions, that are called when the Deferred is resolved.</param>
-    ///   <returns type="Deferred" />
-    /// </signature>
-  },
-  'fail': function() {
-    /// <signature>
-    ///   <summary>Add handlers to be called when the Deferred object is rejected.</summary>
-    ///   <param name="failCallbacks" type="Function">A function, or array of functions, that are called when the Deferred is rejected.</param>
-    ///   <param name="failCallbacks" type="Function">Optional additional functions, or arrays of functions, that are called when the Deferred is rejected.</param>
-    ///   <returns type="Deferred" />
-    /// </signature>
-  },
-  'isRejected': function() {
-    /// <summary>Determine whether a Deferred object has been rejected.</summary>
-    /// <returns type="Boolean" />
-  },
-  'isResolved': function() {
-    /// <summary>Determine whether a Deferred object has been resolved.</summary>
-    /// <returns type="Boolean" />
-  },
-  'notify': function() {
-    /// <signature>
-    ///   <summary>Call the progressCallbacks on a Deferred object with the given args.</summary>
-    ///   <param name="args" type="Object">Optional arguments that are passed to the progressCallbacks.</param>
-    ///   <returns type="Deferred" />
-    /// </signature>
-  },
-  'notifyWith': function() {
-    /// <signature>
-    ///   <summary>Call the progressCallbacks on a Deferred object with the given context and args.</summary>
-    ///   <param name="context" type="Object">Context passed to the progressCallbacks as the this object.</param>
-    ///   <param name="args" type="Object">Optional arguments that are passed to the progressCallbacks.</param>
-    ///   <returns type="Deferred" />
-    /// </signature>
-  },
-  'pipe': function() {
-    /// <signature>
-    ///   <summary>Utility method to filter and/or chain Deferreds.</summary>
-    ///   <param name="doneFilter" type="Function">An optional function that is called when the Deferred is resolved.</param>
-    ///   <param name="failFilter" type="Function">An optional function that is called when the Deferred is rejected.</param>
-    ///   <returns type="Promise" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Utility method to filter and/or chain Deferreds.</summary>
-    ///   <param name="doneFilter" type="Function">An optional function that is called when the Deferred is resolved.</param>
-    ///   <param name="failFilter" type="Function">An optional function that is called when the Deferred is rejected.</param>
-    ///   <param name="progressFilter" type="Function">An optional function that is called when progress notifications are sent to the Deferred.</param>
-    ///   <returns type="Promise" />
-    /// </signature>
-  },
-  'progress': function() {
-    /// <signature>
-    ///   <summary>Add handlers to be called when the Deferred object generates progress notifications.</summary>
-    ///   <param name="progressCallbacks" type="Function">A function, or array of functions, that is called when the Deferred generates progress notifications.</param>
-    ///   <returns type="Deferred" />
-    /// </signature>
-  },
-  'promise': function() {
-    /// <signature>
-    ///   <summary>Return a Deferred's Promise object.</summary>
-    ///   <param name="target" type="Object">Object onto which the promise methods have to be attached</param>
-    ///   <returns type="Promise" />
-    /// </signature>
-  },
-  'reject': function() {
-    /// <signature>
-    ///   <summary>Reject a Deferred object and call any failCallbacks with the given args.</summary>
-    ///   <param name="args" type="Object">Optional arguments that are passed to the failCallbacks.</param>
-    ///   <returns type="Deferred" />
-    /// </signature>
-  },
-  'rejectWith': function() {
-    /// <signature>
-    ///   <summary>Reject a Deferred object and call any failCallbacks with the given context and args.</summary>
-    ///   <param name="context" type="Object">Context passed to the failCallbacks as the this object.</param>
-    ///   <param name="args" type="Array">An optional array of arguments that are passed to the failCallbacks.</param>
-    ///   <returns type="Deferred" />
-    /// </signature>
-  },
-  'resolve': function() {
-    /// <signature>
-    ///   <summary>Resolve a Deferred object and call any doneCallbacks with the given args.</summary>
-    ///   <param name="args" type="Object">Optional arguments that are passed to the doneCallbacks.</param>
-    ///   <returns type="Deferred" />
-    /// </signature>
-  },
-  'resolveWith': function() {
-    /// <signature>
-    ///   <summary>Resolve a Deferred object and call any doneCallbacks with the given context and args.</summary>
-    ///   <param name="context" type="Object">Context passed to the doneCallbacks as the this object.</param>
-    ///   <param name="args" type="Array">An optional array of arguments that are passed to the doneCallbacks.</param>
-    ///   <returns type="Deferred" />
-    /// </signature>
-  },
-  'state': function() {
-    /// <summary>Determine the current state of a Deferred object.</summary>
-    /// <returns type="String" />
-  },
-  'then': function() {
-    /// <signature>
-    ///   <summary>Add handlers to be called when the Deferred object is resolved or rejected.</summary>
-    ///   <param name="doneCallbacks" type="Function">A function, or array of functions, called when the Deferred is resolved.</param>
-    ///   <param name="failCallbacks" type="Function">A function, or array of functions, called when the Deferred is rejected.</param>
-    ///   <returns type="Deferred" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Add handlers to be called when the Deferred object is resolved or rejected.</summary>
-    ///   <param name="doneCallbacks" type="Function">A function, or array of functions, called when the Deferred is resolved.</param>
-    ///   <param name="failCallbacks" type="Function">A function, or array of functions, called when the Deferred is rejected.</param>
-    ///   <param name="progressCallbacks" type="Function">A function, or array of functions, called when the Deferred notifies progress.</param>
-    ///   <returns type="Deferred" />
-    /// </signature>
-  },
-});
-
-return _object;
-};
-intellisense.redirectDefinition(jQuery.Callbacks, _731531622);
-
-intellisense.annotate(jQuery.Event.prototype, {
-  'currentTarget': function() {
-    /// <summary>The current DOM element within the event bubbling phase.</summary>
-    /// <returns type="Element" />
-  },
-  'data': function() {
-    /// <summary>An optional data map passed to an event method when the current executing handler is bound.</summary>
-  },
-  'delegateTarget': function() {
-    /// <summary>The element where the currently-called jQuery event handler was attached.</summary>
-    /// <returns type="Element" />
-  },
-  'isDefaultPrevented': function() {
-    /// <summary>Returns whether event.preventDefault() was ever called on this event object.</summary>
-    /// <returns type="Boolean" />
-  },
-  'isImmediatePropagationStopped': function() {
-    /// <summary>Returns whether event.stopImmediatePropagation() was ever called on this event object.</summary>
-    /// <returns type="Boolean" />
-  },
-  'isPropagationStopped': function() {
-    /// <summary>Returns whether event.stopPropagation() was ever called on this event object.</summary>
-    /// <returns type="Boolean" />
-  },
-  'namespace': function() {
-    /// <summary>The namespace specified when the event was triggered.</summary>
-    /// <returns type="String" />
-  },
-  'pageX': function() {
-    /// <summary>The mouse position relative to the left edge of the document.</summary>
-    /// <returns type="Number" />
-  },
-  'pageY': function() {
-    /// <summary>The mouse position relative to the top edge of the document.</summary>
-    /// <returns type="Number" />
-  },
-  'preventDefault': function() {
-    /// <summary>If this method is called, the default action of the event will not be triggered.</summary>
-  },
-  'relatedTarget': function() {
-    /// <summary>The other DOM element involved in the event, if any.</summary>
-    /// <returns type="Element" />
-  },
-  'result': function() {
-    /// <summary>The last value returned by an event handler that was triggered by this event, unless the value was undefined.</summary>
-    /// <returns type="Object" />
-  },
-  'stopImmediatePropagation': function() {
-    /// <summary>Keeps the rest of the handlers from being executed and prevents the event from bubbling up the DOM tree.</summary>
-  },
-  'stopPropagation': function() {
-    /// <summary>Prevents the event from bubbling up the DOM tree, preventing any parent handlers from being notified of the event.</summary>
-  },
-  'target': function() {
-    /// <summary>The DOM element that initiated the event.</summary>
-    /// <returns type="Element" />
-  },
-  'timeStamp': function() {
-    /// <summary>The difference in milliseconds between the time the browser created the event and January 1, 1970.</summary>
-    /// <returns type="Number" />
-  },
-  'type': function() {
-    /// <summary>Describes the nature of the event.</summary>
-    /// <returns type="String" />
-  },
-  'which': function() {
-    /// <summary>For key or mouse events, this property indicates the specific key or button that was pressed.</summary>
-    /// <returns type="Number" />
-  },
-});
-
-intellisense.annotate(jQuery.fn, {
-  'add': function() {
-    /// <signature>
-    ///   <summary>Add elements to the set of matched elements.</summary>
-    ///   <param name="selector" type="String">A string representing a selector expression to find additional elements to add to the set of matched elements.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Add elements to the set of matched elements.</summary>
-    ///   <param name="elements" type="Array">One or more elements to add to the set of matched elements.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Add elements to the set of matched elements.</summary>
-    ///   <param name="html" type="String">An HTML fragment to add to the set of matched elements.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Add elements to the set of matched elements.</summary>
-    ///   <param name="jQuery object" type="jQuery object ">An existing jQuery object to add to the set of matched elements.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Add elements to the set of matched elements.</summary>
-    ///   <param name="selector" type="String">A string representing a selector expression to find additional elements to add to the set of matched elements.</param>
-    ///   <param name="context" type="Element">The point in the document at which the selector should begin matching; similar to the context argument of the $(selector, context) method.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'addClass': function() {
-    /// <signature>
-    ///   <summary>Adds the specified class(es) to each of the set of matched elements.</summary>
-    ///   <param name="className" type="String">One or more class names to be added to the class attribute of each matched element.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Adds the specified class(es) to each of the set of matched elements.</summary>
-    ///   <param name="function(index, currentClass)" type="Function">A function returning one or more space-separated class names to be added to the existing class name(s). Receives the index position of the element in the set and the existing class name(s) as arguments. Within the function, this refers to the current element in the set.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'after': function() {
-    /// <signature>
-    ///   <summary>Insert content, specified by the parameter, after each element in the set of matched elements.</summary>
-    ///   <param name="content" type="jQuery">HTML string, DOM element, or jQuery object to insert after each element in the set of matched elements.</param>
-    ///   <param name="content" type="jQuery">One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert after each element in the set of matched elements.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Insert content, specified by the parameter, after each element in the set of matched elements.</summary>
-    ///   <param name="function(index)" type="Function">A function that returns an HTML string, DOM element(s), or jQuery object to insert after each element in the set of matched elements. Receives the index position of the element in the set as an argument. Within the function, this refers to the current element in the set.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'ajaxComplete': function() {
-    /// <signature>
-    ///   <summary>Register a handler to be called when Ajax requests complete. This is an Ajax Event.</summary>
-    ///   <param name="handler(event, XMLHttpRequest, ajaxOptions)" type="Function">The function to be invoked.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'ajaxError': function() {
-    /// <signature>
-    ///   <summary>Register a handler to be called when Ajax requests complete with an error. This is an Ajax Event.</summary>
-    ///   <param name="handler(event, jqXHR, ajaxSettings, thrownError)" type="Function">The function to be invoked.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'ajaxSend': function() {
-    /// <signature>
-    ///   <summary>Attach a function to be executed before an Ajax request is sent. This is an Ajax Event.</summary>
-    ///   <param name="handler(event, jqXHR, ajaxOptions)" type="Function">The function to be invoked.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'ajaxStart': function() {
-    /// <signature>
-    ///   <summary>Register a handler to be called when the first Ajax request begins. This is an Ajax Event.</summary>
-    ///   <param name="handler()" type="Function">The function to be invoked.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'ajaxStop': function() {
-    /// <signature>
-    ///   <summary>Register a handler to be called when all Ajax requests have completed. This is an Ajax Event.</summary>
-    ///   <param name="handler()" type="Function">The function to be invoked.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'ajaxSuccess': function() {
-    /// <signature>
-    ///   <summary>Attach a function to be executed whenever an Ajax request completes successfully. This is an Ajax Event.</summary>
-    ///   <param name="handler(event, XMLHttpRequest, ajaxOptions)" type="Function">The function to be invoked.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'all': function() {
-    /// <summary>Selects all elements.</summary>
-  },
-  'andSelf': function() {
-    /// <summary>Add the previous set of elements on the stack to the current set.</summary>
-    /// <returns type="jQuery" />
-  },
-  'animate': function() {
-    /// <signature>
-    ///   <summary>Perform a custom animation of a set of CSS properties.</summary>
-    ///   <param name="properties" type="Object">A map of CSS properties that the animation will move toward.</param>
-    ///   <param name="duration" type="Number">A string or number determining how long the animation will run.</param>
-    ///   <param name="easing" type="String">A string indicating which easing function to use for the transition.</param>
-    ///   <param name="complete" type="Function">A function to call once the animation is complete.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Perform a custom animation of a set of CSS properties.</summary>
-    ///   <param name="properties" type="Object">A map of CSS properties that the animation will move toward.</param>
-    ///   <param name="options" type="Object">A map of additional options to pass to the method. Supported keys:         duration: A string or number determining how long the animation will run.easing: A string indicating which easing function to use for the transition.complete: A function to call once the animation is complete.step: A function to be called after each step of the animation.queue: A Boolean indicating whether to place the animation in the effects queue. If false, the animation will begin immediately. As of jQuery 1.7, the queue option can also accept a string, in which case the animation is added to the queue represented by that string.specialEasing: A map of one or more of the CSS properties defined by the properties argument and their corresponding easing functions (added 1.4).</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'animated': function() {
-    /// <summary>Select all elements that are in the progress of an animation at the time the selector is run.</summary>
-  },
-  'append': function() {
-    /// <signature>
-    ///   <summary>Insert content, specified by the parameter, to the end of each element in the set of matched elements.</summary>
-    ///   <param name="content" type="jQuery">DOM element, HTML string, or jQuery object to insert at the end of each element in the set of matched elements.</param>
-    ///   <param name="content" type="jQuery">One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert at the end of each element in the set of matched elements.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Insert content, specified by the parameter, to the end of each element in the set of matched elements.</summary>
-    ///   <param name="function(index, html)" type="Function">A function that returns an HTML string, DOM element(s), or jQuery object to insert at the end of each element in the set of matched elements. Receives the index position of the element in the set and the old HTML value of the element as arguments. Within the function, this refers to the current element in the set.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'appendTo': function() {
-    /// <signature>
-    ///   <summary>Insert every element in the set of matched elements to the end of the target.</summary>
-    ///   <param name="target" type="jQuery">A selector, element, HTML string, or jQuery object; the matched set of elements will be inserted at the end of the element(s) specified by this parameter.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'attr': function() {
-    /// <signature>
-    ///   <summary>Set one or more attributes for the set of matched elements.</summary>
-    ///   <param name="attributeName" type="String">The name of the attribute to set.</param>
-    ///   <param name="value" type="Number">A value to set for the attribute.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Set one or more attributes for the set of matched elements.</summary>
-    ///   <param name="map" type="Object">A map of attribute-value pairs to set.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Set one or more attributes for the set of matched elements.</summary>
-    ///   <param name="attributeName" type="String">The name of the attribute to set.</param>
-    ///   <param name="function(index, attr)" type="Function">A function returning the value to set. this is the current element. Receives the index position of the element in the set and the old attribute value as arguments.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'attributeContains': function() {
-    /// <signature>
-    ///   <summary>Selects elements that have the specified attribute with a value containing the a given substring.</summary>
-    ///   <param name="attribute" type="String">An attribute name.</param>
-    ///   <param name="value" type="String">An attribute value. Can be either an unquoted single word or a quoted string.</param>
-    /// </signature>
-  },
-  'attributeContainsPrefix': function() {
-    /// <signature>
-    ///   <summary>Selects elements that have the specified attribute with a value either equal to a given string or starting with that string followed by a hyphen (-).</summary>
-    ///   <param name="attribute" type="String">An attribute name.</param>
-    ///   <param name="value" type="String">An attribute value. Can be either an unquoted single word or a quoted string.</param>
-    /// </signature>
-  },
-  'attributeContainsWord': function() {
-    /// <signature>
-    ///   <summary>Selects elements that have the specified attribute with a value containing a given word, delimited by spaces.</summary>
-    ///   <param name="attribute" type="String">An attribute name.</param>
-    ///   <param name="value" type="String">An attribute value. Can be either an unquoted single word or a quoted string.</param>
-    /// </signature>
-  },
-  'attributeEndsWith': function() {
-    /// <signature>
-    ///   <summary>Selects elements that have the specified attribute with a value ending exactly with a given string. The comparison is case sensitive.</summary>
-    ///   <param name="attribute" type="String">An attribute name.</param>
-    ///   <param name="value" type="String">An attribute value. Can be either an unquoted single word or a quoted string.</param>
-    /// </signature>
-  },
-  'attributeEquals': function() {
-    /// <signature>
-    ///   <summary>Selects elements that have the specified attribute with a value exactly equal to a certain value.</summary>
-    ///   <param name="attribute" type="String">An attribute name.</param>
-    ///   <param name="value" type="String">An attribute value. Can be either an unquoted single word or a quoted string.</param>
-    /// </signature>
-  },
-  'attributeHas': function() {
-    /// <signature>
-    ///   <summary>Selects elements that have the specified attribute, with any value.</summary>
-    ///   <param name="attribute" type="String">An attribute name.</param>
-    /// </signature>
-  },
-  'attributeMultiple': function() {
-    /// <signature>
-    ///   <summary>Matches elements that match all of the specified attribute filters.</summary>
-    ///   <param name="attributeFilter1" type="String">An attribute filter.</param>
-    ///   <param name="attributeFilter2" type="String">Another attribute filter, reducing the selection even more</param>
-    ///   <param name="attributeFilterN" type="String">As many more attribute filters as necessary</param>
-    /// </signature>
-  },
-  'attributeNotEqual': function() {
-    /// <signature>
-    ///   <summary>Select elements that either don't have the specified attribute, or do have the specified attribute but not with a certain value.</summary>
-    ///   <param name="attribute" type="String">An attribute name.</param>
-    ///   <param name="value" type="String">An attribute value. Can be either an unquoted single word or a quoted string.</param>
-    /// </signature>
-  },
-  'attributeStartsWith': function() {
-    /// <signature>
-    ///   <summary>Selects elements that have the specified attribute with a value beginning exactly with a given string.</summary>
-    ///   <param name="attribute" type="String">An attribute name.</param>
-    ///   <param name="value" type="String">An attribute value. Can be either an unquoted single word or a quoted string.</param>
-    /// </signature>
-  },
-  'before': function() {
-    /// <signature>
-    ///   <summary>Insert content, specified by the parameter, before each element in the set of matched elements.</summary>
-    ///   <param name="content" type="jQuery">HTML string, DOM element, or jQuery object to insert before each element in the set of matched elements.</param>
-    ///   <param name="content" type="jQuery">One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert before each element in the set of matched elements.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Insert content, specified by the parameter, before each element in the set of matched elements.</summary>
-    ///   <param name="function" type="Function">A function that returns an HTML string, DOM element(s), or jQuery object to insert before each element in the set of matched elements. Receives the index position of the element in the set as an argument. Within the function, this refers to the current element in the set.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'bind': function() {
-    /// <signature>
-    ///   <summary>Attach a handler to an event for the elements.</summary>
-    ///   <param name="eventType" type="String">A string containing one or more DOM event types, such as "click" or "submit," or custom event names.</param>
-    ///   <param name="eventData" type="Object">A map of data that will be passed to the event handler.</param>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Attach a handler to an event for the elements.</summary>
-    ///   <param name="eventType" type="String">A string containing one or more DOM event types, such as "click" or "submit," or custom event names.</param>
-    ///   <param name="eventData" type="Object">A map of data that will be passed to the event handler.</param>
-    ///   <param name="preventBubble" type="Boolean">Setting the third argument to false will attach a function that prevents the default action from occurring and stops the event from bubbling. The default is true.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Attach a handler to an event for the elements.</summary>
-    ///   <param name="events" type="Object">A map of one or more DOM event types and functions to execute for them.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'blur': function() {
-    /// <signature>
-    ///   <summary>Bind an event handler to the "blur" JavaScript event, or trigger that event on an element.</summary>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Bind an event handler to the "blur" JavaScript event, or trigger that event on an element.</summary>
-    ///   <param name="eventData" type="Object">A map of data that will be passed to the event handler.</param>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'button': function() {
-    /// <summary>Selects all button elements and elements of type button.</summary>
-  },
-  'change': function() {
-    /// <signature>
-    ///   <summary>Bind an event handler to the "change" JavaScript event, or trigger that event on an element.</summary>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Bind an event handler to the "change" JavaScript event, or trigger that event on an element.</summary>
-    ///   <param name="eventData" type="Object">A map of data that will be passed to the event handler.</param>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'checkbox': function() {
-    /// <summary>Selects all elements of type checkbox.</summary>
-  },
-  'checked': function() {
-    /// <summary>Matches all elements that are checked.</summary>
-  },
-  'child': function() {
-    /// <signature>
-    ///   <summary>Selects all direct child elements specified by "child" of elements specified by "parent".</summary>
-    ///   <param name="parent" type="String">Any valid selector.</param>
-    ///   <param name="child" type="String">A selector to filter the child elements.</param>
-    /// </signature>
-  },
-  'children': function() {
-    /// <signature>
-    ///   <summary>Get the children of each element in the set of matched elements, optionally filtered by a selector.</summary>
-    ///   <param name="selector" type="String">A string containing a selector expression to match elements against.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'class': function() {
-    /// <signature>
-    ///   <summary>Selects all elements with the given class.</summary>
-    ///   <param name="class" type="String">A class to search for. An element can have multiple classes; only one of them must match.</param>
-    /// </signature>
-  },
-  'clearQueue': function() {
-    /// <signature>
-    ///   <summary>Remove from the queue all items that have not yet been run.</summary>
-    ///   <param name="queueName" type="String">A string containing the name of the queue. Defaults to fx, the standard effects queue.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'click': function() {
-    /// <signature>
-    ///   <summary>Bind an event handler to the "click" JavaScript event, or trigger that event on an element.</summary>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Bind an event handler to the "click" JavaScript event, or trigger that event on an element.</summary>
-    ///   <param name="eventData" type="Object">A map of data that will be passed to the event handler.</param>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'clone': function() {
-    /// <signature>
-    ///   <summary>Create a deep copy of the set of matched elements.</summary>
-    ///   <param name="withDataAndEvents" type="Boolean">A Boolean indicating whether event handlers should be copied along with the elements. As of jQuery 1.4, element data will be copied as well.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Create a deep copy of the set of matched elements.</summary>
-    ///   <param name="withDataAndEvents" type="Boolean">A Boolean indicating whether event handlers and data should be copied along with the elements. The default value is false. *In jQuery 1.5.0 the default value was incorrectly true; it was changed back to false in 1.5.1 and up.</param>
-    ///   <param name="deepWithDataAndEvents" type="Boolean">A Boolean indicating whether event handlers and data for all children of the cloned element should be copied. By default its value matches the first argument's value (which defaults to false).</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'closest': function() {
-    /// <signature>
-    ///   <summary>Get the first element that matches the selector, beginning at the current element and progressing up through the DOM tree.</summary>
-    ///   <param name="selector" type="String">A string containing a selector expression to match elements against.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Get the first element that matches the selector, beginning at the current element and progressing up through the DOM tree.</summary>
-    ///   <param name="selector" type="String">A string containing a selector expression to match elements against.</param>
-    ///   <param name="context" type="Element">A DOM element within which a matching element may be found. If no context is passed in then the context of the jQuery set will be used instead.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Get the first element that matches the selector, beginning at the current element and progressing up through the DOM tree.</summary>
-    ///   <param name="jQuery object" type="jQuery">A jQuery object to match elements against.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Get the first element that matches the selector, beginning at the current element and progressing up through the DOM tree.</summary>
-    ///   <param name="element" type="Element">An element to match elements against.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'contains': function() {
-    /// <signature>
-    ///   <summary>Select all elements that contain the specified text.</summary>
-    ///   <param name="text" type="String">A string of text to look for. It's case sensitive.</param>
-    /// </signature>
-  },
-  'contents': function() {
-    /// <summary>Get the children of each element in the set of matched elements, including text and comment nodes.</summary>
-    /// <returns type="jQuery" />
-  },
-  'context': function() {
-    /// <summary>The DOM node context originally passed to jQuery(); if none was passed then context will likely be the document.</summary>
-    /// <returns type="Element" />
-  },
-  'css': function() {
-    /// <signature>
-    ///   <summary>Set one or more CSS properties for the  set of matched elements.</summary>
-    ///   <param name="propertyName" type="String">A CSS property name.</param>
-    ///   <param name="value" type="Number">A value to set for the property.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Set one or more CSS properties for the  set of matched elements.</summary>
-    ///   <param name="propertyName" type="String">A CSS property name.</param>
-    ///   <param name="function(index, value)" type="Function">A function returning the value to set. this is the current element. Receives the index position of the element in the set and the old value as arguments.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Set one or more CSS properties for the  set of matched elements.</summary>
-    ///   <param name="map" type="Object">A map of property-value pairs to set.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'data': function() {
-    /// <signature>
-    ///   <summary>Store arbitrary data associated with the matched elements.</summary>
-    ///   <param name="key" type="String">A string naming the piece of data to set.</param>
-    ///   <param name="value" type="Object">The new data value; it can be any Javascript type including Array or Object.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Store arbitrary data associated with the matched elements.</summary>
-    ///   <param name="obj" type="Object">An object of key-value pairs of data to update.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'dblclick': function() {
-    /// <signature>
-    ///   <summary>Bind an event handler to the "dblclick" JavaScript event, or trigger that event on an element.</summary>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Bind an event handler to the "dblclick" JavaScript event, or trigger that event on an element.</summary>
-    ///   <param name="eventData" type="Object">A map of data that will be passed to the event handler.</param>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'delay': function() {
-    /// <signature>
-    ///   <summary>Set a timer to delay execution of subsequent items in the queue.</summary>
-    ///   <param name="duration" type="Number">An integer indicating the number of milliseconds to delay execution of the next item in the queue.</param>
-    ///   <param name="queueName" type="String">A string containing the name of the queue. Defaults to fx, the standard effects queue.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'delegate': function() {
-    /// <signature>
-    ///   <summary>Attach a handler to one or more events for all elements that match the selector, now or in the future, based on a specific set of root elements.</summary>
-    ///   <param name="selector" type="String">A selector to filter the elements that trigger the event.</param>
-    ///   <param name="eventType" type="String">A string containing one or more space-separated JavaScript event types, such as "click" or "keydown," or custom event names.</param>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute at the time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Attach a handler to one or more events for all elements that match the selector, now or in the future, based on a specific set of root elements.</summary>
-    ///   <param name="selector" type="String">A selector to filter the elements that trigger the event.</param>
-    ///   <param name="eventType" type="String">A string containing one or more space-separated JavaScript event types, such as "click" or "keydown," or custom event names.</param>
-    ///   <param name="eventData" type="Object">A map of data that will be passed to the event handler.</param>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute at the time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Attach a handler to one or more events for all elements that match the selector, now or in the future, based on a specific set of root elements.</summary>
-    ///   <param name="selector" type="String">A selector to filter the elements that trigger the event.</param>
-    ///   <param name="events" type="Object">A map of one or more event types and functions to execute for them.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'dequeue': function() {
-    /// <signature>
-    ///   <summary>Execute the next function on the queue for the matched elements.</summary>
-    ///   <param name="queueName" type="String">A string containing the name of the queue. Defaults to fx, the standard effects queue.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'descendant': function() {
-    /// <signature>
-    ///   <summary>Selects all elements that are descendants of a given ancestor.</summary>
-    ///   <param name="ancestor" type="String">Any valid selector.</param>
-    ///   <param name="descendant" type="String">A selector to filter the descendant elements.</param>
-    /// </signature>
-  },
-  'detach': function() {
-    /// <signature>
-    ///   <summary>Remove the set of matched elements from the DOM.</summary>
-    ///   <param name="selector" type="String">A selector expression that filters the set of matched elements to be removed.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'die': function() {
-    /// <signature>
-    ///   <summary>Remove an event handler previously attached using .live() from the elements.</summary>
-    ///   <param name="eventType" type="String">A string containing a JavaScript event type, such as click or keydown.</param>
-    ///   <param name="handler" type="String">The function that is no longer to be executed.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Remove an event handler previously attached using .live() from the elements.</summary>
-    ///   <param name="eventTypes" type="Object">A map of one or more event types, such as click or keydown and their corresponding functions that are no longer to be executed.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'disabled': function() {
-    /// <summary>Selects all elements that are disabled.</summary>
-  },
-  'each': function() {
-    /// <signature>
-    ///   <summary>Iterate over a jQuery object, executing a function for each matched element.</summary>
-    ///   <param name="function(index, Element)" type="Function">A function to execute for each matched element.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'element': function() {
-    /// <signature>
-    ///   <summary>Selects all elements with the given tag name.</summary>
-    ///   <param name="element" type="String">An element to search for. Refers to the tagName of DOM nodes.</param>
-    /// </signature>
-  },
-  'empty': function() {
-    /// <summary>Select all elements that have no children (including text nodes).</summary>
-  },
-  'enabled': function() {
-    /// <summary>Selects all elements that are enabled.</summary>
-  },
-  'end': function() {
-    /// <summary>End the most recent filtering operation in the current chain and return the set of matched elements to its previous state.</summary>
-    /// <returns type="jQuery" />
-  },
-  'eq': function() {
-    /// <signature>
-    ///   <summary>Reduce the set of matched elements to the one at the specified index.</summary>
-    ///   <param name="index" type="Number">An integer indicating the 0-based position of the element.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Reduce the set of matched elements to the one at the specified index.</summary>
-    ///   <param name="-index" type="Number">An integer indicating the position of the element, counting backwards  from the last element in the set.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'error': function() {
-    /// <signature>
-    ///   <summary>Bind an event handler to the "error" JavaScript event.</summary>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute when the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Bind an event handler to the "error" JavaScript event.</summary>
-    ///   <param name="eventData" type="Object">A map of data that will be passed to the event handler.</param>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'even': function() {
-    /// <summary>Selects even elements, zero-indexed.  See also odd.</summary>
-  },
-  'fadeIn': function() {
-    /// <signature>
-    ///   <summary>Display the matched elements by fading them to opaque.</summary>
-    ///   <param name="duration" type="Number">A string or number determining how long the animation will run.</param>
-    ///   <param name="callback" type="Function">A function to call once the animation is complete.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Display the matched elements by fading them to opaque.</summary>
-    ///   <param name="duration" type="Number">A string or number determining how long the animation will run.</param>
-    ///   <param name="easing" type="String">A string indicating which easing function to use for the transition.</param>
-    ///   <param name="callback" type="Function">A function to call once the animation is complete.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'fadeOut': function() {
-    /// <signature>
-    ///   <summary>Hide the matched elements by fading them to transparent.</summary>
-    ///   <param name="duration" type="Number">A string or number determining how long the animation will run.</param>
-    ///   <param name="callback" type="Function">A function to call once the animation is complete.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Hide the matched elements by fading them to transparent.</summary>
-    ///   <param name="duration" type="Number">A string or number determining how long the animation will run.</param>
-    ///   <param name="easing" type="String">A string indicating which easing function to use for the transition.</param>
-    ///   <param name="callback" type="Function">A function to call once the animation is complete.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'fadeTo': function() {
-    /// <signature>
-    ///   <summary>Adjust the opacity of the matched elements.</summary>
-    ///   <param name="duration" type="Number">A string or number determining how long the animation will run.</param>
-    ///   <param name="opacity" type="Number">A number between 0 and 1 denoting the target opacity.</param>
-    ///   <param name="callback" type="Function">A function to call once the animation is complete.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Adjust the opacity of the matched elements.</summary>
-    ///   <param name="duration" type="Number">A string or number determining how long the animation will run.</param>
-    ///   <param name="opacity" type="Number">A number between 0 and 1 denoting the target opacity.</param>
-    ///   <param name="easing" type="String">A string indicating which easing function to use for the transition.</param>
-    ///   <param name="callback" type="Function">A function to call once the animation is complete.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'fadeToggle': function() {
-    /// <signature>
-    ///   <summary>Display or hide the matched elements by animating their opacity.</summary>
-    ///   <param name="duration" type="Number">A string or number determining how long the animation will run.</param>
-    ///   <param name="easing" type="String">A string indicating which easing function to use for the transition.</param>
-    ///   <param name="callback" type="Function">A function to call once the animation is complete.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'file': function() {
-    /// <summary>Selects all elements of type file.</summary>
-  },
-  'filter': function() {
-    /// <signature>
-    ///   <summary>Reduce the set of matched elements to those that match the selector or pass the function's test.</summary>
-    ///   <param name="selector" type="String">A string containing a selector expression to match the current set of elements against.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Reduce the set of matched elements to those that match the selector or pass the function's test.</summary>
-    ///   <param name="function(index)" type="Function">A function used as a test for each element in the set. this is the current DOM element.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Reduce the set of matched elements to those that match the selector or pass the function's test.</summary>
-    ///   <param name="element" type="Element">An element to match the current set of elements against.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Reduce the set of matched elements to those that match the selector or pass the function's test.</summary>
-    ///   <param name="jQuery object" type="Object">An existing jQuery object to match the current set of elements against.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'find': function() {
-    /// <signature>
-    ///   <summary>Get the descendants of each element in the current set of matched elements, filtered by a selector, jQuery object, or element.</summary>
-    ///   <param name="selector" type="String">A string containing a selector expression to match elements against.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Get the descendants of each element in the current set of matched elements, filtered by a selector, jQuery object, or element.</summary>
-    ///   <param name="jQuery object" type="Object">A jQuery object to match elements against.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Get the descendants of each element in the current set of matched elements, filtered by a selector, jQuery object, or element.</summary>
-    ///   <param name="element" type="Element">An element to match elements against.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'first': function() {
-    /// <summary>Selects the first matched element.</summary>
-  },
-  'first-child': function() {
-    /// <summary>Selects all elements that are the first child of their parent.</summary>
-  },
-  'focus': function() {
-    /// <signature>
-    ///   <summary>Bind an event handler to the "focus" JavaScript event, or trigger that event on an element.</summary>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Bind an event handler to the "focus" JavaScript event, or trigger that event on an element.</summary>
-    ///   <param name="eventData" type="Object">A map of data that will be passed to the event handler.</param>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'focusin': function() {
-    /// <signature>
-    ///   <summary>Bind an event handler to the "focusin" event.</summary>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Bind an event handler to the "focusin" event.</summary>
-    ///   <param name="eventData" type="Object">A map of data that will be passed to the event handler.</param>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'focusout': function() {
-    /// <signature>
-    ///   <summary>Bind an event handler to the "focusout" JavaScript event.</summary>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Bind an event handler to the "focusout" JavaScript event.</summary>
-    ///   <param name="eventData" type="Object">A map of data that will be passed to the event handler.</param>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'get': function() {
-    /// <signature>
-    ///   <summary>Retrieve the DOM elements matched by the jQuery object.</summary>
-    ///   <param name="index" type="Number">A zero-based integer indicating which element to retrieve.</param>
-    ///   <returns type="Element, Array" />
-    /// </signature>
-  },
-  'gt': function() {
-    /// <signature>
-    ///   <summary>Select all elements at an index greater than index within the matched set.</summary>
-    ///   <param name="index" type="Number">Zero-based index.</param>
-    /// </signature>
-  },
-  'has': function() {
-    /// <signature>
-    ///   <summary>Reduce the set of matched elements to those that have a descendant that matches the selector or DOM element.</summary>
-    ///   <param name="selector" type="String">A string containing a selector expression to match elements against.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Reduce the set of matched elements to those that have a descendant that matches the selector or DOM element.</summary>
-    ///   <param name="contained" type="Element">A DOM element to match elements against.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'hasClass': function() {
-    /// <signature>
-    ///   <summary>Determine whether any of the matched elements are assigned the given class.</summary>
-    ///   <param name="className" type="String">The class name to search for.</param>
-    ///   <returns type="Boolean" />
-    /// </signature>
-  },
-  'header': function() {
-    /// <summary>Selects all elements that are headers, like h1, h2, h3 and so on.</summary>
-  },
-  'height': function() {
-    /// <signature>
-    ///   <summary>Set the CSS height of every matched element.</summary>
-    ///   <param name="value" type="Number">An integer representing the number of pixels, or an integer with an optional unit of measure appended (as a string).</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Set the CSS height of every matched element.</summary>
-    ///   <param name="function(index, height)" type="Function">A function returning the height to set. Receives the index position of the element in the set and the old height as arguments. Within the function, this refers to the current element in the set.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'hidden': function() {
-    /// <summary>Selects all elements that are hidden.</summary>
-  },
-  'hide': function() {
-    /// <signature>
-    ///   <summary>Hide the matched elements.</summary>
-    ///   <param name="duration" type="Number">A string or number determining how long the animation will run.</param>
-    ///   <param name="callback" type="Function">A function to call once the animation is complete.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Hide the matched elements.</summary>
-    ///   <param name="duration" type="Number">A string or number determining how long the animation will run.</param>
-    ///   <param name="easing" type="String">A string indicating which easing function to use for the transition.</param>
-    ///   <param name="callback" type="Function">A function to call once the animation is complete.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'hover': function() {
-    /// <signature>
-    ///   <summary>Bind two handlers to the matched elements, to be executed when the mouse pointer enters and leaves the elements.</summary>
-    ///   <param name="handlerIn(eventObject)" type="Function">A function to execute when the mouse pointer enters the element.</param>
-    ///   <param name="handlerOut(eventObject)" type="Function">A function to execute when the mouse pointer leaves the element.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'html': function() {
-    /// <signature>
-    ///   <summary>Set the HTML contents of each element in the set of matched elements.</summary>
-    ///   <param name="htmlString" type="String">A string of HTML to set as the content of each matched element.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Set the HTML contents of each element in the set of matched elements.</summary>
-    ///   <param name="function(index, oldhtml)" type="Function">A function returning the HTML content to set. Receives the index position of the element in the set and the old HTML value as arguments. jQuery empties the element before calling the function; use the oldhtml argument to reference the previous content. Within the function, this refers to the current element in the set.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'id': function() {
-    /// <signature>
-    ///   <summary>Selects a single element with the given id attribute.</summary>
-    ///   <param name="id" type="String">An ID to search for, specified via the id attribute of an element.</param>
-    /// </signature>
-  },
-  'image': function() {
-    /// <summary>Selects all elements of type image.</summary>
-  },
-  'index': function() {
-    /// <signature>
-    ///   <summary>Search for a given element from among the matched elements.</summary>
-    ///   <param name="selector" type="String">A selector representing a jQuery collection in which to look for an element.</param>
-    ///   <returns type="Number" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Search for a given element from among the matched elements.</summary>
-    ///   <param name="element" type="jQuery">The DOM element or first element within the jQuery object to look for.</param>
-    ///   <returns type="Number" />
-    /// </signature>
-  },
-  'init': function() {
-    /// <signature>
-    ///   <summary>Accepts a string containing a CSS selector which is then used to match a set of elements.</summary>
-    ///   <param name="selector" type="String">A string containing a selector expression</param>
-    ///   <param name="context" type="jQuery">A DOM Element, Document, or jQuery to use as context</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Accepts a string containing a CSS selector which is then used to match a set of elements.</summary>
-    ///   <param name="element" type="Element">A DOM element to wrap in a jQuery object.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Accepts a string containing a CSS selector which is then used to match a set of elements.</summary>
-    ///   <param name="object" type="Object">A plain object to wrap in a jQuery object.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Accepts a string containing a CSS selector which is then used to match a set of elements.</summary>
-    ///   <param name="elementArray" type="Array">An array containing a set of DOM elements to wrap in a jQuery object.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Accepts a string containing a CSS selector which is then used to match a set of elements.</summary>
-    ///   <param name="jQuery object" type="Object">An existing jQuery object to clone.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'innerHeight': function() {
-    /// <summary>Get the current computed height for the first element in the set of matched elements, including padding but not border.</summary>
-    /// <returns type="Integer" />
-  },
-  'innerWidth': function() {
-    /// <summary>Get the current computed width for the first element in the set of matched elements, including padding but not border.</summary>
-    /// <returns type="Integer" />
-  },
-  'input': function() {
-    /// <summary>Selects all input, textarea, select and button elements.</summary>
-  },
-  'insertAfter': function() {
-    /// <signature>
-    ///   <summary>Insert every element in the set of matched elements after the target.</summary>
-    ///   <param name="target" type="jQuery">A selector, element, HTML string, or jQuery object; the matched set of elements will be inserted after the element(s) specified by this parameter.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'insertBefore': function() {
-    /// <signature>
-    ///   <summary>Insert every element in the set of matched elements before the target.</summary>
-    ///   <param name="target" type="jQuery">A selector, element, HTML string, or jQuery object; the matched set of elements will be inserted before the element(s) specified by this parameter.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'is': function() {
-    /// <signature>
-    ///   <summary>Check the current matched set of elements against a selector, element, or jQuery object and return true if at least one of these elements matches the given arguments.</summary>
-    ///   <param name="selector" type="String">A string containing a selector expression to match elements against.</param>
-    ///   <returns type="Boolean" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Check the current matched set of elements against a selector, element, or jQuery object and return true if at least one of these elements matches the given arguments.</summary>
-    ///   <param name="function(index)" type="Function">A function used as a test for the set of elements. It accepts one argument, index, which is the element's index in the jQuery collection.Within the function, this refers to the current DOM element.</param>
-    ///   <returns type="Boolean" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Check the current matched set of elements against a selector, element, or jQuery object and return true if at least one of these elements matches the given arguments.</summary>
-    ///   <param name="jQuery object" type="Object">An existing jQuery object to match the current set of elements against.</param>
-    ///   <returns type="Boolean" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Check the current matched set of elements against a selector, element, or jQuery object and return true if at least one of these elements matches the given arguments.</summary>
-    ///   <param name="element" type="Element">An element to match the current set of elements against.</param>
-    ///   <returns type="Boolean" />
-    /// </signature>
-  },
-  'jquery': function() {
-    /// <summary>A string containing the jQuery version number.</summary>
-    /// <returns type="String" />
-  },
-  'keydown': function() {
-    /// <signature>
-    ///   <summary>Bind an event handler to the "keydown" JavaScript event, or trigger that event on an element.</summary>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Bind an event handler to the "keydown" JavaScript event, or trigger that event on an element.</summary>
-    ///   <param name="eventData" type="Object">A map of data that will be passed to the event handler.</param>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'keypress': function() {
-    /// <signature>
-    ///   <summary>Bind an event handler to the "keypress" JavaScript event, or trigger that event on an element.</summary>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Bind an event handler to the "keypress" JavaScript event, or trigger that event on an element.</summary>
-    ///   <param name="eventData" type="Object">A map of data that will be passed to the event handler.</param>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'keyup': function() {
-    /// <signature>
-    ///   <summary>Bind an event handler to the "keyup" JavaScript event, or trigger that event on an element.</summary>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Bind an event handler to the "keyup" JavaScript event, or trigger that event on an element.</summary>
-    ///   <param name="eventData" type="Object">A map of data that will be passed to the event handler.</param>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'last': function() {
-    /// <summary>Selects the last matched element.</summary>
-  },
-  'last-child': function() {
-    /// <summary>Selects all elements that are the last child of their parent.</summary>
-  },
-  'length': function() {
-    /// <summary>The number of elements in the jQuery object.</summary>
-    /// <returns type="Number" />
-  },
-  'live': function() {
-    /// <signature>
-    ///   <summary>Attach an event handler for all elements which match the current selector, now and in the future.</summary>
-    ///   <param name="events" type="String">A string containing a JavaScript event type, such as "click" or "keydown." As of jQuery 1.4 the string can contain multiple, space-separated event types or custom event names.</param>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute at the time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Attach an event handler for all elements which match the current selector, now and in the future.</summary>
-    ///   <param name="events" type="String">A string containing a JavaScript event type, such as "click" or "keydown." As of jQuery 1.4 the string can contain multiple, space-separated event types or custom event names.</param>
-    ///   <param name="data" type="Object">A map of data that will be passed to the event handler.</param>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute at the time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Attach an event handler for all elements which match the current selector, now and in the future.</summary>
-    ///   <param name="events-map" type="Object">A map of one or more JavaScript event types and functions to execute for them.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'load': function() {
-    /// <signature>
-    ///   <summary>Bind an event handler to the "load" JavaScript event.</summary>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute when the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Bind an event handler to the "load" JavaScript event.</summary>
-    ///   <param name="eventData" type="Object">A map of data that will be passed to the event handler.</param>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'lt': function() {
-    /// <signature>
-    ///   <summary>Select all elements at an index less than index within the matched set.</summary>
-    ///   <param name="index" type="Number">Zero-based index.</param>
-    /// </signature>
-  },
-  'map': function() {
-    /// <signature>
-    ///   <summary>Pass each element in the current matched set through a function, producing a new jQuery object containing the return values.</summary>
-    ///   <param name="callback(index, domElement)" type="Function">A function object that will be invoked for each element in the current set.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'mousedown': function() {
-    /// <signature>
-    ///   <summary>Bind an event handler to the "mousedown" JavaScript event, or trigger that event on an element.</summary>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Bind an event handler to the "mousedown" JavaScript event, or trigger that event on an element.</summary>
-    ///   <param name="eventData" type="Object">A map of data that will be passed to the event handler.</param>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'mouseenter': function() {
-    /// <signature>
-    ///   <summary>Bind an event handler to be fired when the mouse enters an element, or trigger that handler on an element.</summary>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Bind an event handler to be fired when the mouse enters an element, or trigger that handler on an element.</summary>
-    ///   <param name="eventData" type="Object">A map of data that will be passed to the event handler.</param>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'mouseleave': function() {
-    /// <signature>
-    ///   <summary>Bind an event handler to be fired when the mouse leaves an element, or trigger that handler on an element.</summary>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Bind an event handler to be fired when the mouse leaves an element, or trigger that handler on an element.</summary>
-    ///   <param name="eventData" type="Object">A map of data that will be passed to the event handler.</param>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'mousemove': function() {
-    /// <signature>
-    ///   <summary>Bind an event handler to the "mousemove" JavaScript event, or trigger that event on an element.</summary>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Bind an event handler to the "mousemove" JavaScript event, or trigger that event on an element.</summary>
-    ///   <param name="eventData" type="Object">A map of data that will be passed to the event handler.</param>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'mouseout': function() {
-    /// <signature>
-    ///   <summary>Bind an event handler to the "mouseout" JavaScript event, or trigger that event on an element.</summary>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Bind an event handler to the "mouseout" JavaScript event, or trigger that event on an element.</summary>
-    ///   <param name="eventData" type="Object">A map of data that will be passed to the event handler.</param>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'mouseover': function() {
-    /// <signature>
-    ///   <summary>Bind an event handler to the "mouseover" JavaScript event, or trigger that event on an element.</summary>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Bind an event handler to the "mouseover" JavaScript event, or trigger that event on an element.</summary>
-    ///   <param name="eventData" type="Object">A map of data that will be passed to the event handler.</param>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'mouseup': function() {
-    /// <signature>
-    ///   <summary>Bind an event handler to the "mouseup" JavaScript event, or trigger that event on an element.</summary>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Bind an event handler to the "mouseup" JavaScript event, or trigger that event on an element.</summary>
-    ///   <param name="eventData" type="Object">A map of data that will be passed to the event handler.</param>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'multiple': function() {
-    /// <signature>
-    ///   <summary>Selects the combined results of all the specified selectors.</summary>
-    ///   <param name="selector1" type="String">Any valid selector.</param>
-    ///   <param name="selector2" type="String">Another valid selector.</param>
-    ///   <param name="selectorN" type="String">As many more valid selectors as you like.</param>
-    /// </signature>
-  },
-  'next': function() {
-    /// <signature>
-    ///   <summary>Get the immediately following sibling of each element in the set of matched elements. If a selector is provided, it retrieves the next sibling only if it matches that selector.</summary>
-    ///   <param name="selector" type="String">A string containing a selector expression to match elements against.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'next adjacent': function() {
-    /// <signature>
-    ///   <summary>Selects all next elements matching "next" that are immediately preceded by a sibling "prev".</summary>
-    ///   <param name="prev" type="String">Any valid selector.</param>
-    ///   <param name="next" type="String">A selector to match the element that is next to the first selector.</param>
-    /// </signature>
-  },
-  'next siblings': function() {
-    /// <signature>
-    ///   <summary>Selects all sibling elements that follow after the "prev" element, have the same parent, and match the filtering "siblings" selector.</summary>
-    ///   <param name="prev" type="String">Any valid selector.</param>
-    ///   <param name="siblings" type="String">A selector to filter elements that are the following siblings of the first selector.</param>
-    /// </signature>
-  },
-  'nextAll': function() {
-    /// <signature>
-    ///   <summary>Get all following siblings of each element in the set of matched elements, optionally filtered by a selector.</summary>
-    ///   <param name="selector" type="String">A string containing a selector expression to match elements against.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'nextUntil': function() {
-    /// <signature>
-    ///   <summary>Get all following siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object passed.</summary>
-    ///   <param name="selector" type="String">A string containing a selector expression to indicate where to stop matching following sibling elements.</param>
-    ///   <param name="filter" type="String">A string containing a selector expression to match elements against.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Get all following siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object passed.</summary>
-    ///   <param name="element" type="Element">A DOM node or jQuery object indicating where to stop matching following sibling elements.</param>
-    ///   <param name="filter" type="String">A string containing a selector expression to match elements against.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'not': function() {
-    /// <signature>
-    ///   <summary>Remove elements from the set of matched elements.</summary>
-    ///   <param name="selector" type="String">A string containing a selector expression to match elements against.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Remove elements from the set of matched elements.</summary>
-    ///   <param name="elements" type="Array">One or more DOM elements to remove from the matched set.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Remove elements from the set of matched elements.</summary>
-    ///   <param name="function(index)" type="Function">A function used as a test for each element in the set. this is the current DOM element.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Remove elements from the set of matched elements.</summary>
-    ///   <param name="jQuery object" type="Object">An existing jQuery object to match the current set of elements against.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'nth-child': function() {
-    /// <signature>
-    ///   <summary>Selects all elements that are the nth-child of their parent.</summary>
-    ///   <param name="index" type="String">The index of each child to match, starting with 1, the string even or odd, or an equation ( eg. :nth-child(even), :nth-child(4n) )</param>
-    /// </signature>
-  },
-  'odd': function() {
-    /// <summary>Selects odd elements, zero-indexed.  See also even.</summary>
-  },
-  'off': function() {
-    /// <signature>
-    ///   <summary>Remove an event handler.</summary>
-    ///   <param name="events" type="String">One or more space-separated event types and optional namespaces, or just namespaces, such as "click", "keydown.myPlugin", or ".myPlugin".</param>
-    ///   <param name="selector" type="String">A selector which should match the one originally passed to .on() when attaching event handlers.</param>
-    ///   <param name="handler(eventObject)" type="Function">A handler function previously attached for the event(s), or the special value false.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Remove an event handler.</summary>
-    ///   <param name="events-map" type="Object">A map where the string keys represent one or more space-separated event types and optional namespaces, and the values represent handler functions previously attached for the event(s).</param>
-    ///   <param name="selector" type="String">A selector which should match the one originally passed to .on() when attaching event handlers.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'offset': function() {
-    /// <signature>
-    ///   <summary>Set the current coordinates of every element in the set of matched elements, relative to the document.</summary>
-    ///   <param name="coordinates" type="Object">An object containing the properties top and left, which are integers indicating the new top and left coordinates for the elements.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Set the current coordinates of every element in the set of matched elements, relative to the document.</summary>
-    ///   <param name="function(index, coords)" type="Function">A function to return the coordinates to set. Receives the index of the element in the collection as the first argument and the current coordinates as the second argument. The function should return an object with the new top and left properties.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'offsetParent': function() {
-    /// <summary>Get the closest ancestor element that is positioned.</summary>
-    /// <returns type="jQuery" />
-  },
-  'on': function() {
-    /// <signature>
-    ///   <summary>Attach an event handler function for one or more events to the selected elements.</summary>
-    ///   <param name="events" type="String">One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".</param>
-    ///   <param name="selector" type="String">A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.</param>
-    ///   <param name="data" type="Anything">Data to be passed to the handler in event.data when an event is triggered.</param>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Attach an event handler function for one or more events to the selected elements.</summary>
-    ///   <param name="events-map" type="Object">A map in which the string keys represent one or more space-separated event types and optional namespaces, and the values represent a handler function to be called for the event(s).</param>
-    ///   <param name="selector" type="String">A selector string to filter the descendants of the selected elements that will call the handler. If the selector is null or omitted, the handler is always called when it reaches the selected element.</param>
-    ///   <param name="data" type="Anything">Data to be passed to the handler in event.data when an event occurs.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'one': function() {
-    /// <signature>
-    ///   <summary>Attach a handler to an event for the elements. The handler is executed at most once per element.</summary>
-    ///   <param name="events" type="String">A string containing one or more JavaScript event types, such as "click" or "submit," or custom event names.</param>
-    ///   <param name="data" type="Object">A map of data that will be passed to the event handler.</param>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute at the time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Attach a handler to an event for the elements. The handler is executed at most once per element.</summary>
-    ///   <param name="events" type="String">One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".</param>
-    ///   <param name="selector" type="String">A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.</param>
-    ///   <param name="data" type="Anything">Data to be passed to the handler in event.data when an event is triggered.</param>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Attach a handler to an event for the elements. The handler is executed at most once per element.</summary>
-    ///   <param name="events-map" type="Object">A map in which the string keys represent one or more space-separated event types and optional namespaces, and the values represent a handler function to be called for the event(s).</param>
-    ///   <param name="selector" type="String">A selector string to filter the descendants of the selected elements that will call the handler. If the selector is null or omitted, the handler is always called when it reaches the selected element.</param>
-    ///   <param name="data" type="Anything">Data to be passed to the handler in event.data when an event occurs.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'only-child': function() {
-    /// <summary>Selects all elements that are the only child of their parent.</summary>
-  },
-  'outerHeight': function() {
-    /// <signature>
-    ///   <summary>Get the current computed height for the first element in the set of matched elements, including padding, border, and optionally margin. Returns an integer (without "px") representation of the value or null if called on an empty set of elements.</summary>
-    ///   <param name="includeMargin" type="Boolean">A Boolean indicating whether to include the element's margin in the calculation.</param>
-    ///   <returns type="Integer" />
-    /// </signature>
-  },
-  'outerWidth': function() {
-    /// <signature>
-    ///   <summary>Get the current computed width for the first element in the set of matched elements, including padding and border.</summary>
-    ///   <param name="includeMargin" type="Boolean">A Boolean indicating whether to include the element's margin in the calculation.</param>
-    ///   <returns type="Integer" />
-    /// </signature>
-  },
-  'parent': function() {
-    /// <signature>
-    ///   <summary>Get the parent of each element in the current set of matched elements, optionally filtered by a selector.</summary>
-    ///   <param name="selector" type="String">A string containing a selector expression to match elements against.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'parents': function() {
-    /// <signature>
-    ///   <summary>Get the ancestors of each element in the current set of matched elements, optionally filtered by a selector.</summary>
-    ///   <param name="selector" type="String">A string containing a selector expression to match elements against.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'parentsUntil': function() {
-    /// <signature>
-    ///   <summary>Get the ancestors of each element in the current set of matched elements, up to but not including the element matched by the selector, DOM node, or jQuery object.</summary>
-    ///   <param name="selector" type="String">A string containing a selector expression to indicate where to stop matching ancestor elements.</param>
-    ///   <param name="filter" type="String">A string containing a selector expression to match elements against.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Get the ancestors of each element in the current set of matched elements, up to but not including the element matched by the selector, DOM node, or jQuery object.</summary>
-    ///   <param name="element" type="Element">A DOM node or jQuery object indicating where to stop matching ancestor elements.</param>
-    ///   <param name="filter" type="String">A string containing a selector expression to match elements against.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'password': function() {
-    /// <summary>Selects all elements of type password.</summary>
-  },
-  'position': function() {
-    /// <summary>Get the current coordinates of the first element in the set of matched elements, relative to the offset parent.</summary>
-    /// <returns type="Object" />
-  },
-  'prepend': function() {
-    /// <signature>
-    ///   <summary>Insert content, specified by the parameter, to the beginning of each element in the set of matched elements.</summary>
-    ///   <param name="content" type="jQuery">DOM element, array of elements, HTML string, or jQuery object to insert at the beginning of each element in the set of matched elements.</param>
-    ///   <param name="content" type="jQuery">One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert at the beginning of each element in the set of matched elements.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Insert content, specified by the parameter, to the beginning of each element in the set of matched elements.</summary>
-    ///   <param name="function(index, html)" type="Function">A function that returns an HTML string, DOM element(s), or jQuery object to insert at the beginning of each element in the set of matched elements. Receives the index position of the element in the set and the old HTML value of the element as arguments. Within the function, this refers to the current element in the set.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'prependTo': function() {
-    /// <signature>
-    ///   <summary>Insert every element in the set of matched elements to the beginning of the target.</summary>
-    ///   <param name="target" type="jQuery">A selector, element, HTML string, or jQuery object; the matched set of elements will be inserted at the beginning of the element(s) specified by this parameter.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'prev': function() {
-    /// <signature>
-    ///   <summary>Get the immediately preceding sibling of each element in the set of matched elements, optionally filtered by a selector.</summary>
-    ///   <param name="selector" type="String">A string containing a selector expression to match elements against.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'prevAll': function() {
-    /// <signature>
-    ///   <summary>Get all preceding siblings of each element in the set of matched elements, optionally filtered by a selector.</summary>
-    ///   <param name="selector" type="String">A string containing a selector expression to match elements against.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'prevUntil': function() {
-    /// <signature>
-    ///   <summary>Get all preceding siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object.</summary>
-    ///   <param name="selector" type="String">A string containing a selector expression to indicate where to stop matching preceding sibling elements.</param>
-    ///   <param name="filter" type="String">A string containing a selector expression to match elements against.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Get all preceding siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object.</summary>
-    ///   <param name="element" type="Element">A DOM node or jQuery object indicating where to stop matching preceding sibling elements.</param>
-    ///   <param name="filter" type="String">A string containing a selector expression to match elements against.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'promise': function() {
-    /// <signature>
-    ///   <summary>Return a Promise object to observe when all actions of a certain type bound to the collection, queued or not, have finished.</summary>
-    ///   <param name="type" type="String">The type of queue that needs to be observed.</param>
-    ///   <param name="target" type="Object">Object onto which the promise methods have to be attached</param>
-    ///   <returns type="Promise" />
-    /// </signature>
-  },
-  'prop': function() {
-    /// <signature>
-    ///   <summary>Set one or more properties for the set of matched elements.</summary>
-    ///   <param name="propertyName" type="String">The name of the property to set.</param>
-    ///   <param name="value" type="Boolean">A value to set for the property.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Set one or more properties for the set of matched elements.</summary>
-    ///   <param name="map" type="Object">A map of property-value pairs to set.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Set one or more properties for the set of matched elements.</summary>
-    ///   <param name="propertyName" type="String">The name of the property to set.</param>
-    ///   <param name="function(index, oldPropertyValue)" type="Function">A function returning the value to set. Receives the index position of the element in the set and the old property value as arguments. Within the function, the keyword this refers to the current element.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'pushStack': function() {
-    /// <signature>
-    ///   <summary>Add a collection of DOM elements onto the jQuery stack.</summary>
-    ///   <param name="elements" type="Array">An array of elements to push onto the stack and make into a new jQuery object.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Add a collection of DOM elements onto the jQuery stack.</summary>
-    ///   <param name="elements" type="Array">An array of elements to push onto the stack and make into a new jQuery object.</param>
-    ///   <param name="name" type="String">The name of a jQuery method that generated the array of elements.</param>
-    ///   <param name="arguments" type="Array">The arguments that were passed in to the jQuery method (for serialization).</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'queue': function() {
-    /// <signature>
-    ///   <summary>Manipulate the queue of functions to be executed on the matched elements.</summary>
-    ///   <param name="queueName" type="String">A string containing the name of the queue. Defaults to fx, the standard effects queue.</param>
-    ///   <param name="newQueue" type="Array">An array of functions to replace the current queue contents.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Manipulate the queue of functions to be executed on the matched elements.</summary>
-    ///   <param name="queueName" type="String">A string containing the name of the queue. Defaults to fx, the standard effects queue.</param>
-    ///   <param name="callback( next )" type="Function">The new function to add to the queue, with a function to call that will dequeue the next item.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'radio': function() {
-    /// <summary>Selects all  elements of type radio.</summary>
-  },
-  'ready': function() {
-    /// <signature>
-    ///   <summary>Specify a function to execute when the DOM is fully loaded.</summary>
-    ///   <param name="handler" type="Function">A function to execute after the DOM is ready.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'remove': function() {
-    /// <signature>
-    ///   <summary>Remove the set of matched elements from the DOM.</summary>
-    ///   <param name="selector" type="String">A selector expression that filters the set of matched elements to be removed.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'removeAttr': function() {
-    /// <signature>
-    ///   <summary>Remove an attribute from each element in the set of matched elements.</summary>
-    ///   <param name="attributeName" type="String">An attribute to remove; as of version 1.7, it can be a space-separated list of attributes.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'removeClass': function() {
-    /// <signature>
-    ///   <summary>Remove a single class, multiple classes, or all classes from each element in the set of matched elements.</summary>
-    ///   <param name="className" type="String">One or more space-separated classes to be removed from the class attribute of each matched element.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Remove a single class, multiple classes, or all classes from each element in the set of matched elements.</summary>
-    ///   <param name="function(index, class)" type="Function">A function returning one or more space-separated class names to be removed. Receives the index position of the element in the set and the old class value as arguments.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'removeData': function() {
-    /// <signature>
-    ///   <summary>Remove a previously-stored piece of data.</summary>
-    ///   <param name="name" type="String">A string naming the piece of data to delete.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Remove a previously-stored piece of data.</summary>
-    ///   <param name="list" type="String">An array or space-separated string naming the pieces of data to delete.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'removeProp': function() {
-    /// <signature>
-    ///   <summary>Remove a property for the set of matched elements.</summary>
-    ///   <param name="propertyName" type="String">The name of the property to set.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'replaceAll': function() {
-    /// <signature>
-    ///   <summary>Replace each target element with the set of matched elements.</summary>
-    ///   <param name="target" type="String">A selector expression indicating which element(s) to replace.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'replaceWith': function() {
-    /// <signature>
-    ///   <summary>Replace each element in the set of matched elements with the provided new content.</summary>
-    ///   <param name="newContent" type="jQuery">The content to insert. May be an HTML string, DOM element, or jQuery object.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Replace each element in the set of matched elements with the provided new content.</summary>
-    ///   <param name="function" type="Function">A function that returns content with which to replace the set of matched elements.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'reset': function() {
-    /// <summary>Selects all elements of type reset.</summary>
-  },
-  'resize': function() {
-    /// <signature>
-    ///   <summary>Bind an event handler to the "resize" JavaScript event, or trigger that event on an element.</summary>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Bind an event handler to the "resize" JavaScript event, or trigger that event on an element.</summary>
-    ///   <param name="eventData" type="Object">A map of data that will be passed to the event handler.</param>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'scroll': function() {
-    /// <signature>
-    ///   <summary>Bind an event handler to the "scroll" JavaScript event, or trigger that event on an element.</summary>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Bind an event handler to the "scroll" JavaScript event, or trigger that event on an element.</summary>
-    ///   <param name="eventData" type="Object">A map of data that will be passed to the event handler.</param>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'scrollLeft': function() {
-    /// <signature>
-    ///   <summary>Set the current horizontal position of the scroll bar for each of the set of matched elements.</summary>
-    ///   <param name="value" type="Number">An integer indicating the new position to set the scroll bar to.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'scrollTop': function() {
-    /// <signature>
-    ///   <summary>Set the current vertical position of the scroll bar for each of the set of matched elements.</summary>
-    ///   <param name="value" type="Number">An integer indicating the new position to set the scroll bar to.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'select': function() {
-    /// <signature>
-    ///   <summary>Bind an event handler to the "select" JavaScript event, or trigger that event on an element.</summary>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Bind an event handler to the "select" JavaScript event, or trigger that event on an element.</summary>
-    ///   <param name="eventData" type="Object">A map of data that will be passed to the event handler.</param>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'selected': function() {
-    /// <summary>Selects all elements that are selected.</summary>
-  },
-  'serialize': function() {
-    /// <summary>Encode a set of form elements as a string for submission.</summary>
-    /// <returns type="String" />
-  },
-  'serializeArray': function() {
-    /// <summary>Encode a set of form elements as an array of names and values.</summary>
-    /// <returns type="Array" />
-  },
-  'show': function() {
-    /// <signature>
-    ///   <summary>Display the matched elements.</summary>
-    ///   <param name="duration" type="Number">A string or number determining how long the animation will run.</param>
-    ///   <param name="callback" type="Function">A function to call once the animation is complete.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Display the matched elements.</summary>
-    ///   <param name="duration" type="Number">A string or number determining how long the animation will run.</param>
-    ///   <param name="easing" type="String">A string indicating which easing function to use for the transition.</param>
-    ///   <param name="callback" type="Function">A function to call once the animation is complete.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'siblings': function() {
-    /// <signature>
-    ///   <summary>Get the siblings of each element in the set of matched elements, optionally filtered by a selector.</summary>
-    ///   <param name="selector" type="String">A string containing a selector expression to match elements against.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'size': function() {
-    /// <summary>Return the number of elements in the jQuery object.</summary>
-    /// <returns type="Number" />
-  },
-  'slice': function() {
-    /// <signature>
-    ///   <summary>Reduce the set of matched elements to a subset specified by a range of indices.</summary>
-    ///   <param name="start" type="Number">An integer indicating the 0-based position at which the elements begin to be selected. If negative, it indicates an offset from the end of the set.</param>
-    ///   <param name="end" type="Number">An integer indicating the 0-based position at which the elements stop being selected. If negative, it indicates an offset from the end of the set. If omitted, the range continues until the end of the set.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'slideDown': function() {
-    /// <signature>
-    ///   <summary>Display the matched elements with a sliding motion.</summary>
-    ///   <param name="duration" type="Number">A string or number determining how long the animation will run.</param>
-    ///   <param name="callback" type="Function">A function to call once the animation is complete.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Display the matched elements with a sliding motion.</summary>
-    ///   <param name="duration" type="Number">A string or number determining how long the animation will run.</param>
-    ///   <param name="easing" type="String">A string indicating which easing function to use for the transition.</param>
-    ///   <param name="callback" type="Function">A function to call once the animation is complete.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'slideToggle': function() {
-    /// <signature>
-    ///   <summary>Display or hide the matched elements with a sliding motion.</summary>
-    ///   <param name="duration" type="Number">A string or number determining how long the animation will run.</param>
-    ///   <param name="callback" type="Function">A function to call once the animation is complete.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Display or hide the matched elements with a sliding motion.</summary>
-    ///   <param name="duration" type="Number">A string or number determining how long the animation will run.</param>
-    ///   <param name="easing" type="String">A string indicating which easing function to use for the transition.</param>
-    ///   <param name="callback" type="Function">A function to call once the animation is complete.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'slideUp': function() {
-    /// <signature>
-    ///   <summary>Hide the matched elements with a sliding motion.</summary>
-    ///   <param name="duration" type="Number">A string or number determining how long the animation will run.</param>
-    ///   <param name="callback" type="Function">A function to call once the animation is complete.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Hide the matched elements with a sliding motion.</summary>
-    ///   <param name="duration" type="Number">A string or number determining how long the animation will run.</param>
-    ///   <param name="easing" type="String">A string indicating which easing function to use for the transition.</param>
-    ///   <param name="callback" type="Function">A function to call once the animation is complete.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'stop': function() {
-    /// <signature>
-    ///   <summary>Stop the currently-running animation on the matched elements.</summary>
-    ///   <param name="clearQueue" type="Boolean">A Boolean indicating whether to remove queued animation as well. Defaults to false.</param>
-    ///   <param name="jumpToEnd" type="Boolean">A Boolean indicating whether to complete the current animation immediately. Defaults to false.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Stop the currently-running animation on the matched elements.</summary>
-    ///   <param name="queue" type="String">The name of the queue in which to stop animations.</param>
-    ///   <param name="clearQueue" type="Boolean">A Boolean indicating whether to remove queued animation as well. Defaults to false.</param>
-    ///   <param name="jumpToEnd" type="Boolean">A Boolean indicating whether to complete the current animation immediately. Defaults to false.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'submit': function() {
-    /// <signature>
-    ///   <summary>Bind an event handler to the "submit" JavaScript event, or trigger that event on an element.</summary>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Bind an event handler to the "submit" JavaScript event, or trigger that event on an element.</summary>
-    ///   <param name="eventData" type="Object">A map of data that will be passed to the event handler.</param>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'text': function() {
-    /// <signature>
-    ///   <summary>Set the content of each element in the set of matched elements to the specified text.</summary>
-    ///   <param name="textString" type="String">A string of text to set as the content of each matched element.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Set the content of each element in the set of matched elements to the specified text.</summary>
-    ///   <param name="function(index, text)" type="Function">A function returning the text content to set. Receives the index position of the element in the set and the old text value as arguments.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'toArray': function() {
-    /// <summary>Retrieve all the DOM elements contained in the jQuery set, as an array.</summary>
-    /// <returns type="Array" />
-  },
-  'toggle': function() {
-    /// <signature>
-    ///   <summary>Display or hide the matched elements.</summary>
-    ///   <param name="duration" type="Number">A string or number determining how long the animation will run.</param>
-    ///   <param name="callback" type="Function">A function to call once the animation is complete.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Display or hide the matched elements.</summary>
-    ///   <param name="duration" type="Number">A string or number determining how long the animation will run.</param>
-    ///   <param name="easing" type="String">A string indicating which easing function to use for the transition.</param>
-    ///   <param name="callback" type="Function">A function to call once the animation is complete.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Display or hide the matched elements.</summary>
-    ///   <param name="showOrHide" type="Boolean">A Boolean indicating whether to show or hide the elements.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'toggleClass': function() {
-    /// <signature>
-    ///   <summary>Add or remove one or more classes from each element in the set of matched elements, depending on either the class's presence or the value of the switch argument.</summary>
-    ///   <param name="className" type="String">One or more class names (separated by spaces) to be toggled for each element in the matched set.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Add or remove one or more classes from each element in the set of matched elements, depending on either the class's presence or the value of the switch argument.</summary>
-    ///   <param name="className" type="String">One or more class names (separated by spaces) to be toggled for each element in the matched set.</param>
-    ///   <param name="switch" type="Boolean">A Boolean (not just truthy/falsy) value to determine whether the class should be added or removed.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Add or remove one or more classes from each element in the set of matched elements, depending on either the class's presence or the value of the switch argument.</summary>
-    ///   <param name="switch" type="Boolean">A boolean value to determine whether the class should be added or removed.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Add or remove one or more classes from each element in the set of matched elements, depending on either the class's presence or the value of the switch argument.</summary>
-    ///   <param name="function(index, class, switch)" type="Function">A function that returns class names to be toggled in the class attribute of each element in the matched set. Receives the index position of the element in the set, the old class value, and the switch as arguments.</param>
-    ///   <param name="switch" type="Boolean">A boolean value to determine whether the class should be added or removed.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'trigger': function() {
-    /// <signature>
-    ///   <summary>Execute all handlers and behaviors attached to the matched elements for the given event type.</summary>
-    ///   <param name="eventType" type="String">A string containing a JavaScript event type, such as click or submit.</param>
-    ///   <param name="extraParameters" type="Object">Additional parameters to pass along to the event handler.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Execute all handlers and behaviors attached to the matched elements for the given event type.</summary>
-    ///   <param name="event" type="Event">A jQuery.Event object.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'triggerHandler': function() {
-    /// <signature>
-    ///   <summary>Execute all handlers attached to an element for an event.</summary>
-    ///   <param name="eventType" type="String">A string containing a JavaScript event type, such as click or submit.</param>
-    ///   <param name="extraParameters" type="Array">An array of additional parameters to pass along to the event handler.</param>
-    ///   <returns type="Object" />
-    /// </signature>
-  },
-  'unbind': function() {
-    /// <signature>
-    ///   <summary>Remove a previously-attached event handler from the elements.</summary>
-    ///   <param name="eventType" type="String">A string containing a JavaScript event type, such as click or submit.</param>
-    ///   <param name="handler(eventObject)" type="Function">The function that is to be no longer executed.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Remove a previously-attached event handler from the elements.</summary>
-    ///   <param name="eventType" type="String">A string containing a JavaScript event type, such as click or submit.</param>
-    ///   <param name="false" type="Boolean">Unbinds the corresponding 'return false' function that was bound using .bind( eventType, false ).</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Remove a previously-attached event handler from the elements.</summary>
-    ///   <param name="event" type="Object">A JavaScript event object as passed to an event handler.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'undelegate': function() {
-    /// <signature>
-    ///   <summary>Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements.</summary>
-    ///   <param name="selector" type="String">A selector which will be used to filter the event results.</param>
-    ///   <param name="eventType" type="String">A string containing a JavaScript event type, such as "click" or "keydown"</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements.</summary>
-    ///   <param name="selector" type="String">A selector which will be used to filter the event results.</param>
-    ///   <param name="eventType" type="String">A string containing a JavaScript event type, such as "click" or "keydown"</param>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute at the time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements.</summary>
-    ///   <param name="selector" type="String">A selector which will be used to filter the event results.</param>
-    ///   <param name="events" type="Object">A map of one or more event types and previously bound functions to unbind from them.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements.</summary>
-    ///   <param name="namespace" type="String">A string containing a namespace to unbind all events from.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'unload': function() {
-    /// <signature>
-    ///   <summary>Bind an event handler to the "unload" JavaScript event.</summary>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute when the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Bind an event handler to the "unload" JavaScript event.</summary>
-    ///   <param name="eventData" type="Object">A map of data that will be passed to the event handler.</param>
-    ///   <param name="handler(eventObject)" type="Function">A function to execute each time the event is triggered.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'unwrap': function() {
-    /// <summary>Remove the parents of the set of matched elements from the DOM, leaving the matched elements in their place.</summary>
-    /// <returns type="jQuery" />
-  },
-  'val': function() {
-    /// <signature>
-    ///   <summary>Set the value of each element in the set of matched elements.</summary>
-    ///   <param name="value" type="String">A string of text or an array of strings corresponding to the value of each matched element to set as selected/checked.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Set the value of each element in the set of matched elements.</summary>
-    ///   <param name="function(index, value)" type="Function">A function returning the value to set. this is the current element. Receives the index position of the element in the set and the old value as arguments.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'visible': function() {
-    /// <summary>Selects all elements that are visible.</summary>
-  },
-  'width': function() {
-    /// <signature>
-    ///   <summary>Set the CSS width of each element in the set of matched elements.</summary>
-    ///   <param name="value" type="Number">An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string).</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Set the CSS width of each element in the set of matched elements.</summary>
-    ///   <param name="function(index, width)" type="Function">A function returning the width to set. Receives the index position of the element in the set and the old width as arguments. Within the function, this refers to the current element in the set.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'wrap': function() {
-    /// <signature>
-    ///   <summary>Wrap an HTML structure around each element in the set of matched elements.</summary>
-    ///   <param name="wrappingElement" type="jQuery">An HTML snippet, selector expression, jQuery object, or DOM element specifying the structure to wrap around the matched elements.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Wrap an HTML structure around each element in the set of matched elements.</summary>
-    ///   <param name="function(index)" type="Function">A callback function returning the HTML content or jQuery object to wrap around the matched elements. Receives the index position of the element in the set as an argument. Within the function, this refers to the current element in the set.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'wrapAll': function() {
-    /// <signature>
-    ///   <summary>Wrap an HTML structure around all elements in the set of matched elements.</summary>
-    ///   <param name="wrappingElement" type="jQuery">An HTML snippet, selector expression, jQuery object, or DOM element specifying the structure to wrap around the matched elements.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-  'wrapInner': function() {
-    /// <signature>
-    ///   <summary>Wrap an HTML structure around the content of each element in the set of matched elements.</summary>
-    ///   <param name="wrappingElement" type="String">An HTML snippet, selector expression, jQuery object, or DOM element specifying the structure to wrap around the content of the matched elements.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Wrap an HTML structure around the content of each element in the set of matched elements.</summary>
-    ///   <param name="function(index)" type="Function">A callback function which generates a structure to wrap around the content of the matched elements. Receives the index position of the element in the set as an argument. Within the function, this refers to the current element in the set.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-});
-
-intellisense.annotate(window, {
-  '$': function() {
-    /// <signature>
-    ///   <summary>Accepts a string containing a CSS selector which is then used to match a set of elements.</summary>
-    ///   <param name="selector" type="String">A string containing a selector expression</param>
-    ///   <param name="context" type="jQuery">A DOM Element, Document, or jQuery to use as context</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Accepts a string containing a CSS selector which is then used to match a set of elements.</summary>
-    ///   <param name="element" type="Element">A DOM element to wrap in a jQuery object.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Accepts a string containing a CSS selector which is then used to match a set of elements.</summary>
-    ///   <param name="object" type="Object">A plain object to wrap in a jQuery object.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Accepts a string containing a CSS selector which is then used to match a set of elements.</summary>
-    ///   <param name="elementArray" type="Array">An array containing a set of DOM elements to wrap in a jQuery object.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-    /// <signature>
-    ///   <summary>Accepts a string containing a CSS selector which is then used to match a set of elements.</summary>
-    ///   <param name="jQuery object" type="Object">An existing jQuery object to clone.</param>
-    ///   <returns type="jQuery" />
-    /// </signature>
-  },
-});
-
diff --git a/NewLife.Cube/Scripts/jquery.unobtrusive-ajax.js b/NewLife.Cube/Scripts/jquery.unobtrusive-ajax.js
deleted file mode 100644
index 23ec54724f..0000000000
--- a/NewLife.Cube/Scripts/jquery.unobtrusive-ajax.js
+++ /dev/null
@@ -1,177 +0,0 @@
-﻿/* NUGET: BEGIN LICENSE TEXT
- *
- * Microsoft grants you the right to use these script files for the sole
- * purpose of either: (i) interacting through your browser with the Microsoft
- * website or online service, subject to the applicable licensing or use
- * terms; or (ii) using the files as included with a Microsoft product subject
- * to that product's license terms. Microsoft reserves all other rights to the
- * files not expressly granted by Microsoft, whether by implication, estoppel
- * or otherwise. Insofar as a script file is dual licensed under GPL,
- * Microsoft neither took the code under GPL nor distributes it thereunder but
- * under the terms set out in this paragraph. All notices and licenses
- * below are for informational purposes only.
- *
- * NUGET: END LICENSE TEXT */
-/*!
-** Unobtrusive Ajax support library for jQuery
-** Copyright (C) Microsoft Corporation. All rights reserved.
-*/
-
-/*jslint white: true, browser: true, onevar: true, undef: true, nomen: true, eqeqeq: true, plusplus: true, bitwise: true, regexp: true, newcap: true, immed: true, strict: false */
-/*global window: false, jQuery: false */
-
-(function ($) {
-    var data_click = "unobtrusiveAjaxClick",
-        data_validation = "unobtrusiveValidation";
-
-    function getFunction(code, argNames) {
-        var fn = window, parts = (code || "").split(".");
-        while (fn && parts.length) {
-            fn = fn[parts.shift()];
-        }
-        if (typeof (fn) === "function") {
-            return fn;
-        }
-        argNames.push(code);
-        return Function.constructor.apply(null, argNames);
-    }
-
-    function isMethodProxySafe(method) {
-        return method === "GET" || method === "POST";
-    }
-
-    function asyncOnBeforeSend(xhr, method) {
-        if (!isMethodProxySafe(method)) {
-            xhr.setRequestHeader("X-HTTP-Method-Override", method);
-        }
-    }
-
-    function asyncOnSuccess(element, data, contentType) {
-        var mode;
-
-        if (contentType.indexOf("application/x-javascript") !== -1) {  // jQuery already executes JavaScript for us
-            return;
-        }
-
-        mode = (element.getAttribute("data-ajax-mode") || "").toUpperCase();
-        $(element.getAttribute("data-ajax-update")).each(function (i, update) {
-            var top;
-
-            switch (mode) {
-            case "BEFORE":
-                top = update.firstChild;
-                $("<div />").html(data).contents().each(function () {
-                    update.insertBefore(this, top);
-                });
-                break;
-            case "AFTER":
-                $("<div />").html(data).contents().each(function () {
-                    update.appendChild(this);
-                });
-                break;
-            default:
-                $(update).html(data);
-                break;
-            }
-        });
-    }
-
-    function asyncRequest(element, options) {
-        var confirm, loading, method, duration;
-
-        confirm = element.getAttribute("data-ajax-confirm");
-        if (confirm && !window.confirm(confirm)) {
-            return;
-        }
-
-        loading = $(element.getAttribute("data-ajax-loading"));
-        duration = element.getAttribute("data-ajax-loading-duration") || 0;
-
-        $.extend(options, {
-            type: element.getAttribute("data-ajax-method") || undefined,
-            url: element.getAttribute("data-ajax-url") || undefined,
-            beforeSend: function (xhr) {
-                var result;
-                asyncOnBeforeSend(xhr, method);
-                result = getFunction(element.getAttribute("data-ajax-begin"), ["xhr"]).apply(this, arguments);
-                if (result !== false) {
-                    loading.show(duration);
-                }
-                return result;
-            },
-            complete: function () {
-                loading.hide(duration);
-                getFunction(element.getAttribute("data-ajax-complete"), ["xhr", "status"]).apply(this, arguments);
-            },
-            success: function (data, status, xhr) {
-                asyncOnSuccess(element, data, xhr.getResponseHeader("Content-Type") || "text/html");
-                getFunction(element.getAttribute("data-ajax-success"), ["data", "status", "xhr"]).apply(this, arguments);
-            },
-            error: getFunction(element.getAttribute("data-ajax-failure"), ["xhr", "status", "error"])
-        });
-
-        options.data.push({ name: "X-Requested-With", value: "XMLHttpRequest" });
-
-        method = options.type.toUpperCase();
-        if (!isMethodProxySafe(method)) {
-            options.type = "POST";
-            options.data.push({ name: "X-HTTP-Method-Override", value: method });
-        }
-
-        $.ajax(options);
-    }
-
-    function validate(form) {
-        var validationInfo = $(form).data(data_validation);
-        return !validationInfo || !validationInfo.validate || validationInfo.validate();
-    }
-
-    $(document).on("click", "a[data-ajax=true]", function (evt) {
-        evt.preventDefault();
-        asyncRequest(this, {
-            url: this.href,
-            type: "GET",
-            data: []
-        });
-    });
-
-    $(document).on("click", "form[data-ajax=true] input[type=image]", function (evt) {
-        var name = evt.target.name,
-            $target = $(evt.target),
-            form = $target.parents("form")[0],
-            offset = $target.offset();
-
-        $(form).data(data_click, [
-            { name: name + ".x", value: Math.round(evt.pageX - offset.left) },
-            { name: name + ".y", value: Math.round(evt.pageY - offset.top) }
-        ]);
-
-        setTimeout(function () {
-            $(form).removeData(data_click);
-        }, 0);
-    });
-
-    $(document).on("click", "form[data-ajax=true] :submit", function (evt) {
-        var name = evt.target.name,
-            form = $(evt.target).parents("form")[0];
-
-        $(form).data(data_click, name ? [{ name: name, value: evt.target.value }] : []);
-
-        setTimeout(function () {
-            $(form).removeData(data_click);
-        }, 0);
-    });
-
-    $(document).on("submit", "form[data-ajax=true]", function (evt) {
-        var clickInfo = $(this).data(data_click) || [];
-        evt.preventDefault();
-        if (!validate(this)) {
-            return;
-        }
-        asyncRequest(this, {
-            url: this.action,
-            type: this.method || "GET",
-            data: clickInfo.concat($(this).serializeArray())
-        });
-    });
-}(jQuery));
\ No newline at end of file
diff --git a/NewLife.Cube/Scripts/jquery.unobtrusive-ajax.min.js b/NewLife.Cube/Scripts/jquery.unobtrusive-ajax.min.js
deleted file mode 100644
index 7c3d42a3dd..0000000000
--- a/NewLife.Cube/Scripts/jquery.unobtrusive-ajax.min.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/* NUGET: BEGIN LICENSE TEXT
- *
- * Microsoft grants you the right to use these script files for the sole
- * purpose of either: (i) interacting through your browser with the Microsoft
- * website or online service, subject to the applicable licensing or use
- * terms; or (ii) using the files as included with a Microsoft product subject
- * to that product's license terms. Microsoft reserves all other rights to the
- * files not expressly granted by Microsoft, whether by implication, estoppel
- * or otherwise. Insofar as a script file is dual licensed under GPL,
- * Microsoft neither took the code under GPL nor distributes it thereunder but
- * under the terms set out in this paragraph. All notices and licenses
- * below are for informational purposes only.
- *
- * NUGET: END LICENSE TEXT */
-/*
-** Unobtrusive Ajax support library for jQuery
-** Copyright (C) Microsoft Corporation. All rights reserved.
-*/
-(function(a){var b="unobtrusiveAjaxClick",g="unobtrusiveValidation";function c(d,b){var a=window,c=(d||"").split(".");while(a&&c.length)a=a[c.shift()];if(typeof a==="function")return a;b.push(d);return Function.constructor.apply(null,b)}function d(a){return a==="GET"||a==="POST"}function f(b,a){!d(a)&&b.setRequestHeader("X-HTTP-Method-Override",a)}function h(c,b,e){var d;if(e.indexOf("application/x-javascript")!==-1)return;d=(c.getAttribute("data-ajax-mode")||"").toUpperCase();a(c.getAttribute("data-ajax-update")).each(function(f,c){var e;switch(d){case"BEFORE":e=c.firstChild;a("<div />").html(b).contents().each(function(){c.insertBefore(this,e)});break;case"AFTER":a("<div />").html(b).contents().each(function(){c.appendChild(this)});break;default:a(c).html(b)}})}function e(b,e){var j,k,g,i;j=b.getAttribute("data-ajax-confirm");if(j&&!window.confirm(j))return;k=a(b.getAttribute("data-ajax-loading"));i=b.getAttribute("data-ajax-loading-duration")||0;a.extend(e,{type:b.getAttribute("data-ajax-method")||undefined,url:b.getAttribute("data-ajax-url")||undefined,beforeSend:function(d){var a;f(d,g);a=c(b.getAttribute("data-ajax-begin"),["xhr"]).apply(this,arguments);a!==false&&k.show(i);return a},complete:function(){k.hide(i);c(b.getAttribute("data-ajax-complete"),["xhr","status"]).apply(this,arguments)},success:function(a,e,d){h(b,a,d.getResponseHeader("Content-Type")||"text/html");c(b.getAttribute("data-ajax-success"),["data","status","xhr"]).apply(this,arguments)},error:c(b.getAttribute("data-ajax-failure"),["xhr","status","error"])});e.data.push({name:"X-Requested-With",value:"XMLHttpRequest"});g=e.type.toUpperCase();if(!d(g)){e.type="POST";e.data.push({name:"X-HTTP-Method-Override",value:g})}a.ajax(e)}function i(c){var b=a(c).data(g);return!b||!b.validate||b.validate()}a(document).on("click","a[data-ajax=true]",function(a){a.preventDefault();e(this,{url:this.href,type:"GET",data:[]})});a(document).on("click","form[data-ajax=true] input[type=image]",function(c){var g=c.target.name,d=a(c.target),f=d.parents("form")[0],e=d.offset();a(f).data(b,[{name:g+".x",value:Math.round(c.pageX-e.left)},{name:g+".y",value:Math.round(c.pageY-e.top)}]);setTimeout(function(){a(f).removeData(b)},0)});a(document).on("click","form[data-ajax=true] :submit",function(c){var e=c.target.name,d=a(c.target).parents("form")[0];a(d).data(b,e?[{name:e,value:c.target.value}]:[]);setTimeout(function(){a(d).removeData(b)},0)});a(document).on("submit","form[data-ajax=true]",function(d){var c=a(this).data(b)||[];d.preventDefault();if(!i(this))return;e(this,{url:this.action,type:this.method||"GET",data:c.concat(a(this).serializeArray())})})})(jQuery);
\ No newline at end of file
diff --git a/NewLife.Cube/Scripts/jquery.validate.unobtrusive.js b/NewLife.Cube/Scripts/jquery.validate.unobtrusive.js
deleted file mode 100644
index 689657b830..0000000000
--- a/NewLife.Cube/Scripts/jquery.validate.unobtrusive.js
+++ /dev/null
@@ -1,367 +0,0 @@
-﻿/*!
-** Unobtrusive validation support library for jQuery and jQuery Validate
-** Copyright (C) Microsoft Corporation. All rights reserved.
-*/
-
-/*jslint white: true, browser: true, onevar: true, undef: true, nomen: true, eqeqeq: true, plusplus: true, bitwise: true, regexp: true, newcap: true, immed: true, strict: false */
-/*global document: false, jQuery: false */
-
-(function ($) {
-    var $jQval = $.validator,
-        adapters,
-        data_validation = "unobtrusiveValidation";
-
-    function setValidationValues(options, ruleName, value) {
-        options.rules[ruleName] = value;
-        if (options.message) {
-            options.messages[ruleName] = options.message;
-        }
-    }
-
-    function splitAndTrim(value) {
-        return value.replace(/^\s+|\s+$/g, "").split(/\s*,\s*/g);
-    }
-
-    function escapeAttributeValue(value) {
-        // As mentioned on http://api.jquery.com/category/selectors/
-        return value.replace(/([!"#$%&'()*+,./:;<=>?@\[\\\]^`{|}~])/g, "\\$1");
-    }
-
-    function getModelPrefix(fieldName) {
-        return fieldName.substr(0, fieldName.lastIndexOf(".") + 1);
-    }
-
-    function appendModelPrefix(value, prefix) {
-        if (value.indexOf("*.") === 0) {
-            value = value.replace("*.", prefix);
-        }
-        return value;
-    }
-
-    function onError(error, inputElement) {  // 'this' is the form element
-        var container = $(this).find("[data-valmsg-for='" + escapeAttributeValue(inputElement[0].name) + "']"),
-            replaceAttrValue = container.attr("data-valmsg-replace"),
-            replace = replaceAttrValue ? $.parseJSON(replaceAttrValue) !== false : null;
-
-        container.removeClass("field-validation-valid").addClass("field-validation-error");
-        error.data("unobtrusiveContainer", container);
-
-        if (replace) {
-            container.empty();
-            error.removeClass("input-validation-error").appendTo(container);
-        }
-        else {
-            error.hide();
-        }
-    }
-
-    function onErrors(event, validator) {  // 'this' is the form element
-        var container = $(this).find("[data-valmsg-summary=true]"),
-            list = container.find("ul");
-
-        if (list && list.length && validator.errorList.length) {
-            list.empty();
-            container.addClass("validation-summary-errors").removeClass("validation-summary-valid");
-
-            $.each(validator.errorList, function () {
-                $("<li />").html(this.message).appendTo(list);
-            });
-        }
-    }
-
-    function onSuccess(error) {  // 'this' is the form element
-        var container = error.data("unobtrusiveContainer"),
-            replaceAttrValue = container.attr("data-valmsg-replace"),
-            replace = replaceAttrValue ? $.parseJSON(replaceAttrValue) : null;
-
-        if (container) {
-            container.addClass("field-validation-valid").removeClass("field-validation-error");
-            error.removeData("unobtrusiveContainer");
-
-            if (replace) {
-                container.empty();
-            }
-        }
-    }
-
-    function onReset(event) {  // 'this' is the form element
-        var $form = $(this);
-        $form.data("validator").resetForm();
-        $form.find(".validation-summary-errors")
-            .addClass("validation-summary-valid")
-            .removeClass("validation-summary-errors");
-        $form.find(".field-validation-error")
-            .addClass("field-validation-valid")
-            .removeClass("field-validation-error")
-            .removeData("unobtrusiveContainer")
-            .find(">*")  // If we were using valmsg-replace, get the underlying error
-                .removeData("unobtrusiveContainer");
-    }
-
-    function validationInfo(form) {
-        var $form = $(form),
-            result = $form.data(data_validation),
-            onResetProxy = $.proxy(onReset, form);
-
-        if (!result) {
-            result = {
-                options: {  // options structure passed to jQuery Validate's validate() method
-                    errorClass: "input-validation-error",
-                    errorElement: "span",
-                    errorPlacement: $.proxy(onError, form),
-                    invalidHandler: $.proxy(onErrors, form),
-                    messages: {},
-                    rules: {},
-                    success: $.proxy(onSuccess, form)
-                },
-                attachValidation: function () {
-                    $form
-                        .unbind("reset." + data_validation, onResetProxy)
-                        .bind("reset." + data_validation, onResetProxy)
-                        .validate(this.options);
-                },
-                validate: function () {  // a validation function that is called by unobtrusive Ajax
-                    $form.validate();
-                    return $form.valid();
-                }
-            };
-            $form.data(data_validation, result);
-        }
-
-        return result;
-    }
-
-    $jQval.unobtrusive = {
-        adapters: [],
-
-        parseElement: function (element, skipAttach) {
-            /// <summary>
-            /// Parses a single HTML element for unobtrusive validation attributes.
-            /// </summary>
-            /// <param name="element" domElement="true">The HTML element to be parsed.</param>
-            /// <param name="skipAttach" type="Boolean">[Optional] true to skip attaching the
-            /// validation to the form. If parsing just this single element, you should specify true.
-            /// If parsing several elements, you should specify false, and manually attach the validation
-            /// to the form when you are finished. The default is false.</param>
-            var $element = $(element),
-                form = $element.parents("form")[0],
-                valInfo, rules, messages;
-
-            if (!form) {  // Cannot do client-side validation without a form
-                return;
-            }
-
-            valInfo = validationInfo(form);
-            valInfo.options.rules[element.name] = rules = {};
-            valInfo.options.messages[element.name] = messages = {};
-
-            $.each(this.adapters, function () {
-                var prefix = "data-val-" + this.name,
-                    message = $element.attr(prefix),
-                    paramValues = {};
-
-                if (message !== undefined) {  // Compare against undefined, because an empty message is legal (and falsy)
-                    prefix += "-";
-
-                    $.each(this.params, function () {
-                        paramValues[this] = $element.attr(prefix + this);
-                    });
-
-                    this.adapt({
-                        element: element,
-                        form: form,
-                        message: message,
-                        params: paramValues,
-                        rules: rules,
-                        messages: messages
-                    });
-                }
-            });
-
-            $.extend(rules, { "__dummy__": true });
-
-            if (!skipAttach) {
-                valInfo.attachValidation();
-            }
-        },
-
-        parse: function (selector) {
-            /// <summary>
-            /// Parses all the HTML elements in the specified selector. It looks for input elements decorated
-            /// with the [data-val=true] attribute value and enables validation according to the data-val-*
-            /// attribute values.
-            /// </summary>
-            /// <param name="selector" type="String">Any valid jQuery selector.</param>
-            var $forms = $(selector)
-                .parents("form")
-                .andSelf()
-                .add($(selector).find("form"))
-                .filter("form");
-
-            $(selector).find(":input[data-val=true]").each(function () {
-                $jQval.unobtrusive.parseElement(this, true);
-            });
-
-            $forms.each(function () {
-                var info = validationInfo(this);
-                if (info) {
-                    info.attachValidation();
-                }
-            });
-        }
-    };
-
-    adapters = $jQval.unobtrusive.adapters;
-
-    adapters.add = function (adapterName, params, fn) {
-        /// <summary>Adds a new adapter to convert unobtrusive HTML into a jQuery Validate validation.</summary>
-        /// <param name="adapterName" type="String">The name of the adapter to be added. This matches the name used
-        /// in the data-val-nnnn HTML attribute (where nnnn is the adapter name).</param>
-        /// <param name="params" type="Array" optional="true">[Optional] An array of parameter names (strings) that will
-        /// be extracted from the data-val-nnnn-mmmm HTML attributes (where nnnn is the adapter name, and
-        /// mmmm is the parameter name).</param>
-        /// <param name="fn" type="Function">The function to call, which adapts the values from the HTML
-        /// attributes into jQuery Validate rules and/or messages.</param>
-        /// <returns type="jQuery.validator.unobtrusive.adapters" />
-        if (!fn) {  // Called with no params, just a function
-            fn = params;
-            params = [];
-        }
-        this.push({ name: adapterName, params: params, adapt: fn });
-        return this;
-    };
-
-    adapters.addBool = function (adapterName, ruleName) {
-        /// <summary>Adds a new adapter to convert unobtrusive HTML into a jQuery Validate validation, where
-        /// the jQuery Validate validation rule has no parameter values.</summary>
-        /// <param name="adapterName" type="String">The name of the adapter to be added. This matches the name used
-        /// in the data-val-nnnn HTML attribute (where nnnn is the adapter name).</param>
-        /// <param name="ruleName" type="String" optional="true">[Optional] The name of the jQuery Validate rule. If not provided, the value
-        /// of adapterName will be used instead.</param>
-        /// <returns type="jQuery.validator.unobtrusive.adapters" />
-        return this.add(adapterName, function (options) {
-            setValidationValues(options, ruleName || adapterName, true);
-        });
-    };
-
-    adapters.addMinMax = function (adapterName, minRuleName, maxRuleName, minMaxRuleName, minAttribute, maxAttribute) {
-        /// <summary>Adds a new adapter to convert unobtrusive HTML into a jQuery Validate validation, where
-        /// the jQuery Validate validation has three potential rules (one for min-only, one for max-only, and
-        /// one for min-and-max). The HTML parameters are expected to be named -min and -max.</summary>
-        /// <param name="adapterName" type="String">The name of the adapter to be added. This matches the name used
-        /// in the data-val-nnnn HTML attribute (where nnnn is the adapter name).</param>
-        /// <param name="minRuleName" type="String">The name of the jQuery Validate rule to be used when you only
-        /// have a minimum value.</param>
-        /// <param name="maxRuleName" type="String">The name of the jQuery Validate rule to be used when you only
-        /// have a maximum value.</param>
-        /// <param name="minMaxRuleName" type="String">The name of the jQuery Validate rule to be used when you
-        /// have both a minimum and maximum value.</param>
-        /// <param name="minAttribute" type="String" optional="true">[Optional] The name of the HTML attribute that
-        /// contains the minimum value. The default is "min".</param>
-        /// <param name="maxAttribute" type="String" optional="true">[Optional] The name of the HTML attribute that
-        /// contains the maximum value. The default is "max".</param>
-        /// <returns type="jQuery.validator.unobtrusive.adapters" />
-        return this.add(adapterName, [minAttribute || "min", maxAttribute || "max"], function (options) {
-            var min = options.params.min,
-                max = options.params.max;
-
-            if (min && max) {
-                setValidationValues(options, minMaxRuleName, [min, max]);
-            }
-            else if (min) {
-                setValidationValues(options, minRuleName, min);
-            }
-            else if (max) {
-                setValidationValues(options, maxRuleName, max);
-            }
-        });
-    };
-
-    adapters.addSingleVal = function (adapterName, attribute, ruleName) {
-        /// <summary>Adds a new adapter to convert unobtrusive HTML into a jQuery Validate validation, where
-        /// the jQuery Validate validation rule has a single value.</summary>
-        /// <param name="adapterName" type="String">The name of the adapter to be added. This matches the name used
-        /// in the data-val-nnnn HTML attribute(where nnnn is the adapter name).</param>
-        /// <param name="attribute" type="String">[Optional] The name of the HTML attribute that contains the value.
-        /// The default is "val".</param>
-        /// <param name="ruleName" type="String" optional="true">[Optional] The name of the jQuery Validate rule. If not provided, the value
-        /// of adapterName will be used instead.</param>
-        /// <returns type="jQuery.validator.unobtrusive.adapters" />
-        return this.add(adapterName, [attribute || "val"], function (options) {
-            setValidationValues(options, ruleName || adapterName, options.params[attribute]);
-        });
-    };
-
-    $jQval.addMethod("__dummy__", function (value, element, params) {
-        return true;
-    });
-
-    $jQval.addMethod("regex", function (value, element, params) {
-        var match;
-        if (this.optional(element)) {
-            return true;
-        }
-
-        match = new RegExp(params).exec(value);
-        return (match && (match.index === 0) && (match[0].length === value.length));
-    });
-
-    $jQval.addMethod("nonalphamin", function (value, element, nonalphamin) {
-        var match;
-        if (nonalphamin) {
-            match = value.match(/\W/g);
-            match = match && match.length >= nonalphamin;
-        }
-        return match;
-    });
-
-    adapters.addSingleVal("accept", "exts").addSingleVal("regex", "pattern");
-    adapters.addBool("creditcard").addBool("date").addBool("digits").addBool("email").addBool("number").addBool("url");
-    adapters.addMinMax("length", "minlength", "maxlength", "rangelength").addMinMax("range", "min", "max", "range");
-    adapters.add("equalto", ["other"], function (options) {
-        var prefix = getModelPrefix(options.element.name),
-            other = options.params.other,
-            fullOtherName = appendModelPrefix(other, prefix),
-            element = $(options.form).find(":input[name='" + escapeAttributeValue(fullOtherName) + "']")[0];
-
-        setValidationValues(options, "equalTo", element);
-    });
-    adapters.add("required", function (options) {
-        // jQuery Validate equates "required" with "mandatory" for checkbox elements
-        if (options.element.tagName.toUpperCase() !== "INPUT" || options.element.type.toUpperCase() !== "CHECKBOX") {
-            setValidationValues(options, "required", true);
-        }
-    });
-    adapters.add("remote", ["url", "type", "additionalfields"], function (options) {
-        var value = {
-            url: options.params.url,
-            type: options.params.type || "GET",
-            data: {}
-        },
-            prefix = getModelPrefix(options.element.name);
-
-        $.each(splitAndTrim(options.params.additionalfields || options.element.name), function (i, fieldName) {
-            var paramName = appendModelPrefix(fieldName, prefix);
-            value.data[paramName] = function () {
-                return $(options.form).find(":input[name='" + escapeAttributeValue(paramName) + "']").val();
-            };
-        });
-
-        setValidationValues(options, "remote", value);
-    });
-    adapters.add("password", ["min", "nonalphamin", "regex"], function (options) {
-        if (options.params.min) {
-            setValidationValues(options, "minlength", options.params.min);
-        }
-        if (options.params.nonalphamin) {
-            setValidationValues(options, "nonalphamin", options.params.nonalphamin);
-        }
-        if (options.params.regex) {
-            setValidationValues(options, "regex", options.params.regex);
-        }
-    });
-
-    $(function () {
-        $jQval.unobtrusive.parse(document);
-    });
-} (jQuery));
\ No newline at end of file
diff --git a/NewLife.Cube/Scripts/jquery.validate.unobtrusive.min.js b/NewLife.Cube/Scripts/jquery.validate.unobtrusive.min.js
deleted file mode 100644
index c458f7419c..0000000000
--- a/NewLife.Cube/Scripts/jquery.validate.unobtrusive.min.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-** Unobtrusive validation support library for jQuery and jQuery Validate
-** Copyright (C) Microsoft Corporation. All rights reserved.
-*/
-(function(a){var d=a.validator,b,e="unobtrusiveValidation";function c(a,b,c){a.rules[b]=c;if(a.message)a.messages[b]=a.message}function j(a){return a.replace(/^\s+|\s+$/g,"").split(/\s*,\s*/g)}function f(a){return a.replace(/([!"#$%&'()*+,./:;<=>?@\[\\\]^`{|}~])/g,"\\$1")}function h(a){return a.substr(0,a.lastIndexOf(".")+1)}function g(a,b){if(a.indexOf("*.")===0)a=a.replace("*.",b);return a}function m(c,e){var b=a(this).find("[data-valmsg-for='"+f(e[0].name)+"']"),d=b.attr("data-valmsg-replace"),g=d?a.parseJSON(d)!==false:null;b.removeClass("field-validation-valid").addClass("field-validation-error");c.data("unobtrusiveContainer",b);if(g){b.empty();c.removeClass("input-validation-error").appendTo(b)}else c.hide()}function l(e,d){var c=a(this).find("[data-valmsg-summary=true]"),b=c.find("ul");if(b&&b.length&&d.errorList.length){b.empty();c.addClass("validation-summary-errors").removeClass("validation-summary-valid");a.each(d.errorList,function(){a("<li />").html(this.message).appendTo(b)})}}function k(d){var b=d.data("unobtrusiveContainer"),c=b.attr("data-valmsg-replace"),e=c?a.parseJSON(c):null;if(b){b.addClass("field-validation-valid").removeClass("field-validation-error");d.removeData("unobtrusiveContainer");e&&b.empty()}}function n(){var b=a(this);b.data("validator").resetForm();b.find(".validation-summary-errors").addClass("validation-summary-valid").removeClass("validation-summary-errors");b.find(".field-validation-error").addClass("field-validation-valid").removeClass("field-validation-error").removeData("unobtrusiveContainer").find(">*").removeData("unobtrusiveContainer")}function i(c){var b=a(c),d=b.data(e),f=a.proxy(n,c);if(!d){d={options:{errorClass:"input-validation-error",errorElement:"span",errorPlacement:a.proxy(m,c),invalidHandler:a.proxy(l,c),messages:{},rules:{},success:a.proxy(k,c)},attachValidation:function(){b.unbind("reset."+e,f).bind("reset."+e,f).validate(this.options)},validate:function(){b.validate();return b.valid()}};b.data(e,d)}return d}d.unobtrusive={adapters:[],parseElement:function(b,h){var d=a(b),f=d.parents("form")[0],c,e,g;if(!f)return;c=i(f);c.options.rules[b.name]=e={};c.options.messages[b.name]=g={};a.each(this.adapters,function(){var c="data-val-"+this.name,i=d.attr(c),h={};if(i!==undefined){c+="-";a.each(this.params,function(){h[this]=d.attr(c+this)});this.adapt({element:b,form:f,message:i,params:h,rules:e,messages:g})}});a.extend(e,{__dummy__:true});!h&&c.attachValidation()},parse:function(b){var c=a(b).parents("form").andSelf().add(a(b).find("form")).filter("form");a(b).find(":input[data-val=true]").each(function(){d.unobtrusive.parseElement(this,true)});c.each(function(){var a=i(this);a&&a.attachValidation()})}};b=d.unobtrusive.adapters;b.add=function(c,a,b){if(!b){b=a;a=[]}this.push({name:c,params:a,adapt:b});return this};b.addBool=function(a,b){return this.add(a,function(d){c(d,b||a,true)})};b.addMinMax=function(e,g,f,a,d,b){return this.add(e,[d||"min",b||"max"],function(b){var e=b.params.min,d=b.params.max;if(e&&d)c(b,a,[e,d]);else if(e)c(b,g,e);else d&&c(b,f,d)})};b.addSingleVal=function(a,b,d){return this.add(a,[b||"val"],function(e){c(e,d||a,e.params[b])})};d.addMethod("__dummy__",function(){return true});d.addMethod("regex",function(b,c,d){var a;if(this.optional(c))return true;a=(new RegExp(d)).exec(b);return a&&a.index===0&&a[0].length===b.length});d.addMethod("nonalphamin",function(c,d,b){var a;if(b){a=c.match(/\W/g);a=a&&a.length>=b}return a});b.addSingleVal("accept","exts").addSingleVal("regex","pattern");b.addBool("creditcard").addBool("date").addBool("digits").addBool("email").addBool("number").addBool("url");b.addMinMax("length","minlength","maxlength","rangelength").addMinMax("range","min","max","range");b.add("equalto",["other"],function(b){var i=h(b.element.name),j=b.params.other,d=g(j,i),e=a(b.form).find(":input[name='"+f(d)+"']")[0];c(b,"equalTo",e)});b.add("required",function(a){(a.element.tagName.toUpperCase()!=="INPUT"||a.element.type.toUpperCase()!=="CHECKBOX")&&c(a,"required",true)});b.add("remote",["url","type","additionalfields"],function(b){var d={url:b.params.url,type:b.params.type||"GET",data:{}},e=h(b.element.name);a.each(j(b.params.additionalfields||b.element.name),function(i,h){var c=g(h,e);d.data[c]=function(){return a(b.form).find(":input[name='"+f(c)+"']").val()}});c(b,"remote",d)});b.add("password",["min","nonalphamin","regex"],function(a){a.params.min&&c(a,"minlength",a.params.min);a.params.nonalphamin&&c(a,"nonalphamin",a.params.nonalphamin);a.params.regex&&c(a,"regex",a.params.regex)});a(function(){d.unobtrusive.parse(document)})})(jQuery);
\ No newline at end of file
diff --git a/NewLife.Cube/Scripts/modernizr-2.6.2.js b/NewLife.Cube/Scripts/modernizr-2.6.2.js
deleted file mode 100644
index 56a00220b4..0000000000
--- a/NewLife.Cube/Scripts/modernizr-2.6.2.js
+++ /dev/null
@@ -1,1393 +0,0 @@
-/*!
- * Modernizr v2.6.2
- * www.modernizr.com
- *
- * Copyright (c) Faruk Ates, Paul Irish, Alex Sexton
- * Available under the BSD and MIT licenses: www.modernizr.com/license/
- */
-
-/*
- * Modernizr tests which native CSS3 and HTML5 features are available in
- * the current UA and makes the results available to you in two ways:
- * as properties on a global Modernizr object, and as classes on the
- * <html> element. This information allows you to progressively enhance
- * your pages with a granular level of control over the experience.
- *
- * Modernizr has an optional (not included) conditional resource loader
- * called Modernizr.load(), based on Yepnope.js (yepnopejs.com).
- * To get a build that includes Modernizr.load(), as well as choosing
- * which tests to include, go to www.modernizr.com/download/
- *
- * Authors        Faruk Ates, Paul Irish, Alex Sexton
- * Contributors   Ryan Seddon, Ben Alman
- */
-
-window.Modernizr = (function( window, document, undefined ) {
-
-    var version = '2.6.2',
-
-    Modernizr = {},
-
-    /*>>cssclasses*/
-    // option for enabling the HTML classes to be added
-    enableClasses = true,
-    /*>>cssclasses*/
-
-    docElement = document.documentElement,
-
-    /**
-     * Create our "modernizr" element that we do most feature tests on.
-     */
-    mod = 'modernizr',
-    modElem = document.createElement(mod),
-    mStyle = modElem.style,
-
-    /**
-     * Create the input element for various Web Forms feature tests.
-     */
-    inputElem /*>>inputelem*/ = document.createElement('input') /*>>inputelem*/ ,
-
-    /*>>smile*/
-    smile = ':)',
-    /*>>smile*/
-
-    toString = {}.toString,
-
-    // TODO :: make the prefixes more granular
-    /*>>prefixes*/
-    // List of property values to set for css tests. See ticket #21
-    prefixes = ' -webkit- -moz- -o- -ms- '.split(' '),
-    /*>>prefixes*/
-
-    /*>>domprefixes*/
-    // Following spec is to expose vendor-specific style properties as:
-    //   elem.style.WebkitBorderRadius
-    // and the following would be incorrect:
-    //   elem.style.webkitBorderRadius
-
-    // Webkit ghosts their properties in lowercase but Opera & Moz do not.
-    // Microsoft uses a lowercase `ms` instead of the correct `Ms` in IE8+
-    //   erik.eae.net/archives/2008/03/10/21.48.10/
-
-    // More here: github.com/Modernizr/Modernizr/issues/issue/21
-    omPrefixes = 'Webkit Moz O ms',
-
-    cssomPrefixes = omPrefixes.split(' '),
-
-    domPrefixes = omPrefixes.toLowerCase().split(' '),
-    /*>>domprefixes*/
-
-    /*>>ns*/
-    ns = {'svg': 'http://www.w3.org/2000/svg'},
-    /*>>ns*/
-
-    tests = {},
-    inputs = {},
-    attrs = {},
-
-    classes = [],
-
-    slice = classes.slice,
-
-    featureName, // used in testing loop
-
-
-    /*>>teststyles*/
-    // Inject element with style element and some CSS rules
-    injectElementWithStyles = function( rule, callback, nodes, testnames ) {
-
-      var style, ret, node, docOverflow,
-          div = document.createElement('div'),
-          // After page load injecting a fake body doesn't work so check if body exists
-          body = document.body,
-          // IE6 and 7 won't return offsetWidth or offsetHeight unless it's in the body element, so we fake it.
-          fakeBody = body || document.createElement('body');
-
-      if ( parseInt(nodes, 10) ) {
-          // In order not to give false positives we create a node for each test
-          // This also allows the method to scale for unspecified uses
-          while ( nodes-- ) {
-              node = document.createElement('div');
-              node.id = testnames ? testnames[nodes] : mod + (nodes + 1);
-              div.appendChild(node);
-          }
-      }
-
-      // <style> elements in IE6-9 are considered 'NoScope' elements and therefore will be removed
-      // when injected with innerHTML. To get around this you need to prepend the 'NoScope' element
-      // with a 'scoped' element, in our case the soft-hyphen entity as it won't mess with our measurements.
-      // msdn.microsoft.com/en-us/library/ms533897%28VS.85%29.aspx
-      // Documents served as xml will throw if using &shy; so use xml friendly encoded version. See issue #277
-      style = ['&#173;','<style id="s', mod, '">', rule, '</style>'].join('');
-      div.id = mod;
-      // IE6 will false positive on some tests due to the style element inside the test div somehow interfering offsetHeight, so insert it into body or fakebody.
-      // Opera will act all quirky when injecting elements in documentElement when page is served as xml, needs fakebody too. #270
-      (body ? div : fakeBody).innerHTML += style;
-      fakeBody.appendChild(div);
-      if ( !body ) {
-          //avoid crashing IE8, if background image is used
-          fakeBody.style.background = '';
-          //Safari 5.13/5.1.4 OSX stops loading if ::-webkit-scrollbar is used and scrollbars are visible
-          fakeBody.style.overflow = 'hidden';
-          docOverflow = docElement.style.overflow;
-          docElement.style.overflow = 'hidden';
-          docElement.appendChild(fakeBody);
-      }
-
-      ret = callback(div, rule);
-      // If this is done after page load we don't want to remove the body so check if body exists
-      if ( !body ) {
-          fakeBody.parentNode.removeChild(fakeBody);
-          docElement.style.overflow = docOverflow;
-      } else {
-          div.parentNode.removeChild(div);
-      }
-
-      return !!ret;
-
-    },
-    /*>>teststyles*/
-
-    /*>>mq*/
-    // adapted from matchMedia polyfill
-    // by Scott Jehl and Paul Irish
-    // gist.github.com/786768
-    testMediaQuery = function( mq ) {
-
-      var matchMedia = window.matchMedia || window.msMatchMedia;
-      if ( matchMedia ) {
-        return matchMedia(mq).matches;
-      }
-
-      var bool;
-
-      injectElementWithStyles('@media ' + mq + ' { #' + mod + ' { position: absolute; } }', function( node ) {
-        bool = (window.getComputedStyle ?
-                  getComputedStyle(node, null) :
-                  node.currentStyle)['position'] == 'absolute';
-      });
-
-      return bool;
-
-     },
-     /*>>mq*/
-
-
-    /*>>hasevent*/
-    //
-    // isEventSupported determines if a given element supports the given event
-    // kangax.github.com/iseventsupported/
-    //
-    // The following results are known incorrects:
-    //   Modernizr.hasEvent("webkitTransitionEnd", elem) // false negative
-    //   Modernizr.hasEvent("textInput") // in Webkit. github.com/Modernizr/Modernizr/issues/333
-    //   ...
-    isEventSupported = (function() {
-
-      var TAGNAMES = {
-        'select': 'input', 'change': 'input',
-        'submit': 'form', 'reset': 'form',
-        'error': 'img', 'load': 'img', 'abort': 'img'
-      };
-
-      function isEventSupported( eventName, element ) {
-
-        element = element || document.createElement(TAGNAMES[eventName] || 'div');
-        eventName = 'on' + eventName;
-
-        // When using `setAttribute`, IE skips "unload", WebKit skips "unload" and "resize", whereas `in` "catches" those
-        var isSupported = eventName in element;
-
-        if ( !isSupported ) {
-          // If it has no `setAttribute` (i.e. doesn't implement Node interface), try generic element
-          if ( !element.setAttribute ) {
-            element = document.createElement('div');
-          }
-          if ( element.setAttribute && element.removeAttribute ) {
-            element.setAttribute(eventName, '');
-            isSupported = is(element[eventName], 'function');
-
-            // If property was created, "remove it" (by setting value to `undefined`)
-            if ( !is(element[eventName], 'undefined') ) {
-              element[eventName] = undefined;
-            }
-            element.removeAttribute(eventName);
-          }
-        }
-
-        element = null;
-        return isSupported;
-      }
-      return isEventSupported;
-    })(),
-    /*>>hasevent*/
-
-    // TODO :: Add flag for hasownprop ? didn't last time
-
-    // hasOwnProperty shim by kangax needed for Safari 2.0 support
-    _hasOwnProperty = ({}).hasOwnProperty, hasOwnProp;
-
-    if ( !is(_hasOwnProperty, 'undefined') && !is(_hasOwnProperty.call, 'undefined') ) {
-      hasOwnProp = function (object, property) {
-        return _hasOwnProperty.call(object, property);
-      };
-    }
-    else {
-      hasOwnProp = function (object, property) { /* yes, this can give false positives/negatives, but most of the time we don't care about those */
-        return ((property in object) && is(object.constructor.prototype[property], 'undefined'));
-      };
-    }
-
-    // Adapted from ES5-shim https://github.com/kriskowal/es5-shim/blob/master/es5-shim.js
-    // es5.github.com/#x15.3.4.5
-
-    if (!Function.prototype.bind) {
-      Function.prototype.bind = function bind(that) {
-
-        var target = this;
-
-        if (typeof target != "function") {
-            throw new TypeError();
-        }
-
-        var args = slice.call(arguments, 1),
-            bound = function () {
-
-            if (this instanceof bound) {
-
-              var F = function(){};
-              F.prototype = target.prototype;
-              var self = new F();
-
-              var result = target.apply(
-                  self,
-                  args.concat(slice.call(arguments))
-              );
-              if (Object(result) === result) {
-                  return result;
-              }
-              return self;
-
-            } else {
-
-              return target.apply(
-                  that,
-                  args.concat(slice.call(arguments))
-              );
-
-            }
-
-        };
-
-        return bound;
-      };
-    }
-
-    /**
-     * setCss applies given styles to the Modernizr DOM node.
-     */
-    function setCss( str ) {
-        mStyle.cssText = str;
-    }
-
-    /**
-     * setCssAll extrapolates all vendor-specific css strings.
-     */
-    function setCssAll( str1, str2 ) {
-        return setCss(prefixes.join(str1 + ';') + ( str2 || '' ));
-    }
-
-    /**
-     * is returns a boolean for if typeof obj is exactly type.
-     */
-    function is( obj, type ) {
-        return typeof obj === type;
-    }
-
-    /**
-     * contains returns a boolean for if substr is found within str.
-     */
-    function contains( str, substr ) {
-        return !!~('' + str).indexOf(substr);
-    }
-
-    /*>>testprop*/
-
-    // testProps is a generic CSS / DOM property test.
-
-    // In testing support for a given CSS property, it's legit to test:
-    //    `elem.style[styleName] !== undefined`
-    // If the property is supported it will return an empty string,
-    // if unsupported it will return undefined.
-
-    // We'll take advantage of this quick test and skip setting a style
-    // on our modernizr element, but instead just testing undefined vs
-    // empty string.
-
-    // Because the testing of the CSS property names (with "-", as
-    // opposed to the camelCase DOM properties) is non-portable and
-    // non-standard but works in WebKit and IE (but not Gecko or Opera),
-    // we explicitly reject properties with dashes so that authors
-    // developing in WebKit or IE first don't end up with
-    // browser-specific content by accident.
-
-    function testProps( props, prefixed ) {
-        for ( var i in props ) {
-            var prop = props[i];
-            if ( !contains(prop, "-") && mStyle[prop] !== undefined ) {
-                return prefixed == 'pfx' ? prop : true;
-            }
-        }
-        return false;
-    }
-    /*>>testprop*/
-
-    // TODO :: add testDOMProps
-    /**
-     * testDOMProps is a generic DOM property test; if a browser supports
-     *   a certain property, it won't return undefined for it.
-     */
-    function testDOMProps( props, obj, elem ) {
-        for ( var i in props ) {
-            var item = obj[props[i]];
-            if ( item !== undefined) {
-
-                // return the property name as a string
-                if (elem === false) return props[i];
-
-                // let's bind a function
-                if (is(item, 'function')){
-                  // default to autobind unless override
-                  return item.bind(elem || obj);
-                }
-
-                // return the unbound function or obj or value
-                return item;
-            }
-        }
-        return false;
-    }
-
-    /*>>testallprops*/
-    /**
-     * testPropsAll tests a list of DOM properties we want to check against.
-     *   We specify literally ALL possible (known and/or likely) properties on
-     *   the element including the non-vendor prefixed one, for forward-
-     *   compatibility.
-     */
-    function testPropsAll( prop, prefixed, elem ) {
-
-        var ucProp  = prop.charAt(0).toUpperCase() + prop.slice(1),
-            props   = (prop + ' ' + cssomPrefixes.join(ucProp + ' ') + ucProp).split(' ');
-
-        // did they call .prefixed('boxSizing') or are we just testing a prop?
-        if(is(prefixed, "string") || is(prefixed, "undefined")) {
-          return testProps(props, prefixed);
-
-        // otherwise, they called .prefixed('requestAnimationFrame', window[, elem])
-        } else {
-          props = (prop + ' ' + (domPrefixes).join(ucProp + ' ') + ucProp).split(' ');
-          return testDOMProps(props, prefixed, elem);
-        }
-    }
-    /*>>testallprops*/
-
-
-    /**
-     * Tests
-     * -----
-     */
-
-    // The *new* flexbox
-    // dev.w3.org/csswg/css3-flexbox
-
-    tests['flexbox'] = function() {
-      return testPropsAll('flexWrap');
-    };
-
-    // The *old* flexbox
-    // www.w3.org/TR/2009/WD-css3-flexbox-20090723/
-
-    tests['flexboxlegacy'] = function() {
-        return testPropsAll('boxDirection');
-    };
-
-    // On the S60 and BB Storm, getContext exists, but always returns undefined
-    // so we actually have to call getContext() to verify
-    // github.com/Modernizr/Modernizr/issues/issue/97/
-
-    tests['canvas'] = function() {
-        var elem = document.createElement('canvas');
-        return !!(elem.getContext && elem.getContext('2d'));
-    };
-
-    tests['canvastext'] = function() {
-        return !!(Modernizr['canvas'] && is(document.createElement('canvas').getContext('2d').fillText, 'function'));
-    };
-
-    // webk.it/70117 is tracking a legit WebGL feature detect proposal
-
-    // We do a soft detect which may false positive in order to avoid
-    // an expensive context creation: bugzil.la/732441
-
-    tests['webgl'] = function() {
-        return !!window.WebGLRenderingContext;
-    };
-
-    /*
-     * The Modernizr.touch test only indicates if the browser supports
-     *    touch events, which does not necessarily reflect a touchscreen
-     *    device, as evidenced by tablets running Windows 7 or, alas,
-     *    the Palm Pre / WebOS (touch) phones.
-     *
-     * Additionally, Chrome (desktop) used to lie about its support on this,
-     *    but that has since been rectified: crbug.com/36415
-     *
-     * We also test for Firefox 4 Multitouch Support.
-     *
-     * For more info, see: modernizr.github.com/Modernizr/touch.html
-     */
-
-    tests['touch'] = function() {
-        var bool;
-
-        if(('ontouchstart' in window) || window.DocumentTouch && document instanceof DocumentTouch) {
-          bool = true;
-        } else {
-          injectElementWithStyles(['@media (',prefixes.join('touch-enabled),('),mod,')','{#modernizr{top:9px;position:absolute}}'].join(''), function( node ) {
-            bool = node.offsetTop === 9;
-          });
-        }
-
-        return bool;
-    };
-
-
-    // geolocation is often considered a trivial feature detect...
-    // Turns out, it's quite tricky to get right:
-    //
-    // Using !!navigator.geolocation does two things we don't want. It:
-    //   1. Leaks memory in IE9: github.com/Modernizr/Modernizr/issues/513
-    //   2. Disables page caching in WebKit: webk.it/43956
-    //
-    // Meanwhile, in Firefox < 8, an about:config setting could expose
-    // a false positive that would throw an exception: bugzil.la/688158
-
-    tests['geolocation'] = function() {
-        return 'geolocation' in navigator;
-    };
-
-
-    tests['postmessage'] = function() {
-      return !!window.postMessage;
-    };
-
-
-    // Chrome incognito mode used to throw an exception when using openDatabase
-    // It doesn't anymore.
-    tests['websqldatabase'] = function() {
-      return !!window.openDatabase;
-    };
-
-    // Vendors had inconsistent prefixing with the experimental Indexed DB:
-    // - Webkit's implementation is accessible through webkitIndexedDB
-    // - Firefox shipped moz_indexedDB before FF4b9, but since then has been mozIndexedDB
-    // For speed, we don't test the legacy (and beta-only) indexedDB
-    tests['indexedDB'] = function() {
-      return !!testPropsAll("indexedDB", window);
-    };
-
-    // documentMode logic from YUI to filter out IE8 Compat Mode
-    //   which false positives.
-    tests['hashchange'] = function() {
-      return isEventSupported('hashchange', window) && (document.documentMode === undefined || document.documentMode > 7);
-    };
-
-    // Per 1.6:
-    // This used to be Modernizr.historymanagement but the longer
-    // name has been deprecated in favor of a shorter and property-matching one.
-    // The old API is still available in 1.6, but as of 2.0 will throw a warning,
-    // and in the first release thereafter disappear entirely.
-    tests['history'] = function() {
-      return !!(window.history && history.pushState);
-    };
-
-    tests['draganddrop'] = function() {
-        var div = document.createElement('div');
-        return ('draggable' in div) || ('ondragstart' in div && 'ondrop' in div);
-    };
-
-    // FF3.6 was EOL'ed on 4/24/12, but the ESR version of FF10
-    // will be supported until FF19 (2/12/13), at which time, ESR becomes FF17.
-    // FF10 still uses prefixes, so check for it until then.
-    // for more ESR info, see: mozilla.org/en-US/firefox/organizations/faq/
-    tests['websockets'] = function() {
-        return 'WebSocket' in window || 'MozWebSocket' in window;
-    };
-
-
-    // css-tricks.com/rgba-browser-support/
-    tests['rgba'] = function() {
-        // Set an rgba() color and check the returned value
-
-        setCss('background-color:rgba(150,255,150,.5)');
-
-        return contains(mStyle.backgroundColor, 'rgba');
-    };
-
-    tests['hsla'] = function() {
-        // Same as rgba(), in fact, browsers re-map hsla() to rgba() internally,
-        //   except IE9 who retains it as hsla
-
-        setCss('background-color:hsla(120,40%,100%,.5)');
-
-        return contains(mStyle.backgroundColor, 'rgba') || contains(mStyle.backgroundColor, 'hsla');
-    };
-
-    tests['multiplebgs'] = function() {
-        // Setting multiple images AND a color on the background shorthand property
-        //  and then querying the style.background property value for the number of
-        //  occurrences of "url(" is a reliable method for detecting ACTUAL support for this!
-
-        setCss('background:url(https://),url(https://),red url(https://)');
-
-        // If the UA supports multiple backgrounds, there should be three occurrences
-        //   of the string "url(" in the return value for elemStyle.background
-
-        return (/(url\s*\(.*?){3}/).test(mStyle.background);
-    };
-
-
-
-    // this will false positive in Opera Mini
-    //   github.com/Modernizr/Modernizr/issues/396
-
-    tests['backgroundsize'] = function() {
-        return testPropsAll('backgroundSize');
-    };
-
-    tests['borderimage'] = function() {
-        return testPropsAll('borderImage');
-    };
-
-
-    // Super comprehensive table about all the unique implementations of
-    // border-radius: muddledramblings.com/table-of-css3-border-radius-compliance
-
-    tests['borderradius'] = function() {
-        return testPropsAll('borderRadius');
-    };
-
-    // WebOS unfortunately false positives on this test.
-    tests['boxshadow'] = function() {
-        return testPropsAll('boxShadow');
-    };
-
-    // FF3.0 will false positive on this test
-    tests['textshadow'] = function() {
-        return document.createElement('div').style.textShadow === '';
-    };
-
-
-    tests['opacity'] = function() {
-        // Browsers that actually have CSS Opacity implemented have done so
-        //  according to spec, which means their return values are within the
-        //  range of [0.0,1.0] - including the leading zero.
-
-        setCssAll('opacity:.55');
-
-        // The non-literal . in this regex is intentional:
-        //   German Chrome returns this value as 0,55
-        // github.com/Modernizr/Modernizr/issues/#issue/59/comment/516632
-        return (/^0.55$/).test(mStyle.opacity);
-    };
-
-
-    // Note, Android < 4 will pass this test, but can only animate
-    //   a single property at a time
-    //   daneden.me/2011/12/putting-up-with-androids-bullshit/
-    tests['cssanimations'] = function() {
-        return testPropsAll('animationName');
-    };
-
-
-    tests['csscolumns'] = function() {
-        return testPropsAll('columnCount');
-    };
-
-
-    tests['cssgradients'] = function() {
-        /**
-         * For CSS Gradients syntax, please see:
-         * webkit.org/blog/175/introducing-css-gradients/
-         * developer.mozilla.org/en/CSS/-moz-linear-gradient
-         * developer.mozilla.org/en/CSS/-moz-radial-gradient
-         * dev.w3.org/csswg/css3-images/#gradients-
-         */
-
-        var str1 = 'background-image:',
-            str2 = 'gradient(linear,left top,right bottom,from(#9f9),to(white));',
-            str3 = 'linear-gradient(left top,#9f9, white);';
-
-        setCss(
-             // legacy webkit syntax (FIXME: remove when syntax not in use anymore)
-              (str1 + '-webkit- '.split(' ').join(str2 + str1) +
-             // standard syntax             // trailing 'background-image:'
-              prefixes.join(str3 + str1)).slice(0, -str1.length)
-        );
-
-        return contains(mStyle.backgroundImage, 'gradient');
-    };
-
-
-    tests['cssreflections'] = function() {
-        return testPropsAll('boxReflect');
-    };
-
-
-    tests['csstransforms'] = function() {
-        return !!testPropsAll('transform');
-    };
-
-
-    tests['csstransforms3d'] = function() {
-
-        var ret = !!testPropsAll('perspective');
-
-        // Webkit's 3D transforms are passed off to the browser's own graphics renderer.
-        //   It works fine in Safari on Leopard and Snow Leopard, but not in Chrome in
-        //   some conditions. As a result, Webkit typically recognizes the syntax but
-        //   will sometimes throw a false positive, thus we must do a more thorough check:
-        if ( ret && 'webkitPerspective' in docElement.style ) {
-
-          // Webkit allows this media query to succeed only if the feature is enabled.
-          // `@media (transform-3d),(-webkit-transform-3d){ ... }`
-          injectElementWithStyles('@media (transform-3d),(-webkit-transform-3d){#modernizr{left:9px;position:absolute;height:3px;}}', function( node, rule ) {
-            ret = node.offsetLeft === 9 && node.offsetHeight === 3;
-          });
-        }
-        return ret;
-    };
-
-
-    tests['csstransitions'] = function() {
-        return testPropsAll('transition');
-    };
-
-
-    /*>>fontface*/
-    // @font-face detection routine by Diego Perini
-    // javascript.nwbox.com/CSSSupport/
-
-    // false positives:
-    //   WebOS github.com/Modernizr/Modernizr/issues/342
-    //   WP7   github.com/Modernizr/Modernizr/issues/538
-    tests['fontface'] = function() {
-        var bool;
-
-        injectElementWithStyles('@font-face {font-family:"font";src:url("https://")}', function( node, rule ) {
-          var style = document.getElementById('smodernizr'),
-              sheet = style.sheet || style.styleSheet,
-              cssText = sheet ? (sheet.cssRules && sheet.cssRules[0] ? sheet.cssRules[0].cssText : sheet.cssText || '') : '';
-
-          bool = /src/i.test(cssText) && cssText.indexOf(rule.split(' ')[0]) === 0;
-        });
-
-        return bool;
-    };
-    /*>>fontface*/
-
-    // CSS generated content detection
-    tests['generatedcontent'] = function() {
-        var bool;
-
-        injectElementWithStyles(['#',mod,'{font:0/0 a}#',mod,':after{content:"',smile,'";visibility:hidden;font:3px/1 a}'].join(''), function( node ) {
-          bool = node.offsetHeight >= 3;
-        });
-
-        return bool;
-    };
-
-
-
-    // These tests evaluate support of the video/audio elements, as well as
-    // testing what types of content they support.
-    //
-    // We're using the Boolean constructor here, so that we can extend the value
-    // e.g.  Modernizr.video     // true
-    //       Modernizr.video.ogg // 'probably'
-    //
-    // Codec values from : github.com/NielsLeenheer/html5test/blob/9106a8/index.html#L845
-    //                     thx to NielsLeenheer and zcorpan
-
-    // Note: in some older browsers, "no" was a return value instead of empty string.
-    //   It was live in FF3.5.0 and 3.5.1, but fixed in 3.5.2
-    //   It was also live in Safari 4.0.0 - 4.0.4, but fixed in 4.0.5
-
-    tests['video'] = function() {
-        var elem = document.createElement('video'),
-            bool = false;
-
-        // IE9 Running on Windows Server SKU can cause an exception to be thrown, bug #224
-        try {
-            if ( bool = !!elem.canPlayType ) {
-                bool      = new Boolean(bool);
-                bool.ogg  = elem.canPlayType('video/ogg; codecs="theora"')      .replace(/^no$/,'');
-
-                // Without QuickTime, this value will be `undefined`. github.com/Modernizr/Modernizr/issues/546
-                bool.h264 = elem.canPlayType('video/mp4; codecs="avc1.42E01E"') .replace(/^no$/,'');
-
-                bool.webm = elem.canPlayType('video/webm; codecs="vp8, vorbis"').replace(/^no$/,'');
-            }
-
-        } catch(e) { }
-
-        return bool;
-    };
-
-    tests['audio'] = function() {
-        var elem = document.createElement('audio'),
-            bool = false;
-
-        try {
-            if ( bool = !!elem.canPlayType ) {
-                bool      = new Boolean(bool);
-                bool.ogg  = elem.canPlayType('audio/ogg; codecs="vorbis"').replace(/^no$/,'');
-                bool.mp3  = elem.canPlayType('audio/mpeg;')               .replace(/^no$/,'');
-
-                // Mimetypes accepted:
-                //   developer.mozilla.org/En/Media_formats_supported_by_the_audio_and_video_elements
-                //   bit.ly/iphoneoscodecs
-                bool.wav  = elem.canPlayType('audio/wav; codecs="1"')     .replace(/^no$/,'');
-                bool.m4a  = ( elem.canPlayType('audio/x-m4a;')            ||
-                              elem.canPlayType('audio/aac;'))             .replace(/^no$/,'');
-            }
-        } catch(e) { }
-
-        return bool;
-    };
-
-
-    // In FF4, if disabled, window.localStorage should === null.
-
-    // Normally, we could not test that directly and need to do a
-    //   `('localStorage' in window) && ` test first because otherwise Firefox will
-    //   throw bugzil.la/365772 if cookies are disabled
-
-    // Also in iOS5 Private Browsing mode, attempting to use localStorage.setItem
-    // will throw the exception:
-    //   QUOTA_EXCEEDED_ERRROR DOM Exception 22.
-    // Peculiarly, getItem and removeItem calls do not throw.
-
-    // Because we are forced to try/catch this, we'll go aggressive.
-
-    // Just FWIW: IE8 Compat mode supports these features completely:
-    //   www.quirksmode.org/dom/html5.html
-    // But IE8 doesn't support either with local files
-
-    tests['localstorage'] = function() {
-        try {
-            localStorage.setItem(mod, mod);
-            localStorage.removeItem(mod);
-            return true;
-        } catch(e) {
-            return false;
-        }
-    };
-
-    tests['sessionstorage'] = function() {
-        try {
-            sessionStorage.setItem(mod, mod);
-            sessionStorage.removeItem(mod);
-            return true;
-        } catch(e) {
-            return false;
-        }
-    };
-
-
-    tests['webworkers'] = function() {
-        return !!window.Worker;
-    };
-
-
-    tests['applicationcache'] = function() {
-        return !!window.applicationCache;
-    };
-
-
-    // Thanks to Erik Dahlstrom
-    tests['svg'] = function() {
-        return !!document.createElementNS && !!document.createElementNS(ns.svg, 'svg').createSVGRect;
-    };
-
-    // specifically for SVG inline in HTML, not within XHTML
-    // test page: paulirish.com/demo/inline-svg
-    tests['inlinesvg'] = function() {
-      var div = document.createElement('div');
-      div.innerHTML = '<svg/>';
-      return (div.firstChild && div.firstChild.namespaceURI) == ns.svg;
-    };
-
-    // SVG SMIL animation
-    tests['smil'] = function() {
-        return !!document.createElementNS && /SVGAnimate/.test(toString.call(document.createElementNS(ns.svg, 'animate')));
-    };
-
-    // This test is only for clip paths in SVG proper, not clip paths on HTML content
-    // demo: srufaculty.sru.edu/david.dailey/svg/newstuff/clipPath4.svg
-
-    // However read the comments to dig into applying SVG clippaths to HTML content here:
-    //   github.com/Modernizr/Modernizr/issues/213#issuecomment-1149491
-    tests['svgclippaths'] = function() {
-        return !!document.createElementNS && /SVGClipPath/.test(toString.call(document.createElementNS(ns.svg, 'clipPath')));
-    };
-
-    /*>>webforms*/
-    // input features and input types go directly onto the ret object, bypassing the tests loop.
-    // Hold this guy to execute in a moment.
-    function webforms() {
-        /*>>input*/
-        // Run through HTML5's new input attributes to see if the UA understands any.
-        // We're using f which is the <input> element created early on
-        // Mike Taylr has created a comprehensive resource for testing these attributes
-        //   when applied to all input types:
-        //   miketaylr.com/code/input-type-attr.html
-        // spec: www.whatwg.org/specs/web-apps/current-work/multipage/the-input-element.html#input-type-attr-summary
-
-        // Only input placeholder is tested while textarea's placeholder is not.
-        // Currently Safari 4 and Opera 11 have support only for the input placeholder
-        // Both tests are available in feature-detects/forms-placeholder.js
-        Modernizr['input'] = (function( props ) {
-            for ( var i = 0, len = props.length; i < len; i++ ) {
-                attrs[ props[i] ] = !!(props[i] in inputElem);
-            }
-            if (attrs.list){
-              // safari false positive's on datalist: webk.it/74252
-              // see also github.com/Modernizr/Modernizr/issues/146
-              attrs.list = !!(document.createElement('datalist') && window.HTMLDataListElement);
-            }
-            return attrs;
-        })('autocomplete autofocus list placeholder max min multiple pattern required step'.split(' '));
-        /*>>input*/
-
-        /*>>inputtypes*/
-        // Run through HTML5's new input types to see if the UA understands any.
-        //   This is put behind the tests runloop because it doesn't return a
-        //   true/false like all the other tests; instead, it returns an object
-        //   containing each input type with its corresponding true/false value
-
-        // Big thanks to @miketaylr for the html5 forms expertise. miketaylr.com/
-        Modernizr['inputtypes'] = (function(props) {
-
-            for ( var i = 0, bool, inputElemType, defaultView, len = props.length; i < len; i++ ) {
-
-                inputElem.setAttribute('type', inputElemType = props[i]);
-                bool = inputElem.type !== 'text';
-
-                // We first check to see if the type we give it sticks..
-                // If the type does, we feed it a textual value, which shouldn't be valid.
-                // If the value doesn't stick, we know there's input sanitization which infers a custom UI
-                if ( bool ) {
-
-                    inputElem.value         = smile;
-                    inputElem.style.cssText = 'position:absolute;visibility:hidden;';
-
-                    if ( /^range$/.test(inputElemType) && inputElem.style.WebkitAppearance !== undefined ) {
-
-                      docElement.appendChild(inputElem);
-                      defaultView = document.defaultView;
-
-                      // Safari 2-4 allows the smiley as a value, despite making a slider
-                      bool =  defaultView.getComputedStyle &&
-                              defaultView.getComputedStyle(inputElem, null).WebkitAppearance !== 'textfield' &&
-                              // Mobile android web browser has false positive, so must
-                              // check the height to see if the widget is actually there.
-                              (inputElem.offsetHeight !== 0);
-
-                      docElement.removeChild(inputElem);
-
-                    } else if ( /^(search|tel)$/.test(inputElemType) ){
-                      // Spec doesn't define any special parsing or detectable UI
-                      //   behaviors so we pass these through as true
-
-                      // Interestingly, opera fails the earlier test, so it doesn't
-                      //  even make it here.
-
-                    } else if ( /^(url|email)$/.test(inputElemType) ) {
-                      // Real url and email support comes with prebaked validation.
-                      bool = inputElem.checkValidity && inputElem.checkValidity() === false;
-
-                    } else {
-                      // If the upgraded input compontent rejects the :) text, we got a winner
-                      bool = inputElem.value != smile;
-                    }
-                }
-
-                inputs[ props[i] ] = !!bool;
-            }
-            return inputs;
-        })('search tel url email datetime date month week time datetime-local number range color'.split(' '));
-        /*>>inputtypes*/
-    }
-    /*>>webforms*/
-
-
-    // End of test definitions
-    // -----------------------
-
-
-
-    // Run through all tests and detect their support in the current UA.
-    // todo: hypothetically we could be doing an array of tests and use a basic loop here.
-    for ( var feature in tests ) {
-        if ( hasOwnProp(tests, feature) ) {
-            // run the test, throw the return value into the Modernizr,
-            //   then based on that boolean, define an appropriate className
-            //   and push it into an array of classes we'll join later.
-            featureName  = feature.toLowerCase();
-            Modernizr[featureName] = tests[feature]();
-
-            classes.push((Modernizr[featureName] ? '' : 'no-') + featureName);
-        }
-    }
-
-    /*>>webforms*/
-    // input tests need to run.
-    Modernizr.input || webforms();
-    /*>>webforms*/
-
-
-    /**
-     * addTest allows the user to define their own feature tests
-     * the result will be added onto the Modernizr object,
-     * as well as an appropriate className set on the html element
-     *
-     * @param feature - String naming the feature
-     * @param test - Function returning true if feature is supported, false if not
-     */
-     Modernizr.addTest = function ( feature, test ) {
-       if ( typeof feature == 'object' ) {
-         for ( var key in feature ) {
-           if ( hasOwnProp( feature, key ) ) {
-             Modernizr.addTest( key, feature[ key ] );
-           }
-         }
-       } else {
-
-         feature = feature.toLowerCase();
-
-         if ( Modernizr[feature] !== undefined ) {
-           // we're going to quit if you're trying to overwrite an existing test
-           // if we were to allow it, we'd do this:
-           //   var re = new RegExp("\\b(no-)?" + feature + "\\b");
-           //   docElement.className = docElement.className.replace( re, '' );
-           // but, no rly, stuff 'em.
-           return Modernizr;
-         }
-
-         test = typeof test == 'function' ? test() : test;
-
-         if (typeof enableClasses !== "undefined" && enableClasses) {
-           docElement.className += ' ' + (test ? '' : 'no-') + feature;
-         }
-         Modernizr[feature] = test;
-
-       }
-
-       return Modernizr; // allow chaining.
-     };
-
-
-    // Reset modElem.cssText to nothing to reduce memory footprint.
-    setCss('');
-    modElem = inputElem = null;
-
-    /*>>shiv*/
-    /*! HTML5 Shiv v3.6.1 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed */
-    ;(function(window, document) {
-    /*jshint evil:true */
-      /** Preset options */
-      var options = window.html5 || {};
-
-      /** Used to skip problem elements */
-      var reSkip = /^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i;
-
-      /** Not all elements can be cloned in IE **/
-      var saveClones = /^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i;
-
-      /** Detect whether the browser supports default html5 styles */
-      var supportsHtml5Styles;
-
-      /** Name of the expando, to work with multiple documents or to re-shiv one document */
-      var expando = '_html5shiv';
-
-      /** The id for the the documents expando */
-      var expanID = 0;
-
-      /** Cached data for each document */
-      var expandoData = {};
-
-      /** Detect whether the browser supports unknown elements */
-      var supportsUnknownElements;
-
-      (function() {
-        try {
-            var a = document.createElement('a');
-            a.innerHTML = '<xyz></xyz>';
-            //if the hidden property is implemented we can assume, that the browser supports basic HTML5 Styles
-            supportsHtml5Styles = ('hidden' in a);
-
-            supportsUnknownElements = a.childNodes.length == 1 || (function() {
-              // assign a false positive if unable to shiv
-              (document.createElement)('a');
-              var frag = document.createDocumentFragment();
-              return (
-                typeof frag.cloneNode == 'undefined' ||
-                typeof frag.createDocumentFragment == 'undefined' ||
-                typeof frag.createElement == 'undefined'
-              );
-            }());
-        } catch(e) {
-          supportsHtml5Styles = true;
-          supportsUnknownElements = true;
-        }
-
-      }());
-
-      /*--------------------------------------------------------------------------*/
-
-      /**
-       * Creates a style sheet with the given CSS text and adds it to the document.
-       * @private
-       * @param {Document} ownerDocument The document.
-       * @param {String} cssText The CSS text.
-       * @returns {StyleSheet} The style element.
-       */
-      function addStyleSheet(ownerDocument, cssText) {
-        var p = ownerDocument.createElement('p'),
-            parent = ownerDocument.getElementsByTagName('head')[0] || ownerDocument.documentElement;
-
-        p.innerHTML = 'x<style>' + cssText + '</style>';
-        return parent.insertBefore(p.lastChild, parent.firstChild);
-      }
-
-      /**
-       * Returns the value of `html5.elements` as an array.
-       * @private
-       * @returns {Array} An array of shived element node names.
-       */
-      function getElements() {
-        var elements = html5.elements;
-        return typeof elements == 'string' ? elements.split(' ') : elements;
-      }
-
-        /**
-       * Returns the data associated to the given document
-       * @private
-       * @param {Document} ownerDocument The document.
-       * @returns {Object} An object of data.
-       */
-      function getExpandoData(ownerDocument) {
-        var data = expandoData[ownerDocument[expando]];
-        if (!data) {
-            data = {};
-            expanID++;
-            ownerDocument[expando] = expanID;
-            expandoData[expanID] = data;
-        }
-        return data;
-      }
-
-      /**
-       * returns a shived element for the given nodeName and document
-       * @memberOf html5
-       * @param {String} nodeName name of the element
-       * @param {Document} ownerDocument The context document.
-       * @returns {Object} The shived element.
-       */
-      function createElement(nodeName, ownerDocument, data){
-        if (!ownerDocument) {
-            ownerDocument = document;
-        }
-        if(supportsUnknownElements){
-            return ownerDocument.createElement(nodeName);
-        }
-        if (!data) {
-            data = getExpandoData(ownerDocument);
-        }
-        var node;
-
-        if (data.cache[nodeName]) {
-            node = data.cache[nodeName].cloneNode();
-        } else if (saveClones.test(nodeName)) {
-            node = (data.cache[nodeName] = data.createElem(nodeName)).cloneNode();
-        } else {
-            node = data.createElem(nodeName);
-        }
-
-        // Avoid adding some elements to fragments in IE < 9 because
-        // * Attributes like `name` or `type` cannot be set/changed once an element
-        //   is inserted into a document/fragment
-        // * Link elements with `src` attributes that are inaccessible, as with
-        //   a 403 response, will cause the tab/window to crash
-        // * Script elements appended to fragments will execute when their `src`
-        //   or `text` property is set
-        return node.canHaveChildren && !reSkip.test(nodeName) ? data.frag.appendChild(node) : node;
-      }
-
-      /**
-       * returns a shived DocumentFragment for the given document
-       * @memberOf html5
-       * @param {Document} ownerDocument The context document.
-       * @returns {Object} The shived DocumentFragment.
-       */
-      function createDocumentFragment(ownerDocument, data){
-        if (!ownerDocument) {
-            ownerDocument = document;
-        }
-        if(supportsUnknownElements){
-            return ownerDocument.createDocumentFragment();
-        }
-        data = data || getExpandoData(ownerDocument);
-        var clone = data.frag.cloneNode(),
-            i = 0,
-            elems = getElements(),
-            l = elems.length;
-        for(;i<l;i++){
-            clone.createElement(elems[i]);
-        }
-        return clone;
-      }
-
-      /**
-       * Shivs the `createElement` and `createDocumentFragment` methods of the document.
-       * @private
-       * @param {Document|DocumentFragment} ownerDocument The document.
-       * @param {Object} data of the document.
-       */
-      function shivMethods(ownerDocument, data) {
-        if (!data.cache) {
-            data.cache = {};
-            data.createElem = ownerDocument.createElement;
-            data.createFrag = ownerDocument.createDocumentFragment;
-            data.frag = data.createFrag();
-        }
-
-
-        ownerDocument.createElement = function(nodeName) {
-          //abort shiv
-          if (!html5.shivMethods) {
-              return data.createElem(nodeName);
-          }
-          return createElement(nodeName, ownerDocument, data);
-        };
-
-        ownerDocument.createDocumentFragment = Function('h,f', 'return function(){' +
-          'var n=f.cloneNode(),c=n.createElement;' +
-          'h.shivMethods&&(' +
-            // unroll the `createElement` calls
-            getElements().join().replace(/\w+/g, function(nodeName) {
-              data.createElem(nodeName);
-              data.frag.createElement(nodeName);
-              return 'c("' + nodeName + '")';
-            }) +
-          ');return n}'
-        )(html5, data.frag);
-      }
-
-      /*--------------------------------------------------------------------------*/
-
-      /**
-       * Shivs the given document.
-       * @memberOf html5
-       * @param {Document} ownerDocument The document to shiv.
-       * @returns {Document} The shived document.
-       */
-      function shivDocument(ownerDocument) {
-        if (!ownerDocument) {
-            ownerDocument = document;
-        }
-        var data = getExpandoData(ownerDocument);
-
-        if (html5.shivCSS && !supportsHtml5Styles && !data.hasCSS) {
-          data.hasCSS = !!addStyleSheet(ownerDocument,
-            // corrects block display not defined in IE6/7/8/9
-            'article,aside,figcaption,figure,footer,header,hgroup,nav,section{display:block}' +
-            // adds styling not present in IE6/7/8/9
-            'mark{background:#FF0;color:#000}'
-          );
-        }
-        if (!supportsUnknownElements) {
-          shivMethods(ownerDocument, data);
-        }
-        return ownerDocument;
-      }
-
-      /*--------------------------------------------------------------------------*/
-
-      /**
-       * The `html5` object is exposed so that more elements can be shived and
-       * existing shiving can be detected on iframes.
-       * @type Object
-       * @example
-       *
-       * // options can be changed before the script is included
-       * html5 = { 'elements': 'mark section', 'shivCSS': false, 'shivMethods': false };
-       */
-      var html5 = {
-
-        /**
-         * An array or space separated string of node names of the elements to shiv.
-         * @memberOf html5
-         * @type Array|String
-         */
-        'elements': options.elements || 'abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video',
-
-        /**
-         * A flag to indicate that the HTML5 style sheet should be inserted.
-         * @memberOf html5
-         * @type Boolean
-         */
-        'shivCSS': (options.shivCSS !== false),
-
-        /**
-         * Is equal to true if a browser supports creating unknown/HTML5 elements
-         * @memberOf html5
-         * @type boolean
-         */
-        'supportsUnknownElements': supportsUnknownElements,
-
-        /**
-         * A flag to indicate that the document's `createElement` and `createDocumentFragment`
-         * methods should be overwritten.
-         * @memberOf html5
-         * @type Boolean
-         */
-        'shivMethods': (options.shivMethods !== false),
-
-        /**
-         * A string to describe the type of `html5` object ("default" or "default print").
-         * @memberOf html5
-         * @type String
-         */
-        'type': 'default',
-
-        // shivs the document according to the specified `html5` object options
-        'shivDocument': shivDocument,
-
-        //creates a shived element
-        createElement: createElement,
-
-        //creates a shived documentFragment
-        createDocumentFragment: createDocumentFragment
-      };
-
-      /*--------------------------------------------------------------------------*/
-
-      // expose html5
-      window.html5 = html5;
-
-      // shiv the document
-      shivDocument(document);
-
-    }(this, document));
-    /*>>shiv*/
-
-    // Assign private properties to the return object with prefix
-    Modernizr._version      = version;
-
-    // expose these for the plugin API. Look in the source for how to join() them against your input
-    /*>>prefixes*/
-    Modernizr._prefixes     = prefixes;
-    /*>>prefixes*/
-    /*>>domprefixes*/
-    Modernizr._domPrefixes  = domPrefixes;
-    Modernizr._cssomPrefixes  = cssomPrefixes;
-    /*>>domprefixes*/
-
-    /*>>mq*/
-    // Modernizr.mq tests a given media query, live against the current state of the window
-    // A few important notes:
-    //   * If a browser does not support media queries at all (eg. oldIE) the mq() will always return false
-    //   * A max-width or orientation query will be evaluated against the current state, which may change later.
-    //   * You must specify values. Eg. If you are testing support for the min-width media query use:
-    //       Modernizr.mq('(min-width:0)')
-    // usage:
-    // Modernizr.mq('only screen and (max-width:768)')
-    Modernizr.mq            = testMediaQuery;
-    /*>>mq*/
-
-    /*>>hasevent*/
-    // Modernizr.hasEvent() detects support for a given event, with an optional element to test on
-    // Modernizr.hasEvent('gesturestart', elem)
-    Modernizr.hasEvent      = isEventSupported;
-    /*>>hasevent*/
-
-    /*>>testprop*/
-    // Modernizr.testProp() investigates whether a given style property is recognized
-    // Note that the property names must be provided in the camelCase variant.
-    // Modernizr.testProp('pointerEvents')
-    Modernizr.testProp      = function(prop){
-        return testProps([prop]);
-    };
-    /*>>testprop*/
-
-    /*>>testallprops*/
-    // Modernizr.testAllProps() investigates whether a given style property,
-    //   or any of its vendor-prefixed variants, is recognized
-    // Note that the property names must be provided in the camelCase variant.
-    // Modernizr.testAllProps('boxSizing')
-    Modernizr.testAllProps  = testPropsAll;
-    /*>>testallprops*/
-
-
-    /*>>teststyles*/
-    // Modernizr.testStyles() allows you to add custom styles to the document and test an element afterwards
-    // Modernizr.testStyles('#modernizr { position:absolute }', function(elem, rule){ ... })
-    Modernizr.testStyles    = injectElementWithStyles;
-    /*>>teststyles*/
-
-
-    /*>>prefixed*/
-    // Modernizr.prefixed() returns the prefixed or nonprefixed property name variant of your input
-    // Modernizr.prefixed('boxSizing') // 'MozBoxSizing'
-
-    // Properties must be passed as dom-style camelcase, rather than `box-sizing` hypentated style.
-    // Return values will also be the camelCase variant, if you need to translate that to hypenated style use:
-    //
-    //     str.replace(/([A-Z])/g, function(str,m1){ return '-' + m1.toLowerCase(); }).replace(/^ms-/,'-ms-');
-
-    // If you're trying to ascertain which transition end event to bind to, you might do something like...
-    //
-    //     var transEndEventNames = {
-    //       'WebkitTransition' : 'webkitTransitionEnd',
-    //       'MozTransition'    : 'transitionend',
-    //       'OTransition'      : 'oTransitionEnd',
-    //       'msTransition'     : 'MSTransitionEnd',
-    //       'transition'       : 'transitionend'
-    //     },
-    //     transEndEventName = transEndEventNames[ Modernizr.prefixed('transition') ];
-
-    Modernizr.prefixed      = function(prop, obj, elem){
-      if(!obj) {
-        return testPropsAll(prop, 'pfx');
-      } else {
-        // Testing DOM property e.g. Modernizr.prefixed('requestAnimationFrame', window) // 'mozRequestAnimationFrame'
-        return testPropsAll(prop, obj, elem);
-      }
-    };
-    /*>>prefixed*/
-
-
-    /*>>cssclasses*/
-    // Remove "no-js" class from <html> element, if it exists:
-    docElement.className = docElement.className.replace(/(^|\s)no-js(\s|$)/, '$1$2') +
-
-                            // Add the new classes to the <html> element.
-                            (enableClasses ? ' js ' + classes.join(' ') : '');
-    /*>>cssclasses*/
-
-    return Modernizr;
-
-})(this, this.document);
diff --git a/NewLife.Cube/Setting.cs b/NewLife.Cube/Setting.cs
deleted file mode 100644
index f3228dfad0..0000000000
--- a/NewLife.Cube/Setting.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-﻿using System;
-using System.ComponentModel;
-using System.Web;
-using NewLife.Security;
-using NewLife.Xml;
-
-namespace NewLife.Cube
-{
-    /// <summary>魔方设置</summary>
-    [DisplayName("魔方设置")]
-    [XmlConfigFile(@"Config\Cube.config", 15000)]
-    public class Setting : XmlConfig<Setting>
-    {
-        #region 属性
-        /// <summary>是否启用调试。默认为不启用</summary>
-        [Description("调试")]
-        public Boolean Debug { get; set; }
-
-        /// <summary>显示运行时间</summary>
-        [Description("显示运行时间")]
-        public Boolean ShowRunTime { get; set; } = true;
-
-        /// <summary>扩展插件服务器。将从该网页上根据关键字分析链接并下载插件</summary>
-        [Description("扩展插件服务器。将从该网页上根据关键字分析链接并下载插件")]
-        public String PluginServer { get; set; } = "http://x.newlifex.com/";
-
-        /// <summary>工作台页面。进入后台的第一个内容页</summary>
-        [Description("工作台页面。进入后台的第一个内容页")]
-        public String StartPage { get; set; }
-
-        /// <summary>布局页。</summary>
-        [Description("布局页。")]
-        public String Layout { get; set; } = "~/Views/Shared/_Ace_Layout.cshtml";
-
-        /// <summary>默认角色。注册用户得到的角色，0使用认证中心角色，-1强制使用</summary>
-        [Description("默认角色。注册用户得到的角色，0使用认证中心角色，-1强制使用")]
-        public Int32 DefaultRole { get; set; } = 0;
-
-        /// <summary>启用密码登录。允许输入用户名密码进行登录</summary>
-        [Description("启用密码登录。允许输入用户名密码进行登录")]
-        public Boolean AllowLogin { get; set; } = true;
-
-        /// <summary>启用注册。允许输入用户名密码进行注册</summary>
-        [Description("启用注册。允许输入用户名密码进行注册")]
-        public Boolean AllowRegister { get; set; } = true;
-
-        /// <summary>自动注册。第三方登录后，如果本地未登录，自动注册新用户</summary>
-        [Description("自动注册。第三方登录后，如果本地未登录，自动注册新用户")]
-        public Boolean AutoRegister { get; set; } = true;
-
-        /// <summary>强行绑定用户。根据OAuth登录返回用户名强项绑定本地同名用户，而不需要增加提供者前缀</summary>
-        [Description("强行绑定用户。根据OAuth登录返回用户名强项绑定本地同名用户，而不需要增加提供者前缀")]
-        public Boolean ForceBindUser { get; set; }
-
-        /// <summary>会话超时。单点登录后会话超时时间，该时间内可借助Cookie登录，默认0s</summary>
-        [Description("会话超时。单点登录后会话超时时间，该时间内可借助Cookie登录，默认0s")]
-        public Int32 SessionTimeout { get; set; } = 0;
-
-        /// <summary>登录提示。留空表示不显示登录提示信息</summary>
-        [Description("登录提示。留空表示不显示登录提示信息")]
-        public String LoginTip { get; set; }
-
-        /// <summary>用户在线。记录用户在线状态</summary>
-        [Description("用户在线。记录用户在线状态")]
-        public Boolean WebOnline { get; set; } = true;
-
-        /// <summary>用户行为。记录用户所有操作</summary>
-        [Description("用户行为。记录用户所有操作")]
-        public Boolean WebBehavior { get; set; }
-
-        /// <summary>访问统计。统计页面访问量</summary>
-        [Description("访问统计。统计页面访问量")]
-        public Boolean WebStatistics { get; set; } = true;
-
-        /// <summary>捕获所有异常。默认false只捕获魔方区域异常</summary>
-        [Description("捕获所有异常。默认false只捕获魔方区域异常")]
-        public Boolean CatchAllException { get; set; }
-
-        /// <summary>表单组样式。大中小屏幕分别3/2/1列</summary>
-        [Description("表单组样式。大中小屏幕分别3/2/1列")]
-        public String FormGroupClass { get; set; } = "form-group col-xs-12 col-sm-6 col-lg-4";
-
-        /// <summary>下拉选择框。使用Bootstrap，美观，但有呈现方面的性能损耗</summary>
-        [Description("下拉选择框。使用Bootstrap，美观，但有呈现方面的性能损耗")]
-        public Boolean BootstrapSelect { get; set; } = true;
-
-        /// <summary>强制SSL。强制使用https访问</summary>
-        [Description("强制SSL。强制使用https访问")]
-        public Boolean ForceSSL { get; set; }
-
-        /// <summary>头像目录。设定后下载远程头像到本地</summary>
-        [Description("头像目录。设定后下载远程头像到本地")]
-        public String AvatarPath { get; set; } = "..\\Avatars";
-
-        ///// <summary>安全密钥。用于加密Cookie等通信内容</summary>
-        //[Description("安全密钥。用于加密Cookie等通信内容")]
-        //public String SecurityKey { get; set; }
-        #endregion
-
-        #region 方法
-        /// <summary>实例化</summary>
-        public Setting() { }
-
-        /// <summary>加载时触发</summary>
-        protected override void OnLoaded()
-        {
-            if (StartPage.IsNullOrEmpty()) StartPage = HttpRuntime.AppDomainAppVirtualPath.EnsureEnd("/") + "Admin/Index/Main";
-            //if (SecurityKey.IsNullOrEmpty()) SecurityKey = Rand.NextString(16);
-
-            base.OnLoaded();
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Views/CubeHome/Index.cshtml b/NewLife.Cube/Views/CubeHome/Index.cshtml
deleted file mode 100644
index 6f47746c01..0000000000
--- a/NewLife.Cube/Views/CubeHome/Index.cshtml
+++ /dev/null
@@ -1,23 +0,0 @@
-﻿@using NewLife.Common;
-@{
-    Layout = null;
-    var page = HttpRuntime.AppDomainAppVirtualPath;
-    page = page.EnsureEnd("/") + "Admin";
-}
-
-<!DOCTYPE html>
-
-<html>
-<head>
-    <meta name="viewport" content="width=device-width" />
-    <title>@SysConfig.Current.DisplayName</title>
-    <meta http-equiv="refresh" content="0;url=@page">
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body>
-    <div>
-        <h1>@SysConfig.Current.DisplayName</h1>
-        <h3>正在启动系统……</h3>
-        @SysConfig.Current.Company
-    </div>
-</body>
-</html>
\ No newline at end of file
diff --git a/NewLife.Cube/Views/CubeHome/Index.generated.cs b/NewLife.Cube/Views/CubeHome/Index.generated.cs
deleted file mode 100644
index bd37e5fe9a..0000000000
--- a/NewLife.Cube/Views/CubeHome/Index.generated.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    
-    #line 1 "..\..\Views\CubeHome\Index.cshtml"
-    using NewLife.Common;
-    
-    #line default
-    #line hidden
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Views/CubeHome/Index.cshtml")]
-    public partial class _Views_CubeHome_Index_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Views_CubeHome_Index_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 2 "..\..\Views\CubeHome\Index.cshtml"
-  
-    Layout = null;
-    var page = HttpRuntime.AppDomainAppVirtualPath;
-    page = page.EnsureEnd("/") + "Admin";
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n\r\n<!DOCTYPE html>\r\n\r\n<html>\r\n<head>\r\n    <meta");
-
-WriteLiteral(" name=\"viewport\"");
-
-WriteLiteral(" content=\"width=device-width\"");
-
-WriteLiteral(" />\r\n    <title>");
-
-            
-            #line 13 "..\..\Views\CubeHome\Index.cshtml"
-      Write(SysConfig.Current.DisplayName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</title>\r\n    <meta");
-
-WriteLiteral(" http-equiv=\"refresh\"");
-
-WriteAttribute("content", Tuple.Create(" content=\"", 324), Tuple.Create("\"", 345)
-, Tuple.Create(Tuple.Create("", 334), Tuple.Create("0;url=", 334), true)
-            
-            #line 14 "..\..\Views\CubeHome\Index.cshtml"
-, Tuple.Create(Tuple.Create("", 340), Tuple.Create<System.Object, System.Int32>(page
-            
-            #line default
-            #line hidden
-, 340), false)
-);
-
-WriteLiteral(">\r\n        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>\r\n<body>\r\n    <div>\r\n        <h1>");
-
-            
-            #line 18 "..\..\Views\CubeHome\Index.cshtml"
-       Write(SysConfig.Current.DisplayName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</h1>\r\n        <h3>正在启动系统……</h3>\r\n");
-
-WriteLiteral("        ");
-
-            
-            #line 20 "..\..\Views\CubeHome\Index.cshtml"
-   Write(SysConfig.Current.Company);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n    </div>\r\n</body>\r\n</html>");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Views/Home/Index.cshtml b/NewLife.Cube/Views/Home/Index.cshtml
deleted file mode 100644
index 5273bfe1f6..0000000000
--- a/NewLife.Cube/Views/Home/Index.cshtml
+++ /dev/null
@@ -1,22 +0,0 @@
-﻿@using NewLife.Common;
-@{
-    Layout = null;
-    var page = HttpRuntime.AppDomainAppVirtualPath;
-    page = page.EnsureEnd("/") + "Admin";
-}
-
-<!DOCTYPE html>
-
-<html>
-<head>
-    <meta name="viewport" content="width=device-width" />
-    <title>@SysConfig.Current.DisplayName</title>
-    <meta http-equiv="refresh" content="0;url=@page">
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body>
-    <div>
-        <h1>@SysConfig.Current.DisplayName</h1>
-        @SysConfig.Current.Company
-    </div>
-</body>
-</html>
\ No newline at end of file
diff --git a/NewLife.Cube/Views/Home/Index.generated.cs b/NewLife.Cube/Views/Home/Index.generated.cs
deleted file mode 100644
index 30f059f9cd..0000000000
--- a/NewLife.Cube/Views/Home/Index.generated.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    
-    #line 1 "..\..\Views\Home\Index.cshtml"
-    using NewLife.Common;
-    
-    #line default
-    #line hidden
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Home/Index.cshtml")]
-    public partial class _Views_Home_Index_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Views_Home_Index_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 2 "..\..\Views\Home\Index.cshtml"
-  
-    Layout = null;
-    var page = HttpRuntime.AppDomainAppVirtualPath;
-    page = page.EnsureEnd("/") + "Admin";
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n\r\n<!DOCTYPE html>\r\n\r\n<html>\r\n<head>\r\n    <meta");
-
-WriteLiteral(" name=\"viewport\"");
-
-WriteLiteral(" content=\"width=device-width\"");
-
-WriteLiteral(" />\r\n    <title>");
-
-            
-            #line 13 "..\..\Views\Home\Index.cshtml"
-      Write(SysConfig.Current.DisplayName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</title>\r\n    <meta");
-
-WriteLiteral(" http-equiv=\"refresh\"");
-
-WriteAttribute("content", Tuple.Create(" content=\"", 324), Tuple.Create("\"", 345)
-, Tuple.Create(Tuple.Create("", 334), Tuple.Create("0;url=", 334), true)
-            
-            #line 14 "..\..\Views\Home\Index.cshtml"
-, Tuple.Create(Tuple.Create("", 340), Tuple.Create<System.Object, System.Int32>(page
-            
-            #line default
-            #line hidden
-, 340), false)
-);
-
-WriteLiteral(">\r\n        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>\r\n<body>\r\n    <div>\r\n        <h1>");
-
-            
-            #line 18 "..\..\Views\Home\Index.cshtml"
-       Write(SysConfig.Current.DisplayName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</h1>\r\n");
-
-WriteLiteral("        ");
-
-            
-            #line 19 "..\..\Views\Home\Index.cshtml"
-   Write(SysConfig.Current.Company);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n    </div>\r\n</body>\r\n</html>");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Views/Shared/CubeError.cshtml b/NewLife.Cube/Views/Shared/CubeError.cshtml
deleted file mode 100644
index 76f13c75cb..0000000000
--- a/NewLife.Cube/Views/Shared/CubeError.cshtml
+++ /dev/null
@@ -1,36 +0,0 @@
-﻿@model System.Web.Mvc.HandleErrorInfo
-@{
-    //Layout = "_Ace_Layout.cshtml";
-    Layout = "_Layout.cshtml";
-    //Layout = NewLife.Cube.Setting.Current.Layout;
-    ViewBag.Title = "处理你的请求时出错";
-
-    var ex = Model == null ? null : Model.Exception;
-
-    var error = "没有捕捉到异常信息";
-    var context = ViewBag.Context as ExceptionContext;
-    if (context != null && context.Exception != null)
-    {
-        // 由于nginx的配置导致出现奇葩错误
-        ex = context.Exception;
-    }
-    if (NewLife.Cube.Setting.Current.Debug)
-    {
-        error = ex.ToString();
-    }
-    else
-    {
-        error = ex.GetTrue().Message;
-    }
-    error = error.Replace("--->", "--->" + Environment.NewLine);
-}
-<div class="panel panel-default">
-    <div class="panel-body">
-        <strong>
-            <pre class="alert alert-danger" role="alert">@error</pre>
-        </strong>
-    </div>
-    <div class="panel-footer">
-        <a href="javascript: history.go(-1);" class="btn btn-info">返回上一页</a>
-    </div>
-</div>
\ No newline at end of file
diff --git a/NewLife.Cube/Views/Shared/CubeError.generated.cs b/NewLife.Cube/Views/Shared/CubeError.generated.cs
deleted file mode 100644
index 20a56d54ab..0000000000
--- a/NewLife.Cube/Views/Shared/CubeError.generated.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Shared/CubeError.cshtml")]
-    public partial class _Views_Shared_CubeError_cshtml : System.Web.Mvc.WebViewPage<System.Web.Mvc.HandleErrorInfo>
-    {
-        public _Views_Shared_CubeError_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 2 "..\..\Views\Shared\CubeError.cshtml"
-  
-    //Layout = "_Ace_Layout.cshtml";
-    Layout = "_Layout.cshtml";
-    //Layout = NewLife.Cube.Setting.Current.Layout;
-    ViewBag.Title = "处理你的请求时出错";
-
-    var ex = Model == null ? null : Model.Exception;
-
-    var error = "没有捕捉到异常信息";
-    var context = ViewBag.Context as ExceptionContext;
-    if (context != null && context.Exception != null)
-    {
-        // 由于nginx的配置导致出现奇葩错误
-        ex = context.Exception;
-    }
-    if (NewLife.Cube.Setting.Current.Debug)
-    {
-        error = ex.ToString();
-    }
-    else
-    {
-        error = ex.GetTrue().Message;
-    }
-    error = error.Replace("--->", "--->" + Environment.NewLine);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n<div");
-
-WriteLiteral(" class=\"panel panel-default\"");
-
-WriteLiteral(">\r\n    <div");
-
-WriteLiteral(" class=\"panel-body\"");
-
-WriteLiteral(">\r\n        <strong>\r\n            <pre");
-
-WriteLiteral(" class=\"alert alert-danger\"");
-
-WriteLiteral(" role=\"alert\"");
-
-WriteLiteral(">");
-
-            
-            #line 30 "..\..\Views\Shared\CubeError.cshtml"
-                                                    Write(error);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</pre>\r\n        </strong>\r\n    </div>\r\n    <div");
-
-WriteLiteral(" class=\"panel-footer\"");
-
-WriteLiteral(">\r\n        <a");
-
-WriteLiteral(" href=\"javascript: history.go(-1);\"");
-
-WriteLiteral(" class=\"btn btn-info\"");
-
-WriteLiteral(">返回上一页</a>\r\n    </div>\r\n</div>");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Views/Shared/Form.cshtml b/NewLife.Cube/Views/Shared/Form.cshtml
deleted file mode 100644
index 8937c0ab30..0000000000
--- a/NewLife.Cube/Views/Shared/Form.cshtml
+++ /dev/null
@@ -1,31 +0,0 @@
-﻿@using System.Reflection
-@using XCode
-@using XCode.Configuration
-@{
-    Layout = NewLife.Cube.Setting.Current.Layout;
-
-    var entity = Model as IEntity;
-    var isNew = entity.IsNullKey;
-
-    var rv = entity.GetRouteKey();
-}
-
-<div class="form-horizontal">
-    @Html.Partial("_Form_Header", entity)
-    @using (Html.BeginForm((isNew ? "Add" : "Edit"), null, rv))
-    {
-        @Html.AntiForgeryToken()
-        @*@Html.ValidationSummary()*@
-        //解决主键为(0长度字符串"")的异常信息无法显示问题
-        <ul>
-            @foreach (var item in ViewData.ModelState.Values)
-            {
-                foreach (var error in item.Errors)
-                {
-                    <li>@error.Exception</li>
-                }
-            }
-        </ul>
-        @Html.Partial("_Form_Body", entity)
-    }
-</div>
diff --git a/NewLife.Cube/Views/Shared/Form.generated.cs b/NewLife.Cube/Views/Shared/Form.generated.cs
deleted file mode 100644
index 5892b5369b..0000000000
--- a/NewLife.Cube/Views/Shared/Form.generated.cs
+++ /dev/null
@@ -1,193 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    
-    #line 1 "..\..\Views\Shared\Form.cshtml"
-    using System.Reflection;
-    
-    #line default
-    #line hidden
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    
-    #line 2 "..\..\Views\Shared\Form.cshtml"
-    using XCode;
-    
-    #line default
-    #line hidden
-    
-    #line 3 "..\..\Views\Shared\Form.cshtml"
-    using XCode.Configuration;
-    
-    #line default
-    #line hidden
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Shared/Form.cshtml")]
-    public partial class _Views_Shared_Form_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Views_Shared_Form_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 4 "..\..\Views\Shared\Form.cshtml"
-  
-    Layout = NewLife.Cube.Setting.Current.Layout;
-
-    var entity = Model as IEntity;
-    var isNew = entity.IsNullKey;
-
-    var rv = entity.GetRouteKey();
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n\r\n<div");
-
-WriteLiteral(" class=\"form-horizontal\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("    ");
-
-            
-            #line 14 "..\..\Views\Shared\Form.cshtml"
-Write(Html.Partial("_Form_Header", entity));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-            
-            #line 15 "..\..\Views\Shared\Form.cshtml"
-    
-            
-            #line default
-            #line hidden
-            
-            #line 15 "..\..\Views\Shared\Form.cshtml"
-     using (Html.BeginForm((isNew ? "Add" : "Edit"), null, rv))
-    {
-        
-            
-            #line default
-            #line hidden
-            
-            #line 17 "..\..\Views\Shared\Form.cshtml"
-   Write(Html.AntiForgeryToken());
-
-            
-            #line default
-            #line hidden
-            
-            #line 17 "..\..\Views\Shared\Form.cshtml"
-                                
-        
-            
-            #line default
-            #line hidden
-            
-            #line 18 "..\..\Views\Shared\Form.cshtml"
-                                     
-        //解决主键为(0长度字符串"")的异常信息无法显示问题
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        <ul>\r\n");
-
-            
-            #line 21 "..\..\Views\Shared\Form.cshtml"
-            
-            
-            #line default
-            #line hidden
-            
-            #line 21 "..\..\Views\Shared\Form.cshtml"
-             foreach (var item in ViewData.ModelState.Values)
-            {
-                foreach (var error in item.Errors)
-                {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                    <li>");
-
-            
-            #line 25 "..\..\Views\Shared\Form.cshtml"
-                   Write(error.Exception);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</li>\r\n");
-
-            
-            #line 26 "..\..\Views\Shared\Form.cshtml"
-                }
-            }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        </ul>\r\n");
-
-            
-            #line 29 "..\..\Views\Shared\Form.cshtml"
-        
-            
-            #line default
-            #line hidden
-            
-            #line 29 "..\..\Views\Shared\Form.cshtml"
-   Write(Html.Partial("_Form_Body", entity));
-
-            
-            #line default
-            #line hidden
-            
-            #line 29 "..\..\Views\Shared\Form.cshtml"
-                                           
-    }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</div>\r\n");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Views/Shared/List.cshtml b/NewLife.Cube/Views/Shared/List.cshtml
deleted file mode 100644
index f3d20263bd..0000000000
--- a/NewLife.Cube/Views/Shared/List.cshtml
+++ /dev/null
@@ -1,18 +0,0 @@
-﻿@using NewLife.Web;
-@using XCode;
-@{
-    Layout = NewLife.Cube.Setting.Current.Layout;
-
-    var fact = ViewBag.Factory as IEntityOperate;
-    var page = ViewBag.Page as Pager;
-}
-
-<div class="clearfix">
-    @Html.Partial("_List_Toolbar")
-</div>
-<div class="table-responsive">
-    @Html.Partial("_List_Data")
-</div>
-<div class="panel-footer">
-    @Html.Partial("_List_Pager")
-</div>
\ No newline at end of file
diff --git a/NewLife.Cube/Views/Shared/List.generated.cs b/NewLife.Cube/Views/Shared/List.generated.cs
deleted file mode 100644
index 726fdcbea6..0000000000
--- a/NewLife.Cube/Views/Shared/List.generated.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    
-    #line 1 "..\..\Views\Shared\List.cshtml"
-    using NewLife.Web;
-    
-    #line default
-    #line hidden
-    
-    #line 2 "..\..\Views\Shared\List.cshtml"
-    using XCode;
-    
-    #line default
-    #line hidden
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Shared/List.cshtml")]
-    public partial class _Views_Shared_List_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Views_Shared_List_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 3 "..\..\Views\Shared\List.cshtml"
-  
-    Layout = NewLife.Cube.Setting.Current.Layout;
-
-    var fact = ViewBag.Factory as IEntityOperate;
-    var page = ViewBag.Page as Pager;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n\r\n<div");
-
-WriteLiteral(" class=\"clearfix\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("    ");
-
-            
-            #line 11 "..\..\Views\Shared\List.cshtml"
-Write(Html.Partial("_List_Toolbar"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n</div>\r\n<div");
-
-WriteLiteral(" class=\"table-responsive\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("    ");
-
-            
-            #line 14 "..\..\Views\Shared\List.cshtml"
-Write(Html.Partial("_List_Data"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n</div>\r\n<div");
-
-WriteLiteral(" class=\"panel-footer\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("    ");
-
-            
-            #line 17 "..\..\Views\Shared\List.cshtml"
-Write(Html.Partial("_List_Pager"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n</div>");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Views/Shared/ListTree.cshtml b/NewLife.Cube/Views/Shared/ListTree.cshtml
deleted file mode 100644
index e6b936bd7c..0000000000
--- a/NewLife.Cube/Views/Shared/ListTree.cshtml
+++ /dev/null
@@ -1,18 +0,0 @@
-﻿@using NewLife.Web;
-@using XCode;
-@{
-    Layout = NewLife.Cube.Setting.Current.Layout;
-
-    var fact = ViewBag.Factory as IEntityOperate;
-    var page = ViewBag.Page as Pager;
-}
-
-<div class="clearfix">
-    @Html.Partial("_List_Toolbar")
-</div>
-<div class="table-responsive">
-    @Html.Partial("_ListTree_Data")
-</div>
-<div class="panel-footer">
-    @Html.Partial("_List_Pager")
-</div>
\ No newline at end of file
diff --git a/NewLife.Cube/Views/Shared/ListTree.generated.cs b/NewLife.Cube/Views/Shared/ListTree.generated.cs
deleted file mode 100644
index 6ffcfe23b7..0000000000
--- a/NewLife.Cube/Views/Shared/ListTree.generated.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    
-    #line 1 "..\..\Views\Shared\ListTree.cshtml"
-    using NewLife.Web;
-    
-    #line default
-    #line hidden
-    
-    #line 2 "..\..\Views\Shared\ListTree.cshtml"
-    using XCode;
-    
-    #line default
-    #line hidden
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Shared/ListTree.cshtml")]
-    public partial class _Views_Shared_ListTree_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Views_Shared_ListTree_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 3 "..\..\Views\Shared\ListTree.cshtml"
-  
-    Layout = NewLife.Cube.Setting.Current.Layout;
-
-    var fact = ViewBag.Factory as IEntityOperate;
-    var page = ViewBag.Page as Pager;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n\r\n<div");
-
-WriteLiteral(" class=\"clearfix\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("    ");
-
-            
-            #line 11 "..\..\Views\Shared\ListTree.cshtml"
-Write(Html.Partial("_List_Toolbar"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n</div>\r\n<div");
-
-WriteLiteral(" class=\"table-responsive\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("    ");
-
-            
-            #line 14 "..\..\Views\Shared\ListTree.cshtml"
-Write(Html.Partial("_ListTree_Data"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n</div>\r\n<div");
-
-WriteLiteral(" class=\"panel-footer\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("    ");
-
-            
-            #line 17 "..\..\Views\Shared\ListTree.cshtml"
-Write(Html.Partial("_List_Pager"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n</div>");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Views/Shared/NoPermission.cshtml b/NewLife.Cube/Views/Shared/NoPermission.cshtml
deleted file mode 100644
index 8b9993d2a7..0000000000
--- a/NewLife.Cube/Views/Shared/NoPermission.cshtml
+++ /dev/null
@@ -1,28 +0,0 @@
-﻿@model System.Web.Mvc.HandleErrorInfo
-@{
-    //Layout = "_Ace_Layout.cshtml";
-    Layout = "_Layout.cshtml";
-    //Layout = NewLife.Cube.Setting.Current.Layout;
-
-    //var context = ViewBag.Context as AuthorizationContext;
-    var Resource = ViewBag.Resource;
-    var Permission = (PermissionFlags)ViewBag.Permission;
-    var pm = Permission.GetDescription();
-    var menu = ViewBag.Menu as IMenu;
-
-    ViewBag.Title = String.Format("没有访问资源[{0}]的权限[{1}]", Resource, pm);
-}
-<div class="panel panel-default">
-    <div class="panel-body" title="@(menu == null ? "" : menu.FullName)">
-        <strong>
-            <pre class="alert alert-danger" role="alert">访问资源 @Resource 需要 @pm 权限</pre>
-        </strong>
-    </div>
-    <div class="panel-footer">
-        <a href="~/Admin/User/Logout" class="btn btn-primary">
-            <i class="ace-icon fa fa-power-off"></i>
-            以其它身份登录
-        </a>
-        <a href="javascript: history.go(-1);" class="btn btn-info">返回上一页</a>
-    </div>
-</div>
\ No newline at end of file
diff --git a/NewLife.Cube/Views/Shared/NoPermission.generated.cs b/NewLife.Cube/Views/Shared/NoPermission.generated.cs
deleted file mode 100644
index dd8298f917..0000000000
--- a/NewLife.Cube/Views/Shared/NoPermission.generated.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Shared/NoPermission.cshtml")]
-    public partial class _Views_Shared_NoPermission_cshtml : System.Web.Mvc.WebViewPage<System.Web.Mvc.HandleErrorInfo>
-    {
-        public _Views_Shared_NoPermission_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 2 "..\..\Views\Shared\NoPermission.cshtml"
-  
-    //Layout = "_Ace_Layout.cshtml";
-    Layout = "_Layout.cshtml";
-    //Layout = NewLife.Cube.Setting.Current.Layout;
-
-    //var context = ViewBag.Context as AuthorizationContext;
-    var Resource = ViewBag.Resource;
-    var Permission = (PermissionFlags)ViewBag.Permission;
-    var pm = Permission.GetDescription();
-    var menu = ViewBag.Menu as IMenu;
-
-    ViewBag.Title = String.Format("没有访问资源[{0}]的权限[{1}]", Resource, pm);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n<div");
-
-WriteLiteral(" class=\"panel panel-default\"");
-
-WriteLiteral(">\r\n    <div");
-
-WriteLiteral(" class=\"panel-body\"");
-
-WriteAttribute("title", Tuple.Create(" title=\"", 549), Tuple.Create("\"", 593)
-            
-            #line 16 "..\..\Views\Shared\NoPermission.cshtml"
-, Tuple.Create(Tuple.Create("", 557), Tuple.Create<System.Object, System.Int32>(menu == null ? "" : menu.FullName
-            
-            #line default
-            #line hidden
-, 557), false)
-);
-
-WriteLiteral(">\r\n        <strong>\r\n            <pre");
-
-WriteLiteral(" class=\"alert alert-danger\"");
-
-WriteLiteral(" role=\"alert\"");
-
-WriteLiteral(">访问资源 ");
-
-            
-            #line 18 "..\..\Views\Shared\NoPermission.cshtml"
-                                                         Write(Resource);
-
-            
-            #line default
-            #line hidden
-WriteLiteral(" 需要 ");
-
-            
-            #line 18 "..\..\Views\Shared\NoPermission.cshtml"
-                                                                      Write(pm);
-
-            
-            #line default
-            #line hidden
-WriteLiteral(" 权限</pre>\r\n        </strong>\r\n    </div>\r\n    <div");
-
-WriteLiteral(" class=\"panel-footer\"");
-
-WriteLiteral(">\r\n        <a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 777), Tuple.Create("\"", 803)
-, Tuple.Create(Tuple.Create("", 784), Tuple.Create<System.Object, System.Int32>(Href("~/Admin/User/Logout")
-, 784), false)
-);
-
-WriteLiteral(" class=\"btn btn-primary\"");
-
-WriteLiteral(">\r\n            <i");
-
-WriteLiteral(" class=\"ace-icon fa fa-power-off\"");
-
-WriteLiteral("></i>\r\n            以其它身份登录\r\n        </a>\r\n        <a");
-
-WriteLiteral(" href=\"javascript: history.go(-1);\"");
-
-WriteLiteral(" class=\"btn btn-info\"");
-
-WriteLiteral(">返回上一页</a>\r\n    </div>\r\n</div>");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Views/Shared/ObjectForm.cshtml b/NewLife.Cube/Views/Shared/ObjectForm.cshtml
deleted file mode 100644
index ee78facc36..0000000000
--- a/NewLife.Cube/Views/Shared/ObjectForm.cshtml
+++ /dev/null
@@ -1,52 +0,0 @@
-﻿@model Object
-@using System.ComponentModel;
-@using System.Reflection;
-@using NewLife.Reflection;
-@{
-    Layout = NewLife.Cube.Setting.Current.Layout;
-
-    var Obj = Model as Object;
-    var pis = ViewBag.Properties as IEnumerable<PropertyInfo>;
-}
-<div class="row">
-    @Html.Partial("_Object_Nav", Model)
-</div>
-<div class="row">
-    <div class="col-md-12">
-        <div class="form-horizontal">
-            @using (Html.BeginForm("Update", null))
-            {
-                @Html.AntiForgeryToken()
-                @Html.ValidationSummary(true)
-                foreach (var pi in pis)
-                {
-                    var name = pi.Name;
-                    var dis = pi.GetDisplayName();
-                    var des = pi.GetDescription();
-                    if (dis.IsNullOrEmpty() && !des.IsNullOrEmpty()) { dis = des; des = null; }
-                    if (!dis.IsNullOrEmpty() && des.IsNullOrEmpty() && dis.Contains("。"))
-                    {
-                        des = dis.Substring("。");
-                        dis = dis.Substring(null, "。");
-                    }
-                    <div class="form-group col-sm-12 col-md-12">
-                        <label class="control-label col-xs-2 col-md-3 no-padding-left" for="@pi.Name">@(dis ?? pi.Name)</label>
-                        <div class="input-group col-xs-10 col-md-4">
-                            @Html.ForEditor(pi.Name, Obj.GetValue(pi), pi.PropertyType)
-                            @Html.ValidationMessage(pi.Name)
-                        </div>
-                        <span class="hidden-xs col-md-5">&nbsp; @des</span>
-                    </div>
-                }
-                if (this.Has(PermissionFlags.Update))
-                {
-                    <div class="clearfix form-actions col-sm-12 col-md-12">
-                        <label class="control-label col-xs-4 col-sm-5 col-md-5"></label>
-                        <button type="submit" class="btn btn-success"><i class="glyphicon glyphicon-save"></i><strong>保存</strong></button>
-                        <button type="button" class="btn btn-danger" onclick="history.go(-1);"><i class="glyphicon glyphicon-remove"></i><strong>取消</strong></button>
-                    </div>
-                }
-            }
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/NewLife.Cube/Views/Shared/ObjectForm.generated.cs b/NewLife.Cube/Views/Shared/ObjectForm.generated.cs
deleted file mode 100644
index f3143329c8..0000000000
--- a/NewLife.Cube/Views/Shared/ObjectForm.generated.cs
+++ /dev/null
@@ -1,277 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    
-    #line 2 "..\..\Views\Shared\ObjectForm.cshtml"
-    using System.ComponentModel;
-    
-    #line default
-    #line hidden
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    
-    #line 3 "..\..\Views\Shared\ObjectForm.cshtml"
-    using System.Reflection;
-    
-    #line default
-    #line hidden
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    using NewLife.Cube;
-    
-    #line 4 "..\..\Views\Shared\ObjectForm.cshtml"
-    using NewLife.Reflection;
-    
-    #line default
-    #line hidden
-    using NewLife.Web;
-    using XCode;
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Shared/ObjectForm.cshtml")]
-    public partial class _Views_Shared_ObjectForm_cshtml : System.Web.Mvc.WebViewPage<Object>
-    {
-        public _Views_Shared_ObjectForm_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 5 "..\..\Views\Shared\ObjectForm.cshtml"
-  
-    Layout = NewLife.Cube.Setting.Current.Layout;
-
-    var Obj = Model as Object;
-    var pis = ViewBag.Properties as IEnumerable<PropertyInfo>;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n<div");
-
-WriteLiteral(" class=\"row\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("    ");
-
-            
-            #line 12 "..\..\Views\Shared\ObjectForm.cshtml"
-Write(Html.Partial("_Object_Nav", Model));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n</div>\r\n<div");
-
-WriteLiteral(" class=\"row\"");
-
-WriteLiteral(">\r\n    <div");
-
-WriteLiteral(" class=\"col-md-12\"");
-
-WriteLiteral(">\r\n        <div");
-
-WriteLiteral(" class=\"form-horizontal\"");
-
-WriteLiteral(">\r\n");
-
-            
-            #line 17 "..\..\Views\Shared\ObjectForm.cshtml"
-            
-            
-            #line default
-            #line hidden
-            
-            #line 17 "..\..\Views\Shared\ObjectForm.cshtml"
-             using (Html.BeginForm("Update", null))
-            {
-                
-            
-            #line default
-            #line hidden
-            
-            #line 19 "..\..\Views\Shared\ObjectForm.cshtml"
-           Write(Html.AntiForgeryToken());
-
-            
-            #line default
-            #line hidden
-            
-            #line 19 "..\..\Views\Shared\ObjectForm.cshtml"
-                                        
-                
-            
-            #line default
-            #line hidden
-            
-            #line 20 "..\..\Views\Shared\ObjectForm.cshtml"
-           Write(Html.ValidationSummary(true));
-
-            
-            #line default
-            #line hidden
-            
-            #line 20 "..\..\Views\Shared\ObjectForm.cshtml"
-                                             
-                foreach (var pi in pis)
-                {
-                    var name = pi.Name;
-                    var dis = pi.GetDisplayName();
-                    var des = pi.GetDescription();
-                    if (dis.IsNullOrEmpty() && !des.IsNullOrEmpty()) { dis = des; des = null; }
-                    if (!dis.IsNullOrEmpty() && des.IsNullOrEmpty() && dis.Contains("。"))
-                    {
-                        des = dis.Substring("。");
-                        dis = dis.Substring(null, "。");
-                    }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                    <div");
-
-WriteLiteral(" class=\"form-group col-sm-12 col-md-12\"");
-
-WriteLiteral(">\r\n                        <label");
-
-WriteLiteral(" class=\"control-label col-xs-2 col-md-3 no-padding-left\"");
-
-WriteAttribute("for", Tuple.Create(" for=\"", 1268), Tuple.Create("\"", 1282)
-            
-            #line 33 "..\..\Views\Shared\ObjectForm.cshtml"
-            , Tuple.Create(Tuple.Create("", 1274), Tuple.Create<System.Object, System.Int32>(pi.Name
-            
-            #line default
-            #line hidden
-, 1274), false)
-);
-
-WriteLiteral(">");
-
-            
-            #line 33 "..\..\Views\Shared\ObjectForm.cshtml"
-                                                                                                  Write(dis ?? pi.Name);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</label>\r\n                        <div");
-
-WriteLiteral(" class=\"input-group col-xs-10 col-md-4\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("                            ");
-
-            
-            #line 35 "..\..\Views\Shared\ObjectForm.cshtml"
-                       Write(Html.ForEditor(pi.Name, Obj.GetValue(pi), pi.PropertyType));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                            ");
-
-            
-            #line 36 "..\..\Views\Shared\ObjectForm.cshtml"
-                       Write(Html.ValidationMessage(pi.Name));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n                        </div>\r\n                        <span");
-
-WriteLiteral(" class=\"hidden-xs col-md-5\"");
-
-WriteLiteral(">&nbsp; ");
-
-            
-            #line 38 "..\..\Views\Shared\ObjectForm.cshtml"
-                                                           Write(des);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</span>\r\n                    </div>\r\n");
-
-            
-            #line 40 "..\..\Views\Shared\ObjectForm.cshtml"
-                }
-                if (this.Has(PermissionFlags.Update))
-                {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                    <div");
-
-WriteLiteral(" class=\"clearfix form-actions col-sm-12 col-md-12\"");
-
-WriteLiteral(">\r\n                        <label");
-
-WriteLiteral(" class=\"control-label col-xs-4 col-sm-5 col-md-5\"");
-
-WriteLiteral("></label>\r\n                        <button");
-
-WriteLiteral(" type=\"submit\"");
-
-WriteLiteral(" class=\"btn btn-success\"");
-
-WriteLiteral("><i");
-
-WriteLiteral(" class=\"glyphicon glyphicon-save\"");
-
-WriteLiteral("></i><strong>保存</strong></button>\r\n                        <button");
-
-WriteLiteral(" type=\"button\"");
-
-WriteLiteral(" class=\"btn btn-danger\"");
-
-WriteLiteral(" onclick=\"history.go(-1);\"");
-
-WriteLiteral("><i");
-
-WriteLiteral(" class=\"glyphicon glyphicon-remove\"");
-
-WriteLiteral("></i><strong>取消</strong></button>\r\n                    </div>\r\n");
-
-            
-            #line 48 "..\..\Views\Shared\ObjectForm.cshtml"
-                }
-            }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        </div>\r\n    </div>\r\n</div>");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Views/Shared/_Ace_Layout.cshtml b/NewLife.Cube/Views/Shared/_Ace_Layout.cshtml
deleted file mode 100644
index 3650cd28a4..0000000000
--- a/NewLife.Cube/Views/Shared/_Ace_Layout.cshtml
+++ /dev/null
@@ -1,191 +0,0 @@
-﻿@using NewLife.Common;
-@{
-    var set = NewLife.Cube.Setting.Current;
-}
-<!DOCTYPE html>
-<html lang="zh-CN">
-<head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="description" content="新生命团队,NewLife,魔方,Cube,XCode" />
-    @*上述3个meta标签*必须*放在最前面，任何其他内容都*必须*跟随其后！*@
-    <title>@ViewBag.Title - @SysConfig.Current.DisplayName</title>
-    <link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon">
-
-    <!-- 页面内联样式 -->
-    @RenderSection("css", required: false)
-
-    @if (set.BootstrapSelect)
-    {
-        <link rel="stylesheet" href="~/Content/bootstrap/css/bootstrap-multiselect.css">
-    }
-
-    <link rel="stylesheet" href="~/Content/DateTimePicker/bootstrap-datetimepicker.min.css">
-
-    <link rel="stylesheet" href="~/Content/bootstrap-switch/bootstrap-switch.min.css">
-
-    <!-- 最后引入基本样式 -->
-    <link rel="stylesheet" href="~/Content/bootstrap/css/bootstrap.min.css">
-    <link rel="stylesheet" href="~/Content/bootstrap/css/font-awesome.min.css">
-
-    <link rel="stylesheet" href="~/Content/bootstrap/css/bootstrap-theme.min.css">
-    <link rel="stylesheet" href="~/Content/bootstrap/css/bootstrap-responsive.min.css">
-
-    <!-- 文本字体 -->
-    <link rel="stylesheet" href="~/Content/ace/css/ace-fonts.min.css">
-    <!-- ace 样式 -->
-    <link rel="stylesheet" href="~/Content/ace/css/ace.min.css" class="ace-main-stylesheet" id="main-ace-style">
-    @*artdialog style*@
-    <link href="~/Content/artDialog/css/ui-dialog.css" rel="stylesheet" />
-
-    <!-- 自定义样式 -->
-    <link rel="stylesheet" href="~/Content/Cube.css?v=2.0.2017.1126">
-    <!-- JQuery作为一等公民，页面内部随时可能使用 -->
-    <script src="~/Content/js/jquery-2.1.3.min.js"></script>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body>
-    <div class="panel panel-default">
-        <div class="breadcrumbs" id="breadcrumbs">
-            <ul class="breadcrumb">
-                @Html.Partial("_Ace_Layout_Nav")
-            </ul>
-            <div style="float: right; margin-left: 40px;">@ViewBag.HeaderContent</div>
-        </div>
-        <div class="page-content">
-            <section class="content-wrapper main-content clear-fix">
-                @RenderBody()
-            </section>
-        </div>
-        @if (DbRunTimeModule.Enable)
-        {
-            <div class="panel-footer">
-                @Html.Raw(DbRunTimeModule.GetInfo())
-            </div>
-        }
-    </div>
-    <!-- 最早引入基本脚本 -->
-    <script src="~/Content/bootstrap/js/bootstrap.min.js"></script>
-    @if (set.BootstrapSelect)
-    {
-        <script src="~/Content/bootstrap/js/bootstrap-multiselect.min.js"></script>
-    }
-
-    @RenderSection("scripts", required: false)
-
-    <!--日历控件支持-->
-    <script src="~/Content/DateTimePicker/bootstrap-datetimepicker.min.js"></script>
-    <script src="~/Content/DateTimePicker/locales/bootstrap-datetimepicker.zh-CN.js"></script>
-    <script>
-        $(function () {
-            $('.form_datetime').each(function () {
-                var df = $(this).attr('dateformat');
-                if (!df) {
-                    $(this).attr('dateformat', 'yyyy-mm-dd hh:ii:ss');
-                    $(this).width(140);
-                }
-                else {
-                    // 把C#标准格式化替换为控件格式
-                    df = df.replace('mm', 'ii').replace('MM', 'mm').replace('HH', 'hh');
-                    $(this).attr('dateformat', df);
-
-                    // 根据时间日期格式，锁定日期输入框宽度
-                    if (df.indexOf('hh') >= 0)
-                        $(this).width(140);
-                    else
-                        $(this).width(80);
-                }
-
-                //根据日期格式自动推算日期选择view显示的范围
-                var sv = 2;
-                var mv = 2;
-                var autoView = $(this).attr('autoView');
-                if (autoView != 'false') {
-                    df = $(this).attr('dateformat');
-                    if (df.indexOf('ii') >= 0) {
-                        mv = 0;
-                        if (df.indexOf('dd') >= 0) {
-                            sv = 2;
-                        } else {
-                            sv = 1;
-                        }
-                    } else if (df.indexOf('hh') >= 0) {
-                        mv = 1;
-                        if (df.indexOf('dd') >= 0) {
-                            sv = 2;
-                        } else {
-                            sv = 1;
-                        }
-                    } else if (df.indexOf('dd') >= 0) {
-                        mv = 2;
-                        sv = 2;
-                    } else if (df.indexOf('mm') >= 0) {
-                        mv = 3;
-                        sv = 3;
-                    } else if (df.indexOf('yyyy') >= 0) {
-                        mv = 4;
-                        sv = 4;
-                    }
-                }
-
-                $(this).attr('startview', sv);
-                $(this).attr('minview', mv);
-            });
-            $("[dateformat]").each(function () {
-                $(this).datetimepicker({
-                    format: $(this).attr("dateformat"),
-                    autoclose: true,
-                    language: "zh-CN",
-                    forceParse: false,
-                    startView: parseInt($(this).attr('startview')),
-                    minView: parseInt($(this).attr('minview'))
-                });
-            });
-            @if (set.BootstrapSelect) {<text>
-            $('.multiselect').each(function () {
-                $(this).multiselect({
-                    // 下拉列表仅在列表项比较多时显示过滤框
-                    enableFiltering: $(this).children().length > 10,
-                    buttonClass: 'btn btn-white btn-primary',
-                    templates: {
-                        button: '<button type="button" class="multiselect dropdown-toggle" data-toggle="dropdown"></button>',
-                        ul: '<ul class="multiselect-container dropdown-menu"></ul>',
-                        filter: '<li class="multiselect-item filter"><div class="input-group"><span class="input-group-addon"><i class="fa fa-search"></i></span><input class="form-control multiselect-search" type="text"></div></li>',
-                        filterClearBtn: '<span class="input-group-btn"><button class="btn btn-default btn-white btn-grey multiselect-clear-filter" type="button"><i class="fa fa-times-circle red2"></i></button></span>',
-                        li: '<li><a href="javascript:void(0);"><label></label></a></li>',
-                        divider: '<li class="multiselect-item divider"></li>',
-                        liGroup: '<li class="multiselect-item group"><label class="multiselect-group"></label></li>'
-                    },
-                    filterPlaceholder: '搜索',
-                    nonSelectedText: '无',
-                    allSelectedText: '全选'
-                });
-            });
-            </text>}
-            @*双击跳转到form
-            _List_Data_Action.cshtml变更
-            @Html.ActionLink("编辑", "Edit", new { id = @Model },new{@class="editcell"})*@
-            $('tr').dblclick(function () {
-                var $this = $(this);
-                var row = $this.closest("tr");
-                var findcell = row.find('.editcell');
-                if (findcell.length > 0) window.location.href = findcell.attr("href");
-            });
-        });
-    </script>
-
-    <!--开关插件-->
-    <script src="~/Content/bootstrap-switch/bootstrap-switch.min.js"></script>
-    <script>
-        $(function () {
-            $("input.chkSwitch").bootstrapSwitch();
-        })
-    </script>
-
-    @*artDialog*@
-    <script src="~/Content/artDialog/dist/dialog-plus-min.js"></script>
-    <script src="~/Content/artDialog/dist/dialog.new.life.js"></script>
-    @*模态窗Ajax删除提示*@
-    <script src="~/Content/Cube.js?v=2.0.2017.1126"></script>
-</body>
-</html>
\ No newline at end of file
diff --git a/NewLife.Cube/Views/Shared/_Ace_Layout.generated.cs b/NewLife.Cube/Views/Shared/_Ace_Layout.generated.cs
deleted file mode 100644
index aa0f9a054a..0000000000
--- a/NewLife.Cube/Views/Shared/_Ace_Layout.generated.cs
+++ /dev/null
@@ -1,607 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    
-    #line 1 "..\..\Views\Shared\_Ace_Layout.cshtml"
-    using NewLife.Common;
-    
-    #line default
-    #line hidden
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Shared/_Ace_Layout.cshtml")]
-    public partial class _Views_Shared__Ace_Layout_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Views_Shared__Ace_Layout_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 2 "..\..\Views\Shared\_Ace_Layout.cshtml"
-  
-    var set = NewLife.Cube.Setting.Current;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n<!DOCTYPE html>\r\n<html");
-
-WriteLiteral(" lang=\"zh-CN\"");
-
-WriteLiteral(">\r\n<head>\r\n    <meta");
-
-WriteLiteral(" charset=\"utf-8\"");
-
-WriteLiteral(">\r\n    <meta");
-
-WriteLiteral(" http-equiv=\"X-UA-Compatible\"");
-
-WriteLiteral(" content=\"IE=edge\"");
-
-WriteLiteral(">\r\n    <meta");
-
-WriteLiteral(" name=\"viewport\"");
-
-WriteLiteral(" content=\"width=device-width, initial-scale=1\"");
-
-WriteLiteral(">\r\n    <meta");
-
-WriteLiteral(" name=\"description\"");
-
-WriteLiteral(" content=\"新生命团队,NewLife,魔方,Cube,XCode\"");
-
-WriteLiteral(" />\r\n    ");
-
-WriteLiteral("\r\n    <title>");
-
-            
-            #line 13 "..\..\Views\Shared\_Ace_Layout.cshtml"
-      Write(ViewBag.Title);
-
-            
-            #line default
-            #line hidden
-WriteLiteral(" - ");
-
-            
-            #line 13 "..\..\Views\Shared\_Ace_Layout.cshtml"
-                       Write(SysConfig.Current.DisplayName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</title>\r\n    <link");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 477), Tuple.Create("\"", 497)
-, Tuple.Create(Tuple.Create("", 484), Tuple.Create<System.Object, System.Int32>(Href("~/favicon.ico")
-, 484), false)
-);
-
-WriteLiteral(" rel=\"shortcut icon\"");
-
-WriteLiteral(" type=\"image/x-icon\"");
-
-WriteLiteral(">\r\n\r\n    <!-- 页面内联样式 -->\r\n");
-
-WriteLiteral("    ");
-
-            
-            #line 17 "..\..\Views\Shared\_Ace_Layout.cshtml"
-Write(RenderSection("css", required: false));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n\r\n");
-
-            
-            #line 19 "..\..\Views\Shared\_Ace_Layout.cshtml"
-    
-            
-            #line default
-            #line hidden
-            
-            #line 19 "..\..\Views\Shared\_Ace_Layout.cshtml"
-     if (set.BootstrapSelect)
-    {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        <link");
-
-WriteLiteral(" rel=\"stylesheet\"");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 678), Tuple.Create("\"", 734)
-, Tuple.Create(Tuple.Create("", 685), Tuple.Create<System.Object, System.Int32>(Href("~/Content/bootstrap/css/bootstrap-multiselect.css")
-, 685), false)
-);
-
-WriteLiteral(">\r\n");
-
-            
-            #line 22 "..\..\Views\Shared\_Ace_Layout.cshtml"
-    }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n    <link");
-
-WriteLiteral(" rel=\"stylesheet\"");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 773), Tuple.Create("\"", 837)
-, Tuple.Create(Tuple.Create("", 780), Tuple.Create<System.Object, System.Int32>(Href("~/Content/DateTimePicker/bootstrap-datetimepicker.min.css")
-, 780), false)
-);
-
-WriteLiteral(">\r\n\r\n    <link");
-
-WriteLiteral(" rel=\"stylesheet\"");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 869), Tuple.Create("\"", 927)
-, Tuple.Create(Tuple.Create("", 876), Tuple.Create<System.Object, System.Int32>(Href("~/Content/bootstrap-switch/bootstrap-switch.min.css")
-, 876), false)
-);
-
-WriteLiteral(">\r\n\r\n    <!-- 最后引入基本样式 -->\r\n    <link");
-
-WriteLiteral(" rel=\"stylesheet\"");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 982), Tuple.Create("\"", 1030)
-, Tuple.Create(Tuple.Create("", 989), Tuple.Create<System.Object, System.Int32>(Href("~/Content/bootstrap/css/bootstrap.min.css")
-, 989), false)
-);
-
-WriteLiteral(">\r\n    <link");
-
-WriteLiteral(" rel=\"stylesheet\"");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1060), Tuple.Create("\"", 1111)
-, Tuple.Create(Tuple.Create("", 1067), Tuple.Create<System.Object, System.Int32>(Href("~/Content/bootstrap/css/font-awesome.min.css")
-, 1067), false)
-);
-
-WriteLiteral(">\r\n\r\n    <link");
-
-WriteLiteral(" rel=\"stylesheet\"");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1143), Tuple.Create("\"", 1197)
-, Tuple.Create(Tuple.Create("", 1150), Tuple.Create<System.Object, System.Int32>(Href("~/Content/bootstrap/css/bootstrap-theme.min.css")
-, 1150), false)
-);
-
-WriteLiteral(">\r\n    <link");
-
-WriteLiteral(" rel=\"stylesheet\"");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1227), Tuple.Create("\"", 1286)
-, Tuple.Create(Tuple.Create("", 1234), Tuple.Create<System.Object, System.Int32>(Href("~/Content/bootstrap/css/bootstrap-responsive.min.css")
-, 1234), false)
-);
-
-WriteLiteral(">\r\n\r\n    <!-- 文本字体 -->\r\n    <link");
-
-WriteLiteral(" rel=\"stylesheet\"");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1337), Tuple.Create("\"", 1379)
-, Tuple.Create(Tuple.Create("", 1344), Tuple.Create<System.Object, System.Int32>(Href("~/Content/ace/css/ace-fonts.min.css")
-, 1344), false)
-);
-
-WriteLiteral(">\r\n    <!-- ace 样式 -->\r\n    <link");
-
-WriteLiteral(" rel=\"stylesheet\"");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1430), Tuple.Create("\"", 1466)
-, Tuple.Create(Tuple.Create("", 1437), Tuple.Create<System.Object, System.Int32>(Href("~/Content/ace/css/ace.min.css")
-, 1437), false)
-);
-
-WriteLiteral(" class=\"ace-main-stylesheet\"");
-
-WriteLiteral(" id=\"main-ace-style\"");
-
-WriteLiteral(">\r\n    ");
-
-WriteLiteral("\r\n    <link");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1552), Tuple.Create("\"", 1596)
-, Tuple.Create(Tuple.Create("", 1559), Tuple.Create<System.Object, System.Int32>(Href("~/Content/artDialog/css/ui-dialog.css")
-, 1559), false)
-);
-
-WriteLiteral(" rel=\"stylesheet\"");
-
-WriteLiteral(" />\r\n\r\n    <!-- 自定义样式 -->\r\n    <link");
-
-WriteLiteral(" rel=\"stylesheet\"");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1667), Tuple.Create("\"", 1708)
-, Tuple.Create(Tuple.Create("", 1674), Tuple.Create<System.Object, System.Int32>(Href("~/Content/Cube.css?v=2.0.2017.1126")
-, 1674), false)
-);
-
-WriteLiteral(">\r\n    <!-- JQuery作为一等公民，页面内部随时可能使用 -->\r\n    <script");
-
-WriteAttribute("src", Tuple.Create(" src=\"", 1761), Tuple.Create("\"", 1799)
-, Tuple.Create(Tuple.Create("", 1767), Tuple.Create<System.Object, System.Int32>(Href("~/Content/js/jquery-2.1.3.min.js")
-, 1767), false)
-);
-
-WriteLiteral("></script>\r\n        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>\r\n<body>\r\n    <div");
-
-WriteLiteral(" class=\"panel panel-default\"");
-
-WriteLiteral(">\r\n        <div");
-
-WriteLiteral(" class=\"breadcrumbs\"");
-
-WriteLiteral(" id=\"breadcrumbs\"");
-
-WriteLiteral(">\r\n            <ul");
-
-WriteLiteral(" class=\"breadcrumb\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("                ");
-
-            
-            #line 51 "..\..\Views\Shared\_Ace_Layout.cshtml"
-           Write(Html.Partial("_Ace_Layout_Nav"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n            </ul>\r\n            <div");
-
-WriteLiteral(" style=\"float: right; margin-left: 40px;\"");
-
-WriteLiteral(">");
-
-            
-            #line 53 "..\..\Views\Shared\_Ace_Layout.cshtml"
-                                                     Write(ViewBag.HeaderContent);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</div>\r\n        </div>\r\n        <div");
-
-WriteLiteral(" class=\"page-content\"");
-
-WriteLiteral(">\r\n            <section");
-
-WriteLiteral(" class=\"content-wrapper main-content clear-fix\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("                ");
-
-            
-            #line 57 "..\..\Views\Shared\_Ace_Layout.cshtml"
-           Write(RenderBody());
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n            </section>\r\n        </div>\r\n");
-
-            
-            #line 60 "..\..\Views\Shared\_Ace_Layout.cshtml"
-        
-            
-            #line default
-            #line hidden
-            
-            #line 60 "..\..\Views\Shared\_Ace_Layout.cshtml"
-         if (DbRunTimeModule.Enable)
-        {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            <div");
-
-WriteLiteral(" class=\"panel-footer\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("                ");
-
-            
-            #line 63 "..\..\Views\Shared\_Ace_Layout.cshtml"
-           Write(Html.Raw(DbRunTimeModule.GetInfo()));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n            </div>\r\n");
-
-            
-            #line 65 "..\..\Views\Shared\_Ace_Layout.cshtml"
-        }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("    </div>\r\n    <!-- 最早引入基本脚本 -->\r\n    <script");
-
-WriteAttribute("src", Tuple.Create(" src=\"", 2527), Tuple.Create("\"", 2572)
-, Tuple.Create(Tuple.Create("", 2533), Tuple.Create<System.Object, System.Int32>(Href("~/Content/bootstrap/js/bootstrap.min.js")
-, 2533), false)
-);
-
-WriteLiteral("></script>\r\n");
-
-            
-            #line 69 "..\..\Views\Shared\_Ace_Layout.cshtml"
-    
-            
-            #line default
-            #line hidden
-            
-            #line 69 "..\..\Views\Shared\_Ace_Layout.cshtml"
-     if (set.BootstrapSelect)
-    {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        <script");
-
-WriteAttribute("src", Tuple.Create(" src=\"", 2638), Tuple.Create("\"", 2695)
-, Tuple.Create(Tuple.Create("", 2644), Tuple.Create<System.Object, System.Int32>(Href("~/Content/bootstrap/js/bootstrap-multiselect.min.js")
-, 2644), false)
-);
-
-WriteLiteral("></script>\r\n");
-
-            
-            #line 72 "..\..\Views\Shared\_Ace_Layout.cshtml"
-    }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("    ");
-
-            
-            #line 74 "..\..\Views\Shared\_Ace_Layout.cshtml"
-Write(RenderSection("scripts", required: false));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n\r\n    <!--日历控件支持-->\r\n    <script");
-
-WriteAttribute("src", Tuple.Create(" src=\"", 2797), Tuple.Create("\"", 2859)
-, Tuple.Create(Tuple.Create("", 2803), Tuple.Create<System.Object, System.Int32>(Href("~/Content/DateTimePicker/bootstrap-datetimepicker.min.js")
-, 2803), false)
-);
-
-WriteLiteral("></script>\r\n    <script");
-
-WriteAttribute("src", Tuple.Create(" src=\"", 2883), Tuple.Create("\"", 2955)
-, Tuple.Create(Tuple.Create("", 2889), Tuple.Create<System.Object, System.Int32>(Href("~/Content/DateTimePicker/locales/bootstrap-datetimepicker.zh-CN.js")
-, 2889), false)
-);
-
-WriteLiteral("></script>\r\n    <script>\r\n        $(function () {\r\n            $(\'.form_datetime\'" +
-").each(function () {\r\n                var df = $(this).attr(\'dateformat\');\r\n    " +
-"            if (!df) {\r\n                    $(this).attr(\'dateformat\', \'yyyy-mm-" +
-"dd hh:ii:ss\');\r\n                    $(this).width(140);\r\n                }\r\n    " +
-"            else {\r\n                    // 把C#标准格式化替换为控件格式\r\n                    " +
-"df = df.replace(\'mm\', \'ii\').replace(\'MM\', \'mm\').replace(\'HH\', \'hh\');\r\n          " +
-"          $(this).attr(\'dateformat\', df);\r\n\r\n                    // 根据时间日期格式，锁定日" +
-"期输入框宽度\r\n                    if (df.indexOf(\'hh\') >= 0)\r\n                        " +
-"$(this).width(140);\r\n                    else\r\n                        $(this).w" +
-"idth(80);\r\n                }\r\n\r\n                //根据日期格式自动推算日期选择view显示的范围\r\n     " +
-"           var sv = 2;\r\n                var mv = 2;\r\n                var autoVie" +
-"w = $(this).attr(\'autoView\');\r\n                if (autoView != \'false\') {\r\n     " +
-"               df = $(this).attr(\'dateformat\');\r\n                    if (df.inde" +
-"xOf(\'ii\') >= 0) {\r\n                        mv = 0;\r\n                        if (" +
-"df.indexOf(\'dd\') >= 0) {\r\n                            sv = 2;\r\n                 " +
-"       } else {\r\n                            sv = 1;\r\n                        }\r" +
-"\n                    } else if (df.indexOf(\'hh\') >= 0) {\r\n                      " +
-"  mv = 1;\r\n                        if (df.indexOf(\'dd\') >= 0) {\r\n               " +
-"             sv = 2;\r\n                        } else {\r\n                        " +
-"    sv = 1;\r\n                        }\r\n                    } else if (df.indexO" +
-"f(\'dd\') >= 0) {\r\n                        mv = 2;\r\n                        sv = 2" +
-";\r\n                    } else if (df.indexOf(\'mm\') >= 0) {\r\n                    " +
-"    mv = 3;\r\n                        sv = 3;\r\n                    } else if (df." +
-"indexOf(\'yyyy\') >= 0) {\r\n                        mv = 4;\r\n                      " +
-"  sv = 4;\r\n                    }\r\n                }\r\n\r\n                $(this).a" +
-"ttr(\'startview\', sv);\r\n                $(this).attr(\'minview\', mv);\r\n           " +
-" });\r\n            $(\"[dateformat]\").each(function () {\r\n                $(this)." +
-"datetimepicker({\r\n                    format: $(this).attr(\"dateformat\"),\r\n     " +
-"               autoclose: true,\r\n                    language: \"zh-CN\",\r\n       " +
-"             forceParse: false,\r\n                    startView: parseInt($(this)" +
-".attr(\'startview\')),\r\n                    minView: parseInt($(this).attr(\'minvie" +
-"w\'))\r\n                });\r\n            });\r\n");
-
-            
-            #line 144 "..\..\Views\Shared\_Ace_Layout.cshtml"
-            
-            
-            #line default
-            #line hidden
-            
-            #line 144 "..\..\Views\Shared\_Ace_Layout.cshtml"
-             if (set.BootstrapSelect) {
-            
-            #line default
-            #line hidden
-WriteLiteral(@"
-            $('.multiselect').each(function () {
-                $(this).multiselect({
-                    // 下拉列表仅在列表项比较多时显示过滤框
-                    enableFiltering: $(this).children().length > 10,
-                    buttonClass: 'btn btn-white btn-primary',
-                    templates: {
-                        button: '<button");
-
-WriteLiteral(" type=\"button\"");
-
-WriteLiteral(" class=\"multiselect dropdown-toggle\"");
-
-WriteLiteral(" data-toggle=\"dropdown\"");
-
-WriteLiteral("></button>\',\r\n                        ul: \'<ul");
-
-WriteLiteral(" class=\"multiselect-container dropdown-menu\"");
-
-WriteLiteral("></ul>\',\r\n                        filter: \'<li");
-
-WriteLiteral(" class=\"multiselect-item filter\"");
-
-WriteLiteral("><div");
-
-WriteLiteral(" class=\"input-group\"");
-
-WriteLiteral("><span");
-
-WriteLiteral(" class=\"input-group-addon\"");
-
-WriteLiteral("><i");
-
-WriteLiteral(" class=\"fa fa-search\"");
-
-WriteLiteral("></i></span><input");
-
-WriteLiteral(" class=\"form-control multiselect-search\"");
-
-WriteLiteral(" type=\"text\"");
-
-WriteLiteral("></div></li>\',\r\n                        filterClearBtn: \'<span");
-
-WriteLiteral(" class=\"input-group-btn\"");
-
-WriteLiteral("><button");
-
-WriteLiteral(" class=\"btn btn-default btn-white btn-grey multiselect-clear-filter\"");
-
-WriteLiteral(" type=\"button\"");
-
-WriteLiteral("><i");
-
-WriteLiteral(" class=\"fa fa-times-circle red2\"");
-
-WriteLiteral("></i></button></span>\',\r\n                        li: \'<li><a");
-
-WriteLiteral(" href=\"javascript:void(0);\"");
-
-WriteLiteral("><label></label></a></li>\',\r\n                        divider: \'<li");
-
-WriteLiteral(" class=\"multiselect-item divider\"");
-
-WriteLiteral("></li>\',\r\n                        liGroup: \'<li");
-
-WriteLiteral(" class=\"multiselect-item group\"");
-
-WriteLiteral("><label");
-
-WriteLiteral(" class=\"multiselect-group\"");
-
-WriteLiteral("></label></li>\'\r\n                    },\r\n                    filterPlaceholder: \'" +
-"搜索\',\r\n                    nonSelectedText: \'无\',\r\n                    allSelected" +
-"Text: \'全选\'\r\n                });\r\n            });\r\n            ");
-
-            
-            #line 164 "..\..\Views\Shared\_Ace_Layout.cshtml"
-                   }
-            
-            
-            #line default
-            #line hidden
-            
-            #line 167 "..\..\Views\Shared\_Ace_Layout.cshtml"
-                                                                                        
-
-            
-            #line default
-            #line hidden
-WriteLiteral(@"            $('tr').dblclick(function () {
-                var $this = $(this);
-                var row = $this.closest(""tr"");
-                var findcell = row.find('.editcell');
-                if (findcell.length > 0) window.location.href = findcell.attr(""href"");
-            });
-        });
-    </script>
-
-    <!--开关插件-->
-    <script");
-
-WriteAttribute("src", Tuple.Create(" src=\"", 7503), Tuple.Create("\"", 7559)
-, Tuple.Create(Tuple.Create("", 7509), Tuple.Create<System.Object, System.Int32>(Href("~/Content/bootstrap-switch/bootstrap-switch.min.js")
-, 7509), false)
-);
-
-WriteLiteral("></script>\r\n    <script>\r\n        $(function () {\r\n            $(\"input.chkSwitch" +
-"\").bootstrapSwitch();\r\n        })\r\n    </script>\r\n\r\n    ");
-
-WriteLiteral("\r\n    <script");
-
-WriteAttribute("src", Tuple.Create(" src=\"", 7723), Tuple.Create("\"", 7772)
-, Tuple.Create(Tuple.Create("", 7729), Tuple.Create<System.Object, System.Int32>(Href("~/Content/artDialog/dist/dialog-plus-min.js")
-, 7729), false)
-);
-
-WriteLiteral("></script>\r\n    <script");
-
-WriteAttribute("src", Tuple.Create(" src=\"", 7796), Tuple.Create("\"", 7845)
-, Tuple.Create(Tuple.Create("", 7802), Tuple.Create<System.Object, System.Int32>(Href("~/Content/artDialog/dist/dialog.new.life.js")
-, 7802), false)
-);
-
-WriteLiteral("></script>\r\n    ");
-
-WriteLiteral("\r\n    <script");
-
-WriteAttribute("src", Tuple.Create(" src=\"", 7890), Tuple.Create("\"", 7929)
-, Tuple.Create(Tuple.Create("", 7896), Tuple.Create<System.Object, System.Int32>(Href("~/Content/Cube.js?v=2.0.2017.1126")
-, 7896), false)
-);
-
-WriteLiteral("></script>\r\n</body>\r\n</html>");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Views/Shared/_Ace_Layout_Nav.cshtml b/NewLife.Cube/Views/Shared/_Ace_Layout_Nav.cshtml
deleted file mode 100644
index 8874f8957b..0000000000
--- a/NewLife.Cube/Views/Shared/_Ace_Layout_Nav.cshtml
+++ /dev/null
@@ -1,22 +0,0 @@
-﻿@{
-    //var menu = ManageProvider.Menu.Current;
-    var menu = ViewBag.Menu as IMenu;
-}
-<li>
-    <i class="ace-icon fa fa-home home-icon"></i>
-    @if (menu != null)
-    {
-        foreach (IMenu item in (menu as IEntityTree).AllParents)
-        {
-            if (item.ID != 0)
-            {
-                <a href="@(item.Url!=null? Url.Content(item.Url):"#")">@item.DisplayName</a>
-
-            }
-        }
-    }
-</li>
-
-<li>
-    <a href="@Url.Action("Index")">@(menu != null ? menu.DisplayName : ViewBag.Title)</a>
-</li>
diff --git a/NewLife.Cube/Views/Shared/_Ace_Layout_Nav.generated.cs b/NewLife.Cube/Views/Shared/_Ace_Layout_Nav.generated.cs
deleted file mode 100644
index d4a0eb9889..0000000000
--- a/NewLife.Cube/Views/Shared/_Ace_Layout_Nav.generated.cs
+++ /dev/null
@@ -1,137 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Shared/_Ace_Layout_Nav.cshtml")]
-    public partial class _Views_Shared__Ace_Layout_Nav_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Views_Shared__Ace_Layout_Nav_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 1 "..\..\Views\Shared\_Ace_Layout_Nav.cshtml"
-  
-    //var menu = ManageProvider.Menu.Current;
-    var menu = ViewBag.Menu as IMenu;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n<li>\r\n    <i");
-
-WriteLiteral(" class=\"ace-icon fa fa-home home-icon\"");
-
-WriteLiteral("></i>\r\n");
-
-            
-            #line 7 "..\..\Views\Shared\_Ace_Layout_Nav.cshtml"
-    
-            
-            #line default
-            #line hidden
-            
-            #line 7 "..\..\Views\Shared\_Ace_Layout_Nav.cshtml"
-     if (menu != null)
-    {
-        foreach (IMenu item in (menu as IEntityTree).AllParents)
-        {
-            if (item.ID != 0)
-            {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 322), Tuple.Create("\"", 373)
-            
-            #line 13 "..\..\Views\Shared\_Ace_Layout_Nav.cshtml"
-, Tuple.Create(Tuple.Create("", 329), Tuple.Create<System.Object, System.Int32>(item.Url!=null? Url.Content(item.Url):"#"
-            
-            #line default
-            #line hidden
-, 329), false)
-);
-
-WriteLiteral(">");
-
-            
-            #line 13 "..\..\Views\Shared\_Ace_Layout_Nav.cshtml"
-                                                                  Write(item.DisplayName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</a>\r\n");
-
-            
-            #line 14 "..\..\Views\Shared\_Ace_Layout_Nav.cshtml"
-
-            }
-        }
-    }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</li>\r\n\r\n<li>\r\n    <a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 454), Tuple.Create("\"", 481)
-            
-            #line 21 "..\..\Views\Shared\_Ace_Layout_Nav.cshtml"
-, Tuple.Create(Tuple.Create("", 461), Tuple.Create<System.Object, System.Int32>(Url.Action("Index")
-            
-            #line default
-            #line hidden
-, 461), false)
-);
-
-WriteLiteral(">");
-
-            
-            #line 21 "..\..\Views\Shared\_Ace_Layout_Nav.cshtml"
-                               Write(menu != null ? menu.DisplayName : ViewBag.Title);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</a>\r\n</li>\r\n");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Views/Shared/_DateRange.cshtml b/NewLife.Cube/Views/Shared/_DateRange.cshtml
deleted file mode 100644
index 4fbc0dac46..0000000000
--- a/NewLife.Cube/Views/Shared/_DateRange.cshtml
+++ /dev/null
@@ -1,18 +0,0 @@
-﻿@{
-    var formatStr = (Model is String) ? Model : "yyyy-MM-dd";
-    var p = ViewBag.Page as Pager;
-}
-<div class="form-group">
-    <label for="dtStart" class="control-label">时间：</label>
-    <div class="input-group">
-        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-        <input name="dtStart" id="dtStart" value="@p["dtStart"]" dateformat="@formatStr" class="form-control form_datetime" />
-    </div>
-</div>
-<div class="form-group">
-    <label for="dtEnd" class="control-label">至</label>
-    <div class="input-group">
-        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-        <input name="dtEnd" id="dtEnd" value="@p["dtEnd"]" dateformat="@formatStr" class="form-control form_datetime" />
-    </div>
-</div>
\ No newline at end of file
diff --git a/NewLife.Cube/Views/Shared/_DateRange.generated.cs b/NewLife.Cube/Views/Shared/_DateRange.generated.cs
deleted file mode 100644
index bc0bee1b43..0000000000
--- a/NewLife.Cube/Views/Shared/_DateRange.generated.cs
+++ /dev/null
@@ -1,159 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Shared/_DateRange.cshtml")]
-    public partial class _Views_Shared__DateRange_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Views_Shared__DateRange_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 1 "..\..\Views\Shared\_DateRange.cshtml"
-  
-    var formatStr = (Model is String) ? Model : "yyyy-MM-dd";
-    var p = ViewBag.Page as Pager;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n<div");
-
-WriteLiteral(" class=\"form-group\"");
-
-WriteLiteral(">\r\n    <label");
-
-WriteLiteral(" for=\"dtStart\"");
-
-WriteLiteral(" class=\"control-label\"");
-
-WriteLiteral(">时间：</label>\r\n    <div");
-
-WriteLiteral(" class=\"input-group\"");
-
-WriteLiteral(">\r\n        <span");
-
-WriteLiteral(" class=\"input-group-addon\"");
-
-WriteLiteral("><i");
-
-WriteLiteral(" class=\"fa fa-calendar\"");
-
-WriteLiteral("></i></span>\r\n        <input");
-
-WriteLiteral(" name=\"dtStart\"");
-
-WriteLiteral(" id=\"dtStart\"");
-
-WriteAttribute("value", Tuple.Create(" value=\"", 344), Tuple.Create("\"", 365)
-            
-            #line 9 "..\..\Views\Shared\_DateRange.cshtml"
-, Tuple.Create(Tuple.Create("", 352), Tuple.Create<System.Object, System.Int32>(p["dtStart"]
-            
-            #line default
-            #line hidden
-, 352), false)
-);
-
-WriteAttribute("dateformat", Tuple.Create(" dateformat=\"", 366), Tuple.Create("\"", 389)
-            
-            #line 9 "..\..\Views\Shared\_DateRange.cshtml"
-, Tuple.Create(Tuple.Create("", 379), Tuple.Create<System.Object, System.Int32>(formatStr
-            
-            #line default
-            #line hidden
-, 379), false)
-);
-
-WriteLiteral(" class=\"form-control form_datetime\"");
-
-WriteLiteral(" />\r\n    </div>\r\n</div>\r\n<div");
-
-WriteLiteral(" class=\"form-group\"");
-
-WriteLiteral(">\r\n    <label");
-
-WriteLiteral(" for=\"dtEnd\"");
-
-WriteLiteral(" class=\"control-label\"");
-
-WriteLiteral(">至</label>\r\n    <div");
-
-WriteLiteral(" class=\"input-group\"");
-
-WriteLiteral(">\r\n        <span");
-
-WriteLiteral(" class=\"input-group-addon\"");
-
-WriteLiteral("><i");
-
-WriteLiteral(" class=\"fa fa-calendar\"");
-
-WriteLiteral("></i></span>\r\n        <input");
-
-WriteLiteral(" name=\"dtEnd\"");
-
-WriteLiteral(" id=\"dtEnd\"");
-
-WriteAttribute("value", Tuple.Create(" value=\"", 680), Tuple.Create("\"", 699)
-            
-            #line 16 "..\..\Views\Shared\_DateRange.cshtml"
-, Tuple.Create(Tuple.Create("", 688), Tuple.Create<System.Object, System.Int32>(p["dtEnd"]
-            
-            #line default
-            #line hidden
-, 688), false)
-);
-
-WriteAttribute("dateformat", Tuple.Create(" dateformat=\"", 700), Tuple.Create("\"", 723)
-            
-            #line 16 "..\..\Views\Shared\_DateRange.cshtml"
-, Tuple.Create(Tuple.Create("", 713), Tuple.Create<System.Object, System.Int32>(formatStr
-            
-            #line default
-            #line hidden
-, 713), false)
-);
-
-WriteLiteral(" class=\"form-control form_datetime\"");
-
-WriteLiteral(" />\r\n    </div>\r\n</div>");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Views/Shared/_Form_Action.cshtml b/NewLife.Cube/Views/Shared/_Form_Action.cshtml
deleted file mode 100644
index 4ef4cc96ef..0000000000
--- a/NewLife.Cube/Views/Shared/_Form_Action.cshtml
+++ /dev/null
@@ -1,13 +0,0 @@
-﻿@using XCode.Membership;
-@{
-    var entity = Model as IEntity;
-    var isNew = entity.IsNullKey;
-}
-@if (this.Has(PermissionFlags.Insert, PermissionFlags.Update))
-{
-    <div class="clearfix form-actions col-sm-12 col-md-12">
-        <label class="control-label col-xs-4 col-sm-5 col-md-5"></label>
-        <button type="submit" class="btn btn-success btn-sm"><i class="glyphicon glyphicon-@(isNew ? "plus" : "save")"></i><strong>@(isNew ? "新增" : "保存")</strong></button>
-        <button type="button" class="btn btn-danger btn-sm" onclick="history.go(-1);"><i class="glyphicon glyphicon-remove"></i><strong>取消</strong></button>
-    </div>
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Views/Shared/_Form_Action.generated.cs b/NewLife.Cube/Views/Shared/_Form_Action.generated.cs
deleted file mode 100644
index 7dc034afaa..0000000000
--- a/NewLife.Cube/Views/Shared/_Form_Action.generated.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    
-    #line 1 "..\..\Views\Shared\_Form_Action.cshtml"
-    using XCode.Membership;
-    
-    #line default
-    #line hidden
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Shared/_Form_Action.cshtml")]
-    public partial class _Views_Shared__Form_Action_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Views_Shared__Form_Action_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 2 "..\..\Views\Shared\_Form_Action.cshtml"
-  
-    var entity = Model as IEntity;
-    var isNew = entity.IsNullKey;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-            
-            #line 6 "..\..\Views\Shared\_Form_Action.cshtml"
- if (this.Has(PermissionFlags.Insert, PermissionFlags.Update))
-{
-
-            
-            #line default
-            #line hidden
-WriteLiteral("    <div");
-
-WriteLiteral(" class=\"clearfix form-actions col-sm-12 col-md-12\"");
-
-WriteLiteral(">\r\n        <label");
-
-WriteLiteral(" class=\"control-label col-xs-4 col-sm-5 col-md-5\"");
-
-WriteLiteral("></label>\r\n        <button");
-
-WriteLiteral(" type=\"submit\"");
-
-WriteLiteral(" class=\"btn btn-success btn-sm\"");
-
-WriteLiteral("><i");
-
-WriteAttribute("class", Tuple.Create(" class=\"", 369), Tuple.Create("\"", 423)
-, Tuple.Create(Tuple.Create("", 377), Tuple.Create("glyphicon", 377), true)
-, Tuple.Create(Tuple.Create(" ", 386), Tuple.Create("glyphicon-", 387), true)
-            
-            #line 10 "..\..\Views\Shared\_Form_Action.cshtml"
-             , Tuple.Create(Tuple.Create("", 397), Tuple.Create<System.Object, System.Int32>(isNew ? "plus" : "save"
-            
-            #line default
-            #line hidden
-, 397), false)
-);
-
-WriteLiteral("></i><strong>");
-
-            
-            #line 10 "..\..\Views\Shared\_Form_Action.cshtml"
-                                                                                                                               Write(isNew ? "新增" : "保存");
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</strong></button>\r\n        <button");
-
-WriteLiteral(" type=\"button\"");
-
-WriteLiteral(" class=\"btn btn-danger btn-sm\"");
-
-WriteLiteral(" onclick=\"history.go(-1);\"");
-
-WriteLiteral("><i");
-
-WriteLiteral(" class=\"glyphicon glyphicon-remove\"");
-
-WriteLiteral("></i><strong>取消</strong></button>\r\n    </div>\r\n");
-
-            
-            #line 13 "..\..\Views\Shared\_Form_Action.cshtml"
-}
-            
-            #line default
-            #line hidden
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Views/Shared/_Form_Body.cshtml b/NewLife.Cube/Views/Shared/_Form_Body.cshtml
deleted file mode 100644
index 0c34f77f2b..0000000000
--- a/NewLife.Cube/Views/Shared/_Form_Body.cshtml
+++ /dev/null
@@ -1,16 +0,0 @@
-﻿@using NewLife;
-@using XCode;
-@using XCode.Configuration;
-@{
-    var entity = Model as IEntity;
-    var fields = ViewBag.Fields as IList<FieldItem>;
-}
-@foreach (var item in fields)
-{
-    if (!item.IsIdentity)
-    {
-        @Html.Partial("_Form_Group", new Pair(entity, item))
-    }
-}
-@Html.Partial("_Form_Footer", entity)
-@Html.Partial("_Form_Action", entity)
diff --git a/NewLife.Cube/Views/Shared/_Form_Body.generated.cs b/NewLife.Cube/Views/Shared/_Form_Body.generated.cs
deleted file mode 100644
index 20ac06ed08..0000000000
--- a/NewLife.Cube/Views/Shared/_Form_Body.generated.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    
-    #line 1 "..\..\Views\Shared\_Form_Body.cshtml"
-    using NewLife;
-    
-    #line default
-    #line hidden
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    
-    #line 2 "..\..\Views\Shared\_Form_Body.cshtml"
-    using XCode;
-    
-    #line default
-    #line hidden
-    
-    #line 3 "..\..\Views\Shared\_Form_Body.cshtml"
-    using XCode.Configuration;
-    
-    #line default
-    #line hidden
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Shared/_Form_Body.cshtml")]
-    public partial class _Views_Shared__Form_Body_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Views_Shared__Form_Body_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 4 "..\..\Views\Shared\_Form_Body.cshtml"
-  
-    var entity = Model as IEntity;
-    var fields = ViewBag.Fields as IList<FieldItem>;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-            
-            #line 8 "..\..\Views\Shared\_Form_Body.cshtml"
- foreach (var item in fields)
-{
-    if (!item.IsIdentity)
-    {
-        
-            
-            #line default
-            #line hidden
-            
-            #line 12 "..\..\Views\Shared\_Form_Body.cshtml"
-   Write(Html.Partial("_Form_Group", new Pair(entity, item)));
-
-            
-            #line default
-            #line hidden
-            
-            #line 12 "..\..\Views\Shared\_Form_Body.cshtml"
-                                                            
-    }
-}
-
-            
-            #line default
-            #line hidden
-            
-            #line 15 "..\..\Views\Shared\_Form_Body.cshtml"
-Write(Html.Partial("_Form_Footer", entity));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-            
-            #line 16 "..\..\Views\Shared\_Form_Body.cshtml"
-Write(Html.Partial("_Form_Action", entity));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Views/Shared/_Form_Footer.cshtml b/NewLife.Cube/Views/Shared/_Form_Footer.cshtml
deleted file mode 100644
index f88d4dd4ba..0000000000
--- a/NewLife.Cube/Views/Shared/_Form_Footer.cshtml
+++ /dev/null
@@ -1,87 +0,0 @@
-﻿@using NewLife.Cube;
-@using XCode.Configuration;
-@{
-    var entity = Model as IEntity;
-    var fact = EntityFactory.CreateOperate(entity.GetType());
-    var fields = ViewBag.Fields as IList<FieldItem>;
-
-    var set = NewLife.Cube.Setting.Current;
-    var cls = set.FormGroupClass;
-    if (cls.IsNullOrEmpty()) { cls = "form-group col-xs-12 col-sm-6 col-lg-4"; }
-
-    var total = 12;
-    var label = 4;
-    var span = 0;
-    var input = total - label - span;
-
-    var cid = fact.Table.FindByName("CreateUserID") as FieldItem;
-    var uid = fact.Table.FindByName("UpdateUserID") as FieldItem;
-    var cip = fact.Table.FindByName("CreateIP") as FieldItem;
-    var uip = fact.Table.FindByName("UpdateIP") as FieldItem;
-    var remark = fact.Table.FindByName("Remark") as FieldItem;
-    if (remark == null) { remark = fact.Table.FindByName("Description"); }
-
-    var hasUser = cid != null || uid != null;
-    if (hasUser && ViewData["Provider"] == null) { ViewData["Provider"] = ManageProvider.Provider; }
-    var provider = ViewData["Provider"] as IManageProvider;
-}
-@if (cid != null && !fields.Contains(cid))
-{
-    var user = fact.Table.FindByName("CreateUserID") as FieldItem;
-    var time = fact.Table.FindByName("CreateTime") as FieldItem;
-    <div class="form-group col-xs-12 col-sm-6">
-        <label class="control-label col-xs-@label col-sm-@label">创建</label>
-        <div class="control-label col-xs-@(total - label) col-sm-@input" style="text-align: left;">
-            @if (user != null)
-            {
-                var val = entity[user.Name];
-                <span class="text-primary" title="@val">@provider.FindByID(val)</span>
-            }
-            @if (time != null)
-            {
-                var dt = (DateTime)entity[time.Name];
-                <span class="text-success">@dt.ToFullString()</span>
-            }
-            @if (cip != null)
-            {
-                var ip = entity[cip.Name] + "";
-                <span class="text-primary">@ip @ip.IPToAddress()</span>
-            }
-        </div>
-    </div>
-}
-@if (uid != null && !fields.Contains(uid))
-{
-    var user = fact.Table.FindByName("UpdateUserID") as FieldItem;
-    var time = fact.Table.FindByName("UpdateTime") as FieldItem;
-    <div class="form-group col-xs-12 col-sm-6">
-        <label class="control-label col-xs-@label col-sm-@label">更新</label>
-        <div class="control-label col-xs-@(total - label) col-sm-@input" style="text-align: left;">
-            @if (user != null)
-            {
-                var val = entity[user.Name];
-                <span class="text-primary" title="@val">@provider.FindByID(val)</span>
-            }
-            @if (time != null)
-            {
-                var dt = (DateTime)entity[time.Name];
-                <span class="text-success">@dt.ToFullString()</span>
-            }
-            @if (uip != null)
-            {
-                var ip = entity[uip.Name] + "";
-                <span class="text-primary">@ip @ip.IPToAddress()</span>
-            }
-        </div>
-    </div>
-}
-@if (remark != null && !fields.Contains(remark))
-{
-    <div class="form-group col-md-12">
-        <label class="control-label col-md-2">@remark.DisplayName</label>
-        <div class="input-group col-md-8">
-            @Html.ForString(remark.Name, (String)entity[remark.Name], -1)
-            @Html.ForDescription(remark)
-        </div>
-    </div>
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Views/Shared/_Form_Footer.generated.cs b/NewLife.Cube/Views/Shared/_Form_Footer.generated.cs
deleted file mode 100644
index 468bcc487a..0000000000
--- a/NewLife.Cube/Views/Shared/_Form_Footer.generated.cs
+++ /dev/null
@@ -1,536 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    
-    #line 1 "..\..\Views\Shared\_Form_Footer.cshtml"
-    using NewLife.Cube;
-    
-    #line default
-    #line hidden
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    
-    #line 2 "..\..\Views\Shared\_Form_Footer.cshtml"
-    using XCode.Configuration;
-    
-    #line default
-    #line hidden
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Shared/_Form_Footer.cshtml")]
-    public partial class _Views_Shared__Form_Footer_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Views_Shared__Form_Footer_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 3 "..\..\Views\Shared\_Form_Footer.cshtml"
-  
-    var entity = Model as IEntity;
-    var fact = EntityFactory.CreateOperate(entity.GetType());
-    var fields = ViewBag.Fields as IList<FieldItem>;
-
-    var set = NewLife.Cube.Setting.Current;
-    var cls = set.FormGroupClass;
-    if (cls.IsNullOrEmpty()) { cls = "form-group col-xs-12 col-sm-6 col-lg-4"; }
-
-    var total = 12;
-    var label = 4;
-    var span = 0;
-    var input = total - label - span;
-
-    var cid = fact.Table.FindByName("CreateUserID") as FieldItem;
-    var uid = fact.Table.FindByName("UpdateUserID") as FieldItem;
-    var cip = fact.Table.FindByName("CreateIP") as FieldItem;
-    var uip = fact.Table.FindByName("UpdateIP") as FieldItem;
-    var remark = fact.Table.FindByName("Remark") as FieldItem;
-    if (remark == null) { remark = fact.Table.FindByName("Description"); }
-
-    var hasUser = cid != null || uid != null;
-    if (hasUser && ViewData["Provider"] == null) { ViewData["Provider"] = ManageProvider.Provider; }
-    var provider = ViewData["Provider"] as IManageProvider;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-            
-            #line 28 "..\..\Views\Shared\_Form_Footer.cshtml"
- if (cid != null && !fields.Contains(cid))
-{
-    var user = fact.Table.FindByName("CreateUserID") as FieldItem;
-    var time = fact.Table.FindByName("CreateTime") as FieldItem;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("    <div");
-
-WriteLiteral(" class=\"form-group col-xs-12 col-sm-6\"");
-
-WriteLiteral(">\r\n        <label");
-
-WriteAttribute("class", Tuple.Create(" class=\"", 1334), Tuple.Create("\"", 1383)
-, Tuple.Create(Tuple.Create("", 1342), Tuple.Create("control-label", 1342), true)
-, Tuple.Create(Tuple.Create(" ", 1355), Tuple.Create("col-xs-", 1356), true)
-            
-            #line 33 "..\..\Views\Shared\_Form_Footer.cshtml"
-, Tuple.Create(Tuple.Create("", 1363), Tuple.Create<System.Object, System.Int32>(label
-            
-            #line default
-            #line hidden
-, 1363), false)
-, Tuple.Create(Tuple.Create(" ", 1369), Tuple.Create("col-sm-", 1370), true)
-            
-            #line 33 "..\..\Views\Shared\_Form_Footer.cshtml"
-, Tuple.Create(Tuple.Create("", 1377), Tuple.Create<System.Object, System.Int32>(label
-            
-            #line default
-            #line hidden
-, 1377), false)
-);
-
-WriteLiteral(">创建</label>\r\n        <div");
-
-WriteAttribute("class", Tuple.Create(" class=\"", 1409), Tuple.Create("\"", 1468)
-, Tuple.Create(Tuple.Create("", 1417), Tuple.Create("control-label", 1417), true)
-, Tuple.Create(Tuple.Create(" ", 1430), Tuple.Create("col-xs-", 1431), true)
-            
-            #line 34 "..\..\Views\Shared\_Form_Footer.cshtml"
-, Tuple.Create(Tuple.Create("", 1438), Tuple.Create<System.Object, System.Int32>(total - label
-            
-            #line default
-            #line hidden
-, 1438), false)
-, Tuple.Create(Tuple.Create(" ", 1454), Tuple.Create("col-sm-", 1455), true)
-            
-            #line 34 "..\..\Views\Shared\_Form_Footer.cshtml"
-, Tuple.Create(Tuple.Create("", 1462), Tuple.Create<System.Object, System.Int32>(input
-            
-            #line default
-            #line hidden
-, 1462), false)
-);
-
-WriteLiteral(" style=\"text-align: left;\"");
-
-WriteLiteral(">\r\n");
-
-            
-            #line 35 "..\..\Views\Shared\_Form_Footer.cshtml"
-            
-            
-            #line default
-            #line hidden
-            
-            #line 35 "..\..\Views\Shared\_Form_Footer.cshtml"
-             if (user != null)
-            {
-                var val = entity[user.Name];
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <span");
-
-WriteLiteral(" class=\"text-primary\"");
-
-WriteAttribute("title", Tuple.Create(" title=\"", 1633), Tuple.Create("\"", 1645)
-            
-            #line 38 "..\..\Views\Shared\_Form_Footer.cshtml"
-, Tuple.Create(Tuple.Create("", 1641), Tuple.Create<System.Object, System.Int32>(val
-            
-            #line default
-            #line hidden
-, 1641), false)
-);
-
-WriteLiteral(">");
-
-            
-            #line 38 "..\..\Views\Shared\_Form_Footer.cshtml"
-                                                   Write(provider.FindByID(val));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</span>\r\n");
-
-            
-            #line 39 "..\..\Views\Shared\_Form_Footer.cshtml"
-            }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            ");
-
-            
-            #line 40 "..\..\Views\Shared\_Form_Footer.cshtml"
-             if (time != null)
-            {
-                var dt = (DateTime)entity[time.Name];
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <span");
-
-WriteLiteral(" class=\"text-success\"");
-
-WriteLiteral(">");
-
-            
-            #line 43 "..\..\Views\Shared\_Form_Footer.cshtml"
-                                      Write(dt.ToFullString());
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</span>\r\n");
-
-            
-            #line 44 "..\..\Views\Shared\_Form_Footer.cshtml"
-            }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            ");
-
-            
-            #line 45 "..\..\Views\Shared\_Form_Footer.cshtml"
-             if (cip != null)
-            {
-                var ip = entity[cip.Name] + "";
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <span");
-
-WriteLiteral(" class=\"text-primary\"");
-
-WriteLiteral(">");
-
-            
-            #line 48 "..\..\Views\Shared\_Form_Footer.cshtml"
-                                      Write(ip);
-
-            
-            #line default
-            #line hidden
-WriteLiteral(" ");
-
-            
-            #line 48 "..\..\Views\Shared\_Form_Footer.cshtml"
-                                          Write(ip.IPToAddress());
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</span>\r\n");
-
-            
-            #line 49 "..\..\Views\Shared\_Form_Footer.cshtml"
-            }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        </div>\r\n    </div>\r\n");
-
-            
-            #line 52 "..\..\Views\Shared\_Form_Footer.cshtml"
-}
-
-            
-            #line default
-            #line hidden
-            
-            #line 53 "..\..\Views\Shared\_Form_Footer.cshtml"
- if (uid != null && !fields.Contains(uid))
-{
-    var user = fact.Table.FindByName("UpdateUserID") as FieldItem;
-    var time = fact.Table.FindByName("UpdateTime") as FieldItem;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("    <div");
-
-WriteLiteral(" class=\"form-group col-xs-12 col-sm-6\"");
-
-WriteLiteral(">\r\n        <label");
-
-WriteAttribute("class", Tuple.Create(" class=\"", 2339), Tuple.Create("\"", 2388)
-, Tuple.Create(Tuple.Create("", 2347), Tuple.Create("control-label", 2347), true)
-, Tuple.Create(Tuple.Create(" ", 2360), Tuple.Create("col-xs-", 2361), true)
-            
-            #line 58 "..\..\Views\Shared\_Form_Footer.cshtml"
-, Tuple.Create(Tuple.Create("", 2368), Tuple.Create<System.Object, System.Int32>(label
-            
-            #line default
-            #line hidden
-, 2368), false)
-, Tuple.Create(Tuple.Create(" ", 2374), Tuple.Create("col-sm-", 2375), true)
-            
-            #line 58 "..\..\Views\Shared\_Form_Footer.cshtml"
-, Tuple.Create(Tuple.Create("", 2382), Tuple.Create<System.Object, System.Int32>(label
-            
-            #line default
-            #line hidden
-, 2382), false)
-);
-
-WriteLiteral(">更新</label>\r\n        <div");
-
-WriteAttribute("class", Tuple.Create(" class=\"", 2414), Tuple.Create("\"", 2473)
-, Tuple.Create(Tuple.Create("", 2422), Tuple.Create("control-label", 2422), true)
-, Tuple.Create(Tuple.Create(" ", 2435), Tuple.Create("col-xs-", 2436), true)
-            
-            #line 59 "..\..\Views\Shared\_Form_Footer.cshtml"
-, Tuple.Create(Tuple.Create("", 2443), Tuple.Create<System.Object, System.Int32>(total - label
-            
-            #line default
-            #line hidden
-, 2443), false)
-, Tuple.Create(Tuple.Create(" ", 2459), Tuple.Create("col-sm-", 2460), true)
-            
-            #line 59 "..\..\Views\Shared\_Form_Footer.cshtml"
-, Tuple.Create(Tuple.Create("", 2467), Tuple.Create<System.Object, System.Int32>(input
-            
-            #line default
-            #line hidden
-, 2467), false)
-);
-
-WriteLiteral(" style=\"text-align: left;\"");
-
-WriteLiteral(">\r\n");
-
-            
-            #line 60 "..\..\Views\Shared\_Form_Footer.cshtml"
-            
-            
-            #line default
-            #line hidden
-            
-            #line 60 "..\..\Views\Shared\_Form_Footer.cshtml"
-             if (user != null)
-            {
-                var val = entity[user.Name];
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <span");
-
-WriteLiteral(" class=\"text-primary\"");
-
-WriteAttribute("title", Tuple.Create(" title=\"", 2638), Tuple.Create("\"", 2650)
-            
-            #line 63 "..\..\Views\Shared\_Form_Footer.cshtml"
-, Tuple.Create(Tuple.Create("", 2646), Tuple.Create<System.Object, System.Int32>(val
-            
-            #line default
-            #line hidden
-, 2646), false)
-);
-
-WriteLiteral(">");
-
-            
-            #line 63 "..\..\Views\Shared\_Form_Footer.cshtml"
-                                                   Write(provider.FindByID(val));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</span>\r\n");
-
-            
-            #line 64 "..\..\Views\Shared\_Form_Footer.cshtml"
-            }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            ");
-
-            
-            #line 65 "..\..\Views\Shared\_Form_Footer.cshtml"
-             if (time != null)
-            {
-                var dt = (DateTime)entity[time.Name];
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <span");
-
-WriteLiteral(" class=\"text-success\"");
-
-WriteLiteral(">");
-
-            
-            #line 68 "..\..\Views\Shared\_Form_Footer.cshtml"
-                                      Write(dt.ToFullString());
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</span>\r\n");
-
-            
-            #line 69 "..\..\Views\Shared\_Form_Footer.cshtml"
-            }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            ");
-
-            
-            #line 70 "..\..\Views\Shared\_Form_Footer.cshtml"
-             if (uip != null)
-            {
-                var ip = entity[uip.Name] + "";
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <span");
-
-WriteLiteral(" class=\"text-primary\"");
-
-WriteLiteral(">");
-
-            
-            #line 73 "..\..\Views\Shared\_Form_Footer.cshtml"
-                                      Write(ip);
-
-            
-            #line default
-            #line hidden
-WriteLiteral(" ");
-
-            
-            #line 73 "..\..\Views\Shared\_Form_Footer.cshtml"
-                                          Write(ip.IPToAddress());
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</span>\r\n");
-
-            
-            #line 74 "..\..\Views\Shared\_Form_Footer.cshtml"
-            }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        </div>\r\n    </div>\r\n");
-
-            
-            #line 77 "..\..\Views\Shared\_Form_Footer.cshtml"
-}
-
-            
-            #line default
-            #line hidden
-            
-            #line 78 "..\..\Views\Shared\_Form_Footer.cshtml"
- if (remark != null && !fields.Contains(remark))
-{
-
-            
-            #line default
-            #line hidden
-WriteLiteral("    <div");
-
-WriteLiteral(" class=\"form-group col-md-12\"");
-
-WriteLiteral(">\r\n        <label");
-
-WriteLiteral(" class=\"control-label col-md-2\"");
-
-WriteLiteral(">");
-
-            
-            #line 81 "..\..\Views\Shared\_Form_Footer.cshtml"
-                                         Write(remark.DisplayName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</label>\r\n        <div");
-
-WriteLiteral(" class=\"input-group col-md-8\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("            ");
-
-            
-            #line 83 "..\..\Views\Shared\_Form_Footer.cshtml"
-       Write(Html.ForString(remark.Name, (String)entity[remark.Name], -1));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("            ");
-
-            
-            #line 84 "..\..\Views\Shared\_Form_Footer.cshtml"
-       Write(Html.ForDescription(remark));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n        </div>\r\n    </div>\r\n");
-
-            
-            #line 87 "..\..\Views\Shared\_Form_Footer.cshtml"
-}
-            
-            #line default
-            #line hidden
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Views/Shared/_Form_Group.cshtml b/NewLife.Cube/Views/Shared/_Form_Group.cshtml
deleted file mode 100644
index e4ea371798..0000000000
--- a/NewLife.Cube/Views/Shared/_Form_Group.cshtml
+++ /dev/null
@@ -1,15 +0,0 @@
-﻿@using NewLife;
-@using XCode;
-@using XCode.Configuration;
-@{
-    var pair = Model as Pair;
-    var entity = pair.First as IEntity;
-    var item = pair.Second as FieldItem;
-
-    var set = NewLife.Cube.Setting.Current;
-    var cls = set.FormGroupClass;
-    if (cls.IsNullOrEmpty()) { cls = "form-group col-xs-12 col-sm-6 col-lg-4"; }
-}
-<div class="@cls">
-    @Html.Partial("_Form_Item", new Pair(entity, item))
-</div>
diff --git a/NewLife.Cube/Views/Shared/_Form_Group.generated.cs b/NewLife.Cube/Views/Shared/_Form_Group.generated.cs
deleted file mode 100644
index ea411994f0..0000000000
--- a/NewLife.Cube/Views/Shared/_Form_Group.generated.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    
-    #line 1 "..\..\Views\Shared\_Form_Group.cshtml"
-    using NewLife;
-    
-    #line default
-    #line hidden
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    
-    #line 2 "..\..\Views\Shared\_Form_Group.cshtml"
-    using XCode;
-    
-    #line default
-    #line hidden
-    
-    #line 3 "..\..\Views\Shared\_Form_Group.cshtml"
-    using XCode.Configuration;
-    
-    #line default
-    #line hidden
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Shared/_Form_Group.cshtml")]
-    public partial class _Views_Shared__Form_Group_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Views_Shared__Form_Group_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 4 "..\..\Views\Shared\_Form_Group.cshtml"
-  
-    var pair = Model as Pair;
-    var entity = pair.First as IEntity;
-    var item = pair.Second as FieldItem;
-
-    var set = NewLife.Cube.Setting.Current;
-    var cls = set.FormGroupClass;
-    if (cls.IsNullOrEmpty()) { cls = "form-group col-xs-12 col-sm-6 col-lg-4"; }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n<div");
-
-WriteAttribute("class", Tuple.Create(" class=\"", 350), Tuple.Create("\"", 362)
-            
-            #line 13 "..\..\Views\Shared\_Form_Group.cshtml"
-, Tuple.Create(Tuple.Create("", 358), Tuple.Create<System.Object, System.Int32>(cls
-            
-            #line default
-            #line hidden
-, 358), false)
-);
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("    ");
-
-            
-            #line 14 "..\..\Views\Shared\_Form_Group.cshtml"
-Write(Html.Partial("_Form_Item", new Pair(entity, item)));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n</div>\r\n");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Views/Shared/_Form_Header.cshtml b/NewLife.Cube/Views/Shared/_Form_Header.cshtml
deleted file mode 100644
index fcbbaa4d3d..0000000000
--- a/NewLife.Cube/Views/Shared/_Form_Header.cshtml
+++ /dev/null
@@ -1,21 +0,0 @@
-﻿@{ 
-    var msg = ViewBag.StatusMessage as String;
-}
-@if (!msg.IsNullOrEmpty())
-{
-    //if (ViewData.ModelState.Values.Any(st => st.Errors.Count > 0))
-    if (ViewBag.RowsAffected <= 0)
-    {
-        <div class="alert alert-danger alert-dismissible text-center" role="alert">
-            <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-            <strong>@msg</strong>
-        </div>
-    }
-    else
-    {
-        <div class="alert alert-success alert-dismissible text-center" role="alert">
-            <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-            <strong>@msg</strong>
-        </div>
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Views/Shared/_Form_Header.generated.cs b/NewLife.Cube/Views/Shared/_Form_Header.generated.cs
deleted file mode 100644
index 418a687186..0000000000
--- a/NewLife.Cube/Views/Shared/_Form_Header.generated.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Shared/_Form_Header.cshtml")]
-    public partial class _Views_Shared__Form_Header_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Views_Shared__Form_Header_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 1 "..\..\Views\Shared\_Form_Header.cshtml"
-   
-    var msg = ViewBag.StatusMessage as String;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-            
-            #line 4 "..\..\Views\Shared\_Form_Header.cshtml"
- if (!msg.IsNullOrEmpty())
-{
-    //if (ViewData.ModelState.Values.Any(st => st.Errors.Count > 0))
-    if (ViewBag.RowsAffected <= 0)
-    {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        <div");
-
-WriteLiteral(" class=\"alert alert-danger alert-dismissible text-center\"");
-
-WriteLiteral(" role=\"alert\"");
-
-WriteLiteral(">\r\n            <button");
-
-WriteLiteral(" type=\"button\"");
-
-WriteLiteral(" class=\"close\"");
-
-WriteLiteral(" data-dismiss=\"alert\"");
-
-WriteLiteral(" aria-label=\"Close\"");
-
-WriteLiteral("><span");
-
-WriteLiteral(" aria-hidden=\"true\"");
-
-WriteLiteral(">&times;</span></button>\r\n            <strong>");
-
-            
-            #line 11 "..\..\Views\Shared\_Form_Header.cshtml"
-               Write(msg);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</strong>\r\n        </div>\r\n");
-
-            
-            #line 13 "..\..\Views\Shared\_Form_Header.cshtml"
-    }
-    else
-    {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        <div");
-
-WriteLiteral(" class=\"alert alert-success alert-dismissible text-center\"");
-
-WriteLiteral(" role=\"alert\"");
-
-WriteLiteral(">\r\n            <button");
-
-WriteLiteral(" type=\"button\"");
-
-WriteLiteral(" class=\"close\"");
-
-WriteLiteral(" data-dismiss=\"alert\"");
-
-WriteLiteral(" aria-label=\"Close\"");
-
-WriteLiteral("><span");
-
-WriteLiteral(" aria-hidden=\"true\"");
-
-WriteLiteral(">&times;</span></button>\r\n            <strong>");
-
-            
-            #line 18 "..\..\Views\Shared\_Form_Header.cshtml"
-               Write(msg);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</strong>\r\n        </div>\r\n");
-
-            
-            #line 20 "..\..\Views\Shared\_Form_Header.cshtml"
-    }
-}
-            
-            #line default
-            #line hidden
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Views/Shared/_Form_Item.cshtml b/NewLife.Cube/Views/Shared/_Form_Item.cshtml
deleted file mode 100644
index 86b5335988..0000000000
--- a/NewLife.Cube/Views/Shared/_Form_Item.cshtml
+++ /dev/null
@@ -1,46 +0,0 @@
-﻿@using NewLife;
-@using XCode;
-@using XCode.Configuration;
-@{
-    var pair = Model as Pair;
-    var entity = pair.First as IEntity;
-    var item = pair.Second as FieldItem;
-
-    var err = 0;
-    ModelState st = null;
-    if (ViewData.ModelState.TryGetValue(item.Name, out st) && st != null) { err = st.Errors.Count; }
-
-    var des = item.Description.TrimStart(item.DisplayName).TrimStart(",", ".", "，", "。");
-
-    var total = 12;
-    var label = 3;
-    var span = 4;
-    if (err == 0 && des.IsNullOrEmpty())
-    {
-        span = 0;
-    }
-    else if (item.Type == typeof(Boolean) || item.Type.IsEnum)
-    {
-        span += 1;
-    }
-    //else if (item.Type == typeof(DateTime))
-    //{
-    //    span += 1;
-    //    total--;
-    //}
-    var input = total - label - span;
-}
-<label class="control-label col-xs-@label col-sm-@label">@item.DisplayName</label>
-<div class="input-group col-xs-@(total - label) col-sm-@input">
-    @Html.ForEditor(item, entity)
-</div>
-@if (err > 0)
-{
-    <span class="col-sm-@span alert alert-danger">
-        @Html.ValidationMessage(item.Name)
-    </span>
-}
-else if (!des.IsNullOrEmpty())
-{
-    <span class="hidden-xs col-sm-@span">@Html.ForDescription(item)</span>
-}
diff --git a/NewLife.Cube/Views/Shared/_Form_Item.generated.cs b/NewLife.Cube/Views/Shared/_Form_Item.generated.cs
deleted file mode 100644
index 9c7297a16d..0000000000
--- a/NewLife.Cube/Views/Shared/_Form_Item.generated.cs
+++ /dev/null
@@ -1,241 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    
-    #line 1 "..\..\Views\Shared\_Form_Item.cshtml"
-    using NewLife;
-    
-    #line default
-    #line hidden
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    
-    #line 2 "..\..\Views\Shared\_Form_Item.cshtml"
-    using XCode;
-    
-    #line default
-    #line hidden
-    
-    #line 3 "..\..\Views\Shared\_Form_Item.cshtml"
-    using XCode.Configuration;
-    
-    #line default
-    #line hidden
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Shared/_Form_Item.cshtml")]
-    public partial class _Views_Shared__Form_Item_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Views_Shared__Form_Item_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 4 "..\..\Views\Shared\_Form_Item.cshtml"
-  
-    var pair = Model as Pair;
-    var entity = pair.First as IEntity;
-    var item = pair.Second as FieldItem;
-
-    var err = 0;
-    ModelState st = null;
-    if (ViewData.ModelState.TryGetValue(item.Name, out st) && st != null) { err = st.Errors.Count; }
-
-    var des = item.Description.TrimStart(item.DisplayName).TrimStart(",", ".", "，", "。");
-
-    var total = 12;
-    var label = 3;
-    var span = 4;
-    if (err == 0 && des.IsNullOrEmpty())
-    {
-        span = 0;
-    }
-    else if (item.Type == typeof(Boolean) || item.Type.IsEnum)
-    {
-        span += 1;
-    }
-    //else if (item.Type == typeof(DateTime))
-    //{
-    //    span += 1;
-    //    total--;
-    //}
-    var input = total - label - span;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n<label");
-
-WriteAttribute("class", Tuple.Create(" class=\"", 811), Tuple.Create("\"", 860)
-, Tuple.Create(Tuple.Create("", 819), Tuple.Create("control-label", 819), true)
-, Tuple.Create(Tuple.Create(" ", 832), Tuple.Create("col-xs-", 833), true)
-            
-            #line 33 "..\..\Views\Shared\_Form_Item.cshtml"
-, Tuple.Create(Tuple.Create("", 840), Tuple.Create<System.Object, System.Int32>(label
-            
-            #line default
-            #line hidden
-, 840), false)
-, Tuple.Create(Tuple.Create(" ", 846), Tuple.Create("col-sm-", 847), true)
-            
-            #line 33 "..\..\Views\Shared\_Form_Item.cshtml"
-, Tuple.Create(Tuple.Create("", 854), Tuple.Create<System.Object, System.Int32>(label
-            
-            #line default
-            #line hidden
-, 854), false)
-);
-
-WriteLiteral(">");
-
-            
-            #line 33 "..\..\Views\Shared\_Form_Item.cshtml"
-                                                    Write(item.DisplayName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</label>\r\n<div");
-
-WriteAttribute("class", Tuple.Create(" class=\"", 893), Tuple.Create("\"", 950)
-, Tuple.Create(Tuple.Create("", 901), Tuple.Create("input-group", 901), true)
-, Tuple.Create(Tuple.Create(" ", 912), Tuple.Create("col-xs-", 913), true)
-            
-            #line 34 "..\..\Views\Shared\_Form_Item.cshtml"
-, Tuple.Create(Tuple.Create("", 920), Tuple.Create<System.Object, System.Int32>(total - label
-            
-            #line default
-            #line hidden
-, 920), false)
-, Tuple.Create(Tuple.Create(" ", 936), Tuple.Create("col-sm-", 937), true)
-            
-            #line 34 "..\..\Views\Shared\_Form_Item.cshtml"
-, Tuple.Create(Tuple.Create("", 944), Tuple.Create<System.Object, System.Int32>(input
-            
-            #line default
-            #line hidden
-, 944), false)
-);
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("    ");
-
-            
-            #line 35 "..\..\Views\Shared\_Form_Item.cshtml"
-Write(Html.ForEditor(item, entity));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n</div>\r\n");
-
-            
-            #line 37 "..\..\Views\Shared\_Form_Item.cshtml"
- if (err > 0)
-{
-
-            
-            #line default
-            #line hidden
-WriteLiteral("    <span");
-
-WriteAttribute("class", Tuple.Create(" class=\"", 1024), Tuple.Create("\"", 1063)
-, Tuple.Create(Tuple.Create("", 1032), Tuple.Create("col-sm-", 1032), true)
-            
-            #line 39 "..\..\Views\Shared\_Form_Item.cshtml"
-, Tuple.Create(Tuple.Create("", 1039), Tuple.Create<System.Object, System.Int32>(span
-            
-            #line default
-            #line hidden
-, 1039), false)
-, Tuple.Create(Tuple.Create(" ", 1044), Tuple.Create("alert", 1045), true)
-, Tuple.Create(Tuple.Create(" ", 1050), Tuple.Create("alert-danger", 1051), true)
-);
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("        ");
-
-            
-            #line 40 "..\..\Views\Shared\_Form_Item.cshtml"
-   Write(Html.ValidationMessage(item.Name));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n    </span>\r\n");
-
-            
-            #line 42 "..\..\Views\Shared\_Form_Item.cshtml"
-}
-else if (!des.IsNullOrEmpty())
-{
-
-            
-            #line default
-            #line hidden
-WriteLiteral("    <span");
-
-WriteAttribute("class", Tuple.Create(" class=\"", 1171), Tuple.Create("\"", 1201)
-, Tuple.Create(Tuple.Create("", 1179), Tuple.Create("hidden-xs", 1179), true)
-, Tuple.Create(Tuple.Create(" ", 1188), Tuple.Create("col-sm-", 1189), true)
-            
-            #line 45 "..\..\Views\Shared\_Form_Item.cshtml"
-, Tuple.Create(Tuple.Create("", 1196), Tuple.Create<System.Object, System.Int32>(span
-            
-            #line default
-            #line hidden
-, 1196), false)
-);
-
-WriteLiteral(">");
-
-            
-            #line 45 "..\..\Views\Shared\_Form_Item.cshtml"
-                                    Write(Html.ForDescription(item));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</span>\r\n");
-
-            
-            #line 46 "..\..\Views\Shared\_Form_Item.cshtml"
-}
-
-            
-            #line default
-            #line hidden
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Views/Shared/_Layout.cshtml b/NewLife.Cube/Views/Shared/_Layout.cshtml
deleted file mode 100644
index 94c56ede71..0000000000
--- a/NewLife.Cube/Views/Shared/_Layout.cshtml
+++ /dev/null
@@ -1,40 +0,0 @@
-﻿@using NewLife.Common;
-@{
-    var cfg = NewLife.Common.SysConfig.Current;
-    var title = ViewBag.Title + "";
-    if (title != "" && !title.EndsWith(" - ")) { title += " - "; }
-    title += cfg.DisplayName;
-    var title2 = ViewBag.Title2 as String;
-    if (!title2.IsNullOrEmpty()) { title += " - " + title2; }
-}
-<!DOCTYPE html>
-<html lang="zh-CN">
-<head>
-    <meta charset="utf-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    @*上述3个meta标签*必须*放在最前面，任何其他内容都*必须*跟随其后！*@
-    <title>@title</title>
-    <link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon">
-
-    <!-- 页面内联样式 -->
-    @RenderSection("css", required: false)
-
-    <link rel="stylesheet" href="~/Content/bootstrap/css/bootstrap.min.css" />
-    @*<link rel="stylesheet" href="~/Content/bootstrap-switch/bootstrap-switch.min.css" />*@
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body>
-    @*@Html.Partial("_Layout_Header")*@
-
-    @*<div class="container">*@
-    @RenderBody()
-    @*</div>*@
-
-    @*@Html.Partial("_Layout_Footer")*@
-
-    <script src="~/Content/js/jquery-2.1.3.min.js"></script>
-    <script src="~/Content/bootstrap/js/bootstrap.js"></script>
-    @*<script src="~/Content/bootstrap-switch/bootstrap-switch.min.js"></script>*@
-    @RenderSection("scripts", required: false)
-</body>
-</html>
diff --git a/NewLife.Cube/Views/Shared/_Layout.generated.cs b/NewLife.Cube/Views/Shared/_Layout.generated.cs
deleted file mode 100644
index 0ab3f08855..0000000000
--- a/NewLife.Cube/Views/Shared/_Layout.generated.cs
+++ /dev/null
@@ -1,179 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    
-    #line 1 "..\..\Views\Shared\_Layout.cshtml"
-    using NewLife.Common;
-    
-    #line default
-    #line hidden
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Shared/_Layout.cshtml")]
-    public partial class _Views_Shared__Layout_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Views_Shared__Layout_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 2 "..\..\Views\Shared\_Layout.cshtml"
-  
-    var cfg = NewLife.Common.SysConfig.Current;
-    var title = ViewBag.Title + "";
-    if (title != "" && !title.EndsWith(" - ")) { title += " - "; }
-    title += cfg.DisplayName;
-    var title2 = ViewBag.Title2 as String;
-    if (!title2.IsNullOrEmpty()) { title += " - " + title2; }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n<!DOCTYPE html>\r\n<html");
-
-WriteLiteral(" lang=\"zh-CN\"");
-
-WriteLiteral(">\r\n<head>\r\n    <meta");
-
-WriteLiteral(" charset=\"utf-8\"");
-
-WriteLiteral(" />\r\n    <meta");
-
-WriteLiteral(" http-equiv=\"X-UA-Compatible\"");
-
-WriteLiteral(" content=\"IE=edge\"");
-
-WriteLiteral(">\r\n    <meta");
-
-WriteLiteral(" name=\"viewport\"");
-
-WriteLiteral(" content=\"width=device-width, initial-scale=1.0\"");
-
-WriteLiteral(" />\r\n    ");
-
-WriteLiteral("\r\n    <title>");
-
-            
-            #line 17 "..\..\Views\Shared\_Layout.cshtml"
-      Write(title);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</title>\r\n    <link");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 618), Tuple.Create("\"", 638)
-, Tuple.Create(Tuple.Create("", 625), Tuple.Create<System.Object, System.Int32>(Href("~/favicon.ico")
-, 625), false)
-);
-
-WriteLiteral(" rel=\"shortcut icon\"");
-
-WriteLiteral(" type=\"image/x-icon\"");
-
-WriteLiteral(">\r\n\r\n    <!-- 页面内联样式 -->\r\n");
-
-WriteLiteral("    ");
-
-            
-            #line 21 "..\..\Views\Shared\_Layout.cshtml"
-Write(RenderSection("css", required: false));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n\r\n    <link");
-
-WriteLiteral(" rel=\"stylesheet\"");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 777), Tuple.Create("\"", 825)
-, Tuple.Create(Tuple.Create("", 784), Tuple.Create<System.Object, System.Int32>(Href("~/Content/bootstrap/css/bootstrap.min.css")
-, 784), false)
-);
-
-WriteLiteral(" />\r\n    ");
-
-WriteLiteral("\r\n        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>\r\n<body>\r\n    ");
-
-WriteLiteral("\r\n\r\n    ");
-
-WriteLiteral("\r\n");
-
-WriteLiteral("    ");
-
-            
-            #line 30 "..\..\Views\Shared\_Layout.cshtml"
-Write(RenderBody());
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n    ");
-
-WriteLiteral("\r\n\r\n    ");
-
-WriteLiteral("\r\n\r\n    <script");
-
-WriteAttribute("src", Tuple.Create(" src=\"", 1109), Tuple.Create("\"", 1147)
-, Tuple.Create(Tuple.Create("", 1115), Tuple.Create<System.Object, System.Int32>(Href("~/Content/js/jquery-2.1.3.min.js")
-, 1115), false)
-);
-
-WriteLiteral("></script>\r\n    <script");
-
-WriteAttribute("src", Tuple.Create(" src=\"", 1171), Tuple.Create("\"", 1212)
-, Tuple.Create(Tuple.Create("", 1177), Tuple.Create<System.Object, System.Int32>(Href("~/Content/bootstrap/js/bootstrap.js")
-, 1177), false)
-);
-
-WriteLiteral("></script>\r\n    ");
-
-WriteLiteral("\r\n");
-
-WriteLiteral("    ");
-
-            
-            #line 38 "..\..\Views\Shared\_Layout.cshtml"
-Write(RenderSection("scripts", required: false));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n</body>\r\n</html>\r\n");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Views/Shared/_Layout_Footer.cshtml b/NewLife.Cube/Views/Shared/_Layout_Footer.cshtml
deleted file mode 100644
index 42ba0b984d..0000000000
--- a/NewLife.Cube/Views/Shared/_Layout_Footer.cshtml
+++ /dev/null
@@ -1,19 +0,0 @@
-﻿@using NewLife.Common;
-@{
-    var cfg = NewLife.Common.SysConfig.Current;
-    var user = ManageProvider.User;
-}
-<div class="container footer">
-    <div class="page-divider"></div>
-    <div class="clearfix">
-        <div class="pull-right btn-group dropup">
-            <a class="dropdown-toggle" data-toggle="dropdown" href="#">友情链接 <span class="caret"></span></a>
-            <ul class="dropdown-menu">
-                <li>友情链接1</li>
-                <li>友情链接2</li>
-                <li>友情链接3</li>
-            </ul>
-        </div>
-        <div class="pull-left"><p class="muted" title="">&copy; 2002-@DateTime.Now.Year @cfg.Company</p></div>
-    </div>
-</div>
diff --git a/NewLife.Cube/Views/Shared/_Layout_Footer.generated.cs b/NewLife.Cube/Views/Shared/_Layout_Footer.generated.cs
deleted file mode 100644
index 3642a119b8..0000000000
--- a/NewLife.Cube/Views/Shared/_Layout_Footer.generated.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    
-    #line 1 "..\..\Views\Shared\_Layout_Footer.cshtml"
-    using NewLife.Common;
-    
-    #line default
-    #line hidden
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Shared/_Layout_Footer.cshtml")]
-    public partial class _Views_Shared__Layout_Footer_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Views_Shared__Layout_Footer_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 2 "..\..\Views\Shared\_Layout_Footer.cshtml"
-  
-    var cfg = NewLife.Common.SysConfig.Current;
-    var user = ManageProvider.User;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n<div");
-
-WriteLiteral(" class=\"container footer\"");
-
-WriteLiteral(">\r\n    <div");
-
-WriteLiteral(" class=\"page-divider\"");
-
-WriteLiteral("></div>\r\n    <div");
-
-WriteLiteral(" class=\"clearfix\"");
-
-WriteLiteral(">\r\n        <div");
-
-WriteLiteral(" class=\"pull-right btn-group dropup\"");
-
-WriteLiteral(">\r\n            <a");
-
-WriteLiteral(" class=\"dropdown-toggle\"");
-
-WriteLiteral(" data-toggle=\"dropdown\"");
-
-WriteLiteral(" href=\"#\"");
-
-WriteLiteral(">友情链接 <span");
-
-WriteLiteral(" class=\"caret\"");
-
-WriteLiteral("></span></a>\r\n            <ul");
-
-WriteLiteral(" class=\"dropdown-menu\"");
-
-WriteLiteral(">\r\n                <li>友情链接1</li>\r\n                <li>友情链接2</li>\r\n              " +
-"  <li>友情链接3</li>\r\n            </ul>\r\n        </div>\r\n        <div");
-
-WriteLiteral(" class=\"pull-left\"");
-
-WriteLiteral("><p");
-
-WriteLiteral(" class=\"muted\"");
-
-WriteLiteral(" title=\"\"");
-
-WriteLiteral(">&copy; 2002-");
-
-            
-            #line 17 "..\..\Views\Shared\_Layout_Footer.cshtml"
-                                                                Write(DateTime.Now.Year);
-
-            
-            #line default
-            #line hidden
-WriteLiteral(" ");
-
-            
-            #line 17 "..\..\Views\Shared\_Layout_Footer.cshtml"
-                                                                                   Write(cfg.Company);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</p></div>\r\n    </div>\r\n</div>\r\n");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Views/Shared/_Layout_Header.cshtml b/NewLife.Cube/Views/Shared/_Layout_Header.cshtml
deleted file mode 100644
index 53421f4c23..0000000000
--- a/NewLife.Cube/Views/Shared/_Layout_Header.cshtml
+++ /dev/null
@@ -1,37 +0,0 @@
-﻿@using NewLife.Common;
-@{
-    var cfg = NewLife.Common.SysConfig.Current;
-    var user = ManageProvider.User;
-    var retUrl = Request.Url.PathAndQuery;
-}
-<div class="navbar navbar-default">
-    <div class="container">
-        <div class="navbar-header">
-            <button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".navbar-responsive-collapse">
-                <span class="sr-only"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </button>
-            <a class="navbar-brand" href="~/">@cfg.DisplayName<sub>@cfg.Name</sub></a>
-        </div>
-        <div class="navbar-collapse collapse navbar-responsive-collapse">
-            <ul class="nav navbar-nav">
-                <li>@Html.ActionLink("首页", "Index", "Home")</li>
-                <li>@Html.ActionLink("关于我们", "About", "Home")</li>
-            </ul>
-            <ul class="nav navbar-nav navbar-right">
-                @if (user == null)
-                {
-                    <li class="">@Html.ActionLink("注册", "Register", "Account")</li>
-                    <li class="">@Html.ActionLink("登录", "Login", "Account", new { r = retUrl }, null)</li>
-                }
-                else
-                {
-                    <li class="">@Html.ActionLink(user + "", "Detail", "Account", new { user.ID }, null)</li>
-                    <li class="">@Html.ActionLink("注销", "Logout", "Account", new { r = retUrl }, null)</li>
-                }
-            </ul>
-        </div>
-    </div>
-</div>
diff --git a/NewLife.Cube/Views/Shared/_Layout_Header.generated.cs b/NewLife.Cube/Views/Shared/_Layout_Header.generated.cs
deleted file mode 100644
index 02f106d0ae..0000000000
--- a/NewLife.Cube/Views/Shared/_Layout_Header.generated.cs
+++ /dev/null
@@ -1,253 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    
-    #line 1 "..\..\Views\Shared\_Layout_Header.cshtml"
-    using NewLife.Common;
-    
-    #line default
-    #line hidden
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Shared/_Layout_Header.cshtml")]
-    public partial class _Views_Shared__Layout_Header_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Views_Shared__Layout_Header_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 2 "..\..\Views\Shared\_Layout_Header.cshtml"
-  
-    var cfg = NewLife.Common.SysConfig.Current;
-    var user = ManageProvider.User;
-    var retUrl = Request.Url.PathAndQuery;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n<div");
-
-WriteLiteral(" class=\"navbar navbar-default\"");
-
-WriteLiteral(">\r\n    <div");
-
-WriteLiteral(" class=\"container\"");
-
-WriteLiteral(">\r\n        <div");
-
-WriteLiteral(" class=\"navbar-header\"");
-
-WriteLiteral(">\r\n            <button");
-
-WriteLiteral(" class=\"navbar-toggle\"");
-
-WriteLiteral(" type=\"button\"");
-
-WriteLiteral(" data-toggle=\"collapse\"");
-
-WriteLiteral(" data-target=\".navbar-responsive-collapse\"");
-
-WriteLiteral(">\r\n                <span");
-
-WriteLiteral(" class=\"sr-only\"");
-
-WriteLiteral("></span>\r\n                <span");
-
-WriteLiteral(" class=\"icon-bar\"");
-
-WriteLiteral("></span>\r\n                <span");
-
-WriteLiteral(" class=\"icon-bar\"");
-
-WriteLiteral("></span>\r\n                <span");
-
-WriteLiteral(" class=\"icon-bar\"");
-
-WriteLiteral("></span>\r\n            </button>\r\n            <a");
-
-WriteLiteral(" class=\"navbar-brand\"");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 636), Tuple.Create("\"", 645)
-, Tuple.Create(Tuple.Create("", 643), Tuple.Create<System.Object, System.Int32>(Href("~/")
-, 643), false)
-);
-
-WriteLiteral(">");
-
-            
-            #line 16 "..\..\Views\Shared\_Layout_Header.cshtml"
-                                         Write(cfg.DisplayName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("<sub>");
-
-            
-            #line 16 "..\..\Views\Shared\_Layout_Header.cshtml"
-                                                              Write(cfg.Name);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</sub></a>\r\n        </div>\r\n        <div");
-
-WriteLiteral(" class=\"navbar-collapse collapse navbar-responsive-collapse\"");
-
-WriteLiteral(">\r\n            <ul");
-
-WriteLiteral(" class=\"nav navbar-nav\"");
-
-WriteLiteral(">\r\n                <li>");
-
-            
-            #line 20 "..\..\Views\Shared\_Layout_Header.cshtml"
-               Write(Html.ActionLink("首页", "Index", "Home"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</li>\r\n                <li>");
-
-            
-            #line 21 "..\..\Views\Shared\_Layout_Header.cshtml"
-               Write(Html.ActionLink("关于我们", "About", "Home"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</li>\r\n            </ul>\r\n            <ul");
-
-WriteLiteral(" class=\"nav navbar-nav navbar-right\"");
-
-WriteLiteral(">\r\n");
-
-            
-            #line 24 "..\..\Views\Shared\_Layout_Header.cshtml"
-                
-            
-            #line default
-            #line hidden
-            
-            #line 24 "..\..\Views\Shared\_Layout_Header.cshtml"
-                 if (user == null)
-                {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                    <li");
-
-WriteLiteral(" class=\"\"");
-
-WriteLiteral(">");
-
-            
-            #line 26 "..\..\Views\Shared\_Layout_Header.cshtml"
-                            Write(Html.ActionLink("注册", "Register", "Account"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</li>\r\n");
-
-WriteLiteral("                    <li");
-
-WriteLiteral(" class=\"\"");
-
-WriteLiteral(">");
-
-            
-            #line 27 "..\..\Views\Shared\_Layout_Header.cshtml"
-                            Write(Html.ActionLink("登录", "Login", "Account", new { r = retUrl }, null));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</li>\r\n");
-
-            
-            #line 28 "..\..\Views\Shared\_Layout_Header.cshtml"
-                }
-                else
-                {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                    <li");
-
-WriteLiteral(" class=\"\"");
-
-WriteLiteral(">");
-
-            
-            #line 31 "..\..\Views\Shared\_Layout_Header.cshtml"
-                            Write(Html.ActionLink(user + "", "Detail", "Account", new { user.ID }, null));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</li>\r\n");
-
-WriteLiteral("                    <li");
-
-WriteLiteral(" class=\"\"");
-
-WriteLiteral(">");
-
-            
-            #line 32 "..\..\Views\Shared\_Layout_Header.cshtml"
-                            Write(Html.ActionLink("注销", "Logout", "Account", new { r = retUrl }, null));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</li>\r\n");
-
-            
-            #line 33 "..\..\Views\Shared\_Layout_Header.cshtml"
-                }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            </ul>\r\n        </div>\r\n    </div>\r\n</div>\r\n");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Views/Shared/_ListTree_Data.cshtml b/NewLife.Cube/Views/Shared/_ListTree_Data.cshtml
deleted file mode 100644
index de239809e2..0000000000
--- a/NewLife.Cube/Views/Shared/_ListTree_Data.cshtml
+++ /dev/null
@@ -1,82 +0,0 @@
-﻿@using NewLife;
-@using NewLife.Web;
-@using XCode;
-@using XCode.Configuration;
-@{
-    var fact = ViewBag.Factory as IEntityOperate;
-    var page = ViewBag.Page as Pager;
-    var fields = ViewBag.Fields as IList<FieldItem>;
-    var fk = fact.Unique;
-    var enableSelect = this.EnableSelect();
-}
-<table class="table table-bordered table-hover table-striped table-condensed table-data-list">
-    <thead>
-        <tr>
-            @if (enableSelect)
-            {
-                <th class="text-center" style="width:10px;"><input type="checkbox" id="chkAll" title="全选" /></th>
-            }
-            @foreach (var item in fields)
-            {
-                var sortUrl = item.OriField != null ? page.GetSortUrl(item.OriField.Name) : page.GetSortUrl(item.Name);
-                var cls = item.IsIdentity ? "text-center hidden-md hidden-sm hidden-xs" : "text-center";
-                <th class="@cls" title="@item.Description"><a href="@Html.Raw(sortUrl)">@item.DisplayName</a></th>
-            }
-            <th class="text-center">升</th>
-            <th class="text-center">降</th>
-            @if (this.Has(PermissionFlags.Detail, PermissionFlags.Update, PermissionFlags.Delete))
-            {
-                <th class="text-center">操作</th>
-            }
-        </tr>
-    </thead>
-    <tbody>
-        @foreach (IEntityTree entity in Model)
-        {
-            var FirstFlag = 0;
-            var p = entity.Parent as IEntityTree;
-            if (p == null)
-            {
-                p = fact.EntityType.GetValue("Root") as IEntityTree;
-            }
-            var id = entity["ID"];
-            <tr>
-                @if (enableSelect)
-                {
-                    <td class="text-center"><input type="checkbox" name="keys" value="@entity[fk.Name]" /></td>
-                }
-                @foreach (var item in fields)
-                {
-                    if (FirstFlag == 0)
-                    {
-                        @Html.Partial("_List_Data_Item_First", new Pair(entity, item))
-                    }
-                    else
-                    {
-                        @Html.Partial("_List_Data_Item", new Pair(entity, item))
-                    }
-
-                    FirstFlag++;
-                }
-                <td class="text-center">
-                    @if (p != null && p.Childs != null && p.Childs.Count > 0 && entity != p.Childs[0])
-                    {
-                        <a href="@Url.Action("Up", new { id })"><span class="glyphicon glyphicon-arrow-up" style="color: green;"></span></a>
-                    }
-                </td>
-                <td class="text-center">
-                    @if (p != null && entity != p.Childs[p.Childs.Count - 1])
-                    {
-                        <a href="@Url.Action("Down", new { id })"><span class="glyphicon glyphicon-arrow-down" style="color: red;"></span></a>
-                    }
-                </td>
-                @if (this.Has(PermissionFlags.Detail, PermissionFlags.Update, PermissionFlags.Delete))
-                {
-                    <td class="text-center">
-                        @Html.Partial("_List_Data_Action", (Object)entity)
-                    </td>
-                }
-            </tr>
-        }
-    </tbody>
-</table>
\ No newline at end of file
diff --git a/NewLife.Cube/Views/Shared/_ListTree_Data.generated.cs b/NewLife.Cube/Views/Shared/_ListTree_Data.generated.cs
deleted file mode 100644
index 85bb8b35a2..0000000000
--- a/NewLife.Cube/Views/Shared/_ListTree_Data.generated.cs
+++ /dev/null
@@ -1,486 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    
-    #line 1 "..\..\Views\Shared\_ListTree_Data.cshtml"
-    using NewLife;
-    
-    #line default
-    #line hidden
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    
-    #line 2 "..\..\Views\Shared\_ListTree_Data.cshtml"
-    using NewLife.Web;
-    
-    #line default
-    #line hidden
-    
-    #line 3 "..\..\Views\Shared\_ListTree_Data.cshtml"
-    using XCode;
-    
-    #line default
-    #line hidden
-    
-    #line 4 "..\..\Views\Shared\_ListTree_Data.cshtml"
-    using XCode.Configuration;
-    
-    #line default
-    #line hidden
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Shared/_ListTree_Data.cshtml")]
-    public partial class _Views_Shared__ListTree_Data_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Views_Shared__ListTree_Data_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 5 "..\..\Views\Shared\_ListTree_Data.cshtml"
-  
-    var fact = ViewBag.Factory as IEntityOperate;
-    var page = ViewBag.Page as Pager;
-    var fields = ViewBag.Fields as IList<FieldItem>;
-    var fk = fact.Unique;
-    var enableSelect = this.EnableSelect();
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n<table");
-
-WriteLiteral(" class=\"table table-bordered table-hover table-striped table-condensed table-data" +
-"-list\"");
-
-WriteLiteral(">\r\n    <thead>\r\n        <tr>\r\n");
-
-            
-            #line 15 "..\..\Views\Shared\_ListTree_Data.cshtml"
-            
-            
-            #line default
-            #line hidden
-            
-            #line 15 "..\..\Views\Shared\_ListTree_Data.cshtml"
-             if (enableSelect)
-            {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(" style=\"width:10px;\"");
-
-WriteLiteral("><input");
-
-WriteLiteral(" type=\"checkbox\"");
-
-WriteLiteral(" id=\"chkAll\"");
-
-WriteLiteral(" title=\"全选\"");
-
-WriteLiteral(" /></th>\r\n");
-
-            
-            #line 18 "..\..\Views\Shared\_ListTree_Data.cshtml"
-            }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            ");
-
-            
-            #line 19 "..\..\Views\Shared\_ListTree_Data.cshtml"
-             foreach (var item in fields)
-            {
-                var sortUrl = item.OriField != null ? page.GetSortUrl(item.OriField.Name) : page.GetSortUrl(item.Name);
-                var cls = item.IsIdentity ? "text-center hidden-md hidden-sm hidden-xs" : "text-center";
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <th");
-
-WriteAttribute("class", Tuple.Create(" class=\"", 909), Tuple.Create("\"", 921)
-            
-            #line 23 "..\..\Views\Shared\_ListTree_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 917), Tuple.Create<System.Object, System.Int32>(cls
-            
-            #line default
-            #line hidden
-, 917), false)
-);
-
-WriteAttribute("title", Tuple.Create(" title=\"", 922), Tuple.Create("\"", 947)
-            
-            #line 23 "..\..\Views\Shared\_ListTree_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 930), Tuple.Create<System.Object, System.Int32>(item.Description
-            
-            #line default
-            #line hidden
-, 930), false)
-);
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 951), Tuple.Create("\"", 976)
-            
-            #line 23 "..\..\Views\Shared\_ListTree_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 958), Tuple.Create<System.Object, System.Int32>(Html.Raw(sortUrl)
-            
-            #line default
-            #line hidden
-, 958), false)
-);
-
-WriteLiteral(">");
-
-            
-            #line 23 "..\..\Views\Shared\_ListTree_Data.cshtml"
-                                                                                   Write(item.DisplayName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</a></th>\r\n");
-
-            
-            #line 24 "..\..\Views\Shared\_ListTree_Data.cshtml"
-            }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">升</th>\r\n            <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">降</th>\r\n");
-
-            
-            #line 27 "..\..\Views\Shared\_ListTree_Data.cshtml"
-            
-            
-            #line default
-            #line hidden
-            
-            #line 27 "..\..\Views\Shared\_ListTree_Data.cshtml"
-             if (this.Has(PermissionFlags.Detail, PermissionFlags.Update, PermissionFlags.Delete))
-            {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">操作</th>\r\n");
-
-            
-            #line 30 "..\..\Views\Shared\_ListTree_Data.cshtml"
-            }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        </tr>\r\n    </thead>\r\n    <tbody>\r\n");
-
-            
-            #line 34 "..\..\Views\Shared\_ListTree_Data.cshtml"
-        
-            
-            #line default
-            #line hidden
-            
-            #line 34 "..\..\Views\Shared\_ListTree_Data.cshtml"
-         foreach (IEntityTree entity in Model)
-        {
-            var FirstFlag = 0;
-            var p = entity.Parent as IEntityTree;
-            if (p == null)
-            {
-                p = fact.EntityType.GetValue("Root") as IEntityTree;
-            }
-            var id = entity["ID"];
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            <tr>\r\n");
-
-            
-            #line 44 "..\..\Views\Shared\_ListTree_Data.cshtml"
-                
-            
-            #line default
-            #line hidden
-            
-            #line 44 "..\..\Views\Shared\_ListTree_Data.cshtml"
-                 if (enableSelect)
-                {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                    <td");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><input");
-
-WriteLiteral(" type=\"checkbox\"");
-
-WriteLiteral(" name=\"keys\"");
-
-WriteAttribute("value", Tuple.Create(" value=\"", 1763), Tuple.Create("\"", 1787)
-            
-            #line 46 "..\..\Views\Shared\_ListTree_Data.cshtml"
-      , Tuple.Create(Tuple.Create("", 1771), Tuple.Create<System.Object, System.Int32>(entity[fk.Name]
-            
-            #line default
-            #line hidden
-, 1771), false)
-);
-
-WriteLiteral(" /></td>\r\n");
-
-            
-            #line 47 "..\..\Views\Shared\_ListTree_Data.cshtml"
-                }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                ");
-
-            
-            #line 48 "..\..\Views\Shared\_ListTree_Data.cshtml"
-                 foreach (var item in fields)
-                {
-                    if (FirstFlag == 0)
-                    {
-                        
-            
-            #line default
-            #line hidden
-            
-            #line 52 "..\..\Views\Shared\_ListTree_Data.cshtml"
-                   Write(Html.Partial("_List_Data_Item_First", new Pair(entity, item)));
-
-            
-            #line default
-            #line hidden
-            
-            #line 52 "..\..\Views\Shared\_ListTree_Data.cshtml"
-                                                                                      
-                    }
-                    else
-                    {
-                        
-            
-            #line default
-            #line hidden
-            
-            #line 56 "..\..\Views\Shared\_ListTree_Data.cshtml"
-                   Write(Html.Partial("_List_Data_Item", new Pair(entity, item)));
-
-            
-            #line default
-            #line hidden
-            
-            #line 56 "..\..\Views\Shared\_ListTree_Data.cshtml"
-                                                                                
-                    }
-
-                    FirstFlag++;
-                }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <td");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">\r\n");
-
-            
-            #line 62 "..\..\Views\Shared\_ListTree_Data.cshtml"
-                    
-            
-            #line default
-            #line hidden
-            
-            #line 62 "..\..\Views\Shared\_ListTree_Data.cshtml"
-                     if (p != null && p.Childs != null && p.Childs.Count > 0 && entity != p.Childs[0])
-                    {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                        <a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 2462), Tuple.Create("\"", 2498)
-            
-            #line 64 "..\..\Views\Shared\_ListTree_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 2469), Tuple.Create<System.Object, System.Int32>(Url.Action("Up", new { id })
-            
-            #line default
-            #line hidden
-, 2469), false)
-);
-
-WriteLiteral("><span");
-
-WriteLiteral(" class=\"glyphicon glyphicon-arrow-up\"");
-
-WriteLiteral(" style=\"color: green;\"");
-
-WriteLiteral("></span></a>\r\n");
-
-            
-            #line 65 "..\..\Views\Shared\_ListTree_Data.cshtml"
-                    }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                </td>\r\n                <td");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">\r\n");
-
-            
-            #line 68 "..\..\Views\Shared\_ListTree_Data.cshtml"
-                    
-            
-            #line default
-            #line hidden
-            
-            #line 68 "..\..\Views\Shared\_ListTree_Data.cshtml"
-                     if (p != null && entity != p.Childs[p.Childs.Count - 1])
-                    {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                        <a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 2794), Tuple.Create("\"", 2832)
-            
-            #line 70 "..\..\Views\Shared\_ListTree_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 2801), Tuple.Create<System.Object, System.Int32>(Url.Action("Down", new { id })
-            
-            #line default
-            #line hidden
-, 2801), false)
-);
-
-WriteLiteral("><span");
-
-WriteLiteral(" class=\"glyphicon glyphicon-arrow-down\"");
-
-WriteLiteral(" style=\"color: red;\"");
-
-WriteLiteral("></span></a>\r\n");
-
-            
-            #line 71 "..\..\Views\Shared\_ListTree_Data.cshtml"
-                    }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                </td>\r\n");
-
-            
-            #line 73 "..\..\Views\Shared\_ListTree_Data.cshtml"
-                
-            
-            #line default
-            #line hidden
-            
-            #line 73 "..\..\Views\Shared\_ListTree_Data.cshtml"
-                 if (this.Has(PermissionFlags.Detail, PermissionFlags.Update, PermissionFlags.Delete))
-                {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                    <td");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("                        ");
-
-            
-            #line 76 "..\..\Views\Shared\_ListTree_Data.cshtml"
-                   Write(Html.Partial("_List_Data_Action", (Object)entity));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n                    </td>\r\n");
-
-            
-            #line 78 "..\..\Views\Shared\_ListTree_Data.cshtml"
-                }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            </tr>\r\n");
-
-            
-            #line 80 "..\..\Views\Shared\_ListTree_Data.cshtml"
-        }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("    </tbody>\r\n</table>");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Views/Shared/_List_Data.cshtml b/NewLife.Cube/Views/Shared/_List_Data.cshtml
deleted file mode 100644
index cfd162f047..0000000000
--- a/NewLife.Cube/Views/Shared/_List_Data.cshtml
+++ /dev/null
@@ -1,61 +0,0 @@
-﻿@using NewLife;
-@using NewLife.Web;
-@using XCode;
-@using XCode.Configuration;
-@{
-    var fact = ViewBag.Factory as IEntityOperate;
-    var page = ViewBag.Page as Pager;
-    var fields = ViewBag.Fields as IList<FieldItem>;
-    var fk = fact.Unique;
-    var enableSelect = this.EnableSelect();
-
-    var hasUser = fields.Any(f => f.Name.EqualIgnoreCase("CreateUserID", "UpdateUserID"));
-    if (hasUser && !ViewData.ContainsKey("")) { ViewData["Provider"] = ManageProvider.Provider; }
-}
-<table class="table table-bordered table-hover table-striped table-condensed table-data-list">
-    <thead>
-        <tr>
-            @if (enableSelect)
-            {
-                <th class="text-center" style="width:10px;"><input type="checkbox" id="chkAll" title="全选" /></th>
-            }
-            @foreach (var item in fields)
-            {
-                var sortUrl = item.OriField != null ? page.GetSortUrl(item.OriField.Name) : page.GetSortUrl(item.Name);
-                if (item.Type == typeof(DateTime))
-                {
-                    <th class="text-center" style="min-width:134px;" title="@item.Description"><a href="@Html.Raw(sortUrl)">@item.DisplayName</a></th>
-                }
-                else
-                {
-                    <th class="text-center" title="@item.Description"><a href="@Html.Raw(sortUrl)">@item.DisplayName</a></th>
-                }
-            }
-            @if (this.Has(PermissionFlags.Detail, PermissionFlags.Update, PermissionFlags.Delete))
-            {
-                <th class="text-center" style="min-width:100px;">操作</th>
-            }
-        </tr>
-    </thead>
-    <tbody>
-        @foreach (var entity in Model)
-        {
-            <tr>
-                @if (enableSelect)
-                {
-                    <td class="text-center"><input type="checkbox" name="keys" value="@entity[fk.Name]" /></td>
-                }
-                @foreach (var item in fields)
-                {
-                    @Html.Partial("_List_Data_Item", new Pair(entity, item))
-                }
-                @if (this.Has(PermissionFlags.Detail, PermissionFlags.Update, PermissionFlags.Delete))
-                {
-                    <td class="text-center">
-                        @Html.Partial("_List_Data_Action", (Object)entity)
-                    </td>
-                }
-            </tr>
-        }
-    </tbody>
-</table>
\ No newline at end of file
diff --git a/NewLife.Cube/Views/Shared/_List_Data.generated.cs b/NewLife.Cube/Views/Shared/_List_Data.generated.cs
deleted file mode 100644
index df70cbbbf4..0000000000
--- a/NewLife.Cube/Views/Shared/_List_Data.generated.cs
+++ /dev/null
@@ -1,390 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    
-    #line 1 "..\..\Views\Shared\_List_Data.cshtml"
-    using NewLife;
-    
-    #line default
-    #line hidden
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    
-    #line 2 "..\..\Views\Shared\_List_Data.cshtml"
-    using NewLife.Web;
-    
-    #line default
-    #line hidden
-    
-    #line 3 "..\..\Views\Shared\_List_Data.cshtml"
-    using XCode;
-    
-    #line default
-    #line hidden
-    
-    #line 4 "..\..\Views\Shared\_List_Data.cshtml"
-    using XCode.Configuration;
-    
-    #line default
-    #line hidden
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Shared/_List_Data.cshtml")]
-    public partial class _Views_Shared__List_Data_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Views_Shared__List_Data_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 5 "..\..\Views\Shared\_List_Data.cshtml"
-  
-    var fact = ViewBag.Factory as IEntityOperate;
-    var page = ViewBag.Page as Pager;
-    var fields = ViewBag.Fields as IList<FieldItem>;
-    var fk = fact.Unique;
-    var enableSelect = this.EnableSelect();
-
-    var hasUser = fields.Any(f => f.Name.EqualIgnoreCase("CreateUserID", "UpdateUserID"));
-    if (hasUser && !ViewData.ContainsKey("")) { ViewData["Provider"] = ManageProvider.Provider; }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n<table");
-
-WriteLiteral(" class=\"table table-bordered table-hover table-striped table-condensed table-data" +
-"-list\"");
-
-WriteLiteral(">\r\n    <thead>\r\n        <tr>\r\n");
-
-            
-            #line 18 "..\..\Views\Shared\_List_Data.cshtml"
-            
-            
-            #line default
-            #line hidden
-            
-            #line 18 "..\..\Views\Shared\_List_Data.cshtml"
-             if (enableSelect)
-            {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(" style=\"width:10px;\"");
-
-WriteLiteral("><input");
-
-WriteLiteral(" type=\"checkbox\"");
-
-WriteLiteral(" id=\"chkAll\"");
-
-WriteLiteral(" title=\"全选\"");
-
-WriteLiteral(" /></th>\r\n");
-
-            
-            #line 21 "..\..\Views\Shared\_List_Data.cshtml"
-            }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            ");
-
-            
-            #line 22 "..\..\Views\Shared\_List_Data.cshtml"
-             foreach (var item in fields)
-            {
-                var sortUrl = item.OriField != null ? page.GetSortUrl(item.OriField.Name) : page.GetSortUrl(item.Name);
-                if (item.Type == typeof(DateTime))
-                {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                    <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(" style=\"min-width:134px;\"");
-
-WriteAttribute("title", Tuple.Create(" title=\"", 1116), Tuple.Create("\"", 1141)
-            
-            #line 27 "..\..\Views\Shared\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1124), Tuple.Create<System.Object, System.Int32>(item.Description
-            
-            #line default
-            #line hidden
-, 1124), false)
-);
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1145), Tuple.Create("\"", 1170)
-            
-            #line 27 "..\..\Views\Shared\_List_Data.cshtml"
-                        , Tuple.Create(Tuple.Create("", 1152), Tuple.Create<System.Object, System.Int32>(Html.Raw(sortUrl)
-            
-            #line default
-            #line hidden
-, 1152), false)
-);
-
-WriteLiteral(">");
-
-            
-            #line 27 "..\..\Views\Shared\_List_Data.cshtml"
-                                                                                                                       Write(item.DisplayName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</a></th>\r\n");
-
-            
-            #line 28 "..\..\Views\Shared\_List_Data.cshtml"
-                }
-                else
-                {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                    <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteAttribute("title", Tuple.Create(" title=\"", 1303), Tuple.Create("\"", 1328)
-            
-            #line 31 "..\..\Views\Shared\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1311), Tuple.Create<System.Object, System.Int32>(item.Description
-            
-            #line default
-            #line hidden
-, 1311), false)
-);
-
-WriteLiteral("><a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1332), Tuple.Create("\"", 1357)
-            
-            #line 31 "..\..\Views\Shared\_List_Data.cshtml"
-, Tuple.Create(Tuple.Create("", 1339), Tuple.Create<System.Object, System.Int32>(Html.Raw(sortUrl)
-            
-            #line default
-            #line hidden
-, 1339), false)
-);
-
-WriteLiteral(">");
-
-            
-            #line 31 "..\..\Views\Shared\_List_Data.cshtml"
-                                                                                              Write(item.DisplayName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</a></th>\r\n");
-
-            
-            #line 32 "..\..\Views\Shared\_List_Data.cshtml"
-                }
-            }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            ");
-
-            
-            #line 34 "..\..\Views\Shared\_List_Data.cshtml"
-             if (this.Has(PermissionFlags.Detail, PermissionFlags.Update, PermissionFlags.Delete))
-            {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <th");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(" style=\"min-width:100px;\"");
-
-WriteLiteral(">操作</th>\r\n");
-
-            
-            #line 37 "..\..\Views\Shared\_List_Data.cshtml"
-            }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        </tr>\r\n    </thead>\r\n    <tbody>\r\n");
-
-            
-            #line 41 "..\..\Views\Shared\_List_Data.cshtml"
-        
-            
-            #line default
-            #line hidden
-            
-            #line 41 "..\..\Views\Shared\_List_Data.cshtml"
-         foreach (var entity in Model)
-        {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            <tr>\r\n");
-
-            
-            #line 44 "..\..\Views\Shared\_List_Data.cshtml"
-                
-            
-            #line default
-            #line hidden
-            
-            #line 44 "..\..\Views\Shared\_List_Data.cshtml"
-                 if (enableSelect)
-                {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                    <td");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral("><input");
-
-WriteLiteral(" type=\"checkbox\"");
-
-WriteLiteral(" name=\"keys\"");
-
-WriteAttribute("value", Tuple.Create(" value=\"", 1845), Tuple.Create("\"", 1869)
-            
-            #line 46 "..\..\Views\Shared\_List_Data.cshtml"
-      , Tuple.Create(Tuple.Create("", 1853), Tuple.Create<System.Object, System.Int32>(entity[fk.Name]
-            
-            #line default
-            #line hidden
-, 1853), false)
-);
-
-WriteLiteral(" /></td>\r\n");
-
-            
-            #line 47 "..\..\Views\Shared\_List_Data.cshtml"
-                }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                ");
-
-            
-            #line 48 "..\..\Views\Shared\_List_Data.cshtml"
-                 foreach (var item in fields)
-                {
-                    
-            
-            #line default
-            #line hidden
-            
-            #line 50 "..\..\Views\Shared\_List_Data.cshtml"
-               Write(Html.Partial("_List_Data_Item", new Pair(entity, item)));
-
-            
-            #line default
-            #line hidden
-            
-            #line 50 "..\..\Views\Shared\_List_Data.cshtml"
-                                                                            
-                }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                ");
-
-            
-            #line 52 "..\..\Views\Shared\_List_Data.cshtml"
-                 if (this.Has(PermissionFlags.Detail, PermissionFlags.Update, PermissionFlags.Delete))
-                {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                    <td");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("                        ");
-
-            
-            #line 55 "..\..\Views\Shared\_List_Data.cshtml"
-                   Write(Html.Partial("_List_Data_Action", (Object)entity));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n                    </td>\r\n");
-
-            
-            #line 57 "..\..\Views\Shared\_List_Data.cshtml"
-                }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            </tr>\r\n");
-
-            
-            #line 59 "..\..\Views\Shared\_List_Data.cshtml"
-        }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("    </tbody>\r\n</table>");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Views/Shared/_List_Data_Action.cshtml b/NewLife.Cube/Views/Shared/_List_Data_Action.cshtml
deleted file mode 100644
index 4ceb639135..0000000000
--- a/NewLife.Cube/Views/Shared/_List_Data_Action.cshtml
+++ /dev/null
@@ -1,30 +0,0 @@
-﻿@{
-    var entity = Model as IEntity;
-
-    var rv = entity.GetRouteKey();
-}
-@if (this.Has(PermissionFlags.Update))
-{
-    <i class="glyphicon glyphicon-edit" style="color: blue;"></i>
-    <a href="@Url.Action("Edit", rv)" class="editcell">编辑</a>
-}
-else if (this.Has(PermissionFlags.Detail))
-{
-    <i class="glyphicon glyphicon-edit" style="color: blue;"></i>
-    <a href="@Url.Action("Detail", rv)" class="editcell">查看</a>
-}
-@if (this.Has(PermissionFlags.Delete))
-{
-    var fact = ViewBag.Factory as IEntityOperate;
-    var fi = (fact == null || fact.Fields == null) ? null : fact.Fields.FirstOrDefault(e => e.Name.EqualIgnoreCase("Deleted", "IsDelete", "IsDeleted"));
-    if (fi != null && fi.Type == typeof(Boolean) && (Boolean)entity[fi.Name])
-    {
-        <i class="glyphicon glyphicon-transfer" style="color: green;"></i>
-        <a href="@Url.Action("Delete", rv)" data-action="action" data-confirm="确认恢复？">恢复</a>
-    }
-    else
-    {
-        <i class="glyphicon glyphicon-remove" style="color: red;"></i>
-        <a href="@Url.Action("Delete", rv)" data-action="action" data-confirm="确认删除？">删除</a>
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Views/Shared/_List_Data_Action.generated.cs b/NewLife.Cube/Views/Shared/_List_Data_Action.generated.cs
deleted file mode 100644
index 3c5a38f08d..0000000000
--- a/NewLife.Cube/Views/Shared/_List_Data_Action.generated.cs
+++ /dev/null
@@ -1,212 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Shared/_List_Data_Action.cshtml")]
-    public partial class _Views_Shared__List_Data_Action_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Views_Shared__List_Data_Action_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 1 "..\..\Views\Shared\_List_Data_Action.cshtml"
-  
-    var entity = Model as IEntity;
-
-    var rv = entity.GetRouteKey();
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-            
-            #line 6 "..\..\Views\Shared\_List_Data_Action.cshtml"
- if (this.Has(PermissionFlags.Update))
-{
-
-            
-            #line default
-            #line hidden
-WriteLiteral("    <i");
-
-WriteLiteral(" class=\"glyphicon glyphicon-edit\"");
-
-WriteLiteral(" style=\"color: blue;\"");
-
-WriteLiteral("></i>\r\n");
-
-WriteLiteral("    <a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 197), Tuple.Create("\"", 227)
-            
-            #line 9 "..\..\Views\Shared\_List_Data_Action.cshtml"
-, Tuple.Create(Tuple.Create("", 204), Tuple.Create<System.Object, System.Int32>(Url.Action("Edit", rv)
-            
-            #line default
-            #line hidden
-, 204), false)
-);
-
-WriteLiteral(" class=\"editcell\"");
-
-WriteLiteral(">编辑</a>\r\n");
-
-            
-            #line 10 "..\..\Views\Shared\_List_Data_Action.cshtml"
-}
-else if (this.Has(PermissionFlags.Detail))
-{
-
-            
-            #line default
-            #line hidden
-WriteLiteral("    <i");
-
-WriteLiteral(" class=\"glyphicon glyphicon-edit\"");
-
-WriteLiteral(" style=\"color: blue;\"");
-
-WriteLiteral("></i>\r\n");
-
-WriteLiteral("    <a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 377), Tuple.Create("\"", 409)
-            
-            #line 14 "..\..\Views\Shared\_List_Data_Action.cshtml"
-, Tuple.Create(Tuple.Create("", 384), Tuple.Create<System.Object, System.Int32>(Url.Action("Detail", rv)
-            
-            #line default
-            #line hidden
-, 384), false)
-);
-
-WriteLiteral(" class=\"editcell\"");
-
-WriteLiteral(">查看</a>\r\n");
-
-            
-            #line 15 "..\..\Views\Shared\_List_Data_Action.cshtml"
-}
-
-            
-            #line default
-            #line hidden
-            
-            #line 16 "..\..\Views\Shared\_List_Data_Action.cshtml"
- if (this.Has(PermissionFlags.Delete))
-{
-    var fact = ViewBag.Factory as IEntityOperate;
-    var fi = (fact == null || fact.Fields == null) ? null : fact.Fields.FirstOrDefault(e => e.Name.EqualIgnoreCase("Deleted", "IsDelete", "IsDeleted"));
-    if (fi != null && fi.Type == typeof(Boolean) && (Boolean)entity[fi.Name])
-    {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        <i");
-
-WriteLiteral(" class=\"glyphicon glyphicon-transfer\"");
-
-WriteLiteral(" style=\"color: green;\"");
-
-WriteLiteral("></i>\r\n");
-
-WriteLiteral("        <a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 859), Tuple.Create("\"", 891)
-            
-            #line 23 "..\..\Views\Shared\_List_Data_Action.cshtml"
-, Tuple.Create(Tuple.Create("", 866), Tuple.Create<System.Object, System.Int32>(Url.Action("Delete", rv)
-            
-            #line default
-            #line hidden
-, 866), false)
-);
-
-WriteLiteral(" data-action=\"action\"");
-
-WriteLiteral(" data-confirm=\"确认恢复？\"");
-
-WriteLiteral(">恢复</a>\r\n");
-
-            
-            #line 24 "..\..\Views\Shared\_List_Data_Action.cshtml"
-    }
-    else
-    {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        <i");
-
-WriteLiteral(" class=\"glyphicon glyphicon-remove\"");
-
-WriteLiteral(" style=\"color: red;\"");
-
-WriteLiteral("></i>\r\n");
-
-WriteLiteral("        <a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1049), Tuple.Create("\"", 1081)
-            
-            #line 28 "..\..\Views\Shared\_List_Data_Action.cshtml"
-, Tuple.Create(Tuple.Create("", 1056), Tuple.Create<System.Object, System.Int32>(Url.Action("Delete", rv)
-            
-            #line default
-            #line hidden
-, 1056), false)
-);
-
-WriteLiteral(" data-action=\"action\"");
-
-WriteLiteral(" data-confirm=\"确认删除？\"");
-
-WriteLiteral(">删除</a>\r\n");
-
-            
-            #line 29 "..\..\Views\Shared\_List_Data_Action.cshtml"
-    }
-}
-            
-            #line default
-            #line hidden
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Views/Shared/_List_Data_Item.cshtml b/NewLife.Cube/Views/Shared/_List_Data_Item.cshtml
deleted file mode 100644
index 0ef4272f8d..0000000000
--- a/NewLife.Cube/Views/Shared/_List_Data_Item.cshtml
+++ /dev/null
@@ -1,102 +0,0 @@
-﻿@using XCode;
-@using XCode.Configuration;
-@{
-    var pair = Model as Pair;
-    var entity = pair.First as IEntity;
-    var item = pair.Second as FieldItem;
-
-    var value = entity[item.Name];
-}
-@if (item.IsIdentity)
-{
-    <td class="text-center">@value</td>
-}
-else
-{
-    switch (Type.GetTypeCode(item.Type))
-    {
-        case TypeCode.Boolean:
-            if ((Boolean)value)
-            {
-                <td class="text-center">
-                    <i class="glyphicon glyphicon-ok" style="color: green;"></i>
-                </td>
-            }
-            else
-            {
-                <td class="text-center">
-                    <i class="glyphicon glyphicon-remove" style="color: red;"></i>
-                </td>
-            }
-            break;
-        case TypeCode.DateTime:
-            var dt = (DateTime)value;
-            <td>@dt.ToFullString("")</td>
-            break;
-        case TypeCode.Decimal:
-            <td>@value</td>
-            break;
-        case TypeCode.Single:
-        case TypeCode.Double:
-            <td>@value</td>
-            break;
-        case TypeCode.Byte:
-        case TypeCode.Int16:
-        case TypeCode.Int32:
-        case TypeCode.Int64:
-        case TypeCode.UInt16:
-        case TypeCode.UInt32:
-        case TypeCode.UInt64:
-            //特殊处理枚举
-            if (item.Type.IsEnum)
-            {
-                var val = "";
-                try
-                {
-                    val = System.EnumHelper.GetDescription((Enum)value) ?? value + "";
-                }
-                catch { }
-                <td class="text-center">@val</td>
-            }
-            else if (item.Name.EqualIgnoreCase("CreateUserID", "UpdateUserID"))
-            {
-                var provider = ViewData["Provider"] as IManageProvider;
-                <td>@provider.FindByID(value)</td>
-            }
-            else
-            {
-                <td class="text-right">@Convert.ToInt64(value).ToString("n0")</td>
-            }
-            break;
-        case TypeCode.String:
-        default:
-            {
-                var val = value;
-                var map = item.Map;
-                if (map != null && map.Provider != null && val + "" != "")
-                {
-                    var dic = new RouteValueDictionary();
-                    var key = map.Provider.Key;
-                    if (!key.IsNullOrEmpty() && item.OriField != null) { dic[key] = entity[item.OriField.Name]; }
-                    <td>@Html.ActionLink(value + "", "Edit", map.Provider.EntityType.Name, dic, null)</td>
-                }
-                else if (item.Name.EqualIgnoreCase("CreateIP", "UpdateIP"))
-                {
-                    <td title="@((value+"").IPToAddress())">@value</td>
-                }
-                else if (item.Name.EqualIgnoreCase("Remark", "Description"))
-                {
-                    //防止内容过长
-                    <td style="max-width:600px;overflow:hidden;white-space: nowrap;text-overflow: ellipsis;" title="@value">@value</td>
-                }
-                else
-                {
-                    <td>@value</td>
-                }
-            }
-            break;
-            @*default:
-                <td>@value</td>
-                break;*@
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Views/Shared/_List_Data_Item.generated.cs b/NewLife.Cube/Views/Shared/_List_Data_Item.generated.cs
deleted file mode 100644
index f55588aac8..0000000000
--- a/NewLife.Cube/Views/Shared/_List_Data_Item.generated.cs
+++ /dev/null
@@ -1,420 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    
-    #line 1 "..\..\Views\Shared\_List_Data_Item.cshtml"
-    using XCode;
-    
-    #line default
-    #line hidden
-    
-    #line 2 "..\..\Views\Shared\_List_Data_Item.cshtml"
-    using XCode.Configuration;
-    
-    #line default
-    #line hidden
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Shared/_List_Data_Item.cshtml")]
-    public partial class _Views_Shared__List_Data_Item_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Views_Shared__List_Data_Item_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 3 "..\..\Views\Shared\_List_Data_Item.cshtml"
-  
-    var pair = Model as Pair;
-    var entity = pair.First as IEntity;
-    var item = pair.Second as FieldItem;
-
-    var value = entity[item.Name];
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-            
-            #line 10 "..\..\Views\Shared\_List_Data_Item.cshtml"
- if (item.IsIdentity)
-{
-
-            
-            #line default
-            #line hidden
-WriteLiteral("    <td");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">");
-
-            
-            #line 12 "..\..\Views\Shared\_List_Data_Item.cshtml"
-                       Write(value);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n");
-
-            
-            #line 13 "..\..\Views\Shared\_List_Data_Item.cshtml"
-}
-else
-{
-    switch (Type.GetTypeCode(item.Type))
-    {
-        case TypeCode.Boolean:
-            if ((Boolean)value)
-            {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <td");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">\r\n                    <i");
-
-WriteLiteral(" class=\"glyphicon glyphicon-ok\"");
-
-WriteLiteral(" style=\"color: green;\"");
-
-WriteLiteral("></i>\r\n                </td>\r\n");
-
-            
-            #line 24 "..\..\Views\Shared\_List_Data_Item.cshtml"
-            }
-            else
-            {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <td");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">\r\n                    <i");
-
-WriteLiteral(" class=\"glyphicon glyphicon-remove\"");
-
-WriteLiteral(" style=\"color: red;\"");
-
-WriteLiteral("></i>\r\n                </td>\r\n");
-
-            
-            #line 30 "..\..\Views\Shared\_List_Data_Item.cshtml"
-            }
-            break;
-        case TypeCode.DateTime:
-            var dt = (DateTime)value;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            <td>");
-
-            
-            #line 34 "..\..\Views\Shared\_List_Data_Item.cshtml"
-           Write(dt.ToFullString(""));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n");
-
-            
-            #line 35 "..\..\Views\Shared\_List_Data_Item.cshtml"
-            break;
-        case TypeCode.Decimal:
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            <td>");
-
-            
-            #line 37 "..\..\Views\Shared\_List_Data_Item.cshtml"
-           Write(value);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n");
-
-            
-            #line 38 "..\..\Views\Shared\_List_Data_Item.cshtml"
-            break;
-        case TypeCode.Single:
-        case TypeCode.Double:
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            <td>");
-
-            
-            #line 41 "..\..\Views\Shared\_List_Data_Item.cshtml"
-           Write(value);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n");
-
-            
-            #line 42 "..\..\Views\Shared\_List_Data_Item.cshtml"
-            break;
-        case TypeCode.Byte:
-        case TypeCode.Int16:
-        case TypeCode.Int32:
-        case TypeCode.Int64:
-        case TypeCode.UInt16:
-        case TypeCode.UInt32:
-        case TypeCode.UInt64:
-            //特殊处理枚举
-            if (item.Type.IsEnum)
-            {
-                var val = "";
-                try
-                {
-                    val = System.EnumHelper.GetDescription((Enum)value) ?? value + "";
-                }
-                catch { }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <td");
-
-WriteLiteral(" class=\"text-center\"");
-
-WriteLiteral(">");
-
-            
-            #line 59 "..\..\Views\Shared\_List_Data_Item.cshtml"
-                                   Write(val);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n");
-
-            
-            #line 60 "..\..\Views\Shared\_List_Data_Item.cshtml"
-            }
-            else if (item.Name.EqualIgnoreCase("CreateUserID", "UpdateUserID"))
-            {
-                var provider = ViewData["Provider"] as IManageProvider;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <td>");
-
-            
-            #line 64 "..\..\Views\Shared\_List_Data_Item.cshtml"
-               Write(provider.FindByID(value));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n");
-
-            
-            #line 65 "..\..\Views\Shared\_List_Data_Item.cshtml"
-            }
-            else
-            {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <td");
-
-WriteLiteral(" class=\"text-right\"");
-
-WriteLiteral(">");
-
-            
-            #line 68 "..\..\Views\Shared\_List_Data_Item.cshtml"
-                                  Write(Convert.ToInt64(value).ToString("n0"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n");
-
-            
-            #line 69 "..\..\Views\Shared\_List_Data_Item.cshtml"
-            }
-            break;
-        case TypeCode.String:
-        default:
-            {
-                var val = value;
-                var map = item.Map;
-                if (map != null && map.Provider != null && val + "" != "")
-                {
-                    var dic = new RouteValueDictionary();
-                    var key = map.Provider.Key;
-                    if (!key.IsNullOrEmpty() && item.OriField != null) { dic[key] = entity[item.OriField.Name]; }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                    <td>");
-
-            
-            #line 81 "..\..\Views\Shared\_List_Data_Item.cshtml"
-                   Write(Html.ActionLink(value + "", "Edit", map.Provider.EntityType.Name, dic, null));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n");
-
-            
-            #line 82 "..\..\Views\Shared\_List_Data_Item.cshtml"
-                }
-                else if (item.Name.EqualIgnoreCase("CreateIP", "UpdateIP"))
-                {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                    <td");
-
-WriteAttribute("title", Tuple.Create(" title=\"", 2759), Tuple.Create("\"", 2794)
-            
-            #line 85 "..\..\Views\Shared\_List_Data_Item.cshtml"
-, Tuple.Create(Tuple.Create("", 2767), Tuple.Create<System.Object, System.Int32>((value+"").IPToAddress()
-            
-            #line default
-            #line hidden
-, 2767), false)
-);
-
-WriteLiteral(">");
-
-            
-            #line 85 "..\..\Views\Shared\_List_Data_Item.cshtml"
-                                                       Write(value);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n");
-
-            
-            #line 86 "..\..\Views\Shared\_List_Data_Item.cshtml"
-                }
-                else if (item.Name.EqualIgnoreCase("Remark", "Description"))
-                {
-                    //防止内容过长
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                    <td");
-
-WriteLiteral(" style=\"max-width:600px;overflow:hidden;white-space: nowrap;text-overflow: ellips" +
-"is;\"");
-
-WriteAttribute("title", Tuple.Create(" title=\"", 3063), Tuple.Create("\"", 3077)
-            
-            #line 90 "..\..\Views\Shared\_List_Data_Item.cshtml"
-                                    , Tuple.Create(Tuple.Create("", 3071), Tuple.Create<System.Object, System.Int32>(value
-            
-            #line default
-            #line hidden
-, 3071), false)
-);
-
-WriteLiteral(">");
-
-            
-            #line 90 "..\..\Views\Shared\_List_Data_Item.cshtml"
-                                                                                                                       Write(value);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n");
-
-            
-            #line 91 "..\..\Views\Shared\_List_Data_Item.cshtml"
-                }
-                else
-                {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                    <td>");
-
-            
-            #line 94 "..\..\Views\Shared\_List_Data_Item.cshtml"
-                   Write(value);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n");
-
-            
-            #line 95 "..\..\Views\Shared\_List_Data_Item.cshtml"
-                }
-            }
-            break;
-            
-            
-            #line default
-            #line hidden
-            
-            #line 100 "..\..\Views\Shared\_List_Data_Item.cshtml"
-                        
-    }
-}
-            
-            #line default
-            #line hidden
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Views/Shared/_List_Data_Item_First.cshtml b/NewLife.Cube/Views/Shared/_List_Data_Item_First.cshtml
deleted file mode 100644
index ff3d61228c..0000000000
--- a/NewLife.Cube/Views/Shared/_List_Data_Item_First.cshtml
+++ /dev/null
@@ -1,94 +0,0 @@
-﻿@using XCode;
-@using XCode.Configuration;
-@{
-    var pair = Model as Pair;
-    var entity = pair.First as IEntity;
-    var item = pair.Second as FieldItem;
-}
-@if (item.IsIdentity)
-{
-    <td class="text-center hidden-md hidden-sm hidden-xs">@entity[item.Name]</td>
-}
-else
-{
-    switch (Type.GetTypeCode(item.Type))
-    {
-        case TypeCode.Boolean:
-            if ((Boolean)entity[item.Name])
-            {
-                <td class="text-center hidden-md hidden-sm hidden-xs">
-                    <i class="glyphicon glyphicon-ok" style="color: green;"></i>
-                </td>
-            }
-            else
-            {
-                <td class="text-center hidden-md hidden-sm hidden-xs">
-                    <i class="glyphicon glyphicon-remove" style="color: red;"></i>
-                </td>
-            }
-            break;
-        case TypeCode.DateTime:
-            var dt = (DateTime)entity[item.Name];
-            if (dt > DateTime.MinValue && dt.Year > 1900)
-            {
-                <td class="text-center hidden-md hidden-sm hidden-xs">@(((DateTime)entity[item.Name]).ToFullString(""))</td>
-            }
-            else
-            {
-                <td class="text-center hidden-md hidden-sm hidden-xs"></td>
-            }
-            break;
-        case TypeCode.Decimal:
-            <td class="text-center hidden-md hidden-sm hidden-xs">@entity[item.Name]</td>
-            break;
-        case TypeCode.Single:
-        case TypeCode.Double:
-            <td class="text-center hidden-md hidden-sm hidden-xs">@entity[item.Name]</td>
-            break;
-        case TypeCode.Byte:
-        case TypeCode.Int16:
-        case TypeCode.Int32:
-        case TypeCode.Int64:
-        case TypeCode.UInt16:
-        case TypeCode.UInt32:
-        case TypeCode.UInt64:
-            //特殊处理枚举
-            if (item.Type.IsEnum)
-            {
-                var v = entity[item.Name];
-                var val = v + "";
-                try
-                {
-                    val = System.EnumHelper.GetDescription((Enum)v) ?? v + "";
-                }
-                catch { }
-                <td class="text-center hidden-md hidden-sm hidden-xs">@val</td>
-            }
-            else
-            {
-                <td class="text-center hidden-md hidden-sm hidden-xs">@Convert.ToInt64(entity[item.Name]).ToString("n0")</td>
-            }
-            break;
-        case TypeCode.String:
-        default:
-            {
-                var val = entity[item.Name];
-                var map = item.Map;
-                if (map != null && map.Provider != null && val + "" != "")
-                {
-                    var dic = new RouteValueDictionary();
-                    var key = map.Provider.Key;
-                    if (!key.IsNullOrEmpty() && item.OriField != null) { dic[key] = entity[item.OriField.Name]; }
-                    <td class="text-center hidden-md hidden-sm hidden-xs">@Html.ActionLink(entity[item.Name] + "", "Edit", map.Provider.EntityType.Name, dic, null)</td>
-                }
-                else
-                {
-                    <td class="text-center hidden-md hidden-sm hidden-xs">@entity[item.Name]</td>
-                }
-            }
-            break;
-            @*default:
-                <td>@entity[item.Name]</td>
-                break;*@
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Views/Shared/_List_Data_Item_First.generated.cs b/NewLife.Cube/Views/Shared/_List_Data_Item_First.generated.cs
deleted file mode 100644
index 86e4ddd84d..0000000000
--- a/NewLife.Cube/Views/Shared/_List_Data_Item_First.generated.cs
+++ /dev/null
@@ -1,368 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    
-    #line 1 "..\..\Views\Shared\_List_Data_Item_First.cshtml"
-    using XCode;
-    
-    #line default
-    #line hidden
-    
-    #line 2 "..\..\Views\Shared\_List_Data_Item_First.cshtml"
-    using XCode.Configuration;
-    
-    #line default
-    #line hidden
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Shared/_List_Data_Item_First.cshtml")]
-    public partial class _Views_Shared__List_Data_Item_First_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Views_Shared__List_Data_Item_First_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 3 "..\..\Views\Shared\_List_Data_Item_First.cshtml"
-  
-    var pair = Model as Pair;
-    var entity = pair.First as IEntity;
-    var item = pair.Second as FieldItem;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-            
-            #line 8 "..\..\Views\Shared\_List_Data_Item_First.cshtml"
- if (item.IsIdentity)
-{
-
-            
-            #line default
-            #line hidden
-WriteLiteral("    <td");
-
-WriteLiteral(" class=\"text-center hidden-md hidden-sm hidden-xs\"");
-
-WriteLiteral(">");
-
-            
-            #line 10 "..\..\Views\Shared\_List_Data_Item_First.cshtml"
-                                                     Write(entity[item.Name]);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n");
-
-            
-            #line 11 "..\..\Views\Shared\_List_Data_Item_First.cshtml"
-}
-else
-{
-    switch (Type.GetTypeCode(item.Type))
-    {
-        case TypeCode.Boolean:
-            if ((Boolean)entity[item.Name])
-            {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <td");
-
-WriteLiteral(" class=\"text-center hidden-md hidden-sm hidden-xs\"");
-
-WriteLiteral(">\r\n                    <i");
-
-WriteLiteral(" class=\"glyphicon glyphicon-ok\"");
-
-WriteLiteral(" style=\"color: green;\"");
-
-WriteLiteral("></i>\r\n                </td>\r\n");
-
-            
-            #line 22 "..\..\Views\Shared\_List_Data_Item_First.cshtml"
-            }
-            else
-            {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <td");
-
-WriteLiteral(" class=\"text-center hidden-md hidden-sm hidden-xs\"");
-
-WriteLiteral(">\r\n                    <i");
-
-WriteLiteral(" class=\"glyphicon glyphicon-remove\"");
-
-WriteLiteral(" style=\"color: red;\"");
-
-WriteLiteral("></i>\r\n                </td>\r\n");
-
-            
-            #line 28 "..\..\Views\Shared\_List_Data_Item_First.cshtml"
-            }
-            break;
-        case TypeCode.DateTime:
-            var dt = (DateTime)entity[item.Name];
-            if (dt > DateTime.MinValue && dt.Year > 1900)
-            {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <td");
-
-WriteLiteral(" class=\"text-center hidden-md hidden-sm hidden-xs\"");
-
-WriteLiteral(">");
-
-            
-            #line 34 "..\..\Views\Shared\_List_Data_Item_First.cshtml"
-                                                                  Write(((DateTime)entity[item.Name]).ToFullString(""));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n");
-
-            
-            #line 35 "..\..\Views\Shared\_List_Data_Item_First.cshtml"
-            }
-            else
-            {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <td");
-
-WriteLiteral(" class=\"text-center hidden-md hidden-sm hidden-xs\"");
-
-WriteLiteral("></td>\r\n");
-
-            
-            #line 39 "..\..\Views\Shared\_List_Data_Item_First.cshtml"
-            }
-            break;
-        case TypeCode.Decimal:
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            <td");
-
-WriteLiteral(" class=\"text-center hidden-md hidden-sm hidden-xs\"");
-
-WriteLiteral(">");
-
-            
-            #line 42 "..\..\Views\Shared\_List_Data_Item_First.cshtml"
-                                                             Write(entity[item.Name]);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n");
-
-            
-            #line 43 "..\..\Views\Shared\_List_Data_Item_First.cshtml"
-            break;
-        case TypeCode.Single:
-        case TypeCode.Double:
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            <td");
-
-WriteLiteral(" class=\"text-center hidden-md hidden-sm hidden-xs\"");
-
-WriteLiteral(">");
-
-            
-            #line 46 "..\..\Views\Shared\_List_Data_Item_First.cshtml"
-                                                             Write(entity[item.Name]);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n");
-
-            
-            #line 47 "..\..\Views\Shared\_List_Data_Item_First.cshtml"
-            break;
-        case TypeCode.Byte:
-        case TypeCode.Int16:
-        case TypeCode.Int32:
-        case TypeCode.Int64:
-        case TypeCode.UInt16:
-        case TypeCode.UInt32:
-        case TypeCode.UInt64:
-            //特殊处理枚举
-            if (item.Type.IsEnum)
-            {
-                var v = entity[item.Name];
-                var val = v + "";
-                try
-                {
-                    val = System.EnumHelper.GetDescription((Enum)v) ?? v + "";
-                }
-                catch { }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <td");
-
-WriteLiteral(" class=\"text-center hidden-md hidden-sm hidden-xs\"");
-
-WriteLiteral(">");
-
-            
-            #line 65 "..\..\Views\Shared\_List_Data_Item_First.cshtml"
-                                                                 Write(val);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n");
-
-            
-            #line 66 "..\..\Views\Shared\_List_Data_Item_First.cshtml"
-            }
-            else
-            {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <td");
-
-WriteLiteral(" class=\"text-center hidden-md hidden-sm hidden-xs\"");
-
-WriteLiteral(">");
-
-            
-            #line 69 "..\..\Views\Shared\_List_Data_Item_First.cshtml"
-                                                                 Write(Convert.ToInt64(entity[item.Name]).ToString("n0"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n");
-
-            
-            #line 70 "..\..\Views\Shared\_List_Data_Item_First.cshtml"
-            }
-            break;
-        case TypeCode.String:
-        default:
-            {
-                var val = entity[item.Name];
-                var map = item.Map;
-                if (map != null && map.Provider != null && val + "" != "")
-                {
-                    var dic = new RouteValueDictionary();
-                    var key = map.Provider.Key;
-                    if (!key.IsNullOrEmpty() && item.OriField != null) { dic[key] = entity[item.OriField.Name]; }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                    <td");
-
-WriteLiteral(" class=\"text-center hidden-md hidden-sm hidden-xs\"");
-
-WriteLiteral(">");
-
-            
-            #line 82 "..\..\Views\Shared\_List_Data_Item_First.cshtml"
-                                                                     Write(Html.ActionLink(entity[item.Name] + "", "Edit", map.Provider.EntityType.Name, dic, null));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n");
-
-            
-            #line 83 "..\..\Views\Shared\_List_Data_Item_First.cshtml"
-                }
-                else
-                {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                    <td");
-
-WriteLiteral(" class=\"text-center hidden-md hidden-sm hidden-xs\"");
-
-WriteLiteral(">");
-
-            
-            #line 86 "..\..\Views\Shared\_List_Data_Item_First.cshtml"
-                                                                     Write(entity[item.Name]);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</td>\r\n");
-
-            
-            #line 87 "..\..\Views\Shared\_List_Data_Item_First.cshtml"
-                }
-            }
-            break;
-            
-            
-            #line default
-            #line hidden
-            
-            #line 92 "..\..\Views\Shared\_List_Data_Item_First.cshtml"
-                        
-    }
-}
-            
-            #line default
-            #line hidden
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Views/Shared/_List_Pager.cshtml b/NewLife.Cube/Views/Shared/_List_Pager.cshtml
deleted file mode 100644
index 35b7ca8ddd..0000000000
--- a/NewLife.Cube/Views/Shared/_List_Pager.cshtml
+++ /dev/null
@@ -1,35 +0,0 @@
-﻿@using NewLife.Web;
-@{
-    var page = ViewBag.Page as Pager;
-    //page.PageUrlTemplate = page.PageUrlTemplate.Replace("{链接}", Url.Action("Index") + "{链接}");
-    // 没有总记录数的时候不显示分页，可以认为不启用分页
-
-    var act = ViewBag.Action as String;
-    if (act.IsNullOrEmpty()) { act = Url.Action("Index"); }
-}
-@if (page.TotalCount > 0)
-{<text><form action="@act?@page.GetBaseUrl(true, true, false)" method="post" role="form">
-    共<span>@page.TotalCount.ToString("n0")</span>条&nbsp;
-    每页<span>@page.PageSize</span>条&nbsp;
-    当前第<span>@page.PageIndex.ToString("n0")</span>页/共<span>@page.PageCount.ToString("n0")</span>页&nbsp;
-    @Html.Raw(page.GetPage("首页"))&nbsp;
-    @Html.Raw(page.GetPage("上一页"))&nbsp;
-    @Html.Raw(page.GetPage("下一页"))&nbsp;
-    @Html.Raw(page.GetPage("尾页")) &nbsp;
-    转到第<input name="PageIndex" type="text" value="@page.PageIndex" class="input-sm" style="width:40px;text-align:right;" />页
-    <input type="submit" value="GO" class="btn btn-deafult btn-sm" />
-    页大小
-    <select id="PageSize" name="PageSize" onchange="$(this).parents('form').submit();">
-        <option value="5">5</option>
-        <option value="10">10</option>
-        <option value="20">20</option>
-        <option value="30">30</option>
-        <option value="50">50</option>
-        <option value="100">100</option>
-    </select>
-    <script type="text/javascript">
-        $(function () {
-            $('#PageSize').val(@page.PageSize);
-        });
-    </script>
-</form></text>}
\ No newline at end of file
diff --git a/NewLife.Cube/Views/Shared/_List_Pager.generated.cs b/NewLife.Cube/Views/Shared/_List_Pager.generated.cs
deleted file mode 100644
index 2613853804..0000000000
--- a/NewLife.Cube/Views/Shared/_List_Pager.generated.cs
+++ /dev/null
@@ -1,260 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    
-    #line 1 "..\..\Views\Shared\_List_Pager.cshtml"
-    using NewLife.Web;
-    
-    #line default
-    #line hidden
-    using XCode;
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Shared/_List_Pager.cshtml")]
-    public partial class _Views_Shared__List_Pager_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Views_Shared__List_Pager_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 2 "..\..\Views\Shared\_List_Pager.cshtml"
-  
-    var page = ViewBag.Page as Pager;
-    //page.PageUrlTemplate = page.PageUrlTemplate.Replace("{链接}", Url.Action("Index") + "{链接}");
-    // 没有总记录数的时候不显示分页，可以认为不启用分页
-
-    var act = ViewBag.Action as String;
-    if (act.IsNullOrEmpty()) { act = Url.Action("Index"); }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-            
-            #line 10 "..\..\Views\Shared\_List_Pager.cshtml"
- if (page.TotalCount > 0)
-{
-            
-            #line default
-            #line hidden
-WriteLiteral("<form");
-
-WriteAttribute("action", Tuple.Create(" action=\"", 341), Tuple.Create("\"", 390)
-            
-            #line 11 "..\..\Views\Shared\_List_Pager.cshtml"
-, Tuple.Create(Tuple.Create("", 350), Tuple.Create<System.Object, System.Int32>(act
-            
-            #line default
-            #line hidden
-, 350), false)
-, Tuple.Create(Tuple.Create("", 354), Tuple.Create("?", 354), true)
-            
-            #line 11 "..\..\Views\Shared\_List_Pager.cshtml"
-, Tuple.Create(Tuple.Create("", 355), Tuple.Create<System.Object, System.Int32>(page.GetBaseUrl(true, true, false)
-            
-            #line default
-            #line hidden
-, 355), false)
-);
-
-WriteLiteral(" method=\"post\"");
-
-WriteLiteral(" role=\"form\"");
-
-WriteLiteral(">\r\n    共<span>");
-
-            
-            #line 12 "..\..\Views\Shared\_List_Pager.cshtml"
-      Write(page.TotalCount.ToString("n0"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</span>条&nbsp;\r\n    每页<span>");
-
-            
-            #line 13 "..\..\Views\Shared\_List_Pager.cshtml"
-       Write(page.PageSize);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</span>条&nbsp;\r\n    当前第<span>");
-
-            
-            #line 14 "..\..\Views\Shared\_List_Pager.cshtml"
-        Write(page.PageIndex.ToString("n0"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</span>页/共<span>");
-
-            
-            #line 14 "..\..\Views\Shared\_List_Pager.cshtml"
-                                                      Write(page.PageCount.ToString("n0"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</span>页&nbsp;\r\n");
-
-WriteLiteral("    ");
-
-            
-            #line 15 "..\..\Views\Shared\_List_Pager.cshtml"
-Write(Html.Raw(page.GetPage("首页")));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("&nbsp;\r\n");
-
-WriteLiteral("    ");
-
-            
-            #line 16 "..\..\Views\Shared\_List_Pager.cshtml"
-Write(Html.Raw(page.GetPage("上一页")));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("&nbsp;\r\n");
-
-WriteLiteral("    ");
-
-            
-            #line 17 "..\..\Views\Shared\_List_Pager.cshtml"
-Write(Html.Raw(page.GetPage("下一页")));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("&nbsp;\r\n");
-
-WriteLiteral("    ");
-
-            
-            #line 18 "..\..\Views\Shared\_List_Pager.cshtml"
-Write(Html.Raw(page.GetPage("尾页")));
-
-            
-            #line default
-            #line hidden
-WriteLiteral(" &nbsp;\r\n    转到第<input");
-
-WriteLiteral(" name=\"PageIndex\"");
-
-WriteLiteral(" type=\"text\"");
-
-WriteAttribute("value", Tuple.Create(" value=\"", 834), Tuple.Create("\"", 857)
-            
-            #line 19 "..\..\Views\Shared\_List_Pager.cshtml"
-, Tuple.Create(Tuple.Create("", 842), Tuple.Create<System.Object, System.Int32>(page.PageIndex
-            
-            #line default
-            #line hidden
-, 842), false)
-);
-
-WriteLiteral(" class=\"input-sm\"");
-
-WriteLiteral(" style=\"width:40px;text-align:right;\"");
-
-WriteLiteral(" />页\r\n    <input");
-
-WriteLiteral(" type=\"submit\"");
-
-WriteLiteral(" value=\"GO\"");
-
-WriteLiteral(" class=\"btn btn-deafult btn-sm\"");
-
-WriteLiteral(" />\r\n    页大小\r\n    <select");
-
-WriteLiteral(" id=\"PageSize\"");
-
-WriteLiteral(" name=\"PageSize\"");
-
-WriteLiteral(" onchange=\"$(this).parents(\'form\').submit();\"");
-
-WriteLiteral(">\r\n        <option");
-
-WriteLiteral(" value=\"5\"");
-
-WriteLiteral(">5</option>\r\n        <option");
-
-WriteLiteral(" value=\"10\"");
-
-WriteLiteral(">10</option>\r\n        <option");
-
-WriteLiteral(" value=\"20\"");
-
-WriteLiteral(">20</option>\r\n        <option");
-
-WriteLiteral(" value=\"30\"");
-
-WriteLiteral(">30</option>\r\n        <option");
-
-WriteLiteral(" value=\"50\"");
-
-WriteLiteral(">50</option>\r\n        <option");
-
-WriteLiteral(" value=\"100\"");
-
-WriteLiteral(">100</option>\r\n    </select>\r\n    <script");
-
-WriteLiteral(" type=\"text/javascript\"");
-
-WriteLiteral(">\r\n        $(function () {\r\n            $(\'#PageSize\').val(");
-
-            
-            #line 32 "..\..\Views\Shared\_List_Pager.cshtml"
-                          Write(page.PageSize);
-
-            
-            #line default
-            #line hidden
-WriteLiteral(");\r\n        });\r\n    </script>\r\n</form>");
-
-            
-            #line 35 "..\..\Views\Shared\_List_Pager.cshtml"
-              }
-            
-            #line default
-            #line hidden
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Views/Shared/_List_Pager1.cshtml b/NewLife.Cube/Views/Shared/_List_Pager1.cshtml
deleted file mode 100644
index 438f0cbb43..0000000000
--- a/NewLife.Cube/Views/Shared/_List_Pager1.cshtml
+++ /dev/null
@@ -1,58 +0,0 @@
-﻿@using NewLife.Web;
-@{
-    var page = ViewBag.Page as Pager;
-    page.PageUrlTemplate = Url.Action("Index") + "{链接}";
-    // 没有总记录数的时候不显示分页，可以认为不启用分页
-}
-@helper  GetNumericPage(Pager page, int len = 8)
-{
-
-    int left = (len - 1) / 2, right = len - left - 1;
-    int start = page.PageIndex - left;//开始页数
-    Int64 end = page.PageIndex + right;//结束页数
-    start = start < 1 ? 1 : start;
-    end = end > page.PageCount ? page.PageCount : end;
-    if (page.PageIndex <= 1)
-    {
-        <li class="paginItem current"><a href="#">|<</a></li>
-        <li class="paginItem current"><a href="#"><</a></li>
-    }
-    else
-    {
-        <li class="paginItem"><a href="@page.GetPageUrl("首页", 1)">|<</a></li>
-        <li class="paginItem"><a href="@page.GetPageUrl("上一页", page.PageIndex-1)"><</a></li>
-    }
-
-    for (int i = start; i <= end; i++)
-    {
-        if (i == page.PageIndex)
-        {
-            <li class="paginItem current"><a href="javascript:;">@i</a></li>
-        }
-        else
-        {
-            <li class="paginItem"><a href="@page.GetPageUrl(i.ToString(), i)">@i</a></li>
-        }
-    }
-
-    if (page.PageIndex >= page.PageCount)
-    {
-        <li class="paginItem current"><a href="#">></a></li>
-        <li class="paginItem current"><a href="#">>|</a></li>
-    }
-    else
-    {
-        <li class="paginItem"><a href="@page.GetPageUrl("下一页", page.PageIndex + 1)">></a></li>
-        <li class="paginItem"><a href="@page.GetPageUrl("未页", page.PageCount)">>|</a></li>
-    }
-}
-
-@if (page.TotalCount > 0)
-{
-    <div class="pagin">
-        <div class="message">共<i class="blue">@page.TotalCount</i>条记录，当前显示第&nbsp;<i class="blue">@page.PageIndex&nbsp;</i>页/共&nbsp;<i class="blue">@page.PageCount&nbsp;</i>页</div>
-        <ul class="paginList">
-            @GetNumericPage(page)
-        </ul>
-    </div>
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Views/Shared/_List_Pager1.generated.cs b/NewLife.Cube/Views/Shared/_List_Pager1.generated.cs
deleted file mode 100644
index 54629a4aed..0000000000
--- a/NewLife.Cube/Views/Shared/_List_Pager1.generated.cs
+++ /dev/null
@@ -1,389 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    
-    #line 1 "..\..\Views\Shared\_List_Pager1.cshtml"
-    using NewLife.Web;
-    
-    #line default
-    #line hidden
-    using XCode;
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Shared/_List_Pager1.cshtml")]
-    public partial class _Views_Shared__List_Pager1_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-
-#line 7 "..\..\Views\Shared\_List_Pager1.cshtml"
-public System.Web.WebPages.HelperResult  GetNumericPage(Pager page, int len = 8)
-{
-#line default
-#line hidden
-return new System.Web.WebPages.HelperResult(__razor_helper_writer => {
-
-#line 8 "..\..\Views\Shared\_List_Pager1.cshtml"
- 
-
-    int left = (len - 1) / 2, right = len - left - 1;
-    int start = page.PageIndex - left;//开始页数
-    Int64 end = page.PageIndex + right;//结束页数
-    start = start < 1 ? 1 : start;
-    end = end > page.PageCount ? page.PageCount : end;
-    if (page.PageIndex <= 1)
-    {
-
-
-#line default
-#line hidden
-WriteLiteralTo(__razor_helper_writer, "        <li");
-
-WriteLiteralTo(__razor_helper_writer, " class=\"paginItem current\"");
-
-WriteLiteralTo(__razor_helper_writer, "><a");
-
-WriteLiteralTo(__razor_helper_writer, " href=\"#\"");
-
-WriteLiteralTo(__razor_helper_writer, ">|<</a></li>\r\n");
-
-WriteLiteralTo(__razor_helper_writer, "        <li");
-
-WriteLiteralTo(__razor_helper_writer, " class=\"paginItem current\"");
-
-WriteLiteralTo(__razor_helper_writer, "><a");
-
-WriteLiteralTo(__razor_helper_writer, " href=\"#\"");
-
-WriteLiteralTo(__razor_helper_writer, "><</a></li>\r\n");
-
-
-#line 19 "..\..\Views\Shared\_List_Pager1.cshtml"
-    }
-    else
-    {
-
-
-#line default
-#line hidden
-WriteLiteralTo(__razor_helper_writer, "        <li");
-
-WriteLiteralTo(__razor_helper_writer, " class=\"paginItem\"");
-
-WriteLiteralTo(__razor_helper_writer, "><a");
-
-WriteAttributeTo(__razor_helper_writer, "href", Tuple.Create(" href=\"", 671), Tuple.Create("\"", 703)
-
-#line 22 "..\..\Views\Shared\_List_Pager1.cshtml"
-, Tuple.Create(Tuple.Create("", 678), Tuple.Create<System.Object, System.Int32>(page.GetPageUrl("首页", 1)
-
-#line default
-#line hidden
-, 678), false)
-);
-
-WriteLiteralTo(__razor_helper_writer, ">|<</a></li>\r\n");
-
-WriteLiteralTo(__razor_helper_writer, "        <li");
-
-WriteLiteralTo(__razor_helper_writer, " class=\"paginItem\"");
-
-WriteLiteralTo(__razor_helper_writer, "><a");
-
-WriteAttributeTo(__razor_helper_writer, "href", Tuple.Create(" href=\"", 750), Tuple.Create("\"", 798)
-
-#line 23 "..\..\Views\Shared\_List_Pager1.cshtml"
-, Tuple.Create(Tuple.Create("", 757), Tuple.Create<System.Object, System.Int32>(page.GetPageUrl("上一页", page.PageIndex-1)
-
-#line default
-#line hidden
-, 757), false)
-);
-
-WriteLiteralTo(__razor_helper_writer, "><</a></li>\r\n");
-
-
-#line 24 "..\..\Views\Shared\_List_Pager1.cshtml"
-    }
-
-    for (int i = start; i <= end; i++)
-    {
-        if (i == page.PageIndex)
-        {
-
-
-#line default
-#line hidden
-WriteLiteralTo(__razor_helper_writer, "            <li");
-
-WriteLiteralTo(__razor_helper_writer, " class=\"paginItem current\"");
-
-WriteLiteralTo(__razor_helper_writer, "><a");
-
-WriteLiteralTo(__razor_helper_writer, " href=\"javascript:;\"");
-
-WriteLiteralTo(__razor_helper_writer, ">");
-
-
-#line 30 "..\..\Views\Shared\_List_Pager1.cshtml"
-                                   WriteTo(__razor_helper_writer, i);
-
-
-#line default
-#line hidden
-WriteLiteralTo(__razor_helper_writer, "</a></li>\r\n");
-
-
-#line 31 "..\..\Views\Shared\_List_Pager1.cshtml"
-        }
-        else
-        {
-
-
-#line default
-#line hidden
-WriteLiteralTo(__razor_helper_writer, "            <li");
-
-WriteLiteralTo(__razor_helper_writer, " class=\"paginItem\"");
-
-WriteLiteralTo(__razor_helper_writer, "><a");
-
-WriteAttributeTo(__razor_helper_writer, "href", Tuple.Create(" href=\"", 1063), Tuple.Create("\"", 1103)
-
-#line 34 "..\..\Views\Shared\_List_Pager1.cshtml"
-, Tuple.Create(Tuple.Create("", 1070), Tuple.Create<System.Object, System.Int32>(page.GetPageUrl(i.ToString(), i)
-
-#line default
-#line hidden
-, 1070), false)
-);
-
-WriteLiteralTo(__razor_helper_writer, ">");
-
-
-#line 34 "..\..\Views\Shared\_List_Pager1.cshtml"
-                                                WriteTo(__razor_helper_writer, i);
-
-
-#line default
-#line hidden
-WriteLiteralTo(__razor_helper_writer, "</a></li>\r\n");
-
-
-#line 35 "..\..\Views\Shared\_List_Pager1.cshtml"
-        }
-    }
-
-    if (page.PageIndex >= page.PageCount)
-    {
-
-
-#line default
-#line hidden
-WriteLiteralTo(__razor_helper_writer, "        <li");
-
-WriteLiteralTo(__razor_helper_writer, " class=\"paginItem current\"");
-
-WriteLiteralTo(__razor_helper_writer, "><a");
-
-WriteLiteralTo(__razor_helper_writer, " href=\"#\"");
-
-WriteLiteralTo(__razor_helper_writer, ">></a></li>\r\n");
-
-WriteLiteralTo(__razor_helper_writer, "        <li");
-
-WriteLiteralTo(__razor_helper_writer, " class=\"paginItem current\"");
-
-WriteLiteralTo(__razor_helper_writer, "><a");
-
-WriteLiteralTo(__razor_helper_writer, " href=\"#\"");
-
-WriteLiteralTo(__razor_helper_writer, ">>|</a></li>\r\n");
-
-
-#line 42 "..\..\Views\Shared\_List_Pager1.cshtml"
-    }
-    else
-    {
-
-
-#line default
-#line hidden
-WriteLiteralTo(__razor_helper_writer, "        <li");
-
-WriteLiteralTo(__razor_helper_writer, " class=\"paginItem\"");
-
-WriteLiteralTo(__razor_helper_writer, "><a");
-
-WriteAttributeTo(__razor_helper_writer, "href", Tuple.Create(" href=\"", 1369), Tuple.Create("\"", 1419)
-
-#line 45 "..\..\Views\Shared\_List_Pager1.cshtml"
-, Tuple.Create(Tuple.Create("", 1376), Tuple.Create<System.Object, System.Int32>(page.GetPageUrl("下一页", page.PageIndex + 1)
-
-#line default
-#line hidden
-, 1376), false)
-);
-
-WriteLiteralTo(__razor_helper_writer, ">></a></li>\r\n");
-
-WriteLiteralTo(__razor_helper_writer, "        <li");
-
-WriteLiteralTo(__razor_helper_writer, " class=\"paginItem\"");
-
-WriteLiteralTo(__razor_helper_writer, "><a");
-
-WriteAttributeTo(__razor_helper_writer, "href", Tuple.Create(" href=\"", 1465), Tuple.Create("\"", 1510)
-
-#line 46 "..\..\Views\Shared\_List_Pager1.cshtml"
-, Tuple.Create(Tuple.Create("", 1472), Tuple.Create<System.Object, System.Int32>(page.GetPageUrl("未页", page.PageCount)
-
-#line default
-#line hidden
-, 1472), false)
-);
-
-WriteLiteralTo(__razor_helper_writer, ">>|</a></li>\r\n");
-
-
-#line 47 "..\..\Views\Shared\_List_Pager1.cshtml"
-    }
-
-
-#line default
-#line hidden
-});
-
-#line 48 "..\..\Views\Shared\_List_Pager1.cshtml"
-}
-#line default
-#line hidden
-
-        public _Views_Shared__List_Pager1_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 2 "..\..\Views\Shared\_List_Pager1.cshtml"
-  
-    var page = ViewBag.Page as Pager;
-    page.PageUrlTemplate = Url.Action("Index") + "{链接}";
-    // 没有总记录数的时候不显示分页，可以认为不启用分页
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("\r\n");
-
-            
-            #line 50 "..\..\Views\Shared\_List_Pager1.cshtml"
- if (page.TotalCount > 0)
-{
-
-            
-            #line default
-            #line hidden
-WriteLiteral("    <div");
-
-WriteLiteral(" class=\"pagin\"");
-
-WriteLiteral(">\r\n        <div");
-
-WriteLiteral(" class=\"message\"");
-
-WriteLiteral(">共<i");
-
-WriteLiteral(" class=\"blue\"");
-
-WriteLiteral(">");
-
-            
-            #line 53 "..\..\Views\Shared\_List_Pager1.cshtml"
-                                         Write(page.TotalCount);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</i>条记录，当前显示第&nbsp;<i");
-
-WriteLiteral(" class=\"blue\"");
-
-WriteLiteral(">");
-
-            
-            #line 53 "..\..\Views\Shared\_List_Pager1.cshtml"
-                                                                                            Write(page.PageIndex);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("&nbsp;</i>页/共&nbsp;<i");
-
-WriteLiteral(" class=\"blue\"");
-
-WriteLiteral(">");
-
-            
-            #line 53 "..\..\Views\Shared\_List_Pager1.cshtml"
-                                                                                                                                              Write(page.PageCount);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("&nbsp;</i>页</div>\r\n        <ul");
-
-WriteLiteral(" class=\"paginList\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("            ");
-
-            
-            #line 55 "..\..\Views\Shared\_List_Pager1.cshtml"
-       Write(GetNumericPage(page));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n        </ul>\r\n    </div>\r\n");
-
-            
-            #line 58 "..\..\Views\Shared\_List_Pager1.cshtml"
-}
-            
-            #line default
-            #line hidden
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Views/Shared/_List_Search.cshtml b/NewLife.Cube/Views/Shared/_List_Search.cshtml
deleted file mode 100644
index 07730a8994..0000000000
--- a/NewLife.Cube/Views/Shared/_List_Search.cshtml
+++ /dev/null
@@ -1,12 +0,0 @@
-﻿@using NewLife;
-@using NewLife.Web;
-@using NewLife.Cube;
-@using XCode;
-@{
-    var fact = ViewBag.Factory as IEntityOperate;
-    var fi = fact.MasterTime;
-}
-@if (fi != null)
-{
-    @Html.Partial("_DateRange")
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Views/Shared/_List_Search.generated.cs b/NewLife.Cube/Views/Shared/_List_Search.generated.cs
deleted file mode 100644
index 0874429794..0000000000
--- a/NewLife.Cube/Views/Shared/_List_Search.generated.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    
-    #line 1 "..\..\Views\Shared\_List_Search.cshtml"
-    using NewLife;
-    
-    #line default
-    #line hidden
-    
-    #line 3 "..\..\Views\Shared\_List_Search.cshtml"
-    using NewLife.Cube;
-    
-    #line default
-    #line hidden
-    using NewLife.Reflection;
-    
-    #line 2 "..\..\Views\Shared\_List_Search.cshtml"
-    using NewLife.Web;
-    
-    #line default
-    #line hidden
-    
-    #line 4 "..\..\Views\Shared\_List_Search.cshtml"
-    using XCode;
-    
-    #line default
-    #line hidden
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Shared/_List_Search.cshtml")]
-    public partial class _Views_Shared__List_Search_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Views_Shared__List_Search_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 5 "..\..\Views\Shared\_List_Search.cshtml"
-  
-    var fact = ViewBag.Factory as IEntityOperate;
-    var fi = fact.MasterTime;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-            
-            #line 9 "..\..\Views\Shared\_List_Search.cshtml"
- if (fi != null)
-{
-    
-            
-            #line default
-            #line hidden
-            
-            #line 11 "..\..\Views\Shared\_List_Search.cshtml"
-Write(Html.Partial("_DateRange"));
-
-            
-            #line default
-            #line hidden
-            
-            #line 11 "..\..\Views\Shared\_List_Search.cshtml"
-                               
-}
-            
-            #line default
-            #line hidden
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Views/Shared/_List_Toolbar.cshtml b/NewLife.Cube/Views/Shared/_List_Toolbar.cshtml
deleted file mode 100644
index c381eeb5d4..0000000000
--- a/NewLife.Cube/Views/Shared/_List_Toolbar.cshtml
+++ /dev/null
@@ -1,73 +0,0 @@
-﻿@using NewLife;
-@using NewLife.Web;
-@using XCode;
-@{
-    var fact = ViewBag.Factory as IEntityOperate;
-    var page = ViewBag.Page as Pager ?? new Pager();
-
-    var act = ViewBag.Action as String;
-    if (act.IsNullOrEmpty()) { act = Url.Action("Index"); }
-
-    var enableSelect = this.EnableSelect();
-}
-<div class="tableTools-container">
-    <div class="form-inline">
-        <form action="@Html.Raw(page.GetFormAction(act))" method="post" role="form">
-            @if (this.Has(PermissionFlags.Insert))
-            {
-                var rv = page.GetRouteValue();
-                @Html.ActionLink("添加" + ViewContext.Controller.GetType().GetDisplayName(), "Add", rv, new { @class = "btn btn-success btn-sm" }.ToDictionary())
-            }
-            @if (enableSelect)
-            {
-                <div class="form-group toolbar-batch">
-                    @Html.Partial("_List_Toolbar_Batch")
-                </div>
-            }
-            <div class="pull-right form-group">
-                @Html.Partial("_List_Search")
-                @Html.Partial("_List_Toolbar_Search")
-                @Html.Partial("_List_Toolbar_Adv")
-            </div>
-        </form>
-    </div>
-</div>
-@if (enableSelect)
-{
-    <script>
-        $(function () {
-            var $toolbarContext = $('.toolbar-batch'),
-                $batchButtons = $('button[data-action="action"], input[data-action="action"]'), //button, input=button, a 3种类型都可以
-                $table = $('.table'),
-                $keys = $('input[name="keys"]', $table);
-
-            $table.on('click', '#chkAll', function () {
-                // 全选
-                $keys.prop('checked', this.checked);
-                // 启用禁用批量操作区
-                $batchButtons.prop('disabled', !this.checked);
-            });
-
-            $table.on('click.checked', 'tbody input[name="keys"]', function (e) {
-                //页面中所有的checkbox
-                var allbox = $table.find('tbody :checkbox[name="keys"]');
-                //页面中所选中的checkbox
-                var selecteds = $table.find('tbody :checkbox:checked[name="keys"]');
-                if (selecteds.length > 0) {
-                    // 启用禁用批量操作区
-                    $batchButtons.prop('disabled', false);
-                    //需要判断当前页面所有行的checkbox是否都选中，以此来决定是否需要改变checkbox#chkAll 的状态
-                    if (allbox.length == selecteds.length) {
-                        $table.find('#chkAll').prop('checked', true);
-                    } else {
-                        $table.find('#chkAll').prop('checked', false);
-                    }
-                }
-                else {
-                    $batchButtons.prop('disabled', true);
-                    $table.find('#chkAll').prop('checked', false);
-                }
-            });
-        })
-    </script>
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Views/Shared/_List_Toolbar.generated.cs b/NewLife.Cube/Views/Shared/_List_Toolbar.generated.cs
deleted file mode 100644
index ee875b4a8c..0000000000
--- a/NewLife.Cube/Views/Shared/_List_Toolbar.generated.cs
+++ /dev/null
@@ -1,241 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    
-    #line 1 "..\..\Views\Shared\_List_Toolbar.cshtml"
-    using NewLife;
-    
-    #line default
-    #line hidden
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    
-    #line 2 "..\..\Views\Shared\_List_Toolbar.cshtml"
-    using NewLife.Web;
-    
-    #line default
-    #line hidden
-    
-    #line 3 "..\..\Views\Shared\_List_Toolbar.cshtml"
-    using XCode;
-    
-    #line default
-    #line hidden
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Shared/_List_Toolbar.cshtml")]
-    public partial class _Views_Shared__List_Toolbar_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Views_Shared__List_Toolbar_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 4 "..\..\Views\Shared\_List_Toolbar.cshtml"
-  
-    var fact = ViewBag.Factory as IEntityOperate;
-    var page = ViewBag.Page as Pager ?? new Pager();
-
-    var act = ViewBag.Action as String;
-    if (act.IsNullOrEmpty()) { act = Url.Action("Index"); }
-
-    var enableSelect = this.EnableSelect();
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n<div");
-
-WriteLiteral(" class=\"tableTools-container\"");
-
-WriteLiteral(">\r\n    <div");
-
-WriteLiteral(" class=\"form-inline\"");
-
-WriteLiteral(">\r\n        <form");
-
-WriteAttribute("action", Tuple.Create(" action=\"", 396), Tuple.Create("\"", 439)
-            
-            #line 15 "..\..\Views\Shared\_List_Toolbar.cshtml"
-, Tuple.Create(Tuple.Create("", 405), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetFormAction(act))
-            
-            #line default
-            #line hidden
-, 405), false)
-);
-
-WriteLiteral(" method=\"post\"");
-
-WriteLiteral(" role=\"form\"");
-
-WriteLiteral(">\r\n");
-
-            
-            #line 16 "..\..\Views\Shared\_List_Toolbar.cshtml"
-            
-            
-            #line default
-            #line hidden
-            
-            #line 16 "..\..\Views\Shared\_List_Toolbar.cshtml"
-             if (this.Has(PermissionFlags.Insert))
-            {
-                var rv = page.GetRouteValue();
-                
-            
-            #line default
-            #line hidden
-            
-            #line 19 "..\..\Views\Shared\_List_Toolbar.cshtml"
-           Write(Html.ActionLink("添加" + ViewContext.Controller.GetType().GetDisplayName(), "Add", rv, new { @class = "btn btn-success btn-sm" }.ToDictionary()));
-
-            
-            #line default
-            #line hidden
-            
-            #line 19 "..\..\Views\Shared\_List_Toolbar.cshtml"
-                                                                                                                                                               
-            }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            ");
-
-            
-            #line 21 "..\..\Views\Shared\_List_Toolbar.cshtml"
-             if (enableSelect)
-            {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <div");
-
-WriteLiteral(" class=\"form-group toolbar-batch\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("                    ");
-
-            
-            #line 24 "..\..\Views\Shared\_List_Toolbar.cshtml"
-               Write(Html.Partial("_List_Toolbar_Batch"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n                </div>\r\n");
-
-            
-            #line 26 "..\..\Views\Shared\_List_Toolbar.cshtml"
-            }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            <div");
-
-WriteLiteral(" class=\"pull-right form-group\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("                ");
-
-            
-            #line 28 "..\..\Views\Shared\_List_Toolbar.cshtml"
-           Write(Html.Partial("_List_Search"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                ");
-
-            
-            #line 29 "..\..\Views\Shared\_List_Toolbar.cshtml"
-           Write(Html.Partial("_List_Toolbar_Search"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-WriteLiteral("                ");
-
-            
-            #line 30 "..\..\Views\Shared\_List_Toolbar.cshtml"
-           Write(Html.Partial("_List_Toolbar_Adv"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n            </div>\r\n        </form>\r\n    </div>\r\n</div>\r\n");
-
-            
-            #line 35 "..\..\Views\Shared\_List_Toolbar.cshtml"
- if (enableSelect)
-{
-
-            
-            #line default
-            #line hidden
-WriteLiteral("    <script>\r\n        $(function () {\r\n            var $toolbarContext = $(\'.tool" +
-"bar-batch\'),\r\n                $batchButtons = $(\'button[data-action=\"action\"], i" +
-"nput[data-action=\"action\"]\'), //button, input=button, a 3种类型都可以\r\n               " +
-" $table = $(\'.table\'),\r\n                $keys = $(\'input[name=\"keys\"]\', $table);" +
-"\r\n\r\n            $table.on(\'click\', \'#chkAll\', function () {\r\n                // " +
-"全选\r\n                $keys.prop(\'checked\', this.checked);\r\n                // 启用禁" +
-"用批量操作区\r\n                $batchButtons.prop(\'disabled\', !this.checked);\r\n        " +
-"    });\r\n\r\n            $table.on(\'click.checked\', \'tbody input[name=\"keys\"]\', fu" +
-"nction (e) {\r\n                //页面中所有的checkbox\r\n                var allbox = $ta" +
-"ble.find(\'tbody :checkbox[name=\"keys\"]\');\r\n                //页面中所选中的checkbox\r\n  " +
-"              var selecteds = $table.find(\'tbody :checkbox:checked[name=\"keys\"]\'" +
-");\r\n                if (selecteds.length > 0) {\r\n                    // 启用禁用批量操作" +
-"区\r\n                    $batchButtons.prop(\'disabled\', false);\r\n                 " +
-"   //需要判断当前页面所有行的checkbox是否都选中，以此来决定是否需要改变checkbox#chkAll 的状态\r\n                 " +
-"   if (allbox.length == selecteds.length) {\r\n                        $table.find" +
-"(\'#chkAll\').prop(\'checked\', true);\r\n                    } else {\r\n              " +
-"          $table.find(\'#chkAll\').prop(\'checked\', false);\r\n                    }\r" +
-"\n                }\r\n                else {\r\n                    $batchButtons.pr" +
-"op(\'disabled\', true);\r\n                    $table.find(\'#chkAll\').prop(\'checked\'" +
-", false);\r\n                }\r\n            });\r\n        })\r\n    </script>\r\n");
-
-            
-            #line 73 "..\..\Views\Shared\_List_Toolbar.cshtml"
-}
-            
-            #line default
-            #line hidden
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Views/Shared/_List_Toolbar_Adv.cshtml b/NewLife.Cube/Views/Shared/_List_Toolbar_Adv.cshtml
deleted file mode 100644
index de22abb43e..0000000000
--- a/NewLife.Cube/Views/Shared/_List_Toolbar_Adv.cshtml
+++ /dev/null
@@ -1,57 +0,0 @@
-﻿@using NewLife.Common;
-@{
-    var user = ViewBag.User as IUser ?? User.Identity as IUser;
-}
-<div class="btn-group">
-    <button data-toggle="dropdown" class="btn btn-info btn-sm btn-sm-force dropdown-toggle" aria-expanded="false">
-        高级
-        <span class="ace-icon fa fa-caret-down icon-on-right"></span>
-    </button>
-
-    <ul class="dropdown-menu dropdown-info dropdown-menu-right">
-        <li>
-            <a href="@Url.Action("ExportExcel")">导出Excel</a>
-        </li>
-        <li>
-            <a href="@Url.Action("ExportXml")">导出Xml</a>
-        </li>
-        @*<li>
-                <a href="@Url.Action("ImportXml")">导入Xml</a>
-            </li>*@
-        <li>
-            <a href="@Url.Action("ExportJson")">导出Json</a>
-        </li>
-        @*<li>
-                <a href="@Url.Action("ImportJson")">导入Json</a>
-            </li>*@
-        @if (this.Has(PermissionFlags.Delete))
-        {
-            <li class="divider"></li>
-            <li>
-                <a href="@Url.Action("DeleteSelect")" data-action="action" data-fields="keys" data-confirm="该操作将删除选中数据并不可恢复！确认删除？" title="删除选中数据">删除选中</a>
-            </li>
-            <li>
-                <a href="@Url.Action("DeleteAll")" data-action="action" data-confirm="该操作将删除当前查询的所有数据并不可恢复！确认删除？" title="删除当前查询的所有数据">删除全部</a>
-            </li>
-        }
-        @if (SysConfig.Current.Develop)
-        {
-            <li class="divider"></li>
-            if (User.IsInRole("管理员"))
-            {
-                <li>
-                    <a href="@Url.Action("Clear")" data-action="action" data-confirm="该操作将删除数据表所有数据并不可恢复！确认清空？" title="删除数据表所有数据">清空数据表</a>
-                </li>
-            }
-            if (ViewHelper.IsDevelop())
-            {
-                <li>
-                    <a href="@Url.Action("MakeList")">生成列表</a>
-                </li>
-                <li>
-                    <a href="@Url.Action("MakeForm")">生成表单</a>
-                </li>
-            }
-        }
-    </ul>
-</div><!-- /.btn-group -->
\ No newline at end of file
diff --git a/NewLife.Cube/Views/Shared/_List_Toolbar_Adv.generated.cs b/NewLife.Cube/Views/Shared/_List_Toolbar_Adv.generated.cs
deleted file mode 100644
index e7c642bd80..0000000000
--- a/NewLife.Cube/Views/Shared/_List_Toolbar_Adv.generated.cs
+++ /dev/null
@@ -1,284 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    
-    #line 1 "..\..\Views\Shared\_List_Toolbar_Adv.cshtml"
-    using NewLife.Common;
-    
-    #line default
-    #line hidden
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Shared/_List_Toolbar_Adv.cshtml")]
-    public partial class _Views_Shared__List_Toolbar_Adv_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Views_Shared__List_Toolbar_Adv_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 2 "..\..\Views\Shared\_List_Toolbar_Adv.cshtml"
-  
-    var user = ViewBag.User as IUser ?? User.Identity as IUser;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n<div");
-
-WriteLiteral(" class=\"btn-group\"");
-
-WriteLiteral(">\r\n    <button");
-
-WriteLiteral(" data-toggle=\"dropdown\"");
-
-WriteLiteral(" class=\"btn btn-info btn-sm btn-sm-force dropdown-toggle\"");
-
-WriteLiteral(" aria-expanded=\"false\"");
-
-WriteLiteral(">\r\n        高级\r\n        <span");
-
-WriteLiteral(" class=\"ace-icon fa fa-caret-down icon-on-right\"");
-
-WriteLiteral("></span>\r\n    </button>\r\n\r\n    <ul");
-
-WriteLiteral(" class=\"dropdown-menu dropdown-info dropdown-menu-right\"");
-
-WriteLiteral(">\r\n        <li>\r\n            <a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 431), Tuple.Create("\"", 464)
-            
-            #line 13 "..\..\Views\Shared\_List_Toolbar_Adv.cshtml"
-, Tuple.Create(Tuple.Create("", 438), Tuple.Create<System.Object, System.Int32>(Url.Action("ExportExcel")
-            
-            #line default
-            #line hidden
-, 438), false)
-);
-
-WriteLiteral(">导出Excel</a>\r\n        </li>\r\n        <li>\r\n            <a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 522), Tuple.Create("\"", 553)
-            
-            #line 16 "..\..\Views\Shared\_List_Toolbar_Adv.cshtml"
-, Tuple.Create(Tuple.Create("", 529), Tuple.Create<System.Object, System.Int32>(Url.Action("ExportXml")
-            
-            #line default
-            #line hidden
-, 529), false)
-);
-
-WriteLiteral(">导出Xml</a>\r\n        </li>\r\n        ");
-
-WriteLiteral("\r\n        <li>\r\n            <a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 708), Tuple.Create("\"", 740)
-            
-            #line 22 "..\..\Views\Shared\_List_Toolbar_Adv.cshtml"
-, Tuple.Create(Tuple.Create("", 715), Tuple.Create<System.Object, System.Int32>(Url.Action("ExportJson")
-            
-            #line default
-            #line hidden
-, 715), false)
-);
-
-WriteLiteral(">导出Json</a>\r\n        </li>\r\n        ");
-
-WriteLiteral("\r\n");
-
-            
-            #line 27 "..\..\Views\Shared\_List_Toolbar_Adv.cshtml"
-        
-            
-            #line default
-            #line hidden
-            
-            #line 27 "..\..\Views\Shared\_List_Toolbar_Adv.cshtml"
-         if (this.Has(PermissionFlags.Delete))
-        {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            <li");
-
-WriteLiteral(" class=\"divider\"");
-
-WriteLiteral("></li>\r\n");
-
-WriteLiteral("            <li>\r\n                <a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1004), Tuple.Create("\"", 1038)
-            
-            #line 31 "..\..\Views\Shared\_List_Toolbar_Adv.cshtml"
-, Tuple.Create(Tuple.Create("", 1011), Tuple.Create<System.Object, System.Int32>(Url.Action("DeleteSelect")
-            
-            #line default
-            #line hidden
-, 1011), false)
-);
-
-WriteLiteral(" data-action=\"action\"");
-
-WriteLiteral(" data-fields=\"keys\"");
-
-WriteLiteral(" data-confirm=\"该操作将删除选中数据并不可恢复！确认删除？\"");
-
-WriteLiteral(" title=\"删除选中数据\"");
-
-WriteLiteral(">删除选中</a>\r\n            </li>\r\n");
-
-WriteLiteral("            <li>\r\n                <a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1197), Tuple.Create("\"", 1228)
-            
-            #line 34 "..\..\Views\Shared\_List_Toolbar_Adv.cshtml"
-, Tuple.Create(Tuple.Create("", 1204), Tuple.Create<System.Object, System.Int32>(Url.Action("DeleteAll")
-            
-            #line default
-            #line hidden
-, 1204), false)
-);
-
-WriteLiteral(" data-action=\"action\"");
-
-WriteLiteral(" data-confirm=\"该操作将删除当前查询的所有数据并不可恢复！确认删除？\"");
-
-WriteLiteral(" title=\"删除当前查询的所有数据\"");
-
-WriteLiteral(">删除全部</a>\r\n            </li>\r\n");
-
-            
-            #line 36 "..\..\Views\Shared\_List_Toolbar_Adv.cshtml"
-        }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        ");
-
-            
-            #line 37 "..\..\Views\Shared\_List_Toolbar_Adv.cshtml"
-         if (SysConfig.Current.Develop)
-        {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("            <li");
-
-WriteLiteral(" class=\"divider\"");
-
-WriteLiteral("></li>\r\n");
-
-            
-            #line 40 "..\..\Views\Shared\_List_Toolbar_Adv.cshtml"
-            if (User.IsInRole("管理员"))
-            {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <li>\r\n                    <a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1542), Tuple.Create("\"", 1569)
-            
-            #line 43 "..\..\Views\Shared\_List_Toolbar_Adv.cshtml"
-, Tuple.Create(Tuple.Create("", 1549), Tuple.Create<System.Object, System.Int32>(Url.Action("Clear")
-            
-            #line default
-            #line hidden
-, 1549), false)
-);
-
-WriteLiteral(" data-action=\"action\"");
-
-WriteLiteral(" data-confirm=\"该操作将删除数据表所有数据并不可恢复！确认清空？\"");
-
-WriteLiteral(" title=\"删除数据表所有数据\"");
-
-WriteLiteral(">清空数据表</a>\r\n                </li>\r\n");
-
-            
-            #line 45 "..\..\Views\Shared\_List_Toolbar_Adv.cshtml"
-            }
-            if (ViewHelper.IsDevelop())
-            {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <li>\r\n                    <a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1799), Tuple.Create("\"", 1829)
-            
-            #line 49 "..\..\Views\Shared\_List_Toolbar_Adv.cshtml"
-, Tuple.Create(Tuple.Create("", 1806), Tuple.Create<System.Object, System.Int32>(Url.Action("MakeList")
-            
-            #line default
-            #line hidden
-, 1806), false)
-);
-
-WriteLiteral(">生成列表</a>\r\n                </li>\r\n");
-
-WriteLiteral("                <li>\r\n                    <a");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 1908), Tuple.Create("\"", 1938)
-            
-            #line 52 "..\..\Views\Shared\_List_Toolbar_Adv.cshtml"
-, Tuple.Create(Tuple.Create("", 1915), Tuple.Create<System.Object, System.Int32>(Url.Action("MakeForm")
-            
-            #line default
-            #line hidden
-, 1915), false)
-);
-
-WriteLiteral(">生成表单</a>\r\n                </li>\r\n");
-
-            
-            #line 54 "..\..\Views\Shared\_List_Toolbar_Adv.cshtml"
-            }
-        }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("    </ul>\r\n</div><!-- /.btn-group -->");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Views/Shared/_List_Toolbar_Batch.cshtml b/NewLife.Cube/Views/Shared/_List_Toolbar_Batch.cshtml
deleted file mode 100644
index 9fe2c1b177..0000000000
--- a/NewLife.Cube/Views/Shared/_List_Toolbar_Batch.cshtml
+++ /dev/null
@@ -1,13 +0,0 @@
-﻿@using NewLife.Common;
-@{
-    var user = ViewBag.User as IUser ?? User.Identity as IUser;
-    var fact = ViewBag.Factory as IEntityOperate;
-    var enableSelect = this.EnableSelect();
-}
-@if (enableSelect)
-{
-    @*<button type="button" class="btn btn-purple btn-sm" data-action="action" data-url="@Url.Action("DeleteSelect")" data-method="post" data-fields="keys,keys2" data-confirm="该操作将删除选中数据并不可恢复！确认删除？" disabled>
-        <span class="ace-icon fa fa-search icon-on-right bigger-110"></span>
-        批量删除
-    </button>*@
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Views/Shared/_List_Toolbar_Batch.generated.cs b/NewLife.Cube/Views/Shared/_List_Toolbar_Batch.generated.cs
deleted file mode 100644
index e1e4719a4f..0000000000
--- a/NewLife.Cube/Views/Shared/_List_Toolbar_Batch.generated.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    
-    #line 1 "..\..\Views\Shared\_List_Toolbar_Batch.cshtml"
-    using NewLife.Common;
-    
-    #line default
-    #line hidden
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Shared/_List_Toolbar_Batch.cshtml")]
-    public partial class _Views_Shared__List_Toolbar_Batch_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Views_Shared__List_Toolbar_Batch_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 2 "..\..\Views\Shared\_List_Toolbar_Batch.cshtml"
-  
-    var user = ViewBag.User as IUser ?? User.Identity as IUser;
-    var fact = ViewBag.Factory as IEntityOperate;
-    var enableSelect = this.EnableSelect();
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-            
-            #line 7 "..\..\Views\Shared\_List_Toolbar_Batch.cshtml"
- if (enableSelect)
-{
-    
-            
-            #line default
-            #line hidden
-            
-            #line 12 "..\..\Views\Shared\_List_Toolbar_Batch.cshtml"
-               
-}
-            
-            #line default
-            #line hidden
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Views/Shared/_List_Toolbar_Search.cshtml b/NewLife.Cube/Views/Shared/_List_Toolbar_Search.cshtml
deleted file mode 100644
index 8af28ff6cc..0000000000
--- a/NewLife.Cube/Views/Shared/_List_Toolbar_Search.cshtml
+++ /dev/null
@@ -1,12 +0,0 @@
-﻿<div class="input-group">
-    <span class="input-group-addon">
-        <i class="ace-icon fa fa-check"></i>
-    </span>
-    <input name="q" type="search" id="q" value="@Request["q"]" class="form-control" placeholder="搜索关键字" />
-    <span class="input-group-btn">
-        <button type="submit" class="btn btn-purple btn-sm">
-            <span class="ace-icon fa fa-search icon-on-right bigger-110"></span>
-            查询
-        </button>
-    </span>
-</div>
\ No newline at end of file
diff --git a/NewLife.Cube/Views/Shared/_List_Toolbar_Search.generated.cs b/NewLife.Cube/Views/Shared/_List_Toolbar_Search.generated.cs
deleted file mode 100644
index 05afaa5d46..0000000000
--- a/NewLife.Cube/Views/Shared/_List_Toolbar_Search.generated.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Shared/_List_Toolbar_Search.cshtml")]
-    public partial class _Views_Shared__List_Toolbar_Search_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Views_Shared__List_Toolbar_Search_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-WriteLiteral("<div");
-
-WriteLiteral(" class=\"input-group\"");
-
-WriteLiteral(">\r\n    <span");
-
-WriteLiteral(" class=\"input-group-addon\"");
-
-WriteLiteral(">\r\n        <i");
-
-WriteLiteral(" class=\"ace-icon fa fa-check\"");
-
-WriteLiteral("></i>\r\n    </span>\r\n    <input");
-
-WriteLiteral(" name=\"q\"");
-
-WriteLiteral(" type=\"search\"");
-
-WriteLiteral(" id=\"q\"");
-
-WriteAttribute("value", Tuple.Create(" value=\"", 164), Tuple.Create("\"", 185)
-            
-            #line 5 "..\..\Views\Shared\_List_Toolbar_Search.cshtml"
-, Tuple.Create(Tuple.Create("", 172), Tuple.Create<System.Object, System.Int32>(Request["q"]
-            
-            #line default
-            #line hidden
-, 172), false)
-);
-
-WriteLiteral(" class=\"form-control\"");
-
-WriteLiteral(" placeholder=\"搜索关键字\"");
-
-WriteLiteral(" />\r\n    <span");
-
-WriteLiteral(" class=\"input-group-btn\"");
-
-WriteLiteral(">\r\n        <button");
-
-WriteLiteral(" type=\"submit\"");
-
-WriteLiteral(" class=\"btn btn-purple btn-sm\"");
-
-WriteLiteral(">\r\n            <span");
-
-WriteLiteral(" class=\"ace-icon fa fa-search icon-on-right bigger-110\"");
-
-WriteLiteral("></span>\r\n            查询\r\n        </button>\r\n    </span>\r\n</div>");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Views/Shared/_LoginPartial.cshtml b/NewLife.Cube/Views/Shared/_LoginPartial.cshtml
deleted file mode 100644
index 8fee165782..0000000000
--- a/NewLife.Cube/Views/Shared/_LoginPartial.cshtml
+++ /dev/null
@@ -1,18 +0,0 @@
-﻿@using XCode.Membership;
-@{ 
-    var user = ViewBag.User as IUser ?? User.Identity as IUser;
-}
-@if (user != null)
-{
-    <text>
-        你好，@Html.ActionLink(user + "", "Info", "Admin/User", routeValues: new { id = user.ID }, htmlAttributes: new { @class = "username", title = "管理" })!
-        @Html.ActionLink("注销", "Logout", "Admin/User")
-    </text>
-}
-else
-{
-    <ul>
-        <li>@Html.ActionLink("注册", "Login", "Admin/User", routeValues: new { ReturnUrl = Request.Url, act = "Register" }, htmlAttributes: new { id = "registerLink" })</li>
-        <li>@Html.ActionLink("登录", "Login", "Admin/User", routeValues: new { ReturnUrl = Request.Url }, htmlAttributes: new { id = "loginLink" })</li>
-    </ul>
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Views/Shared/_LoginPartial.generated.cs b/NewLife.Cube/Views/Shared/_LoginPartial.generated.cs
deleted file mode 100644
index f5be330cd1..0000000000
--- a/NewLife.Cube/Views/Shared/_LoginPartial.generated.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    
-    #line 1 "..\..\Views\Shared\_LoginPartial.cshtml"
-    using XCode.Membership;
-    
-    #line default
-    #line hidden
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Shared/_LoginPartial.cshtml")]
-    public partial class _Views_Shared__LoginPartial_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Views_Shared__LoginPartial_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 2 "..\..\Views\Shared\_LoginPartial.cshtml"
-   
-    var user = ViewBag.User as IUser ?? User.Identity as IUser;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-            
-            #line 5 "..\..\Views\Shared\_LoginPartial.cshtml"
- if (user != null)
-{
-
-            
-            #line default
-            #line hidden
-WriteLiteral("    ");
-
-WriteLiteral("\r\n        你好，");
-
-            
-            #line 8 "..\..\Views\Shared\_LoginPartial.cshtml"
-      Write(Html.ActionLink(user + "", "Info", "Admin/User", routeValues: new { id = user.ID }, htmlAttributes: new { @class = "username", title = "管理" }));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("!\r\n");
-
-WriteLiteral("        ");
-
-            
-            #line 9 "..\..\Views\Shared\_LoginPartial.cshtml"
-   Write(Html.ActionLink("注销", "Logout", "Admin/User"));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n    ");
-
-WriteLiteral("\r\n");
-
-            
-            #line 11 "..\..\Views\Shared\_LoginPartial.cshtml"
-}
-else
-{
-
-            
-            #line default
-            #line hidden
-WriteLiteral("    <ul>\r\n        <li>");
-
-            
-            #line 15 "..\..\Views\Shared\_LoginPartial.cshtml"
-       Write(Html.ActionLink("注册", "Login", "Admin/User", routeValues: new { ReturnUrl = Request.Url, act = "Register" }, htmlAttributes: new { id = "registerLink" }));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</li>\r\n        <li>");
-
-            
-            #line 16 "..\..\Views\Shared\_LoginPartial.cshtml"
-       Write(Html.ActionLink("登录", "Login", "Admin/User", routeValues: new { ReturnUrl = Request.Url }, htmlAttributes: new { id = "loginLink" }));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</li>\r\n    </ul>\r\n");
-
-            
-            #line 18 "..\..\Views\Shared\_LoginPartial.cshtml"
-}
-            
-            #line default
-            #line hidden
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Views/Shared/_Object_Nav.cshtml b/NewLife.Cube/Views/Shared/_Object_Nav.cshtml
deleted file mode 100644
index f099142a53..0000000000
--- a/NewLife.Cube/Views/Shared/_Object_Nav.cshtml
+++ /dev/null
@@ -1,3 +0,0 @@
-﻿@{
-    var Obj = Model as Object;
-}
diff --git a/NewLife.Cube/Views/Shared/_Object_Nav.generated.cs b/NewLife.Cube/Views/Shared/_Object_Nav.generated.cs
deleted file mode 100644
index 476486eae0..0000000000
--- a/NewLife.Cube/Views/Shared/_Object_Nav.generated.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Shared/_Object_Nav.cshtml")]
-    public partial class _Views_Shared__Object_Nav_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Views_Shared__Object_Nav_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 1 "..\..\Views\Shared\_Object_Nav.cshtml"
-  
-    var Obj = Model as Object;
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Views/Shared/_StatLevel.cshtml b/NewLife.Cube/Views/Shared/_StatLevel.cshtml
deleted file mode 100644
index d44ef49009..0000000000
--- a/NewLife.Cube/Views/Shared/_StatLevel.cshtml
+++ /dev/null
@@ -1,38 +0,0 @@
-﻿@using XCode.Statistics;
-@{
-    // 所有可用层级
-    var vs = Model as StatLevels[];
-    var ds = System.EnumHelper.GetDescriptions(typeof(StatLevels));
-    var def = StatLevels.All;
-    if (vs != null && vs.Length > 0)
-    {
-        ds = vs.ToDictionary(e => (Int32)e, e => e.GetDescription());
-        def = vs[0];
-    }
-
-    var page = ViewBag.Page as Pager;
-
-    var n = page["Level"].ToInt(-1);
-    var level = n >= 0 ? (StatLevels)n : def;
-    var formatStr = "";
-    switch (level)
-    {
-        case StatLevels.Year: formatStr = "yyyy"; break;
-        case StatLevels.Month: formatStr = "yyyy-MM"; break;
-        case StatLevels.Day: formatStr = "yyyy-MM-dd"; break;
-        case StatLevels.Hour: formatStr = "yyyy-MM-dd HH"; break;
-        case StatLevels.Minute: formatStr = "yyyy-MM-dd HH:mm"; break;
-    }
-}
-<div class="form-group">
-    @Html.ForDropDownList("Level", ds, (Int32)level, null, true)
-</div>
-@if (level > StatLevels.All)
-{
-    <div class="form-group">
-        <div class="input-group">
-            <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-            <input name="Time" id="Time" value="@page["Time"]" dateformat="@formatStr" class="form-control form_datetime" />
-        </div>
-    </div>
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Views/Shared/_StatLevel.generated.cs b/NewLife.Cube/Views/Shared/_StatLevel.generated.cs
deleted file mode 100644
index fe88e7cab9..0000000000
--- a/NewLife.Cube/Views/Shared/_StatLevel.generated.cs
+++ /dev/null
@@ -1,161 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    using XCode.Membership;
-    
-    #line 1 "..\..\Views\Shared\_StatLevel.cshtml"
-    using XCode.Statistics;
-    
-    #line default
-    #line hidden
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Shared/_StatLevel.cshtml")]
-    public partial class _Views_Shared__StatLevel_cshtml : System.Web.Mvc.WebViewPage<dynamic>
-    {
-        public _Views_Shared__StatLevel_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 2 "..\..\Views\Shared\_StatLevel.cshtml"
-  
-    // 所有可用层级
-    var vs = Model as StatLevels[];
-    var ds = System.EnumHelper.GetDescriptions(typeof(StatLevels));
-    var def = StatLevels.All;
-    if (vs != null && vs.Length > 0)
-    {
-        ds = vs.ToDictionary(e => (Int32)e, e => e.GetDescription());
-        def = vs[0];
-    }
-
-    var page = ViewBag.Page as Pager;
-
-    var n = page["Level"].ToInt(-1);
-    var level = n >= 0 ? (StatLevels)n : def;
-    var formatStr = "";
-    switch (level)
-    {
-        case StatLevels.Year: formatStr = "yyyy"; break;
-        case StatLevels.Month: formatStr = "yyyy-MM"; break;
-        case StatLevels.Day: formatStr = "yyyy-MM-dd"; break;
-        case StatLevels.Hour: formatStr = "yyyy-MM-dd HH"; break;
-        case StatLevels.Minute: formatStr = "yyyy-MM-dd HH:mm"; break;
-    }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n<div");
-
-WriteLiteral(" class=\"form-group\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("    ");
-
-            
-            #line 28 "..\..\Views\Shared\_StatLevel.cshtml"
-Write(Html.ForDropDownList("Level", ds, (Int32)level, null, true));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n</div>\r\n");
-
-            
-            #line 30 "..\..\Views\Shared\_StatLevel.cshtml"
- if (level > StatLevels.All)
-{
-
-            
-            #line default
-            #line hidden
-WriteLiteral("    <div");
-
-WriteLiteral(" class=\"form-group\"");
-
-WriteLiteral(">\r\n        <div");
-
-WriteLiteral(" class=\"input-group\"");
-
-WriteLiteral(">\r\n            <span");
-
-WriteLiteral(" class=\"input-group-addon\"");
-
-WriteLiteral("><i");
-
-WriteLiteral(" class=\"fa fa-calendar\"");
-
-WriteLiteral("></i></span>\r\n            <input");
-
-WriteLiteral(" name=\"Time\"");
-
-WriteLiteral(" id=\"Time\"");
-
-WriteAttribute("value", Tuple.Create(" value=\"", 1160), Tuple.Create("\"", 1181)
-            
-            #line 35 "..\..\Views\Shared\_StatLevel.cshtml"
-, Tuple.Create(Tuple.Create("", 1168), Tuple.Create<System.Object, System.Int32>(page["Time"]
-            
-            #line default
-            #line hidden
-, 1168), false)
-);
-
-WriteAttribute("dateformat", Tuple.Create(" dateformat=\"", 1182), Tuple.Create("\"", 1205)
-            
-            #line 35 "..\..\Views\Shared\_StatLevel.cshtml"
-, Tuple.Create(Tuple.Create("", 1195), Tuple.Create<System.Object, System.Int32>(formatStr
-            
-            #line default
-            #line hidden
-, 1195), false)
-);
-
-WriteLiteral(" class=\"form-control form_datetime\"");
-
-WriteLiteral(" />\r\n        </div>\r\n    </div>\r\n");
-
-            
-            #line 38 "..\..\Views\Shared\_StatLevel.cshtml"
-}
-            
-            #line default
-            #line hidden
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Views/Web.config b/NewLife.Cube/Views/Web.config
deleted file mode 100644
index eb2711b479..0000000000
--- a/NewLife.Cube/Views/Web.config
+++ /dev/null
@@ -1,48 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-
-<configuration>
-  <configSections>
-    <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-      <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
-      <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
-    </sectionGroup>
-  </configSections>
-
-  <system.web.webPages.razor>
-    <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-    <pages pageBaseType="System.Web.Mvc.WebViewPage">
-      <namespaces>
-        <add namespace="System.Web.Mvc" />
-        <add namespace="System.Web.Mvc.Ajax" />
-        <add namespace="System.Web.Mvc.Html" />
-        <add namespace="System.Web.Routing" />
-
-        <add namespace="NewLife" />
-        <add namespace="NewLife.Cube" />
-        <add namespace="NewLife.Reflection" />
-        <add namespace="NewLife.Web" />
-        <add namespace="XCode" />
-        <add namespace="XCode.Membership" />
-      </namespaces>
-    </pages>
-  </system.web.webPages.razor>
-
-  <appSettings>
-    <add key="webpages:Enabled" value="false" />
-  </appSettings>
-
-  <system.web>
-    <compilation>
-      <assemblies>
-        <add assembly="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      </assemblies>
-    </compilation>
-  </system.web>
-
-  <system.webServer>
-    <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler" />
-    </handlers>
-  </system.webServer>
-</configuration>
diff --git a/NewLife.Cube/Views/_ViewStart.cshtml b/NewLife.Cube/Views/_ViewStart.cshtml
deleted file mode 100644
index 05012a8dde..0000000000
--- a/NewLife.Cube/Views/_ViewStart.cshtml
+++ /dev/null
@@ -1,3 +0,0 @@
-﻿@{
-    Layout = NewLife.Cube.Setting.Current.Layout;
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Views/_ViewStart.generated.cs b/NewLife.Cube/Views/_ViewStart.generated.cs
deleted file mode 100644
index 5a85719f1d..0000000000
--- a/NewLife.Cube/Views/_ViewStart.generated.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-﻿#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ASP
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using NewLife;
-    using NewLife.Cube;
-    using NewLife.Reflection;
-    using NewLife.Web;
-    using XCode;
-    using XCode.Membership;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Views/_ViewStart.cshtml")]
-    public partial class _Views__ViewStart_cshtml : System.Web.Mvc.ViewStartPage
-    {
-        public _Views__ViewStart_cshtml()
-        {
-        }
-        public override void Execute()
-        {
-            
-            #line 1 "..\..\Views\_ViewStart.cshtml"
-  
-    Layout = NewLife.Cube.Setting.Current.Layout;
-
-            
-            #line default
-            #line hidden
-        }
-    }
-}
-#pragma warning restore 1591
diff --git a/NewLife.Cube/Web.config b/NewLife.Cube/Web.config
deleted file mode 100644
index b1363607c9..0000000000
--- a/NewLife.Cube/Web.config
+++ /dev/null
@@ -1,106 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <sectionGroup name="system.web.webPages.razor"
-      type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-      <section name="host"
-        type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
-        requirePermission="false"/>
-      <section name="pages"
-        type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
-        requirePermission="false"/>
-    </sectionGroup>
-  </configSections>
-
-  <appSettings>
-    <add key="webpages:Version" value="3.0.0.0"/>
-    <add key="webpages:Enabled" value="false"/>
-    <add key="ClientValidationEnabled" value="true"/>
-    <add key="UnobtrusiveJavaScriptEnabled" value="true"/>
-    <add key="RouteDebugger:Enabled" value="true"/>
-  </appSettings>
-  <connectionStrings>
-    <!--<add name="Membership" connectionString="Data Source=..\Data\Membership.db;TablePrefix=school_;" providerName="Sqlite"/>-->
-    <!--<add name="Membership" connectionString="Server=.;Integrated Security=SSPI;Database=Membership" providerName="System.Data.SqlClient" />-->
-    <!--<add name="Membership" connectionString="Server=.;user id=sa;password=sa;Database=Membership" providerName="System.Data.SqlClient" />-->
-    <!--<add name="Membership" connectionString="Server=localhost;Port=3306;Database=Membership;Uid=root;Pwd=root" providerName="MySql.Data.MySqlClient"/>-->
-    <!--<add name="Membership" connectionString="Data Source=tcp://10.10.20.104/ORCL;User Id=scott;Password=tiger;" providerName="System.Data.OracleClient"/>-->
-  </connectionStrings>
-  <system.web>
-    <compilation debug="true" targetFramework="4.5"/>
-    <pages>
-      <namespaces>
-        <add namespace="System.Web.Mvc"/>
-        <add namespace="System.Web.Mvc.Ajax"/>
-        <add namespace="System.Web.Mvc.Html"/>
-        <add namespace="System.Web.Routing"/>
-        <add namespace="System.Web.WebPages"/>
-      </namespaces>
-    </pages>
-    <httpRuntime executionTimeout="15"/>
-  </system.web>
-  <system.webServer>
-    <validation validateIntegratedModeConfiguration="false"/>
-    <!--<handlers>
-      <add name="json" verb="GET,HEAD" path="*.json" type="System.Web.StaticFileHandler"/>
-      <add name="all" path="*" verb="*"  type="System.Web.HttpNotFoundHandler"/>
-    </handlers>-->
-    <httpProtocol>
-      <customHeaders>
-        <remove name="X-Powered-By"/>
-        <add name="X-Powered-By" value="NewLife.Cube http://www.NewLifeX.com"/>
-      </customHeaders>
-    </httpProtocol>
-    <staticContent>
-      <remove fileExtension=".woff"/>
-      <remove fileExtension=".woff2"/>
-      <mimeMap fileExtension=".woff" mimeType="application/x-font-woff"/>
-      <mimeMap fileExtension=".woff2" mimeType="application/x-font-woff"/>
-      <remove fileExtension=".ttf"/>
-      <mimeMap fileExtension=".ttf" mimeType="application/x-font-truetype"/>
-      <remove fileExtension=".svg"/>
-      <mimeMap fileExtension=".svg" mimeType="image/svg+xml"/>
-      <remove fileExtension=".otf"/>
-      <mimeMap fileExtension=".otf" mimeType="application/x-font-opentype"/>
-      <remove fileExtension=".eot"/>
-      <mimeMap fileExtension=".eot" mimeType="application/vnd.ms-fontobject"/>
-      <!--静态缓存使用浏览器缓存，超时时间之内不发出Http请求（F5除外）-->
-      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="240:00:00"/>
-    </staticContent>
-  </system.webServer>
-
-  <system.web.webPages.razor>
-    <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.6.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
-    <pages pageBaseType="System.Web.Mvc.WebViewPage">
-      <namespaces>
-        <add namespace="System.Web.Mvc"/>
-        <add namespace="System.Web.Mvc.Ajax"/>
-        <add namespace="System.Web.Mvc.Html"/>
-        <add namespace="System.Web.Routing"/>
-
-        <add namespace="NewLife"/>
-        <add namespace="NewLife.Cube"/>
-        <add namespace="NewLife.Reflection"/>
-        <add namespace="NewLife.Web"/>
-        <add namespace="XCode"/>
-        <add namespace="XCode.Membership"/>
-      </namespaces>
-    </pages>
-  </system.web.webPages.razor>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="1.0.0.0-5.2.6.0" newVersion="5.2.6.0"/>
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
\ No newline at end of file
diff --git a/NewLife.Cube/Web/OAuthHelper.cs b/NewLife.Cube/Web/OAuthHelper.cs
deleted file mode 100644
index 8d634849e8..0000000000
--- a/NewLife.Cube/Web/OAuthHelper.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using NewLife.Web;
-
-namespace NewLife.Cube.Web
-{
-    /// <summary>开放验证助手</summary>
-    public static class OAuthHelper
-    {
-        /// <summary>获取登录地址</summary>
-        /// <param name="name"></param>
-        /// <param name="returnUrl"></param>
-        /// <returns></returns>
-        public static String GetLoginUrl(String name, String returnUrl)
-        {
-            var url = "Sso/Login?name=" + name;
-            if (!returnUrl.IsNullOrEmpty()) url += "&r=" + HttpUtility.UrlEncode(returnUrl);
-
-            url = HttpRuntime.AppDomainAppVirtualPath + url;
-
-            return url;
-        }
-
-        /// <summary>合并Url</summary>
-        /// <param name="baseUrl"></param>
-        /// <param name="returnUrl"></param>
-        /// <returns></returns>
-        public static String GetUrl(String baseUrl, String returnUrl = null)
-        {
-            var url = baseUrl;
-
-            //if (returnUrl.IsNullOrEmpty()) returnUrl = Request["r"];
-
-            if (!returnUrl.IsNullOrEmpty())
-            {
-                if (url.Contains("?"))
-                    url += "&";
-                else
-                    url += "?";
-
-                url += "r=" + HttpUtility.UrlEncode(returnUrl);
-            }
-
-            return url;
-        }
-
-        //public static String GetRedirectUri(this HttpRequestBase req, String redirect)
-        //{
-        //    var buri = req.GetRawUrl();
-
-        //    var returnUrl = req["returnUrl"];
-        //    if (!returnUrl.IsNullOrEmpty() && returnUrl.StartsWithIgnoreCase("http"))
-        //    {
-        //        var uri = new Uri(returnUrl);
-        //        if (uri != null && uri.Host.EqualIgnoreCase(buri.Host)) returnUrl = uri.PathAndQuery;
-        //    }
-
-        //    if (!returnUrl.IsNullOrEmpty())
-        //    {
-        //        if (redirect.Contains("?"))
-        //            redirect += "&";
-        //        else
-        //            redirect += "?";
-
-        //        redirect += "returnUrl=" + HttpUtility.UrlEncode(returnUrl);
-        //    }
-
-        //    // 如果是相对路径，自动加上前缀。需要考虑反向代理的可能，不能直接使用Request.Url
-        //    if (redirect.StartsWith("~/")) redirect = HttpRuntime.AppDomainAppVirtualPath.EnsureEnd("/") + redirect.Substring(2);
-        //    if (redirect.StartsWith("/"))
-        //    {
-        //        //if (burl.IsNullOrEmpty()) throw new ArgumentNullException(nameof(BaseUrl), "使用相对跳转地址时，需要设置BaseUrl");
-        //        // 从Http请求头中取出原始主机名和端口
-        //        //var request = HttpContext.Current.Request;
-        //        //var uri = request.GetRawUrl();
-
-        //        var uri = new Uri(buri, redirect);
-        //        redirect = uri.ToString();
-        //    }
-
-        //    return redirect;
-        //}
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/Web/SsoProvider.cs b/NewLife.Cube/Web/SsoProvider.cs
deleted file mode 100644
index ad95ef2ace..0000000000
--- a/NewLife.Cube/Web/SsoProvider.cs
+++ /dev/null
@@ -1,408 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Web;
-using NewLife.Cube.Entity;
-using NewLife.Log;
-using NewLife.Model;
-using NewLife.Reflection;
-using NewLife.Security;
-using NewLife.Web;
-using XCode.Membership;
-
-namespace NewLife.Cube.Web
-{
-    /// <summary>单点登录提供者</summary>
-    public class SsoProvider
-    {
-        #region 属性
-        /// <summary>用户管理提供者</summary>
-        public IManageProvider Provider { get; set; }
-
-        /// <summary>重定向地址。~/Sso/LoginInfo</summary>
-        public String RedirectUrl { get; set; }
-
-        /// <summary>登录成功后跳转地址。~/Admin</summary>
-        public String SuccessUrl { get; set; }
-
-        /// <summary>本地登录检查地址。~/Admin/User/Login</summary>
-        public String LoginUrl { get; set; }
-
-        /// <summary>已登录用户</summary>
-        public IManageUser Current => Provider.Current;
-        #endregion
-
-        #region 构造
-        /// <summary>实例化</summary>
-        public SsoProvider()
-        {
-            Provider = ManageProvider.Provider;
-            RedirectUrl = "~/Sso/LoginInfo";
-            SuccessUrl = "~/Admin";
-            LoginUrl = "~/Admin/User/Login";
-        }
-        #endregion
-
-        #region 方法
-        /// <summary>获取OAuth客户端</summary>
-        /// <param name="name"></param>
-        /// <returns></returns>
-        public virtual OAuthClient GetClient(String name) => OAuthClient.Create(name);
-
-        /// <summary>获取返回地址</summary>
-        /// <param name="request">请求对象</param>
-        /// <param name="referr">是否使用引用</param>
-        /// <returns></returns>
-        public virtual String GetReturnUrl(HttpRequestBase request, Boolean referr)
-        {
-            var url = request["r"];
-            if (url.IsNullOrEmpty()) url = request["redirect_uri"];
-            if (url.IsNullOrEmpty() && referr) url = request.UrlReferrer + "";
-            if (!url.IsNullOrEmpty() && url.StartsWithIgnoreCase("http"))
-            {
-                var baseUri = request.GetRawUrl();
-
-                var uri = new Uri(url);
-                if (uri != null && uri.Host.EqualIgnoreCase(baseUri.Host)) url = uri.PathAndQuery;
-            }
-
-            return url;
-        }
-
-        /// <summary>获取回调地址</summary>
-        /// <param name="request"></param>
-        /// <param name="returnUrl"></param>
-        /// <returns></returns>
-        public virtual String GetRedirect(HttpRequestBase request, String returnUrl = null)
-        {
-            if (returnUrl.IsNullOrEmpty()) returnUrl = request["r"];
-            // 过滤环回重定向
-            if (!returnUrl.IsNullOrEmpty() && returnUrl.StartsWithIgnoreCase("/Sso/Login")) returnUrl = null;
-
-            var uri = RedirectUrl.AsUri(request.GetRawUrl()) + "";
-
-            return uri.AppendReturn(returnUrl);
-        }
-
-        /// <summary>登录成功</summary>
-        /// <param name="client">OAuth客户端</param>
-        /// <param name="context">服务提供者。可用于获取HttpContext成员</param>
-        /// <returns></returns>
-        public virtual String OnLogin(OAuthClient client, IServiceProvider context)
-        {
-            var openid = client.OpenID;
-            if (openid.IsNullOrEmpty()) openid = client.UserName;
-
-            // 根据OpenID找到用户绑定信息
-            var uc = UserConnect.FindByProviderAndOpenID(client.Name, openid);
-            if (uc == null) uc = new UserConnect { Provider = client.Name, OpenID = openid };
-
-            uc.Fill(client);
-
-            // 强行绑定，把第三方账号强行绑定到当前已登录账号
-            var forceBind = false;
-            var req = context.GetService<HttpRequest>();
-            if (req != null) forceBind = req["sso_action"].EqualIgnoreCase("bind");
-
-            // 检查绑定，新用户的uc.UserID为0
-            var prv = Provider;
-            var user = prv.FindByID(uc.UserID);
-            if (forceBind || user == null || !uc.Enable) user = OnBind(uc, client);
-
-            // 填充昵称等数据
-            Fill(client, user);
-
-            if (user is IAuthUser user3)
-            {
-                user3.Logins++;
-                user3.LastLogin = DateTime.Now;
-                user3.LastLoginIP = WebHelper.UserHost;
-                user3.Save();
-            }
-
-            try
-            {
-                uc.Save();
-            }
-            catch (Exception ex)
-            {
-                //为了防止某些特殊数据导致的无法正常登录，把所有异常记录到日志当中。忽略错误
-                XTrace.WriteException(ex);
-            }
-
-            if (!user.Enable) throw new InvalidOperationException("用户已禁用！");
-
-            // 登录成功，保存当前用户
-            //prv.Current = user;
-            prv.SetCurrent(user, context);
-            // 单点登录不要保存Cookie，让它在Session过期时请求认证中心
-            //prv.SaveCookie(user);
-            var set = Setting.Current;
-            if (set.SessionTimeout > 0) prv.SaveCookie(user, TimeSpan.FromSeconds(set.SessionTimeout), context);
-
-            LogProvider.Provider.WriteLog(user.GetType(), client.Name, "单点登录", user.ID, user + "", req.UserHostAddress);
-
-            return SuccessUrl;
-        }
-
-        /// <summary>填充用户，登录成功并获取用户信息之后</summary>
-        /// <param name="client"></param>
-        /// <param name="user"></param>
-        protected virtual void Fill(OAuthClient client, IManageUser user)
-        {
-            client.Fill(user);
-
-            var dic = client.Items;
-            // 用户信息
-            if (dic != null && user is UserX user2)
-            {
-                if (user2.Mail.IsNullOrEmpty() && dic.TryGetValue("email", out var email)) user2.Mail = email;
-                if (user2.Mail.IsNullOrEmpty() && dic.TryGetValue("mail", out email)) user2.Mail = email;
-                if (user2.Mobile.IsNullOrEmpty() && dic.TryGetValue("mobile", out var mobile)) user2.Mobile = mobile;
-                if (user2.Code.IsNullOrEmpty() && dic.TryGetValue("code", out var code)) user2.Code = code;
-                if (user2.Sex == SexKinds.未知 && dic.TryGetValue("sex", out var sex)) user2.Sex = (SexKinds)sex.ToInt();
-
-                // 如果默认角色为0，则使用认证中心提供的角色
-                var set = Setting.Current;
-                var rid = set.DefaultRole;
-                //if (rid == 0 && dic.TryGetValue("roleid", out var roleid) && roleid.ToInt() > 0) user2.RoleID = roleid.ToInt();
-                if (rid <= 0)
-                {
-                    // 0使用认证中心角色，-1强制使用
-                    if (user2.RoleID <= 0 || rid < 0)
-                    {
-                        user2.RoleID = GetRole(dic, rid <= -1);
-                        user2.RoleIDs = GetRoles(client.Items, rid <= -1).Join();
-                    }
-                }
-
-                // 头像
-                if (user2.Avatar.IsNullOrEmpty()) user2.Avatar = client.Avatar;
-
-                // 下载远程头像到本地，Avatar还是保存远程头像地址
-                if (user2.Avatar.StartsWithIgnoreCase("http") && !set.AvatarPath.IsNullOrEmpty()) FetchAvatar(user);
-            }
-        }
-
-        /// <summary>绑定用户，用户未有效绑定或需要强制绑定时</summary>
-        /// <param name="uc"></param>
-        /// <param name="client"></param>
-        public virtual IManageUser OnBind(UserConnect uc, OAuthClient client)
-        {
-            var prv = Provider;
-
-            // 如果未登录，需要注册一个
-            var user = prv.Current;
-            if (user == null)
-            {
-                var set = Setting.Current;
-                if (!set.AutoRegister) throw new InvalidOperationException("绑定要求本地已登录！");
-
-                // 先找用户名，如果存在，就加上提供者前缀，直接覆盖
-                var name = client.UserName;
-                if (name.IsNullOrEmpty()) name = client.NickName;
-                if (!name.IsNullOrEmpty())
-                {
-                    user = prv.FindByName(name);
-                    if (user != null && !set.ForceBindUser)
-                    {
-                        name = client.Name + "_" + name;
-                        user = prv.FindByName(name);
-                    }
-                }
-                else
-                // QQ、微信 等不返回用户名
-                {
-                    // OpenID和AccessToken不可能同时为空
-                    var openid = client.OpenID;
-                    if (openid.IsNullOrEmpty()) openid = client.AccessToken;
-
-                    // 过长，需要随机一个较短的
-                    var num = openid.GetBytes().Crc();
-
-                    name = client.Name + "_" + num.ToString("X8");
-                    user = prv.FindByName(name);
-                }
-
-                if (user == null)
-                {
-                    // 新注册用户采用魔方默认角色
-                    var rid = set.DefaultRole;
-                    //if (rid == 0 && client.Items.TryGetValue("roleid", out var roleid)) rid = roleid.ToInt();
-                    //if (rid <= 0) rid = GetRole(client.Items, rid < -1);
-
-                    // 注册用户，随机密码
-                    user = prv.Register(name, Rand.NextString(16), rid, true);
-                    //if (user is UserX user2) user2.RoleIDs = GetRoles(client.Items, rid < -2).Join();
-                }
-            }
-
-            uc.UserID = user.ID;
-            uc.Enable = true;
-
-            return user;
-        }
-
-        /// <summary>注销</summary>
-        /// <returns></returns>
-        public virtual void Logout() => Provider.Logout();
-        #endregion
-
-        #region 服务端
-        /// <summary>获取访问令牌</summary>
-        /// <param name="sso"></param>
-        /// <param name="code"></param>
-        /// <returns></returns>
-        public virtual Object GetAccessToken(OAuthServer sso, String code)
-        {
-            var token = sso.GetToken(code);
-
-            return new
-            {
-                access_token = token,
-                expires_in = sso.Expire,
-                scope = "basic,UserInfo",
-            };
-        }
-
-        /// <summary>获取用户信息</summary>
-        /// <param name="sso"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        public virtual IManageUser GetUser(OAuthServer sso, String token)
-        {
-            var username = sso.Decode(token);
-
-            var user = Provider?.FindByName(username);
-            // 两级单点登录可能因缓存造成查不到用户
-            if (user == null) user = UserX.Find(UserX._.Name == username);
-
-            return user;
-        }
-
-        /// <summary>获取用户信息</summary>
-        /// <param name="sso"></param>
-        /// <param name="token"></param>
-        /// <param name="user"></param>
-        /// <returns></returns>
-        public virtual Object GetUserInfo(OAuthServer sso, String token, IManageUser user)
-        {
-            if (user is UserX user2)
-                return new
-                {
-                    userid = user.ID,
-                    username = user.Name,
-                    nickname = user.NickName,
-                    sex = user2.Sex,
-                    mail = user2.Mail,
-                    mobile = user2.Mobile,
-                    code = user2.Code,
-                    roleid = user2.RoleID,
-                    rolename = user2.RoleName,
-                    roleids = user2.RoleIDs,
-                    rolenames = user2.Roles.Skip(1).Join(",", e => e + ""),
-                    avatar = user2.Avatar,
-                };
-            else
-                return new
-                {
-                    userid = user.ID,
-                    username = user.Name,
-                    nickname = user.NickName,
-                };
-        }
-        #endregion
-
-        #region 辅助
-        /// <summary>抓取远程头像</summary>
-        /// <param name="user"></param>
-        /// <returns></returns>
-        public virtual Boolean FetchAvatar(IManageUser user)
-        {
-            var av = user.GetValue("Avatar") as String;
-            if (av.IsNullOrEmpty()) throw new Exception("用户头像不存在 " + user);
-
-            var url = av;
-            if (!url.StartsWithIgnoreCase("http")) return false;
-
-            // 不要扩展名
-            var set = Setting.Current;
-            av = set.AvatarPath.CombinePath(user.ID + "").GetFullPath();
-
-            // 头像是否已存在
-            if (File.Exists(av)) return false;
-
-            av.EnsureDirectory(true);
-
-            try
-            {
-                var wc = new WebClientX(true, true);
-                Task.Factory.StartNew(() => wc.DownloadFileAsync(url, av)).Wait(5000);
-
-                //// 更新头像
-                //user.SetValue("Avatar", "/Sso/Avatar/" + user.ID);
-
-                return true;
-            }
-            catch (Exception ex)
-            {
-                XTrace.WriteException(ex);
-            }
-
-            return false;
-        }
-
-        private Int32 GetRole(IDictionary<String, String> dic, Boolean create)
-        {
-            // 先找RoleName，再找RoleID
-            if (dic.TryGetValue("RoleName", out var name) && !name.IsNullOrEmpty())
-            {
-                var r = Role.FindByName(name);
-                if (r != null) return r.ID;
-
-                if (create)
-                {
-                    r = new Role { Name = name };
-                    r.Insert();
-                    return r.ID;
-                }
-            }
-
-            //// 判断角色有效
-            //if (dic.TryGetValue("RoleID", out var rid) && Role.FindByID(rid.ToInt()) != null) return rid.ToInt();
-
-            return 0;
-        }
-
-        private Int32[] GetRoles(IDictionary<String, String> dic, Boolean create)
-        {
-            if (dic.TryGetValue("RoleNames", out var roleNames))
-            {
-                var names = roleNames.Split(",");
-                var rs = new List<Int32>();
-                foreach (var item in names)
-                {
-                    var r = Role.FindByName(item);
-                    if (r != null)
-                        rs.Add(r.ID);
-                    else if (create)
-                    {
-                        r = new Role { Name = item };
-                        r.Insert();
-                        rs.Add(r.ID);
-                    }
-                }
-
-                if (rs.Count > 0) return rs.ToArray();
-            }
-
-            //// 判断角色有效
-            //if (dic.TryGetValue("RoleIDs", out var rids)) return rids.SplitAsInt().Where(e => Role.FindByID(e) != null).ToArray();
-
-            return new Int32[0];
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube/favicon.ico b/NewLife.Cube/favicon.ico
deleted file mode 100644
index 10ea33cf68..0000000000
Binary files a/NewLife.Cube/favicon.ico and /dev/null differ
diff --git a/NewLife.Cube/index.html b/NewLife.Cube/index.html
deleted file mode 100644
index c01c4939da..0000000000
--- a/NewLife.Cube/index.html
+++ /dev/null
@@ -1,11 +0,0 @@
-﻿<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8" />
-    <title></title>
-    <meta http-equiv="refresh" content="0;url=/Admin">
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body>
-    <h1>正在启动系统……</h1>
-</body>
-</html>
\ No newline at end of file
diff --git a/NewLife.Cube/packages.config b/NewLife.Cube/packages.config
deleted file mode 100644
index a5db7aac1e..0000000000
--- a/NewLife.Cube/packages.config
+++ /dev/null
@@ -1,10 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.AspNet.Mvc" version="5.2.6" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Mvc.zh-Hans" version="5.2.6" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Razor" version="3.2.6" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Razor.zh-Hans" version="3.2.6" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebPages" version="3.2.6" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebPages.zh-Hans" version="3.2.6" targetFramework="net45" />
-  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
-</packages>
\ No newline at end of file
diff --git "a/NewLife.Cube/\345\217\221\345\270\203NuGet.cs" "b/NewLife.Cube/\345\217\221\345\270\203NuGet.cs"
deleted file mode 100644
index d8694f4fce..0000000000
--- "a/NewLife.Cube/\345\217\221\345\270\203NuGet.cs"
+++ /dev/null
@@ -1 +0,0 @@
-//include=..\发布NuGet.cs
\ No newline at end of file
diff --git a/NewLife.Cube4/Areas/Admin/Views/Web.config b/NewLife.Cube4/Areas/Admin/Views/Web.config
deleted file mode 100644
index 2642241235..0000000000
--- a/NewLife.Cube4/Areas/Admin/Views/Web.config
+++ /dev/null
@@ -1,48 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-
-<configuration>
-  <configSections>
-    <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-      <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
-      <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
-    </sectionGroup>
-  </configSections>
-
-  <system.web.webPages.razor>
-    <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=4.0.0.1, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-    <pages pageBaseType="System.Web.Mvc.WebViewPage">
-      <namespaces>
-        <add namespace="System.Web.Mvc" />
-        <add namespace="System.Web.Mvc.Ajax" />
-        <add namespace="System.Web.Mvc.Html" />
-        <add namespace="System.Web.Routing" />
-
-        <add namespace="NewLife" />
-        <add namespace="NewLife.Cube" />
-        <add namespace="NewLife.Reflection" />
-        <add namespace="NewLife.Web" />
-        <add namespace="XCode" />
-        <add namespace="XCode.Membership" />
-      </namespaces>
-    </pages>
-  </system.web.webPages.razor>
-
-  <appSettings>
-    <add key="webpages:Enabled" value="false" />
-  </appSettings>
-
-  <system.web>
-    <compilation>
-      <assemblies>
-        <add assembly="System.Web.Mvc, Version=4.0.0.1, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      </assemblies>
-    </compilation>
-  </system.web>
-
-  <system.webServer>
-    <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler" />
-    </handlers>
-  </system.webServer>
-</configuration>
diff --git a/NewLife.Cube4/Global.asax b/NewLife.Cube4/Global.asax
deleted file mode 100644
index 1c47d0bf1e..0000000000
--- a/NewLife.Cube4/Global.asax
+++ /dev/null
@@ -1 +0,0 @@
-﻿<%@ Application Codebehind="Global.asax.cs" Inherits="NewLife.Cube.MvcApplication" Language="C#" %>
diff --git a/NewLife.Cube4/Global.asax.cs b/NewLife.Cube4/Global.asax.cs
deleted file mode 100644
index afdb2332c1..0000000000
--- a/NewLife.Cube4/Global.asax.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-﻿using System.Web.Mvc;
-using System.Web.Routing;
-using NewLife.Log;
-
-namespace NewLife.Cube
-{
-    /// <summary>
-    /// 注意: 有关启用 IIS6 或 IIS7 经典模式的说明，
-    /// 请访问 http://go.microsoft.com/?LinkId=9394801
-    /// </summary>
-
-    public class MvcApplication : System.Web.HttpApplication
-    {
-        /// <summary>应用程序启动</summary>
-        protected void Application_Start()
-        {
-            XTrace.WriteLine("系统启动");
-
-            AreaRegistration.RegisterAllAreas();
-
-            RouteConfig.RegisterRoutes(RouteTable.Routes);
-            //BundleConfig.RegisterBundles(BundleTable.Bundles);
-
-            XTrace.WriteLine("系统启动完成");
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Cube4/NewLife.Cube40.csproj b/NewLife.Cube4/NewLife.Cube40.csproj
deleted file mode 100644
index 08bc222670..0000000000
--- a/NewLife.Cube4/NewLife.Cube40.csproj
+++ /dev/null
@@ -1,763 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>
-    </ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{7AC0E99B-CFD8-4B59-8838-503EAA30523F}</ProjectGuid>
-    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>NewLife.Cube</RootNamespace>
-    <AssemblyName>NewLife.Cube</AssemblyName>
-    <MvcBuildViews>false</MvcBuildViews>
-    <UseIISExpress>true</UseIISExpress>
-    <IISExpressSSLPort />
-    <IISExpressAnonymousAuthentication />
-    <IISExpressWindowsAuthentication />
-    <IISExpressUseClassicPipelineMode />
-    <MvcProjectUpgradeChecked>true</MvcProjectUpgradeChecked>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>15.0</OldToolsVersion>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>Bin\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NET4</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>Bin\NewLife.Cube.XML</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>Bin\</OutputPath>
-    <DefineConstants>TRACE;NET4</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DocumentationFile>Bin\NewLife.Cube.XML</DocumentationFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Web.ApplicationServices" />
-    <Reference Include="System.Web.DynamicData" />
-    <Reference Include="System.Web.Entity" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.Helpers.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Mvc, Version=4.0.0.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.Mvc.4.0.40804.0\lib\net40\System.Web.Mvc.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.Razor.2.0.30506.0\lib\net40\System.Web.Razor.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Routing" />
-    <Reference Include="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages.Deployment, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Web.Services" />
-    <Reference Include="System.Xml.Linq" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\NewLife.Cube\App_Start\RouteConfig.cs">
-      <Link>App_Start\RouteConfig.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\AdminAreaRegistration.cs">
-      <Link>Areas\Admin\AdminAreaRegistration.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Controllers\CoreController.cs">
-      <Link>Areas\Admin\Controllers\CoreController.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Controllers\CubeController.cs">
-      <Link>Areas\Admin\Controllers\CubeController.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Controllers\DbController.cs">
-      <Link>Areas\Admin\Controllers\DbController.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Controllers\FileController.cs">
-      <Link>Areas\Admin\Controllers\FileController.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Controllers\LogController.cs">
-      <Link>Areas\Admin\Controllers\LogController.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Controllers\MenuController.cs">
-      <Link>Areas\Admin\Controllers\MenuController.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Controllers\RoleController.cs">
-      <Link>Areas\Admin\Controllers\RoleController.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Controllers\SysController.cs">
-      <Link>Areas\Admin\Controllers\SysController.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Controllers\UserConnectController.cs">
-      <Link>Areas\Admin\Controllers\UserConnectController.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Controllers\UserController.cs">
-      <Link>Areas\Admin\Controllers\UserController.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Controllers\UserOnlineController.cs">
-      <Link>Areas\Admin\Controllers\UserOnlineController.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Controllers\UserTokenController.cs">
-      <Link>Areas\Admin\Controllers\UserTokenController.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Controllers\VisitStatController.cs">
-      <Link>Areas\Admin\Controllers\VisitStatController.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Controllers\XCodeController.cs">
-      <Link>Areas\Admin\Controllers\XCodeController.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Index\IndexController.cs">
-      <Link>Areas\Admin\Index\IndexController.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Models\DbItem.cs">
-      <Link>Areas\Admin\Models\DbItem.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Models\FileItem.cs">
-      <Link>Areas\Admin\Models\FileItem.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Views\Db\Index.generated.cs">
-      <Link>Areas\Admin\Views\Db\Index.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Views\File\Index.generated.cs">
-      <Link>Areas\Admin\Views\File\Index.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Views\Index\Assembly.generated.cs">
-      <Link>Areas\Admin\Views\Index\Assembly.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Views\Index\Cache.generated.cs">
-      <Link>Areas\Admin\Views\Index\Cache.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Views\Index\Index.generated.cs">
-      <Link>Areas\Admin\Views\Index\Index.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Views\Index\Main.generated.cs">
-      <Link>Areas\Admin\Views\Index\Main.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Views\Index\ProcessModules.generated.cs">
-      <Link>Areas\Admin\Views\Index\ProcessModules.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Views\Index\ServerVar.generated.cs">
-      <Link>Areas\Admin\Views\Index\ServerVar.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Views\Index\Session.generated.cs">
-      <Link>Areas\Admin\Views\Index\Session.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Views\Index\_Left.generated.cs">
-      <Link>Areas\Admin\Views\Index\_Left.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Views\Index\_Left_Item.generated.cs">
-      <Link>Areas\Admin\Views\Index\_Left_Item.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Views\Index\_Navbar.generated.cs">
-      <Link>Areas\Admin\Views\Index\_Navbar.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Views\Log\_List_Data.generated.cs">
-      <Link>Areas\Admin\Views\Log\_List_Data.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Views\Log\_List_Search.generated.cs">
-      <Link>Areas\Admin\Views\Log\_List_Search.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Views\Menu\_ListTree_Data.generated.cs">
-      <Link>Areas\Admin\Views\Menu\_ListTree_Data.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Views\Role\SetPermission.generated.cs">
-      <Link>Areas\Admin\Views\Role\SetPermission.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Views\Role\_Form_Group.generated.cs">
-      <Link>Areas\Admin\Views\Role\_Form_Group.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Views\Role\_List_Data.generated.cs">
-      <Link>Areas\Admin\Views\Role\_List_Data.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Views\Shared\_Object_Nav.generated.cs">
-      <Link>Areas\Admin\Views\Shared\_Object_Nav.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Views\UserOnline\_List_Data.generated.cs">
-      <Link>Areas\Admin\Views\UserOnline\_List_Data.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Views\UserToken\_List_Data.generated.cs">
-      <Link>Areas\Admin\Views\UserToken\_List_Data.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Views\User\Info.generated.cs">
-      <Link>Areas\Admin\Views\User\Info.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Views\User\Login.generated.cs">
-      <Link>Areas\Admin\Views\User\Login.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Views\User\_Form_Action.generated.cs">
-      <Link>Areas\Admin\Views\User\_Form_Action.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Views\User\_List_Data.generated.cs">
-      <Link>Areas\Admin\Views\User\_List_Data.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Views\User\_List_Search.generated.cs">
-      <Link>Areas\Admin\Views\User\_List_Search.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Views\User\_List_Toolbar_Batch.generated.cs">
-      <Link>Areas\Admin\Views\User\_List_Toolbar_Batch.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Views\User\_Login_Forgot.generated.cs">
-      <Link>Areas\Admin\Views\User\_Login_Forgot.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Views\User\_Login_Login.generated.cs">
-      <Link>Areas\Admin\Views\User\_Login_Login.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Views\User\_Login_Login3.generated.cs">
-      <Link>Areas\Admin\Views\User\_Login_Login3.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Views\User\_Login_Register.generated.cs">
-      <Link>Areas\Admin\Views\User\_Login_Register.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Views\VisitStat\_List_Data.generated.cs">
-      <Link>Areas\Admin\Views\VisitStat\_List_Data.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Views\VisitStat\_List_Search.generated.cs">
-      <Link>Areas\Admin\Views\VisitStat\_List_Search.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Areas\Admin\Views\_ViewStart.generated.cs">
-      <Link>Areas\Admin\Views\_ViewStart.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Common\AreaRegistrationBase.cs">
-      <Link>Common\AreaRegistrationBase.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Common\BootstrapJs.cs">
-      <Link>Common\BootstrapJs.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Common\ConfigController.cs">
-      <Link>Common\ConfigController.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Common\ControllerBaseX.cs">
-      <Link>Common\ControllerBaseX.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Common\ControllerHelper.cs">
-      <Link>Common\ControllerHelper.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Common\DbRunTimeModule.cs">
-      <Link>Common\DbRunTimeModule.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Common\EntityAuthorizeAttribute.cs">
-      <Link>Common\EntityAuthorizeAttribute.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Common\EntityController.cs">
-      <Link>Common\EntityController.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Common\EntityModelBinder.cs">
-      <Link>Common\EntityModelBinder.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Common\EntityTreeController.cs">
-      <Link>Common\EntityTreeController.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Common\FieldCollection.cs">
-      <Link>Common\FieldCollection.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Common\HtmlExtensions.cs">
-      <Link>Common\HtmlExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Common\MembershipExtensions.cs">
-      <Link>Common\MembershipExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Common\MvcHandleErrorAttribute.cs">
-      <Link>Common\MvcHandleErrorAttribute.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Common\NoPermissionException.cs">
-      <Link>Common\NoPermissionException.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Common\ObjectController.cs">
-      <Link>Common\ObjectController.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Common\RazorViewEngineX.cs">
-      <Link>Common\RazorViewEngineX.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Common\ViewHelper.cs">
-      <Link>Common\ViewHelper.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Common\WeuiJS.cs">
-      <Link>Common\WeuiJS.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Controllers\HomeController.cs">
-      <Link>Controllers\HomeController.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Controllers\SsoController.cs">
-      <Link>Controllers\SsoController.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Entity\XCoder.cs">
-      <Link>Entity\XCoder.cs</Link>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>XCoder.tt</DependentUpon>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Entity\用户令牌.Biz.cs">
-      <Link>Entity\用户令牌.Biz.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Entity\用户令牌.cs">
-      <Link>Entity\用户令牌.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Entity\用户链接.Biz.cs">
-      <Link>Entity\用户链接.Biz.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Entity\用户链接.cs">
-      <Link>Entity\用户链接.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\PreApplicationStartCode.cs">
-      <Link>PreApplicationStartCode.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Precompiled\AssemblyExtensions.cs">
-      <Link>Precompiled\AssemblyExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Precompiled\CompositePrecompiledMvcEngine.cs">
-      <Link>Precompiled\CompositePrecompiledMvcEngine.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Precompiled\FrontendController.cs">
-      <Link>Precompiled\FrontendController.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Precompiled\Pages.cs">
-      <Link>Precompiled\Pages.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Precompiled\PrecompiledMvcEngine.cs">
-      <Link>Precompiled\PrecompiledMvcEngine.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Precompiled\PrecompiledMvcView.cs">
-      <Link>Precompiled\PrecompiledMvcView.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Precompiled\PrecompiledViewAssembly.cs">
-      <Link>Precompiled\PrecompiledViewAssembly.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Precompiled\PrecompiledViewLocationCache.cs">
-      <Link>Precompiled\PrecompiledViewLocationCache.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Precompiled\ViewCacheDependency.cs">
-      <Link>Precompiled\ViewCacheDependency.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Precompiled\ViewCacheDependencyManager.cs">
-      <Link>Precompiled\ViewCacheDependencyManager.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Precompiled\ViewFile.cs">
-      <Link>Precompiled\ViewFile.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Precompiled\ViewPathProvider.cs">
-      <Link>Precompiled\ViewPathProvider.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Properties\AssemblyInfo.cs">
-      <Link>Properties\AssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Setting.cs">
-      <Link>Setting.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Views\CubeHome\Index.generated.cs">
-      <Link>Views\CubeHome\Index.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Views\Home\Index.generated.cs">
-      <Link>Views\Home\Index.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Views\Shared\CubeError.generated.cs">
-      <Link>Views\Shared\CubeError.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Views\Shared\Form.generated.cs">
-      <Link>Views\Shared\Form.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Views\Shared\List.generated.cs">
-      <Link>Views\Shared\List.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Views\Shared\ListTree.generated.cs">
-      <Link>Views\Shared\ListTree.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Views\Shared\NoPermission.generated.cs">
-      <Link>Views\Shared\NoPermission.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Views\Shared\ObjectForm.generated.cs">
-      <Link>Views\Shared\ObjectForm.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Views\Shared\_Ace_Layout.generated.cs">
-      <Link>Views\Shared\_Ace_Layout.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Views\Shared\_Ace_Layout_Nav.generated.cs">
-      <Link>Views\Shared\_Ace_Layout_Nav.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Views\Shared\_DateRange.generated.cs">
-      <Link>Views\Shared\_DateRange.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Views\Shared\_Form_Action.generated.cs">
-      <Link>Views\Shared\_Form_Action.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Views\Shared\_Form_Footer.generated.cs">
-      <Link>Views\Shared\_Form_Footer.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Views\Shared\_Form_Group.generated.cs">
-      <Link>Views\Shared\_Form_Group.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Views\Shared\_Form_Header.generated.cs">
-      <Link>Views\Shared\_Form_Header.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Views\Shared\_Form_Item.generated.cs">
-      <Link>Views\Shared\_Form_Item.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Views\Shared\_Layout.generated.cs">
-      <Link>Views\Shared\_Layout.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Views\Shared\_Layout_Footer.generated.cs">
-      <Link>Views\Shared\_Layout_Footer.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Views\Shared\_Layout_Header.generated.cs">
-      <Link>Views\Shared\_Layout_Header.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Views\Shared\_ListTree_Data.generated.cs">
-      <Link>Views\Shared\_ListTree_Data.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Views\Shared\_List_Data.generated.cs">
-      <Link>Views\Shared\_List_Data.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Views\Shared\_List_Data_Action.generated.cs">
-      <Link>Views\Shared\_List_Data_Action.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Views\Shared\_List_Data_Item.generated.cs">
-      <Link>Views\Shared\_List_Data_Item.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Views\Shared\_List_Data_Item_First.generated.cs">
-      <Link>Views\Shared\_List_Data_Item_First.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Views\Shared\_List_Pager.generated.cs">
-      <Link>Views\Shared\_List_Pager.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Views\Shared\_List_Pager1.generated.cs">
-      <Link>Views\Shared\_List_Pager1.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Views\Shared\_List_Search.generated.cs">
-      <Link>Views\Shared\_List_Search.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Views\Shared\_List_Toolbar.generated.cs">
-      <Link>Views\Shared\_List_Toolbar.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Views\Shared\_List_Toolbar_Adv.generated.cs">
-      <Link>Views\Shared\_List_Toolbar_Adv.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Views\Shared\_List_Toolbar_Batch.generated.cs">
-      <Link>Views\Shared\_List_Toolbar_Batch.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Views\Shared\_List_Toolbar_Search.generated.cs">
-      <Link>Views\Shared\_List_Toolbar_Search.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Views\Shared\_LoginPartial.generated.cs">
-      <Link>Views\Shared\_LoginPartial.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Views\Shared\_Object_Nav.generated.cs">
-      <Link>Views\Shared\_Object_Nav.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Views\_ViewStart.generated.cs">
-      <Link>Views\_ViewStart.generated.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Web\OAuthHelper.cs">
-      <Link>Web\OAuthHelper.cs</Link>
-    </Compile>
-    <Compile Include="..\NewLife.Cube\Web\SsoProvider.cs">
-      <Link>Web\SsoProvider.cs</Link>
-    </Compile>
-    <Compile Include="Global.asax.cs">
-      <DependentUpon>Global.asax</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="..\NewLife.Cube\Areas\Admin\Views\Db\Index.cshtml">
-      <Link>Areas\Admin\Views\Db\Index.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Areas\Admin\Views\File\Index.cshtml">
-      <Link>Areas\Admin\Views\File\Index.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Areas\Admin\Views\Index\Index.cshtml">
-      <Link>Areas\Admin\Views\Index\Index.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Areas\Admin\Views\Index\Main.cshtml">
-      <Link>Areas\Admin\Views\Index\Main.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Areas\Admin\Views\Index\_Left.cshtml">
-      <Link>Areas\Admin\Views\Index\_Left.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Areas\Admin\Views\Index\_Left_Item.cshtml">
-      <Link>Areas\Admin\Views\Index\_Left_Item.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Areas\Admin\Views\Index\_Navbar.cshtml">
-      <Link>Areas\Admin\Views\Index\_Navbar.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Areas\Admin\Views\Log\_List_Search.cshtml">
-      <Link>Areas\Admin\Views\Log\_List_Search.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Areas\Admin\Views\Role\SetPermission.cshtml">
-      <Link>Areas\Admin\Views\Role\SetPermission.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Areas\Admin\Views\Role\_Form_Group.cshtml">
-      <Link>Areas\Admin\Views\Role\_Form_Group.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Entity\Cube.xml">
-      <Link>Entity\Cube.xml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Entity\XCoder.tt">
-      <Link>Entity\XCoder.tt</Link>
-      <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>XCoder.cs</LastGenOutput>
-    </Content>
-    <Content Include="favicon.ico" />
-    <Content Include="..\NewLife.Cube\Areas\Admin\Views\User\Info.cshtml">
-      <Link>Areas\Admin\Views\User\Info.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Areas\Admin\Views\User\Login.cshtml">
-      <Link>Areas\Admin\Views\User\Login.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Areas\Admin\Views\User\_Form_Action.cshtml">
-      <Link>Areas\Admin\Views\User\_Form_Action.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Areas\Admin\Views\User\_List_Search.cshtml">
-      <Link>Areas\Admin\Views\User\_List_Search.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Areas\Admin\Views\User\_Login_Forgot.cshtml">
-      <Link>Areas\Admin\Views\User\_Login_Forgot.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Areas\Admin\Views\User\_Login_Login.cshtml">
-      <Link>Areas\Admin\Views\User\_Login_Login.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Areas\Admin\Views\User\_Login_Register.cshtml">
-      <Link>Areas\Admin\Views\User\_Login_Register.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Areas\Admin\Views\_ViewStart.cshtml">
-      <Link>Areas\Admin\Views\_ViewStart.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Views\CubeHome\Index.cshtml">
-      <Link>Views\CubeHome\Index.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Views\Home\Index.cshtml">
-      <Link>Views\Home\Index.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Views\Shared\CubeError.cshtml">
-      <Link>Views\Shared\CubeError.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Views\Shared\Form.cshtml">
-      <Link>Views\Shared\Form.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Views\Shared\List.cshtml">
-      <Link>Views\Shared\List.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Views\Shared\ListTree.cshtml">
-      <Link>Views\Shared\ListTree.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Views\Shared\NoPermission.cshtml">
-      <Link>Views\Shared\NoPermission.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Views\Shared\ObjectForm.cshtml">
-      <Link>Views\Shared\ObjectForm.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Views\Shared\_Ace_Layout.cshtml">
-      <Link>Views\Shared\_Ace_Layout.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Views\Shared\_Ace_Layout_Nav.cshtml">
-      <Link>Views\Shared\_Ace_Layout_Nav.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Views\Shared\_DateRange.cshtml">
-      <Link>Views\Shared\_DateRange.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Views\Shared\_Form_Action.cshtml">
-      <Link>Views\Shared\_Form_Action.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Views\Shared\_Form_Footer.cshtml">
-      <Link>Views\Shared\_Form_Footer.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Views\Shared\_Form_Group.cshtml">
-      <Link>Views\Shared\_Form_Group.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Views\Shared\_Form_Header.cshtml">
-      <Link>Views\Shared\_Form_Header.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Views\Shared\_Form_Item.cshtml">
-      <Link>Views\Shared\_Form_Item.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Views\Shared\_Layout.cshtml">
-      <Link>Views\Shared\_Layout.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Views\Shared\_Layout_Footer.cshtml">
-      <Link>Views\Shared\_Layout_Footer.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Views\Shared\_Layout_Header.cshtml">
-      <Link>Views\Shared\_Layout_Header.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Views\Shared\_ListTree_Data.cshtml">
-      <Link>Views\Shared\_ListTree_Data.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Views\Shared\_List_Data.cshtml">
-      <Link>Views\Shared\_List_Data.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Views\Shared\_List_Data_Action.cshtml">
-      <Link>Views\Shared\_List_Data_Action.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Views\Shared\_List_Data_Item.cshtml">
-      <Link>Views\Shared\_List_Data_Item.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Views\Shared\_List_Pager.cshtml">
-      <Link>Views\Shared\_List_Pager.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Views\Shared\_List_Pager1.cshtml">
-      <Link>Views\Shared\_List_Pager1.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Views\Shared\_List_Search.cshtml">
-      <Link>Views\Shared\_List_Search.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Views\Shared\_List_Toolbar.cshtml">
-      <Link>Views\Shared\_List_Toolbar.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Views\Shared\_List_Toolbar_Adv.cshtml">
-      <Link>Views\Shared\_List_Toolbar_Adv.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Views\Shared\_List_Toolbar_Search.cshtml">
-      <Link>Views\Shared\_List_Toolbar_Search.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Views\Shared\_LoginPartial.cshtml">
-      <Link>Views\Shared\_LoginPartial.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Views\_ViewStart.cshtml">
-      <Link>Views\_ViewStart.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Areas\Admin\Views\User\_List_Data.cshtml">
-      <Link>Areas\Admin\Views\User\_List_Data.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Areas\Admin\Views\User\_List_Toolbar_Batch.cshtml">
-      <Link>Areas\Admin\Views\User\_List_Toolbar_Batch.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Areas\Admin\Views\User\_Login_Login3.cshtml">
-      <Link>Areas\Admin\Views\User\_Login_Login3.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Areas\Admin\Views\Index\Assembly.cshtml">
-      <Link>Areas\Admin\Views\Index\Assembly.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Areas\Admin\Views\Index\Cache.cshtml">
-      <Link>Areas\Admin\Views\Index\Cache.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Areas\Admin\Views\Index\ProcessModules.cshtml">
-      <Link>Areas\Admin\Views\Index\ProcessModules.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Areas\Admin\Views\Index\ServerVar.cshtml">
-      <Link>Areas\Admin\Views\Index\ServerVar.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Areas\Admin\Views\Index\Session.cshtml">
-      <Link>Areas\Admin\Views\Index\Session.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Areas\Admin\Views\Log\_List_Data.cshtml">
-      <Link>Areas\Admin\Views\Log\_List_Data.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Areas\Admin\Views\Menu\_ListTree_Data.cshtml">
-      <Link>Areas\Admin\Views\Menu\_ListTree_Data.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Areas\Admin\Views\Role\_List_Data.cshtml">
-      <Link>Areas\Admin\Views\Role\_List_Data.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Areas\Admin\Views\Shared\_Object_Nav.cshtml">
-      <Link>Areas\Admin\Views\Shared\_Object_Nav.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Areas\Admin\Views\UserOnline\_List_Data.cshtml">
-      <Link>Areas\Admin\Views\UserOnline\_List_Data.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Areas\Admin\Views\UserToken\_List_Data.cshtml">
-      <Link>Areas\Admin\Views\UserToken\_List_Data.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Areas\Admin\Views\VisitStat\_List_Data.cshtml">
-      <Link>Areas\Admin\Views\VisitStat\_List_Data.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Areas\Admin\Views\VisitStat\_List_Search.cshtml">
-      <Link>Areas\Admin\Views\VisitStat\_List_Search.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Views\Shared\_List_Data_Item_First.cshtml">
-      <Link>Views\Shared\_List_Data_Item_First.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Views\Shared\_List_Toolbar_Batch.cshtml">
-      <Link>Views\Shared\_List_Toolbar_Batch.cshtml</Link>
-    </Content>
-    <Content Include="..\NewLife.Cube\Views\Shared\_Object_Nav.cshtml">
-      <Link>Views\Shared\_Object_Nav.cshtml</Link>
-    </Content>
-    <None Include="Global.asax" />
-    <None Include="Areas\Admin\Views\Web.config" />
-    <None Include="Properties\PublishProfiles\Cube.pubxml" />
-    <Content Include="Web.config">
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Include="Web.Debug.config">
-      <DependentUpon>Web.config</DependentUpon>
-    </Content>
-    <Content Include="Web.Release.config">
-      <DependentUpon>Web.config</DependentUpon>
-    </Content>
-    <EmbeddedResource Include="Views\Web.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\NewLife.Core\NewLife.Core40.csproj">
-      <Project>{5813c22e-eeb3-4dee-a45c-bb218041193a}</Project>
-      <Name>NewLife.Core40</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\XCode\XCode40.csproj">
-      <Project>{b49aba5a-c5da-45f4-87f1-b435ec51d710}</Project>
-      <Name>XCode40</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
-  </ItemGroup>
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v12.0</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="'$(Solutions.VSVersion)' == '8.0'" />
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.targets" Condition="'$(Solutions.VSVersion)' == '9.0'" />
-  <Target Name="MvcBuildViews" AfterTargets="AfterBuild" Condition="'$(MvcBuildViews)'=='true'">
-    <AspNetCompiler VirtualPath="temp" PhysicalPath="$(WebProjectOutputDir)" />
-  </Target>
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <SaveServerSettingsInUserFile>True</SaveServerSettingsInUserFile>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
-  <PropertyGroup>
-  </PropertyGroup>
-  <PropertyGroup>
-    <PostBuildEvent>
-      md "$(ProjectDir)..\..\Bin4"
-      copy "$(TargetDir)$(TargetName)".* "$(ProjectDir)..\..\Bin4\" /y
-      del "$(ProjectDir)..\..\Bin4\NewLife.Cube.dll.config" /q
-</PostBuildEvent>
-  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target> -->
-</Project>
\ No newline at end of file
diff --git a/NewLife.Cube4/Properties/PublishProfiles/Cube.pubxml b/NewLife.Cube4/Properties/PublishProfiles/Cube.pubxml
deleted file mode 100644
index 8840e5d7e7..0000000000
--- a/NewLife.Cube4/Properties/PublishProfiles/Cube.pubxml
+++ /dev/null
@@ -1,24 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<!--
-您 Web 项目的发布/打包进程将使用此文件。您可以通过编辑此 MSBuild 文件
-来自定义该进程的行为。若要了解与此相关的详细信息，请访问 http://go.microsoft.com/fwlink/?LinkID=208121。
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <WebPublishMethod>FileSystem</WebPublishMethod>
-    <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
-    <LastUsedPlatform>Any CPU</LastUsedPlatform>
-    <SiteUrlToLaunchAfterPublish />
-    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
-    <ExcludeApp_Data>True</ExcludeApp_Data>
-    <publishUrl>..\..\NewLife.Cube</publishUrl>
-    <DeleteExistingFiles>True</DeleteExistingFiles>
-    <PrecompileBeforePublish>True</PrecompileBeforePublish>
-    <EnableUpdateable>False</EnableUpdateable>
-    <DebugSymbols>False</DebugSymbols>
-    <WDPMergeOption>MergeAllOutputsToASingleAssembly</WDPMergeOption>
-    <UseMerge>True</UseMerge>
-    <SingleAssemblyName>Cube</SingleAssemblyName>
-    <DeleteAppCodeCompiledFiles>True</DeleteAppCodeCompiledFiles>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/NewLife.Cube4/Views/Web.config b/NewLife.Cube4/Views/Web.config
deleted file mode 100644
index 2642241235..0000000000
--- a/NewLife.Cube4/Views/Web.config
+++ /dev/null
@@ -1,48 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-
-<configuration>
-  <configSections>
-    <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-      <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
-      <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
-    </sectionGroup>
-  </configSections>
-
-  <system.web.webPages.razor>
-    <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=4.0.0.1, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-    <pages pageBaseType="System.Web.Mvc.WebViewPage">
-      <namespaces>
-        <add namespace="System.Web.Mvc" />
-        <add namespace="System.Web.Mvc.Ajax" />
-        <add namespace="System.Web.Mvc.Html" />
-        <add namespace="System.Web.Routing" />
-
-        <add namespace="NewLife" />
-        <add namespace="NewLife.Cube" />
-        <add namespace="NewLife.Reflection" />
-        <add namespace="NewLife.Web" />
-        <add namespace="XCode" />
-        <add namespace="XCode.Membership" />
-      </namespaces>
-    </pages>
-  </system.web.webPages.razor>
-
-  <appSettings>
-    <add key="webpages:Enabled" value="false" />
-  </appSettings>
-
-  <system.web>
-    <compilation>
-      <assemblies>
-        <add assembly="System.Web.Mvc, Version=4.0.0.1, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      </assemblies>
-    </compilation>
-  </system.web>
-
-  <system.webServer>
-    <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler" />
-    </handlers>
-  </system.webServer>
-</configuration>
diff --git a/NewLife.Cube4/Web.Debug.config b/NewLife.Cube4/Web.Debug.config
deleted file mode 100644
index 2b5d97561e..0000000000
--- a/NewLife.Cube4/Web.Debug.config
+++ /dev/null
@@ -1,30 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-
-<!-- 有关使用 web.config 转换的详细信息，请访问 http://go.microsoft.com/fwlink/?LinkId=125889 -->
-
-<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <!--
-    在下例中，“SetAttributes”转换将更改 
-    “connectionString”的值，仅在“Match”定位器 
-    查找到值为“MyDB”的特性“name”时使用“ReleaseSQLServer”。
-    
-    <connectionStrings>
-      <add name="MyDB" 
-        connectionString="Data Source=ReleaseSQLServer;Initial Catalog=MyReleaseDB;Integrated Security=True" 
-        xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
-    </connectionStrings>
-  -->
-  <system.web>
-    <!--
-      在下例中，“Replace”转换将替换 
-       Web.config 文件的整个 <customErrors> 节。
-      请注意，由于 
-      在 <system.web> 节点下仅有一个 customErrors 节，因此不需要使用“xdt:Locator”特性。
-      
-      <customErrors defaultRedirect="GenericError.htm"
-        mode="RemoteOnly" xdt:Transform="Replace">
-        <error statusCode="500" redirect="InternalError.htm"/>
-      </customErrors>
-    -->
-  </system.web>
-</configuration>
\ No newline at end of file
diff --git a/NewLife.Cube4/Web.Release.config b/NewLife.Cube4/Web.Release.config
deleted file mode 100644
index a756111fbb..0000000000
--- a/NewLife.Cube4/Web.Release.config
+++ /dev/null
@@ -1,31 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-
-<!-- 有关使用 web.config 转换的详细信息，请访问 http://go.microsoft.com/fwlink/?LinkId=125889 -->
-
-<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <!--
-    在下例中，“SetAttributes”转换将更改 
-    “connectionString”的值，仅在“Match”定位器 
-    查找到值为“MyDB”的特性“name”时使用“ReleaseSQLServer”。
-    
-    <connectionStrings>
-      <add name="MyDB" 
-        connectionString="Data Source=ReleaseSQLServer;Initial Catalog=MyReleaseDB;Integrated Security=True" 
-        xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
-    </connectionStrings>
-  -->
-  <system.web>
-    <compilation xdt:Transform="RemoveAttributes(debug)" />
-    <!--
-      在下例中，“Replace”转换将替换 
-       Web.config 文件的整个 <customErrors> 节。
-      请注意，由于 
-      在 <system.web> 节点下仅有一个 customErrors 节，因此不需要使用“xdt:Locator”特性。
-      
-      <customErrors defaultRedirect="GenericError.htm"
-        mode="RemoteOnly" xdt:Transform="Replace">
-        <error statusCode="500" redirect="InternalError.htm"/>
-      </customErrors>
-    -->
-  </system.web>
-</configuration>
\ No newline at end of file
diff --git a/NewLife.Cube4/Web.config b/NewLife.Cube4/Web.config
deleted file mode 100644
index 0228b159f6..0000000000
--- a/NewLife.Cube4/Web.config
+++ /dev/null
@@ -1,63 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <appSettings>
-    <add key="webpages:Version" value="2.0.0.0" />
-    <add key="webpages:Enabled" value="false" />
-    <add key="ClientValidationEnabled" value="true" />
-    <add key="UnobtrusiveJavaScriptEnabled" value="true" />
-  </appSettings>
-  <connectionStrings>
-    <!--<add name="Membership" connectionString="Data Source=~\App_Data\Membership.db" providerName="Sqlite"/>-->
-    <!--<add name="Membership" connectionString="Server=.;Integrated Security=SSPI;Database=Membership" providerName="System.Data.SqlClient" />-->
-    <!--<add name="Membership" connectionString="Server=.;user id=sa;password=sa;Database=Membership" providerName="System.Data.SqlClient" />-->
-    <!--<add name="Membership" connectionString="Server=10.10.4.192;Port=3306;Database=Membership;Uid=root;Pwd=Pass@word;Migration=On" providerName="MySql.Data.MySqlClient"/>-->
-    <!--<add name="Membership" connectionString="Data Source=tcp://10.10.20.104/ORCL;User Id=scott;Password=tiger;" providerName="System.Data.OracleClient"/>-->
-  </connectionStrings>
-  <system.web>
-    <compilation debug="true" targetFramework="4.0" />
-    <authentication mode="Forms">
-      <forms loginUrl="~/Admin/User/Login" timeout="2880" />
-    </authentication>
-    <pages>
-      <namespaces>
-        <add namespace="System.Web.Mvc" />
-        <add namespace="System.Web.Mvc.Ajax" />
-        <add namespace="System.Web.Mvc.Html" />
-        <add namespace="System.Web.Routing" />
-        <add namespace="System.Web.WebPages" />
-      </namespaces>
-    </pages>
-    <httpRuntime executionTimeout="15" />
-  </system.web>
-  <system.webServer>
-    <validation validateIntegratedModeConfiguration="false" />
-    <modules runAllManagedModulesForAllRequests="true">
-      <!--全局错误处理模块-->
-      <add name="ErrorModule" type="NewLife.Web.ErrorModule,NewLife.Core"/>
-      <!--页面执行时间模块，用于在页面中输出页面执行时间和查询执行次数-->
-      <add name="DbRunTimeModule" type="NewLife.Cube.DbRunTimeModule,NewLife.Cube"/>
-    </modules>
-    <httpProtocol>
-      <customHeaders>
-        <remove name="X-Powered-By" />
-        <add name="X-Powered-By" value="NewLife.Cube http://www.NewLifeX.com" />
-      </customHeaders>
-    </httpProtocol>
-    <!--静态缓存使用浏览器缓存，超时时间之内不发出Http请求（F5除外）-->
-    <staticContent>
-      <remove fileExtension=".woff" />
-      <remove fileExtension=".woff2" />
-      <mimeMap fileExtension=".woff" mimeType="application/x-font-woff" />
-      <mimeMap fileExtension=".woff2" mimeType="application/x-font-woff" />
-      <remove fileExtension=".ttf" />
-      <mimeMap fileExtension=".ttf" mimeType="application/x-font-truetype" />
-      <remove fileExtension=".svg" />
-      <mimeMap fileExtension=".svg" mimeType="image/svg+xml" />
-      <remove fileExtension=".otf" />
-      <mimeMap fileExtension=".otf" mimeType="application/x-font-opentype" />
-      <remove fileExtension=".eot" />
-      <mimeMap fileExtension=".eot" mimeType="application/vnd.ms-fontobject" />
-      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="240:00:00" />
-    </staticContent>
-  </system.webServer>
-</configuration>
\ No newline at end of file
diff --git a/NewLife.Cube4/favicon.ico b/NewLife.Cube4/favicon.ico
deleted file mode 100644
index 10ea33cf68..0000000000
Binary files a/NewLife.Cube4/favicon.ico and /dev/null differ
diff --git a/NewLife.Cube4/packages.config b/NewLife.Cube4/packages.config
deleted file mode 100644
index f7534b296e..0000000000
--- a/NewLife.Cube4/packages.config
+++ /dev/null
@@ -1,9 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.AspNet.Mvc" version="4.0.40804.0" targetFramework="net40" />
-  <package id="Microsoft.AspNet.Razor" version="2.0.30506.0" targetFramework="net40" />
-  <package id="Microsoft.AspNet.Razor.zh-Hans" version="2.0.30506.0" targetFramework="net40" />
-  <package id="Microsoft.AspNet.WebPages" version="2.0.30506.0" targetFramework="net40" />
-  <package id="Microsoft.AspNet.WebPages.zh-Hans" version="2.0.30506.0" targetFramework="net40" />
-  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
-</packages>
\ No newline at end of file
diff --git a/NewLife.Net/App.config b/NewLife.Net/App.config
deleted file mode 100644
index 75f95eadcc..0000000000
--- a/NewLife.Net/App.config
+++ /dev/null
@@ -1,21 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <appSettings>
-    <!--网络配置-->
-    <!--是否启用网络调试。默认为不启用-->
-    <add key="NewLife.Net.Debug" value="true" />
-    <!--是否缓存网关。缓存网关可以加速UPnP的发现过程-->
-    <add key="NewLife.Net.UPnP.CacheGateway" value="true" />
-    <!--StunClient使用的服务器，优先于内置服务器使用-->
-    <add key="NewLife.Net.StunServers" value="" />
-  </appSettings>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" /></startup>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.2.29.0" newVersion="2.2.29.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
diff --git a/NewLife.Net/Application/AppTest.cs b/NewLife.Net/Application/AppTest.cs
deleted file mode 100644
index 17eb3cc7ba..0000000000
--- a/NewLife.Net/Application/AppTest.cs
+++ /dev/null
@@ -1,395 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Net;
-using System.Net.Sockets;
-using System.Threading;
-using System.Threading.Tasks;
-using NewLife.Log;
-using NewLife.Net.Sockets;
-using NewLife.Threading;
-
-namespace NewLife.Net.Application
-{
-    /// <summary>网络应用程序测试</summary>
-    public static class AppTest
-    {
-        #region 基础服务测试
-        /// <summary>开始测试</summary>
-        public static void Start()
-        {
-            StartServer();
-            StartClient();
-        }
-
-        /// <summary>开始测试</summary>
-        public static void StartServer()
-        {
-            var ts = new Type[] { typeof(ChargenServer), typeof(DaytimeServer), typeof(DiscardServer), typeof(EchoServer), typeof(TimeServer) };
-            //var ts = new Type[] { typeof(EchoServer) };
-            var list = new List<NetServer>();
-            foreach (var item in ts)
-            {
-                var server = Activator.CreateInstance(item) as NetServer;
-                server.Start();
-                list.Add(server);
-            }
-        }
-
-        /// <summary>开始测试</summary>
-        public static void StartClient()
-        {
-            StartEchoServer(7);
-            StartDaytimeServer(13);
-            StartTimeServer(37);
-            StartDiscardServer(9);
-            StartChargenServer(19);
-        }
-
-        static AutoResetEvent _are = new AutoResetEvent(true);
-        static void OnReceived(Object sender, ReceivedEventArgs e)
-        {
-            var session = sender as ISocketSession;
-            Console.WriteLine("客户端{0} 收到 [{1}]: {2}", session, e.Stream.Length, e.Stream.ToStr());
-
-            _are.Set();
-        }
-
-        static void OnError(Object sender, ExceptionEventArgs e)
-        {
-            Console.WriteLine("客户端{0}错误 {1}", sender, e.Exception);
-        }
-
-        static void TestSend(String name, NetUri uri, Boolean isAsync, Boolean isSendData, Boolean isReceiveData)
-        {
-            Console.WriteLine();
-
-            var msg = String.Format("{0}Test_{1}_{2}!", name, uri.Type, isAsync ? "异步" : "同步");
-            var client = uri.CreateRemote();
-            client.Error += OnError;
-            if (isAsync && isReceiveData)
-            {
-                _are.Reset();
-                client.Received += OnReceived;
-                client.Open();
-            }
-            if (isSendData) client.Send(msg);
-
-            var rs = false;
-            if (isReceiveData)
-            {
-                if (!isAsync)
-                {
-                    try
-                    {
-                        //Console.WriteLine("客户端" + session + " " + session.ReceiveString());
-                        var pk = client.Receive();
-                        Console.WriteLine("客户端{0} 收到 [{1}]: {2}", client, pk.Count, pk.ToStr());
-
-                        rs = true;
-                    }
-                    catch (Exception ex)
-                    {
-                        Debug.Fail("同步超时！" + ex.Message);
-                    }
-                }
-                else
-                {
-                    if (!_are.WaitOne(2000))
-                        Debug.Fail("异步超时！");
-                    else
-                        rs = true;
-                }
-            }
-            client.Dispose();
-            client = null;
-            GC.Collect();
-
-            XTrace.WriteLine(rs ? "成功！" : "失败！");
-        }
-
-        static void TestSends(String name, IPEndPoint ep, Boolean isSendData, Boolean isReceiveData = true)
-        {
-            //if (ep.AddressFamily == AddressFamily.InterNetworkV6) return;
-
-            Console.WriteLine();
-            Console.WriteLine("{0}：", name);
-            //TestSend(name, ProtocolType.Udp, ep, false, isSendData, isReceiveData);
-            //TestSend(name, ProtocolType.Udp, ep, true, isSendData, isReceiveData);
-            //TestSend(name, ProtocolType.Tcp, ep, false, isSendData, isReceiveData);
-            //TestSend(name, ProtocolType.Tcp, ep, true, isSendData, isReceiveData);
-            var uri = new NetUri(NetType.Udp, ep);
-            TestSend(name, uri, false, isSendData, isReceiveData);
-            TestSend(name, uri, true, isSendData, isReceiveData);
-            uri.Type = NetType.Tcp;
-            TestSend(name, uri, false, isSendData, isReceiveData);
-            TestSend(name, uri, true, isSendData, isReceiveData);
-
-            GC.Collect();
-        }
-
-        static void StartEchoServer(Int32 port)
-        {
-            var ep = new IPEndPoint(IPAddress.Loopback, port);
-
-            TestSends("Echo", ep, true);
-
-            ep = new IPEndPoint(IPAddress.IPv6Loopback, port);
-
-            TestSends("Echo IPv6", ep, true);
-        }
-
-        static void StartDaytimeServer(Int32 port)
-        {
-            var ep = new IPEndPoint(IPAddress.Loopback, port);
-
-            TestSends("Daytime", ep, true);
-
-            ep = new IPEndPoint(IPAddress.IPv6Loopback, port);
-
-            TestSends("Daytime IPv6", ep, true);
-        }
-
-        static void StartTimeServer(Int32 port)
-        {
-            var ep = new IPEndPoint(IPAddress.Loopback, port);
-
-            TestSends("Time", ep, true);
-
-            ep = new IPEndPoint(IPAddress.IPv6Loopback, port);
-
-            TestSends("Time IPv6", ep, true);
-        }
-
-        static void StartDiscardServer(Int32 port)
-        {
-            var ep = new IPEndPoint(IPAddress.Loopback, port);
-
-            TestSends("Discard", ep, true, false);
-
-            ep = new IPEndPoint(IPAddress.IPv6Loopback, port);
-
-            TestSends("Discard IPv6", ep, true, false);
-        }
-
-        static void StartChargenServer(Int32 port)
-        {
-            var ep = new IPEndPoint(IPAddress.Loopback, port);
-
-            TestSends("Chargen", ep, true);
-
-            ep = new IPEndPoint(IPAddress.IPv6Loopback, port);
-
-            TestSends("Chargen IPv6", ep, true);
-        }
-        #endregion
-
-        #region TCP大量连接测试
-        /// <summary>TCP大量连接测试</summary>
-        public static void TcpConnectionTest()
-        {
-            while (true)
-            {
-                Console.Write("请选择模式：（1，服务端 2，客户端）");
-                var str = Console.ReadLine();
-
-                if (str == "1")
-                {
-                    TestServer();
-                    break;
-                }
-                else if (str == "2")
-                {
-                    TestClient();
-                    break;
-                }
-            }
-        }
-
-        static NetServer server = null;
-        static void TestServer()
-        {
-            var port = ReadInt("请输入监听端口：", 1, 65535);
-
-            // 扩大事件池
-            //NetEventArgs.Pool.Max = 200000;
-
-            server = new NetServer();
-            server.ProtocolType = NetType.Tcp;
-            server.Port = port;
-            server.UseSession = true;
-            server.Received += server_Received;
-            //// 最大不活跃时间设为10分钟
-            //foreach (var item in server.Servers)
-            //{
-            //    item.SessionTimeout = 10 * 60;
-            //}
-            server.Start();
-            server.Log = null;
-
-            Task.Factory.StartNew(ShowStatus);
-
-            Console.WriteLine("服务端准备就绪，任何时候任意键退出服务程序！");
-            Console.ReadKey(true);
-
-            server.Dispose();
-        }
-
-        static void server_Received(Object sender, ReceivedEventArgs e)
-        {
-            OnReceive(sender as ISocketSession, e.Stream);
-        }
-
-        /// <summary>已重载。</summary>
-        /// <param name="session"></param>
-        /// <param name="stream"></param>
-        static void OnReceive(ISocketSession session, Stream stream)
-        {
-            if (stream.Length == 0) return;
-
-            asyncCount++;
-
-            //if (stream.Length > 100)
-            //    Console.WriteLine("Echo {0} [{1}]", session.Remote, stream.Length);
-            //else
-            //    Console.WriteLine("Echo {0} [{1}] {2}", session.Remote, stream.Length, e.GetString());
-            //var p = stream.Position;
-            //var msg = "";
-            //if (stream.Length > 100)
-            //    msg = String.Format("Echo {0} [{1}]", session.Remote, stream.Length);
-            //else
-            //    msg = String.Format("Echo {0} [{1}] {2}", session.Remote, stream.Length, stream.ToStr());
-
-            ////session.Send(e.Buffer, e.Offset, stream.Length);
-            //stream.Position = p;
-            session.Send(stream);
-        }
-
-        static Int32 asyncCount = 0;
-        static void ShowStatus()
-        {
-            while (true)
-            {
-                try
-                {
-                    ThreadPool.GetAvailableThreads(out var wt, out var cpt);
-                    var threads = Process.GetCurrentProcess().Threads.Count;
-
-                    var color = Console.ForegroundColor;
-                    Console.ForegroundColor = ConsoleColor.Yellow;
-                    //Console.WriteLine("异步:{0} 会话:{1} Thread:{2}/{3}/{4} Pool:{5}/{6}/{7}", asyncCount, server.Sessions.Count, threads, wt, cpt, pool.StockCount, pool.FreeCount, pool.CreateCount);
-                    //var count = server.Sessions.Count;
-                    var count = server.SessionCount;
-                    Console.WriteLine("消息:{0} 会话:{1} Thread:{2}/{3}/{4}", asyncCount, count, threads, wt, cpt);
-                    Console.ForegroundColor = color;
-                }
-                catch { }
-
-                Thread.Sleep(3000);
-            }
-        }
-
-        //static Thread[] threads;
-        static void TestClient()
-        {
-            Console.Write("请输入服务器地址：");
-            var host = Console.ReadLine();
-            var port = ReadInt("请输入服务器端口：", 1, 65535);
-
-            var ep = NetHelper.ParseEndPoint(host, port);
-            var uri = new NetUri(NetType.Tcp, ep);
-
-            Console.WriteLine("开始测试连接{0}……", uri);
-
-            var session = uri.CreateRemote();
-            session.Send("Hi");
-            var rs = session.ReceiveString();
-            session.Dispose();
-            if (rs.IsNullOrWhiteSpace())
-            {
-                Console.WriteLine("连接失败！");
-                return;
-            }
-
-            var threadcount = ReadInt("请输入线程数（建议20）：", 1, 10000);
-            var perthread = ReadInt("请输入每线程连接数（建议500）：", 1, 10000);
-            //var time = ReadInt("请输入连接间隔（毫秒，建议10毫秒）：", 1, 10000);
-            var time = 10;
-
-            var threads = new Thread[threadcount];
-            for (var i = 0; i < threadcount; i++)
-            {
-                var th = new Thread(ClientProcess);
-                th.IsBackground = true;
-                th.Priority = ThreadPriority.BelowNormal;
-                th.Name = "Client_" + (i + 1);
-
-                threads[i] = th;
-                var p = new TCParam() { ID = i + 1, Count = perthread, Period = time, Uri = uri };
-                th.Start(p);
-
-                Thread.Sleep(100);
-            }
-        }
-
-        static void ClientProcess(Object state)
-        {
-            var p = state as TCParam;
-
-            var msg = String.Format("Hi I am {0}!", p.ID);
-
-            var clients = new ISocketClient[p.Count];
-            for (var k = 0; k < 100; k++)
-            {
-                Console.WriteLine("第{1}轮处理：{0}", p.ID, k + 1);
-
-                for (var i = 0; i < p.Count; i++)
-                {
-                    try
-                    {
-                        var client = clients[i];
-                        if (client == null || client.Disposed)
-                        {
-                            client = p.Uri.CreateRemote();
-
-                            clients[i] = client;
-                        }
-
-                        client.Send(msg);
-                    }
-                    catch { }
-
-                    if (p.Period > 0) Thread.Sleep(p.Period);
-                }
-            }
-        }
-
-        class TCParam
-        {
-            public Int32 ID;
-            public Int32 Count;
-            public Int32 Period;
-
-            public NetUri Uri;
-        }
-
-        static Int32 ReadInt(String title, Int32 min, Int32 max)
-        {
-            if (String.IsNullOrEmpty(title))
-                title = "请输入数字：";
-            else if (title[title.Length - 1] != '：')
-                title += "：";
-
-            var n = 0;
-            while (n < min || n > max)
-            {
-                Console.Write(title);
-                var str = Console.ReadLine();
-                if (!String.IsNullOrEmpty(str)) Int32.TryParse(str, out n);
-            }
-            return n;
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Application/ChargenServer.cs b/NewLife.Net/Application/ChargenServer.cs
deleted file mode 100644
index e815cab553..0000000000
--- a/NewLife.Net/Application/ChargenServer.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-﻿using System;
-using System.IO;
-using System.Net.Sockets;
-using System.Threading;
-using NewLife.Net.Sockets;
-
-namespace NewLife.Net.Application
-{
-    /// <summary>Chargen服务器。不停的向连接者发送数据</summary>
-    public class ChargenServer : NetServer
-    {
-        /// <summary>实例化一个Chargen服务</summary>
-        public ChargenServer()
-        {
-            //// 默认Tcp协议
-            //ProtocolType = ProtocolType.Tcp;
-            // 默认19端口
-            Port = 19;
-
-            Name = "Chargen服务";
-        }
-
-        /// <summary>已重载。</summary>
-        /// <param name="session"></param>
-        protected override INetSession OnNewSession(ISocketSession session)
-        {
-            WriteLog("Chargen {0} OnAccept", session.Remote);
-
-            // 如果没有远程地址，或者远程地址是广播地址，则跳过。否则会攻击广播者。
-            // Tcp的该属性可能没值，可以忽略
-            var remote = session.Remote.EndPoint;
-            if (remote != null && remote.Address.IsAny()) return null;
-
-            // 使用多线程
-            var thread = new Thread(LoopSend);
-            thread.Name = "Chargen.LoopSend";
-            thread.IsBackground = true;
-            //thread.Priority = ThreadPriority.Lowest;
-            thread.Start(session);
-
-            //return base.OnNewSession(session);
-            return null;
-        }
-
-        /// <summary>已重载。</summary>
-        /// <param name="session"></param>
-        /// <param name="stream"></param>
-        protected override void OnReceive(INetSession session, Stream stream)
-        {
-            if (stream.Length == 0) return;
-
-            if (stream.Length > 100)
-                WriteLog("Chargen {0} [{1}]", session.Remote, stream.Length);
-            else
-                WriteLog("Chargen {0} [{1}] {2}", session.Remote, stream.Length, stream.ToStr());
-        }
-
-        /// <summary>触发异常</summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected override void OnError(Object sender, ExceptionEventArgs e)
-        {
-            base.OnError(sender, e);
-
-            // 出现重置错误，可能是UDP发送时客户端重置了，标识错误，让所有循环终止
-            //if (e.LastOperation == SocketAsyncOperation.ReceiveFrom && e.SocketError == SocketError.ConnectionReset) hasError = true;
-            hasError = true;
-        }
-
-        Boolean hasError = false;
-
-        void LoopSend(Object state)
-        {
-            var session = state as ISocketSession;
-            if (session == null) return;
-
-            hasError = false;
-
-            try
-            {
-                // 不断的发送数据，直到连接断开为止
-                //while (!hasError)
-                for (var i = 0; i < 64 && !hasError; i++)
-                {
-                    try
-                    {
-                        Send(session);
-
-                        // 暂停100ms
-                        Thread.Sleep(100);
-                    }
-                    catch { break; }
-                }
-            }
-            finally
-            {
-                session.Dispose();
-            }
-        }
-
-        Int32 Length = 72;
-        Int32 Index = 0;
-
-        void Send(ISocketSession session)
-        {
-            var startIndex = Index++;
-            if (Index >= Length) Index = 0;
-
-            var buffer = new Byte[Length];
-
-            // 产生数据
-            for (var i = 0; i < buffer.Length; i++)
-            {
-                var p = startIndex + i;
-                if (p >= buffer.Length) p -= buffer.Length;
-                buffer[p] = (Byte)(i + 32);
-            }
-
-            session.Send(buffer);
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Application/DaytimeServer.cs b/NewLife.Net/Application/DaytimeServer.cs
deleted file mode 100644
index fe40494c5f..0000000000
--- a/NewLife.Net/Application/DaytimeServer.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-﻿using System;
-using System.Text;
-using NewLife.Net.Sockets;
-
-namespace NewLife.Net.Application
-{
-    /// <summary>Daytime服务器。返回服务端的时间日期</summary>
-    public class DaytimeServer : NetServer
-    {
-        /// <summary>实例化一个Daytime服务</summary>
-        public DaytimeServer()
-        {
-            // 默认13端口
-            Port = 13;
-
-            Name = "Daytime服务";
-        }
-
-        /// <summary>已重载。</summary>
-        /// <param name="session"></param>
-        protected override INetSession OnNewSession(ISocketSession session)
-        {
-            WriteLog("Daytime {0}", session.Remote);
-
-            var buffer = Encoding.ASCII.GetBytes(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffffff"));
-            //Send(e.Socket, buffer, 0, buffer.Length, e.RemoteEndPoint);
-            //session.Send(buffer, 0, buffer.Length, e.RemoteEndPoint);
-            session.Send(buffer);
-
-            return null;
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Application/DiscardServer.cs b/NewLife.Net/Application/DiscardServer.cs
deleted file mode 100644
index bc34861483..0000000000
--- a/NewLife.Net/Application/DiscardServer.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-﻿using System;
-using System.IO;
-using NewLife.Net.Sockets;
-
-namespace NewLife.Net.Application
-{
-    /// <summary>Discard服务器。抛弃所有收到的数据包，不做任何响应</summary>
-    public class DiscardServer : NetServer
-    {
-        /// <summary>实例化一个Discard服务</summary>
-        public DiscardServer()
-        {
-            // 默认9端口
-            Port = 9;
-
-            Name = "Discard服务";
-        }
-
-        /// <summary>已重载。</summary>
-        /// <param name="session"></param>
-        /// <param name="stream"></param>
-        protected override void OnReceive(INetSession session, Stream stream)
-        {
-            if (stream.Length == 0) return;
-
-            if (stream.Length > 100)
-                WriteLog("Discard {0} [{1}] {2}...", session.Remote, stream.Length, stream.ReadBytes(1000).ToStr());
-            else
-                WriteLog("Discard {0} [{1}] {2}", session.Remote, stream.Length, stream.ToStr());
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Application/EchoHandler.cs b/NewLife.Net/Application/EchoHandler.cs
deleted file mode 100644
index df610d4d8e..0000000000
--- a/NewLife.Net/Application/EchoHandler.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-﻿using System;
-using NewLife.Data;
-using NewLife.Log;
-using NewLife.Net.Handlers;
-
-namespace NewLife.Net.Application
-{
-    /// <summary>回声处理器</summary>
-    public class EchoHandler : Handler
-    {
-        /// <summary>读取</summary>
-        /// <param name="context"></param>
-        /// <param name="message"></param>
-        /// <returns></returns>
-        public override Object Read(IHandlerContext context, Object message)
-        {
-            if (message is Packet pk)
-            {
-                var len = pk.Total;
-                if (len > 100)
-                    XTrace.WriteLine("Echo {0} [{1}]", context.Session, len);
-                else
-                    XTrace.WriteLine("Echo {0} [{1}] {2}", context.Session, len, pk.ToStr());
-            }
-            else
-                XTrace.WriteLine("{0}", message);
-
-            context.Session.SendMessage(message);
-
-            return null;
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Application/EchoServer.cs b/NewLife.Net/Application/EchoServer.cs
deleted file mode 100644
index 5bfe418be7..0000000000
--- a/NewLife.Net/Application/EchoServer.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-﻿using System;
-using System.IO;
-using NewLife.Net.Sockets;
-
-namespace NewLife.Net.Application
-{
-    /// <summary>Echo服务。把客户端发来的数据原样返回。</summary>
-    public class EchoServer : NetServer
-    {
-        /// <summary>实例化一个Echo服务</summary>
-        public EchoServer()
-        {
-            // 默认7端口
-            Port = 7;
-
-            Name = "Echo服务";
-        }
-
-        /// <summary>已重载。</summary>
-        /// <param name="session"></param>
-        /// <param name="stream"></param>
-        protected override void OnReceive(INetSession session, Stream stream)
-        {
-            if (stream.Length == 0) return;
-
-            var p = stream.Position;
-            if (stream.Length > 100)
-                WriteLog("Echo {0} [{1}]", session.Remote, stream.Length);
-            else
-                WriteLog("Echo {0} [{1}] {2}", session.Remote, stream.Length, stream.ToStr());
-
-            //Send(e.Socket, e.Buffer, e.Offset, stream.Length, e.RemoteEndPoint);
-            //session.Send(e.Buffer, e.Offset, stream.Length, e.RemoteEndPoint);
-            //session.Send(e.Buffer, e.Offset, stream.Length);
-            stream.Position = p;
-            //session.Send(stream);
-            session.Send(stream.ReadBytes());
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Application/LogServer.cs b/NewLife.Net/Application/LogServer.cs
deleted file mode 100644
index 960fecc28a..0000000000
--- a/NewLife.Net/Application/LogServer.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-﻿using System;
-using System.IO;
-using NewLife.Log;
-using NewLife.Net.Sockets;
-
-namespace NewLife.Net.Application
-{
-    /// <summary>日志服务</summary>
-    public class LogServer : NetServer<LogServer.LogSession>
-    {
-        /// <summary>实例化一个日志服务</summary>
-        public LogServer()
-        {
-            // 默认514端口
-            Port = 514;
-
-            Name = "日志服务";
-        }
-
-        /// <summary>日志会话</summary>
-        public class LogSession : NetSession
-        {
-            /// <summary>实例化</summary>
-            public LogSession()
-            {
-                // 不需要日志前缀
-                //LogPrefix = "";
-            }
-
-            /// <summary>开始会话</summary>
-            public override void Start()
-            {
-                Log = XTrace.Log;
-
-                LogPrefix = "[{0}]".F(ID);
-
-                base.Start();
-            }
-
-            /// <summary>已重载。</summary>
-            /// <param name="e"></param>
-            protected override void OnReceive(ReceivedEventArgs e)
-            {
-                if (e.Length == 0) return;
-
-                WriteLog("{0}", e.ToStr());
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Application/SerialServer.cs b/NewLife.Net/Application/SerialServer.cs
deleted file mode 100644
index 9d3d367cb6..0000000000
--- a/NewLife.Net/Application/SerialServer.cs
+++ /dev/null
@@ -1,219 +0,0 @@
-﻿using System;
-using System.IO;
-using System.IO.Ports;
-using System.Threading;
-using NewLife.Data;
-
-namespace NewLife.Net.Application
-{
-    /// <summary>串口服务器。把收发数据映射到本地的指定串口</summary>
-    /// <remarks>
-    /// 一定要注意：串口编程最大的问题在于硬件设备可能极为不稳定，响应速度不可估计，所以需要尽可能的等待。
-    /// 
-    /// 串口读取的学问非常的大，影响响应比较慢，要等一会才能得到数据，并且可能只是得到一部分，而无限制的等待，又会让整个读取变得相当漫长。
-    /// 一般来说，串口传输的数据，是指定长度有头有尾的帧数据。因此，只需要设定好等待时间和帧大小，就能很好的读取数据。
-    /// </remarks>
-    public class SerialServer : NetServer<SerialServer.Session>
-    {
-        #region 属性
-        private String _PortName = "COM1";
-        /// <summary>串口名。默认COM1</summary>
-        public String PortName { get { return _PortName; } set { _PortName = value; } }
-
-        private Boolean _AutoClose = true;
-        /// <summary>每次收发完数据之后自动关闭</summary>
-        public Boolean AutoClose { get { return _AutoClose; } set { _AutoClose = value; } }
-
-        private SerialPort _Serial;
-        /// <summary>串口对象</summary>
-        public SerialPort Serial { get { return _Serial; } set { _Serial = value; } }
-
-        private Int32 _Timeout = 1000;
-        /// <summary>超时时间</summary>
-        public Int32 Timeout { get { return _Timeout; } set { _Timeout = value; } }
-
-        private Int32 _ReceivedBytesThreshold = 1;
-        /// <summary>每一帧长度</summary>
-        public Int32 ReceivedBytesThreshold { get { return _ReceivedBytesThreshold; } set { _ReceivedBytesThreshold = value; } }
-        #endregion
-
-        #region 构造
-        /// <summary>实例化一个串口服务器</summary>
-        public SerialServer()
-        {
-            Port = 24;
-            Name = "串口服务";
-        }
-
-        /// <summary>子类重载实现资源释放逻辑时必须首先调用基类方法</summary>
-        /// <param name="disposing">从Dispose调用（释放所有资源）还是析构函数调用（释放非托管资源）</param>
-        protected override void OnDispose(Boolean disposing)
-        {
-            base.OnDispose(disposing);
-
-            var sp = Serial;
-            Serial = null;
-            if (sp != null) sp.Dispose();
-        }
-        #endregion
-
-        #region 事件
-        /// <summary>创建窗口对象时触发</summary>
-        public event EventHandler OnCreate;
-
-        void RaiseCreate()
-        {
-            if (OnCreate != null) OnCreate(this, EventArgs.Empty);
-        }
-        #endregion
-
-        #region 业务
-        #endregion
-
-        #region 会话
-        /// <summary>串口服务会话</summary>
-        public class Session : NetSession<SerialServer>
-        {
-            static readonly Byte[] vspStart = new Byte[] { 0xFF, 0xFA, 0x2C };
-            static readonly Byte[] vspEnd = new Byte[] { 0xFF, 0xF0 };
-
-            /// <summary>收到客户端发来的数据</summary>
-            /// <param name="e"></param>
-            protected override void OnReceive(ReceivedEventArgs e)
-            {
-                var ms = e.Stream;
-                if (ms == null || ms.Length <= 0) return;
-
-                var sp = Host.Serial;
-                if (sp == null)
-                {
-                    sp = new SerialPort(Host.PortName);
-                    Host.Serial = sp;
-
-                    //sp.BaudRate = 9600;
-                    //sp.DataBits = 8;
-                    //sp.Parity = Parity.None;
-                    //sp.StopBits = StopBits.One;
-                    if (Host.Timeout > 0) sp.ReadTimeout = sp.WriteTimeout = Host.Timeout;
-                    //sp.ReadBufferSize = sp.WriteBufferSize = 1024;
-                    //sp.Handshake = Handshake.None;
-
-                    //sp.DataReceived += new SerialDataReceivedEventHandler(sp_DataReceived);
-                    if (Host.ReceivedBytesThreshold > 0) sp.ReceivedBytesThreshold = Host.ReceivedBytesThreshold;
-
-                    // 如果不设置，有时候可能读不到数据
-                    sp.RtsEnable = true;
-                    sp.DtrEnable = true;
-
-                    Host.RaiseCreate();
-                }
-
-                //var ms = e.GetStream();
-
-                #region 特殊处理VSP格式
-                // 特殊处理VSP格式。有可能是先开始FFF0才到FFFA
-                while (ms.Position < ms.Length && (ms.StartsWith(vspStart) || ms.StartsWith(vspEnd) && ms.StartsWith(vspStart)))
-                {
-                    var data = ms.ReadTo(vspEnd);
-                    if (data != null)
-                    {
-                        WriteLog("VSP: {0}", data.ToHex());
-                        switch (data[0])
-                        {
-                            case 0x01:
-                                Array.Reverse(data, 1, 4);
-                                var rate = BitConverter.ToInt32(data, 1);
-                                if (rate > 0) sp.BaudRate = rate;
-                                break;
-                            case 0x02:
-                                if (data[1] > 0) sp.DataBits = data[1];
-                                break;
-                            case 0x03:
-                                if (data[1] > 0) sp.Parity = (Parity)data[1];
-                                break;
-                            case 0x04:
-                                if (data[1] > 0) sp.StopBits = (StopBits)data[1];
-                                break;
-                            case 0x05:
-                                if (data[1] > 0) sp.Handshake = (Handshake)data[1];
-                                break;
-                            default:
-                                break;
-                        }
-                    }
-                }
-                #endregion
-
-                if (ms.Position >= ms.Length) return;
-
-                // 必须加锁，防止多线程冲突
-                lock (sp)
-                {
-                    if (!sp.IsOpen) sp.Open();
-
-                    // 写数据
-                    var data2 = ms.ReadBytes();
-                    WriteLog("Net=>SerialPort: {0}", data2.ToHex());
-                    sp.Write(data2, 0, data2.Length);
-
-                    // 读数据
-                    ReadAndSend(sp, Session);
-
-                    if (Host.AutoClose) sp.Close();
-                }
-
-                //base.OnReceive(e);
-            }
-
-            void ReadAndSend(SerialPort sp, ISocketSession session)
-            {
-                // 读取数据
-                var data = Read(sp, Host.ReceivedBytesThreshold);
-                if (data != null && data.Count > 0)
-                {
-                    WriteLog("SerialPort=>Net: {0}", data.ToHex());
-                    session.Send(data);
-                }
-            }
-        }
-        #endregion
-
-        #region 辅助
-        /// <summary>从串口中读取指定长度的数据，一般是一帧</summary>
-        /// <param name="sp"></param>
-        /// <param name="length"></param>
-        /// <returns></returns>
-        public static Packet Read(SerialPort sp, Int32 length = -1)
-        {
-            // 读取数据
-            var ms = new MemoryStream();
-            if (sp.ReadTimeout < 1) sp.ReadTimeout = 1000;
-
-            while (sp.IsOpen)
-            {
-                // 等待1秒，直到有数据为止
-                var timeout = sp.ReadTimeout;
-                if (timeout < 1) timeout = 500;
-                var end = DateTime.Now.AddMilliseconds(timeout);
-                while (sp.BytesToRead <= 0 && sp.IsOpen && end > DateTime.Now) Thread.SpinWait(1);
-
-                if (!sp.IsOpen || sp.BytesToRead <= 0) break;
-
-                try
-                {
-                    var data = new Byte[sp.BytesToRead];
-                    var count = sp.Read(data, 0, data.Length);
-                    if (count > 0) ms.Write(data, 0, count);
-                }
-                catch { break; }
-
-                // 如果已经足够一帧，结束
-                if (length > 0 && ms.Length >= length) break;
-            }
-
-            ms.Position = 0;
-            return ms.ReadBytes();
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Application/StreamServer.cs b/NewLife.Net/Application/StreamServer.cs
deleted file mode 100644
index f69f309a5a..0000000000
--- a/NewLife.Net/Application/StreamServer.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-﻿using System;
-using System.IO;
-using NewLife.IO;
-using NewLife.Net.Sockets;
-
-namespace NewLife.Net.Application
-{
-    /// <summary>数据流服务器</summary>
-    public class StreamServer : NetServer
-    {
-        /// <summary>实例化一个数据流服务器</summary>
-        public StreamServer()
-        {
-            //// 默认Udp协议
-            //ProtocolType = ProtocolType.Udp;
-            // 默认支持所有协议
-            // 默认8000端口
-            Port = 8000;
-        }
-
-        private String _StreamHandlerName;
-        /// <summary>数据流处理器名称</summary>
-        public String StreamHandlerName { get { return _StreamHandlerName; } set { _StreamHandlerName = value; } }
-
-        /// <summary>已重载。</summary>
-        public override void EnsureCreateServer()
-        {
-            if (String.IsNullOrEmpty(StreamHandlerName)) throw new Exception("未指定数据流处理器名称！");
-
-            if (String.IsNullOrEmpty(Name))
-            {
-                Name = String.Format("数据流服务器（{0}）", ProtocolType);
-            }
-
-            base.EnsureCreateServer();
-        }
-
-        /// <summary>已重载。</summary>
-        /// <param name="session"></param>
-        /// <param name="stream"></param>
-        protected override void OnReceive(ISocketSession session, Stream stream)
-        {
-            if (stream.Length > 0) StreamHandler.Process(StreamHandlerName, stream);
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Application/TimeServer.cs b/NewLife.Net/Application/TimeServer.cs
deleted file mode 100644
index 6b9cf0ee43..0000000000
--- a/NewLife.Net/Application/TimeServer.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-﻿using System;
-
-namespace NewLife.Net.Application
-{
-    /// <summary>Time服务器</summary>
-    public class TimeServer : NetServer
-    {
-        /// <summary>实例化一个Time服务。向请求者返回1970年1月1日以来的所有秒数</summary>
-        public TimeServer()
-        {
-            // 默认37端口
-            Port = 37;
-
-            Name = "Time服务";
-        }
-
-        /// <summary>已重载。</summary>
-        /// <param name="session"></param>
-        protected override INetSession OnNewSession(ISocketSession session)
-        {
-            WriteLog("Time {0}", session.Remote);
-
-            var s = DateTime.Now.ToInt();
-            var buf = s.GetBytes(false);
-            session.Send(buf);
-
-            return null;
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/CoAP/CoAPMessage.cs b/NewLife.Net/CoAP/CoAPMessage.cs
deleted file mode 100644
index 164c5db3ab..0000000000
--- a/NewLife.Net/CoAP/CoAPMessage.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using NewLife.Messaging;
-using NewLife.Serialization;
-
-namespace NewLife.Net.CoAP
-{
-    /// <summary>受限制的应用协议(Constrained Application Protocol)</summary>
-    /// <remarks>用于物联网M2M</remarks>
-    public class CoAPMessage : Message<CoAPMessage>
-    {
-        #region 协议字段
-        [BitSize(2)]
-        private Byte _Ver;
-        /// <summary>版本</summary>
-        public Byte Ver { get { return _Ver; } set { _Ver = value; } }
-
-        [BitSize(2)]
-        private Byte _Type;
-        /// <summary>类型</summary>
-        public Byte Type { get { return _Type; } set { _Type = value; } }
-
-        [BitSize(4)]
-        private Byte _OptionCount;
-        /// <summary>可选选项数量</summary>
-        public Byte OptionCount { get { return _OptionCount; } set { _OptionCount = value; } }
-
-        private Byte _Code;
-        /// <summary>指令码</summary>
-        public Byte Code { get { return _Code; } set { _Code = value; } }
-
-        private Int32 _MessageID;
-        /// <summary>消息编号</summary>
-        public Int32 MessageID { get { return _MessageID; } set { _MessageID = value; } }
-        #endregion
-
-        #region 读写
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Common/BufferPool.cs b/NewLife.Net/Common/BufferPool.cs
deleted file mode 100644
index 4826e40c48..0000000000
--- a/NewLife.Net/Common/BufferPool.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Net.Sockets;
-
-namespace NewLife.Net.Common
-{
-    /// <summary>缓冲池</summary>
-    /// <remarks>
-    /// 频繁的分配小块内存，很容易形成内存碎片，并可能倒置GC无法回收而最后内存不足。
-    /// 缓冲池采用一开始就分配一大块空间的策略，谁要使用内存再从池里申请，用完后自动归还。
-    /// 这样整个缓冲池的生命周期内GC不来干涉。
-    /// </remarks>
-    public class BufferPool
-    {
-        #region 属性
-        private Int32 _Count;
-        /// <summary>内存块数</summary>
-        public Int32 Count { get { return _Count; } }
-
-        private Int32 _Size;
-        /// <summary>内存分块大小</summary>
-        public Int32 Size { get { return _Size; } }
-
-        /// <summary>一大块预先申请的内存区域</summary>
-        private Byte[] _Buffer;
-
-        /// <summary>下一次可用的内存块偏移量</summary>
-        private Int32 _Index;
-        /// <summary>总内存大小</summary>
-        private Int32 _TotalBytes;
-        /// <summary>用过后归还的内存块索引，优先从这里借用</summary>
-        private Stack<Int32> _Free = new Stack<Int32>();
-
-        /// <summary>可用内存块数</summary>
-        public int Available
-        {
-            get
-            {
-                lock (_Free)
-                {
-                    return (_TotalBytes - _Index) / _Size + _Free.Count;
-                }
-            }
-        }
-        #endregion
-
-        #region 构造
-        /// <summary>通过指定内存块数量和大小实例化一个内存池</summary>
-        /// <param name="count">内存块数量</param>
-        /// <param name="size">内存块大小</param>
-        public BufferPool(Int32 count, Int32 size)
-        {
-            _Count = count;
-            _Size = size;
-            _TotalBytes = count * size;
-            _Buffer = new Byte[_TotalBytes];
-        }
-        #endregion
-
-        #region 方法
-        /// <summary>借出内存区域</summary>
-        /// <param name="args"></param>
-        public void Pop(SocketAsyncEventArgs args)
-        {
-            lock (_Free)
-            {
-                if (_Free.Count > 0)
-                    args.SetBuffer(_Buffer, _Free.Pop(), _Size);
-                else
-                {
-                    // 判断是否已用完
-                    if (_Index >= _TotalBytes - 1) throw new InvalidOperationException("内存不足！");
-
-                    args.SetBuffer(_Buffer, _Index, _Size);
-                    _Index += _Size;
-                }
-            }
-        }
-
-        /// <summary>归还内存块</summary>
-        /// <param name="args"></param>
-        public void Push(SocketAsyncEventArgs args)
-        {
-            lock (_Free)
-            {
-                _Free.Push(args.Offset);
-                args.SetBuffer(null, 0, 0);
-            }
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Common/ClientMessageProvider.cs b/NewLife.Net/Common/ClientMessageProvider.cs
deleted file mode 100644
index 9ba1c2c70e..0000000000
--- a/NewLife.Net/Common/ClientMessageProvider.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-﻿using System;
-using System.IO;
-using System.Net.Sockets;
-using System.Threading;
-using NewLife.Messaging;
-using NewLife.Net.Sockets;
-
-namespace NewLife.Net.Common
-{
-    /// <summary>客户端消息提供者</summary>
-    public class ClientMessageProvider : MessageProvider
-    {
-        private ISocketClient _Session;
-        /// <summary>客户端</summary>
-        public ISocketClient Session
-        {
-            get { return _Session; }
-            set
-            {
-                if (_Session != value)
-                {
-                    _Session = value;
-
-                    if (value != null)
-                    {
-                        //// 只有Udp需要控制包大小
-                        //MaxMessageSize = value.ProtocolType == ProtocolType.Udp ? 1460 : 0;
-                        //MaxMessageSize = 1460;
-
-                        // 鉴于Internet上的标准MTU值为576字节,所以我建议在进行Internet的UDP编程时.
-                        // 最好将UDP的数据长度控件在548字节(576-8-20)以内.
-                        // 局域网环境下,UDP包大小为1024*8,速度达到2M/s,丢包情况理想.
-                        // 外网环境下,UDP包大小为548,速度理想,丢包情况理想.
-                        // http://www.cnblogs.com/begingame/archive/2011/08/18/2145138.html
-                        MaxMessageSize = value.Local.ProtocolType == ProtocolType.Udp ? 1472 : 1460;
-                        //MaxMessageSize = value.ProtocolType == ProtocolType.Udp ? 1024 * 8 : 1460;
-                        //value.Host.Socket.DontFragment = true;
-
-                        if (value.UseReceiveAsync)
-                        {
-                            value.Received += new EventHandler<ReceivedEventArgs>(client_Received);
-
-                            //if (!value.UseReceiveAsync) value.ReceiveAsync();
-                        }
-                    }
-                }
-            }
-        }
-
-        /// <summary>Session被关闭需要更新时触发。外部应该重新给Session赋值</summary>
-        public event EventHandler OnUpdate;
-
-        void client_Received(object sender, ReceivedEventArgs e)
-        {
-            var session = Session;
-            try
-            {
-                var message = Message.Read(e.Stream);
-                Process(message, session.Remote);
-            }
-            catch (Exception ex)
-            {
-                var msg = new ExceptionMessage() { Value = ex };
-                Process(msg, session.Remote);
-            }
-        }
-
-        /// <summary>发送消息。如果有响应，可在消息到达事件中获得。这里会实现大消息分包。</summary>
-        /// <param name="message"></param>
-        public override void Send(Message message)
-        {
-            // MaxMessageSize未设置时，先取一次Session，触发MaxMessageSize的设置
-            if (MaxMessageSize <= 0 && GetSession() == null) throw new ArgumentNullException("会话为空！可能没有设置OnUpdate事件！");
-
-            base.Send(message);
-        }
-
-        /// <summary>发送数据流。</summary>
-        /// <param name="stream"></param>
-        protected override void OnSend(Stream stream)
-        {
-            var session = GetSession();
-            session.Send(stream);
-
-            // UDP暂停一会，避免连续发送导致数据包丢失
-            if (session.Local.ProtocolType == ProtocolType.Udp) Thread.Sleep(10);
-        }
-
-        ISocketClient GetSession()
-        {
-            var session = Session;
-            Boolean needUpdate = false;
-            if (session == null || session.Disposed /*|| session.Host == null*/)
-                needUpdate = true;
-            else
-            {
-                //var socket = session.Host.Socket;
-                //if (socket == null || socket.ProtocolType == ProtocolType.Tcp && !socket.Connected)
-                //    needUpdate = true;
-            }
-
-            if (needUpdate && OnUpdate != null) OnUpdate(this, EventArgs.Empty);
-
-            return Session;
-        }
-
-        /// <summary>发送并接收</summary>
-        /// <param name="message"></param>
-        /// <param name="millisecondsTimeout"></param>
-        /// <returns></returns>
-        public override Message SendAndReceive(Message message, int millisecondsTimeout = 0)
-        {
-            var session = GetSession();
-            if (session.UseReceiveAsync) return base.SendAndReceive(message, millisecondsTimeout);
-
-            Send(message);
-            var data = session.Receive();
-            if (data == null || data.Length < 1) return null;
-
-            var ms = new MemoryStream(data);
-            return Message.Read(ms);
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Common/ExceptionEventArgs.cs b/NewLife.Net/Common/ExceptionEventArgs.cs
deleted file mode 100644
index 46770028bf..0000000000
--- a/NewLife.Net/Common/ExceptionEventArgs.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace NewLife.Net
-{
-    /// <summary>异常事件参数</summary>
-    public class ExceptionEventArgs : EventArgs
-    {
-        private Exception _Exception;
-        /// <summary>异常</summary>
-        public Exception Exception { get { return _Exception; } set { _Exception = value; } }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Common/IStatistics.cs b/NewLife.Net/Common/IStatistics.cs
deleted file mode 100644
index 98bf79df09..0000000000
--- a/NewLife.Net/Common/IStatistics.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-﻿using System;
-
-namespace NewLife.Net.Common
-{
-    /// <summary>统计接口。
-    /// <see cref="Increment"/>后更新<see cref="First"/>、<see cref="Last"/>、<see cref="Total"/>，
-    /// 但并不会马上更新统计数据，除非<see cref="Enable"/>为true。</summary>
-    /// <example>
-    /// <code>
-    /// private IStatistics _Statistics;
-    /// /// &lt;summary&gt;统计信息，默认关闭，通过&lt;see cref="IStatistics.Enable"/&gt;打开。&lt;/summary&gt;
-    /// public IStatistics Statistics { get { return _Statistics ?? (_Statistics = NetService.Resolve&lt;IStatistics&gt;()); } }
-    /// </code>
-    /// </example>
-    public interface IStatistics
-    {
-        /// <summary>是否启用统计。</summary>
-        Boolean Enable { get; set; }
-
-        ///// <summary>定时器统计周期。单位毫秒，默认20000ms（Debug时10000ms），小于0时关闭定时器，采用实时计算。越小越准确，但是性能损耗也很大。</summary>
-        //Int32 Period { get; set; }
-
-        /// <summary>首次统计时间</summary>
-        DateTime First { get; set; }
-
-        /// <summary>最后统计时间</summary>
-        DateTime Last { get; }
-
-        /// <summary>每分钟最大值</summary>
-        Int32 Total { get; set; }
-
-        /// <summary>每分钟总操作</summary>
-        Int32 TotalPerMinute { get; }
-
-        /// <summary>每小时总操作</summary>
-        Int32 TotalPerHour { get; }
-
-        /// <summary>每分钟最大值</summary>
-        Int32 MaxPerMinute { get; }
-
-        /// <summary>每秒平均</summary>
-        Int32 AveragePerSecond { get; }
-
-        /// <summary>每分钟平均</summary>
-        Int32 AveragePerMinute { get; }
-
-        /// <summary>增加计数</summary>
-        /// <param name="n"></param>
-        void Increment(Int32 n = 1);
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Common/NetException.cs b/NewLife.Net/Common/NetException.cs
deleted file mode 100644
index bb53a5d2ac..0000000000
--- a/NewLife.Net/Common/NetException.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-﻿using System;
-using System.Runtime.Serialization;
-using NewLife.Exceptions;
-
-namespace NewLife.Net
-{
-    /// <summary>网络异常</summary>
-    [Serializable]
-    public class NetException : XException
-    {
-        #region 构造
-        /// <summary>初始化</summary>
-        public NetException() { }
-
-        /// <summary>初始化</summary>
-        /// <param name="message"></param>
-        public NetException(String message) : base(message) { }
-
-        /// <summary>初始化</summary>
-        /// <param name="format"></param>
-        /// <param name="args"></param>
-        public NetException(String format, params Object[] args) : base(format, args) { }
-
-        /// <summary>初始化</summary>
-        /// <param name="message"></param>
-        /// <param name="innerException"></param>
-        public NetException(String message, Exception innerException) : base(message, innerException) { }
-
-        /// <summary>初始化</summary>
-        /// <param name="innerException"></param>
-        public NetException(Exception innerException) : base((innerException != null ? innerException.Message : null), innerException) { }
-
-        /// <summary>初始化</summary>
-        /// <param name="info"></param>
-        /// <param name="context"></param>
-        protected NetException(SerializationInfo info, StreamingContext context) : base(info, context) { }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Common/NetHelper.cs b/NewLife.Net/Common/NetHelper.cs
deleted file mode 100644
index 94dd70d830..0000000000
--- a/NewLife.Net/Common/NetHelper.cs
+++ /dev/null
@@ -1,374 +0,0 @@
-﻿using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Net;
-using System.Net.NetworkInformation;
-using System.Net.Sockets;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using NewLife.Collections;
-using NewLife.Configuration;
-using NewLife.Log;
-using NewLife.Net;
-using NewLife.Reflection;
-
-namespace System
-{
-    /// <summary>网络工具类</summary>
-    public static class NetHelper
-    {
-        #region 日志输出
-        private static Boolean? _Debug;
-        /// <summary>是否调试</summary>
-        public static Boolean Debug
-        {
-            get
-            {
-                if (_Debug != null) return _Debug.Value;
-
-                _Debug = Config.GetConfig<Boolean>("NewLife.Net.Debug", false);
-
-                return _Debug.Value;
-            }
-            set { _Debug = value; }
-        }
-
-        /// <summary>输出日志</summary>
-        /// <param name="format"></param>
-        /// <param name="args"></param>
-        public static void WriteLog(String format, params Object[] args)
-        {
-            XTrace.WriteLine(format, args);
-        }
-        #endregion
-
-        #region 辅助函数
-        /// <summary>设置超时检测时间和检测间隔</summary>
-        /// <param name="socket">要设置的Socket对象</param>
-        /// <param name="iskeepalive">是否启用Keep-Alive</param>
-        /// <param name="starttime">多长时间后开始第一次探测（单位：毫秒）</param>
-        /// <param name="interval">探测时间间隔（单位：毫秒）</param>
-        public static void SetTcpKeepAlive(this Socket socket, Boolean iskeepalive, Int32 starttime = 10000, Int32 interval = 10000)
-        {
-            if (socket == null || !socket.Connected) return;
-            uint dummy = 0;
-            byte[] inOptionValues = new byte[Marshal.SizeOf(dummy) * 3];
-            BitConverter.GetBytes((uint)(iskeepalive ? 1 : 0)).CopyTo(inOptionValues, 0);
-            BitConverter.GetBytes((uint)starttime).CopyTo(inOptionValues, Marshal.SizeOf(dummy));
-            BitConverter.GetBytes((uint)interval).CopyTo(inOptionValues, Marshal.SizeOf(dummy) * 2);
-            socket.IOControl(IOControlCode.KeepAliveValues, inOptionValues, null);
-        }
-
-        private static DictionaryCache<String, IPAddress> _dnsCache = new DictionaryCache<String, IPAddress>(StringComparer.OrdinalIgnoreCase) { Expriod = 600, Asynchronous = true };
-        /// <summary>分析地址</summary>
-        /// <param name="hostname"></param>
-        /// <returns></returns>
-        public static IPAddress ParseAddress(String hostname)
-        {
-            if (String.IsNullOrEmpty(hostname)) return null;
-
-            try
-            {
-                return _dnsCache.GetItem(hostname, key =>
-                {
-                    IPAddress addr = null;
-                    if (IPAddress.TryParse(key, out addr)) return addr;
-
-                    var hostAddresses = Dns.GetHostAddresses(key);
-                    if (hostAddresses == null || hostAddresses.Length < 1) return null;
-
-                    return hostAddresses.FirstOrDefault(d => d.AddressFamily == AddressFamily.InterNetwork || d.AddressFamily == AddressFamily.InterNetworkV6);
-                });
-            }
-            catch (SocketException ex)
-            {
-                throw new NetException("解析主机" + hostname + "的地址失败！" + ex.Message, ex);
-            }
-        }
-
-        /// <summary>分析网络终结点</summary>
-        /// <param name="address">地址，可以不带端口</param>
-        /// <param name="defaultPort">地址不带端口时指定的默认端口</param>
-        /// <returns></returns>
-        public static IPEndPoint ParseEndPoint(String address, Int32 defaultPort = 0)
-        {
-            if (String.IsNullOrEmpty(address)) return null;
-
-            Int32 p = address.IndexOf(":");
-            if (p > 0)
-                return new IPEndPoint(ParseAddress(address.Substring(0, p)), Int32.Parse(address.Substring(p + 1)));
-            else
-                return new IPEndPoint(ParseAddress(address), defaultPort);
-        }
-
-        /// <summary>针对IPv4和IPv6获取合适的Any地址</summary>
-        /// <param name="address"></param>
-        /// <param name="family"></param>
-        /// <returns></returns>
-        public static IPAddress GetRightAny(this IPAddress address, AddressFamily family)
-        {
-            switch (family)
-            {
-                case AddressFamily.InterNetwork:
-                    if (address == IPAddress.IPv6Any) return IPAddress.Any;
-                    return address;
-                case AddressFamily.InterNetworkV6:
-                    if (address == IPAddress.Any) return IPAddress.IPv6Any;
-                    return address;
-                default:
-                    return address;
-            }
-        }
-
-        /// <summary>是否Any地址，同时处理IPv4和IPv6</summary>
-        /// <param name="address"></param>
-        /// <returns></returns>
-        public static Boolean IsAny(this IPAddress address) { return IPAddress.Any.Equals(address) || IPAddress.IPv6Any.Equals(address); }
-
-        /// <summary>获取相对于指定远程地址的本地地址</summary>
-        /// <param name="address"></param>
-        /// <param name="remote"></param>
-        /// <returns></returns>
-        public static IPAddress GetRelativeAddress(this IPAddress address, IPAddress remote)
-        {
-            // 如果不是任意地址，直接返回
-            var addr = address;
-            if (addr == null || !addr.IsAny()) return addr;
-
-            // 如果是本地环回地址，返回环回地址
-            if (IPAddress.IsLoopback(remote))
-                return addr.AddressFamily == AddressFamily.InterNetwork ? IPAddress.Loopback : IPAddress.IPv6Loopback;
-
-            // 否则返回本地第一个IP地址
-            foreach (var item in NetHelper.GetIPs())
-            {
-                if (item.AddressFamily == addr.AddressFamily) return item;
-            }
-            return null;
-        }
-
-        /// <summary>获取相对于指定远程地址的本地地址</summary>
-        /// <param name="local"></param>
-        /// <param name="remote"></param>
-        /// <returns></returns>
-        public static IPEndPoint GetRelativeEndPoint(this IPEndPoint local, IPAddress remote)
-        {
-            if (local == null || remote == null) return local;
-
-            var addr = GetRelativeAddress(local.Address, remote);
-            return addr == null ? local : new IPEndPoint(addr, local.Port);
-        }
-
-        /// <summary>指定地址的指定端口是否已被使用，似乎没办法判断IPv6地址</summary>
-        /// <param name="protocol"></param>
-        /// <param name="address"></param>
-        /// <param name="port"></param>
-        /// <returns></returns>
-        internal static Boolean IsUsed(ProtocolType protocol, IPAddress address, Int32 port)
-        {
-            var gp = IPGlobalProperties.GetIPGlobalProperties();
-
-            IPEndPoint[] eps = null;
-            if (protocol == ProtocolType.Tcp)
-                eps = gp.GetActiveTcpListeners();
-            else if (protocol == ProtocolType.Udp)
-                eps = gp.GetActiveUdpListeners();
-            else
-                return false;
-
-            foreach (var item in eps)
-            {
-                if (item.Address.Equals(address) && item.Port == port) return true;
-            }
-
-            return false;
-        }
-        #endregion
-
-        #region 本机信息
-        /// <summary>获取活动的接口信息</summary>
-        /// <returns></returns>
-        public static IEnumerable<IPInterfaceProperties> GetActiveInterfaces()
-        {
-            foreach (var item in NetworkInterface.GetAllNetworkInterfaces())
-            {
-                if (item.OperationalStatus != OperationalStatus.Up) continue;
-
-                var ip = item.GetIPProperties();
-                if (ip != null) yield return ip;
-            }
-        }
-
-        /// <summary>获取可用的DHCP地址</summary>
-        /// <returns></returns>
-        public static IEnumerable<IPAddress> GetDhcps()
-        {
-            var list = new List<IPAddress>();
-            foreach (var item in GetActiveInterfaces())
-            {
-                if (item != null && item.DhcpServerAddresses.Count > 0)
-                {
-                    foreach (var elm in item.DhcpServerAddresses)
-                    {
-                        if (list.Contains(elm)) continue;
-                        list.Add(elm);
-
-                        yield return elm;
-                    }
-                }
-            }
-        }
-
-        /// <summary>获取可用的DNS地址</summary>
-        /// <returns></returns>
-        public static IEnumerable<IPAddress> GetDns()
-        {
-            var list = new List<IPAddress>();
-            foreach (var item in GetActiveInterfaces())
-            {
-                if (item != null && item.DnsAddresses.Count > 0)
-                {
-                    foreach (var elm in item.DnsAddresses)
-                    {
-                        if (list.Contains(elm)) continue;
-                        list.Add(elm);
-
-                        yield return elm;
-                    }
-                }
-            }
-        }
-
-        /// <summary>获取可用的IP地址</summary>
-        /// <returns></returns>
-        public static IEnumerable<IPAddress> GetIPs()
-        {
-            var list = new List<IPAddress>();
-            foreach (var item in GetActiveInterfaces())
-            {
-                if (item != null && item.UnicastAddresses.Count > 0)
-                {
-                    foreach (var elm in item.UnicastAddresses)
-                    {
-                        if (list.Contains(elm.Address)) continue;
-                        list.Add(elm.Address);
-
-                        yield return elm.Address;
-                    }
-                }
-            }
-        }
-
-        /// <summary>获取可用的多播地址</summary>
-        /// <returns></returns>
-        public static IEnumerable<IPAddress> GetMulticasts()
-        {
-            var list = new List<IPAddress>();
-            foreach (var item in GetActiveInterfaces())
-            {
-                if (item != null && item.MulticastAddresses.Count > 0)
-                {
-                    foreach (var elm in item.MulticastAddresses)
-                    {
-                        if (list.Contains(elm.Address)) continue;
-                        list.Add(elm.Address);
-
-                        yield return elm.Address;
-                    }
-                }
-            }
-        }
-        #endregion
-
-        #region 远程开机
-        /// <summary>唤醒指定MAC地址的计算机</summary>
-        /// <param name="macs"></param>
-        public static void Wake(params String[] macs)
-        {
-            if (macs == null || macs.Length < 1) return;
-
-            foreach (var item in macs)
-            {
-                Wake(item);
-            }
-        }
-
-        static void Wake(String mac)
-        {
-            mac = mac.Replace("-", null);
-            var buffer = new Byte[mac.Length / 2];
-            for (int i = 0; i < buffer.Length; i++)
-            {
-                buffer[i] = Byte.Parse(mac.Substring(i * 2, 2), NumberStyles.HexNumber);
-            }
-
-            var bts = new Byte[6 + 16 * buffer.Length];
-            for (int i = 0; i < 6; i++)
-            {
-                bts[i] = 0xFF;
-            }
-            for (int i = 6, k = 0; i < bts.Length; i++, k++)
-            {
-                if (k >= buffer.Length) k = 0;
-
-                bts[i] = buffer[k];
-            }
-
-            var client = new UdpClient();
-            client.EnableBroadcast = true;
-            client.Send(bts, bts.Length, new IPEndPoint(IPAddress.Broadcast, 7));
-        }
-        #endregion
-
-        #region 关闭连接
-        /// <summary>关闭连接</summary>
-        /// <param name="socket"></param>
-        /// <param name="reuseAddress"></param>
-        internal static void Close(Socket socket, Boolean reuseAddress = false)
-        {
-            if (socket == null || mSafeHandle == null) return;
-
-            var value = mSafeHandle is PropertyInfo ? socket.GetValue(mSafeHandle as PropertyInfo) : socket.GetValue(mSafeHandle as FieldInfo);
-            var hand = value as SafeHandle;
-            if (hand == null || hand.IsClosed) return;
-
-            // 先用Shutdown禁用Socket（发送未完成发送的数据），再用Close关闭，这是一种比较优雅的关闭Socket的方法
-            if (socket.Connected)
-            {
-                try
-                {
-                    socket.Disconnect(reuseAddress);
-                    socket.Shutdown(SocketShutdown.Both);
-                }
-                catch (SocketException ex2)
-                {
-                    if (ex2.SocketErrorCode != SocketError.NotConnected) WriteLog(ex2.ToString());
-                }
-                catch (ObjectDisposedException) { }
-                catch (Exception ex3)
-                {
-                    if (Debug) WriteLog(ex3.ToString());
-                }
-            }
-
-            socket.Close();
-        }
-
-        private static MemberInfo[] _mSafeHandle;
-        /// <summary>SafeHandle字段</summary>
-        private static MemberInfo mSafeHandle
-        {
-            get
-            {
-                if (_mSafeHandle != null && _mSafeHandle.Length > 0) return _mSafeHandle[0];
-
-                MemberInfo pi = typeof(Socket).GetFieldEx("m_Handle");
-                if (pi == null) pi = typeof(Socket).GetPropertyEx("SafeHandle");
-                _mSafeHandle = new MemberInfo[] { pi };
-
-                return pi;
-            }
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Common/NetUri.cs b/NewLife.Net/Common/NetUri.cs
deleted file mode 100644
index 3fd48739c1..0000000000
--- a/NewLife.Net/Common/NetUri.cs
+++ /dev/null
@@ -1,182 +0,0 @@
-﻿using System;
-using System.Net;
-using System.Net.Sockets;
-using System.Xml.Serialization;
-using NewLife.Serialization;
-
-namespace NewLife.Net.Common
-{
-    /// <summary>网络资源标识，指定协议、地址、端口、地址族（IPv4/IPv6）</summary>
-    /// <remarks>
-    /// 仅序列化<see cref="ProtocolType"/>和<see cref="EndPoint"/>，其它均是配角！
-    /// 有可能<see cref="Host"/>代表主机域名，而<see cref="Address"/>指定主机IP地址。
-    /// </remarks>
-    public class NetUri : IAccessor
-    {
-        #region 属性
-        private ProtocolType _ProtocolType;
-        /// <summary>协议类型</summary>
-        public ProtocolType ProtocolType { get { return _ProtocolType; } set { _ProtocolType = value; _Protocol = value.ToString(); } }
-
-        [NonSerialized]
-        private String _Protocol;
-        /// <summary>协议</summary>
-        [XmlIgnore]
-        public String Protocol
-        {
-            get { return _Protocol; }
-            set
-            {
-                _Protocol = value;
-                if (String.IsNullOrEmpty(value))
-                    _ProtocolType = ProtocolType.Unknown;
-                else
-                {
-                    try
-                    {
-                        _ProtocolType = (ProtocolType)Enum.Parse(typeof(ProtocolType), value, true);
-                        // 规范化名字
-                        _Protocol = _ProtocolType.ToString();
-                    }
-                    catch { _ProtocolType = ProtocolType.Unknown; }
-                }
-            }
-        }
-
-        /// <summary>地址</summary>
-        [XmlIgnore]
-        public IPAddress Address { get { return EndPoint.Address; } set { EndPoint.Address = value; _Host = value + ""; } }
-
-        [NonSerialized]
-        private String _Host;
-        /// <summary>主机</summary>
-        [XmlIgnore]
-        public String Host { get { return _Host; } set { _Host = value; try { EndPoint.Address = NetHelper.ParseAddress(value); } catch { } } }
-
-        /// <summary>端口</summary>
-        [XmlIgnore]
-        public Int32 Port { get { return EndPoint.Port; } set { EndPoint.Port = value; } }
-
-        private IPEndPoint _EndPoint;
-        /// <summary>终结点</summary>
-        public IPEndPoint EndPoint { get { return _EndPoint ?? (_EndPoint = new IPEndPoint(IPAddress.Any, 0)); } set { _EndPoint = value; _Host = value == null ? null : value.Address.ToString(); } }
-        #endregion
-
-        #region 构造
-        /// <summary>实例化</summary>
-        public NetUri() { }
-
-        /// <summary>实例化</summary>
-        /// <param name="uri"></param>
-        public NetUri(String uri) { Parse(uri); }
-
-        /// <summary>实例化</summary>
-        /// <param name="protocol"></param>
-        /// <param name="endpoint"></param>
-        public NetUri(ProtocolType protocol, IPEndPoint endpoint)
-        {
-            ProtocolType = protocol;
-            EndPoint = endpoint;
-        }
-
-        /// <summary>实例化</summary>
-        /// <param name="protocol"></param>
-        /// <param name="address"></param>
-        /// <param name="port"></param>
-        public NetUri(ProtocolType protocol, IPAddress address, Int32 port)
-        {
-            ProtocolType = protocol;
-            Address = address;
-            Port = port;
-        }
-        #endregion
-
-        #region 方法
-        static readonly String Sep = "://";
-
-        /// <summary>分析</summary>
-        /// <param name="uri"></param>
-        public NetUri Parse(String uri)
-        {
-            if (uri.IsNullOrWhiteSpace()) return this;
-
-            // 分析协议
-            var p = uri.IndexOf(Sep);
-            if (p > 0)
-            {
-                Protocol = uri.Substring(0, p);
-                uri = uri.Substring(p + Sep.Length);
-            }
-
-            // 分析端口
-            p = uri.LastIndexOf(":");
-            if (p > 0)
-            {
-                var pt = uri.Substring(p + 1);
-                Int32 port = 0;
-                if (Int32.TryParse(pt, out port))
-                {
-                    Port = port;
-                    uri = uri.Substring(0, p);
-                }
-            }
-
-            Host = uri;
-
-            return this;
-        }
-
-        /// <summary>克隆</summary>
-        /// <returns></returns>
-        public NetUri Clone()
-        {
-            return new NetUri().CopyFrom(this);
-        }
-
-        /// <summary>从另一个对象复制</summary>
-        /// <param name="uri"></param>
-        /// <returns></returns>
-        public NetUri CopyFrom(NetUri uri)
-        {
-            if (uri == null) return this;
-
-            this.Protocol = uri.Protocol;
-            this.Host = uri.Host;
-            this.Port = uri.Port;
-
-            return this;
-        }
-        #endregion
-
-        #region 辅助
-        /// <summary>已重载。</summary>
-        /// <returns></returns>
-        public override string ToString()
-        {
-            if (Port > 0)
-                return String.Format("{0}://{1}:{2}", Protocol, Host, Port);
-            else
-                return String.Format("{0}://{1}", Protocol, Host);
-        }
-        #endregion
-
-        #region IAccessor 成员
-
-        bool IAccessor.Read(IReader reader) { return false; }
-
-        bool IAccessor.ReadComplete(IReader reader, bool success)
-        {
-            // 因为反序列化仅给字段复制，重新设置一下，保证Protocol等属性有值
-            ProtocolType = ProtocolType;
-            EndPoint = EndPoint;
-
-            return success;
-        }
-
-        bool IAccessor.Write(IWriter writer) { return false; }
-
-        bool IAccessor.WriteComplete(IWriter writer, bool success) { return success; }
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Common/Pool.cs b/NewLife.Net/Common/Pool.cs
deleted file mode 100644
index c46cee890d..0000000000
--- a/NewLife.Net/Common/Pool.cs
+++ /dev/null
@@ -1,216 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading;
-
-namespace NewLife.Net.Common
-{
-    /// <summary>
-    /// 对象池
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    public class Pool<T> : IDisposable where T : new()
-    {
-        #region 属性
-        private Stack<T> _Stock;
-        /// <summary>在库</summary>
-        private Stack<T> Stock
-        {
-            get { return _Stock ?? (_Stock = new Stack<T>(Max)); }
-        }
-
-        //private List<T> _NotStock;
-        ///// <summary>不在库</summary>
-        //private List<T> NotStock
-        //{
-        //    get { return _NotStock ?? (_NotStock = new List<T>()); }
-        //}
-
-        private Int32 _Max = 10000;
-        /// <summary>最大缓存数</summary>
-        public Int32 Max
-        {
-            get { return _Max; }
-            set { _Max = value; }
-        }
-
-        /// <summary>在库</summary>
-        public Int32 StockCount { get { return _Stock == null ? 0 : _Stock.Count; } }
-
-        /// <summary>不在库</summary>
-        public Int32 NotStockCount { get { return CreateCount - StockCount; } }
-
-        private Int32 _CreateCount;
-        /// <summary>创建数</summary>
-        public Int32 CreateCount
-        {
-            get { return _CreateCount; }
-            //set { _CreateCount = value; }
-        }
-        #endregion
-
-        #region 方法
-        /// <summary>
-        /// 归还
-        /// </summary>
-        /// <param name="obj"></param>
-        public virtual void Push(T obj)
-        {
-            // 释放后，不再接受归还，因为可能别的线程尝试归还
-            if (Disposed) return;
-
-            Stack<T> stack = Stock;
-
-            //// 不是我的，我不要
-            //if (!NotStock.Contains(obj)) throw new Exception("不是我的我不要！");
-            // 满了，不要
-            if (stack.Count > Max) return;
-            lock (this)
-            {
-                if (Disposed) return;
-                //if (!NotStock.Contains(obj)) throw new Exception("不是我的我不要！");
-                if (stack.Count > Max) return;
-
-                if (stack.Contains(obj)) throw new Exception("设计错误，该对象已经存在于池中！");
-
-                stack.Push(obj);
-                //NotStock.Remove(obj);
-
-                //if (CreateCount != StockCount + NotStockCount) throw new Exception("设计错误！");
-            }
-        }
-
-        /// <summary>
-        /// 借出
-        /// </summary>
-        /// <returns></returns>
-        public virtual T Pop()
-        {
-            Stack<T> stack = Stock;
-
-            lock (this)
-            {
-                T obj = default(T);
-                if (stack.Count > 0)
-                {
-                    //obj = queue[0];
-                    //queue.RemoveAt(0);
-                    obj = stack.Pop();
-                }
-                else
-                {
-                    obj = Create();
-                    Interlocked.Increment(ref _CreateCount);
-                }
-                //NotStock.Add(obj);
-
-                //if (CreateCount != StockCount + NotStockCount) throw new Exception("设计错误！");
-                return obj;
-            }
-        }
-
-        /// <summary>
-        /// 创建实例
-        /// </summary>
-        /// <returns></returns>
-        protected virtual T Create()
-        {
-            return new T();
-        }
-
-        /// <summary>
-        /// 清空
-        /// </summary>
-        public void Clear()
-        {
-            lock (this)
-            {
-                if (_Stock != null) _Stock.Clear();
-                //if (_NotStock != null) _NotStock.Clear();
-            }
-        }
-        #endregion
-
-        #region 释放资源
-        /// <summary>
-        /// 释放资源
-        /// </summary>
-        public void Dispose()
-        {
-            Dispose(true);
-        }
-
-        /// <summary>是否已经释放</summary>
-        public Boolean Disposed
-        {
-            get { return disposed > 0; }
-        }
-
-        private Int32 disposed = 0;
-        /// <summary>
-        /// 释放资源，参数表示是否由Dispose调用。该方法保证OnDispose只被调用一次！
-        /// </summary>
-        /// <param name="disposing"></param>
-        private void Dispose(Boolean disposing)
-        {
-            if (disposed > 0) return;
-            Interlocked.Increment(ref disposed);
-
-            OnDispose(disposing);
-
-            Interlocked.Increment(ref disposed);
-        }
-
-        /// <summary>
-        /// 子类重载实现资源释放逻辑
-        /// </summary>
-        /// <param name="disposing">从Dispose调用（释放所有资源）还是析构函数调用（释放非托管资源）</param>
-        protected virtual void OnDispose(Boolean disposing)
-        {
-            if (disposed > 1) throw new Exception("设计错误，OnDispose应该只被调用一次！代码不应该直接调用OnDispose，而应该调用Dispose。");
-
-            if (disposing)
-            {
-                // 释放托管资源
-                if (typeof(IDisposable).IsAssignableFrom(typeof(T)))
-                {
-                    lock (this)
-                    {
-                        if (_Stock != null)
-                        {
-                            foreach (T item in _Stock.ToArray())
-                            {
-                                ((IDisposable)item).Dispose();
-                            }
-                            _Stock.Clear();
-                        }
-                        //if (_NotStock != null)
-                        //{
-                        //    foreach (T item in _NotStock.ToArray())
-                        //    {
-                        //        ((IDisposable)item).Dispose();
-                        //    }
-                        //    _NotStock.Clear();
-                        //}
-                    }
-                }
-
-                // 告诉GC，不要调用析构函数
-                GC.SuppressFinalize(this);
-            }
-
-            // 释放非托管资源
-        }
-
-        /// <summary>
-        /// 析构函数
-        /// </summary>
-        ~Pool()
-        {
-            // 如果忘记调用Dispose，这里会释放非托管资源
-            // 如果曾经调用过Dispose，因为GC.SuppressFinalize(this)，不会再调用该析构函数
-            Dispose(false);
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Common/ServerMessageProvider.cs b/NewLife.Net/Common/ServerMessageProvider.cs
deleted file mode 100644
index 02bc934316..0000000000
--- a/NewLife.Net/Common/ServerMessageProvider.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-﻿using System;
-using System.IO;
-using System.Net.Sockets;
-using NewLife.Messaging;
-using NewLife.Net.Sockets;
-using NewLife.Reflection;
-
-namespace NewLife.Net.Common
-{
-    /// <summary>网络服务消息提供者</summary>
-    /// <remarks>
-    /// 服务端是异步接收，在处理消息时不方便进一步了解网络相关数据，可通过<see cref="Message.UserState"/>附带用户会话。
-    /// 采用线程静态的弱引用<see cref="Session"/>来保存用户会话，便于发送消息。
-    /// </remarks>
-    public class ServerMessageProvider : MessageProvider
-    {
-        private NetServer _Server;
-        /// <summary>网络会话</summary>
-        public NetServer Server
-        {
-            get { return _Server; }
-            set
-            {
-                _Server = value;
-                if (value != null)
-                    MaxMessageSize = value.ProtocolType == ProtocolType.Udp ? 1472 : 1460;
-                else
-                    MaxMessageSize = 0;
-            }
-        }
-
-        /// <summary>实例化一个网络服务消息提供者</summary>
-        /// <param name="server"></param>
-        public ServerMessageProvider(NetServer server)
-        {
-            Server = server;
-
-            server.Received += server_Received;
-        }
-
-        /// <summary>当前会话</summary>
-        [ThreadStatic]
-        private static WeakReference<ISocketSession> Session = null;
-
-        void server_Received(object sender, ReceivedEventArgs e)
-        {
-            var session = sender as ISocketSession;
-            Session = new WeakReference<ISocketSession>(session);
-
-            var stream = e.Stream;
-            //// 如果上次还留有数据，复制进去
-            //if (session.Stream != null && session.Stream.Position < session.Stream.Length)
-            //{
-            //    // 这个流是上一次的完整数据，位置在最后，直接合并即可
-            //    var ms = session.Stream;
-            //    var p = ms.Position;
-            //    ms.Position = ms.Length;
-            //    stream.CopyTo(ms);
-            //    ms.Position = p;
-            //    stream = ms;
-            //}
-
-            OnReceive(session, stream);
-        }
-
-        /// <summary>收到数据流</summary>
-        /// <param name="session"></param>
-        /// <param name="stream"></param>
-        protected virtual void OnReceive(ISocketSession session, Stream stream)
-        {
-            try
-            {
-                Process(stream, session, session.Remote);
-
-                //// 如果还有剩下，写入数据流，供下次使用
-                //if (stream.Position < stream.Length)
-                //{
-                //    var ms = new MemoryStream();
-                //    stream.CopyTo(ms);
-                //    ms.Position = 0;
-                //    session.Stream = ms;
-                //}
-                //else
-                //    session.Stream = null;
-            }
-            catch (Exception ex)
-            {
-                if (NetHelper.Debug) NetHelper.WriteLog(ex.ToString());
-
-                // 去掉内部异常，以免过大
-                if (ex.InnerException != null) ex.SetValue("_innerException", null);
-                var msg = new ExceptionMessage() { Value = ex };
-                //session.Send(msg.GetStream());
-                OnSend(msg.GetStream());
-
-                //// 出错后清空数据流，避免连锁反应
-                //session.Stream = null;
-            }
-        }
-
-        /// <summary>发送数据流。</summary>
-        /// <param name="stream"></param>
-        protected override void OnSend(Stream stream)
-        {
-            var session = Session.Target;
-            // 如果为空，这里让它报错，否则无法查找问题所在
-            //if (session != null) session.Send(stream);
-            session.Send(stream);
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Common/SessionMessageProvider.cs b/NewLife.Net/Common/SessionMessageProvider.cs
deleted file mode 100644
index 60e5307423..0000000000
--- a/NewLife.Net/Common/SessionMessageProvider.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-﻿using System;
-using System.IO;
-using NewLife.Messaging;
-using NewLife.Net.Sockets;
-using NewLife.Reflection;
-
-namespace NewLife.Net.Common
-{
-    /// <summary>网络会话消息提供者</summary>
-    public class SessionMessageProvider : MessageProvider
-    {
-        private INetSession _Session;
-        /// <summary>网络会话</summary>
-        public INetSession Session { get { return _Session; } set { _Session = value; } }
-
-        /// <summary>实例化一个网络会话消息提供者</summary>
-        /// <param name="session"></param>
-        public SessionMessageProvider(INetSession session)
-        {
-            Session = session;
-
-            session.Received += new EventHandler<ReceivedEventArgs>(client_Received);
-        }
-
-        void client_Received(object sender, ReceivedEventArgs e)
-        {
-            var session = Session.Session;
-            var s = e.Stream;
-            //// 如果上次还留有数据，复制进去
-            //if (session.Stream != null && session.Stream.Position < session.Stream.Length)
-            //{
-            //    var ms = new MemoryStream();
-            //    session.Stream.CopyTo(ms);
-            //    s.CopyTo(ms);
-            //    s = ms;
-            //}
-            try
-            {
-                Process(s, session, session.Remote);
-
-                //// 如果还有剩下，写入数据流，供下次使用
-                //if (s.Position < s.Length)
-                //    session.Stream = s;
-                //else
-                //    session.Stream = null;
-            }
-            catch (Exception ex)
-            {
-                if (NetHelper.Debug) NetHelper.WriteLog(ex.ToString());
-
-                // 去掉内部异常，以免过大
-                if (ex.InnerException != null) ex.SetValue("_innerException", null);
-                var msg = new ExceptionMessage() { Value = ex };
-                session.Send(msg.GetStream());
-
-                //// 出错后清空数据流，避免连锁反应
-                //session.Stream = null;
-            }
-        }
-
-        /// <summary>发送数据流。</summary>
-        /// <param name="stream"></param>
-        protected override void OnSend(Stream stream) { Session.Send(stream); }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Common/Statistics.cs b/NewLife.Net/Common/Statistics.cs
deleted file mode 100644
index 08c791d95e..0000000000
--- a/NewLife.Net/Common/Statistics.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-﻿using System;
-using System.Threading;
-
-namespace NewLife.Net.Common
-{
-    /// <summary>统计</summary>
-    class Statistics : IStatistics
-    {
-        private Boolean _Enable;
-        /// <summary>是否启用统计</summary>
-        public Boolean Enable { get { return _Enable; } set { _Enable = value; } }
-
-        private DateTime _First;
-        /// <summary>首次统计时间</summary>
-        public DateTime First { get { return _First; } set { _First = value; } }
-
-        private DateTime _Last;
-        /// <summary>最后统计时间</summary>
-        public DateTime Last { get { return _Last; } }
-
-        private Int32 _Total;
-        /// <summary>每分钟最大值</summary>
-        public Int32 Total { get { return _Total; } set { _Total = value; } }
-
-        private Int32 _TotalPerMinute;
-        /// <summary>每分钟总操作</summary>
-        public Int32 TotalPerMinute { get { return _TotalPerMinute; } }
-
-        private Int32 _TotalPerHour;
-        /// <summary>每小时总操作</summary>
-        public Int32 TotalPerHour { get { return _TotalPerHour; } }
-
-        private Int32 _MaxPerMinute;
-        /// <summary>每分钟最大值</summary>
-        public Int32 MaxPerMinute { get { return _MaxPerMinute; } set { _MaxPerMinute = value; } }
-
-        /// <summary>每秒平均</summary>
-        public Int32 AveragePerSecond
-        {
-            get
-            {
-                if (Total <= 0) return 0;
-                TimeSpan ts = Last - First;
-                return ts.TotalSeconds > 0 ? (Int32)(0.5 + Total / ts.TotalSeconds) : 0;
-            }
-        }
-
-        /// <summary>每分钟平均</summary>
-        public Int32 AveragePerMinute
-        {
-            get
-            {
-                if (Total <= 0) return 0;
-                TimeSpan ts = Last - First;
-                return ts.TotalMinutes > 0 ? (Int32)(0.5 + Total / ts.TotalMinutes) : 0;
-            }
-        }
-
-        private DateTime _NextPerMinute;
-        private DateTime _NextPerHour;
-
-        /// <summary>增加计数</summary>
-        /// <param name="n"></param>
-        public void Increment(Int32 n = 1)
-        {
-            //_Total++;
-
-            //老树注释，删除多余代码
-            //if (n == 1)
-            //    Interlocked.Increment(ref _Total);
-            //else
-                Interlocked.Add(ref _Total, n);
-
-            DateTime now = DateTime.Now;
-            _Last = now;
-            if (_Total <= 100 && _First <= DateTime.MinValue) _First = now;
-
-            if (!Enable) return;
-
-            //_TotalPerMinute++;
-            //_TotalPerHour++;
-
-            //老树注释，删除多余代码
-            //if (n == 1)
-            //{
-            //    Interlocked.Increment(ref _TotalPerMinute);
-            //    Interlocked.Increment(ref _TotalPerHour);
-            //}
-            //else
-            //{
-                Interlocked.Add(ref _TotalPerMinute, n);
-                Interlocked.Add(ref _TotalPerHour, n);
-            //}
-
-            if (_NextPerMinute < now)
-            {
-                if (_NextPerMinute != DateTime.MinValue) _TotalPerMinute = 0;
-                _NextPerMinute = now.AddMinutes(1);
-            }
-
-            if (_NextPerHour < now)
-            {
-                if (_NextPerHour != DateTime.MinValue) _TotalPerHour = 0;
-                _NextPerHour = now.AddHours(1);
-            }
-
-            if (_TotalPerMinute > _MaxPerMinute) _MaxPerMinute = _TotalPerMinute;
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Common/WeakReference.cs b/NewLife.Net/Common/WeakReference.cs
deleted file mode 100644
index a0a085084e..0000000000
--- a/NewLife.Net/Common/WeakReference.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace NewLife.Net.Common
-{
-    /// <summary>
-    /// 弱引用
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    public class WeakReference<T> : WeakReference
-    {
-        /// <summary>
-        /// 实例化
-        /// </summary>
-        public WeakReference() : base(null) { }
-
-        /// <summary>
-        /// 实例化
-        /// </summary>
-        /// <param name="target"></param>
-        public WeakReference(T target) : base(target) { }
-
-        /// <summary>
-        /// 实例化
-        /// </summary>
-        /// <param name="target"></param>
-        /// <param name="trackResurrection"></param>
-        public WeakReference(T target, bool trackResurrection) : base(target, trackResurrection) { }
-
-        /// <summary>
-        /// 目标引用对象
-        /// </summary>
-        public new T Target
-        {
-            get { return (T)base.Target; }
-            set { base.Target = value; }
-        }
-
-        /// <summary>
-        /// 类型转换
-        /// </summary>
-        /// <param name="obj"></param>
-        /// <returns></returns>
-        public static implicit operator T(WeakReference<T> obj)
-        {
-            if (obj != null && obj.Target != null) return obj.Target;
-            return default(T);
-        }
-
-        /// <summary>
-        /// 类型转换
-        /// </summary>
-        /// <param name="target"></param>
-        /// <returns></returns>
-        public static implicit operator WeakReference<T>(T target)
-        {
-            return new WeakReference<T>(target);
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/DNS/BinaryDNS.cs b/NewLife.Net/DNS/BinaryDNS.cs
deleted file mode 100644
index d728e82552..0000000000
--- a/NewLife.Net/DNS/BinaryDNS.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-﻿using System;
-using NewLife.Serialization;
-
-namespace NewLife.Net.DNS
-{
-    /// <summary>DNS的二进制序列化</summary>
-    class BinaryDNS : BinaryHandlerBase
-    {
-        BinaryComposite _binary;
-        public DNSNameAccessor Accessor { get; set; }
-
-        public BinaryDNS()
-        {
-            //Priority = 90;
-            // 提高优先级，必须在基础处理器之前
-            Priority = 0;
-
-            _binary = new BinaryComposite();
-            Accessor = new DNSNameAccessor();
-        }
-
-        public override Boolean Write(Object value, Type type)
-        {
-            _binary.Host = Host;
-
-            // TXT记录的Text字段不采用DNS字符串
-            if (type == typeof(String) && Host.Member.Name != "_Text")
-            {
-                Int64 p = 0;
-                p += Host.Stream.Position;
-                Accessor.Write(Host.Stream, (String)value, p);
-
-                return true;
-            }
-            if (type == typeof(TimeSpan))
-            {
-                var ts = (TimeSpan)value;
-                Host.Write((Int32)ts.TotalSeconds);
-
-                return true;
-            }
-
-            return false;
-        }
-
-        public override Boolean TryRead(Type type, ref Object value)
-        {
-            _binary.Host = Host;
-
-            // TXT记录的Text字段不采用DNS字符串
-            if (type == typeof(String) && Host.Member.Name != "_Text")
-            {
-                value = Accessor.Read(Host.Stream, 0);
-
-                return true;
-            }
-            if (type == typeof(TimeSpan))
-            {
-                value = new TimeSpan(0, 0, Host.Read<Int32>());
-
-                return true;
-            }
-  
-            return false;
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/DNS/DNSClient.cs b/NewLife.Net/DNS/DNSClient.cs
deleted file mode 100644
index 1b60f722cd..0000000000
--- a/NewLife.Net/DNS/DNSClient.cs
+++ /dev/null
@@ -1,173 +0,0 @@
-﻿using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace NewLife.Net.DNS
-{
-    /// <summary>DNS客户端</summary>
-    public class DNSClient : DisposeBase
-    {
-        #region 属性
-        /// <summary>DNS服务器</summary>
-        public NetUri Server { get; set; }
-
-        /// <summary>网络客户端</summary>
-        public ISocketClient Client { get; set; }
-
-        /// <summary>总次数</summary>
-        public Int32 Total { get; private set; }
-
-        /// <summary>成功数</summary>
-        public Int32 Success { get; private set; }
-
-        /// <summary>成功率</summary>
-        public Double Percent { get { return Total == 0 ? 0 : (Double)Success / Total; } }
-        #endregion
-
-        #region 构造
-        /// <summary>使用本地DNS配置创建DNS客户端</summary>
-        public DNSClient()
-        {
-            var addr = NetHelper.GetDns().FirstOrDefault();
-            if (addr != null) Server = new NetUri(NetType.Udp, addr, 53);
-        }
-
-        /// <summary>使用指定目标服务器创建DNS客户端</summary>
-        /// <param name="uri"></param>
-        public DNSClient(NetUri uri)
-        {
-            Server = uri;
-        }
-
-        /// <summary>销毁</summary>
-        /// <param name="disposing"></param>
-        protected override void OnDispose(Boolean disposing)
-        {
-            base.OnDispose(disposing);
-
-            Client.TryDispose();
-        }
-        #endregion
-
-        #region 打开关闭
-        /// <summary>打开客户端</summary>
-        /// <returns></returns>
-        public Boolean Open()
-        {
-            if (Server == null) return false;
-
-            var nc = Client;
-            if (nc == null || nc.Disposed) nc = Client = Server.CreateRemote();
-            if (nc == null) return false;
-            if (nc.Active) return true;
-
-            nc.Timeout = 3000;
-
-            nc.Received += Client_Received;
-
-            return nc.Open();
-        }
-
-        private void Client_Received(Object sender, ReceivedEventArgs e)
-        {
-            if (e.Length == 0) return;
-
-            var dns = DNSEntity.Read(e.Stream, Client.Local.IsTcp);
-            OnReceive(dns);
-        }
-
-        /// <summary>关闭客户端</summary>
-        /// <param name="reason">关闭原因。便于日志分析</param>
-        /// <returns></returns>
-        public Boolean Close(String reason)
-        {
-            var nc = Client;
-            if (nc == null || !nc.Active) return true;
-
-            nc.Received -= Client_Received;
-
-            return nc.Close(reason);
-        }
-        #endregion
-
-        #region 主要方法
-        private TaskCompletionSource<DNSEntity> _recv;
-
-        /// <summary>收到响应</summary>
-        /// <param name="dns"></param>
-        protected virtual void OnReceive(DNSEntity dns)
-        {
-            if (dns != null) Success++;
-
-            _recv?.SetResult(dns);
-            _recv = null;
-        }
-
-        /// <summary>异步查询解析</summary>
-        /// <param name="dns"></param>
-        /// <returns></returns>
-        public virtual async Task<DNSEntity> QueryAsync(DNSEntity dns)
-        {
-            if (!Open()) return null;
-
-            var nc = Client;
-
-            var tcs = new TaskCompletionSource<DNSEntity>();
-            _recv = tcs;
-
-            // 发送请求
-            var ms = dns.GetStream(nc.Local.IsTcp);
-            nc.Send(ms.ReadBytes());
-
-            Total++;
-
-            return await tcs.Task;
-        }
-        #endregion
-
-        #region 辅助
-        /// <summary>已重载。</summary>
-        /// <returns></returns>
-        public override String ToString()
-        {
-            return "{0} {1:n0}/{2:n0}={3:p0}".F(Server, Success, Total, Percent);
-        }
-        #endregion
-
-        #region 静态
-        /// <summary>使用一批DNS客户端发起请求</summary>
-        /// <param name="clients"></param>
-        /// <param name="dns"></param>
-        /// <param name="msTimeout"></param>
-        /// <returns></returns>
-        public static IDictionary<DNSClient, DNSEntity> QueryAll(IEnumerable<DNSClient> clients, DNSEntity dns, Int32 msTimeout = 1000)
-        {
-            DNSClient[] cs = null;
-            lock (clients) { cs = clients.ToArray(); }
-
-            // 所有客户端同时发出请求
-            var ts = new List<Task<DNSEntity>>();
-            foreach (var client in cs)
-            {
-                var task = client.QueryAsync(dns);
-                ts.Add(task);
-            }
-
-            // 等待所有客户端响应，或者超时
-            Task.WaitAll(ts.ToArray(), msTimeout);
-
-            // 获取结果
-            var dic = new Dictionary<DNSClient, DNSEntity>();
-            for (var i = 0; i < cs.Length; i++)
-            {
-                var task = ts[i];
-                if (task.IsOK() && task.Result != null) dic.Add(cs[i], task.Result);
-            }
-
-            return dic;
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/DNS/DNSEntity.cs b/NewLife.Net/DNS/DNSEntity.cs
deleted file mode 100644
index 5eebdad919..0000000000
--- a/NewLife.Net/DNS/DNSEntity.cs
+++ /dev/null
@@ -1,271 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Text;
-using NewLife.Messaging;
-using NewLife.Reflection;
-using NewLife.Serialization;
-
-namespace NewLife.Net.DNS
-{
-    /// <summary>DNS实体类基类</summary>
-    /// <remarks>
-    /// 参考博客园 @看那边的人 <a target="_blank" href="http://www.cnblogs.com/topdog/archive/2011/11/15/2250185.html">DIY一个DNS查询器：了解DNS协议</a> 
-    /// <a target="_blank" href="http://www.cnblogs.com/topdog/archive/2011/11/21/2257597.html">DIY一个DNS查询器：程序实现</a>
-    /// </remarks>
-    public class DNSEntity : Message<DNSEntity>
-    {
-        #region 属性
-        private DNSHeader _Header = new DNSHeader();
-        /// <summary>头部</summary>
-        public DNSHeader Header { get { return _Header; } set { _Header = value; } }
-
-        [FieldSize("_Header._Questions")]
-        private DNSQuery[] _Questions;
-        /// <summary>请求段</summary>
-        public DNSQuery[] Questions { get { return _Questions; } set { _Questions = value; } }
-
-        [FieldSize("_Header._Answers")]
-        private DNSRecord[] _Answers;
-        /// <summary>回答段</summary>
-        public DNSRecord[] Answers { get { return _Answers; } set { _Answers = value; } }
-
-        [FieldSize("_Header._Authorities")]
-        private DNSRecord[] _Authoritis;
-        /// <summary>授权段</summary>
-        public DNSRecord[] Authoritis { get { return _Authoritis; } set { _Authoritis = value; } }
-
-        [FieldSize("_Header._Additionals")]
-        private DNSRecord[] _Additionals;
-        /// <summary>附加段</summary>
-        public DNSRecord[] Additionals { get { return _Additionals; } set { _Additionals = value; } }
-        #endregion
-
-        #region 扩展属性
-        ///// <summary>是否响应</summary>
-        //public Boolean Response { get { return Header.Response; } set { Header.Response = value; } }
-
-        //DNSQuery Question
-        //{
-        //    get
-        //    {
-        //        if (Questions == null || Questions.Length < 1) Questions = new DNSQuery[] { new DNSQuery() };
-
-        //        return Questions[0];
-        //    }
-        //}
-
-        ///// <summary>名称</summary>
-        //public virtual String Name { get { return Question.Name; } set { Question.Name = value; } }
-
-        ///// <summary>查询类型</summary>
-        //public virtual DNSQueryType Type { get { return Question.Type; } set { Question.Type = value; } }
-
-        ///// <summary>协议组</summary>
-        //public virtual DNSQueryClass Class { get { return Question.Class; } set { Question.Class = value; } }
-
-        /// <summary>获取响应</summary>
-        /// <param name="create"></param>
-        /// <returns></returns>
-        internal protected DNSRecord GetAnswer(Boolean create = false)
-        {
-            var qs = Questions;
-            if (qs == null || qs.Length == 0) return null;
-
-            var type = qs.First().Type;
-            if (Answers == null || Answers.Length < 1)
-            {
-                if (!create) return null;
-
-                Answers = new DNSRecord[] { CreateRecord(type) };
-            }
-
-            foreach (var item in Answers)
-            {
-                if (item.Type == type) return item;
-            }
-
-            return Answers[0];
-        }
-
-        ///// <summary>是否PTR类型</summary>
-        //public Boolean IsPTR { get { return Type == DNSQueryType.PTR; } }
-        #endregion
-
-        #region 读写
-        /// <summary>把当前对象写入到数据流中去</summary>
-        /// <param name="stream"></param>
-        /// <param name="forTcp">是否是Tcp，Tcp需要增加整个流长度</param>
-        public void Write(Stream stream, Boolean forTcp)
-        {
-            if (forTcp)
-            {
-                // 必须独立写然后再补长度，否则内部字符串长度偏移不正确
-                var ms = new MemoryStream();
-                Write(ms, null);
-
-                stream.Write(((Int16)ms.Length).GetBytes(false));
-                ms.WriteTo(stream);
-            }
-            else
-                Write(stream, null);
-        }
-
-        /// <summary>获取当前对象的数据流</summary>
-        /// <param name="forTcp">是否是Tcp，Tcp需要增加整个流长度</param>
-        /// <returns></returns>
-        public Stream GetStream(Boolean forTcp)
-        {
-            var ms = new MemoryStream();
-            Write(ms, forTcp);
-            ms.Position = 0;
-
-            return ms;
-        }
-
-        /// <summary>从数据中读取对象</summary>
-        /// <param name="data"></param>
-        /// <param name="forTcp">是否是Tcp，Tcp需要增加整个流长度</param>
-        /// <returns></returns>
-        public static DNSEntity Read(Byte[] data, Boolean forTcp)
-        {
-            if (data == null || data.Length < 1) return null;
-
-            return Read(new MemoryStream(data), forTcp);
-        }
-
-        /// <summary>从数据流中读取对象，返回<see cref="DNS_A"/>、<see cref="DNS_PTR"/>等真实对象</summary>
-        /// <param name="stream"></param>
-        /// <param name="forTcp">是否是Tcp，Tcp需要增加整个流长度</param>
-        /// <returns></returns>
-        public static DNSEntity Read(Stream stream, Boolean forTcp)
-        {
-            // 跳过2个字节的长度
-            if (forTcp)
-            {
-                // 必须全部先读出来，否则内部的字符串映射位移不正确
-                //var data = new Byte[2];
-                //stream.Read(data, 0, data.Length);
-                //// 网络序变为主机序
-                //Array.Reverse(data);
-                //var len = BitConverter.ToInt16(data, 0);
-                //data = new Byte[len];
-                //stream.Read(data, 0, data.Length);
-                var len = stream.ReadBytes(2).ToUInt16(0, false);
-                var data = stream.ReadBytes(len);
-
-                stream = new MemoryStream(data);
-            }
-
-            return Read(stream);
-        }
-
-        /// <summary>创建序列化器</summary>
-        /// <param name="isRead"></param>
-        /// <returns></returns>
-        protected override IFormatterX CreateFormatter(Boolean isRead)
-        {
-            var fm = base.CreateFormatter(isRead);
-            fm.Encoding = Encoding.UTF8;
-            fm.UseProperty = false;
-
-            var bn = fm as Binary;
-            if (bn != null)
-            {
-                bn.EncodeInt = false;
-                bn.UseFieldSize = true;
-                bn.UseRef = false;
-                bn.AddHandler<BinaryDNS>();
-            }
-
-            return fm;
-        }
-        #endregion
-
-        #region 注册子类型
-        static Dictionary<DNSQueryType, Type> entitytypes = new Dictionary<DNSQueryType, Type>();
-        static DNSEntity()
-        {
-            foreach (var item in typeof(DNSRecord).GetAllSubclasses())
-            {
-                if (item == typeof(DNSRecord)) continue;
-
-                var dr = item.CreateInstance() as DNSRecord;
-                if (dr != null) entitytypes.Add(dr.Type, item);
-            }
-        }
-
-        /// <summary>创建指定类型的记录</summary>
-        /// <param name="qt"></param>
-        /// <returns></returns>
-        public static DNSRecord CreateRecord(DNSQueryType qt)
-        {
-            if (!entitytypes.TryGetValue(qt, out var type) || type == null) return null;
-
-            return type.CreateInstance() as DNSRecord;
-        }
-        #endregion
-
-        #region 辅助
-        /// <summary>复制</summary>
-        /// <param name="entity"></param>
-        public virtual DNSEntity CloneFrom(DNSEntity entity)
-        {
-            var de = this;
-            de.Header = entity.Header;
-            de.Questions = entity.Questions;
-            de.Answers = entity.Answers;
-            de.Authoritis = entity.Authoritis;
-            de.Additionals = entity.Additionals;
-
-            return de;
-        }
-
-        /// <summary>已重载。</summary>
-        /// <returns></returns>
-        [DebuggerHidden]
-        public override String ToString()
-        {
-            var rs = Questions;
-            if (!Header.Response)
-            {
-                if (rs != null && rs.Length > 0)
-                    return rs[0].ToString();
-            }
-            else
-            {
-                var sb = new StringBuilder();
-
-                if (rs != null && rs.Length > 0)
-                    sb.AppendFormat("[{0}]", rs[0]);
-
-                if (Answers != null && Answers.Length > 0)
-                {
-                    foreach (var item in Answers)
-                    {
-                        if (sb.Length > 0) sb.Append(" ");
-                        sb.Append(item);
-                    }
-                }
-                else if (Authoritis != null && Authoritis.Length > 0)
-                {
-                    foreach (var item in Authoritis)
-                    {
-                        if (sb.Length > 0) sb.Append(" ");
-                        sb.Append(item);
-                    }
-                }
-                else if (Header.ResponseCode == DNSRcodeType.NameError)
-                    sb.Append("No such name");
-
-                return sb.ToString();
-                //return String.Format("Response {0}", sb);
-            }
-
-            return base.ToString();
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/DNS/DNSHeader.cs b/NewLife.Net/DNS/DNSHeader.cs
deleted file mode 100644
index 94784e6f25..0000000000
--- a/NewLife.Net/DNS/DNSHeader.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-﻿using System;
-
-namespace NewLife.Net.DNS
-{
-    /// <summary>DNS头部</summary>
-    public class DNSHeader
-    {
-        #region 属性
-        /// <summary>全局编号，不断累加</summary>
-        static Int16 gid = 1;
-
-        private Int16 _ID;
-        /// <summary>长度为16位，是一个用户发送查询的时候定义的随机数，当服务器返回结果的时候，返回包的ID与用户发送的一致。</summary>
-        public Int16 ID { get { return _ID; } set { _ID = value; } }
-
-        /// <summary>默认RecursionDesired</summary>
-        private D1 _D1 = D1.RecursionDesired;
-
-        /// <summary>是否响应</summary>
-        public Boolean Response { get { return _D1.Has(D1.Response); } set { _D1 = _D1.Set<D1>(D1.Response, value); } }
-
-        /// <summary>长度4位，值0是标准查询，1是反向查询，2是服务器状态查询。</summary>
-        public DNSOpcodeType Opcode { get { return (DNSOpcodeType)(((UInt16)_D1 >> 3) & 0xFF); } set { _D1 = (D1)((UInt16)_D1 | ((Byte)value << 3)); } }
-
-        /// <summary>长度1位，授权应答(Authoritative Answer) - 这个比特位在应答的时候才有意义，指出给出应答的服务器是查询域名的授权解析服务器。</summary>
-        public Boolean AuthoritativeAnswer { get { return _D1.Has(D1.AuthoritativeAnswer); } set { _D1 = _D1.Set<D1>(D1.AuthoritativeAnswer, value); } }
-
-        /// <summary>长度1位，截断(TrunCation) - 用来指出报文比允许的长度还要长，导致被截断。</summary>
-        public Boolean TrunCation { get { return _D1.Has(D1.TrunCation); } set { _D1 = _D1.Set<D1>(D1.TrunCation, value); } }
-
-        /// <summary>长度1位，期望递归(Recursion Desired) - 这个比特位被请求设置，应答的时候使用的相同的值返回。如果设置了RD，就建议域名服务器进行递归解析，递归查询的支持是可选的。</summary>
-        public Boolean RecursionDesired { get { return _D1.Has(D1.RecursionDesired); } set { _D1 = _D1.Set<D1>(D1.RecursionDesired, value); } }
-
-        // 一个字节，因为Z是保留3位，这里干脆占用了它的位置
-        private Byte _D2;
-
-        /// <summary>长度1位，支持递归(Recursion Available) - 这个比特位在应答中设置或取消，用来代表服务器是否支持递归查询。</summary>
-        public Boolean RecursionAvailable { get { return (_D2 & 0x80) == 0x80; } set { _D2 = (Byte)(value ? _D2 | 0x80 : _D2 & 0x7F); } }
-
-        internal UInt16 Reserved
-        {
-            get { return ((UInt16)_D2).GetBits(4, 3); }
-            set { ((UInt16)_D2).SetBits(4, 3, value); }
-        }
-
-        /// <summary>Broadcast Flag</summary>
-        public Boolean Broadcast
-        {
-            get { return _D2.GetBit(4); }
-            set { _D2.SetBit(4, value); }
-        }
-
-        //private Byte _ResponseCode;
-        /// <summary>长度4位，应答码，类似http的stateCode一样，值0没有错误、1格式错误、2服务器错误、3名字错误、4服务器不支持、5拒绝。</summary>
-        public DNSRcodeType ResponseCode { get { return (DNSRcodeType)(_D2 & 0x0F); } set { _D2 = (Byte)(_D2 | ((Byte)value & 0x0F)); } }
-
-        private Int16 _Questions;
-        /// <summary>报文请求段中的问题记录数</summary>
-        public Int16 Questions { get { return _Questions; } set { _Questions = value; } }
-
-        private Int16 _Answers;
-        /// <summary>报文回答段中的回答记录数</summary>
-        public Int16 Answers { get { return _Answers; } set { _Answers = value; } }
-
-        private Int16 _Authorities;
-        /// <summary>报文授权段中的授权记录数</summary>
-        public Int16 Authoritis { get { return _Authorities; } set { _Authorities = value; } }
-
-        private Int16 _Additionals;
-        /// <summary>报文附加段中的附加记录数</summary>
-        public Int16 Additionals { get { return _Additionals; } set { _Additionals = value; } }
-        #endregion
-
-        #region 构造
-        /// <summary>实例化一个DNS头部</summary>
-        public DNSHeader() { ID = gid++; }
-        #endregion
-
-        #region 枚举
-        [Flags]
-        enum D1 : Byte
-        {
-            RecursionDesired = 1,
-
-            TrunCation = 2,
-
-            AuthoritativeAnswer = 4,
-
-            //Opcode = 8 + 16,
-            Opcode1 = 8,
-            Opcode2 = 16,
-            Opcode3 = 32,
-            Opcode4 = 64,
-
-            Response = 128,
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/DNS/DNSNameAccessor.cs b/NewLife.Net/DNS/DNSNameAccessor.cs
deleted file mode 100644
index 655364c18b..0000000000
--- a/NewLife.Net/DNS/DNSNameAccessor.cs
+++ /dev/null
@@ -1,192 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-
-namespace NewLife.Net.DNS
-{
-    /// <summary>DNS名称访问器</summary>
-    class DNSNameAccessor
-    {
-        #region 属性
-        /// <summary>键</summary>
-        public List<Int32> Keys { get; set; }
-
-        /// <summary>值</summary>
-        public List<String> Values { get; set; }
-        #endregion
-
-        #region 构造
-        /// <summary>实例化DNS名称访问器</summary>
-        public DNSNameAccessor()
-        {
-            Keys = new List<Int32>();
-            Values = new List<String>();
-        }
-        #endregion
-
-        #region 方法
-        String this[Int32 key]
-        {
-            get
-            {
-                var p = Keys.IndexOf(key);
-#if DEBUG
-                if (p < 0) throw new XException("DNS名称解析未找到序号为{0}的字符串！", key);
-#else
-                if (p < 0) return null;
-#endif
-                return Values[p];
-            }
-        }
-
-        Int32 this[String value]
-        {
-            get
-            {
-                var p = Values.IndexOf(value);
-                if (p < 0) throw new XException("DNS名称解析未找到字符串为{0}的序号！", value);
-                return Keys[p];
-            }
-        }
-
-        /// <summary>从流中读取字符串</summary>
-        /// <param name="stream">数据流</param>
-        /// <param name="offset">数据流相对于真正数据的位移</param>
-        /// <returns></returns>
-        public String Read(Stream stream, Int64 offset)
-        {
-            // 先用局部变量临时保存，因为每新读出来一段，就要全部加上去
-            var keys = new List<Int32>();
-            var values = new List<String>();
-
-            var start = stream.Position;
-            var p = start;
-            var n = 0;
-            var sb = new StringBuilder();
-            while (true)
-            {
-                n = stream.ReadByte();
-                if (n == 0) break;
-                //if (n == -1) n = (Int32)(Byte)n;
-                if (n == -1) break;
-
-                if (sb.Length > 0) sb.Append(".");
-
-                String str = null;
-
-                // 0xC0表示是引用，下一个地址指示偏移量
-                //if (n == 0xC0)
-                if (n >= 0xC0)
-                {
-                    var n2 = stream.ReadByte();
-                    // 偏移量的标准公式是：(Cn-C0)*256+偏移
-                    str = this[(n - 0xC0) * 256 + n2];
-
-                    // 之前的每个加上str
-                    for (var i = 0; i < values.Count; i++) values[i] += "." + str;
-
-                    // 局部引用，前面还有一段本地读出来的，这样子，整个就形成了一个新的字符串
-                    if (sb.Length > 0)
-                    {
-                        keys.Add((Int32)(offset + start));
-                        values.Add(sb + str);
-                    }
-
-                    sb.Append(str);
-
-                    break;
-                }
-
-                var buffer = stream.ReadBytes(n);
-                str = Encoding.UTF8.GetString(buffer);
-
-                // 之前的每个加上str
-                for (var i = 0; i < values.Count; i++) values[i] += "." + str;
-
-                // 加入当前项。因为引用项马上就要跳出了，不会做二次引用，所以不加
-                if (!values.Contains(str))
-                {
-                    keys.Add((Int32)(offset + p));
-                    values.Add(str);
-                }
-
-                sb.Append(str);
-
-                p = stream.Position;
-            }
-            for (var i = 0; i < keys.Count; i++)
-            {
-                if (!Values.Contains(values[i]))
-                {
-                    Keys.Add(keys[i]);
-                    Values.Add(values[i]);
-                }
-            }
-
-            return sb.ToString();
-        }
-
-        public void Write(Stream stream, String value, Int64 offset)
-        {
-            // 先用局部变量临时保存，因为每新读出来一段，就要全部加上去
-            var keys = new List<Int32>();
-            var values = new List<String>();
-
-            var start = stream.Position;
-            var p = 0;
-            var isRef = false;
-            var ss = ("" + value).Split(".");
-            for (var i = 0; i < ss.Length; i++)
-            {
-                isRef = false;
-
-                // 如果已存在，则写引用
-                var name = String.Join(".", ss, i, ss.Length - i);
-                if (Values.Contains(name))
-                {
-                    //stream.WriteByte(0xC0);
-                    //stream.WriteByte((Byte)this[name]);
-
-                    // 偏移量的标准公式是：(Cn-C0)*256+偏移
-                    // 相对位置，注意超长位移（大于0xFF）
-                    var abp = this[name];
-                    var ab = abp / 0xFF;
-                    abp = abp & 0xFF;
-                    stream.WriteByte((Byte)(0xC0 + ab));
-                    stream.WriteByte((Byte)abp);
-
-                    // 之前的每个加上str
-                    for (var j = 0; j < values.Count; j++) values[j] += "." + name;
-
-                    // 使用引用的必然是最后一个
-                    isRef = true;
-
-                    break;
-                }
-
-                // 否则，先写长度，后存入引用
-                p = (Int32)(stream.Position - start);
-
-                var buffer = Encoding.UTF8.GetBytes(ss[i]);
-                stream.WriteByte((Byte)buffer.Length);
-                stream.Write(buffer, 0, buffer.Length);
-
-                // 之前的每个加上str
-                for (var j = 0; j < values.Count; j++) values[j] += "." + ss[i];
-
-                // 加入当前项
-                keys.Add((Int32)(offset + p));
-                values.Add(ss[i]);
-            }
-            if (!isRef) stream.WriteByte((Byte)0);
-
-            for (var i = 0; i < keys.Count; i++)
-            {
-                Keys.Add(keys[i]);
-                Values.Add(values[i]);
-            }
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/DNS/DNSOpcodeType.cs b/NewLife.Net/DNS/DNSOpcodeType.cs
deleted file mode 100644
index 010177bead..0000000000
--- a/NewLife.Net/DNS/DNSOpcodeType.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-﻿using System;
-
-namespace NewLife.Net.DNS
-{
-    /// <summary>
-    /// The Query Types (OPCODE) that specifies kind of query in a message.
-    /// (RFC 1035 4.1.1 and 1002 4.2.1.1)
-    /// </summary>
-    public enum DNSOpcodeType : Byte
-    {
-        /// <summary>A standard query (QUERY); used for NetBIOS, too</summary>
-        Query = 0,
-
-        /// <summary>An inverse query (IQUERY)</summary>
-        InverseQuery = 1,
-
-        /// <summary>A server status request (STATUS)</summary>
-        Status = 2,
-
-        /// <summary>Reserved for future use</summary>
-        //[Obsolete("Reserved for future use.")]
-        Reserverd3 = 3,
-
-        /// <summary>Reserved for future use</summary>
-        //[Obsolete("Reserved for future use.")]
-        Reserverd4 = 4,
-
-        /// <summary>NetBIOS registration</summary>
-        Registration = 5,
-
-        /// <summary>NetBIOS release</summary>
-        Release = 6,
-
-        /// <summary>NetBIOS WACK</summary>
-        WACK = 7,
-
-        /// <summary>NetBIOS refresh</summary>
-        Refresh = 8,
-
-        /// <summary>Reserved for future use</summary>
-        //[Obsolete("Reserved for future use.")]
-        Reserverd9 = 9,
-
-        /// <summary>Reserved for future use</summary>
-        //[Obsolete("Reserved for future use.")]
-        Reserverd10 = 10,
-
-        /// <summary>Reserved for future use</summary>
-        //[Obsolete("Reserved for future use.")]
-        Reserverd11 = 11,
-
-        /// <summary>Reserved for future use</summary>
-        //[Obsolete("Reserved for future use.")]
-        Reserverd12 = 12,
-
-        /// <summary>Reserved for future use</summary>
-        //[Obsolete("Reserved for future use.")]
-        Reserverd13 = 13,
-
-        /// <summary>Reserved for future use</summary>
-        //[Obsolete("Reserved for future use.")]
-        Reserverd14 = 14,
-
-        /// <summary>Reserved for future use</summary>
-        //[Obsolete("Reserved for future use.")]
-        Reserverd15 = 15
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/DNS/DNSQueryType.cs b/NewLife.Net/DNS/DNSQueryType.cs
deleted file mode 100644
index eec4e19c75..0000000000
--- a/NewLife.Net/DNS/DNSQueryType.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-﻿
-namespace NewLife.Net.DNS
-{
-    /// <summary>查询的资源记录类型</summary>
-    public enum DNSQueryType : System.UInt16
-    {
-        /// <summary>指定计算机 IP 地址。</summary>
-        A = 0x01,
-
-        /// <summary>指定用于命名区域的 DNS 名称服务器。</summary>
-        NS = 0x02,
-
-        /// <summary>指定邮件接收站（此类型已经过时了，使用MX代替）</summary>
-        MD = 0x03,
-
-        /// <summary>指定邮件中转站（此类型已经过时了，使用MX代替）</summary>
-        MF = 0x04,
-
-        /// <summary>指定用于别名的规范名称。</summary>
-        CNAME = 0x05,
-
-        /// <summary>指定用于 DNS 区域的“起始授权机构”。</summary>
-        SOA = 0x06,
-
-        /// <summary>指定邮箱域名。</summary>
-        MB = 0x07,
-
-        /// <summary>指定邮件组成员。</summary>
-        MG = 0x08,
-
-        /// <summary>指定邮件重命名域名。</summary>
-        MR = 0x09,
-
-        /// <summary>指定空的资源记录</summary>
-        NULL = 0x0A,
-
-        /// <summary>描述已知服务。</summary>
-        WKS = 0x0B,
-
-        /// <summary>如果查询是 IP 地址，则指定计算机名；否则指定指向其它信息的指针。</summary>
-        PTR = 0x0C,
-
-        /// <summary>指定计算机 CPU 以及操作系统类型。</summary>
-        HINFO = 0x0D,
-
-        /// <summary>指定邮箱或邮件列表信息。</summary>
-        MINFO = 0x0E,
-
-        /// <summary>指定邮件交换器。</summary>
-        MX = 0x0F,
-
-        /// <summary>指定文本信息。</summary>
-        TXT = 0x10,
-
-        /// <summary>NetBIOS general Name Service Resource Record</summary>
-        NB = 32,
-
-        /// <summary>NetBIOS NODE STATUS Resource Record</summary>
-        NBSTAT = 33,
-
-        /// <summary>IPv6地址</summary>
-        AAAA = 0x1C,
-
-        /// <summary>根</summary>
-        Root = 0x1D,
-
-        /// <summary>指定用户信息。</summary>
-        UINFO = 0x64,
-
-        /// <summary>指定用户标识符。</summary>
-        UID = 0x65,
-
-        /// <summary>指定组名的组标识符。</summary>
-        GID = 0x66,
-
-        /// <summary>指定所有数据类型。</summary>
-        ANY = 0xFF
-    }
-
-    /// <summary>指定信息的协议组</summary>
-    public enum DNSQueryClass : System.UInt16
-    {
-        /// <summary>指定 Internet 类别。</summary>
-        IN = 0x01,
-
-        /// <summary>指定 CSNET 类别。（已过时）</summary>
-        CSNET = 0x02,
-
-        /// <summary>指定 Chaos 类别。</summary>
-        CHAOS = 0x03,
-
-        /// <summary>指定 MIT Athena Hesiod 类别。</summary>
-        HESIOD = 0x04,
-
-        /// <summary>指定任何以前列出的通配符。</summary>
-        ANY = 0xFF
-    };
-}
\ No newline at end of file
diff --git a/NewLife.Net/DNS/DNSQuestion.cs b/NewLife.Net/DNS/DNSQuestion.cs
deleted file mode 100644
index 351a0da8e7..0000000000
--- a/NewLife.Net/DNS/DNSQuestion.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Text;
-using NewLife.Serialization;
-
-namespace NewLife.Net.DNS
-{
-    class DNSQuestion : IAccessor
-    {
-        #region 属性
-        [NonSerialized]
-        private String _Name;
-        /// <summary>属性说明</summary>
-        public String Name { get { return _Name; } set { _Name = value; } }
-
-        private DNSQueryType _Type;
-        /// <summary>属性说明</summary>
-        public DNSQueryType Type { get { return _Type; } set { _Type = value; } }
-
-        private DNSQueryClass _Class;
-        /// <summary>属性说明</summary>
-        public DNSQueryClass Class { get { return _Class; } set { _Class = value; } }
-        #endregion
-
-        #region IAccessor 成员
-
-        bool IAccessor.Read(IReader reader)
-        {
-            // 提前读取名称
-            Name = ReadName(reader);
-
-            return false;
-        }
-
-        bool IAccessor.ReadComplete(IReader reader, bool success) { return success; }
-
-        bool IAccessor.Write(IWriter writer)
-        {
-            // 提前写入名称
-            WriteName(writer, Name);
-
-            return false;
-        }
-
-        bool IAccessor.WriteComplete(IWriter writer, bool success) { return success; }
-
-        #endregion
-
-        #region 处理名称
-        internal static String ReadName(IReader reader)
-        {
-            Int32 n = 0;
-            StringBuilder sb = new StringBuilder();
-            while ((n = reader.ReadByte()) != 0)
-            {
-                if (sb.Length > 0) sb.Append(".");
-
-                Byte[] buffer = reader.ReadBytes(n);
-                sb.Append(Encoding.UTF8.GetString(buffer));
-            }
-
-            return sb.ToString();
-        }
-
-        internal static void WriteName(IWriter writer, String value)
-        {
-            String[] ss = ("" + value).Split(".");
-            for (int i = 0; i < ss.Length; i++)
-            {
-                Byte[] buffer = Encoding.UTF8.GetBytes(ss[i]);
-                writer.Write((Byte)buffer.Length);
-                writer.Write(buffer, 0, buffer.Length);
-            }
-            writer.Write((Byte)0);
-        }
-        #endregion
-    }
-}
diff --git a/NewLife.Net/DNS/DNSRcodeType.cs b/NewLife.Net/DNS/DNSRcodeType.cs
deleted file mode 100644
index 731afde8f4..0000000000
--- a/NewLife.Net/DNS/DNSRcodeType.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-﻿
-namespace NewLife.Net.DNS
-{
-    /// <summary>These are the return codes (RCODE) the server can send back. (RFC 1035 4.1.1)</summary>
-    public enum DNSRcodeType
-    {
-        /// <summary>No error condition</summary>
-        Success = 0,
-
-        /// <summary>The name server was unable to interpret the query.</summary>
-        FormatError = 1,
-
-        /// <summary>
-        /// The name server was unable to process this query due to a problem 
-        /// with the name server.
-        /// </summary>
-        ServerFailure = 2,
-
-        /// <summary>
-        /// Meaningful only for responses from an authoritative name server, 
-        /// this code signifies that the domain name referenced in the query 
-        /// does not exist.
-        /// </summary>
-        NameError = 3,
-
-        /// <summary>The name server does not support the requested kind of query.</summary>
-        NotImplemented = 4,
-
-        /// <summary>
-        /// The name server refuses to perform the specified operation for 
-        /// policy reasons.  For example, a name server may not wish to provide 
-        /// the information to the particular requester, or a name server may 
-        /// not wish to perform a particular operation (e.g., zone transfer) 
-        /// for particular data.
-        /// </summary>
-        Refused = 5,
-
-        /// <summary>Reserved for future use</summary>
-        Reserverd6 = 6,
-
-        /// <summary>Reserved for future use</summary>
-        Reserverd7 = 7,
-
-        /// <summary>Reserved for future use</summary>
-        Reserverd8 = 8,
-
-        /// <summary>Reserved for future use</summary>
-        Reserverd9 = 9,
-
-        /// <summary>Reserved for future use</summary>
-        Reserverd10 = 10,
-
-        /// <summary>Reserved for future use</summary>
-        Reserverd11 = 11,
-
-        /// <summary>Reserved for future use</summary>
-        Reserverd12 = 12,
-
-        /// <summary>Reserved for future use</summary>
-        Reserverd13 = 13,
-
-        /// <summary>Reserved for future use</summary>
-        Reserverd14 = 14,
-
-        /// <summary>Reserved for future use</summary>
-        Reserverd15 = 15
-    }
-}
diff --git a/NewLife.Net/DNS/DNSRecord.cs b/NewLife.Net/DNS/DNSRecord.cs
deleted file mode 100644
index 5809056de1..0000000000
--- a/NewLife.Net/DNS/DNSRecord.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-﻿using System;
-using System.Reflection;
-using NewLife.Serialization;
-using System.Linq;
-
-namespace NewLife.Net.DNS
-{
-    /// <summary>DNS查询记录</summary>
-    public class DNSQuery
-    {
-        #region 属性
-        private String _Name;
-        /// <summary>名称</summary>
-        public String Name { get { return _Name; } set { _Name = value; } }
-
-        private DNSQueryType _Type = DNSQueryType.A;
-        /// <summary>查询类型</summary>
-        public virtual DNSQueryType Type { get { return _Type; } set { _Type = value; } }
-
-        private DNSQueryClass _Class = DNSQueryClass.IN;
-        /// <summary>协议组</summary>
-        public DNSQueryClass Class { get { return _Class; } set { _Class = value; } }
-        #endregion
-
-        #region 辅助
-        /// <summary>已重载。</summary>
-        /// <returns></returns>
-        public override String ToString() { return String.Format("{0} {1}", Type, Name); }
-        #endregion
-    }
-
-    /// <summary>DNS记录</summary>
-    public class DNSRecord : DNSQuery, IMemberAccessor
-    {
-        #region 属性
-        private TimeSpan _TTL;
-        /// <summary>生存时间。4字节，指示RDATA中的资源记录在缓存的生存时间。</summary>
-        public TimeSpan TTL { get { return _TTL; } set { _TTL = value; } }
-
-        /// <summary>长度</summary>
-        /// <remarks>后面应该是一个数据区域，留给派生类</remarks>
-        private Int16 _Length;
-
-        //[FieldSize("_Length")]
-        //private Byte[] _Data;
-        ///// <summary>资源数据</summary>
-        //public Byte[] Data { get { return _Data; } set { _Data = value; } }
-        #endregion
-
-        #region 扩展属性
-        [NonSerialized]
-        private String _Text;
-        /// <summary>文本信息</summary>
-        public virtual String Text { get { return _Text; } set { _Text = value; } }
-        #endregion
-
-        #region 静态
-        const String LENGTH = "_Length";
-        const String POSITION = "Position";
-        #endregion
-
-        #region 克隆
-        /// <summary>克隆</summary>
-        /// <param name="dr"></param>
-        /// <returns></returns>
-        public DNSRecord CloneFrom(DNSRecord dr)
-        {
-            Name = dr.Name;
-            Type = dr.Type;
-            Class = dr.Class;
-            TTL = dr.TTL;
-            _Length = dr._Length;
-
-            return this;
-        }
-        #endregion
-
-        #region 辅助
-        /// <summary>已重载。</summary>
-        /// <returns></returns>
-        public override String ToString() { return String.Format("{0} {1}", Type, Text ?? Name); }
-        #endregion
-
-        #region IMemberAccessor 成员
-
-        Boolean IMemberAccessor.Read(IFormatterX fm, MemberInfo member)
-        {
-            if (member.Name == "_Type")
-            {
-                Type = fm.Read<DNSQueryType>();
-
-                // 如果是响应，创建具体消息
-                //var de = fm.Hosts.Peek() as DNSEntity;
-                var de = fm.Hosts.FirstOrDefault(e => e is DNSEntity) as DNSEntity;
-                if (de != null && de.Header.Response)
-                {
-                    var dr = DNSEntity.CreateRecord(Type);
-                    if (dr == null) return false;
-
-                    dr.Name = Name;
-                    dr.Type = Type;
-
-                    // 设置给上级，让它用新的对象继续读取后面的成员
-                    fm.Hosts.Pop();
-                    fm.Hosts.Push(dr);
-                }
-
-                return true;
-            }
-
-            return false;
-        }
-
-        void IMemberAccessor.Write(IFormatterX fm, MemberInfo member)
-        {
-        }
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/DNS/DNSServer.cs b/NewLife.Net/DNS/DNSServer.cs
deleted file mode 100644
index 0f0f541d02..0000000000
--- a/NewLife.Net/DNS/DNSServer.cs
+++ /dev/null
@@ -1,320 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using NewLife.Collections;
-using NewLife.Log;
-#if !NET4
-using TaskEx = System.Threading.Tasks.Task;
-#endif
-
-namespace NewLife.Net.DNS
-{
-    /// <summary>DNS服务器</summary>
-    public class DNSServer : NetServer
-    {
-        #region 属性
-        /// <summary>域名</summary>
-        public String DomainName { get; set; }
-
-        /// <summary>上级DNS地址</summary>
-        public List<NetUri> Parents { get; set; } = new List<NetUri>();
-        #endregion
-
-        #region 构造
-        /// <summary>实例化一个DNS服务器</summary>
-        public DNSServer()
-        {
-            //Name = "DNS";
-            Port = 53;
-
-            DomainName = "dns.NewLifeX.com";
-
-            SocketLog = Logger.Null;
-            SessionLog = Logger.Null;
-        }
-        #endregion
-
-        #region 父级DNS
-        /// <summary>获取本机DNS列表</summary>
-        /// <returns></returns>
-        public virtual List<NetUri> GetLocalDNS()
-        {
-            var list = new List<NetUri>();
-            foreach (var item in NetHelper.GetDns())
-            {
-                if (!item.IsIPv4()) continue;
-
-                if (item.IsAny())
-                {
-                    WriteLog("取得的本地DNS[{0}]有误，任意地址不能作为父级DNS地址。", item);
-                    continue;
-                }
-                var uri = new NetUri(NetType.Udp, item, 53);
-                WriteLog("使用本地地址作为父级DNS：{0}", uri);
-                list.Add(uri);
-            }
-
-            return list;
-        }
-
-        /// <summary>设置父级DNS</summary>
-        /// <param name="parents"></param>
-        public virtual void SetParents(String parents)
-        {
-            var ss = parents.Split(",");
-            if (ss == null || ss.Length < 1) return;
-
-            var ps = Parents;
-            var list = new HashSet<String>(ps.Select(p => p.ToString()), StringComparer.OrdinalIgnoreCase);
-            //ps.Clear();
-
-            for (var i = ss.Length - 1; i >= 0; i--)
-            {
-                try
-                {
-                    var uri = new NetUri(ss[i]);
-                    if (uri.Port <= 0) uri.Port = 53;
-                    if (!list.Contains(uri.ToString()))
-                    {
-                        if (uri.Address.IsAny())
-                        {
-                            WriteLog("配置的父级DNS[{0}]有误，任意地址不能作为父级DNS地址。", uri);
-                            continue;
-                        }
-                        ps.Insert(0, uri);
-                        list.Add(uri.ToString());
-                    }
-                }
-                catch (Exception ex)
-                {
-                    WriteLog("配置的父级DNS[{0}]有误，{1}", ss[i], ex.Message);
-                }
-            }
-        }
-
-        private List<DNSClient> _Clients;
-        #endregion
-
-        #region 方法
-        /// <summary>启动服务</summary>
-        protected override void OnStart()
-        {
-            // 如果没有设置父级DNS，则使用本地DNS
-            var ps = Parents;
-            if (ps.Count == 0) ps.AddRange(GetLocalDNS());
-
-            base.OnStart();
-
-            // 准备连接
-            _Clients = new List<DNSClient>();
-            foreach (var item in Parents.ToArray())
-            {
-                var nc = new DNSClient(item);
-                TaskEx.Run(() =>
-                {
-                    if (nc.Open())
-                    {
-                        WriteLog("已连接父级DNS：{0}", nc.Client.Remote);
-                        lock (_Clients) { _Clients.Add(nc); }
-                    }
-                });
-            }
-        }
-
-        /// <summary>停止服务</summary>
-        protected override void OnStop()
-        {
-            base.OnStop();
-
-            _Clients.TryDispose();
-            _Clients = null;
-        }
-
-        DictionaryCache<String, DNSEntity> cache = new DictionaryCache<String, DNSEntity>() { Expire = 600/*, Asynchronous = true, CacheDefault = false*/ };
-
-        /// <summary>接收处理</summary>
-        /// <param name="session"></param>
-        /// <param name="stream"></param>
-        protected override void OnReceive(INetSession session, Stream stream)
-        {
-            var isTcp = session.Session.Local.IsTcp;
-
-            // 解析
-            var request = DNSEntity.Read(stream, isTcp);
-
-            var response = Request(session, request);
-            if (response != null)
-            {
-                response.Header.ID = request.Header.ID;
-                Response(session, request, response);
-            }
-
-            session.Dispose();
-        }
-
-        /// <summary>处理请求</summary>
-        /// <param name="session"></param>
-        /// <param name="request"></param>
-        /// <returns></returns>
-        protected virtual DNSEntity Request(INetSession session, DNSEntity request)
-        {
-            var local = session.Session.Local;
-            var isTcp = local.IsTcp;
-
-            // 处理，修改
-            WriteLog("{0} 请求 {1}", session.Session.Remote, request);
-
-            // 请求事件，如果第二参数有值，则直接返回
-            // 结合数据库缓存，可以在这里进行返回
-            if (OnRequest != null)
-            {
-                var e = new DNSEventArgs
-                {
-                    Request = request
-                };
-                OnRequest(this, e);
-                if (e.Response != null) return e.Response;
-            }
-
-            // 如果是PTR请求
-            var rq = request.Questions[0];
-            if (rq.Type == DNSQueryType.PTR)
-            {
-                var ptr = RequestPTR(request);
-                if (ptr != null) return ptr;
-            }
-
-            // 读取缓存
-            //var rs = cache.GetItem(request.ToString(), k => GetDNS(k, request));
-            var key = request.ToString();
-            var rs = cache[key];
-            if (rs == null) cache[key] = rs = GetDNS(key, request);
-
-            // 返回给客户端
-            if (rs != null)
-            {
-                // 如果是PTR请求
-                if (rq.Type == DNSQueryType.PTR && rs.Questions[0].Type == DNSQueryType.PTR)
-                {
-                    var ptr = rq as DNS_PTR;
-                    if (rs.GetAnswer() is DNS_PTR ptr2)
-                    {
-                        ptr2.Name = ptr.Name;
-                        ptr2.DomainName = DomainName;
-                    }
-                    if (rs.Answers != null && rs.Answers.Length > 0)
-                    {
-                        foreach (var item in rs.Answers)
-                        {
-                            if (item.Type == DNSQueryType.PTR) item.Name = ptr.Name;
-                        }
-                    }
-                }
-            }
-
-            return rs;
-        }
-
-        /// <summary>处理PTR请求</summary>
-        /// <param name="request"></param>
-        /// <returns></returns>
-        protected virtual DNSEntity RequestPTR(DNSEntity request)
-        {
-            var rq = request.Questions[0];
-            var ptr = rq as DNS_PTR;
-            if (ptr == null) ptr = new DNS_PTR { Name = rq.Name };
-            // 对本地的请求马上返回
-            var addr = ptr.Address;
-            if (addr != null && addr.IsLocal())
-            {
-                var ptr2 = new DNS_PTR
-                {
-                    Name = ptr.Name,
-                    DomainName = DomainName
-                };
-
-                var rs = new DNSEntity
-                {
-                    Questions = request.Questions,
-                    Answers = new DNSRecord[] { ptr2 }
-                };
-
-                rs.Header.ID = request.Header.ID;
-                return rs;
-            }
-            return null;
-        }
-
-        /// <summary>处理响应</summary>
-        /// <param name="session"></param>
-        /// <param name="request"></param>
-        /// <param name="response"></param>
-        protected virtual void Response(INetSession session, DNSEntity request, DNSEntity response)
-        {
-            var ss = session?.Session;
-            if (ss == null) return;
-
-            var isTcp = ss.Local.IsTcp;
-
-            if (OnResponse != null)
-            {
-                var e = new DNSEventArgs { Request = request, Response = response, Session = ss };
-                OnResponse(this, e);
-            }
-
-            session?.Send(response.GetStream(isTcp));
-        }
-
-        DNSEntity GetDNS(String key, DNSEntity request)
-        {
-            // 批量请求父级代理
-            var dic = DNSClient.QueryAll(_Clients, request);
-            if (dic.Count == 0) return null;
-
-            DNSEntity rs = null;
-            foreach (var item in dic)
-            {
-                rs = item.Value;
-                var nc = item.Key.Client;
-
-                WriteLog("{0} GetDNS {1}", nc.Remote, rs);
-
-                if (OnNew != null)
-                {
-                    var e = new DNSEventArgs { Request = request, Response = item.Value, Session = nc };
-                    OnNew(this, e);
-                }
-            }
-
-            return rs;
-        }
-        #endregion
-
-        #region 事件
-        /// <summary>请求时触发。</summary>
-        public event EventHandler<DNSEventArgs> OnRequest;
-
-        /// <summary>响应时触发。</summary>
-        public event EventHandler<DNSEventArgs> OnResponse;
-
-        /// <summary>取得新DNS时触发。</summary>
-        public event EventHandler<DNSEventArgs> OnNew;
-        #endregion
-    }
-
-    /// <summary>DNS事件参数</summary>
-    public class DNSEventArgs : EventArgs
-    {
-        /// <summary>请求</summary>
-        public DNSEntity Request { get; set; }
-
-        /// <summary>响应</summary>
-        public DNSEntity Response { get; set; }
-
-        /// <summary>网络会话</summary>
-        public ISocketRemote Session { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/DNS/DNS_A.cs b/NewLife.Net/DNS/DNS_A.cs
deleted file mode 100644
index 04dfa0c49d..0000000000
--- a/NewLife.Net/DNS/DNS_A.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-﻿using System;
-using System.Net;
-using NewLife.Serialization;
-
-namespace NewLife.Net.DNS
-{
-    /// <summary>A记录</summary>
-    /// <remarks>
-    /// 查询的时候只需要设置Question.Name，返回的数据里面，Address和DNSRecord.TTL最有价值。
-    /// </remarks>
-    public class DNS_A : DNSRecord
-    {
-        #region 属性
-        [FieldSize("_Length")]
-        private Byte[] _Address;
-        /// <summary>IP地址</summary>
-        public IPAddress Address { get { return _Address == null ? null : new IPAddress(_Address); } set { _Address = value?.GetAddressBytes(); } }
-
-        /// <summary>文本信息</summary>
-        public override String Text { get { return Address + ""; } set { Address = String.IsNullOrEmpty(value) ? null : IPAddress.Parse(value); } }
-        #endregion
-
-        #region 构造
-        /// <summary>构造一个A记录实例</summary>
-        public DNS_A()
-        {
-            Type = DNSQueryType.A;
-            Class = DNSQueryClass.IN;
-        }
-        #endregion
-
-        ///// <summary>已重载。</summary>
-        ///// <returns></returns>
-        //public override string ToString()
-        //{
-        //    // Address为空，可能是请求
-        //    if (Address == null)
-        //        return String.Format("{0} {1}", Type, Name);
-        //    else
-        //        return String.Format("{0} {1}", Type, Address);
-        //}
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/DNS/DNS_AAAA.cs b/NewLife.Net/DNS/DNS_AAAA.cs
deleted file mode 100644
index 85eaa27b00..0000000000
--- a/NewLife.Net/DNS/DNS_AAAA.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-﻿
-namespace NewLife.Net.DNS
-{
-    /// <summary>A记录</summary>
-    public class DNS_AAAA : DNS_A
-    {
-        #region 构造
-        /// <summary>构造一个AAAA记录实例</summary>
-        public DNS_AAAA()
-        {
-            Type = DNSQueryType.AAAA;
-            Class = DNSQueryClass.IN;
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/DNS/DNS_CNAME.cs b/NewLife.Net/DNS/DNS_CNAME.cs
deleted file mode 100644
index 327f1e7ace..0000000000
--- a/NewLife.Net/DNS/DNS_CNAME.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-﻿using System;
-
-namespace NewLife.Net.DNS
-{
-    /// <summary>CNAME记录</summary>
-    public class DNS_CNAME : DNSRecord
-    {
-        #region 属性
-        private String _PrimaryName;
-        /// <summary>IP地址</summary>
-        public String PrimaryName { get { return _PrimaryName; } set { _PrimaryName = value; } }
-
-        /// <summary>文本信息</summary>
-        public override String Text { get { return PrimaryName; } set { PrimaryName = value; } }
-        #endregion
-
-        #region 构造
-        /// <summary>构造一个CNAME记录实例</summary>
-        public DNS_CNAME()
-        {
-            Type = DNSQueryType.CNAME;
-            Class = DNSQueryClass.IN;
-        }
-        #endregion
-
-        ///// <summary>已重载。</summary>
-        ///// <returns></returns>
-        //public override string ToString()
-        //{
-        //    return String.Format("{0} {1}", Type, PrimaryName);
-        //}
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/DNS/DNS_MX.cs b/NewLife.Net/DNS/DNS_MX.cs
deleted file mode 100644
index aac1e2a0fd..0000000000
--- a/NewLife.Net/DNS/DNS_MX.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-﻿using System;
-
-namespace NewLife.Net.DNS
-{
-    /// <summary>MX记录</summary>
-    public class DNS_MX : DNSRecord
-    {
-        #region 属性
-        private Int16 _Preference;
-        /// <summary>引用</summary>
-        public Int16 Preference { get { return _Preference; } set { _Preference = value; } }
-
-        private String _Host;
-        /// <summary>主机</summary>
-        public String Host { get { return _Host; } set { _Host = value; } }
-
-        /// <summary>文本信息</summary>
-        public override String Text
-        {
-            get { return String.Format("{0},{1}", Preference, Host); }
-            set
-            {
-                if (String.IsNullOrEmpty(value) || !value.Contains(","))
-                {
-                    Preference = 0;
-                    Host = null;
-                    return;
-                }
-
-                var p = value.IndexOf(",");
-                Preference = Int16.Parse(value.Substring(0, p));
-                Host = value.Substring(p + 1);
-            }
-        }
-        #endregion
-
-        #region 构造
-        /// <summary>构造一个MX记录实例</summary>
-        public DNS_MX()
-        {
-            Type = DNSQueryType.MX;
-            Class = DNSQueryClass.IN;
-        }
-        #endregion
-
-        /// <summary>已重载。</summary>
-        /// <returns></returns>
-        public override String ToString()
-        {
-            return String.Format("{0} {1} {2}", Type, Preference, Host);
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/DNS/DNS_NB.cs b/NewLife.Net/DNS/DNS_NB.cs
deleted file mode 100644
index cad9d7ef85..0000000000
--- a/NewLife.Net/DNS/DNS_NB.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-﻿using System;
-using System.Net;
-using NewLife.Serialization;
-
-namespace NewLife.Net.DNS
-{
-    /// <summary>NetBIOS记录</summary>
-    /// <remarks>
-    /// 查询的时候只需要设置Question.Name。
-    /// </remarks>
-    public class DNS_NB : DNSRecord
-    {
-        #region 属性
-        private UInt16 _flags = 0;
-
-        /// <summary></summary>
-        public Boolean G { get { return BitHelper.GetBit(_flags, 15); } }
-
-        /// <summary></summary>
-        public UInt16 ONT { get { return BitHelper.GetBits(_flags, 13, 2); } }
-
-        [FieldSize("_Length", -2)]
-        private IPAddress _Address;
-        /// <summary>地址</summary>
-        public IPAddress Address { get { return _Address; } set { _Address = value; } }
-
-        /// <summary>文本信息</summary>
-        public override String Text { get { return Address + ""; } set { Address = String.IsNullOrEmpty(value) ? null : IPAddress.Parse(value); } }
-        #endregion
-
-        #region 构造
-        /// <summary>构造一个NetBIOS记录实例</summary>
-        public DNS_NB()
-        {
-            Type = DNSQueryType.NB;
-            Class = DNSQueryClass.IN;
-        }
-        #endregion
-
-        ///// <summary>已重载。</summary>
-        ///// <returns></returns>
-        //public override string ToString()
-        //{
-        //    //// Domain为空，可能是请求
-        //    //if (String.IsNullOrEmpty(Domain))
-        //    return String.Format("{0} {1}", Type, Name);
-        //    //else
-        //    //    return String.Format("{0} {1}", Type, Domain);
-        //}
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/DNS/DNS_NS.cs b/NewLife.Net/DNS/DNS_NS.cs
deleted file mode 100644
index 8b0f7dd3d7..0000000000
--- a/NewLife.Net/DNS/DNS_NS.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-﻿using System;
-
-namespace NewLife.Net.DNS
-{
-    /// <summary>NS记录</summary>
-    public class DNS_NS : DNSRecord
-    {
-        #region 属性
-        private String _NameServer;
-        /// <summary>命名服务器</summary>
-        public String NameServer { get { return _NameServer; } set { _NameServer = value; } }
-
-        /// <summary>文本信息</summary>
-        public override String Text { get { return NameServer; } set { NameServer = value; } }
-        #endregion
-
-        #region 构造
-        /// <summary>构造一个NS记录实例</summary>
-        public DNS_NS()
-        {
-            Type = DNSQueryType.NS;
-            Class = DNSQueryClass.IN;
-        }
-        #endregion
-
-        ///// <summary>已重载。</summary>
-        ///// <returns></returns>
-        //public override string ToString()
-        //{
-        //    return String.Format("{0} {1}", Type, NameServer);
-        //}
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/DNS/DNS_PTR.cs b/NewLife.Net/DNS/DNS_PTR.cs
deleted file mode 100644
index 8905b7595c..0000000000
--- a/NewLife.Net/DNS/DNS_PTR.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-﻿using System;
-using System.Net;
-
-namespace NewLife.Net.DNS
-{
-    /// <summary>PTR记录</summary>
-    /// <remarks>
-    /// 查询的时候只需要设置<see cref="Address"/>，返回的数据里面，<see cref="DomainName"/>最有价值。
-    /// </remarks>
-    public class DNS_PTR : DNSRecord
-    {
-        #region 属性
-        const String _suffix = ".in-addr.arpa";
-
-        /// <summary>IP地址</summary>
-        public IPAddress Address
-        {
-            get
-            {
-                var name = Name;
-                if (String.IsNullOrEmpty(name)) return null;
-
-                //if (name.EndsWithIgnoreCase(_suffix)) name = name.Substring(0, name.Length - _suffix.Length);
-                name = name.TrimEnd(_suffix);
-
-                // 倒序
-                var ss = name.Split(".");
-                Array.Reverse(ss);
-                name = String.Join(".", ss);
-
-                if (!IPAddress.TryParse(name, out var addr)) return null;
-                return addr;
-            }
-            set
-            {
-                if (value != null)
-                {
-                    var bts = value.GetAddressBytes();
-                    // 倒序
-                    Array.Reverse(bts);
-                    // 重新变成地址
-                    var addr = new IPAddress(bts);
-                    Name = addr + _suffix;
-                }
-                else
-                    Name = null;
-            }
-        }
-
-        private String _DomainName;
-        /// <summary>域名</summary>
-        public String DomainName { get { return _DomainName; } set { _DomainName = value; } }
-
-        /// <summary>文本信息</summary>
-        public override String Text { get { return DomainName; } set { DomainName = value; } }
-        #endregion
-
-        #region 构造
-        /// <summary>构造一个A记录实例</summary>
-        public DNS_PTR()
-        {
-            Type = DNSQueryType.PTR;
-            Class = DNSQueryClass.IN;
-        }
-        #endregion
-
-        ///// <summary>已重载。</summary>
-        ///// <returns></returns>
-        //public override string ToString()
-        //{
-        //    return String.Format("{0} {1}", Type, DomainName);
-        //}
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/DNS/DNS_SOA.cs b/NewLife.Net/DNS/DNS_SOA.cs
deleted file mode 100644
index 31e2ed5838..0000000000
--- a/NewLife.Net/DNS/DNS_SOA.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-﻿using System;
-
-namespace NewLife.Net.DNS
-{
-    /// <summary>SOA记录</summary>
-    public class DNS_SOA : DNSRecord
-    {
-        #region 属性
-        private String _PrimaryNameServer;
-        /// <summary>主要名称服务器</summary>
-        public String PrimaryNameServer { get { return _PrimaryNameServer; } set { _PrimaryNameServer = value; } }
-
-        private String _ResponsibleAuthorityMail;
-        /// <summary>认证邮箱</summary>
-        public String ResponsibleAuthorityMail { get { return _ResponsibleAuthorityMail; } set { _ResponsibleAuthorityMail = value; } }
-
-        private Int32 _SerialNumber;
-        /// <summary>序列号</summary>
-        public Int32 SerialNumber { get { return _SerialNumber; } set { _SerialNumber = value; } }
-
-        private TimeSpan _RefreshInterval;
-        /// <summary>刷新间隔</summary>
-        public TimeSpan RefreshInterval { get { return _RefreshInterval; } set { _RefreshInterval = value; } }
-
-        private TimeSpan _RetryInterval;
-        /// <summary>重试间隔</summary>
-        public TimeSpan RetryInterval { get { return _RetryInterval; } set { _RetryInterval = value; } }
-
-        private TimeSpan _ExpirationLimit;
-        /// <summary>过期限制</summary>
-        public TimeSpan ExpirationLimit { get { return _ExpirationLimit; } set { _ExpirationLimit = value; } }
-
-        private TimeSpan _MinimumTTL;
-        /// <summary>最小TTL</summary>
-        public TimeSpan MinimumTTL { get { return _MinimumTTL; } set { _MinimumTTL = value; } }
-
-        /// <summary>文本信息</summary>
-        public override String Text { get { return PrimaryNameServer; } set { PrimaryNameServer = value; } }
-        #endregion
-
-        #region 构造
-        /// <summary>构造一个SOA记录实例</summary>
-        public DNS_SOA()
-        {
-            Type = DNSQueryType.SOA;
-            Class = DNSQueryClass.IN;
-        }
-        #endregion
-
-        ///// <summary>已重载。</summary>
-        ///// <returns></returns>
-        //public override string ToString()
-        //{
-        //    return String.Format("{0} {1}", Type, PrimaryNameServer);
-        //}
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/DNS/DNS_TXT.cs b/NewLife.Net/DNS/DNS_TXT.cs
deleted file mode 100644
index 4e51eef078..0000000000
--- a/NewLife.Net/DNS/DNS_TXT.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-﻿using System;
-using NewLife.Serialization;
-
-namespace NewLife.Net.DNS
-{
-    /// <summary>TXT记录</summary>
-    public class DNS_TXT : DNSRecord
-    {
-        #region 属性
-        [FieldSize("_Length")]
-        private String _Text;
-        /// <summary>文本</summary>
-        public override String Text { get { return _Text; } set { _Text = value; } }
-        #endregion
-
-        #region 构造
-        /// <summary>构造一个TXT记录实例</summary>
-        public DNS_TXT()
-        {
-            Type = DNSQueryType.TXT;
-            Class = DNSQueryClass.IN;
-        }
-        #endregion
-
-        ///// <summary>已重载。</summary>
-        ///// <returns></returns>
-        //public override string ToString()
-        //{
-        //    return String.Format("{0} {1}", Type, Text);
-        //}
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/DNS/NetBIOS.cs b/NewLife.Net/DNS/NetBIOS.cs
deleted file mode 100644
index 7773104cbb..0000000000
--- a/NewLife.Net/DNS/NetBIOS.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-﻿using System;
-using System.Net;
-using System.Net.Sockets;
-using System.Text;
-
-namespace NewLife.Net.DNS
-{
-    /// <summary>NetBIOS名称</summary>
-    public class NetBIOS
-    {
-        /// <summary>查询名称</summary>
-        /// <param name="name">名称</param>
-        /// <returns></returns>
-        public IPAddress QueryName(String name)
-        {
-            //DnsRequest request = new DnsRequest(new Question(EncodeName(name), DnsType.NB, DnsClass.IN));
-            var request = new DNSEntity();
-            request.Questions[0].Name = EncodeName(name);
-            request.Header.RecursionDesired = true;
-            request.Header.Broadcast = true;
-
-            var res = Invoke(request);
-
-            if (res == null || res.Answers.Length == 0) return null;
-
-            var nb = res.Answers[0] as DNS_A;
-
-            if (nb == null) return null;
-
-            return nb.Address;
-        }
-
-        /// <summary>注册</summary>
-        /// <param name="name">名称</param>
-        /// <param name="address"></param>
-        /// <returns></returns>
-        public Boolean Register(String name, IPAddress address)
-        {
-            //DnsRequest request = new DnsRequest(new Question(EncodeName(name), DnsType.NB, DnsClass.IN));
-            var request = new DNSEntity();
-            request.Questions[0].Name = EncodeName(name);
-            request.Header.Opcode = DNSOpcodeType.Registration;
-            request.Header.RecursionAvailable = false;
-            request.Header.RecursionDesired = false;
-            request.Header.Broadcast = false;
-
-
-            var add = new DNS_NB();
-            add.Name = EncodeName(name);
-            add.TTL = new TimeSpan(0, 0, 30);
-            add.Address = address;
-
-            request.Additionals = new DNSRecord[] { add };
-
-            var res = Invoke(request, false);
-
-            return true;
-        }
-
-        static String EncodeName(String domain)
-        {
-            var sb = new StringBuilder();
-
-            domain = domain.PadRight(16, ' ');
-            //foreach (char c in domain + "                ".Substring(0, 16 - domain.Length))
-            foreach (var c in domain)
-            {
-                var b = (Byte)c;
-                var x = (Char)((Byte)'A' + (((Byte)c & 0xF0) >> 4));
-
-                sb.Append(x);
-
-                x = (Char)((Byte)'A' + ((Byte)c & 0x0F));
-
-                sb.Append(x);
-            }
-
-            return sb.ToString();
-        }
-
-        DNSEntity Invoke(DNSEntity request) { return Invoke(request, true); }
-
-        private static readonly Int32 _maxRetryAttemps = 2;
-        internal DNSEntity Invoke(DNSEntity request, Boolean isQuery)
-        {
-            var attempts = 0;
-
-            while (attempts <= _maxRetryAttemps)
-            {
-                var bytes = request.GetStream(false).ReadBytes();
-
-                if (bytes.Length > 512)
-                    throw new ArgumentException("RFC 1035 2.3.4 states that the maximum size of a UDP datagram is 512 octets (bytes).");
-
-                Socket socket = null;
-
-                try
-                {
-                    socket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
-
-                    socket.ReceiveTimeout = 300;
-                    //socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReceiveTimeout, 300);
-
-                    socket.SendTo(bytes, bytes.Length, SocketFlags.None, new IPEndPoint(IPAddress.Parse("192.168.178.255"), 137));
-
-                    if (!isQuery) return null;
-
-                    // Messages carried by UDP are restricted to 512 bytes (not counting the IP
-                    // or UDP headers).  Longer messages are truncated and the TC bit is set in
-                    // the header. (RFC 1035 4.2.1)
-                    var responseMessage = new Byte[512];
-
-                    //int numBytes = socket.Receive(responseMessage);
-
-                    var ep = (EndPoint)new IPEndPoint(new IPAddress(4294967295), 137);
-                    var numBytes = socket.ReceiveFrom(responseMessage, ref ep);
-
-                    if (numBytes == 0 || numBytes > 512)
-                        throw new Exception("RFC 1035 2.3.4 states that the maximum size of a UDP datagram is 512 octets (bytes).");
-
-                    //DnsReader br = new DnsReader(responseMessage);
-                    //DnsResponse res = new DnsResponse(br);
-                    var rs = DNSEntity.Read(responseMessage);
-
-                    if (request.Header.ID == rs.Header.ID) return rs;
-
-                    attempts++;
-                }
-                catch
-                {
-                    attempts++;
-                }
-                finally
-                {
-                    socket.Close();
-                    socket = null;
-                }
-            }
-
-            throw new Exception("Could not resolve the query (" + attempts + " attempts).");
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Dhcp/DhcpClient.cs b/NewLife.Net/Dhcp/DhcpClient.cs
deleted file mode 100644
index 14cef58a24..0000000000
--- a/NewLife.Net/Dhcp/DhcpClient.cs
+++ /dev/null
@@ -1,233 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Text;
-using NewLife.Common;
-using NewLife.Log;
-using NewLife.Security;
-using NewLife.Threading;
-
-namespace NewLife.Net.Dhcp
-{
-    /// <summary>DHCP客户端</summary>
-    public class DhcpClient : DisposeBase
-    {
-        #region 属性
-        private UdpServer _Client;
-        /// <summary>网络客户端</summary>
-        public UdpServer Client { get { return _Client; } set { _Client = value; } }
-
-        private IPAddress _Address = IPAddress.Any;
-        /// <summary>地址</summary>
-        public IPAddress Address { get { return _Address; } set { _Address = value; } }
-
-        private Byte[] _Mac;
-        /// <summary>物理地址</summary>
-        public Byte[] Mac { get { return _Mac; } set { _Mac = value; } }
-
-        /// <summary>事务ID</summary>
-        private Int32 TransID;
-
-        private TimerX _Timer;
-        #endregion
-
-        #region 构造
-        /// <summary>销毁</summary>
-        /// <param name="disposing"></param>
-        protected override void OnDispose(Boolean disposing)
-        {
-            base.OnDispose(disposing);
-
-            if (_Timer != null) _Timer.Dispose();
-
-            Stop();
-        }
-        #endregion
-
-        #region 主要方法
-        /// <summary>开始</summary>
-        public void Start()
-        {
-            if (Client == null)
-            {
-                Client = new UdpServer();
-                Client.Received += Client_Received;
-                Client.Open();
-
-                _Timer = new TimerX(s =>
-                {
-                    try
-                    {
-                        SendDiscover();
-                    }
-                    catch (Exception ex) { WriteLog(ex.ToString()); }
-                }, null, 0, 1000);
-            }
-
-            //var rnd = new Random();
-            TransID = Rand.Next();
-            if (_Mac == null || _Mac.Length == 0)
-                _Mac = NetHelper.GetMacs().FirstOrDefault();
-            if (_Mac == null || _Mac.Length == 0)
-                _Mac = Rand.NextBytes(6);
-        }
-
-        /// <summary>停止</summary>
-        public void Stop()
-        {
-            var client = Client;
-            if (client != null)
-            {
-                Client = null;
-                client.Dispose();
-            }
-        }
-
-        void Client_Received(Object sender, ReceivedEventArgs e)
-        {
-            var dhcp = new DhcpEntity();
-            dhcp.Read(e.Stream, null);
-
-            var kind = dhcp.Kind;
-            WriteLog("收到：{0}", dhcp);
-            switch (kind)
-            {
-                case DhcpMessageType.Offer:
-                    OnOffer(dhcp, e.Remote);
-                    break;
-                case DhcpMessageType.Ack:
-                    OnAck(dhcp, e.Remote);
-                    break;
-                case DhcpMessageType.Nak:
-                    OnNak(dhcp, e.Remote);
-                    break;
-                default:
-                    WriteLog("未知消息：\r\n{0}", dhcp);
-                    break;
-            }
-        }
-
-        /// <summary>发送DHCP消息</summary>
-        /// <param name="dhcp"></param>
-        protected void Send(DhcpEntity dhcp)
-        {
-            dhcp.ClientMac = Mac;
-
-            var opt = new DhcpOption();
-            opt.SetClientId(Mac);
-            dhcp.Options.Add(opt);
-
-            if (Address != IPAddress.Any)
-            {
-                opt = new DhcpOption();
-                opt.SetData(DhcpOptions.RequestedIP, Address.GetAddressBytes());
-                dhcp.Options.Add(opt);
-            }
-
-            opt = new DhcpOption();
-            opt.SetData(DhcpOptions.HostName, ("WSWL_SmartOS_").GetBytes());
-            dhcp.Options.Add(opt);
-
-            opt = new DhcpOption();
-            opt.SetData(DhcpOptions.Vendor, "http://www.NewLifeX.com".GetBytes());
-            dhcp.Options.Add(opt);
-
-            opt = new DhcpOption();
-            opt.SetData(DhcpOptions.ParameterList, new Byte[] { 0x01, 0x06, 0x03, 0x2b });
-            dhcp.Options.Add(opt);
-
-            dhcp.TransactionID = TransID;
-
-            WriteLog("发送：{0}", dhcp);
-
-            var buf = dhcp.ToArray();
-            Client.Client.Broadcast(buf, 68);
-        }
-
-        /// <summary>广播发现</summary>
-        public void SendDiscover()
-        {
-            var dhcp = new DhcpEntity
-            {
-                Kind = DhcpMessageType.Discover
-            };
-
-            Send(dhcp);
-        }
-
-        /// <summary>提供IP</summary>
-        /// <param name="dhcp"></param>
-        /// <param name="state"></param>
-        protected virtual void OnOffer(DhcpEntity dhcp, Object state)
-        {
-            if (dhcp.TransactionID != TransID)
-            {
-                XTrace.Log.Error("响应消息事务不等于本地事务 0x{0:X8} != 0x{1:X8}", dhcp.TransactionID, TransID);
-                return;
-            }
-
-            Address = new IPAddress(dhcp.YourIP);
-            WriteLog("得到地址 {0} 来自 {1}", Address, state);
-            foreach (var item in dhcp.Options)
-            {
-                WriteLog("{0,-16}: {1}", item.Option, item.ToStr());
-            }
-
-            // 发送确认
-            SendRequest();
-        }
-
-        /// <summary>发送请求</summary>
-        public void SendRequest()
-        {
-            var dhcp = new DhcpEntity
-            {
-                Kind = DhcpMessageType.Request
-            };
-
-            Send(dhcp);
-        }
-
-        /// <summary>确认</summary>
-        /// <param name="dhcp"></param>
-        /// <param name="state"></param>
-        protected virtual void OnAck(DhcpEntity dhcp, Object state)
-        {
-            WriteLog("已确认地址 {0} 来自 {1}", Address, state);
-
-            // 查找租约时间
-            var opt = dhcp.Get(DhcpOptions.IPLeaseTime);
-            if (opt != null)
-            {
-                var buf = opt.Data.ReadBytes();
-                buf.Reverse();
-                var ts = new TimeSpan(0, 0, buf.ToInt());
-                WriteLog("租约到期：{0}", ts);
-            }
-        }
-
-        /// <summary>拒绝</summary>
-        /// <param name="dhcp"></param>
-        /// <param name="state"></param>
-        protected virtual void OnNak(DhcpEntity dhcp, Object state)
-        {
-            WriteLog("被拒绝 {0} 来自 {1}", Address, state);
-
-            // 查找拒绝原因
-            var opt = dhcp.Get(DhcpOptions.Message);
-            if (opt != null)
-            {
-                WriteLog("拒绝原因：{0}", opt.ToStr());
-            }
-        }
-        /// <summary>日志</summary>
-        public ILog Log { get; set; } = Logger.Null;
-
-        /// <summary>写日志</summary>
-        /// <param name="format"></param>
-        /// <param name="args"></param>
-        public void WriteLog(String format, params Object[] args) => Log.Info(format, args);
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Dhcp/DhcpEntity.cs b/NewLife.Net/Dhcp/DhcpEntity.cs
deleted file mode 100644
index cb8a7c1d95..0000000000
--- a/NewLife.Net/Dhcp/DhcpEntity.cs
+++ /dev/null
@@ -1,250 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Reflection;
-using System.Text;
-using System.Xml.Serialization;
-using NewLife.Messaging;
-using NewLife.Reflection;
-using NewLife.Serialization;
-
-namespace NewLife.Net.Dhcp
-{
-    /// <summary>DHCP实体</summary>
-    public class DhcpEntity : Message<DhcpEntity>
-    {
-        #region 属性
-        private Byte _MessageType = 1;
-        /// <summary>消息类型。若是client送给server的封包，设为1，反向为2</summary>
-        public Byte MessageType { get { return _MessageType; } set { _MessageType = value; } }
-
-        private Byte _HardwareType = 1;
-        /// <summary>硬件类型</summary>
-        public Byte HardwareType { get { return _HardwareType; } set { _HardwareType = value; } }
-
-        private Byte _HardwareAddressLength = 6;
-        /// <summary>硬件地址长度</summary>
-        public Byte HardAddrLength { get { return _HardwareAddressLength; } set { _HardwareAddressLength = value; } }
-
-        private Byte _Hops;
-        /// <summary>属性说明</summary>
-        public Byte Hops { get { return _Hops; } set { _Hops = value; } }
-
-        private Int32 _TransactionID;
-        /// <summary>会话编号</summary>
-        public Int32 TransactionID { get { return _TransactionID; } set { _TransactionID = value; } }
-
-        private Int16 _Seconds;
-        /// <summary>秒数</summary>
-        public Int16 Seconds { get { return _Seconds; } set { _Seconds = value; } }
-
-        private UInt16 _BootpFlags = 0x8000;
-        /// <summary>属性说明</summary>
-        public UInt16 BootpFlags { get { return _BootpFlags; } set { _BootpFlags = value; } }
-
-        [FieldSize(4)]
-        private Byte[] _ClientIPAddress;
-        /// <summary>客户端IP地址</summary>
-        public Byte[] ClientIP { get { return _ClientIPAddress; } set { _ClientIPAddress = value; } }
-
-        [FieldSize(4)]
-        private Byte[] _YourIPAddress;
-        /// <summary>属性说明</summary>
-        public Byte[] YourIP { get { return _YourIPAddress; } set { _YourIPAddress = value; } }
-
-        [FieldSize(4)]
-        private Byte[] _NextServerIPAddress;
-        /// <summary>属性说明</summary>
-        public Byte[] NextServerIP { get { return _NextServerIPAddress; } set { _NextServerIPAddress = value; } }
-
-        [FieldSize(4)]
-        private Byte[] _RelayAgentIPAddress;
-        /// <summary>属性说明</summary>
-        public Byte[] RelayAgentIP { get { return _RelayAgentIPAddress; } set { _RelayAgentIPAddress = value; } }
-
-        [FieldSize(16)]
-        private Byte[] _ClientMACAddress;
-        /// <summary>客户端MAC地址。占用16字节，实际内存长度由_HardwareAddressLength决定</summary>
-        public Byte[] ClientMac { get { return _ClientMACAddress; } set { _ClientMACAddress = value; } }
-
-        [FieldSize(64)]
-        private String _ServerName;
-        /// <summary>服务器名</summary>
-        public String ServerName { get { return _ServerName; } set { _ServerName = value; } }
-
-        [FieldSize(128)]
-        private String _BootFileName;
-        /// <summary>启动文件名</summary>
-        public String BootFileName { get { return _BootFileName; } set { _BootFileName = value; } }
-
-        private Int32 _Magic = 0x63825363;
-        /// <summary>幻数</summary>
-        public Int32 Magic { get { return _Magic; } set { _Magic = value; } }
-        #endregion
-
-        #region 扩展属性
-        [NonSerialized]
-        private List<DhcpOption> _Options = new List<DhcpOption>();
-        /// <summary>可选项</summary>
-        public List<DhcpOption> Options { get { return _Options; } set { _Options = value; } }
-
-        /// <summary>获取可选项</summary>
-        /// <param name="type"></param>
-        /// <param name="add"></param>
-        /// <returns></returns>
-        public DhcpOption Get(DhcpOptions type, Boolean add = false)
-        {
-            var opt = Options.FirstOrDefault(e => e.Option == type);
-            if (opt == null && add)
-            {
-                opt = new DhcpOption();
-                Options.Add(opt);
-            }
-            return opt;
-        }
-
-        /// <summary>消息种类</summary>
-        [XmlIgnore]
-        public Dhcp.DhcpMessageType Kind
-        {
-            get
-            {
-                var opt = Get(DhcpOptions.MessageType);
-                var b = opt != null ? opt.Data[0] : 0;
-                return (DhcpMessageType)b;
-            }
-            set
-            {
-                var opt = Get(DhcpOptions.MessageType, true);
-                opt.SetType(value);
-            }
-        }
-        #endregion
-
-        #region 读写核心
-        /// <summary>读取扩展属性</summary>
-        /// <param name="stream"></param>
-        /// <param name="context"></param>
-        /// <returns></returns>
-        public override Boolean Read(Stream stream, Object context)
-        {
-            if (!base.Read(stream, context)) return false;
-
-            // 读取扩展可选项
-            if (stream.Position < stream.Length)
-            {
-                var fm = CreateFormatter(true);
-                fm.Stream = stream;
-
-                while (stream.Position < stream.Length)
-                {
-                    if (stream.ReadByte() == 0xFF) break;
-                    stream.Position--;
-
-                    var opt = fm.Read<DhcpOption>();
-                    Options.Add(opt);
-
-                    if (opt.Option == DhcpOptions.End) break;
-                }
-            }
-
-            return true;
-        }
-
-        /// <summary>写入可选项</summary>
-        /// <param name="stream"></param>
-        /// <param name="context"></param>
-        public override void Write(Stream stream, Object context)
-        {
-            base.Write(stream, context);
-
-            var binary = CreateFormatter(true) as Binary;
-            binary.Stream = stream;
-            foreach (var opt in Options)
-            {
-                if (opt.Option == DhcpOptions.End) break;
-
-                binary.Write(opt);
-            }
-
-            // 写入可选项结束符
-            stream.Write(0xFF);
-        }
-
-        /// <summary>使用字段大小</summary>
-        /// <param name="isRead"></param>
-        /// <returns></returns>
-        protected override IFormatterX CreateFormatter(Boolean isRead)
-        {
-            var fm = base.CreateFormatter(isRead) as Binary;
-            fm.UseFieldSize = true;
-            //fm.Log = XTrace.Log;
-
-            return fm;
-        }
-        #endregion
-
-        #region 辅助
-        /// <summary>显示扩展属性</summary>
-        /// <param name="pi"></param>
-        /// <param name="len"></param>
-        /// <param name="sb"></param>
-        protected override void GetMember(PropertyInfo pi, Int32 len, StringBuilder sb)
-        {
-            if (pi.Name == "Options")
-            {
-                foreach (var opt in Options)
-                {
-                    if (sb.Length > 0) sb.AppendLine();
-
-                    sb.AppendFormat("{0," + len + "}: {1}", opt.Option, opt.ToStr());
-                }
-                return;
-            }
-
-            base.GetMember(pi, len, sb);
-        }
-
-        /// <summary>获取用于输出的成员值</summary>
-        /// <param name="pi"></param>
-        /// <returns></returns>
-        protected override Object GetMemberValue(PropertyInfo pi)
-        {
-            var v = base.GetMemberValue(pi);
-            var type = pi.PropertyType;
-
-            if (type.IsEnum) return v;
-
-            if (pi.Name.Contains("IP")) return new IPAddress(v.ToInt());
-            if (pi.Name.Contains("Mac"))
-            {
-                var buf = (Byte[])this.GetValue(pi);
-                if (buf == null) return null;
-                return buf.ReadBytes(0, HardAddrLength).ToHex(":");
-            }
-
-            var code = Type.GetTypeCode(type);
-            switch (code)
-            {
-                case TypeCode.Byte:
-                    return "0x{0:X2}".F(v.ToInt());
-                case TypeCode.DateTime:
-                    return "{0}".F(v);
-                case TypeCode.Int16:
-                case TypeCode.UInt16:
-                    return "0x{0:X4}".F(v);
-                case TypeCode.Int32:
-                case TypeCode.UInt32:
-                    return "0x{0:X8}".F(v);
-                case TypeCode.Int64:
-                case TypeCode.UInt64:
-                    return "0x{0:X16}".F(v);
-            }
-
-            return v;
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Dhcp/DhcpMessageType.cs b/NewLife.Net/Dhcp/DhcpMessageType.cs
deleted file mode 100644
index 81a46c8144..0000000000
--- a/NewLife.Net/Dhcp/DhcpMessageType.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-﻿using System.ComponentModel;
-
-namespace NewLife.Net.Dhcp
-{
-    /// <summary>DHCP消息类型</summary>
-    public enum DhcpMessageType : System.Byte
-    {
-        /// <summary>发现</summary>
-        [Description("发现")]
-        Discover = 1,
-
-        /// <summary>提供</summary>
-        [Description("提供")]
-        Offer = 2,
-
-        /// <summary>请求</summary>
-        [Description("请求")]
-        Request = 3,
-
-        /// <summary>谢绝</summary>
-        [Description("谢绝")]
-        Decline = 4,
-
-        /// <summary>应答</summary>
-        [Description("应答")]
-        Ack = 5,
-
-        /// <summary>拒绝</summary>
-        [Description("拒绝")]
-        Nak = 6,
-
-        /// <summary>释放</summary>
-        [Description("释放")]
-        Release = 7,
-
-        /// <summary>通知</summary>
-        [Description("通知")]
-        Inform = 8
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Dhcp/DhcpOption.cs b/NewLife.Net/Dhcp/DhcpOption.cs
deleted file mode 100644
index 1b22c57c34..0000000000
--- a/NewLife.Net/Dhcp/DhcpOption.cs
+++ /dev/null
@@ -1,184 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Text;
-using NewLife.Serialization;
-
-namespace NewLife.Net.Dhcp
-{
-    /// <summary>DHCP选项类型</summary>
-    public enum DhcpOptions : Byte
-    {
-        /// <summary></summary>
-        Mask = 1,
-
-        /// <summary></summary>
-        Router = 3,
-
-        /// <summary></summary>
-        TimeServer = 4,
-
-        /// <summary></summary>
-        NameServer = 5,
-
-        /// <summary></summary>
-        DNSServer = 6,
-
-        /// <summary></summary>
-        LOGServer = 7,
-
-        /// <summary></summary>
-        HostName = 12,
-
-        /// <summary></summary>
-        MTU = 26,				// 0x1A
-
-        /// <summary></summary>
-        StaticRout = 33,		// 0x21
-
-        /// <summary></summary>
-        ARPCacheTimeout = 35,	// 0x23
-
-        /// <summary></summary>
-        NTPServer = 42,		// 0x2A
-
-        /// <summary></summary>
-        RequestedIP = 50,		// 0x32
-
-        /// <summary></summary>
-        IPLeaseTime = 51,		// 0x33
-
-        /// <summary></summary>
-        MessageType = 53,		// 0x35
-
-        /// <summary></summary>
-        DHCPServer = 54,		// 0x36
-
-        /// <summary></summary>
-        ParameterList = 55,	// 0x37
-
-        /// <summary></summary>
-        Message = 56,			// 0x38
-
-        /// <summary></summary>
-        MaxMessageSize = 57,	// 0x39
-
-        /// <summary></summary>
-        Vendor = 60,			// 0x3C
-
-        /// <summary></summary>
-        ClientIdentifier = 61,	// 0x3D
-
-        /// <summary></summary>
-        End = 255
-    }
-
-    /// <summary>DHCP可选项</summary>
-    public class DhcpOption
-    {
-        #region 属性
-        private DhcpOptions _Option;
-        /// <summary>选项类型</summary>
-        public DhcpOptions Option { get { return _Option; } set { _Option = value; } }
-
-        private Byte _Length;
-        /// <summary>长度</summary>
-        public Byte Length { get { return _Length; } set { _Length = value; } }
-
-        [FieldSize("_Length")]
-        private Byte[] _Data;
-        /// <summary>数据部分</summary>
-        public Byte[] Data { get { return _Data; } set { _Data = value; } }
-        #endregion
-
-        #region 方法
-        /// <summary>设置类型</summary>
-        /// <param name="kind"></param>
-        /// <returns></returns>
-        public DhcpOption SetType(DhcpMessageType kind)
-        {
-            Option = DhcpOptions.MessageType;
-            Length = 1;
-            Data = new Byte[] { (Byte)kind };
-
-            return this;
-        }
-
-        /// <summary>设置客户端标识</summary>
-        /// <param name="clientid"></param>
-        public void SetClientId(Byte[] clientid)
-        {
-            Option = DhcpOptions.ClientIdentifier;
-            Length = (Byte)(1 + clientid.Length);
-            Data = new Byte[Length];
-            Data[0] = 1;
-            Data.Write(1, clientid);
-        }
-
-        /// <summary>设置参数</summary>
-        /// <param name="kind"></param>
-        /// <param name="data"></param>
-        public void SetData(DhcpOptions kind, Byte[] data)
-        {
-            Option = kind;
-            Length = (Byte)data.Length;
-            Data = data.ReadBytes();
-        }
-        #endregion
-
-        #region 辅助
-        /// <summary>转为字符串标识</summary>
-        /// <returns></returns>
-        public String ToStr()
-        {
-            switch (Option)
-            {
-                case DhcpOptions.Router:
-                case DhcpOptions.Mask:
-                case DhcpOptions.DNSServer:
-                case DhcpOptions.DHCPServer:
-                case DhcpOptions.RequestedIP:
-                case DhcpOptions.NTPServer:
-                case DhcpOptions.TimeServer:
-                case DhcpOptions.NameServer:
-                case DhcpOptions.LOGServer:
-                    return new IPAddress(Data.ToInt()).ToString();
-                case DhcpOptions.HostName:
-                case DhcpOptions.Vendor:
-                    return Data.ToStr();
-                case DhcpOptions.MTU:
-                    break;
-                case DhcpOptions.StaticRout:
-                    break;
-                case DhcpOptions.ARPCacheTimeout:
-                    break;
-                case DhcpOptions.IPLeaseTime:
-                    break;
-                case DhcpOptions.MessageType:
-                case DhcpOptions.Message:
-                    return ((DhcpMessageType)Data[0]).ToString();
-                case DhcpOptions.ParameterList:
-                    break;
-                case DhcpOptions.MaxMessageSize:
-                    break;
-                case DhcpOptions.ClientIdentifier:
-                    return Data.ReadBytes(1, 6).ToHex(":");
-                case DhcpOptions.End:
-                    return "";
-                default:
-                    break;
-            }
-
-            return Data.ToHex();
-        }
-
-        /// <summary>已重载。</summary>
-        /// <returns></returns>
-        public override String ToString()
-        {
-            return Option + " " + ToStr();
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Dhcp/DhcpServer.cs b/NewLife.Net/Dhcp/DhcpServer.cs
deleted file mode 100644
index a9a58ab6a7..0000000000
--- a/NewLife.Net/Dhcp/DhcpServer.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-﻿using System;
-using System.Net.Sockets;
-using NewLife.Net.Sockets;
-
-namespace NewLife.Net.Dhcp
-{
-    /// <summary>DHCP服务器</summary>
-    public class DhcpServer : NetServer<DhcpSession>
-    {
-        /// <summary>实例化DHCP服务器</summary>
-        public DhcpServer()
-        {
-            ProtocolType = NetType.Udp;
-            Port = 67;
-        }
-
-        /// <summary>确保创建服务器</summary>
-        public override void EnsureCreateServer()
-        {
-            var count = Servers.Count;
-
-            base.EnsureCreateServer();
-
-            // 附加多一个端口
-            if (count == 0)
-            {
-                var list = CreateServer(Local.Address, 68, Local.Type, AddressFamily);
-                foreach (var item in list)
-                {
-                    AttachServer(item);
-                }
-            }
-        }
-
-        /// <summary>收到消息时触发</summary>
-        public event EventHandler<DhcpMessageEventArgs> OnMessage;
-
-        internal void RaiseMessage(DhcpSession session, DhcpMessageEventArgs e)
-        {
-            if (OnMessage != null) OnMessage(session, e);
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Dhcp/DhcpSession.cs b/NewLife.Net/Dhcp/DhcpSession.cs
deleted file mode 100644
index 386ea8e233..0000000000
--- a/NewLife.Net/Dhcp/DhcpSession.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Text;
-using NewLife.Net.Sockets;
-
-namespace NewLife.Net.Dhcp
-{
-    /// <summary>DHCP会话</summary>
-    public class DhcpSession : NetSession
-    {
-        /// <summary>收到数据时触发</summary>
-        /// <param name="e"></param>
-        protected override void OnReceive(ReceivedEventArgs e)
-        {
-            var dhcp = new DhcpEntity();
-            dhcp.Read(e.Stream, null);
-
-            var kind = dhcp.Kind;
-            WriteLog("收到：{0} {1}", kind, e.Remote);
-            var ds = (this as INetSession).Host as DhcpServer;
-
-            var dme = new DhcpMessageEventArgs
-            {
-                Request = dhcp,
-                Remote = e.Remote,
-                UserState = e.UserState
-            };
-
-            OnMessage?.Invoke(this, dme);
-
-            ds.RaiseMessage(this, dme);
-
-            if (dme.Response != null)
-            {
-                var buf = dme.Response.ToArray();
-                Send(buf);
-            }
-
-            base.OnReceive(e);
-        }
-
-        /// <summary>收到消息时触发</summary>
-        public event EventHandler<DhcpMessageEventArgs> OnMessage;
-    }
-
-    /// <summary>消息事件参数</summary>
-    public class DhcpMessageEventArgs : EventArgs
-    {
-        /// <summary>收到的消息</summary>
-        public DhcpEntity Request { get; set; }
-
-        /// <summary>响应消息</summary>
-        public DhcpEntity Response { get; set; }
-
-        /// <summary>远程地址</summary>
-        public IPEndPoint Remote { get; set; }
-
-        /// <summary>用户对象</summary>
-        public Object UserState { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/FTP/FTPClient.cs b/NewLife.Net/FTP/FTPClient.cs
deleted file mode 100644
index eaaa1793ef..0000000000
--- a/NewLife.Net/FTP/FTPClient.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-﻿
-namespace NewLife.Net.FTP
-{
-    /// <summary>FTP客户端</summary>
-    public class FTPClient : DisposeBase
-    {
-        //TODO 未实现FTP客户端
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/FTP/FTPItem.cs b/NewLife.Net/FTP/FTPItem.cs
deleted file mode 100644
index 5273ad9af4..0000000000
--- a/NewLife.Net/FTP/FTPItem.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-﻿using System;
-
-namespace NewLife.Net.FTP
-{
-    /// <summary>FTP项</summary>
-    public class FTPItem
-    {
-        #region 属性
-        private String _Name;
-        /// <summary>名称</summary>
-        public String Name { get { return _Name; } set { _Name = value; } }
-
-        private Int64 _Size;
-        /// <summary>大小</summary>
-        public Int64 Size { get { return _Size; } set { _Size = value; } }
-
-        private DateTime _Modified;
-        /// <summary>修改时间</summary>
-        public DateTime Modified { get { return _Modified; } set { _Modified = value; } }
-
-        private Boolean _IsDirectory;
-        /// <summary>是否目录</summary>
-        public Boolean IsDirectory { get { return _IsDirectory; } set { _IsDirectory = value; } }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/FTP/FTPServer.cs b/NewLife.Net/FTP/FTPServer.cs
deleted file mode 100644
index 619774c878..0000000000
--- a/NewLife.Net/FTP/FTPServer.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-﻿using System.Net.Sockets;
-using NewLife.Net.Sockets;
-
-namespace NewLife.Net.FTP
-{
-    /// <summary>FTP服务器</summary>
-    public class FTPServer : NetServer<FTPSession>
-    {
-        //TODO 未实现FTP服务端
-
-        #region 属性
-        //private Dictionary<Int32, FTPSession> _Sessions;
-        ///// <summary>会话集合</summary>
-        //public IDictionary<Int32, FTPSession> Sessions { get { return _Sessions ?? (_Sessions = new Dictionary<int, FTPSession>()); } }
-        #endregion
-
-        /// <summary>实例化一个FTP服务器</summary>
-        public FTPServer()
-        {
-            Port = 21;
-            ProtocolType = NetType.Tcp;
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/FTP/FTPSession.cs b/NewLife.Net/FTP/FTPSession.cs
deleted file mode 100644
index 69e590c557..0000000000
--- a/NewLife.Net/FTP/FTPSession.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-﻿using NewLife.Net.Sockets;
-
-namespace NewLife.Net.FTP
-{
-    /// <summary>FTP会话</summary>
-    public class FTPSession : NetSession
-    {
-        //TODO 未实现FTP会话
-
-        #region 属性
-
-        #endregion
-
-        #region 启动会话
-        //void Start()
-        //{
-
-        //}
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/FTP/FTPTransferMode.cs b/NewLife.Net/FTP/FTPTransferMode.cs
deleted file mode 100644
index 5a9db36449..0000000000
--- a/NewLife.Net/FTP/FTPTransferMode.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-﻿
-namespace NewLife.Net.FTP
-{
-    /// <summary>传输模式</summary>
-    public enum FTPTransferMode
-    {
-        /// <summary>主动。服务器主动连接客户端</summary>
-        Active,
-
-        /// <summary>被动。客户端连接服务器</summary>
-        Passive
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Fetion/WapFetion.cs b/NewLife.Net/Fetion/WapFetion.cs
deleted file mode 100644
index ac3f2865ea..0000000000
--- a/NewLife.Net/Fetion/WapFetion.cs
+++ /dev/null
@@ -1,409 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Web;
-using NewLife.Log;
-using NewLife.Web;
-
-namespace NewLife.Net.Fetion
-{
-    /// <summary>Wap飞信</summary>
-    /// <remarks>
-    /// 参考博客园 <a target="_blank" href="http://www.cnblogs.com/youwang/archive/2012/01/07/2315933.html">小桥流水</a>
-    /// 
-    /// 1，登录退出
-    /// 2，根据手机号码或者飞信号发送信息
-    /// 3，根据手机号码查找飞信号
-    /// 4，根据飞信号查找手机号码
-    /// 5，根据手机号码或者飞信号添加好友
-    /// 6，好友列表，支持设置备注和请求所只用的昵称
-    /// 7，支持设置任意好友的备注
-    /// 8，支持获取任意好友的手机号码
-    /// 9，支持向陌生人发送强制信息（看人品）
-    /// </remarks>
-    public class WapFetion : DisposeBase
-    {
-        #region 属性
-        private String _Mobile;
-        /// <summary>手机号码</summary>
-        public String Mobile { get { return _Mobile; } set { _Mobile = value; } }
-
-        private String _Password;
-        /// <summary>密码</summary>
-        public String Password { get { return _Password; } set { _Password = value; } }
-
-        private Boolean hasLogined;
-
-        private WebClientX _Client;
-        /// <summary>客户端</summary>
-        public WebClientX Client
-        {
-            get
-            {
-                if (_Client == null)
-                {
-                    var client = new WebClientX(false, true);
-                    //client.Headers.Add("Content-Type", "application/x-www-form-urlencoded");
-                    var result = client.DownloadString(server + "/im/");
-
-                    _Client = client;
-                }
-                return _Client;
-            }
-            set { _Client = value; }
-        }
-
-        private Boolean _ShowResponse;
-        /// <summary>是否显示响应。一般只用于调试</summary>
-        public Boolean ShowResponse { get { return _ShowResponse; } set { _ShowResponse = value; } }
-        #endregion
-
-        #region 构造
-        /// <summary>构造函数</summary>
-        /// <param name="mobile">手机号码</param>
-        /// <param name="password">密码</param>
-        public WapFetion(String mobile, String password)
-        {
-            Mobile = mobile;
-            //Password = password;
-            Password = UrlEncode(password);
-        }
-
-        /// <summary>子类重载实现资源释放逻辑时必须首先调用基类方法</summary>
-        /// <param name="disposing">从Dispose调用（释放所有资源）还是析构函数调用（释放非托管资源）</param>
-        protected override void OnDispose(bool disposing)
-        {
-            base.OnDispose(disposing);
-
-            if (_Client != null) _Client.Dispose();
-
-            if (hasLogined) Logout();
-        }
-        #endregion
-
-        #region 发送数据
-        String UrlEncode(String text) { return HttpUtility.UrlEncode(text, Encoding.UTF8); }
-
-        const String server = "http://f.10086.cn";
-        String Post(String uri, String data, params Object[] ps)
-        {
-            if (!hasLogined) Login();
-
-            if (ps != null && ps.Length > 0) data = String.Format(data, ps);
-            var d = Encoding.UTF8.GetBytes(data);
-            Client.Headers[HttpRequestHeader.ContentType] = "application/x-www-form-urlencoded";
-            if (ShowResponse) WriteLog("{0} {1}", uri, data);
-            Client.Encoding = Encoding.UTF8;
-            d = Client.UploadData(server + uri, d);
-            var result = Encoding.UTF8.GetString(d);
-            if (ShowResponse) WriteLog(result);
-            return result;
-        }
-
-        String Get(String uri, params Object[] ps)
-        {
-            if (!hasLogined) Login();
-
-            if (ps != null && ps.Length > 0) uri = String.Format(uri, ps);
-            if (ShowResponse) WriteLog(uri);
-            Client.Encoding = Encoding.UTF8;
-            var result = Client.DownloadString(server + uri);
-            if (ShowResponse) WriteLog(result);
-            return result;
-        }
-        #endregion
-
-        #region 登录退出
-        /// <summary>登陆</summary>
-        /// <returns></returns>
-        public String Login()
-        {
-            if (hasLogined) return null;
-            hasLogined = true;
-
-            var result = Post("/im/login/inputpasssubmit1.action", "m={0}&pass={1}&loginstatus=1", Mobile, Password);
-            if (result.Contains("失败")) throw new NetException("登录失败！");
-            return result;
-        }
-
-        /// <summary>注销</summary>
-        /// <returns></returns>
-        public String Logout()
-        {
-            return Post("/im/index/logoutsubmit.action", "");
-        }
-        #endregion
-
-        #region 发送消息
-        /// <summary>通过手机号，给自己会好友发送消息</summary>
-        /// <param name="mobile">手机号</param>
-        /// <param name="message">消息</param>
-        public void Send(String mobile, String message)
-        {
-            if (String.IsNullOrEmpty(message)) throw new ArgumentNullException("message");
-            if (String.IsNullOrEmpty(mobile)) mobile = Mobile;
-
-            if (mobile == Mobile)
-                SendToMyself(message);
-            else
-            {
-                Int32 uid = GetUid(mobile);
-                if (uid != 0)
-                    Send(uid, message);
-                else
-                    AddFriend(mobile);
-            }
-        }
-
-        /// <summary>获取用户UID</summary>
-        /// <param name="mobile"></param>
-        /// <returns></returns>
-        protected Int32 GetUid(String mobile)
-        {
-            // 在好友列表里面找
-            var fs = _Friends;
-            var f = fs == null ? null : fs.FirstOrDefault(e => e.Mobile == mobile);
-            if (f != null) return f.ID;
-
-            String uri = "/im/index/searchOtherInfoList.action";
-            String data = "searchText=" + mobile;
-
-            String result = Post(uri, data);
-            Match mc = Regex.Match(result, @"toinputMsg\.action\?touserid=(\d+)");
-            if (!mc.Success) return 0;
-
-            var id = Int32.Parse(mc.Groups[1].Value);
-            if (id > 0)
-            {
-                // 如果没有，就强制创建列表
-                fs = _Friends ?? (_Friends = new List<Friend>());
-                // 分别根据编号和手机号查找
-                f = fs.FirstOrDefault(e => e.Mobile == mobile);
-                if (f == null) f = fs.FirstOrDefault(e => e.Mobile == mobile);
-                // 如果没有，创建一个
-                if (f == null)
-                {
-                    f = new Friend();
-                    f.Client = this;
-                    fs.Add(f);
-                }
-                // 设置编号和手机号
-                f.ID = id;
-                f.Mobile = mobile;
-            }
-
-            return id;
-        }
-
-        /// <summary>发往目标UID</summary>
-        /// <param name="uid"></param>
-        /// <param name="message"></param>
-        public void Send(Int32 uid, String message)
-        {
-            if (uid < 1) throw new ArgumentNullException("uid");
-            if (String.IsNullOrEmpty(message)) throw new ArgumentNullException("message");
-
-            String uri = "/im/chat/sendMsg.action?touserid=" + uid;
-            String data = "msg=" + UrlEncode(message);
-            String result = Post(uri, data);
-            if (!result.Contains("成功")) throw new XException("发送失败！");
-        }
-
-        /// <summary>发送给自己</summary>
-        /// <param name="message"></param>
-        public void SendToMyself(String message)
-        {
-            if (String.IsNullOrEmpty(message)) throw new ArgumentNullException("message");
-
-            String uri = "/im/user/sendMsgToMyselfs.action";
-            String data = "msg=" + UrlEncode(message);
-            String result = Post(uri, data);
-            if (!result.Contains("成功")) throw new XException("发送失败！");
-        }
-
-        /// <summary>向非好友发送强制信息。经测试，很难成功，貌似必须同城用户才行</summary>
-        /// <param name="uid"></param>
-        /// <param name="message"></param>
-        public void SendStranger(Int32 uid, String message)
-        {
-            if (uid < 1) throw new ArgumentNullException("uid");
-            if (String.IsNullOrEmpty(message)) throw new ArgumentNullException("message");
-
-            // 首先创建强制会话
-            Get("/im/chat/toStrangers.action?touserid=" + uid);
-            String uri = "/im/chat/sendStrangerMsg.action?touserid=" + uid;
-            String data = "backUrl=&touchTextLength=&touchTitle=&msg=" + UrlEncode(message);
-            String result = Post(uri, data);
-            if (!result.Contains("成功")) throw new XException("发送失败！");
-        }
-        #endregion
-
-        #region 添加好友
-        /// <summary>添加好友</summary>
-        /// <param name="mobile">对方手机号码</param>
-        /// <param name="localName">本地名</param>
-        /// <param name="nickName">我的昵称，让对方知道我是谁</param>
-        public void AddFriend(String mobile, String localName = null, String nickName = null)
-        {
-            AddFriend(Int32.Parse(mobile), 0, localName, nickName);
-        }
-
-        /// <summary>添加好友</summary>
-        /// <param name="number">手机号码或者飞信号码，由第二个参数决定</param>
-        /// <param name="type">0：手机号；1：飞信号</param>
-        /// <param name="localName">本地名</param>
-        /// <param name="nickName">我的昵称，让对方知道我是谁</param>
-        public void AddFriend(Int32 number, Int32 type = 0, String localName = null, String nickName = null)
-        {
-            if (number <= 0) throw new ArgumentNullException("number");
-            if (String.IsNullOrEmpty(nickName)) nickName = Mobile.Substring(0, 5);
-
-            if (!String.IsNullOrEmpty(localName) && localName.Length > 5) localName = localName.Substring(0, 5);
-            if (!String.IsNullOrEmpty(nickName) && nickName.Length > 5) nickName = nickName.Substring(0, 5);
-
-            if (!String.IsNullOrEmpty(localName)) localName = UrlEncode(localName);
-            if (!String.IsNullOrEmpty(nickName)) nickName = UrlEncode(nickName);
-
-            Post("/im/user/insertfriend1.action", "");
-            Post("/im/user/insertfriend2.action", "type={0}&number={1}", type, number);
-            Post("/im/user/insertfriend3.action", "buddylist=0&nickname=&type={0}&number={1}", type, number);
-            Post("/im/user/insertfriendsubmit.action", "nickname={3}&buddylist=0&localName={2}&type={1}&number={0}", number, type, localName, nickName);
-        }
-        #endregion
-
-        #region 好友列表
-        private List<Friend> _Friends;
-        /// <summary>好友列表</summary>
-        public List<Friend> Friends { get { return _Friends ?? (_Friends = GetFriends()); } set { _Friends = value; } }
-
-        static Regex reg_friends = new Regex("<img[^>]*alt=\"([^\"]*)\"[^>]*>\\s*(?:</img>)\\s*<a[^>]*/im/chat/toinputMsg\\.action\\?touserid=(\\d+)[^>]*>([^<]*)</a>\\s*([^<]*?)\\s*<br", RegexOptions.Compiled);
-        static Regex reg_next = new Regex("href=\"([^\"]*)\"[^>]*>下一页</a>", RegexOptions.Compiled);
-        List<Friend> GetFriends()
-        {
-            var list = new List<Friend>();
-
-            String uri = "/im/index/index.action?type=all";
-            while (true)
-            {
-                var rs = Get(uri);
-
-                var ms = reg_friends.Matches(rs);
-                if (ms == null) break;
-
-                foreach (Match item in ms)
-                {
-                    var entity = new Friend();
-                    entity.ID = Int32.Parse(item.Groups[2].Value);
-                    entity.Name = item.Groups[3].Value;
-                    entity.Status = item.Groups[1].Value;
-                    entity.Description = item.Groups[4].Value;
-
-                    // 最后设置这个，否则，给Name赋值的时候，会引发一系列反应
-                    entity.Client = this;
-
-                    list.Add(entity);
-                }
-
-                // 获取下一页
-                var m = reg_next.Match(rs);
-                if (!m.Success) break;
-
-                uri = m.Groups[1].Value;
-                if (String.IsNullOrEmpty(uri)) break;
-                uri = HttpUtility.HtmlDecode(uri);
-            }
-
-            return list;
-        }
-
-        /// <summary>更新本地名</summary>
-        /// <param name="uid"></param>
-        /// <param name="localName"></param>
-        public void UpdateLocalName(Int32 uid, String localName)
-        {
-            if (uid < 1) throw new ArgumentNullException("uid");
-            //if (String.IsNullOrEmpty(localname)) throw new ArgumentNullException("localname");
-
-            Post("/im/user/updateLocalnames.action", String.Format("touserid={0}&localName={1}", uid, localName));
-        }
-
-        /// <summary>获取指定用户的手机号</summary>
-        /// <param name="uid"></param>
-        /// <returns></returns>
-        public String GetMobile(Int32 uid)
-        {
-            if (uid < 1) throw new ArgumentNullException("uid");
-
-            var rs = Get("/im/user/userinfoByuserid.action?touserid=" + uid);
-            if (String.IsNullOrEmpty(rs)) return null;
-
-            var reg = new Regex("手机号码:(\\d{11})", RegexOptions.Compiled);
-            var m = reg.Match(rs);
-            if (!m.Success) return null;
-
-            return m.Groups[1].Value;
-        }
-
-        #region 好友
-        /// <summary>好友</summary>
-        public class Friend
-        {
-            private WapFetion _Client;
-            /// <summary>客户端</summary>
-            internal WapFetion Client { get { return _Client; } set { _Client = value; } }
-
-            private Int32 _ID;
-            /// <summary>编号</summary>
-            public Int32 ID { get { return _ID; } set { _ID = value; } }
-
-            private String _Name;
-            /// <summary>名称</summary>
-            public String Name { get { return _Name; } set { _Name = value; if (Client != null) Client.UpdateLocalName(ID, Name); } }
-
-            private String _Mobile;
-            /// <summary>号码</summary>
-            public String Mobile { get { return _Mobile; } set { _Mobile = value; } }
-
-            private String _Status;
-            /// <summary>状态</summary>
-            public String Status { get { return _Status; } set { _Status = value; } }
-
-            private String _Description;
-            /// <summary>描述</summary>
-            public String Description { get { return _Description; } set { _Description = value; } }
-
-            /// <summary>刷新信息，目前主要获取手机号</summary>
-            public void Refresh()
-            {
-                if (Client != null) Mobile = Client.GetMobile(ID);
-            }
-
-            /// <summary>已重载。</summary>
-            /// <returns></returns>
-            public override string ToString()
-            {
-                var m = Mobile;
-                if (String.IsNullOrEmpty(m)) m = ID.ToString();
-                return String.Format("[{0}]{1}({2}) {3}", Status, Name, m, Description);
-            }
-        }
-        #endregion
-        #endregion
-
-        #region 日志
-        /// <summary>日志</summary>
-        public ILog Log { get; set; } = Logger.Null;
-
-        /// <summary>写日志</summary>
-        /// <param name="format"></param>
-        /// <param name="args"></param>
-        public void WriteLog(String format, params Object[] args)
-        {
-            Log?.Info(format, args);
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Flash/SandBoxServer.cs b/NewLife.Net/Flash/SandBoxServer.cs
deleted file mode 100644
index 70e4994d9b..0000000000
--- a/NewLife.Net/Flash/SandBoxServer.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-﻿using System;
-using System.IO;
-using System.Net.Sockets;
-using NewLife.Net.Sockets;
-
-namespace NewLife.Net
-{
-    /// <summary>安全沙箱</summary>
-    public class SandBoxServer : NetServer
-    {
-        #region 属性
-        private String _Policy = "<cross-domain-policy><allow-access-from domain=\"*\" to-ports=\"*\" /></cross-domain-policy>\0";
-        /// <summary>安全策略文件内容</summary>
-        public String Policy { get { return _Policy; } set { _Policy = value; } }
-        #endregion
-
-        /// <summary>实例化一个安全沙箱服务器</summary>
-        public SandBoxServer()
-        {
-            Port = 843;
-            ProtocolType = NetType.Tcp;
-        }
-        /// <summary>数据返回</summary>
-        /// <param name="session"></param>
-        /// <param name="stream"></param>
-        protected override void OnReceive(INetSession session, Stream stream)
-        {
-            var sss = stream.ToStr();
-            if (sss == "<policy-file-request/>\0")
-            {
-                session.Send(System.Text.Encoding.UTF8.GetBytes(_Policy.ToCharArray()));
-            }
-            session.Dispose();
-            return;
-        }
-    }
-}
diff --git a/NewLife.Net/Http/ByteParser.cs b/NewLife.Net/Http/ByteParser.cs
deleted file mode 100644
index 4441086890..0000000000
--- a/NewLife.Net/Http/ByteParser.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-﻿
-namespace NewLife.Net.Http
-{
-    sealed class ByteParser
-    {
-        private byte[] _bytes;
-        private int _pos;
-
-        internal ByteParser(byte[] bytes)
-        {
-            _bytes = bytes;
-            _pos = 0;
-        }
-
-        internal ByteString ReadLine()
-        {
-            ByteString str = null;
-            for (int i = _pos; i < _bytes.Length; i++)
-            {
-                if (_bytes[i] == 10)
-                {
-                    int length = i - _pos;
-                    if (length > 0 && _bytes[i - 1] == 13) length--;
-                    str = new ByteString(_bytes, _pos, length);
-                    _pos = i + 1;
-                    return str;
-                }
-            }
-            if (_pos < _bytes.Length) str = new ByteString(_bytes, _pos, _bytes.Length - _pos);
-            _pos = _bytes.Length;
-            return str;
-        }
-
-        internal int CurrentOffset { get { return _pos; } }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Http/ByteString.cs b/NewLife.Net/Http/ByteString.cs
deleted file mode 100644
index a454a6c98b..0000000000
--- a/NewLife.Net/Http/ByteString.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-﻿using System;
-using System.Collections;
-using System.Text;
-
-namespace NewLife.Net.Http
-{
-    sealed class ByteString
-    {
-        private byte[] _bytes;
-        private int _length;
-        private int _offset;
-
-        public ByteString(byte[] bytes, int offset, int length)
-        {
-            _bytes = bytes;
-            if (_bytes != null && offset >= 0 && length >= 0 && offset + length <= _bytes.Length)
-            {
-                _offset = offset;
-                _length = length;
-            }
-        }
-
-        public byte[] GetBytes()
-        {
-            byte[] dst = new byte[_length];
-            if (_length > 0) Buffer.BlockCopy(_bytes, _offset, dst, 0, _length);
-            return dst;
-        }
-
-        public string GetString() { return GetString(Encoding.UTF8); }
-
-        public string GetString(Encoding enc)
-        {
-            if (IsEmpty) return string.Empty;
-            return enc.GetString(_bytes, _offset, _length);
-        }
-
-        public int IndexOf(char ch) { return IndexOf(ch, 0); }
-
-        public int IndexOf(char ch, int offset)
-        {
-            for (int i = offset; i < _length; i++)
-            {
-                if (this[i] == ((byte)ch)) return i;
-            }
-            return -1;
-        }
-
-        public ByteString[] Split(char sep)
-        {
-            ArrayList list = new ArrayList();
-            int offset = 0;
-            while (offset < _length)
-            {
-                int index = IndexOf(sep, offset);
-                if (index < 0)
-                {
-                    list.Add(Substring(offset));
-                    break;
-                }
-                list.Add(Substring(offset, index - offset));
-                for (offset = index + 1; offset < _length && this[offset] == ((byte)sep); offset++)
-                {
-                }
-            }
-            int count = list.Count;
-            ByteString[] strArray = new ByteString[count];
-            for (int i = 0; i < count; i++)
-            {
-                strArray[i] = (ByteString)list[i];
-            }
-            return strArray;
-        }
-
-        public ByteString Substring(int offset) { return Substring(offset, _length - offset); }
-
-        public ByteString Substring(int offset, int len) { return new ByteString(_bytes, _offset + offset, len); }
-
-        public byte[] Bytes { get { return _bytes; } }
-
-        public bool IsEmpty
-        {
-            get
-            {
-                if (_bytes != null) return _length == 0;
-                return true;
-            }
-        }
-
-        public byte this[int index] { get { return _bytes[_offset + index]; } }
-
-        public int Length { get { return _length; } }
-
-        public int Offset { get { return _offset; } }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Http/HttpCache.cs b/NewLife.Net/Http/HttpCache.cs
deleted file mode 100644
index 8474c4b326..0000000000
--- a/NewLife.Net/Http/HttpCache.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-﻿using System;
-using System.IO;
-using NewLife.Collections;
-
-namespace NewLife.Net.Http
-{
-    /// <summary>Http缓存。以Url作为缓存键</summary>
-    class HttpCache
-    {
-        #region 属性
-        private Int32 _Expriod = 600;
-        /// <summary>过期时间。单位是秒，默认0秒，表示永不过期</summary>
-        public Int32 Expriod { get { return _Expriod; } set { _Expriod = value; } }
-
-        private DictionaryCache<String, HttpCacheItem> _Items;
-        /// <summary>缓存项</summary>
-        private DictionaryCache<String, HttpCacheItem> Items
-        {
-            get
-            {
-                if (_Items == null) _Items = new DictionaryCache<String, HttpCacheItem>(StringComparer.OrdinalIgnoreCase) { Expire = Expriod };
-                return _Items;
-            }
-            set { _Items = value; }
-        }
-        #endregion
-
-        #region 方法
-        public HttpCacheItem GetItem(String url)
-        {
-            return Items[url];
-            //HttpCacheItem item = null;
-            //if (!Items.TryGetValue(url, out item)) return null;
-            //lock (Items)
-            //{
-            //    if (!Items.TryGetValue(url, out item)) return null;
-
-            //    // 移除过期
-            //    if (item.ExpiredTime < DateTime.Now)
-            //    {
-            //        Items.Remove(url);
-            //        item = null;
-            //    }
-
-            //    return item;
-            //}
-        }
-
-        public HttpCacheItem Add(HttpHeader request, HttpHeader response)
-        {
-            var url = request.RawUrl;
-            var item = new HttpCacheItem() { Url = url, Request = request, Response = response };
-            item.Stream = response.GetStream();
-            //lock (Items)
-            //{
-            //    Items[url] = item;
-            //}
-            Items[url] = item;
-
-            return item;
-        }
-        #endregion
-    }
-
-    /// <summary>Http缓存项。</summary>
-    class HttpCacheItem
-    {
-        #region 属性
-        private String _Url;
-        /// <summary>网址</summary>
-        public String Url { get { return _Url; } set { _Url = value; } }
-
-        private HttpHeader _Request;
-        /// <summary>请求</summary>
-        public HttpHeader Request { get { return _Request; } set { _Request = value; } }
-
-        private HttpHeader _Response;
-        /// <summary>响应</summary>
-        public HttpHeader Response { get { return _Response; } set { _Response = value; } }
-
-        private Stream _Stream;
-        /// <summary>数据流</summary>
-        public Stream Stream { get { return _Stream ?? (_Stream = new MemoryStream()); } set { _Stream = value; } }
-
-        //private DateTime _StartTime = DateTime.Now;
-        ///// <summary>开始时间</summary>
-        //public DateTime StartTime { get { return _StartTime; } set { _StartTime = value; } }
-
-        //private DateTime _ExpiredTime = DateTime.Now.AddMinutes(10);
-        ///// <summary>到期时间</summary>
-        //public DateTime ExpiredTime { get { return _ExpiredTime; } set { _ExpiredTime = value; } }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Http/HttpHeader.cs b/NewLife.Net/Http/HttpHeader.cs
deleted file mode 100644
index 4efd4315d2..0000000000
--- a/NewLife.Net/Http/HttpHeader.cs
+++ /dev/null
@@ -1,366 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using NewLife.IO;
-using NewLife.Serialization;
-
-namespace NewLife.Net.Http
-{
-    /// <summary>Http头部</summary>
-    public class HttpHeader
-    {
-        #region 属性
-        /// <summary>是否响应。以Method是否为空作为依据。</summary>
-        public Boolean IsResponse { get { return String.IsNullOrEmpty(Method); } }
-
-        private String _Method;
-        /// <summary>请求方法</summary>
-        public String Method { get { return _Method; } set { _Method = value; } }
-
-        private Uri _Url;
-        /// <summary>请求文档</summary>
-        public Uri Url { get { return _Url; } set { _Url = value; } }
-
-        private String _Version;
-        /// <summary>协议版本</summary>
-        public String Version { get { return _Version; } set { _Version = value; } }
-
-        private Int32 _StatusCode;
-        /// <summary>状态码</summary>
-        public Int32 StatusCode { get { return _StatusCode; } set { _StatusCode = value; } }
-
-        private String _StatusDescription;
-        /// <summary>状态描述</summary>
-        public String StatusDescription { get { return _StatusDescription; } set { _StatusDescription = value; } }
-
-        private IDictionary<String, String> _Headers;
-        /// <summary>头部</summary>
-        public IDictionary<String, String> Headers { get { return _Headers ?? (_Headers = new HeaderCollection()); } }
-
-        //const String VersionPrefix = "HTTP/";
-
-        private Boolean _IsFinish = true;
-        /// <summary>是否完整Http头。是否双换行结束</summary>
-        public Boolean IsFinish { get { return _IsFinish; } private set { _IsFinish = value; } }
-
-        /// <summary>未完成分析时剩下部分</summary>
-        private String _last;
-        #endregion
-
-        #region 扩展属性
-        /// <summary>主机头</summary>
-        public String Host { get { return Headers["Host"]; } set { Headers["Host"] = value; } }
-
-        /// <summary>引用页</summary>
-        public String Referer { get { return Headers["Referer"]; } set { Headers["Referer"] = value; } }
-
-        /// <summary>重定向地址</summary>
-        public String Location { get { return Headers["Location"]; } set { Headers["Location"] = value; } }
-
-        /// <summary>内容长度</summary>
-        public Int32 ContentLength { get { return Headers["Content-Length"].IsNullOrWhiteSpace() ? 0 : Int32.Parse(Headers["Content-Length"]); } set { Headers["Content-Length"] = value.ToString(); } }
-
-        /// <summary>内容类型</summary>
-        public String ContentType { get { return Headers["Content-type"]; } set { Headers["Content-type"] = value; } }
-
-        /// <summary>是否保持连接</summary>
-        public String Connection { get { return Headers["Connection"]; } set { Headers["Connection"] = value; } }
-
-        /// <summary>是否保持连接</summary>
-        public Boolean KeepAlive { get { return !"Close".EqualIgnoreCase(Connection); } set { Connection = value ? "keep-alive" : "Close"; } }
-
-        /// <summary>是否保持代理连接</summary>
-        public String ProxyConnection { get { return Headers["Proxy-Connection"]; } set { Headers["Proxy-Connection"] = value; } }
-
-        /// <summary>是否保持代理连接</summary>
-        public Boolean ProxyKeepAlive { get { return !"Close".EqualIgnoreCase(ProxyConnection); } set { ProxyConnection = value ? "Keep-Alive" : "Close"; } }
-
-        /// <summary>原始地址。直接代理会包括全路径</summary>
-        public String RawUrl { get { return Url != null && Url.IsAbsoluteUri ? Url.ToString() : String.Format("http://{0}{1}", Host, Url); } }
-        #endregion
-
-        #region 方法
-        /// <summary>从流中读取Http头部对象。如果不是Http头部，指针要回到原来位置</summary>
-        /// <param name="stream"></param>
-        /// <param name="mode"></param>
-        /// <returns></returns>
-        public static HttpHeader Read(Stream stream, HttpHeaderReadMode mode = HttpHeaderReadMode.RequestOrResponse)
-        {
-            if (stream == null) return null;
-
-            // 因为数据流可能不是Http流，这里需要更高效的Http探测方法，以提高效率。
-
-            HttpHeader entity = null;
-            var p = stream.Position;
-            //var reader = new BinaryReaderX(stream);
-
-            entity = ReadFirst(stream);
-            if (entity == null) return null;
-
-            switch (mode)
-            {
-                case HttpHeaderReadMode.Request:
-                    if (entity.IsResponse) { stream.Position = p; return null; }
-                    break;
-                case HttpHeaderReadMode.Response:
-                    if (!entity.IsResponse) { stream.Position = p; return null; }
-                    break;
-                default:
-                    break;
-            }
-
-            if (stream.Position < stream.Length) entity.ReadHeaders(stream);
-
-            //// 因为涉及字符编码，所以跟流位置可能不同。对于ASCII编码没有问题。
-            //stream.Position = p + reader.CharPosition;
-
-            return entity;
-        }
-
-        /// <summary>仅读取第一行。如果不是Http头部，指针要回到原来位置</summary>
-        /// <param name="stream"></param>
-        /// <returns></returns>
-        public static HttpHeader ReadFirst(Stream stream)
-        {
-            // 如果不是Http头部，指针要回到原来位置
-            var p = stream.Position;
-
-            var idx = stream.IndexOf("\r\n".GetBytes());
-            stream.Position = p;
-
-            if (idx < 0) return null;
-
-            var line = stream.ReadBytes(idx + 2).ToStr().Trim();
-            if (line.IsNullOrWhiteSpace()) { stream.Position = p; return null; }
-
-            var ss = line.Split(new Char[] { ' ' }, 3);
-            if (ss == null || ss.Length < 3 || ss[0].IsNullOrWhiteSpace() || ss[0].Length > 10) { stream.Position = p; return null; }
-
-            var entity = new HttpHeader();
-            if (ss[0].StartsWithIgnoreCase("HTTP/"))
-            {
-                entity.Version = ss[0];
-                entity.StatusCode = Int32.Parse(ss[1]);
-                entity.StatusDescription = ss[2];
-            }
-            else if (ss[2].StartsWithIgnoreCase("HTTP/"))
-            {
-                entity.Method = ss[0];
-                entity.Url = new Uri(ss[1], UriKind.RelativeOrAbsolute);
-                entity.Version = ss[2];
-            }
-            else
-            {
-                // 版本必须是HTTP/开头，否则非法
-                stream.Position = p;
-                return null;
-            }
-
-            return entity;
-        }
-
-        private static Byte[] _NewLine = "\r\n".GetBytes();
-
-        /// <summary>读取头部键值</summary>
-        /// <param name="stream"></param>
-        public void ReadHeaders(Stream stream)
-        {
-            //var reader = new StreamReaderX(stream, null, false);
-
-            IsFinish = true;
-            while (true)
-            {
-                //var line = reader.ReadLine();
-                var old = stream.Position;
-                var idx = stream.IndexOf(_NewLine);
-                if (idx <= 0) return;
-
-                //stream.Position = old;
-                stream.Seek(-idx - _NewLine.Length, SeekOrigin.Current);
-                var line = stream.ReadBytes(idx + _NewLine.Length).ToStr();
-                // 找到Empty，也就是找到了换行符，Http头结束
-                if (line == String.Empty) return;
-                if (line == null)
-                {
-                    if (stream.Position < stream.Length)
-                    {
-                        // 可能是结束
-                        var str = stream.ReadBytes().ToStr();
-                        if (str == Environment.NewLine) return;
-
-                        IsFinish = false;
-                        _last += str;
-                    }
-                    break;
-                }
-                // 加上上次剩下的
-                if (_last != null)
-                {
-                    line = _last + line;
-                    _last = null;
-                }
-
-                var p = line.IndexOf(":");
-                if (p < 0) throw new NetException("无法处理的头部名值对！{0}", line);
-                Headers[line.Substring(0, p).Trim()] = line.Substring(p + 1).Trim();
-            }
-        }
-
-        /// <summary>往流中写入Http头</summary>
-        /// <param name="stream"></param>
-        public void Write(Stream stream)
-        {
-            //// StreamWriter太恶心了，自动把流给关闭了，还没有地方设置
-            //using (var writer = new StreamWriterX(stream) { Closable = false })
-            //{
-            //    if (!IsResponse)
-            //        writer.WriteLine("{0} {1} {2}", Method, Url, Version);
-            //    else
-            //        writer.WriteLine("{0} {1} {2}", Version, StatusCode, StatusDescription);
-            //    foreach (var item in Headers)
-            //    {
-            //        writer.WriteLine("{0}: {1}", item.Key, item.Value);
-            //    }
-            //    if (IsFinish)
-            //        writer.WriteLine();
-            //    else
-            //        writer.Write(_last);
-            //}
-
-            var sb = new StringBuilder();
-            if (!IsResponse)
-                sb.AppendFormat("{0} {1} {2}\r\n", Method, Url, Version);
-            else
-                sb.AppendFormat("{0} {1} {2}\r\n", Version, StatusCode, StatusDescription);
-            foreach (var item in Headers)
-            {
-                sb.AppendFormat("{0}: {1}\r\n", item.Key, item.Value);
-            }
-            if (IsFinish)
-                sb.AppendLine();
-            else
-                sb.Append(_last);
-
-            stream.Write(sb.ToString().GetBytes());
-        }
-
-        /// <summary>获取Http头的数据流</summary>
-        /// <returns></returns>
-        public Stream GetStream()
-        {
-            var ms = new MemoryStream();
-            Write(ms);
-            ms.Position = 0;
-            return ms;
-        }
-
-        /// <summary>已重载。以文本形式呈现整个头部</summary>
-        /// <returns></returns>
-        public override String ToString()
-        {
-            if (!IsResponse)
-                return String.Format("{0} {1} {2}", Method, RawUrl, Version);
-            else
-                return String.Format("{0} {1} {2}", Version, StatusCode, StatusDescription);
-        }
-
-        /// <summary>文本形式</summary>
-        /// <returns></returns>
-        public String ToText()
-        {
-            var sb = new StringBuilder();
-            if (!IsResponse)
-                sb.AppendFormat("{0} {1} {2}", Method, Url, Version);
-            else
-                sb.AppendFormat("{0} {1} {2}", Version, StatusCode, StatusDescription);
-            sb.AppendLine();
-            foreach (var item in Headers)
-            {
-                sb.AppendFormat("{0}: {1}", item.Key, item.Value);
-                sb.AppendLine();
-            }
-            if (IsFinish)
-                sb.AppendLine();
-            else
-                sb.Append(_last);
-
-            return sb.ToString();
-        }
-        #endregion
-
-        #region 辅助
-        class HeaderCollection : Dictionary<String, String>, IDictionary<String, String>
-        {
-            public HeaderCollection() : base(StringComparer.OrdinalIgnoreCase) { }
-
-            public new String this[String key]
-            {
-                get
-                {
-                    return TryGetValue(key, out var v) ? v : null;
-                }
-                set
-                {
-                    if (value == null)
-                    {
-                        if (ContainsKey(key)) Remove(key);
-                    }
-                    else
-                        base[key] = value;
-                }
-            }
-        }
-        #endregion
-    }
-
-    /// <summary>读取模式</summary>
-    public enum HttpHeaderReadMode
-    {
-        /// <summary>请求或响应</summary>
-        RequestOrResponse,
-
-        /// <summary>请求</summary>
-        Request,
-
-        /// <summary>响应</summary>
-        Response
-    }
-
-    /// <summary>Http谓语</summary>
-    enum HttpVerb
-    {
-        /// <summary>未解析</summary>
-        Unparsed,
-
-        /// <summary>未知</summary>
-        Unknown,
-
-        /// <summary>获取</summary>
-        GET,
-
-        /// <summary>推送</summary>
-        PUT,
-
-        /// <summary>跟GET一样，只不过响应包只包括头部而没有内容</summary>
-        HEAD,
-
-        /// <summary>提交</summary>
-        POST,
-
-        /// <summary>调试</summary>
-        DEBUG,
-
-        /// <summary>跟踪</summary>
-        TRACE,
-
-        /// <summary>连接</summary>
-        CONNECT,
-
-        /// <summary>选项</summary>
-        OPTIONS,
-
-        /// <summary>删除</summary>
-        DELETE
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Http/HttpServer.cs b/NewLife.Net/Http/HttpServer.cs
deleted file mode 100644
index 2f4f17becf..0000000000
--- a/NewLife.Net/Http/HttpServer.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-﻿using System.Net.Sockets;
-using NewLife.Net.Sockets;
-
-namespace NewLife.Net.Http
-{
-    /// <summary>Http服务器</summary>
-    public class HttpServer : NetServer<HttpSession>
-    {
-        //TODO 未实现Http服务端
-
-        #region 属性
-        //private Dictionary<Int32, HttpSession> _Sessions;
-        ///// <summary>会话集合</summary>
-        //public IDictionary<Int32, HttpSession> Sessions { get { return _Sessions ?? (_Sessions = new Dictionary<int, HttpSession>()); } }
-        #endregion
-
-        /// <summary>实例化一个Http服务器</summary>
-        public HttpServer()
-        {
-            Port = 80;
-            ProtocolType = NetType.Tcp;
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Http/HttpSession.cs b/NewLife.Net/Http/HttpSession.cs
deleted file mode 100644
index ff8cb4fd22..0000000000
--- a/NewLife.Net/Http/HttpSession.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-﻿using NewLife.Net.Sockets;
-
-namespace NewLife.Net.Http
-{
-    /// <summary>Http会话</summary>
-    public class HttpSession : NetSession
-    {
-        //TODO 未实现Http会话
-
-        #region 属性
-
-        #endregion
-
-        #region 启动会话
-        //void Start()
-        //{
-
-        //}
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Http/Messages.cs b/NewLife.Net/Http/Messages.cs
deleted file mode 100644
index fcfdc6e0ed..0000000000
--- a/NewLife.Net/Http/Messages.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-﻿using System;
-using System.Globalization;
-using System.IO;
-using System.Reflection;
-using System.Text;
-using System.Web;
-using NewLife.Reflection;
-
-namespace NewLife.Net.Http
-{
-    internal class Messages
-    {
-        private const String _dirListingDirFormat = "{0,38:dddd, MMMM dd, yyyy hh:mm tt}        &lt;dir&gt; <A href=\"{1}/\">{2}</A>\r\n";
-        private const String _dirListingFileFormat = "{0,38:dddd, MMMM dd, yyyy hh:mm tt} {1,12:n0} <A href=\"{2}\">{3}</A>\r\n";
-        private const String _dirListingFormat1 = "<html>\r\n    <head>\r\n    <title>{0}</title>\r\n";
-        private const String _dirListingFormat2 = "            <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>\r\n    <body bgcolor=\"white\">\r\n\r\n    <h2> <i>{0}</i> </h2></span>\r\n\r\n            <hr width=100% size=1 color=silver>\r\n\r\n<PRE>\r\n";
-        private const String _dirListingParentFormat = "<A href=\"{0}\">[To Parent Directory]</A>\r\n\r\n";
-        private static String _dirListingTail = ("</PRE>\r\n            <hr width=100% size=1 color=silver>\r\n\r\n              <b>{0}:</b>&nbsp;{1} " + VersionString + "\r\n\r\n            </font>\r\n\r\n    </body>\r\n</html>\r\n");
-        private const String _httpErrorFormat1 = "<html>\r\n    <head>\r\n        <title>{0}</title>\r\n";
-        private static String _httpErrorFormat2 = ("            <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>\r\n    <body bgcolor=\"white\">\r\n\r\n            <span><h1>{0}<hr width=100% size=1 color=silver></h1>\r\n\r\n            <h2> <i>{1}</i> </h2></span>\r\n\r\n            <hr width=100% size=1 color=silver>\r\n\r\n            <b>{2}:</b>&nbsp;{3} " + VersionString + "\r\n\r\n            </font>\r\n\r\n    </body>\r\n</html>\r\n");
-        private const String _httpStyle = "        <style>\r\n        \tbody {font-family:\"Verdana\";font-weight:normal;font-size: 8pt;color:black;} \r\n        \tp {font-family:\"Verdana\";font-weight:normal;color:black;margin-top: -5px}\r\n        \tb {font-family:\"Verdana\";font-weight:bold;color:black;margin-top: -5px}\r\n        \th1 { font-family:\"Verdana\";font-weight:normal;font-size:18pt;color:red }\r\n        \th2 { font-family:\"Verdana\";font-weight:normal;font-size:14pt;color:maroon }\r\n        \tpre {font-family:\"Lucida Console\";font-size: 8pt}\r\n        \t.marker {font-weight: bold; color: black;text-decoration: none;}\r\n        \t.version {color: gray;}\r\n        \t.error {margin-bottom: 10px;}\r\n        \t.expandable { text-decoration:underline; font-weight:bold; color:navy; cursor:hand; }\r\n        </style>\r\n";
-
-        public static String Name = typeof(WebServer).Name;
-        public static String VersionString = AssemblyX.Create(Assembly.GetExecutingAssembly()).CompileVersion.ToString();
-        public static String VersionInfo = "版本信息";
-
-        public static String FormatDirectoryListing(String dirPath, String parentPath, FileSystemInfo[] elements)
-        {
-            var builder = new StringBuilder();
-            String str = "目录列表 -- " + dirPath;
-            builder.AppendFormat("<html>\r\n    <head>\r\n    <title>{0}</title>\r\n", str);
-            builder.Append("        <style>\r\n        \tbody {font-family:\"Verdana\";font-weight:normal;font-size: 8pt;color:black;} \r\n        \tp {font-family:\"Verdana\";font-weight:normal;color:black;margin-top: -5px}\r\n        \tb {font-family:\"Verdana\";font-weight:bold;color:black;margin-top: -5px}\r\n        \th1 { font-family:\"Verdana\";font-weight:normal;font-size:18pt;color:red }\r\n        \th2 { font-family:\"Verdana\";font-weight:normal;font-size:14pt;color:maroon }\r\n        \tpre {font-family:\"Lucida Console\";font-size: 8pt}\r\n        \t.marker {font-weight: bold; color: black;text-decoration: none;}\r\n        \t.version {color: gray;}\r\n        \t.error {margin-bottom: 10px;}\r\n        \t.expandable { text-decoration:underline; font-weight:bold; color:navy; cursor:hand; }\r\n        </style>\r\n");
-            builder.AppendFormat("            <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>\r\n    <body bgcolor=\"white\">\r\n\r\n    <h2> <i>{0}</i> </h2></span>\r\n\r\n            <hr width=100% size=1 color=silver>\r\n\r\n<PRE>\r\n", str);
-            if (parentPath != null)
-            {
-                if (!parentPath.EndsWith("/")) parentPath = parentPath + "/";
-                builder.Append(String.Format(CultureInfo.InvariantCulture, "<A href=\"{0}\">[父目录]</A>\r\n\r\n", new object[] { parentPath }));
-            }
-            if (elements != null)
-            {
-                for (int i = 0; i < elements.Length; i++)
-                {
-                    if (elements[i] is FileInfo)
-                    {
-                        FileInfo info = (FileInfo)elements[i];
-                        builder.AppendFormat("{0,38:dddd, MMMM dd, yyyy hh:mm tt} {1,12:n0} <A href=\"{2}\">{3}</A>\r\n", info.LastWriteTime, info.Length, info.Name, info.Name);
-                    }
-                    else if (elements[i] is DirectoryInfo)
-                    {
-                        DirectoryInfo info2 = (DirectoryInfo)elements[i];
-                        builder.AppendFormat("{0,38:dddd, MMMM dd, yyyy hh:mm tt}        &lt;dir&gt; <A href=\"{1}/\">{2}</A>\r\n", info2.LastWriteTime, info2.Name, info2.Name);
-                    }
-                }
-            }
-            builder.AppendFormat(_dirListingTail, VersionInfo, Name);
-            return builder.ToString();
-        }
-
-        public static String FormatErrorMessageBody(int statusCode, String appName)
-        {
-            String statusDescription = HttpWorkerRequest.GetStatusDescription(statusCode);
-            String str2 = String.Format("{0}发生错误", appName);
-            String str3 = String.Format("Http 错误 {0} - {1}", statusCode, statusDescription);
-            return String.Format("<html>\r\n    <head>\r\n        <title>{0}</title>\r\n", statusDescription) + "        <style>\r\n        \tbody {font-family:\"Verdana\";font-weight:normal;font-size: 8pt;color:black;} \r\n        \tp {font-family:\"Verdana\";font-weight:normal;color:black;margin-top: -5px}\r\n        \tb {font-family:\"Verdana\";font-weight:bold;color:black;margin-top: -5px}\r\n        \th1 { font-family:\"Verdana\";font-weight:normal;font-size:18pt;color:red }\r\n        \th2 { font-family:\"Verdana\";font-weight:normal;font-size:14pt;color:maroon }\r\n        \tpre {font-family:\"Lucida Console\";font-size: 8pt}\r\n        \t.marker {font-weight: bold; color: black;text-decoration: none;}\r\n        \t.version {color: gray;}\r\n        \t.error {margin-bottom: 10px;}\r\n        \t.expandable { text-decoration:underline; font-weight:bold; color:navy; cursor:hand; }\r\n        </style>\r\n" + String.Format(_httpErrorFormat2, str2, str3, VersionInfo, Name);
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Http/NtlmAuth.cs b/NewLife.Net/Http/NtlmAuth.cs
deleted file mode 100644
index 604207089e..0000000000
--- a/NewLife.Net/Http/NtlmAuth.cs
+++ /dev/null
@@ -1,179 +0,0 @@
-﻿using System;
-using System.Runtime.InteropServices;
-using System.Security;
-using System.Security.Principal;
-
-namespace NewLife.Net.Http
-{
-    /// <summary>NTLM验证</summary>
-    [SuppressUnmanagedCodeSecurity]
-    sealed class NtlmAuth : IDisposable
-    {
-        #region 属性
-        private string _blob;
-        private bool _completed;
-        private SecHandle _credentialsHandle;
-        private bool _credentialsHandleAcquired;
-        private SecBuffer _inputBuffer;
-        private SecBufferDesc _inputBufferDesc;
-        private SecBuffer _outputBuffer;
-        private SecBufferDesc _outputBufferDesc;
-        private SecHandle _securityContext;
-        private bool _securityContextAcquired;
-        private uint _securityContextAttributes;
-        private SecurityIdentifier _sid;
-        private long _timestamp;
-        private const int ISC_REQ_ALLOCATE_MEMORY = 0x100;
-        private const int ISC_REQ_CONFIDENTIALITY = 0x10;
-        private const int ISC_REQ_DELEGATE = 1;
-        private const int ISC_REQ_MUTUAL_AUTH = 2;
-        private const int ISC_REQ_PROMPT_FOR_CREDS = 0x40;
-        private const int ISC_REQ_REPLAY_DETECT = 4;
-        private const int ISC_REQ_SEQUENCE_DETECT = 8;
-        private const int ISC_REQ_STANDARD_FLAGS = 20;
-        private const int ISC_REQ_USE_SESSION_KEY = 0x20;
-        private const int ISC_REQ_USE_SUPPLIED_CREDS = 0x80;
-        private const int SEC_E_OK = 0;
-        private const int SEC_I_COMPLETE_AND_CONTINUE = 0x90314;
-        private const int SEC_I_COMPLETE_NEEDED = 0x90313;
-        private const int SEC_I_CONTINUE_NEEDED = 0x90312;
-        private const int SECBUFFER_DATA = 1;
-        private const int SECBUFFER_EMPTY = 0;
-        private const int SECBUFFER_TOKEN = 2;
-        private const int SECBUFFER_VERSION = 0;
-        private const int SECPKG_CRED_INBOUND = 1;
-        private const int SECURITY_NETWORK_DREP = 0;
-
-        public string Blob { get { return _blob; } }
-
-        public bool Completed { get { return _completed; } }
-
-        public SecurityIdentifier SID { get { return _sid; } }
-        #endregion
-
-        #region 构造
-        public NtlmAuth()
-        {
-            if (AcquireCredentialsHandle(null, "NTLM", 1, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero, ref _credentialsHandle, ref _timestamp) != 0) throw new InvalidOperationException();
-            _credentialsHandleAcquired = true;
-        }
-
-        ~NtlmAuth() { FreeUnmanagedResources(); }
-
-        [DllImport("SECUR32.DLL", CharSet = CharSet.Unicode)]
-        private static extern int DeleteSecurityContext(ref SecHandle phContext);
-
-        [DllImport("SECUR32.DLL", CharSet = CharSet.Unicode)]
-        private static extern int FreeCredentialsHandle(ref SecHandle phCredential);
-        private void FreeUnmanagedResources()
-        {
-            if (_securityContextAcquired) DeleteSecurityContext(ref _securityContext);
-            if (_credentialsHandleAcquired) FreeCredentialsHandle(ref _credentialsHandle);
-        }
-        void IDisposable.Dispose()
-        {
-            FreeUnmanagedResources();
-            GC.SuppressFinalize(this);
-        }
-        #endregion
-
-        #region 方法
-        public unsafe bool Authenticate(string blobString)
-        {
-            _blob = null;
-            byte[] buffer = Convert.FromBase64String(blobString);
-            byte[] inArray = new byte[0x4000];
-            fixed (SecHandle* ptrRef = &_securityContext)
-            {
-                fixed (SecBuffer* ptrRef2 = &_inputBuffer)
-                {
-                    fixed (SecBuffer* ptrRef3 = &_outputBuffer)
-                    {
-                        fixed (Byte* ptrRef4 = buffer)
-                        {
-                            fixed (Byte* ptrRef5 = inArray)
-                            {
-                                IntPtr zero = IntPtr.Zero;
-                                if (_securityContextAcquired) zero = (IntPtr)ptrRef;
-                                _inputBufferDesc.ulVersion = 0;
-                                _inputBufferDesc.cBuffers = 1;
-                                _inputBufferDesc.pBuffers = (IntPtr)ptrRef2;
-                                _inputBuffer.cbBuffer = (uint)buffer.Length;
-                                _inputBuffer.BufferType = 2;
-                                _inputBuffer.pvBuffer = (IntPtr)ptrRef4;
-                                _outputBufferDesc.ulVersion = 0;
-                                _outputBufferDesc.cBuffers = 1;
-                                _outputBufferDesc.pBuffers = (IntPtr)ptrRef3;
-                                _outputBuffer.cbBuffer = (uint)inArray.Length;
-                                _outputBuffer.BufferType = 2;
-                                _outputBuffer.pvBuffer = (IntPtr)ptrRef5;
-                                int num = AcceptSecurityContext(ref _credentialsHandle, zero, ref _inputBufferDesc, 20, 0, ref _securityContext, ref _outputBufferDesc, ref _securityContextAttributes, ref _timestamp);
-                                if (num == 0x90312)
-                                {
-                                    _securityContextAcquired = true;
-                                    _blob = Convert.ToBase64String(inArray, 0, (int)_outputBuffer.cbBuffer);
-                                }
-                                else
-                                {
-                                    if (num != 0) return false;
-                                    IntPtr phToken = IntPtr.Zero;
-                                    if (QuerySecurityContextToken(ref _securityContext, ref phToken) != 0) return false;
-                                    try
-                                    {
-                                        using (WindowsIdentity identity = new WindowsIdentity(phToken))
-                                        {
-                                            _sid = identity.User;
-                                        }
-                                    }
-                                    finally
-                                    {
-                                        CloseHandle(phToken);
-                                    }
-                                    _completed = true;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            return true;
-        }
-
-        [DllImport("SECUR32.DLL", CharSet = CharSet.Unicode)]
-        private static extern int AcceptSecurityContext(ref SecHandle phCredential, IntPtr phContext, ref SecBufferDesc pInput, uint fContextReq, uint TargetDataRep, ref SecHandle phNewContext, ref SecBufferDesc pOutput, ref uint pfContextAttr, ref long ptsTimeStamp);
-        [DllImport("SECUR32.DLL", CharSet = CharSet.Unicode)]
-        private static extern int AcquireCredentialsHandle(string pszPrincipal, string pszPackage, uint fCredentialUse, IntPtr pvLogonID, IntPtr pAuthData, IntPtr pGetKeyFn, IntPtr pvGetKeyArgument, ref SecHandle phCredential, ref long ptsExpiry);
-
-        [DllImport("KERNEL32.DLL", CharSet = CharSet.Unicode)]
-        private static extern int CloseHandle(IntPtr phToken);
-
-        [DllImport("SECUR32.DLL", CharSet = CharSet.Unicode)]
-        private static extern int QuerySecurityContextToken(ref SecHandle phContext, ref IntPtr phToken);
-        #endregion
-
-        #region 内部结构
-        [StructLayout(LayoutKind.Sequential)]
-        private struct SecBuffer
-        {
-            public uint cbBuffer;
-            public uint BufferType;
-            public IntPtr pvBuffer;
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        private struct SecBufferDesc
-        {
-            public uint ulVersion;
-            public uint cBuffers;
-            public IntPtr pBuffers;
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        private struct SecHandle
-        {
-            public IntPtr dwLower;
-            public IntPtr dwUpper;
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Http/WebHost.cs b/NewLife.Net/Http/WebHost.cs
deleted file mode 100644
index 717805b88c..0000000000
--- a/NewLife.Net/Http/WebHost.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-﻿using System;
-using System.Globalization;
-using System.Security.Permissions;
-using System.Security.Principal;
-using System.Threading;
-using System.Web;
-using System.Web.Hosting;
-
-namespace NewLife.Net.Http
-{
-    sealed class Host : MarshalByRefObject, IRegisteredObject
-    {
-        private bool _disableDirectoryListing;
-        private string _installPath;
-        private string _lowerCasedClientScriptPathWithTrailingSlash;
-        private string _lowerCasedVirtualPath;
-        private string _lowerCasedVirtualPathWithTrailingSlash;
-        private int _pendingCallsCount;
-        private string _physicalClientScriptPath;
-        private string _physicalPath;
-        private int _port;
-        private bool _requireAuthentication;
-        private WebServer _server;
-        private string _virtualPath;
-
-        public Host()
-        {
-            HostingEnvironment.RegisterObject(this);
-        }
-
-        private void AddPendingCall() { Interlocked.Increment(ref _pendingCallsCount); }
-
-        public void Configure(WebServer server, int port, string virtualPath, string physicalPath, bool requireAuthentication) { Configure(server, port, virtualPath, physicalPath, requireAuthentication, false); }
-
-        public void Configure(WebServer server, int port, string virtualPath, string physicalPath, bool requireAuthentication, bool disableDirectoryListing)
-        {
-            _server = server;
-            _port = port;
-            _installPath = null;
-            _virtualPath = virtualPath;
-            _requireAuthentication = requireAuthentication;
-            _disableDirectoryListing = disableDirectoryListing;
-            _lowerCasedVirtualPath = CultureInfo.InvariantCulture.TextInfo.ToLower(_virtualPath);
-            _lowerCasedVirtualPathWithTrailingSlash = virtualPath.EndsWith("/") ? virtualPath : (virtualPath + "/");
-            _lowerCasedVirtualPathWithTrailingSlash = CultureInfo.InvariantCulture.TextInfo.ToLower(_lowerCasedVirtualPathWithTrailingSlash);
-            _physicalPath = physicalPath;
-            _physicalClientScriptPath = HttpRuntime.AspClientScriptPhysicalPath + @"\";
-            _lowerCasedClientScriptPathWithTrailingSlash = CultureInfo.InvariantCulture.TextInfo.ToLower(HttpRuntime.AspClientScriptVirtualPath + "/");
-        }
-
-        public SecurityIdentifier GetProcessSID()
-        {
-            using (WindowsIdentity identity = new WindowsIdentity(_server.ProcessToken))
-            {
-                return identity.User;
-            }
-        }
-
-        public IntPtr GetProcessToken()
-        {
-            new SecurityPermission(PermissionState.Unrestricted).Assert();
-            return _server.ProcessToken;
-        }
-
-        public string GetProcessUser() { return _server.ProcessUser; }
-
-        public override object InitializeLifetimeService() { return null; }
-
-        public bool IsVirtualPathAppPath(string path)
-        {
-            if (path == null) return false;
-            path = CultureInfo.InvariantCulture.TextInfo.ToLower(path);
-            if (!(path == _lowerCasedVirtualPath)) return path == _lowerCasedVirtualPathWithTrailingSlash;
-            return true;
-        }
-
-        public bool IsVirtualPathInApp(string path)
-        {
-            bool flag;
-            return IsVirtualPathInApp(path, out flag);
-        }
-
-        public bool IsVirtualPathInApp(string path, out bool isClientScriptPath)
-        {
-            isClientScriptPath = false;
-            if (path != null)
-            {
-                path = CultureInfo.InvariantCulture.TextInfo.ToLower(path);
-                if (_virtualPath == "/" && path.StartsWith("/", StringComparison.Ordinal))
-                {
-                    if (path.StartsWith(_lowerCasedClientScriptPathWithTrailingSlash, StringComparison.Ordinal)) isClientScriptPath = true;
-                    return true;
-                }
-                if (path.StartsWith(_lowerCasedVirtualPathWithTrailingSlash, StringComparison.Ordinal)) return true;
-                if (path == _lowerCasedVirtualPath) return true;
-                if (path.StartsWith(_lowerCasedClientScriptPathWithTrailingSlash, StringComparison.Ordinal))
-                {
-                    isClientScriptPath = true;
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        public void ProcessRequest(WebSession conn)
-        {
-            AddPendingCall();
-            try
-            {
-                new WebRequest(this, conn).Process();
-            }
-            finally
-            {
-                RemovePendingCall();
-            }
-        }
-
-        private void RemovePendingCall() { Interlocked.Decrement(ref _pendingCallsCount); }
-
-        [SecurityPermission(SecurityAction.Assert, Unrestricted = true)]
-        public void Shutdown() { HostingEnvironment.InitiateShutdown(); }
-
-        void IRegisteredObject.Stop(bool immediate)
-        {
-            if (_server != null) _server.HostStopped();
-            WaitForPendingCallsToFinish();
-            HostingEnvironment.UnregisterObject(this);
-        }
-
-        private void WaitForPendingCallsToFinish()
-        {
-            while (_pendingCallsCount > 0)
-            {
-                Thread.Sleep(250);
-            }
-        }
-
-        public bool DisableDirectoryListing { get { return _disableDirectoryListing; } }
-
-        public string InstallPath { get { return _installPath; } }
-
-        public string NormalizedClientScriptPath { get { return _lowerCasedClientScriptPathWithTrailingSlash; } }
-
-        public string NormalizedVirtualPath { get { return _lowerCasedVirtualPathWithTrailingSlash; } }
-
-        public string PhysicalClientScriptPath { get { return _physicalClientScriptPath; } }
-
-        public string PhysicalPath { get { return _physicalPath; } }
-
-        public int Port { get { return _port; } }
-
-        public bool RequireAuthentication { get { return _requireAuthentication; } }
-
-        public string VirtualPath { get { return _virtualPath; } }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Http/WebRequest.cs b/NewLife.Net/Http/WebRequest.cs
deleted file mode 100644
index 9b8223abd7..0000000000
--- a/NewLife.Net/Http/WebRequest.cs
+++ /dev/null
@@ -1,873 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Globalization;
-using System.IO;
-using System.Web;
-using System.Collections;
-using System.Security;
-using System.Web.Hosting;
-using System.Security.Permissions;
-using Microsoft.Win32.SafeHandles;
-
-namespace NewLife.Net.Http
-{
-    /// <summary>定义由 ASP.NET 托管代码用于处理请求的基本辅助方法和枚举</summary>
-    sealed class WebRequest : SimpleWorkerRequest
-    {
-        #region 属性
-        private WebSession _Session;
-        /// <summary>会话</summary>
-        public WebSession Session { get { return _Session; } set { _Session = value; } }
-
-        private Host _Host;
-        /// <summary>主机</summary>
-        public Host Host { get { return _Host; } set { _Host = value; } }
-
-        private HttpHeader _ResponseHeader;
-        /// <summary>响应头</summary>
-        public HttpHeader ResponseHeader { get { return _ResponseHeader ?? (_ResponseHeader = new HttpHeader()); } }
-
-        private string _allRawHeaders;
-        //private IStackWalk _connectionPermission;
-        private int _contentLength;
-        private int _endHeadersOffset;
-        private byte[] _headerBytes;
-        private ArrayList _headerByteStrings;
-        private bool _isClientScriptPath;
-        private string[] _knownRequestHeaders;
-        private int _preloadedContentLength;
-        private ArrayList _responseBodyBytes;
-        //private StringBuilder _responseHeadersBuilder;
-        //private int ResponseHeader.StatusCode;
-        private bool _specialCaseStaticFileHeaders;
-        private int _startHeadersOffset;
-        private static char[] badPathChars = new char[] { '%', '>', '<', ':', '\\' };
-        private static string[] defaultFileNames = new string[] { "default.aspx", "default.htm", "default.html" };
-        private static char[] IntToHex = new char[] { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
-        private const int MaxChunkLength = 0x10000;
-        private const int maxHeaderBytes = 0x8000;
-        private static string[] restrictedDirs = new string[] { "/bin", "/app_browsers", "/app_code", "/app_data", "/app_localresources", "/app_globalresources", "/app_webreferences" };
-        #endregion
-
-        #region 构造
-        public WebRequest(Host host, WebSession session)
-            : base(string.Empty, string.Empty, null)
-        {
-            //_connectionPermission = new PermissionSet(PermissionState.Unrestricted);
-            Host = host;
-            Session = session;
-        }
-        #endregion
-
-        #region 信息属性
-        /// <summary>返回当前正在执行的服务器应用程序的虚拟路径。</summary>
-        /// <returns>当前应用程序的虚拟路径。</returns>
-        public override string GetAppPath() { return Host.VirtualPath; }
-
-        /// <summary>返回当前正在执行的服务器应用程序的物理路径。</summary>
-        /// <returns>当前应用程序的物理路径。</returns>
-        public override string GetAppPathTranslated() { return Host.PhysicalPath; }
-
-        private string _filePath;
-        /// <summary>在派生类中被重写时，返回所请求的 URI 的虚拟路径。</summary>
-        /// <returns>请求的 URI 的路径。</returns>
-        public override string GetFilePath() { return _filePath; }
-
-        private string _pathTranslated;
-        /// <summary>返回请求的 URI 的物理文件路径（并将其从虚拟路径转换成物理路径：例如，从“/proj1/page.aspx”转换成“c:\dir\page.aspx”）</summary>
-        /// <returns>请求的 URI 的已转换的物理文件路径。</returns>
-        public override string GetFilePathTranslated() { return _pathTranslated; }
-
-        /// <summary>返回请求标头的指定成员。</summary>
-        /// <returns>请求标头中返回的 HTTP 谓词。</returns>
-        public override string GetHttpVerbName() { return ResponseHeader.Method; }
-
-        /// <summary>提供对请求的 HTTP 版本（如“HTTP/1.1”）的访问。</summary>
-        /// <returns>请求标头中返回的 HTTP 版本。</returns>
-        public override string GetHttpVersion() { return ResponseHeader.Version; }
-
-        /// <summary>返回与指定的索引相对应的标准 HTTP 请求标头。</summary>
-        /// <returns>HTTP 请求标头。</returns>
-        /// <param name="index">标头的索引。例如，<see cref="F:System.Web.HttpWorkerRequest.HeaderAllow" /> 字段。</param>
-        public override string GetKnownRequestHeader(int index) { return _knownRequestHeaders[index]; }
-
-        /// <summary>提供对请求标头的指定成员的访问。</summary>
-        /// <returns>请求标头中返回的服务器 IP 地址。</returns>
-        public override string GetLocalAddress()
-        {
-            //_connectionPermission.Assert();
-            return Session.LocalIP;
-        }
-
-        /// <summary>提供对请求标头的指定成员的访问。</summary>
-        /// <returns>请求标头中返回的服务器端口号。</returns>
-        public override int GetLocalPort() { return Host.Port; }
-
-        private string _pathInfo;
-        /// <summary>返回具有 URL 扩展的资源的其他路径信息。即对于路径 /virdir/page.html/tail，GetPathInfo 值为 /tail。</summary>
-        /// <returns>资源的附加路径信息。</returns>
-        public override string GetPathInfo() { return _pathInfo; }
-
-        private byte[] _preloadedContent;
-        /// <summary>返回 HTTP 请求正文已被读取的部分。</summary>
-        /// <returns>HTTP 请求正文已被读取的部分。</returns>
-        public override byte[] GetPreloadedEntityBody() { return _preloadedContent; }
-
-        private string _queryString;
-        /// <summary>返回请求 URL 中指定的查询字符串。</summary>
-        /// <returns>请求查询字符串。</returns>
-        public override string GetQueryString() { return _queryString; }
-
-        private byte[] _queryStringBytes;
-        /// <summary>在派生类中被重写时，以字节数组的形式返回响应查询字符串。</summary>
-        /// <returns>包含响应的字节数组。</returns>
-        public override byte[] GetQueryStringRawBytes() { return _queryStringBytes; }
-
-        private string _url;
-        /// <summary>返回附加了查询字符串的请求标头中包含的 URL 路径。</summary>
-        /// <returns>请求标头的原始 URL 路径。</returns>
-        public override string GetRawUrl() { return _url; }
-
-        /// <summary>提供对请求标头的指定成员的访问。</summary>
-        /// <returns>客户端的 IP 地址。</returns>
-        public override string GetRemoteAddress()
-        {
-            //_connectionPermission.Assert();
-            return Session.Remote.Host;
-        }
-
-        /// <summary>提供对请求标头的指定成员的访问。</summary>
-        /// <returns>客户端的 HTTP 端口号。</returns>
-        public override int GetRemotePort() { return Session.Remote.Port; }
-
-        /// <summary>在派生类中被重写时，返回本地服务器的名称。</summary>
-        /// <returns>本地服务器的名称。</returns>
-        public override string GetServerName()
-        {
-            string localAddress = GetLocalAddress();
-            if (!localAddress.Equals("127.0.0.1") && !localAddress.Equals("::1") && !localAddress.Equals("::ffff:127.0.0.1")) return localAddress;
-            return "localhost";
-        }
-
-        /// <summary>从与请求关联的服务器变量词典返回单个服务器变量。</summary>
-        /// <returns>请求的服务器变量。</returns>
-        /// <param name="name">请求的服务器变量的名称。</param>
-        public override string GetServerVariable(string name)
-        {
-            if (String.IsNullOrEmpty(name)) return String.Empty;
-            string processUser = string.Empty;
-            switch (name.ToUpper())
-            {
-                case "ALL_RAW":
-                    return _allRawHeaders;
-                case "SERVER_PROTOCOL":
-                    return ResponseHeader.Version;
-                case "LOGON_USER":
-                    if (GetUserToken() != IntPtr.Zero) processUser = Host.GetProcessUser();
-                    return processUser;
-                case "AUTH_TYPE":
-                    if (GetUserToken() != IntPtr.Zero) processUser = "NTLM";
-                    return processUser;
-                default:
-                    break;
-            }
-            return String.Empty;
-        }
-
-        /// <summary>返回非标准的 HTTP 请求标头值。</summary>
-        /// <returns>标头值。</returns>
-        /// <param name="name">标头名称。</param>
-        public override string GetUnknownRequestHeader(string name)
-        {
-            int length = _unknownRequestHeaders.Length;
-            for (int i = 0; i < length; i++)
-            {
-                if (string.Compare(name, _unknownRequestHeaders[i][0], StringComparison.OrdinalIgnoreCase) == 0) return _unknownRequestHeaders[i][1];
-            }
-            return null;
-        }
-
-        private string[][] _unknownRequestHeaders;
-        /// <summary>获取所有非标准的 HTTP 标头的名称/值对。</summary>
-        /// <returns>标头的名称/值对的数组。</returns>
-        public override string[][] GetUnknownRequestHeaders() { return _unknownRequestHeaders; }
-
-        private string _path;
-        /// <summary>返回请求的 URI 的虚拟路径。</summary>
-        /// <returns>请求的 URI 的路径。</returns>
-        public override string GetUriPath() { return _path; }
-
-        /// <summary>在派生类中被重写时，返回客户端的模拟标记。</summary>
-        /// <returns>表示客户端的模拟标记的值。默认值为 0。</returns>
-        public override IntPtr GetUserToken() { return Host.GetProcessToken(); }
-
-        /// <summary>头部是否已发送</summary>
-        private bool _headersSent;
-        /// <summary>返回一个值，该值指示是否已为当前的请求将 HTTP 响应标头发送到客户端。</summary>
-        /// <returns>如果 HTTP 响应标头已发送到客户端，则为 true；否则，为 false。</returns>
-        public override bool HeadersSent() { return _headersSent; }
-
-        private bool IsBadPath() { return _path.IndexOfAny(badPathChars) >= 0 || CultureInfo.InvariantCulture.CompareInfo.IndexOf(_path, "..", CompareOptions.Ordinal) >= 0 || CultureInfo.InvariantCulture.CompareInfo.IndexOf(_path, "//", CompareOptions.Ordinal) >= 0; }
-
-        /// <summary>返回一个值，该值指示客户端连接是否仍处于活动状态。</summary>
-        /// <returns>如果客户端连接仍处于活动状态，则为 true；否则，为 false。</returns>
-        public override bool IsClientConnected()
-        {
-            //_connectionPermission.Assert();
-            return Session.Session.Client.Connected;
-        }
-
-        /// <summary>返回一个值，该值指示是否所有请求数据都可用，以及是否不需要对客户端进行进一步读取。</summary>
-        /// <returns>如果所有请求数据都可用，则为 true；否则，为 false。</returns>
-        public override bool IsEntireEntityBodyIsPreloaded() { return _contentLength == _preloadedContentLength; }
-        #endregion
-
-        #region 处理请求
-        [AspNetHostingPermission(SecurityAction.Assert, Level = AspNetHostingPermissionLevel.Medium)]
-        public void Process()
-        {
-            if (!TryParseRequest()) return;
-
-            if (ResponseHeader.Method == "POST" && _contentLength > 0 && _preloadedContentLength < _contentLength) Session.Write100Continue();
-            if (!Host.RequireAuthentication || TryNtlmAuthenticate())
-            {
-                if (_isClientScriptPath)
-                    Session.WriteEntireResponseFromFile(Host.PhysicalClientScriptPath + _path.Substring(Host.NormalizedClientScriptPath.Length), false);
-                else if (IsRequestForRestrictedDirectory())
-                    Session.WriteErrorAndClose(403);
-                else if (!ProcessDefaultDocumentRequest())
-                {
-                    PrepareResponse();
-                    HttpRuntime.ProcessRequest(this);
-                }
-            }
-        }
-
-        private bool TryParseRequest()
-        {
-            Reset();
-            ReadAllHeaders();
-            if (!Session.IsLocal)
-            {
-                Session.WriteErrorAndClose(403);
-                return false;
-            }
-            if (_headerBytes == null || _endHeadersOffset < 0 || _headerByteStrings == null || _headerByteStrings.Count == 0)
-            {
-                Session.WriteErrorAndClose(400);
-                return false;
-            }
-            ParseRequestLine();
-            if (IsBadPath())
-            {
-                Session.WriteErrorAndClose(400);
-                return false;
-            }
-            if (!Host.IsVirtualPathInApp(_path, out _isClientScriptPath))
-            {
-                Session.WriteErrorAndClose(404);
-                return false;
-            }
-            ParseHeaders();
-            ParsePostedContent();
-            return true;
-        }
-
-        private void Reset()
-        {
-            _headerBytes = null;
-            _startHeadersOffset = 0;
-            _endHeadersOffset = 0;
-            _headerByteStrings = null;
-            _isClientScriptPath = false;
-            ResponseHeader.Method = null;
-            _url = null;
-            ResponseHeader.Version = null;
-            _path = null;
-            _filePath = null;
-            _pathInfo = null;
-            _pathTranslated = null;
-            _queryString = null;
-            _queryStringBytes = null;
-            _contentLength = 0;
-            _preloadedContentLength = 0;
-            _preloadedContent = null;
-            _allRawHeaders = null;
-            _unknownRequestHeaders = null;
-            _knownRequestHeaders = null;
-            _specialCaseStaticFileHeaders = false;
-        }
-
-        private void ReadAllHeaders()
-        {
-            _headerBytes = null;
-            do
-            {
-                if (!TryReadAllHeaders()) return;
-            }
-            while (_endHeadersOffset < 0);
-        }
-
-        private void ParseHeaders()
-        {
-            _knownRequestHeaders = new string[40];
-            ArrayList list = new ArrayList();
-            for (int i = 1; i < _headerByteStrings.Count; i++)
-            {
-                string str = ((ByteString)_headerByteStrings[i]).GetString();
-                int index = str.IndexOf(':');
-                if (index >= 0)
-                {
-                    string header = str.Substring(0, index).Trim();
-                    string str3 = str.Substring(index + 1).Trim();
-                    int knownRequestHeaderIndex = HttpWorkerRequest.GetKnownRequestHeaderIndex(header);
-                    if (knownRequestHeaderIndex >= 0)
-                        _knownRequestHeaders[knownRequestHeaderIndex] = str3;
-                    else
-                    {
-                        list.Add(header);
-                        list.Add(str3);
-                    }
-                }
-            }
-            int num4 = list.Count / 2;
-            _unknownRequestHeaders = new string[num4][];
-            int num5 = 0;
-            for (int j = 0; j < num4; j++)
-            {
-                _unknownRequestHeaders[j] = new string[] { (string)list[num5++], (string)list[num5++] };
-            }
-            if (_headerByteStrings.Count > 1)
-                _allRawHeaders = Encoding.UTF8.GetString(_headerBytes, _startHeadersOffset, _endHeadersOffset - _startHeadersOffset);
-            else
-                _allRawHeaders = string.Empty;
-        }
-
-        private void ParsePostedContent()
-        {
-            _contentLength = 0;
-            _preloadedContentLength = 0;
-            string s = _knownRequestHeaders[11];
-            if (s != null)
-            {
-                try
-                {
-                    _contentLength = int.Parse(s, CultureInfo.InvariantCulture);
-                }
-                catch
-                {
-                }
-            }
-            if (_headerBytes.Length > _endHeadersOffset)
-            {
-                _preloadedContentLength = _headerBytes.Length - _endHeadersOffset;
-                if (_preloadedContentLength > _contentLength) _preloadedContentLength = _contentLength;
-                if (_preloadedContentLength > 0)
-                {
-                    _preloadedContent = new byte[_preloadedContentLength];
-                    Buffer.BlockCopy(_headerBytes, _endHeadersOffset, _preloadedContent, 0, _preloadedContentLength);
-                }
-            }
-        }
-
-        private void ParseRequestLine()
-        {
-            ByteString[] strArray = ((ByteString)_headerByteStrings[0]).Split(' ');
-            if (strArray == null || strArray.Length < 2 || strArray.Length > 3)
-                Session.WriteErrorAndClose(400);
-            else
-            {
-                ResponseHeader.Method = strArray[0].GetString();
-                ByteString str2 = strArray[1];
-                _url = str2.GetString();
-                if (_url.IndexOf((Char)0xfffd) >= 0) _url = str2.GetString(Encoding.Default);
-                if (strArray.Length == 3)
-                    ResponseHeader.Version = strArray[2].GetString();
-                else
-                    ResponseHeader.Version = "HTTP/1.0";
-                int index = str2.IndexOf('?');
-                if (index > 0)
-                    _queryStringBytes = str2.Substring(index + 1).GetBytes();
-                else
-                    _queryStringBytes = new byte[0];
-                index = _url.IndexOf('?');
-                if (index > 0)
-                {
-                    _path = _url.Substring(0, index);
-                    _queryString = _url.Substring(index + 1);
-                }
-                else
-                {
-                    _path = _url;
-                    _queryString = string.Empty;
-                }
-                if (_path.IndexOf('%') >= 0)
-                {
-                    _path = HttpUtility.UrlDecode(_path, Encoding.UTF8);
-                    index = _url.IndexOf('?');
-                    if (index >= 0)
-                        _url = _path + _url.Substring(index);
-                    else
-                        _url = _path;
-                }
-                int startIndex = _path.LastIndexOf('.');
-                int num3 = _path.LastIndexOf('/');
-                if (startIndex >= 0 && num3 >= 0 && startIndex < num3)
-                {
-                    int length = _path.IndexOf('/', startIndex);
-                    _filePath = _path.Substring(0, length);
-                    _pathInfo = _path.Substring(length);
-                }
-                else
-                {
-                    _filePath = _path;
-                    _pathInfo = string.Empty;
-                }
-                _pathTranslated = MapPath(_filePath);
-            }
-        }
-
-        private void PrepareResponse()
-        {
-            _headersSent = false;
-            ResponseHeader.StatusCode = 200;
-            //_responseHeadersBuilder = new StringBuilder();
-            _responseBodyBytes = new ArrayList();
-        }
-
-        private void SkipAllPostedContent()
-        {
-            if (_contentLength > 0 && _preloadedContentLength < _contentLength)
-            {
-                byte[] buffer;
-                for (int i = _contentLength - _preloadedContentLength; i > 0; i -= buffer.Length)
-                {
-                    buffer = Session.ReadRequestBytes(i);
-                    if (buffer == null || buffer.Length == 0) return;
-                }
-            }
-        }
-
-        [SecurityPermission(SecurityAction.Assert, UnmanagedCode = true), SecurityPermission(SecurityAction.Assert, ControlPrincipal = true)]
-        private bool TryNtlmAuthenticate()
-        {
-            try
-            {
-                using (var auth = new NtlmAuth())
-                {
-                    do
-                    {
-                        string blobString = null;
-                        string extraHeaders = _knownRequestHeaders[0x18];
-                        if (extraHeaders != null && extraHeaders.StartsWith("NTLM ", StringComparison.Ordinal)) blobString = extraHeaders.Substring(5);
-                        var dic = new Dictionary<String, String>();
-                        if (blobString != null)
-                        {
-                            if (!auth.Authenticate(blobString))
-                            {
-                                Session.WriteErrorAndClose(403);
-                                return false;
-                            }
-                            if (auth.Completed)
-                            {
-                                if (Host.GetProcessSID() == auth.SID) return true;
-
-                                Session.WriteErrorAndClose(403);
-                                return false;
-                            }
-                            dic["WWW-Authenticate"] = "NTLM " + auth.Blob;
-                        }
-                        else
-                            dic["WWW-Authenticate"] = "NTLM";
-                        SkipAllPostedContent();
-                        Session.WriteErrorWithExtraHeadersAndKeepAlive(401, dic);
-                    }
-                    while (TryParseRequest());
-                }
-            }
-            catch
-            {
-                try
-                {
-                    Session.WriteErrorAndClose(500);
-                }
-                catch { }
-            }
-            return false;
-        }
-
-        private bool TryReadAllHeaders()
-        {
-            byte[] src = Session.ReadRequestBytes(0x8000);
-            if (src == null || src.Length == 0) return false;
-            if (_headerBytes != null)
-            {
-                int num = src.Length + _headerBytes.Length;
-                if (num > 0x8000) return false;
-                byte[] dst = new byte[num];
-                Buffer.BlockCopy(_headerBytes, 0, dst, 0, _headerBytes.Length);
-                Buffer.BlockCopy(src, 0, dst, _headerBytes.Length, src.Length);
-                _headerBytes = dst;
-            }
-            else
-                _headerBytes = src;
-            _startHeadersOffset = -1;
-            _endHeadersOffset = -1;
-            _headerByteStrings = new ArrayList();
-            ByteParser parser = new ByteParser(_headerBytes);
-            while (true)
-            {
-                ByteString str = parser.ReadLine();
-                if (str == null) break;
-                if (_startHeadersOffset < 0) _startHeadersOffset = parser.CurrentOffset;
-                if (str.IsEmpty)
-                {
-                    _endHeadersOffset = parser.CurrentOffset;
-                    break;
-                }
-                _headerByteStrings.Add(str);
-            }
-            return true;
-        }
-        #endregion
-
-        #region 响应方法
-        /// <summary>终止与客户端的连接。</summary>
-        public override void CloseConnection()
-        {
-            //_connectionPermission.Assert();
-            Session.Dispose();
-        }
-
-        /// <summary>由运行时使用以通知 <see cref="T:System.Web.HttpWorkerRequest" /> 当前请求的请求处理已完成。</summary>
-        public override void EndOfRequest() { }
-
-        /// <summary>将所有挂起的响应数据发送到客户端。</summary>
-        /// <param name="finalFlush">如果这将是最后一次刷新响应数据，则为 true；否则为 false。</param>
-        public override void FlushResponse(bool finalFlush)
-        {
-            if (ResponseHeader.StatusCode != 404 || _headersSent || !finalFlush || ResponseHeader.Method != "GET" || !ProcessDirectoryListingRequest())
-            {
-                //_connectionPermission.Assert();
-                if (!_headersSent)
-                {
-                    Session.WriteHeaders(ResponseHeader.StatusCode, ResponseHeader.Headers);
-                    _headersSent = true;
-                }
-                for (int i = 0; i < _responseBodyBytes.Count; i++)
-                {
-                    byte[] data = (byte[])_responseBodyBytes[i];
-                    Session.WriteBody(data, 0, data.Length);
-                }
-                _responseBodyBytes = new ArrayList();
-                if (finalFlush) Session.Dispose();
-            }
-        }
-
-        private bool IsRequestForRestrictedDirectory()
-        {
-            string str = CultureInfo.InvariantCulture.TextInfo.ToLower(_path);
-            if (Host.VirtualPath != "/") str = str.Substring(Host.VirtualPath.Length);
-            foreach (string str2 in restrictedDirs)
-            {
-                if (str.StartsWith(str2, StringComparison.Ordinal) && (str.Length == str2.Length || str[str2.Length] == '/')) return true;
-            }
-            return false;
-        }
-
-        /// <summary>返回与指定虚拟路径相对应的物理路径。</summary>
-        /// <returns>与 <paramref name="path" /> 参数中指定的虚拟路径相对应的物理路径。</returns>
-        /// <param name="path">虚拟路径。</param>
-        public override string MapPath(string path)
-        {
-            string physicalPath = string.Empty;
-            bool isClientScriptPath = false;
-            if (path == null || path.Length == 0 || path.Equals("/"))
-            {
-                if (Host.VirtualPath == "/")
-                    physicalPath = Host.PhysicalPath;
-                else
-                    physicalPath = Environment.SystemDirectory;
-            }
-            else if (Host.IsVirtualPathAppPath(path))
-                physicalPath = Host.PhysicalPath;
-            else if (Host.IsVirtualPathInApp(path, out isClientScriptPath))
-            {
-                if (isClientScriptPath)
-                    physicalPath = Host.PhysicalClientScriptPath + path.Substring(Host.NormalizedClientScriptPath.Length);
-                else
-                    physicalPath = Host.PhysicalPath + path.Substring(Host.NormalizedVirtualPath.Length);
-            }
-            else if (path.StartsWith("/", StringComparison.Ordinal))
-                physicalPath = Host.PhysicalPath + path.Substring(1);
-            else
-                physicalPath = Host.PhysicalPath + path;
-            physicalPath = physicalPath.Replace('/', '\\');
-            if (physicalPath.EndsWith(@"\") && !physicalPath.EndsWith(@":\")) physicalPath = physicalPath.Substring(0, physicalPath.Length - 1);
-            return physicalPath;
-        }
-
-        private bool ProcessDefaultDocumentRequest()
-        {
-            if (ResponseHeader.Method == "GET")
-            {
-                string path = _pathTranslated;
-                if (_pathInfo.Length > 0) path = MapPath(_path);
-                if (!Directory.Exists(path)) return false;
-                if (!_path.EndsWith("/"))
-                {
-                    string str2 = _path + "/";
-                    //string extraHeaders = "Location: " + UrlEncodeRedirect(str2) + "\r\n";
-                    ResponseHeader.Location = UrlEncodeRedirect(str2);
-                    string body = "<html><head><title>Object moved</title>        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head><body>\r\n<h2>Object moved to <a href='" + str2 + "'>here</a>.</h2>\r\n</body></html>\r\n";
-                    Session.WriteEntireResponseFromString(0x12e, ResponseHeader.Headers, body, false);
-                    return true;
-                }
-                foreach (string str5 in defaultFileNames)
-                {
-                    string str6 = path + @"\" + str5;
-                    if (File.Exists(str6))
-                    {
-                        _path = _path + str5;
-                        _filePath = _path;
-                        _url = (_queryString != null) ? (_path + "?" + _queryString) : _path;
-                        _pathTranslated = str6;
-                        return false;
-                    }
-                }
-            }
-            return false;
-        }
-
-        private bool ProcessDirectoryListingRequest()
-        {
-            if (ResponseHeader.Method != "GET") return false;
-            string path = _pathTranslated;
-            if (_pathInfo.Length > 0) path = MapPath(_path);
-            if (!Directory.Exists(path)) return false;
-            if (Host.DisableDirectoryListing) return false;
-            FileSystemInfo[] elements = null;
-            try
-            {
-                elements = new DirectoryInfo(path).GetFileSystemInfos();
-            }
-            catch { }
-            string str2 = null;
-            if (_path.Length > 1)
-            {
-                int length = _path.LastIndexOf('/', _path.Length - 2);
-                str2 = (length > 0) ? _path.Substring(0, length) : "/";
-                if (!Host.IsVirtualPathInApp(str2)) str2 = null;
-            }
-            var header = new HttpHeader();
-            header.ContentType = "text/html; charset=utf-8";
-            Session.WriteEntireResponseFromString(200, header.Headers, Messages.FormatDirectoryListing(_path, str2, elements), false);
-            //Session.WriteEntireResponseFromString(200, "Content-type: text/html; charset=utf-8\r\n", Messages.FormatDirectoryListing(_path, str2, elements), false);
-            return true;
-        }
-
-        /// <summary>读取客户端的请求数据（在尚未预加载时）。</summary>
-        /// <returns>读取的字节数。</returns>
-        /// <param name="buffer">将数据读入的字节数组。</param>
-        /// <param name="size">最多读取的字节数。</param>
-        public override int ReadEntityBody(byte[] buffer, int size)
-        {
-            int count = 0;
-            //_connectionPermission.Assert();
-            byte[] src = Session.ReadRequestBytes(size);
-            if (src != null && src.Length > 0)
-            {
-                count = src.Length;
-                Buffer.BlockCopy(src, 0, buffer, 0, count);
-            }
-            return count;
-        }
-
-        /// <summary>将 Content-Length HTTP 标头添加到小于或等于 2 GB 的消息正文的响应。</summary>
-        /// <param name="contentLength">响应的长度（以字节为单位）。</param>
-        public override void SendCalculatedContentLength(int contentLength)
-        {
-            if (!_headersSent) ResponseHeader.ContentLength = contentLength;
-        }
-
-        /// <summary>将标准 HTTP 标头添加到响应。</summary>
-        /// <param name="index">标头索引。例如 <see cref="F:System.Web.HttpWorkerRequest.HeaderContentLength" />。</param>
-        /// <param name="value">标头的值。</param>
-        public override void SendKnownResponseHeader(int index, string value)
-        {
-            if (!_headersSent)
-            {
-                switch (index)
-                {
-                    case 1:
-                    case 2:
-                    case 0x1a:
-                        return;
-
-                    case 0x12:
-                    case 0x13:
-                        if (!_specialCaseStaticFileHeaders) break;
-                        return;
-
-                    case 20:
-                        if (!(value == "bytes")) break;
-                        _specialCaseStaticFileHeaders = true;
-                        return;
-                }
-                ResponseHeader.Headers[HttpWorkerRequest.GetKnownResponseHeaderName(index)] = value;
-                //_responseHeadersBuilder.Append(HttpWorkerRequest.GetKnownResponseHeaderName(index));
-                //_responseHeadersBuilder.Append(": ");
-                //_responseHeadersBuilder.Append(value);
-                //_responseHeadersBuilder.Append("\r\n");
-            }
-        }
-
-        /// <summary>将指定文件的内容添加到响应并指定文件中的起始位置和要发送的字节数。</summary>
-        /// <param name="handle">要发送的文件的句柄。</param>
-        /// <param name="offset">文件中的起始位置。</param>
-        /// <param name="length">要发送的字节数。</param>
-        public override void SendResponseFromFile(IntPtr handle, long offset, long length)
-        {
-            if (length != 0)
-            {
-                FileStream f = null;
-                try
-                {
-                    SafeFileHandle handle2 = new SafeFileHandle(handle, false);
-                    f = new FileStream(handle2, FileAccess.Read);
-                    SendResponseFromFileStream(f, offset, length);
-                }
-                finally
-                {
-                    if (f != null)
-                    {
-                        f.Close();
-                        f = null;
-                    }
-                }
-            }
-        }
-
-        /// <summary>将指定文件的内容添加到响应并指定文件中的起始位置和要发送的字节数。</summary>
-        /// <param name="filename">要发送的文件的名称。</param>
-        /// <param name="offset">文件中的起始位置。</param>
-        /// <param name="length">要发送的字节数。</param>
-        public override void SendResponseFromFile(string filename, long offset, long length)
-        {
-            if (length != 0)
-            {
-                FileStream f = null;
-                try
-                {
-                    f = new FileStream(filename, FileMode.Open, FileAccess.Read, FileShare.Read);
-                    SendResponseFromFileStream(f, offset, length);
-                }
-                finally
-                {
-                    if (f != null) f.Close();
-                }
-            }
-        }
-
-        /// <summary>将指定文件的内容添加到响应并指定文件中的起始位置和要发送的字节数。</summary>
-        /// <param name="f">要发送的文件的名称。</param>
-        /// <param name="offset">文件中的起始位置。</param>
-        /// <param name="length">要发送的字节数。</param>
-        private void SendResponseFromFileStream(FileStream f, long offset, long length)
-        {
-            long num = f.Length;
-            if (length == -1) length = num - offset;
-            if (length != 0 && offset >= 0 && length <= num - offset)
-            {
-                if (offset > 0) f.Seek(offset, SeekOrigin.Begin);
-                if (length <= 0x10000)
-                {
-                    byte[] buffer = new byte[(int)length];
-                    int num2 = f.Read(buffer, 0, (int)length);
-                    SendResponseFromMemory(buffer, num2);
-                }
-                else
-                {
-                    byte[] buffer2 = new byte[0x10000];
-                    int num3 = (int)length;
-                    while (num3 > 0)
-                    {
-                        int count = (num3 < 0x10000) ? num3 : 0x10000;
-                        int num5 = f.Read(buffer2, 0, count);
-                        SendResponseFromMemory(buffer2, num5);
-                        num3 -= num5;
-                        if (num3 > 0 && num5 > 0) FlushResponse(false);
-                    }
-                }
-            }
-        }
-
-        /// <summary>将字节数组中指定数目的字节添加到响应。</summary>
-        /// <param name="data">要发送的字节数组。</param>
-        /// <param name="length">要发送的字节数（从第一个字节开始）。</param>
-        public override void SendResponseFromMemory(byte[] data, int length)
-        {
-            if (length > 0)
-            {
-                byte[] dst = new byte[length];
-                Buffer.BlockCopy(data, 0, dst, 0, length);
-                _responseBodyBytes.Add(dst);
-            }
-        }
-
-        /// <summary>指定响应的 HTTP 状态代码和状态说明，例如 SendStatus(200, "Ok")。</summary>
-        /// <param name="statusCode">要发送的状态代码</param>
-        /// <param name="statusDescription">要发送的状态说明。</param>
-        public override void SendStatus(int statusCode, string statusDescription) { ResponseHeader.StatusCode = statusCode; }
-
-        /// <summary>将非标准 HTTP 标头添加到响应。</summary>
-        /// <param name="name">要发送的标头的名称。</param>
-        /// <param name="value">标头的值。</param>
-        public override void SendUnknownResponseHeader(string name, string value)
-        {
-            if (!_headersSent)
-            {
-                ResponseHeader.Headers[name] = value;
-                //_responseHeadersBuilder.Append(name);
-                //_responseHeadersBuilder.Append(": ");
-                //_responseHeadersBuilder.Append(value);
-                //_responseHeadersBuilder.Append("\r\n");
-            }
-        }
-        #endregion
-
-        #region 辅助
-        private static string UrlEncodeRedirect(string path)
-        {
-            byte[] bytes = Encoding.UTF8.GetBytes(path);
-            int length = bytes.Length;
-            int num2 = 0;
-            for (int i = 0; i < length; i++)
-            {
-                if ((bytes[i] & 0x80) != 0) num2++;
-            }
-            if (num2 > 0)
-            {
-                byte[] buffer2 = new byte[length + num2 * 2];
-                int num4 = 0;
-                for (int j = 0; j < length; j++)
-                {
-                    byte num6 = bytes[j];
-                    if ((num6 & 0x80) == 0)
-                        buffer2[num4++] = num6;
-                    else
-                    {
-                        buffer2[num4++] = 0x25;
-                        buffer2[num4++] = (byte)IntToHex[num6 >> 4 & 15];
-                        buffer2[num4++] = (byte)IntToHex[num6 & 15];
-                    }
-                }
-                path = Encoding.ASCII.GetString(buffer2);
-            }
-            if (path.IndexOf(' ') >= 0) path = path.Replace(" ", "%20");
-            return path;
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Http/WebServer.cs b/NewLife.Net/Http/WebServer.cs
deleted file mode 100644
index 42196a0d91..0000000000
--- a/NewLife.Net/Http/WebServer.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-﻿using System;
-using System.Globalization;
-using System.Net.Sockets;
-using System.Runtime.InteropServices;
-using System.Security.Principal;
-using System.Web.Hosting;
-
-namespace NewLife.Net.Http
-{
-    /// <summary>可承载ASP.Net的Web服务器</summary>
-    public class WebServer : NetServer<WebSession>
-    {
-        //TODO 未实现Web服务端
-
-        #region 属性
-        //private Dictionary<Int32, HttpSession> _Sessions;
-        ///// <summary>会话集合</summary>
-        //public IDictionary<Int32, HttpSession> Sessions { get { return _Sessions ?? (_Sessions = new Dictionary<int, HttpSession>()); } }
-
-        private String _PhysicalPath = AppDomain.CurrentDomain.BaseDirectory;
-        /// <summary>物理路径。默认当前路径。</summary>
-        public String PhysicalPath { get { return _PhysicalPath; } set { _PhysicalPath = value; } }
-
-        private String _VirtualPath = "/";
-        /// <summary>序列路径。默认根路径/</summary>
-        public String VirtualPath { get { return _VirtualPath; } set { _VirtualPath = value; } }
-
-        private Boolean _RequireAuthentication;
-        /// <summary>要求验证</summary>
-        public Boolean RequireAuthentication { get { return _RequireAuthentication; } set { _RequireAuthentication = value; } }
-
-        private Boolean _DisableDirectoryListing;
-        /// <summary>关闭目录浏览</summary>
-        public Boolean DisableDirectoryListing { get { return _DisableDirectoryListing; } set { _DisableDirectoryListing = value; } }
-
-        private ApplicationManager _AppManager;
-        /// <summary>应用管理器</summary>
-        public ApplicationManager AppManager { get { return _AppManager ?? (_AppManager = ApplicationManager.GetApplicationManager()); } }
-
-        private Host _Host;
-        /// <summary>属性说明</summary>
-        private Host Host
-        {
-            get
-            {
-                // 这里本应该注意线程安全，但是因为冲突可能性太小，故不处理
-                if (_Host == null)
-                {
-                    String appId = (VirtualPath + PhysicalPath).ToLowerInvariant().GetHashCode().ToString("x", CultureInfo.InvariantCulture);
-                    var host = (Host)AppManager.CreateObject(appId, typeof(Host), VirtualPath, PhysicalPath, false);
-                    host.Configure(this, Port, VirtualPath, PhysicalPath, RequireAuthentication, DisableDirectoryListing);
-                    _Host = host;
-
-                }
-                return _Host;
-            }
-        }
-        #endregion
-
-        #region 进程信息
-        private IntPtr _ProcessToken;
-        /// <summary>进程标识</summary>
-        public IntPtr ProcessToken { get { return _ProcessToken; } }
-
-        private String _ProcessUser;
-        /// <summary>进程用户</summary>
-        public String ProcessUser { get { return _ProcessUser; } }
-
-        private void ObtainProcessToken()
-        {
-            if (ImpersonateSelf(2))
-            {
-                OpenThreadToken(GetCurrentThread(), 0xf01ff, true, ref _ProcessToken);
-                RevertToSelf();
-                _ProcessUser = WindowsIdentity.GetCurrent().Name;
-            }
-        }
-
-        [DllImport("ADVAPI32.DLL", SetLastError = true)]
-        private static extern bool ImpersonateSelf(int level);
-        [DllImport("KERNEL32.DLL", SetLastError = true)]
-        private static extern IntPtr GetCurrentThread();
-        [DllImport("ADVAPI32.DLL", SetLastError = true)]
-        private static extern int OpenThreadToken(IntPtr thread, int access, bool openAsSelf, ref IntPtr hToken);
-        [DllImport("ADVAPI32.DLL", SetLastError = true)]
-        private static extern int RevertToSelf();
-        #endregion
-
-        #region 构造
-        /// <summary>实例化一个Web服务器</summary>
-        public WebServer()
-        {
-            Port = 23;
-            ProtocolType = ProtocolType.Tcp;
-
-            ObtainProcessToken();
-        }
-        #endregion
-
-        #region 会话
-        /// <summary>添加会话。子类可以在添加会话前对会话进行一些处理</summary>
-        /// <param name="session"></param>
-        protected override void AddSession(INetSession session)
-        {
-            var s = session as WebSession;
-            if (s != null) s.Server = this;
-
-            base.AddSession(session);
-        }
-        #endregion
-
-        #region 方法
-        internal void HostStopped() { _Host = null; }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Http/WebSession.cs b/NewLife.Net/Http/WebSession.cs
deleted file mode 100644
index 3e9028aefc..0000000000
--- a/NewLife.Net/Http/WebSession.cs
+++ /dev/null
@@ -1,289 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Net.Sockets;
-using System.Reflection;
-using System.Text;
-using System.Web;
-using NewLife.Reflection;
-
-namespace NewLife.Net.Http
-{
-    /// <summary>Web会话</summary>
-    public class WebSession : NetSession
-    {
-        //TODO 未实现Web会话
-
-        #region 属性
-        private WebServer _Server;
-        /// <summary>服务器</summary>
-        public new WebServer Server { get { return _Server; } set { _Server = value; } }
-
-        static string _localServerIP;
-        private static string LocalServerIP
-        {
-            get
-            {
-                if (_localServerIP == null) _localServerIP = "" + NetHelper.MyIP();
-                return _localServerIP;
-            }
-        }
-
-        internal bool IsLocal
-        {
-            get
-            {
-                string remoteIP = Session.Remote.Host;
-                if (string.IsNullOrEmpty(remoteIP)) return false;
-                if (!remoteIP.Equals("127.0.0.1") && !remoteIP.Equals("::1") && !remoteIP.Equals("::ffff:127.0.0.1")) return LocalServerIP.Equals(remoteIP);
-                return true;
-            }
-        }
-
-        internal string LocalIP
-        {
-            get
-            {
-                var localEndPoint = Session.Remote.EndPoint;
-                if (localEndPoint != null && localEndPoint.Address != null) return localEndPoint.Address.ToString();
-                return this.DefaultLocalHostIP;
-            }
-        }
-
-        String _defaultLoalhostIP;
-        private string DefaultLocalHostIP
-        {
-            get
-            {
-                if (string.IsNullOrEmpty(_defaultLoalhostIP))
-                {
-#if !NET4
-                    if (!Socket.SupportsIPv4 && Socket.OSSupportsIPv6)
-#else
-                    if (!Socket.OSSupportsIPv4 && Socket.OSSupportsIPv6)
-#endif
-                        _defaultLoalhostIP = "::1";
-                    else
-                        _defaultLoalhostIP = "127.0.0.1";
-                }
-                return _defaultLoalhostIP;
-            }
-        }
-        #endregion
-
-        #region 启动会话
-        //void Start()
-        //{
-
-        //}
-        #endregion
-
-        #region 方法
-        private string GetErrorResponseBody(int statusCode, string message)
-        {
-            string str = Messages.FormatErrorMessageBody(statusCode, Server.VirtualPath);
-            if (!String.IsNullOrEmpty(message)) str = str + "\r\n<!--\r\n" + message + "\r\n-->";
-            return str;
-        }
-
-        internal byte[] ReadRequestBytes(int maxBytes)
-        {
-            return Session.Receive();
-            //try
-            //{
-            //    if (WaitForRequestBytes() == 0) return null;
-            //    int available = _socket.Available;
-            //    if (available > maxBytes) available = maxBytes;
-            //    int count = 0;
-            //    byte[] buffer = new byte[available];
-            //    if (available > 0) count = _socket.Receive(buffer, 0, available, SocketFlags.None);
-            //    if (count < available)
-            //    {
-            //        byte[] dst = new byte[count];
-            //        if (count > 0) Buffer.BlockCopy(buffer, 0, dst, 0, count);
-            //        buffer = dst;
-            //    }
-            //    return buffer;
-            //}
-            //catch
-            //{
-            //    return null;
-            //}
-        }
-
-        //internal int WaitForRequestBytes()
-        //{
-        //    int available = 0;
-        //    try
-        //    {
-        //        if (_socket.Available == 0)
-        //        {
-        //            _socket.Poll(0x186a0, SelectMode.SelectRead);
-        //            if (_socket.Available == 0 && _socket.Connected) _socket.Poll(0x1c9c380, SelectMode.SelectRead);
-        //        }
-        //        available = _socket.Available;
-        //    }
-        //    catch
-        //    {
-        //    }
-        //    return available;
-        //}
-
-        internal void Write100Continue() { WriteEntireResponseFromString(100, null, null, true); }
-
-        internal void WriteBody(byte[] data, int offset, int length)
-        {
-            try
-            {
-                Send(data, offset, length);
-            }
-            catch (SocketException) { }
-        }
-
-        internal void WriteEntireResponseFromFile(string fileName, bool keepAlive)
-        {
-            if (!File.Exists(fileName))
-                WriteErrorAndClose(404);
-            else
-            {
-                var moreHeaders = MakeContentTypeHeader(fileName);
-                if (moreHeaders == null)
-                    WriteErrorAndClose(403);
-                else
-                {
-                    bool flag = false;
-                    try
-                    {
-                        using (var fs = new FileStream(fileName, FileMode.Open, FileAccess.Read, FileShare.Read))
-                        {
-                            //int length = (int)stream.Length;
-                            //byte[] buffer = new byte[length];
-                            //int contentLength = stream.Read(buffer, 0, length);
-                            string header = MakeResponseHeaders(200, moreHeaders, (Int32)fs.Length, keepAlive);
-                            Send(header);
-                            Send(fs);
-                            flag = true;
-                        }
-                    }
-                    catch (SocketException) { }
-                    finally
-                    {
-                        if (!keepAlive || !flag) Dispose();
-                    }
-                }
-            }
-        }
-
-        internal void WriteEntireResponseFromString(int statusCode, IDictionary<String, String> extraHeaders, string body, bool keepAlive)
-        {
-            try
-            {
-                int contentLength = (body != null) ? Encoding.UTF8.GetByteCount(body) : 0;
-                string str = MakeResponseHeaders(statusCode, extraHeaders, contentLength, keepAlive);
-                Send(str + body);
-            }
-            catch (SocketException) { }
-            finally
-            {
-                if (!keepAlive) Dispose();
-            }
-        }
-
-        internal void WriteErrorAndClose(int statusCode, string message = null)
-        {
-            var dic = new Dictionary<String, String>();
-            dic["Content-type"] = "text/html;charset=utf-8";
-            WriteEntireResponseFromString(statusCode, dic, GetErrorResponseBody(statusCode, message), false);
-        }
-
-        internal void WriteErrorWithExtraHeadersAndKeepAlive(int statusCode, IDictionary<String, String> extraHeaders)
-        {
-            WriteEntireResponseFromString(statusCode, extraHeaders, GetErrorResponseBody(statusCode, null), true);
-        }
-
-        internal void WriteHeaders(int statusCode, IDictionary<String, String> extraHeaders)
-        {
-            string s = MakeResponseHeaders(statusCode, extraHeaders, -1, false);
-            try
-            {
-                Send(s);
-            }
-            catch (SocketException) { }
-        }
-        #endregion
-
-        #region 辅助
-        private static IDictionary<String, String> MakeContentTypeHeader(string fileName)
-        {
-            string str = null;
-            switch (Path.GetExtension(fileName).ToLowerInvariant())
-            {
-                case ".bmp":
-                    str = "image/bmp";
-                    break;
-
-                case ".css":
-                    str = "text/css";
-                    break;
-
-                case ".gif":
-                    str = "image/gif";
-                    break;
-
-                case ".ico":
-                    str = "image/x-icon";
-                    break;
-
-                case ".htm":
-                case ".html":
-                    str = "text/html";
-                    break;
-
-                case ".jpe":
-                case ".jpeg":
-                case ".jpg":
-                    str = "image/jpeg";
-                    break;
-
-                case ".js":
-                    str = "application/x-javascript";
-                    break;
-            }
-            if (str == null) return null;
-            var dic = new Dictionary<String, String>();
-            dic["Content-Type"] = str;
-            return dic;
-        }
-
-        private static string MakeResponseHeaders(int statusCode, IDictionary<String, String> moreHeaders, int contentLength, bool keepAlive)
-        {
-            var header = new HttpHeader();
-            header.StatusCode = statusCode;
-            header.StatusDescription = HttpWorkerRequest.GetStatusDescription(statusCode);
-            if (contentLength >= 0) header.ContentLength = contentLength;
-            header.Headers["Server"] = typeof(WebServer).FullName + "/" + AssemblyX.Create(Assembly.GetExecutingAssembly()).CompileVersion;
-            header.Headers["Date"] = DateTime.Now.ToUniversalTime().ToString("R", DateTimeFormatInfo.InvariantInfo);
-            if (moreHeaders != null)
-            {
-                foreach (var item in moreHeaders)
-                {
-                    header.Headers[item.Key] = item.Value;
-                }
-            }
-            if (!keepAlive) header.KeepAlive = false;
-            return header.ToText();
-
-            //var builder = new StringBuilder();
-            //builder.Append(string.Concat(new object[] { "HTTP/1.1 ", statusCode, " ", HttpWorkerRequest.GetStatusDescription(statusCode), "\r\n" }));
-            //builder.Append("Server: ASP.NET Development Server/" + Messages.VersionString + "\r\n");
-            //builder.Append("Date: " + DateTime.Now.ToUniversalTime().ToString("R", DateTimeFormatInfo.InvariantInfo) + "\r\n");
-            //if (contentLength >= 0) builder.Append("Content-Length: " + contentLength + "\r\n");
-            //if (moreHeaders != null) builder.Append(moreHeaders);
-            //if (!keepAlive) builder.Append("Connection: Close\r\n");
-            //builder.Append("\r\n");
-            //return builder.ToString();
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/IO/FileClient.cs b/NewLife.Net/IO/FileClient.cs
deleted file mode 100644
index 8ed22ff8d9..0000000000
--- a/NewLife.Net/IO/FileClient.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-﻿using System;
-using System.IO;
-using NewLife.Log;
-
-namespace NewLife.Net.IO
-{
-    /// <summary>文件客户端</summary>
-    public class FileClient : DisposeBase
-    {
-        #region 属性
-        private ISocketClient _Client;
-        /// <summary>客户端连接</summary>
-        public ISocketClient Client { get { return _Client; } set { _Client = value; } }
-        #endregion
-
-        #region 构造
-        /// <summary>销毁客户端</summary>
-        /// <param name="disposing"></param>
-        protected override void OnDispose(Boolean disposing)
-        {
-            base.OnDispose(disposing);
-
-            if (Client != null) Client.Dispose();
-        }
-        #endregion
-
-        #region 方法
-        /// <summary>连接文件服务器</summary>
-        /// <param name="hostname"></param>
-        /// <param name="port"></param>
-        public void Connect(String hostname, Int32 port)
-        {
-            if (Client == null)
-            {
-                var tcp = new TcpSession();
-                //tcp.UseProcessAsync = false;
-                // 因为第一个包发送文件头，所以必须在一个会话里面完成文件传输，不能使用断线重连
-                tcp.AutoReconnect = 0;
-                tcp.ThrowException = true;
-                Client = tcp;
-                tcp.Remote.Port = port;
-                tcp.Remote.Host = hostname;
-
-                tcp.Open();
-            }
-        }
-
-        /// <summary>发送文件</summary>
-        /// <param name="fileName"></param>
-        public void SendFile(String fileName)
-        {
-            SendFile(fileName, null);
-        }
-
-        void SendFile(String fileName, String root)
-        {
-            var ff = new FileFormat(fileName, root);
-            WriteLog("{2} 发送文件{0}，{1:n0}kb", ff.Name, ff.Length / 1024, Client.Local);
-            Client.Send(ff.GetHeader());
-            //Client.Send(ff.Stream);
-            using (var fs = fileName.AsFile().OpenRead())
-            {
-                Client.Send(fs);
-            }
-        }
-
-        /// <summary>发送目录</summary>
-        /// <param name="directoryName"></param>
-        public void SendDirectory(String directoryName)
-        {
-            foreach (var item in Directory.GetFiles(directoryName, "*.*", SearchOption.AllDirectories))
-            {
-                SendFile(item, directoryName);
-            }
-        }
-        #endregion
-
-        #region 日志
-#if DEBUG
-        private ILog _Log = XTrace.Log;
-#else
-        private ILog _Log = Logger.Null;
-#endif
-        /// <summary>日志对象</summary>
-        public ILog Log { get { return _Log; } set { _Log = value; } }
-
-        /// <summary>输出日志</summary>
-        /// <param name="format"></param>
-        /// <param name="args"></param>
-        public void WriteLog(String format, params Object[] args)
-        {
-            if (Log != null) Log.Info(format, args);
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/IO/FileFormat.cs b/NewLife.Net/IO/FileFormat.cs
deleted file mode 100644
index f8f0a4adc0..0000000000
--- a/NewLife.Net/IO/FileFormat.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-﻿using System;
-using System.IO;
-using NewLife.Security;
-
-namespace NewLife.Net.IO
-{
-    /// <summary>文件格式</summary>
-    public class FileFormat
-    {
-        #region 属性
-        private String _Name;
-        /// <summary>文件名</summary>
-        public String Name { get { return _Name; } set { _Name = value; } }
-
-        private Int64 _Length;
-        /// <summary>文件大小</summary>
-        public Int64 Length { get { return _Length; } set { _Length = value; } }
-
-        private Int32 _Checksum;
-        /// <summary>头部检验和</summary>
-        public Int32 Checksum { get { return _Checksum; } set { _Checksum = value; } }
-
-        private Int32 _Crc;
-        /// <summary>计算出来的32位头部检验码</summary>
-        public Int32 Crc { get { return _Crc; } set { _Crc = value; } }
-        #endregion
-
-        #region 构造
-        /// <summary>初始化一个实例</summary>
-        public FileFormat() { }
-
-        /// <summary>使用文件路径和根路径初始化一个文件格式对象</summary>
-        /// <param name="fileName"></param>
-        /// <param name="root"></param>
-        public FileFormat(String fileName, String root)
-        {
-            var fi = new FileInfo(fileName);
-
-            if (String.IsNullOrEmpty(root))
-            {
-                root = Path.GetDirectoryName(fileName);
-                fileName = Path.GetFileName(fileName);
-            }
-            else
-            {
-                //if (fileName.StartsWithIgnoreCase(root)) fileName = fileName.Substring(root.Length);
-                //if (fileName.StartsWith("/")) fileName = fileName.Substring(1);
-                //if (fileName.StartsWith("\\")) fileName = fileName.Substring(1);
-                fileName = fileName.TrimStart(root).TrimStart("/", "\\");
-            }
-
-            Name = fileName;
-            Length = fi.Length;
-        }
-        #endregion
-
-        #region 方法
-        /// <summary>读取</summary>
-        /// <param name="stream"></param>
-        public void Read(Stream stream)
-        {
-            var b = stream.ReadByte();
-            if (b < 0 || b > 0x7F) throw new Exception("非法数据流！");
-            stream.Seek(-1, SeekOrigin.Current);
-
-            var p = stream.Position;
-            var reader = new BinaryReader(stream);
-            Name = reader.ReadString();
-            Length = reader.ReadInt64();
-            Crc = (Int32)Crc32.ComputeRange(stream, 0, 0);
-            Checksum = reader.ReadInt32();
-        }
-
-        /// <summary>写入</summary>
-        /// <param name="stream"></param>
-        public void Write(Stream stream)
-        {
-            var p = stream.Position;
-            var writer = new BinaryWriter(stream);
-            writer.Write(Name);
-            if (stream.Position - p >= 0x7F) throw new Exception("文件名必须小于127字节");
-
-            writer.Write(Length);
-            Checksum = Crc = (Int32)Crc32.ComputeRange(stream, 0, 0);
-            writer.Write(Checksum);
-        }
-
-        /// <summary>获取头部数据流</summary>
-        /// <returns></returns>
-        public Stream GetHeader()
-        {
-            var ms = new MemoryStream();
-            Write(ms);
-            ms.Position = 0;
-            return ms;
-        }
-        #endregion
-    }
-}
diff --git a/NewLife.Net/IO/FileServer.cs b/NewLife.Net/IO/FileServer.cs
deleted file mode 100644
index 3a684a3f7e..0000000000
--- a/NewLife.Net/IO/FileServer.cs
+++ /dev/null
@@ -1,197 +0,0 @@
-﻿using System;
-using System.IO;
-using System.Net.Sockets;
-using NewLife.Net.Sockets;
-
-namespace NewLife.Net.IO
-{
-    /// <summary>文件服务端</summary>
-    public class FileServer : NetServer<FileSession>
-    {
-        #region 属性
-        private String _SavedPath;
-        /// <summary>保存路径</summary>
-        public String SavedPath { get { return _SavedPath ?? (_SavedPath = "Data"); } set { _SavedPath = value; } }
-        #endregion
-
-        #region 方法
-        /// <summary>实例化一个文件服务</summary>
-        public FileServer()
-        {
-            Port = 33;
-            ProtocolType = NetType.Tcp;
-
-            Name = "文件服务";
-        }
-
-        /// <summary>附加服务器</summary>
-        /// <param name="server"></param>
-        /// <returns></returns>
-        public override Boolean AttachServer(ISocketServer server)
-        {
-            // 接收文件需要顺序
-            if (server is TcpServer)
-            {
-                var tcp = server as TcpServer;
-                tcp.ProcessAsync = false;
-                // 连续传输文件，间隔不得超过5秒
-                //tcp.SessionTimeout = 5;
-            }
-            return base.AttachServer(server);
-        }
-        #endregion
-
-        #region 事件
-        ///// <summary>收到连接时</summary>
-        ///// <param name="session"></param>
-        //protected override void OnNewSession(ISocketSession session)
-        //{
-        //    base.OnNewSession(session);
-
-        //    session.Received += (sender, e) =>
-        //    {
-        //        var tc = sender as ISocketSession;
-
-        //        var stream = tc.Stream;
-        //        stream.Write(e.Data, 0, e.Length);
-        //        stream.Seek(-1 * e.Length, SeekOrigin.Current);
-
-        //        // 数据太少时等下一次，不过基本上不可能。5是FileFormat可能的最小长度
-        //        if (stream.Length < 5) return;
-
-        //        var format = FileFormat.Load(stream);
-        //    };
-        //}
-        #endregion
-    }
-
-    /// <summary>文件服务会话</summary>
-    public class FileSession : NetSession<FileServer>
-    {
-        #region 属性
-        private FileFormat _Inf;
-        /// <summary>文件信息</summary>
-        public FileFormat Inf { get { return _Inf; } set { _Inf = value; } }
-
-        private Int64 _Length;
-        /// <summary>长度</summary>
-        public Int64 Length { get { return _Length; } set { _Length = value; } }
-
-        private FileStream _Stream;
-        /// <summary>文件流</summary>
-        public FileStream Stream { get { return _Stream; } set { _Stream = value; } }
-
-        private DateTime _StartTime;
-        /// <summary>开始时间</summary>
-        public DateTime StartTime { get { return _StartTime; } set { _StartTime = value; } }
-        #endregion
-
-        #region 构造
-        //public FileSession()
-        //{
-        //}
-
-        ///// <summary>开始</summary>
-        //public override void Start()
-        //{
-        //    base.Start();
-        //    StartTime = Session.StartTime;
-        //}
-
-        /// <summary>销毁会话</summary>
-        /// <param name="disposing"></param>
-        protected override void OnDispose(Boolean disposing)
-        {
-            base.OnDispose(disposing);
-
-            CloseStream();
-
-            if (Inf != null)
-            {
-                WriteError("{0}接收失败，完成度{1:p}", Inf.Name, (Double)Length / Inf.Length);
-            }
-        }
-
-        void CloseStream()
-        {
-            if (Stream != null)
-            {
-                try
-                {
-                    Stream.Flush();
-                    Stream.SetLength(Stream.Position);
-                    Stream.Dispose();
-                }
-                catch { }
-                Stream = null;
-            }
-        }
-        #endregion
-
-        /// <summary>处理收到的数据</summary>
-        /// <param name="e"></param>
-        protected override void OnReceive(ReceivedEventArgs e)
-        {
-            //base.OnReceive(e);
-
-            var stream = e.Stream;
-
-            // 第一个数据包解析头部
-            if (e.Length > 0 && Inf == null)
-            {
-                var fi = new FileFormat();
-                try
-                {
-                    fi.Read(stream);
-
-                    if (fi.Checksum != fi.Crc)
-                        throw new XException("文件{0}校验和错误{1:X8}!={2:X8}！", fi.Name, fi.Checksum, fi.Crc);
-                }
-                catch (Exception ex)
-                {
-                    WriteError("无法解析文件头！{0}", ex.Message);
-                    // 如果加载失败，则关闭会话
-                    Dispose();
-                    return;
-                }
-                Inf = fi;
-                Length = 0;
-                if (StartTime == DateTime.MinValue) StartTime = Session.StartTime;
-
-                // 加大网络缓冲区
-                Session.Client.ReceiveBufferSize = 8 * 1024 * 1024;
-
-                var file = Host.SavedPath.CombinePath(Inf.Name).EnsureDirectory();
-                Stream = file.AsFile().OpenWrite();
-                WriteLog("接收{0}，{1:n0}kb", Inf.Name, Inf.Length / 1024);
-
-                if (stream.Position >= stream.Length) return;
-            }
-
-            var len = stream.Length - stream.Position;
-            if (len > 0)
-            {
-                Length += len;
-                var ms = (DateTime.Now - StartTime).TotalMilliseconds;
-                var speed = Length / 1024 / ms * 1000;
-                WriteLog("收到{0:n0}字节，{1:n0}kb/s，完成{2:p}", len, (Int32)speed, (Double)Length / Inf.Length);
-                if (Stream != null && Stream.CanWrite) Stream.Write(stream);
-                //}
-                //else
-                //{
-                if (Length >= Inf.Length)
-                {
-                    //var ms = (DateTime.Now - StartTime).TotalMilliseconds;
-                    //var speed = Length / 1024 / ms * 1000;
-                    WriteLog("{0}接收完成，{1:n0}ms，{2:n0}kb/s", Inf.Name, (Int32)ms, (Int32)speed);
-                    //Dispose();
-
-                    // 清空，方便接收下一个文件
-                    Inf = null;
-                    CloseStream();
-                    StartTime = DateTime.MinValue;
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/ISO/COTP.cs b/NewLife.Net/ISO/COTP.cs
deleted file mode 100644
index e7be24f596..0000000000
--- a/NewLife.Net/ISO/COTP.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using NewLife.Serialization;
-
-namespace NewLife.Net.ISO
-{
-    /// <summary></summary>
-    public class COTP : Protocol<COTP>
-    {
-        #region 属性
-        private Byte _Length;
-        /// <summary>长度</summary>
-        public Byte Length { get { return _Length; } set { _Length = value; } }
-
-        private Byte _PDUType;
-        /// <summary>类型</summary>
-        public Byte PDUType { get { return _PDUType; } set { _PDUType = value; } }
-
-        private Byte _Flag;
-        /// <summary>标识位</summary>
-        public Byte Flag { get { return _Flag; } set { _Flag = value; } }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/ISO/TPKT.cs b/NewLife.Net/ISO/TPKT.cs
deleted file mode 100644
index 319b594863..0000000000
--- a/NewLife.Net/ISO/TPKT.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using NewLife.Serialization;
-
-namespace NewLife.Net.ISO
-{
-    /// <summary>ISO transport services on top of the TCP</summary>
-    public class TPKT : Protocol<TPKT>
-    {
-        #region 属性
-        private Byte _Version;
-        /// <summary>版本</summary>
-        public Byte Version { get { return _Version; } set { _Version = value; } }
-
-        private Byte _Reserved;
-        /// <summary>保留</summary>
-        public Byte Reserved { get { return _Reserved; } set { _Reserved = value; } }
-
-        private Int16 _Length;
-        /// <summary>长度</summary>
-        public Int16 Length { get { return _Length; } set { _Length = value; } }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/MQTT/MqttDecoder.cs b/NewLife.Net/MQTT/MqttDecoder.cs
deleted file mode 100644
index 04f2fa53b0..0000000000
--- a/NewLife.Net/MQTT/MqttDecoder.cs
+++ /dev/null
@@ -1,480 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-using System.Text;
-using NewLife.Data;
-using NewLife.Exceptions;
-using NewLife.Net.Handlers;
-using NewLife.Net.MQTT.Packets;
-
-namespace NewLife.Net.MQTT
-{
-    public sealed class MqttDecoder : ReplayingDecoder<MqttDecoder.ParseState>
-    {
-        public enum ParseState
-        {
-            Ready,
-            Failed
-        }
-
-        readonly Boolean isServer;
-        readonly Int32 maxMessageSize;
-
-        public MqttDecoder(Boolean isServer, Int32 maxMessageSize)
-            : base(ParseState.Ready)
-        {
-            this.isServer = isServer;
-            this.maxMessageSize = maxMessageSize;
-        }
-
-        protected override void Decode(IHandlerContext context, Packet input, List<Object> output)
-        {
-            try
-            {
-                switch (this.State)
-                {
-                    case ParseState.Ready:
-                        if (!TryDecodePacket(input, context, out var packet))
-                        {
-                            this.RequestReplay();
-                            return;
-                        }
-
-                        output.Add(packet);
-                        this.Checkpoint();
-                        break;
-                    case ParseState.Failed:
-                        // read out data until connection is closed
-                        input.SkipBytes(input.ReadableBytes);
-                        return;
-                    default:
-                        throw new ArgumentOutOfRangeException();
-                }
-            }
-            catch (DecoderException)
-            {
-                input.SkipBytes(input.ReadableBytes);
-                this.Checkpoint(ParseState.Failed);
-                throw;
-            }
-        }
-
-        Boolean TryDecodePacket(Packet buffer, IHandlerContext context, out DataPacket packet)
-        {
-            if (!buffer.IsReadable(2)) // packet consists of at least 2 bytes
-            {
-                packet = null;
-                return false;
-            }
-
-            Int32 signature = buffer.ReadByte();
-
-            if (!TryDecodeRemainingLength(buffer, out var remainingLength) || !buffer.IsReadable(remainingLength))
-            {
-                packet = null;
-                return false;
-            }
-
-            packet = DecodePacketInternal(buffer, signature, ref remainingLength, context);
-
-            if (remainingLength > 0)
-            {
-                throw new DecoderException($"Declared remaining length is bigger than packet data size by {remainingLength}.");
-            }
-
-            return true;
-        }
-
-        DataPacket DecodePacketInternal(Packet buffer, Int32 packetSignature, ref Int32 remainingLength, IHandlerContext context)
-        {
-            if (Signatures.IsPublish(packetSignature))
-            {
-                var qualityOfService = (QualityOfService)((packetSignature >> 1) & 0x3); // take bits #1 and #2 ONLY and convert them into QoS value
-                if (qualityOfService == QualityOfService.Reserved)
-                {
-                    throw new DecoderException($"Unexpected QoS value of {(Int32)qualityOfService} for {PacketType.PUBLISH} packet.");
-                }
-
-                var duplicate = (packetSignature & 0x8) == 0x8; // test bit#3
-                var retain = (packetSignature & 0x1) != 0; // test bit#0
-                var packet = new PublishPacket(qualityOfService, duplicate, retain);
-                DecodePublishPacket(buffer, packet, ref remainingLength);
-                return packet;
-            }
-
-            switch (packetSignature) // strict match checks for valid message type + correct values in flags part
-            {
-                case Signatures.PubAck:
-                    var pubAckPacket = new PubAckPacket();
-                    DecodePacketIdVariableHeader(buffer, pubAckPacket, ref remainingLength);
-                    return pubAckPacket;
-                case Signatures.PubRec:
-                    var pubRecPacket = new PubRecPacket();
-                    DecodePacketIdVariableHeader(buffer, pubRecPacket, ref remainingLength);
-                    return pubRecPacket;
-                case Signatures.PubRel:
-                    var pubRelPacket = new PubRelPacket();
-                    DecodePacketIdVariableHeader(buffer, pubRelPacket, ref remainingLength);
-                    return pubRelPacket;
-                case Signatures.PubComp:
-                    var pubCompPacket = new PubCompPacket();
-                    DecodePacketIdVariableHeader(buffer, pubCompPacket, ref remainingLength);
-                    return pubCompPacket;
-                case Signatures.PingReq:
-                    ValidateServerPacketExpected(packetSignature);
-                    return PingReqPacket.Instance;
-                case Signatures.Subscribe:
-                    ValidateServerPacketExpected(packetSignature);
-                    var subscribePacket = new SubscribePacket();
-                    DecodePacketIdVariableHeader(buffer, subscribePacket, ref remainingLength);
-                    DecodeSubscribePayload(buffer, subscribePacket, ref remainingLength);
-                    return subscribePacket;
-                case Signatures.Unsubscribe:
-                    ValidateServerPacketExpected(packetSignature);
-                    var unsubscribePacket = new UnsubscribePacket();
-                    DecodePacketIdVariableHeader(buffer, unsubscribePacket, ref remainingLength);
-                    DecodeUnsubscribePayload(buffer, unsubscribePacket, ref remainingLength);
-                    return unsubscribePacket;
-                case Signatures.Connect:
-                    ValidateServerPacketExpected(packetSignature);
-                    var connectPacket = new ConnectPacket();
-                    DecodeConnectPacket(buffer, connectPacket, ref remainingLength, context);
-                    return connectPacket;
-                case Signatures.Disconnect:
-                    ValidateServerPacketExpected(packetSignature);
-                    return DisconnectPacket.Instance;
-                case Signatures.ConnAck:
-                    ValidateClientPacketExpected(packetSignature);
-                    var connAckPacket = new ConnAckPacket();
-                    DecodeConnAckPacket(buffer, connAckPacket, ref remainingLength);
-                    return connAckPacket;
-                case Signatures.SubAck:
-                    ValidateClientPacketExpected(packetSignature);
-                    var subAckPacket = new SubAckPacket();
-                    DecodePacketIdVariableHeader(buffer, subAckPacket, ref remainingLength);
-                    DecodeSubAckPayload(buffer, subAckPacket, ref remainingLength);
-                    return subAckPacket;
-                case Signatures.UnsubAck:
-                    ValidateClientPacketExpected(packetSignature);
-                    var unsubAckPacket = new UnsubAckPacket();
-                    DecodePacketIdVariableHeader(buffer, unsubAckPacket, ref remainingLength);
-                    return unsubAckPacket;
-                case Signatures.PingResp:
-                    ValidateClientPacketExpected(packetSignature);
-                    return PingRespPacket.Instance;
-                default:
-                    throw new DecoderException($"First packet byte value of `{packetSignature}` is invalid.");
-            }
-        }
-
-        void ValidateServerPacketExpected(Int32 signature)
-        {
-            if (!isServer)
-            {
-                throw new DecoderException($"DataPacket type determined through first packet byte `{signature}` is not supported by MQTT client.");
-            }
-        }
-
-        void ValidateClientPacketExpected(Int32 signature)
-        {
-            if (isServer)
-            {
-                throw new DecoderException($"DataPacket type determined through first packet byte `{signature}` is not supported by MQTT server.");
-            }
-        }
-
-        Boolean TryDecodeRemainingLength(Packet buffer, out Int32 value)
-        {
-            Int32 readable = buffer.ReadableBytes;
-
-            var result = 0;
-            var multiplier = 1;
-            Byte digit;
-            var read = 0;
-            do
-            {
-                if (readable < read + 1)
-                {
-                    value = default(Int32);
-                    return false;
-                }
-                digit = buffer.ReadByte();
-                result += (digit & 0x7f) * multiplier;
-                multiplier <<= 7;
-                read++;
-            }
-            while ((digit & 0x80) != 0 && read < 4);
-
-            if (read == 4 && (digit & 0x80) != 0)
-            {
-                throw new DecoderException("Remaining length exceeds 4 bytes in length");
-            }
-
-            var completeMessageSize = result + 1 + read;
-            if (completeMessageSize > maxMessageSize)
-            {
-                throw new DecoderException("Message is too big: " + completeMessageSize);
-            }
-
-            value = result;
-            return true;
-        }
-
-        static void DecodeConnectPacket(Packet buffer, ConnectPacket packet, ref Int32 remainingLength, IHandlerContext context)
-        {
-            var protocolName = DecodeString(buffer, ref remainingLength);
-            if (!Util.ProtocolName.Equals(protocolName, StringComparison.Ordinal))
-            {
-                throw new DecoderException($"Unexpected protocol name. Expected: {Util.ProtocolName}. Actual: {protocolName}");
-            }
-            packet.ProtocolName = Util.ProtocolName;
-
-            DecreaseRemainingLength(ref remainingLength, 1);
-            packet.ProtocolLevel = buffer.ReadByte();
-
-            if (packet.ProtocolLevel != Util.ProtocolLevel)
-            {
-                var connAckPacket = new ConnAckPacket();
-                connAckPacket.ReturnCode = ConnectReturnCode.RefusedUnacceptableProtocolVersion;
-                context.WriteAndFlushAsync(connAckPacket);
-                throw new DecoderException($"Unexpected protocol level. Expected: {Util.ProtocolLevel}. Actual: {packet.ProtocolLevel}");
-            }
-
-            DecreaseRemainingLength(ref remainingLength, 1);
-            Int32 connectFlags = buffer.ReadByte();
-
-            packet.CleanSession = (connectFlags & 0x02) == 0x02;
-
-            var hasWill = (connectFlags & 0x04) == 0x04;
-            if (hasWill)
-            {
-                packet.HasWill = true;
-                packet.WillRetain = (connectFlags & 0x20) == 0x20;
-                packet.WillQualityOfService = (QualityOfService)((connectFlags & 0x18) >> 3);
-                if (packet.WillQualityOfService == QualityOfService.Reserved)
-                {
-                    throw new DecoderException($"[MQTT-3.1.2-14] Unexpected Will QoS value of {(Int32)packet.WillQualityOfService}.");
-                }
-                packet.WillTopicName = String.Empty;
-            }
-            else if ((connectFlags & 0x38) != 0) // bits 3,4,5 [MQTT-3.1.2-11]
-            {
-                throw new DecoderException("[MQTT-3.1.2-11]");
-            }
-
-            packet.HasUsername = (connectFlags & 0x80) == 0x80;
-            packet.HasPassword = (connectFlags & 0x40) == 0x40;
-            if (packet.HasPassword && !packet.HasUsername)
-            {
-                throw new DecoderException("[MQTT-3.1.2-22]");
-            }
-            if ((connectFlags & 0x1) != 0) // [MQTT-3.1.2-3]
-            {
-                throw new DecoderException("[MQTT-3.1.2-3]");
-            }
-
-            packet.KeepAliveInSeconds = DecodeUnsignedShort(buffer, ref remainingLength);
-
-            var clientId = DecodeString(buffer, ref remainingLength);
-            Util.ValidateClientId(clientId);
-            packet.ClientId = clientId;
-
-            if (hasWill)
-            {
-                packet.WillTopicName = DecodeString(buffer, ref remainingLength);
-                var willMessageLength = DecodeUnsignedShort(buffer, ref remainingLength);
-                DecreaseRemainingLength(ref remainingLength, willMessageLength);
-                packet.WillMessage = buffer.ReadBytes(willMessageLength);
-            }
-
-            if (packet.HasUsername)
-            {
-                packet.Username = DecodeString(buffer, ref remainingLength);
-            }
-
-            if (packet.HasPassword)
-            {
-                packet.Password = DecodeString(buffer, ref remainingLength);
-            }
-        }
-
-        static void DecodeConnAckPacket(Packet buffer, ConnAckPacket packet, ref Int32 remainingLength)
-        {
-            var ackData = DecodeUnsignedShort(buffer, ref remainingLength);
-            packet.SessionPresent = ((ackData >> 8) & 0x1) != 0;
-            packet.ReturnCode = (ConnectReturnCode)(ackData & 0xFF);
-        }
-
-        static void DecodePublishPacket(Packet buffer, PublishPacket packet, ref Int32 remainingLength)
-        {
-            var topicName = DecodeString(buffer, ref remainingLength, 1);
-            Util.ValidateTopicName(topicName);
-
-            packet.TopicName = topicName;
-            if (packet.QualityOfService > QualityOfService.AtMostOnce)
-            {
-                DecodePacketIdVariableHeader(buffer, packet, ref remainingLength);
-            }
-
-            Packet payload;
-            if (remainingLength > 0)
-            {
-                payload = buffer.ReadSlice(remainingLength);
-                payload.Retain();
-                remainingLength = 0;
-            }
-            else
-            {
-                payload = Unpooled.Empty;
-            }
-            packet.Payload = payload;
-        }
-
-        static void DecodePacketIdVariableHeader(Packet buffer, PacketWithId packet, ref Int32 remainingLength)
-        {
-            var packetId = packet.PacketId = DecodeUnsignedShort(buffer, ref remainingLength);
-            if (packetId == 0)
-            {
-                throw new DecoderException("[MQTT-2.3.1-1]");
-            }
-        }
-
-        static void DecodeSubscribePayload(Packet buffer, SubscribePacket packet, ref Int32 remainingLength)
-        {
-            var subscribeTopics = new List<SubscriptionRequest>();
-            while (remainingLength > 0)
-            {
-                var topicFilter = DecodeString(buffer, ref remainingLength);
-                ValidateTopicFilter(topicFilter);
-
-                DecreaseRemainingLength(ref remainingLength, 1);
-                Int32 qos = buffer.ReadByte();
-                if (qos >= (Int32)QualityOfService.Reserved)
-                {
-                    throw new DecoderException($"[MQTT-3.8.3-4]. Invalid QoS value: {qos}.");
-                }
-
-                subscribeTopics.Add(new SubscriptionRequest(topicFilter, (QualityOfService)qos));
-            }
-
-            if (subscribeTopics.Count == 0)
-            {
-                throw new DecoderException("[MQTT-3.8.3-3]");
-            }
-
-            packet.Requests = subscribeTopics;
-        }
-
-        static void ValidateTopicFilter(String topicFilter)
-        {
-            var length = topicFilter.Length;
-            if (length == 0)
-            {
-                throw new DecoderException("[MQTT-4.7.3-1]");
-            }
-
-            for (var i = 0; i < length; i++)
-            {
-                var c = topicFilter[i];
-                switch (c)
-                {
-                    case '+':
-                        if ((i > 0 && topicFilter[i - 1] != '/') || (i < length - 1 && topicFilter[i + 1] != '/'))
-                        {
-                            throw new DecoderException($"[MQTT-4.7.1-3]. Invalid topic filter: {topicFilter}");
-                        }
-                        break;
-                    case '#':
-                        if (i < length - 1 || (i > 0 && topicFilter[i - 1] != '/'))
-                        {
-                            throw new DecoderException($"[MQTT-4.7.1-2]. Invalid topic filter: {topicFilter}");
-                        }
-                        break;
-                }
-            }
-        }
-
-        static void DecodeSubAckPayload(Packet buffer, SubAckPacket packet, ref Int32 remainingLength)
-        {
-            var returnCodes = new QualityOfService[remainingLength];
-            for (var i = 0; i < remainingLength; i++)
-            {
-                var returnCode = (QualityOfService)buffer.ReadByte();
-                if (returnCode > QualityOfService.ExactlyOnce && returnCode != QualityOfService.Failure)
-                {
-                    throw new DecoderException($"[MQTT-3.9.3-2]. Invalid return code: {returnCode}");
-                }
-                returnCodes[i] = returnCode;
-            }
-            packet.ReturnCodes = returnCodes;
-
-            remainingLength = 0;
-        }
-
-        static void DecodeUnsubscribePayload(Packet buffer, UnsubscribePacket packet, ref Int32 remainingLength)
-        {
-            var unsubscribeTopics = new List<String>();
-            while (remainingLength > 0)
-            {
-                var topicFilter = DecodeString(buffer, ref remainingLength);
-                ValidateTopicFilter(topicFilter);
-                unsubscribeTopics.Add(topicFilter);
-            }
-
-            if (unsubscribeTopics.Count == 0)
-            {
-                throw new DecoderException("[MQTT-3.10.3-2]");
-            }
-
-            packet.TopicFilters = unsubscribeTopics;
-
-            remainingLength = 0;
-        }
-
-        static Int32 DecodeUnsignedShort(Packet buffer, ref Int32 remainingLength)
-        {
-            DecreaseRemainingLength(ref remainingLength, 2);
-            return buffer.ReadUnsignedShort();
-        }
-
-        static String DecodeString(Packet buffer, ref Int32 remainingLength) => DecodeString(buffer, ref remainingLength, 0, Int32.MaxValue);
-
-        static String DecodeString(Packet buffer, ref Int32 remainingLength, Int32 minBytes) => DecodeString(buffer, ref remainingLength, minBytes, Int32.MaxValue);
-
-        static String DecodeString(Packet buffer, ref Int32 remainingLength, Int32 minBytes, Int32 maxBytes)
-        {
-            var size = DecodeUnsignedShort(buffer, ref remainingLength);
-
-            if (size < minBytes)
-            {
-                throw new DecoderException($"String value is shorter than minimum allowed {minBytes}. Advertised length: {size}");
-            }
-            if (size > maxBytes)
-            {
-                throw new DecoderException($"String value is longer than maximum allowed {maxBytes}. Advertised length: {size}");
-            }
-
-            if (size == 0)
-            {
-                return String.Empty;
-            }
-
-            DecreaseRemainingLength(ref remainingLength, size);
-
-            var value = buffer.ToString(buffer.ReaderIndex, size, Encoding.UTF8);
-            // todo: enforce string definition by MQTT spec
-            buffer.SetReaderIndex(buffer.ReaderIndex + size);
-            return value;
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)] // we don't care about the method being on exception's stack so it's OK to inline
-        static void DecreaseRemainingLength(ref Int32 remainingLength, Int32 minExpectedLength)
-        {
-            if (remainingLength < minExpectedLength)
-            {
-                throw new DecoderException($"Current Remaining Length of {remainingLength} is smaller than expected {minExpectedLength}.");
-            }
-            remainingLength -= minExpectedLength;
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/MQTT/MqttEncoder.cs b/NewLife.Net/MQTT/MqttEncoder.cs
deleted file mode 100644
index 044eb84a25..0000000000
--- a/NewLife.Net/MQTT/MqttEncoder.cs
+++ /dev/null
@@ -1,465 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Text;
-using NewLife.Data;
-using NewLife.Net.MQTT.Packets;
-
-namespace NewLife.Net.MQTT
-{
-    public sealed class MqttEncoder : MessageToMessageEncoder<DataPacket>
-    {
-        public static readonly MqttEncoder Instance = new MqttEncoder();
-        const Int32 PacketIdLength = 2;
-        const Int32 StringSizeLength = 2;
-        const Int32 MaxVariableLength = 4;
-
-        protected override void Encode(IHandlerContext context, DataPacket message, List<Object> output) => DoEncode(context.Allocator, message, output);
-
-        public override Boolean IsSharable => true;
-
-        /// <summary>
-        ///     This is the main encoding method.
-        ///     It's only visible for testing.
-        ///     @param bufferAllocator Allocates ByteBuf
-        ///     @param packet MQTT packet to encode
-        ///     @return ByteBuf with encoded bytes
-        /// </summary>
-        internal static void DoEncode(IByteBufferAllocator bufferAllocator, DataPacket packet, List<Object> output)
-        {
-            switch (packet.PacketType)
-            {
-                case PacketType.CONNECT:
-                    EncodeConnectMessage(bufferAllocator, (ConnectPacket)packet, output);
-                    break;
-                case PacketType.CONNACK:
-                    EncodeConnAckMessage(bufferAllocator, (ConnAckPacket)packet, output);
-                    break;
-                case PacketType.PUBLISH:
-                    EncodePublishMessage(bufferAllocator, (PublishPacket)packet, output);
-                    break;
-                case PacketType.PUBACK:
-                case PacketType.PUBREC:
-                case PacketType.PUBREL:
-                case PacketType.PUBCOMP:
-                case PacketType.UNSUBACK:
-                    EncodePacketWithIdOnly(bufferAllocator, (PacketWithId)packet, output);
-                    break;
-                case PacketType.SUBSCRIBE:
-                    EncodeSubscribeMessage(bufferAllocator, (SubscribePacket)packet, output);
-                    break;
-                case PacketType.SUBACK:
-                    EncodeSubAckMessage(bufferAllocator, (SubAckPacket)packet, output);
-                    break;
-                case PacketType.UNSUBSCRIBE:
-                    EncodeUnsubscribeMessage(bufferAllocator, (UnsubscribePacket)packet, output);
-                    break;
-                case PacketType.PINGREQ:
-                case PacketType.PINGRESP:
-                case PacketType.DISCONNECT:
-                    EncodePacketWithFixedHeaderOnly(bufferAllocator, packet, output);
-                    break;
-                default:
-                    throw new ArgumentException("Unknown packet type: " + packet.PacketType, nameof(packet));
-            }
-        }
-
-        static void EncodeConnectMessage(IByteBufferAllocator bufferAllocator, ConnectPacket packet, List<Object> output)
-        {
-            var payloadBufferSize = 0;
-
-            // Client id
-            var clientId = packet.ClientId;
-            Util.ValidateClientId(clientId);
-            var clientIdBytes = EncodeStringInUtf8(clientId);
-            payloadBufferSize += StringSizeLength + clientIdBytes.Length;
-
-            Byte[] willTopicBytes;
-            Packet willMessage;
-            if (packet.HasWill)
-            {
-                // Will topic and message
-                var willTopic = packet.WillTopicName;
-                willTopicBytes = EncodeStringInUtf8(willTopic);
-                willMessage = packet.WillMessage;
-                payloadBufferSize += StringSizeLength + willTopicBytes.Length;
-                payloadBufferSize += 2 + willMessage.ReadableBytes;
-            }
-            else
-            {
-                willTopicBytes = null;
-                willMessage = null;
-            }
-
-            var userName = packet.Username;
-            Byte[] userNameBytes;
-            if (packet.HasUsername)
-            {
-                userNameBytes = EncodeStringInUtf8(userName);
-                payloadBufferSize += StringSizeLength + userNameBytes.Length;
-            }
-            else
-            {
-                userNameBytes = null;
-            }
-
-            Byte[] passwordBytes;
-            if (packet.HasPassword)
-            {
-                var password = packet.Password;
-                passwordBytes = EncodeStringInUtf8(password);
-                payloadBufferSize += StringSizeLength + passwordBytes.Length;
-            }
-            else
-            {
-                passwordBytes = null;
-            }
-
-            // Fixed header
-            var protocolNameBytes = EncodeStringInUtf8(Util.ProtocolName);
-            var variableHeaderBufferSize = StringSizeLength + protocolNameBytes.Length + 4;
-            var variablePartSize = variableHeaderBufferSize + payloadBufferSize;
-            var fixedHeaderBufferSize = 1 + MaxVariableLength;
-            Packet buf = null;
-            try
-            {
-                buf = bufferAllocator.Buffer(fixedHeaderBufferSize + variablePartSize);
-                buf.WriteByte(CalculateFirstByteOfFixedHeader(packet));
-                WriteVariableLengthInt(buf, variablePartSize);
-
-                buf.WriteShort(protocolNameBytes.Length);
-                buf.WriteBytes(protocolNameBytes);
-
-                buf.WriteByte(Util.ProtocolLevel);
-                buf.WriteByte(CalculateConnectFlagsByte(packet));
-                buf.WriteShort(packet.KeepAliveInSeconds);
-
-                // Payload
-                buf.WriteShort(clientIdBytes.Length);
-                buf.WriteBytes(clientIdBytes, 0, clientIdBytes.Length);
-                if (packet.HasWill)
-                {
-                    buf.WriteShort(willTopicBytes.Length);
-                    buf.WriteBytes(willTopicBytes, 0, willTopicBytes.Length);
-                    buf.WriteShort(willMessage.ReadableBytes);
-                    if (willMessage.IsReadable())
-                    {
-                        buf.WriteBytes(willMessage);
-                    }
-                    willMessage.Release();
-                    willMessage = null;
-                }
-                if (packet.HasUsername)
-                {
-                    buf.WriteShort(userNameBytes.Length);
-                    buf.WriteBytes(userNameBytes, 0, userNameBytes.Length);
-
-                    if (packet.HasPassword)
-                    {
-                        buf.WriteShort(passwordBytes.Length);
-                        buf.WriteBytes(passwordBytes, 0, passwordBytes.Length);
-                    }
-                }
-
-                output.Add(buf);
-                buf = null;
-            }
-            finally
-            {
-                buf?.SafeRelease();
-                willMessage?.SafeRelease();
-            }
-        }
-
-        static Int32 CalculateConnectFlagsByte(ConnectPacket packet)
-        {
-            var flagByte = 0;
-            if (packet.HasUsername)
-            {
-                flagByte |= 0x80;
-            }
-            if (packet.HasPassword)
-            {
-                flagByte |= 0x40;
-            }
-            if (packet.HasWill)
-            {
-                flagByte |= 0x04;
-                flagByte |= ((Int32)packet.WillQualityOfService & 0x03) << 3;
-                if (packet.WillRetain)
-                {
-                    flagByte |= 0x20;
-                }
-            }
-            if (packet.CleanSession)
-            {
-                flagByte |= 0x02;
-            }
-            return flagByte;
-        }
-
-        static void EncodeConnAckMessage(IByteBufferAllocator bufferAllocator, ConnAckPacket message, List<Object> output)
-        {
-            Packet buffer = null;
-            try
-            {
-                buffer = bufferAllocator.Buffer(4);
-                buffer.WriteByte(CalculateFirstByteOfFixedHeader(message));
-                buffer.WriteByte(2); // remaining length
-                if (message.SessionPresent)
-                {
-                    buffer.WriteByte(1); // 7 reserved 0-bits and SP = 1
-                }
-                else
-                {
-                    buffer.WriteByte(0); // 7 reserved 0-bits and SP = 0
-                }
-                buffer.WriteByte((Byte)message.ReturnCode);
-
-
-                output.Add(buffer);
-                buffer = null;
-            }
-            finally
-            {
-                buffer?.SafeRelease();
-            }
-        }
-
-        static void EncodePublishMessage(IByteBufferAllocator bufferAllocator, PublishPacket packet, List<Object> output)
-        {
-            Packet payload = packet.Payload ?? Unpooled.Empty;
-
-            var topicName = packet.TopicName;
-            Util.ValidateTopicName(topicName);
-            var topicNameBytes = EncodeStringInUtf8(topicName);
-
-            Int32 variableHeaderBufferSize = StringSizeLength + topicNameBytes.Length +
-                (packet.QualityOfService > QualityOfService.AtMostOnce ? PacketIdLength : 0);
-            Int32 payloadBufferSize = payload.ReadableBytes;
-            var variablePartSize = variableHeaderBufferSize + payloadBufferSize;
-            var fixedHeaderBufferSize = 1 + MaxVariableLength;
-
-            Packet buf = null;
-            try
-            {
-                buf = bufferAllocator.Buffer(fixedHeaderBufferSize + variablePartSize);
-                buf.WriteByte(CalculateFirstByteOfFixedHeader(packet));
-                WriteVariableLengthInt(buf, variablePartSize);
-                buf.WriteShort(topicNameBytes.Length);
-                buf.WriteBytes(topicNameBytes);
-                if (packet.QualityOfService > QualityOfService.AtMostOnce)
-                {
-                    buf.WriteShort(packet.PacketId);
-                }
-
-                output.Add(buf);
-                buf = null;
-            }
-            finally
-            {
-                buf?.SafeRelease();
-            }
-
-            if (payload.IsReadable())
-            {
-                output.Add(payload.Retain());
-            }
-        }
-
-        static void EncodePacketWithIdOnly(IByteBufferAllocator bufferAllocator, PacketWithId packet, List<Object> output)
-        {
-            var msgId = packet.PacketId;
-
-            const Int32 VariableHeaderBufferSize = PacketIdLength; // variable part only has a packet id
-            var fixedHeaderBufferSize = 1 + MaxVariableLength;
-            Packet buffer = null;
-            try
-            {
-                buffer = bufferAllocator.Buffer(fixedHeaderBufferSize + VariableHeaderBufferSize);
-                buffer.WriteByte(CalculateFirstByteOfFixedHeader(packet));
-                WriteVariableLengthInt(buffer, VariableHeaderBufferSize);
-                buffer.WriteShort(msgId);
-
-                output.Add(buffer);
-                buffer = null;
-            }
-            finally
-            {
-                buffer?.SafeRelease();
-            }
-        }
-
-        static void EncodeSubscribeMessage(IByteBufferAllocator bufferAllocator, SubscribePacket packet, List<Object> output)
-        {
-            const Int32 VariableHeaderSize = PacketIdLength;
-            var payloadBufferSize = 0;
-
-            ThreadLocalObjectList encodedTopicFilters = ThreadLocalObjectList.NewInstance();
-
-            Packet buf = null;
-            try
-            {
-                foreach (var topic in packet.Requests)
-                {
-                    var topicFilterBytes = EncodeStringInUtf8(topic.TopicFilter);
-                    payloadBufferSize += StringSizeLength + topicFilterBytes.Length + 1; // length, value, QoS
-                    encodedTopicFilters.Add(topicFilterBytes);
-                }
-
-                var variablePartSize = VariableHeaderSize + payloadBufferSize;
-                var fixedHeaderBufferSize = 1 + MaxVariableLength;
-
-                buf = bufferAllocator.Buffer(fixedHeaderBufferSize + variablePartSize);
-                buf.WriteByte(CalculateFirstByteOfFixedHeader(packet));
-                WriteVariableLengthInt(buf, variablePartSize);
-
-                // Variable Header
-                buf.WriteShort(packet.PacketId); // todo: review: validate?
-
-                // Payload
-                for (var i = 0; i < encodedTopicFilters.Count; i++)
-                {
-                    var topicFilterBytes = (Byte[])encodedTopicFilters[i];
-                    buf.WriteShort(topicFilterBytes.Length);
-                    buf.WriteBytes(topicFilterBytes, 0, topicFilterBytes.Length);
-                    buf.WriteByte((Int32)packet.Requests[i].QualityOfService);
-                }
-
-                output.Add(buf);
-                buf = null;
-            }
-            finally
-            {
-                buf?.SafeRelease();
-                encodedTopicFilters.Return();
-            }
-        }
-
-        static void EncodeSubAckMessage(IByteBufferAllocator bufferAllocator, SubAckPacket message, List<Object> output)
-        {
-            var payloadBufferSize = message.ReturnCodes.Count;
-            var variablePartSize = PacketIdLength + payloadBufferSize;
-            var fixedHeaderBufferSize = 1 + MaxVariableLength;
-            Packet buf = null;
-            try
-            {
-                buf = bufferAllocator.Buffer(fixedHeaderBufferSize + variablePartSize);
-                buf.WriteByte(CalculateFirstByteOfFixedHeader(message));
-                WriteVariableLengthInt(buf, variablePartSize);
-                buf.WriteShort(message.PacketId);
-                foreach (QualityOfService qos in message.ReturnCodes)
-                {
-                    buf.WriteByte((Byte)qos);
-                }
-
-                output.Add(buf);
-                buf = null;
-
-            }
-            finally
-            {
-                buf?.SafeRelease();
-            }
-        }
-
-        static void EncodeUnsubscribeMessage(IByteBufferAllocator bufferAllocator, UnsubscribePacket packet, List<Object> output)
-        {
-            const Int32 VariableHeaderSize = 2;
-            var payloadBufferSize = 0;
-
-            ThreadLocalObjectList encodedTopicFilters = ThreadLocalObjectList.NewInstance();
-
-            Packet buf = null;
-            try
-            {
-                foreach (var topic in packet.TopicFilters)
-                {
-                    var topicFilterBytes = EncodeStringInUtf8(topic);
-                    payloadBufferSize += StringSizeLength + topicFilterBytes.Length; // length, value
-                    encodedTopicFilters.Add(topicFilterBytes);
-                }
-
-                var variablePartSize = VariableHeaderSize + payloadBufferSize;
-                var fixedHeaderBufferSize = 1 + MaxVariableLength;
-
-                buf = bufferAllocator.Buffer(fixedHeaderBufferSize + variablePartSize);
-                buf.WriteByte(CalculateFirstByteOfFixedHeader(packet));
-                WriteVariableLengthInt(buf, variablePartSize);
-
-                // Variable Header
-                buf.WriteShort(packet.PacketId); // todo: review: validate?
-
-                // Payload
-                for (var i = 0; i < encodedTopicFilters.Count; i++)
-                {
-                    var topicFilterBytes = (Byte[])encodedTopicFilters[i];
-                    buf.WriteShort(topicFilterBytes.Length);
-                    buf.WriteBytes(topicFilterBytes, 0, topicFilterBytes.Length);
-                }
-
-                output.Add(buf);
-                buf = null;
-            }
-            finally
-            {
-                buf?.SafeRelease();
-                encodedTopicFilters.Return();
-            }
-        }
-
-        static void EncodePacketWithFixedHeaderOnly(IByteBufferAllocator bufferAllocator, DataPacket packet, List<Object> output)
-        {
-            Packet buffer = null;
-            try
-            {
-                buffer = bufferAllocator.Buffer(2);
-                buffer.WriteByte(CalculateFirstByteOfFixedHeader(packet));
-                buffer.WriteByte(0);
-
-                output.Add(buffer);
-                buffer = null;
-            }
-            finally
-            {
-                buffer?.SafeRelease();
-            }
-        }
-
-        static Int32 CalculateFirstByteOfFixedHeader(DataPacket packet)
-        {
-            var ret = 0;
-            ret |= (Int32)packet.PacketType << 4;
-            if (packet.Duplicate)
-            {
-                ret |= 0x08;
-            }
-            ret |= (Int32)packet.QualityOfService << 1;
-            if (packet.RetainRequested)
-            {
-                ret |= 0x01;
-            }
-            return ret;
-        }
-
-        static void WriteVariableLengthInt(Packet buffer, Int32 value)
-        {
-            do
-            {
-                var digit = value % 128;
-                value /= 128;
-                if (value > 0)
-                {
-                    digit |= 0x80;
-                }
-                buffer.WriteByte(digit);
-            }
-            while (value > 0);
-        }
-
-        static Byte[] EncodeStringInUtf8(String s)
-        {
-            // todo: validate against extra limitations per MQTT's UTF-8 string definition
-            return Encoding.UTF8.GetBytes(s);
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/MQTT/MqttMessage.cs b/NewLife.Net/MQTT/MqttMessage.cs
deleted file mode 100644
index fc72a234d4..0000000000
--- a/NewLife.Net/MQTT/MqttMessage.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Text;
-using NewLife.Serialization;
-
-namespace NewLife.Net.MQTT
-{
-    /// <summary>MQTT（Message Queue Telemetry Transport）,遥测传输协议</summary>
-    /// <remarks>
-    /// 提供订阅/发布模式，更为简约、轻量，易于使用，针对受限环境（带宽低、网络延迟高、网络通信不稳定），可以简单概括为物联网打造，官方总结特点如下：
-    /// 1.使用发布/订阅消息模式，提供一对多的消息发布，解除应用程序耦合。
-    /// 2. 对负载内容屏蔽的消息传输。
-    /// 3. 使用 TCP/IP 提供网络连接。
-    /// 4. 有三种消息发布服务质量：
-    /// “至多一次”，消息发布完全依赖底层 TCP/IP 网络。会发生消息丢失或重复。这一级别可用于如下情况，环境传感器数据，丢失一次读记录无所谓，因为不久后还会有第二次发送。
-    /// “至少一次”，确保消息到达，但消息重复可能会发生。
-    /// “只有一次”，确保消息到达一次。这一级别可用于如下情况，在计费系统中，消息重复或丢失会导致不正确的结果。
-    /// 5. 小型传输，开销很小（固定长度的头部是 2 字节），协议交换最小化，以降低网络流量。
-    /// 6. 使用 Last Will 和 Testament 特性通知有关各方客户端异常中断的机制。
-    /// </remarks>
-    public class MqttMessage
-    {
-        #region 属性
-        [BitSize(4)]
-        private Byte _Type;
-        /// <summary>消息类型</summary>
-        public Byte Type { get { return _Type; } set { _Type = value; } }
-
-        [BitSize(1)]
-        private Byte _Dup;
-        /// <summary>打开标识。值为1时表示当前消息先前已经被传送过</summary>
-        /// <remarks>
-        /// 保证消息可靠传输，默认为0，只占用一个字节，表示第一次发送。不能用于检测消息重复发送等。只适用于客户端或服务器端尝试重发PUBLISH, PUBREL, SUBSCRIBE 或 UNSUBSCRIBE消息，注意需要满足以下条件：
-        /// 当QoS > 0
-        /// 消息需要回复确认
-        /// 此时，在可变头部需要包含消息ID。当值为1时，表示当前消息先前已经被传送过。
-        /// </remarks>
-        public Byte Dup { get { return _Dup; } set { _Dup = value; } }
-
-        [BitSize(2)]
-        private Byte _QoS;
-        /// <summary>QoS等级</summary>
-        public Byte QoS { get { return _QoS; } set { _QoS = value; } }
-
-        [BitSize(1)]
-        private Byte _Retain;
-        /// <summary>保持。仅针对PUBLISH消息。不同值，不同含义</summary>
-        /// <remarks>
-        /// 1：表示发送的消息需要一直持久保存（不受服务器重启影响），不但要发送给当前的订阅者，并且以后新来的订阅了此Topic name的订阅者会马上得到推送。
-        /// 备注：新来乍到的订阅者，只会取出最新的一个RETAIN flag = 1的消息推送。
-        /// 0：仅仅为当前订阅者推送此消息。
-        /// 假如服务器收到一个空消息体(zero-length payload)、RETAIN = 1、已存在Topic name的PUBLISH消息，服务器可以删除掉对应的已被持久化的PUBLISH消息。
-        /// </remarks>
-        public Byte Retain { get { return _Retain; } set { _Retain = value; } }
-
-        private Byte _Length;
-        /// <summary>长度。7位压缩编码整数</summary>
-        /// <remarks>
-        /// 在当前消息中剩余的byte(字节)数，包含可变头部和负荷(内容)。
-        /// 单个字节最大值：01111111，16进制：0x7F，10进制为127。
-        /// MQTT协议规定，第八位（最高位）若为1，则表示还有后续字节存在。
-        /// </remarks>
-        public Byte Length { get { return _Length; } set { _Length = value; } }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/MQTT/MqttType.cs b/NewLife.Net/MQTT/MqttType.cs
deleted file mode 100644
index a68caa2c46..0000000000
--- a/NewLife.Net/MQTT/MqttType.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace NewLife.Net.MQTT
-{
-    /// <summary>消息类型</summary>
-    public enum MqttType : Byte
-    {
-        /// <summary>保留</summary>
-        Reserved = 0,
-
-        /// <summary>连接</summary>
-        Connect,
-
-        /// <summary>连接确认</summary>
-        ConnAck,
-
-        /// <summary>发布消息</summary>
-        Publish,
-
-        /// <summary>发布确认</summary>
-        PubAck,
-
-        /// <summary>发布已接收</summary>
-        PubRec,
-
-        /// <summary>发布已释放</summary>
-        PubRel,
-
-        /// <summary>发布已完成</summary>
-        PubComp,
-
-        /// <summary>客户端订阅请求</summary>
-        Subscribe,
-
-        /// <summary>订阅确认</summary>
-        SubAck,
-
-        /// <summary>取消订阅</summary>
-        UnSubscribe,
-
-        /// <summary>取消订阅确认</summary>
-        UnSubAck,
-
-        /// <summary>Ping请求</summary>
-        PingReq,
-
-        /// <summary>Ping响应</summary>
-        PingResp,
-
-        /// <summary>断开连接</summary>
-        Disconnect,
-
-        /// <summary>保留</summary>
-        Reserved2
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/MQTT/Packets/ConnAckPacket.cs b/NewLife.Net/MQTT/Packets/ConnAckPacket.cs
deleted file mode 100644
index 582ad77125..0000000000
--- a/NewLife.Net/MQTT/Packets/ConnAckPacket.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-﻿using System;
-
-namespace NewLife.Net.MQTT.Packets
-{
-    /// <summary>连接响应包</summary>
-    public sealed class ConnAckPacket : DataPacket
-    {
-        /// <summary>包类型</summary>
-        public override PacketType PacketType => PacketType.CONNACK;
-
-        /// <summary>会话</summary>
-        public Boolean SessionPresent { get; set; }
-
-        /// <summary>响应代码</summary>
-        public ConnectReturnCode ReturnCode { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/MQTT/Packets/ConnectPacket.cs b/NewLife.Net/MQTT/Packets/ConnectPacket.cs
deleted file mode 100644
index e5a8a2c8c2..0000000000
--- a/NewLife.Net/MQTT/Packets/ConnectPacket.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-﻿using System;
-using NewLife.Data;
-
-namespace NewLife.Net.MQTT.Packets
-{
-    /// <summary>连接包</summary>
-    public sealed class ConnectPacket : DataPacket
-    {
-        /// <summary>包类型</summary>
-        public override PacketType PacketType => PacketType.CONNECT;
-
-        public String ProtocolName { get; set; }
-
-        public Int32 ProtocolLevel { get; set; }
-
-        public Boolean CleanSession { get; set; }
-
-        public Boolean HasWill { get; set; }
-
-        public QualityOfService WillQualityOfService { get; set; }
-
-        public Boolean WillRetain { get; set; }
-
-        public Boolean HasPassword { get; set; }
-
-        public Boolean HasUsername { get; set; }
-
-        public Int32 KeepAliveInSeconds { get; set; }
-
-        public String Username { get; set; }
-
-        public String Password { get; set; }
-
-        public String ClientId { get; set; }
-
-        public String WillTopicName { get; set; }
-
-        public Packet WillMessage { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/MQTT/Packets/ConnectReturnCode.cs b/NewLife.Net/MQTT/Packets/ConnectReturnCode.cs
deleted file mode 100644
index aa06defdff..0000000000
--- a/NewLife.Net/MQTT/Packets/ConnectReturnCode.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-﻿
-namespace NewLife.Net.MQTT.Packets
-{
-    /// <summary>连接返回代码</summary>
-    public enum ConnectReturnCode
-    {
-        /// <summary>已接受</summary>
-        Accepted = 0x00,
-
-        /// <summary>拒绝不可用协议版本</summary>
-        RefusedUnacceptableProtocolVersion = 0X01,
-
-        /// <summary>拒绝标识</summary>
-        RefusedIdentifierRejected = 0x02,
-
-        /// <summary>服务不可用</summary>
-        RefusedServerUnavailable = 0x03,
-
-        /// <summary>错误用户名密码</summary>
-        RefusedBadUsernameOrPassword = 0x04,
-
-        /// <summary>为认证</summary>
-        RefusedNotAuthorized = 0x05
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/MQTT/Packets/DataPacket.cs b/NewLife.Net/MQTT/Packets/DataPacket.cs
deleted file mode 100644
index f63b30014f..0000000000
--- a/NewLife.Net/MQTT/Packets/DataPacket.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-﻿using System;
-
-namespace NewLife.Net.MQTT.Packets
-{
-    /// <summary>数据包</summary>
-    public abstract class DataPacket
-    {
-        /// <summary>包类型</summary>
-        public abstract PacketType PacketType { get; }
-
-        /// <summary>双向</summary>
-        public virtual Boolean Duplicate => false;
-
-        /// <summary>服务质量</summary>
-        public virtual QualityOfService QualityOfService => QualityOfService.AtMostOnce;
-
-        /// <summary>保留请求</summary>
-        public virtual Boolean RetainRequested => false;
-
-        /// <summary>已重载</summary>
-        public override String ToString() => $"{GetType().Name}[Type={PacketType}, QualityOfService={QualityOfService}, Duplicate={Duplicate}, Retain={RetainRequested}]";
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/MQTT/Packets/DisconnectPacket.cs b/NewLife.Net/MQTT/Packets/DisconnectPacket.cs
deleted file mode 100644
index f08c0a0611..0000000000
--- a/NewLife.Net/MQTT/Packets/DisconnectPacket.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-﻿
-namespace NewLife.Net.MQTT.Packets
-{
-    /// <summary>断开连接</summary>
-    public sealed class DisconnectPacket : DataPacket
-    {
-        /// <summary>实例</summary>
-        public static readonly DisconnectPacket Instance = new DisconnectPacket();
-
-        DisconnectPacket() { }
-
-        /// <summary>包类型</summary>
-        public override PacketType PacketType => PacketType.DISCONNECT;
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/MQTT/Packets/PacketType.cs b/NewLife.Net/MQTT/Packets/PacketType.cs
deleted file mode 100644
index e7218d81da..0000000000
--- a/NewLife.Net/MQTT/Packets/PacketType.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-﻿
-namespace NewLife.Net.MQTT.Packets
-{
-    /// <summary>包类型</summary>
-    public enum PacketType
-    {
-        // ReSharper disable InconsistentNaming
-        CONNECT = 1,
-        CONNACK = 2,
-        PUBLISH = 3,
-        PUBACK = 4,
-        PUBREC = 5,
-        PUBREL = 6,
-        PUBCOMP = 7,
-        SUBSCRIBE = 8,
-        SUBACK = 9,
-        UNSUBSCRIBE = 10,
-        UNSUBACK = 11,
-        PINGREQ = 12,
-        PINGRESP = 13,
-        DISCONNECT = 14
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/MQTT/Packets/PacketWithId.cs b/NewLife.Net/MQTT/Packets/PacketWithId.cs
deleted file mode 100644
index 7d52896542..0000000000
--- a/NewLife.Net/MQTT/Packets/PacketWithId.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-﻿using System;
-
-namespace NewLife.Net.MQTT.Packets
-{
-    /// <summary>带ID数据包</summary>
-    public abstract class PacketWithId : DataPacket
-    {
-        /// <summary>包ID</summary>
-        public Int32 PacketId { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/MQTT/Packets/PingReqPacket.cs b/NewLife.Net/MQTT/Packets/PingReqPacket.cs
deleted file mode 100644
index 745cacc580..0000000000
--- a/NewLife.Net/MQTT/Packets/PingReqPacket.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-﻿
-namespace NewLife.Net.MQTT.Packets
-{
-    /// <summary>心跳请求</summary>
-    public sealed class PingReqPacket : DataPacket
-    {
-        /// <summary>实例</summary>
-        public static readonly PingReqPacket Instance = new PingReqPacket();
-
-        PingReqPacket() { }
-
-        /// <summary>包类型</summary>
-        public override PacketType PacketType => PacketType.PINGREQ;
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/MQTT/Packets/PingRespPacket.cs b/NewLife.Net/MQTT/Packets/PingRespPacket.cs
deleted file mode 100644
index 946090b446..0000000000
--- a/NewLife.Net/MQTT/Packets/PingRespPacket.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-﻿
-namespace NewLife.Net.MQTT.Packets
-{
-    /// <summary>心跳响应</summary>
-    public sealed class PingRespPacket : DataPacket
-    {
-        /// <summary>实例</summary>
-        public static readonly PingRespPacket Instance = new PingRespPacket();
-
-        PingRespPacket() { }
-
-        /// <summary>包类型</summary>
-        public override PacketType PacketType => PacketType.PINGRESP;
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/MQTT/Packets/PubAckPacket.cs b/NewLife.Net/MQTT/Packets/PubAckPacket.cs
deleted file mode 100644
index a74e263a53..0000000000
--- a/NewLife.Net/MQTT/Packets/PubAckPacket.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-﻿
-namespace NewLife.Net.MQTT.Packets
-{
-    /// <summary>发布确认</summary>
-    public sealed class PubAckPacket : PacketWithId
-    {
-        /// <summary>包类型</summary>
-        public override PacketType PacketType => PacketType.PUBACK;
-
-        /// <summary>在响应中</summary>
-        public static PubAckPacket InResponseTo(PublishPacket publishPacket)
-        {
-            return new PubAckPacket
-            {
-                PacketId = publishPacket.PacketId
-            };
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/MQTT/Packets/PubCompPacket.cs b/NewLife.Net/MQTT/Packets/PubCompPacket.cs
deleted file mode 100644
index 2d59226643..0000000000
--- a/NewLife.Net/MQTT/Packets/PubCompPacket.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-﻿
-namespace NewLife.Net.MQTT.Packets
-{
-    /// <summary>发布完成</summary>
-    public sealed class PubCompPacket : PacketWithId
-    {
-        /// <summary>包类型</summary>
-        public override PacketType PacketType => PacketType.PUBCOMP;
-
-        /// <summary>包类型</summary>
-        public static PubCompPacket InResponseTo(PubRelPacket publishPacket)
-        {
-            return new PubCompPacket
-            {
-                PacketId = publishPacket.PacketId
-            };
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/MQTT/Packets/PubRecPacket.cs b/NewLife.Net/MQTT/Packets/PubRecPacket.cs
deleted file mode 100644
index b4be9e1682..0000000000
--- a/NewLife.Net/MQTT/Packets/PubRecPacket.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-﻿
-namespace NewLife.Net.MQTT.Packets
-{
-    /// <summary>发布</summary>
-    public sealed class PubRecPacket : PacketWithId
-    {
-        /// <summary>包类型</summary>
-        public override PacketType PacketType => PacketType.PUBREC;
-
-        /// <summary>在响应中</summary>
-        public static PubRecPacket InResponseTo(PublishPacket publishPacket)
-        {
-            return new PubRecPacket
-            {
-                PacketId = publishPacket.PacketId
-            };
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/MQTT/Packets/PubRelPacket.cs b/NewLife.Net/MQTT/Packets/PubRelPacket.cs
deleted file mode 100644
index f20aa490da..0000000000
--- a/NewLife.Net/MQTT/Packets/PubRelPacket.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-﻿
-namespace NewLife.Net.MQTT.Packets
-{
-    /// <summary>发布</summary>
-    public sealed class PubRelPacket : PacketWithId
-    {
-        /// <summary>包类型</summary>
-        public override PacketType PacketType => PacketType.PUBREL;
-
-        /// <summary>服务质量</summary>
-        public override QualityOfService QualityOfService => QualityOfService.AtLeastOnce;
-
-        /// <summary>包类型</summary>
-        public static PubRelPacket InResponseTo(PubRecPacket publishPacket)
-        {
-            return new PubRelPacket
-            {
-                PacketId = publishPacket.PacketId
-            };
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/MQTT/Packets/PublishPacket.cs b/NewLife.Net/MQTT/Packets/PublishPacket.cs
deleted file mode 100644
index 82a29230e1..0000000000
--- a/NewLife.Net/MQTT/Packets/PublishPacket.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-﻿
-using System;
-
-namespace NewLife.Net.MQTT.Packets
-{
-    /// <summary>发布包</summary>
-    public sealed class PublishPacket : PacketWithId, IByteBufferHolder
-    {
-        readonly QualityOfService qos;
-        readonly Boolean duplicate;
-        readonly Boolean retainRequested;
-
-        public PublishPacket(QualityOfService qos, Boolean duplicate, Boolean retain)
-        {
-            this.qos = qos;
-            this.duplicate = duplicate;
-            retainRequested = retain;
-        }
-
-        /// <summary>包类型</summary>
-        public override PacketType PacketType => PacketType.PUBLISH;
-
-        public override Boolean Duplicate => duplicate;
-
-        public override QualityOfService QualityOfService => qos;
-
-        public override Boolean RetainRequested => retainRequested;
-
-        public String TopicName { get; set; }
-
-        public Packet Payload { get; set; }
-
-        public Int32 ReferenceCount => Payload.ReferenceCount;
-
-        public IReferenceCounted Retain()
-        {
-            Payload.Retain();
-            return this;
-        }
-
-        public IReferenceCounted Retain(Int32 increment)
-        {
-            Payload.Retain(increment);
-            return this;
-        }
-
-        public IReferenceCounted Touch()
-        {
-            Payload.Touch();
-            return this;
-        }
-
-        public IReferenceCounted Touch(Object hint)
-        {
-            Payload.Touch(hint);
-            return this;
-        }
-
-        public Boolean Release() => Payload.Release();
-
-        public Boolean Release(Int32 decrement) => Payload.Release(decrement);
-
-        Packet IByteBufferHolder.Content => Payload;
-
-        public IByteBufferHolder Copy() => this.Replace(Payload.Copy());
-
-        public IByteBufferHolder Replace(Packet content)
-        {
-            var result = new PublishPacket(qos, duplicate, retainRequested);
-            result.TopicName = TopicName;
-            result.Payload = content;
-            return result;
-        }
-
-        IByteBufferHolder IByteBufferHolder.Duplicate() => this.Replace(Payload.Duplicate());
-
-        public IByteBufferHolder RetainedDuplicate() => this.Replace(Payload.RetainedDuplicate());
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/MQTT/Packets/QualityOfService.cs b/NewLife.Net/MQTT/Packets/QualityOfService.cs
deleted file mode 100644
index 6aa22e5f18..0000000000
--- a/NewLife.Net/MQTT/Packets/QualityOfService.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-﻿
-namespace NewLife.Net.MQTT.Packets
-{
-    /// <summary>服务质量</summary>
-    public enum QualityOfService
-    {
-        /// <summary>最多一次</summary>
-        AtMostOnce = 0,
-
-        /// <summary>至少一次</summary>
-        AtLeastOnce = 0x1,
-
-        /// <summary>刚好一次</summary>
-        ExactlyOnce = 0x2,
-
-        /// <summary>保留</summary>
-        Reserved = 0x3,
-
-        /// <summary>失败</summary>
-        Failure = 0x80
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/MQTT/Packets/SubAckPacket.cs b/NewLife.Net/MQTT/Packets/SubAckPacket.cs
deleted file mode 100644
index 747d083aa2..0000000000
--- a/NewLife.Net/MQTT/Packets/SubAckPacket.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-
-namespace NewLife.Net.MQTT.Packets
-{
-    /// <summary>发布确认</summary>
-    public sealed class SubAckPacket : PacketWithId
-    {
-        /// <summary>包类型</summary>
-        public override PacketType PacketType => PacketType.SUBACK;
-
-        /// <summary>返回代码</summary>
-        public IReadOnlyList<QualityOfService> ReturnCodes { get; set; }
-
-        public static SubAckPacket InResponseTo(SubscribePacket subscribePacket, QualityOfService maxQoS)
-        {
-            var subAckPacket = new SubAckPacket
-            {
-                PacketId = subscribePacket.PacketId
-            };
-            var subscriptionRequests = subscribePacket.Requests;
-            var returnCodes = new QualityOfService[subscriptionRequests.Count];
-            for (var i = 0; i < subscriptionRequests.Count; i++)
-            {
-                var requestedQos = subscriptionRequests[i].QualityOfService;
-                returnCodes[i] = requestedQos <= maxQoS ? requestedQos : maxQoS;
-            }
-
-            subAckPacket.ReturnCodes = returnCodes;
-
-            return subAckPacket;
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/MQTT/Packets/SubscribePacket.cs b/NewLife.Net/MQTT/Packets/SubscribePacket.cs
deleted file mode 100644
index 8483a23228..0000000000
--- a/NewLife.Net/MQTT/Packets/SubscribePacket.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-﻿
-using System.Collections.Generic;
-
-namespace NewLife.Net.MQTT.Packets
-{
-    /// <summary>订阅</summary>
-    public sealed class SubscribePacket : PacketWithId
-    {
-        public SubscribePacket()
-        {
-        }
-
-        public SubscribePacket(System.Int32 packetId, params SubscriptionRequest[] requests)
-        {
-            PacketId = packetId;
-            Requests = requests;
-        }
-
-        /// <summary>包类型</summary>
-        public override PacketType PacketType => PacketType.SUBSCRIBE;
-
-        /// <summary>服务质量</summary>
-        public override QualityOfService QualityOfService => QualityOfService.AtLeastOnce;
-
-        /// <summary>请求集合</summary>
-        public IReadOnlyList<SubscriptionRequest> Requests { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/MQTT/Packets/SubscriptionRequest.cs b/NewLife.Net/MQTT/Packets/SubscriptionRequest.cs
deleted file mode 100644
index d87ae55c49..0000000000
--- a/NewLife.Net/MQTT/Packets/SubscriptionRequest.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-﻿using System;
-using System.Diagnostics.Contracts;
-
-namespace NewLife.Net.MQTT.Packets
-{
-    /// <summary>包类型</summary>
-    public class SubscriptionRequest : IEquatable<SubscriptionRequest>
-    {
-        public SubscriptionRequest(String topicFilter, QualityOfService qualityOfService)
-        {
-            Contract.Requires(!String.IsNullOrEmpty(topicFilter));
-
-            TopicFilter = topicFilter;
-            QualityOfService = qualityOfService;
-        }
-
-        public String TopicFilter { get; }
-
-        public QualityOfService QualityOfService { get; }
-
-        public Boolean Equals(SubscriptionRequest other)
-        {
-            return QualityOfService == other.QualityOfService
-                && TopicFilter.Equals(other.TopicFilter, StringComparison.Ordinal);
-        }
-
-        public override String ToString() => $"{GetType().Name}[TopicFilter={TopicFilter}, QualityOfService={QualityOfService}]";
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/MQTT/Packets/UnsubAckPacket.cs b/NewLife.Net/MQTT/Packets/UnsubAckPacket.cs
deleted file mode 100644
index aa9d4a516b..0000000000
--- a/NewLife.Net/MQTT/Packets/UnsubAckPacket.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-﻿
-namespace NewLife.Net.MQTT.Packets
-{
-    /// <summary>取消订阅确认</summary>
-    public sealed class UnsubAckPacket : PacketWithId
-    {
-        /// <summary>包类型</summary>
-        public override PacketType PacketType => PacketType.UNSUBACK;
-
-        public static UnsubAckPacket InResponseTo(UnsubscribePacket unsubscribePacket)
-        {
-            return new UnsubAckPacket
-            {
-                PacketId = unsubscribePacket.PacketId
-            };
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/MQTT/Packets/UnsubscribePacket.cs b/NewLife.Net/MQTT/Packets/UnsubscribePacket.cs
deleted file mode 100644
index 526656037e..0000000000
--- a/NewLife.Net/MQTT/Packets/UnsubscribePacket.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-
-namespace NewLife.Net.MQTT.Packets
-{
-    /// <summary>取消订阅</summary>
-    public sealed class UnsubscribePacket : PacketWithId
-    {
-        public UnsubscribePacket() { }
-
-        public UnsubscribePacket(Int32 packetId, params String[] topicFilters)
-        {
-            PacketId = packetId;
-            TopicFilters = topicFilters;
-        }
-
-        /// <summary>包类型</summary>
-        public override PacketType PacketType => PacketType.UNSUBSCRIBE;
-
-        /// <summary>服务质量</summary>
-        public override QualityOfService QualityOfService => QualityOfService.AtLeastOnce;
-
-        /// <summary>主题过滤器</summary>
-        public IEnumerable<String> TopicFilters { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/MQTT/QualityOfService.cs b/NewLife.Net/MQTT/QualityOfService.cs
deleted file mode 100644
index 760ea19026..0000000000
--- a/NewLife.Net/MQTT/QualityOfService.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace NewLife.Net.MQTT
-{
-    /// <summary>服务质量</summary>
-    public enum QualityOfService : Byte
-    {
-        /// <summary>至多一次 	发完即丢弃</summary>
-        Q0 = 0,
-
-        /// <summary>至少一次 	需要确认回复</summary>
-        Q1,
-
-        /// <summary>只有一次 	需要确认回复</summary>
-        Q2,
-
-        /// <summary>保留</summary>
-        Q3
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/MQTT/Signatures.cs b/NewLife.Net/MQTT/Signatures.cs
deleted file mode 100644
index c402513c4d..0000000000
--- a/NewLife.Net/MQTT/Signatures.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-﻿using System;
-using System.Runtime.CompilerServices;
-using NewLife.Net.MQTT.Packets;
-
-namespace NewLife.Net.MQTT
-{
-    /// <summary>签名</summary>
-    static class Signatures
-    {
-        const Byte QoS1Signature = (Int32)QualityOfService.AtLeastOnce << 1;
-
-        // most often used (anticipated) come first
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Boolean IsPublish(Int32 signature)
-        {
-            const Byte TypeOnlyMask = 0xf << 4;
-            return (signature & TypeOnlyMask) == ((Int32)PacketType.PUBLISH << 4);
-        }
-
-        public const Byte PubAck = (Int32)PacketType.PUBACK << 4;
-        public const Byte PubRec = (Int32)PacketType.PUBREC << 4;
-        public const Byte PubRel = ((Int32)PacketType.PUBREL << 4) | QoS1Signature;
-        public const Byte PubComp = (Int32)PacketType.PUBCOMP << 4;
-        public const Byte Connect = (Int32)PacketType.CONNECT << 4;
-        public const Byte ConnAck = (Int32)PacketType.CONNACK << 4;
-        public const Byte Subscribe = ((Int32)PacketType.SUBSCRIBE << 4) | QoS1Signature;
-        public const Byte SubAck = (Int32)PacketType.SUBACK << 4;
-        public const Byte PingReq = (Int32)PacketType.PINGREQ << 4;
-        public const Byte PingResp = (Int32)PacketType.PINGRESP << 4;
-        public const Byte Disconnect = (Int32)PacketType.DISCONNECT << 4;
-        public const Byte Unsubscribe = ((Int32)PacketType.UNSUBSCRIBE << 4) | QoS1Signature;
-        public const Byte UnsubAck = (Int32)PacketType.UNSUBACK << 4;
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/MQTT/Util.cs b/NewLife.Net/MQTT/Util.cs
deleted file mode 100644
index 0df8b7985f..0000000000
--- a/NewLife.Net/MQTT/Util.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-﻿using System;
-using NewLife.Exceptions;
-
-namespace NewLife.Net.MQTT
-{
-    /// <summary>工具类</summary>
-    static class Util
-    {
-        public const String ProtocolName = "MQTT";
-        public const Int32 ProtocolLevel = 4;
-
-        static readonly Char[] TopicWildcards = { '#', '+' };
-
-        public static void ValidateTopicName(String topicName)
-        {
-            if (topicName.Length == 0)
-            {
-                throw new DecoderException("[MQTT-4.7.3-1]");
-            }
-
-            if (topicName.IndexOfAny(TopicWildcards) > 0)
-            {
-                throw new DecoderException($"Invalid PUBLISH topic name: {topicName}");
-            }
-        }
-
-        public static void ValidatePacketId(Int32 packetId)
-        {
-            if (packetId < 1)
-            {
-                throw new DecoderException("Invalid packet identifier: " + packetId);
-            }
-        }
-
-        public static void ValidateClientId(String clientId)
-        {
-            if (clientId == null)
-            {
-                throw new DecoderException("Client identifier is required.");
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Modbus/DataStore.cs b/NewLife.Net/Modbus/DataStore.cs
deleted file mode 100644
index 1d36e1d8c1..0000000000
--- a/NewLife.Net/Modbus/DataStore.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-﻿using System;
-
-namespace NewLife.Net.Modbus
-{
-    /// <summary>默认数据存储</summary>
-    public class DataStore : IDataStore
-    {
-        private IBitStore _Inputs;
-        /// <summary>离散量输入</summary>
-        public IBitStore Inputs { get { return _Inputs; } }
-
-        private IBitStore _Coils;
-        /// <summary>线圈</summary>
-        public IBitStore Coils { get { return _Coils; } }
-
-        private IWordStore _InputRegisters;
-        /// <summary>输入寄存器</summary>
-        public IWordStore InputRegisters { get { return _InputRegisters; } }
-
-        private IWordStore _HoldingRegisters;
-        /// <summary>保持寄存器</summary>
-        public IWordStore HoldingRegisters { get { return _HoldingRegisters; } }
-
-        /// <summary>默认初始化</summary>
-        public DataStore() : this(new BitStore(), new WordStore()) { }
-
-        /// <summary>使用两个存储器初始化，两两共用</summary>
-        /// <param name="bit"></param>
-        /// <param name="word"></param>
-        public DataStore(IBitStore bit, IWordStore word) : this(bit, bit, word, word) { }
-
-        /// <summary>使用四个存储器初始化</summary>
-        /// <param name="bitInputs"></param>
-        /// <param name="bitCoils"></param>
-        /// <param name="wordInput"></param>
-        /// <param name="holding"></param>
-        public DataStore(IBitStore bitInputs, IBitStore bitCoils, IWordStore wordInput, IWordStore holding)
-        {
-            _Inputs = bitInputs;
-            _Coils = bitCoils;
-            _InputRegisters = wordInput;
-            _HoldingRegisters = holding;
-        }
-    }
-
-    /// <summary>默认位存储</summary>
-    public class BitStore : IBitStore
-    {
-        Boolean[] Coils;
-
-        /// <summary>数量</summary>
-        /// <returns></returns>
-        public Int32 Count { get { return Coils.Length; } }
-
-        /// <summary>索引器</summary>
-        /// <param name="i"></param>
-        /// <returns></returns>
-        public Boolean this[Int32 i] { get { return Coils[i]; } set { Coils[i] = value; } }
-
-        /// <summary>读取状态</summary>
-        /// <param name="i"></param>
-        /// <returns></returns>
-        public Boolean Read(Int32 i) { return Coils[i]; }
-
-        /// <summary>写入状态</summary>
-        /// <param name="i"></param>
-        /// <param name="flag"></param>
-        public void Write(Int32 i, Boolean flag) { Coils[i] = flag; }
-
-        /// <summary>初始化</summary>
-        public BitStore() : this(0) { }
-
-        /// <summary>初始化指定个数存储位</summary>
-        /// <param name="n"></param>
-        public BitStore(Int32 n)
-        {
-            if (n <= 0) n = 64;
-            Coils = new Boolean[n];
-        }
-
-        /// <summary>数组形式</summary>
-        /// <returns></returns>
-        public Boolean[] ToArray() { return Coils; }
-    }
-
-    /// <summary>默认字存储</summary>
-    public class WordStore : IWordStore
-    {
-        UInt16[] Regs;
-
-        /// <summary>数量</summary>
-        /// <returns></returns>
-        public Int32 Count { get { return Regs.Length; } }
-
-        /// <summary>索引器</summary>
-        /// <param name="i"></param>
-        /// <returns></returns>
-        public UInt16 this[Int32 i] { get { return Regs[i]; } set { Regs[i] = value; } }
-
-        /// <summary>读取</summary>
-        /// <param name="i"></param>
-        /// <returns></returns>
-        public UInt16 Read(Int32 i) { return Regs[i]; }
-
-        /// <summary>写入</summary>
-        /// <param name="i"></param>
-        /// <param name="value">数值</param>
-        public void Write(Int32 i, UInt16 value) { Regs[i] = value; }
-
-        /// <summary>初始化</summary>
-        public WordStore() : this(0) { }
-
-        /// <summary>初始化指定个数存储位</summary>
-        /// <param name="n"></param>
-        public WordStore(Int32 n)
-        {
-            if (n <= 0) n = 64;
-            Regs = new UInt16[n];
-        }
-
-        /// <summary>数组形式</summary>
-        /// <returns></returns>
-        public UInt16[] ToArray() { return Regs; }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Modbus/Errors.cs b/NewLife.Net/Modbus/Errors.cs
deleted file mode 100644
index 1cab093b51..0000000000
--- a/NewLife.Net/Modbus/Errors.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-﻿
-namespace NewLife.Net.Modbus
-{
-    /// <summary>错误代码</summary>
-    public enum Errors : System.Byte
-    {
-        /// <summary>错误的功能代码</summary>
-        FunctionCode = 1,
-
-        /// <summary>错误的数据地址</summary>
-        Address = 2,
-
-        /// <summary>错误的数据值</summary>
-        Value = 3,
-
-        /// <summary>错误的个数</summary>
-        Count,
-
-        /// <summary>处理出错</summary>
-        ProcessError,
-
-        /// <summary>错误的数据长度</summary>
-        MessageLength,
-
-        /// <summary>Crc校验错误</summary>
-        CrcError
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Modbus/IDataStore.cs b/NewLife.Net/Modbus/IDataStore.cs
deleted file mode 100644
index d5458d9fa1..0000000000
--- a/NewLife.Net/Modbus/IDataStore.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-﻿using System;
-
-namespace NewLife.Net.Modbus
-{
-    /// <summary>数据存储接口</summary>
-    public interface IDataStore
-    {
-        /// <summary>离散量输入</summary>
-        IBitStore Inputs { get; }
-
-        /// <summary>线圈</summary>
-        IBitStore Coils { get; }
-
-        /// <summary>输入寄存器</summary>
-        IWordStore InputRegisters { get; }
-
-        /// <summary>保持寄存器</summary>
-        IWordStore HoldingRegisters { get; }
-    }
-
-    /// <summary>位存储接口</summary>
-    public interface IBitStore
-    {
-        /// <summary>数量</summary>
-        /// <returns></returns>
-        Int32 Count { get; }
-
-        /// <summary>索引器</summary>
-        /// <param name="i"></param>
-        /// <returns></returns>
-        Boolean this[Int32 i] { get; set; }
-
-        /// <summary>读取状态</summary>
-        /// <param name="i"></param>
-        /// <returns></returns>
-        Boolean Read(Int32 i);
-
-        /// <summary>写入状态</summary>
-        /// <param name="i"></param>
-        /// <param name="flag"></param>
-        void Write(Int32 i, Boolean flag);
-
-        /// <summary>数组形式</summary>
-        /// <returns></returns>
-        Boolean[] ToArray();
-    }
-
-    /// <summary>字存储接口</summary>
-    public interface IWordStore
-    {
-        /// <summary>寄存器数</summary>
-        /// <returns></returns>
-        Int32 Count { get; }
-
-        /// <summary>索引器</summary>
-        /// <param name="i"></param>
-        /// <returns></returns>
-        UInt16 this[Int32 i] { get; set; }
-
-        /// <summary>读取</summary>
-        /// <param name="i"></param>
-        /// <returns></returns>
-        UInt16 Read(Int32 i);
-
-        /// <summary>写入</summary>
-        /// <param name="i"></param>
-        /// <param name="value">数值</param>
-        void Write(Int32 i, UInt16 value);
-
-        /// <summary>数组形式</summary>
-        /// <returns></returns>
-        UInt16[] ToArray();
-    }
-
-    /// <summary>存储类助手</summary>
-    public static class StoreHelper
-    {
-        /// <summary>读取整个UInt32</summary>
-        /// <param name="store"></param>
-        /// <param name="i"></param>
-        /// <returns></returns>
-        public static UInt32 ReadUInt32(this IWordStore store, Int32 i)
-        {
-            return (UInt32)((store.Read(i) << 16) + store.Read(i + 1));
-        }
-
-        /// <summary>写入整个UInt32</summary>
-        /// <param name="store"></param>
-        /// <param name="i"></param>
-        /// <param name="value"></param>
-        /// <returns></returns>
-        public static IWordStore WriteUInt32(this IWordStore store, Int32 i, UInt32 value)
-        {
-            store.Write(i, (UInt16)(value >> 16));
-            store.Write(i + 1, (UInt16)(value & 0xFFFF));
-
-            return store;
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Modbus/IOHelper.cs b/NewLife.Net/Modbus/IOHelper.cs
deleted file mode 100644
index b90c7f5fc5..0000000000
--- a/NewLife.Net/Modbus/IOHelper.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-﻿using System;
-
-namespace NewLife.Net.Modbus
-{
-    /// <summary>IO操作助手</summary>
-    static class IOHelper
-    {
-        /// <summary>从字节数组中读取一段数据</summary>
-        /// <param name="data"></param>
-        /// <param name="offset">偏移</param>
-        /// <param name="count">数量</param>
-        /// <returns></returns>
-        public static Byte[] ReadBytes(this Byte[] data, Int32 offset = 0, Int32 count = -1)
-        {
-            if (count <= 0) count = data.Length - offset;
-
-            var buf = new Byte[count];
-#if MF
-            Array.Copy(data, offset, buf, 0, count);
-#else
-            Buffer.BlockCopy(data, offset, buf, 0, count);
-#endif
-            return buf;
-        }
-
-        /// <summary>从字节数据指定位置读取一个无符号16位整数</summary>
-        /// <param name="data"></param>
-        /// <param name="offset">偏移</param>
-        /// <returns></returns>
-        public static UInt16 ReadUInt16(this Byte[] data, Int32 offset = 0)
-        {
-            return (UInt16)((data[offset] << 8) + data[offset + 1]);
-        }
-
-        /// <summary>向字节数组的指定位置写入一个无符号16位整数</summary>
-        /// <param name="data"></param>
-        /// <param name="offset">偏移</param>
-        /// <param name="n"></param>
-        /// <returns></returns>
-        public static Byte[] WriteUInt16(this Byte[] data, Int32 offset, Int32 n)
-        {
-            // STM32单片机是小端
-            //data[offset] = (Byte)(n & 0xFF);
-            //data[offset + 1] = (Byte)(n >> 8);
-            // Modbus协议规定大端
-            data[offset] = (Byte)(n >> 8);
-            data[offset + 1] = (Byte)(n & 0xFF);
-
-            return data;
-        }
-
-        /// <summary>向字节数组写入一片数据</summary>
-        /// <param name="data"></param>
-        /// <param name="srcOffset"></param>
-        /// <param name="buf"></param>
-        /// <param name="offset">偏移</param>
-        /// <param name="count">数量</param>
-        /// <returns></returns>
-        public static Byte[] Write(this Byte[] data, Int32 srcOffset, Byte[] buf, Int32 offset = 0, Int32 count = -1)
-        {
-            if (count <= 0) count = data.Length - offset;
-
-#if MF
-            Array.Copy(buf, srcOffset, data, offset, count);
-#else
-            Buffer.BlockCopy(buf, srcOffset, data, offset, count);
-#endif
-            return data;
-        }
-
-        #region CRC
-        static readonly UInt16[] crc_ta = new UInt16[16] { 0x0000, 0xCC01, 0xD801, 0x1400, 0xF001, 0x3C00, 0x2800, 0xE401, 0xA001, 0x6C00, 0x7800, 0xB401, 0x5000, 0x9C01, 0x8801, 0x4400, };
-
-        /// <summary>Crc校验</summary>
-        /// <param name="data"></param>
-        /// <param name="offset">偏移</param>
-        /// <param name="count">数量</param>
-        /// <returns></returns>
-        public static UInt16 Crc(this Byte[] data, Int32 offset, Int32 count = -1)
-        {
-            if (data == null || data.Length < 1) return 0;
-
-            UInt16 u = 0xFFFF;
-            Byte b;
-
-            if (count == 0) count = data.Length - offset;
-
-            for (var i = offset; i < count; i++)
-            {
-                b = data[i];
-                u = (UInt16)(crc_ta[(b ^ u) & 15] ^ (u >> 4));
-                u = (UInt16)(crc_ta[((b >> 4) ^ u) & 15] ^ (u >> 4));
-            }
-
-            return u;
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Modbus/MBFunction.cs b/NewLife.Net/Modbus/MBFunction.cs
deleted file mode 100644
index 723526d722..0000000000
--- a/NewLife.Net/Modbus/MBFunction.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-﻿
-namespace NewLife.Net.Modbus
-{
-    /// <summary>Modbus功能码</summary>
-    public enum MBFunction : System.Byte
-    {
-        /// <summary>读取线圈状态。取得一组逻辑线圈的当前状态（ON/OFF) </summary>
-        ReadCoils = 1,
-
-        /// <summary>读取离散量输入状态。取得一组开关输入的当前状态（ON/OFF) </summary>
-        ReadInputs = 2,
-
-        /// <summary>读取保持寄存器。在一个或多个保持寄存器中取得当前的二进制值 </summary>
-        ReadHoldingRegisters = 3,
-
-        /// <summary>读取输入寄存器。在一个或多个输入寄存器中取得当前的二进制值</summary>
-        ReadInputRegisters = 4,
-
-        /// <summary>强置单线圈。强置一个逻辑线圈的通断状态</summary>
-        WriteSingleCoil = 5,
-
-        /// <summary>预置单寄存器。把具体二进值装入一个保持寄存器</summary>
-        WriteSingleRegister = 6,
-
-        ///// <summary>读取异常状态。取得8个内部线圈的通断状态，这8个线圈的地址由控制器决定 </summary>
-        //ReadError = 7,
-
-        /// <summary>回送诊断校验。把诊断校验报文送从机，以对通信处理进行评鉴</summary>
-        Diagnostics = 8,
-
-        /// <summary>强置多线圈。强置一串连续逻辑线圈的通断</summary>
-        WriteMultipleCoils = 15,
-
-        /// <summary>预置多寄存器。把具体的二进制值装入一串连续的保持寄存器</summary>
-        WriteMultipleRegisters = 16,
-
-        /// <summary>报告从机标识。可使主机判断编址从机的类型及该从机运行指示灯的状态</summary>
-        ReportIdentity = 17,
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Modbus/ModbusEntity.cs b/NewLife.Net/Modbus/ModbusEntity.cs
deleted file mode 100644
index 0c5af014ad..0000000000
--- a/NewLife.Net/Modbus/ModbusEntity.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-﻿#region Modbus协议
-/*
- * GB/T 19582.1-2008 基于Modbus协议的工业自动化网络规范
- * 请求响应：1字节功能码|n字节数据|2字节CRC校验
- * 异常响应：1字节功能码+0x80|1字节异常码
- * 
- * Modbus数据模型基本表
- * 基本表        对象类型   访问类型    注释
- * 离散量输入    单个位     只读        I/O系统可提供这种类型的数据
- * 线圈          单个位     读写        通过应用程序可改变这种类型的数据
- * 输入寄存器    16位字     只读        I/O系统可提供这种类型的数据
- * 保持寄存器    16位字     读写        通过应用程序可改变这种类型的数据
- * 
- */
-#endregion
-
-using System;
-
-namespace NewLife.Net.Modbus
-{
-    /// <summary>Modbus实体</summary>
-    public class ModbusEntity
-    {
-        #region 属性
-        /// <summary>头部位移，RS232=0，RS485=1</summary>
-        public const Int32 HEAD_OFFSET = 1;
-        /// <summary>不包含数据部分的固定长度。地址、功能码、校验码</summary>
-        public const Int32 NO_DATA_LENGTH = 1 + HEAD_OFFSET + 2;
-
-        private Byte _Host = 1;
-        /// <summary>主机地址。用于485编码</summary>
-        public Byte Host { get { return _Host; } set { _Host = value; } }
-
-        private MBFunction _Function;
-        /// <summary>功能码</summary>
-        public MBFunction Function { get { return _Function; } set { _Function = value; } }
-
-        private Boolean _IsException;
-        /// <summary>是否异常</summary>
-        public Boolean IsException { get { return _IsException; } set { _IsException = value; } }
-
-        private Byte[] _Data;
-        /// <summary>数据</summary>
-        public Byte[] Data { get { return _Data; } set { _Data = value; } }
-
-        private UInt16 _Crc;
-        /// <summary>校验数据</summary>
-        public UInt16 Crc { get { return _Crc; } set { _Crc = value; } }
-        #endregion
-
-        //#region 扩展属性
-        //public UInt16 Address { get { return Data.ReadUInt16(0); } }
-        //public UInt16 Count { get { return Data.ReadUInt16(2); } }
-        //#endregion
-
-        #region 读写
-        /// <summary>分析字节数组</summary>
-        /// <param name="data"></param>
-        /// <param name="offset">偏移</param>
-        /// <param name="count">数量</param>
-        /// <returns></returns>
-        public ModbusEntity Parse(Byte[] data, Int32 offset = 0, Int32 count = -1)
-        {
-            if (data == null) return null;
-            if (count <= 0) count = data.Length - offset;
-            if (count < NO_DATA_LENGTH) return null;
-
-            var mb = this;
-            mb.Host = data[offset];
-            // 读取功能码，最高一位代表是否异常
-            var f = data[offset + HEAD_OFFSET];
-            if ((f & 0x80) == 0)
-                mb.Function = (MBFunction)f;
-            else
-            {
-                // 过滤掉异常位
-                mb.Function = (MBFunction)(f & 0x7F);
-                mb.IsException = true;
-            }
-            var len = count - NO_DATA_LENGTH;
-            if (len > 0) mb.Data = data.ReadBytes(offset + HEAD_OFFSET + 1, len);
-            // 最后两个字节是Crc
-            //mb.Crc = data.ReadUInt16(offset + count - 2);
-            var ofs = offset + count - 2;
-            mb.Crc = (UInt16)(data[ofs] + (data[ofs + 1] << 8));
-
-            return mb;
-        }
-
-        /// <summary>转为字节数组</summary>
-        /// <returns></returns>
-        public Byte[] ToArray()
-        {
-            //// 先计算Crc
-            //Crc = Data.Crc();
-
-            var len = NO_DATA_LENGTH;
-            var bts = Data;
-            if (bts != null && bts.Length > 0) len += bts.Length;
-            var buf = new Byte[len];
-            buf[0] = Host;
-            buf[HEAD_OFFSET] = (Byte)Function;
-            // 异常加上0x80
-            if (IsException) buf[HEAD_OFFSET] |= 0x80;
-            // 复制头数据
-            if (len > NO_DATA_LENGTH) Array.Copy(bts, 0, buf, HEAD_OFFSET + 1, bts.Length);
-
-            // 计算Crc
-            Crc = buf.Crc(0, len - 2);
-
-            // 最后两个字节是Crc
-            //buf.WriteUInt16(len - 2, Crc);
-            buf[len - 2] = (Byte)(Crc & 0xFF);
-            buf[len - 1] = (Byte)(Crc >> 8);
-
-            return buf;
-        }
-
-        /// <summary>设置错误码</summary>
-        /// <param name="errorCode"></param>
-        /// <returns></returns>
-        public ModbusEntity SetError(Errors errorCode)
-        {
-            IsException = true;
-            Data = new Byte[] { (Byte)errorCode };
-
-            return this;
-        }
-        #endregion
-
-        #region 辅助
-        /// <summary>已重载。</summary>
-        /// <returns></returns>
-        public override String ToString()
-        {
-            return Function.ToString();
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Modbus/ModbusException.cs b/NewLife.Net/Modbus/ModbusException.cs
deleted file mode 100644
index 0577ce0511..0000000000
--- a/NewLife.Net/Modbus/ModbusException.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-﻿using System;
-
-namespace NewLife.Net.Modbus
-{
-    /// <summary>Modbus异常</summary>
-    public class ModbusException : Exception
-    {
-        private Errors _Error;
-        /// <summary>错误代码</summary>
-        public Errors Error { get { return _Error; } private set { _Error = value; } }
-
-        /// <summary>初始化</summary>
-        /// <param name="error"></param>
-        public ModbusException(Errors error) { Error = error; }
-
-        /// <summary>已重载。</summary>
-        /// <returns></returns>
-        public override String ToString()
-        {
-            return "Modbus Error " + Error;
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Modbus/ModbusMaster.cs b/NewLife.Net/Modbus/ModbusMaster.cs
deleted file mode 100644
index c94e6db172..0000000000
--- a/NewLife.Net/Modbus/ModbusMaster.cs
+++ /dev/null
@@ -1,420 +0,0 @@
-﻿#region Modbus协议
-/*
- * GB/T 19582.1-2008 基于Modbus协议的工业自动化网络规范
- * 请求响应：1字节功能码|n字节数据|2字节CRC校验
- * 异常响应：1字节功能码+0x80|1字节异常码
- * 
- * Modbus数据模型基本表
- * 基本表        对象类型   访问类型    注释
- * 离散量输入    单个位     只读        I/O系统可提供这种类型的数据
- * 线圈          单个位     读写        通过应用程序可改变这种类型的数据
- * 输入寄存器    16位字     只读        I/O系统可提供这种类型的数据
- * 保持寄存器    16位字     读写        通过应用程序可改变这种类型的数据
- * 
- */
-#endregion
-
-using System;
-using System.Threading;
-using NewLife.Log;
-
-namespace NewLife.Net.Modbus
-{
-    /// <summary>Modbus主站</summary>
-    /// <example>
-    /// <code>
-    /// var master = new ModbusMaster();
-    /// master.Transport = new UdpTransport("127.0.0.1", 502);
-    /// 
-    /// Assert.IsTrue(master.Diagnostics(), "诊断错误");
-    /// 
-    /// var ids = master.ReportIdentity();
-    /// Assert.IsNotNull(ids, "标识不能为空");
-    /// </code>
-    /// </example>
-    public class ModbusMaster : DisposeBase
-    {
-        #region 属性
-        /// <summary>传输接口</summary>
-        public ITransport Transport { get; set; }
-
-        /// <summary>主机地址。用于485编码</summary>
-        public Byte Host { get; set; } = 1;
-
-        /// <summary>启用调试</summary>
-        public Boolean Debug { get; set; }
-
-        /// <summary>发送数据后接收数据前的延迟时间，默认0毫秒</summary>
-        public Int32 Delay { get; set; }
-        #endregion
-
-        #region 构造
-        /// <summary>销毁</summary>
-        /// <param name="disposing"></param>
-        protected override void OnDispose(Boolean disposing)
-        {
-            base.OnDispose(disposing);
-
-            if (Transport != null) Transport.Dispose();
-        }
-        #endregion
-
-        #region 方法
-        /// <summary>处理指令</summary>
-        /// <param name="entity">指令实体</param>
-        /// <param name="expect">预期返回数据长度</param>
-        /// <returns></returns>
-        ModbusEntity Process(ModbusEntity entity, Int32 expect)
-        {
-            if (Transport == null) throw new NullReferenceException("Transport");
-
-            entity.Host = Host;
-
-            // 发送
-            var buf = entity.ToArray();
-
-            if (Debug) WriteLine(entity.Function + " :" + buf.ToHex());
-
-            // Modbus加锁，防止冲突
-            lock (this)
-            {
-                // 预期返回指令长度，传入参数expect没有考虑头部和校验位
-                var st = Transport as SerialTransport;
-                //if (st != null) st.FrameSize = expect + ModbusEntity.NO_DATA_LENGTH;
-                Transport.Send(buf);
-
-                // lscy 2013-7-29 
-                // 发送后，休眠一段时间，避免设备数据未全部写到串口缓冲区中
-                // 一般情况下，100ms 已足够
-                if (Delay > 0) Thread.Sleep(Delay);
-
-                // 读取
-                var pk = Transport.Receive();
-                if (pk == null || pk.Count == 0) return null;
-
-                if (Debug) WriteLine(new String(' ', entity.Function.ToString().Length) + "=>" + pk.ToHex());
-
-                var rs = new ModbusEntity().Parse(pk.Data, pk.Offset, pk.Count);
-                if (rs == null) return null;
-                if (rs.IsException) throw new ModbusException(rs.Data != null && rs.Data.Length > 0 ? (Errors)rs.Data[0] : (Errors)0);
-
-                return rs;
-            }
-        }
-        #endregion
-
-        #region 线圈
-        /// <summary>读取线圈状态</summary>
-        /// <remarks>
-        /// 请求：0x01|2字节起始地址|2字节线圈数量(1~2000)
-        /// 响应：0x01|1字节字节计数|n字节线圈状态（n=输出数量/8，如果余数不为0，n=n+1）
-        /// </remarks>
-        /// <param name="addr"></param>
-        /// <returns></returns>
-        public Boolean ReadCoil(Int32 addr)
-        {
-            //return ReadInputs(MBFunction.ReadCoils, addr, 1)[0];
-            // 小心内部可能没有返回
-            var rs = ReadInputs(MBFunction.ReadCoils, addr, 1);
-            if (rs == null || rs.Length < 1) return false;
-            return rs[0];
-        }
-
-        /// <summary>读取线圈状态</summary>
-        /// <remarks>
-        /// 请求：0x01|2字节起始地址|2字节线圈数量(1~2000)
-        /// 响应：0x01|1字节字节计数|n字节线圈状态（n=输出数量/8，如果余数不为0，n=n+1）
-        /// </remarks>
-        /// <param name="addr"></param>
-        /// <param name="count">数量</param>
-        /// <returns></returns>
-        public Boolean[] ReadCoils(Int32 addr, UInt16 count)
-        {
-            return ReadInputs(MBFunction.ReadCoils, addr, count);
-        }
-
-        /// <summary>读取离散量输入</summary>
-        /// <remarks>
-        /// 请求：0x02|2字节起始地址|2字节输入数量(1~2000)
-        /// 响应：0x02|1字节字节计数|n字节输入状态（n=输入数量/8，如果余数不为0，n=n+1）
-        /// </remarks>
-        /// <param name="addr"></param>
-        /// <param name="count">数量</param>
-        /// <returns></returns>
-        public Boolean[] ReadInputs(Int32 addr, UInt16 count)
-        {
-            return ReadInputs(MBFunction.ReadInputs, addr, count);
-        }
-
-        Boolean[] ReadInputs(MBFunction func, Int32 addr, UInt16 count)
-        {
-            var cmd = new ModbusEntity();
-            cmd.Function = func;
-            var buf = new Byte[4];
-            buf.WriteUInt16(0, addr);
-            buf.WriteUInt16(2, count);
-            cmd.Data = buf;
-
-            var rLen = 1 + count / 8;
-            if (count % 8 != 0) rLen++;
-            var rs = Process(cmd, rLen);
-            if (rs == null || rs.Data == null || rs.Data.Length < 1) return null;
-
-            // 特殊处理单个读取，提高效率
-            if (count == 1) return new Boolean[] { rs.Data[1] == 1 };
-
-            var flags = new Boolean[count];
-
-            // 元素存放于m字节n位
-            Int32 m = 0, n = 0;
-            for (var i = 0; i < flags.Length && 1 + m < rs.Data.Length; i++)
-            {
-                if (((rs.Data[1 + m] >> n) & 0x01) == 1) flags[i] = true;
-                if (++n >= 8)
-                {
-                    m++;
-                    n = 0;
-                }
-            }
-
-            return flags;
-        }
-
-        /// <summary>写单个线圈</summary>
-        /// <remarks>
-        /// 请求：0x05|2字节输出地址|2字节输出值（0x0000/0xFF00）
-        /// 响应：0x05|2字节输出地址|2字节输出值（0x0000/0xFF00）
-        /// </remarks>
-        /// <param name="addr"></param>
-        /// <param name="flag"></param>
-        /// <returns></returns>
-        public Boolean WriteSingleCoil(Int32 addr, Boolean flag)
-        {
-            var cmd = new ModbusEntity();
-            cmd.Function = MBFunction.WriteSingleCoil;
-            var buf = new Byte[4];
-            buf.WriteUInt16(0, addr);
-            if (flag) buf.WriteUInt16(2, 0xFF00);
-            cmd.Data = buf;
-
-            var rs = Process(cmd, 2 + 2);
-            if (rs == null) return false; ;
-
-            return (rs.Data.ReadUInt16(2) != 0) == flag;
-        }
-
-        /// <summary>写多个线圈</summary>
-        /// <remarks>
-        /// 请求：0x0F|2字节起始地址|2字节输出数量（1~1698）|1字节字节计数|n字节输出值（n=输出数量/8，如果余数不为0，n=n+1）
-        /// 响应：0x0F|2字节起始地址|2字节输出数量
-        /// </remarks>
-        /// <param name="addr"></param>
-        /// <param name="flags"></param>
-        /// <returns></returns>
-        public Boolean WriteMultipleCoils(Int32 addr, params Boolean[] flags)
-        {
-            var cmd = new ModbusEntity();
-            cmd.Function = MBFunction.WriteMultipleCoils;
-
-            var n = flags.Length / 8;
-            if (flags.Length % 8 != 0) n++;
-
-            var buf = new Byte[4 + 1 + n];
-            buf.WriteUInt16(0, addr);
-            buf.WriteUInt16(2, (UInt16)flags.Length);
-
-            buf[4] = (Byte)n;
-
-            // 元素存放于m字节n位
-            var m = n = 0;
-            for (var i = 0; i < flags.Length; i++)
-            {
-                if (flags[i]) buf[5 + m] |= (Byte)(1 << n);
-
-                if (++n >= 8)
-                {
-                    m++;
-                    n = 0;
-                }
-            }
-
-            cmd.Data = buf;
-
-            var rs = Process(cmd, 2 + 2);
-            if (rs == null) return false;
-
-            return rs.Data.ReadUInt16(0) == addr && rs.Data.ReadUInt16(2) == flags.Length;
-        }
-        #endregion
-
-        #region 寄存器
-        /// <summary>读取保持寄存器</summary>
-        /// <remarks>
-        /// 请求：0x03|2字节起始地址|2字节寄存器数量（1~2000）
-        /// 响应：0x03|1字节字节数|n*2字节寄存器值
-        /// </remarks>
-        /// <param name="addr"></param>
-        /// <returns></returns>
-        public UInt16 ReadHoldingRegister(Int32 addr)
-        {
-            return ReadRegisters(MBFunction.ReadHoldingRegisters, addr, 1)[0];
-        }
-
-        /// <summary>读取保持寄存器</summary>
-        /// <remarks>
-        /// 请求：0x03|2字节起始地址|2字节寄存器数量（1~2000）
-        /// 响应：0x03|1字节字节数|n*2字节寄存器值
-        /// </remarks>
-        /// <param name="addr"></param>
-        /// <param name="count">数量</param>
-        /// <returns></returns>
-        public UInt16[] ReadHoldingRegisters(Int32 addr, UInt16 count)
-        {
-            return ReadRegisters(MBFunction.ReadHoldingRegisters, addr, count);
-        }
-
-        /// <summary>读取输入寄存器</summary>
-        /// <remarks>
-        /// 请求：0x04|2字节起始地址|2字节输入寄存器数量（1~2000）
-        /// 响应：0x04|1字节字节数|n*2字节输入寄存器
-        /// </remarks>
-        /// <param name="addr"></param>
-        /// <param name="count">数量</param>
-        /// <returns></returns>
-        public UInt16[] ReadInputRegisters(Int32 addr, UInt16 count)
-        {
-            return ReadRegisters(MBFunction.ReadInputRegisters, addr, count);
-        }
-
-        UInt16[] ReadRegisters(MBFunction func, Int32 addr, UInt16 count)
-        {
-            var cmd = new ModbusEntity();
-            cmd.Function = func;
-            var buf = new Byte[4];
-            buf.WriteUInt16(0, addr);
-            buf.WriteUInt16(2, count);
-            cmd.Data = buf;
-
-            var rs = Process(cmd, 1 + count * 2);
-            if (rs == null) return null;
-
-            count = rs.Data[0];
-            if (1 + count > rs.Data.Length) count = (UInt16)(rs.Data.Length - 1);
-
-            var ds = new UInt16[count / 2];
-            for (var i = 0; i < ds.Length; i++)
-            {
-                ds[i] = rs.Data.ReadUInt16(1 + i * 2);
-            }
-
-            return ds;
-        }
-
-        /// <summary>写单个寄存器</summary>
-        /// <remarks>
-        /// 请求：0x06|2字节寄存器地址|2字节寄存器值
-        /// 响应：0x06|2字节寄存器地址|2字节寄存器值
-        /// </remarks>
-        /// <param name="addr"></param>
-        /// <param name="val"></param>
-        /// <returns></returns>
-        public Boolean WriteSingleRegister(Int32 addr, UInt16 val)
-        {
-            var cmd = new ModbusEntity();
-            cmd.Function = MBFunction.WriteSingleRegister;
-            var buf = new Byte[4];
-            buf.WriteUInt16(0, addr);
-            buf.WriteUInt16(2, val);
-            cmd.Data = buf;
-
-            var rs = Process(cmd, 2 + 2);
-            if (rs == null) return false;
-
-            return rs.Data.ReadUInt16(0) == addr && rs.Data.ReadUInt16(2) == val;
-        }
-
-        /// <summary>写多个寄存器</summary>
-        /// <remarks>
-        /// 请求：0x10|2字节起始地址|2字节寄存器数量（1~123）|1字节字节计数|n*2寄存器值
-        /// 响应：0x10|2字节起始地址|2字节寄存器数量
-        /// </remarks>
-        /// <param name="addr"></param>
-        /// <param name="vals"></param>
-        /// <returns></returns>
-        public Boolean WriteMultipleRegisters(Int32 addr, params UInt16[] vals)
-        {
-            var cmd = new ModbusEntity();
-            cmd.Function = MBFunction.WriteMultipleRegisters;
-
-            var buf = new Byte[4 + 1 + vals.Length * 2];
-            buf.WriteUInt16(0, addr);
-            buf.WriteUInt16(2, (UInt16)vals.Length);
-            // 字节计数
-            buf[4] = (Byte)(vals.Length * 2);
-
-            for (var i = 0; i < vals.Length; i++)
-            {
-                buf.WriteUInt16(5 + i * 2, vals[i]);
-            }
-
-            cmd.Data = buf;
-
-            var rs = Process(cmd, 2 + 2);
-            if (rs == null) return false;
-
-            return rs.Data.ReadUInt16(0) == addr && rs.Data.ReadUInt16(2) == vals.Length;
-        }
-        #endregion
-
-        #region 诊断标识
-        /// <summary>诊断</summary>
-        /// <remarks>
-        /// 01080000801A
-        /// 请求：0x08|2字节子功能|n*2字节数据
-        /// 响应：0x08|2字节子功能|n*2字节数据
-        /// </remarks>
-        /// <returns></returns>
-        public Boolean Diagnostics()
-        {
-            var cmd = new ModbusEntity();
-            cmd.Function = MBFunction.Diagnostics;
-
-            // 子功能码
-            var buf = new Byte[2];
-            buf.WriteUInt16(0, 0);
-            cmd.Data = buf;
-
-            var rs = Process(cmd, 2);
-            return rs != null;
-        }
-
-        /// <summary>返回标识</summary>
-        /// <remarks>
-        /// 0111C02C
-        /// </remarks>
-        /// <returns></returns>
-        public Byte[] ReportIdentity()
-        {
-            var cmd = new ModbusEntity();
-            cmd.Function = MBFunction.ReportIdentity;
-
-            var rs = Process(cmd, 1 + 8);
-            if (rs == null) return null;
-
-            var count = (Int32)rs.Data[0];
-            if (count > rs.Data.Length - 1) count = rs.Data.Length - 1;
-
-            if (count <= 0) return new Byte[0];
-
-            return rs.Data.ReadBytes(1, count);
-        }
-        #endregion
-
-        #region 日志
-        void WriteLine(String msg)
-        {
-            if (Debug) XTrace.WriteLine(msg);
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Modbus/ModbusSlave.cs b/NewLife.Net/Modbus/ModbusSlave.cs
deleted file mode 100644
index 704ede46ff..0000000000
--- a/NewLife.Net/Modbus/ModbusSlave.cs
+++ /dev/null
@@ -1,624 +0,0 @@
-﻿#region Modbus协议
-/*
- * GB/T 19582.1-2008 基于Modbus协议的工业自动化网络规范
- * 请求响应：1字节功能码|n字节数据|2字节CRC校验
- * 异常响应：1字节功能码+0x80|1字节异常码
- * 
- * Modbus数据模型基本表
- * 基本表        对象类型   访问类型    注释
- * 离散量输入    单个位     只读        I/O系统可提供这种类型的数据
- * 线圈          单个位     读写        通过应用程序可改变这种类型的数据
- * 输入寄存器    16位字     只读        I/O系统可提供这种类型的数据
- * 保持寄存器    16位字     读写        通过应用程序可改变这种类型的数据
- * 
- */
-#endregion
-
-using System;
-
-namespace NewLife.Net.Modbus
-{
-    /// <summary>Modbus从站</summary>
-    /// <example>
-    /// <code>
-    /// var slave = new ModbusSlave();
-    /// slave.Transport = new UdpTransport(502);
-    /// slave.Listen();
-    /// </code>
-    /// </example>
-    public class ModbusSlave : IDisposable
-    {
-        #region 属性
-        private Byte _Host;
-        /// <summary>主站ID</summary>
-        public Byte Host { get { return _Host; } set { _Host = value; } }
-
-        private IDataStore _DataStore;
-        /// <summary>数据存储</summary>
-        public IDataStore DataStore { get { return _DataStore ?? (_DataStore = new DataStore()); } set { _DataStore = value; } }
-
-        private ITransport[] _Transports = new ITransport[4];
-        /// <summary>传输口</summary>
-        public ITransport[] Transports { get { return _Transports; } /*set { _Transport = value; }*/ }
-
-        private Boolean _EnableDebug;
-        /// <summary>启用调试</summary>
-        public Boolean EnableDebug { get { return _EnableDebug; } set { _EnableDebug = value; } }
-
-        //private Boolean inited;
-        #endregion
-
-        #region 构造
-        /// <summary>析构</summary>
-        ~ModbusSlave() { Dispose(false); }
-
-        /// <summary>销毁</summary>
-        public void Dispose() { Dispose(true); }
-
-        /// <summary>销毁</summary>
-        /// <param name="disposing"></param>
-        protected virtual void Dispose(Boolean disposing)
-        {
-            if (disposing) GC.SuppressFinalize(this);
-
-            //if (Transport != null) Transport.Dispose();
-            for (var i = 0; i < Transports.Length; i++)
-            {
-                if (Transports[i] != null) Transports[i].Dispose();
-            }
-        }
-        #endregion
-
-        #region Modbus功能
-        /// <summary>开始监听</summary>
-        /// <returns></returns>
-        public virtual ModbusSlave Listen(ITransport transport)
-        {
-            if (transport == null) throw new ArgumentNullException("transport");
-
-            // 找到一个空位，放入数组
-            for (var i = 0; i < Transports.Length; i++)
-            {
-                if (Transports[i] == null)
-                {
-                    Transports[i] = transport;
-                    break;
-                }
-            }
-
-            var name = transport.ToString();
-
-#if !MF
-            transport.Received += (s, e) => { e.Data = Process(e.Data); };
-#else
-            transport.Received += (ts, data) => { return Process(data); };
-#endif
-            transport.Open();
-
-            WriteLine(GetType().Name + "在" + name + "上监听Host=" + Host);
-
-            return this;
-        }
-
-        /// <summary>处理Modbus消息</summary>
-        /// <param name="buf"></param>
-        /// <returns></returns>
-        public virtual Byte[] Process(Byte[] buf)
-        {
-#if DEBUG
-            var str = "Request :";
-            for (var i = 0; i < buf.Length; i++)
-            {
-                str += " " + buf[i].ToString("X2");
-            }
-            WriteLine(str);
-#endif
-
-            // 处理
-            var entity = new ModbusEntity().Parse(buf);
-            // 检查主机
-            if (entity.Host != 0 && entity.Host != Host) return null;
-            // 检查Crc校验
-            var crc = buf.Crc(0, buf.Length - 2);
-            if (crc != entity.Crc)
-                entity.SetError(Errors.CrcError);
-            else
-                entity = Process(entity);
-            buf = entity.ToArray();
-
-#if DEBUG
-            str = "Response:";
-            for (var i = 0; i < buf.Length; i++)
-            {
-                str += " " + buf[i].ToString("X2");
-            }
-            WriteLine(str);
-            WriteLine("");
-#endif
-            return buf;
-        }
-
-        /// <summary>处理Modbus消息</summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        protected virtual ModbusEntity Process(ModbusEntity entity)
-        {
-            // 如果是广播消息，则设置主站ID，便于其他人知道我的主站ID
-            if (entity.Host == 0) entity.Host = Host;
-            try
-            {
-                switch (entity.Function)
-                {
-                    case MBFunction.ReadCoils:
-                    case MBFunction.ReadInputs:
-                        entity = ReadCoils(entity);
-                        break;
-                    case MBFunction.ReadHoldingRegisters:
-                    case MBFunction.ReadInputRegisters:
-                        entity = ReadRegisters(entity);
-                        break;
-                    case MBFunction.WriteSingleCoil:
-                        entity = WriteSingleCoil(entity);
-                        break;
-                    case MBFunction.WriteSingleRegister:
-                        entity = WriteSingleRegister(entity);
-                        break;
-                    case MBFunction.WriteMultipleCoils:
-                        entity = WriteMultipleCoils(entity);
-                        break;
-                    case MBFunction.WriteMultipleRegisters:
-                        entity = WriteMultipleRegisters(entity);
-                        break;
-                    case MBFunction.Diagnostics:
-                        entity = Diagnostics(entity);
-                        break;
-                    case MBFunction.ReportIdentity:
-                        entity = ReportIdentity(entity);
-                        break;
-                    default:
-                        // 不支持的功能码
-                        return entity.SetError(Errors.FunctionCode);
-                }
-
-                return entity;
-            }
-            catch (Exception ex)
-            {
-                //WriteLine(ex.Message);
-#if MF
-                Microsoft.SPOT.Debug.Print(ex.Message);
-#else
-                NewLife.Log.XTrace.WriteLine(ex.ToString());
-#endif
-
-                // 执行错误
-                return entity.SetError(Errors.ProcessError);
-            }
-        }
-        #endregion
-
-        #region 线圈
-        /// <summary>读状态 离散量输入/线圈</summary>
-        /// <remarks>
-        /// 线圈
-        /// 请求：0x01|2字节起始地址|2字节线圈数量(1~2000)
-        /// 响应：0x01|1字节字节计数|n字节线圈状态（n=输出数量/8，如果余数不为0，n=n+1）
-        /// 
-        /// 离散量输入
-        /// 请求：0x02|2字节起始地址|2字节输入数量(1~2000)
-        /// 响应：0x02|1字节字节计数|n字节输入状态（n=输入数量/8，如果余数不为0，n=n+1）
-        /// </remarks>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        ModbusEntity ReadCoils(ModbusEntity entity)
-        {
-            var data = entity.Data;
-            // 无效功能指令
-            if (data == null || data.Length != 4) return entity.SetError(Errors.MessageLength);
-
-            var addr = data.ReadUInt16(0);
-            var count = data.ReadUInt16(2);
-            // 输出数量不正确 count <= 0x07D0=2000
-            if (count == 0 || count > 0x07D0) return entity.SetError(Errors.Count);
-
-            IBitStore store = null;
-#if DEBUG
-            var func = "";
-#endif
-            switch (entity.Function)
-            {
-                case MBFunction.ReadCoils:
-                    store = DataStore.Coils;
-#if DEBUG
-                    func = "ReadCoils";
-#endif
-                    break;
-                case MBFunction.ReadInputs:
-                    store = DataStore.Inputs;
-#if DEBUG
-                    func = "ReadInputs";
-#endif
-                    break;
-                default:
-                    break;
-            }
-
-            // 起始地址+数量 不正确
-            if (addr + count >= store.Count) return entity.SetError(Errors.Address);
-#if DEBUG
-            WriteLine(func + "(0x" + addr.ToString("X2") + ", 0x" + count.ToString("X2") + ")");
-#endif
-            if (OnReadCoil != null) OnReadCoil(entity, addr, count);
-
-            // 返回的时候，用字节存储每一个线圈的状态
-            var n = count >> 3;
-            if ((count & 0x07) != 0) n++;
-            var buf = new Byte[1 + n];
-            // 字节数
-            buf[0] = (Byte)n;
-            // 元素存放于m字节n位
-            var m = n = 0;
-            for (var i = 0; i < count; i++)
-            {
-                var p = store.Read(addr + i);
-
-                // 存放在m个字节的n位，注意前面预留一个字节
-                if (p) buf[1 + m] |= (Byte)(1 << n);
-                if (++n >= 8)
-                {
-                    m++;
-                    n = 0;
-                }
-            }
-
-            entity.Data = buf;
-
-            return entity;
-        }
-
-        /// <summary>写单个线圈</summary>
-        /// <remarks>
-        /// 请求：0x05|2字节输出地址|2字节输出值（0x0000/0xFF00）
-        /// 响应：0x05|2字节输出地址|2字节输出值（0x0000/0xFF00）
-        /// </remarks>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        ModbusEntity WriteSingleCoil(ModbusEntity entity)
-        {
-            var data = entity.Data;
-            // 无效功能指令
-            if (data == null || data.Length < 4) return entity.SetError(Errors.MessageLength);
-
-            var addr = data.ReadUInt16(0);
-            var val = data.ReadUInt16(2);
-            // 输出值 False=0 True=0xFF00
-            if (val != 0 && val != 0xFF00) return entity.SetError(Errors.Value);
-
-            var store = DataStore.Coils;
-            // 输出地址
-            if (addr >= store.Count) return entity.SetError(Errors.Address);
-
-            var flag = val != 0;
-
-#if DEBUG
-            WriteLine("WriteSingleCoil(0x" + addr.ToString("X2") + ", " + flag + ")");
-#endif
-
-            //store.Write(addr, flag);
-
-            var count = 0;
-            // 支持一下连续写入
-            for (var i = 2; i + 1 < data.Length; i += 2, count++)
-            {
-                store.Write(addr + count, data.ReadUInt16(i) != 0);
-
-            }
-
-            if (OnWriteCoil != null) OnWriteCoil(entity, addr, count);
-
-            // 读出来
-            for (var i = 2; i + 1 < data.Length; i += 2)
-            {
-                data.WriteUInt16(i, (UInt16)(store.Read(addr + i - 2) ? 0xFF00 : 0));
-            }
-
-            //// 读出来
-            //data.WriteUInt16(2, (UInt16)(store.Read(addr) ? 0xFF00 : 0));
-
-            return entity;
-        }
-
-        /// <summary>写多个线圈</summary>
-        /// <remarks>
-        /// 请求：0x0F|2字节起始地址|2字节输出数量（1~1698）|1字节字节计数|n字节输出值（n=输出数量/8，如果余数不为0，n=n+1）
-        /// 响应：0x0F|2字节起始地址|2字节输出数量
-        /// </remarks>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        ModbusEntity WriteMultipleCoils(ModbusEntity entity)
-        {
-            var data = entity.Data;
-            // 2字节地址，2字节数量，1字节计数，至少1字节的数据字节
-            if (data == null || data.Length < 2 + 2 + 1 + 1) return entity.SetError(Errors.MessageLength);
-
-            var addr = data.ReadUInt16(0);
-            var size = data.ReadUInt16(2);
-            var count = data[4];
-
-            // 输出数量
-            if (size > 0x07B0 || count + 5 != data.Length) return entity.SetError(Errors.Count);
-
-            var store = DataStore.Coils;
-            // 起始地址+输出数量
-            if (addr + size >= store.Count) return entity.SetError(Errors.Address);
-
-#if DEBUG
-            WriteLine("WriteMultipleCoils(0x" + addr.ToString("X2") + ", 0x" + size.ToString("X2") + ")");
-#endif
-
-            // 元素存放于m字节n位
-            Int32 m = 0, n = 0;
-            for (var i = 0; i < size; i++)
-            {
-                // 数据位于5+m字节的n位
-                var flag = ((data[5 + m] >> n) & 0x01) == 0x01;
-
-                store.Write(addr + i, flag);
-
-                if (++n >= 8)
-                {
-                    m++;
-                    n = 0;
-                }
-            }
-
-            if (OnWriteCoil != null) OnWriteCoil(entity, addr, size);
-
-            // 响应只要这么一点点
-            entity.Data = data.ReadBytes(0, 4);
-
-            return entity;
-        }
-
-        /// <summary>读取线圈前触发</summary>
-        public event ModbusHandler OnReadCoil;
-
-        /// <summary>写入线圈后触发</summary>
-        public event ModbusHandler OnWriteCoil;
-        #endregion
-
-        #region 寄存器
-        /// <summary>读取寄存器 输入寄存器/保持寄存器</summary>
-        /// <remarks>
-        /// 保持寄存器
-        /// 请求：0x03|2字节起始地址|2字节寄存器数量（1~2000）
-        /// 响应：0x03|1字节字节数|n*2字节寄存器值
-        /// 
-        /// 输入寄存器
-        /// 请求：0x04|2字节起始地址|2字节输入寄存器数量（1~2000）
-        /// 响应：0x04|1字节字节数|n*2字节输入寄存器
-        /// </remarks>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        ModbusEntity ReadRegisters(ModbusEntity entity)
-        {
-            var data = entity.Data;
-            // 无效功能指令
-            if (data == null || data.Length != 4) return entity.SetError(Errors.MessageLength);
-
-            var addr = data.ReadUInt16(0);
-            var count = data.ReadUInt16(2);
-            // 输出数量不正确 count <= 0x07D0=2000
-            //if (count == 0 || count > 0x07D0) return entity.SetError(3);
-            if (count == 0) return entity.SetError(Errors.Count);
-
-            IWordStore store = null;
-#if DEBUG
-            var func = "";
-#endif
-            switch (entity.Function)
-            {
-                case MBFunction.ReadHoldingRegisters:
-                    store = DataStore.HoldingRegisters;
-#if DEBUG
-                    func = "ReadHoldingRegisters";
-#endif
-                    break;
-                case MBFunction.ReadInputRegisters:
-                    store = DataStore.InputRegisters;
-#if DEBUG
-                    func = "ReadInputRegisters";
-#endif
-                    break;
-                default:
-                    break;
-            }
-            if (count > store.Count) return entity.SetError(Errors.Count);
-            // 起始地址+数量 不正确
-            if (addr + count > 0xFFFF) return entity.SetError(Errors.Address);
-
-#if DEBUG
-            WriteLine(func + "(0x" + addr.ToString("X2") + ", 0x" + count.ToString("X2") + ")");
-#endif
-            if (OnReadRegister != null) OnReadRegister(entity, addr, count);
-
-            var buf = new Byte[1 + count * 2];
-            buf[0] = (Byte)(count * 2);
-
-            for (var i = 0; i < count; i++)
-            {
-                buf.WriteUInt16(1 + i * 2, store.Read(addr + i));
-            }
-
-            // 读出来
-            entity.Data = buf;
-
-            return entity;
-        }
-
-        /// <summary>写单个寄存器</summary>
-        /// <remarks>
-        /// 请求：0x06|2字节寄存器地址|2字节寄存器值
-        /// 响应：0x06|2字节寄存器地址|2字节寄存器值
-        /// </remarks>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        ModbusEntity WriteSingleRegister(ModbusEntity entity)
-        {
-            var data = entity.Data;
-            // 无效功能指令
-            if (data == null || data.Length < 4) return entity.SetError(Errors.MessageLength);
-
-            var addr = data.ReadUInt16(0);
-            var val = data.ReadUInt16(2);
-            // 寄存器值 0<<val<<0xFFFF
-            //if (val != 0 && val != 0xFF00) return entity.SetError(3);
-
-            var store = DataStore.HoldingRegisters;
-            // 寄存器地址
-            if (addr >= store.Count) return entity.SetError(Errors.Address);
-
-#if DEBUG
-            WriteLine("WriteSingleRegister(0x" + addr.ToString("X2") + ", 0x" + val.ToString("X2") + ")");
-#endif
-
-            //store.Write(addr, val);
-            var count = 0;
-            // 支持多字连续写入
-            for (var i = 2; i + 1 < data.Length; i += 2, count++)
-            {
-                store.Write(addr + count, data.ReadUInt16(i));
-            }
-
-            if (OnWriteRegister != null) OnWriteRegister(entity, addr, count);
-
-            return entity;
-        }
-
-        /// <summary>写多个寄存器</summary>
-        /// <remarks>
-        /// 请求：0x10|2字节起始地址|2字节寄存器数量（1~123）|1字节字节计数|n*2寄存器值
-        /// 响应：0x10|2字节起始地址|2字节寄存器数量
-        /// </remarks>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        ModbusEntity WriteMultipleRegisters(ModbusEntity entity)
-        {
-            var data = entity.Data;
-            // 2字节地址，2字节数量，1字节计数，至少1字节的数据字节
-            if (data == null || data.Length < 2 + 2 + 1 + 2) return entity.SetError(Errors.MessageLength);
-
-            var addr = data.ReadUInt16(0);
-            var size = data.ReadUInt16(2);
-            var count = data[4];
-
-            // 输出数量
-            if (size > 0x07B0 || data.Length - 5 != count) return entity.SetError(Errors.Count);
-
-            var store = DataStore.HoldingRegisters;
-            // 起始地址+输出数量
-            if (addr + size >= store.Count) return entity.SetError(Errors.Address);
-
-#if DEBUG
-            WriteLine("WriteMultipleRegisters(0x" + addr.ToString("X2") + ", 0x" + size.ToString("X2") + ")");
-#endif
-
-            for (var i = 0; i < size; i++)
-            {
-                store.Write(addr + i, data.ReadUInt16(5 + i * 2));
-            }
-
-            if (OnWriteRegister != null) OnWriteRegister(entity, addr, size);
-
-            // 响应只要这么一点点
-            entity.Data = data.ReadBytes(0, 4);
-
-            return entity;
-        }
-
-        /// <summary>读取寄存器前触发</summary>
-        public event ModbusHandler OnReadRegister;
-
-        /// <summary>写入寄存器后触发</summary>
-        public event ModbusHandler OnWriteRegister;
-        #endregion
-
-        #region 诊断标识
-        /// <summary>诊断</summary>
-        /// <remarks>
-        /// 请求：0x08|2字节子功能|n*2字节数据
-        /// 响应：0x08|2字节子功能|n*2字节数据
-        /// </remarks>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        ModbusEntity Diagnostics(ModbusEntity entity)
-        {
-            var data = entity.Data;
-            // 无效功能指令。2字节子功能码，多字节的数据
-            if (data == null || data.Length < 2) return entity.SetError(Errors.MessageLength);
-
-            var sub = data.ReadUInt16(0);
-#if DEBUG
-            WriteLine("Diagnostics(0x" + sub.ToString("X2") + ")");
-#endif
-
-            // 默认原样返回，暂时没有什么有用的子功能码需要处理
-            return entity;
-        }
-
-        /// <summary>报告从站ID</summary>
-        /// <remarks>
-        /// 请求：0x11
-        /// 响应：0x11|1字节字节计数|从站ID|运行指示状态（0x00=OFF,0xFF=ON）|附加数据
-        /// </remarks>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        ModbusEntity ReportIdentity(ModbusEntity entity)
-        {
-            var data = entity.Data;
-            // 无效功能指令。
-            if (data != null && data.Length > 0) return entity.SetError(Errors.MessageLength);
-
-#if DEBUG
-            WriteLine("ReportIdentity()");
-#endif
-
-            var hid = new Byte[] { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, };
-
-            var buf = new Byte[1 + hid.Length];
-            buf[0] = (Byte)hid.Length;
-            Array.Copy(hid, 0, buf, 1, hid.Length);
-            entity.Data = buf;
-
-            return entity;
-        }
-        #endregion
-
-        #region 日志
-        void WriteLine(String msg)
-        {
-#if MF
-            if (EnableDebug) Microsoft.SPOT.Debug.Print(msg);
-#else
-            if (EnableDebug) NewLife.Log.XTrace.WriteLine(msg);
-#endif
-        }
-        #endregion
-    }
-
-    /// <summary>事件委托</summary>
-    /// <param name="entity"></param>
-    /// <param name="index"></param>
-    /// <param name="count"></param>
-    public delegate void ModbusHandler(ModbusEntity entity, Int32 index, Int32 count);
-
-    ///// <summary>写线圈委托</summary>
-    ///// <param name="i"></param>
-    ///// <param name="value"></param>
-    //public delegate void WriteCoilHandler(Int32 i, Int32 count);
-
-    ///// <summary>写寄存器委托</summary>
-    ///// <param name="i"></param>
-    ///// <param name="value"></param>
-    //public delegate void WriteRegisterHandler(Int32 i, Int32 count);
-}
\ No newline at end of file
diff --git "a/NewLife.Net/Modbus/Modbus\350\257\264\346\230\216.txt" "b/NewLife.Net/Modbus/Modbus\350\257\264\346\230\216.txt"
deleted file mode 100644
index f771047f58..0000000000
--- "a/NewLife.Net/Modbus/Modbus\350\257\264\346\230\216.txt"
+++ /dev/null
@@ -1,2 +0,0 @@
-﻿2013-01-19
-1，在TCP上默认502端口
\ No newline at end of file
diff --git a/NewLife.Net/Modbus/UdpTransport.cs b/NewLife.Net/Modbus/UdpTransport.cs
deleted file mode 100644
index 2c03a75307..0000000000
--- a/NewLife.Net/Modbus/UdpTransport.cs
+++ /dev/null
@@ -1,194 +0,0 @@
-﻿using System;
-using System.Net;
-using System.Net.Sockets;
-
-namespace NewLife.Net.Modbus
-{
-    /// <summary>UDP传输</summary>
-    public class UdpTransport : ITransport, IDisposable
-    {
-        #region 属性
-        private String _HostName;
-        /// <summary>主机名</summary>
-        public String HostName { get { return _HostName; } set { _HostName = value; } }
-
-        private Int32 _Port;
-        /// <summary>端口</summary>
-        public Int32 Port { get { return _Port; } set { _Port = value; } }
-
-        private Int32 _Timeout = 3000;
-        /// <summary>超时。默认3000ms</summary>
-        public Int32 Timeout { get { return _Timeout; } set { _Timeout = value; } }
-
-        private UdpClient _Client;
-        /// <summary>客户端</summary>
-        public UdpClient Client { get { return _Client; } set { _Client = value; } }
-
-        private Int32 _ExpectedFrame;
-        /// <summary>读取的期望帧长度，小于该长度为未满一帧，读取不做返回</summary>
-        public Int32 FrameSize { get { return _ExpectedFrame; } set { _ExpectedFrame = value; } }
-        #endregion
-
-        #region 构造
-        /// <summary>使用监听口初始化</summary>
-        /// <param name="listenPort"></param>
-        public UdpTransport(Int32 listenPort)
-        {
-            Port = listenPort;
-        }
-
-        /// <summary>初始化</summary>
-        /// <param name="host"></param>
-        /// <param name="port"></param>
-        public UdpTransport(String host, Int32 port)
-        {
-            HostName = host;
-            Port = port;
-        }
-
-        /// <summary>析构</summary>
-        ~UdpTransport() { Dispose(false); }
-
-        /// <summary>销毁</summary>
-        public void Dispose() { Dispose(true); }
-
-        /// <summary>销毁</summary>
-        /// <param name="disposing"></param>
-        protected virtual void Dispose(Boolean disposing)
-        {
-            if (disposing) GC.SuppressFinalize(this);
-
-            Close();
-        }
-        #endregion
-
-        #region 方法
-        /// <summary>打开</summary>
-        public void Open()
-        {
-            if (Client == null || !Client.Client.Connected)
-            {
-                Client = new UdpClient(HostName, Port);
-                if (Timeout > 0) Client.Client.ReceiveTimeout = Timeout;
-            }
-        }
-
-        /// <summary>关闭</summary>
-        public void Close()
-        {
-            if (Client != null) Client.Close();
-        }
-
-        /// <summary>写入数据</summary>
-        /// <param name="buffer">缓冲区</param>
-        /// <param name="offset">偏移</param>
-        /// <param name="count">数量</param>
-        public void Send(Byte[] buffer, Int32 offset = 0, Int32 count = -1)
-        {
-            Open();
-
-#if !MF
-            WriteLog("Write:{0}", BitConverter.ToString(buffer));
-#endif
-
-            if (count < 0) count = buffer.Length - offset;
-
-            var sp = Client;
-            lock (sp)
-            {
-                if (offset == 0)
-                    sp.Send(buffer, count);
-                else
-                    sp.Send(buffer.ReadBytes(offset, count), count);
-            }
-        }
-
-        /// <summary>读取指定长度的数据，一般是一帧</summary>
-        /// <param name="buffer">缓冲区</param>
-        /// <param name="offset">偏移</param>
-        /// <param name="count">数量</param>
-        /// <returns></returns>
-        public Int32 Receive(Byte[] buffer, Int32 offset = 0, Int32 count = -1)
-        {
-            Open();
-
-            if (count < 0) count = buffer.Length - offset;
-
-            var size = 0;
-            var sp = Client;
-            lock (sp)
-            {
-                try
-                {
-                    var remoteEP = new IPEndPoint(IPAddress.Any, 0);
-                    var data = sp.Receive(ref remoteEP);
-                    if (data != null && data.Length > 0)
-                    {
-                        size = data.Length;
-                        // 计算还有多少可用空间
-                        if (size > count) size = count;
-                        buffer.Write(offset, data, 0, size);
-                    }
-                }
-                catch { }
-            }
-
-#if !MF
-            WriteLog("Read:{0}", BitConverter.ToString(buffer, offset, size));
-#endif
-
-            return size;
-        }
-        #endregion
-
-        #region 异步接收
-        /// <summary>开始监听</summary>
-        public void ReceiveAsync()
-        {
-            if (Client == null)
-            {
-                Client = new UdpClient(Port);
-                if (Timeout > 0) Client.Client.ReceiveTimeout = Timeout;
-            }
-
-            // 开始新的监听
-            Client.BeginReceive(OnReceive, Client);
-        }
-
-        void OnReceive(IAsyncResult ar)
-        {
-            // 接收数据
-            var server = ar.AsyncState as UdpClient;
-            var ep = new IPEndPoint(IPAddress.Any, 0);
-            var data = server.EndReceive(ar, ref ep);
-
-            // 开始新的监听
-            server.BeginReceive(OnReceive, server);
-
-            // 分析处理
-            if (Received != null)
-            {
-                data = Received(this, data);
-
-                // 数据发回去
-                if (data != null) server.Send(data, data.Length, ep);
-            }
-        }
-
-        /// <summary>数据到达事件，事件里调用<see cref="Receive"/>读取数据</summary>
-        public event TransportEventHandler Received;
-        #endregion
-
-        #region 日志
-        /// <summary>输出日志</summary>
-        /// <param name="formart"></param>
-        /// <param name="args"></param>
-        public static void WriteLog(String formart, params Object[] args)
-        {
-#if !MF
-            NewLife.Log.XTrace.WriteLine(formart, args);
-#endif
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Model/DataEventArgs.cs b/NewLife.Net/Model/DataEventArgs.cs
deleted file mode 100644
index 7e8032b6d3..0000000000
--- a/NewLife.Net/Model/DataEventArgs.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace NewLife.Net.Model
-{
-    /// <summary>数据接收事件参数</summary>
-    public class DataEventArgs : EventArgs
-    {
-        private Byte[] _Buffer;
-        /// <summary>缓冲区</summary>
-        public Byte[] Buffer { get { return _Buffer; } set { _Buffer = value; } }
-
-        private Int32 _Offset;
-        /// <summary>偏移</summary>
-        public Int32 Offset { get { return _Offset; } set { _Offset = value; } }
-
-        private Int32 _Count;
-        /// <summary>字节数</summary>
-        public Int32 Count { get { return _Count; } set { _Count = value; } }
-
-        /// <summary>实例化</summary>
-        /// <param name="buffer">缓冲区</param>
-        /// <param name="offset">偏移</param>
-        /// <param name="count">数量</param>
-        public DataEventArgs(Byte[] buffer, Int32 offset, Int32 count)
-        {
-            Buffer = buffer;
-            Offset = offset;
-            Count = count;
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/NTP/NTP.cs b/NewLife.Net/NTP/NTP.cs
deleted file mode 100644
index 1c7e4511dc..0000000000
--- a/NewLife.Net/NTP/NTP.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-﻿using System;
-
-namespace NewLife.Net.NTP
-{
-    /// <summary>Network Time Protocol（NTP）是用来使计算机时间同步化的一种协议</summary>
-    public class NTP
-    {
-        #region 属性
-        private NTPLeapIndicator _LeapIndicator;
-        /// <summary>跳跃指示器，警告在当月最后一天的最终时刻插入的迫近闺秒（闺秒）。</summary>
-        public NTPLeapIndicator LeapIndicator
-        {
-            get { return _LeapIndicator; }
-            set { _LeapIndicator = value; }
-        }
-
-        private Byte _VersionNumber;
-        /// <summary>版本号。</summary>
-        public Byte VersionNumber
-        {
-            get { return _VersionNumber; }
-            set { _VersionNumber = value; }
-        }
-
-        private NTPMode _Mode;
-        /// <summary>工作模式。该字段包括以下值：0－预留；1－对称行为；3－客户机；4－服务器；5－广播；6－NTP控制信息。NTP协议具有3种工作模式，分别为主/被动对称模式、客户/服务器模式、广播模式。在主/被动对称模式中，有一对一的连接，双方均可同步对方或被对方同步，先发出申请建立连接的一方工作在主动模式下，另一方工作在被动模式下；客户/服务器模式与主/被动模式基本相同，惟一区别在于客户方可被服务器同步，但服务器不能被客户同步；在广播模式中，有一对多的连接，服务器不论客户工作在何种模式下，都会主动发出时间信息，客户根据此信息调整自己的时间。</summary>
-        public NTPMode Mode
-        {
-            get { return _Mode; }
-            set { _Mode = value; }
-        }
-
-        private NTPStratum _Stratum;
-        /// <summary>对本地时钟级别的整体识别。</summary>
-        public NTPStratum Stratum
-        {
-            get { return _Stratum; }
-            set { _Stratum = value; }
-        }
-
-        private UInt32 _PollInterval;
-        /// <summary>有符号整数表示连续信息间的最大间隔。</summary>
-        public UInt32 PollInterval
-        {
-            get { return _PollInterval; }
-            set { _PollInterval = value; }
-        }
-
-        private Double _Precision;
-        /// <summary>有符号整数表示本地时钟精确度。</summary>
-        public Double Precision
-        {
-            get { return _Precision; }
-            set { _Precision = value; }
-        }
-
-        private Double _RootDelay;
-        /// <summary>表示到达主参考源的一次往复的总延迟，它是有15～16位小数部分的符号定点小数。</summary>
-        public Double RootDelay
-        {
-            get { return _RootDelay; }
-            set { _RootDelay = value; }
-        }
-
-        private Double _RootDispersion;
-        /// <summary>表示一次到达主参考源的标准误差，它是有15～16位小数部分的无符号定点小数。</summary>
-        public Double RootDispersion
-        {
-            get { return _RootDispersion; }
-            set { _RootDispersion = value; }
-        }
-
-        private String _ReferenceID;
-        /// <summary>识别特殊参考源。</summary>
-        public String ReferenceID
-        {
-            get { return _ReferenceID; }
-            set { _ReferenceID = value; }
-        }
-
-        private DateTime _ReferenceTimestamp;
-        /// <summary>属性说明</summary>
-        public DateTime ReferenceTimestamp
-        {
-            get { return _ReferenceTimestamp; }
-            set { _ReferenceTimestamp = value; }
-        }
-
-        private DateTime _OriginateTimestamp;
-        /// <summary>属性说明</summary>
-        public DateTime OriginateTimestamp
-        {
-            get { return _OriginateTimestamp; }
-            set { _OriginateTimestamp = value; }
-        }
-
-        private DateTime _ReceiveTimestamp;
-        /// <summary>属性说明</summary>
-        public DateTime ReceiveTimestamp
-        {
-            get { return _ReceiveTimestamp; }
-            set { _ReceiveTimestamp = value; }
-        }
-
-        private DateTime _TransmitTimestamp;
-        /// <summary>属性说明</summary>
-        public DateTime TransmitTimestamp
-        {
-            get { return _TransmitTimestamp; }
-            set { _TransmitTimestamp = value; }
-        }
-        #endregion
-
-        #region 扩展属性
-        private Int32 _KeyID;
-        /// <summary>属性说明</summary>
-        public Int32 KeyID
-        {
-            get { return _KeyID; }
-            set { _KeyID = value; }
-        }
-
-        private Byte[] _MessageDigest;
-        /// <summary>消息签名</summary>
-        public Byte[] MessageDigest
-        {
-            get { return _MessageDigest; }
-            set { _MessageDigest = value; }
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/NTP/NTPClient.cs b/NewLife.Net/NTP/NTPClient.cs
deleted file mode 100644
index 8f5583be91..0000000000
--- a/NewLife.Net/NTP/NTPClient.cs
+++ /dev/null
@@ -1,626 +0,0 @@
-﻿//using System;
-//using System.Collections.Generic;
-//using System.Text;
-//using System.Net;
-//using System.Net.Sockets;
-//using System.Runtime.InteropServices;
-
-//namespace NewLife.Net.Application
-//{
-//    /// <summary>
-//    /// Leap indicator
-//    /// </summary>
-//    public enum _LeapIndicator
-//    {
-//        NoWarning,        // 0 - No warning
-//        LastMinute61,    // 1 - Last minute has 61 seconds
-//        LastMinute59,    // 2 - Last minute has 59 seconds
-//        Alarm            // 3 - Alarm condition (clock not synchronized)
-//    }
-
-//    /// <summary>
-//    /// Mode
-//    /// </summary>
-//    public enum _Mode
-//    {
-//        SymmetricActive,    // 1 - Symmetric active
-//        SymmetricPassive,    // 2 - Symmetric pasive
-//        Client,                // 3 - Client
-//        Server,                // 4 - Server
-//        Broadcast,            // 5 - Broadcast
-//        Unknown                // 0, 6, 7 - Reserved
-//    }
-
-//    /// <summary>
-//    /// Stratum
-//    /// </summary>
-//    public enum _Stratum
-//    {
-//        Unspecified,            // 0 - unspecified or unavailable
-//        PrimaryReference,        // 1 - primary reference (e.g. radio-clock)
-//        SecondaryReference,        // 2-15 - secondary reference (via NTP or SNTP)
-//        Reserved                // 16-255 - reserved
-//    }
-
-//    /// <summary>
-//    /// NTPClient is a C# class designed to connect to time servers on the Internet.
-//    /// The implementation of the protocol is based on the RFC 2030.
-//    /// 
-//    /// -----------------------------------------------------------------------------
-//    /// Structure of the standard NTP header (as described in RFC 2030)
-//    ///                       1                   2                   3
-//    ///   0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-//    ///  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//    ///  |LI | VN  |Mode |    Stratum    |     Poll      |   Precision   |
-//    ///  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//    ///  |                          Root Delay                           |
-//    ///  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//    ///  |                       Root Dispersion                         |
-//    ///  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//    ///  |                     Reference Identifier                      |
-//    ///  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//    ///  |                                                               |
-//    ///  |                   Reference Timestamp (64)                    |
-//    ///  |                                                               |
-//    ///  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//    ///  |                                                               |
-//    ///  |                   Originate Timestamp (64)                    |
-//    ///  |                                                               |
-//    ///  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//    ///  |                                                               |
-//    ///  |                    Receive Timestamp (64)                     |
-//    ///  |                                                               |
-//    ///  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//    ///  |                                                               |
-//    ///  |                    Transmit Timestamp (64)                    |
-//    ///  |                                                               |
-//    ///  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//    ///  |                 Key Identifier (optional) (32)                |
-//    ///  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//    ///  |                                                               |
-//    ///  |                                                               |
-//    ///  |                 Message Digest (optional) (128)               |
-//    ///  |                                                               |
-//    ///  |                                                               |
-//    ///  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//    /// 
-//    /// -----------------------------------------------------------------------------
-//    /// 
-//    /// NTP Timestamp Format (as described in RFC 2030)
-//    ///                         1                   2                   3
-//    ///     0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-//    /// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//    /// |                           Seconds                             |
-//    /// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//    /// |                  Seconds Fraction (0-padded)                  |
-//    /// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//    /// 
-//    /// </summary>
-//    public class NTPClient
-//    {
-//        // NTP Data Structure Length
-//        private const byte NTPDataLength = 48;
-//        // NTP Data Structure (as described in RFC 2030)
-//        byte[] NTPData = new byte[NTPDataLength];
-
-//        // Offset constants for timestamps in the data structure
-//        private const byte offReferenceID = 12;
-//        private const byte offReferenceTimestamp = 16;
-//        private const byte offOriginateTimestamp = 24;
-//        private const byte offReceiveTimestamp = 32;
-//        private const byte offTransmitTimestamp = 40;
-
-//        /// <summary>
-//        /// Warns of an impending leap second to be inserted/deleted in the last minute of the current day. (See the _LeapIndicator enum)
-//        /// </summary>
-//        public _LeapIndicator LeapIndicator
-//        {
-//            get
-//            {
-//                // Isolate the two most significant bits
-//                byte val = (byte)(NTPData[0] >> 6);
-//                switch (val)
-//                {
-//                    case 0: return _LeapIndicator.NoWarning;
-//                    case 1: return _LeapIndicator.LastMinute61;
-//                    case 2: return _LeapIndicator.LastMinute59;
-//                    case 3: goto default;
-//                    default:
-//                        return _LeapIndicator.Alarm;
-//                }
-//            }
-//        }
-
-//        /// <summary>
-//        /// Version number of the protocol (3 or 4).
-//        /// </summary>
-//        public byte VersionNumber
-//        {
-//            get
-//            {
-//                // Isolate bits 3 - 5
-//                byte val = (byte)((NTPData[0] & 0x38) >> 3);
-//                return val;
-//            }
-//        }
-
-//        /// <summary>
-//        /// Returns mode. (See the _Mode enum)
-//        /// </summary>
-//        public _Mode Mode
-//        {
-//            get
-//            {
-//                // Isolate bits 0 - 3
-//                byte val = (byte)(NTPData[0] & 0x7);
-//                switch (val)
-//                {
-//                    case 0: goto default;
-//                    case 6: goto default;
-//                    case 7: goto default;
-//                    default:
-//                        return _Mode.Unknown;
-//                    case 1:
-//                        return _Mode.SymmetricActive;
-//                    case 2:
-//                        return _Mode.SymmetricPassive;
-//                    case 3:
-//                        return _Mode.Client;
-//                    case 4:
-//                        return _Mode.Server;
-//                    case 5:
-//                        return _Mode.Broadcast;
-//                }
-//            }
-//        }
-
-//        /// <summary>
-//        /// Stratum of the clock. (See the _Stratum enum)
-//        /// </summary>
-//        public _Stratum Stratum
-//        {
-//            get
-//            {
-//                byte val = (byte)NTPData[1];
-//                if (val == 0) return _Stratum.Unspecified;
-//                else
-//                    if (val == 1) return _Stratum.PrimaryReference;
-//                    else
-//                        if (val <= 15) return _Stratum.SecondaryReference;
-//                        else
-//                            return _Stratum.Reserved;
-//            }
-//        }
-
-//        /// <summary>
-//        /// Maximum interval between successive messages.
-//        /// </summary>
-//        public uint PollInterval
-//        {
-//            get
-//            {
-//                return (uint)Math.Round(Math.Pow(2, NTPData[2]));
-//            }
-//        }
-
-//        /// <summary>
-//        /// Precision of the clock.
-//        /// </summary>
-//        public double Precision
-//        {
-//            get
-//            {
-//                return (1000 * Math.Pow(2, NTPData[3]));
-//            }
-//        }
-
-//        /// <summary>
-//        /// Round trip time to the primary reference source.
-//        /// </summary>
-//        public double RootDelay
-//        {
-//            get
-//            {
-//                int temp = 0;
-//                temp = 256 * (256 * (256 * NTPData[4] + NTPData[5]) + NTPData[6]) + NTPData[7];
-//                return 1000 * (((double)temp) / 0x10000);
-//            }
-//        }
-
-//        /// <summary>
-//        /// Nominal error relative to the primary reference source.
-//        /// </summary>
-//        public double RootDispersion
-//        {
-//            get
-//            {
-//                int temp = 0;
-//                temp = 256 * (256 * (256 * NTPData[8] + NTPData[9]) + NTPData[10]) + NTPData[11];
-//                return 1000 * (((double)temp) / 0x10000);
-//            }
-//        }
-
-//        /// <summary>
-//        /// Reference identifier (either a 4 character string or an IP address).
-//        /// </summary>
-//        public string ReferenceID
-//        {
-//            get
-//            {
-//                string val = "";
-//                switch (Stratum)
-//                {
-//                    case _Stratum.Unspecified:
-//                        goto case _Stratum.PrimaryReference;
-//                    case _Stratum.PrimaryReference:
-//                        val += (char)NTPData[offReferenceID + 0];
-//                        val += (char)NTPData[offReferenceID + 1];
-//                        val += (char)NTPData[offReferenceID + 2];
-//                        val += (char)NTPData[offReferenceID + 3];
-//                        break;
-//                    case _Stratum.SecondaryReference:
-//                        switch (VersionNumber)
-//                        {
-//                            case 3:    // Version 3, Reference ID is an IPv4 address
-//                                string Address = NTPData[offReferenceID + 0].ToString() + "." +
-//                                                 NTPData[offReferenceID + 1].ToString() + "." +
-//                                                 NTPData[offReferenceID + 2].ToString() + "." +
-//                                                 NTPData[offReferenceID + 3].ToString();
-//                                try
-//                                {
-//                                    IPHostEntry Host = Dns.GetHostByAddress(Address);
-//                                    val = Host.HostName + " (" + Address + ")";
-//                                }
-//                                catch (Exception)
-//                                {
-//                                    val = "N/A";
-//                                }
-//                                break;
-//                            case 4: // Version 4, Reference ID is the timestamp of last update
-//                                DateTime time = ComputeDate(GetMilliSeconds(offReferenceID));
-//                                // Take care of the time zone
-//                                TimeSpan offspan = TimeZone.CurrentTimeZone.GetUtcOffset(DateTime.Now);
-//                                val = (time + offspan).ToString();
-//                                break;
-//                            default:
-//                                val = "N/A";
-//                                break;
-//                        }
-//                        break;
-//                }
-
-//                return val;
-//            }
-//        }
-
-//        /// <summary>
-//        /// The time at which the clock was last set or corrected.
-//        /// </summary>
-//        public DateTime ReferenceTimestamp
-//        {
-//            get
-//            {
-//                DateTime time = ComputeDate(GetMilliSeconds(offReferenceTimestamp));
-//                // Take care of the time zone
-//                TimeSpan offspan = TimeZone.CurrentTimeZone.GetUtcOffset(DateTime.Now);
-//                return time + offspan;
-//            }
-//        }
-
-//        /// <summary>
-//        /// The time at which the request departed the client for the server.
-//        /// </summary>
-//        public DateTime OriginateTimestamp
-//        {
-//            get
-//            {
-//                return ComputeDate(GetMilliSeconds(offOriginateTimestamp));
-//            }
-//        }
-
-//        /// <summary>
-//        /// The time at which the request arrived at the server.
-//        /// </summary>
-//        public DateTime ReceiveTimestamp
-//        {
-//            get
-//            {
-//                DateTime time = ComputeDate(GetMilliSeconds(offReceiveTimestamp));
-//                // Take care of the time zone
-//                TimeSpan offspan = TimeZone.CurrentTimeZone.GetUtcOffset(DateTime.Now);
-//                return time + offspan;
-//            }
-//        }
-
-//        /// <summary>
-//        /// The time at which the reply departed the server for client.
-//        /// </summary>
-//        public DateTime TransmitTimestamp
-//        {
-//            get
-//            {
-//                DateTime time = ComputeDate(GetMilliSeconds(offTransmitTimestamp));
-//                // Take care of the time zone
-//                TimeSpan offspan = TimeZone.CurrentTimeZone.GetUtcOffset(DateTime.Now);
-//                return time + offspan;
-//            }
-//            set
-//            {
-//                SetDate(offTransmitTimestamp, value);
-//            }
-//        }
-
-//        /// <summary>
-//        /// ReceptionTimestamp
-//        /// </summary>
-//        public DateTime ReceptionTimestamp;
-
-//        /// <summary>
-//        /// The time between the departure of request and arrival of reply.
-//        /// </summary>
-//        public int RoundTripDelay
-//        {
-//            get
-//            {
-//                TimeSpan span = (ReceiveTimestamp - OriginateTimestamp) + (ReceptionTimestamp - TransmitTimestamp);
-//                return (int)span.TotalMilliseconds;
-//            }
-//        }
-
-//        /// <summary>
-//        /// Local clock offset (in milliseconds)
-//        /// </summary>
-//        public int LocalClockOffset
-//        {
-//            get
-//            {
-//                TimeSpan span = (ReceiveTimestamp - OriginateTimestamp) - (ReceptionTimestamp - TransmitTimestamp);
-//                return (int)(span.TotalMilliseconds / 2);
-//            }
-//        }
-
-//        // Compute date, given the number of milliseconds since January 1, 1900
-//        private DateTime ComputeDate(ulong milliseconds)
-//        {
-//            TimeSpan span = TimeSpan.FromMilliseconds((double)milliseconds);
-//            DateTime time = new DateTime(1900, 1, 1);
-//            time += span;
-//            return time;
-//        }
-
-//        // Compute the number of milliseconds, given the offset of a 8-byte array
-//        private ulong GetMilliSeconds(byte offset)
-//        {
-//            ulong intpart = 0, fractpart = 0;
-
-//            for (int i = 0; i <= 3; i++)
-//            {
-//                intpart = 256 * intpart + NTPData[offset + i];
-//            }
-//            for (int i = 4; i <= 7; i++)
-//            {
-//                fractpart = 256 * fractpart + NTPData[offset + i];
-//            }
-//            ulong milliseconds = intpart * 1000 + (fractpart * 1000) / 0x100000000L;
-//            return milliseconds;
-//        }
-
-//        // Compute the 8-byte array, given the date
-//        private void SetDate(byte offset, DateTime date)
-//        {
-//            ulong intpart = 0, fractpart = 0;
-//            DateTime StartOfCentury = new DateTime(1900, 1, 1, 0, 0, 0);    // January 1, 1900 12:00 AM
-
-//            ulong milliseconds = (ulong)(date - StartOfCentury).TotalMilliseconds;
-//            intpart = milliseconds / 1000;
-//            fractpart = ((milliseconds % 1000) * 0x100000000L) / 1000;
-
-//            ulong temp = intpart;
-//            for (int i = 3; i >= 0; i--)
-//            {
-//                NTPData[offset + i] = (byte)(temp % 256);
-//                temp = temp / 256;
-//            }
-
-//            temp = fractpart;
-//            for (int i = 7; i >= 4; i--)
-//            {
-//                NTPData[offset + i] = (byte)(temp % 256);
-//                temp = temp / 256;
-//            }
-//        }
-
-//        /// <summary>
-//        /// Sets up data structure and prepares for connection.
-//        /// </summary>
-//        private void Initialize()
-//        {
-//            // Set version number to 4 and Mode to 3 (client)
-//            NTPData[0] = 0x1B;
-//            // Initialize all other fields with 0
-//            for (int i = 1; i < 48; i++)
-//            {
-//                NTPData[i] = 0;
-//            }
-//            // Initialize the transmit timestamp
-//            TransmitTimestamp = DateTime.Now;
-//        }
-
-//        /// <summary>
-//        /// 实例化
-//        /// </summary>
-//        /// <param name="host"></param>
-//        public NTPClient(string host)
-//        {
-//            TimeServer = host;
-//        }
-
-//        /// <summary>
-//        /// Connects to the time server and populates the data structure.It can also set the system time.
-//        /// </summary>
-//        /// <param name="UpdateSystemTime"></param>
-//        public void Connect(bool UpdateSystemTime)
-//        {
-//            try
-//            {
-//                // Resolve server address
-//                IPHostEntry hostadd = Dns.Resolve(TimeServer);
-//                IPEndPoint EPhost = new IPEndPoint(hostadd.AddressList[0], 123);
-
-//                //Connect the time server
-//                UdpClient TimeSocket = new UdpClient();
-//                TimeSocket.Connect(EPhost);
-
-//                // Initialize data structure
-//                Initialize();
-//                TimeSocket.Send(NTPData, NTPData.Length);
-//                NTPData = TimeSocket.Receive(ref EPhost);
-//                if (!IsResponseValid())
-//                {
-//                    throw new Exception("Invalid response from " + TimeServer);
-//                }
-//                ReceptionTimestamp = DateTime.Now;
-//            }
-//            catch (SocketException e)
-//            {
-//                throw new Exception(e.Message);
-//            }
-
-//            // Update system time
-//            if (UpdateSystemTime)
-//            {
-//                SetTime();
-//            }
-//        }
-
-//        /// <summary>
-//        /// Returns true if received data is valid and if comes from a NTP-compliant time server.
-//        /// </summary>
-//        /// <returns></returns>
-//        public bool IsResponseValid()
-//        {
-//            if (NTPData.Length < NTPDataLength || Mode != _Mode.Server)
-//            {
-//                return false;
-//            }
-//            else
-//            {
-//                return true;
-//            }
-//        }
-
-//        /// <summary>
-//        /// Returns a string representation of the object.
-//        /// </summary>
-//        /// <returns></returns>
-//        public override string ToString()
-//        {
-//            string str;
-
-//            str = "Leap Indicator: ";
-//            switch (LeapIndicator)
-//            {
-//                case _LeapIndicator.NoWarning:
-//                    str += "No warning";
-//                    break;
-//                case _LeapIndicator.LastMinute61:
-//                    str += "Last minute has 61 seconds";
-//                    break;
-//                case _LeapIndicator.LastMinute59:
-//                    str += "Last minute has 59 seconds";
-//                    break;
-//                case _LeapIndicator.Alarm:
-//                    str += "Alarm Condition (clock not synchronized)";
-//                    break;
-//            }
-//            str += "\r\nVersion number: " + VersionNumber.ToString() + "\r\n";
-//            str += "Mode: ";
-//            switch (Mode)
-//            {
-//                case _Mode.Unknown:
-//                    str += "Unknown";
-//                    break;
-//                case _Mode.SymmetricActive:
-//                    str += "Symmetric Active";
-//                    break;
-//                case _Mode.SymmetricPassive:
-//                    str += "Symmetric Pasive";
-//                    break;
-//                case _Mode.Client:
-//                    str += "Client";
-//                    break;
-//                case _Mode.Server:
-//                    str += "Server";
-//                    break;
-//                case _Mode.Broadcast:
-//                    str += "Broadcast";
-//                    break;
-//            }
-//            str += "\r\nStratum: ";
-//            switch (Stratum)
-//            {
-//                case _Stratum.Unspecified:
-//                case _Stratum.Reserved:
-//                    str += "Unspecified";
-//                    break;
-//                case _Stratum.PrimaryReference:
-//                    str += "Primary Reference";
-//                    break;
-//                case _Stratum.SecondaryReference:
-//                    str += "Secondary Reference";
-//                    break;
-//            }
-//            str += "\r\nLocal time: " + TransmitTimestamp.ToString();
-//            str += "\r\nPrecision: " + Precision.ToString() + " ms";
-//            str += "\r\nPoll Interval: " + PollInterval.ToString() + " s";
-//            str += "\r\nReference ID: " + ReferenceID.ToString();
-//            str += "\r\nRoot Dispersion: " + RootDispersion.ToString() + " ms";
-//            str += "\r\nRound Trip Delay: " + RoundTripDelay.ToString() + " ms";
-//            str += "\r\nLocal Clock Offset: " + LocalClockOffset.ToString() + " ms";
-//            str += "\r\n";
-
-//            return str;
-//        }
-
-//        /// <summary>
-//        /// 系统时间结构体
-//        /// </summary>
-//        [StructLayoutAttribute(LayoutKind.Sequential)]
-//        private struct SYSTEMTIME
-//        {
-//            public short year;
-//            public short month;
-//            public short dayOfWeek;
-//            public short day;
-//            public short hour;
-//            public short minute;
-//            public short second;
-//            public short milliseconds;
-//        }
-
-//        [DllImport("kernel32.dll")]
-//        static extern bool SetLocalTime(ref SYSTEMTIME time);
-
-
-//        // Set system time according to transmit timestamp
-//        private void SetTime()
-//        {
-//            SYSTEMTIME st;
-
-//            DateTime trts = TransmitTimestamp;
-//            st.year = (short)trts.Year;
-//            st.month = (short)trts.Month;
-//            st.dayOfWeek = (short)trts.DayOfWeek;
-//            st.day = (short)trts.Day;
-//            st.hour = (short)trts.Hour;
-//            st.minute = (short)trts.Minute;
-//            st.second = (short)trts.Second;
-//            st.milliseconds = (short)trts.Millisecond;
-
-//            SetLocalTime(ref st);
-//        }
-
-//        // The URL of the time server we're connecting to
-//        private string TimeServer;
-//    }
-//}
\ No newline at end of file
diff --git a/NewLife.Net/NTP/NTPEnum.cs b/NewLife.Net/NTP/NTPEnum.cs
deleted file mode 100644
index f64f42d1f8..0000000000
--- a/NewLife.Net/NTP/NTPEnum.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-﻿
-namespace NewLife.Net.NTP
-{
-    /// <summary>Leap indicator</summary>
-    public enum NTPLeapIndicator
-    {
-        /// <summary>0 - No warning</summary>
-        NoWarning,
-
-        /// <summary>1 - Last minute has 61 seconds</summary>
-        LastMinute61,
-
-        /// <summary>2 - Last minute has 59 seconds</summary>
-        LastMinute59,
-
-        /// <summary>3 - Alarm condition (clock not synchronized)</summary>
-        Alarm
-    }
-
-    /// <summary>Mode</summary>
-    public enum NTPMode
-    {
-        /// <summary>未知</summary>
-        Reserved,
-
-        /// <summary>1 - Symmetric active</summary>
-        SymmetricActive,
-
-        /// <summary>2 - Symmetric pasive</summary>
-        SymmetricPassive,
-
-        /// <summary>3 - Client</summary>
-        Client,
-
-        /// <summary>4 - Server</summary>
-        Server,
-
-        /// <summary>5 - Broadcast</summary>
-        Broadcast,
-
-        /// <summary>6 - reserved for NTP control message</summary>
-        ReservedForNTPControlMessage,
-
-        /// <summary>7 - reserved for private use</summary>
-        ReservedForPrivateUse
-    }
-
-    /// <summary>Stratum</summary>
-    public enum NTPStratum
-    {
-        /// <summary>0 - unspecified or unavailable</summary>
-        Unspecified,
-
-        /// <summary>1 - primary reference (e.g. radio-clock)</summary>
-        PrimaryReference,
-
-        /// <summary>2-15 - secondary reference (via NTP or SNTP)</summary>
-        SecondaryReference,
-
-        /// <summary>16-255 - reserved</summary>
-        Reserved
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/NetService.cs b/NewLife.Net/NetService.cs
deleted file mode 100644
index a825df4467..0000000000
--- a/NewLife.Net/NetService.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-﻿using System;
-using System.Net.Sockets;
-using NewLife.Model;
-using NewLife.Net.Proxy;
-using NewLife.Net.Sockets;
-
-namespace NewLife.Net
-{
-    /// <summary>网络服务对象提供者</summary>
-    public class NetService //: ServiceContainer<NetService>
-    {
-        #region 当前静态服务容器
-        /// <summary>当前对象容器</summary>
-        public static IObjectContainer Container { get { return ObjectContainer.Current; } }
-        #endregion
-
-        static NetService()
-        {
-            var container = Container;
-            container.Register<IProxySession, ProxySession>()
-                .Register<ISocketServer, TcpServer>(ProtocolType.Tcp)
-                .Register<ISocketServer, UdpServer>(ProtocolType.Udp)
-                .Register<ISocketClient, TcpSession>(ProtocolType.Tcp)
-                .Register<ISocketClient, UdpServer>(ProtocolType.Udp)
-                .Register<ISocketSession, TcpSession>(ProtocolType.Tcp)
-                //.Register<ISocketSession, UdpServer>(ProtocolType.Udp)
-                //.Register<IStatistics, Statistics>()
-                .Register<INetSession, NetSession>();
-        }
-
-        /// <summary>安装，引发静态构造函数</summary>
-        public static void Install() { }
-
-        #region 方法
-        /// <summary>根据网络标识创建客户端并连接（对Tcp）</summary>
-        /// <param name="uri"></param>
-        /// <returns></returns>
-        public static ISocketClient CreateClient(NetUri uri)
-        {
-            if (uri == null) throw new ArgumentNullException("uri");
-
-            var client = Container.Resolve<ISocketClient>(uri.ProtocolType);
-            //if (uri.EndPoint != null)
-            //{
-            //    if (uri.ProtocolType == ProtocolType.Tcp) client.Connect(uri.EndPoint);
-            //}
-            client.Remote = uri;
-
-            return client;
-        }
-
-        /// <summary>根据网络标识创建客户端会话并连接（对Tcp）</summary>
-        /// <param name="uri"></param>
-        /// <param name="timeout">数据接收超时时间</param>
-        /// <returns></returns>
-        public static ISocketSession CreateSession(NetUri uri, int timeout = 3000)
-        {
-            if (uri == null) throw new ArgumentNullException("uri");
-
-            // 特殊处理UDP
-            if (uri.ProtocolType == ProtocolType.Udp)
-            {
-                var server = Container.Resolve<ISocketServer>(uri.ProtocolType);
-                if (server is UdpServer)
-                {
-                    var udp = server as UdpServer;
-                    udp.Timeout = timeout;
-                    //udp.Open();
-                    //udp.ReceiveAsync();
-                    return udp.CreateSession(uri.EndPoint);
-                }
-            }
-
-            var client = Container.Resolve<ISocketSession>(uri.ProtocolType);
-            if (uri.EndPoint != null)
-            {
-                //if (uri.ProtocolType == ProtocolType.Tcp) (client as ISocketClient).Connect(uri.EndPoint);
-                if (client is ISocketClient && !uri.EndPoint.IsAny()) //(client as ISocketClient).Connect(uri.EndPoint);
-                {
-                    var socketClient = client as ISocketClient;
-                    socketClient.Timeout = timeout;
-                }
-            }
-            client.Remote = uri;
-
-            return client;
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/NewLife.Net.csproj b/NewLife.Net/NewLife.Net.csproj
deleted file mode 100644
index 3a39733b70..0000000000
--- a/NewLife.Net/NewLife.Net.csproj
+++ /dev/null
@@ -1,283 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{5A8EF50C-3394-4C1E-99F0-33EFE8691CB0}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>NewLife.Net</RootNamespace>
-    <AssemblyName>NewLife.Net</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\..\Bin\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DocumentationFile>..\..\Bin\NewLife.Net.XML</DocumentationFile>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <OutputPath>..\..\Bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DocumentationFile>..\..\Bin\NewLife.Net.XML</DocumentationFile>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Web.Services" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Application\AppTest.cs" />
-    <Compile Include="Application\ChargenServer.cs" />
-    <Compile Include="Application\DaytimeServer.cs" />
-    <Compile Include="Application\DiscardServer.cs" />
-    <Compile Include="Application\EchoHandler.cs" />
-    <Compile Include="Application\LogServer.cs" />
-    <Compile Include="Application\EchoServer.cs" />
-    <Compile Include="Application\SerialServer.cs" />
-    <Compile Include="CoAP\CoAPMessage.cs" />
-    <Compile Include="Dhcp\DhcpClient.cs" />
-    <Compile Include="Dhcp\DhcpMessageType.cs" />
-    <Compile Include="Dhcp\DhcpEntity.cs" />
-    <Compile Include="Dhcp\DhcpOption.cs" />
-    <Compile Include="Dhcp\DhcpServer.cs" />
-    <Compile Include="Dhcp\DhcpSession.cs" />
-    <Compile Include="DNS\BinaryDNS.cs" />
-    <Compile Include="DNS\DNSClient.cs" />
-    <Compile Include="DNS\DNSEntity.cs" />
-    <Compile Include="DNS\DNSHeader.cs" />
-    <Compile Include="DNS\DNSNameAccessor.cs" />
-    <Compile Include="DNS\DNSOpcodeType.cs" />
-    <Compile Include="DNS\DNSQueryType.cs" />
-    <Compile Include="DNS\DNSRcodeType.cs" />
-    <Compile Include="DNS\DNSRecord.cs" />
-    <Compile Include="DNS\DNSServer.cs" />
-    <Compile Include="DNS\DNS_A.cs" />
-    <Compile Include="DNS\DNS_AAAA.cs" />
-    <Compile Include="DNS\DNS_CNAME.cs" />
-    <Compile Include="DNS\DNS_MX.cs" />
-    <Compile Include="DNS\DNS_NB.cs" />
-    <Compile Include="DNS\DNS_NS.cs" />
-    <Compile Include="DNS\DNS_PTR.cs" />
-    <Compile Include="DNS\DNS_SOA.cs" />
-    <Compile Include="DNS\DNS_TXT.cs" />
-    <Compile Include="DNS\NetBIOS.cs" />
-    <Compile Include="Flash\SandBoxServer.cs" />
-    <Compile Include="FTP\FTPClient.cs" />
-    <Compile Include="FTP\FTPItem.cs" />
-    <Compile Include="FTP\FTPServer.cs" />
-    <Compile Include="FTP\FTPSession.cs" />
-    <Compile Include="FTP\FTPTransferMode.cs" />
-    <Compile Include="Http\HttpCache.cs" />
-    <Compile Include="ISO\COTP.cs" />
-    <Compile Include="ISO\TPKT.cs" />
-    <Compile Include="Modbus\DataStore.cs" />
-    <Compile Include="Modbus\Errors.cs" />
-    <Compile Include="Modbus\IDataStore.cs" />
-    <Compile Include="Modbus\IOHelper.cs" />
-    <Compile Include="Modbus\MBFunction.cs" />
-    <Compile Include="Modbus\ModbusEntity.cs" />
-    <Compile Include="Modbus\ModbusException.cs" />
-    <Compile Include="Modbus\ModbusMaster.cs" />
-    <Compile Include="Modbus\ModbusSlave.cs" />
-    <Compile Include="Model\DataEventArgs.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="MQTT\MqttMessage.cs" />
-    <Compile Include="MQTT\MqttType.cs" />
-    <Compile Include="Http\HttpHeader.cs" />
-    <Compile Include="MQTT\QualityOfService.cs" />
-    <Compile Include="NTP\NTPClient.cs" />
-    <Compile Include="Application\TimeServer.cs" />
-    <Compile Include="IO\FileClient.cs" />
-    <Compile Include="IO\FileFormat.cs" />
-    <Compile Include="IO\FileServer.cs" />
-    <Compile Include="NTP\NTPEnum.cs" />
-    <Compile Include="NTP\NTP.cs" />
-    <Compile Include="P2P\HoleServer.cs" />
-    <Compile Include="P2P\P2PClient.cs" />
-    <Compile Include="P2P\P2PTest.cs" />
-    <Compile Include="Pop3\Pop3Client.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Pop3\Pop3Server.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Pop3\Pop3Session.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Proxy\HttpProxy.cs" />
-    <Compile Include="Proxy\HttpReverseProxy.cs" />
-    <Compile Include="Proxy\IProxy.cs" />
-    <Compile Include="Proxy\IProxySession.cs" />
-    <Compile Include="Proxy\ProxySession.cs" />
-    <Compile Include="Proxy\ProxyBase.cs" />
-    <Compile Include="Proxy\NATProxy.cs" />
-    <Compile Include="Sdp\SdpAttribute.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sdp\SdpConnection.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sdp\SdpMediaDescription.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sdp\SdpMessage.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sdp\SdpOrigin.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sdp\SdpTime.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="SGIP\SGIPBind.cs" />
-    <Compile Include="SGIP\SGIPClient.cs" />
-    <Compile Include="SGIP\SGIPDeliver.cs" />
-    <Compile Include="SGIP\SGIPEntity.cs" />
-    <Compile Include="SGIP\SGIPReport.cs" />
-    <Compile Include="SGIP\SGIPServer.cs" />
-    <Compile Include="SGIP\SGIPSubmit.cs" />
-    <Compile Include="SGIP\SGIPUnbind.cs" />
-    <Compile Include="Sip\Message\Sip.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sip\Message\SipACValue.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sip\Message\SipAddressParam.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sip\Message\SipAlertParam.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sip\Message\SipContactParam.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sip\Message\SipContentDisposition.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sip\Message\SipEncoding.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sip\Message\SipErrorUri.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sip\Message\SipEvent.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sip\Message\SipFrom.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sip\Message\SipHiEntry.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sip\Message\SipIdentityInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sip\Message\SipInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sip\Message\SipJoin.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sip\Message\SipNameAddress.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sip\Message\SipValue.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sip\Message\SipValueWithParams.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Smtp\RelayServer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Smtp\RelaySession.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Smtp\SmtpClient.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Smtp\SmtpServer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Smtp\SmtpSession.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sockets\Netbase.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Stress\TcpStressClient.cs" />
-    <Compile Include="Stress\TcpStressConfig.cs" />
-    <Compile Include="Stress\TcpStress.cs" />
-    <Compile Include="Stun\StunAttribute.cs" />
-    <Compile Include="Stun\StunClient.cs" />
-    <Compile Include="Stun\StunMessage.cs" />
-    <Compile Include="Stun\StunMessageType.cs" />
-    <Compile Include="Stun\StunNetType.cs" />
-    <Compile Include="Stun\StunResult.cs" />
-    <Compile Include="Stun\StunServer.cs" />
-    <Compile Include="TDP\TDPClient.cs" />
-    <Compile Include="TDP\TDPFlags.cs" />
-    <Compile Include="TDP\TDPPacket.cs" />
-    <Compile Include="Telnet\TelnetClient.cs" />
-    <Compile Include="Telnet\TelnetServer.cs" />
-    <Compile Include="Telnet\TelnetSession.cs" />
-    <Compile Include="UPnP\Entities\Device.cs" />
-    <Compile Include="UPnP\Entities\Envelope.cs" />
-    <Compile Include="UPnP\Entities\InternetGatewayDevice.cs" />
-    <Compile Include="UPnP\Entities\PortMappingEntry.cs" />
-    <Compile Include="UPnP\Entities\Service.cs" />
-    <Compile Include="UPnP\Entities\SpecVersion.cs" />
-    <Compile Include="UPnP\UPnPAction.cs" />
-    <Compile Include="UPnP\UPnPClient.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="App.config">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <None Include="SNTP\SNTPClient.cs" />
-    <None Include="TDP\TDP.pdf" />
-    <None Include="架构设计\网络模型.cd" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Modbus\Modbus说明.txt" />
-    <Content Include="说明.txt" />
-    <EmbeddedResource Include="UpdateInfo.txt" />
-    <Content Include="架构设计\NewLife_SocketClient.jpg" />
-    <Content Include="架构设计\NewLife_TcpServer.jpg" />
-    <Content Include="架构设计\NewLife_TCP状态变迁.jpg" />
-    <Content Include="架构设计\NewLife_UdpServer.jpg" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\NewLife.Core\NewLife.Core.csproj">
-      <Project>{5813C22E-EEB3-4DEE-A45C-BB218041193A}</Project>
-      <Name>NewLife.Core</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/NewLife.Net/NewLife.Net40.csproj b/NewLife.Net/NewLife.Net40.csproj
deleted file mode 100644
index dd4000d7ac..0000000000
--- a/NewLife.Net/NewLife.Net40.csproj
+++ /dev/null
@@ -1,282 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{5A8EF50C-3394-4C1E-99F0-33EFE8691CB0}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>NewLife.Net</RootNamespace>
-    <AssemblyName>NewLife.Net</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\..\Bin4\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NET4</DefineConstants>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DocumentationFile>..\..\Bin4\NewLife.Net.XML</DocumentationFile>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>..\..\Bin4\</OutputPath>
-    <DefineConstants>TRACE;NET4</DefineConstants>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DocumentationFile>..\..\Bin4\NewLife.Net.XML</DocumentationFile>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Web.Services" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Application\AppTest.cs" />
-    <Compile Include="Application\ChargenServer.cs" />
-    <Compile Include="Application\DaytimeServer.cs" />
-    <Compile Include="Application\DiscardServer.cs" />
-    <Compile Include="Application\EchoHandler.cs" />
-    <Compile Include="Application\LogServer.cs" />
-    <Compile Include="Application\EchoServer.cs" />
-    <Compile Include="Application\SerialServer.cs" />
-    <Compile Include="CoAP\CoAPMessage.cs" />
-    <Compile Include="Dhcp\DhcpClient.cs" />
-    <Compile Include="Dhcp\DhcpMessageType.cs" />
-    <Compile Include="Dhcp\DhcpEntity.cs" />
-    <Compile Include="Dhcp\DhcpOption.cs" />
-    <Compile Include="Dhcp\DhcpServer.cs" />
-    <Compile Include="Dhcp\DhcpSession.cs" />
-    <Compile Include="DNS\BinaryDNS.cs" />
-    <Compile Include="DNS\DNSClient.cs" />
-    <Compile Include="DNS\DNSEntity.cs" />
-    <Compile Include="DNS\DNSHeader.cs" />
-    <Compile Include="DNS\DNSNameAccessor.cs" />
-    <Compile Include="DNS\DNSOpcodeType.cs" />
-    <Compile Include="DNS\DNSQueryType.cs" />
-    <Compile Include="DNS\DNSRcodeType.cs" />
-    <Compile Include="DNS\DNSRecord.cs" />
-    <Compile Include="DNS\DNSServer.cs" />
-    <Compile Include="DNS\DNS_A.cs" />
-    <Compile Include="DNS\DNS_AAAA.cs" />
-    <Compile Include="DNS\DNS_CNAME.cs" />
-    <Compile Include="DNS\DNS_MX.cs" />
-    <Compile Include="DNS\DNS_NB.cs" />
-    <Compile Include="DNS\DNS_NS.cs" />
-    <Compile Include="DNS\DNS_PTR.cs" />
-    <Compile Include="DNS\DNS_SOA.cs" />
-    <Compile Include="DNS\DNS_TXT.cs" />
-    <Compile Include="DNS\NetBIOS.cs" />
-    <Compile Include="Flash\SandBoxServer.cs" />
-    <Compile Include="FTP\FTPClient.cs" />
-    <Compile Include="FTP\FTPItem.cs" />
-    <Compile Include="FTP\FTPServer.cs" />
-    <Compile Include="FTP\FTPSession.cs" />
-    <Compile Include="FTP\FTPTransferMode.cs" />
-    <Compile Include="Http\HttpCache.cs" />
-    <Compile Include="ISO\COTP.cs" />
-    <Compile Include="ISO\TPKT.cs" />
-    <Compile Include="Modbus\DataStore.cs" />
-    <Compile Include="Modbus\Errors.cs" />
-    <Compile Include="Modbus\IDataStore.cs" />
-    <Compile Include="Modbus\IOHelper.cs" />
-    <Compile Include="Modbus\MBFunction.cs" />
-    <Compile Include="Modbus\ModbusEntity.cs" />
-    <Compile Include="Modbus\ModbusException.cs" />
-    <Compile Include="Modbus\ModbusMaster.cs" />
-    <Compile Include="Modbus\ModbusSlave.cs" />
-    <Compile Include="Model\DataEventArgs.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="MQTT\MqttMessage.cs" />
-    <Compile Include="MQTT\MqttType.cs" />
-    <Compile Include="MQTT\QualityOfService.cs" />
-    <Compile Include="Http\HttpHeader.cs" />
-    <Compile Include="NTP\NTPClient.cs" />
-    <Compile Include="Application\TimeServer.cs" />
-    <Compile Include="IO\FileClient.cs" />
-    <Compile Include="IO\FileFormat.cs" />
-    <Compile Include="IO\FileServer.cs" />
-    <Compile Include="NTP\NTPEnum.cs" />
-    <Compile Include="NTP\NTP.cs" />
-    <Compile Include="P2P\HoleServer.cs" />
-    <Compile Include="P2P\P2PClient.cs" />
-    <Compile Include="P2P\P2PTest.cs" />
-    <Compile Include="Pop3\Pop3Client.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Pop3\Pop3Server.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Pop3\Pop3Session.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Proxy\HttpProxy.cs" />
-    <Compile Include="Proxy\HttpReverseProxy.cs" />
-    <Compile Include="Proxy\IProxy.cs" />
-    <Compile Include="Proxy\IProxySession.cs" />
-    <Compile Include="Proxy\ProxySession.cs" />
-    <Compile Include="Proxy\ProxyBase.cs" />
-    <Compile Include="Proxy\NATProxy.cs" />
-    <Compile Include="Sdp\SdpAttribute.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sdp\SdpConnection.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sdp\SdpMediaDescription.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sdp\SdpMessage.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sdp\SdpOrigin.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sdp\SdpTime.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="SGIP\SGIPBind.cs" />
-    <Compile Include="SGIP\SGIPClient.cs" />
-    <Compile Include="SGIP\SGIPDeliver.cs" />
-    <Compile Include="SGIP\SGIPEntity.cs" />
-    <Compile Include="SGIP\SGIPReport.cs" />
-    <Compile Include="SGIP\SGIPServer.cs" />
-    <Compile Include="SGIP\SGIPSubmit.cs" />
-    <Compile Include="SGIP\SGIPUnbind.cs" />
-    <Compile Include="Sip\Message\Sip.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sip\Message\SipACValue.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sip\Message\SipAddressParam.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sip\Message\SipAlertParam.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sip\Message\SipContactParam.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sip\Message\SipContentDisposition.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sip\Message\SipEncoding.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sip\Message\SipErrorUri.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sip\Message\SipEvent.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sip\Message\SipFrom.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sip\Message\SipHiEntry.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sip\Message\SipIdentityInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sip\Message\SipInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sip\Message\SipJoin.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sip\Message\SipNameAddress.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sip\Message\SipValue.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sip\Message\SipValueWithParams.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Smtp\RelayServer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Smtp\RelaySession.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Smtp\SmtpClient.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Smtp\SmtpServer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Smtp\SmtpSession.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sockets\Netbase.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Stress\TcpStressClient.cs" />
-    <Compile Include="Stress\TcpStressConfig.cs" />
-    <Compile Include="Stress\TcpStress.cs" />
-    <Compile Include="Stun\StunAttribute.cs" />
-    <Compile Include="Stun\StunClient.cs" />
-    <Compile Include="Stun\StunMessage.cs" />
-    <Compile Include="Stun\StunMessageType.cs" />
-    <Compile Include="Stun\StunNetType.cs" />
-    <Compile Include="Stun\StunResult.cs" />
-    <Compile Include="Stun\StunServer.cs" />
-    <Compile Include="TDP\TDPClient.cs" />
-    <Compile Include="TDP\TDPFlags.cs" />
-    <Compile Include="TDP\TDPPacket.cs" />
-    <Compile Include="Telnet\TelnetClient.cs" />
-    <Compile Include="Telnet\TelnetServer.cs" />
-    <Compile Include="Telnet\TelnetSession.cs" />
-    <Compile Include="UPnP\Entities\Device.cs" />
-    <Compile Include="UPnP\Entities\Envelope.cs" />
-    <Compile Include="UPnP\Entities\InternetGatewayDevice.cs" />
-    <Compile Include="UPnP\Entities\PortMappingEntry.cs" />
-    <Compile Include="UPnP\Entities\Service.cs" />
-    <Compile Include="UPnP\Entities\SpecVersion.cs" />
-    <Compile Include="UPnP\UPnPAction.cs" />
-    <Compile Include="UPnP\UPnPClient.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="App.config">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <None Include="SNTP\SNTPClient.cs" />
-    <None Include="TDP\TDP.pdf" />
-    <None Include="架构设计\网络模型.cd" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Modbus\Modbus说明.txt" />
-    <Content Include="说明.txt" />
-    <EmbeddedResource Include="UpdateInfo.txt" />
-    <Content Include="架构设计\NewLife_SocketClient.jpg" />
-    <Content Include="架构设计\NewLife_TcpServer.jpg" />
-    <Content Include="架构设计\NewLife_TCP状态变迁.jpg" />
-    <Content Include="架构设计\NewLife_UdpServer.jpg" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\NewLife.Core\NewLife.Core40.csproj">
-      <Project>{5813c22e-eeb3-4dee-a45c-bb218041193a}</Project>
-      <Name>NewLife.Core40</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/NewLife.Net/P2P/HoleServer.cs b/NewLife.Net/P2P/HoleServer.cs
deleted file mode 100644
index 0786556740..0000000000
--- a/NewLife.Net/P2P/HoleServer.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading;
-using NewLife.Net.Sockets;
-
-namespace NewLife.Net.P2P
-{
-    /// <summary>打洞服务器</summary>
-    /// <remarks>
-    /// Tcp打洞流程（A想连接B）：
-    /// 1，客户端A通过路由器NAT-A连接打洞服务器S
-    /// 2，A向S发送标识，异步等待响应
-    /// 3，S记录A的标识和会话<see cref="ISocketClient"/>
-    /// 3，客户端B，从业务通道拿到标识
-    /// 4，B通过路由器NAT-B连接打洞服务器S，异步等待响应
-    /// 5，B向S发送标识
-    /// 6，S找到匹配标识，同时向AB会话响应对方的外网地址，会话结束
-    /// 7，AB收到响应，B先连接A，A暂停一会后连接B
-    /// </remarks>
-    public class HoleServer : NetServer
-    {
-        #region 属性
-        private Dictionary<String, INetSession> _Clients;
-        /// <summary>客户端集合</summary>
-        public IDictionary<String, INetSession> Clients { get { return _Clients ?? (_Clients = new Dictionary<String, INetSession>(StringComparer.OrdinalIgnoreCase)); } }
-        #endregion
-
-        #region 方法
-        /// <summary>收到数据时</summary>
-        /// <param name="session"></param>
-        /// <param name="stream"></param>
-        protected override void OnReceive(INetSession session, Stream stream)
-        {
-            var remoteEP = session.Remote.EndPoint;
-
-            var str = stream.ToStr();
-            WriteLog("");
-            WriteLog(remoteEP + "=>" + session.Session.Local.EndPoint + " " + str);
-
-            var ss = str.Split(":");
-            ss[0] = ss[0].ToLower();
-            if (ss[0] == "reg")
-            {
-                var name = ss[1];
-                if (!Clients.TryGetValue(name, out var ns))
-                {
-                    // 集合里面没有，认为是发起邀请方，做好记录
-                    ns = new NetSession();
-                    //ns.Server = sender as ISocketServer;
-                    ns.Session = session.Session;
-                    //ns.ClientEndPoint = remoteEP;
-                    Clients[name] = ns;
-                    session.OnDisposed += (s, e2) => ns.Dispose();
-                    ns.OnDisposed += (s, e2) => Clients.Remove(name);
-
-                    //session.Send("注册成功！你的公网地址是：" + client, null, client);
-                    session.Send("注册成功！你的公网地址是：" + remoteEP, null);
-
-                    WriteLog("邀请已建立：{0}", name);
-                }
-                else
-                {
-                    // 如果连续注册两次可能会有问题，这里要处理一下
-                    //if ("" + ns.ClientEndPoint == "" + remoteEP)
-                    //    session.Send("Has Register!", null);
-                    //else
-                    {
-                        // 到这里，应该是被邀请方到来，同时响应双方
-                        session.Send(remoteEP.ToString(), null);
-
-                        // 同时还要通知对方
-                        ns.Session.Send(remoteEP.ToString(), null);
-
-                        WriteLog("邀请已接受：{0} {1} {2}", name, remoteEP, remoteEP);
-
-                        Clients.Remove(name);
-                        Thread.Sleep(1000);
-                        //session.Disconnect();
-                        //if (ns.Session != null) ns.Session.Disconnect();
-                        session.Dispose();
-                        ns.Session.Dispose();
-                    }
-                }
-            }
-            else if (ss[0] == "invite")
-            {
-                if (Clients.TryGetValue(ss[1], out var ns))
-                {
-                    session.Send("invite:" + remoteEP, null);
-
-                    // 同时还要通知对方
-                    ns.Session.Send("invite:" + remoteEP.ToString(), null);
-                }
-                else
-                    session.Send("Not Found!", null);
-            }
-            else
-            {
-                if (!str.Contains("P2P")) session.Send("无法处理的信息：" + str, null);
-            }
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/P2P/P2PClient.cs b/NewLife.Net/P2P/P2PClient.cs
deleted file mode 100644
index 1729057baf..0000000000
--- a/NewLife.Net/P2P/P2PClient.cs
+++ /dev/null
@@ -1,280 +0,0 @@
-﻿using System;
-using System.Net;
-using System.Net.Sockets;
-using System.Threading;
-using NewLife.Net.Sockets;
-using NewLife.Security;
-
-namespace NewLife.Net.P2P
-{
-    /// <summary>P2P客户端</summary>
-    /// <remarks>
-    /// Tcp打洞流程（A想连接B）：
-    /// 1，客户端A通过路由器NAT-A连接打洞服务器S
-    /// 2，A向S发送标识，异步等待响应
-    /// 3，S记录A的标识和会话<see cref="ISocketClient"/>
-    /// 3，客户端B，从业务通道拿到标识
-    /// 4，B通过路由器NAT-B连接打洞服务器S，异步等待响应
-    /// 5，B向S发送标识
-    /// 6，S找到匹配标识，同时向AB会话响应对方的外网地址，会话结束
-    /// 7，AB收到响应，B先连接A，A暂停一会后连接B
-    /// 
-    /// 经鉴定，我认为网络上所有关于TCP穿透的文章，全部都是在胡扯
-    /// 不外乎几种可能：
-    /// 1，双方都在同一个内网
-    /// 2，通过服务器中转所有数据
-    /// 3，臆断，认为那样子就可行。包括许多论文也是这个说法，我中的这招，不经过NAT会成功，经过最流行的TP-LINK就无法成功
-    /// </remarks>
-    public class P2PClient : Netbase
-    {
-        #region 属性
-        private ISocketServer _Server;
-        /// <summary>客户端</summary>
-        public ISocketServer Server { get { return _Server; } set { _Server = value; } }
-
-        private IPEndPoint _HoleServer;
-        /// <summary>打洞服务器地址</summary>
-        public IPEndPoint HoleServer { get { return _HoleServer; } set { _HoleServer = value; } }
-
-        private ISocketClient _Client;
-        /// <summary>客户端</summary>
-        public ISocketClient Client { get { return _Client; } set { _Client = value; } }
-
-        private NetType _ProtocolType = NetType.Udp;
-        /// <summary>协议</summary>
-        public NetType ProtocolType { get { return _ProtocolType; } set { _ProtocolType = value; } }
-
-        private IPEndPoint _ParterAddress;
-        /// <summary>目标伙伴地址</summary>
-        public IPEndPoint ParterAddress { get { return _ParterAddress; } set { _ParterAddress = value; } }
-
-        private Int32 _Success;
-        /// <summary>是否成功</summary>
-        public Int32 Success { get { return _Success; } set { _Success = value; } }
-        #endregion
-
-        #region 方法
-        /// <summary></summary>
-        public void EnsureServer()
-        {
-            if (Server == null)
-            {
-                if (ProtocolType == NetType.Tcp)
-                {
-                    var server = new TcpServer();
-                    Server = server;
-                    //server.ReuseAddress = true;
-                    server.NewSession += server_Accepted;
-                }
-                else
-                {
-                    var server = new UdpServer();
-                    //Server = server;
-                    //server.ReuseAddress = true;
-                    server.Received += server_Received;
-                    //server.Bind();
-                    server.Open();
-                }
-
-                Server.Start();
-
-                WriteLog("监听：{0}", Server);
-            }
-        }
-
-        void server_Received(Object sender, ReceivedEventArgs e)
-        {
-            var session = sender as ISocketSession;
-
-            var str = e.Stream.ToStr();
-            var remote = "" + session.Remote.EndPoint;
-            if (remote == "" + HoleServer)
-            {
-                WriteLog("HoleServer数据到来：{0} {1}", session.Remote, str);
-
-                var ss = str.Split(":");
-                if (ss == null || ss.Length < 2) return;
-
-                if (!IPAddress.TryParse(ss[0], out var address)) return;
-                if (!Int32.TryParse(ss[1], out var port)) return;
-                var ep = new IPEndPoint(address, port);
-                ParterAddress = ep;
-
-                Console.WriteLine("准备连接对方：{0}", ep);
-                while (Success <= 0)
-                {
-                    (Server as UdpServer).Client.Send("Hello!", null, ep);
-
-                    Thread.Sleep(100);
-                    if (Success > 0) break;
-                    Thread.Sleep(3000);
-                }
-            }
-            else if (remote == "" + ParterAddress)
-            {
-                WriteLog("Parter数据到来：{0} {1}", session.Remote, str);
-                //Success = true;
-                if (Success > 0) Success++;
-
-                //var session = e.Session;
-                if (session != null)
-                {
-                    session.Send("P2P连接已建立！", null);
-                    WriteLog("P2P连接已建立！");
-                    session.Send("我与" + session.Remote + "的P2P连接已建立！", null);
-
-                    while (true)
-                    {
-                        Console.Write("请输入要说的话：");
-                        var line = Console.ReadLine();
-                        if (String.IsNullOrEmpty(line)) continue;
-                        if (line == "exit") break;
-
-                        session.Send(line, null);
-                        Console.WriteLine("已发送！");
-                    }
-                }
-            }
-            else
-            {
-                WriteLog("未识别的数据到来：{0} {1}", session.Remote, str);
-            }
-        }
-
-        void server_Accepted(Object sender, SessionEventArgs e)
-        {
-            var session = e.Session as ISocketSession;
-            WriteLog("连接到来：{0}", session.Remote);
-
-            if (session != null)
-            {
-                session.Received += client_Received;
-                session.Send("P2P连接已建立！");
-                WriteLog("P2P连接已建立！");
-            }
-        }
-
-        void EnsureClient()
-        {
-            EnsureServer();
-            if (Client == null)
-            {
-                var server = Server;
-
-                var client = new TcpSession();
-                Client = client;
-                //client.Address = server.LocalEndPoint.Address;
-                //client.Port = server.LocalEndPoint.Port;
-                //client.ReuseAddress = true;
-                //client.Connect(HoleServer);
-                //var session = client.CreateSession();
-                var session = client as ISocketSession;
-                session.Received += client_Received;
-                client.Open();
-            }
-        }
-
-        void client_Received(Object sender, ReceivedEventArgs e)
-        {
-            //WriteLog("数据到来：{0} {1}", e.RemoteIPEndPoint, e.GetString());
-
-            //var ss = e.GetString().Split(":");
-            var ss = e.Stream.ToStr().Split(":");
-            if (ss == null || ss.Length < 2) return;
-
-            if (!IPAddress.TryParse(ss[0], out var address)) return;
-            if (!Int32.TryParse(ss[1], out var port)) return;
-            var ep = new IPEndPoint(address, port);
-            ParterAddress = ep;
-
-            Client.Dispose();
-            var server = Server;
-
-            //Random rnd = new Random((Int32)DateTime.Now.Ticks);
-            Thread.Sleep(Rand.Next(0, 2000));
-
-            var client = new TcpSession();
-            Client = client;
-            //client.Address = server.LocalEndPoint.Address;
-            //client.Port = server.LocalEndPoint.Port;
-            //client.ReuseAddress = true;
-            client.Local.EndPoint = server.Local.EndPoint;
-            Console.WriteLine("准备连接对方：{0}", ep);
-            try
-            {
-                //client.Connect(ep);
-                client.Received += client_Received2;
-                client.Open();
-
-                Client.Send("Hello!");
-            }
-            catch (Exception ex)
-            {
-                WriteLog(ex.Message);
-            }
-        }
-
-        void client_Received2(Object sender, ReceivedEventArgs e)
-        {
-            var session = sender as ISocketSession;
-            WriteLog("数据到来2：{0} {1}", session.Remote, e.Stream.ToStr());
-        }
-        #endregion
-
-        #region 业务
-        /// <summary>开始处理</summary>
-        /// <param name="name">名称</param>
-        public void Start(String name)
-        {
-            if (String.IsNullOrEmpty(name)) throw new ArgumentNullException("name");
-
-            //if (ProtocolType == ProtocolType.Tcp) EnsureClient();
-
-            SendToHole("reg:" + name);
-
-            //while (ParterAddress == null)
-            //{
-            //    Server.Send("reg:" + name, null, HoleServer);
-            //    var ep = new IPEndPoint(HoleServer.Address, HoleServer.Port + 1);
-            //    Server.Send("checknat", null, ep);
-
-            //    Thread.Sleep(100);
-            //    if (ParterAddress != null) break;
-            //    Thread.Sleep(19000);
-            //}
-        }
-
-        void SendToHole(String msg)
-        {
-            var ep = new IPEndPoint(HoleServer.Address, HoleServer.Port + 1);
-            EnsureServer();
-            var server = Server as UdpServer;
-            if (server != null)
-            {
-                server.Client.Send(msg, null, HoleServer);
-                //server.Send("test", null, HoleServer);
-                if (msg.StartsWith("reg"))
-                {
-                    server.Client.Send("checknat", null, ep);
-                }
-            }
-            else
-            {
-                var client = new TcpSession() as ISocketSession;
-                //client.Address = Server.LocalEndPoint.Address;
-                //client.Port = Server.LocalEndPoint.Port;
-                //client.ReuseAddress = true;
-                //client.Connect(ep);
-                client.Local.EndPoint = Server.Local.EndPoint;
-                client.Send("checknat");
-                WriteLog("HoleServer数据到来：{0}", client.ReceiveString());
-                client.Dispose();
-
-                EnsureClient();
-                //Client.Send(msg, null);
-                Client.Send(msg);
-            }
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/P2P/P2PTest.cs b/NewLife.Net/P2P/P2PTest.cs
deleted file mode 100644
index a378c3ac36..0000000000
--- a/NewLife.Net/P2P/P2PTest.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-﻿using System;
-using System.Net;
-using System.Net.Sockets;
-
-namespace NewLife.Net.P2P
-{
-    /// <summary>P2P测试</summary>
-    public static class P2PTest
-    {
-        /// <summary>开始</summary>
-        /// <param name="port"></param>
-        public static void StartHole(Int32 port = 15)
-        {
-            var server = new HoleServer();
-            server.AddServer(IPAddress.Any, port);
-            server.AddServer(IPAddress.Any, port + 1);
-            server.Start();
-        }
-
-        /// <summary>开始客户端</summary>
-        /// <param name="name">名称</param>
-        /// <param name="server"></param>
-        /// <param name="serverport"></param>
-        /// <param name="isTcp"></param>
-        public static void StartClient(String name, String server = "127.0.0.1", Int32 serverport = 15, Boolean isTcp = false)
-        {
-            var client = new P2PClient();
-            // 这里决定是Udp穿透还是Tcp穿透
-            if (isTcp) client.ProtocolType = NetType.Tcp;
-            client.HoleServer = new IPEndPoint(NetHelper.ParseAddress(server), serverport);
-            client.EnsureServer();
-            //var s = client.Server as UdpServer;
-            //s.Send("test", null, client.HoleServer);
-            //s.Send("nnhy", null, new IPEndPoint(client.HoleServer.Address, serverport + 1));
-            Console.WriteLine("任意键开始！");
-            Console.ReadKey(true);
-            client.Start(name);
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Pop3/Pop3Client.cs b/NewLife.Net/Pop3/Pop3Client.cs
deleted file mode 100644
index 318f913b01..0000000000
--- a/NewLife.Net/Pop3/Pop3Client.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-﻿
-namespace NewLife.Net.Pop3
-{
-    /// <summary>Pop3客户端</summary>
-    public class Pop3Client : DisposeBase
-    {
-        //TODO 未实现Pop3客户端
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Pop3/Pop3Server.cs b/NewLife.Net/Pop3/Pop3Server.cs
deleted file mode 100644
index 4b106eea49..0000000000
--- a/NewLife.Net/Pop3/Pop3Server.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-﻿using System.Net.Sockets;
-using NewLife.Net.Sockets;
-
-namespace NewLife.Net.Pop3
-{
-    /// <summary>Pop3服务器</summary>
-    public class Pop3Server : NetServer<Pop3Session>
-    {
-        //TODO 未实现Pop3服务端
-
-        #region 属性
-        //private Dictionary<Int32, Pop3Session> _Sessions;
-        ///// <summary>会话集合</summary>
-        //public IDictionary<Int32, Pop3Session> Sessions { get { return _Sessions ?? (_Sessions = new Dictionary<int, Pop3Session>()); } }
-        #endregion
-
-        /// <summary>实例化一个Pop3服务器</summary>
-        public Pop3Server()
-        {
-            Port = 110;
-            ProtocolType = NetType.Tcp;
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Pop3/Pop3Session.cs b/NewLife.Net/Pop3/Pop3Session.cs
deleted file mode 100644
index 731f57b6f4..0000000000
--- a/NewLife.Net/Pop3/Pop3Session.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-﻿using NewLife.Net.Sockets;
-
-namespace NewLife.Net.Pop3
-{
-    /// <summary>Pop3会话</summary>
-    public class Pop3Session : NetSession
-    {
-        //TODO 未实现Pop3会话
-
-        #region 属性
-
-        #endregion
-
-        #region 启动会话
-        //void Start()
-        //{
-
-        //}
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Properties/AssemblyInfo.cs b/NewLife.Net/Properties/AssemblyInfo.cs
deleted file mode 100644
index 31d2639681..0000000000
--- a/NewLife.Net/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-﻿using System.Reflection;
-using System.Runtime.InteropServices;
-
-// 有关程序集的常规信息通过以下
-// 特性集控制。更改这些特性值可修改
-// 与程序集关联的信息。
-[assembly: AssemblyTitle("新生命网络库")]
-[assembly: AssemblyDescription("网络通讯基础框架及各种协议实现")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyProduct("NewLife.Net")]
-[assembly: AssemblyCompany("新生命开发团队")]
-[assembly: AssemblyCopyright("©2002-2018 新生命开发团队 http://www.NewLifeX.com")]
-[assembly: AssemblyTrademark("四叶草")]
-[assembly: AssemblyCulture("")]
-
-// 将 ComVisible 设置为 false 使此程序集中的类型
-// 对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型，
-// 则将该类型上的 ComVisible 特性设置为 true。
-[assembly: ComVisible(false)]
-
-// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
-[assembly: Guid("53d97538-79f2-49ac-890c-4cf4a0463946")]
-
-// 程序集的版本信息由下面四个值组成:
-//
-//      主版本
-//      次版本 
-//      内部版本号
-//      修订号
-//
-// 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
-// 方法是按如下所示使用“*”:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.2.*")]
-[assembly: AssemblyFileVersion("3.2.2016.0204")]
-
-/*
- * v3.2.2016.0204   增加网络统计，包括会话、发送、接收
- * 
- * v3.1.2015.0511   增加日志服务器LogServer，用于接收网络日志
- * 
- * v3.0.2014.1202   第三代网络库完成，回归APM模型，以简单为核心理念。网络基础测试通过，Tcp压力测试2w通过
- * 
- * v2.3.2013.0917   Modbus数据存储增加不触发写入事件的索引器操作
- * 
- * v2.3.2013.0716   升级Modbus协议，不再使用二进制序列化，保持和MF兼容
- * 
- * v2.2.2012.0420   采用NetUri精简代理会话
- *                  HttpProxy增加403缓存和静态文件缓存
- * 
- * v2.1.2012.0411   精简核心结构，进一步完善网络模型
- * 
- * v2.0.2012.0229   完全重构网络模型。划分为四层：Socket层、封装层ISocket、数据会话层ISocketSession、网络会话INetSession
- * 
- * v1.7.2012.0209   完善串口服务器和DNS服务器
- * 
- * v1.7.2011.1228   抽象网络接口，方便编写应用服务
- *                  优化事件参数对象池，避免内存泄漏
- *                  增加DNS协议解析
- *                  设计代理服务器架构
- *                  **经过几天的Echo压力测试，服务端连接数达到143711，CPU在1%~10%，内存WorkSet 523M，PrivateBytes 591M
- *                  一系列测试表明，服务端似乎没有连接上限，每次测试都以客户端端口用完导致“队列已满”异常而告终。
- *                  MS承认网络异步操作有内存泄漏，大量OverlappedData会留在内存，官方建议做法是减少异步操作。
- *                  此外，360安全软件会导致网络性能变得很差，客户端很容易崩溃。
- * 
- * v1.6.2011.0626   修正一个严重错误，TcpServer开始异步Accept时，不需要设置缓冲区，否则客户端连接后不会马上得到Accept事件，
- *                  而必须等到第一个数据包的到来才触发，那时缓冲区里面同时带有第一个数据包的数据。
- * 
- * v1.6.2011.0624   全面支持IPV6，并实现了隐式探测支持，只要用到IPV6的地址（本地和远程），就自动采用IPV6通信
- * 
- * v1.5.2011.0413   改善NetServer，不再作为抽象基类，通过指定协议类型可直接创建Tcp/Udp服务器
- *                  重写Echo服务器和数据流服务器，把Tcp/Udp的实现统一起来
- *                  实现另外四个简单网络服务器
- * 
- * v1.4.2010.1201   增加Socket数据流SocketStream
- *                  增加Tcp和Udp数据流网络服务
- * 
- * v1.3.2010.1107   使用SocketAsyncEventArgs重建网络模型
- *                  2010-11-16 调整完成，基本上满足万级连接下工作的要求，一万以上连接需要服务器拥有更多的处理器核心，硬件越强，程序工作越强！
- * 
- * v1.2.2010.0915   优化读写内存流ReadWriteStream，增加读写阻塞和超时、超大时自动压缩缓冲区的功能
- * 
- * v1.1.2010.0816   增加增强的TCP客户端TcpClientEx，使用内存流解决粘包问题
- * 
- * v1.0.2010.0803   创建网络库
- *
-**/
\ No newline at end of file
diff --git a/NewLife.Net/Proxy/HttpProxy.cs b/NewLife.Net/Proxy/HttpProxy.cs
deleted file mode 100644
index 3b40f7e379..0000000000
--- a/NewLife.Net/Proxy/HttpProxy.cs
+++ /dev/null
@@ -1,661 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net;
-using System.Net.Sockets;
-using System.Runtime.InteropServices;
-using Microsoft.Win32;
-using NewLife.Net.Http;
-
-namespace NewLife.Net.Proxy
-{
-    /// <summary>Http代理。可用于代理各种Http通讯请求。</summary>
-    /// <remarks>Http代理请求与普通请求唯一的不同就是Uri，Http代理请求收到的是可能包括主机名的完整Uri</remarks>
-    public class HttpProxy : ProxyBase<HttpProxy.Session>
-    {
-        #region 构造
-        /// <summary>实例化</summary>
-        public HttpProxy()
-        {
-            Port = 8080;
-            ProtocolType = NetType.Tcp;
-
-            Cache = new HttpCache();
-        }
-        #endregion
-
-        #region 事件
-        /// <summary>收到请求时发生。</summary>
-        public event EventHandler<HttpProxyEventArgs> OnRequest;
-
-        /// <summary>收到响应时发生。</summary>
-        public event EventHandler<HttpProxyEventArgs> OnResponse;
-
-        /// <summary>收到请求主体时发生。</summary>
-        public event EventHandler<HttpProxyEventArgs> OnRequestBody;
-
-        /// <summary>收到响应主体时发生。</summary>
-        public event EventHandler<HttpProxyEventArgs> OnResponseBody;
-
-        /// <summary>触发事件</summary>
-        /// <param name="session"></param>
-        /// <param name="kind"></param>
-        /// <param name="he"></param>
-        /// <returns>返回是否取消操作</returns>
-        Boolean RaiseEvent(HttpProxy.Session session, EventKind kind, HttpProxyEventArgs he)
-        {
-            var handler = GetHandler(kind);
-
-            if (handler != null) handler(session, he);
-
-            return he.Cancel;
-        }
-
-        EventHandler<HttpProxyEventArgs> GetHandler(EventKind kind)
-        {
-            switch (kind)
-            {
-                case EventKind.OnRequest:
-                    return OnRequest;
-                case EventKind.OnResponse:
-                    return OnResponse;
-                case EventKind.OnRequestBody:
-                    return OnRequestBody;
-                case EventKind.OnResponseBody:
-                    return OnResponseBody;
-                default:
-                    break;
-            }
-            return null;
-        }
-
-        enum EventKind
-        {
-            OnRequest,
-            OnResponse,
-            OnRequestBody,
-            OnResponseBody
-        }
-        #endregion
-
-        #region 缓存
-        /// <summary>激活缓存</summary>
-        public Boolean EnableCache { get; set; }
-
-        /// <summary>Http缓存</summary>
-        HttpCache Cache { get; set; }
-        #endregion
-
-        #region 会话
-        /// <summary>Http反向代理会话</summary>
-        public class Session : ProxySession<HttpProxy, Session>
-        {
-            /// <summary>当前正在处理的请求。一个连接同时只能处理一个请求，除非是Http 1.2</summary>
-            HttpHeader UnFinishedRequest;
-
-            /// <summary>已完成处理，正在转发数据的请求头</summary>
-            public HttpHeader Request;
-
-            /// <summary>收到客户端发来的数据。子类可通过重载该方法来修改数据</summary>
-            /// <remarks>
-            /// 如果数据包包括头部和主体，可以分开处理。
-            /// 最麻烦的就是数据包不是一个完整的头部，还落了一部分在后面的包上。
-            /// </remarks>
-            /// <param name="e"></param>
-            protected override void OnReceive(ReceivedEventArgs e)
-            {
-                if (e.Length == 0)
-                {
-                    base.OnReceive(e);
-                    return;
-                }
-
-                #region 解析请求头
-                // 解析请求头。
-                var stream = e.Stream;
-                // 当前正在处理的未完整的头部，浏览器可能把请求头分成几块发过来
-                var entity = UnFinishedRequest;
-                // 如果当前请求为空，说明这是第一个数据包，可能包含头部
-                if (entity == null)
-                {
-                    // 读取并分析头部
-                    entity = HttpHeader.Read(stream, HttpHeaderReadMode.Request);
-                    if (entity == null)
-                    {
-                        // 分析失败？这个可能不是Http请求头
-                        var he = new HttpProxyEventArgs(Request, stream);
-                        if (Proxy.RaiseEvent(this, EventKind.OnRequestBody, he)) return;
-                        //e.Stream = he.Stream;
-                        e.Data = he.Stream.ReadBytes();
-
-                        base.OnReceive(e);
-
-                        return;
-                    }
-
-                    // 根据完成情况保存到不同的本地变量中
-                    if (!entity.IsFinish)
-                        UnFinishedRequest = entity;
-                    else
-                        Request = entity;
-                }
-                else if (!entity.IsFinish)
-                {
-                    // 如果请求未完成，说明现在的数据内容还是头部
-                    entity.ReadHeaders(stream);
-                    if (entity.IsFinish)
-                    {
-                        Request = entity;
-                        UnFinishedRequest = null;
-                    }
-                }
-                else
-                {
-                    // 否则，头部已完成，现在就是内容，直接转发
-                    var he = new HttpProxyEventArgs(Request, stream);
-                    if (Proxy.RaiseEvent(this, EventKind.OnRequestBody, he)) return;
-                    //e.Stream = he.Stream;
-                    e.Data = he.Stream.ReadBytes();
-
-                    base.OnReceive(e);
-
-                    return;
-                }
-
-                // 请求头不完整，不发送，等下一部分到来
-                if (!entity.IsFinish) return;
-                #endregion
-
-                WriteLog("{0}", entity.Url);
-
-                #region 重构请求包
-                // 现在所在位置是一个全新的请求
-                var rs = OnRequest(entity, e);
-                {
-                    var he = new HttpProxyEventArgs(Request, stream);
-                    he.Cancel = !rs;
-                    rs = !Proxy.RaiseEvent(this, EventKind.OnRequest, he);
-                }
-                if (!rs) return;
-
-                // 如果流中还有数据，可能是请求体，也要拷贝
-                if (stream.Position < stream.Length)
-                {
-                    var he = new HttpProxyEventArgs(Request, stream);
-                    if (Proxy.RaiseEvent(this, EventKind.OnRequestBody, he)) return;
-                    stream = he.Stream;
-                }
-
-                // 重新构造请求
-                var ms = new MemoryStream();
-                entity.Write(ms);
-                stream.CopyTo(ms);
-                ms.Position = 0;
-
-                //e.Stream = ms;
-                e.Data = ms.ToArray();
-                #endregion
-
-                base.OnReceive(e);
-            }
-
-            /// <summary>是否保持连接</summary>
-            Boolean KeepAlive = false;
-            DateTime RequestTime;
-
-            /// <summary>收到请求时</summary>
-            /// <param name="entity"></param>
-            /// <param name="e"></param>
-            /// <returns></returns>
-            protected virtual Boolean OnRequest(HttpHeader entity, ReceivedEventArgs e)
-            {
-                var host = "";
-                var oriUrl = entity.Url;
-
-                // 特殊处理CONNECT
-                if (entity.Method.EqualIgnoreCase("CONNECT")) return ProcessConnect(entity, e);
-
-                // 检查缓存
-                if (GetCache(entity, e)) return false;
-
-                var remote = RemoteServer;
-                var ruri = RemoteServerUri;
-                if (entity.Url.IsAbsoluteUri)
-                {
-                    var uri = entity.Url;
-                    host = uri.Host + ":" + uri.Port;
-
-                    // 如果地址或端口改变，则重新连接服务器
-                    if (remote != null && (uri.Host != ruri.Host || uri.Port != ruri.Port))
-                    {
-                        remote.Dispose();
-                        RemoteServer = null;
-                    }
-                    //RemoteHost = uri.Host;
-                    //LastPort = uri.Port;
-
-                    //RemoteEndPoint = new IPEndPoint(NetHelper.ParseAddress(uri.Host), uri.Port);
-                    ruri.Host = uri.Host;
-                    ruri.Port = uri.Port;
-                    entity.Url = new Uri(uri.PathAndQuery, UriKind.Relative);
-                }
-                else if (!String.IsNullOrEmpty(entity.Host))
-                {
-                    //RemoteEndPoint = NetHelper.ParseEndPoint(entity.Host, 80);
-                    ruri.Host = entity.Host;
-                    ruri.Port = 80;
-                }
-                else
-                    throw new NetException("无法处理的请求！{0}", entity);
-
-                //WriteDebugLog("[{4}] {3} => {0} {1} [{2}]", entity.Method, oriUrl, entity.ContentLength, Session.Remote.EndPoint, ID);
-
-                // 可能不含Host
-                if (String.IsNullOrEmpty(entity.Host)) entity.Host = host;
-
-                // 处理KeepAlive
-                KeepAlive = false;
-                if (!String.IsNullOrEmpty(entity.ProxyConnection))
-                {
-                    entity.KeepAlive = entity.ProxyKeepAlive;
-                    entity.ProxyConnection = null;
-
-                    KeepAlive = entity.ProxyKeepAlive;
-                }
-
-                RequestTime = DateTime.Now;
-
-                return true;
-            }
-
-            Boolean ProcessConnect(HttpHeader entity, ReceivedEventArgs e)
-            {
-                //WriteDebugLog("[{3}] {0} {1} [{2}]", entity.Method, entity.Url, entity.ContentLength, ID);
-
-                //var host = entity.Url.ToString();
-                var uri = RemoteServerUri;
-                var ep = NetHelper.ParseEndPoint(entity.Url.ToString(), 80);
-                uri.EndPoint = ep;
-
-                // 不要连自己，避免死循环
-                if (ep.Port == Proxy.Server.Port &&
-                    (ep.Address == IPAddress.Loopback || ep.Address == IPAddress.IPv6Loopback))
-                {
-                    WriteLog("不要连自己，避免死循环");
-                    Dispose();
-                    return false;
-                }
-
-                var rs = new HttpHeader();
-                rs.Version = entity.Version;
-                try
-                {
-                    // 连接远程服务器，启动数据交换
-                    if (RemoteServer == null) StartRemote(e);
-
-                    rs.StatusCode = 200;
-                    rs.StatusDescription = "OK";
-                }
-                catch (Exception ex)
-                {
-                    rs.StatusCode = 500;
-                    rs.StatusDescription = ex.Message;
-                }
-
-                // 告诉客户端，已经连上了服务端，或者没有连上，这里不需要向服务端发送任何数据
-                Send(rs.GetStream());
-                return false;
-            }
-
-            /// <summary>检查是否存在缓存，如果存在，则直接返回缓存</summary>
-            /// <param name="entity"></param>
-            /// <param name="e"></param>
-            /// <returns></returns>
-            protected virtual Boolean GetCache(HttpHeader entity, ReceivedEventArgs e)
-            {
-                if (!Proxy.EnableCache || entity == null) return false;
-
-                if (entity.Method.EqualIgnoreCase("GET"))
-                {
-                    // 查找缓存
-                    var citem = Proxy.Cache.GetItem(entity.RawUrl);
-                    if (citem != null)
-                    {
-                        // 响应缓存
-                        Byte[] cs = null;
-                        var ms = citem.Stream;
-                        if (ms is MemoryStream)
-                            cs = (ms as MemoryStream).ToArray();
-                        else
-                        {
-                            lock (ms)
-                            {
-                                ms.Position = 0;
-                                cs = ms.ReadBytes();
-                            }
-                        }
-                        //var cs = citem.Response.GetStream();
-
-                        //WriteDebugLog("[{0}] {1} 缓存命中[{2}]", ID, entity.RawUrl, cs.Length);
-
-                        Send(cs);
-
-                        return true;
-                    }
-                }
-
-                return false;
-            }
-
-            HttpHeader UnFinishedResponse;
-            HttpHeader Response;
-
-            HttpCacheItem cacheItem;
-
-            /// <summary>收到客户端发来的数据。子类可通过重载该方法来修改数据</summary>
-            /// <param name="e"></param>
-            /// <returns>修改后的数据</returns>
-            protected override void OnReceiveRemote(ReceivedEventArgs e)
-            {
-                var parseHeader = Proxy.EnableCache || Proxy.GetHandler(EventKind.OnResponse) != null;
-                var parseBody = Proxy.EnableCache || Proxy.GetHandler(EventKind.OnResponseBody) != null;
-
-                var entity = UnFinishedResponse;
-                var stream = e.Stream;
-                if (parseHeader || parseBody)
-                {
-                    #region 解析响应头
-                    // 解析头部
-                    if (entity == null)
-                    {
-                        #region 未完成响应为空，可能是第一个响应包，也可能是后续数据包
-                        // 如果当前未完成响应为空，说明这是第一个数据包，可能包含头部
-                        entity = HttpHeader.Read(stream, HttpHeaderReadMode.Response);
-                        if (entity == null)
-                        {
-                            var he = new HttpProxyEventArgs(Response, stream);
-                            if (Proxy.RaiseEvent(this, EventKind.OnResponseBody, he)) return;
-                            //e.Stream = he.Stream;
-                            e.Data = he.Stream.ReadBytes();
-
-                            // 如果现在正在缓存之中，那么也罢这些非头部数据一并拷贝到缓存里面
-                            if (cacheItem != null)
-                            {
-                                var p = e.Stream.Position;
-                                e.Stream.CopyTo(cacheItem.Stream);
-                                var count = e.Stream.Position = p;
-                                e.Stream.Position = p;
-                                //WriteDebugLog("[{0}] {1} 缓存数据[{2}]", ID, Request.RawUrl, count);
-                            }
-
-                            base.OnReceiveRemote(e);
-                            return;
-                        }
-
-                        if (!entity.IsFinish)
-                            UnFinishedResponse = entity;
-                        else
-                            Response = entity;
-                        #endregion
-                    }
-                    else if (!entity.IsFinish)
-                    {
-                        #region 未完成响应，继续读取头部
-                        // 如果请求未完成，说明现在的数据内容还是头部
-                        entity.ReadHeaders(stream);
-                        if (entity.IsFinish)
-                        {
-                            Response = entity;
-                            UnFinishedResponse = null;
-                        }
-                        #endregion
-                    }
-                    else
-                    {
-                        #region 未完成响应的头部已完成？似乎不大可能
-                        // 否则，头部已完成，现在就是内容
-                        var he = new HttpProxyEventArgs(Response, stream);
-                        if (Proxy.RaiseEvent(this, EventKind.OnResponseBody, he)) return;
-                        base.OnReceiveRemote(e);
-                        //e.Stream = he.Stream;
-                        e.Data = he.Stream.ReadBytes();
-
-                        // 如果现在正在缓存之中，那么也罢这些非头部数据一并拷贝到缓存里面
-                        if (cacheItem != null)
-                        {
-                            var p = e.Stream.Position;
-                            e.Stream.CopyTo(cacheItem.Stream);
-                            var count = e.Stream.Position = p;
-                            e.Stream.Position = p;
-                            //WriteDebugLog("[{0}] {1} 缓存数据[{2}]", ID, Request.RawUrl, count);
-                        }
-
-                        return;
-                        #endregion
-                    }
-                    #endregion
-
-                    // 请求头不完整，不发送，等下一部分到来
-                    if (!entity.IsFinish) return;
-
-                    {
-                        var he = new HttpProxyEventArgs(entity, stream);
-                        if (Proxy.RaiseEvent(this, EventKind.OnResponse, he)) return;
-                        stream = he.Stream;
-                    }
-
-                    // 写入头部扩展
-                    entity.Headers["Powered-By-Proxy"] = Proxy.Name;
-                    entity.Headers["RequestTime"] = RequestTime.ToString("yyyy-MM-dd HH:mm:ss.fff");
-                    entity.Headers["TotalTime"] = (DateTime.Now - RequestTime).ToString();
-                }
-
-                #region 缓存
-                if (Proxy.EnableCache) SetCache(Response, e);
-                #endregion
-
-                #region 重构响应包
-                if (entity != null)
-                {
-                    var ms = new MemoryStream();
-                    entity.Write(ms);
-
-                    if (parseBody && stream.Position < stream.Length)
-                    {
-                        var he = new HttpProxyEventArgs(Response, stream);
-                        if (Proxy.RaiseEvent(this, EventKind.OnResponseBody, he)) return;
-                        stream = he.Stream;
-                    }
-
-                    stream.CopyTo(ms);
-                    ms.Position = 0;
-
-                    //stream = ms;
-                    //e.Stream = ms;
-                    e.Data = ms.ToArray();
-                }
-
-                if (cacheItem != null)
-                {
-                    var p = e.Stream.Position;
-                    e.Stream.CopyTo(cacheItem.Stream);
-                    var count = e.Stream.Position = p;
-                    e.Stream.Position = p;
-                    //WriteDebugLog("[{0}] {1} 增加缓存[{2}]", ID, Request.RawUrl, count);
-                }
-                #endregion
-
-                base.OnReceiveRemote(e);
-            }
-
-            static readonly HashSet<String> cacheSuffix = new HashSet<String>(
-                new String[] { ".htm", ".html", ".js", ".css", ".jpg", ".png", ".gif", ".swf" },
-                StringComparer.OrdinalIgnoreCase);
-
-            static readonly HashSet<String> cacheContentType = new HashSet<String>(
-                new String[] { "text/css", "application/javascript", "text/javascript", "application/x-javascript", "image/jpeg", "image/png", "image/gif" },
-                StringComparer.OrdinalIgnoreCase);
-
-            /// <summary>如果符合缓存条件，则设置缓存</summary>
-            /// <param name="entity"></param>
-            /// <param name="e"></param>
-            /// <returns></returns>
-            protected virtual Boolean SetCache(HttpHeader entity, ReceivedEventArgs e)
-            {
-                // 既然是新响应，那么需要首先重置缓存项
-                cacheItem = null;
-
-                var request = Request;
-                var response = entity;
-                if (request == null || response == null) return false;
-
-                if (request.Method.EqualIgnoreCase("GET"))
-                {
-                    if (response.StatusCode == 304)
-                    {
-                        response.Headers["HttpProxyCache"] = "304";
-                        cacheItem = Proxy.Cache.Add(request, response);
-                        return true;
-                    }
-
-                    var url = request.RawUrl;
-                    if (!String.IsNullOrEmpty(url) && url[url.Length - 1] != '/' && cacheSuffix.Contains(Path.GetExtension(url)))
-                    {
-                        response.Headers["HttpProxyCache"] = Path.GetExtension(url);
-                        cacheItem = Proxy.Cache.Add(request, response);
-                        return true;
-                    }
-
-                    var contentType = response.ContentType;
-                    if (!String.IsNullOrEmpty(contentType))
-                    {
-                        var p = contentType.IndexOf(";");
-                        if (p < 0 || cacheContentType.Contains(contentType.Substring(0, p)))
-                        {
-                            response.Headers["HttpProxyCache"] = contentType;
-                            cacheItem = Proxy.Cache.Add(request, response);
-                            return true;
-                        }
-                    }
-                }
-                return false;
-            }
-
-            /// <summary>远程连接断开时触发。默认销毁整个会话，子类可根据业务情况决定客户端与代理的链接是否重用。</summary>
-            /// <param name="session"></param>
-            protected override void OnRemoteDispose(ISocketClient session)
-            {
-                // 如果客户端不要求保持连接，就销毁吧
-                if (!KeepAlive) base.OnRemoteDispose(session);
-            }
-        }
-        #endregion
-
-        #region 浏览器代理
-        struct Struct_INTERNET_PROXY_INFO
-        {
-            public Int32 dwAccessType;
-            public IntPtr proxy;
-            public IntPtr proxyBypass;
-        }
-
-        /// <summary>定义API函数</summary>
-        /// <param name="hInternet"></param>
-        /// <param name="dwOption"></param>
-        /// <param name="lpBuffer"></param>
-        /// <param name="lpdwBufferLength"></param>
-        /// <returns></returns>
-        [DllImport("wininet.dll", SetLastError = true)]
-        private static extern Boolean InternetSetOption(IntPtr hInternet, Int32 dwOption, IntPtr lpBuffer, Int32 lpdwBufferLength);
-
-        /// <summary>获取IE代理设置</summary>
-        public static String GetIEProxy()
-        {
-            using (var key = Registry.CurrentUser.OpenSubKey("Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings", true))
-            {
-                if (key == null) return null;
-
-                var obj = key.GetValue("ProxyEnable", 0);
-                if (obj == null || (Int32)obj == 0) return null;
-
-                obj = key.GetValue("ProxyServer");
-                return obj == null ? null : "" + obj;
-            }
-        }
-
-        /// <summary>设置IE代理。传入空地址取消代理设置</summary>
-        /// <param name="proxy">地址与端口以冒号分开</param>
-        /// <param name="proxyOverride">代理是否跳过本地地址</param>
-        public static void SetIEProxy(String proxy, Boolean proxyOverride = true)
-        {
-            const Int32 INTERNET_OPTION_PROXY = 38;
-            const Int32 INTERNET_OPEN_TYPE_PROXY = 3;
-            const Int32 INTERNET_OPEN_TYPE_DIRECT = 1;
-
-            var isCancel = String.IsNullOrEmpty(proxy);
-
-            Struct_INTERNET_PROXY_INFO info;
-
-            // 填充结构体 
-            info.dwAccessType = !isCancel ? INTERNET_OPEN_TYPE_PROXY : INTERNET_OPEN_TYPE_DIRECT;
-            info.proxy = Marshal.StringToHGlobalAnsi("" + proxy);
-            info.proxyBypass = Marshal.StringToHGlobalAnsi("local");
-
-            // 分配内存
-            var ptr = Marshal.AllocCoTaskMem(Marshal.SizeOf(info));
-
-            // 获取结构体指针
-            Marshal.StructureToPtr(info, ptr, true);
-
-            var key = Registry.CurrentUser.OpenSubKey("Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings", true);
-            if (!isCancel)
-            {
-                key.SetValue("ProxyServer", proxy);
-                key.SetValue("ProxyEnable", 1);
-                if (proxyOverride)
-                    key.SetValue("ProxyOverride", "<local>");
-                else
-                    key.DeleteValue("ProxyOverride");
-            }
-            else
-                key.SetValue("ProxyEnable", 0);
-            key.Close();
-
-            if (!Runtime.Mono)
-            {
-                InternetSetOption(IntPtr.Zero, INTERNET_OPTION_PROXY, ptr, Marshal.SizeOf(info));
-
-                const Int32 INTERNET_OPTION_REFRESH = 0x000025;
-                const Int32 INTERNET_OPTION_SETTINGS_CHANGED = 0x000027;
-                InternetSetOption(IntPtr.Zero, INTERNET_OPTION_SETTINGS_CHANGED, IntPtr.Zero, 0);
-                InternetSetOption(IntPtr.Zero, INTERNET_OPTION_REFRESH, IntPtr.Zero, 0);
-            }
-        }
-        #endregion
-    }
-
-    /// <summary>Http代理事件参数</summary>
-    public class HttpProxyEventArgs : EventArgs
-    {
-        /// <summary>头部</summary>
-        public HttpHeader Header { get; set; }
-
-        /// <summary>主体数据流。外部可以更改，如果只是读取，请一定注意保持指针在原来的位置</summary>
-        public Stream Stream { get; set; }
-
-        /// <summary>是否取消操作</summary>
-        public Boolean Cancel { get; set; }
-
-        /// <summary>实例化</summary>
-        public HttpProxyEventArgs() { }
-
-        /// <summary>实例化</summary>
-        /// <param name="header"></param>
-        /// <param name="stream"></param>
-        public HttpProxyEventArgs(HttpHeader header, Stream stream)
-        {
-            Header = header;
-            Stream = stream;
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Proxy/HttpReverseProxy.cs b/NewLife.Net/Proxy/HttpReverseProxy.cs
deleted file mode 100644
index ed5a65d05c..0000000000
--- a/NewLife.Net/Proxy/HttpReverseProxy.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-﻿using System;
-using System.Diagnostics;
-using System.IO;
-using NewLife.Net.Http;
-
-namespace NewLife.Net.Proxy
-{
-    /// <summary>Http反向代理。把所有收到的Http请求转发到目标服务器。</summary>
-    /// <remarks>
-    /// 主要是修改Http请求头为正确的主机，还有可能修改Http响应。
-    /// 
-    /// 经典用途：
-    /// 1，缓存。代理缓存某些静态资源的请求结果，减少对服务器的请求压力
-    /// 2，拦截。禁止访问某些资源，返回空白页或者连接重置
-    /// 3，修改请求或响应。更多的可能是修改响应的页面内容
-    /// 4，记录统计。记录并统计请求的网址。
-    /// 
-    /// 修改Http响应的一般做法：
-    /// 1，反向映射888端口到目标abc.com
-    /// 2，abc.com页面响应时，所有http://abc.com/的连接都修改为http://IP:888
-    /// 3，注意在内网的反向代理需要使用公网IP，而不是本机IP
-    /// 4，子域名也可以修改，比如http://pic.abc.com/修改为http://IP:888/http_pic.abc.com/
-    /// </remarks>
-    public class HttpReverseProxy : NATProxy
-    {
-        /// <summary>实例化</summary>
-        public HttpReverseProxy()
-        {
-            Name = "HttpRev";
-
-            Port = 80;
-            if (RemoteServer.Port == 0) RemoteServer.Port = 80;
-
-            ProtocolType = NetType.Tcp;
-        }
-
-        /// <summary>创建会话</summary>
-        /// <param name="session"></param>
-        /// <returns></returns>
-        protected override INetSession CreateSession(ISocketSession session)
-        {
-            return new Session();
-        }
-
-        #region 会话
-        /// <summary>Http反向代理会话</summary>
-        class Session : NATSession
-        {
-            ///// <summary>代理对象</summary>
-            //public new HttpReverseProxy Proxy { get { return base.Proxy as HttpReverseProxy; } set { base.Proxy = value; } }
-
-            /// <summary>请求头部</summary>
-            public HttpHeader Request { get; set; }
-
-            /// <summary>属性说明</summary>
-            public String Host { get; set; }
-
-            /// <summary>属性说明</summary>
-            public String RawHost { get; set; }
-
-            /// <summary>请求时触发。</summary>
-            public event EventHandler<ReceivedEventArgs> OnRequest;
-
-            /// <summary>收到客户端发来的数据。子类可通过重载该方法来修改数据</summary>
-            /// <param name="e"></param>
-            protected override void OnReceive(ReceivedEventArgs e)
-            {
-                // 解析请求头
-                var stream = e.Stream;
-                var entity = HttpHeader.Read(stream, HttpHeaderReadMode.Request);
-                if (entity == null)
-                {
-                    base.OnReceive(e);
-                    return;
-                }
-
-                WriteLog("{3}请求：{0} {1} [{2}]", entity.Method, entity.Url, entity.ContentLength, ID);
-
-                Request = entity;
-                if (OnRequest != null) OnRequest(this, e);
-
-                var host = entity.Url.IsAbsoluteUri ? entity.Url.Host : Proxy.RemoteServer.Host;
-                Host = host;
-                RawHost = entity.Host;
-                entity.Host = host;
-
-                // 引用
-                var r = entity.Referer;
-                if (!String.IsNullOrEmpty(r))
-                {
-                    var ri = new Uri(r, UriKind.RelativeOrAbsolute);
-                    if (ri.IsAbsoluteUri && ri.Authority == RawHost)
-                    {
-                        r = r.Replace(RawHost, host);
-                        entity.Referer = r;
-                    }
-                }
-
-                //// 取消压缩
-                //var key = "Accept-Encoding";
-                //if (entity.Headers.ContainsKey(key)) entity.Headers.Remove(key);
-
-                // 重新构造请求
-                var ms = new MemoryStream();
-                entity.Write(ms);
-                stream.CopyTo(ms);
-                ms.Position = 0;
-
-                //e.Stream = ms;
-                e.Data = ms.ToArray();
-
-                base.OnReceive(e);
-            }
-
-            ///// <summary>收到客户端发来的数据。子类可通过重载该方法来修改数据</summary>
-            ///// <param name="e"></param>
-            ///// <param name="stream">数据</param>
-            ///// <returns>修改后的数据</returns>
-            //protected override Stream OnReceiveRemote(NetEventArgs e, Stream stream)
-            //{
-            //    //var entity = HttpHeader.Read(stream, HttpHeaderReadMode.Response);
-            //    //if (entity == null) return base.OnReceive(e, stream);
-
-            //    var html = e.GetString();
-            //    html = html.Replace(Host, RawHost);
-            //    stream = new MemoryStream(Encoding.UTF8.GetBytes(html));
-
-            //    return base.OnReceiveRemote(e, stream);
-            //}
-
-            /// <summary>写调试版日志</summary>
-            /// <param name="action"></param>
-            /// <param name="stream"></param>
-            protected override void WriteDebugLog(String action, Stream stream)
-            {
-                if (Log == null || !Log.Enable) return;
-
-                var p = stream.Position;
-                var str = stream.ReadBytes(5).ToStr();
-                stream.Position = p;
-                if (str.StartsWithIgnoreCase("HTTP/", "GET ", "POST "))
-                {
-                    // 只显示头部
-                    str = stream.ToStr().Substring(null, "\r\n\r\n").Trim();
-                    str = Environment.NewLine + str;
-                }
-                else
-                    str = stream.ReadBytes(16).ToHex();
-                stream.Position = p;
-
-                WriteLog(action + "[{0}] {1}", stream.Length, str);
-            }
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Proxy/IProxy.cs b/NewLife.Net/Proxy/IProxy.cs
deleted file mode 100644
index 80da8c4419..0000000000
--- a/NewLife.Net/Proxy/IProxy.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-﻿
-namespace NewLife.Net.Proxy
-{
-    /// <summary>数据转发代理接口</summary>
-    public interface IProxy
-    {
-        #region 属性
-        ///// <summary>会话集合。</summary>
-        //ICollection<IProxySession> Sessions { get; }
-
-        ///// <summary>代理过滤器集合。</summary>
-        //ICollection<IProxyFilter> Filters { get; }
-
-        ///// <summary>主过滤器，同时也是集合，会话主要针对这个操作</summary>
-        //IProxyFilter MainFilter { get; }
-        #endregion
-
-        #region 方法
-        ///// <summary>为会话创建与远程服务器通讯的Socket。可以使用Socket池达到重用的目的。</summary>
-        ///// <param name="session"></param>
-        ///// <param name="e"></param>
-        ///// <returns></returns>
-        //ISocketClient CreateRemote(IProxySession session, NetEventArgs e);
-
-        ///// <summary>客户端发数据往服务端时</summary>
-        ///// <param name="session"></param>
-        ///// <param name="stream"></param>
-        ///// <param name="e"></param>
-        ///// <returns></returns>
-        //Stream OnClientToServer(IProxySession session, Stream stream, NetEventArgs e);
-
-        ///// <summary>服务端发数据往客户端时</summary>
-        ///// <param name="session"></param>
-        ///// <param name="stream"></param>
-        ///// <param name="e"></param>
-        ///// <returns></returns>
-        //Stream OnServerToClient(IProxySession session, Stream stream, NetEventArgs e);
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Proxy/IProxySession.cs b/NewLife.Net/Proxy/IProxySession.cs
deleted file mode 100644
index 125e834ab3..0000000000
--- a/NewLife.Net/Proxy/IProxySession.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-﻿using System;
-using System.IO;
-using System.Text;
-using NewLife.Net.Sockets;
-
-namespace NewLife.Net.Proxy
-{
-    /// <summary>代理会话接口。客户端的一次转发请求（或者Tcp连接），就是一个会话。转发的全部操作都在会话中完成。</summary>
-    /// <remarks>
-    /// 一个会话应该包含两端，两个Socket，服务端和客户端。
-    /// 客户端<see cref="INetSession.Session"/>发来的数据，在这里经过一系列过滤器后，转发给服务端<see cref="RemoteServer"/>；
-    /// 服务端<see cref="RemoteServer"/>返回的数据，在这里经过过滤器后，转发给客户端<see cref="INetSession.Session"/>。
-    /// 会话进行业务处理的过程中，可以通过多个SendRemote方法向远程服务端发送数据。
-    /// </remarks>
-    public interface IProxySession : INetSession
-    {
-        #region 属性
-        /// <summary>代理对象</summary>
-        IProxy Proxy { get; set; }
-
-        /// <summary>远程服务端。跟目标服务端通讯的那个Socket，其实是客户端TcpSession/UdpSession</summary>
-        ISocketClient RemoteServer { get; set; }
-
-        /// <summary>服务端地址</summary>
-        NetUri RemoteServerUri { get; }
-
-        /// <summary>是否中转空数据包。默认true</summary>
-        Boolean ExchangeEmptyData { get; set; }
-        #endregion
-
-        #region 发送
-        /// <summary>发送数据</summary>
-        /// <param name="buffer">缓冲区</param>
-        /// <param name="offset">位移</param>
-        /// <param name="size">写入字节数</param>
-        IProxySession SendRemote(Byte[] buffer, Int32 offset = 0, Int32 size = -1);
-
-        /// <summary>发送数据流</summary>
-        /// <param name="stream"></param>
-        /// <returns></returns>
-        IProxySession SendRemote(Stream stream);
-
-        /// <summary>发送字符串</summary>
-        /// <param name="msg"></param>
-        /// <param name="encoding"></param>
-        IProxySession SendRemote(String msg, Encoding encoding = null);
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Proxy/NATProxy.cs b/NewLife.Net/Proxy/NATProxy.cs
deleted file mode 100644
index 45715b1172..0000000000
--- a/NewLife.Net/Proxy/NATProxy.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-﻿using System;
-using System.Net.Sockets;
-using NewLife.Net.Sockets;
-
-namespace NewLife.Net.Proxy
-{
-    /// <summary>通用NAT代理。所有收到的数据，都转发到指定目标</summary>
-    public class NATProxy : ProxyBase<NATSession>
-    {
-        #region 属性
-        /// <summary>远程服务器地址</summary>
-        public NetUri RemoteServer { get; set; } = new NetUri();
-        #endregion
-
-        #region 构造
-        /// <summary>实例化</summary>
-        public NATProxy() { }
-
-        /// <summary>实例化</summary>
-        /// <param name="hostname">目标服务器地址</param>
-        /// <param name="port">目标服务器端口</param>
-        public NATProxy(String hostname, Int32 port) : this(hostname, port, NetType.Tcp) { }
-
-        /// <summary>实例化</summary>
-        /// <param name="hostname">目标服务器地址</param>
-        /// <param name="port">目标服务器端口</param>
-        /// <param name="protocol">协议</param>
-        public NATProxy(String hostname, Int32 port, NetType protocol)
-            : this()
-        {
-            RemoteServer = new NetUri(protocol, hostname, port);
-            //RemoteServer.Host = hostname;
-        }
-        #endregion
-
-        #region 方法
-        /// <summary>开始</summary>
-        protected override void OnStart()
-        {
-            WriteLog("NAT代理 => {0}", RemoteServer);
-
-            if (RemoteServer.Type == 0) RemoteServer.Type = ProtocolType;
-
-            base.OnStart();
-        }
-
-        /// <summary>添加会话。子类可以在添加会话前对会话进行一些处理</summary>
-        /// <param name="session"></param>
-        protected override void AddSession(INetSession session)
-        {
-            var ps = session as ProxySession;
-            ps.RemoteServerUri = RemoteServer;
-            // 如果不是Tcp/Udp，则使用本地协议
-            if (!RemoteServer.IsTcp && !RemoteServer.IsUdp)
-                ps.RemoteServerUri.Type = Local.Type;
-
-            base.AddSession(session);
-        }
-        #endregion
-    }
-
-    /// <summary>NAT会话</summary>
-    public class NATSession : ProxySession<NATProxy, NATSession> { }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Proxy/ProxyBase.cs b/NewLife.Net/Proxy/ProxyBase.cs
deleted file mode 100644
index 1a88dd9914..0000000000
--- a/NewLife.Net/Proxy/ProxyBase.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-﻿
-namespace NewLife.Net.Proxy
-{
-    /// <summary>网络数据转发代理基类</summary>
-    /// <remarks>
-    /// 网络代理分为本地服务器、客户端、远程服务器三种角色，本地服务器负责监听并转发客户端和远程服务器之间的所有数据。
-    /// </remarks>
-    /// <typeparam name="TProxySession">代理会话类型</typeparam>
-    public abstract class ProxyBase<TProxySession> : NetServer<TProxySession>, IProxy
-        where TProxySession : ProxySession, new()
-    {
-        #region 构造函数
-        /// <summary></summary>
-        public ProxyBase()
-        {
-            //必须要使UseSession = true，否则创建的session对象无Host属性，在ShowSession时，无法获取Host.Name
-            UseSession = true;
-        }
-        #endregion
-
-        #region 业务
-        /// <summary>创建会话</summary>
-        /// <param name="session"></param>
-        /// <returns></returns>
-        protected override INetSession CreateSession(ISocketSession session)
-        {
-            var rs = new TProxySession();
-            var ps = rs as IProxySession;
-            if (ps != null) ps.Proxy = this;
-
-            return rs;
-        }
-
-        /// <summary>添加会话。子类可以在添加会话前对会话进行一些处理</summary>
-        /// <param name="session"></param>
-        protected override void AddSession(INetSession session)
-        {
-            var ps = session as IProxySession;
-            if (ps != null && ps.Proxy == null) ps.Proxy = this;
-
-            base.AddSession(session);
-        }
-        #endregion
-
-        #region 事件
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Proxy/ProxySession.cs b/NewLife.Net/Proxy/ProxySession.cs
deleted file mode 100644
index eb4b3079ad..0000000000
--- a/NewLife.Net/Proxy/ProxySession.cs
+++ /dev/null
@@ -1,304 +0,0 @@
-﻿using System;
-using System.Diagnostics;
-using System.IO;
-using System.Text;
-using NewLife.Data;
-
-namespace NewLife.Net.Proxy
-{
-    /// <summary>代理会话</summary>
-    /// <typeparam name="TProxy">实际代理类型</typeparam>
-    /// <typeparam name="TProxySession">代理会话类型</typeparam>
-    public class ProxySession<TProxy, TProxySession> : ProxySession
-        where TProxy : ProxyBase<TProxySession>
-        where TProxySession : ProxySession, new()
-    {
-        /// <summary>代理对象</summary>
-        public TProxy Proxy { get { return (this as IProxySession).Proxy as TProxy; } set { (this as IProxySession).Proxy = value; } }
-    }
-
-    /// <summary>代理会话。客户端的一次转发请求（或者Tcp连接），就是一个会话。转发的全部操作都在会话中完成。</summary>
-    /// <remarks>
-    /// 一个会话应该包含两端，两个Socket，服务端和客户端
-    /// 客户端<see cref="INetSession.Session"/>发来的数据，在这里经过一系列过滤器后，转发给服务端<see cref="RemoteServer"/>；
-    /// 服务端<see cref="RemoteServer"/>返回的数据，在这里经过过滤器后，转发给客户端<see cref="INetSession.Session"/>。
-    /// </remarks>
-    public class ProxySession : NetSession, IProxySession
-    {
-        #region 属性
-        /// <summary>代理对象</summary>
-        IProxy IProxySession.Proxy { get; set; }
-
-        /// <summary>远程服务端。跟目标服务端通讯的那个Socket，其实是客户端TcpSession/UdpServer</summary>
-        public ISocketClient RemoteServer { get; set; }
-
-        /// <summary>服务端地址</summary>
-        public NetUri RemoteServerUri { get; set; }
-
-        /// <summary>是否中转空数据包。默认true</summary>
-        public Boolean ExchangeEmptyData { get; set; }
-        #endregion
-
-        #region 构造
-        /// <summary>实例化一个代理会话</summary>
-        public ProxySession()
-        {
-            RemoteServerUri = new NetUri();
-            ExchangeEmptyData = true;
-        }
-
-        /// <summary>子类重载实现资源释放逻辑时必须首先调用基类方法</summary>
-        /// <param name="disposing">从Dispose调用（释放所有资源）还是析构函数调用（释放非托管资源）</param>
-        protected override void OnDispose(Boolean disposing)
-        {
-            base.OnDispose(disposing);
-
-            var remote = RemoteServer;
-            if (remote != null)
-            {
-                RemoteServer = null;
-                remote.TryDispose();
-            }
-        }
-        #endregion
-
-        #region 数据交换
-        /// <summary>开始会话处理。</summary>
-        public override void Start()
-        {
-            // 如果未指定远程协议，则与来源协议一致
-            if (RemoteServerUri.Type == 0) RemoteServerUri.Type = Session.Local.Type;
-            // 如果是Tcp，收到空数据时不要断开。为了稳定可靠，默认设置
-            if (Session is TcpSession) (Session as TcpSession).DisconnectWhenEmptyData = false;
-
-            base.Start();
-        }
-
-        /// <summary>收到客户端发来的数据</summary>
-        /// <param name="e"></param>
-        protected override void OnReceive(ReceivedEventArgs e)
-        {
-            if (Disposed) return;
-
-            //WriteLog("客户端[{0}] {1}", e.Length, e.ToHex(16));
-
-            var len = e.Length;
-            if (len > 0 || len == 0 && ExchangeEmptyData)
-            {
-                if (len > 0) WriteDebugLog("客户端", e.Stream);
-
-                // 如果未建立到远程服务器链接，则建立
-                if (RemoteServer == null) StartRemote(e);
-
-                // 如果已存在到远程服务器的链接，则把数据发向远程服务器
-                if (RemoteServer != null) SendRemote(e.Stream);
-            }
-        }
-
-        /// <summary>开始远程连接</summary>
-        /// <param name="e"></param>
-        protected virtual void StartRemote(ReceivedEventArgs e)
-        {
-            if (RemoteServer != null) return;
-            lock (this)
-            {
-                if (RemoteServer != null) return;
-
-                var start = DateTime.Now;
-                ISocketClient session = null;
-                try
-                {
-                    WriteDebugLog("连接远程服务器 {0} 解析 {1}", RemoteServerUri, RemoteServerUri.Address);
-
-                    session = CreateRemote(e);
-                    //session.Log = Log;
-                    // Socket日志一致
-                    session.Log = Session.Log;
-                    session.OnDisposed += (s, e2) =>
-                    {
-                        // 这个是必须清空的，是否需要保持会话呢，由OnRemoteDispose决定
-                        RemoteServer = null;
-                        OnRemoteDispose(s as ISocketClient);
-                    };
-                    session.Received += Remote_Received;
-                    session.Open();
-
-                    WriteDebugLog("连接远程服务器成功");
-
-                    RemoteServer = session;
-                }
-                catch (Exception ex)
-                {
-                    var ts = DateTime.Now - start;
-                    WriteError("无法为{0}连接远程服务器{1}！耗时{2}！{3}", Remote, RemoteServerUri, ts, ex.Message);
-
-                    if (session != null) session.Dispose();
-                    Dispose();
-                }
-            }
-        }
-
-        /// <summary>为会话创建与远程服务器通讯的Socket。可以使用Socket池达到重用的目的。</summary>
-        /// <param name="e"></param>
-        /// <returns></returns>
-        protected virtual ISocketClient CreateRemote(ReceivedEventArgs e)
-        {
-            var client = RemoteServerUri.CreateRemote();
-            // 如果是Tcp，收到空数据时不要断开。为了稳定可靠，默认设置
-            if (client is TcpSession) (client as TcpSession).DisconnectWhenEmptyData = false;
-
-            return client;
-        }
-
-        /// <summary>远程连接断开时触发。默认销毁整个会话，子类可根据业务情况决定客户端与代理的链接是否重用。</summary>
-        /// <param name="client"></param>
-        protected virtual void OnRemoteDispose(ISocketClient client) { Dispose(); }
-
-        void Remote_Received(Object sender, ReceivedEventArgs e)
-        {
-            if (Disposed) return;
-
-            try
-            {
-                OnReceiveRemote(e);
-            }
-            catch (Exception ex)
-            {
-                WriteError(ex.Message);
-                Dispose();
-            }
-        }
-
-        /// <summary>收到远程服务器返回的数据</summary>
-        /// <param name="e"></param>
-        protected virtual void OnReceiveRemote(ReceivedEventArgs e)
-        {
-            var len = e.Length;
-            if (len > 0) WriteDebugLog("服务端", e.Stream);
-
-            if (len > 0 || len == 0 && ExchangeEmptyData)
-            {
-                var session = Session;
-                if (session == null || session.Disposed)
-                    Dispose();
-                else
-                {
-                    try
-                    {
-                        Send(e.Stream);
-                    }
-                    catch (Exception ex)
-                    {
-                        WriteError("转发给客户端出错，{0}", ex.Message);
-
-                        Dispose();
-                        throw;
-                    }
-                }
-            }
-        }
-        #endregion
-
-        #region 发送
-        /// <summary>发送数据</summary>
-        /// <param name="buffer">缓冲区</param>
-        /// <param name="offset">位移</param>
-        /// <param name="size">写入字节数</param>
-        public virtual IProxySession SendRemote(Byte[] buffer, Int32 offset = 0, Int32 size = -1)
-        {
-            try
-            {
-                RemoteServer.Send(new Packet(buffer, offset, size));
-            }
-            catch { Dispose(); throw; }
-
-            return this;
-        }
-
-        /// <summary>发送数据流</summary>
-        /// <param name="stream"></param>
-        /// <returns></returns>
-        public virtual IProxySession SendRemote(Stream stream)
-        {
-            try
-            {
-                RemoteServer.Send(stream);
-            }
-            catch (Exception ex)
-            {
-                WriteError("转发给服务端出错，{0}", ex.Message);
-
-                Dispose();
-                throw;
-            }
-
-            return this;
-        }
-
-        /// <summary>发送字符串</summary>
-        /// <param name="msg"></param>
-        /// <param name="encoding"></param>
-        public virtual IProxySession SendRemote(String msg, Encoding encoding = null)
-        {
-            try
-            {
-                RemoteServer.Send(msg, encoding);
-            }
-            catch { Dispose(); throw; }
-
-            return this;
-        }
-        #endregion
-
-        #region 错误处理
-        /// <summary></summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected override void OnError(Object sender, ExceptionEventArgs e)
-        {
-            if (e.Exception != null) Dispose();
-        }
-        #endregion
-
-        #region 辅助
-        private String _LogPrefix;
-        /// <summary>日志前缀</summary>
-        public override String LogPrefix
-        {
-            get
-            {
-                if (_LogPrefix == null)
-                {
-                    var session = this as INetSession;
-                    var name = session.Host == null ? "" : session.Host.Name.TrimEnd("Proxy");
-                    _LogPrefix = "{0}[{1}] ".F(name, ID);
-                }
-                return _LogPrefix;
-            }
-            set { _LogPrefix = value; }
-        }
-
-        /// <summary>写调试版日志</summary>
-        /// <param name="format"></param>
-        /// <param name="args"></param>
-        [Conditional("DEBUG")]
-        protected void WriteDebugLog(String format, params Object[] args)
-        {
-            WriteLog(format, args);
-        }
-
-        /// <summary>写调试版日志</summary>
-        /// <param name="action"></param>
-        /// <param name="stream"></param>
-        [Conditional("DEBUG")]
-        protected virtual void WriteDebugLog(String action, Stream stream)
-        {
-            WriteLog(action + "[{0}] {1}", stream.Length, stream.ReadBytes(16).ToHex());
-        }
-
-        /// <summary>已重载。</summary>
-        /// <returns></returns>
-        public override String ToString() { return base.ToString() + "=>" + RemoteServerUri; }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Proxy/Socks5/Socks5Client.cs b/NewLife.Net/Proxy/Socks5/Socks5Client.cs
deleted file mode 100644
index c93237fa79..0000000000
--- a/NewLife.Net/Proxy/Socks5/Socks5Client.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-﻿
-namespace NewLife.Net.Proxy
-{
-    class Socks5Client
-    {
-    }
-}
diff --git a/NewLife.Net/Proxy/Socks5/Socks5Entity.cs b/NewLife.Net/Proxy/Socks5/Socks5Entity.cs
deleted file mode 100644
index 72494b1666..0000000000
--- a/NewLife.Net/Proxy/Socks5/Socks5Entity.cs
+++ /dev/null
@@ -1,256 +0,0 @@
-﻿using System;
-using System.Net;
-using NewLife.Serialization;
-
-namespace NewLife.Net.Proxy
-{
-    /// <summary>Socks5实体基类</summary>
-    public abstract class Socks5Entity
-    {
-        private Byte _Ver = 5;
-        /// <summary>版本。默认5</summary>
-        public Byte Ver { get { return _Ver; } set { _Ver = value; } }
-    }
-
-    /// <summary>Socks5请求</summary>
-    public class Socks5Request : Socks5Entity
-    {
-        private Byte _Count = 2;
-        /// <summary>方法数</summary>
-        public Byte Count { get { return _Count; } set { _Count = value; } }
-
-        [FieldSize(255)]
-        private Byte[] _Methods = new Byte[] { 0, 2 };
-        /// <summary>方法</summary>
-        public Byte[] Methods { get { return _Methods; } set { _Methods = value; } }
-
-        #region 扩展
-        const Byte NoAuth = 0;
-        const Byte Auth = 2;
-
-        /// <summary>是否支持不认证</summary>
-        public Boolean SupportNoAuth
-        {
-            get
-            {
-                for (int i = 0; i < Count && _Methods != null && i < _Methods.Length; i++)
-                {
-                    if (_Methods[i] == NoAuth) return true;
-                }
-                return false;
-            }
-            set
-            {
-                for (int i = 0; i < Count && _Methods != null && i < _Methods.Length; i++)
-                {
-                    if (_Methods[i] == NoAuth) return;
-                }
-                if (_Methods == null)
-                    _Methods = new Byte[1];
-                else if (_Methods.Length <= Count)
-                {
-                    var ss = new Byte[_Methods.Length + 1];
-                    _Methods.CopyTo(ss, 0);
-                    _Methods = ss;
-                }
-                _Methods[Count] = NoAuth;
-                Count++;
-            }
-        }
-
-        /// <summary>是否支持用户名密码认证</summary>
-        public Boolean SupportAuth
-        {
-            get
-            {
-                for (int i = 0; i < Count && _Methods != null && i < _Methods.Length; i++)
-                {
-                    if (_Methods[i] == Auth) return true;
-                }
-                return false;
-            }
-            set
-            {
-                for (int i = 0; i < Count && _Methods != null && i < _Methods.Length; i++)
-                {
-                    if (_Methods[i] == Auth) return;
-                }
-                if (_Methods == null)
-                    _Methods = new Byte[1];
-                else if (_Methods.Length <= Count)
-                {
-                    var ss = new Byte[_Methods.Length + 1];
-                    _Methods.CopyTo(ss, 0);
-                    _Methods = ss;
-                }
-                _Methods[Count] = Auth;
-                Count++;
-            }
-        }
-        #endregion
-    }
-
-    /// <summary>Socks5答复</summary>
-    public class Socks5Answer : Socks5Entity
-    {
-        private Byte _MethodOrStatus;
-
-        /// <summary>方法</summary>
-        public Byte Method { get { return _MethodOrStatus; } set { _MethodOrStatus = value; } }
-
-        /// <summary>认证状态</summary>
-        public Byte Status { get { return _MethodOrStatus; } set { _MethodOrStatus = value; } }
-    }
-
-    /// <summary>Socks5实体</summary>
-    public class Socks5Entity2 : Socks5Entity, IAccessor
-    {
-        private Byte _CmdOrRep;
-
-        private Byte _Rsv;
-        /// <summary>保留</summary>
-        public Byte Rsv { get { return _Rsv; } set { _Rsv = value; } }
-
-        private Socks5AddressType _AddressType = Socks5AddressType.IPv4;
-        /// <summary>地址类型</summary>
-        public Socks5AddressType AddressType { get { return _AddressType; } set { _AddressType = value; } }
-
-        [NonSerialized]
-        private String _Address;
-        /// <summary>地址</summary>
-        public String Address { get { return _Address; } set { _Address = value; } }
-
-        [NonSerialized]
-        private UInt16 _Port;
-        /// <summary>端口</summary>
-        public UInt16 Port { get { return _Port; } set { _Port = value; } }
-
-        #region 扩展属性
-        /// <summary>命令</summary>
-        public Socks5Command Command { get { return (Socks5Command)_CmdOrRep; } set { _CmdOrRep = (Byte)value; } }
-
-        /// <summary>响应</summary>
-        public Socks5Response Response { get { return (Socks5Response)_CmdOrRep; } set { _CmdOrRep = (Byte)value; } }
-        #endregion
-
-        #region IAccessor 成员
-        Boolean IAccessor.Read(IReader reader) { return false; }
-
-        Boolean IAccessor.ReadComplete(IReader reader, Boolean success)
-        {
-            var rd = reader as IReader2;
-            switch (AddressType)
-            {
-                case Socks5AddressType.IPv4:
-                    Address = new IPAddress(rd.ReadBytes(4)).ToString();
-                    break;
-                case Socks5AddressType.DomainName:
-                    Address = rd.ReadString();
-                    break;
-                case Socks5AddressType.IPv6:
-                    Address = new IPAddress(rd.ReadBytes(16)).ToString();
-                    break;
-                default:
-                    break;
-            }
-            Port = rd.ReadUInt16();
-            return success;
-        }
-
-        Boolean IAccessor.Write(IWriter writer) { return false; }
-
-        Boolean IAccessor.WriteComplete(IWriter writer, Boolean success)
-        {
-            var wr = writer as IWriter2;
-            switch (AddressType)
-            {
-                case Socks5AddressType.IPv4:
-                    wr.Write(IPAddress.Parse(Address).GetAddressBytes());
-                    break;
-                case Socks5AddressType.DomainName:
-                    wr.Write(Address);
-                    break;
-                case Socks5AddressType.IPv6:
-                    wr.Write(IPAddress.Parse(Address).GetAddressBytes());
-                    break;
-                default:
-                    break;
-            }
-            wr.Write(Port);
-            return success;
-        }
-        #endregion
-    }
-
-    /// <summary>Socks5命令</summary>
-    public enum Socks5Command : byte
-    {
-        /// <summary>Connect</summary>
-        Connect = 1,
-
-        /// <summary>Bind</summary>
-        Bind = 2,
-
-        /// <summary>UdpAssociate</summary>
-        UdpAssociate = 3,
-    }
-
-    /// <summary>Socks5响应类型</summary>
-    public enum Socks5Response : byte
-    {
-        /// <summary>成功</summary>
-        Success = 0,
-
-        /// <summary>普通的SOCKS服务器请求失败</summary>
-        GeneralSocksServerFailure,
-
-        /// <summary>现有的规则不允许的连接</summary>
-        ConnectionNotAllowed,
-
-        /// <summary>网络不可达</summary>
-        NetworkUnreachable,
-
-        /// <summary>主机不可达</summary>
-        HostUnreachable,
-
-        /// <summary>连接被拒</summary>
-        ConnectionRefused,
-
-        /// <summary>TTL超时</summary>
-        TTLExpired,
-
-        /// <summary>不支持的命令</summary>
-        CommandNotSupported,
-
-        /// <summary>不支持的地址类型</summary>
-        AddressTypeNotSupported,
-
-        /// <summary>未定义错误</summary>
-        UnknownError
-    }
-
-    /// <summary>Socks5地址类型</summary>
-    public enum Socks5AddressType : byte
-    {
-        /// <summary>IPv4地址</summary>
-        IPv4 = 1,
-
-        /// <summary>域名</summary>
-        DomainName = 3,
-
-        /// <summary>IPv6地址</summary>
-        IPv6 = 4
-    }
-
-    /// <summary>Socks5认证消息</summary>
-    public class Socks5Auth : Socks5Entity
-    {
-        private String _UserName;
-        /// <summary>用户名</summary>
-        public String UserName { get { return _UserName; } set { _UserName = value; } }
-
-        private String _Password;
-        /// <summary>密码</summary>
-        public String Password { get { return _Password; } set { _Password = value; } }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Proxy/Socks5/Socks5Server.cs b/NewLife.Net/Proxy/Socks5/Socks5Server.cs
deleted file mode 100644
index d1d6deb0bc..0000000000
--- a/NewLife.Net/Proxy/Socks5/Socks5Server.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-﻿
-namespace NewLife.Net.Proxy
-{
-    /// <summary>Socks5代理</summary>
-    /// <remarks>
-    /// 1，Socks5Request。协商认证方法
-    /// 2，Socks5Answer。确定认证方法
-    /// 3，Socks5Entity2。请求命令
-    /// 4，Socks5Entity2。响应命令
-    /// 5，Socks5Auth。请求认证
-    /// 6，Socks5Answer。响应认证
-    /// 7，开始传输
-    /// </remarks>
-    public class Socks5 : ProxyBase<Socks5.Session>
-    {
-        ///// <summary>创建会话</summary>
-        ///// <param name="e"></param>
-        ///// <returns></returns>
-        //protected override INetSession CreateSession(NetEventArgs e)
-        //{
-        //    return new Session();
-        //}
-
-        #region 会话
-        /// <summary>Socks5代理会话</summary>
-        public class Session : ProxySession<Socks5, Session>
-        {
-            ///// <summary>代理对象</summary>
-            //public new HttpReverseProxy Proxy { get { return base.Proxy as HttpReverseProxy; } set { base.Proxy = value; } }
-
-            ///// <summary>收到客户端发来的数据。子类可通过重载该方法来修改数据</summary>
-            ///// <param name="e"></param>
-            ///// <param name="stream">数据</param>
-            ///// <returns>修改后的数据</returns>
-            //protected override Stream OnReceive(NetEventArgs e, Stream stream)
-            //{
-            //    return stream;
-            //}
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/SGIP/SGIPBind.cs b/NewLife.Net/SGIP/SGIPBind.cs
deleted file mode 100644
index c7d96346de..0000000000
--- a/NewLife.Net/SGIP/SGIPBind.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-﻿using System;
-using NewLife.Serialization;
-
-namespace NewLife.Net.SGIP
-{
-    /// <summary>Bind操作由Bind命令和Bind_Resp应答组成。客户端首先发送Bind命令，服务器端收到Bind命令后，对命令发送方进行验证，然后返回Bind_Resp应答。</summary>
-    public class SGIPBind : SGIPEntity
-    {
-        #region 属性
-        private LoginTypes _LoginType;
-        /// <summary>登录类型</summary>
-        public LoginTypes LoginType { get { return _LoginType; } set { _LoginType = value; } }
-
-        [FieldSize(16)]
-        private String _LoginName;
-        /// <summary>登录名</summary>
-        public String LoginName { get { return _LoginName; } set { _LoginName = value; } }
-
-        [FieldSize(16)]
-        private String _LoginPassowrd;
-        /// <summary>登录密码</summary>
-        public String LoginPassowrd { get { return _LoginPassowrd; } set { _LoginPassowrd = value; } }
-
-        [FieldSize(8)]
-        private String _Reserve;
-        /// <summary>保留</summary>
-        public String Reserve { get { return _Reserve; } set { _Reserve = value; } }
-        #endregion
-
-        #region 构造
-        /// <summary>实例化</summary>
-        public SGIPBind() : base(SGIPCommands.Bind) { }
-        #endregion
-    }
-
-    /// <summary>Bind操作，登录类型。</summary>
-    public enum LoginTypes : Byte
-    {
-        /// <summary>1：SP向SMG建立的连接，用于发送命令</summary>
-        SpToSmg = 1,
-        /// <summary>2：SMG向SP建立的连接，用于发送命令</summary>
-        SmgToSp = 2,
-        /// <summary>3：SMG之间建立的连接，用于转发命令</summary>
-        SmgToSmg = 3,
-        /// <summary>4：SMG向GNS建立的连接，用于路由表的检索和维护</summary>
-        SmgToGns = 4,
-        /// <summary>5：GNS向SMG建立的连接，用于路由表的更新</summary>
-        GnsToSmg = 5,
-        /// <summary>6：主备GNS之间建立的连接，用于主备路由表的一致性</summary>
-        GnsToGns = 6,
-        /// <summary>11：SP与SMG以及SMG之间建立的测试连接，用于跟踪测试</summary>
-        Test = 11,
-        /// <summary>其它：保留</summary>
-        Unknown = 0,
-    }
-}
diff --git a/NewLife.Net/SGIP/SGIPClient.cs b/NewLife.Net/SGIP/SGIPClient.cs
deleted file mode 100644
index e57dc01a72..0000000000
--- a/NewLife.Net/SGIP/SGIPClient.cs
+++ /dev/null
@@ -1,268 +0,0 @@
-﻿using System;
-using System.IO;
-using NewLife.Net.Sockets;
-
-namespace NewLife.Net.SGIP
-{
-    /// <summary>SGIP客户端</summary>
-    public class SGIPClient : Netbase
-    {
-        #region 属性
-        #region 基本属性
-        private ISocketClient _Client;
-        /// <summary>TCP客户端</summary>
-        public ISocketClient Client { get { return _Client; } set { _Client = value; } }
-
-        private String _IP;
-        /// <summary>IP地址</summary>
-        public String IP { get { return _IP; } set { _IP = value; } }
-
-        private Int32 _Port;
-        /// <summary>端口</summary>
-        public Int32 Port { get { return _Port; } set { _Port = value; } }
-
-        private UInt32 _SrcNodeSequence;
-        /// <summary>源节点</summary>
-        public UInt32 SrcNodeSequence { get { return _SrcNodeSequence; } set { _SrcNodeSequence = value; } }
-        #endregion
-
-        #region 登录属性
-        private String _SystemID;
-        /// <summary>帐号名</summary>
-        public String SystemID { get { return _SystemID; } set { _SystemID = value; } }
-
-        private String _Password;
-        /// <summary>密码</summary>
-        public String Password { get { return _Password; } set { _Password = value; } }
-
-        private Boolean _Logined = false;
-        /// <summary>是否已登录</summary>
-        public Boolean Logined { get { return _Logined; } set { _Logined = value; } }
-        #endregion
-
-        #region 发信息属性
-        private String _SPNumber;
-        /// <summary>SP的接入号码。</summary>
-        public String SPNumber { get { return _SPNumber; } set { _SPNumber = value; } }
-
-        private String _CorpID;
-        /// <summary>企业代码。取值范围：0～99999。</summary>
-        public String CorpID { get { return _CorpID; } set { _CorpID = value; } }
-
-        private String _ServiceType;
-        /// <summary>业务代码</summary>
-        public String ServiceType { get { return _ServiceType; } set { _ServiceType = value; } }
-        #endregion
-        #endregion
-
-        #region 登录
-        /// <summary>登录。发送Bind指令，接收Bind_Resp响应</summary>
-        /// <returns></returns>
-        public Boolean Login()
-        {
-            WriteLog(String.Format("正在连接服务器…… {0}:{1}", IP, Port));
-            var client = new TcpSession();
-            Client = client;
-            try
-            {
-                //client.Connect(IP, Port);
-                //client.Connect(IP, Port);
-                client.Remote.Host = IP;
-                client.Remote.Port = Port;
-            }
-            catch (Exception ex)
-            {
-                var str = IP + ":" + Port.ToString();
-                throw new NetException("连接网关服务器" + str + "出错，请确定网络是否畅通！" + ex.Message, ex);
-            }
-
-            var cmd = new SGIPBind();
-            cmd.LoginName = SystemID;
-            cmd.LoginPassowrd = Password;
-            cmd.LoginType = LoginTypes.SpToSmg;
-
-            WriteLog("正在登录……");
-
-            var session = client as ISocketSession;
-            session.Send(cmd.GetStream().ReadBytes());
-            var pk = client.Receive();
-            var resp = SGIPEntity.Read(pk.GetStream()) as SGIPResponse;
-
-            if (resp == null) throw new Exception("登录失败！服务器没有响应！");
-            if (resp.Result != SGIPErrorCodes.Success) throw new Exception("登录失败！" + resp.Result.GetDescription());
-
-            //登录完成，开始读取指令
-            client.Received += Client_Received;
-            client.Open();
-
-            Logined = true;
-
-            WriteLog("登录成功！");
-
-            return true;
-        }
-
-        void Client_Received(Object sender, ReceivedEventArgs e)
-        {
-        }
-        #endregion
-
-        #region 发信息
-        /// <summary>发信息</summary>
-        /// <param name="target">目标对象</param>
-        /// <param name="content"></param>
-        public void SendMessage(String target, String content)
-        {
-            if (String.IsNullOrEmpty(target) || String.IsNullOrEmpty(content)) return;
-
-            if (!target.StartsWith("86")) target = "86" + target;
-
-            var cmd = new SGIPSubmit();
-            var id = SystemID;
-            if (id.Length > 4) id = SystemID.Substring(4);
-            cmd.SPNumber = SPNumber + id + "4888";
-            cmd.ChargeNumber = new String('0', 21);
-            cmd.UserCount = 1;
-            cmd.UserNumber = target;
-            cmd.CorpId = CorpID;
-            cmd.ServiceType = ServiceType;
-            cmd.FeeType = FeeTypes.FreeSend;
-            cmd.FeeValue = "0";
-            cmd.GivenValue = "0";
-            cmd.AgentFlag = SubmitAgentFlags.SouldIncome;
-            cmd.MorelatetoMTFlag = SubmitMorelatetoMTFlags.NormalFirst;
-            cmd.Priority = 0;
-            cmd.ExpireTime = "";
-            cmd.ScheduleTime = "";
-            cmd.ReportFlag = SubmitReportFlags.Always;
-            cmd.TP_pid = 0;
-            cmd.TP_udhi = 0;
-            cmd.MessageCoding = SGIPMessageCodings.Gbk;
-            //cmd.MessageCoding = MessageCodings.Ascii;
-            cmd.MessageType = 0;
-            //cmd.MessageLength = (UInt32)content.Length;
-            cmd.MessageContent = content;
-
-            WriteLog("正在向" + target + "发信息……");
-            //Submit_Resp resp = Send(cmd) as Submit_Resp;
-            Send(cmd);
-        }
-
-        /// <summary>传递信息</summary>
-        /// <param name="target">目标对象</param>
-        /// <param name="content"></param>
-        /// <returns></returns>
-        public void DeliverMessage(String target, String content)
-        {
-            if (String.IsNullOrEmpty(target) || String.IsNullOrEmpty(content)) return;
-
-            if (!target.StartsWith("86")) target = "86" + target;
-
-            var cmd = new SGIPDeliver();
-            cmd.UserNumber = target;
-            cmd.SPNumber = SPNumber + SystemID.Substring(4) + "4888";
-            cmd.TP_pid = 0;
-            cmd.TP_udhi = 0;
-            cmd.MessageCoding = SGIPMessageCodings.Gbk;
-            cmd.MessageLength = (UInt32)content.Length;
-            cmd.MessageContent = content;
-
-            WriteLog("正在向" + target + "分发信息……");
-            //Deliver_Resp resp = Send(cmd) as Deliver_Resp;
-            Send(cmd);
-        }
-        #endregion
-
-        #region 退出
-        /// <summary>退出</summary>
-        /// <returns></returns>
-        public Boolean Logout()
-        {
-            if (Logined)
-            {
-                WriteLog("正在注销……");
-
-                if (Client != null && Client.Client.Connected)
-                {
-                    try
-                    {
-                        Write(new SGIPUnbind());
-                        WriteLog("注销成功！");
-                    }
-                    catch (Exception ex)
-                    {
-                        WriteLog("注销失败！" + ex.Message);
-                    }
-                }
-
-                Logined = false;
-            }
-
-            Client?.Close("注销");
-
-            return true;
-        }
-        #endregion
-
-        #region 发命令
-        /// <summary>发送指令，返回响应</summary>
-        /// <param name="command">指令</param>
-        /// <returns>响应</returns>
-        private SGIPEntity Send(SGIPEntity command)
-        {
-            Write(command);
-
-            return null;
-        }
-        #endregion
-
-        #region 读写命令
-        /// <summary>读命令</summary>
-        /// <returns></returns>
-        private SGIPEntity Read()
-        {
-            if (Client == null || !Client.Client.Connected) throw new InvalidOperationException("没有连接到服务器！");
-
-            try
-            {
-                var cmd = SGIPEntity.Read(Client.Receive().GetStream());
-                if (cmd == null) throw new Exception("获取命令失败！");
-
-                WriteLog("收包：" + cmd.ToString());
-                return cmd;
-            }
-            catch (IOException ex)
-            {
-                throw new InvalidOperationException("读命令失败！", ex);
-            }
-        }
-
-        /// <summary>写命令</summary>
-        /// <param name="cmd"></param>
-        private void Write(SGIPEntity cmd)
-        {
-            if (Client == null || !Client.Client.Connected) throw new InvalidOperationException("没有连接到服务器！");
-
-            if (cmd.SrcNodeSequence < 1) cmd.SrcNodeSequence = SrcNodeSequence;
-
-            try
-            {
-                try
-                {
-                    Client.Send(cmd.GetStream().ReadBytes());
-                }
-                catch (Exception ex)
-                {
-                    throw new Exception("发送" + cmd.Command + "指令失败！", ex);
-                }
-
-                WriteLog("发包：" + cmd);
-            }
-            catch (IOException ex)
-            {
-                throw new InvalidOperationException("写" + cmd.Command + "命令失败！", ex);
-            }
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/SGIP/SGIPDeliver.cs b/NewLife.Net/SGIP/SGIPDeliver.cs
deleted file mode 100644
index 8a36b89282..0000000000
--- a/NewLife.Net/SGIP/SGIPDeliver.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-﻿using System;
-using NewLife.Serialization;
-
-namespace NewLife.Net.SGIP
-{
-    /// <summary>MO指令</summary>
-    public class SGIPDeliver : SGIPEntity
-    {
-        #region 属性
-        [FieldSize(21)]
-        private String _UserNumber;
-        /// <summary>发送短消息的用户手机号，手机号码前加“86”国别标志</summary>
-        public String UserNumber { get { return _UserNumber; } set { _UserNumber = value; } }
-
-        private String _SPNumber;
-        /// <summary>SP的接入号码</summary>
-        public String SPNumber { get { return _SPNumber; } set { _SPNumber = value; } }
-
-        private Byte _TP_pid;
-        /// <summary>GSM协议类型。详细解释请参考GSM03.40中的9.2.3.9</summary>
-        public Byte TP_pid { get { return _TP_pid; } set { _TP_pid = value; } }
-
-        private Byte _TP_udhi;
-        /// <summary>GSM协议类型。详细解释请参考GSM03.40中的9.2.3.23,仅使用1位，右对齐</summary>
-        public Byte TP_udhi { get { return _TP_udhi; } set { _TP_udhi = value; } }
-
-        private SGIPMessageCodings _MessageCoding;
-        /// <summary>短消息的编码格式。</summary>
-        public SGIPMessageCodings MessageCoding { get { return _MessageCoding; } set { _MessageCoding = value; } }
-
-        private UInt32 _MessageLength;
-        /// <summary>短消息的长度</summary>
-        public UInt32 MessageLength { get { return _MessageLength; } set { _MessageLength = value; } }
-
-        private String _MessageContent;
-        /// <summary>短消息的内容</summary>
-        public String MessageContent { get { return _MessageContent; } set { _MessageContent = value; } }
-
-        [FieldSize(8)]
-        private String _Reserve;
-        /// <summary>保留，扩展用</summary>
-        public String Reserve { get { return _Reserve; } set { _Reserve = value; } }
-        #endregion
-    
-        #region 构造
-        /// <summary>实例化</summary>
-        public SGIPDeliver() : base(SGIPCommands.Deliver) { }
-        #endregion
-}
-
-    /// <summary>短消息的编码格式。</summary>
-    public enum SGIPMessageCodings : Byte
-    {
-        /// <summary>0：纯ASCII字符串</summary>
-        Ascii = 0,
-        /// <summary>3：写卡操作</summary>
-        WriteCard = 3,
-        /// <summary>4：二进制编码</summary>
-        Binary = 4,
-        /// <summary>8：UCS2编码</summary>
-        Ucs2 = 8,
-        /// <summary>15: GBK编码</summary>
-        Gbk = 15,
-        /// <summary>其它参见GSM3.38第4节：SMS Data Coding Scheme</summary>
-        Others = 99,
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/SGIP/SGIPEntity.cs b/NewLife.Net/SGIP/SGIPEntity.cs
deleted file mode 100644
index cce8ace1a6..0000000000
--- a/NewLife.Net/SGIP/SGIPEntity.cs
+++ /dev/null
@@ -1,295 +0,0 @@
-﻿using System;
-using System.ComponentModel;
-using System.IO;
-using NewLife.Model;
-using NewLife.Serialization;
-
-namespace NewLife.Net.SGIP
-{
-    /// <summary>SGIP命令实体基类</summary>
-    public abstract class SGIPEntity
-    {
-        #region 属性
-        [NonSerialized]
-        private SGIPCommands _Command;
-        /// <summary>命令</summary>
-        public SGIPCommands Command { get { return _Command; } set { _Command = value; } }
-
-        private UInt32 _SrcNodeSequence;
-        /// <summary>序列号</summary>
-        public UInt32 SrcNodeSequence { get { return _SrcNodeSequence; } set { _SrcNodeSequence = value; } }
-
-        private UInt32 _DateSequence;
-        /// <summary>序列号</summary>
-        public UInt32 DateSequence { get { return _DateSequence; } set { _DateSequence = value; } }
-
-        private static UInt32 msgseq = 0;
-        private UInt32 _MsgSequence;
-        /// <summary>序列号</summary>
-        public UInt32 MsgSequence { get { return _MsgSequence; } set { _MsgSequence = value; } }
-        #endregion
-
-        #region 构造
-        /// <summary>实例化</summary>
-        public SGIPEntity()
-        {
-            DateSequence = (UInt32)(DateTime.Now.Month * 100000000 +
-        DateTime.Now.Day * 1000000 +
-        DateTime.Now.Hour * 10000 +
-        DateTime.Now.Minute * 100 +
-        DateTime.Now.Second);
-
-            MsgSequence = ++msgseq;
-        }
-
-        /// <summary>实例化</summary>
-        /// <param name="command"></param>
-        public SGIPEntity(SGIPCommands command) : this() { Command = command; }
-
-        static SGIPEntity() { Install(); }
-
-        static void Install()
-        {
-            ObjectContainer.Current.Register<SGIPEntity, SGIPBind>(SGIPCommands.Bind)
-                .Register<SGIPEntity, SGIPDeliver>(SGIPCommands.Deliver)
-                .Register<SGIPEntity, SGIPReport>(SGIPCommands.Report)
-                .Register<SGIPEntity, SGIPSubmit>(SGIPCommands.Submit)
-                .Register<SGIPEntity, SGIPUnbind>(SGIPCommands.Unbind)
-                .Register<SGIPEntity, SGIPResponse>(SGIPCommands.Bind_Resp)
-                .Register<SGIPEntity, SGIPResponse>(SGIPCommands.Deliver_Resp)
-                .Register<SGIPEntity, SGIPResponse>(SGIPCommands.Report_Resp)
-                .Register<SGIPEntity, SGIPResponse>(SGIPCommands.Submit_Resp)
-                .Register<SGIPEntity, SGIPResponse>(SGIPCommands.Unbind_Resp);
-        }
-        #endregion
-
-        #region 读写
-        /// <summary>从流中读取对象</summary>
-        /// <param name="stream"></param>
-        /// <returns></returns>
-        public static SGIPEntity Read(Stream stream)
-        {
-            //var reader = new BinaryReaderX(stream);
-            //reader.Settings.EncodeInt = false;
-            var reader = new Binary();
-            reader.Stream = stream;
-
-            // 先读取包长度和命令类型
-            var len = reader.Read<Int32>();
-            var cmd = (SGIPCommands)reader.Read<UInt32>();
-
-            var type = ObjectContainer.Current.ResolveType<SGIPEntity>(cmd);
-            var entity = reader.Read(type) as SGIPEntity;
-            entity.Command = cmd;
-            return entity;
-        }
-
-        /// <summary>把对象写入流中</summary>
-        /// <param name="stream"></param>
-        /// <returns></returns>
-        public void Write(Stream stream)
-        {
-            //var writer = new BinaryWriterX();
-            //writer.Settings.EncodeInt = false;
-            var writer = new Binary();
-            writer.Stream = stream;
-            
-            writer.Write((UInt32)Command);
-            writer.Write(this);
-
-            // 拿出内部流，换一个流，为了用这个读写器
-            var ms = writer.Stream;
-            writer.Stream = stream;
-
-            // 写入长度
-            writer.Write((UInt32)ms.Length);
-            ms.Position = 0;
-            ms.CopyTo(stream);
-        }
-
-        /// <summary>获取数据流</summary>
-        /// <returns></returns>
-        public Stream GetStream()
-        {
-            var ms = new MemoryStream();
-            Write(ms);
-            ms.Position = 0;
-            return ms;
-        }
-        #endregion
-    }
-
-    /// <summary>响应</summary>
-    public class SGIPResponse : SGIPEntity
-    {
-        #region 属性
-        private SGIPErrorCodes _Result;
-        /// <summary>结果</summary>
-        public SGIPErrorCodes Result { get { return _Result; } set { _Result = value; } }
-
-        [FieldSize(8)]
-        private String _Reserve;
-        /// <summary>保留</summary>
-        public String Reserve { get { return _Reserve; } set { _Reserve = value; } }
-        #endregion
-    }
-
-    /// <summary>指令枚举</summary>
-    public enum SGIPCommands : UInt32
-    {
-        /// <summary>绑定</summary>
-        Bind = 0x1,
-        /// <summary>绑定响应</summary>
-        Bind_Resp = 0x80000001,
-        /// <summary>取消绑定</summary>
-        Unbind = 0x2,
-        /// <summary>取消绑定响应</summary>
-        Unbind_Resp = 0x80000002,
-        /// <summary>提交</summary>
-        Submit = 0x3,
-        /// <summary>提交响应</summary>
-        Submit_Resp = 0x80000003,
-        /// <summary>分发</summary>
-        Deliver = 0x4,
-        /// <summary>分发响应</summary>
-        Deliver_Resp = 0x80000004,
-        /// <summary>报告</summary>
-        Report = 0x5,
-        /// <summary>报告响应</summary>
-        Report_Resp = 0x80000005,
-        //ADDSP = 0x6,
-        //ADDSP_RESP = 0x80000006,
-        //MODIFYSP = 0x7,
-        //MODIFYSP_RESP = 0x80000007,
-        //DELETESP = 0x8,
-        //DELETESP_RESP = 0x80000008,
-        //QUERYROUTE = 0x9,
-        //QUERYROUTE_RESP = 0x80000009,
-        //ADDTELESEG = 0xa,
-        //ADDTELESEG_RESP = 0x8000000a,
-        //MODIFYTELESEG = 0xb,
-        //MODIFYTELESEG_RESP = 0x8000000b,
-        //DELETETELESEG = 0xc,
-        //DELETETELESEG_RESP = 0x8000000c,
-        //ADDSMG = 0xd,
-        //ADDSMG_RESP = 0x8000000d,
-        //MODIFYSMG = 0xe,
-        //MODIFYSMG_RESP = 0x0000000e,
-        //DELETESMG = 0xf,
-        //DELETESMG_RESP = 0x8000000f,
-        //CHECKUSER = 0x10,
-        //CHECKUSER_RESP = 0x80000010,
-        //USERRPT = 0x11,
-        //USERRPT_RESP = 0x80000011,
-        //TRACE = 0x1000,
-        //TRACE_RESP = 0x80001000,
-    }
-
-    /// <summary>错误代码</summary>
-    public enum SGIPErrorCodes : Byte
-    {
-        /// <summary>无错误，命令正确接收</summary>
-        [Description("无错误，命令正确接收")]
-        Success = 0,
-
-        /// <summary>非法登录，如登录名、口令出错、登录名与口令不符等。</summary>
-        [Description("非法登录，如登录名、口令出错、登录名与口令不符等")]
-        LoginError = 1,
-
-        /// <summary>重复登录，如在同一TCP/IP连接中连续两次以上请求登录。</summary>
-        [Description("重复登录，如在同一TCP/IP连接中连续两次以上请求登录")]
-        Relogon = 2,
-
-        /// <summary>连接过多，指单个节点要求同时建立的连接数过多。</summary>
-        [Description("连接过多，指单个节点要求同时建立的连接数过多")]
-        ConnectionFull = 3,
-
-        /// <summary>登录类型错，指bind命令中的logintype字段出错。</summary>
-        [Description("登录类型错，指bind命令中的logintype字段出错")]
-        ErrorLoginType = 4,
-
-        /// <summary>参数格式错，指命令中参数值与参数类型不符或与协议规定的范围不符。</summary>
-        [Description("参数格式错，指命令中参数值与参数类型不符或与协议规定的范围不符")]
-        ParameterError = 5,
-
-        /// <summary>非法手机号码，协议中所有手机号码字段出现非86130号码或手机号码前未加“86”时都应报错。</summary>
-        [Description("非法手机号码，协议中所有手机号码字段出现非86130号码或手机号码前未加“86”时都应报错")]
-        TelnumberError = 6,
-
-        /// <summary>消息ID错</summary>
-        [Description("消息ID错")]
-        MsgIDError = 7,
-
-        /// <summary>信息长度错</summary>
-        [Description("信息长度错")]
-        PackageLengthError = 8,
-
-        /// <summary>非法序列号，包括序列号重复、序列号格式错误等</summary>
-        [Description("非法序列号，包括序列号重复、序列号格式错误等")]
-        SequenceError = 9,
-
-        /// <summary>非法操作GNS</summary>
-        [Description("非法操作GNS")]
-        GnsOperationError = 10,
-
-        /// <summary>节点忙，指本节点存储队列满或其他原因，暂时不能提供服务的情况</summary>
-        [Description("节点忙，指本节点存储队列满或其他原因，暂时不能提供服务的情况")]
-        NodeBusy = 11,
-
-        /// <summary>目的地址不可达，指路由表存在路由且消息路由正确但被路由的节点暂时不能提供服务的情况</summary>
-        [Description("目的地址不可达，指路由表存在路由且消息路由正确但被路由的节点暂时不能提供服务的情况")]
-        NodeCanNotReachable = 21,
-
-        /// <summary>路由错，指路由表存在路由但消息路由出错的情况，如转错SMG等</summary>
-        [Description("路由错，指路由表存在路由但消息路由出错的情况，如转错SMG等")]
-        RouteError = 22,
-
-        /// <summary>路由不存在，指消息路由的节点在路由表中不存在</summary>
-        [Description("路由不存在，指消息路由的节点在路由表中不存在")]
-        RoutNodeNotExisted = 23,
-
-        /// <summary>计费号码无效，鉴权不成功时反馈的错误信息</summary>
-        [Description("计费号码无效，鉴权不成功时反馈的错误信息")]
-        FeeNumberError = 24,
-
-        /// <summary>用户不能通信（如不在服务区、未开机等情况）</summary>
-        [Description("用户不能通信（如不在服务区、未开机等情况）")]
-        UserCanNotReachable = 25,
-
-        /// <summary>手机内存不足</summary>
-        [Description("手机内存不足")]
-        HandsetFull = 26,
-
-        /// <summary>手机不支持短消息</summary>
-        [Description("手机不支持短消息")]
-        HandsetCanNotRecvSms = 27,
-
-        /// <summary>手机接收短消息出现错误</summary>
-        [Description("手机接收短消息出现错误")]
-        HandsetReturnError = 28,
-
-        /// <summary>不知道的用户</summary>
-        [Description("不知道的用户")]
-        UnknownUser = 29,
-
-        /// <summary>不提供此功能</summary>
-        [Description("不提供此功能")]
-        NoDevice = 30,
-
-        /// <summary>非法设备</summary>
-        [Description("非法设备")]
-        InvalidateDevice = 31,
-
-        /// <summary>系统失败（一般指系统消息队列满）</summary>
-        [Description("系统失败（一般指系统消息队列满）")]
-        SystemError = 32,
-
-        /// <summary>超过流量限制，指发送方在一秒内的流量已经达到限制，拒绝发送</summary>
-        [Description("超过流量限制，指发送方在一秒内的流量已经达到限制，拒绝发送")]
-        FullSequence = 33,
-
-        /// <summary>未知错误</summary>
-        [Description("未知错误")]
-        OtherError = 99,
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/SGIP/SGIPReport.cs b/NewLife.Net/SGIP/SGIPReport.cs
deleted file mode 100644
index 3393733fba..0000000000
--- a/NewLife.Net/SGIP/SGIPReport.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-﻿using System;
-using NewLife.Serialization;
-
-namespace NewLife.Net.SGIP
-{
-    /// <summary>Report命令用于向SP发送一条先前的Submit命令的当前状态，或者用于向前转SMG发送一条先前的Deliver命令的当前状态。Report命令的接收方需要向发送方返回Report_Resp命令</summary>
-    public class SGIPReport : SGIPEntity
-    {
-        #region 属性
-        private UInt32 _SubmitSequenceNumber1;
-        /// <summary>该命令所涉及的Submit或deliver命令的序列号</summary>
-        public UInt32 SubmitSequenceNumber1 { get { return _SubmitSequenceNumber1; } set { _SubmitSequenceNumber1 = value; } }
-
-        private UInt32 _SubmitSequenceNumber2;
-        /// <summary>该命令所涉及的Submit或deliver命令的序列号</summary>
-        public UInt32 SubmitSequenceNumber2 { get { return _SubmitSequenceNumber2; } set { _SubmitSequenceNumber2 = value; } }
-
-        private UInt32 _SubmitSequenceNumber3;
-        /// <summary>该命令所涉及的Submit或deliver命令的序列号</summary>
-        public UInt32 SubmitSequenceNumber3 { get { return _SubmitSequenceNumber3; } set { _SubmitSequenceNumber3 = value; } }
-
-        private SGIPReportTypes _ReportType;
-        /// <summary>Report命令类型</summary>
-        public SGIPReportTypes ReportType { get { return _ReportType; } set { _ReportType = value; } }
-
-        [FieldSize(21)]
-        private String _UserNumber;
-        /// <summary>接收短消息的手机号，手机号码前加“86”国别标志</summary>
-        public String UserNumber { get { return _UserNumber; } set { _UserNumber = value; } }
-
-        private SGIPReportStates _State;
-        /// <summary>该命令所涉及的短消息的当前执行状态</summary>
-        public SGIPReportStates State { get { return _State; } set { _State = value; } }
-
-        private SGIPErrorCodes _ErrorCode;
-        /// <summary>当State=2时为错误码值，否则为0</summary>
-        public SGIPErrorCodes ErrorCode { get { return _ErrorCode; } set { _ErrorCode = value; } }
-
-        [FieldSize(8)]
-        private String _Reserve;
-        /// <summary>保留，扩展用</summary>
-        public String Reserve { get { return _Reserve; } set { _Reserve = value; } }
-        #endregion
-
-        #region 构造
-        /// <summary>实例化</summary>
-        public SGIPReport() : base(SGIPCommands.Report) { }
-        #endregion
-    }
-
-    /// <summary>Report命令类型</summary>
-    public enum SGIPReportTypes : Byte
-    {
-        /// <summary>0：对先前一条Submit命令的状态报告</summary>
-        Submit = 0,
-        /// <summary>1：对先前一条前转Deliver命令的状态报告</summary>
-        Deliver = 1,
-    }
-
-    /// <summary>该命令所涉及的短消息的当前执行状态</summary>
-    public enum SGIPReportStates : Byte
-    {
-        /// <summary>0：发送成功</summary>
-        Success = 0,
-        /// <summary>1：等待发送</summary>
-        Accepted = 1,
-        /// <summary>2：发送失败</summary>
-        Error = 2,
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/SGIP/SGIPServer.cs b/NewLife.Net/SGIP/SGIPServer.cs
deleted file mode 100644
index cd333777f5..0000000000
--- a/NewLife.Net/SGIP/SGIPServer.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-﻿using System.Net.Sockets;
-using NewLife.Net.Sockets;
-
-namespace NewLife.Net.SGIP
-{
-    /// <summary>SGIP服务器</summary>
-    public class SGIPServer : NetServer
-    {
-        #region 构造
-        /// <summary>实例化</summary>
-        public SGIPServer()
-        {
-            ProtocolType = NetType.Tcp;
-            Port = 8801;
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/SGIP/SGIPSubmit.cs b/NewLife.Net/SGIP/SGIPSubmit.cs
deleted file mode 100644
index 65909402d0..0000000000
--- a/NewLife.Net/SGIP/SGIPSubmit.cs
+++ /dev/null
@@ -1,168 +0,0 @@
-﻿using System;
-using NewLife.Serialization;
-
-namespace NewLife.Net.SGIP
-{
-    /// <summary>
-    /// 在SP和SMG的通信中，SP用Submit命令向SMG提交MT短消息，发送到用户的手机中。SMG接收到Submit命令，会返回Submit_Resp应答。SMG根据Submit命令中的付费号码，判断出该命令是否应从本地SMSC发送，如果属于本地发送，则直接发送到相应的SMSC，否则路由至相应的SMG。
-    /// 在SMG和SMG的通信中，Submit命令用于SMG客户端向服务器端路由从SP收到的MT短消息。服务器端接收到Submit命令后，再发送到与之相连的目的SMSC。
-    /// </summary>
-    public class SGIPSubmit : SGIPEntity
-    {
-        #region 属性
-        [FieldSize(21)]
-        private String _SPNumber;
-        /// <summary>SP的接入号码</summary>
-        public String SPNumber { get { return _SPNumber; } set { _SPNumber = value; } }
-
-        [FieldSize(21)]
-        private String _ChargeNumber;
-        /// <summary>付费号码，手机号码前加“86”国别标志；当且仅当群发且对用户收费时为空；如果为空，则该条短消息产生的费用由UserNumber代表的用户支付；如果为全零字符串“000000000000000000000”，表示该条短消息产生的费用由SP支付。</summary>
-        public String ChargeNumber { get { return _ChargeNumber; } set { _ChargeNumber = value; } }
-
-        private Byte _UserCount;
-        /// <summary>接收短消息的手机数量，取值范围1至100</summary>
-        public Byte UserCount { get { return _UserCount; } set { _UserCount = value; } }
-
-        [FieldSize(21)]
-        private String _UserNumber;
-        /// <summary>接收该短消息的手机号，该字段重复UserCount指定的次数，手机号码前加“86”国别标志</summary>
-        public String UserNumber { get { return _UserNumber; } set { _UserNumber = value; } }
-
-        [FieldSize(5)]
-        private String _CorpId;
-        /// <summary>企业代码，取值范围0-99999</summary>
-        public String CorpId { get { return _CorpId; } set { _CorpId = value; } }
-
-        [FieldSize(10)]
-        private String _ServiceType;
-        /// <summary>业务代码，由SP定义</summary>
-        public String ServiceType { get { return _ServiceType; } set { _ServiceType = value; } }
-
-        private FeeTypes _FeeType;
-        /// <summary>计费类型</summary>
-        public FeeTypes FeeType { get { return _FeeType; } set { _FeeType = value; } }
-
-        [FieldSize(6)]
-        private String _FeeValue;
-        /// <summary>取值范围0-99999，该条短消息的收费值，单位为分，由SP定义 对于包月制收费的用户，该值为月租费的值</summary>
-        public String FeeValue { get { return _FeeValue; } set { _FeeValue = value; } }
-
-        [FieldSize(6)]
-        private String _GivenValue;
-        /// <summary>取值范围0-99999，赠送用户的话费，单位为分，由SP定义，特指由SP向用户发送广告时的赠送话费</summary>
-        public String GivenValue { get { return _GivenValue; } set { _GivenValue = value; } }
-
-        private SubmitAgentFlags _AgentFlag;
-        /// <summary>代收费标志，0：应收；1：实收</summary>
-        public SubmitAgentFlags AgentFlag { get { return _AgentFlag; } set { _AgentFlag = value; } }
-
-        private SubmitMorelatetoMTFlags _MorelatetoMTFlag;
-        /// <summary>引起MT消息的原因0-MO点播引起的第一条MT消息；1-MO点播引起的非第一条MT消息；2-非MO点播引起的MT消息；3-系统反馈引起的MT消息。</summary>
-        public SubmitMorelatetoMTFlags MorelatetoMTFlag { get { return _MorelatetoMTFlag; } set { _MorelatetoMTFlag = value; } }
-
-        private Byte _Priority;
-        /// <summary>优先级0-9从低到高，默认为0</summary>
-        public Byte Priority { get { return _Priority; } set { _Priority = value; } }
-
-        [FieldSize(16)]
-        private String _ExpireTime;
-        /// <summary>短消息寿命的终止时间，如果为空，表示使用短消息中心的缺省值。时间内容为16个字符，格式为”yymmddhhmmsstnnp” ，其中“tnnp”取固定值“032+”，即默认系统为北京时间</summary>
-        public String ExpireTime { get { return _ExpireTime; } set { _ExpireTime = value; } }
-
-        [FieldSize(16)]
-        private String _ScheduleTime;
-        /// <summary>短消息定时发送的时间，如果为空，表示立刻发送该短消息。时间内容为16个字符，格式为“yymmddhhmmsstnnp” ，其中“tnnp”取固定值“032+”，即默认系统为北京时间</summary>
-        public String ScheduleTime { get { return _ScheduleTime; } set { _ScheduleTime = value; } }
-
-        private SubmitReportFlags _ReportFlag;
-        /// <summary>状态报告标记0-该条消息只有最后出错时要返回状态报告1-该条消息无论最后是否成功都要返回状态报告2-该条消息不需要返回状态报告3-该条消息仅携带包月计费信息，不下发给用户，要返回状态报告其它-保留缺省设置为0</summary>
-        public SubmitReportFlags ReportFlag { get { return _ReportFlag; } set { _ReportFlag = value; } }
-
-        private Byte _TP_pid;
-        /// <summary>GSM协议类型。详细解释请参考GSM03.40中的9.2.3.9</summary>
-        public Byte TP_pid { get { return _TP_pid; } set { _TP_pid = value; } }
-
-        private Byte _TP_udhi;
-        /// <summary>GSM协议类型。详细解释请参考GSM03.40中的9.2.3.23,仅使用1位，右对齐</summary>
-        public Byte TP_udhi { get { return _TP_udhi; } set { _TP_udhi = value; } }
-
-        private SGIPMessageCodings _MessageCoding;
-        /// <summary>短消息的编码格式。0：纯ASCII字符串3：写卡操作4：二进制编码8：UCS2编码15: GBK编码其它参见GSM3.38第4节：SMS Data Coding Scheme</summary>
-        public SGIPMessageCodings MessageCoding { get { return _MessageCoding; } set { _MessageCoding = value; } }
-
-        private Byte _MessageType;
-        /// <summary>信息类型：0-短消息信息其它：待定</summary>
-        public Byte MessageType { get { return _MessageType; } set { _MessageType = value; } }
-
-        private UInt32 _MessageLength;
-        /// <summary>短消息的长度</summary>
-        public UInt32 MessageLength { get { return _MessageLength; } set { _MessageLength = value; } }
-
-        [FieldSize("_MessageLength")]
-        private String _MessageContent;
-        /// <summary>短消息的内容</summary>
-        public String MessageContent { get { return _MessageContent; } set { _MessageContent = value; } }
-
-        [FieldSize(8)]
-        private String _Reserve;
-        /// <summary>保留，扩展用</summary>
-        public String Reserve { get { return _Reserve; } set { _Reserve = value; } }
-        #endregion
-   
-        #region 构造
-        /// <summary>实例化</summary>
-        public SGIPSubmit() : base(SGIPCommands.Submit) { }
-        #endregion
- }
-
-    /// <summary>代收费标志，0：应收；1：实收</summary>
-    public enum SubmitAgentFlags : Byte
-    {
-        /// <summary>0：应收</summary>
-        SouldIncome = 0,
-        /// <summary>1：实收</summary>
-        RealIncome = 1,
-    }
-
-    /// <summary>状态报告标记</summary>
-    public enum SubmitReportFlags : Byte
-    {
-        /// <summary>0-该条消息只有最后出错时要返回状态报告</summary>
-        ErrorReport = 0,
-        /// <summary>1-该条消息无论最后是否成功都要返回状态报告</summary>
-        Always = 1,
-        /// <summary>2-该条消息不需要返回状态报告</summary>
-        NoReport = 2,
-        /// <summary>3-该条消息仅携带包月计费信息，不下发给用户，要返回状态报告</summary>
-        MonthReport = 3,
-    }
-
-    /// <summary>引起MT消息的原因</summary>
-    public enum SubmitMorelatetoMTFlags : Byte
-    {
-        /// <summary>0-MO点播引起的第一条MT消息；</summary>
-        VoteFirst = 0,
-        /// <summary>1-MO点播引起的非第一条MT消息；</summary>
-        VoteNonFirst = 1,
-        /// <summary>2-非MO点播引起的MT消息；</summary>
-        NormalFirst = 2,
-        /// <summary>3-系统反馈引起的MT消息。</summary>
-        NormalNonFirst = 3,
-    }
-
-    /// <summary>计费类别定义</summary>
-    public enum FeeTypes : Byte
-    {
-        /// <summary>0	“短消息类型”为“发送”，对“计费用户号码”不计信息费，此类话单仅用于核减SP对称的信道费</summary>
-        FreeSend = 0,
-        /// <summary>1	对“计费用户号码”免费</summary>
-        Free = 1,
-        /// <summary>2	对“计费用户号码”按条计信息费</summary>
-        RowNumFee = 2,
-        /// <summary>3	对“计费用户号码”按包月收取信息费</summary>
-        MonthFee = 3,
-        /// <summary>4	对“计费用户号码”的收费是由SP实现</summary>
-        SpFee = 4,
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/SGIP/SGIPUnbind.cs b/NewLife.Net/SGIP/SGIPUnbind.cs
deleted file mode 100644
index 6e865e2bea..0000000000
--- a/NewLife.Net/SGIP/SGIPUnbind.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-﻿
-namespace NewLife.Net.SGIP
-{
-    /// <summary>Unbind操作由Unbind命令和Unbind_Resp应答组成。通信连接建立以后，客户端如果要停止通信，需要发送Unbind命令；服务器端收到Unbind命令后，向客户端发送Unbind_Resp相应，然后双方断开连接</summary>
-    public class SGIPUnbind : SGIPEntity
-    {
-        #region 构造
-        /// <summary>实例化</summary>
-        public SGIPUnbind() : base(SGIPCommands.Unbind) { }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/SNTP/SNTPClient.cs b/NewLife.Net/SNTP/SNTPClient.cs
deleted file mode 100644
index 4eb33e0c2e..0000000000
--- a/NewLife.Net/SNTP/SNTPClient.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace NewLife.Net.SNTP
-{
-    /// <summary>简单网络时间协议 (SNTP：Simple Network Time Protocol)</summary>
-    /// <remarks>
-    /// RFC 1305
-    /// 
-    /// <a target="_blank" href="http://baike.baidu.com/view/262336.htm">SNTP</a>
-    /// 
-    /// SNTPV4 由 NTP 改编而来，主要用来同步因特网中的计算机时钟。 SNTP 适用于无需完全使用 NTP 功能的情况。
-    /// 比较以前的 NTP 和 SNTP 版本， SNTPV4 的引入没有改变 NTP 规范和原有实现过程，它是对 NTP 的进一步改进，
-    /// 支持以一种简单、无状态远程过程调用模式执行精确而可靠的操作，这类似于 UDP / TIME 协议。
-    /// </remarks>
-    public class SNTPClient
-    {
-        /// <summary>从NTP服务器获取UTC时间</summary>
-        /// <param name="server">NTP服务器</param>
-        /// <param name="port">NTP端口。默认123</param>
-        /// <returns>返回UTC时间</returns>
-        public static DateTime GetTime(string server, int port)
-        {
-
-        }
-
-        /* RFC 2030 4.
-                Below is a description of the NTP/SNTP Version 4 message format,
-                which follows the IP and UDP headers. This format is identical to
-                that described in RFC-1305, with the exception of the contents of the
-                reference identifier field. The header fields are defined as follows:
-
-                                     1                   2                   3
-                 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-                +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-                |LI | VN  |Mode |    Stratum    |     Poll      |   Precision   |
-                +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-                |                          Root Delay                           |
-                +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-                |                       Root Dispersion                         |
-                +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-                |                     Reference Identifier                      |
-                +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-                |                                                               |
-                |                   Reference Timestamp (64)                    |
-                |                                                               |
-                +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-                |                                                               |
-                |                   Originate Timestamp (64)                    |
-                |                                                               |
-                +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-                |                                                               |
-                |                    Receive Timestamp (64)                     |
-                |                                                               |
-                +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-                |                                                               |
-                |                    Transmit Timestamp (64)                    |
-                |                                                               |
-                +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-                |                 Key Identifier (optional) (32)                |
-                +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-                |                                                               |
-                |                                                               |
-                |                 Message Digest (optional) (128)               |
-                |                                                               |
-                |                                                               |
-                +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-             
-                2030 5. For unicast request we need to fill version and mode only.
-                
-            */
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Sdp/SdpAttribute.cs b/NewLife.Net/Sdp/SdpAttribute.cs
deleted file mode 100644
index 35b43b56c6..0000000000
--- a/NewLife.Net/Sdp/SdpAttribute.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-﻿using System;
-
-namespace NewLife.Net.Sdp
-{
-    /// <summary>SDP 属性</summary>
-    public class SdpAttribute
-    {
-        #region 属性
-        private String _Name;
-        /// <summary>名称</summary>
-        public String Name { get { return _Name; } set { _Name = value; } }
-
-        private String _Value;
-        /// <summary>值</summary>
-        public String Value { get { return _Value; } set { _Value = value; } }
-        #endregion
-
-        #region 方法
-        /// <summary>分析</summary>
-        /// <param name="value">数值</param>
-        /// <returns></returns>
-        public static SdpAttribute Parse(String value)
-        {
-            if (String.IsNullOrEmpty(value)) throw new ArgumentNullException("value");
-
-            var p = value.IndexOf("=");
-            var p2 = value.IndexOf(":", p);
-
-            var entity = new SdpAttribute();
-            if (p2 > 0)
-            {
-                entity.Name = value.Substring(p + 1, p2 - p - 1);
-                entity.Value = value.Substring(p2 + 1);
-            }
-            else
-                entity.Name = value.Substring(p + 1);
-
-            return entity;
-        }
-
-        /// <summary>已重载。</summary>
-        /// <returns></returns>
-        public override String ToString()
-        {
-            if (String.IsNullOrEmpty(Value))
-                return String.Format("a={0}", Name);
-            else
-                return String.Format("a={0}:{1}", Name, Value);
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Sdp/SdpConnection.cs b/NewLife.Net/Sdp/SdpConnection.cs
deleted file mode 100644
index 696f8b43ff..0000000000
--- a/NewLife.Net/Sdp/SdpConnection.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-﻿using System;
-
-namespace NewLife.Net.Sdp
-{
-    /// <summary>SDP Connection</summary>
-    public class SdpConnection
-    {
-        #region 属性
-        private String _NetType;
-        /// <summary>网络类型</summary>
-        public String NetType { get { return _NetType; } set { _NetType = value; } }
-
-        private String _AddressType;
-        /// <summary>地址类型</summary>
-        public String AddressType { get { return _AddressType; } set { _AddressType = value; } }
-
-        private String _Address;
-        /// <summary>地址</summary>
-        public String Address { get { return _Address; } set { _Address = value; } }
-        #endregion
-
-        #region 方法
-        /// <summary>分析</summary>
-        /// <param name="value">数值</param>
-        /// <returns></returns>
-        public static SdpConnection Parse(String value)
-        {
-            if (String.IsNullOrEmpty(value)) throw new ArgumentNullException("value");
-
-            value = value.Trim();
-
-            if (!value.ToLower().StartsWith("c=")) throw new NetException("Invalid SDP Connection('c=') value '" + value + "'.");
-
-            value = value.Substring(2);
-
-            var values = value.Split(' ');
-            if (values.Length != 3) throw new NetException("Invalid SDP Connection('c=') value '" + value + "'.");
-
-            var entity = new SdpConnection();
-            entity.NetType = values[0];
-            entity.AddressType = values[1];
-            entity.Address = values[2];
-
-            return entity;
-        }
-
-        /// <summary>已重载。</summary>
-        /// <returns></returns>
-        public override String ToString()
-        {
-            return "c=" + NetType + " " + AddressType + " " + Address + "\r\n";
-        }
-        #endregion
-    }
-}
diff --git a/NewLife.Net/Sdp/SdpMediaDescription.cs b/NewLife.Net/Sdp/SdpMediaDescription.cs
deleted file mode 100644
index 7be8954826..0000000000
--- a/NewLife.Net/Sdp/SdpMediaDescription.cs
+++ /dev/null
@@ -1,164 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace NewLife.Net.Sdp
-{
-    /// <summary>SDP 媒体描述</summary>
-    public class SdpMediaDescription
-    {
-        #region 属性
-        private String _MediaType;
-        /// <summary>媒体类型</summary>
-        public String MediaType { get { return _MediaType; } set { _MediaType = value; } }
-
-        private Int32 _Port;
-        /// <summary>端口</summary>
-        public Int32 Port { get { return _Port; } set { _Port = value; } }
-
-        private Int32 _NumberOfPorts;
-        /// <summary>端口数</summary>
-        public Int32 NumberOfPorts { get { return _NumberOfPorts; } set { _NumberOfPorts = value; } }
-
-        private String _Protocol;
-        /// <summary>协议。UDP;RTP/AVP;RTP/SAVP.</summary>
-        public String Protocol { get { return _Protocol; } set { _Protocol = value; } }
-
-        private List<String> _MediaFormats;
-        /// <summary>媒体格式</summary>
-        /// <remarks>
-        /// <code>
-        /// ; Media Formats: 
-        /// ; If the Transport Protocol is "RTP/AVP" or "RTP/SAVP" the &lt;fmt&gt; 
-        /// ; sub-fields contain RTP payload type numbers, for example: 
-        /// ; - for Audio: 0: PCMU, 4: G723, 8: PCMA, 18: G729 
-        /// ; - for Video: 31: H261, 32: MPV 
-        /// ; If the Transport Protocol is "udp" the &lt;fmt&gt; sub-fields 
-        /// ; must reference a MIME type 
-        /// </code>
-        /// </remarks>
-        public List<String> MediaFormats { get { return _MediaFormats; } set { _MediaFormats = value; } }
-
-        private String _Information;
-        /// <summary>信息</summary>
-        public String Information { get { return _Information; } set { _Information = value; } }
-
-        private SdpConnection _Connection;
-        /// <summary>连接</summary>
-        public SdpConnection Connection { get { return _Connection; } set { _Connection = value; } }
-
-        private String _Bandwidth;
-        /// <summary>带宽</summary>
-        public String Bandwidth { get { return _Bandwidth; } set { _Bandwidth = value; } }
-
-        private List<SdpAttribute> _Attributes;
-        /// <summary>属性集合</summary>
-        public List<SdpAttribute> Attributes { get { return _Attributes; } set { _Attributes = value; } }
-
-        private Dictionary<String, Object> _Tags;
-        /// <summary>标签集合</summary>
-        public Dictionary<String, Object> Tags { get { return _Tags; } set { _Tags = value; } }
-        #endregion
-
-        #region 方法
-        /// <summary>分析</summary>
-        /// <param name="value">数值</param>
-        /// <returns></returns>
-        public static SdpMediaDescription Parse(String value)
-        {
-            var media = new SdpMediaDescription();
-
-            // m=<media> <port>/<number of ports> <proto> <fmt> ...
-            var p = value.IndexOf("=");
-            value = value.Substring(p + 1);
-            var vs = value.Split(" ");
-
-            //--- <media> ------------------------------------------------------------
-            if (vs == null || vs.Length < 1) throw new Exception("SDP message \"m\" field <media> value is missing !");
-
-            media.MediaType = vs[0];
-
-            //--- <port>/<number of ports> -------------------------------------------
-            if (vs.Length < 2) throw new Exception("SDP message \"m\" field <port> value is missing !");
-
-            var word = vs[1];
-            if (word.IndexOf('/') > -1)
-            {
-                var words = word.Split('/');
-                media.Port = Convert.ToInt32(words[0]);
-                media.NumberOfPorts = Convert.ToInt32(words[1]);
-            }
-            else
-            {
-                media.Port = Convert.ToInt32(word);
-                media.NumberOfPorts = 1;
-            }
-
-            //--- <proto> --------------------------------------------------------------
-            if (vs.Length < 2) throw new Exception("SDP message \"m\" field <proto> value is missing !");
-
-            media.Protocol = vs[2];
-
-            //--- <fmt> ----------------------------------------------------------------
-            for (var i = 3; i < vs.Length; i++)
-            {
-                media.MediaFormats.Add(vs[i]);
-            }
-
-            return media;
-        }
-
-        /// <summary>已重载。</summary>
-        /// <returns></returns>
-        public override String ToString()
-        {
-            /*
-                           m=  (media name and transport address)
-                           i=* (media title)
-                           c=* (connection information -- optional if included at session level)
-                           b=* (zero or more bandwidth information lines)
-                           k=* (encryption key)
-                           a=* (zero or more media attribute lines)
-                       */
-
-            // m=<media> <port>/<number of ports> <proto> <fmt> ...
-
-            var retVal = new StringBuilder();
-            if (NumberOfPorts > 1)
-            {
-                retVal.Append("m=" + MediaType + " " + Port + "/" + NumberOfPorts + " " + Protocol);
-            }
-            else
-            {
-                retVal.Append("m=" + MediaType + " " + Port + " " + Protocol);
-            }
-            foreach (var mediaFormat in MediaFormats)
-            {
-                retVal.Append(" " + mediaFormat);
-            }
-            retVal.Append("\r\n");
-            // i (media title)
-            if (!String.IsNullOrEmpty(Information))
-            {
-                retVal.Append("i=" + Information + "\r\n");
-            }
-            // b (bandwidth information)
-            if (!String.IsNullOrEmpty(Bandwidth))
-            {
-                retVal.Append("b=" + Bandwidth + "\r\n");
-            }
-            // c (connection information)
-            if (Connection != null)
-            {
-                retVal.Append(Connection.ToString());
-            }
-            foreach (var attribute in Attributes)
-            {
-                retVal.Append(attribute.ToString());
-            }
-
-            return retVal.ToString();
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Sdp/SdpMessage.cs b/NewLife.Net/Sdp/SdpMessage.cs
deleted file mode 100644
index 9ac40adc1c..0000000000
--- a/NewLife.Net/Sdp/SdpMessage.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-
-namespace NewLife.Net.Sdp
-{
-    /// <summary>会话描述协议</summary>
-    /// <remarks>
-    /// <a target="_blank" href="http://baike.baidu.com/view/875414.htm">会话描述协议</a>
-    /// 
-    /// 为会话通知、会话邀请和其它形式的多媒体会话初始化等目的提供了多媒体会话描述。
-    /// </remarks>
-    public class SdpMessage
-    {
-        #region 属性
-        private String _Version;
-        /// <summary>版本</summary>
-        public String Version { get { return _Version; } set { _Version = value; } }
-
-        private SdpOrigin _Origin;
-        /// <summary>属性说明</summary>
-        public SdpOrigin Origin { get { return _Origin; } set { _Origin = value; } }
-
-        private String _SessionName;
-        /// <summary>会话名</summary>
-        public String SessionName { get { return _SessionName; } set { _SessionName = value; } }
-
-        private String _SessionDescription;
-        /// <summary>会话描述</summary>
-        public String SessionDescription { get { return _SessionDescription; } set { _SessionDescription = value; } }
-
-        private String _Uri;
-        /// <summary>资源标识</summary>
-        public String Uri { get { return _Uri; } set { _Uri = value; } }
-
-        private SdpConnection _Connection;
-        /// <summary>连接</summary>
-        public SdpConnection Connection { get { return _Connection; } set { _Connection = value; } }
-
-        private List<SdpTime> _Times;
-        /// <summary>属性说明</summary>
-        public List<SdpTime> Times { get { return _Times ?? (_Times = new List<SdpTime>()); } }
-
-        private String _RepeatTimes;
-        /// <summary>会话重复次数</summary>
-        public String RepeatTimes { get { return _RepeatTimes; } set { _RepeatTimes = value; } }
-
-        private List<SdpAttribute> _Attributes;
-        /// <summary>属性集合</summary>
-        public List<SdpAttribute> Attributes { get { return _Attributes ?? (_Attributes = new List<SdpAttribute>()); } }
-
-        private List<SdpMediaDescription> _MediaDescriptions;
-        /// <summary>媒体描述集合</summary>
-        public List<SdpMediaDescription> MediaDescriptions { get { return _MediaDescriptions ?? (_MediaDescriptions = new List<SdpMediaDescription>()); } }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Sdp/SdpOrigin.cs b/NewLife.Net/Sdp/SdpOrigin.cs
deleted file mode 100644
index 2e14263fff..0000000000
--- a/NewLife.Net/Sdp/SdpOrigin.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-﻿using System;
-
-namespace NewLife.Net.Sdp
-{
-    /// <summary>SDP Origin。RFC 4566 5.2</summary>
-    public class SdpOrigin
-    {
-        #region 属性
-        private String _UserName;
-        /// <summary>用户名</summary>
-        public String UserName { get { return _UserName; } set { _UserName = value; } }
-
-        private Int64 _SessionID;
-        /// <summary>会话编号</summary>
-        public Int64 SessionID { get { return _SessionID; } set { _SessionID = value; } }
-
-        private Int64 _SessionVersion;
-        /// <summary>会话版本。每次会话数据被修改时都递增该值</summary>
-        public Int64 SessionVersion { get { return _SessionVersion; } set { _SessionVersion = value; } }
-
-        private String _NetType;
-        /// <summary>网络类型。IN</summary>
-        public String NetType { get { return _NetType; } set { _NetType = value; } }
-
-        private String _AddressType;
-        /// <summary>地址类型。IP4，IP6</summary>
-        public String AddressType { get { return _AddressType; } set { _AddressType = value; } }
-
-        private String _UnicastAddress;
-        /// <summary>地址</summary>
-        public String UnicastAddress { get { return _UnicastAddress; } set { _UnicastAddress = value; } }
-        #endregion
-
-        #region 方法
-        /// <summary>分析</summary>
-        /// <param name="value">Origin value.</param>
-        /// <returns>Returns parsed SDP Origin.</returns>
-        public static SdpOrigin Parse(String value)
-        {
-            if (value == null) throw new ArgumentNullException("value");
-
-            value = value.Trim();
-
-            /* o=<username> <sess-id> <sess-version> <nettype> <addrtype> <unicast-address>
-            */
-
-            if (!value.ToLower().StartsWith("o=")) throw new NetException("Invalid SDP Origin('o=') value '" + value + "'.");
-
-            value = value.Substring(2);
-
-            var values = value.Split(' ');
-            if (values.Length != 6) throw new NetException("Invalid SDP Origin('o=') value '" + value + "'.");
-
-            var so = new SdpOrigin();
-            so.UserName = values[0];
-            so.SessionID = Convert.ToInt64(values[1]);
-            so.SessionVersion = Convert.ToInt64(values[2]);
-            so.NetType = values[3];
-            so.AddressType = values[4];
-            so.UnicastAddress = values[5];
-            return so;
-        }
-
-        /// <summary>已重载。</summary>
-        /// <returns></returns>
-        public override String ToString()
-        {
-            return "o=" + UserName + " " + SessionID + " " + SessionVersion + " " + NetType + " " + AddressType + " " + UnicastAddress + "\r\n";
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Sdp/SdpTime.cs b/NewLife.Net/Sdp/SdpTime.cs
deleted file mode 100644
index e748e663b2..0000000000
--- a/NewLife.Net/Sdp/SdpTime.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-﻿using System;
-
-namespace NewLife.Net.Sdp
-{
-    /// <summary>SDP 时间</summary>
-    public class SdpTime
-    {
-        #region 属性
-        private Int64 _StartTime;
-        /// <summary>开始时间。1900年以来的秒数</summary>
-        public Int64 StartTime { get { return _StartTime; } set { _StartTime = value; } }
-
-        private Int64 _StopTime;
-        /// <summary>停止时间。1900年以来的秒数</summary>
-        public Int64 StopTime { get { return _StopTime; } set { _StopTime = value; } }
-        #endregion
-
-        #region 方法
-        /// <summary>分析</summary>
-        /// <param name="value">数值</param>
-        /// <returns></returns>
-        public static SdpTime Parse(String value)
-        {
-            if (value == null) throw new ArgumentNullException("value");
-
-            value = value.Trim();
-
-            if (!value.ToLower().StartsWith("t=")) throw new NetException("Invalid SDP Time('t=') value '" + value + "'.");
-
-            value = value.Substring(2);
-
-            var values = value.Split(' ');
-            if (values.Length != 2) throw new NetException("Invalid SDP Time('t=') value '" + value + "'.");
-
-            var entity = new SdpTime();
-            entity.StartTime = Convert.ToInt64(values[0]);
-            entity.StopTime = Convert.ToInt64(values[1]);
-            return entity;
-        }
-
-        /// <summary>已重载。</summary>
-        /// <returns></returns>
-        public override String ToString()
-        {
-            return "t=" + StartTime + " " + StopTime + "\r\n";
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Sip/Message/Sip.cs b/NewLife.Net/Sip/Message/Sip.cs
deleted file mode 100644
index d3ac1f1373..0000000000
--- a/NewLife.Net/Sip/Message/Sip.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-﻿
-namespace NewLife.Net.Sip.Message
-{
-    /// <summary></summary>
-    public class Sip : SipValueWithParams
-    {
-        #region 属性
-        #endregion
-
-        #region 扩展属性
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Sip/Message/SipACValue.cs b/NewLife.Net/Sip/Message/SipACValue.cs
deleted file mode 100644
index a7724116ca..0000000000
--- a/NewLife.Net/Sip/Message/SipACValue.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-﻿using System;
-
-namespace NewLife.Net.Sip.Message
-{
-    /// <summary>ac-value</summary>
-    /// <remarks>
-    /// <code>
-    /// RFC 3841 Syntax:
-    ///     ac-value       = "*" *(SEMI ac-params)
-    ///     ac-params      = feature-param / req-param / explicit-param / generic-param
-    ///                      ;;feature param from RFC 3840
-    ///                      ;;generic-param from RFC 3261
-    ///     req-param      = "require"
-    ///     explicit-param = "explicit"
-    /// </code>
-    /// </remarks>
-    public class SipACValue : SipValueWithParams
-    {
-        #region 属性
-        private Boolean _Require;
-        /// <summary>属性说明</summary>
-        public Boolean Require { get { return _Require; } set { _Require = value; } }
-
-        private Boolean _Explicit;
-        /// <summary>属性说明</summary>
-        public Boolean Explicit { get { return _Explicit; } set { _Explicit = value; } }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Sip/Message/SipAddressParam.cs b/NewLife.Net/Sip/Message/SipAddressParam.cs
deleted file mode 100644
index cd8dc31e3d..0000000000
--- a/NewLife.Net/Sip/Message/SipAddressParam.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-﻿
-namespace NewLife.Net.Sip.Message
-{
-    /// <summary></summary>
-    public class SipAddressParam : SipValueWithParams
-    {
-        #region 属性
-        private SipNameAddress _Address;
-        /// <summary>地址</summary>
-        public SipNameAddress Address { get { return _Address; } set { _Address = value; } }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Sip/Message/SipAlertParam.cs b/NewLife.Net/Sip/Message/SipAlertParam.cs
deleted file mode 100644
index 7b8444b12d..0000000000
--- a/NewLife.Net/Sip/Message/SipAlertParam.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-﻿using System;
-
-namespace NewLife.Net.Sip.Message
-{
-    /// <summary></summary>
-    public class SipAlertParam : SipValueWithParams
-    {
-        #region 属性
-        private String _Uri;
-        /// <summary>标识</summary>
-        public String Uri { get { return _Uri; } set { _Uri = value; } }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Sip/Message/SipContactParam.cs b/NewLife.Net/Sip/Message/SipContactParam.cs
deleted file mode 100644
index 1dabb234b7..0000000000
--- a/NewLife.Net/Sip/Message/SipContactParam.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-﻿using System;
-
-namespace NewLife.Net.Sip.Message
-{
-    /// <summary></summary>
-    public class SipContactParam : SipValueWithParams
-    {
-        #region 属性
-        private SipNameAddress _Address;
-        /// <summary>地址</summary>
-        public SipNameAddress Address { get { return _Address; } set { _Address = value; } }
-        #endregion
-
-        #region 扩展属性
-        /// <summary>是否*联系人</summary>
-        public Boolean IsStarContact { get { return Address != null && Address.Uri != null && Address.Uri.Host.StartsWith("*"); } }
-
-        private Double _QValue;
-        /// <summary>qvalue</summary>
-        public Double QValue { get { return _QValue; } set { _QValue = value; } }
-
-        private Int32 _Expires;
-        /// <summary>expires</summary>
-        public Int32 Expires { get { return _Expires; } set { _Expires = value; } }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Sip/Message/SipContentDisposition.cs b/NewLife.Net/Sip/Message/SipContentDisposition.cs
deleted file mode 100644
index ba92c015a4..0000000000
--- a/NewLife.Net/Sip/Message/SipContentDisposition.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-﻿using System;
-
-namespace NewLife.Net.Sip.Message
-{
-    /// <summary></summary>
-    public class SipContentDisposition : SipValueWithParams
-    {
-        #region 属性
-        private String _DispositionType;
-        /// <summary>DispositionType</summary>
-        public String DispositionType { get { return _DispositionType; } set { _DispositionType = value; } }
-        #endregion
-
-        #region 扩展属性
-        private String _Handling;
-        /// <summary>handling</summary>
-        public String Handling { get { return _Handling; } set { _Handling = value; } }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Sip/Message/SipEncoding.cs b/NewLife.Net/Sip/Message/SipEncoding.cs
deleted file mode 100644
index 8d57eb175f..0000000000
--- a/NewLife.Net/Sip/Message/SipEncoding.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-﻿using System;
-
-namespace NewLife.Net.Sip.Message
-{
-    /// <summary></summary>
-    public class SipEncoding : SipValueWithParams
-    {
-        #region 属性
-        private String _ContentEncoding;
-        /// <summary>属性说明</summary>
-        public String ContentEncoding { get { return _ContentEncoding; } set { _ContentEncoding = value; } }
-        #endregion
-
-        #region 扩展属性
-        private Double _QValue;
-        /// <summary>qvalue</summary>
-        public Double QValue { get { return _QValue; } set { _QValue = value; } }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Sip/Message/SipErrorUri.cs b/NewLife.Net/Sip/Message/SipErrorUri.cs
deleted file mode 100644
index e46edd606a..0000000000
--- a/NewLife.Net/Sip/Message/SipErrorUri.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-﻿using System;
-
-namespace NewLife.Net.Sip.Message
-{
-    /// <summary></summary>
-    public class SipErrorUri : SipValueWithParams
-    {
-        #region 属性
-        private String _Uri;
-        /// <summary>属性说明</summary>
-        public String Uri { get { return _Uri; } set { _Uri = value; } }
-        #endregion
-
-        #region 扩展属性
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Sip/Message/SipEvent.cs b/NewLife.Net/Sip/Message/SipEvent.cs
deleted file mode 100644
index aee68ef8a0..0000000000
--- a/NewLife.Net/Sip/Message/SipEvent.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-﻿using System;
-
-namespace NewLife.Net.Sip.Message
-{
-    /// <summary></summary>
-    public class SipEvent : SipValueWithParams
-    {
-        #region 属性
-        private String _EventType;
-        /// <summary>属性说明</summary>
-        public String EventType { get { return _EventType; } set { _EventType = value; } }
-        #endregion
-
-        #region 扩展属性
-        private String _ID;
-        /// <summary>id</summary>
-        public String ID { get { return _ID; } set { _ID = value; } }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Sip/Message/SipFrom.cs b/NewLife.Net/Sip/Message/SipFrom.cs
deleted file mode 100644
index edea24e98a..0000000000
--- a/NewLife.Net/Sip/Message/SipFrom.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-﻿using System;
-
-namespace NewLife.Net.Sip.Message
-{
-    /// <summary></summary>
-    public class SipFrom : SipValueWithParams
-    {
-        #region 属性
-        private SipNameAddress _Address;
-        /// <summary>地址</summary>
-        public SipNameAddress Address { get { return _Address; } set { _Address = value; } }
-        #endregion
-
-        #region 扩展属性
-        private String _Tag;
-        /// <summary>tag</summary>
-        public String Tag { get { return _Tag; } set { _Tag = value; } }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Sip/Message/SipHiEntry.cs b/NewLife.Net/Sip/Message/SipHiEntry.cs
deleted file mode 100644
index 59a3ddaf24..0000000000
--- a/NewLife.Net/Sip/Message/SipHiEntry.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-﻿using System;
-
-namespace NewLife.Net.Sip.Message
-{
-    /// <summary></summary>
-    public class SipHiEntry : SipValueWithParams
-    {
-        #region 属性
-        private SipNameAddress _Address;
-        /// <summary>地址</summary>
-        public SipNameAddress Address { get { return _Address; } set { _Address = value; } }
-        #endregion
-
-        #region 扩展属性
-        private Double _Index;
-        /// <summary>index</summary>
-        public Double Index { get { return _Index; } set { _Index = value; } }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Sip/Message/SipIdentityInfo.cs b/NewLife.Net/Sip/Message/SipIdentityInfo.cs
deleted file mode 100644
index cfa0597a09..0000000000
--- a/NewLife.Net/Sip/Message/SipIdentityInfo.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-﻿using System;
-
-namespace NewLife.Net.Sip.Message
-{
-    /// <summary></summary>
-    public class SipIdentityInfo : SipValueWithParams
-    {
-        #region 属性
-        private String _Uri;
-        /// <summary>属性说明</summary>
-        public String Uri { get { return _Uri; } set { _Uri = value; } }
-        #endregion
-
-        #region 扩展属性
-        private String _Alg;
-        /// <summary>alg</summary>
-        public String Alg { get { return _Alg; } set { _Alg = value; } }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Sip/Message/SipInfo.cs b/NewLife.Net/Sip/Message/SipInfo.cs
deleted file mode 100644
index a8349525ad..0000000000
--- a/NewLife.Net/Sip/Message/SipInfo.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-﻿using System;
-
-namespace NewLife.Net.Sip.Message
-{
-    /// <summary></summary>
-    public class SipInfo : SipValueWithParams
-    {
-        #region 属性
-        private String _Uri;
-        /// <summary>属性说明</summary>
-        public String Uri { get { return _Uri; } set { _Uri = value; } }
-        #endregion
-
-        #region 扩展属性
-        private String _Purpose;
-        /// <summary>属性说明</summary>
-        public String Purpose { get { return _Purpose; } set { _Purpose = value; } }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Sip/Message/SipJoin.cs b/NewLife.Net/Sip/Message/SipJoin.cs
deleted file mode 100644
index dd498e3cf0..0000000000
--- a/NewLife.Net/Sip/Message/SipJoin.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-﻿
-namespace NewLife.Net.Sip.Message
-{
-    /// <summary></summary>
-    public class SipJoin : SipValueWithParams
-    {
-        #region 属性
-        #endregion
-
-        #region 扩展属性
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Sip/Message/SipNameAddress.cs b/NewLife.Net/Sip/Message/SipNameAddress.cs
deleted file mode 100644
index 31e8f1deb0..0000000000
--- a/NewLife.Net/Sip/Message/SipNameAddress.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-﻿using System;
-
-namespace NewLife.Net.Sip.Message
-{
-    /// <summary></summary>
-    public class SipNameAddress
-    {
-        #region 属性
-        private String _DisplayName;
-        /// <summary>显示名</summary>
-        public String DisplayName { get { return _DisplayName; } set { _DisplayName = value; } }
-
-        private Uri _Uri;
-        /// <summary>唯一标识</summary>
-        public Uri Uri { get { return _Uri; } set { _Uri = value; } }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Sip/Message/SipValue.cs b/NewLife.Net/Sip/Message/SipValue.cs
deleted file mode 100644
index bcf9659edf..0000000000
--- a/NewLife.Net/Sip/Message/SipValue.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-﻿
-namespace NewLife.Net.Sip.Message
-{
-    /// <summary>Sip实体基类</summary>
-    public abstract class SipValue
-    {
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Sip/Message/SipValueWithParams.cs b/NewLife.Net/Sip/Message/SipValueWithParams.cs
deleted file mode 100644
index 86ad090e4d..0000000000
--- a/NewLife.Net/Sip/Message/SipValueWithParams.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-
-namespace NewLife.Net.Sip.Message
-{
-    /// <summary>带参数Sip实体基类</summary>
-    public abstract class SipValueWithParams : SipValue
-    {
-        #region 属性
-        private Dictionary<String, String> _Parameters;
-        /// <summary>参数集合</summary>
-        public IDictionary<String, String> Parameters { get { return _Parameters ?? (_Parameters = new Dictionary<String, String>(StringComparer.OrdinalIgnoreCase)); } }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Smtp/RelayServer.cs b/NewLife.Net/Smtp/RelayServer.cs
deleted file mode 100644
index d2ab08c043..0000000000
--- a/NewLife.Net/Smtp/RelayServer.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-﻿using System.Net.Sockets;
-using NewLife.Net.Sockets;
-
-namespace NewLife.Net.Smtp
-{
-    /// <summary>Relay服务器</summary>
-    public class RelayServer : NetServer<RelaySession>
-    {
-        //TODO 未实现Relay服务端
-
-        #region 属性
-        //private Dictionary<Int32, RelaySession> _Sessions;
-        ///// <summary>会话集合</summary>
-        //public IDictionary<Int32, RelaySession> Sessions { get { return _Sessions ?? (_Sessions = new Dictionary<int, RelaySession>()); } }
-        #endregion
-
-        /// <summary>实例化一个Relay服务器</summary>
-        public RelayServer()
-        {
-            Port = 25;
-            ProtocolType = NetType.Tcp;
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Smtp/RelaySession.cs b/NewLife.Net/Smtp/RelaySession.cs
deleted file mode 100644
index e018a975b9..0000000000
--- a/NewLife.Net/Smtp/RelaySession.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-﻿using NewLife.Net.Sockets;
-
-namespace NewLife.Net.Smtp
-{
-    /// <summary>Relay会话</summary>
-    public class RelaySession : NetSession
-    {
-        //TODO 未实现Relay会话
-
-        #region 属性
-
-        #endregion
-
-        #region 启动会话
-        //void Start()
-        //{
-
-        //}
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Smtp/SmtpClient.cs b/NewLife.Net/Smtp/SmtpClient.cs
deleted file mode 100644
index 5936d899b4..0000000000
--- a/NewLife.Net/Smtp/SmtpClient.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-﻿
-namespace NewLife.Net.Smtp
-{
-    /// <summary>Smtp客户端</summary>
-    public class SmtpClient : DisposeBase
-    {
-        //TODO 未实现Smtp客户端
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Smtp/SmtpServer.cs b/NewLife.Net/Smtp/SmtpServer.cs
deleted file mode 100644
index 76a602953c..0000000000
--- a/NewLife.Net/Smtp/SmtpServer.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-﻿using System.Net.Sockets;
-using NewLife.Net.Sockets;
-
-namespace NewLife.Net.Smtp
-{
-    /// <summary>Smtp服务器</summary>
-    public class SmtpServer : NetServer<SmtpSession>
-    {
-        //TODO 未实现Smtp服务端
-
-        #region 属性
-        //private Dictionary<Int32, SmtpSession> _Sessions;
-        ///// <summary>会话集合</summary>
-        //public IDictionary<Int32, SmtpSession> Sessions { get { return _Sessions ?? (_Sessions = new Dictionary<int, SmtpSession>()); } }
-        #endregion
-
-        /// <summary>实例化一个Smtp服务器</summary>
-        public SmtpServer()
-        {
-            Port = 25;
-            ProtocolType = NetType.Tcp;
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Smtp/SmtpSession.cs b/NewLife.Net/Smtp/SmtpSession.cs
deleted file mode 100644
index cc8d47c7d4..0000000000
--- a/NewLife.Net/Smtp/SmtpSession.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-﻿using NewLife.Net.Sockets;
-
-namespace NewLife.Net.Smtp
-{
-    /// <summary>Smtp会话</summary>
-    public class SmtpSession : NetSession
-    {
-        //TODO 未实现Smtp会话
-
-        #region 属性
-
-        #endregion
-
-        #region 启动会话
-        //void Start()
-        //{
-
-        //}
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Sockets/INetSession.cs b/NewLife.Net/Sockets/INetSession.cs
deleted file mode 100644
index 83d9cecce6..0000000000
--- a/NewLife.Net/Sockets/INetSession.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-﻿using System;
-using System.IO;
-using System.Text;
-
-namespace NewLife.Net.Sockets
-{
-    /// <summary>网络服务会话接口</summary>
-    /// <remarks>
-    /// 所有应用服务器以会话<see cref="INetSession"/>作为业务处理核心。
-    /// 应用服务器收到新会话请求后，通过<see cref="Start"/>启动一个会话处理。
-    /// 会话进行业务处理的过程中，可以通过多个Send方法向客户端发送数据。
-    /// </remarks>
-    public interface INetSession : IDisposable2
-    {
-        #region 属性
-        /// <summary>编号</summary>
-        Int32 ID { get; set; }
-
-        /// <summary>主服务</summary>
-        NetServer Host { get; set; }
-
-        /// <summary>Socket服务器。当前通讯所在的Socket服务器，其实是TcpServer/UdpServer</summary>
-        ISocketServer Server { get; set; }
-
-        /// <summary>客户端。跟客户端通讯的那个Socket，其实是服务端TcpSession/UdpSession</summary>
-        ISocketSession Session { get; set; }
-
-        /// <summary>客户端地址</summary>
-        NetUri Remote { get; }
-        #endregion
-
-        #region 方法
-        /// <summary>开始会话处理。</summary>
-        void Start();
-        #endregion
-
-        #region 收发
-        /// <summary>发送数据</summary>
-        /// <param name="buffer">缓冲区</param>
-        /// <param name="offset">位移</param>
-        /// <param name="size">写入字节数</param>
-        INetSession Send(byte[] buffer, int offset = 0, int size = -1);
-
-        /// <summary>发送数据流</summary>
-        /// <param name="stream"></param>
-        /// <returns></returns>
-        INetSession Send(Stream stream);
-
-        /// <summary>发送字符串</summary>
-        /// <param name="msg"></param>
-        /// <param name="encoding"></param>
-        INetSession Send(string msg, Encoding encoding = null);
-
-        /// <summary>数据到达事件</summary>
-        event EventHandler<ReceivedEventArgs> Received;
-        #endregion
-    }
-
-    /// <summary>会话事件参数</summary>
-    public class NetSessionEventArgs : EventArgs
-    {
-        private INetSession _Session;
-        /// <summary>会话</summary>
-        public INetSession Session { get { return _Session; } set { _Session = value; } }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Sockets/ISocket.cs b/NewLife.Net/Sockets/ISocket.cs
deleted file mode 100644
index 1bda7eb6bd..0000000000
--- a/NewLife.Net/Sockets/ISocket.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-﻿using System;
-using System.Net;
-using System.Net.Sockets;
-using NewLife.Net.Common;
-
-namespace NewLife.Net.Sockets
-{
-    /// <summary>基础Socket接口</summary>
-    /// <remarks>
-    /// 主要是对Socket封装一层，把所有异步操作结果转移到事件中去。
-    /// </remarks>
-    public interface ISocket : ISocketAddress, IDisposable2
-    {
-        #region 属性
-        /// <summary>基础Socket对象</summary>
-        Socket Socket { get; set; }
-
-        /// <summary>监听本地地址</summary>
-        IPAddress Address { get; set; }
-
-        /// <summary>监听端口</summary>
-        Int32 Port { get; set; }
-
-        /// <summary>地址族</summary>
-        AddressFamily AddressFamily { get; set; }
-
-        ///// <summary>是否使用线程池处理事件。建议仅在事件处理非常耗时时使用线程池来处理。</summary>
-        //bool UseThreadPool { get; set; }
-
-        ///// <summary>禁用接收延迟，收到数据后马上建立异步读取再处理本次数据</summary>
-        //bool NoDelay { get; set; }
-
-        ///// <summary>允许将套接字绑定到已在使用中的地址。</summary>
-        //bool ReuseAddress { get; set; }
-
-        ///// <summary>缓冲区大小</summary>
-        //int BufferSize { get; set; }
-
-        ///// <summary>数据字典</summary>
-        //IDictionary Items { get; }
-
-        /// <summary>接收数据包统计信息，默认关闭，通过<see cref="IStatistics.Enable"/>打开。</summary>
-        IStatistics Statistics { get; }
-
-        /// <summary>异步操作计数</summary>
-        Int32 AsyncCount { get; }
-        #endregion
-
-        #region 方法
-        /// <summary>绑定本地终结点</summary>
-        void Bind();
-
-        /// <summary>关闭网络操作</summary>
-        void Close();
-        #endregion
-
-        #region 事件
-        /// <summary>错误发生/断开连接时</summary>
-        event EventHandler<ExceptionEventArgs> Error;
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Sockets/ISocketAddress.cs b/NewLife.Net/Sockets/ISocketAddress.cs
deleted file mode 100644
index dd036f3b18..0000000000
--- a/NewLife.Net/Sockets/ISocketAddress.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-﻿using System;
-using System.Net;
-using System.Net.Sockets;
-
-namespace NewLife.Net.Sockets
-{
-    /// <summary>用于指定双方地址的接口</summary>
-    public interface ISocketAddress
-    {
-        #region 属性
-        /// <summary>协议类型</summary>
-        ProtocolType ProtocolType { get; }
-
-        ///// <summary>监听本地地址</summary>
-        //IPAddress Address { get; set; }
-
-        ///// <summary>监听端口</summary>
-        //Int32 Port { get; set; }
-
-        ///// <summary>地址族</summary>
-        //AddressFamily AddressFamily { get; set; }
-
-        /// <summary>本地终结点</summary>
-        IPEndPoint LocalEndPoint { get; }
-
-        /// <summary>本地地址</summary>
-        NetUri LocalUri { get; }
-
-        ///// <summary>远程地址</summary>
-        //NetUri RemoteUri { get; }
-
-        ///// <summary>远程终结点</summary>
-        //IPEndPoint RemoteEndPoint { get; }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Sockets/ISocketClient.cs b/NewLife.Net/Sockets/ISocketClient.cs
deleted file mode 100644
index 3a4a683ff3..0000000000
--- a/NewLife.Net/Sockets/ISocketClient.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-﻿using System;
-using System.Net;
-using System.Net.Sockets;
-using System.Text;
-
-namespace NewLife.Net.Sockets
-{
-    /// <summary>Socket客户端接口。</summary>
-    public interface ISocketClient : ISocket
-    {
-        /// <summary>基础Socket对象</summary>
-        Socket Client { get; set; }
-
-        ///// <summary>连接超时时间。单位毫秒，默认为0。如果设置了超时时间，则采用异步加等待的方式进行连接。</summary>
-        //Int32 ConnectTimeout { get; set; }
-
-        /// <summary>建立与远程主机的连接</summary>
-        /// <param name="remoteEP">表示远程设备。</param>
-        /// <returns>返回自身，用于链式写法</returns>
-        ISocketClient Connect(EndPoint remoteEP);
-
-        /// <summary>建立与远程主机的连接</summary>
-        /// <param name="address"></param>
-        /// <param name="port"></param>
-        /// <returns>返回自身，用于链式写法</returns>
-        ISocketClient Connect(IPAddress address, int port);
-
-        /// <summary>建立与远程主机的连接</summary>
-        /// <param name="hostname"></param>
-        /// <param name="port"></param>
-        /// <returns>返回自身，用于链式写法</returns>
-        ISocketClient Connect(string hostname, int port);
-
-        /// <summary>为指定地址创建会话。对于无连接Socket，必须指定远程地址；对于有连接Socket，指定的远程地址将不起任何作用</summary>
-        /// <param name="remoteEP"></param>
-        /// <returns></returns>
-        ISocketSession CreateSession(IPEndPoint remoteEP = null);
-
-        /// <summary>开始异步接收数据</summary>
-        void ReceiveAsync();
-
-        /// <summary>接收数据</summary>
-        /// <returns></returns>
-        byte[] Receive();
-
-        ///// <summary>接收字符串</summary>
-        ///// <param name="encoding"></param>
-        ///// <returns></returns>
-        //string ReceiveString(Encoding encoding = null);
-
-        ///// <summary>发送数据</summary>
-        ///// <param name="buffer">缓冲区</param>
-        ///// <param name="offset">位移</param>
-        ///// <param name="size">写入字节数</param>
-        ///// <param name="remoteEP">远程终结点</param>
-        //void Send(byte[] buffer, int offset = 0, int size = 0, EndPoint remoteEP = null);
-
-        ///// <summary>发送数据流</summary>
-        ///// <param name="stream"></param>
-        ///// <param name="remoteEP">远程终结点</param>
-        ///// <returns></returns>
-        //long Send(Stream stream, EndPoint remoteEP = null);
-
-        ///// <summary>发送字符串</summary>
-        ///// <param name="msg"></param>
-        ///// <param name="encoding"></param>
-        ///// <param name="remoteEP">远程终结点</param>
-        //void Send(string msg, Encoding encoding = null, EndPoint remoteEP = null);
-
-        /// <summary>数据到达，在事件处理代码中，事件参数不得另作他用，套接字事件池将会将其回收。</summary>
-        event EventHandler<NetEventArgs> Received;
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Sockets/ISocketServer.cs b/NewLife.Net/Sockets/ISocketServer.cs
deleted file mode 100644
index 205e80426f..0000000000
--- a/NewLife.Net/Sockets/ISocketServer.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-﻿using System.Net.Sockets;
-using NewLife.Model;
-
-namespace NewLife.Net.Sockets
-{
-    /// <summary>Socket服务器接口</summary>
-    public interface ISocketServer : ISocket, IServer
-    {
-        /// <summary>是否活动</summary>
-        bool Active { get; }
-
-        /// <summary>基础Socket对象</summary>
-        Socket Server { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Sockets/ISocketSession.cs b/NewLife.Net/Sockets/ISocketSession.cs
deleted file mode 100644
index 6f818ba81f..0000000000
--- a/NewLife.Net/Sockets/ISocketSession.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-﻿using System;
-using System.IO;
-using System.Net;
-using System.Text;
-
-namespace NewLife.Net.Sockets
-{
-    /// <summary>用于与对方进行通讯的Socket会话，仅具有收发功能，也专用于上层应用收发数据</summary>
-    /// <remarks>
-    /// 对于Tcp来说，它就是<see cref="Tcp.TcpClientX"/>自身，不管客户端还是服务端的会话。
-    /// 对于Udp来说，需要额外创建一个对象，包括自身和远程地址。
-    /// 
-    /// Socket会话发送数据不需要指定远程地址，因为内部已经具有。
-    /// 接收数据时，Tcp接收全部数据，而Udp只接受来自所属远方的数据。
-    /// 
-    /// Socket会话不具有连接和断开的能力，所以需要外部连接好之后再创建Socket会话。
-    /// 但是会话可以销毁，来代替断开。
-    /// 对于Udp额外创建的会话来说，仅仅销毁会话而已。
-    /// 
-    /// 所以，它必须具有收发数据的能力。
-    /// </remarks>
-    public interface ISocketSession : ISocketAddress, IDisposable2
-    {
-        #region 属性
-        /// <summary>编号</summary>
-        Int32 ID { get; set; }
-
-        /// <summary>宿主对象。除了<see cref="Udp.UdpServer"/>外，都是<see cref="ISocketClient"/>接口。</summary>
-        ISocket Host { get; }
-
-        /// <summary>会话数据流，供用户程序使用，内部不做处理。可用于解决Tcp粘包的问题，把多余的分片放入该数据流中。</summary>
-        Stream Stream { get; set; }
-
-        /// <summary>远程地址</summary>
-        NetUri RemoteUri { get; }
-
-        /// <summary>远程终结点</summary>
-        IPEndPoint RemoteEndPoint { get; }
-        #endregion
-
-        #region 发送
-        /// <summary>发送数据</summary>
-        /// <param name="buffer">缓冲区</param>
-        /// <param name="offset">位移</param>
-        /// <param name="size">写入字节数</param>
-        /// <returns>返回自身，用于链式写法</returns>
-        ISocketSession Send(byte[] buffer, int offset = 0, int size = 0);
-        #endregion
-
-        #region 接收
-        /// <summary>是否异步接收数据</summary>
-        Boolean UseReceiveAsync { get; }
-
-        /// <summary>开始异步接收数据</summary>
-        void ReceiveAsync();
-
-        /// <summary>接收数据</summary>
-        /// <returns></returns>
-        byte[] Receive();
-
-        /// <summary>数据到达，在事件处理代码中，事件参数不得另作他用，套接字事件池将会将其回收。</summary>
-        event EventHandler<ReceivedEventArgs> Received;
-        #endregion
-    }
-
-    /// <summary>Socket会话扩展</summary>
-    public static class SocketSessionHelper
-    {
-        #region 发送
-        /// <summary>发送数据流</summary>
-        /// <param name="session">会话</param>
-        /// <param name="stream"></param>
-        /// <returns></returns>
-        /// <returns>返回自身，用于链式写法</returns>
-        public static ISocketSession Send(this ISocketSession session, Stream stream)
-        {
-            var size = 1460;
-            var buffer = new Byte[size];
-            while (true)
-            {
-                var n = stream.Read(buffer, 0, buffer.Length);
-                if (n <= 0) break;
-
-                session.Send(buffer, 0, n);
-
-                if (n < buffer.Length) break;
-            }
-            return session;
-        }
-
-        /// <summary>发送字符串</summary>
-        /// <param name="session">会话</param>
-        /// <param name="msg"></param>
-        /// <param name="encoding"></param>
-        /// <returns>返回自身，用于链式写法</returns>
-        public static ISocketSession Send(this ISocketSession session, String msg, Encoding encoding = null)
-        {
-            if (String.IsNullOrEmpty(msg)) return session;
-
-            if (encoding == null) encoding = Encoding.UTF8;
-            session.Send(encoding.GetBytes(msg), 0, 0);
-
-            return session;
-        }
-        #endregion
-
-        #region 接收
-        /// <summary>接收字符串</summary>
-        /// <param name="session">会话</param>
-        /// <param name="encoding"></param>
-        /// <returns></returns>
-        public static String ReceiveString(this ISocketSession session, Encoding encoding = null)
-        {
-            var buffer = session.Receive();
-            if (buffer == null || buffer.Length < 1) return null;
-
-            if (encoding == null) encoding = Encoding.UTF8;
-            return encoding.GetString(buffer);
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Sockets/NetEventArgs.cs b/NewLife.Net/Sockets/NetEventArgs.cs
deleted file mode 100644
index 7cd5dda26c..0000000000
--- a/NewLife.Net/Sockets/NetEventArgs.cs
+++ /dev/null
@@ -1,214 +0,0 @@
-﻿using System;
-using System.IO;
-using System.Net;
-using System.Net.Sockets;
-using System.Text;
-using NewLife.Collections;
-using NewLife.Net.Common;
-
-namespace NewLife.Net.Sockets
-{
-    /// <summary>网络事件参数</summary>
-    public class NetEventArgs : SocketAsyncEventArgs, /*ISafeStackItem,*/ IDisposable
-    {
-        #region 属性
-        static Int32 _gid;
-
-        // ID变大后，可能达到最大值，然后变为-1，再变为0，所以不用担心
-        private Int32 _ID = ++_gid;
-        /// <summary>编号</summary>
-        public Int32 ID { get { return _ID; } set { _ID = value; } }
-
-        private Int32 _Times;
-        /// <summary>使用次数</summary>
-        private Int32 Times { get { return _Times; } set { _Times = value; } }
-
-        private ISocket _Socket;
-        /// <summary>当前对象的使用者，默认就是从对象池<see cref="Pool"/>中借出当前网络事件参数的那个SocketBase。
-        /// 比如，如果是Server程序，那么它往往就是与客户端通讯的那个Socket(TcpSession)。
-        /// 在TcpServer中，它就是TcpSession。
-        /// </summary>
-        public ISocket Socket { get { return _Socket; } set { _Socket = value; } }
-
-        private ISocketClient _Session;
-        /// <summary>Socket会话</summary>
-        public ISocketClient Session { get { return _Session; } set { _Session = value; } }
-
-        private Exception _Error;
-        /// <summary>异常信息</summary>
-        public Exception Error { get { return _Error; } set { _Error = value; } }
-
-        /// <summary>远程IP终结点</summary>
-        public IPEndPoint RemoteIPEndPoint { get { return base.RemoteEndPoint as IPEndPoint; } set { base.RemoteEndPoint = value; } }
-
-        private Boolean _Cancel;
-        /// <summary>是否取消后续操作</summary>
-        public Boolean Cancel { get { return _Cancel; } set { _Cancel = value; } }
-        #endregion
-
-        #region 构造
-        /// <summary>析构</summary>
-        ~NetEventArgs()
-        {
-            Dispose(false);
-        }
-
-        void IDisposable.Dispose()
-        {
-            Dispose(true);
-        }
-
-        Boolean disposed;
-        void Dispose(Boolean disposing)
-        {
-            if (disposed) return;
-            disposed = true;
-
-            if (disposing) GC.SuppressFinalize(this);
-
-            //XTrace.WriteLine("{0}被抛弃！{1} {2}", ID, LastOperation, RemoteIPEndPoint);
-
-            //! 清空缓冲区，这一点非常非常重要，内部有个重叠数据对象，挂在一个全局对象池上，它会Pinned住数据缓冲区，这里必须清空被Pinned住的缓冲区
-            SetBuffer(0);
-
-            // 断开所有资源的链接
-            _buffer = null;
-
-            _Socket = null;
-            _Session = null;
-            _Error = null;
-
-            base.Dispose();
-        }
-        #endregion
-
-        #region 缓冲区
-        /// <summary>采用弱引用，及时清理不再使用的内存，避免内存泄漏。</summary>
-        private WeakReference<Byte[]> _buffer;
-
-        /// <summary>设置缓冲区。
-        /// 为了避免频繁分配内存，可以为每一个事件参数固定挂载一个缓冲区，达到重用的效果。
-        /// 但是对于TcpServer的Accept来说，不能设置缓冲区，否则客户端连接的时候不会触发Accept事件，
-        /// 而必须等到第一个数据包的到来才触发，那时缓冲区里面同时带有第一个数据包的数据。
-        /// 
-        /// 所以，考虑把缓冲内置一份到外部，进行控制。
-        /// </summary>
-        /// <param name="size"></param>
-        internal void SetBuffer(Int32 size)
-        {
-            // 销毁时，使用中是无法释放的
-            if (disposed) return;
-
-            if (size > 0)
-            {
-                // 没有缓冲区，或者大小不相同时，重新设置
-                if (Buffer == null || Count != size)
-                {
-                    // 没有缓冲区，或者大小不够时，重新分配
-                    Byte[] _buf = _buffer == null ? null : _buffer.Target;
-                    if (_buf == null || _buf.Length < size) _buffer = _buf = new Byte[size];
-
-                    SetBuffer(_buf, 0, size);
-                }
-            }
-            else
-            {
-                // 事件内有缓冲区时才清空，不管它多长，必须清空
-                if (Buffer != null) SetBuffer(null, 0, 0);
-            }
-        }
-        #endregion
-
-        #region 对象池
-        private static ObjectPool<NetEventArgs> _Pool;
-        /// <summary>套接字事件参数池。静态，所有实例共享使用</summary>
-        public static ObjectPool<NetEventArgs> Pool { get { return _Pool ?? (_Pool = new ObjectPool<NetEventArgs>() { Max = 1000 }); } }
-
-        private static BufferPool bpool = new BufferPool(2000, 1500);
-
-        /// <summary>从池里拿一个对象。回收原则参考<see cref="Push"/></summary>
-        /// <returns></returns>
-        public static NetEventArgs Pop()
-        {
-            var e = Pool.Pop();
-            bpool.Pop(e);
-            e.Times++;
-
-            return e;
-        }
-
-        /// <summary>把对象归还到池里</summary>
-        /// <remarks>
-        /// 网络事件参数使用原则：
-        /// 1，得到者负责回收（通过方法参数得到）
-        /// 2，正常执行时自己负责回收，异常时顶级或OnError负责回收
-        /// 3，把回收责任交给别的方法
-        /// 4，事件订阅者不允许回收，不允许另作他用
-        /// </remarks>
-        /// <param name="e"></param>
-        public static void Push(NetEventArgs e)
-        {
-            if (e == null) return;
-
-            e.Error = null;
-            e.UserToken = null;
-            e.Socket = null;
-            e.Session = null;
-            e.AcceptSocket = null;
-            e.RemoteEndPoint = null;
-
-            // 清空缓冲区，避免事件池里面的对象占用内存
-            //e.SetBuffer(0);
-            bpool.Push(e);
-
-            Pool.Push(e);
-        }
-        #endregion
-
-        #region 辅助
-        /// <summary>从接收缓冲区拿字符串，UTF-8编码</summary>
-        /// <returns></returns>
-        public String GetString(Encoding encoding = null)
-        {
-            if (Buffer == null || Buffer.Length < 1 || BytesTransferred < 1) return null;
-
-            if (encoding == null) encoding = Encoding.UTF8;
-            return encoding.GetString(Buffer, Offset, BytesTransferred);
-        }
-
-        /// <summary>从接收缓冲区获取一个流，该流可用于读取已接收数据，写入数据时向远端发送数据。该流应该在持有事件参数期内使用，否则可能产生冲突。</summary>
-        /// <returns></returns>
-        public Stream GetStream()
-        {
-            if (Buffer == null || Buffer.Length < 1 || BytesTransferred < 1) return null;
-
-            Stream ms = new MemoryStream(Buffer, Offset, BytesTransferred);
-            return new SocketStream(AcceptSocket, ms, RemoteEndPoint);
-        }
-
-        /// <summary>将接收缓冲区中的数据写入流</summary>
-        /// <param name="stream"></param>
-        public void WriteTo(Stream stream)
-        {
-            if (Buffer == null || Buffer.Length < 1 || BytesTransferred < 1) return;
-
-            stream.Write(Buffer, Offset, BytesTransferred);
-        }
-
-        /// <summary>已重载。</summary>
-        /// <returns></returns>
-        public override string ToString()
-        {
-            // 不要取字符串，那样影响效率
-            //return String.Format("[{0}]{1}", LastOperation, GetString());
-
-            if (Error != null)
-                return String.Format("[{0}]{1} {2}", ID, LastOperation, Error.Message);
-            else if (SocketError != SocketError.Success)
-                return String.Format("[{0}]{1} {2}", ID, LastOperation, SocketError);
-            else
-                return String.Format("[{0}]{1} BytesTransferred={2}", ID, LastOperation, BytesTransferred);
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Sockets/NetServer.cs b/NewLife.Net/Sockets/NetServer.cs
deleted file mode 100644
index 0fea370b94..0000000000
--- a/NewLife.Net/Sockets/NetServer.cs
+++ /dev/null
@@ -1,563 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net;
-using System.Net.Sockets;
-using System.Text;
-using System.Threading;
-using NewLife.Log;
-using NewLife.Model;
-
-namespace NewLife.Net.Sockets
-{
-    /// <summary>网络服务器。可同时支持多个Socket服务器，同时支持IPv4和IPv6，同时支持Tcp和Udp</summary>
-    /// <remarks>
-    /// 网络服务器模型，所有网络应用服务器可以通过继承该类实现。
-    /// 该类仅实现了业务应用对网络流的操作，与具体网络协议无关。
-    /// 
-    /// 收到请求<see cref="Server_NewSession"/>后，会建立<see cref="CreateSession"/>会话，并加入到会话集合<see cref="Sessions"/>中，然后启动<see cref="Start"/>会话处理；
-    /// 
-    /// 快速用法：
-    /// 指定端口后直接<see cref="Start"/>，NetServer将同时监听Tcp/Udp和IPv4/IPv6（会检查是否支持）四个端口。
-    /// 
-    /// 简单用法：
-    /// 重载方法<see cref="EnsureCreateServer"/>来创建一个SocketServer并赋值给<see cref="Server"/>属性，<see cref="EnsureCreateServer"/>将会在<see cref="OnStart"/>时首先被调用。
-    /// 
-    /// 标准用法：
-    /// 使用<see cref="AttachServer"/>方法向网络服务器添加Socket服务，其中第一个将作为默认Socket服务<see cref="Server"/>。
-    /// 如果Socket服务集合<see cref="Servers"/>为空，将依据地址<see cref="Local"/>、端口<see cref="Port"/>、地址族<see cref="AddressFamily"/>、协议<see cref="ProtocolType"/>创建默认Socket服务。
-    /// 如果地址族<see cref="AddressFamily"/>指定为IPv4和IPv6以外的值，将同时创建IPv4和IPv6两个Socket服务；
-    /// 如果协议<see cref="ProtocolType"/>指定为Tcp和Udp以外的值，将同时创建Tcp和Udp两个Socket服务；
-    /// 默认情况下，地址族<see cref="AddressFamily"/>和协议<see cref="ProtocolType"/>都是其它值，所以一共将会创建四个Socket服务（Tcp、Tcpv6、Udp、Udpv6）。
-    /// </remarks>
-    public class NetServer : Netbase, IServer
-    {
-        #region 属性
-        /// <summary>服务名</summary>
-        public String Name { get; set; }
-
-        private NetUri _Local = new NetUri();
-        /// <summary>本地结点</summary>
-        public NetUri Local
-        {
-            get { return _Local; }
-            set
-            {
-                _Local = value;
-                if (AddressFamily <= AddressFamily.Unspecified) AddressFamily = value.Address.AddressFamily;
-            }
-        }
-
-        /// <summary>端口</summary>
-        public Int32 Port { get { return _Local.Port; } set { _Local.Port = value; } }
-
-        /// <summary>协议类型</summary>
-        public ProtocolType ProtocolType { get { return _Local.ProtocolType; } set { _Local.ProtocolType = value; } }
-
-        /// <summary>寻址方案</summary>
-        public AddressFamily AddressFamily { get; set; }
-
-        /// <summary>服务器集合</summary>
-        public IList<ISocketServer> Servers { get; private set; }
-
-        /// <summary>服务器。返回服务器集合中的第一个服务器</summary>
-        public ISocketServer Server
-        {
-            get
-            {
-                var ss = Servers;
-                if (ss.Count <= 0) EnsureCreateServer();
-
-                return ss.Count > 0 ? ss[0] : null;
-            }
-            set { if (!Servers.Contains(value)) Servers.Insert(0, value); }
-        }
-
-        /// <summary>是否活动</summary>
-        public Boolean Active { get { return Servers.Count > 0 && Server != null && Server.Active; } }
-
-        /// <summary>会话超时时间。默认0秒，使用SocketServer默认值</summary>
-        /// <remarks>
-        /// 对于每一个会话连接，如果超过该时间仍然没有收到任何数据，则断开会话连接。
-        /// </remarks>
-        public Int32 SessionTimeout { get; set; }
-
-        /// <summary>使用会话集合，允许遍历会话。默认false</summary>
-        public Boolean UseSession { get; set; }
-
-        /// <summary>会话统计</summary>
-        public IStatistics StatSession { get; set; }
-
-        /// <summary>发送统计</summary>
-        public IStatistics StatSend { get; set; }
-
-        /// <summary>接收统计</summary>
-        public IStatistics StatReceive { get; set; }
-
-        /// <summary>是否输出发送日志。默认false</summary>
-        public Boolean LogSend { get; set; }
-
-        /// <summary>是否输出接收日志。默认false</summary>
-        public Boolean LogReceive { get; set; }
-        #endregion
-
-        #region 构造
-        /// <summary>实例化一个网络服务器</summary>
-        public NetServer()
-        {
-            Name = GetType().Name;
-
-            //SessionTimeout = 30;
-            //AddressFamily = AddressFamily.Unknown;
-
-            Servers = new List<ISocketServer>();
-
-            StatSession = new Statistics();
-            StatSend = new Statistics();
-            StatReceive = new Statistics();
-        }
-
-        /// <summary>通过指定监听地址和端口实例化一个网络服务器</summary>
-        /// <param name="address"></param>
-        /// <param name="port"></param>
-        public NetServer(IPAddress address, Int32 port)
-        {
-            Local.Address = address;
-            Port = port;
-        }
-
-        /// <summary>通过指定监听地址和端口，还有协议，实例化一个网络服务器，默认支持Tcp协议和Udp协议</summary>
-        /// <param name="address"></param>
-        /// <param name="port"></param>
-        /// <param name="protocolType"></param>
-        public NetServer(IPAddress address, Int32 port, ProtocolType protocolType)
-            : this(address, port)
-        {
-            Local.ProtocolType = protocolType;
-        }
-
-        /// <summary>已重载。释放会话集合等资源</summary>
-        /// <param name="disposing"></param>
-        protected override void OnDispose(bool disposing)
-        {
-            base.OnDispose(disposing);
-
-            if (Active) Stop();
-
-            // 释放托管资源
-            if (disposing)
-            {
-                var sessions = _Sessions;
-                if (sessions != null)
-                {
-                    _Sessions = null;
-
-                    WriteLog("准备释放网络会话{0}个！", sessions.Count);
-                    foreach (var item in sessions.Values.ToArray())
-                    {
-                        item.Dispose();
-                    }
-                    sessions.Clear();
-                }
-
-                var severs = Servers;
-                if (severs != null)
-                {
-                    WriteLog("准备释放服务{0}个！", severs.Count);
-                    foreach (var item in severs)
-                    {
-                        item.Dispose();
-                    }
-                    severs.Clear();
-                }
-            }
-        }
-        #endregion
-
-        #region 创建
-        /// <summary>添加Socket服务器</summary>
-        /// <param name="server"></param>
-        /// <returns>添加是否成功</returns>
-        public virtual Boolean AttachServer(ISocketServer server)
-        {
-            if (Servers.Contains(server)) return false;
-
-            server.Name = String.Format("{0}{1}{2}", Name, server.Local.IsTcp ? "Tcp" : "Udp", server.Local.Address.IsIPv4() ? "" : "6");
-            // 内部服务器日志更多是为了方便网络库调试，而网络服务器日志用于应用开发
-            server.Log = SocketLog ?? Log;
-            server.NewSession += Server_NewSession;
-
-            if (SessionTimeout > 0) server.SessionTimeout = SessionTimeout;
-
-            server.StatSession.Parent = StatSession;
-            server.StatSend.Parent = StatSend;
-            server.StatReceive.Parent = StatReceive;
-
-            server.LogSend = LogSend;
-            server.LogReceive = LogReceive;
-
-            server.Error += OnError;
-
-            Servers.Add(server);
-
-            return true;
-        }
-
-        /// <summary>同时添加指定端口的IPv4和IPv6服务器，如果协议不是指定的Tcp或Udp，则同时添加Tcp和Udp服务器</summary>
-        /// <param name="address"></param>
-        /// <param name="port"></param>
-        /// <param name="protocol"></param>
-        /// <param name="family"></param>
-        /// <returns></returns>
-        public virtual Int32 AddServer(IPAddress address, Int32 port, ProtocolType protocol = ProtocolType.Unknown, AddressFamily family = AddressFamily.Unspecified)
-        {
-            var list = CreateServer(address, port, protocol, family);
-            Int32 count = 0;
-            foreach (var item in list)
-            {
-                AttachServer(item);
-
-                count++;
-            }
-            return count;
-        }
-
-        /// <summary>确保建立服务器</summary>
-        public virtual void EnsureCreateServer()
-        {
-            if (Servers.Count <= 0)
-            {
-                var list = CreateServer(Local.Address, Port, Local.ProtocolType, AddressFamily);
-                foreach (var item in list)
-                {
-                    AttachServer(item);
-                }
-            }
-        }
-        #endregion
-
-        #region 方法
-        /// <summary>开始服务</summary>
-        public void Start()
-        {
-            if (Active) throw new InvalidOperationException("服务已经开始！");
-
-            OnStart();
-
-            if (Server == null)
-            {
-                WriteLog("没有可用Socket服务器！");
-
-                return;
-            }
-
-            Local.ProtocolType = Server.Local.ProtocolType;
-
-            WriteLog("准备就绪！");
-        }
-
-        /// <summary>开始时调用的方法</summary>
-        protected virtual void OnStart()
-        {
-            EnsureCreateServer();
-
-            WriteLog("准备开始监听{0}个服务器", Servers.Count);
-
-            foreach (var item in Servers)
-            {
-                if (item.Port > 0) WriteLog("开始监听 {0}", item);
-                //item.Log = Log;
-                item.Start();
-
-                // 如果是随机端口，反写回来，并且修改其它服务器的端口
-                if (Port == 0)
-                {
-                    Port = item.Port;
-
-                    foreach (var elm in Servers)
-                    {
-                        if (elm != item && elm.Port == 0) elm.Port = Port;
-                    }
-                }
-                if (item.Port <= 0) WriteLog("开始监听 {0}", item);
-            }
-        }
-
-        /// <summary>停止服务</summary>
-        public void Stop()
-        {
-            if (!Active) throw new InvalidOperationException("服务没有开始！");
-
-            WriteLog("准备停止监听{0}个服务器", Servers.Count);
-
-            foreach (var item in Servers)
-            {
-                WriteLog("停止监听 {0}", item);
-                item.Stop();
-            }
-
-            OnStop();
-
-            WriteLog("已停止！");
-        }
-
-        /// <summary>停止时调用的方法</summary>
-        protected virtual void OnStop() { Dispose(); }
-        #endregion
-
-        #region 业务
-        /// <summary>新会话，对于TCP是新连接，对于UDP是新客户端</summary>
-        public event EventHandler<NetSessionEventArgs> NewSession;
-
-        /// <summary>某个会话的数据到达。sender是ISocketSession</summary>
-        public event EventHandler<ReceivedEventArgs> Received;
-
-        /// <summary>接受连接时，对于Udp是收到数据时（同时触发OnReceived）。</summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        void Server_NewSession(Object sender, SessionEventArgs e)
-        {
-            var session = e.Session;
-
-            var ns = OnNewSession(session);
-
-            if (NewSession != null) NewSession(sender, new NetSessionEventArgs { Session = ns });
-        }
-
-        private Int32 sessionID = 0;
-        /// <summary>收到连接时，建立会话，并挂接数据接收和错误处理事件</summary>
-        /// <param name="session"></param>
-        protected virtual INetSession OnNewSession(ISocketSession session)
-        {
-            Interlocked.Increment(ref _SessionCount);
-            session.OnDisposed += (s, e2) => Interlocked.Decrement(ref _SessionCount);
-
-            var ns = CreateSession(session);
-            // sessionID变大后，可能达到最大值，然后变为-1，再变为0，所以不用担心
-            //ns.ID = ++sessionID;
-            // 网络会话改为原子操作，避免多线程冲突
-            ns.ID = Interlocked.Increment(ref sessionID);
-            ns.Host = this;
-            ns.Server = session.Server;
-            ns.Session = session;
-            if (ns is NetSession) (ns as NetSession).Log = SessionLog ?? Log;
-
-            if (UseSession) AddSession(ns);
-
-            session.Received += OnReceived;
-            session.Error += OnError;
-
-            // 开始会话处理
-            ns.Start();
-
-            return ns;
-        }
-
-        /// <summary>收到数据时</summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        void OnReceived(Object sender, ReceivedEventArgs e)
-        {
-            var session = sender as ISocketSession;
-
-            OnReceive(session, e.Stream);
-
-            if (Received != null) Received(sender, e);
-        }
-
-        /// <summary>收到数据时，最原始的数据处理，但不影响会话内部的数据处理</summary>
-        /// <param name="session"></param>
-        /// <param name="stream"></param>
-        protected virtual void OnReceive(ISocketSession session, Stream stream) { }
-
-        /// <summary>错误发生/断开连接时。sender是ISocketSession</summary>
-        public event EventHandler<ExceptionEventArgs> Error;
-
-        /// <summary>触发异常</summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected virtual void OnError(Object sender, ExceptionEventArgs e)
-        {
-            if (Log.Enable) Log.Error("{0} Error {1}", sender, e.Exception);
-
-            if (Error != null) Error(sender, e);
-        }
-        #endregion
-
-        #region 会话
-        private IDictionary<Int32, INetSession> _Sessions;
-        /// <summary>会话集合。用自增的数字ID作为标识，业务应用自己维持ID与业务主键的对应关系。</summary>
-        public IDictionary<Int32, INetSession> Sessions { get { return _Sessions ?? (_Sessions = new Dictionary<Int32, INetSession>()); } }
-
-        private Int32 _SessionCount;
-        /// <summary>会话数</summary>
-        public Int32 SessionCount { get { return _SessionCount; } set { _SessionCount = value; } }
-
-        /// <summary>添加会话。子类可以在添加会话前对会话进行一些处理</summary>
-        /// <param name="session"></param>
-        protected virtual void AddSession(INetSession session)
-        {
-            var dic = Sessions;
-            lock (dic)
-            {
-                if (session.Host == null) session.Host = this;
-                session.OnDisposed += (s, e) =>
-                {
-                    var dic2 = Sessions;
-                    lock (dic2)
-                    {
-                        dic2.Remove((s as INetSession).ID);
-                    }
-                };
-                dic[session.ID] = session;
-            }
-        }
-
-        /// <summary>创建会话</summary>
-        /// <param name="session"></param>
-        /// <returns></returns>
-        protected virtual INetSession CreateSession(ISocketSession session)
-        {
-            var ns = new NetSession();
-            (ns as INetSession).Host = this;
-            ns.Server = session.Server;
-            ns.Session = session;
-
-            return ns;
-        }
-
-        /// <summary>根据会话ID查找会话</summary>
-        /// <param name="sessionid"></param>
-        /// <returns></returns>
-        public INetSession GetSession(Int32 sessionid)
-        {
-            if (sessionid == 0) return null;
-
-            var dic = Sessions;
-            lock (dic)
-            {
-                INetSession ns = null;
-                if (!dic.TryGetValue(sessionid, out ns)) return null;
-                return ns;
-            }
-        }
-        #endregion
-
-        #region 创建Tcp/Udp、IPv4/IPv6服务
-        /// <summary>创建Tcp/Udp、IPv4/IPv6服务</summary>
-        /// <param name="address"></param>
-        /// <param name="port"></param>
-        /// <param name="protocol"></param>
-        /// <param name="family"></param>
-        /// <returns></returns>
-        protected static ISocketServer[] CreateServer(IPAddress address, Int32 port, ProtocolType protocol, AddressFamily family)
-        {
-            if (protocol == ProtocolType.Tcp) return CreateServer<TcpServer>(address, port, family);
-            if (protocol == ProtocolType.Udp) return CreateServer<UdpServer>(address, port, family);
-
-            var list = new List<ISocketServer>();
-
-            // 其它未知协议，同时用Tcp和Udp
-            list.AddRange(CreateServer<TcpServer>(address, port, family));
-            list.AddRange(CreateServer<UdpServer>(address, port, family));
-
-            return list.ToArray();
-        }
-
-        static ISocketServer[] CreateServer<TServer>(IPAddress address, Int32 port, AddressFamily family) where TServer : ISocketServer, new()
-        {
-            var list = new List<ISocketServer>();
-            switch (family)
-            {
-                case AddressFamily.InterNetwork:
-                case AddressFamily.InterNetworkV6:
-                    var svr = new TServer();
-                    svr.Local.Address = address.GetRightAny(family);
-                    svr.Port = port;
-                    //svr.AddressFamily = family;
-
-                    // 协议端口不能是已经被占用
-                    //if (!NetHelper.IsUsed(svr.Local.ProtocolType, svr.Local.Address, svr.Port)) list.Add(svr);
-                    if (!svr.Local.CheckPort()) list.Add(svr);
-                    break;
-                default:
-                    // 其它情况表示同时支持IPv4和IPv6
-#if !NET4
-                    if (Socket.SupportsIPv4) list.AddRange(CreateServer<TServer>(address, port, AddressFamily.InterNetwork));
-#else
-                    if (Socket.OSSupportsIPv4) list.AddRange(CreateServer<TServer>(address, port, AddressFamily.InterNetwork));
-#endif
-                    if (Socket.OSSupportsIPv6) list.AddRange(CreateServer<TServer>(address, port, AddressFamily.InterNetworkV6));
-                    break;
-            }
-
-            return list.ToArray();
-        }
-        #endregion
-
-        #region 辅助
-        /// <summary>用于内部Socket服务器的日志提供者</summary>
-        public ILog SocketLog { get; set; }
-
-        /// <summary>用于网络会话的日志提供者</summary>
-        public ILog SessionLog { get; set; }
-
-        /// <summary>已重载。日志加上前缀</summary>
-        /// <param name="format"></param>
-        /// <param name="args"></param>
-        public override void WriteLog(string format, params object[] args)
-        {
-            base.WriteLog(String.Format("{0} {1}", Name, format), args);
-        }
-
-        /// <summary>已重载。</summary>
-        /// <returns></returns>
-        public override string ToString()
-        {
-            var servers = Servers;
-            if (servers == null || servers.Count < 1) return Name;
-
-            if (servers.Count == 1) return Name + " " + servers[0].ToString();
-
-            var sb = new StringBuilder();
-            foreach (var item in servers)
-            {
-                if (sb.Length > 0) sb.Append(" ");
-                sb.Append(item);
-            }
-            return Name + " " + sb.ToString();
-        }
-        #endregion
-    }
-
-    /// <summary>网络服务器</summary>
-    /// <typeparam name="TSession"></typeparam>
-    public class NetServer<TSession> : NetServer where TSession : class, INetSession, new()
-    {
-        /// <summary>创建会话</summary>
-        /// <param name="session"></param>
-        /// <returns></returns>
-        protected override INetSession CreateSession(ISocketSession session)
-        {
-            var ns = new TSession();
-            ns.Host = this;
-            ns.Server = session.Server;
-            ns.Session = session;
-
-            return ns;
-        }
-
-        /// <summary>获取指定标识的会话</summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        public new TSession GetSession(Int32 id)
-        {
-            if (id <= 0) return null;
-
-            INetSession ns = null;
-            if (!Sessions.TryGetValue(id, out ns)) return null;
-
-            return ns as TSession;
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Sockets/NetSession.cs b/NewLife.Net/Sockets/NetSession.cs
deleted file mode 100644
index 6350f5aaf0..0000000000
--- a/NewLife.Net/Sockets/NetSession.cs
+++ /dev/null
@@ -1,168 +0,0 @@
-﻿using System;
-using System.Diagnostics;
-using System.IO;
-using System.Text;
-
-namespace NewLife.Net.Sockets
-{
-    /// <summary>网络服务的会话</summary>
-    /// <typeparam name="TServer">网络服务类型</typeparam>
-    public class NetSession<TServer> : NetSession where TServer : NetServer
-    {
-        /// <summary>主服务</summary>
-        public virtual TServer Host { get { return (this as INetSession).Host as TServer; } set { (this as INetSession).Host = value; } }
-    }
-
-    /// <summary>网络服务的会话</summary>
-    /// <remarks>
-    /// 实际应用可通过重载<see cref="OnReceive"/>实现收到数据时的业务逻辑。
-    /// </remarks>
-    public class NetSession : Netbase, INetSession
-    {
-        #region 属性
-        private Int32 _ID;
-        /// <summary>编号</summary>
-        public virtual Int32 ID { get { return _ID; } set { if (_ID > 0)throw new NetException("禁止修改会话编号！"); _ID = value; } }
-
-        private NetServer _Host;
-        /// <summary>主服务</summary>
-        NetServer INetSession.Host { get { return _Host; } set { _Host = value; } }
-
-        private ISocketSession _Session;
-        /// <summary>客户端。跟客户端通讯的那个Socket，其实是服务端TcpSession/UdpServer</summary>
-        public ISocketSession Session { get { return _Session; } set { _Session = value; } }
-
-        private ISocketServer _Server;
-        /// <summary>服务端</summary>
-        public ISocketServer Server { get { return _Server; } set { _Server = value; } }
-
-        /// <summary>客户端地址</summary>
-        public NetUri Remote { get { return Session == null ? null : Session.Remote; } }
-        #endregion
-
-        #region 方法
-        /// <summary>开始会话处理。</summary>
-        public virtual void Start()
-        {
-            if (Log.Enable) WriteLog("新会话 {0}", Session);
-
-            var ss = Session;
-            if (ss != null)
-            {
-                ss.Received += (s, e2) => OnReceive(e2);
-                ss.OnDisposed += (s, e2) => this.Dispose();
-                ss.Error += OnError;
-            }
-        }
-
-        /// <summary>子类重载实现资源释放逻辑时必须首先调用基类方法</summary>
-        /// <param name="disposing">从Dispose调用（释放所有资源）还是析构函数调用（释放非托管资源）</param>
-        protected override void OnDispose(bool disposing)
-        {
-            WriteLog("会话结束 {0}", Session);
-
-            base.OnDispose(disposing);
-
-            Session.Dispose();
-
-            Server = null;
-            Session = null;
-        }
-        #endregion
-
-        #region 业务核心
-        /// <summary>收到客户端发来的数据，触发<seealso cref="Received"/>事件，重载者可直接处理数据</summary>
-        /// <param name="e"></param>
-        protected virtual void OnReceive(ReceivedEventArgs e)
-        {
-            if (Received != null) Received(this, e);
-        }
-
-        /// <summary>数据到达事件</summary>
-        public event EventHandler<ReceivedEventArgs> Received;
-        #endregion
-
-        #region 收发
-        /// <summary>发送数据</summary>
-        /// <param name="buffer">缓冲区</param>
-        /// <param name="offset">位移</param>
-        /// <param name="size">写入字节数</param>
-        public virtual INetSession Send(byte[] buffer, int offset = 0, int size = -1)
-        {
-            Session.Send(buffer, offset, size);
-
-            return this;
-        }
-
-        /// <summary>发送数据流</summary>
-        /// <param name="stream"></param>
-        /// <returns></returns>
-        public virtual INetSession Send(Stream stream)
-        {
-            Session.Send(stream);
-
-            return this;
-        }
-
-        /// <summary>发送字符串</summary>
-        /// <param name="msg"></param>
-        /// <param name="encoding"></param>
-        public virtual INetSession Send(string msg, Encoding encoding = null)
-        {
-            Session.Send(msg, encoding);
-
-            return this;
-        }
-        #endregion
-
-        #region 异常处理
-        /// <summary>错误处理</summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected virtual void OnError(object sender, ExceptionEventArgs e) { }
-        #endregion
-
-        #region 辅助
-        private String _LogPrefix;
-        /// <summary>日志前缀</summary>
-        public virtual String LogPrefix
-        {
-            get
-            {
-                if (_LogPrefix == null)
-                {
-                    var name = _Host == null ? "" : _Host.Name;
-                    _LogPrefix = "{0}[{1}] ".F(name, ID);
-                }
-                return _LogPrefix;
-            }
-            set { _LogPrefix = value; }
-        }
-
-        /// <summary>已重载。日志加上前缀</summary>
-        /// <param name="format"></param>
-        /// <param name="args"></param>
-        public override void WriteLog(string format, params object[] args)
-        {
-            base.WriteLog(LogPrefix + format, args);
-        }
-
-        /// <summary>输出错误日志</summary>
-        /// <param name="format"></param>
-        /// <param name="args"></param>
-        public virtual void WriteError(String format, params Object[] args)
-        {
-            var name = _Host == null ? "" : _Host.Name;
-            Log.Error(LogPrefix + format, args);
-        }
-
-        /// <summary>已重载。</summary>
-        /// <returns></returns>
-        public override string ToString()
-        {
-            //return Session == null ? base.ToString() : Session.ToString();
-            return String.Format("{0}[{1}] {2}", _Host == null ? "" : _Host.Name, ID, Session);
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Sockets/Netbase.cs b/NewLife.Net/Sockets/Netbase.cs
deleted file mode 100644
index b02b0349ca..0000000000
--- a/NewLife.Net/Sockets/Netbase.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-﻿using System;
-using System.Diagnostics;
-using System.Reflection;
-using NewLife.Log;
-
-namespace NewLife.Net.Sockets
-{
-    /// <summary>网络基类，提供资源释放和日志输出的统一处理</summary>
-    public abstract class Netbase : DisposeBase
-    {
-        #region 构造销毁
-        static Netbase()
-        {
-            // 输出网络库版本
-            Assembly.GetExecutingAssembly().WriteVersion();
-        }
-
-        /// <summary>实例化</summary>
-        public Netbase()
-        {
-            if (Setting.Current.Debug) Log = XTrace.Log;
-        }
-        #endregion
-
-        #region 日志
-        /// <summary>日志提供者</summary>
-        public ILog Log { get; set; } = Logger.Null;
-
-        /// <summary>写日志</summary>
-        /// <param name="format"></param>
-        /// <param name="args"></param>
-        public virtual void WriteLog(String format, params Object[] args)
-        {
-            Log.Info(format, args);
-        }
-
-        /// <summary>写调试日志</summary>
-        /// <param name="format"></param>
-        /// <param name="args"></param>
-        [Conditional("DEBUG")]
-        public virtual void WriteDebugLog(String format, params Object[] args)
-        {
-            Log.Debug(format, args);
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Sockets/ReceivedEventArgs.cs b/NewLife.Net/Sockets/ReceivedEventArgs.cs
deleted file mode 100644
index 7afc3c7193..0000000000
--- a/NewLife.Net/Sockets/ReceivedEventArgs.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-﻿using System;
-using System.IO;
-
-namespace NewLife.Net.Sockets
-{
-    /// <summary>数据接收事件参数</summary>
-    public class ReceivedEventArgs : EventArgs
-    {
-        private Stream _Stream;
-        /// <summary>数据流</summary>
-        public Stream Stream { get { return _Stream; } set { _Stream = value; } }
-
-        /// <summary>实例化一个数据接收事件参数</summary>
-        /// <param name="steam"></param>
-        public ReceivedEventArgs(Stream steam) { Stream = steam; }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Sockets/SocketBase.cs b/NewLife.Net/Sockets/SocketBase.cs
deleted file mode 100644
index 543ea46947..0000000000
--- a/NewLife.Net/Sockets/SocketBase.cs
+++ /dev/null
@@ -1,500 +0,0 @@
-﻿using System;
-using System.Collections;
-using System.Diagnostics;
-using System.Net;
-using System.Net.Sockets;
-using System.Text;
-using System.Threading;
-using NewLife.Exceptions;
-using NewLife.Log;
-using NewLife.Net.Common;
-using NewLife.Reflection;
-using NewLife.Threading;
-
-namespace NewLife.Net.Sockets
-{
-    /// <summary>Socket基类</summary>
-    /// <remarks>
-    /// 主要是对Socket封装一层，把所有异步操作结果转移到<see cref="RaiseComplete"/>去。
-    /// 
-    /// 网络模型处理流程
-    /// 1，实例化对象，Socket属性为空，可以由外部赋值。此时可以设置协议和监听地址端口等。
-    /// 2，如果外部没有给Socket赋值，EnsureCreate构造Socket。此时可以给Socket设置各种参数。
-    /// 3，使用Bind绑定本地监听地址和端口。到此完成了初始化的所有工作。
-    /// 
-    /// 异步处理流程:
-    /// AcceptAsync/ReceiveAsync    异步接受/异步接收
-    ///     StartAsync             统一的开始异步方法，如果异步方法同步返回，则采用线程池调用回调方法，转为异步处理
-    ///         EnsureCreate       确保已创建Socket
-    ///         Bind               确保Socket已绑定到本地地址和端口
-    ///         Pop                借出网络参数
-    ///         =>RaiseComplete    异步回调方法，处理所有异步事件的起始点
-    ///             ->Completed    完成事件，可以取消处理
-    ///                 Push       取消处理时，归还网络参数
-    ///                 return
-    ///             OnComplete     子类通过重载来处理各种异步事件
-    ///                 OnAccept/OnReceive
-    ///                     Push    如果处理过程中，没有外部注册事件，则马上归还事件，然后开始新的异步操作
-    ///                     AcceptAsync/ReceiveAsync
-    ///                     return
-    ///                 Process
-    ///                     ->OnProcess   统一的事件处理核心
-    ///                         AcceptAsync/ReceiveAsync
-    ///                         OnError 如果异步处理失败，不是<see cref="SocketError.Success"/>，则触发错误事件，然后退出
-    ///                             return
-    ///                         ProcessAccept/ProcessReceive
-    ///                         Push    每次用完都还，保证不出错丢失
-    ///                         OnError 处理异常时触发错误事件
-    ///                         AcceptAsync/ReceiveAsync
-    ///                         OnError 重新开始异步处理出错，触发错误事件，但不干涉当前处理中的网络参数
-    ///             OnError
-    ///         Push   开始异步处理异常时，归还网络参数再抛出异常
-    /// </remarks>
-    public class SocketBase : Netbase, ISocket
-    {
-        #region 属性
-        private Socket _Socket;
-        /// <summary>套接字</summary>
-        internal protected Socket Socket
-        {
-            get { return _Socket; }
-            set
-            {
-                // 外部设置套接字时，除非是已绑定的，否则不清除本地Uri
-                //if (value != null && value.IsBound) _LocalUri = _RemoteUri = null;
-                if (value != null && value.IsBound) _LocalUri = null;
-
-                _Socket = value;
-            }
-        }
-
-        /// <summary>基础Socket对象</summary>
-        Socket ISocket.Socket { get { return Socket; } set { Socket = value; } }
-
-        #region 本地
-        private NetUri _LocalUri;
-        /// <summary>本地地址</summary>
-        public NetUri LocalUri
-        {
-            get
-            {
-                if (_LocalUri != null) return _LocalUri;
-
-                var uri = new NetUri(ProtocolType, new IPEndPoint(IPAddress.Any, 0));
-                uri.ProtocolType = ProtocolType;
-                var socket = Socket;
-                try
-                {
-                    if (socket != null)
-                    {
-                        uri.EndPoint = socket.LocalEndPoint as IPEndPoint;
-                        uri.ProtocolType = socket.ProtocolType;
-                    }
-                }
-                catch (ObjectDisposedException) { }
-
-                return _LocalUri = uri;
-            }
-        }
-
-        /// <summary>协议类型</summary>
-        public virtual ProtocolType ProtocolType { get { return _LocalUri == null ? 0 : _LocalUri.ProtocolType; } }
-
-        /// <summary>监听本地地址</summary>
-        public IPAddress Address { get { return LocalUri.Address; } set { LocalUri.Address = value; } }
-
-        /// <summary>监听本地端口</summary>
-        public Int32 Port { get { return LocalUri.Port; } set { LocalUri.Port = value; } }
-
-        /// <summary>本地地址族</summary>
-        public AddressFamily AddressFamily
-        {
-            get { return Address.AddressFamily; }
-            set
-            {
-                // 根据地址族选择合适的本地地址
-                LocalUri.Address = LocalUri.Address.GetRightAny(value);
-            }
-        }
-
-        /// <summary>本地终结点</summary>
-        public IPEndPoint LocalEndPoint { get { return LocalUri.EndPoint; } }
-        #endregion
-
-        //private Int32 _BufferSize = 10240;
-        //! 注意：大于85K会进入LOH（大对象堆）
-        //private Int32 _BufferSize = 80 * 1024;
-        private Int32 _BufferSize = 8 * 1024;
-        /// <summary>缓冲区大小</summary>
-        public Int32 BufferSize { get { return _BufferSize; } set { _BufferSize = value; } }
-
-        //private Boolean _NoDelay = true;
-        ///// <summary>禁用接收延迟，收到数据后马上建立异步读取再处理本次数据</summary>
-        //public Boolean NoDelay { get { return _NoDelay; } set { _NoDelay = value; } }
-
-        //private Boolean _UseThreadPool;
-        ///// <summary>是否使用线程池处理事件。建议仅在事件处理非常耗时时使用线程池来处理。</summary>
-        //public Boolean UseThreadPool { get { return _UseThreadPool; } set { _UseThreadPool = value; } }
-
-        /// <summary>不管客户端还是服务端，只允许用一个网络事件</summary>
-        NetEventArgs _arg;
-        #endregion
-
-        #region 扩展属性
-        private Boolean _ReuseAddress;
-        /// <summary>允许将套接字绑定到已在使用中的地址。</summary>
-        public Boolean ReuseAddress
-        {
-            get
-            {
-                if (Socket == null) return _ReuseAddress;
-
-                Object value = Socket.GetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress);
-                return value != null && Convert.ToBoolean(value);
-            }
-            set
-            {
-                if (Socket != null) Socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, value);
-                _ReuseAddress = value;
-            }
-        }
-
-        private IDictionary _Items;
-        /// <summary>数据字典</summary>
-        public IDictionary Items { get { return _Items ?? (_Items = new Hashtable(StringComparer.OrdinalIgnoreCase)); } }
-
-        private Int32 _AsyncCount;
-        /// <summary>异步操作计数</summary>
-        public virtual Int32 AsyncCount { get { return _AsyncCount; } /*set { _AsyncCount = value; }*/ }
-        #endregion
-
-        #region 构造
-        static SocketBase()
-        {
-            // 注册接口实现
-            NetService.Install();
-
-            // 自动收缩内存，调试状态1分钟一次，非调试状态10分钟一次
-            Int32 time = NetHelper.Debug ? 60000 : 600000;
-            new TimerX(s => Runtime.ReleaseMemory(), null, time, time, false);
-
-#if !NET4
-            try
-            {
-                // 写在另外一个方法里面，保证不会在当前方法编译的时候就报错
-                CheckNet21();
-
-                // 回收一次，引发编译NetEventArgs的析构函数
-                GC.Collect();
-            }
-            catch (TypeLoadException ex)
-            {
-                if (ex.TypeName.Contains("SocketAsyncEventArgs"))
-                    throw new XException("NewLife.Net网络库需要.Net2.0 Sp1支持！", ex);
-                else
-                    throw ex;
-            }
-#endif
-        }
-
-#if !NET4
-        static void CheckNet21()
-        {
-            var e = new NetEventArgs();
-            //(e as IDisposable).Dispose();
-            e.AcceptSocket = null;
-        }
-#endif
-
-        /// <summary>实例化</summary>
-        public SocketBase()
-        {
-            // 子类可能重载协议类型
-            LocalUri.ProtocolType = ProtocolType;
-            //RemoteUri.ProtocolType = ProtocolType;
-
-            _arg = NetEventArgs.Pop();
-            _arg.Completed += (s, e) => RaiseComplete(e as NetEventArgs);
-
-            SetShowEventLog();
-        }
-        #endregion
-
-        #region 释放资源
-        /// <summary>关闭网络操作</summary>
-        public void Close() { Dispose(); }
-
-        /// <summary>子类重载实现资源释放逻辑</summary>
-        /// <param name="disposing">从Dispose调用（释放所有资源）还是析构函数调用（释放非托管资源）</param>
-        protected override void OnDispose(bool disposing)
-        {
-            base.OnDispose(disposing);
-
-            //  if (_arg != null) NetEventArgs.Push(_arg); //此处不能做此操作，会导致异常，并且连接无法正常断开，移动把网络清理干净后，再将参数还回池中
-
-            var socket = Socket;
-            if (socket != null)
-            {
-                //NetHelper.Close(socket, ReuseAddress);
-                // 此时Socket可能已经销毁，不能进行Socket操作
-                NetHelper.Close(socket, _ReuseAddress);
-                Socket = null;
-            }
-
-            if (_Statistics != null)
-            {
-                var dp = _Statistics as IDisposable;
-                if (dp != null) dp.Dispose();
-                _Statistics = null;
-            }
-            if (_arg != null)
-                NetEventArgs.Push(_arg);
-        }
-        #endregion
-
-        #region 方法
-        /// <summary>确保创建基础Socket对象</summary>
-        protected virtual void EnsureCreate()
-        {
-            if (Socket != null || Disposed) return;
-
-            Socket socket = null;
-            var addrf = AddressFamily;
-            var protocol = ProtocolType;
-            switch (ProtocolType)
-            {
-                case ProtocolType.Tcp:
-                    socket = new Socket(addrf, SocketType.Stream, protocol);
-                    socket.SetTcpKeepAlive(true);
-                    break;
-                case ProtocolType.Udp:
-                    socket = new Socket(addrf, SocketType.Dgram, protocol);
-                    break;
-                default:
-                    socket = new Socket(addrf, SocketType.Unknown, protocol);
-                    break;
-            }
-
-            // 设置超时时间
-            socket.SendTimeout = 10000;
-            socket.ReceiveTimeout = 10000;
-
-            // 加大接收缓冲区，为BufferSize的10倍，但不超过80k
-            var bufsize = BufferSize * 10;
-            if (bufsize > 80 * 1024) bufsize = 80 * 1024;
-            socket.ReceiveBufferSize = bufsize;
-
-            Socket = socket;
-
-            if (_ReuseAddress) ReuseAddress = true;
-        }
-
-        /// <summary>绑定本地终结点</summary>
-        public virtual void Bind()
-        {
-            if (Disposed) return;
-
-            EnsureCreate();
-            var socket = Socket;
-            if (socket != null && !socket.IsBound)
-            {
-                var ep = new IPEndPoint(Address, Port);
-                socket.Bind(ep);
-
-                //_LocalUri = _RemoteUri = null;
-                _LocalUri = null;
-            }
-        }
-
-        /// <summary>开始异步操作。</summary>
-        /// <param name="callback"></param>
-        internal protected void StartAsync(Func<NetEventArgs, Boolean> callback)
-        {
-            if (Disposed) return;
-
-            EnsureCreate();
-            var socket = Socket;
-            if (socket == null) return;
-
-            // Accept得到的socket不需要绑定
-            if (!socket.IsBound) Bind();
-
-            var e = _arg;
-            // 如果立即返回，则异步处理完成事件
-            if (!callback(e))
-            {
-                // 如果已销毁或取消，则不处理
-                if (!e.Cancel) ThreadPool.QueueUserWorkItem(state => RaiseComplete(state as NetEventArgs), e);
-            }
-            else
-                // 异步开始，增加一个计数
-                Interlocked.Increment(ref _AsyncCount);
-        }
-        #endregion
-
-        #region 完成事件
-        /// <summary>触发完成事件。如果是异步返回，则在IO线程池中执行；如果是同步返回，则在用户线程池中执行。
-        /// 可能由工作线程（事件触发）调用，也可能由用户线程通过线程池线程调用。
-        /// 作为顶级，将会处理所有异常并调用OnError，其中OnError有能力回收参数e。
-        /// </summary>
-        /// <param name="e"></param>
-        void RaiseComplete(NetEventArgs e)
-        {
-            // 异步完成，减少一个计数
-            Interlocked.Decrement(ref _AsyncCount);
-
-            if (ShowEventLog && Log.Level >= LogLevel.Debug) ShowEvent(e);
-
-            try
-            {
-                // 这里直接处理操作取消
-                if (e.SocketError != SocketError.OperationAborted)
-                    OnComplete(e);
-                else
-                    OnError(e, null);
-            }
-            catch (Exception ex)
-            {
-                // 都是在线程池线程里面了，不要往外抛出异常
-                OnError(e, ex);
-            }
-        }
-
-        /// <summary>完成事件分发中心。
-        /// 正常执行时OnComplete必须保证回收参数e，异常时RaiseComplete将能够代为回收
-        /// </summary>
-        /// <param name="e"></param>
-        protected virtual void OnComplete(NetEventArgs e) { }
-        #endregion
-
-        #region 异步结果处理
-        /// <summary>处理异步结果。</summary>
-        /// <param name="e">事件参数</param>
-        /// <param name="start">开始新异步操作的委托</param>
-        /// <param name="process">处理结果的委托</param>
-        protected virtual void Process(NetEventArgs e, Func start, Action<NetEventArgs> process)
-        {
-            // Socket错误由各个处理器来处理
-            if (e.SocketError != SocketError.Success)
-            {
-                OnError(e, null);
-                return;
-            }
-
-            try
-            {
-                // 业务处理的任何异常，都将引发Error事件，但不会影响重新建立新的异步操作
-                process(e);
-            }
-            catch (Exception ex)
-            {
-                try
-                {
-                    OnError(e, ex);
-                }
-                catch { }
-
-                return;
-            }
-
-            // 如果不是操作取消，在处理业务完成后再开始异步操作
-            if (!Disposed) start();
-        }
-        #endregion
-
-        #region 错误处理
-        /// <summary>错误发生/断开连接时</summary>
-        public event EventHandler<ExceptionEventArgs> Error;
-
-        /// <summary>错误发生/断开连接时。拦截Error事件中的所有异常，不外抛，防止因为Error异常导致多次调用OnError</summary>
-        /// <param name="e"></param>
-        /// <param name="ex"></param>
-        internal protected void ProcessError(NetEventArgs e, Exception ex)
-        {
-            if (Error != null)
-            {
-                try
-                {
-                    Error(this, new ExceptionEventArgs { Exception = ex });
-                }
-                catch (Exception ex2)
-                {
-                    WriteLog(ex2.ToString());
-                }
-            }
-        }
-
-        /// <summary>错误发生时。负责调用Error事件以及回收网络事件参数</summary>
-        /// <remarks>OnError除了会调用ProcessError外，还会关闭Socket</remarks>
-        /// <param name="e"></param>
-        /// <param name="ex"></param>
-        protected virtual void OnError(NetEventArgs e, Exception ex)
-        {
-            try
-            {
-                ProcessError(e, ex);
-            }
-            finally
-            {
-                Close();
-            }
-        }
-        #endregion
-
-        #region 辅助
-        /// <summary>检查缓冲区大小</summary>
-        /// <param name="e"></param>
-        [Conditional("DEBUG")]
-        internal protected void CheckBufferSize(NetEventArgs e)
-        {
-            //Int32 n = e.BytesTransferred;
-            //if (n >= e.Buffer.Length || ProtocolType == ProtocolType.Tcp && n >= 1460 || ProtocolType == ProtocolType.Udp && n >= 1464)
-            //{
-            //    WriteLog("接收的实际数据大小{0}超过了缓冲区大小，需要根据真实MTU调整缓冲区大小以提高效率！", n);
-            //}
-        }
-
-        private Boolean _ShowEventLog;
-        /// <summary>是否显示事件日志</summary>
-        public Boolean ShowEventLog { get { return _ShowEventLog; } set { _ShowEventLog = value; } }
-
-        [Conditional("DEBUG")]
-        void SetShowEventLog() { ShowEventLog = true; }
-
-        void ShowEvent(NetEventArgs e)
-        {
-            //WriteLog("Completed[{4}] {0} {1} {2} [{3}]", this, e.LastOperation, e.SocketError, e.BytesTransferred, e.ID);
-            var sb = new StringBuilder();
-            sb.AppendFormat("[{0}] {1} {2}://{3}", e.ID, e.LastOperation, ProtocolType, LocalEndPoint);
-            var ep = e.RemoteIPEndPoint;
-            //if (ep == null || ep.Address.IsAny()) ep = RemoteEndPoint;
-            if ((ep == null || ep.Address.IsAny()) && e.LastOperation == SocketAsyncOperation.Accept && e.AcceptSocket != null) ep = e.AcceptSocket.RemoteEndPoint as IPEndPoint;
-            if (ep != null && !ep.Address.IsAny()) sb.AppendFormat("=>{0}", ep);
-            //sb.AppendFormat(" {0}", e.LastOperation);
-            if (e.SocketError != SocketError.Success) sb.AppendFormat(" {0}", e.SocketError);
-            sb.AppendFormat(" [{0}]", e.BytesTransferred);
-            WriteLog(sb.ToString());
-        }
-
-        /// <summary>已重载。</summary>
-        /// <returns></returns>
-        public override string ToString()
-        {
-            ////if (RemoteEndPoint == null)
-            //return String.Format("{0}://{1}", ProtocolType, LocalEndPoint);
-            ////else
-            ////    return String.Format("{0}://{1}=>{2}", ProtocolType, LocalEndPoint, RemoteEndPoint);
-            return LocalUri.ToString();
-        }
-        #endregion
-
-        #region 统计
-        private IStatistics _Statistics;
-        /// <summary>统计信息，默认关闭，通过<see cref="IStatistics.Enable"/>打开。</summary>
-        public IStatistics Statistics { get { return _Statistics ?? (_Statistics = NetService.Container.Resolve<IStatistics>()); } }
-
-        /// <summary>增加计数</summary>
-        protected void IncCounter() { Statistics.Increment(); }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Sockets/SocketClient.cs b/NewLife.Net/Sockets/SocketClient.cs
deleted file mode 100644
index 9670eef4a4..0000000000
--- a/NewLife.Net/Sockets/SocketClient.cs
+++ /dev/null
@@ -1,255 +0,0 @@
-﻿using System;
-using System.Net;
-using System.Net.Sockets;
-using System.Text;
-
-namespace NewLife.Net.Sockets
-{
-    /// <summary>Socket客户端</summary>
-    /// <remarks>
-    /// 处理的过程中，即使使用异步，也允许事件订阅者阻塞下一次接收的开始<see cref="ReceiveAsync"/>，
-    /// 因为事件订阅者可能需要处理完手头的数据才开始下一次接收。
-    /// </remarks>
-    public abstract class SocketClient : SocketBase, ISocketClient
-    {
-        #region 属性
-        /// <summary>基础Socket对象</summary>
-        public Socket Client { get { if (Socket == null) EnsureCreate(); return Socket; } set { Socket = value; } }
-        #endregion
-
-        #region 远程
-        private NetUri _RemoteUri;
-        /// <summary>远程地址</summary>
-        public NetUri RemoteUri
-        {
-            get
-            {
-                if (_RemoteUri != null)
-                {
-                    _RemoteUri.ProtocolType = ProtocolType;
-                    return _RemoteUri;
-                }
-
-                var uri = new NetUri();
-                uri.ProtocolType = ProtocolType;
-                var socket = Socket;
-                try
-                {
-                    if (socket != null && socket.Connected) uri.EndPoint = socket.RemoteEndPoint as IPEndPoint;
-                }
-                catch (ObjectDisposedException) { }
-
-                return _RemoteUri = uri;
-            }
-        }
-
-        /// <summary>远程终结点</summary>
-        public IPEndPoint RemoteEndPoint { get { return RemoteUri.EndPoint; } }
-        #endregion
-
-        #region 构造
-        /// <summary>实例化</summary>
-        public SocketClient()
-        {
-            // 客户端可能需要阻塞，默认打开延迟
-            //NoDelay = false;
-        }
-        #endregion
-
-        #region 连接
-        /// <summary>建立与远程主机的连接</summary>
-        /// <param name="hostname"></param>
-        /// <param name="port"></param>
-        /// <returns>返回自身，用于链式写法</returns>
-        public virtual ISocketClient Connect(String hostname, Int32 port) { return Connect(NetHelper.ParseAddress(hostname), port); }
-
-        /// <summary>建立与远程主机的连接</summary>
-        /// <param name="address"></param>
-        /// <param name="port"></param>
-        /// <returns>返回自身，用于链式写法</returns>
-        public virtual ISocketClient Connect(IPAddress address, Int32 port) { return Connect(new IPEndPoint(address, port)); }
-
-        /// <summary>建立与远程主机的连接</summary>
-        /// <param name="remoteEP">表示远程设备。</param>
-        /// <returns>返回自身，用于链式写法</returns>
-        public ISocketClient Connect(EndPoint remoteEP)
-        {
-            AddressFamily = remoteEP.AddressFamily;
-            if (!Client.IsBound) Bind();
-
-            Client.Connect(remoteEP);
-
-            // 引发基类重设个地址参数
-            Socket = Client;
-
-            return this;
-        }
-        #endregion
-
-        #region 异步开始
-        /// <summary>开始异步接收数据</summary>
-        public abstract void ReceiveAsync();
-        #endregion
-
-        #region 事件
-        /// <summary>数据到达，在事件处理代码中，事件参数不得另作他用，套接字事件池将会将其回收。</summary>
-        public event EventHandler<NetEventArgs> Received;
-
-        /// <summary>接收到数据时</summary>
-        /// <remarks>
-        /// 网络事件参数使用原则：
-        /// 1，得到者负责回收（通过方法参数得到）
-        /// 2，正常执行时自己负责回收，异常时顶级负责回收
-        /// 3，把回收责任交给别的方法
-        /// </remarks>
-        /// <param name="e"></param>
-        protected virtual void OnReceive(NetEventArgs e)
-        {
-            // Socket错误由各个处理器来处理
-            if (e.SocketError != SocketError.Success)
-            {
-                OnError(e, null);
-                return;
-            }
-
-            // 没有接收事件时，马上开始处理重建委托
-            if (Received == null)
-            {
-                ReceiveAsync();
-                return;
-            }
-
-            Process(e, ReceiveAsync, ProcessReceive);
-        }
-
-        /// <summary>处理接收到的数据</summary>
-        /// <param name="e"></param>
-        internal protected virtual void ProcessReceive(NetEventArgs e)
-        {
-            // 统计接收数
-            IncCounter();
-
-            CheckBufferSize(e);
-            if (Received != null) Received(this, e);
-        }
-
-        /// <summary>已重载。</summary>
-        /// <param name="e"></param>
-        protected override void OnComplete(NetEventArgs e)
-        {
-            switch (e.LastOperation)
-            {
-                case SocketAsyncOperation.Receive:
-                case SocketAsyncOperation.ReceiveFrom:
-                case SocketAsyncOperation.ReceiveMessageFrom:
-                    OnReceive(e);
-                    return;
-                default:
-                    break;
-            }
-
-            base.OnComplete(e);
-        }
-        #endregion
-
-        #region 发送
-        ///// <summary>发送数据流</summary>
-        ///// <param name="stream"></param>
-        ///// <param name="remoteEP"></param>
-        ///// <returns></returns>
-        //public virtual Int64 Send(Stream stream, EndPoint remoteEP = null)
-        //{
-        //    Int64 total = 0;
-
-        //    var size = stream.CanSeek ? stream.Length - stream.Position : BufferSize;
-        //    Byte[] buffer = new Byte[size];
-        //    while (true)
-        //    {
-        //        Int32 n = stream.Read(buffer, 0, buffer.Length);
-        //        if (n <= 0) break;
-
-        //        Send(buffer, 0, n, remoteEP);
-        //        total += n;
-
-        //        if (n < buffer.Length) break;
-        //    }
-        //    return total;
-        //}
-
-        ///// <summary>发送数据</summary>
-        ///// <param name="buffer">缓冲区</param>
-        ///// <param name="offset">位移</param>
-        ///// <param name="size">写入字节数</param>
-        ///// <param name="remoteEP">远程终结点</param>
-        //public virtual void Send(Byte[] buffer, Int32 offset = 0, Int32 size = 0, EndPoint remoteEP = null)
-        //{
-        //    if (!Client.IsBound) Bind();
-
-        //    if (size <= 0) size = buffer.Length - offset;
-        //    if (remoteEP != null && Socket == null) AddressFamily = remoteEP.AddressFamily;
-        //    if (remoteEP != null && ProtocolType == ProtocolType.Udp)
-        //        Client.SendTo(buffer, offset, size, SocketFlags.None, remoteEP);
-        //    else
-        //        Client.Send(buffer, offset, size, SocketFlags.None);
-        //}
-
-        ///// <summary>发送字符串</summary>
-        ///// <param name="msg"></param>
-        ///// <param name="encoding"></param>
-        ///// <param name="remoteEP">远程终结点</param>
-        //public void Send(String msg, Encoding encoding = null, EndPoint remoteEP = null)
-        //{
-        //    if (String.IsNullOrEmpty(msg)) return;
-
-        //    if (encoding == null) encoding = Encoding.UTF8;
-        //    Send(encoding.GetBytes(msg), 0, 0, remoteEP);
-        //}
-        #endregion
-
-        #region 接收
-        /// <summary>接收数据</summary>
-        /// <returns></returns>
-        public Byte[] Receive()
-        {
-            var buffer = new Byte[BufferSize];
-            if (!Client.IsBound) Bind();
-
-            var size = Client.Receive(buffer);
-            if (size <= 0) return null;
-
-            return buffer.ReadBytes(0, size);
-        }
-
-        ///// <summary>接收字符串</summary>
-        ///// <param name="encoding"></param>
-        ///// <returns></returns>
-        //public String ReceiveString(Encoding encoding = null)
-        //{
-        //    var buffer = Receive();
-        //    if (buffer == null || buffer.Length < 1) return null;
-
-        //    if (encoding == null) encoding = Encoding.UTF8;
-        //    return encoding.GetString(buffer);
-        //}
-        #endregion
-
-        #region 创建会话
-        /// <summary>为指定地址创建会话。对于无连接Socket，必须指定远程地址；对于有连接Socket，指定的远程地址将不起任何作用</summary>
-        /// <param name="remoteEP"></param>
-        /// <returns></returns>
-        public abstract ISocketSession CreateSession(IPEndPoint remoteEP = null);
-        #endregion
-
-        #region 辅助
-        /// <summary>已重载。</summary>
-        /// <returns></returns>
-        public override string ToString()
-        {
-            var remote = RemoteEndPoint;
-            if (remote != null) return base.ToString() + "=>" + remote;
-
-            return base.ToString();
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Sockets/SocketServer.cs b/NewLife.Net/Sockets/SocketServer.cs
deleted file mode 100644
index 7126b97fba..0000000000
--- a/NewLife.Net/Sockets/SocketServer.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-﻿using System;
-using System.Net;
-using System.Net.Sockets;
-using NewLife.Model;
-
-namespace NewLife.Net.Sockets
-{
-    /// <summary>针对异步模型进行封装的Socket服务器</summary>
-    public class SocketServer : SocketBase, ISocketServer, IServer
-    {
-        #region 属性
-        /// <summary>基础Socket对象</summary>
-        public Socket Server { get { if (Socket == null) EnsureCreate(); return Socket; } set { Socket = value; } }
-        #endregion
-
-        #region 构造
-        /// <summary>构造一个Socket服务器对象</summary>
-        /// <param name="address"></param>
-        /// <param name="port"></param>
-        public SocketServer(IPAddress address, Int32 port)
-        {
-            Address = address;
-            Port = port;
-        }
-
-        /// <summary>构造一个Socket服务器对象</summary>
-        /// <param name="hostname"></param>
-        /// <param name="port"></param>
-        public SocketServer(String hostname, Int32 port) : this(NetHelper.ParseAddress(hostname), port) { }
-
-        /// <summary>已重载。释放会话集合等资源</summary>
-        /// <param name="disposing"></param>
-        protected override void OnDispose(bool disposing)
-        {
-            base.OnDispose(disposing);
-
-            try
-            {
-                Stop();
-            }
-            catch { }
-        }
-        #endregion
-
-        #region 开始停止
-        private Boolean _Active;
-        /// <summary>是否活动</summary>
-        public Boolean Active { get { return _Active; } private set { _Active = value; } }
-
-        /// <summary>开始监听</summary>
-        public void Start()
-        {
-            if (Active) throw new InvalidOperationException("服务已经开始！");
-
-            OnStart();
-
-            Active = true;
-        }
-
-        /// <summary>开始时调用的方法</summary>
-        protected virtual void OnStart()
-        {
-            EnsureCreate();
-
-            Bind();
-        }
-
-        /// <summary>停止监听</summary>
-        public void Stop()
-        {
-            //if (!Active) throw new InvalidOperationException("服务没有开始！");
-            if (!Active) return;
-
-            OnStop();
-
-            Active = false;
-        }
-
-        /// <summary>停止时调用的方法</summary>
-        protected virtual void OnStop() { Close(); }
-        #endregion
-
-        #region 事件
-        /// <summary>已重载。服务器不会因为普通错误而关闭Socket停止服务</summary>
-        /// <param name="e"></param>
-        /// <param name="ex"></param>
-        protected override void OnError(NetEventArgs e, Exception ex)
-        {
-            var isAborted = e.SocketError == SocketError.OperationAborted;
-            try
-            {
-                ProcessError(e, ex);
-            }
-            finally
-            {
-                if (isAborted) Close();
-            }
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Sockets/SocketStream.cs b/NewLife.Net/Sockets/SocketStream.cs
deleted file mode 100644
index 4fcacd3253..0000000000
--- a/NewLife.Net/Sockets/SocketStream.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-﻿using System;
-using System.IO;
-using System.Net;
-using System.Net.Sockets;
-using NewLife.IO;
-
-namespace NewLife.Net.Sockets
-{
-    /// <summary>Socket数据流</summary>
-    class SocketStream : ReadWriteStream
-    {
-        #region 属性
-        private Socket _Socket;
-        /// <summary>套接字</summary>
-        public Socket Socket { get { return _Socket; } internal set { _Socket = value; } }
-
-        private IPEndPoint _RemoteEndPoint;
-        /// <summary>远程地址</summary>
-        public IPEndPoint RemoteEndPoint { get { return _RemoteEndPoint; } private set { _RemoteEndPoint = value; } }
-        #endregion
-
-        #region 构造
-        /// <summary>初始化</summary>
-        /// <param name="socket"></param>
-        public SocketStream(Socket socket) : this(socket, Stream.Null) { }
-
-        /// <summary>使用Socket和输入流初始化一个Socket流，该流将从输入流中读取数据，并把输出的数据写入到Socket中</summary>
-        /// <param name="socket"></param>
-        /// <param name="inputStream"></param>
-        public SocketStream(Socket socket, Stream inputStream)
-            : base(inputStream, Stream.Null)
-        {
-            Socket = socket;
-        }
-
-        /// <summary>初始化</summary>
-        /// <param name="socket"></param>
-        /// <param name="remote"></param>
-        public SocketStream(Socket socket, EndPoint remote) : this(socket, Stream.Null, remote) { }
-
-        /// <summary>使用Socket和输入流初始化一个Socket流，该流将从输入流中读取数据，并把输出的数据写入到Socket中</summary>
-        /// <param name="socket"></param>
-        /// <param name="inputStream"></param>
-        /// <param name="remote"></param>
-        public SocketStream(Socket socket, Stream inputStream, EndPoint remote)
-            : base(inputStream, Stream.Null)
-        {
-            Socket = socket;
-            RemoteEndPoint = remote as IPEndPoint;
-        }
-        #endregion
-
-        #region 重载
-        /// <summary>读取数据，如果初始化时指定了输入流，则从输入流读取数据，否则从Socket中读取数据</summary>
-        /// <param name="buffer">缓冲区</param>
-        /// <param name="offset">偏移</param>
-        /// <param name="count">数量</param>
-        /// <returns></returns>
-        public override int Read(byte[] buffer, int offset, int count)
-        {
-            if (InputStream == Stream.Null)
-                return Socket.Receive(buffer, offset, count, SocketFlags.None);
-            else
-                return base.Read(buffer, offset, count);
-        }
-
-        /// <summary>写入数据，经Socket向网络发送</summary>
-        /// <param name="buffer">缓冲区</param>
-        /// <param name="offset">偏移</param>
-        /// <param name="count">数量</param>
-        public override void Write(byte[] buffer, int offset, int count)
-        {
-            // 兼容IPV6
-            if (!RemoteEndPoint.Address.IsAny() && RemoteEndPoint.Port != 0)
-                Socket.SendTo(buffer, offset, count, SocketFlags.None, RemoteEndPoint);
-            else
-                Socket.Send(buffer, offset, count, SocketFlags.None);
-        }
-        #endregion
-
-        #region 方法
-        /// <summary>重新设置流</summary>
-        /// <param name="socket"></param>
-        /// <param name="input"></param>
-        /// <param name="remote"></param>
-        public void Reset(Socket socket, Stream input, EndPoint remote)
-        {
-            Socket = socket;
-            RemoteEndPoint = remote as IPEndPoint;
-
-            InputStream = input;
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Stress/TcpStress.cs b/NewLife.Net/Stress/TcpStress.cs
deleted file mode 100644
index 1dbd505ba6..0000000000
--- a/NewLife.Net/Stress/TcpStress.cs
+++ /dev/null
@@ -1,243 +0,0 @@
-﻿using System;
-using System.Diagnostics;
-using System.Net;
-using System.Text;
-using System.Threading;
-using NewLife.Log;
-using NewLife.Threading;
-
-namespace NewLife.Net.Stress
-{
-    /// <summary>Tcp压力测试</summary>
-    public class TcpStress : DisposeBase
-    {
-        #region 属性
-        private TcpStressConfig _Config;
-        /// <summary>配置</summary>
-        public TcpStressConfig Config { get { return _Config; } set { _Config = value; } }
-
-        private Int32 _Connections;
-        /// <summary>连接数</summary>
-        public Int32 Connections { get { return _Connections; } }
-
-        private Int32 _Messages;
-        /// <summary>消息数</summary>
-        public Int32 Messages { get { return _Messages; } set { _Messages = value; } }
-
-        private Int32 _Bytes;
-        /// <summary>字节数</summary>
-        public Int32 Bytes { get { return _Bytes; } set { _Bytes = value; } }
-
-        private Int32 _MessagesPerSecond;
-        /// <summary>每秒消息数</summary>
-        public Int32 MessagesPerSecond { get { return _MessagesPerSecond; } set { _MessagesPerSecond = value; } }
-
-        private Int32 _BytesPerSecond;
-        /// <summary>每秒字节数</summary>
-        public Int32 BytesPerSecond { get { return _BytesPerSecond; } set { _BytesPerSecond = value; } }
-
-        private Int32 _MaxMessages;
-        /// <summary>最大消息速度</summary>
-        public Int32 MaxMessages { get { return _MaxMessages; } set { _MaxMessages = value; } }
-
-        private Int32 _MaxBytes;
-        /// <summary>最大字节速度</summary>
-        public Int32 MaxBytes { get { return _MaxBytes; } set { _MaxBytes = value; } }
-
-        TcpStressClient[] cs;
-        IPEndPoint _address;
-        Byte[] _buffer;
-
-        TimerX timer;
-        #endregion
-
-        #region 构造
-        /// <summary>销毁</summary>
-        /// <param name="disposing"></param>
-        protected override void OnDispose(Boolean disposing)
-        {
-            base.OnDispose(disposing);
-
-            Stop();
-        }
-        #endregion
-
-        #region 测试主方法
-        static TcpStress stress;
-        /// <summary>入口方法</summary>
-        public static void Main()
-        {
-            try
-            {
-                stress = new TcpStress();
-                stress.Config = TcpStressConfig.Current;
-                stress.Config.Show();
-                stress.Init();
-
-                Console.WriteLine("准备就绪！任意键开始……");
-                Console.ReadKey(true);
-
-                var sw = Stopwatch.StartNew();
-                timerShowStatus = new TimerX(ShowStatus, null, 1000, 1000);
-
-                stress.Start();
-            }
-            catch (Exception ex) { Console.WriteLine(ex.ToString()); }
-
-            Console.WriteLine("压力测试中！任意键结束……");
-            Console.ReadKey(true);
-
-            stress.Stop();
-            timerShowStatus.Dispose();
-        }
-
-        static TimerX timerShowStatus;
-        static Stopwatch sw;
-
-        static void ShowStatus(Object state)
-        {
-            var ts = sw.Elapsed;
-            var t = String.Format("{0:00}:{1:00}:{2:00}", ts.Hours, ts.Minutes, ts.Seconds);
-            Console.Title = String.Format("连接:{1:n0} 消息:{2:n0}/s 速度:{3:n0}kB/s 最大消息：{4:n0} 最大速度：{5:n0}kB/s 总消息:{6:n0} 流量:{7:n0}kB 时间:{0}",
-                t,
-                stress.Connections,
-                stress.MessagesPerSecond,
-                stress.BytesPerSecond / 1024,
-                stress.MaxMessages,
-                stress.MaxBytes / 1024,
-                stress.Messages,
-                stress.Bytes / 1024
-                );
-
-            try
-            {
-                ThreadPool.GetAvailableThreads(out var wt, out var cpt);
-                var threads = Process.GetCurrentProcess().Threads.Count;
-
-                var color = Console.ForegroundColor;
-                Console.ForegroundColor = ConsoleColor.Yellow;
-                Console.CursorLeft = 0;
-                Console.Write("连接:{0} 消息速度:{1}/s Thread:{2}/{3}/{4}", stress.Connections, stress.MessagesPerSecond, threads, wt, cpt);
-                Console.ForegroundColor = color;
-            }
-            catch { }
-        }
-        #endregion
-
-        #region 方法
-        /// <summary>初始化工作</summary>
-        public void Init()
-        {
-            var cfg = _Config;
-
-            cs = new TcpStressClient[cfg.Connections];
-            //_address = new IPEndPoint(Dns.GetHostAddresses(cfg.Address)[0], cfg.Port);
-            _address = NetHelper.ParseEndPoint(cfg.Address, cfg.Port);
-
-            // 初始化数据
-            if (!String.IsNullOrEmpty(cfg.Data))
-            {
-                if (cfg.Data.StartsWithIgnoreCase("0x"))
-                    _buffer = cfg.Data.Substring(2).Trim().ToHex();
-                else
-                    _buffer = Encoding.UTF8.GetBytes(cfg.Data);
-
-                if (cfg.UseLength)
-                {
-                    var bts = BitConverter.GetBytes(_buffer.Length);
-                    var buf = new Byte[bts.Length + _buffer.Length];
-                    Buffer.BlockCopy(bts, 0, buf, 0, bts.Length);
-                    Buffer.BlockCopy(_buffer, 0, buf, bts.Length, _buffer.Length);
-                    _buffer = buf;
-                }
-            }
-        }
-
-        /// <summary>开始</summary>
-        public void Start()
-        {
-            var cfg = _Config;
-            var interval = cfg.Interval;
-
-            XTrace.WriteLine("开始建立连接……");
-            for (var i = 0; i < cs.Length; i++)
-            {
-                try
-                {
-                    var client = cs[i] = new TcpStressClient();
-                    client.Interval = cfg.SendInterval;
-                    client.Times = cfg.Times;
-                    client.EndPoint = _address;
-                    client.Buffer = _buffer;
-
-                    client.Connected += (s, e) => Interlocked.Increment(ref _Connections);
-                    client.Disconnected += (s, e) => Interlocked.Decrement(ref _Connections);
-                    client.Sent += (s, e) => SendMessage(e.Arg);
-
-                    client.ConnectAsync();
-                }
-                catch (Exception ex) { XTrace.WriteException(ex); }
-
-                if (interval > 0) Thread.Sleep(interval);
-            }
-
-            // 定时器用于计算每秒统计数
-            timer = new TimerX(OnTimer, null, 1000, 1000);
-
-            // 开始发送
-            if (_buffer != null && _buffer.Length > 0)
-            {
-                XTrace.WriteLine("开始发送数据……");
-                for (var i = 0; i < cs.Length; i++)
-                {
-                    cs[i].StartSend();
-                }
-            }
-        }
-
-        void OnTimer(Object state)
-        {
-            _MessagesPerSecond = 0;
-            _BytesPerSecond = 0;
-        }
-
-        /// <summary>停止</summary>
-        public void Stop()
-        {
-            if (cs != null)
-            {
-                XTrace.WriteLine("正在关闭连接……");
-                for (var i = 0; i < cs.Length; i++)
-                {
-                    if (cs[i] != null)
-                    {
-                        try
-                        {
-                            cs[i].Dispose();
-                        }
-                        catch { }
-                    }
-                }
-                cs = null;
-            }
-
-            if (timer != null)
-            {
-                timer.Dispose();
-                timer = null;
-            }
-        }
-
-        void SendMessage(Int32 count)
-        {
-            Interlocked.Increment(ref _Messages);
-            Interlocked.Increment(ref _MessagesPerSecond);
-            Interlocked.Add(ref _Bytes, count);
-            Interlocked.Add(ref _BytesPerSecond, count);
-
-            if (_MessagesPerSecond > MaxMessages) MaxMessages = _MessagesPerSecond;
-            if (_BytesPerSecond > MaxBytes) MaxBytes = _BytesPerSecond;
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Stress/TcpStressClient.cs b/NewLife.Net/Stress/TcpStressClient.cs
deleted file mode 100644
index d52a718c6e..0000000000
--- a/NewLife.Net/Stress/TcpStressClient.cs
+++ /dev/null
@@ -1,176 +0,0 @@
-﻿using System;
-using System.Net;
-using System.Net.Sockets;
-using NewLife.Threading;
-
-namespace NewLife.Net.Stress
-{
-    class TcpStressClient : DisposeBase
-    {
-        #region 属性
-        private IPEndPoint _EndPoint;
-        /// <summary>远程地址</summary>
-        public IPEndPoint EndPoint { get { return _EndPoint; } set { _EndPoint = value; } }
-
-        private Byte[] _Buffer;
-        /// <summary>数据缓冲区</summary>
-        public Byte[] Buffer { get { return _Buffer; } set { _Buffer = value; } }
-
-        private Int32 _Interval;
-        /// <summary>发送间隔</summary>
-        public Int32 Interval { get { return _Interval; } set { _Interval = value; } }
-
-        private Int32 _Times = 100;
-        /// <summary>发送次数</summary>
-        public Int32 Times { get { return _Times; } set { _Times = value; } }
-
-        Socket socket;
-        TimerX sendTimer;
-        #endregion
-
-        #region 事件
-        public event EventHandler Connected;
-        public event EventHandler Disconnected;
-        public event EventHandler<EventArgs<Int32>> Sent;
-        public event EventHandler<EventArgs<Int32>> Received;
-        #endregion
-
-        #region 构造
-        protected override void OnDispose(Boolean disposing)
-        {
-            base.OnDispose(disposing);
-
-            Disconnect();
-        }
-        #endregion
-
-        #region 连接
-        public void ConnectAsync()
-        {
-            var e = new SocketAsyncEventArgs();
-            e.Completed += OnConnected;
-            e.RemoteEndPoint = EndPoint;
-
-            socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
-            //e.UserToken = socket;
-
-            if (!socket.ConnectAsync(e)) OnConnected(this, e);
-        }
-
-        private void OnConnected(Object sender, SocketAsyncEventArgs e)
-        {
-            e.Completed -= OnConnected;
-
-            if (e.SocketError != SocketError.Success)
-            {
-                Close();
-                return;
-            }
-
-            if (Connected != null)
-            {
-                Connected(this, e);
-                Connected = null;
-            }
-
-            e.Dispose();
-
-            if (Received != null) ReceiveAsyc();
-        }
-        #endregion
-
-        #region 发送
-        /// <summary>开始发送</summary>
-        public void StartSend()
-        {
-            sendTimer = new TimerX(SendData, null, Interval, Interval);
-        }
-
-        private void SendData(Object state)
-        {
-            if (_Times-- <= 0)
-            {
-                if (sendTimer != null) sendTimer.Dispose();
-                return;
-            }
-
-            try
-            {
-                lock (this)
-                {
-                    if (socket.Connected)
-                    {
-                        socket.Send(_Buffer, 0, _Buffer.Length, SocketFlags.None);
-
-                        if (Sent != null) Sent(this, new EventArgs<Int32>(_Buffer.Length));
-                    }
-                }
-            }
-            catch
-            {
-                Disconnect();
-            }
-        }
-        #endregion
-
-        #region 接收
-        void ReceiveAsyc()
-        {
-            var e = new SocketAsyncEventArgs();
-            e.Completed += OnReceived;
-            //e.UserToken = socket;
-            var buf = new Byte[4096];
-            e.SetBuffer(buf, 0, buf.Length);
-
-            if (!socket.ReceiveAsync(e)) OnReceived(this, e);
-        }
-
-        void OnReceived(Object sender, SocketAsyncEventArgs e)
-        {
-            if (e.SocketError != SocketError.Success || e.BytesTransferred <= 0)
-            {
-                Disconnect();
-                return;
-            }
-
-            if (Received != null) Received(this, new EventArgs<Int32>(e.BytesTransferred));
-
-            if (!socket.ReceiveAsync(e)) OnReceived(this, e);
-        }
-        #endregion
-
-        #region 断开
-        public void Disconnect()
-        {
-            lock (this)
-            {
-                if (sendTimer != null) sendTimer.Dispose();
-                Close();
-                OnDisconnected();
-            }
-        }
-
-        void Close()
-        {
-            try
-            {
-                if (socket != null && socket.Connected)
-                {
-                    socket.Shutdown(SocketShutdown.Both);
-                    socket.Close();
-                }
-            }
-            catch { }
-        }
-
-        private void OnDisconnected()
-        {
-            if (Disconnected != null)
-            {
-                Disconnected(this, EventArgs.Empty);
-                Disconnected = null;
-            }
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Stress/TcpStressConfig.cs b/NewLife.Net/Stress/TcpStressConfig.cs
deleted file mode 100644
index aee00bf2f8..0000000000
--- a/NewLife.Net/Stress/TcpStressConfig.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-﻿using System;
-using System.ComponentModel;
-using System.Reflection;
-using NewLife.Reflection;
-using NewLife.Xml;
-
-namespace NewLife.Net.Stress
-{
-    /// <summary>Tcp压力测试配置文件</summary>
-    [XmlConfigFile("TcpStress.xml")]
-    public class TcpStressConfig : XmlConfig<TcpStressConfig>
-    {
-        /// <summary>测试地址</summary>
-        [Description("测试地址")]
-        public String Address { get; set; } = "";
-
-        /// <summary>测试端口</summary>
-        [Description("测试端口")]
-        public Int32 Port { get; set; } = 80;
-
-        /// <summary>连接数</summary>
-        [Description("连接数")]
-        public Int32 Connections { get; set; } = 10000;
-
-        /// <summary>连接间隔，单位毫秒</summary>
-        [Description("连接间隔，单位毫秒")]
-        public Int32 Interval { get; set; }
-
-        /// <summary>发送的数据，十六进制数据使用0x开头</summary>
-        [Description("发送的数据")]
-        public String Data { get; set; } = "我是大石头！";
-
-        /// <summary>使用前缀长度</summary>
-        [Description("使用前缀长度")]
-        public Boolean UseLength { get; set; }
-
-        /// <summary>发送数据间隔，单位毫秒</summary>
-        [Description("发送数据间隔，单位毫秒")]
-        public Int32 SendInterval { get; set; } = 1000;
-
-        /// <summary>每个连接发送数据次数</summary>
-        [Description("每个连接发送数据次数")]
-        public Int32 Times { get; set; } = 100;
-
-        /// <summary>实例化</summary>
-        public TcpStressConfig()
-        {
-        }
-
-        /// <summary>新建配置</summary>
-        protected override void OnNew()
-        {
-            Address = NetHelper.MyIP().ToString();
-        }
-
-        /// <summary>显示参数</summary>
-        public void Show()
-        {
-            var cfg = this;
-
-            var pis = cfg.GetType().GetProperties(true);
-            var len = 0;
-            foreach (var item in pis)
-            {
-                if (item.Name.Length > len) len = item.Name.Length;
-            }
-            var color = Console.ForegroundColor;
-            foreach (var item in pis)
-            {
-                var des = item.GetCustomAttribute<DescriptionAttribute>();
-
-                Console.ForegroundColor = ConsoleColor.Yellow;
-                Console.Write("{0," + len + "}:", item.Name);
-
-                Console.ForegroundColor = ConsoleColor.Red;
-                var v = item.GetValue(cfg, null) + "";
-                if (des != null && des.Description.IndexOf("毫秒") >= 0)
-                {
-                    Console.Write("{0,6}", v);
-                    Console.ForegroundColor = ConsoleColor.Cyan;
-                    Console.Write("ms");
-                }
-                else
-                    Console.Write("{0,8}", v);
-
-                Console.ForegroundColor = ConsoleColor.DarkGray;
-                if (des != null) Console.Write("\t" + des.Description);
-                Console.WriteLine();
-
-                Console.ForegroundColor = color;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Stun/StunAttribute.cs b/NewLife.Net/Stun/StunAttribute.cs
deleted file mode 100644
index 94488a6472..0000000000
--- a/NewLife.Net/Stun/StunAttribute.cs
+++ /dev/null
@@ -1,236 +0,0 @@
-﻿using System;
-using System.Net;
-using System.Text;
-using NewLife.Serialization;
-
-namespace NewLife.Net.Stun
-{
-    class StunAttribute
-    {
-        #region 属性
-        /* RFC 3489 11.2.
-            Each attribute is TLV encoded, with a 16 bit type, 16 bit length, and variable value:
-
-            0                   1                   2                   3
-            0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-            |         Type                  |            Length             |
-            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-            |                             Value                             ....
-            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+                            
-        */
-
-        private AttributeType _Type;
-        /// <summary>类型</summary>
-        public AttributeType Type { get { return _Type; } set { _Type = value; } }
-
-        private UInt16 _Length;
-        /// <summary>属性说明</summary>
-        public UInt16 Length { get { return _Length; } set { _Length = value; } }
-
-        [FieldSize("_Length")]
-        private Byte[] _Data;
-        /// <summary>数据</summary>
-        public Byte[] Data { get { return _Data; } set { _Data = value; } }
-        #endregion
-
-        #region 扩展属性
-        /// <summary>网络节点</summary>
-        public IPEndPoint EndPoint
-        {
-            get { return Data == null ? null : ParseEndPoint(Data); }
-            set { Data = StoreEndPoint(value); }
-        }
-
-        /// <summary>字符串</summary>
-        public String Str
-        {
-            get
-            {
-                if (Data == null) return null;
-                return Encoding.UTF8.GetString(Data);
-            }
-            set
-            {
-                if (String.IsNullOrEmpty(value))
-                    Data = null;
-                else
-                    Data = Encoding.UTF8.GetBytes(value);
-            }
-        }
-
-        /// <summary>整型</summary>
-        public Int32 Int
-        {
-            get
-            {
-                if (Data == null) return 0;
-                var d = new Byte[4];
-                Data.CopyTo(d, 0);
-                Array.Reverse(d);
-                return BitConverter.ToInt32(d, 0);
-            }
-            set
-            {
-                var d = BitConverter.GetBytes(value);
-                Array.Reverse(d);
-                Data = d;
-            }
-        }
-
-        public T GetValue<T>()
-        {
-            if (Data == null || Data.Length < 1) return default(T);
-
-            Object value = null;
-            var t = typeof(T);
-            if (t == typeof(IPEndPoint))
-                value = EndPoint;
-            else if (t == typeof(String))
-                value = Str;
-            else if (t == typeof(Int32))
-                value = Int;
-
-            return (T)value;
-        }
-
-        public void SetValue<T>(T value)
-        {
-            Object v = value;
-            var t = typeof(T);
-            if (t == typeof(IPEndPoint))
-                EndPoint = (IPEndPoint)v;
-            else if (t == typeof(String))
-                Str = (String)v;
-            else if (t == typeof(Int32))
-                Int = (Int32)v;
-        }
-        #endregion
-
-        #region 分析终结点
-        IPEndPoint ParseEndPoint(Byte[] data)
-        {
-            /*
-                It consists of an eight bit address family, and a sixteen bit
-                port, followed by a fixed length value representing the IP address.
-
-                0                   1                   2                   3
-                0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-                +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-                |x x x x x x x x|    Family     |           Port                |
-                +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-                |                             Address                           |
-                +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-            */
-
-            // Skip family
-            //Int32 p = 2;
-
-            // Port
-            var arr = new Byte[2];
-            Array.Copy(data, 2, arr, 0, arr.Length);
-            Array.Reverse(arr);
-            var port = BitConverter.ToUInt16(arr, 0);
-
-            // Address
-            var ip = new Byte[4];
-            //data.CopyTo(ip, 4);
-            Array.Copy(data, 4, ip, 0, ip.Length);
-
-            return new IPEndPoint(new IPAddress(ip), port);
-        }
-
-        Byte[] StoreEndPoint(IPEndPoint endPoint)
-        {
-            /*
-                It consists of an eight bit address family, and a sixteen bit
-                port, followed by a fixed length value representing the IP address.
-
-                0                   1                   2                   3
-                0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-                +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-                |x x x x x x x x|    Family     |           Port                |
-                +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-                |                             Address                           |
-                +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+             
-            */
-
-            if (endPoint == null) return null;
-
-            //// 头部，类型和长度（固定8）
-            //writer.Write((Int16)type);
-            //writer.Write((Int16)8);
-
-            //writer.Write((Byte)1);
-            //writer.Write(endPoint.Port);
-            //writer.Write(endPoint.Address.GetAddressBytes());
-
-            var data = new Byte[8];
-            data[1] = 1;
-
-            var d = BitConverter.GetBytes((UInt16)endPoint.Port);
-            Array.Reverse(d);
-            d.CopyTo(data, 2);
-
-            endPoint.Address.GetAddressBytes().CopyTo(data, 4);
-
-            return data;
-        }
-        #endregion
-
-        #region 辅助
-        public override String ToString()
-        {
-            switch (Type)
-            {
-                case AttributeType.ChangeRequest:
-                    return "改变IP:{0} Port:{1}".F((Int & 4) >> 2, (Int & 2) >> 1);
-                case AttributeType.MappedAddress:
-                case AttributeType.ResponseAddress:
-                case AttributeType.SourceAddress:
-                case AttributeType.ChangedAddress:
-                    return EndPoint + "";
-                case AttributeType.Username:
-                case AttributeType.Password:
-                    return Str;
-                case AttributeType.MessageIntegrity:
-                    return Str;
-                case AttributeType.ErrorCode:
-                    return Int + "";
-                case AttributeType.UnknownAttribute:
-                    break;
-                case AttributeType.ReflectedFrom:
-                    break;
-                case AttributeType.XorMappedAddress:
-                    return EndPoint + "";
-                case AttributeType.XorOnly:
-                    break;
-                case AttributeType.ServerName:
-                    return Str;
-                default:
-                    break;
-            }
-            return base.ToString();
-        }
-        #endregion
-    }
-
-    /// <summary>属性类型</summary>
-    enum AttributeType : UInt16
-    {
-        MappedAddress = 0x0001,
-        ResponseAddress = 0x0002,
-        ChangeRequest = 0x0003,
-        SourceAddress = 0x0004,
-        ChangedAddress = 0x0005,
-        Username = 0x0006,
-        Password = 0x0007,
-        MessageIntegrity = 0x0008,
-        ErrorCode = 0x0009,
-        UnknownAttribute = 0x000A,
-        ReflectedFrom = 0x000B,
-        XorMappedAddress = 0x8020,
-        XorOnly = 0x0021,
-        ServerName = 0x8022,
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Stun/StunClient.cs b/NewLife.Net/Stun/StunClient.cs
deleted file mode 100644
index e2c00168e0..0000000000
--- a/NewLife.Net/Stun/StunClient.cs
+++ /dev/null
@@ -1,445 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net;
-using System.Net.Sockets;
-using NewLife.Configuration;
-using NewLife.Data;
-using NewLife.Net.Sockets;
-
-namespace NewLife.Net.Stun
-{
-    /// <summary>Stun客户端。Simple Traversal of UDP over NATs，NAT 的UDP简单穿越。RFC 3489</summary>
-    /// <remarks>
-    /// <a target="_blank" href="http://baike.baidu.com/view/884586.htm">STUN</a>
-    /// 
-    /// 国内STUN服务器：220.181.126.73、220.181.126.74，位于北京电信，但不清楚是哪家公司
-    /// </remarks>
-    /// <example>
-    /// <code>
-    /// var result = new StunClient().Query();
-    /// if(result.Type != StunNetType.UdpBlocked){
-    ///     
-    /// }
-    /// else{
-    ///     var publicEP = result.Public;
-    /// }
-    /// </code>
-    /// </example>
-    public class StunClient : Netbase
-    {
-        #region 工作原理
-        /*
-        In test I, the client sends a STUN Binding Request to a server, without any flags set in the
-        CHANGE-REQUEST attribute, and without the RESPONSE-ADDRESS attribute. This causes the server 
-        to send the response back to the address and port that the request came from.
-            
-        In test II, the client sends a Binding Request with both the "change IP" and "change port" flags
-        from the CHANGE-REQUEST attribute set.  
-              
-        In test III, the client sends a Binding Request with only the "change port" flag set.
-                          
-                            +--------+
-                            |  Test  |
-                            |   I    |
-                            +--------+
-                                    |
-                                    |
-                                    V
-                                   /\              /\
-                                N /  \ Y          /  \ Y             +--------+
-                UDP      <-------/Resp\--------->/ IP \------------->|  Test  |
-                Blocked          \ ?  /          \Same/              |   II   |
-                                  \  /            \? /               +--------+
-                                   \/              \/                    |
-                                                    | N                  |
-                                                    |                    V
-                                                    V                    /\
-                                                +--------+  Sym.      N /  \
-                                                |  Test  |  UDP    <---/Resp\
-                                                |   II   |  Firewall   \ ?  /
-                                                +--------+              \  /
-                                                    |                    \/
-                                                    V                    |Y
-                        /\                         /\                    |
-         Symmetric  N  /  \       +--------+   N  /  \                   V
-            NAT  <--- / IP \<-----|  Test  |<--- /Resp\               Open
-                      \Same/      |   I    |     \ ?  /               Internet
-                       \? /       +--------+      \  /
-                        \/                         \/
-                        |                           |Y
-                        |                           |
-                        |                           V
-                        |                           Full
-                        |                           Cone
-                        V              /\
-                    +--------+        /  \ Y
-                    |  Test  |------>/Resp\---->Restricted
-                    |   III  |       \ ?  /
-                    +--------+        \  /
-                                       \/
-                                       |N
-                                       |       Port
-                                       +------>Restricted
-
-    */
-        #endregion
-
-        #region 服务器
-        //static String[] servers = new String[] { "stun.NewLifeX.com", "stun.sipgate.net:10000", "stunserver.org", "stun.xten.com", "stun.fwdnet.net", "stun.iptel.org", "220.181.126.73" };
-        static String[] servers = new String[] { "stun.NewLifeX.com", "stun.sipgate.net:10000", "stun.xten.com", "stun.iptel.org", "220.181.126.73" };
-        private List<String> _Servers;
-        /// <summary>Stun服务器</summary>
-        public List<String> Servers
-        {
-            get
-            {
-                if (_Servers == null)
-                {
-                    var list = new List<String>();
-                    var ss = Config.GetConfigSplit<String>("NewLife.Net.StunServers", null);
-                    if (ss != null && ss.Length > 0) list.AddRange(ss);
-                    list.AddRange(servers);
-                    _Servers = list;
-                }
-                return _Servers;
-            }
-        }
-        #endregion
-
-        #region 属性
-        private ISocketClient _Socket;
-        /// <summary>套接字</summary>
-        public ISocketClient Socket { get { return _Socket; } set { _Socket = value; } }
-
-        private ISocketClient _Socket2;
-        /// <summary>用于测试更换本地套接字的第二套接字</summary>
-        public ISocketClient Socket2 { get { return _Socket2; } set { _Socket2 = value; } }
-
-        private NetType _ProtocolType = NetType.Udp;
-        /// <summary>协议，默认Udp</summary>
-        public NetType ProtocolType { get { return _ProtocolType; } set { _ProtocolType = value; } }
-
-        private Int32 _Port;
-        /// <summary>本地端口</summary>
-        public Int32 Port { get { return _Port; } set { _Port = value; } }
-
-        private Int32 _Timeout = 2000;
-        /// <summary>超时时间，默认2000ms</summary>
-        public Int32 Timeout { get { return _Timeout; } set { _Timeout = value; } }
-        #endregion
-
-        #region 构造
-        /// <summary>实例化</summary>
-        public StunClient() { }
-
-        /// <summary>在指定协议上执行查询</summary>
-        /// <param name="protocol"></param>
-        /// <returns></returns>
-        public StunClient(NetType protocol) : this(protocol, 0) { }
-
-        /// <summary>在指定协议和本地端口上执行查询</summary>
-        /// <param name="protocol"></param>
-        /// <param name="port"></param>
-        /// <returns></returns>
-        public StunClient(NetType protocol, Int32 port)
-        {
-            ProtocolType = protocol;
-            Port = port;
-        }
-
-        /// <summary>在指定套接字上执行查询</summary>
-        /// <param name="socket"></param>
-        /// <returns></returns>
-        public StunClient(ISocket socket)
-        {
-            // UDP可以直接使用，而Tcp需要另外处理
-            Socket = socket as ISocketClient;
-            if (Socket == null)
-            {
-                //var client = NetService.Container.Resolve<ISocketClient>(socket.Local.ProtocolType);
-                //var tcp = new TcpClient();
-                //tcp.Client = socket.Client;
-                Socket = new TcpSession(socket.Client);
-            }
-        }
-
-        // 如果是外部传进来的Socket，也销毁，就麻烦大了
-        ///// <summary>子类重载实现资源释放逻辑时必须首先调用基类方法</summary>
-        ///// <param name="disposing">从Dispose调用（释放所有资源）还是析构函数调用（释放非托管资源）</param>
-        //protected override void OnDispose(bool disposing)
-        //{
-        //    base.OnDispose(disposing);
-
-        //    if (_Socket != null)
-        //    {
-        //        _Socket.Dispose();
-        //        _Socket = null;
-        //    }
-        //    if (_Socket2 != null)
-        //    {
-        //        _Socket2.Dispose();
-        //        _Socket2 = null;
-        //    }
-        //}
-        #endregion
-
-        #region 方法
-        void EnsureSocket()
-        {
-            if (_Socket == null)
-            {
-                //var client = NetService.Container.Resolve<ISocketClient>(ProtocolType);
-                //client.Port = Port;
-                var client = new NetUri(ProtocolType, "", Port).CreateClient();
-                client.Open();
-                client.Client.SendTimeout = Timeout;
-                client.Client.ReceiveTimeout = Timeout;
-                _Socket = client;
-            }
-        }
-
-        void EnsureSocket2()
-        {
-            if (_Socket2 == null)
-            {
-                var socket = Socket.Client;
-                var ep = socket.LocalEndPoint as IPEndPoint;
-                var sto = socket.SendTimeout;
-                var rto = socket.ReceiveTimeout;
-
-                // 如果原端口没有启用地址重用，则关闭它
-                var value = socket.GetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress);
-                if (!Convert.ToBoolean(value)) socket.Close();
-
-                //var sk = NetService.Container.Resolve<ISocketClient>(socket.ProtocolType);
-                ////sk.Address = ep.Address;
-                ////sk.Port = ep.Port;
-                //sk.Local.EndPoint = ep;
-                var sk = new NetUri((NetType)socket.ProtocolType, ep).CreateClient();
-                sk.Client.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
-                //sk.Bind();
-                sk.Client.SendTimeout = sto;
-                sk.Client.ReceiveTimeout = rto;
-
-                _Socket2 = sk;
-            }
-        }
-        #endregion
-
-        #region 查询
-        /// <summary>按服务器列表执行查询</summary>
-        /// <returns></returns>
-        public StunResult Query()
-        {
-            foreach (var result in QueryByServers())
-            {
-                if (result != null && result.Type != StunNetType.Blocked) return result;
-            }
-            return null;
-        }
-
-        IEnumerable<StunResult> QueryByServers()
-        {
-            // 如果是被屏蔽，很有可能是因为服务器没有响应，可以通过轮换服务器来测试
-            StunResult result = null;
-            foreach (var item in Servers)
-            {
-                WriteLog("使用服务器：{0}", item);
-
-                //Int32 p = item.IndexOf(":");
-                //if (p > 0)
-                //    result = QueryWithServer(item.Substring(0, p), Int32.Parse(item.Substring(p + 1)));
-                //else
-                //    result = QueryWithServer(item, 3478);
-                var ep = NetHelper.ParseEndPoint(item, 3478);
-                try
-                {
-                    result = QueryWithServer(ep.Address, ep.Port);
-                }
-                catch { result = null; }
-
-                yield return result;
-            }
-        }
-
-        ///// <summary>在指定服务器上执行查询</summary>
-        ///// <param name="host"></param>
-        ///// <param name="port"></param>
-        ///// <returns></returns>
-        //public StunResult QueryWithServer(String host, Int32 port = 3478)
-        //{
-        //    try
-        //    {
-        //        return QueryWithServer(NetHelper.ParseAddress(host), port);
-        //    }
-        //    catch { return null; }
-        //}
-
-        /// <summary>在指定服务器上执行查询</summary>
-        /// <param name="address"></param>
-        /// <param name="port"></param>
-        /// <returns></returns>
-        public StunResult QueryWithServer(IPAddress address, Int32 port)
-        {
-            EnsureSocket();
-            var client = Socket as ISocketClient;
-            var remote = new IPEndPoint(address, port);
-
-            // Test I
-            // 测试网络是否畅通
-            var msg = new StunMessage();
-            msg.Type = StunMessageType.BindingRequest;
-            var rs = Query(client, msg, remote);
-
-            // UDP blocked.
-            if (rs == null) return new StunResult(StunNetType.Blocked, null);
-
-            WriteLog("服务器：{0}", rs.ServerName);
-            WriteLog("映射地址：{0}", rs.MappedAddress);
-            WriteLog("源地址：{0}", rs.SourceAddress);
-            WriteLog("新地址：{0}", rs.ChangedAddress);
-            var remote2 = rs.ChangedAddress;
-
-            // Test II
-            // 要求改变IP和端口
-            msg.ChangeIP = true;
-            msg.ChangePort = true;
-            msg.ResetTransactionID();
-
-            // 如果本地地址就是映射地址，表示没有NAT。这里的本地地址应该有问题，永远都会是0.0.0.0
-            //if (client.LocalEndPoint.Equals(test1response.MappedAddress))
-            var pub = rs.MappedAddress;
-            if (pub != null && client.Local.Port == pub.Port && pub.Address.IsLocal())
-            {
-                // 要求STUN服务器从另一个地址和端口向当前映射端口发送消息。如果收到，表明是完全开放网络；如果没收到，可能是防火墙阻止了。
-                rs = Query(client, msg, remote);
-                // Open Internet.
-                if (rs != null) return new StunResult(StunNetType.OpenInternet, pub);
-
-                // Symmetric UDP firewall.
-                return new StunResult(StunNetType.SymmetricUdpFirewall, pub);
-            }
-            else
-            {
-                rs = Query(client, msg, remote);
-                if (rs != null && pub == null) pub = rs.MappedAddress;
-                // Full cone NAT.
-                if (rs != null) return new StunResult(StunNetType.FullCone, pub);
-
-                // Test II
-                msg.ChangeIP = false;
-                msg.ChangePort = false;
-                msg.ResetTransactionID();
-
-                // 如果是Tcp，这里需要准备第二个重用的Socket
-                if (client.Local.IsTcp)
-                {
-                    EnsureSocket2();
-                    client = Socket2 as ISocketClient;
-                }
-
-                rs = Query(client, msg, remote2);
-                // 如果第二服务器没响应，重试
-                if (rs == null) rs = Query(client, msg, remote2);
-                if (rs != null && pub == null) pub = rs.MappedAddress;
-                if (rs == null) return new StunResult(StunNetType.Blocked, pub);
-
-                // 两次映射地址不一样，对称网络
-                if (!rs.MappedAddress.Equals(pub)) return new StunResult(StunNetType.Symmetric, pub);
-
-                // Test III
-                msg.ChangeIP = false;
-                msg.ChangePort = true;
-                msg.ResetTransactionID();
-
-                rs = Query(client, msg, remote2);
-                if (rs != null && pub == null) pub = rs.MappedAddress;
-                // 受限
-                if (rs != null) return new StunResult(StunNetType.AddressRestrictedCone, pub);
-
-                // 端口受限
-                return new StunResult(StunNetType.PortRestrictedCone, pub);
-            }
-        }
-        #endregion
-
-        #region 获取公网地址
-        /// <summary>获取公网地址</summary>
-        /// <returns></returns>
-        public IPEndPoint GetPublic()
-        {
-            EnsureSocket();
-            //var socket = Socket.Socket;
-            var msg = new StunMessage();
-            msg.Type = StunMessageType.BindingRequest;
-            IPEndPoint ep = null;
-            foreach (var item in Servers)
-            {
-                try
-                {
-                    ep = NetHelper.ParseEndPoint(item, 3478);
-                }
-                catch { continue; }
-                //Int32 p = item.IndexOf(":");
-                //if (p > 0)
-                //    ep = new IPEndPoint(NetHelper.ParseAddress(item.Substring(0, p)), Int32.Parse(item.Substring(p + 1)));
-                //else
-                //    ep = new IPEndPoint(NetHelper.ParseAddress(item), 3478);
-                var rs = Query(Socket, msg, ep);
-                if (rs != null && rs.MappedAddress != null) return rs.MappedAddress;
-            }
-            return null;
-        }
-        #endregion
-
-        #region 业务
-        /// <summary>查询</summary>
-        /// <param name="request"></param>
-        /// <param name="remoteEndPoint"></param>
-        /// <returns></returns>
-        public StunMessage Query(StunMessage request, IPEndPoint remoteEndPoint)
-        {
-            EnsureSocket();
-            return Query(Socket, request, remoteEndPoint);
-        }
-
-        StunMessage Query(ISocketClient client, StunMessage request, IPEndPoint remoteEndPoint)
-        {
-            Packet pk = null;
-            try
-            {
-                if (client.Local.IsTcp)
-                {
-                    // Tcp协议不支持更换IP或者端口
-                    if (request.ChangeIP || request.ChangePort) return null;
-
-                    //if (!client.Connected) client.Connect(remoteEndPoint);
-                    //client.Send(request.ToArray());
-                }
-                //else
-                //    client.SendTo(request.ToArray(), remoteEndPoint);
-
-                WriteLog("查询 {0} =>{1}", request, remoteEndPoint);
-
-                client.Remote.EndPoint = remoteEndPoint;
-                client.Send(request.ToArray());
-
-                pk = client.Receive();
-                if (pk == null || pk.Count == 0) return null;
-            }
-            catch { return null; }
-
-            var rs = StunMessage.Read(pk.GetStream());
-            //if (rs != null && rs.Type != StunMessageType.BindingResponse) return null;
-            if (rs == null) return null;
-
-            // 不是同一个会话不要
-            if (rs.TransactionID.CompareTo(request.TransactionID) != 0) return null;
-            // 不是期望的响应不要
-            if (rs.Type != (StunMessageType)((UInt16)request.Type | 0x0100)) return null;
-            return rs;
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Stun/StunMessage.cs b/NewLife.Net/Stun/StunMessage.cs
deleted file mode 100644
index e35a6db7cd..0000000000
--- a/NewLife.Net/Stun/StunMessage.cs
+++ /dev/null
@@ -1,363 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net;
-using System.Text;
-using NewLife.Reflection;
-using NewLife.Serialization;
-using System.Linq;
-using NewLife.Security;
-
-namespace NewLife.Net.Stun
-{
-    /// <summary>Stun消息</summary>
-    /// <remarks>未测试，可能没有考虑字节序</remarks>
-    public class StunMessage //: IAccessor
-    {
-        #region 属性
-        /* RFC 5389 6.             
-                All STUN messages MUST start with a 20-byte header followed by zero
-                or more Attributes.  The STUN header contains a STUN message type,
-                magic cookie, transaction ID, and message length.
-
-                 0                   1                   2                   3
-                 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-                 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-                 |0 0|     STUN Message Type     |         Message Length        |
-                 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-                 |                         Magic Cookie                          |
-                 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-                 |                                                               |
-                 |                     Transaction ID (96 bits)                  |
-                 |                                                               |
-                 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-              
-               The message length is the count, in bytes, of the size of the
-               message, not including the 20 byte header.
-            */
-
-        private StunMessageType _Type;
-        /// <summary>消息类型</summary>
-        public StunMessageType Type { get { return _Type; } set { _Type = value; } }
-
-        private UInt16 _Length;
-        /// <summary>消息长度</summary>
-        public UInt16 Length { get { return _Length; } set { _Length = value; } }
-
-        //private Int32 _MagicCookie = 0x2112A442;
-        ///// <summary>幻数。0x2112A442</summary>
-        //public Int32 MagicCookie { get { return _MagicCookie; } set { _MagicCookie = value; } }
-
-        [FieldSize(16)]
-        private Byte[] _TransactionID;
-        /// <summary>会话编号</summary>
-        public Byte[] TransactionID { get { return _TransactionID; } set { _TransactionID = value; } }
-        #endregion
-
-        #region 特性集合
-        //[FieldSize("_Length")]
-        //private Byte[] _Data;
-        ///// <summary>数据</summary>
-        //private Byte[] Data { get { return _Data; } set { _Data = value; } }
-
-        [NonSerialized]
-        private Dictionary<AttributeType, StunAttribute> _Atts;
-        /// <summary>属性集合</summary>
-        private Dictionary<AttributeType, StunAttribute> Atts { get { return _Atts ?? (_Atts = new Dictionary<AttributeType, StunAttribute>()); } }
-
-        StunAttribute GetAtt(AttributeType type, Boolean create = false)
-        {
-            if (Atts.TryGetValue(type, out var att)) return att;
-
-            if (!create) return null;
-
-            lock (Atts)
-            {
-                att = new StunAttribute();
-                att.Type = type;
-                Atts.Add(type, att);
-                return att;
-            }
-        }
-
-        T GetAtt<T>(AttributeType type, Int32 position = 0)
-        {
-            var att = GetAtt(type, false);
-            if (att == null) return default(T);
-
-            Object v = null;
-            switch (type)
-            {
-                case AttributeType.ChangeRequest:
-                    var d = att.Int;
-                    if (position == 0)
-                        v = (d & 4) != 0;
-                    else
-                        v = (d & 2) != 0;
-                    return (T)v;
-                case AttributeType.ErrorCode:
-                    var data = att.Data;
-                    var t = typeof(T);
-                    if (t == typeof(Int32))
-                        v = (data[2] & 0x7) * 100 + (data[3] & 0xFF);
-                    else if (t == typeof(String))
-                        v = Encoding.UTF8.GetString(data, 4, data.Length - 4);
-                    return (T)v;
-                default:
-                    return att.GetValue<T>();
-            }
-        }
-
-        void SetAtt<T>(AttributeType type, T value, Int32 position = 0)
-        {
-            var att = GetAtt(type, true);
-
-            switch (type)
-            {
-                case AttributeType.ChangeRequest:
-                    var d = att.Int;
-                    var b = (Boolean)(Object)value;
-                    if (position == 0)
-                    {
-                        if (b)
-                            d |= 4;
-                        else if ((d & 4) != 0)
-                            d ^= 4;
-                    }
-                    else
-                    {
-                        if (b)
-                            d |= 2;
-                        else if ((d & 2) != 0)
-                            d ^= 2;
-                    }
-                    att.Int = d;
-                    break;
-                case AttributeType.ErrorCode:
-                    var data = att.Data;
-                    var t = typeof(T);
-                    if (t == typeof(Int32))
-                    {
-                        if (data == null)
-                        {
-                            data = new Byte[6];
-                            att.Data = data;
-                            data[3] = 4;
-                        }
-                        data[4] = (Byte)Math.Floor((Double)((Int32)(Object)value / 100));
-                        data[5] = (Byte)((Int32)(Object)value & 0xFF);
-                    }
-                    else if (t == typeof(String))
-                    {
-                        var sd = Encoding.UTF8.GetBytes((String)(Object)value);
-                        if (data == null)
-                        {
-                            data = new Byte[6 + sd.Length];
-                            att.Data = data;
-                            data[3] = (Byte)(4 + sd.Length);
-                        }
-                        sd.CopyTo(data, 6);
-                    }
-                    break;
-                default:
-                    att.SetValue<T>(value);
-                    break;
-            }
-        }
-        #endregion
-
-        #region 扩展属性
-        /// <summary>映射地址</summary>
-        public IPEndPoint MappedAddress { get { return GetAtt<IPEndPoint>(AttributeType.MappedAddress); } set { SetAtt<IPEndPoint>(AttributeType.MappedAddress, value); } }
-
-        /// <summary>响应地址</summary>
-        public IPEndPoint ResponseAddress { get { return GetAtt<IPEndPoint>(AttributeType.ResponseAddress); } set { SetAtt<IPEndPoint>(AttributeType.ResponseAddress, value); } }
-
-        /// <summary>请求改变</summary>
-        public Boolean ChangeIP { get { return GetAtt<Boolean>(AttributeType.ChangeRequest, 0); } set { SetAtt<Boolean>(AttributeType.ChangeRequest, value, 0); } }
-
-        /// <summary>请求改变</summary>
-        public Boolean ChangePort { get { return GetAtt<Boolean>(AttributeType.ChangeRequest, 1); } set { SetAtt<Boolean>(AttributeType.ChangeRequest, value, 1); } }
-
-        /// <summary>源地址</summary>
-        public IPEndPoint SourceAddress { get { return GetAtt<IPEndPoint>(AttributeType.SourceAddress); } set { SetAtt<IPEndPoint>(AttributeType.SourceAddress, value); } }
-
-        /// <summary>改变后的地址</summary>
-        public IPEndPoint ChangedAddress { get { return GetAtt<IPEndPoint>(AttributeType.ChangedAddress); } set { SetAtt<IPEndPoint>(AttributeType.ChangedAddress, value); } }
-
-        /// <summary>用户名</summary>
-        public String UserName { get { return GetAtt<String>(AttributeType.Username); } set { SetAtt<String>(AttributeType.Username, value); } }
-
-        /// <summary>密码</summary>
-        public String Password { get { return GetAtt<String>(AttributeType.Password); } set { SetAtt<String>(AttributeType.Password, value); } }
-
-        /// <summary>错误</summary>
-        public Int32 ErrCode { get { return GetAtt<Int32>(AttributeType.ErrorCode); } set { SetAtt<Int32>(AttributeType.ErrorCode, value); } }
-
-        /// <summary>错误</summary>
-        public String ErrReason { get { return GetAtt<String>(AttributeType.ErrorCode); } set { SetAtt<String>(AttributeType.ErrorCode, value); } }
-
-        /// <summary>服务端从客户端拿到的地址</summary>
-        public IPEndPoint ReflectedFrom { get { return GetAtt<IPEndPoint>(AttributeType.ReflectedFrom); } set { SetAtt<IPEndPoint>(AttributeType.ReflectedFrom, value); } }
-
-        /// <summary>服务器名称</summary>
-        public String ServerName { get { return GetAtt<String>(AttributeType.ServerName); } set { SetAtt<String>(AttributeType.ServerName, value); } }
-        #endregion
-
-        #region 构造
-        /// <summary>实例化一个Stun消息</summary>
-        public StunMessage()
-        {
-            ResetTransactionID();
-
-            ChangeIP = false;
-            ChangePort = false;
-        }
-        #endregion
-
-        #region 方法
-        /// <summary>重置会话ID</summary>
-        public void ResetTransactionID()
-        {
-            //if (TransactionID == null || TransactionID.Length != 16) TransactionID = new Byte[16];
-            //var rnd = new Random();
-            //rnd.NextBytes(TransactionID);
-            TransactionID = Rand.NextBytes(16);
-            TransactionID[0] = 0;
-        }
-        #endregion
-
-        #region 读写
-        /// <summary>从流中读取消息</summary>
-        /// <param name="stream"></param>
-        /// <returns></returns>
-        public static StunMessage Read(Stream stream)
-        {
-            if (stream == null) throw new ArgumentNullException("stream");
-
-            var reader = new Binary();
-            reader.Stream = stream;
-            reader.EncodeInt = false;
-            reader.IsLittleEndian = false;
-            reader.UseFieldSize = true;
-
-            var msg = reader.Read<StunMessage>();
-
-            // 负载数据
-            var p = stream.Position + msg.Length;
-            if (p > stream.Length) p = stream.Length;
-            while (stream.Position < p)
-            {
-                //var type = reader.Read<AttributeType>();
-                var att = reader.Read<StunAttribute>();
-                msg.Atts[att.Type] = att;
-            }
-
-            return msg;
-        }
-
-        /// <summary>把消息写入流中</summary>
-        /// <param name="stream"></param>
-        public void Write(Stream stream)
-        {
-            if (stream == null) throw new ArgumentNullException("stream");
-
-            var writer = new Binary();
-            writer.EncodeInt = false;
-            writer.IsLittleEndian = false;
-            writer.UseFieldSize = true;
-
-            // 先写特性，为了取得数据长度
-            foreach (var att in Atts)
-            {
-                //writer.Write(att.Key);
-                var str = att.Value.ToString();
-                writer.Write(att.Value);
-            }
-            var ms = writer.Stream;
-            Length = (UInt16)ms.Length;
-
-            writer.Stream = stream;
-            writer.Write(this);
-
-            // 把特性数据写入
-            stream.Write(ms.ToArray());
-        }
-
-        /// <summary>获取消息的数据流</summary>
-        /// <returns></returns>
-        public Stream GetStream()
-        {
-            var ms = new MemoryStream();
-            Write(ms);
-            ms.Position = 0;
-            return ms;
-        }
-
-        /// <summary>获取消息的字节码</summary>
-        /// <returns></returns>
-        public Byte[] ToArray()
-        {
-            var ms = new MemoryStream();
-            Write(ms);
-            return ms.ToArray();
-        }
-
-        /// <summary>已重载。</summary>
-        /// <returns></returns>
-        public override String ToString()
-        {
-            var tname = Type.ToString().TrimStart("Binding");
-            if (Atts.Count == 0) return tname;
-
-            if (Atts.Count == 1) return "{0} {1}".F(tname, Atts.FirstOrDefault().Value);
-
-            return "{0}[{1}] {2}".F(tname, Atts.Count, Atts.FirstOrDefault().Value);
-        }
-        #endregion
-
-        #region IAccessor 成员
-        //bool IAccessor.Read(IReader reader) { return false; }
-
-        //bool IAccessor.ReadComplete(IReader reader, bool success)
-        //{
-        //    // 分析属性
-        //    if (Data != null && Data.Length > 0)
-        //    {
-        //        reader.Stream = new MemoryStream(Data);
-        //        //_Atts = reader.ReadObject<Dictionary<AttributeType, StunAttribute>>();
-        //        while (reader.Stream.Position < reader.Stream.Length)
-        //        {
-        //            var type = reader.ReadObject<AttributeType>();
-        //            var att = reader.ReadObject<StunAttribute>();
-        //            Atts[type] = att;
-        //        }
-        //    }
-
-        //    return success;
-        //}
-
-        //bool IAccessor.Write(IWriter writer)
-        //{
-        //    // 处理属性
-        //    if (Atts != null && Atts.Count > 0)
-        //    {
-        //        var wr = writer.GetType().CreateInstance() as IWriter;
-        //        wr.Settings = writer.Settings;
-        //        //wr.WriteObject(Atts);
-        //        foreach (var item in Atts)
-        //        {
-        //            wr.WriteObject(item.Key);
-        //            wr.WriteObject(item.Value);
-        //        }
-        //        wr.Stream.Position = 0;
-        //        Data = wr.Stream.ReadBytes();
-        //    }
-
-        //    return false;
-        //}
-
-        //bool IAccessor.WriteComplete(IWriter writer, bool success) { return success; }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Stun/StunMessageType.cs b/NewLife.Net/Stun/StunMessageType.cs
deleted file mode 100644
index 746ca460b8..0000000000
--- a/NewLife.Net/Stun/StunMessageType.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-﻿
-namespace NewLife.Net.Stun
-{
-    /// <summary>STUN消息类型</summary>
-    public enum StunMessageType : System.UInt16
-    {
-        /// <summary>绑定请求</summary>
-        BindingRequest = 0x0001,
-
-        /// <summary>绑定响应</summary>
-        BindingResponse = 0x0101,
-
-        /// <summary>错误响应</summary>
-        BindingErrorResponse = 0x0111,
-
-        /// <summary>安全请求</summary>
-        SharedSecretRequest = 0x0002,
-
-        /// <summary>安全响应</summary>
-        SharedSecretResponse = 0x0102,
-
-        /// <summary>安全错误响应</summary>
-        SharedSecretErrorResponse = 0x0112,
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Stun/StunNetType.cs b/NewLife.Net/Stun/StunNetType.cs
deleted file mode 100644
index a352fc0c80..0000000000
--- a/NewLife.Net/Stun/StunNetType.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-﻿
-using System.ComponentModel;
-namespace NewLife.Net.Stun
-{
-    /// <summary>UDP网络类型</summary>
-    /// <remarks>
-    /// <a target="_blank" href="http://zh.wikipedia.org/wiki/%E7%BD%91%E7%BB%9C%E5%9C%B0%E5%9D%80%E8%BD%AC%E6%8D%A2">网络地址转换【维基百科】</a>
-    /// </remarks>
-    public enum StunNetType
-    {
-        /// <summary>被禁止，或无法连接STUN服务器</summary>
-        [Description("被禁止，或无法连接STUN服务器")]
-        Blocked,
-
-        /// <summary>公网地址，没有NAT和防火墙</summary>
-        [Description("公网地址，没有NAT和防火墙")]
-        OpenInternet,
-
-        /// <summary>公网地址，没有NAT，对称UDP防火墙</summary>
-        [Description("公网地址，没有NAT，对称UDP防火墙")]
-        SymmetricUdpFirewall,
-
-        /// <summary>
-        /// 一对一完全圆锥NAT。IP和端口均可变。
-        /// 一旦一个内部地址(iAddr:port1)映射到外部地址(eAddr:port2),所有发自iAddr:port1的包都经由eAddr:port2向外发送.
-        /// 任意外部主机都能通过给eAddr:port2发包到达iAddr:port1
-        /// </summary>
-        [Description("一对一完全圆锥NAT。IP和端口均可变，可以完美穿透")]
-        FullCone,
-
-        /// <summary>
-        /// 地址受限圆锥NAT。IP必须固定，端口可变。
-        /// 一旦一个内部地址(iAddr:port1)映射到外部地址(eAddr:port2),所有发自iAddr:port1的包都经由eAddr:port2向外发送.
-        /// 任意外部主机(hostAddr:any)都能通过给eAddr:port2发包到达iAddr:port1的前提是：iAddr:port1之前发送过包到hostAddr:any. 
-        /// "any"也就是说端口不受限制
-        /// </summary>
-        [Description("地址受限圆锥NAT。对方IP必须固定，端口可变，仅目标IP可以穿透")]
-        AddressRestrictedCone,
-
-        /// <summary>
-        /// 端口受限圆锥NAT。对方IP和端口都必须固定
-        /// 一旦一个内部地址(iAddr:port1)映射到外部地址(eAddr:port2),所有发自iAddr:port1的包都经由eAddr:port2向外发送.
-        /// 一个外部主机(hostAddr:port3)能够发包到达iAddr:port1的前提是：iAddr:port1之前发送过包到hostAddr:port3.
-        /// </summary>
-        [Description("端口受限圆锥NAT。对方IP和端口都必须固定，不能穿透")]
-        PortRestrictedCone,
-
-        /// <summary>
-        /// 对称NAT。同一内部地址端口，连接不同外网时，映射的公网地址和端口均不同。
-        /// 每一个来自相同内部IP与port的请求到一个特定目的地的IP地址和端口，映射到一个独特的外部来源的IP地址和端口。
-        /// 同一个内部主机发出一个信息包到不同的目的端，不同的映射使用
-        /// 只有曾经收到过内部主机封包的外部主机，才能够把封包发回来
-        /// </summary>
-        [Description("对称NAT。不能穿透")]
-        Symmetric
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Stun/StunResult.cs b/NewLife.Net/Stun/StunResult.cs
deleted file mode 100644
index 0af98b4f3c..0000000000
--- a/NewLife.Net/Stun/StunResult.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-﻿using System.Net;
-
-namespace NewLife.Net.Stun
-{
-    /// <summary>Stun结果</summary>
-    public class StunResult
-    {
-        private StunNetType _Type;
-        /// <summary>类型</summary>
-        public StunNetType Type { get { return _Type; } set { _Type = value; } }
-
-        private IPEndPoint _Public;
-        /// <summary>公共地址</summary>
-        public IPEndPoint Public { get { return _Public; } set { _Public = value; } }
-
-        /// <summary>实例化Stun结果</summary>
-        /// <param name="type">类型</param>
-        /// <param name="ep"></param>
-        public StunResult(StunNetType type, IPEndPoint ep) { Type = type; Public = ep; }
-
-        /// <summary>已重载。</summary>
-        /// <returns></returns>
-        public override System.String ToString()
-        {
-            return System.String.Format("{0} {1}", Type, Public);
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Stun/StunServer.cs b/NewLife.Net/Stun/StunServer.cs
deleted file mode 100644
index 33e0772b3f..0000000000
--- a/NewLife.Net/Stun/StunServer.cs
+++ /dev/null
@@ -1,242 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net;
-using System.Net.Sockets;
-using System.Reflection;
-using NewLife.Net.Sockets;
-using NewLife.Reflection;
-
-namespace NewLife.Net.Stun
-{
-    /// <summary>Stun服务端。Simple Traversal of UDP over NATs，NAT 的UDP简单穿越。RFC 3489</summary>
-    /// <remarks>
-    /// <a target="_blank" href="http://baike.baidu.com/view/884586.htm">STUN</a>
-    /// </remarks>
-    public class StunServer : NetServer
-    {
-        #region 属性
-        private IDictionary<Int32, IPEndPoint> _Public;
-        /// <summary>我的公网地址。因为当前服务器可能在内网中，需要调用StunClient拿公网地址</summary>
-        public IDictionary<Int32, IPEndPoint> Public { get { return _Public; } private set { _Public = value; } }
-
-        private IPEndPoint _Partner;
-        /// <summary>伙伴地址。需要改变地址时，向该伙伴地址发送信息</summary>
-        public IPEndPoint Partner { get { return _Partner; } set { _Partner = value; } }
-
-        private Int32 _Port2;
-        /// <summary>第二端口</summary>
-        public Int32 Port2 { get { return _Port2; } set { _Port2 = value; } }
-        #endregion
-
-        #region 构造
-        /// <summary>实例化</summary>
-        public StunServer()
-        {
-            Name = GetType().Name.TrimEnd("Server");
-
-            Port = 3478;
-            Port2 = Port + 1;
-
-            //// 同时两个端口
-            //AddServer(IPAddress.Any, 3478, ProtocolType.Udp, AddressFamily.InterNetwork);
-            //AddServer(IPAddress.Any, 3479, ProtocolType.Udp, AddressFamily.InterNetwork);
-        }
-
-        /// <summary>确保建立服务器</summary>
-        public override void EnsureCreateServer()
-        {
-            if (Servers.Count <= 0)
-            {
-                // 同时两个端口
-                AddServer(IPAddress.Any, Port, NetType.Unknown, AddressFamily.InterNetwork);
-                AddServer(IPAddress.Any, Port2, NetType.Unknown, AddressFamily.InterNetwork);
-
-                var dic = new Dictionary<Int32, IPEndPoint>();
-                IPEndPoint ep = null;
-                var pub = NetHelper.MyIP();
-                StunResult rs = null;
-                WriteLog("获取公网地址……");
-
-                foreach (var item in Servers)
-                {
-                    if (item.Local.IsTcp) continue;
-
-                    // 查询公网地址和网络类型，如果是受限网络，或者对称网络，则采用本地端口，因此此时只能依赖端口映射，将来这里可以考虑操作UPnP
-                    if (rs == null)
-                    {
-                        item.Start();
-                        rs = new StunClient(item).Query();
-                        if (rs != null)
-                        {
-                            if (rs != null && rs.Type == StunNetType.Blocked && rs.Public != null) rs.Type = StunNetType.Symmetric;
-                            WriteLog("网络类型：{0} {1}", rs.Type, rs.Type.GetDescription());
-                            ep = rs.Public;
-                            if (ep != null) pub = ep.Address;
-                        }
-                    }
-                    else
-                        ep = new StunClient(item).GetPublic();
-                    if (rs != null && rs.Type > StunNetType.AddressRestrictedCone) ep = new IPEndPoint(pub, item.Port);
-                    WriteLog("{0}的公网地址：{1}", item.Local, ep);
-                    dic.Add(item.Port, ep);
-                }
-                // Tcp没办法获取公网地址，只能通过Udp获取到的公网地址加上端口形成，所以如果要使用Tcp，服务器必须拥有独立公网地址
-                foreach (var item in Servers)
-                {
-                    if (item.Local.IsTcp)
-                    {
-                        ep = new IPEndPoint(pub, item.Port);
-                        WriteLog("{0}的公网地址：{1}", item.Local, ep);
-                        dic.Add(item.Port + 100000, ep);
-                    }
-                }
-                //var ep = StunClient.GetPublic(Port, 2000);
-                //WriteLog("端口{0}的公网地址：{1}", Port, ep);
-                //dic.Add(Port, ep);
-                //ep = StunClient.GetPublic(Port2, 2000);
-                //WriteLog("端口{0}的公网地址：{1}", Port2, ep);
-                //dic.Add(Port2, ep);
-                WriteLog("成功获取公网地址！");
-                Public = dic;
-            }
-        }
-        #endregion
-
-        #region 方法
-        /// <summary>接收到数据时</summary>
-        /// <param name="session"></param>
-        /// <param name="stream"></param>
-        protected override void OnReceive(INetSession session, Stream stream)
-        {
-            if (stream.Length > 0)
-            {
-                var remote = session.Remote;
-                //if (remote == null && session != null) remote = session.RemoteEndPoint;
-
-                var request = StunMessage.Read(stream);
-                WriteLog("{0} {1} {2}{3}", request.Type, remote, request.ChangeIP ? " ChangeIP" : "", request.ChangePort ? " ChangePort" : "");
-
-                // 如果是兄弟服务器发过来的，修正响应地址
-                switch (request.Type)
-                {
-                    case StunMessageType.BindingRequest:
-                        //case StunMessageType.BindingResponse:
-                        request.Type = StunMessageType.BindingRequest;
-                        if (request.ResponseAddress != null) remote.EndPoint = request.ResponseAddress;
-                        break;
-                    case StunMessageType.SharedSecretRequest:
-                        //case StunMessageType.SharedSecretResponse:
-                        request.Type = StunMessageType.SharedSecretRequest;
-                        if (request.ResponseAddress != null) remote.EndPoint = request.ResponseAddress;
-                        break;
-                    default:
-                        break;
-                }
-
-                // 是否需要发给伙伴
-                if (request.ChangeIP)
-                {
-                    //if (Partner != null && !Partner.Equals(session.Host.LocalEndPoint.GetRelativeEndPoint(Partner.Address)))
-                    //{
-                    //    // 发给伙伴
-                    //    request.ChangeIP = false;
-                    //    // 记住对方的地址
-                    //    request.ResponseAddress = remote.EndPoint;
-                    //    //session.Send(request.GetStream(), Partner);
-                    //    var us = session.Host as UdpServer;
-                    //    if (us != null)
-                    //    {
-                    //        //us.CreateSession(Partner).Send(request.GetStream());
-                    //        us.Send(request.GetStream(), Partner);
-                    //    }
-                    //    return;
-                    //}
-                    // 如果没有伙伴地址，采用不同端口代替
-                    request.ChangePort = true;
-                }
-
-                // 开始分流处理
-                switch (request.Type)
-                {
-                    case StunMessageType.BindingRequest:
-                        //case StunMessageType.BindingResponse:
-                        OnBind(request, session.Session);
-                        break;
-                    case StunMessageType.SharedSecretRequest:
-                        break;
-                    default:
-                        break;
-                }
-            }
-        }
-        #endregion
-
-        #region 绑定
-        /// <summary>绑定</summary>
-        /// <param name="request"></param>
-        /// <param name="session"></param>
-        /// <returns></returns>
-        protected void OnBind(StunMessage request, ISocketSession session)
-        {
-            var rs = new StunMessage();
-            rs.Type = StunMessageType.BindingResponse;
-            rs.TransactionID = request.TransactionID.ReadBytes();
-            rs.MappedAddress = session.Remote.EndPoint;
-            //rs.SourceAddress = session.GetRelativeEndPoint(remote.Address);
-            if (Public != null)
-            {
-                if (session.Local.IsTcp)
-                    rs.SourceAddress = Public[session.Port + 100000];
-                else
-                    rs.SourceAddress = Public[session.Port];
-            }
-
-            // 找另一个
-            ISocketSession session2 = null;
-            var anotherPort = 0;
-            for (var i = 0; i < Servers.Count; i++)
-            {
-                var server = Servers[i];
-                if (server.Local.Type == session.Local.Type && server.Local.Port != session.Local.Port)
-                {
-                    anotherPort = server.Port;
-                    if (server.Local.IsTcp)
-                    {
-                        break;
-                    }
-                    else
-                    {
-                        session2 = (server as UdpServer).CreateSession(session.Remote.EndPoint);
-                        if (session2 != null) break;
-                    }
-                }
-            }
-            //rs.ChangedAddress = Partner ?? session2.GetRelativeEndPoint(remote.Address);
-            if (Public != null)
-            {
-                if (session.Local.IsTcp)
-                    rs.ChangedAddress = Partner ?? Public[anotherPort + 100000];
-                else
-                    rs.ChangedAddress = Partner ?? Public[anotherPort];
-            }
-
-            var name = Name;
-            if (name == GetType().Name) name = GetType().FullName;
-            rs.ServerName = String.Format("{0} v{1}", name, AssemblyX.Create(Assembly.GetExecutingAssembly()).CompileVersion);
-
-            // 换成另一个
-            if (request.ChangePort) session = session2;
-
-            session.Send(rs.ToArray());
-        }
-        #endregion
-
-        #region 辅助
-        static Boolean IsResponse(StunMessageType type)
-        {
-            return ((UInt16)type & 0x0100) != 0;
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/TDP/TDP.pdf b/NewLife.Net/TDP/TDP.pdf
deleted file mode 100644
index 204c7ff965..0000000000
Binary files a/NewLife.Net/TDP/TDP.pdf and /dev/null differ
diff --git a/NewLife.Net/TDP/TDPClient.cs b/NewLife.Net/TDP/TDPClient.cs
deleted file mode 100644
index ac0bff06cf..0000000000
--- a/NewLife.Net/TDP/TDPClient.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-﻿
-namespace NewLife.Net.TDP
-{
-    class TDPClient
-    {
-        #region 属性
-        private UdpServer _Udp;
-        /// <summary>UDP客户端</summary>
-        public UdpServer Udp { get { return _Udp; } set { _Udp = value; } }
-        #endregion
-
-        #region 连接
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/TDP/TDPFlags.cs b/NewLife.Net/TDP/TDPFlags.cs
deleted file mode 100644
index d8508581d6..0000000000
--- a/NewLife.Net/TDP/TDPFlags.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-﻿using System;
-
-namespace NewLife.Net.TDP
-{
-    /// <summary>TDP标记</summary>
-    [Flags]
-    public enum TDPFlags : Byte
-    {
-        /// <summary>发端完成发送任务。</summary>
-        FIN = 1,
-
-        /// <summary>同步序号用来发起一个连接。</summary>
-        SYN = 2,
-
-        /// <summary>重建连接。</summary>
-        RST = 4,
-
-        /// <summary>接收方应该尽快将这个报文段交给应用层。</summary>
-        PSH = 8,
-
-        /// <summary>确认序号有效。</summary>
-        ACK = 16,
-
-        /// <summary>连接保活标志，用于表示TDP 连接通路存活状态。</summary>
-        LIV = 32
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/TDP/TDPPacket.cs b/NewLife.Net/TDP/TDPPacket.cs
deleted file mode 100644
index 65d1769a27..0000000000
--- a/NewLife.Net/TDP/TDPPacket.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-﻿using System;
-
-namespace NewLife.Net.TDP
-{
-    /// <summary>TDP协议包</summary>
-    /// <remarks>
-    /// TDP，在UDP上实现TCP。
-    /// </remarks>
-    class TDPPacket
-    {
-        #region 属性
-        /// <summary>包括4位首部长度，保留6位，还有6位标志位</summary>
-        private Int32 _Data;
-
-        /// <summary>头部长度</summary>
-        public Byte Length { get { return (Byte)(_Data >> 12); } set { _Data &= (value & 0x0F) << 12; } }
-
-        /// <summary>标记</summary>
-        public TDPFlags Flag { get { return (TDPFlags)(_Data & 0xFF); } set { _Data &= (Byte)value; } }
-
-        private Int16 _WindowSize;
-        /// <summary>16位窗口大小</summary>
-        public Int16 WindowSize { get { return _WindowSize; } set { _WindowSize = value; } }
-
-        private Int32 _SequenceNumber;
-        /// <summary>序列号</summary>
-        public Int32 SequenceNumber { get { return _SequenceNumber; } set { _SequenceNumber = value; } }
-
-        private Int32 _AckNumber;
-        /// <summary>确认序列号</summary>
-        public Int32 AckNumber { get { return _AckNumber; } set { _AckNumber = value; } }
-
-        // 选项：只有一个选项字段，为最长报文大小，即MSS。TDP 选项格式与TCP 选项格式一致，kind=0 时表示选项结束，kind=1 时表示无操作，kind=2 时表示最大报文段长度。
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Tcp/TcpClientX.cs b/NewLife.Net/Tcp/TcpClientX.cs
deleted file mode 100644
index 346be64583..0000000000
--- a/NewLife.Net/Tcp/TcpClientX.cs
+++ /dev/null
@@ -1,194 +0,0 @@
-﻿using System;
-using System.IO;
-using System.Net;
-using System.Net.Sockets;
-using System.Text;
-using NewLife.Net.Sockets;
-
-namespace NewLife.Net.Tcp
-{
-    /// <summary>增强TCP客户端</summary>
-    public class TcpClientX : SocketClient, ISocketSession
-    {
-        #region 属性
-        /// <summary>已重载。</summary>
-        public override ProtocolType ProtocolType { get { return ProtocolType.Tcp; } }
-
-        //private Boolean _DisconnectWhenEmptyData = false;
-        ///// <summary>收到空数据时抛出异常并断开连接。</summary>
-        //public Boolean DisconnectWhenEmptyData { get { return _DisconnectWhenEmptyData; } set { _DisconnectWhenEmptyData = value; } }
-
-        private Int32 _ID;
-        /// <summary>编号</summary>
-        Int32 ISocketSession.ID { get { return _ID; } set { if (_ID > 0)throw new NetException("禁止修改会话编号！"); _ID = value; } }
-
-        /// <summary>宿主对象。</summary>
-        ISocket ISocketSession.Host { get { return this; } }
-
-        private Stream _Stream;
-        /// <summary>会话数据流，供用户程序使用，内部不做处理。可用于解决Tcp粘包的问题，把多余的分片放入该数据流中。</summary>
-        public Stream Stream { get { return _Stream; } set { _Stream = value; } }
-        #endregion
-
-        #region 重载
-        /// <summary>已重载。设置RemoteEndPoint</summary>
-        /// <param name="e"></param>
-        protected override void OnComplete(NetEventArgs e)
-        {
-            SetRemote(e);
-            base.OnComplete(e);
-        }
-
-        internal void SetRemote(NetEventArgs e)
-        {
-            var ep = e.RemoteEndPoint as IPEndPoint;
-            if ((ep == null || ep.Address.IsAny() && ep.Port == 0) && RemoteEndPoint != null) e.RemoteEndPoint = RemoteEndPoint;
-        }
-
-        /// <summary>处理接收到的数据</summary>
-        /// <param name="e"></param>
-        protected internal override void ProcessReceive(NetEventArgs e)
-        {
-            if (e.Session == null) e.Session = CreateSession();
-
-            base.ProcessReceive(e);
-        }
-        #endregion
-
-        #region 方法
-        private Boolean _hasStarted = false;
-        /// <summary>开始异步接收，同时处理传入的事件参数，里面可能有接收到的数据</summary>
-        /// <param name="e"></param>
-        internal void Start(NetEventArgs e)
-        {
-            if (_hasStarted) return;
-            _hasStarted = true;
-
-            if (e.BytesTransferred > 0) ProcessReceive(e);
-
-            ReceiveAsync();
-        }
-        #endregion
-
-        #region 发送
-        /// <summary>发送数据流</summary>
-        /// <param name="stream"></param>
-        /// <returns></returns>
-        /// <returns>返回自身，用于链式写法</returns>
-        public virtual ISocketSession Send(Stream stream)
-        {
-            //Int64 total = 0;
-
-            //var size = stream.CanSeek ? stream.Length - stream.Position : BufferSize;
-            var size = 1460;
-            var buffer = new Byte[size];
-            while (true)
-            {
-                var n = stream.Read(buffer, 0, buffer.Length);
-                if (n <= 0) break;
-
-                Send(buffer, 0, n);
-                //total += n;
-
-                if (n < buffer.Length) break;
-            }
-            //return total;
-            return this;
-        }
-
-        /// <summary>发送数据</summary>
-        /// <param name="buffer">缓冲区</param>
-        /// <param name="offset">位移</param>
-        /// <param name="size">写入字节数</param>
-        /// <returns>返回自身，用于链式写法</returns>
-        public virtual ISocketSession Send(Byte[] buffer, Int32 offset = 0, Int32 size = 0)
-        {
-            var socket = Client;
-            if (socket == null || Disposed) throw new ObjectDisposedException("Client");
-
-            if (!socket.IsBound) Bind();
-
-            if (size <= 0) size = buffer.Length - offset;
-            socket.Send(buffer, offset, size, SocketFlags.None);
-
-            return this;
-        }
-
-        /// <summary>发送字符串</summary>
-        /// <param name="msg"></param>
-        /// <param name="encoding"></param>
-        /// <returns>返回自身，用于链式写法</returns>
-        public ISocketSession Send(String msg, Encoding encoding = null)
-        {
-            if (String.IsNullOrEmpty(msg)) return this;
-
-            if (encoding == null) encoding = Encoding.UTF8;
-            Send(encoding.GetBytes(msg), 0, 0);
-
-            return this;
-        }
-        #endregion
-
-        #region 接收
-        private Boolean _UseReceiveAsync;
-        /// <summary>是否异步接收数据</summary>
-        public Boolean UseReceiveAsync { get { return _UseReceiveAsync; } }
-
-        /// <summary>开始异步接收数据</summary>
-        public override void ReceiveAsync()
-        {
-            _UseReceiveAsync = true;
-
-            StartAsync(e =>
-            {
-                var client = Client;
-                if (client == null || Disposed) { e.Cancel = true; return false; }
-
-                return client.ReceiveAsync(e);
-            });
-        }
-
-        void TcpClientX_Received(object sender, NetEventArgs e)
-        {
-            if (_Received != null) _Received(this, new ReceivedEventArgs(e.GetStream()));
-        }
-
-        Boolean hasSet = false;
-        void SetEvent()
-        {
-            if (hasSet) return;
-            hasSet = true;
-
-            Received += new EventHandler<NetEventArgs>(TcpClientX_Received);
-        }
-
-        /// <summary>接收数据。已重载。接收到0字节表示连接断开！</summary>
-        /// <param name="e"></param>
-        protected override void OnReceive(NetEventArgs e)
-        {
-            if (_Received != null) SetEvent();
-
-            //if (e.BytesTransferred > 0 || !DisconnectWhenEmptyData)
-            if (e.BytesTransferred > 0)
-                base.OnReceive(e);
-            else
-                OnError(e, null);
-        }
-
-        private event EventHandler<ReceivedEventArgs> _Received;
-        /// <summary>数据到达，在事件处理代码中，事件参数不得另作他用，套接字事件池将会将其回收。</summary>
-        event EventHandler<ReceivedEventArgs> ISocketSession.Received
-        {
-            add { _Received += value; }
-            remove { _Received -= value; }
-        }
-        #endregion
-
-        #region 创建会话
-        /// <summary>为指定地址创建会话。对于无连接Socket，必须指定远程地址；对于有连接Socket，指定的远程地址将不起任何作用</summary>
-        /// <param name="remoteEP"></param>
-        /// <returns></returns>
-        public override ISocketSession CreateSession(IPEndPoint remoteEP = null) { return this; }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Tcp/TcpServer.cs b/NewLife.Net/Tcp/TcpServer.cs
deleted file mode 100644
index f978eca963..0000000000
--- a/NewLife.Net/Tcp/TcpServer.cs
+++ /dev/null
@@ -1,248 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Net.Sockets;
-using NewLife.Net.Common;
-using NewLife.Net.Sockets;
-
-namespace NewLife.Net.Tcp
-{
-    /// <summary>TCP服务器</summary>
-    /// <remarks>
-    /// 核心工作：启动服务<see cref="OnStart"/>时，监听端口，并启用多个（逻辑处理器数的10倍）异步接受操作<see cref="AcceptAsync"/>。
-    /// 服务器只处理<see cref="SocketAsyncOperation.Accept"/>操作，并创建<see cref="ISocketSession"/>后，
-    /// 将其赋值在事件参数的<see cref="NetEventArgs.Session"/>中，传递给<see cref="Accepted"/>。
-    /// 
-    /// 服务器完全处于异步工作状态，任何操作都不可能被阻塞。
-    /// 
-    /// 注意：服务器接受连接请求后，不会开始处理数据，而是由<see cref="Accepted"/>事件订阅者决定何时开始处理数据<see cref="TcpClientX.Start"/>。
-    /// </remarks>
-    public class TcpServer : SocketServer
-    {
-        #region 属性
-        /// <summary>已重载。</summary>
-        public override ProtocolType ProtocolType { get { return ProtocolType.Tcp; } }
-
-        private Int32 _MaxNotActive = 30;
-        /// <summary>最大不活动时间。
-        /// 对于每一个会话连接，如果超过该时间仍然没有收到任何数据，则断开会话连接。
-        /// 单位秒，默认30秒。时间不是太准确，建议15秒的倍数。为0表示不检查。</summary>
-        public Int32 MaxNotActive { get { return _MaxNotActive; } set { _MaxNotActive = value; UseSession = true; } }
-
-        private Boolean _AutoReceiveAsync = true;
-        /// <summary>自动开始会话的异步接收。
-        /// 接受连接请求后，自动开始会话的异步接收，默认打开，如果会话需要同步接收数据，需要关闭该选项。</summary>
-        public Boolean AutoReceiveAsync { get { return _AutoReceiveAsync; } set { _AutoReceiveAsync = value; } }
-
-        /// <summary>异步操作计数</summary>
-        public override int AsyncCount
-        {
-            get
-            {
-                Int32 n = base.AsyncCount;
-                foreach (var item in Sessions.Values.ToArray())
-                {
-                    if (item.Host != null) n += item.Host.AsyncCount;
-                }
-                return n;
-            }
-        }
-
-        private Boolean _UseSession;
-        /// <summary>使用会话</summary>
-        public Boolean UseSession { get { return _UseSession; } set { _UseSession = value; } }
-        #endregion
-
-        #region 构造
-        /// <summary>构造TCP服务器对象</summary>
-        public TcpServer() : base(IPAddress.Any, 0) { }
-
-        /// <summary>构造TCP服务器对象</summary>
-        /// <param name="port"></param>
-        public TcpServer(Int32 port) : base(IPAddress.Any, port) { }
-
-        /// <summary>构造TCP服务器对象</summary>
-        /// <param name="address"></param>
-        /// <param name="port"></param>
-        public TcpServer(IPAddress address, Int32 port) : base(address, port) { }
-
-        /// <summary>构造TCP服务器对象</summary>
-        /// <param name="hostname"></param>
-        /// <param name="port"></param>
-        public TcpServer(String hostname, Int32 port) : base(hostname, port) { }
-        #endregion
-
-        #region 开始停止
-        /// <summary>开始</summary>
-        protected override void OnStart()
-        {
-            // 开始监听
-            base.OnStart();
-
-            // 三次握手之后，Accept之前的总连接个数，队列满之后，新连接将得到主动拒绝ConnectionRefused错误
-            // 在我（大石头）的开发机器上，实际上这里的最大值只能是200，大于200跟200一个样
-            Server.Listen(Int32.MaxValue);
-            //Server.Listen(200);
-
-            AcceptAsync();
-        }
-
-        void AcceptAsync()
-        {
-            StartAsync(e =>
-            {
-                var server = Server;
-                if (server == null || Disposed) { e.Cancel = true; return false; }
-
-                e.AcceptSocket = null;
-                return server.AcceptAsync(e);
-            });
-        }
-
-        /// <summary>确定是否有挂起的连接请求。</summary>
-        /// <returns>如果连接正挂起，则为 true；否则为 false。</returns>
-        public Boolean Pending() { return Server.Poll(0, SelectMode.SelectRead); }
-        #endregion
-
-        #region 事件
-        /// <summary>连接完成。在事件处理代码中，事件参数不得另作他用，套接字事件池将会将其回收。</summary>
-        /// <remarks>这里一定不需要再次ReceiveAsync，因为TcpServer在处理完成Accepted事件后，会调用Start->ReceiveAsync</remarks>
-        public event EventHandler<NetEventArgs> Accepted;
-
-        /// <summary>新客户端到达</summary>
-        /// <param name="e"></param>
-        protected virtual void OnAccept(NetEventArgs e)
-        {
-            // 没有接收事件时，马上开始处理重建委托
-            if (Accepted == null)
-            {
-                AcceptAsync();
-                return;
-            }
-
-            // Session的Start也就可能处理一下参数里面的数据，而不可能使用参数，因为参数的完成事件是挂载在TcpServer上的。
-            Process(e, AcceptAsync, ProcessAccept);
-        }
-
-        private IStatistics _AcceptStatistics;
-        /// <summary>连接数统计信息。</summary>
-        public IStatistics AcceptStatistics { get { return _AcceptStatistics ?? (_AcceptStatistics = NetService.Container.Resolve<IStatistics>()); } }
-
-        void ProcessAccept(NetEventArgs e)
-        {
-            // 统计连接数
-            AcceptStatistics.Increment();
-
-            // 建立会话
-            var session = CreateSession(e);
-            //session.NoDelay = this.NoDelay;
-            //e.Socket = session;
-            e.Socket = session.Host;
-            e.Session = session;
-            session.LocalUri.CopyFrom(LocalUri);
-            if (Accepted != null)
-            {
-                e.Cancel = false;
-                Accepted(this, e);
-                if (e.Cancel || session.Disposed || session.Host.Disposed) return;
-            }
-
-            // 不需要指定Key，内部会计算
-            if (UseSession) Sessions.Add(0, session);
-
-            // 设置接收事件，统计异步接收的数据包，不包括同步接收
-            session.Received += (s, e2) => Statistics.Increment();
-
-            // 设置心跳时间
-            e.AcceptSocket.SetTcpKeepAlive(true);
-
-            // 来自这里的事件参数没有远程地址
-            if (AutoReceiveAsync) (session as TcpClientX).Start(e);
-
-            // todo chenqi
-           // NetEventArgs.Push(e);
-        }
-
-        /// <summary>已重载。</summary>
-        /// <param name="e"></param>
-        protected override void OnComplete(NetEventArgs e)
-        {
-            if (e.LastOperation == SocketAsyncOperation.Accept)
-            {
-                OnAccept(e);
-                return;
-            }
-            base.OnComplete(e);
-        }
-        #endregion
-
-        #region 会话
-        private Object _Sessions_lock = new object();
-        private IDictionary<Int32, ISocketSession> _Sessions;
-        /// <summary>会话集合。用自增的数字ID作为标识，业务应用自己维持ID与业务主键的对应关系。</summary>
-        public IDictionary<Int32, ISocketSession> Sessions
-        {
-            get
-            {
-                if (_Sessions != null) return _Sessions;
-                lock (_Sessions_lock)
-                {
-                    if (_Sessions != null) return _Sessions;
-
-                    return _Sessions = new TcpSessionCollection() { Server = this };
-                }
-            }
-        }
-
-        /// <summary>创建会话</summary>
-        /// <param name="e"></param>
-        /// <returns></returns>
-        protected virtual ISocketSession CreateSession(NetEventArgs e)
-        {
-            var session = new TcpClientX();
-            session.Socket = e.AcceptSocket;
-            //session.RemoteEndPoint = e.AcceptSocket.RemoteEndPoint as IPEndPoint;
-            //if (e.RemoteEndPoint == null) e.RemoteEndPoint = session.RemoteEndPoint;
-            session.SetRemote(e);
-            // 对于服务器中的会话来说，收到空数据表示断开连接
-            // session.DisconnectWhenEmptyData = true;
-
-            return session;
-        }
-        #endregion
-
-        #region 释放资源
-        /// <summary>已重载。释放会话集合等资源</summary>
-        /// <param name="disposing"></param>
-        protected override void OnDispose(bool disposing)
-        {
-            base.OnDispose(disposing);
-
-            // 释放托管资源
-            if (disposing)
-            {
-                var sessions = _Sessions;
-                if (sessions != null)
-                {
-                    _Sessions = null;
-
-                    WriteLog("准备释放Tcp会话{0}个！", sessions.Count);
-                    //if (sessions is IDisposable)
-                    //    (sessions as IDisposable).Dispose();
-                    //else
-                    //{
-                    //    foreach (var item in sessions.Values.ToArray())
-                    //    {
-                    //        item.Dispose();
-                    //    }
-                    //    sessions.Clear();
-                    //}
-                    sessions.TryDispose();
-                    sessions.Clear();
-                }
-            }
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Tcp/TcpSessionCollection.cs b/NewLife.Net/Tcp/TcpSessionCollection.cs
deleted file mode 100644
index 8270753d35..0000000000
--- a/NewLife.Net/Tcp/TcpSessionCollection.cs
+++ /dev/null
@@ -1,169 +0,0 @@
-﻿using System;
-using System.Collections;
-using System.Collections.Generic;
-using NewLife.Net.Sockets;
-using NewLife.Threading;
-
-namespace NewLife.Net.Tcp
-{
-    /// <summary>会话集合。带有自动清理不活动会话的功能</summary>
-    class TcpSessionCollection : DisposeBase, IDictionary<Int32, ISocketSession>
-    {
-        Dictionary<Int32, ISocketSession> _dic = new Dictionary<Int32, ISocketSession>();
-
-        private Int32 sessionID = 0;
-
-        /// <summary>添加新会话，并设置会话编号</summary>
-        /// <param name="session"></param>
-        public void Add(ISocketSession session)
-        {
-            lock (_dic)
-            {
-                session.ID = ++sessionID;
-                session.OnDisposed += (s, e) => { lock (_dic) { _dic.Remove((s as ISocketSession).ID); } };
-                _dic.Add(session.ID, session);
-
-                if (clearTimer == null) clearTimer = new TimerX(RemoveNotAlive, null, ClearPeriod, ClearPeriod);
-            }
-        }
-
-        private TcpServer _Server;
-        /// <summary>服务端</summary>
-        public TcpServer Server { get { return _Server; } set { _Server = value; } }
-
-        private Int32 _ClearPeriod = 15000;
-        /// <summary>清理周期。单位毫秒，默认15000毫秒。</summary>
-        public Int32 ClearPeriod { get { return _ClearPeriod; } set { _ClearPeriod = value; } }
-
-        /// <summary>关闭所有</summary>
-        public void CloseAll()
-        {
-            if (clearTimer != null) clearTimer.Dispose();
-
-            if (_dic.Count < 1) return;
-            lock (_dic)
-            {
-                if (_dic.Count < 1) return;
-
-                // 必须先复制到数组，因为会话销毁的时候，会自动从集合中删除，从而引起集合枚举失败
-                var ns = new ISocketSession[_dic.Count];
-                _dic.Values.CopyTo(ns, 0);
-                _dic.Clear();
-                foreach (var item in ns)
-                {
-                    //if (item == null || item.Disposed || item.Socket == null) continue;
-                    if (item == null || item.Disposed) continue;
-
-                    //item.Close();
-                    item.Dispose();
-                }
-            }
-        }
-
-        /// <summary>清理会话计时器</summary>
-        private TimerX clearTimer;
-
-        /// <summary>移除不活动的会话</summary>
-        void RemoveNotAlive(Object state)
-        {
-            if (_dic.Count < 1) return;
-
-            var keys = new List<Int32>();
-            var values = new List<ISocketSession>();
-            lock (_dic)
-            {
-                if (_dic.Count < 1) return;
-
-                Int32 notactive = Server != null ? Server.MaxNotActive : 0;
-                // 这里可能有问题，曾经见到，_list有元素，但是value为null，这里居然没有进行遍历而直接跳过
-                // 操作这个字典的时候，必须加锁，否则就会数据错乱，成了这个样子，无法枚举
-                foreach (var elm in _dic)
-                {
-                    var item = elm.Value;
-                    //if (item == null || item.Disposed || item.Socket == null) list.Add(elm.Key);
-                    if (item == null || item.Disposed || notactive > 0 && item.Host.Statistics.Last.AddSeconds(notactive) < DateTime.Now)
-                    {
-                        keys.Add(elm.Key);
-                        values.Add(elm.Value);
-                    }
-                }
-                foreach (var item in keys)
-                {
-                    _dic.Remove(item);
-                }
-            }
-            foreach (var item in values)
-            {
-                item.Dispose();
-            }
-        }
-
-        protected override void OnDispose(bool disposing)
-        {
-            base.OnDispose(disposing);
-
-            CloseAll();
-        }
-
-        #region 成员
-        public void Clear() { _dic.Clear(); }
-
-        public int Count { get { return _dic.Count; } }
-
-        public bool IsReadOnly { get { return (_dic as IDictionary<Int32, ISocketSession>).IsReadOnly; } }
-
-        public IEnumerator<ISocketSession> GetEnumerator() { return _dic.Values.GetEnumerator() as IEnumerator<ISocketSession>; }
-
-        IEnumerator IEnumerable.GetEnumerator() { return _dic.GetEnumerator(); }
-        #endregion
-
-        #region IDictionary<int,ISocketSession> 成员
-
-        void IDictionary<int, ISocketSession>.Add(int key, ISocketSession value) { Add(value); }
-
-        bool IDictionary<int, ISocketSession>.ContainsKey(int key) { return _dic.ContainsKey(key); }
-
-        ICollection<int> IDictionary<int, ISocketSession>.Keys { get { return _dic.Keys; } }
-
-        bool IDictionary<int, ISocketSession>.Remove(int key)
-        {
-            ISocketSession session;
-            if (!_dic.TryGetValue(key, out session)) return false;
-
-            //session.Close();
-            session.Dispose();
-
-            return _dic.Remove(key);
-        }
-
-        bool IDictionary<int, ISocketSession>.TryGetValue(int key, out ISocketSession value) { return _dic.TryGetValue(key, out value); }
-
-        ICollection<ISocketSession> IDictionary<int, ISocketSession>.Values { get { return _dic.Values; } }
-
-        ISocketSession IDictionary<int, ISocketSession>.this[int key] { get { return _dic[key]; } set { _dic[key] = value; } }
-
-        #endregion
-
-        #region ICollection<KeyValuePair<int,ISocketSession>> 成员
-
-        void ICollection<KeyValuePair<int, ISocketSession>>.Add(KeyValuePair<int, ISocketSession> item)
-        {
-            throw new NetException("不支持！请使用Add(ISocketSession session)方法！");
-        }
-
-        bool ICollection<KeyValuePair<int, ISocketSession>>.Contains(KeyValuePair<int, ISocketSession> item) { throw new NotImplementedException(); }
-
-        void ICollection<KeyValuePair<int, ISocketSession>>.CopyTo(KeyValuePair<int, ISocketSession>[] array, int arrayIndex) { throw new NotImplementedException(); }
-
-        bool ICollection<KeyValuePair<int, ISocketSession>>.Remove(KeyValuePair<int, ISocketSession> item) { throw new NetException("不支持！请直接销毁会话对象！"); }
-
-        #endregion
-
-        #region IEnumerable<KeyValuePair<int,ISocketSession>> 成员
-        IEnumerator<KeyValuePair<int, ISocketSession>> IEnumerable<KeyValuePair<int, ISocketSession>>.GetEnumerator()
-        {
-            throw new NotImplementedException();
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Telnet/TelnetClient.cs b/NewLife.Net/Telnet/TelnetClient.cs
deleted file mode 100644
index 2b5e51e192..0000000000
--- a/NewLife.Net/Telnet/TelnetClient.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-﻿
-namespace NewLife.Net.Telnet
-{
-    /// <summary>Telnet客户端</summary>
-    public class TelnetClient : DisposeBase
-    {
-        //TODO 未实现Telnet客户端
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Telnet/TelnetServer.cs b/NewLife.Net/Telnet/TelnetServer.cs
deleted file mode 100644
index 38a1b9d12d..0000000000
--- a/NewLife.Net/Telnet/TelnetServer.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-﻿using System.Net.Sockets;
-using NewLife.Net.Sockets;
-
-namespace NewLife.Net.Telnet
-{
-    /// <summary>Telnet服务器</summary>
-    public class TelnetServer : NetServer<TelnetSession>
-    {
-        //TODO 未实现Telnet服务端
-
-        #region 属性
-        //private Dictionary<Int32, TelnetSession> _Sessions;
-        ///// <summary>会话集合</summary>
-        //public IDictionary<Int32, TelnetSession> Sessions { get { return _Sessions ?? (_Sessions = new Dictionary<int, TelnetSession>()); } }
-        #endregion
-
-        /// <summary>实例化一个Telnet服务器</summary>
-        public TelnetServer()
-        {
-            Port = 23;
-            ProtocolType = NetType.Tcp;
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Telnet/TelnetSession.cs b/NewLife.Net/Telnet/TelnetSession.cs
deleted file mode 100644
index fb5110f359..0000000000
--- a/NewLife.Net/Telnet/TelnetSession.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-﻿using NewLife.Net.Sockets;
-
-namespace NewLife.Net.Telnet
-{
-    /// <summary>Telnet会话</summary>
-    public class TelnetSession : NetSession
-    {
-        //TODO 未实现Telnet会话
-
-        #region 属性
-
-        #endregion
-
-        #region 启动会话
-        //void Start()
-        //{
-
-        //}
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/UPnP/Entities/Device.cs b/NewLife.Net/UPnP/Entities/Device.cs
deleted file mode 100644
index da7fe8797a..0000000000
--- a/NewLife.Net/UPnP/Entities/Device.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Xml.Serialization;
-
-namespace NewLife.Net.UPnP
-{
-    /// <summary>设备</summary>
-    public class Device
-    {
-        #region 属性
-        private String _deviceType;
-        /// <summary>设备类型</summary>
-        public String deviceType
-        {
-            get { return _deviceType; }
-            set { _deviceType = value; }
-        }
-
-        private String _presentationURL;
-        /// <summary>管理网址</summary>
-        public String presentationURL
-        {
-            get { return _presentationURL; }
-            set { _presentationURL = value; }
-        }
-
-        private String _friendlyName;
-        /// <summary>对于用户的简短描述</summary>
-        public String friendlyName
-        {
-            get { return _friendlyName; }
-            set { _friendlyName = value; }
-        }
-
-        private String _manufacturer;
-        /// <summary>生产厂家</summary>
-        public String manufacturer
-        {
-            get { return _manufacturer; }
-            set { _manufacturer = value; }
-        }
-
-        private String _manufacturerURL;
-        /// <summary>制造商的网址</summary>
-        public String manufacturerURL
-        {
-            get { return _manufacturerURL; }
-            set { _manufacturerURL = value; }
-        }
-
-        private String _modelDescription;
-        /// <summary>描述</summary>
-        public String modelDescription
-        {
-            get { return _modelDescription; }
-            set { _modelDescription = value; }
-        }
-
-        private String _modelName;
-        /// <summary>产品名称</summary>
-        public String modelName
-        {
-            get { return _modelName; }
-            set { _modelName = value; }
-        }
-
-        private String _modelNumber;
-        /// <summary>产品型号</summary>
-        public String modelNumber
-        {
-            get { return _modelNumber; }
-            set { _modelNumber = value; }
-        }
-
-        private String _UDN;
-        /// <summary>唯一设备名称</summary>
-        public String UDN
-        {
-            get { return _UDN; }
-            set { _UDN = value; }
-        }
-
-        private String _UPC;
-        /// <summary>通用产品编码缩写</summary>
-        public String UPC
-        {
-            get { return _UPC; }
-            set { _UPC = value; }
-        }
-
-        private List<Service> _serviceList;
-        /// <summary>服务项目</summary>
-        [XmlArray("serviceList")]
-        [XmlArrayItem("service")]
-        public List<Service> serviceList
-        {
-            get { return _serviceList; }
-            set { _serviceList = value; }
-        }
-
-        private List<Device> _deviceList;
-        /// <summary>设备 仅当根设备带有嵌入式设备时要求</summary>
-        [XmlArray("deviceList")]
-        [XmlArrayItem("device")]
-        public List<Device> deviceList
-        {
-            get { return _deviceList; }
-            set { _deviceList = value; }
-        }
-        #endregion
-
-        #region 方法
-        /// <summary>已重载。</summary>
-        /// <returns></returns>
-        public override String ToString()
-        {
-            //return String.Format("{0} {1}", friendlyName, manufacturer);
-            return friendlyName;
-        }
-        #endregion
-
-        #region 设备/服务
-        /// <summary>获取指定设备指定类型的服务</summary>
-        /// <param name="serviceType"></param>
-        /// <returns></returns>
-        public Service GetService(String serviceType) { return GetService(this, serviceType); }
-
-        static Service GetService(Device device, String serviceType)
-        {
-            if (device == null || device.serviceList == null || device.serviceList.Count < 1) return null;
-
-            foreach (var item in device.serviceList)
-            {
-                if (item.serviceType.EqualIgnoreCase(serviceType)) return item;
-            }
-
-            if (device.deviceList == null || device.deviceList.Count < 1) return null;
-
-            foreach (var item in device.deviceList)
-            {
-                var service = GetService(item, serviceType);
-                if (service != null) return service;
-            }
-
-            return null;
-        }
-
-        /// <summary>取得广域网IP连接设备</summary>
-        /// <returns></returns>
-        public Service GetWANIPService()
-        {
-            return GetService("urn:schemas-upnp-org:service:WANIPConnection:1");
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/UPnP/Entities/Envelope.cs b/NewLife.Net/UPnP/Entities/Envelope.cs
deleted file mode 100644
index 51dde4bbc9..0000000000
--- a/NewLife.Net/UPnP/Entities/Envelope.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-﻿using System;
-using System.Xml;
-using System.Xml.Schema;
-using System.Xml.Serialization;
-
-namespace NewLife.Net.UPnP
-{
-    /// <summary>端口映射结构</summary>
-    [Serializable, XmlRoot("Envelope", Namespace = "http://schemas.xmlsoap.org/soap/envelope/")]
-    public class Envelope
-    {
-        //private String _encodingStyle = "http://schemas.xmlsoap.org/soap/encoding/";
-        ///// <summary>属性说明</summary>
-        //[XmlAttribute("encodingStyle", Namespace = "http://schemas.xmlsoap.org/soap/envelope/")]
-        //public String encodingStyle
-        //{
-        //    get { return _encodingStyle; }
-        //    set { _encodingStyle = value; }
-        //}
-
-        private EnvelopeBody _Body;
-        /// <summary>属性说明</summary>
-        [XmlElement("Body", Namespace = "http://schemas.xmlsoap.org/soap/envelope/")]
-        public EnvelopeBody Body
-        {
-            get { return _Body; }
-            set { _Body = value; }
-        }
-
-        /// <summary>信封主体</summary>
-        public class EnvelopeBody : IXmlSerializable
-        {
-            private String _Xml;
-            /// <summary>Xml文档</summary>
-            public String Xml
-            {
-                get { return _Xml; }
-                set { _Xml = value; }
-            }
-
-            private String _Fault;
-            /// <summary>失败</summary>
-            public String Fault
-            {
-                get { return _Fault; }
-                set { _Fault = value; }
-            }
-
-            /// <summary>获取架构</summary>
-            /// <returns></returns>
-            public XmlSchema GetSchema()
-            {
-                return null;
-            }
-
-            /// <summary>读取Xml</summary>
-            /// <param name="reader"></param>
-            public void ReadXml(XmlReader reader)
-            {
-                var prefix = reader.Prefix;
-
-                var xml = reader.ReadInnerXml();
-                if (xml.StartsWith("<Fault") || xml.StartsWith("<" + prefix + ":Fault"))
-                    Fault = xml;
-                else
-                    Xml = xml;
-            }
-
-            /// <summary>写入Xml</summary>
-            /// <param name="writer"></param>
-            public void WriteXml(XmlWriter writer)
-            {
-                writer.WriteRaw(Xml);
-            }
-
-            /// <summary>抛出异常</summary>
-            /// <returns></returns>
-            public Exception ThrowException()
-            {
-                if (String.IsNullOrEmpty(Fault)) return null;
-
-                var doc = new XmlDocument();
-                doc.LoadXml(Fault);
-
-                var msg = "UPnP Error";
-
-                //XmlNamespaceManager mgr = new XmlNamespaceManager(doc.NameTable);
-                //mgr.AddNamespace(doc.DocumentElement.Prefix, doc.DocumentElement.NamespaceURI);
-                //XmlNode node = doc.SelectSingleNode("//errordescription", mgr);
-                var node = doc.SelectSingleNode("/*/*/*/*[last()]");
-                if (node != null) msg = node.InnerText;
-
-                throw new XException(msg);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/UPnP/Entities/InternetGatewayDevice.cs b/NewLife.Net/UPnP/Entities/InternetGatewayDevice.cs
deleted file mode 100644
index 0eadab70d5..0000000000
--- a/NewLife.Net/UPnP/Entities/InternetGatewayDevice.cs
+++ /dev/null
@@ -1,300 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Xml.Serialization;
-using NewLife.Xml;
-
-namespace NewLife.Net.UPnP
-{
-    /// <summary>因特网网关设备</summary>
-    [Serializable, XmlRoot("root", Namespace = "urn:schemas-upnp-org:device-1-0")]
-    public class InternetGatewayDevice
-    {
-        #region 属性
-        private SpecVersion _specVersion;
-        /// <summary>UPnP 设备架构版本</summary>
-        [XmlElement("specVersion")]
-        public SpecVersion specVersion
-        {
-            get { return _specVersion; }
-            set { _specVersion = value; }
-        }
-
-        private String _URLBase;
-        /// <summary>URL</summary>
-        [XmlElement("URLBase")]
-        public String URLBase
-        {
-            get { return _URLBase; }
-            set { _URLBase = value; }
-        }
-
-        private Device _device;
-        /// <summary>设备</summary>
-        [XmlElement("device")]
-        public Device device
-        {
-            get { return _device; }
-            set { _device = value; }
-        }
-        #endregion
-
-        #region 扩展属性
-        private String _ServerHost;
-        /// <summary>UPNP设备IP</summary>
-        [XmlIgnore]
-        public String ServerHost
-        {
-            get
-            {
-                if (String.IsNullOrEmpty(_ServerHost)) GetHOSTAndPort();
-                return _ServerHost;
-
-            }
-            set { _ServerHost = value; }
-        }
-
-        private Int32 _ServerPort;
-        /// <summary>UPNP设备端口</summary>
-        [XmlIgnore]
-        public Int32 ServerPort
-        {
-            get
-            {
-                if (_ServerPort == 0) GetHOSTAndPort();
-                return _ServerPort;
-            }
-            set { _ServerPort = value; }
-        }
-        #endregion
-
-        #region 方法
-        /// <summary>分析URLBase 并赋值HOST和Port</summary>
-        public void GetHOSTAndPort()
-        {
-            //Regex Regex = new Regex(@"\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3}:\d{1,5}");
-            //String HostAndPortStr = Regex.Match(URLBase).Value;
-            //if (!String.IsNullOrEmpty(HostAndPortStr))
-            //{
-            //    String[] Arr = HostAndPortStr.Split(new Char[] { ':' });
-            //    ServerHOST = Arr[0];
-            //    ServerPort = Convert.ToInt32(Arr[1]);
-            //}
-            //else
-            //    throw new Exception("UPNP设备IP与端口获取出错!");
-
-            if (String.IsNullOrEmpty(URLBase)) return;
-
-            var uri = new Uri(URLBase);
-            ServerHost = uri.Host;
-            ServerPort = uri.Port;
-        }
-
-        /// <summary>已重载。</summary>
-        /// <returns></returns>
-        public override String ToString()
-        {
-            var d = device;
-            if (d != null)
-                return String.Format("{0} {1}", d, ServerHost);
-            else
-                return ServerHost;
-        }
-        #endregion
-
-        #region 操作
-        /// <summary>添加映射端口</summary>
-        /// <param name="remoteHost">远程主机</param>
-        /// <param name="externalPort">外部端口</param>
-        /// <param name="protocol">TCP或UDP</param>
-        /// <param name="internalPort">内部端口</param>
-        /// <param name="internalClient">本地IP地址</param>
-        /// <param name="enabled">是否启用[0,1]</param>
-        /// <param name="description">端口映射的描述</param>
-        /// <param name="duration">映射的持续时间，用0表示永久</param>
-        /// <returns>bool</returns>
-        public Boolean Add(String remoteHost, Int32 externalPort, String protocol, Int32 internalPort, String internalClient, Int32 enabled, String description, Int32 duration)
-        {
-            var entity = new PortMappingEntry();
-            entity.Name = "AddPortMapping";
-            entity.RemoteHost = remoteHost;
-            entity.ExternalPort = externalPort;
-            entity.Protocol = protocol;
-            entity.InternalClient = internalClient;
-            entity.InternalPort = internalPort;
-            entity.Enabled = enabled;
-            entity.Description = description;
-            entity.LeaseDuration = duration;
-
-            var response = Request<PortMappingEntry>(entity);
-            return response != null;
-        }
-
-        /// <summary>添加映射端口</summary>
-        /// <param name="host">本地主机</param>
-        /// <param name="port">端口（内外一致）</param>
-        /// <param name="protocol">协议</param>
-        /// <param name="description">描述</param>
-        /// <returns></returns>
-        public Boolean Add(String host, Int32 port, String protocol, String description)
-        {
-            return Add(null, port, protocol, port, host, 1, description, 0);
-        }
-
-        /// <summary>删除端口映射</summary>
-        /// <param name="remoteHost">远程主机</param>
-        /// <param name="externalPort">外部端口</param>
-        /// <param name="protocol">TCP或UDP</param>
-        /// <returns></returns>
-        public Boolean Delete(String remoteHost, Int32 externalPort, String protocol)
-        {
-            var entity = new PortMappingEntry();
-            entity.Name = "DeletePortMapping";
-            entity.RemoteHost = remoteHost;
-            entity.ExternalPort = externalPort;
-            entity.Protocol = protocol;
-
-            var response = Request<PortMappingEntry>(entity);
-            return response != null;
-        }
-        #endregion
-
-        #region 查找
-        /// <summary>获取指定设备的端口映射信息</summary>
-        /// <param name="remoteHost">远程主机</param>
-        /// <param name="externalPort">外部端口</param>
-        /// <param name="protocol">TCP/UDP</param>
-        /// <returns></returns>
-        public PortMappingEntry GetMapByPortAndProtocol(String remoteHost, Int32 externalPort, String protocol)
-        {
-            var entity = new PortMappingEntry();
-            entity.Name = "GetSpecificPortMappingEntry";
-            entity.RemoteHost = remoteHost;
-            entity.ExternalPort = externalPort;
-            entity.Protocol = protocol;
-
-            var response = Request<PortMappingEntry>(entity);
-            return response;
-        }
-
-        /// <summary>获取指定设备的端口映射信息</summary>
-        /// <param name="index">索引</param>
-        /// <returns></returns>
-        public PortMappingEntry GetMapByIndex(Int32 index)
-        {
-            var entity = new PortMappingEntryRequest();
-            entity.Name = "GetGenericPortMappingEntry";
-            entity.NewPortMappingIndex = index;
-
-            var response = Request<PortMappingEntry>(entity);
-            return response;
-        }
-
-        /// <summary>获取指定设备的所有端口映射信息</summary>
-        /// <returns></returns>
-        public IEnumerable<PortMappingEntry> GetMapByIndexAll()
-        {
-            var n = 0;
-            while (true)
-            {
-                PortMappingEntry item;
-                try
-                {
-                    item = GetMapByIndex(n++);
-                }
-                catch { break; }
-
-                if (item == null) break;
-
-                yield return item;
-            }
-        }
-        #endregion
-
-        #region SOAP
-        /// <summary>向设备发送指令</summary>
-        /// <typeparam name="TResponse"></typeparam>
-        /// <param name="action"></param>
-        /// <returns></returns>
-        TResponse Request<TResponse>(UPnPAction action) where TResponse : UPnPAction<TResponse>, new()
-        {
-            if (device == null || action == null) return null;
-
-            var service = device.GetWANIPService();
-            if (service == null) return null;
-
-            var uri = new Uri(String.Format("http://{0}:{1}{2}", ServerHost, ServerPort, service.controlURL));
-
-            var xml = action.ToSoap(service.serviceType);
-            xml = SOAPRequest(uri, service.serviceType + "#" + action.Name, xml);
-
-            var response = UPnPAction<TResponse>.FromXml(xml);
-
-            return response;
-        }
-
-        /// <summary>SOAP头部</summary>
-        const String SOAP_HEADER = "" +
-            "POST {0} HTTP/1.1\r\n" +
-            "HOST: {1}\r\n" +
-            "SOAPACTION: \"{2}\"\r\n" +
-            "CONTENT-TYPE: text/xml ; charset=\"utf-8\"\r\n" +
-            "Content-Length: {3}" +
-            "\r\n\r\n";
-        ///// <summary>
-        ///// SOAP主体
-        ///// </summary>
-        //const String SOAP_BODY = "" +
-        //    "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" +
-        //    "<s:Envelope xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\" s:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\">\r\n" +
-        //    "<s:Body>\r\n" +
-        //    "{0}\r\n" +
-        //    "</s:Body>\r\n" +
-        //    "</s:Envelope>\r\n";
-
-        /// <summary>发送SOAP请求，发送xml，返回xml</summary>
-        /// <param name="uri"></param>
-        /// <param name="action"></param>
-        /// <param name="xml"></param>
-        /// <returns></returns>
-        static String SOAPRequest(Uri uri, String action, String xml)
-        {
-            //String body = String.Format(SOAP_BODY, xml);
-            var header = String.Format(SOAP_HEADER, uri.PathAndQuery, uri.Host + ":" + uri.Port, action, Encoding.UTF8.GetByteCount(xml));
-
-            var client = new TcpSession();
-            var session = client as ISocketSession;
-            try
-            {
-                //client.Connect(uri.Host, uri.Port);
-                client.Remote.Host = uri.Host;
-                client.Remote.Port = uri.Port;
-                session.Send(header + xml);
-
-                var response = session.ReceiveString();
-                if (String.IsNullOrEmpty(response)) return null;
-
-                var p = response.IndexOf("\r\n\r\n");
-                if (p < 0) return null;
-
-                response = response.Substring(p).Trim();
-                if (String.IsNullOrEmpty(response)) response = session.ReceiveString();
-
-                //Envelope env = null;
-                //XmlSerializer serial = new XmlSerializer(typeof(Envelope));
-                //using (var reader = new StringReader(response))
-                //{
-                //    env = serial.Deserialize(reader) as Envelope;
-                //}
-                var env = response.ToXmlEntity<Envelope>();
-                if (env == null || env.Body == null) return null;
-
-                if (!String.IsNullOrEmpty(env.Body.Fault)) throw env.Body.ThrowException();
-
-                return env.Body.Xml;
-            }
-            finally { client.Dispose(); }
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/UPnP/Entities/PortMappingEntry.cs b/NewLife.Net/UPnP/Entities/PortMappingEntry.cs
deleted file mode 100644
index a028248f81..0000000000
--- a/NewLife.Net/UPnP/Entities/PortMappingEntry.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-﻿using System;
-using System.Xml.Serialization;
-
-namespace NewLife.Net.UPnP
-{
-    /// <summary>端口映射实体</summary>
-    public class PortMappingEntryRequest : PortMappingEntry
-    {
-        private Int32 _NewPortMappingIndex;
-        /// <summary>索引</summary>
-        public Int32 NewPortMappingIndex
-        {
-            get { return _NewPortMappingIndex; }
-            set { _NewPortMappingIndex = value; }
-        }
-    }
-
-    /// <summary>端口映射实体</summary>
-    public class PortMappingEntry : UPnPAction<PortMappingEntry>
-    {
-        #region 属性
-        private String _RemoteHost;
-        /// <summary>远程主机</summary>
-        [XmlElement("NewRemoteHost")]
-        public String RemoteHost
-        {
-            get { return _RemoteHost; }
-            set { _RemoteHost = value; }
-        }
-
-        private Int32 _ExternalPort;
-        /// <summary>外部端口</summary>
-        [XmlElement("NewExternalPort")]
-        public Int32 ExternalPort
-        {
-            get { return _ExternalPort; }
-            set { _ExternalPort = value; }
-        }
-
-        private String _Protocol;
-        /// <summary>TCP/UDP</summary>
-        [XmlElement("NewProtocol")]
-        public String Protocol
-        {
-            get { return _Protocol; }
-            set { _Protocol = value; }
-        }
-
-        private Int32 _InternalPort;
-        /// <summary>内部端口</summary>
-        [XmlElement("NewInternalPort")]
-        public Int32 InternalPort
-        {
-            get { return _InternalPort; }
-            set { _InternalPort = value; }
-        }
-
-        private String _InternalClient;
-        /// <summary>主机IP</summary>
-        [XmlElement("NewInternalClient")]
-        public String InternalClient
-        {
-            get { return _InternalClient; }
-            set { _InternalClient = value; }
-        }
-
-        private Int32 _Enabled;
-        /// <summary>是否启用</summary>
-        [XmlElement("NewEnabled")]
-        public Int32 Enabled
-        {
-            get { return _Enabled; }
-            set { _Enabled = value; }
-        }
-
-        private String _Description;
-        /// <summary>描述</summary>
-        [XmlElement("NewPortMappingDescription")]
-        public String Description
-        {
-            get { return _Description; }
-            set { _Description = value; }
-        }
-
-        private Int32 _LeaseDuration;
-        /// <summary>有效期</summary>
-        [XmlElement("NewLeaseDuration")]
-        public Int32 LeaseDuration
-        {
-            get { return _LeaseDuration; }
-            set { _LeaseDuration = value; }
-        }
-        #endregion
-
-        /// <summary>已重载。</summary>
-        /// <returns></returns>
-        public override String ToString()
-        {
-            return String.Format("{0} {1}://{2}:{3} {4}", Description, Protocol, InternalClient, InternalPort, ExternalPort);
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/UPnP/Entities/Service.cs b/NewLife.Net/UPnP/Entities/Service.cs
deleted file mode 100644
index 9863f7ae60..0000000000
--- a/NewLife.Net/UPnP/Entities/Service.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-﻿using System;
-
-namespace NewLife.Net.UPnP
-{
-    /// <summary>服务项</summary>
-    public class Service
-    {
-        private String _serviceType;
-        /// <summary>UPnP 服务类型。不得包含散列符</summary>
-        public String serviceType
-        {
-            get { return _serviceType; }
-            set { _serviceType = value; }
-        }
-
-        private String _serviceId;
-        /// <summary>服务标识符</summary>
-        public String serviceId
-        {
-            get { return _serviceId; }
-            set { _serviceId = value; }
-        }
-
-        private String _controlURL;
-        /// <summary>控制网址</summary>
-        public String controlURL
-        {
-            get { return _controlURL; }
-            set { _controlURL = value; }
-        }
-
-        private String _eventSubURL;
-        /// <summary>事件的URL</summary>
-        public String eventSubURL
-        {
-            get { return _eventSubURL; }
-            set { _eventSubURL = value; }
-        }
-
-        private String _SCPDURL;
-        /// <summary>服务描述的URL</summary>
-        public String SCPDURL
-        {
-            get { return _SCPDURL; }
-            set { _SCPDURL = value; }
-        }
-
-        /// <summary>已重载。</summary>
-        /// <returns></returns>
-        public override String ToString()
-        {
-            if (!String.IsNullOrEmpty(serviceId))
-            {
-                var ss = serviceId.Split(":");
-                return ss[ss.Length - 1];
-            }
-            return base.ToString();
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/UPnP/Entities/SpecVersion.cs b/NewLife.Net/UPnP/Entities/SpecVersion.cs
deleted file mode 100644
index 233cd1e92e..0000000000
--- a/NewLife.Net/UPnP/Entities/SpecVersion.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-﻿using System;
-
-namespace NewLife.Net.UPnP
-{
-    /// <summary>SpecVersion</summary>
-    public class SpecVersion
-    {
-        private Int32 _major;
-        /// <summary>UPnP 设备架构主版本</summary>
-        public Int32 major
-        {
-            get { return _major; }
-            set { _major = value; }
-        }
-
-        private Int32 _minor;
-        /// <summary>UPnP 设备架构副版本</summary>
-        public Int32 minor
-        {
-            get { return _minor; }
-            set { _minor = value; }
-        }
-
-    }
-}
diff --git a/NewLife.Net/UPnP/UPnPAction.cs b/NewLife.Net/UPnP/UPnPAction.cs
deleted file mode 100644
index 608ce1967d..0000000000
--- a/NewLife.Net/UPnP/UPnPAction.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-﻿using System;
-using System.Reflection;
-using System.Xml;
-using System.Xml.Serialization;
-using NewLife.Reflection;
-using NewLife.Xml;
-
-namespace NewLife.Net.UPnP
-{
-    /// <summary>UPnP操作</summary>
-    /// <typeparam name="TEntity"></typeparam>
-    public class UPnPAction<TEntity> : UPnPAction where TEntity : UPnPAction<TEntity>, new()
-    {
-        /// <summary>XML反序列化为实体</summary>
-        /// <param name="xml"></param>
-        /// <returns></returns>
-        public static TEntity FromXml(String xml)
-        {
-            var doc = new XmlDocument();
-            doc.LoadXml(xml);
-
-            var entity = new TEntity();
-
-            //TypeX tx = TypeX.Create(typeof(TEntity));
-            foreach (var item in typeof(TEntity).GetProperties(true))
-            {
-                //if (AttributeX.GetCustomAttribute<XmlIgnoreAttribute>(item, true) != null) continue;
-
-                var elmName = item.Name;
-                var att = item.GetCustomAttribute<XmlElementAttribute>(true);
-                if (att != null && !String.IsNullOrEmpty(att.ElementName)) elmName = att.ElementName;
-
-                var node = doc.SelectSingleNode("//" + elmName);
-                if (node == null) continue;
-
-                //item.SetValue(entity, Convert.ChangeType(node.InnerText, item.PropertyType));
-                entity.SetValue(item, Reflect.ChangeType(node.InnerText, item.PropertyType));
-            }
-            return entity;
-
-            //XmlSerializer serial = new XmlSerializer(typeof(TEntity));
-            //using (StringReader reader = new StringReader(xml))
-            //{
-            //    return serial.Deserialize(reader) as TEntity;
-            //}
-        }
-    }
-
-    /// <summary>UPnP操作</summary>
-    public abstract class UPnPAction
-    {
-        private String _Name;
-        /// <summary>名称</summary>
-        [XmlIgnore]
-        public virtual String Name
-        {
-            get { return _Name ?? (_Name = GetType().Name); }
-            set { _Name = value; }
-        }
-
-        /// <summary>序列化实体为Xml</summary>
-        /// <param name="xmlns"></param>
-        /// <returns></returns>
-        public virtual String ToXml(String xmlns)
-        {
-            var doc = new XmlDocument();
-            var root = doc.CreateElement("u", Name, xmlns);
-            doc.AppendChild(root);
-
-            //TypeX tx = TypeX.Create(this.GetType());
-            foreach (var item in GetType().GetProperties(true))
-            {
-                //if (AttributeX.GetCustomAttribute<XmlIgnoreAttribute>(item, true) != null) continue;
-
-                var elmName = item.Name;
-                var att = item.GetCustomAttribute<XmlElementAttribute>(true);
-                if (att != null && !String.IsNullOrEmpty(att.ElementName)) elmName = att.ElementName;
-
-                var elm = doc.CreateElement(elmName);
-                var v = this.GetValue(item);
-                var str = v == null ? "" : v.ToString();
-
-                var text = doc.CreateTextNode(str);
-                elm.AppendChild(text);
-
-                root.AppendChild(elm);
-            }
-
-            return doc.InnerXml;
-
-            //XmlSerializer serial = new XmlSerializer(this.GetType());
-            //MemoryStream ms = new MemoryStream();
-            ////serial.Serialize(ms, this);
-
-            //XmlWriterSettings setting = new XmlWriterSettings();
-            //setting.Encoding = Encoding.UTF8;
-            //// 去掉开头 <?xml version="1.0" encoding="utf-8"?>
-            //setting.OmitXmlDeclaration = true;
-
-            //using (XmlWriter writer = XmlWriter.Create(ms, setting))
-            //{
-            //    // 去掉默认命名空间xmlns:xsd和xmlns:xsi
-            //    XmlSerializerNamespaces xsns = new XmlSerializerNamespaces();
-            //    if (!String.IsNullOrEmpty(xmlns)) xsns.Add("u", xmlns);
-
-            //    serial.Serialize(writer, this, xsns);
-            //    byte[] bts = ms.ToArray();
-            //    String xml = Encoding.UTF8.GetString(bts);
-
-            //    if (!String.IsNullOrEmpty(xml)) xml = xml.Trim();
-
-            //    return xml;
-            //}
-        }
-
-        /// <summary>序列化实体为Soap</summary>
-        /// <param name="xmlns"></param>
-        /// <returns></returns>
-        public virtual String ToSoap(String xmlns)
-        {
-            var xml = ToXml(xmlns);
-
-            var env = new Envelope();
-            env.Body = new Envelope.EnvelopeBody();
-            env.Body.Xml = xml;
-
-            //var xsn = new XmlSerializerNamespaces();
-            //xsn.Add("s", "http://schemas.xmlsoap.org/soap/envelope/");
-
-            //var serial = new XmlSerializer(typeof(Envelope));
-            //var ms = new MemoryStream();
-
-            //using (var writer = XmlWriter.Create(ms))
-            //{
-            //    serial.Serialize(writer, env, xsn);
-            //}
-
-            //xml = Encoding.UTF8.GetString(ms.ToArray());
-
-            //xml = env.ToXml(null, "s", "http://schemas.xmlsoap.org/soap/envelope/", true);
-            return xml;
-        }
-    }
-}
diff --git a/NewLife.Net/UPnP/UPnPClient.cs b/NewLife.Net/UPnP/UPnPClient.cs
deleted file mode 100644
index 41d032c476..0000000000
--- a/NewLife.Net/UPnP/UPnPClient.cs
+++ /dev/null
@@ -1,233 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net;
-using System.Text;
-using System.Threading.Tasks;
-using NewLife.Configuration;
-using NewLife.Log;
-using NewLife.Net.Sockets;
-using NewLife.Threading;
-using NewLife.Xml;
-
-namespace NewLife.Net.UPnP
-{
-    /// <summary>通用即插即用协议客户端</summary>
-    /// <remarks>
-    /// UPnP 是各种各样的智能设备、无线设备和个人电脑等实现遍布全球的对等网络连接（P2P）的结构。UPnP 是一种分布式的，开放的网络架构。UPnP 是独立的媒介。
-    /// 
-    /// <a target="_blank" href="http://baike.baidu.com/view/27925.htm">UPnP</a>
-    /// </remarks>
-    /// <example>
-    /// <code>
-    /// UPnPClient client = new UPnPClient();
-    /// client.OnNewDevice += new EventHandler&lt;NewLife.EventArgs&lt;InternetGatewayDevice, bool&gt;&gt;(client_OnNewDevice);
-    /// client.StartDiscover();
-    /// 
-    /// static void client_OnNewDevice(object sender, EventArgs&lt;InternetGatewayDevice, bool&gt; e)
-    /// {
-    ///     Console.WriteLine("{0}{1}", e.Arg1, e.Arg2 ? " [缓存]" : "");
-    ///     if (e.Arg2) return;
-    /// 
-    ///     foreach (var item in e.Arg1.GetMapByIndexAll())
-    ///     {
-    ///         Console.WriteLine(item);
-    ///     }
-    /// }
-    /// </code>
-    /// </example>
-    public class UPnPClient : Netbase
-    {
-        #region 属性
-        private UdpServer _Udp;
-        /// <summary>Udp客户端，用于发现网关设备</summary>
-        private UdpServer Udp
-        {
-            get
-            {
-                if (_Udp == null)
-                {
-                    _Udp = new UdpServer();
-                    //_Udp.Name = "UPnPClient";
-                    //_Udp.ProtocolType = ProtocolType.Udp;
-                    _Udp.Received += Udp_Received;
-                    _Udp.Open();
-                    //_Udp.ReceiveAsync();
-                }
-                return _Udp;
-            }
-            set { _Udp = value; }
-        }
-
-        private SortedList<String, InternetGatewayDevice> _Gateways;
-        /// <summary>网关设备</summary>
-        public SortedList<String, InternetGatewayDevice> Gateways => _Gateways ?? (_Gateways = new SortedList<String, InternetGatewayDevice>());
-        #endregion
-
-        #region 构造
-        /// <summary>释放资源</summary>
-        /// <param name="disposing"></param>
-        protected override void OnDispose(Boolean disposing)
-        {
-            base.OnDispose(disposing);
-
-            try
-            {
-                if (_Udp != null) _Udp.Dispose();
-            }
-            catch { }
-        }
-        #endregion
-
-        #region 发现
-        const String UPNP_DISCOVER = "" +
-            "M-SEARCH * HTTP/1.1\r\n" +
-            "HOST: 239.255.255.250:1900\r\n" +
-            "MAN: \"ssdp:discover\"\r\n" +
-            "MX: 3\r\n" +
-            "ST: UPnP:rootdevice\r\n" + // 搜索目标，这里只要根设备
-            "\r\n\r\n";
-
-        /// <summary>开始</summary>
-        public void StartDiscover()
-        {
-            if (CacheGateway) Task.Factory.StartNew(CheckCacheGateway);
-
-            var address = NetHelper.ParseAddress("239.255.255.250");
-
-            Udp.Client.EnableBroadcast = true;
-            Udp.Client.Send(UPNP_DISCOVER, Encoding.ASCII, new IPEndPoint(address, 1900));
-
-            //Boolean hasDefault = false;
-            //foreach (var item in NetHelper.GetMulticasts())
-            //{
-            //    foreach (var s in Udp.Servers)
-            //    {
-            //        if (s.AddressFamily == item.AddressFamily)
-            //        {
-            //            (s as UdpServer).Send(UPNP_DISCOVER, null, new IPEndPoint(item, 1900));
-            //            if (item.Equals(address)) hasDefault = true;
-            //            break;
-            //        }
-            //    }
-            //}
-            //if (!hasDefault)
-            //{
-            //    foreach (var s in Udp.Servers)
-            //    {
-            //        if (s.AddressFamily == address.AddressFamily)
-            //        {
-            //            (s as UdpServer).Send(UPNP_DISCOVER, null, new IPEndPoint(address, 1900));
-            //            break;
-            //        }
-            //    }
-            //}
-        }
-
-        //List<String> process = new List<String>();
-        void Udp_Received(Object sender, ReceivedEventArgs e)
-        {
-            var content = e.Stream.ToStr();
-            if (String.IsNullOrEmpty(content)) return;
-
-            //var udp = e as UdpReceivedEventArgs;
-
-            var remote = e.Remote;
-            var address = remote.Address;
-            WriteLog("发现UPnP设备：{0}", remote);
-
-            //分析数据并反序列化
-            var sp = "LOCATION:";
-            var p = content.IndexOf(sp);
-            if (p <= 0) return;
-
-            var url = content.Substring(p + sp.Length);
-            p = url.IndexOf(Environment.NewLine);
-            if (p <= 0) return;
-
-            url = url.Substring(0, p);
-            url = url.Trim();
-            if (String.IsNullOrEmpty(url)) return;
-
-            try
-            {
-                //下载IGD.XML
-                var client = new WebClient();
-                var xml = client.DownloadString(url);
-                if (xml != null) xml = xml.Trim();
-
-                var uri = new Uri(url);
-                if (CacheGateway) File.WriteAllText(GetCacheFile(uri.Host), xml);
-
-                AddGateway(uri.Host, xml, false);
-            }
-            catch (Exception ex)
-            {
-                WriteLog(ex.Message + " 路径[" + url + "]");
-                throw;
-            }
-        }
-
-        void AddGateway(String address, String content, Boolean isCache)
-        {
-            //反序列化
-            var device = content.Trim().ToXmlEntity<InternetGatewayDevice>();
-            //XmlSerializer serial = new XmlSerializer(typeof(InternetGatewayDevice));
-            //InternetGatewayDevice device = null;
-            //using (StringReader reader = new StringReader(content.Trim()))
-            //{
-            //    device = serial.Deserialize(reader) as InternetGatewayDevice;
-            if (device == null) return;
-
-            if (String.IsNullOrEmpty(device.URLBase)) device.URLBase = String.Format("http://{0}:1900", address);
-
-            lock (Gateways)
-            {
-                Gateways[address] = device;
-            }
-            //}
-
-            OnNewDevice?.Invoke(this, new EventArgs<InternetGatewayDevice, Boolean>(device, isCache));
-        }
-
-        /// <summary>发现新设备时触发。参数（设备，是否来自缓存）</summary>
-        public event EventHandler<EventArgs<InternetGatewayDevice, Boolean>> OnNewDevice;
-
-        const String cacheKey = "InternetGatewayDevice_";
-
-        /// <summary>检查缓存的网关</summary>
-        void CheckCacheGateway()
-        {
-            var p = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, XTrace.TempPath);
-            p = Path.Combine(p, "UPnP");
-            if (!Directory.Exists(p)) return;
-
-            var ss = Directory.GetFiles(p, cacheKey + "*.xml", SearchOption.TopDirectoryOnly);
-            if (ss == null || ss.Length < 1) return;
-
-            foreach (var item in ss)
-            {
-                var ip = Path.GetFileNameWithoutExtension(item).Substring(cacheKey.Length).Trim(new Char[] { '_' });
-
-                AddGateway(ip, File.ReadAllText(item), true);
-            }
-        }
-
-        static String GetCacheFile(String address)
-        {
-            var fileName = Path.Combine(Path.Combine(XTrace.TempPath, "UPnP"), String.Format(@"{0}{1}.xml", cacheKey, address));
-            fileName = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, fileName);
-
-            var dir = Path.GetDirectoryName(fileName);
-            if (!String.IsNullOrEmpty(dir) && !Directory.Exists(dir)) Directory.CreateDirectory(dir);
-
-            return fileName;
-        }
-        #endregion
-
-        #region 辅助函数
-        /// <summary>是否缓存网关。缓存网关可以加速UPnP的发现过程</summary>
-        public static Boolean CacheGateway => Config.GetConfig<Boolean>("NewLife.Net.UPnP.CacheGateway");
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Udp/IUdp.cs b/NewLife.Net/Udp/IUdp.cs
deleted file mode 100644
index 055eb85fc6..0000000000
--- a/NewLife.Net/Udp/IUdp.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-﻿using System;
-using System.IO;
-using System.Net;
-using System.Text;
-using NewLife.Net.Sockets;
-
-namespace NewLife.Net.Udp
-{
-    /// <summary>Udp接口</summary>
-    interface IUdp
-    {
-        /// <summary>缓冲区大小</summary>
-        Int32 BufferSize { get; }
-
-        /// <summary>发送数据</summary>
-        /// <param name="buffer">缓冲区</param>
-        /// <param name="offset">位移</param>
-        /// <param name="size">写入字节数</param>
-        /// <param name="remoteEP">远程终结点</param>
-        /// <returns>返回自身，用于链式写法</returns>
-        void Send(byte[] buffer, int offset = 0, int size = 0, EndPoint remoteEP = null);
-
-        /// <summary>异步接收</summary>
-        void ReceiveAsync();
-
-        /// <summary>接收数据</summary>
-        /// <returns></returns>
-        Byte[] Receive();
-
-        /// <summary>数据到达，在事件处理代码中，事件参数不得另作他用，套接字事件池将会将其回收。</summary>
-        event EventHandler<NetEventArgs> Received;
-    }
-
-    /// <summary>Udp扩展</summary>
-    static class UdpHelper
-    {
-        /// <summary>发送数据流</summary>
-        /// <param name="udp"></param>
-        /// <param name="stream"></param>
-        /// <param name="remoteEP"></param>
-        /// <returns>返回自身，用于链式写法</returns>
-        public static IUdp Send(this IUdp udp, Stream stream, EndPoint remoteEP = null)
-        {
-            Int64 total = 0;
-
-            //var size = stream.CanSeek ? stream.Length - stream.Position : udp.BufferSize;
-            var size = 1472;
-            Byte[] buffer = new Byte[size];
-            while (true)
-            {
-                Int32 n = stream.Read(buffer, 0, buffer.Length);
-                if (n <= 0) break;
-
-                udp.Send(buffer, 0, n, remoteEP);
-                total += n;
-
-                if (n < buffer.Length) break;
-            }
-            return udp;
-        }
-
-        /// <summary>向指定目的地发送信息</summary>
-        /// <param name="udp"></param>
-        /// <param name="buffer">缓冲区</param>
-        /// <param name="remoteEP"></param>
-        /// <returns>返回自身，用于链式写法</returns>
-        public static IUdp Send(this IUdp udp, Byte[] buffer, EndPoint remoteEP = null) { udp.Send(buffer, 0, buffer.Length, remoteEP); return udp; }
-
-        /// <summary>向指定目的地发送信息</summary>
-        /// <param name="udp"></param>
-        /// <param name="message"></param>
-        /// <param name="encoding"></param>
-        /// <param name="remoteEP"></param>
-        /// <returns>返回自身，用于链式写法</returns>
-        public static IUdp Send(this IUdp udp, String message, Encoding encoding = null, EndPoint remoteEP = null)
-        {
-            //Send(udp, Encoding.UTF8.GetBytes(message), remoteEP);
-
-            if (encoding == null)
-                Send(udp, Encoding.UTF8.GetBytes(message), remoteEP);
-            else
-                Send(udp, encoding.GetBytes(message), remoteEP);
-            return udp;
-        }
-
-        /// <summary>接收字符串</summary>
-        /// <param name="udp"></param>
-        /// <param name="encoding"></param>
-        /// <returns></returns>
-        public static String ReceiveString(this IUdp udp, Encoding encoding = null)
-        {
-            Byte[] buffer = udp.Receive();
-            if (buffer == null || buffer.Length < 1) return null;
-
-            if (encoding == null) encoding = Encoding.UTF8;
-            return encoding.GetString(buffer);
-        }
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Udp/UdpClientX.cs b/NewLife.Net/Udp/UdpClientX.cs
deleted file mode 100644
index 476ed0b659..0000000000
--- a/NewLife.Net/Udp/UdpClientX.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-﻿using System;
-using System.Net;
-using System.Net.Sockets;
-using System.Text;
-using NewLife.Net.Sockets;
-
-namespace NewLife.Net.Udp
-{
-    /// <summary>增强的UDP客户端</summary>
-    public class UdpClientX : SocketClient, IUdp
-    {
-        #region 属性
-        /// <summary>已重载。</summary>
-        public override ProtocolType ProtocolType { get { return ProtocolType.Udp; } }
-        #endregion
-
-        #region 接收
-        /// <summary>异步接收</summary>
-        public override void ReceiveAsync()
-        {
-            StartAsync(e =>
-            {
-                var client = Client;
-                if (client == null || Disposed) { e.Cancel = true; return false; }
-
-                // 兼容IPV6
-                var address = AddressFamily == AddressFamily.InterNetworkV6 ? IPAddress.IPv6Any : IPAddress.Any;
-                e.RemoteEndPoint = new IPEndPoint(address, 0);
-                // 不能用ReceiveAsync，否则得不到远程地址
-                return client.ReceiveFromAsync(e);
-            });
-        }
-        #endregion
-
-        #region 发送
-        /// <summary>发送数据</summary>
-        /// <param name="buffer">缓冲区</param>
-        /// <param name="offset">位移</param>
-        /// <param name="size">写入字节数</param>
-        /// <param name="remoteEP">远程终结点</param>
-        public virtual void Send(Byte[] buffer, Int32 offset = 0, Int32 size = 0, EndPoint remoteEP = null)
-        {
-            var socket = Client;
-            if (!socket.IsBound) Bind();
-
-            if (size <= 0) size = buffer.Length - offset;
-            if (remoteEP != null && Socket == null) AddressFamily = remoteEP.AddressFamily;
-            //if (remoteEP != null && ProtocolType == ProtocolType.Udp)
-            if (socket.Connected)
-                socket.Send(buffer, offset, size, SocketFlags.None);
-            else
-                socket.SendTo(buffer, offset, size, SocketFlags.None, remoteEP);
-
-            //return this;
-        }
-
-        /// <summary>广播数据包</summary>
-        /// <param name="buffer">缓冲区</param>
-        /// <param name="offset">偏移</param>
-        /// <param name="size"></param>
-        /// <param name="port"></param>
-        public void Broadcast(Byte[] buffer, Int32 offset, Int32 size, Int32 port)
-        {
-            if (!Client.EnableBroadcast) Client.EnableBroadcast = true;
-
-            if (size <= 0) size = buffer.Length - offset;
-            Client.SendTo(buffer, offset, size, SocketFlags.None, new IPEndPoint(IPAddress.Broadcast, port));
-        }
-
-        /// <summary>广播字符串</summary>
-        /// <param name="message"></param>
-        /// <param name="port"></param>
-        public void Broadcast(String message, Int32 port)
-        {
-            var buffer = Encoding.UTF8.GetBytes(message);
-            Broadcast(buffer, 0, buffer.Length, port);
-        }
-        #endregion
-
-        #region 创建会话
-        private ISocketSession _session;
-
-        /// <summary>为指定地址创建会话。对于无连接Socket，必须指定远程地址；对于有连接Socket，指定的远程地址将不起任何作用</summary>
-        /// <param name="remoteEP"></param>
-        /// <returns></returns>
-        public override ISocketSession CreateSession(IPEndPoint remoteEP = null)
-        {
-            var socket = Client;
-            if (!socket.Connected)
-            {
-                if (remoteEP == null) throw new ArgumentNullException("remoteEP", "未连接Udp必须指定远程地址！");
-
-                return new UdpSession(this, remoteEP);
-            }
-            else
-            {
-                // 已连接。返回已有的
-                if (_session == null) _session = new UdpSession(this, remoteEP);
-                return _session;
-            }
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Udp/UdpServer.cs b/NewLife.Net/Udp/UdpServer.cs
deleted file mode 100644
index 3f2a550155..0000000000
--- a/NewLife.Net/Udp/UdpServer.cs
+++ /dev/null
@@ -1,184 +0,0 @@
-﻿using System;
-using System.Net;
-using System.Net.Sockets;
-using System.Text;
-using NewLife.Net.Sockets;
-
-namespace NewLife.Net.Udp
-{
-    /// <summary>UDP服务器</summary>
-    /// <remarks>
-    /// 核心工作：启动服务<see cref="OnStart"/>时，监听端口，并启用多个（逻辑处理器数的10倍）异步接收操作<see cref="ReceiveAsync"/>。
-    /// 接收到的数据全部转接到<see cref="Received"/>事件中。
-    /// 
-    /// 服务器完全处于异步工作状态，任何操作都不可能被阻塞。
-    /// </remarks>
-    public class UdpServer : SocketServer, IUdp
-    {
-        #region 属性
-        /// <summary>已重载。</summary>
-        public override ProtocolType ProtocolType { get { return ProtocolType.Udp; } }
-        #endregion
-
-        #region 构造
-        /// <summary>构造一个UDP服务器实例</summary>
-        public UdpServer() : base(IPAddress.Any, 0) { }
-
-        /// <summary>构造一个UDP服务器实例</summary>
-        /// <param name="port"></param>
-        public UdpServer(Int32 port) : base(IPAddress.Any, port) { }
-
-        /// <summary>构造一个UDP服务器实例</summary>
-        /// <param name="address"></param>
-        /// <param name="port"></param>
-        public UdpServer(IPAddress address, Int32 port) : base(address, port) { }
-
-        /// <summary>构造一个UDP服务器实例</summary>
-        /// <param name="hostname"></param>
-        /// <param name="port"></param>
-        public UdpServer(String hostname, Int32 port) : base(hostname, port) { }
-        #endregion
-
-        #region 开始停止
-        /// <summary>开始</summary>
-        protected override void OnStart()
-        {
-            Server.EnableBroadcast = true;
-
-            base.OnStart();
-
-            ReceiveAsync();
-        }
-
-        /// <summary>开始异步接收数据</summary>
-        public virtual void ReceiveAsync()
-        {
-            StartAsync(e =>
-            {
-                var server = Server;
-                if (server == null || Disposed) { e.Cancel = true; return false; }
-
-                // 兼容IPV6
-                var address = AddressFamily == AddressFamily.InterNetworkV6 ? IPAddress.IPv6Any : IPAddress.Any;
-                e.RemoteEndPoint = new IPEndPoint(address, 0);
-                // 不能用ReceiveAsync，否则得不到远程地址
-                return server.ReceiveFromAsync(e);
-            });
-        }
-        #endregion
-
-        #region 事件
-        /// <summary>数据到达。在事件处理代码中，事件参数不得另作他用，套接字事件池将会将其回收。</summary>
-        public event EventHandler<NetEventArgs> Received;
-
-        /// <summary>接收到数据时</summary>
-        /// <param name="e"></param>
-        protected virtual void OnReceive(NetEventArgs e)
-        {
-            // 没有接收事件时，马上开始处理重建委托
-            if (Received == null)
-            {
-                ReceiveAsync();
-                return;
-            }
-
-            Process(e, ReceiveAsync, ProcessReceive);
-        }
-
-        void ProcessReceive(NetEventArgs e)
-        {
-            // 统计接收数
-            IncCounter();
-
-            CheckBufferSize(e);
-            if (Received != null)
-            {
-                e.Session = CreateSession(e.RemoteIPEndPoint);
-                Received(this, e);
-            }
-        }
-
-        /// <summary>已重载。</summary>
-        /// <param name="e"></param>
-        protected override void OnComplete(NetEventArgs e)
-        {
-            switch (e.LastOperation)
-            {
-                case SocketAsyncOperation.Receive:
-                case SocketAsyncOperation.ReceiveFrom:
-                case SocketAsyncOperation.ReceiveMessageFrom:
-                    OnReceive(e);
-                    return;
-                default:
-                    break;
-            }
-
-            base.OnComplete(e);
-        }
-        #endregion
-
-        #region 发送
-        /// <summary>向指定目的地发送信息</summary>
-        /// <param name="buffer">缓冲区</param>
-        /// <param name="offset">偏移</param>
-        /// <param name="size"></param>
-        /// <param name="remoteEP"></param>
-        public void Send(Byte[] buffer, Int32 offset = 0, Int32 size = 0, EndPoint remoteEP = null)
-        {
-            if (size <= 0) size = buffer.Length - offset;
-            var socket = Server;
-            if (socket.Connected)
-                socket.Send(buffer, offset, size, SocketFlags.None);
-            else
-                socket.SendTo(buffer, offset, size, SocketFlags.None, remoteEP);
-
-            //return this;
-        }
-        #endregion
-
-        #region 接收
-        /// <summary>接收数据</summary>
-        /// <returns></returns>
-        public Byte[] Receive()
-        {
-            //Byte[] buffer = new Byte[BufferSize];
-            //if (!Server.IsBound) Bind();
-
-            //Int32 size = Server.Receive(buffer);
-            //if (size <= 0) return null;
-
-            //Byte[] data = new Byte[size];
-            //Buffer.BlockCopy(buffer, 0, data, 0, size);
-            //return data;
-
-            throw new NotSupportedException();
-        }
-
-        /// <summary>接收字符串</summary>
-        /// <param name="encoding"></param>
-        /// <returns></returns>
-        public String ReceiveString(Encoding encoding = null)
-        {
-            //Byte[] buffer = Receive();
-            //if (buffer == null || buffer.Length < 1) return null;
-
-            //if (encoding == null) encoding = Encoding.UTF8;
-            //return encoding.GetString(buffer);
-
-            throw new NotSupportedException();
-        }
-        #endregion
-
-        #region 创建会话
-        /// <summary>为指定地址创建会话。对于无连接Socket，必须指定远程地址；对于有连接Socket，指定的远程地址将不起任何作用</summary>
-        /// <param name="remoteEP"></param>
-        /// <returns></returns>
-        ISocketSession CreateSession(IPEndPoint remoteEP = null)
-        {
-            if (!Server.Connected && remoteEP == null) throw new ArgumentNullException("remoteEP", "未连接Udp必须指定远程地址！");
-
-            return new UdpSession(this, remoteEP);
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/Udp/UdpSession.cs b/NewLife.Net/Udp/UdpSession.cs
deleted file mode 100644
index a9a4560850..0000000000
--- a/NewLife.Net/Udp/UdpSession.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-﻿using System;
-using System.IO;
-using System.Net;
-using System.Net.Sockets;
-using System.Text;
-using NewLife.Net.Common;
-using NewLife.Net.Sockets;
-
-namespace NewLife.Net.Udp
-{
-    class UdpSession : Netbase, ISocketSession
-    {
-        #region 属性
-        private Int32 _ID;
-        /// <summary>标识</summary>
-        public Int32 ID { get { return _ID; } set { _ID = value; } }
-
-        private ISocket _Host;
-        /// <summary>宿主</summary>
-        public ISocket Host { get { return _Host; } set { _Host = value; } }
-
-        /// <summary>协议</summary>
-        public ProtocolType ProtocolType { get { return ProtocolType.Udp; } }
-
-        private IPEndPoint _RemoteEndPoint;
-        /// <summary>远程地址</summary>
-        public IPEndPoint RemoteEndPoint { get { return _RemoteEndPoint; } set { _RemoteEndPoint = value; } }
-
-        private IPEndPoint _LocalEndPoint;
-        /// <summary>本地终结点</summary>
-        public IPEndPoint LocalEndPoint { get { return _LocalEndPoint ?? (_LocalEndPoint = Host.LocalEndPoint); } }
-
-        private NetUri _LocalUri;
-        /// <summary>本地地址</summary>
-        public NetUri LocalUri { get { return _LocalUri ?? (_LocalUri = new NetUri(ProtocolType, LocalEndPoint)); } }
-
-        private NetUri _RemoteUri;
-        /// <summary>远程地址</summary>
-        public NetUri RemoteUri { get { return _RemoteUri ?? (_RemoteUri = new NetUri(ProtocolType, RemoteEndPoint)); } }
-
-        private Boolean _Connected;
-        /// <summary>是否已连接</summary>
-        public Boolean Connected { get { return _Connected; } }
-
-        private Boolean _UseReceiveAsync;
-        /// <summary>是否使用异步接收</summary>
-        public Boolean UseReceiveAsync { get { return _UseReceiveAsync; } set { _UseReceiveAsync = value; } }
-        #endregion
-
-        #region 扩展属性
-        /// <summary>对象</summary>
-        IUdp Udp { get { return Host as IUdp; } }
-
-        private Stream _Stream;
-        /// <summary>会话数据流，供用户程序使用，内部不做处理。可用于解决Tcp粘包的问题，把多余的分片放入该数据流中。</summary>
-        public Stream Stream { get { return _Stream; } set { _Stream = value; } }
-        #endregion
-
-        #region 构造
-        public UdpSession(ISocket host, IPEndPoint remoteEP)
-        {
-            Host = host;
-            RemoteEndPoint = remoteEP;
-
-            var socket = host.Socket;
-            _Connected = socket.Connected;
-        }
-
-        protected override void OnDispose(bool disposing)
-        {
-            base.OnDispose(disposing);
-
-            var host = _Host;
-            // 如果是已连接的会话，可以销毁
-            if (host != null && Connected) _Host.Dispose();
-        }
-        #endregion
-
-        #region ISocketSession 成员
-
-        public ISocketSession Send(byte[] buffer, int offset = 0, int size = 0) { Udp.Send(buffer, offset, size, RemoteEndPoint); return this; }
-
-        public ISocketSession Send(Stream stream) { Udp.Send(stream, RemoteEndPoint); return this; }
-
-        public ISocketSession Send(string msg, Encoding encoding = null) { Udp.Send(msg, encoding, RemoteEndPoint); return this; }
-
-        public void ReceiveAsync()
-        {
-            UseReceiveAsync = true;
-            Udp.Received += new EventHandler<NetEventArgs>(Udp_Received);
-            Udp.ReceiveAsync();
-        }
-
-        void Udp_Received(object sender, NetEventArgs e)
-        {
-            // 判断是否当前远程地址
-            if (!Connected)
-            {
-                // 如果不是当前远程地址，则不触发已收到事件
-                if (e.RemoteEndPoint + "" != RemoteEndPoint + "") return;
-            }
-            if (Received != null) Received(this, new ReceivedEventArgs(e.GetStream()));
-        }
-
-        public byte[] Receive() { return Udp.Receive(); }
-
-        public string ReceiveString(Encoding encoding = null) { return Udp.ReceiveString(); }
-
-        public event EventHandler<ReceivedEventArgs> Received;
-
-        #endregion
-
-        #region 辅助
-        /// <summary>已重载。</summary>
-        /// <returns></returns>
-        public override string ToString()
-        {
-            var remote = RemoteEndPoint;
-            if (remote != null)
-                return String.Format("{0}://{1}=>{2}", ProtocolType, LocalEndPoint, remote);
-            else
-                return String.Format("{0}://{1}", ProtocolType, LocalEndPoint);
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/NewLife.Net/UpdateInfo.txt b/NewLife.Net/UpdateInfo.txt
deleted file mode 100644
index 8207f7481a..0000000000
--- a/NewLife.Net/UpdateInfo.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-﻿v3.1.2015.0511   增加日志服务器LogServer，用于接收网络日志
-
-v3.0.2014.1202   第三代网络库完成，回归APM模型，以简单为核心理念。网络基础测试通过，Tcp压力测试2w通过
-
-v2.3.2013.0917   Modbus数据存储增加不触发写入事件的索引器操作
-
-v2.3.2013.0716   升级Modbus协议，不再使用二进制序列化，保持和MF兼容
-
-v2.2.2012.0420   采用NetUri精简代理会话
-                 HttpProxy增加403缓存和静态文件缓存
-
-v2.1.2012.0411   精简核心结构，进一步完善网络模型
-
-v2.0.2012.0229   完全重构网络模型。划分为四层：Socket层、封装层ISocket、数据会话层ISocketSession、网络会话INetSession
-
-v1.7.2012.0209   完善串口服务器和DNS服务器
-
-v1.7.2011.1228   抽象网络接口，方便编写应用服务
-                 优化事件参数对象池，避免内存泄漏
-                 增加DNS协议解析
-                 设计代理服务器架构
-                 **经过几天的Echo压力测试，服务端连接数达到143711，CPU在1%~10%，内存WorkSet 523M，PrivateBytes 591M
-                 一系列测试表明，服务端似乎没有连接上限，每次测试都以客户端端口用完导致“队列已满”异常而告终。
-                 MS承认网络异步操作有内存泄漏，大量OverlappedData会留在内存，官方建议做法是减少异步操作。
-                 此外，360安全软件会导致网络性能变得很差，客户端很容易崩溃。
-
-v1.6.2011.0626   修正一个严重错误，TcpServer开始异步Accept时，不需要设置缓冲区，否则客户端连接后不会马上得到Accept事件，
-                 而必须等到第一个数据包的到来才触发，那时缓冲区里面同时带有第一个数据包的数据。
-
-v1.6.2011.0624   全面支持IPV6，并实现了隐式探测支持，只要用到IPV6的地址（本地和远程），就自动采用IPV6通信
-
-v1.5.2011.0413   改善NetServer，不再作为抽象基类，通过指定协议类型可直接创建Tcp/Udp服务器
-                 重写Echo服务器和数据流服务器，把Tcp/Udp的实现统一起来
-                 实现另外四个简单网络服务器
-
-v1.4.2010.1201   增加Socket数据流SocketStream
-                 增加Tcp和Udp数据流网络服务
-
-v1.3.2010.1107   使用SocketAsyncEventArgs重建网络模型
-                 2010-11-16 调整完成，基本上满足万级连接下工作的要求，一万以上连接需要服务器拥有更多的处理器核心，硬件越强，程序工作越强！
-
-v1.2.2010.0915   优化读写内存流ReadWriteStream，增加读写阻塞和超时、超大时自动压缩缓冲区的功能
-
-v1.1.2010.0816   增加增强的TCP客户端TcpClientEx，使用内存流解决粘包问题
-
-v1.0.2010.0803   创建网络库
-
-
-历史背景：
-2005年做过一个Http反向代理HttpProxy，后来发展成为网络中间件（网络数据交换机）XProxy。
-多年的更新中发现，很多网络操作可以抽象出来，使得更接近上层，方便扩展使用。
\ No newline at end of file
diff --git "a/NewLife.Net/\345\217\221\345\270\203NuGet.cs" "b/NewLife.Net/\345\217\221\345\270\203NuGet.cs"
deleted file mode 100644
index d8694f4fce..0000000000
--- "a/NewLife.Net/\345\217\221\345\270\203NuGet.cs"
+++ /dev/null
@@ -1 +0,0 @@
-//include=..\发布NuGet.cs
\ No newline at end of file
diff --git "a/NewLife.Net/\346\236\266\346\236\204\350\256\276\350\256\241/NewLife_SocketClient.jpg" "b/NewLife.Net/\346\236\266\346\236\204\350\256\276\350\256\241/NewLife_SocketClient.jpg"
deleted file mode 100644
index 271768120d..0000000000
Binary files "a/NewLife.Net/\346\236\266\346\236\204\350\256\276\350\256\241/NewLife_SocketClient.jpg" and /dev/null differ
diff --git "a/NewLife.Net/\346\236\266\346\236\204\350\256\276\350\256\241/NewLife_TCP\347\212\266\346\200\201\345\217\230\350\277\201.jpg" "b/NewLife.Net/\346\236\266\346\236\204\350\256\276\350\256\241/NewLife_TCP\347\212\266\346\200\201\345\217\230\350\277\201.jpg"
deleted file mode 100644
index dedd168bb0..0000000000
Binary files "a/NewLife.Net/\346\236\266\346\236\204\350\256\276\350\256\241/NewLife_TCP\347\212\266\346\200\201\345\217\230\350\277\201.jpg" and /dev/null differ
diff --git "a/NewLife.Net/\346\236\266\346\236\204\350\256\276\350\256\241/NewLife_TcpServer.jpg" "b/NewLife.Net/\346\236\266\346\236\204\350\256\276\350\256\241/NewLife_TcpServer.jpg"
deleted file mode 100644
index ce874bd137..0000000000
Binary files "a/NewLife.Net/\346\236\266\346\236\204\350\256\276\350\256\241/NewLife_TcpServer.jpg" and /dev/null differ
diff --git "a/NewLife.Net/\346\236\266\346\236\204\350\256\276\350\256\241/NewLife_UdpServer.jpg" "b/NewLife.Net/\346\236\266\346\236\204\350\256\276\350\256\241/NewLife_UdpServer.jpg"
deleted file mode 100644
index cafe5ba2cb..0000000000
Binary files "a/NewLife.Net/\346\236\266\346\236\204\350\256\276\350\256\241/NewLife_UdpServer.jpg" and /dev/null differ
diff --git "a/NewLife.Net/\346\236\266\346\236\204\350\256\276\350\256\241/\347\275\221\347\273\234\346\250\241\345\236\213.cd" "b/NewLife.Net/\346\236\266\346\236\204\350\256\276\350\256\241/\347\275\221\347\273\234\346\250\241\345\236\213.cd"
deleted file mode 100644
index 81862c20f8..0000000000
--- "a/NewLife.Net/\346\236\266\346\236\204\350\256\276\350\256\241/\347\275\221\347\273\234\346\250\241\345\236\213.cd"
+++ /dev/null
@@ -1,207 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<ClassDiagram MajorVersion="1" MinorVersion="1">
-  <Class Name="NewLife.Net.Sockets.SocketClient">
-    <Position X="16.5" Y="7.25" Width="1.75" />
-    <Compartments>
-      <Compartment Name="Fields" Collapsed="true" />
-    </Compartments>
-    <TypeIdentifier>
-      <HashCode>AAAAACABAAAQABAEAAAAAIAAAIAAAAAQABABAAAAAAQ=</HashCode>
-      <FileName>Sockets\SocketClient.cs</FileName>
-    </TypeIdentifier>
-    <Lollipop Position="0.2" />
-  </Class>
-  <Class Name="NewLife.Net.Sockets.SocketServer">
-    <Position X="10.5" Y="7.25" Width="2" />
-    <Compartments>
-      <Compartment Name="Fields" Collapsed="true" />
-    </Compartments>
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAACCAAAAAEAAQAAAAAAAAAAAgIEAAAgAAAAA=</HashCode>
-      <FileName>Sockets\SocketServer.cs</FileName>
-    </TypeIdentifier>
-    <Lollipop Position="0.2" />
-  </Class>
-  <Class Name="NewLife.Net.Tcp.TcpServer">
-    <Position X="9.25" Y="11.25" Width="1.75" />
-    <Compartments>
-      <Compartment Name="Fields" Collapsed="true" />
-    </Compartments>
-    <TypeIdentifier>
-      <HashCode>AABCQCEAACAAABAAEDAgAAAgAAAIAAAAMCAgoAAAAAA=</HashCode>
-      <FileName>Tcp\TcpServer.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="NewLife.Net.Udp.UdpServer">
-    <Position X="11.75" Y="11.25" Width="2" />
-    <Compartments>
-      <Compartment Name="Fields" Collapsed="true" />
-    </Compartments>
-    <TypeIdentifier>
-      <HashCode>AAAAACABAAAQABAAEEAAAAAAAIAAAAAQABAhAAAAAAA=</HashCode>
-      <FileName>Udp\UdpServer.cs</FileName>
-    </TypeIdentifier>
-    <Lollipop Position="0.2" />
-  </Class>
-  <Class Name="NewLife.Net.Sockets.SocketBase">
-    <Position X="13.75" Y="4.75" Width="2" />
-    <Compartments>
-      <Compartment Name="Fields" Collapsed="true" />
-      <Compartment Name="Properties" Collapsed="true" />
-      <Compartment Name="Methods" Collapsed="true" />
-      <Compartment Name="Events" Collapsed="true" />
-    </Compartments>
-    <TypeIdentifier>
-      <HashCode>AEAChCUAAnCAKQIECgAgESAQLSCAAQAKAQGgiBCACgE=</HashCode>
-      <FileName>Sockets\SocketBase.cs</FileName>
-    </TypeIdentifier>
-    <Lollipop Position="0.2" />
-  </Class>
-  <Class Name="NewLife.Net.Tcp.TcpClientX">
-    <Position X="14.5" Y="12" Width="3" />
-    <Compartments>
-      <Compartment Name="Fields" Collapsed="true" />
-    </Compartments>
-    <TypeIdentifier>
-      <HashCode>ggAAACIBACAQABBAAEAoAAAAABAJAAAgADAjAJAEAAA=</HashCode>
-      <FileName>Tcp\TcpClientX.cs</FileName>
-    </TypeIdentifier>
-    <Lollipop Position="0.2" />
-  </Class>
-  <Class Name="NewLife.Net.Udp.UdpClientX">
-    <Position X="18.25" Y="12" Width="1.75" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAACAABAAAEAAAAAAAAAAAAAgABAgAAAAAAA=</HashCode>
-      <FileName>Udp\UdpClientX.cs</FileName>
-    </TypeIdentifier>
-    <Lollipop Position="0.2" />
-  </Class>
-  <Class Name="NewLife.Net.Sockets.NetServer">
-    <Position X="10" Y="0.75" Width="2" />
-    <Compartments>
-      <Compartment Name="Fields" Collapsed="true" />
-      <Compartment Name="Properties" Collapsed="true" />
-      <Compartment Name="Methods" Collapsed="true" />
-      <Compartment Name="Events" Collapsed="true" />
-    </Compartments>
-    <TypeIdentifier>
-      <HashCode>AAAKQIABACCAABAEECggIEQICAAIABAiYFAgAwAEiBE=</HashCode>
-      <FileName>Sockets\NetServer.cs</FileName>
-    </TypeIdentifier>
-    <Lollipop Position="0.2" />
-  </Class>
-  <Class Name="NewLife.Net.Application.ChargenServer" Collapsed="true">
-    <Position X="3.5" Y="3.25" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAACAAAAIAEAAAABAAAEAAAAAAAEAAQAAgAA=</HashCode>
-      <FileName>Application\ChargenServer.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="NewLife.Net.Application.DaytimeServer" Collapsed="true">
-    <Position X="5.75" Y="3.25" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAA=</HashCode>
-      <FileName>Application\DaytimeServer.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="NewLife.Net.Application.DiscardServer" Collapsed="true">
-    <Position X="8" Y="3.25" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAA=</HashCode>
-      <FileName>Application\DiscardServer.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="NewLife.Net.Application.EchoServer" Collapsed="true">
-    <Position X="10.25" Y="3.25" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAA=</HashCode>
-      <FileName>Application\EchoServer.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="NewLife.Net.Application.StreamServer" Collapsed="true">
-    <Position X="12.5" Y="3.25" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAIAAAAAAAAQAAAAAAAAAAAAAAAgAAAAAAAAQAAAAA=</HashCode>
-      <FileName>Application\StreamServer.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="NewLife.Net.Application.TimeServer" Collapsed="true">
-    <Position X="14.75" Y="3.25" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAgAA=</HashCode>
-      <FileName>Application\TimeServer.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="NewLife.Net.IO.FileServer" Collapsed="true">
-    <Position X="17" Y="3.25" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>gAAIAAAABAAAAAAAAAAAEAAEAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>IO\FileServer.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="System.Net.Sockets.Socket" Collapsed="true">
-    <Position X="21" Y="0.75" Width="1.5" />
-    <TypeIdentifier />
-    <Lollipop Position="0.2" />
-  </Class>
-  <Interface Name="NewLife.Net.Proxy.IProxySession">
-    <Position X="10" Y="4.75" Width="2" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAKAAQAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Proxy\IProxySession.cs</FileName>
-    </TypeIdentifier>
-    <ShowAsAssociation>
-      <Property Name="Proxy" />
-      <Property Name="Remote" />
-    </ShowAsAssociation>
-  </Interface>
-  <Interface Name="NewLife.Net.Proxy.IProxy">
-    <Position X="13.25" Y="8.25" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Proxy\IProxy.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Interface Name="NewLife.Net.Sockets.ISocketClient">
-    <Position X="5.25" Y="9.25" Width="1.75" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAABAAAAABAAAAAAAIAAAIAAAAAQABAAAAAAAAQ=</HashCode>
-      <FileName>Sockets\ISocketClient.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Interface Name="NewLife.Net.Sockets.ISocketServer">
-    <Position X="3" Y="9.25" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAgAAAAA=</HashCode>
-      <FileName>Sockets\ISocketServer.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Interface Name="NewLife.Net.Sockets.ISocketSession">
-    <Position X="7" Y="5" Width="1.75" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAABAAAAgAAAAEAAAAAAAIAICAAQABAAABAAAAA=</HashCode>
-      <FileName>Sockets\ISocketSession.cs</FileName>
-    </TypeIdentifier>
-    <ShowAsAssociation>
-      <Property Name="Host" />
-    </ShowAsAssociation>
-  </Interface>
-  <Interface Name="NewLife.Net.Sockets.ISocket">
-    <Position X="4" Y="4.75" Width="2" />
-    <TypeIdentifier>
-      <HashCode>AAACgAAAAAAAIQIEAAAAAAAACAAAAQACAAAgAACAAAE=</HashCode>
-      <FileName>Sockets\ISocket.cs</FileName>
-    </TypeIdentifier>
-    <ShowAsAssociation>
-      <Property Name="Statistics" />
-    </ShowAsAssociation>
-  </Interface>
-  <Interface Name="NewLife.Net.Common.IStatistics">
-    <Position X="1" Y="5" Width="1.75" />
-    <TypeIdentifier>
-      <HashCode>AAAAEAAQAAAAAQAAIAAACAAAAAACQAAAAAASAAgAAAA=</HashCode>
-      <FileName>Common\IStatistics.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Font Name="微软雅黑" Size="9" />
-</ClassDiagram>
\ No newline at end of file
diff --git "a/NewLife.Net/\350\257\264\346\230\216.txt" "b/NewLife.Net/\350\257\264\346\230\216.txt"
deleted file mode 100644
index 1efc4ffc14..0000000000
--- "a/NewLife.Net/\350\257\264\346\230\216.txt"
+++ /dev/null
@@ -1,26 +0,0 @@
-﻿2012-06-01
-1，将来的网络架构可以这样考虑，客户端到服务端采用请求响应的问答方式，同时也尽量支持服务端主动向客户端推送
-
-2012-04-24
-1，考虑增加一个网络事件队列，对于不准时回到池中的网络事件，一律销毁Dispose
-2，可尝试强行调用 FreeOverlapped
-
-2012-03-15
-1，网络模块产生内存泄漏的原因来自于异步操作既不失败也不完成，大量网络事件参数遗留在Root上，可用OverlapedData入手解决。
-
-2012-02-29
-整个网络模型，划分为四层：
-1，最底层当然是系统的Socket了
-2，第二层是Sockets中所包装的各个ISocket实现，包括TcpClientX、TcpServer、UdpClientX、UdpServer，各种事件采用NetEventArgs
-3，第三层是ISocketSession，实现了建立连接后的会话，仅负责收发数据，数据到达事件采用DataReceiveEventArgs
-4，第四层是网络应用层，包括NetServer和INetSession，只跟几大接口相关：ISocketServer、ISocketSession
-
-ISocketSession重点用于客户端，而服务端业务更多采用INetSession。
-
-2011-10-10
-1，考虑实现Web服务器，甚至支持ASP.Net。
-2，最好支持两种方式：HttpListener、自己监听Tcp端口处理数据。前者将有系统内核的http.sys监听端口。
-
-2011-09-07
-1，考虑改进NetServer，让其支持同时用IPv4和IPv6。甚至可以考虑同时用Tcp和Udp。
-2，考虑实现Http协议，参考WebDev实现ASP.Net的Web服务器
\ No newline at end of file
diff --git a/XCoder/App.config b/XCoder/App.config
deleted file mode 100644
index cc400cea84..0000000000
--- a/XCoder/App.config
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <appSettings>
-    <add key="EnableWindowsFormsHighDpiAutoResizing" value="true"/>
-  </appSettings>
-  <connectionStrings>
-    <add name="mssql" connectionString="Data Source=S3;Initial Catalog=master;user=sa;password=sa;" providerName="System.Data.SqlClient"/>
-    <add name="mssql2" connectionString="Data Source=.;Initial Catalog=master;Integrated Security=True;" providerName="System.Data.SqlClient"/>
-    <add name="Oracle" connectionString="Data Source=Tcp://10.10.20.104/ORCL;User Id=scott;Password=tiger;" providerName="System.Data.OracleClient"/>
-    <add name="Oracle2" connectionString="Data Source=orc;User ID=admin;Password=admin" providerName="System.Data.OracleClient"/>
-    <add name="sqlite" connectionString="Data Source=test.db;" providerName="Sqlite"/>
-    <add name="MySql" connectionString="Server=127.0.0.1;Port=3306;Database=mysql;Uid=root;Pwd=root;" providerName="MySql.Data.MySqlClient"/>
-    <add name="PostgreSQL" connectionString="Server=.;Database=master;Uid=root;Pwd=root;" providerName="PostgreSQL.Data.PostgreSQLClient"/>
-    <!--OLE DB Services=-1表示打开连接池-->
-    <add name="Access" connectionString="Provider=Microsoft.Jet.OLEDB.4.0; Data Source=~\App_Data\Test.mdb;Persist Security Info=False;OLE DB Services=-1" providerName="Access"/>
-    <add name="SqlCe" connectionString="Data Source=test.sdf;" providerName="SqlCe"/>
-  </connectionStrings>
-</configuration>
diff --git a/XCoder/Engine/Engine.cs b/XCoder/Engine/Engine.cs
deleted file mode 100644
index 344635090e..0000000000
--- a/XCoder/Engine/Engine.cs
+++ /dev/null
@@ -1,306 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using NewLife;
-using NewLife.Model;
-using NewLife.Reflection;
-using XCode.DataAccessLayer;
-using XTemplate.Templating;
-
-namespace XCoder
-{
-    /// <summary>代码生成引擎</summary>
-    public class Engine
-    {
-        #region 属性
-        public const String TemplatePath = "Template";
-
-        private static Dictionary<String, String> _Templates;
-        /// <summary>模版</summary>
-        public static Dictionary<String, String> Templates { get { return _Templates ?? (_Templates = Source.GetTemplates()); } }
-
-        private static List<String> _FileTemplates;
-        /// <summary>文件模版</summary>
-        public static List<String> FileTemplates
-        {
-            get
-            {
-                if (_FileTemplates == null)
-                {
-                    var list = new List<String>();
-
-                    var dir = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, TemplatePath);
-                    if (Directory.Exists(dir))
-                    {
-                        var ds = Directory.GetDirectories(dir);
-                        if (ds != null && ds.Length > 0)
-                        {
-                            foreach (var item in ds)
-                            {
-                                var di = new DirectoryInfo(item);
-                                list.Add(di.Name);
-                            }
-                        }
-                    }
-                    _FileTemplates = list.OrderBy(e => e).ToList();
-                }
-                return _FileTemplates;
-            }
-        }
-
-        public Engine(ModelConfig config)
-        {
-            Config = config;
-        }
-
-        private ModelConfig _Config;
-        /// <summary>配置</summary>
-        public ModelConfig Config { get { return _Config; } set { _Config = value; } }
-
-        //private String _LastTableKey;
-        //private List<IDataTable> _LastTables;
-        private List<IDataTable> _Tables;
-        /// <summary>所有表</summary>
-        public List<IDataTable> Tables
-        {
-            get
-            {
-                //if (!Config.NeedFix) return _Tables;
-
-                //// 不同的前缀、大小写选项，得到的表集合是不一样的。这里用字典来缓存
-                //var key = String.Format("{0}_{1}_{2}_{3}_{4}", Config.AutoCutPrefix, Config.AutoCutTableName, Config.AutoFixWord, Config.Prefix, Config.UseID);
-                ////return _cache.GetItem(key, k => FixTable(_Tables));
-                //if (_LastTableKey != key)
-                //{
-                //    _LastTables = FixTable(_Tables);
-                //    _LastTableKey = key;
-                //}
-                //return _LastTables;
-                return _Tables;
-            }
-            set { _Tables = value; }
-        }
-
-        //private static ITranslate _Translate;
-        ///// <summary>翻译接口</summary>
-        //static ITranslate Translate { get { return _Translate ?? (_Translate = new NnhyServiceTranslate()); } }
-        #endregion
-
-        #region 构造
-        static Engine()
-        {
-            Template.BaseClassName = typeof(XCoderBase).FullName;
-        }
-        #endregion
-
-        #region 生成
-        /// <summary>生成代码，参数由Config传入</summary>
-        /// <param name="tableName"></param>
-        /// <returns></returns>
-        public String[] Render(String tableName)
-        {
-            var tables = Tables;
-            if (tables == null || tables.Count < 1) return null;
-
-            //var table = tables.Find(e => e.Name.EqualIC(tableName) || e.TableName.EqualIC(tableName));
-            var table = tables.Find(e => tableName.EqualIgnoreCase(e.Name, e.TableName));
-            if (table == null) return null;
-
-            return Render(table);
-        }
-
-        public String[] Render(IDataTable table)
-        {
-            // 检查表格完整性
-            foreach (var dc in table.Columns)
-            {
-                if (dc.DataType == null) throw new ArgumentException("{0}.DataType数据类型错误".F(dc.Name), dc.Name);
-            }
-
-            var data = new Dictionary<String, Object>(StringComparer.OrdinalIgnoreCase);
-            //data["Config"] = Config;
-            data["Tables"] = Tables;
-            data["Table"] = table;
-
-            #region 配置
-            // 复制表属性到配置
-            var cfg = new ModelConfig();
-            foreach (var pi in cfg.GetType().GetProperties(true))
-            {
-                if (table.Properties.ContainsKey(pi.Name))
-                    cfg.SetValue(pi, table.Properties[pi.Name]);
-                else
-                    cfg.SetValue(pi, Config.GetValue(pi));
-            }
-
-            #region 命名空间处理
-            var NameSpace = cfg.NameSpace;
-            var reg = new Regex(@"\$\((\w+)\)", RegexOptions.Compiled);
-            NameSpace = reg.Replace(NameSpace, math =>
-            {
-                var key = math.Groups[1].Value;
-                if (String.IsNullOrEmpty(key)) return null;
-
-                var pix = typeof(IDataTable).GetPropertyEx(key);
-                if (pix != null)
-                    return (String)table.GetValue(pix);
-                else
-                    return table.Properties[key];
-            });
-            NewLife.Log.XTrace.WriteLine("NameSpace" + Config.NameSpace + "@" + NameSpace);
-            cfg.NameSpace = NameSpace;
-            #endregion
-
-            data["Config"] = cfg;
-            #endregion
-
-            #region 模版预处理
-            // 声明模版引擎
-            //Template tt = new Template();
-            Template.Debug = Config.Debug;
-            var templates = new Dictionary<String, String>();
-            // 每一个模版的编码，用于作为输出文件的编码
-            var encs = new List<Encoding>();
-
-            var tempName = Config.TemplateName;
-            var tempKind = "";
-            var p = tempName.IndexOf(']');
-            if (p >= 0)
-            {
-                tempKind = tempName.Substring(0, p + 1);
-                tempName = tempName.Substring(p + 1);
-            }
-            if (tempKind == "[内置]")
-            {
-                // 系统模版
-                foreach (var item in Templates)
-                {
-                    var key = item.Key;
-                    var name = key.Substring(0, key.IndexOf("."));
-                    if (name != tempName) continue;
-
-                    var content = item.Value;
-
-                    // 添加文件头
-                    if (Config.UseHeadTemplate && !String.IsNullOrEmpty(Config.HeadTemplate) && key.EndsWithIgnoreCase(".cs"))
-                        content = Config.HeadTemplate + content;
-
-                    templates.Add(key.Substring(name.Length + 1), content);
-                    encs.Add(Encoding.UTF8);
-                }
-            }
-            else
-            {
-                // 文件模版
-                //var dir = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, TemplatePath);
-                //dir = Path.Combine(dir, tempName);
-                var dir = TemplatePath.GetFullPath().CombinePath(tempName);
-                if (!Directory.Exists(dir)) throw new XException("找不到模版目录{0}，没有可用模版！", dir);
-
-                var ss = Directory.GetFiles(dir, "*.*", SearchOption.TopDirectoryOnly);
-                if (ss != null && ss.Length > 0)
-                {
-                    foreach (var item in ss)
-                    {
-                        if (item.EndsWithIgnoreCase("scc")) continue;
-
-                        var content = File.ReadAllText(item);
-
-                        var name = item.Substring(dir.Length);
-                        if (name.StartsWith(@"\")) name = name.Substring(1);
-
-                        // 添加文件头
-                        if (Config.UseHeadTemplate && !String.IsNullOrEmpty(Config.HeadTemplate) && name.EndsWithIgnoreCase(".cs"))
-                            content = Config.HeadTemplate + content;
-
-                        templates.Add(name, content);
-                        encs.Add(GetEncoding(item));
-                    }
-                }
-            }
-            if (templates.Count < 1) throw new Exception("没有可用模版！");
-
-            var tt = Template.Create(templates);
-            if (tempName.StartsWith("*")) tempName = tempName.Substring(1);
-            tt.AssemblyName = tempName;
-            #endregion
-
-            #region 输出目录预处理
-            var outpath = Config.OutputPath;
-            // 使用正则替换处理 命名空间处已经定义
-            //var reg = new Regex(@"\$\((\w+)\)", RegexOptions.Compiled);
-            outpath = reg.Replace(outpath, math =>
-            {
-                var key = math.Groups[1].Value;
-                if (String.IsNullOrEmpty(key)) return null;
-
-                var pix = typeof(IDataTable).GetPropertyEx(key);
-                if (pix != null)
-                    return (String)table.GetValue(pix);
-                else
-                    return table.Properties[key];
-            });
-            #endregion
-
-            #region 编译生成
-            // 编译模版。这里至少要处理，只有经过了处理，才知道模版项是不是被包含的
-            tt.Compile();
-
-            var rs = new List<String>();
-            var i = -1;
-            foreach (var item in tt.Templates)
-            {
-                i++;
-                if (item.Included) continue;
-
-                // 计算输出文件名
-                var fileName = Path.GetFileName(item.Name);
-                var fname = Config.UseCNFileName ? table.DisplayName : table.Name;
-                fname = fname.Replace("/", "_").Replace("\\", "_").Replace("?", null);
-                // 如果中文名无效，采用英文名
-                if (String.IsNullOrEmpty(Path.GetFileNameWithoutExtension(fname)) || fname[0] == '.') fname = table.Name;
-                fileName = fileName.Replace("类名", fname).Replace("中文名", fname).Replace("连接名", Config.EntityConnName);
-
-                fileName = Path.Combine(outpath, fileName);
-
-                // 如果不覆盖，并且目标文件已存在，则跳过
-                if (!Config.Override && File.Exists(fileName)) continue;
-
-                var content = tt.Render(item.Name, data);
-
-                var dir = Path.GetDirectoryName(fileName);
-                if (!String.IsNullOrEmpty(dir) && !Directory.Exists(dir)) Directory.CreateDirectory(dir);
-                //File.WriteAllText(fileName, content, Encoding.UTF8);
-                // 将文件保存为utf-8无bom格式
-                //File.WriteAllText(fileName, content, new UTF8Encoding(false));
-
-                // aspx页面如果不是UTF8编码，很有可能出现页面中文乱码，CMX生成的页面文件出现该情况
-                // 使用模版文件本身的文件编码来作为输出文件的编码，默认UTF8
-                File.WriteAllText(fileName, content, encs[i]);
-
-                rs.Add(content);
-            }
-            return rs.ToArray();
-            #endregion
-        }
-        #endregion
-
-        #region 辅助
-        /// <summary>获取文件编码</summary>
-        /// <param name="file"></param>
-        /// <returns></returns>
-        static Encoding GetEncoding(String file)
-        {
-            if (String.IsNullOrEmpty(file) || !File.Exists(file)) return Encoding.UTF8;
-
-            using (var reader = new StreamReader(file, Encoding.UTF8, true))
-            {
-                return reader.CurrentEncoding;
-            }
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/XCoder/Engine/FileSource.cs b/XCoder/Engine/FileSource.cs
deleted file mode 100644
index 96d78b4449..0000000000
--- a/XCoder/Engine/FileSource.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Windows.Forms;
-
-namespace XCoder
-{
-    /// <summary>文件资源</summary>
-    public static class Source
-    {
-        public static Icon GetIcon()
-        {
-            try
-            {
-                return new Icon(Assembly.GetExecutingAssembly().GetManifestResourceStream(typeof(Source), "leaf.ico"));
-            }
-            catch { return null; }
-        }
-
-        public static String GetText(String name)
-        {
-            if (Path.GetExtension(name).IsNullOrWhiteSpace()) name += ".txt";
-            var ms = Assembly.GetExecutingAssembly().GetManifestResourceStream(typeof(Source), name);
-            return ms.ToStr();
-        }
-
-        public static void ReleaseAllTemplateFiles()
-        {
-            var path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, Engine.TemplatePath);
-            var dic = GetTemplates();
-
-            foreach (var item in dic.Keys)
-            {
-                // 第一层是目录，然后是文件
-                var dir = item.Substring(0, item.IndexOf("."));
-                var file = item.Substring(dir.Length + 1);
-
-                dir = Path.Combine(path, dir);
-                file = Path.Combine(dir, file);
-
-                if (!String.IsNullOrEmpty(dir) && !Directory.Exists(dir)) Directory.CreateDirectory(dir);
-                File.WriteAllText(file, dic[item]);
-            }
-        }
-
-        /// <summary>释放模版文件</summary>
-        public static Dictionary<String, String> GetTemplates()
-        {
-            var ss = Assembly.GetExecutingAssembly().GetManifestResourceNames();
-            if (ss == null || ss.Length <= 0) return null;
-
-            var dic = new Dictionary<String, String>();
-
-            //找到资源名
-            foreach (var item in ss)
-            {
-                if (item.StartsWith("XCoder.App."))
-                {
-                    ReleaseFile(item, "XCoder.exe.config");
-                }
-                else if (item.StartsWith("XCoder.Template."))
-                {
-                    var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream(item);
-                    var tempName = item.Substring("XCoder.Template.".Length);
-                    var buffer = new Byte[stream.Length];
-                    var count = stream.Read(buffer, 0, buffer.Length);
-
-                    var content = Encoding.UTF8.GetString(buffer, 0, count);
-                    dic.Add(tempName, content);
-                }
-            }
-
-            return dic.OrderBy(e => e.Key).ToDictionary(e => e.Key, e => e.Value);
-        }
-
-        /// <summary>读取资源，并写入到文件</summary>
-        /// <param name="name">名称</param>
-        /// <param name="fileName"></param>
-        public static void ReleaseFile(String name, String fileName)
-        {
-            fileName = fileName.GetFullPath();
-            if (String.IsNullOrEmpty(fileName) || File.Exists(fileName)) return;
-
-            try
-            {
-                var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream(name);
-                if (stream == null) return;
-
-                var buffer = new Byte[stream.Length];
-                var count = stream.Read(buffer, 0, buffer.Length);
-
-                fileName = fileName.GetFullPath();
-                var p = Path.GetDirectoryName(fileName);
-                if (!String.IsNullOrEmpty(p) && !Directory.Exists(p)) Directory.CreateDirectory(p);
-
-                File.WriteAllBytes(fileName, buffer);
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.ToString());
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/XCoder/Engine/IcoHelper.cs b/XCoder/Engine/IcoHelper.cs
deleted file mode 100644
index 077bc41b86..0000000000
--- a/XCoder/Engine/IcoHelper.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-﻿using System;
-using System.Drawing;
-using System.IO;
-using NewLife.IO;
-using XICO;
-
-namespace XCoder
-{
-    class IcoHelper
-    {
-        public static Icon GetIcon(String name)
-        {
-            try
-            {
-                var src = FileSource.GetFileResource(null, "leaf.png");
-                if (src == null) return null;
-
-                using (var bmp = new Bitmap(src))
-                {
-                    using (var water = MakeWater(bmp, name, true))
-                    {
-                        var ms = new MemoryStream();
-                        IconFile.Convert(water, ms, new Int32[] { 32 }, new Int32[] { 32 });
-                        ms.Position = 0;
-
-                        return new Icon(ms);
-                    }
-                }
-            }
-            catch { return null; }
-        }
-
-        static Image MakeWater(Image bmp, String txt, Boolean fitSize)
-        {
-            var brush = new SolidBrush(Color.FromArgb(255, 128, 0));
-
-            if (fitSize && bmp.Width > 256)
-                bmp = new Bitmap(bmp, 256, 256);
-            else
-                bmp = new Bitmap(bmp);
-
-            if (!String.IsNullOrEmpty(txt))
-            {
-                var ft = new Font("微软雅黑", 96, FontStyle.Bold);
-
-                var g = Graphics.FromImage(bmp);
-                g.DrawString(txt, ft, brush, -23, 100);
-                g.Dispose();
-            }
-
-            return bmp;
-        }
-    }
-}
\ No newline at end of file
diff --git a/XCoder/Engine/ModelConfig.cs b/XCoder/Engine/ModelConfig.cs
deleted file mode 100644
index c490f1e9ab..0000000000
--- a/XCoder/Engine/ModelConfig.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using NewLife.Xml;
-
-namespace XCoder
-{
-    [XmlConfigFile("Config\\Model.config")]
-    public class ModelConfig : XmlConfig<ModelConfig>
-    {
-        #region 属性
-        /// <summary>链接名</summary>
-        [DisplayName("链接名")]
-        public String ConnName { get; set; } = "ConnName";
-
-        //private String _Prefix;
-        ///// <summary>前缀</summary>
-        //[DisplayName("前缀")]
-        //public String Prefix { get { return _Prefix; } set { _Prefix = value; } }
-
-        private String _NameSpace;
-        /// <summary>命名空间</summary>
-        [DisplayName("命名空间")]
-        public String NameSpace
-        {
-            get { return String.IsNullOrEmpty(_NameSpace) ? EntityConnName : _NameSpace; }
-            set { _NameSpace = value; }
-        }
-
-        /// <summary>模板名</summary>
-        [DisplayName("模板名")]
-        public String TemplateName { get; set; }
-
-        private String _OutputPath;
-        /// <summary>输出目录</summary>
-        [DisplayName("输出目录")]
-        public String OutputPath
-        {
-            get { return String.IsNullOrEmpty(_OutputPath) ? EntityConnName : _OutputPath; }
-            set { _OutputPath = value; }
-        }
-
-        /// <summary>是否覆盖目标文件</summary>
-        [DisplayName("是否覆盖目标文件")]
-        public Boolean Override { get; set; } = true;
-
-        private String _EntityConnName;
-        /// <summary>实体链接名</summary>
-        [DisplayName("实体链接名")]
-        public String EntityConnName
-        {
-            get { return String.IsNullOrEmpty(_EntityConnName) ? ConnName : _EntityConnName; }
-            set { _EntityConnName = value; }
-        }
-
-        private String _BaseClass;
-        /// <summary>实体基类</summary>
-        [DisplayName("实体基类")]
-        public String BaseClass
-        {
-            get
-            {
-                if (String.IsNullOrEmpty(_BaseClass)) _BaseClass = "Entity";
-                return _BaseClass;
-            }
-            set { _BaseClass = value; }
-        }
-
-        /// <summary>生成泛型实体类</summary>
-        [DisplayName("生成泛型实体类")]
-        public Boolean RenderGenEntity { get; set; }
-
-        //private Boolean _NeedFix = true;
-        ///// <summary>是否需要修正。默认true，将根据配置删除前缀、自动化大小写和完善注释等</summary>
-        //[DisplayName("是否需要修正。默认true，将根据配置删除前缀、自动化大小写和完善注释等")]
-        //public Boolean NeedFix { get { return _NeedFix; } set { _NeedFix = value; } }
-
-        //private Boolean _AutoCutPrefix;
-        ///// <summary>自动去除前缀</summary>
-        //[DisplayName("自动去除前缀")]
-        //public Boolean AutoCutPrefix
-        //{
-        //    get { return _AutoCutPrefix; }
-        //    set { _AutoCutPrefix = value; }
-        //}
-
-        //private Boolean _CutTableName;
-        ///// <summary>是否自动去除字段前面的表名</summary>
-        //[DisplayName("是否自动去除字段前面的表名")]
-        //public Boolean AutoCutTableName { get { return _CutTableName; } set { _CutTableName = value; } }
-
-        //private Boolean _AutoFixWord;
-        ///// <summary>自动纠正大小写</summary>
-        //[DisplayName("自动纠正大小写")]
-        //public Boolean AutoFixWord
-        //{
-        //    get { return _AutoFixWord; }
-        //    set { _AutoFixWord = value; }
-        //}
-
-        /// <summary>使用中文文件名</summary>
-        [DisplayName("使用中文文件名")]
-        public Boolean UseCNFileName { get; set; }
-
-        //private Boolean _UseID;
-        ///// <summary>强制使用ID</summary>
-        //[DisplayName("强制使用ID")]
-        //public Boolean UseID { get { return _UseID; } set { _UseID = value; } }
-
-        /// <summary>使用头部模版</summary>
-        [DisplayName("使用头部模版")]
-        public Boolean UseHeadTemplate { get; set; }
-
-        /// <summary>头部模版</summary>
-        [DisplayName("头部模版")]
-        public String HeadTemplate { get; set; }
-
-        /// <summary>调试</summary>
-        [DisplayName("调试")]
-        public Boolean Debug { get; set; }
-
-        /// <summary> 字典属性</summary>
-        [DisplayName("数据字典")]
-        public SerializableDictionary<String, String> Items { get; set; } = new SerializableDictionary<String, String>();
-        #endregion
-
-        #region 加载/保存
-        public ModelConfig()
-        {
-            var sb = new StringBuilder();
-            sb.AppendLine("/*");
-            sb.AppendLine(" * XCoder v<#=Version#>");
-            sb.AppendLine(" * 作者：<#=Environment.UserName + \"/\" + Environment.MachineName#>");
-            sb.AppendLine(" * 时间：<#=DateTime.Now.ToString(\"yyyy-MM-dd HH:mm:ss\")#>");
-            sb.AppendLine(" * 版权：版权所有 (C) 新生命开发团队 2002~<#=DateTime.Now.ToString(\"yyyy\")#>");
-            sb.AppendLine("*/");
-            HeadTemplate = sb.ToString();
-        }
-        #endregion
-    }
-}
diff --git a/XCoder/Engine/UIConfig.cs b/XCoder/Engine/UIConfig.cs
deleted file mode 100644
index 0788290da5..0000000000
--- a/XCoder/Engine/UIConfig.cs
+++ /dev/null
@@ -1,210 +0,0 @@
-﻿using System;
-using System.Drawing;
-using System.IO;
-using System.Windows.Forms;
-using NewLife.Net;
-using NewLife.Serialization;
-
-namespace XCoder
-{
-    /// <summary>界面配置</summary>
-    class UIConfig
-    {
-        #region 属性
-        private Font _Font;
-        /// <summary>字体</summary>
-        public Font Font { get { return _Font; } set { _Font = value; } }
-
-        private Color _BackColor;
-        /// <summary>背景颜色</summary>
-        public Color BackColor { get { return _BackColor; } set { _BackColor = value; } }
-
-        private Color _ForeColor;
-        /// <summary>前景颜色</summary>
-        public Color ForeColor { get { return _ForeColor; } set { _ForeColor = value; } }
-        #endregion
-
-        private static UIConfig _Current;
-        /// <summary>当前配置</summary>
-        public static UIConfig Current
-        {
-            get
-            {
-                if (_Current == null) _Current = Load() ?? new UIConfig();
-                return _Current;
-            }
-        }
-
-        public static UIConfig Load()
-        {
-            var cfg = XConfig.Current;
-            if (cfg.Extend.IsNullOrWhiteSpace()) return null;
-
-            Byte[] buf = null;
-            try
-            {
-                buf = cfg.Extend.ToBase64();
-            }
-            catch { return null; }
-
-            var ms = new MemoryStream(buf);
-
-            var binary = new Binary();
-            binary.EncodeInt = true;
-            binary.AddHandler<BinaryFont>(11);
-            binary.AddHandler<BinaryColor>(12);
-            binary.AddHandler<BinaryUnknown>(20);
-            binary.Stream = ms;
-
-            //binary.Debug = true;
-            //binary.EnableTrace();
-
-            try
-            {
-                return binary.Read(typeof(UIConfig)) as UIConfig;
-            }
-            catch { return null; }
-        }
-
-        public void Save()
-        {
-            var binary = new Binary();
-            binary.EncodeInt = true;
-            binary.AddHandler<BinaryFont>(11);
-            binary.AddHandler<BinaryColor>(12);
-            binary.AddHandler<BinaryUnknown>(20);
-
-            //binary.Debug = true;
-            //binary.EnableTrace();
-
-            binary.Write(this);
-
-            var cfg = XConfig.Current;
-            cfg.Extend = binary.GetBytes().ToBase64(0, 0, true);
-            cfg.Save();
-        }
-
-        public static UIConfig Apply(TextBoxBase txt)
-        {
-            // 加载颜色
-            var ui = UIConfig.Load();
-            if (ui != null)
-            {
-                try
-                {
-                    txt.Font = ui.Font;
-                    txt.BackColor = ui.BackColor;
-                    txt.ForeColor = ui.ForeColor;
-                }
-                catch { ui = null; }
-            }
-            if (ui == null)
-            {
-                ui = UIConfig.Current;
-                ui.Font = txt.Font;
-                ui.BackColor = txt.BackColor;
-                ui.ForeColor = txt.ForeColor;
-                ui.Save();
-            }
-
-            // 菜单控制
-            var menu = txt.ContextMenuStrip;
-            if (menu != null)
-            {
-                var ti = Find(menu.Items, "字体", true);
-                if (ti == null)
-                {
-                    menu.Items.Insert(0, new ToolStripSeparator());
-
-                    ti = new ToolStripMenuItem("字体");
-                    menu.Items.Add(ti);
-                    ti.Click += mi字体_Click;
-
-                    ti = new ToolStripMenuItem("前景色");
-                    menu.Items.Add(ti);
-                    ti.Click += mi前景色_Click;
-
-                    ti = new ToolStripMenuItem("背景色");
-                    menu.Items.Add(ti);
-                    ti.Click += mi背景色_Click;
-                }
-            }
-
-            return ui;
-        }
-
-        static ToolStripItem Find(ToolStripItemCollection items, String key, Boolean searchAllChildren)
-        {
-            var tis = items.Find(key, searchAllChildren);
-            if (tis != null && tis.Length > 0) return tis[0];
-
-            foreach (ToolStripItem item in items)
-            {
-                if (item.Text.EqualIgnoreCase(key)) return item;
-            }
-            if (searchAllChildren)
-            {
-                foreach (ToolStripItem item in items)
-                {
-                    var tdi = item as ToolStripDropDownItem;
-                    if (tdi != null)
-                    {
-                        var ti = Find(tdi.DropDownItems, key, searchAllChildren);
-                        if (ti != null) return ti;
-                    }
-                }
-            }
-
-            return null;
-        }
-
-        static void mi字体_Click(Object sender, EventArgs e)
-        {
-            var ti = sender as ToolStripItem;
-            var txt = (ti.Owner as ContextMenuStrip).SourceControl as TextBoxBase;
-
-            var fd = new FontDialog();
-            fd.Font = txt.Font;
-            if (fd.ShowDialog() != DialogResult.OK) return;
-
-            txt.Font = fd.Font;
-
-            var ui = UIConfig.Current;
-            ui.Font = txt.Font;
-            ui.Save();
-        }
-
-        static void mi前景色_Click(Object sender, EventArgs e)
-        {
-            var ti = sender as ToolStripItem;
-            var txt = (ti.Owner as ContextMenuStrip).SourceControl as TextBoxBase;
-
-            var cd = new ColorDialog();
-            cd.Color = txt.ForeColor;
-            if (cd.ShowDialog() != DialogResult.OK) return;
-
-            txt.ForeColor = cd.Color;
-
-            var ui = UIConfig.Current;
-            ui.ForeColor = txt.ForeColor;
-            ui.Save();
-        }
-
-        static void mi背景色_Click(Object sender, EventArgs e)
-        {
-            // ((System.Windows.Forms.ContextMenuStrip)(((System.Windows.Forms.ToolStripItem)(sender)).Owner)).SourceControl
-            var ti = sender as ToolStripItem;
-            var txt = (ti.Owner as ContextMenuStrip).SourceControl as TextBoxBase;
-
-            var cd = new ColorDialog();
-            cd.Color = txt.BackColor;
-            if (cd.ShowDialog() != DialogResult.OK) return;
-
-            txt.BackColor = cd.Color;
-
-            var ui = UIConfig.Current;
-            ui.BackColor = txt.BackColor;
-            ui.Save();
-        }
-    }
-}
\ No newline at end of file
diff --git a/XCoder/Engine/XCoderBase.cs b/XCoder/Engine/XCoderBase.cs
deleted file mode 100644
index 987217ff49..0000000000
--- a/XCoder/Engine/XCoderBase.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using XCode.DataAccessLayer;
-using XTemplate.Templating;
-
-namespace XCoder
-{
-    /// <summary>代码生成器模版基类</summary>
-    public class XCoderBase : TemplateBase
-    {
-        #region 属性
-        private IDataTable _Table;
-        /// <summary>表架构</summary>
-        public virtual IDataTable Table { get { return _Table; } set { _Table = value; } }
-
-        private ModelConfig _Config;
-        /// <summary>配置</summary>
-        public ModelConfig Config { get { return _Config; } set { _Config = value; } }
-
-        private List<IDataTable> _Tables;
-        /// <summary>表集合</summary>
-        public List<IDataTable> Tables { get { return _Tables; } set { _Tables = value; } }
-        #endregion
-
-        #region 扩展属性
-        /// <summary>文件版本</summary>
-        public static String Version { get { return Assembly.GetExecutingAssembly().GetName().Version.ToString(); } }
-        #endregion
-
-        #region 重载
-        /// <summary>初始化</summary>
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            if (Data.ContainsKey("Table")) Table = (IDataTable)Data["Table"];
-            if (Data.ContainsKey("Config")) Config = (ModelConfig)Data["Config"];
-            if (Data.ContainsKey("Tables")) Tables = (List<IDataTable>)Data["Tables"];
-        }
-        #endregion
-
-        #region 辅助方法
-        /// <summary>根据指定名称查找表</summary>
-        /// <param name="tableName"></param>
-        /// <returns></returns>
-        public IDataTable FindTable(String tableName)
-        {
-            //return Tables.Find(t => t.TableName.EqualIC(tableName) || t.Name.EqualIC(tableName));
-            return Tables.Find(t => tableName.EqualIgnoreCase(t.TableName, t.Name));
-        }
-
-        /// <summary>判断是否存在指定列</summary>
-        /// <param name="name">名称</param>
-        /// <returns></returns>
-        public Boolean HasColumn(String name)
-        {
-            return Table.Columns.Any(dc => dc.Name.EqualIgnoreCase(name));
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/XCoder/Engine/XConfig.cs b/XCoder/Engine/XConfig.cs
deleted file mode 100644
index 48be88add4..0000000000
--- a/XCoder/Engine/XConfig.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-﻿using System;
-using System.ComponentModel;
-using System.Text;
-using NewLife.Xml;
-
-namespace XCoder
-{
-    [XmlConfigFile("Config\\XCoder.config")]
-    public class XConfig : XmlConfig<XConfig>
-    {
-        #region 属性
-        /// <summary>标题</summary>
-        [Description("标题")]
-        public String Title { get; set; } = "";
-
-        /// <summary>宽度</summary>
-        [Description("宽度")]
-        public Int32 Width { get; set; }
-
-        /// <summary>高度</summary>
-        [Description("高度")]
-        public Int32 Height { get; set; }
-
-        /// <summary>顶部</summary>
-        [Description("顶部")]
-        public Int32 Top { get; set; }
-
-        /// <summary>左边</summary>
-        [Description("左边")]
-        public Int32 Left { get; set; }
-
-        /// <summary>扩展数据</summary>
-        [Description("扩展数据")]
-        public String Extend { get; set; } = "";
-
-        /// <summary>日志着色</summary>
-        [Description("日志着色")]
-        public Boolean ColorLog { get; set; } = true;
-
-        /// <summary>语音提示。默认true</summary>
-        [Description("语音提示。默认true")]
-        public Boolean SpeechTip { get; set; } = true;
-
-        /// <summary>更新服务器</summary>
-        [Description("更新服务器")]
-        public String UpdateServer { get; set; } = "";
-
-        /// <summary>最后更新时间</summary>
-        [DisplayName("最后更新时间")]
-        public DateTime LastUpdate { get; set; }
-
-        /// <summary>最后一个使用的工具</summary>
-        [DisplayName("最后一个使用的工具")]
-        public String LastTool { get; set; } = "";
-        #endregion
-
-        #region 加载/保存
-        public XConfig()
-        {
-        }
-
-        protected override void OnLoaded()
-        {
-            if (UpdateServer.IsNullOrEmpty() || UpdateServer.EqualIgnoreCase("http://x.newlifex.com/")) UpdateServer = NewLife.Setting.Current.PluginServer;
-
-            base.OnLoaded();
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/XCoder/FileEncoding/FrmMain.Designer.cs b/XCoder/FileEncoding/FrmMain.Designer.cs
deleted file mode 100644
index 95f446c6ec..0000000000
--- a/XCoder/FileEncoding/FrmMain.Designer.cs
+++ /dev/null
@@ -1,200 +0,0 @@
-﻿namespace XCoder.FileEncoding
-{
-    partial class FrmMain
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.lbl_file_suffix_name = new System.Windows.Forms.Label();
-            this.txtSuffix = new System.Windows.Forms.TextBox();
-            this.lbl_file_encode_name = new System.Windows.Forms.Label();
-            this.ddlEncodes = new System.Windows.Forms.ComboBox();
-            this.btnChoice = new System.Windows.Forms.Button();
-            this.txtPath = new System.Windows.Forms.TextBox();
-            this.btnReplace = new System.Windows.Forms.Button();
-            this.gv_data = new System.Windows.Forms.DataGridView();
-            this.序号 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.编码 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.名称 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.fbd_choice_folder = new System.Windows.Forms.FolderBrowserDialog();
-            this.label1 = new System.Windows.Forms.Label();
-            this.btnFind = new System.Windows.Forms.Button();
-            ((System.ComponentModel.ISupportInitialize)(this.gv_data)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // lbl_file_suffix_name
-            // 
-            this.lbl_file_suffix_name.AutoSize = true;
-            this.lbl_file_suffix_name.Location = new System.Drawing.Point(12, 20);
-            this.lbl_file_suffix_name.Name = "lbl_file_suffix_name";
-            this.lbl_file_suffix_name.Size = new System.Drawing.Size(29, 12);
-            this.lbl_file_suffix_name.TabIndex = 0;
-            this.lbl_file_suffix_name.Text = "后缀";
-            // 
-            // txtSuffix
-            // 
-            this.txtSuffix.Location = new System.Drawing.Point(47, 16);
-            this.txtSuffix.Name = "txtSuffix";
-            this.txtSuffix.Size = new System.Drawing.Size(85, 21);
-            this.txtSuffix.TabIndex = 1;
-            // 
-            // lbl_file_encode_name
-            // 
-            this.lbl_file_encode_name.AutoSize = true;
-            this.lbl_file_encode_name.Location = new System.Drawing.Point(480, 20);
-            this.lbl_file_encode_name.Name = "lbl_file_encode_name";
-            this.lbl_file_encode_name.Size = new System.Drawing.Size(53, 12);
-            this.lbl_file_encode_name.TabIndex = 2;
-            this.lbl_file_encode_name.Text = "目标编码";
-            // 
-            // ddlEncodes
-            // 
-            this.ddlEncodes.FormattingEnabled = true;
-            this.ddlEncodes.Location = new System.Drawing.Point(539, 16);
-            this.ddlEncodes.Name = "ddlEncodes";
-            this.ddlEncodes.Size = new System.Drawing.Size(154, 20);
-            this.ddlEncodes.TabIndex = 3;
-            // 
-            // btnChoice
-            // 
-            this.btnChoice.Location = new System.Drawing.Point(361, 15);
-            this.btnChoice.Name = "btnChoice";
-            this.btnChoice.Size = new System.Drawing.Size(31, 23);
-            this.btnChoice.TabIndex = 4;
-            this.btnChoice.Text = "...";
-            this.btnChoice.UseVisualStyleBackColor = true;
-            this.btnChoice.Click += new System.EventHandler(this.btn_choice_file_Click);
-            // 
-            // txtPath
-            // 
-            this.txtPath.Location = new System.Drawing.Point(198, 16);
-            this.txtPath.Name = "txtPath";
-            this.txtPath.Size = new System.Drawing.Size(157, 21);
-            this.txtPath.TabIndex = 5;
-            // 
-            // btnReplace
-            // 
-            this.btnReplace.Location = new System.Drawing.Point(699, 15);
-            this.btnReplace.Name = "btnReplace";
-            this.btnReplace.Size = new System.Drawing.Size(66, 23);
-            this.btnReplace.TabIndex = 6;
-            this.btnReplace.Text = "批量转换";
-            this.btnReplace.UseVisualStyleBackColor = true;
-            this.btnReplace.Click += new System.EventHandler(this.btn_replace_Click);
-            // 
-            // gv_data
-            // 
-            this.gv_data.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.gv_data.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.gv_data.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.序号,
-            this.编码,
-            this.名称});
-            this.gv_data.Location = new System.Drawing.Point(3, 57);
-            this.gv_data.Name = "gv_data";
-            this.gv_data.RowTemplate.Height = 23;
-            this.gv_data.Size = new System.Drawing.Size(784, 623);
-            this.gv_data.TabIndex = 7;
-            // 
-            // 序号
-            // 
-            this.序号.HeaderText = "序号";
-            this.序号.Name = "序号";
-            // 
-            // 编码
-            // 
-            this.编码.HeaderText = "编码";
-            this.编码.Name = "编码";
-            // 
-            // 名称
-            // 
-            this.名称.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            this.名称.HeaderText = "名称";
-            this.名称.Name = "名称";
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(152, 20);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(29, 12);
-            this.label1.TabIndex = 8;
-            this.label1.Text = "路径";
-            // 
-            // btnFind
-            // 
-            this.btnFind.Location = new System.Drawing.Point(398, 15);
-            this.btnFind.Name = "btnFind";
-            this.btnFind.Size = new System.Drawing.Size(61, 23);
-            this.btnFind.TabIndex = 9;
-            this.btnFind.Text = "查找";
-            this.btnFind.UseVisualStyleBackColor = true;
-            this.btnFind.Click += new System.EventHandler(this.btnFind_Click);
-            // 
-            // FrmMain
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(789, 681);
-            this.Controls.Add(this.btnFind);
-            this.Controls.Add(this.label1);
-            this.Controls.Add(this.gv_data);
-            this.Controls.Add(this.btnReplace);
-            this.Controls.Add(this.txtPath);
-            this.Controls.Add(this.btnChoice);
-            this.Controls.Add(this.ddlEncodes);
-            this.Controls.Add(this.lbl_file_encode_name);
-            this.Controls.Add(this.txtSuffix);
-            this.Controls.Add(this.lbl_file_suffix_name);
-            this.Name = "FrmMain";
-            this.Text = "文件编码名";
-            this.Load += new System.EventHandler(this.FrmEncodeReplace_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.gv_data)).EndInit();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Label lbl_file_suffix_name;
-        private System.Windows.Forms.TextBox txtSuffix;
-        private System.Windows.Forms.Label lbl_file_encode_name;
-        private System.Windows.Forms.ComboBox ddlEncodes;
-        private System.Windows.Forms.Button btnChoice;
-        private System.Windows.Forms.TextBox txtPath;
-        private System.Windows.Forms.Button btnReplace;
-        private System.Windows.Forms.DataGridView gv_data;
-        private System.Windows.Forms.DataGridViewTextBoxColumn 序号;
-        private System.Windows.Forms.DataGridViewTextBoxColumn 编码;
-        private System.Windows.Forms.DataGridViewTextBoxColumn 名称;
-        private System.Windows.Forms.FolderBrowserDialog fbd_choice_folder;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Button btnFind;
-    }
-}
\ No newline at end of file
diff --git a/XCoder/FileEncoding/FrmMain.cs b/XCoder/FileEncoding/FrmMain.cs
deleted file mode 100644
index e9471be8c7..0000000000
--- a/XCoder/FileEncoding/FrmMain.cs
+++ /dev/null
@@ -1,271 +0,0 @@
-﻿using System;
-using System.ComponentModel;
-using System.IO;
-using System.Text;
-using System.Windows.Forms;
-using NewLife.IO;
-
-namespace XCoder.FileEncoding
-{
-    [DisplayName("文件编码工具")]
-    public partial class FrmMain : Form, IXForm
-    {
-        public FrmMain()
-        {
-            InitializeComponent();
-
-            // 动态调节宽度高度，兼容高DPI
-            this.FixDpi();
-        }
-
-        private void FrmEncodeReplace_Load(Object sender, EventArgs e)
-        {
-            txtSuffix.Text = "*.cs;*.aspx";
-            var encs = new String[] { "UTF-8", "UTF-8 NoBOM", "ASNI", "Unicode", "Default" };
-            //var encs = new Encoding[] { Encoding.UTF8, new UTF8Encoding(false), Encoding.ASCII, Encoding.UTF8 };
-            ddlEncodes.DataSource = encs;
-            ddlEncodes.Text = "UTF-8";
-            //cmb_tag.Text = "UTF-8";
-            btnReplace.Enabled = false;
-        }
-
-
-        private void btn_choice_file_Click(Object sender, EventArgs e)
-        {
-            if (!txtPath.Text.IsNullOrEmpty()) fbd_choice_folder.SelectedPath = txtPath.Text;
-            if (fbd_choice_folder.ShowDialog() != DialogResult.OK) return;
-
-            txtPath.Text = fbd_choice_folder.SelectedPath;
-        }
-
-        private void btn_replace_Click(Object sender, EventArgs e)
-        {
-            if (String.IsNullOrEmpty(txtPath.Text))
-            {
-                MessageBox.Show("请选择文件夹");
-                return;
-            }
-
-            if (gv_data.Rows[0].Cells["序号"].Value == null)
-            {
-                MessageBox.Show("当前没有需要替换的文件");
-                return;
-            }
-
-            if (MessageBox.Show("是否确定要批量修改列表中的编码", "警告", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
-                return;
-
-
-            var enc = Encoding.UTF8;
-            switch (ddlEncodes.Text)
-            {
-                case "UTF-8": enc = Encoding.UTF8; break;
-                case "UTF-8 NoBOM": enc = new UTF8Encoding(false); break;
-                case "ASNI": enc = Encoding.ASCII; break;
-                case "Unicode": enc = Encoding.Unicode; break;
-            }
-
-            var count = 0;
-            foreach (DataGridViewRow item in gv_data.Rows)
-            {
-                if (item.Cells["序号"].Value == null) continue;
-                var fileCharset = item.Cells["编码"].Value.ToString();
-                if (fileCharset.EqualIgnoreCase(ddlEncodes.Text)) continue;
-
-                try
-                {
-                    //ReplaceEncoding(txtPath.Text + item.Cells["名称"].Value.ToString(), fileCharset, enc);
-                    var file = txtPath.Text + item.Cells["名称"].Value;
-                    var txt = File.ReadAllText(file);
-                    File.WriteAllText(file, txt, enc);
-
-                    count++;
-                }
-                catch (Exception ex)
-                {
-                    MessageBox.Show("文件[" + txtPath.Text + item.Cells["名称"].Value.ToString() + "]" + "转换时出错,请手动转换" + ex.Message);
-                }
-            }
-
-            MessageBox.Show("转换{0}个文件完成".F(count));
-            gv_data.Rows.Clear();
-        }
-
-        /// <summary>
-        /// 替换文件编码
-        /// </summary>
-        /// <param name="file"></param>
-        private void ReplaceEncoding(String file, String charset, Encoding targetEncoding)
-        {
-            var fileInfo = "";
-            using (var sr = new StreamReader(file, Encoding.GetEncoding(charset), false))
-            {
-                fileInfo = sr.ReadToEnd();
-            }
-
-            using (var sw = new StreamWriter(file, false, targetEncoding))
-            {
-                sw.Write(fileInfo);
-            }
-        }
-
-        Encoding GetEncode()
-        {
-            // "UTF-8", "ASNI", "Unicode", "Default" 
-            var e = ddlEncodes.Text;
-
-            var result = Encoding.UTF8;
-            switch (e)
-            {
-                case "UTF-8": result = Encoding.UTF8; break;
-                case "ASNI": result = Encoding.ASCII; break;
-                case "Unicode": result = Encoding.Unicode; break;
-            }
-            return result;
-        }
-
-        /// <summary>
-        /// 文件过滤
-        /// </summary>
-        /// <param name="info"></param>
-        public void FileFilter(String path)
-        {
-            var di = path.AsDirectory();
-            if (!di.Exists) return;
-
-            var Count = 1;
-            foreach (var file in di.GetAllFiles(txtSuffix.Text, true))
-            {
-                var enc = EncodePelaceHelper.GetEncoding(file.FullName);
-                if (enc != null && !enc.WebName.EqualIgnoreCase(ddlEncodes.Text))
-                {
-                    gv_data.Rows.Add(Count++, enc.WebName, file.FullName.Substring(path.Length));
-                }
-            }
-        }
-
-        private void btnFind_Click(Object sender, EventArgs e)
-        {
-            gv_data.Rows.Clear();
-            FileFilter(txtPath.Text);
-            btnReplace.Enabled = true;
-        }
-    }
-
-    /// <summary>
-    /// 文件替换辅助类
-    /// </summary>
-    public class EncodePelaceHelper
-    {
-        /// <summary>
-        /// 取得一个文本文件的编码方式。如果无法在文件头部找到有效的前导符，Encoding.UTF8将被返回。
-        /// </summary>
-        /// <param name="fileName">文件名</param>
-        /// 
-        public static Encoding GetEncoding(String fileName)
-        {
-            return GetEncoding(fileName, Encoding.UTF8);
-        }
-
-        /// <summary>取得一个文本文件的编码方式。</summary>
-        /// <param name="fileName">文件名。</param>
-        /// <param name="defaultEncoding">默认编码方式。当该方法无法从文件的头部取得有效的前导符时，将返回该编码方式。</param>
-        /// <returns></returns>
-        /// 
-        public static Encoding GetEncoding(String fileName, Encoding defaultEncoding)
-        {
-            using (var fs = File.OpenRead(fileName))
-            {
-                return fs.Detect() ?? defaultEncoding;
-            }
-        }
-
-        ///// <summary>
-        ///// 取得一个文本文件流的编码方式。
-        ///// </summary>
-        ///// <param name="stream">文本文件流</param>
-        ///// <returns></returns>
-        ///// 
-        //public static Encoding GetEncoding(FileStream stream)
-        //{
-        //    return GetEncoding(stream, Encoding.UTF8);
-        //}
-
-        ///// <summary>
-        ///// 取得一个文本文件的编码方式。
-        ///// </summary>
-        ///// <param name="fileName">文件名。</param>
-        ///// <param name="defaultEncoding">默认编码方式。当该方法无法从文件的头部取得有效的前导符时，将返回该编码方式。</param>
-        ///// <returns></returns>
-        ///// 
-        //public static Encoding GetEncoding(string fileName, Encoding defaultEncoding)
-        //{
-        //    FileStream fs = new FileStream(fileName, FileMode.Open);
-        //    Encoding targetEncoding = GetEncoding(fs, defaultEncoding);
-        //    fs.Close();
-        //    return targetEncoding;
-        //}
-
-        /// <summary>
-        /// 取得一个文本文件流的编码方式。
-
-        /// </summary>
-        /// <param name="stream">文本文件流。</param>
-
-        /// <param name="defaultEncoding">默认编码方式。当该方法无法从文件的头部取得有效的前导符时，将返回该编码方式。</param>
-        /// <returns></returns>
-        /// 
-        public static Encoding GetEncoding(FileStream stream, Encoding defaultEncoding)
-        {
-            var targetEncoding = defaultEncoding;
-            if (stream != null && stream.Length >= 2)
-            {
-                //保存文件流的前4个字节
-                Byte byte1 = 0;
-                Byte byte2 = 0;
-                Byte byte3 = 0;
-                Byte byte4 = 0;
-
-                //保存当前Seek位置
-                var origPos = stream.Seek(0, SeekOrigin.Begin);
-                stream.Seek(0, SeekOrigin.Begin);
-                var nByte = stream.ReadByte();
-                byte1 = Convert.ToByte(nByte);
-                byte2 = Convert.ToByte(stream.ReadByte());
-
-                if (stream.Length >= 3)
-                {
-                    byte3 = Convert.ToByte(stream.ReadByte());
-                }
-
-                if (stream.Length >= 4)
-                {
-                    byte4 = Convert.ToByte(stream.ReadByte());
-                }
-                //根据文件流的前4个字节判断Encoding
-                //Unicode {0xFF, 0xFE};
-                //BE-Unicode {0xFE, 0xFF};
-                //UTF8 = {0xEF, 0xBB, 0xBF};
-
-                if (byte1 == 0xFE && byte2 == 0xFF)//UnicodeBe
-                {
-                    targetEncoding = Encoding.BigEndianUnicode;
-                }
-
-                if (byte1 == 0xFF && byte2 == 0xFE && byte3 != 0xFF)//Unicode
-                {
-                    targetEncoding = Encoding.Unicode;
-                }
-
-                if (byte1 == 0xEF && byte2 == 0xBB && byte3 == 0xBF)//UTF8
-                {
-                    targetEncoding = Encoding.UTF8;
-                }
-
-                //恢复Seek位置
-                stream.Seek(origPos, SeekOrigin.Begin);
-            }
-            return targetEncoding;
-        }
-    }
-}
diff --git a/XCoder/FileEncoding/FrmMain.resx b/XCoder/FileEncoding/FrmMain.resx
deleted file mode 100644
index 44949346d7..0000000000
--- a/XCoder/FileEncoding/FrmMain.resx
+++ /dev/null
@@ -1,141 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="序号.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="编码.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="名称.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="序号.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="编码.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="名称.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="fbd_choice_folder.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-</root>
\ No newline at end of file
diff --git a/XCoder/FolderInfo/FrmMain.Designer.cs b/XCoder/FolderInfo/FrmMain.Designer.cs
deleted file mode 100644
index 48c06089da..0000000000
--- a/XCoder/FolderInfo/FrmMain.Designer.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-﻿namespace XCoder.FolderInfo
-{
-    partial class FrmMain
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.components = new System.ComponentModel.Container();
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmMain));
-            this.treeView1 = new System.Windows.Forms.TreeView();
-            this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.打开目录ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.删除ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.txtLog = new System.Windows.Forms.RichTextBox();
-            this.contextMenuStrip1.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // treeView1
-            // 
-            this.treeView1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.treeView1.Location = new System.Drawing.Point(12, 12);
-            this.treeView1.Name = "treeView1";
-            this.treeView1.Size = new System.Drawing.Size(572, 312);
-            this.treeView1.TabIndex = 0;
-            this.treeView1.AfterCollapse += new System.Windows.Forms.TreeViewEventHandler(this.treeView1_AfterCollapse);
-            this.treeView1.BeforeExpand += new System.Windows.Forms.TreeViewCancelEventHandler(this.treeView1_BeforeExpand);
-            // 
-            // contextMenuStrip1
-            // 
-            this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.打开目录ToolStripMenuItem,
-            this.删除ToolStripMenuItem});
-            this.contextMenuStrip1.Name = "contextMenuStrip1";
-            this.contextMenuStrip1.Size = new System.Drawing.Size(125, 48);
-            // 
-            // 打开目录ToolStripMenuItem
-            // 
-            this.打开目录ToolStripMenuItem.Name = "打开目录ToolStripMenuItem";
-            this.打开目录ToolStripMenuItem.Size = new System.Drawing.Size(124, 22);
-            this.打开目录ToolStripMenuItem.Text = "打开目录";
-            this.打开目录ToolStripMenuItem.Click += new System.EventHandler(this.打开目录ToolStripMenuItem_Click);
-            // 
-            // 删除ToolStripMenuItem
-            // 
-            this.删除ToolStripMenuItem.Name = "删除ToolStripMenuItem";
-            this.删除ToolStripMenuItem.Size = new System.Drawing.Size(124, 22);
-            this.删除ToolStripMenuItem.Text = "删除";
-            this.删除ToolStripMenuItem.Click += new System.EventHandler(this.删除ToolStripMenuItem_Click);
-            // 
-            // txtLog
-            // 
-            this.txtLog.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtLog.Location = new System.Drawing.Point(12, 330);
-            this.txtLog.Name = "txtLog";
-            this.txtLog.Size = new System.Drawing.Size(572, 128);
-            this.txtLog.TabIndex = 1;
-            this.txtLog.Text = "";
-            // 
-            // FrmMain
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(596, 470);
-            this.Controls.Add(this.txtLog);
-            this.Controls.Add(this.treeView1);
-            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.Name = "FrmMain";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "文件/目录 大小统计器";
-            this.Load += new System.EventHandler(this.Form1_Load);
-            this.contextMenuStrip1.ResumeLayout(false);
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.TreeView treeView1;
-        private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
-        private System.Windows.Forms.ToolStripMenuItem 打开目录ToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem 删除ToolStripMenuItem;
-        private System.Windows.Forms.RichTextBox txtLog;
-    }
-}
-
diff --git a/XCoder/FolderInfo/FrmMain.cs b/XCoder/FolderInfo/FrmMain.cs
deleted file mode 100644
index 335e0e3112..0000000000
--- a/XCoder/FolderInfo/FrmMain.cs
+++ /dev/null
@@ -1,321 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Drawing;
-using System.IO;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using NewLife.Log;
-
-namespace XCoder.FolderInfo
-{
-    [DisplayName("文件夹大小统计")]
-    public partial class FrmMain : Form, IXForm
-    {
-        /// <summary>业务日志输出</summary>
-        ILog BizLog;
-
-        #region 初始化
-        public FrmMain()
-        {
-            InitializeComponent();
-
-            // 动态调节宽度高度，兼容高DPI
-            this.FixDpi();
-
-            Icon = IcoHelper.GetIcon("文件");
-        }
-
-        private void Form1_Load(Object sender, EventArgs e)
-        {
-            var log = TextFileLog.Create(null, "Folder_{0:yyyy_MM_dd}.log");
-            BizLog = txtLog.Combine(log);
-            txtLog.UseWinFormControl();
-
-            foreach (var item in DriveInfo.GetDrives())
-            {
-                if (item.DriveType == DriveType.Fixed)
-                {
-                    var str = String.Format("{0,-10} ({1})", item.Name, FormatSize(item.TotalSize));
-                    var tn = treeView1.Nodes.Add(str);
-                    tn.Tag = item.RootDirectory.ToString();
-                    tn.Nodes.Add("no");
-                }
-            }
-        }
-        #endregion
-
-        #region 构造目录树
-        void MakeTree(String path, TreeNode Node)
-        {
-            BizLog.Info("展开目录 {0}", path);
-
-            Node.Nodes.Clear();
-
-            ////修正大小
-            //if (Node.Text.EndsWith("-1 Byte"))
-            //{
-            //    Node.Text = Node.Text.Substring(0, Node.Text.Length - 8) + FormatSize(FolderSize(Node.Tag.ToString()));
-            //}
-
-            var di = new DirectoryInfo(path);
-            var dis = di.GetDirectories();
-            var fis = di.GetFiles();
-
-            var list = new List<FileSystemInfo>();
-            list.AddRange(dis);
-            list.AddRange(fis);
-
-            var max = 0;
-            foreach (var item in list)
-            {
-                max = Math.Max(max, StrLen(item.Name));
-            }
-            max++;
-            foreach (var item in list)
-            {
-                var len = max;
-                len -= (StrLen(item.Name) - item.Name.Length);
-                Int64 size = 0;
-
-                if (item is FileInfo)
-                    size = (item as FileInfo).Length;
-                else//默认不统计大小，加快显示速度
-                    size = -1;
-
-                var str = String.Format("{0,-" + len.ToString() + "} {1,10}", item.Name, FormatSize(size));
-                var tn = Node.Nodes.Add(str);
-                tn.Tag = item;
-                tn.BackColor = GetColor(size);
-                tn.ContextMenuStrip = contextMenuStrip1;
-                if (item is DirectoryInfo)
-                {
-                    tn.Nodes.Add("no");
-                    //使用后台线程统计大小信息
-                    Task.Factory.StartNew(() => TongJi(tn), TaskCreationOptions.LongRunning).LogException();
-                }
-            }
-        }
-
-        String FormatSize(Int64 size)
-        {
-            if (size < 1024) return size.ToString() + " Byte";
-            var ds = (Double)size / 1024;
-            if (ds < 1024) return ds.ToString("N2") + " K";
-            ds = ds / 1024;
-            if (ds < 1024) return ds.ToString("N2") + " M";
-            ds = ds / 1024;
-            if (ds < 1024) return ds.ToString("N2") + " G";
-            ds = ds / 1024;
-            if (ds < 1024) return ds.ToString("N2") + " T";
-            throw new Exception("Too Large");
-        }
-
-        Int32 StrLen(String str)
-        {
-            return Encoding.UTF8.GetBytes(str).Length;
-        }
-        #endregion
-
-        #region 统计文件夹大小
-        //long FolderSize(String path)
-        //{
-        //    return FolderSize(new DirectoryInfo(path));
-        //}
-
-        //long FolderSize(FileSystemInfo si)
-        //{
-        //    return FolderSize(si as DirectoryInfo);
-        //}
-
-        Dictionary<String, Int64> cache = new Dictionary<String, Int64>();
-        Int64 FolderSize(DirectoryInfo di)
-        {
-            Int64 size = 0;
-            if (cache.ContainsKey(di.FullName)) return cache[di.FullName];
-            lock (di.FullName)
-            {
-                if (cache.ContainsKey(di.FullName)) return cache[di.FullName];
-                try
-                {
-                    foreach (var item in di.GetFiles())
-                    {
-                        size += item.Length;
-                    }
-                    foreach (var item in di.GetDirectories())
-                    {
-                        size += FolderSize(item);
-                    }
-                }
-                catch { }
-                if (!cache.ContainsKey(di.FullName)) cache.Add(di.FullName, size);
-            }
-            return size;
-        }
-        #endregion
-
-        #region 统计目录并设置大小
-        void TongJi(Object obj)
-        {
-            var node = obj as TreeNode;
-            if (node == null || node.Tag == null) return;
-            var size = FolderSize(node.Tag as DirectoryInfo);
-            var str = node.Text.Substring(0, node.Text.Length - 10) + String.Format("{0,10}", FormatSize(size));
-            //SetNodeText(node, str, GetColor(size));
-            this.Invoke(() =>
-            {
-                node.Text = str;
-                node.BackColor = GetColor(size);
-            });
-        }
-
-        Color GetColor(Int64 size)
-        {
-            var color = Color.White;
-            if (size > 1024) color = Color.MistyRose;
-            if (size > 1024 * 1024) color = Color.LightBlue;
-            if (size > 100 * 1024 * 1024) color = Color.LawnGreen;
-            if (size > 1024 * 1024 * 1024) color = Color.Yellow;
-            return color;
-        }
-
-        //delegate void SetNodeTextDelegate(TreeNode node, String txt, Color color);
-        //void SetNodeText(TreeNode node, String txt, Color color)
-        //{
-        //    if (treeView1.InvokeRequired)
-        //    {
-        //        var d = new SetNodeTextDelegate(SetNodeText);
-        //        treeView1.Invoke(d, new object[] { node, txt, color });
-        //    }
-        //    else
-        //    {
-        //        node.Text = txt;
-        //        node.BackColor = color;
-        //    }
-        //}
-        #endregion
-
-        #region 展开折叠目录树
-        private void treeView1_BeforeExpand(Object sender, TreeViewCancelEventArgs e)
-        {
-            var node = e.Node;
-            if (node.Nodes != null && node.Nodes.Count > 0 && node.Nodes[0].Text == "no")
-            {
-                try
-                {
-                    var fi = node.Tag as FileSystemInfo;
-                    if (fi != null)
-                        MakeTree(fi.FullName, node);
-                    else if (node.Tag is String)
-                        MakeTree(node.Tag + "", node);
-                }
-                catch { }
-            }
-        }
-
-        private void treeView1_AfterCollapse(Object sender, TreeViewEventArgs e)
-        {
-            // 折叠后清空，使得再次展开时重新计算
-            if (e.Node != null && e.Node.Nodes != null)
-            {
-                e.Node.Nodes.Clear();
-                e.Node.Nodes.Add("no");
-            }
-        }
-        #endregion
-
-        #region 右键菜单
-        String GetSelectedPath()
-        {
-            var node = treeView1.SelectedNode;
-            if (node == null || node.Tag == null) return null;
-
-            var fi = node.Tag as FileSystemInfo;
-            if (fi != null) return fi.FullName;
-
-            return node.Tag.ToString();
-        }
-
-        private void 打开目录ToolStripMenuItem_Click(Object sender, EventArgs e)
-        {
-            var path = GetSelectedPath();
-            if (String.IsNullOrEmpty(path)) return;
-
-            if (path.Contains(" ")) path = "\"" + path + "\"";
-
-            try
-            {
-                if (File.Exists(path))
-                    Process.Start("explorer.exe /select," + path);
-                else
-                    Process.Start("explorer.exe " + path);
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.Message, "删除出错");
-            }
-        }
-
-        private void 删除ToolStripMenuItem_Click(Object sender, EventArgs e)
-        {
-            var path = GetSelectedPath();
-            if (String.IsNullOrEmpty(path)) return;
-
-            if (MessageBox.Show("准备删除" + path + Environment.NewLine + "删除将不可恢复，是否删除？", "确认删除", MessageBoxButtons.YesNo) == DialogResult.No) return;
-
-
-            if (path.Contains(" ")) path = "\"" + path + "\"";
-
-            try
-            {
-                if (File.Exists(path))
-                    File.Delete(path);
-                else
-                    //Directory.Delete(path, true);
-                    DeleteRecursive(new DirectoryInfo(path));
-
-                treeView1.SelectedNode.Remove();
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.Message, "删除出错");
-            }
-        }
-
-        /// <summary>递归删除</summary>
-        /// <param name="di"></param>
-        void DeleteRecursive(DirectoryInfo di)
-        {
-            // 删除本目录文件
-            foreach (var item in di.GetFiles())
-            {
-                BizLog.Info("删除 {0}", item.FullName);
-                try
-                {
-                    item.Delete();
-                }
-                catch (Exception ex)
-                {
-                    BizLog.Error(ex?.GetTrue().ToString());
-                }
-            }
-            // 递归子目录
-            foreach (var item in di.GetDirectories())
-            {
-                DeleteRecursive(item);
-            }
-            try
-            {
-                // 删除本目录
-                di.Delete(true);
-            }
-            catch (Exception ex)
-            {
-                BizLog.Error(ex?.GetTrue().ToString());
-            }
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/XCoder/FolderInfo/FrmMain.resx b/XCoder/FolderInfo/FrmMain.resx
deleted file mode 100644
index 8cadf1a96b..0000000000
--- a/XCoder/FolderInfo/FrmMain.resx
+++ /dev/null
@@ -1,951 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAABAAoAMDAAAAEACACoDgAApgAAACAgAAABAAgAqAgAAE4PAAAYGAAAAQAIAMgGAAD2FwAAEBAAAAEA
-        CABoBQAAvh4AADAwAAABACAAqCUAACYkAAAgIAAAAQAgAKgQAADOSQAAGBgAAAEAIACICQAAdloAABAQ
-        AAABACAAaAQAAP5jAABAQAAAAQAIACgWAABmaAAAQEAAAAEAIAAoQgAAjn4AACgAAAAwAAAAYAAAAAEA
-        CAAAAAAAgAoAAAAAAAAAAAAAAAEAAAAAAAAAAAAA////AIAAAACAgIAAAIAAAODg4ACgoEAAQCCAAGCg
-        IABAQKAAoKCgAICgQACAoCAAQABgAEBAYACgwGAA4MBgAGAgYACgYKAA4ADAAEBgwABgYMAA4KBAAEAg
-        QABA4GAAgOBgAOAgwABAYOAAQIDgAEBAIABgQEAAYGBAAIBgYADAwGAAoICgAMCgwADgwOAAIKAAACCA
-        IABAgCAAQKAgACDAIABAoEAAYMBAAEAgYABgQGAAYACAAGAggADgQMAAYIDgAICA4ACggOAAICAAAGCA
-        AACggAAA4IAAAIAAYABAYGAAYGBgAGCgYAAAwGAAoKCAAMCAoACAwKAAoMCgAKD/oADAYMAAQODAAP/g
-        /wAYwIAAIMiIACjIiAAgyIAAILBoACCoYAAguHAAILh4AEDQmABI2KgAYNioAGjYsABI0KAA+Pj4ADDI
-        kAA40JgA6OjoACCgWAAgqFgA//j/ACCYSAAwyIgAOMiQAPjw+ABY2KgAGMiIACjIkAAgiDgA2NjYABjI
-        gABw2LAAeOC4APDo8AAgeCgAONCQAEjQmABY2KAAIJhQAEDYoABw4LgA8OjoACBQCAAosFgAMNCYADjY
-        oADo8OgAKJgoACigMAAosFAAIMB4ALiwuAAYuHAAsKCoALCoqADAuLgA0MjIAIjoyADY4NgA4NjgAOjg
-        4ADw4OgA8PjwABgwCAAgmCAAMJgoACCgKAAwqEAAIJBIACC4aAAYwHgAoJiYALiosAC4sLAASNiwAMCw
-        uADIwMAAeODAAMjIyADI0MgA0NDIAIDoyADQyNAA2NDQANjY0ADo4OgA+PDwAP/4+AAoWBgAOFggABiY
-        IAAokCgAIHgwACCIMAAgeDgAIJA4ADCgOAAgmEAAKKhAADCoSAA4sFgAKMB4AKigoABI2KAAUNigAEDY
-        qABg2LAAsNiwAEjgsADIuLgAcNi4AFDguABo4LgAyLjAAMDYwADIwMgAyODIAOjY4ADo6OAA8PDoAPjo
-        8ADo8PAA8PD4AP/w+AD4//gA+P//ACBgGAAocBgAEJAYACBoIAAogCAAKIggACh4KAAggCgAKIgoACCY
-        KAAooCgAGHAwABB4MABQaDgAKKA4ACigQAAgqEAAaHhYAFiYWAAgsFgAULBYACioYABoaGgAgJBoADiw
-        aAAwuGgAOLhoAEC4aABouGgAKLhwAHC4cAAowHAASLh4ACjIgACQiIgAkJCIAJCgiACIuIgAQMCIAFDI
-        iABAyJAAKNCQAJiYmABIyJgAsKigADjQoABo0KAAuKioALiwqACo0KgAUNioAKiosACwqLAAsLiwALjA
-        sAB42LAAuLi4ALjAuACA4LgAyMjAANjA0ADYyNAAAAAAAAAAAAAAAAAAAAAAfIvPnZ3ZfvYAAADTbpz4
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADuz25unJxubuZ/AP/Tbpz3AAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAD2dbqLi7VHt2sLTfgDTbpz3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAA8p1u4rOwjk6Os7Oi01zPbpz7AHrm2dnm+H8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA027is05O
-        Tk5OTk6zou7Pbs/92Z1ubsLCnNmXeQAAAAAAAAAAAAAAAAAAAACPjfLynWCzTk5OTk5OTk6OTdPPws/P
-        bsja6lFR6Ign/ewAAAAAAAAAAAAAAAAAtQrTKqja1+hOTk5OTk5OTk5OsCrDxsjDiFRxVFRUca1M1JgA
-        AAAAAAAAAAAAAACx0yZvcHFxcVRrTk5OTk5OTk5RjtrGysajU3BTU1NTU1pxeOeXAAAAAAAAAAAAAJbZ
-        JqlxU1NTU1NUa2tra2tra2tNrdrHn8rf60dHR0dHR0dHRuKXAAAAAAAAAAAAAO4m13BHR19HR0dHVE1N
-        TU1NTU1Ua9qfn9FGRkZGRkZGRkZGRna2AAAAAAAAAAAAgdSGR0ZGRkZGRkZGR1RUVFRUVFRU729zc4lG
-        SEhIRkZGSEZISIp+AAAAAAAAAAAAfIWmRkhISEhISEhISEdTU1NTU1NTcG9zpkVFRUVFRUVFRUVFSIpA
-        bWUAAAAAAAAA/Z91RkVFSEhISEVIRUhHR0dHR0dHX3WFiV5FRUVFRUVFRUVFRUjSKvNYAAAAAAAA/cfR
-        XkVFRUVFRUVFRUVIRkhIRkhIRtGjYkVFRUVFRUVFRUVFRUZficTnWAAAAAAAYSehRUVFRUVFRUVFRUVF
-        RUVFRUVFYqNKXkVFRUVFRUVFRUVFRUVFXqkmQFIAAAAAUjvCSkV4TExMTExMTExMTExMTExMTIhLTExM
-        TExMTExMTExMTExMeEVWyFUAAAAAAJPCZklLSUtLS0tLS0tLS0tLS0tLSUp4S0tLS0tLS0tLS0tLS0tL
-        S0tMxUABAAAAAFgKbsVKS0lJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlLzjsBAAAAAAC7
-        QJxuolZJSUpKSkpKSkpKSkpKSkpKSkpKSkpKSkpKSkpKSkpKSkpJztMBAAAAAAAAYZPTbm7NWUpXVlZW
-        VlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZKxdMBAAAAAAAAe5cF5m6Dg8WIV1ZqampqampqampWampq
-        ampqVlZWampZampWampXbuaZAAAAAJDu088dg4ODg4ODnKJZWVlZWVlZWVlZWWpKSUyKikV2dkxJVlml
-        WWpgnGEAAAAAe9ODg8WgoKCgzc3FwsKgiIiIiIiIo6NWeEVGYkVFRUVIRl/rU1rXWYiD5QAAAADuz4PN
-        WaWlo6WlpaWlpaVgYKOjYGBgaktGYkVFRUVeXl5GRl9TcHGtWsIDggAAAHrTg8VgoaFgYGBgYGBgYGBg
-        oaHJoVlLYmJFRUVFdm911YmJ3+FLdonVp/OaAAAAAJSFpVZgoWZmZmZmZmZmZmZmoYhXTF5eRUhFRUVI
-        RUt1dIVzzKTW3uevVbwAAAAAAeaEqV5ITElKalmIiIiIalZJdl5eSEVISEhISEhIRWJGdtWkcyq2WLyQ
-        AAAAAAAAvzuG40ZGRkZGRkZGRkZGRkZGRUVFRUVFSEhISEVIRUVFSF9H29CE3n4FAAAAAAAAvzuGR0dH
-        R0dHR0dHR0dHR0ZISEhISEhISEhISEVIRUhIR1pTVE3chnPzvwAAAAAAWOCGWlNTU1NTU1NTU1NHR0dH
-        R0dHR0fhdkhISEhISEdHWltb6k1RrN3E51wAAAAAmviEWnBTcHBTU1NTU1NTWlpaWlpaU1p1SEhISEVI
-        R1pTW1tNTVFRrK7pnrZcAAAAAG3U0q1UVFRUVFRUW1NbW1tbW1tbVNumRkVISEVFR1NbTU1oUaxpXU+0
-        qNaaAAAAAFiThNuOa01NTU1bW1tbW2dNZ01nTaR1RkhFRUhIR2dNTWhRrGlPT1Bs8HSYAAAAAABltnRv
-        a05NTU1NTU1NTU1NTU1R4nN1XkVFSEZHR2doUaxpXU9PUGNskdCvWAAAAAAAZX7gh+hRaFFRUVFRUVFR
-        UVFRp3NvRUVI40dTU1tRrGlPT1BQY2xklYevAQAAAAAAAABY+N30rKysrKysrKysrF3idHRvRkhHWlNb
-        Z01RXU9PUFBsZGT8fYe2AAAAAAAAAAAA+OJdaV1daV1dXV1dXU+nc3RvRkdaU1tnTWhRT1BQY2xk/Px9
-        +SpVAAAAAAAAAAAAlN2uT09PT09PT09PtOmEO4XbX1NbW01NaFGsT1CyZGT8/Px93edYAAAAAAAAAAAA
-        mt5pUFBQUFBQUFBQbKbefoXbU1tbTWhRrKxdT2NkZPz8fX3w1oIAAAAAAAAAAAAAXPOolWNQY2NjY2OR
-        6YR+vCrhTepNUVGsaV1PT2OVfX19ffDWgsEAAAAAAAAAAAAAAAHg3JWVZGRkkZXpxOcBXDtvUWhRUaxp
-        T09QUGxj8Pnw4EC7YQAAAAAAAAAAAAAAAACb4Kfp+fz88KjE51IAv+eGUVGsaV1PT1BQY5Gor7h+glgA
-        AAAAAAAAAAAAAAAAAAAAAa/WpNB0zNa2AQAAAJiE3V1pT09QUGNjlenWAQAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAFyafri4fr6BAAAAAAHnnum0UFBQY2R98Mu4XAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAABlO57d8LKRkfninkBSAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAmeCfhoen
-        h4af52UAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH/32dTU1Ob7ZQAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABlgf61/oEAAAAAAAAAAAAAAAAAAAAA//4Bw///
-        AAD//ACD//8AAP/4AEP//wAA//AAAgP/AAD/8AAAAP8AAP8AAAAAfwAA/AAAAAB/AAD4AAAAAD8AAPAA
-        AAAAPwAA8AAAAAA/AADgAAAAAD8AAOAAAAAADwAA4AAAAAAHAADgAAAAAAMAAOAAAAAAAQAA4AAAAAAB
-        AADwAAAAAAAAAPAAAAAAAAAA+AAAAAAAAAD8AAAAAAAAAPwAAAAAAAAA8AAAAAABAADgAAAAAAMAAMAA
-        AAAAAwAAgAAAAAAHAACAAAAAAA8AAAAAAAAAPwAAAAAAAAA/AAAAAAAAAB8AAAAAAAAADwAAAAAAAAAH
-        AACAAAAAAAcAAIAAAAAABwAAwAAAAAADAADgAAAAAAMAAPgAAAAABwAA/AAAAAAHAAD8AAAAAAcAAPwA
-        AAAADwAA/AAAAAAPAAD+AAAAAB8AAP8ACAAAfwAA/4AcAAf/AAD/wDwAB/8AAP///gAP/wAA////AB//
-        AAD///+AP/8AAP///8D//wAAKAAAACAAAABAAAAAAQAIAAAAAACABAAAAAAAAAAAAAAAAQAAAAAAAAAA
-        AAD///8AgAAAAICAgAAAgAAAQECgAODg4ACgoEAAQABgAEAggACgoKAAgKBAAEBgwABAgOAAICAAAGCg
-        IABgYEAAYGBgAKDAoADgwOAA/+D/ACDAIACgwGAAYEBgAIAggADgIMAAIGDAAIBgwAAAIOAAQGDgAKCA
-        4AAgQAAAIEBAAECgQACAgGAA4MCAAMCAoADAoKAAIOCgAMDgwAD/4OAAGMCAACCwaAAgyIgAIKhgACDI
-        gAAoyIgAILh4AOjo6AD4+PgASNCYAP/4/wAwyIgAMNCYADjQmABA0JgAYNioAGjYsAAgwHgAMMiQAEjY
-        qAAoyJAAOMiQADjQkABY2KgA+PD4ACCYSAAguHAAIKBYAEjYoADAuLgAeOC4APDo8AAosFAAKLBYABjI
-        gAAoyIAAaNioALiwsABw4LgA2MjQAODo4ADo6OAA8OjoACCIOAAoqEAAGJhIACCYUAAwuGgAGMB4AFDI
-        kABI0KAAQNigAFDYoABY2KAAsMCoAEDYqABQ4LgAeODAAMjAyADY0NgA4NjYAPDw6AD/6PgAIFAIABg4
-        EAAYSBgAMHA4ACCAOAAgiEAAQKBIACioSABAqEgAKKhQACioYAAguGgASMBwAIigeAA4wHgAWMB4ACjA
-        gABQyIAAiLiIABjIiABYyIgAKNCQAKigmABY0JgAqKCgAKCgqAC4sKgAONioAGDYsABI4LAAuLC4AMCw
-        uADA0LgAaOC4AMjIwADI0MAAyMjIAIDoyACI6MgA2NjQANjI2ADI0NgA4NDYANjg2ADo4OAA6NjoAOjg
-        6AD48PAA6PjwAPj48AD46PgA//j4AP//+AD/6P8AKEAAABg4CAAYUAgAGEAQABhQEAAoWBgAMFgYACBg
-        GAAocBgAGFggAEBYIAAQaCAAOGggACh4IAAoiCAAKJggADBYKAAgYCgAMGAoABhoKABIaCgAIHAoABB4
-        KAAogCgAKIgoADCYKAAooCgAOFgwACiIMAAomDAAMJgwADB4OABAgDgAGIg4ABCQOAAgkDgAMJA4ACCY
-        OAAwmDgAKKA4ADCgOABAaEAAOIBAABiQQAAwqEAAgFBIAFBgSABYaEgAYHhIACCQSAAImEgAKJhIAEig
-        SAAgqEgAMKhIAGhoUAA4kFAAKJhQAFiYUAAooFAASKBQAFigUABIqFAAOLBQAGB4WABwgFgAMJBYADiQ
-        WAAwmFgAGKhYACCoWABQqFgAWKhYABiwWAA4sFgAULBYAFiwWACIaGAAaHhgAHiAYAB4iGAAOJhgAEiY
-        YAAYqGAAKLBgABi4YAAguGAAMLhgAHiQaACAkGgAOKhoAGioaABwqGgAaLBoAHi4aABYwGgAUKhwAHCo
-        cAAAAAAAAAAAAAAATrIfqEYAAPdodQAAAAAAAAAAAAAAAAAAAAAAAAAAAHWka+/ha3UA7Wh1AAAAAAAA
-        AAAAAAAAAAAAAAAAAAB1o/hhYWGF4H73oHpldd/ufgAAAAAAAAAAAAAAAABQULL4YTw8PDyF/s6l9qqz
-        1+LWekYAAAAAAAAAAAB+7vD++EU8PDw8PDwyq7WmcoNgYIMqegAAAAAAAAAATr5zNTU1NkVcXEVcRTfC
-        rNk1Li4uLn12igAAAAAAAJbY5zUuLi4uNjY2NjY2Pry7OistKysrKymIAAAAAAAAX8QtKy0rKy0uNTU1
-        NTU0u3ErLS0tLS0tWRIBAAAAAAASwy0pKSkpKSkrLi4uPXi7QykpKSkpKSkt8vtRAAAAAF+2OikpKSkp
-        KSkpKSkrKtFLKSkpKSkpKS0r59pRAAAABr5WLUMvLy8vLy8vLzosLDovLy8vLy8vL0Mt0P8xAAAAX6JW
-        Q0MqKioqKioqKioqKioqKioqKioqKirxyJsAAAAxX7CxVyosLCwsLCwsLCwsLCwsLCwsLCwsLONrMAAA
-        AACWUM2fr21ERERERERERFdXV0RERFdXV0REVsdBAAAAdcy5rmppaadsQkJCQs9CRCovWVk6OkNyQkKp
-        AwAAANWhtL/JbW1tbGxtwVRUV0MpSykpeys9NTU7wN4AAAB1omy6tbW1bGy1tbVUQkMtLSkpQ0lvSUr1
-        WHQSZQAAZ9vzOixXz21Ubc9XKlkrKy0tKS0pOkrFrXpSlAAAAABQITouKysrKysrKysrLSktLS0tLSkt
-        KzRYyvwGAAAAAJTSOjs7Oy4uPS4uLkxMLng6LS0tLS40PjcyWHCPAAAAM/r0gz81NTY7OzQ0NDQ7Sjot
-        KSkuOz43Ml2EdupmAAAAj25MYDc3Nj4+Pj8+NnZVLSkpLTQ3MltdQDhi6F8AAAAAi/12RTcyMjIyMjJb
-        3VV7KS0uOzJdXjg5OWJ5EgAAAAAARno+XV1dXV1dQFq4bytMND4+MkA4OU9HjnwSAAAAAAAAX1o4QEA4
-        OECE6LdJPTQ+NzJbODlPR0eOd48AAAAAAACLfIk4OTlNT3/pEtM2PjcyXV44R2KOjn8SAAAAAAAAAEh6
-        Wo1iR41PVSeLcTcyW11AODlHR0dNEjEAAAAAAAAAAGZ6dH9NeVUSQY/cN11eODg5YncnJ1EAAAAAAAAA
-        AAAAADGIevx6J5YAAHpJiTk5T418egEAAAAAAAAAAAAAAAAAAAAzAQAAAAAAMOZJf01NdOVRAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAlP8hbiH5ZQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnWN+Rp0AAAAA
-        AAAAAAAA/8GP//+Aj///AAB//AAAH/AAAB/gAAAPwAAAD8AAAAfAAAADwAAAAcAAAADgAAAA4AAAAPAA
-        AADgAAABwAAAA4AAAAMAAAAPAAAADwAAAAcAAAADgAAAA8AAAAPgAAAD8AAAA/AAAAfwAAAH+AAAH/wG
-        AH//PgD///8B////g/8oAAAAGAAAADAAAAABAAgAAAAAAKACAAAAAAAAAAAAAAABAAAAAAAAAAAAAP//
-        /wDAwLgAeJhoAKiwmAD46PgAmMCYAECgUABIuGgASLBgAHiweADo4OgA2OjYAJjImACQyJAA0ODIALDQ
-        qAAwsFgAWNioAGjYuAB44MAAUMiAAIjIkAC42LgAYMCAAGDIkABYyJAASLhgAJjQmABYqGAAOMiQAFDQ
-        oABY0KAAYNioAHDguAC44MAAyODQAOjo6ADI2MAAYMCIAHDYuAA4sGAAwNiwAEiwaAAwyJAAQMiYAEjQ
-        mABg0KgAeNi4AHjguAB42LAAgNCYAODo4ACYwKAAWNCYAECgQAAwqFAAKMiIAEDIkABo2LAAiODIALC4
-        qAB4uIAAUNioADiwWAAgoDgAIMCAACjAgAAwyIgAcNiwAGjAiADY4NAAWLhwAEDQmABAwIgAKKBAABjA
-        gABgwHgA8ODgAFCoWAA40KAAKLBgABjAeABg2LAAQMCAAHi4eAC4wKAAKMiQACDIiAAgwHgAKLhoAFiw
-        aADg6NgAyMiwABjIiAAguHgAILBoABioYAAYsHAAMKBAAJjAkAD46PAAyMDAAEh4QAAQeCgAIJA4ACCA
-        MAAggCgAIIg4ABiYSAAYsGgAGLhwACCoSAAgoEAAWMCAAHDIkAC4yLgAqJiYAEBYMAAIYBgAEHAoABiA
-        OAAYeDAAGGgoABiYUAAgyJAAILhwACCAOACQkIgAsKioAHiAcAAgOAgAGEAQABiQQAAgkEgAGKBQACCo
-        YAAgoFAAIJhIABCQQAAwaDgA2MjQALjAuABAcEAAGHg4ABigWAAYqFgAIIBAALi4sACwwKgAGHAgABCg
-        WAAokEgA4NjYAFiQUAAQqFgAGLh4ACCgWAAIqFAA6NjYAEigUAAQuHAAgLiIAPDw6ABgoFgAGLhoADDQ
-        mAAwuHAAKJgoABDAeACI0KgAoKiQADCYSAAgyIAAKNCQADjImABA0KAAOMCAACiAGAAoqFAAmMioAJiY
-        iABooHAAWLiIADiweABI2KgASNCgAEjYsABAsHgAKHAYACh4IAAoqGAAULB4AEhgMAAwqHAAUOi4AFDg
-        uABomHAAOGAgAGCAWABogFAAMHg4AECIWABwmHAAyMC4AKCgkABAYDAAMJBYAEC4iAA4qHAAUIhYANDA
-        wAA4WCAAwLCwAFBgMAAYQAAAYHBIAEBgKABggFAAxMC8AHyYbACosJwA/Oz8AJzAmABApFAATLhsAHy0
-        fADs5OgA3OjYAJzMnACUyJQA0ODMADSwWABs3LgAVMiEAIzIkABgxIQAYMyUAFzMkABIuGQA7OTsAFis
-        ZAA8zJAAVNSkAFjUpABk2KgAdOC8AGTMkAC85MQAzOTQAOzs6ADM2MQAYMSIAGjcuAB03LgAcOC8AAAA
-        AAAAAADV1tfYmQDOxwAAAAAAAAAAAAAAAAAAAKvBz9DR0tPGxwAAAAAAAAAAAAAAAAAAAMG4w7vDSbbG
-        x8jJystmAAAAAAAAALW2t7y5ubm6xLy9vr9QUDnAAAAAAAAABKxYrqavsLCwsLGys6Y5OVc5tAAAAAAA
-        pG9XOa05pqamUKeoWUJCQkKpqgAAAACfT1JCQkJMWDk5V1FwXkxMTExMWqKjAAAAmptYUlJSUlJSTIhg
-        TFJSUlJZQp7iAAAAlZabfn5gYGBgYGBgYGB+fn5gYG+YmQAAAHRnk51giIiIiIiInZ2dnZ2diIiTAgAA
-        AIGCg4R7homJiYqKiYhgYIidim2MjQB1dndof3p7amlsbIlvTExMWK45WX+AAGZnaGlqampqamyJfq2t
-        Qn6zSxH8c3QAAF1AWFl+YIhgfkJYWEJCQkJZUWNkZQAAAFboriyurq6uOTk5Q0JCQkI5pvJaSDQAAONP
-        Q7Cvph4sLCweUVlCQkTySR9TVD4AAABHSB6wSUlJSUlKS0JCQh4uHxL1IhhHAAAAlT4uHx8fHxJAQVg5
-        LPLzITv+FHNcAAAAADUgISEhOyA3OFceSS706TE8MhYAAAAAAPv86fb2/xsqKx4uH/QhMTExMzQAAAAA
-        AAAX7O3tCBzw8fIS9PX29/j5+gAAAAAAAAAA5OXm5wAAEEASIhTq6wAAAAAAAAAAAAAAAAAAAAAAAN/g
-        4Qni4wAAAAAAAAAAAAAAAAAAAAAAAADb3N3eAAAAAAAAAP4J/wD8Af8A/AAPAOAADwDAAAcAwAAHAIAA
-        AQDAAAEAwAAAAOAAAADgAAAAgAABAAAAAwAAAAcAAAADAAAAAwCAAAEAwAABAOAAAwDgAAMA8AAHAPhg
-        PwD/8D8A//h/ACgAAAAQAAAAIAAAAAEACAAAAAAAQAEAAAAAAAAAAAAAAAEAAAAAAAAAAAAA////ANDP
-        xwBsoGQAmrKQALDTqgDX4tQAvtK4AGS6egBazZQAY8eMAJ3KoQCR06cAbtOgAGPIiQCx2bEAgL+KAD7K
-        jABh27EAaN21AHDUoQC+580A3+zeAJXKpABZ06EAZ920AGPdtQBawn4AUbJkAC7JjQBFzpgAUdKfAG7c
-        tQB24LsAftenALvZuQCZ1LAAZ8WPAEjSngBM0JsAT9OhAEzOlgAmp0MAIcOAAC3IigBDz5cAXNanAG/b
-        tAB03bQAgsiRANrQvwBcu3kAMs+VADvPmQA4zJMANsqPADrNlQAxu20AHL93AB/EggA2yo4AR9CbAFTZ
-        qwBOyowAk8eUAJC2fgArxXkALNCXACfHiAAmxocAJMeHACLJiAAjx4UAH8J/AB7CfwAjxYUAL8eIAES/
-        eQCTyZgApauTACKIQQASlUQAHZI/ACCTQAAfkUEAHpxRAB2zbQAdxIIAHMaEACC9cgAgrEwATrhqAKzZ
-        vQCKinwATXtNACpsMQAaXB4AHnYxACCNPQAgjz8AHqBUABy1bgAbu3QAHr97ACLAfwAXqlsAQINNAK61
-        pwA0cD4AGYVCAB+jWQAeplsAH6VaAB+jVwAfoVUAHqVaAB6lWwAfoVYAIaVaAB2UTQCYoY8ArLqeACWS
-        SgATu3EAHr93ABy4cgAct3EAHLdwAB2vaAAcuHMAHbdxAB63cgAVunQAwcu1AGuoZwAdu28AH8aHABrA
-        fAAkxoYAI8mLACavWwAcvnYAGcOBABrCfwAYw4AAML96AKTJpQCarocAKbFjABvNiwAny40ANMyTADrP
-        mAA61KEAM7FcACOsVAAiz5IAJsiHABfHggByzaEAmKCGAGSwhgA+vIQASd2uAEnXpgBK4bQAOaFcAC98
-        JwAut3YAJcSFAEW5gQCfu6EAXXZJAECteABI1KQATruMAGiHXQBWdEIAeIZsAImsigCyu6oAXmo/ADJk
-        KACco4sAc4BdAFJ1QwD+//8AiwAAAP7//wCMAAAA/f//AI0AAAD9//8AjgAAAP3//wCPAAAA/f//AJAA
-        AAD+//8AkQAAAP7//wCSAAAA////AJMAAAABAAAAlAAAAAMAAACVAAAABQAAAJYAAAAHAAAAlwAAAAkA
-        AACYAAAADAAAAJwZAABXAgAAgQAAAAEAAACCAAAAAQAAAIMAAAABAAAAhAAAAAEAAACIAAAA////AIkA
-        AAD///8AigAAAP7//wCLAAAA/v//AIwAAAD9//8AjQAAAP3//wCOAAAA/f//AI8AAAD9//8AkAAAAP7/
-        /wCRAAAA/v//AJIAAAD///8AkwAAAAEAAACUAAAAAwAAAJUAAAAFAAAAlgAAAAcAAACXAAAAAAAAAAC1
-        tre4uQAAAAAAAAAAAACsra6vsLGys7QAAAAAAKChoqOkpaanqKmqqwAAAJOUlZaXmJmam5ydnp8AAACG
-        h4iJV4qLjI2Oj5CRkgAAeXp7fH1+f4CBfoKDhHCFAABrbG1ub3BxcnN0dXZ3eABdXl9gYWJjZGVmZ2hp
-        agBPUFFSU1RVVldYWVpbXAAAQUJDREVGR0hJSktMTU4AADIzNDU2Nzg5Ojs8PT4/QAAAJCUmJygpKiss
-        LS4vMDEAAAAXGBkaGxwdHh8gISIjAAAAAAwNDg8QERITFBUWAAAAAAAABQYABwgJCgsAAAAAAAAAAAAA
-        AAACAwQAAAAAAPg/AADwBwAAwAMAAIADAACAAQAAgAAAAMAAAACAAQAAAAMAAAADAAAAAQAAgAEAAMAB
-        AADgAwAA8g8AAP8fAAAoAAAAMAAAAGAAAAABACAAAAAAAIAlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP/57gDGvL4AqqOiAr6ztwC9sbsD0sTKvJ+g
-        jv5Oazv9NVch/zZaI/5wiWX82N7a9bGnsmLj3eMA++L5AOfT4Tlvg1z/HE8I/C5bGv+2vbHn8entEPHp
-        7QCvq6YC0MLNAdbK1AG6rLkAo5WVANPI3ACtn6MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAq6KfAAAAAAC1q7AB0sPOANzL
-        2x+xqaPCVm0//yNKBv0jTQj+KFkW/yhbGP8fTg3+KU4O/Yqffv/c2t6ru7G3DtrJ0lJvgl3+HE4H+ipY
-        Ff+tuqjf/Pr6CPz6+wHFu7oAAAAAAAAAAAD/9v8AsZWlANPG3QO6ra4As6iwALyztQAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAApp6aANHK
-        xwCpoaYBraOwCZ6fjMc2WB7/GkkD+zN+Qf9CtIH/Scua/0rQn/5Jx5X/PaJr/hhYFfxge07/2eHZqdXC
-        y05pelT/Hk8J/ChXE/+rt6T14tTcFuPX3gDIu74H////Gv///xr///8MtJaqALmzxQCzqqYArKGoAr61
-        tgB6eHgAuqGlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC2qa4Auq22ALqt
-        rQHT0sADoZ6VAZOOhwSSi4YAtK6kk0BdKf8cUAv3RK15/0/itP5N4LH+Tdyt/0varP9L3K7+T+O3/1Pg
-        sP4jdzf6bYRc/fXt9J9Rajj3IFAL/i1cGv+7xrnO5tzKK7Ospp6TmYLYfots9H2MafSTn4Xgu7yztt/U
-        3127sLcEraOqAMO6uwI5OTUApoF/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAsKWnAMa2
-        uwCwo6gAuam2A+TA2wD/4voAvbKxANK6yQDUwc8wbYFe/xpRBvtCrnb+UOa6/knVp/9K16f/S9ip/0vY
-        qf9L2Kn/S9am/kvarP9U5Lf+J349/q2znP9McDr9G1gM/jxsLv/Ix7/ifZNq6jhjJP8gUAf/HlgO/yBh
-        GP8iXxj/LWEc/26OXv/Sz9DCrKGoUJ2UlwCWkpECpH13AL+5uAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AADKwcQAn5WSAMWstgGyoaUBr5yjALuksSHArrpqvbCtuL6xpry6rqPWPmQf/S6HO/1P4bT/SdWm/krY
-        qf9L2ar/Stip/0vZqv9L2ar/S9mq/0rXp/5O3K//QMyV/laBSf1CcjL/HWoV/0F2M/9We0b/Gl8G/yh1
-        J/s6p2v8PsqQ/kXToP1F0p79PMCI+yOOSfpCgTv/xci+/ZmLlVGom6UBurG1ArSppwAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAMfQ0gDKwMMAopmVALuxsgDJwsYFxLvCcKKmk9lghU3/PYlB/zefXP86rXD/M6Vi/kLC
-        iv9J2qz+SNWm/0nWp/9J16j/Sdeo/0nXqP9J16j/Sdeo/0jXqP9I1KX+St6x/zaWTv4pcxv+J3sj/it6
-        Jf8mcxr9LZBD/TjMlf832KT+NtKc/zjPmf830Jn+N9Wd/j/cq/8kuXj5UZhW/9nY0MX59e0A4eLdArmq
-        rgDX0NIAAAAAAAAAAAAAAAAAAAAAALrIyADKwMQA0MPKAdjL2A3Gtri5boxd/yN9G/8lrFv7MM6X/DbV
-        nvw21J/8N9ai/zjSm/5D1aH/R9Wl/0bVpf9G1qT/R9al/0fWpf9H1qX/R9al/0bWpf9G1KL/Styu/ziu
-        af8mfh3/K4Yq/yqCI/8skTr/Mc6R/zDOk/8vyoz/McyP/zDMkP8xzI//L8uP/y7Ji/421J3+Gblw+4q6
-        i/nhzdZ7/vH3ANDRygLTycwAAAAAAAAAAAAAAAAAAAAAALC8uwDVzMUB59jcANTL0LFylGP/GYYb+i2+
-        df011Z//McyQ/jDKjv8wy4//McyP/y/Kj/84z5j/QtSh/0DTnv9B1J7/QdOf/0HUn/9B1J//QdSf/0DU
-        n/9A0pz/Qtmo/zeyaf8qiCP/LJAw/yqLJf8nu3P/Js2P/yjIhv8oyYn/KMqJ/yjKif8oyon/KMmI/yjJ
-        if8oyIb/HsqM/Ee7ef/b09Lj1sTlCN2s3gHQx8sAAAAAAAAAAAAAAAAAz8/PAOjs8QIAAAAA9vT4PKOv
-        mf8hhhz6LbBh/ivPlf4px4r+KsmM/yvKjf8ryoz/K8mM/yrJjP8qyIz/ONGZ/zzRnP880Jv/PNCb/zzQ
-        nP880Jz/PNCc/zzQnP87z5n/Ptak/zOxYf8rkCj/LJMs/ymgQv8jyYj/IsWE/yHGhP8ixYT/IsaF/yLG
-        hf8ixoX/IsWF/yLGhP8ixYT+IMWI/iPAeP3F2MP969LsNfXQ8ALT0dMCAAAAAPT39AAAAAAA1dXUAKKa
-        mAPIn7AA8N/qoWCYVf8dnSr6J8SF/yTHh/8jx4X/I8aG/yTHhv8jx4b/I8aG/yPHhv8jxoX/KsiM/zbP
-        l/81zpf/Nc+X/zbPl/82z5f/Ns+X/zbPl/81zZX/NtOe/y+wXf8rlyv/LJkp/yK5av8eyIb/IMOB/yDD
-        g/8gxIP/IMSE/yDEhP8gxIT/IMSD/yDEhP8gxIP/IMWD/xbCePzK49r///j/Rvr2+gDs6+sA////AfPz
-        8gD5+fkAxMTEAYaEhgCkkpIPz8vG5zaUM/4mrEL9IMaI/iLEg/8gxYL/IcaC/yHGg/8hxoL/IcaD/yDF
-        gv8hxoP/IMSC/yrLjP8wzZL/MMuS/zDMkv8wzJL/McyS/zDMkv8xy5H/MNCX/yuyV/8rmyf/KaZD/xrE
-        g/8cw4D/G8OB/xzDgf8cw4H/HMOB/xzDgf8cw4H/HMOA/xvDgf8cw4D/HcSB/hbAef6XyKH98Orr5vHr
-        8ZTm6+IO6e7oAPLz8QH//f8A9/T0AgAAAAD///8bw8m79yeQJv8mrE3+HMWG/x7Cgf8cw4D/HcSB/x3E
-        gf8dxIH/HcSB/x3DgP8dxIH/HMOA/x/Egf8pyYv/KcmL/ynJiv8pyYv/KsqL/ynJi/8qyYn/KMyR/yus
-        Uf8tlyX/H7dn/xvFhP8awn7/G8J//xrDgP8bw4D/GsOA/xrDgP8aw4D/GsJ//xnCf/8bwn//GsJ//x7E
-        gP8hpD/+P547/6vPqv/8+f7V8/PzHvn4+QD6+fsC8vLyAgAAAAD///8bxcy99yaGIP8moUf+GsWF/xzB
-        f/8awn//GsJ//xvCf/8bwn//G8J//xvCf/8awn//G8J//xvCf/8exYL/IMWE/yDEg/8gxYP/IcWE/yDF
-        g/8gw4L/HsmK/yieQv8plDf/GMWB/xrCfv8awX//GsJ+/xrCf/8awn//GsJ//xrCf/8awn//GsF//xrC
-        fv8awX//HMKB/yPIhv4pyo3/H7Zp/RWLIviEuYP//Pv92u7v6xjt6OoE0tPTAJGKiQC7qqsM39vZ4TiD
-        Mf4ijDD9HMF8/hvAfv8bwH3/GsB+/xvBfv8bwX7/G8F+/xvBfv8awH3/G8F+/xzAfv8cwH3/G8F+/xvB
-        fv8bwX7/HMF+/xzBff8bwHz/G8WC/yOQOf8iqFz/GcWE/xu/ff8bwX7/G8B+/xvBfv8bwX7/G8F+/xvB
-        fv8bwX7/G8F9/xrAfv8bwX3/HcF9/xzBff8ZwXz+G8aH/iW8d/8PfBb4nsWd//v3+q76+/oA1tfXAM3G
-        xALm2twA+vX5rGiXYv0YbhL6JKVd/xjAfP8buXP/HLp2/xy7dv8cu3b/HLt2/xy7dv8cu3b/HLt2/xy7
-        dv8du3b/Hbt2/x66df8du3b/Hrt2/x26df8dunb/HLl1/yKRQv8duXL/Hbx1/x27df8cu3b/HLt2/xy7
-        dv8cu3b/HLt2/xy7dv8cu3b/HLt2/xy7dv8cu3b/HLt1/xy7df8du3b/G7ly/xvCfv4epFf9LHso/OTs
-        5vz8+vs03NzcAPr6+wMAAAAA+/j7TMnRxv8YYhT5IHYp/h6waP4duXP/HbJs/x60bv8dtW7/HrVv/x61
-        b/8etW//HrVv/x61b/8etW//HrVv/x21b/8etW//HbVv/x20bv8dtW//HrFq/x2lXv8bt3D/HbRu/x21
-        bv8etW//HrVv/x61b/8etW//HrVv/x61b/8etW//HrVv/x61b/8etW//HrVv/x20bv8dtG7/HLRu/xy0
-        bf8iuHb/D28a/Zu4mf/+/P3RAAAAAN7k2gDy7/AB+/r6AP37/KWYsJX/DE8C+B5qI/8jpWD/HLZt/h6y
-        aP8crmX/Ha5m/x6vZ/8dr2b/Ha9m/x6vZ/8er2f/Hq9n/x6vZ/8er2f/Hq9n/x6vZ/8dr2f/Hq9m/x6v
-        af8dr2f/Hq9m/x2vZ/8er2f/Hq9n/x6vZ/8er2f/Hq9n/x6vZ/8er2f/Hq9n/x6vZ/8er2f/Hq9n/x6v
-        Zv8er2f/Ha5m/x6tZf8ft3D+D3ot/2eOYP7/////AAAAAO7z7QDR1NAA3t/eAczSzBbw7+3ZoLad/yJW
-        GP8NSgb+HHc1/yCgWf8fsGb/Hq1j/x6oX/8eqF//Half/x6pX/8eqWD/Hqlf/x6pX/8eqV//Hqlf/x6p
-        X/8eqV//Hqlg/x6pX/8eqV//Hqlg/x6pYP8eqV//Hqlg/x6pYP8eqWD/Hqlg/x6pYP8eqWD/Hqlf/x6p
-        X/8eqWD/Hqlf/x6pYP8eqWD/Halg/x6nXf8hsWj/E3cv/ll8UP/////9AAAAANPU1gDX2tUA+f37AeDj
-        4QC8xL0J2NTZh8bPyfFnh2X9G0QR/hxJE/8ebC7/HJVM/x+qXP8fp1n/H6FX/x6iV/8eo1f/HqNY/x+k
-        WP8fo1j/H6RY/x+kWP8fpFj/H6RY/x+kWP8fo1j/H6RY/x6jWP8epFj/HqRY/x+kWP8fo1f/H6JW/yCi
-        V/8fo1f/HaNY/x6kWf8epFj/H6RZ/x6jWP8fpFj/HqNY/x6hVv8irGH+D2cj/2N/W/3//P/+v7m5APjy
-        +wAAAAAAs6urALSwtAC7tr0evru9aNTP0tjj4OH9kJ2H/R5AEv8aOwv/G0AP/xthJv8ejUb/HqZW/x+k
-        VP8fnlD/H51Q/x+eUf8fnlD/H55R/x+eUf8fnlH/IJ5R/x+eUf8fn1L/H55R/x6cT/8fmk3/HptN/x6c
-        Tv8enlH/HZ9U/x2gVP8dnlL/H5pQ/x6YTv8dmUv/HptN/x+eUf8gn1L/H51Q/x6cT/4lpVn/CkcO/JCZ
-        iP/o3+m06uHmAPPu9ADR0tEBz8/UCsTAwoStrKHzd3pl/0hWNv8sPhn+JDgU/xs0Df8YMgr/GjAL/xop
-        Bf8YLQf/HE0e/x58Ov8dl0j/H5dI/x6XSP8el0j/H5dJ/x+XSf8el0n/H5hK/yCXSf8elEX/H5RE/x+d
-        Tv8dqV7/HLJt/x26df8bv3n/Gr97/xzBff8dwHz/Ir97/yO4df8krmn/IqBW/xyVRf8bk0L/H5VH/h6g
-        Tv8agTj8JEAb/9fY1+fPxc4wz8fNAKunrwOqqa8Avbe0w2ZuU/8ULgT9DT8M+hRlJv0aeTT+HHk0/h13
-        M/8ddDH/G28v/xttLf8daCr/G10i/xpbIv8cdjP/IJJD/yCSQv8gkkL/IZND/yCTQ/8gk0P/Ho0+/yCP
-        P/8eolP/G7Vu/xrBff8exYT/G8WD/xrEgP8aw3//GsF+/xvCf/8dxYH/IceG/yfKjf8szpD/L82P/y/B
-        gv8mqGL/IZRH/yKORP0GNQP9jJKF+7/Avznm6uQAm5qMCI2MfQCsp51mTFw5/wgpAPgdbSz9JpRE/ySU
-        Qv4ikUD/IJA//yCRQP8ikUD/IZJA/yGSQP8gk0D/IZRB/yGUQf8hjDz/IIw7/yCNPP8gjjz/IIw8/yCI
-        N/8iiTf/IJpQ/xy4c/8cxYT/GsWD/xnCgP8cwn7/HMJ+/xjEg/8axYT/GcSF/xrFhf8ex4j/IsiK/yjK
-        jf8tzJL/M86X/znUoP4/2ar+MsaA/QxhEvh1gHH87Pfza8HdzADV1tIGm5eXAK2oqG9peFr0DiQA/CJo
-        I/0gizf/IIIy/iCEM/8ghjX/IIY2/yGGNf8ghTX/IIU1/yCFNf8hhTX/IIU1/yCFNf8ghjX/IYUz/yGB
-        MP8ify3/HYUz/yCZSv8etW3/GsWC/xrFgv8dwX7/G8F+/xzCfv8bw4D/Hb12/ySwV/8krlH/ILNb/yC2
-        Yv8kuWf/KLtt/ya9cP8ivHD+JL90/yK7a/0irVT7O6pK/6TRpf/38PPTytvMBc3o1APTzc8AlpSWL9LP
-        x/Azji3/HphA/B+iWv8gjDv+IIIv/yF8Kf8heSb/IXol/yF6J/8geyj/IHso/yF7KP8heyf/IXom/yB5
-        Jf8gfCj/IIMx/x2RQv8dplr/HLp1/xrHhP8bxoX/HsGA/x/Cf/8dw4D/HcOA/x3DgP8ew3//HMOA/x+9
-        c/8lrVL/Kp0x/y2aJf8qnCz/KZ0r/ziiOf9TrVX/ZbVn/4vDif+517L/6+jm7vbo85nm4N4X6N7bA/fd
-        4AEAAAAA//7/24imfv0gmCP+JcF1/xvKif4dxYL/Hbx4/x2wav8fpVz/H5tP/x2VRf8hkEL/IZBC/yGP
-        Qf8gkUf/H5pP/xykWv8csWn/Hb15/xvFhf8bx4b/HcWC/x7CgP8fwn//HsOA/x/Egf8fxIH/H8SB/x7E
-        gf8fxIH/HcOA/xvFg/8cxYf/HsF8/yOyXP8tozv/J5oo/zqjQ/+52b79//X//vzo89fDwsJSr6+tGLu6
-        uADT09cA/8SoAP3h5gAAAAAA/O748W2hY/4cni3/JsOD/iPFhP8jxIT/IseG/yPJiP8gy4n/IMuI/x7J
-        h/8dyof/HcmH/x3Jh/8dyof/HcmH/x3Jh/8ex4f/G8SC/xzCff8dwX3/HcJ+/x3DgP8dwoH/HsOB/x7E
-        gP8ew4H/HsOA/x3DgP8fw4H/HMOA/xzCf/8ewn7/IsSD/yXIjf8rxoX/Lrdm/yaiNv8hliD+arZr/dTf
-        0vLh3+CTyc3KF+Hf4QDb09UC8+/xAOzt6AAAAAAA/uv5/mmgYf4eoTD/LMmJ/inJiv8oyIj/KsmJ/yjI
-        h/8myIf/JseH/yXGhv8lxob/JseH/yXGhv8lxoX/JcaE/yTFhf8ixIP/IcOB/yHDgf8gw4H/IMOB/yHC
-        gf8ixIL/H8N//x7DgP8ew4D/H8SB/x7CgP8exID/HcJ//yDDgP8kxYP/KMeF/y7Hif8zyZD/Os6X/z3M
-        lP85vG//H6Ew/yeaLP+ez5///fH43+Pe4iP15usA8OzsAOXt6QAAAAAA//v/8Xyqdf8dnCv/McqK/y/M
-        kf8vy4//L8yQ/y/Lj/8ty4//LcuO/yzKjf8sy43/LMqO/yzKjv8ryoz/KciK/yfGhf8nxYT/J8aF/yfH
-        hf8nx4T/J8eE/ynGif8lvXL/H8J9/x7Dgf8fw3//HsOA/x7DgP8ew4D/IcOB/yfFhP8rx4f/L8mK/zXK
-        jv87y5L/PsyT/0LPmP9I1KP+UNSk/kC5a/8Qkxj5i8WO//jv9NH49fcI8ezuAefu6wDl4OEA8vHyl7LD
-        qfohkyD+N8N9/jPQmv4yzJP/M86V/zLNlP8yzJT/Ms2T/zLNkv8yzpL/Ms6S/zDMkP8tyYz/LciL/y3I
-        if8tyYn/LsiK/y/Hif8vyYr/L8qM/zLHhf8mrVD/HsOB/x7DgP8ew3//H8SB/xzDf/8fxIH/KMaG/y3I
-        if8xyYz/NsqO/zrMkv8/zZf/RM6Z/0jQnP9O0Z3/U9Oh/17csf5Pw4L/F5Me+L7Yvf/58flx/Pf8APLr
-        7APv6usAwoCvCe7k59xSoEv+I6lC+z/Tpf84z5f+OM+Y/zjPmf84zpn/OM+Y/znPmf84z5b/NcyR/zPK
-        j/82yo7/NsqO/zXKj/81y4//N8qO/zfJj/83yo3/OM6Z/zS2Zf8lpz7/HcaG/x7Cf/8ew4D/HsOA/xvC
-        gP8dwoD/LMiJ/zTKj/84ypL/PcyV/0LOmP9Gz5v/StGd/0/Tn/9V1aP/W9el/17Wpf9r3rv+NrFY/FCt
-        Uv737/Pj6OToCeTb3gDa1tcA//b/AP73/lrK1cX/IZQh+DG5ZP5J267/QNKf/j7Rm/8/053/P9Kc/z3O
-        mP85zJL/O8yS/zzMk/87zJP/PMyT/zzNk/89zZT/PM2T/z3MlP87zpP/Ps6U/yyjOv8lq0n/HcaF/x/D
-        f/8dwn//HcJ//x7Dgf8gw4L/LMeI/zrNkv8+zJX/RM6Y/0nQm/9O0p7/U9Oh/1bVo/9c1qb/Ytiq/2bZ
-        rP9t3LX+ZdOf/iecL/zR38/89+z1OPrv+ADq5eYC5+XuBfjy9wD06u+hvtS9/yqeLvonr1b7QdSf/kfY
-        qP5D053+P8+a/0HNmP9Czpf/Qs6Y/0LOmf9Dzpn/Q86Z/0POmf9Dz5r/Q86Z/0POmP9F0qL/PL51/yqa
-        JP8mrlL/GsWG/x7Cf/8dwn//H8OA/yPFhP8oxob/K8eI/zvNk/9Gz5n/StGc/1DSn/9V1KL/Wdal/13W
-        qf9j2Kz/aNqv/23bsv9x3Lb/ed+9/yelOfqy1bH+/vv+U/76/gDz7u8E6effAezs6gLl6uUC8Onvm9zk
-        2v5yuXD/NaZD/0DEgP9K0qH/R9Cb/0rQnP9K0Jz/StCd/0vRnf9L0J3/StGd/0rQnP9K0Z3/S9Gd/0rR
-        nv9N0p7/L6dF/yqbKv8lr1T/G8SE/xzCf/8gw4H/J8SD/yvHiP8wyIz/NMmN/zzLk/9L0Z7/UdOg/1bU
-        o/9c1qf/Ydeq/2XZrP9q2rD/btyy/3Petv923rj/geTE/i+pQ/qx0q7+/v/+Uf7//gD69fYE6ebgAOPf
-        4ADm4eIA6ezkAPPt8UL/9v+9vMSq+D+1cP5S2Kj+UdKe/1HToP9R06D/UdOg/1HUof9R06D/UdSh/1LT
-        oP9T06H/U9Of/1fYqP9Fwnr/KZ0s/yueL/8msFb/H8WF/yPEgf8oxob/LceJ/zHKjP83y4//Oc2S/z3M
-        lP9M0p3/WNak/13WqP9j2Kz/Z9mv/2vasv9w3LX/dd65/3rgu/9+4b3/iObF/jKpQ/u+2L79//T+Rv/0
-        /wDu6eoD5uTkAOPg4ADu6usA9f7vAQAAAAD///0BxMSz6ku5ef5Z3K38V9Wi/1nVpP9Y1qT/WNWj/1jW
-        pP9Y1qT/Wdal/1nWpv9Y1ab/Wdam/17Yq/8xqUb/JJoo/y2eLv8ms1//JMiK/yrGhf8vyYv/M8qN/zfL
-        kP88zZP/Qc6W/0XPmv9L0Zz/Xtio/2XYrf9o2q//btuz/3Pct/933rn/feC8/4Hivv+J5sb+fNyz/T6p
-        R/7p6uXx8OrwE+np6ADq6OgAAAAAAOfl5QDq5+cA2t3jAOfu9ALr8/cN0c3E7UuxbP9f37P9Xdao/1/X
-        qv9g16r/YNap/2HXqv9h16r/Ytir/2LYq/9i1qr/Zty1/1LGhv8jmyT/aKho/y2ZK/8pt2P/KsqP/zHH
-        jP81ypH/OsyT/z7Nlv9Dz5n/R9Cb/0zSnf9Q05//XNen/2rbsv9v27b/dN24/3nfuv9+4b3/g+O//4Th
-        v/6e8Nv/Sbto+YnGiv//+/+l/fz9AOfv7QMAAAAAAAAAAAAAAAAAAAAAoq6wANfe4QLn4ecB9+7vuWWs
-        a/1c16P6admw/mfZrf9n2a7/aNmu/2farv9n2a7/Z9qu/2jarv9n2a3/cN67/imlQP9duGD93t7X/i6S
-        KP8svGr+NMuU/zjJj/88zJP/Qs6X/0bPmv9K0Z3/T9Kf/1PTov9X1aT/Xdao/27btP933rn/e9+6/4Di
-        vf+D477/iOXB/p3v3P9w0p79Tq9T/fL08Pnm5+Yr8e/xAO7u7gEAAAAAAAAAAAAAAAAAAAAAq7a4APbx
-        9AP//P8A9vL3YrDHp/81rlr5e+TH/27asv5s27L/btyz/27ctP9v3LL/btuy/23asf9448T+VcSB/xyU
-        H/3S7NX/9uvz/z+UOf8tvm3/Pc6Z/z7Mkv9Dzpj/SNCc/0zSnv9R06D/VtSj/1rWpv9e2Kj/Y9ir/23Z
-        sv+B48L/iOfI/ovpyf6R69D+kenQ/WbMkPpYtmD/7fns/vj//VX49/sA9PT2AQAAAAAAAAAAAAAAAAAA
-        AAAAAAAArbq4AOvr6wD5+PkC////Cf///8t1s3H/Obhk+4Llx/9/48T+d+C5/3Xduv923rn/e+S//n/m
-        x/5fyYv/DpIV+4zLkP/+/f60+O/4n2alXv4ns1r7RNCh/kXPmP9I0Zz/TtKf/1PUof9X1qP/XNen/2LX
-        qv9l2K7/atmy/3Dctv5x2Kn/cdOf/njXpf1w0Jb/bsOC/5PMl//w8e7z3NnYVMnKxgDr6OsCAAAAAD9L
-        PAAAAAAAAAAAAAAAAAAAAAAAAAAAAOro6ADr7uYBzs/NAKe9oyX99/vrcLhx/y2nRflcyY39d9uw/n/f
-        u/593Lj+adCa/jqvVP0Wkhr5fsOB//r4++n3/vsU/PP8dpG1h/8cnzL5S9Si/0vSnP9Q06D/VdWi/1nW
-        pv9d2Kn/Y9ms/2jarv9s27H/btuy/n3kwf84rk7+sNew/87nzf/S5s788fXw2P/2/5Pl3N8sysLBALWt
-        rARNXEQAAAAAAM3RzAAAAAAAAAAAAAAAAAAAAAAAAAAAAO7t7QBkaWUA2tnYAdrf1wDF9b0n//7/16/Z
-        r/9Mr1H/MKI5/SiiN/sjoC/7KJ0q/VGuVP+54L7/////1PP59CX59vgA+PH3MtPZy/oikiP8QsBx/ljY
-        rv5W1KD/XNal/2HYqv9l2a3/adqw/27bs/9v27D/g+fH/lbHiPxVsVj8////2+v/9D3//P8r9/P3BOfr
-        5wAAAAAAlI6FAqSdnAAsOyIA+v//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcJB8AaGhoAP3/
-        /QLl7+MA6OnnD/vz+nX18vPe1+fY/8jhyP/I4sf/2enc/vPy9d3s4+uM4+fjDdXd1QDx8/EE//f8AP/9
-        /6uGuYT/F5Yd+VDIh/9l3Lb+Zdqy/2bar/9q27D/b9yz/3bgvP6F5sr+btOf/yCaKPjG4Mf/9fD1dvj2
-        9wDt7OwA+vL3APfz9gT///8Ctq+qALm0swC4ubcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AACzta8Ag4ODAPj/9wDR/80B4tzfAMrPyADNzMsI7OHrMv///0n///9J7N3rMMvJygfIysgA383eAP//
-        /wHl5esB7e3xAeTl6R3v7PDxYapi/xeZHflDumX+ZNGh/nHbt/534L7+et++/nbar/5TwXP9F5gh95TG
-        lv/6+Pu+8/P1Btri2wXe3uEC8/LyAPf09QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAOrz6wD7//4A5NzhANXV0gPTz9AA7OLrAAAAAAAAAAAA7d/sANHM
-        0ADT0NIC4tHhAAAAAAAAAAAA5eTnAvH09ADs9e9E6uLo73Oocv8ikib/Hp4m/yypPv80rkr/LapC/yCe
-        Kf8mkyf/lbOR//Ho79Xr8+8d9PP2AObk5wHd3d8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA6OfmANrZ2ADU0tIA1dfVAvLz
-        8gLy8vAC1dbVAtPR0gDa2doA7OvuAAAAAAAAAAAAAAAAAOzr6QHi5OEA2tvYJt7V3bOutazzdJ9z/VSb
-        VP5MmEz+V5tX/n6hfPy9v7zs7ebsmPT38w/49/cA7+7tAezr7gDh3+MAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPn59QDOys0Ft7+4ALjB
-        uADv6e1s79bo7ta8zP7KtL/+3L/S/fPe7d7U1NNIws3FAOTn5AD///8D8O7tAOXk5wAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//4Bw///AAD//ACD//8AAP/4AEP//wAA//AAAgP/
-        AAD/8AAAAP8AAP8AAAAAfwAA/AAAAAB/AAD4AAAAAD8AAPAAAAAAPwAA8AAAAAA/AADgAAAAAD8AAOAA
-        AAAADwAA4AAAAAAHAADgAAAAAAMAAOAAAAAAAQAA4AAAAAABAADwAAAAAAAAAPAAAAAAAAAA+AAAAAAA
-        AAD8AAAAAAAAAPwAAAAAAAAA8AAAAAABAADgAAAAAAMAAMAAAAAAAwAAgAAAAAAHAACAAAAAAA8AAAAA
-        AAAAPwAAAAAAAAA/AAAAAAAAAB8AAAAAAAAADwAAAAAAAAAHAACAAAAAAAcAAIAAAAAABwAAwAAAAAAD
-        AADgAAAAAAMAAPgAAAAABwAA/AAAAAAHAAD8AAAAAAcAAPwAAAAADwAA/AAAAAAPAAD+AAAAAB8AAP8A
-        CAAAfwAA/4AcAAf/AAD/wDwAB/8AAP///gAP/wAA////AB//AAD///+AP/8AAP///8D//wAAKAAAACAA
-        AABAAAAAAQAgAAAAAACAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAtauoALGv
-        oACqpKIC1srTAPDj9QS6sqzWUGAv/iQ8APtCVR/8vb2v4u/p8S8aSRcAfY1t0h5PCP+HnH3d/f39Cfr3
-        +AOQj4AA////AQABAAUCAgMCflNLALyvuACuqKkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAApqeuAK+2
-        wAC/ta8BrayfBLmyqQPCt7cPi453yTFUF/8sdDX9O5hf/zWRV/0wcDT+hJV16uHp30h0gmHKHk8I/3+Y
-        deQAAAAA//v/ANrH1gIAAAAA/4j/AAAAAAD///8BqZWjAKShngC6rK4AAAAAAAAAAAAAAAAAtaysAOPD
-        2QCPnKAAoZynA7SwpQCIjnwAkpOHAI+UfKMnVRT/Oqx0+0/itP9O4rT/T+O2/0vdrvwtk1b/naeQ3X2M
-        a9cZTAT/kqaK1uDV2mWRk3y+cn5a2XiHYc2rqZqT1svQK7iutQCvnqkBnp+XAJd9dgAAAAAAAAAAAMDF
-        yACmnZYA27LMAJKanACfnakAwq+2HuLC0FjbxM1xSGYq/zamZ/xS6L3+Sten/krXp/5K1qf+Tdmr/0ni
-        s/1NpG//XXtG/x9iFP91kGf3Omgj/yFyKf8qllP/MZlb/zaNTP+LqoX2wbS7ctXI1gC9trsCh2djAAAA
-        AAAAAAAAxM3UAKObkwDOu8IA4c7aBqudmH1vj2DtR5te/0Wvdv84rG39R9Wi/knWqP9J1qf/Sdeo/0nX
-        qP9I1qb+Stqs/0XKlv0qeCP+Knwl/ydyG/8rpFz9O9ik/Dzapf082qX8N9ii+iGybf+GtIj9++r1I//o
-        +wDEw74AAAAAAAAAAADFztUA18zQAebS3QS7tK24Qow8/yK1Zf8u0pj7MNKY+zPUm/450Jn/RNSi/kPU
-        of9D1aH/RNWh/0PUof9E1qP/Q9Cb/yyRNf4qhSH/KqNP/i3TmP4ryor/KsiJ/irIif4syIn/J9CS+zm+
-        ff7DxrizerRrArnPtQIAAAAA3uHgAMXGwgXYydAA7d7qXVuWUP8ar1f5LdGa/irIiv4qyIr+KciJ/inI
-        i/83z5f/PNGb/zrQmv870Zv/OtCa/zvSnf85zJL/LZg0/yuVLf8jwHn/IceH/yLFg/8ixoT/IsWE/yLG
-        hP4jxYX9G8N//qjWu/C9yMAB/+j+ANXS2gLY2toAi6B6A4iheAC0vqm9MZw3/SHFgPsixoX+IcWD/yHG
-        hP8ixoT/IMWC/ybHiP8yzpT/Ms2U/zLNlP8yzZT/M8+X/zDJif8snS//JqtN/xzGhv8ew4D/HcSC/x7D
-        gv8dxIH/HcSC/yDEgv4RwXn+ltKw+f///3rz9fgJ7OvuANDT0gEAAAAA////AqS9mt0jmzT+HsSC/R3D
-        gf4bw4D/HcOB/xzEgP8cw4D/G8N//yTHhv8pyYr/J8iJ/yjIif8oyo3/KMJ8/yyaL/8dvXL/GcOC/xrC
-        fv8aw3//GsN//xrCf/8aw3//GsF//xzFg/4osl39ZK1m/9zm3Mvr+e8Z+/f7AsDOugDA0LoBrsGm0yWI
-        Kv4dwHz8GsKA/hrBfv8awX7/GsF//xrBfv8awX//HMF+/x3CgP8cwn//HcJ//xzFhf8ftGn/JZpF/xnG
-        g/8awX7/GsF+/xvCf/8bwn//G8F+/xrBfv8awX7+HsOA/x7HiP8MsV/6SJ9Q/+Ts4sbQ4NAAr7+nBae5
-        ngDh4+CcQn84/xSZSvodxYH/HLhz/hy5df8cunX/HLt1/x26dv8dunb/Hbp1/x26df8duXT/HL15/x6p
-        Yf8eq2L/Hb14/xy5dP8cu3b/HLp2/xy6dv8cu3X/HLp2/x26df8cunT/HLhy/iDDgv4Lmkb9eqh2//n7
-        +n7///8DAAAAAP/+/yirvqf6ElwO/xeVS/0gunL/HbVs/x2waf8esGn/HrFp/x6xaf8esWn/HrFp/x6w
-        af8dsWn/Hq5n/x2xav8dsWn/HbFp/x6xaf8esWn/HrFp/x6xaf8esWn/HrFp/x2xaf8dsGn/H7Fr/xWr
-        Yv44gED+/vn7/wAAAADn6uUB8PDvAPn2+Vysu6joL2Eo/BRqKP4gmVL/Hq5i/x6tYf8dp13/Hqdd/x6o
-        Xv8eqF7/Hqhe/x6oXv8eqV7/Hqhe/x6oXv8eqV//Hqhe/x6oXv8ep13/Hqdd/x2oXv8eqV7/Hqlf/x6n
-        Xf8fqF7+GaZb/y5yNv7r5eX/oZeoALaytwHEw8YA1NDWAOvj63jRzs32W2tL/RY6CP4dXiX/HolD/x+k
-        Vv8fo1X/H59S/x+fU/8fn1P/H6BT/x+gVP8foFP/H51Q/x+cTv8enlD/HqBT/x6hVf8eoFT/HpxS/x2b
-        Tv8enE7/H59S/iGiVv8VlUj9P2k+//ju9eS5trwDy8jLAM3K0ECVk4jUUWBE/zdbMf0sVSn+GUQV/ho7
-        Ef8ZOxD/G1Yi/x2DPP8fl0f/H5ZH/x+XSP8fl0j/H5JD/x+URf8eoVP/Ha9m/xy5dP8bvnn/G756/x3A
-        e/8ivXr/Jrdz/yWoX/4glkn/IZxM/Q1kIv5/hnfqubW2PaWhnADDwLgWZ2hS7RRCDv8TdCr8GYo7/xuN
-        Pf8gjj//H40//x+KPf8egTf/H4E3/yCOPv8hjTv/IIk3/yGKOP8enFH/Hbdx/xrDgf8bxYP/G8SA/xrE
-        g/8Zxof/HcmK/yTMkP4r0Zf+MdKb/i7KjvsRjjv8XXZX/9nc1knL0soAxcbAII+fgs0VUBP/H4Ez+ySH
-        Mv8ifyz+IX8t/iGALv8hgS//IYIv/yGCLv8hgSz/IH8t/yCHNf8dmkz/HbRt/xzFg/8cxYP/HMJ+/xzC
-        gP8fvHH/JK1Q/ySpSP8mrlH/KrNb/y21Yv8yuWj/TLxw/5zNoP/c2tqRta+uAO/27gT/7vvLWKBR/xi4
-        XP4fvXv/Hqhf/h+cUP8fkkP/H409/yCMPP8gjD7/H5JE/x2dUf8drWb/G715/xzHhP8dxoT/H8J//x7D
-        gP8dw4D/H8OA/xzEgv8evnj/JbBY/yuhNv8omCP+h7+D/enk3vfq4OCU39LYOLKwrwCwrrIB/ur0ANzN
-        zP8/nkL9H8B1/yXKjP4kyor/I8uL/yHKiP8fyIb/IMiH/yDIhv8gyYj/H8mJ/x3Hhf8dxIH/HsF+/x/D
-        gf8ew4D/HsOA/x7Dgf8ew4D/HcJ//x7Egv8kyIz/LciL/zC5a/4vp0T9c7hy+97j3Ljp5ekf7uLsAOPY
-        3QH68PUA7Nvf/EWgR/4nxHn/L8yR/y7Kjf8syo3/K8mM/yvJjP8ryo3/KsmL/yjHiP8mxYT/JcWD/ybG
-        g/8mxob/JcF9/x7Cff8ew4H/HsOA/x7DgP8ixIH/KcaF/zDIiv84y5H/QNCc/0TQmf8wuGX9PKdF/9Hg
-        z+b/2f8X/On4Aerl5wH/+v+Ub6pl/yK0Xf471aX+NM2T/jTNlv80zZX/Nc+V/zLNkv8wyo3/MMmM/y/J
-        i/8xyYv/MsmL/zTLj/8qslr/HcF8/x/Egf8dw3//HcOA/yzHif8zyY3/OsyS/0HOmP9Hz5r/T9Og/mHd
-        tf9CxID5Va9a//Dw7Jnl5uIA7OnlBN7i2gfX3dDGPaRG/yvFgflD16r+PdKd/j3Rm/47zZb/OsyS/zvL
-        kv87zJL/O82T/zvMkv88z5n/OsF7/yamP/8dxYP/HsJ//xzCf/8fw4H/MMmM/z7Nlf9Ezpn/TNGe/1PU
-        of9a1qX/Yden/nLhv/09s13+r86q6vby9Qz57/kA9OrxAO3h8CfL28bjW7xn/zXAdv9G1J//Q8+a/0XO
-        mf9Fzpr/Rs+b/0XPmv9Gz5v/Rc+a/0jTo/81rU//JaY//xvFhf8ewn//I8SD/ynGiP8yyY3/Rs+a/0/S
-        nv9X1aP/Xteo/2TZrf9s27D/e+PE/lDEf/+XyZX4////Hv/+/wDx7e4C7uvsAMz2yRrBuLqZi7qH80PI
-        jP1S1KP+UNKf/1DTn/9Q06D/UNKf/1HSn/9U1qX/TMuO/ymcKv8nqkr/H8WF/yXFg/8ux4n/NcqO/znL
-        kf9J0Zz/Wtal/2HXqv9o2bD/b9u0/3Xet/6G58n9WceE/p/LnfH///8V//v/AO/r7AD44P8Byu3OAAAA
-        AACtwqnVUcuT/lzaq/1b1qb+W9al/1zXpv9d16j/W9Wn/mHbsf87slr+MZcr/imuUf8oyI3+McmL/zfL
-        kf8+zZX/RM+Z/0zSnf9i2Kv/a9qy/3Lctv9537r+gOC8/4/qz/tbv3T+zt3JxNHmzgDg6uAD9fDyAAAA
-        AACuxKgDa3lcA8vSv7lawYX9auC5+2TXqv9m2K3+Ztmt/2XYq/5u3rj/Vs2W/k2wVf+avY//IKpJ/zXN
-        lv86ypH/Qs6Y/0jQnP9P0qD/VdWi/2PYq/533rr+gOLA/oflxP2T7NL7Zc6T+5rQnP/++/5P9fj1APLw
-        8gQAAAAAAAAAAO3u7AEAAAAA8evsUInAjP9Ry5D5fuTG/Xfhvf9237z+fOXE/3Ldt/wppD/9vuPA9cvS
-        wOYrqlH+P9Gd/UTOl/5M0Z7/U9Sh/1rWpv9h2Kr/admv/3rfuv973rT/fd61/3PPmf+j1Kf/+fj2dP38
-        +wD++/4B++33AAAAAAAAAAAA6+fqAPf4+QLY39kA8vPumXnCgf9HvXL/YM+X+2XSnvtPxH77LKU+/5rR
-        m//18fRa1NTIl0aoU/1D0pr6T9Of/1XUof9c16f/Y9ms/2nZrv534sD+WMJ7/LbfvPvD48bm4Ozds/30
-        +k7v7OsA6+TjAebm4ADx7O8AAAAAAAAAAADr6eoA+fj3AAAAAAD9+/4A+/f5f7jZtuuAw4P/c794/4HC
-        gf/H3cfm5uPlX/b08wD08fNMf7d5/yqyVPlk3bb+Zdqx/mnbsf5w3bj+hOfM/lbKivp8wYD///7/av//
-        /w339fcA6fnwAP/y7QHz6+sA7ezoAP33/AAAAAAAAAAAAOjn5wD6+fkAycHLAOrq6gDm5eUA//T/GP/6
-        /1H///9g//j/SejZ6BHCwcAA8PLvA9DRzwDp6umuVqdX/yuvTf1Z0Jb/admq/2rYpv9Gvm39UatX/+Lp
-        4sHq8ekF2efaAObl5wL///8C5tTGAO/n5gDu7ekAAAAAAAAAAAAAAAAAAAAAAP/+/gD57vkA8O7wAO3q
-        6wL/8/8A//z/AAAAAAD/+v8A6droAMfFxgHj4+UB+/j6APjm+wzm4eOpc6dw9z2cQfw8okb+PZ5E/Wek
-        ZPnc2tm39PTyGPHv7QDU1tMC6ufpAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AADw8fAA6uroAOfm5QLt7e0F+PT3Buno6AXU0dQB3t3eAObm6QDPz8wB8PDuAPz8+wD/6/+Ay73E+KGk
-        lvvDuLv5/+z/lP/+/wDy8fEA1NXSAuHi4wDq6usAAAAAAAAAAAAAAAAAAAAAAAAAAAD/wY///4CP//8A
-        AH/8AAAf8AAAH+AAAA/AAAAPwAAAB8AAAAPAAAABwAAAAOAAAADgAAAA8AAAAOAAAAHAAAADgAAAAwAA
-        AA8AAAAPAAAABwAAAAOAAAADwAAAA+AAAAPwAAAD8AAAB/AAAAf4AAAf/AYAf/8+AP///wH///+D/ygA
-        AAAYAAAAMAAAAAEAIAAAAAAAYAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJlmbACnm54A////AdHH
-        xQXSyskAwrW2f1ZhMv4fQAD5ZnRI/OPf22zwzucUQWUt/2ODVeH8//wAAAAAAJWepQCzm60Awau6Bsqz
-        xgDx//8ArKCmAAAAAADAt7MAip2BAKR1dwCplKUCdYNoAIWMdACnppZTRmYy+DaWXPtEu4j9O6pz/VSL
-        WvbQw8ONOV0k+GWGWd7/+P8d4t3YSq2glkmlj5wSvaq4AMKzvgAAAAAAq4ifAAAAAADMw7sAX4FmAJVo
-        ZwCtn6oAuKSpG7impzhMZzHoN61z/1HpvfxM3rD/UOW4/j7Pm/9onHD9OWUk/WWHWO1oglTmNHk7/0eP
-        WP9wmnLnyMC/dNbV0gDR29ABwYi1AAAAAADFurQB0L6/ALacpQmcm42KaaJy71u6iv89tHj/Sdqq/kjU
-        pf9I1aX+R9Oi/0zfsv5At3z+KXQc/yx6Jf8oq2X/N9We+zbWnfskxoX/V7B4/9vLxEfGy7YBt8WzAfDo
-        7ACPk4QEjY19AKatl6Yznkv/IsmH/SnOkfwv0JX+Oc6Y/0LToP5A0p7/QNKd/kHWpP87w4P+Kocf/iir
-        V/4q0pb9KMeG/yfGhv8qzI76JceF/JjIqcZnvmwAdcV4Avvt+ADw4e4A7uPsKWCkW/wZvG35KMqO/SXF
-        g/8jxYP+JceH/zPNlP81zpb/Nc2V/zbRnf8yv3b/K5ks/yDAev8exIP/H8OB/x/Egv4ixIP9E8F7/YzT
-        ruz//v8y//r/APbp8QPm1tkA69ndVk+kVP0Wv3b6HcOC/xzDgP8cxIH/G8OA/yHGhP8nyYr/JsiI/ybM
-        kf8ptGP/JKlM/xjGh/8awn7/GsJ//xrDgP8bwn//GsSD/iy5bPyFvon58/DuZ+zs6QD/+f0A//r9OlqU
-        U/8RrF76H8aG/xu8ef4avnv/G797/xy+e/8cv3v/HL56/xvDgf8gp1v/HrNq/xrCf/8bvnr/G797/xu/
-        e/8bv3v+Hb97/xzEg/0Jqlb+erN9//f69k7DycIDvcW7BbDBqc8Zcib/Eadc+x66cv8dtG3/HbFr/x6z
-        bP8es2z/HbJs/x6zbP8drWb/HbNr/x6zbP8ds2z/HrRt/x60bf8etG3/HbNs/h+xav8bt3H9K5BK/ePf
-        2fLLz8kD3eTeAPP39xu8xbjFQ3dF/B1+Pf0fpFn+H69h/x6pXf8ep1z/Hqdd/x6nXP8eqV//Hqdd/x6l
-        Wv8epFj/H6NY/x6jWP8do1j/HqVa/x6lXP4frWL/I4RC/b69sf/d0tkDz8jOALizuT6xrKu3e4Rw/CA4
-        Dv0ZQBL+HGgu/x6QR/8fnE7/H5xO/x+bTv8gl0n/H5hJ/x6hVP8dqmH/HK5l/x2uZf8hqWL+IqFV/iOZ
-        TP4UlkX6Mmw8/9jM0K6cmY8Aq56YVEdZNv8PYBv/EnYr/h6AOP8eeDT/HW8t/x56NP8gjT3/IIo4/yCL
-        Ov8enVL/HLZw/xvCf/8bxID/GcWD/x3KjP8kzZH/JcmL/yC9dP4jgDr/kpaJrZ2YlgDMwsJkS3tF7xB6
-        L/4kkT77I4Qx/yGBLP4hgi3+IYQv/yGEMP8giTj/HptO/x20bf8dxYP/HMWD/xzDgf8fu3D/JKxP/yWn
-        Qv4yr1X+XcSH/XPIkfG5zrnC6eThGOPizwHKybX6Nq5U/x7MiP4hvHr/ILRu/h+tZf8fq2L/H61m/x21
-        cP8cwH3/HMeE/x3Ghf8ew4D/HsN//x7DgP8cw4H/IcB7/yq0YP4zpUD8nMSQ/f/q85nv4u4A3trbAPXk
-        7QG8wab/NaxW/SzNkv8sy4z+Ks6R/ynOkf8pzpL/J82P/yXJif8kxYT/JcWD/yXCf/8ewn7/HsOB/x7D
-        gP8iw4H/K8iJ/zbOl/89zZT+Lblo+1+3av/h6d6Jzd/OANnm2ATw5OaTVKla/ybFgfo906L+Ns2V/jbO
-        lf40y5D/M8mM/zLJjP8zyYz/NsyR/yy2Yv8dwHr/HcOB/x3DgP8vyIv/OsuS/0POl/5N0p7/YNy0/kPF
-        gv15vH3/7+zqL/f49wDLzskA2OXRqVq+c/82zI7+Q9Of/kDOl/9AzZb/Qc2X/0HOl/9C0Jz/QceI/yim
-        Qv8cw4H/HsOA/yPEg/82yo//SNCb/1LToP9b1qf+Zdiq/2/fuvljwHz+3uDTb+Pi1wDy6OwByLnJB7S/
-        q4J5vobwR8+Y/VHSoP5P0p//UNOg/0/Snv5V2Kv/ObJa/iOjO/4gxob/KcaG/zPKjf88zJP/U9Sh/2DX
-        qv9p2rH+cty0/33kwvlvxon93+LUbOPg1QAAAAAAAAQAAABTAACfw6PEWNKe/GHZq/td1qb+Xdam/mTZ
-        r/9Y0p39QqJB/jOrUP8qyY3+N8qQ/kDOl/9I0Zv/Wdal/m7btP553rr9iebI+3jdsvqIyZL/4OPcKu/0
-        7QAAAAAAt8+zA6DClgLO2MWIYsSL/2rfuPZ037v9deC8/XHgvPo/tmH/wdi2/UqxaPw1zZP/Rc6Y/k7S
-        n/9Y1aT+YNep/3nfu/574bn/fN61/4fRnP/k7+KAvdS7ANjx2wQAAAAAAAAAAOno5wHd7N4Qudq50GPG
-        hf9hzpb/X82S/0u4Z/+Z0Jvj7+XuZFqtZP4/zpP8V9an/1rVpP5l2Kv/dOC+/WfMkf285MbqzOfRwO/s
-        62P69fkA//b/AQAAAAAAAAAAAAAAAOfr5wHo7+kA7O/sEt3o2I6czp7YlMuV3tDizarp6ecnRFdDALDQ
-        q9I2sVj/W9mo+27fuv9448H9VcmH/43Jkvnt8ekp7OnqAOzq6wB4gnABAAAAAAAAAAAAAAAA9/b2AOfp
-        5gDi/+8A3uTZAAAAAAD///8D////BgAAAADm6OYA7O/rAd7W3jCewJvcQ6dT/Ey4bP1JsWH6f7V/7+zk
-        6mHN080Aw8zEAv///wK9srgAAAAAAPz9+wAAAAAAAAAAAPf19QAAAAAA////Af/5/wYAAAAAAAAAAP//
-        /wXw8+4C3tndAtvX2AD/9P8qxcK92Hybb/uosp3v/+7+W/Pm8gDp0uMCEkseAAAAAAAAAAAAAAAAAAAA
-        AAD+Cf8A/AH/APwADwDgAA8AwAAHAMAABwCAAAEAwAABAMAAAADgAAAA4AAAAIAAAQAAAAMAAAAHAAAA
-        AwAAAAMAgAABAMAAAQDgAAMA4AADAPAABwD4YD8A//A/AP/4fwAoAAAAEAAAACAAAAABACAAAAAAAEAE
-        AAAAAAAAAAAAAAAAAAAAAAAAADcBAAAAAAB9mHYHjZiGAMnAvBReaj/nMmQo/pyji6dzgF10UnVD6T43
-        QQAAAAAAcIxhAMm8uADau8QA/KvaAAAiAAAAAAAAem5iAHRPTAtddkmxQK14/kjUpP1Ou4z6aIdd4VZ0
-        QuV4hmyZiayKtLK7qmPKxMAA173FAf+o+AC2oqMCtaagCpighpRksIblPryE/0ndrv5J16b+SuG0/zmh
-        XP8vfCf/Lrd2/yXEhf9FuYH/n7uhaHS2hgB9uYoHaZpWAJquh4ApsWP/G82L/yfLjf40zJP/Os+Y/zrU
-        of4zsVz+I6xU/iLPkvsmyIf5F8eC+3LNodMzsEoEKps7AABmAABrqGe/Hbtv+h/Gh/sawHz+HcSC/iTG
-        hv8jyYv/Jq9b/xy+dv8Zw4H/GsJ//xjDgP0wv3r/pMmlws3KwRl5mGkArLqegiWSSv8Tu3H7Hr93/xy4
-        cv8ct3H/HLdw/x2vaP8cuHP/HLdx/x23cf4et3L/Fbp0/h+lWv/By7XV4+fjA/Dw8gGutae/NHA+/hmF
-        Qv0fo1n/HqZb/x+lWv8fo1f/H6FV/x6lWv8epVv+H6FW/yGlWvwdlE3+mKGP/3RtbQCKinyHTXtN7Sps
-        MfwaXB7+HnYx/yCNPf8gjz//HqBU/xy1bv8bu3T/Hr97/yLAf/4Xqlv/QINN9p6jl06lq5OoIohB/xKV
-        RP8dkj/+IJNA/x+RQf8enFH/HbNt/x3Egv8cxoT/IL1y/yCsTP1OuGr9rNm90Nbf1Ee81rwAkLZ+/yvF
-        efws0Jf+J8eI/ybGh/4kx4f/IsmI/yPHhf8fwn//HsJ//yPFhf8vx4j9RL95/ZPJmNjc5dYj5uvgBNrQ
-        v4Fcu3n/Ms+V/zvPmf44zJP/NsqP/zrNlf8xu23/HL93/x/Egv82yo7/R9Cb/1TZq/tOyoz/k8eUuDOi
-        NgCRzaUAmdSwZmfFj+5I0p78TNCb/k/Tof9Mzpb9JqdD/iHDgP8tyIr+Q8+X/lzWp/5v27T6dN20+oLI
-        kc8AmA4AKa5OCCu0ZQCVyqSsWdOh/2fdtPdj3bX7WsJ+/1GyZP8uyY3+Rc6Y/1HSn/9u3LX9duC7/37X
-        p/+72bl3otOlANfczgTU4ckDyNbDOZHTp+9u06D/Y8iJ/7HZsbKAv4rNPsqM/2Hbsfxo3bX+cNSh/77n
-        zcvf7N525OjiAOrt5QK0x6UA+/7/ANng2wDw7OkksNOqddfi1GTk5uAAvtK4U2S6evVazZT6Y8eM/Z3K
-        obu6xLAAwNC9APnz+gDp7OEAttizAPj++gDN2M4D6uvhAIzFiAAJAwoAwMC+ANjS1wDQz8eFbKBk/pqy
-        kNbbxNMUy8rIALbDtwj//P8ArtmvAPg/AADwBwAAwAMAAIADAACAAQAAgAAAAMAAAACAAQAAAAMAAAAD
-        AAAAAQAAgAEAAMABAADgAwAA8g8AAP8fAAAoAAAAQAAAAIAAAAABAAgAAAAAAAASAAAAAAAAAAAAAAAB
-        AAAAAAAAAAAAAP///wAA//8AgAAAAACAAACAgIAAgACAAACAgACgoEAAYKAgAODg4ABAQKAAQCCAAICg
-        QABAAGAAoKCgAODAYABAYMAAgKAgAGBgYAD/4P8AQKAgAEAgQABAQGAAYEBgAEBAIABgQEAAgIBgAKDA
-        YACgwKAAQIAgAGAgYACAIIAAwGDAAECA4ACggOAAYIAAAICAIADgwIAAwKCgAMDgwAAgQAAAIIAAAEBg
-        IAAggCAAQMAgACAgIABAoEAAIMBAAGDAQABA4EAAYABAAICgYABg4GAAQCBgAKDggABgQIAAwOCgAKAA
-        oACgQKAAYGCgAIBgoACgYKAA4ADAAOAgwABgYMAAAODgAOBA4ADgYOAAgIDgACAgAABAIAAAoIAAACBg
-        IACgoCAA4KAgAGBgQACAQGAAgGBgAADAYACggIAAoICgAMDAoADAoMAA4MDAAOD/4AD/YP8AGMCAACDI
-        gAAgsGgAKMiIACDIiAAwyJAASNioAEDQmABo2LAAILhwACCoYAA40JgAIKBYACCoWABg2KgAOMiQACCI
-        OAAgwHgASNCYACCYSAAwyIgAWNioAPj4+AAooDAASNCgAP/4/wBY2KAAeOC4AHDguAAgmFAAKMiQAOjo
-        6AAw0JgA+PD4ACC4eAAYyIgAyMjIAEjYoAD48PAAQNigACigOAA40JAA6ODgABiYIABw2LAA0MjIACjI
-        gABQ2KAAeODAANjY2ADo4OgAGMB4ABjIgADY0NAA6PDoACCQSACwoKgAcNi4AMjAwACI6MAA2ODYAPDo
-        6ADw6PAAIHggACCYIAC4sLAAwLi4ANjQ2ADw+PAAIHgoACiAKAAoiCgAIJgoADCgOACwqKgAwLiwALi4
-        uACI6MgA6OjwAP/w+AD/+PgAIFAIAChQEAAokCgAMJgwACCIQAAYuHAAUNioAFDouADY2NAA8Pj4APj/
-        +AAYkBgAGJgYACCAKAAosGAAILhoABi4eAComKAAONCgADjYoAC4sKgAuLiwAMjAyACQ6NAA4NjYAODg
-        2ADg6OAA4ODoAPj48AAIKAAAGEgAABhAEAAoWBAAGFggACh4IAA4YCgAKJgoACigKAAggDgAMKhAADCo
-        SAAosFgAOMiIALCYoACoqKgAaNioAHDYqAC4qLAASNiwAGDYsADIuLgAyMjAANjIyADI0MgAyODIANjo
-        2ADg2OAA6NjgAPDg6AD4//8AGDAIABg4EAAYYBAAEJAYAChwIAAwkCgAMJgoACCgKAAomDAAIJA4AECY
-        QAAoqEAAKKhIAECoSAAYoFgAQLBYACi4YAA4qGgASLhoAECocAA4wHAAKMB4ACjAgACoqJgAWNCgADjY
-        qABA2KgAQOCoAAAAAAAAAAAAAAAAAAAAAAAAAAAAvoQFTMvLTPuV4AAAAACRTKipy7AAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkQXLqaioqMbGy/uMAAAAkUyoqcuMAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAvEyoqKnoju7uzsjGTJOhANpMqMjL3QAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAvCuoqc5mrq+vr69v96jLkwCiTKip
-        y3sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhEyoqfev2F1dXV1d2K+GSUx9
-        vCupqMuTAJGi+wUFBdR7iQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXIqfevXV1dXV1dXV1d
-        2GzJ+9vISahMeNMby6jGxsbGyBuwUQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANxM5nSvXV1dXV1d
-        XV1dXV2vZh77yOjmNPvo5sjorPX19azmSb2MAAAAAAAAAAAAAAAAAAAAAAAAAAAA15m8+/tQ6Ohp2F1d
-        XV1dXV1dXV1dXa/QTOjo6Ezo6OhjXv//Xf9db/XmHYQAAAAAAAAAAAAAAAAAAAAAAADXvAUenaxj9fX1
-        XV1dXV1dXV1dXV1dXV3Y0srKysrKyp34/bpiYmJiYmL9XJy9iAAAAAAAAAAAAAAAAAAAAACZ+x6WdFy7
-        u7u7u35dXV1dXV1dXV1dXV1dXW+enZ2dnZ36d1xcXFxcXFxcXLpa7sIAAAAAAAAAAAAAAAAAAACEUJ0s
-        +Lt3XFxcgFxifm9vfG98fHx8fHx8b35vq56enp62d1pcXFxcXFxcWlxad1kdmgAAAAAAAAAAAAAAAACa
-        +52q+XdrXFxcXFxcXGJ+Xn5+fn5+fn5+Xl5+XquqqqrsWlpaWlpaWlpaWlpaWlpX9oEAAAAAAAAAAAAA
-        AAAAjO6X0XdaWnV1XFxadXVaYmJeXl5eXl5eXl5eul7sq6uqtltbWFhbW1tbW1tbWFtYW/jBmgAAAAAA
-        AAAAAAAA4/uqbvpaWlpaWlpaWlpaWlxiYmJiYmJiYmJiYmJmq6vMblhYWFhYWFhYWFhYWFhYWFtok30A
-        AAAAAAAAAAAAAJQ0l/BbWFhYWFhYWFhYWFtbXHd3d3d3d3d3d3d3a25u6rZbWFhYWFhYWFhYWFhYWFhX
-        WKWmAAAAAAAAAAAAAADA7s3RW1hYWFhYWFhYWFhYWFtcXFxcXFxcXFxcXIVubn9oV1dXV1dXV1dXV1dX
-        V1dXV2gdk3iVAAAAAAAAAAAAjKvNtnpXWFdXWFhYWFhYWFhXWnVaWlpaWlpaWnX5q+pkWFdXV1dXV1dX
-        V1dXV1dXV1don8w0dngAAAAAAAAAAIyeqrZ6V1dXV1dXV1dXV1dXV1dbW1hbWlpaW1hbYOnsiotXV1dX
-        V1dXV1dXV1dXV1dYWmu2s6DeAQAAAAAAAADA6Z5jeldXV1dXV1dXV1dXV1dXV1hXWFhYWFdXeredZHpX
-        V1dXV1dXV1dXV1dXV1dXWFhYW2iqnt59AAAAAAAAeO4sZ1hXildXV1dXV1dXV1dXV1dXV1dXV1dXildh
-        nWhXaFdXV1dXV1dXV1dXV1dXaIpXV4pXaCzum5sAAAAAAAH7lsphV615uLhouGhoaHmKeXloeXl5eXl5
-        eWBXdI5XYGi4aGhoaGhoaGhoaGiKaHloaHlorVdh5h0BAAAAAACNCuiWzq1gYGBgYGBgYGBgYGBgYGBg
-        YGBgYGBgeXRhYGBgYGBgYGBgYGBgYGBgYGBgYGBgYK1geZwem3YAAAAAAHAd5ujOYGBZWVlZWVlZWVlZ
-        WVlZWVlZWVlZWVlhWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWa2O5t5tAAAAAAAAATTG5pxhYFlZWVlZ
-        WVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZY6gdAQAAAAAAALB9D6jGSc5j
-        WWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhWWPG+wEAAAAAAAAACnjd
-        7sfHyc50YWFjY2RkZGRkZGRkZGRkZGRkZGRkZGRkZGRhZGRkZGRkZGRkZGRkZGRkY2F0xh1wAAAAAAAA
-        AAAAmsO9y8fHx5x0ZGRjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NkrOSjCgAA
-        AAAAAAAAjJp7iL3Lx8flx0mOZGN0dHR0dHR0dHR0dHR0dHR0dGpqanR08mPydHR0amp0dHR0dHR0Y8mp
-        iJgAAAAAAAB7olBMy+Xk5OTk5eTk5MmsdGpqampqampqampqampqampjWWBoiopXV2hoeVlhdI5qampq
-        amrFG4EAAAAAAKOiG+XFxcfJycnJycfHx8fl5cnOjo6Oampqjo5qju2OY1loWHqLi1dXV1dYW1p1XGv5
-        ZI6sjmrJ5ZMAAAAAAAD7GcXHnI5qampqampqju2s7WfOzu3tjo6Ojo6OZ6xjYFiLV1hXV1dXV1dXWFha
-        WlpcYmLSYXRJxfuMAAAAAAD7GcXJZ+1nZ2dnZ2dnZ2dnZ6xn7axnZ2dnZ2dnZ3Rgi1dXV1dXV3p6WFdX
-        WFtbWlpcXFxi/v7wxw9wAAAAAACEGcWpZ2dnZ2dnZ2dnZ2dnZ2dnZ2dnZ2dnzrVnamBYi1dXV1dXV2i2
-        0be3YGBo+YVaXFxma7afLyimAAAAAACm+5ZJzrWctbW1tc7Ozs7Ozs7OzrW1tbWctWfyYIt6V1dXV1dX
-        V1dXYPBuzG5ubm5un59u7/H2HZV4gQAAAAAA4e7N9FdZY+3OnJaWlpaWlpaWlpaWnLWOY61YW1dXV1hY
-        WFhYWFdYWHp6aNFuzW5ubvYdHd52lYmaAAAAAAAAbaKqbmiLenpbV2BZYWNqampqanRjYa2KWFt6V1dY
-        WFhYWFhYWFhYWFhXV1hbaNGg6m7z3nB9sAAAAAAAAAAAAAH7l+9bWIVYWFhbW1tbW1tbW1tbW1tbWFdX
-        aFdXWFdYWFhYWFhYWFhXV1dXWFt1hbZ/l5f2k3inAAAAAAAAAAAB+5fwWlpaWlpaWFhYWFhYWFhYWFhY
-        WFhYWFhXWFdYWFdYWFhYWFdYV1dYWIVaWlxi0vjPgm4ddokAAAAAAAAAAfuX0HVaWlpaXFpaWlpaWlpa
-        WlpaWlpYWFhYWFhY+lhYV1hYWFhYWFdYhVpaWlxmZl66XvjPs/PCfQAAAAAAAAGiqs9cXFxcXFxcXFxc
-        XFxcXFxaWlpaWlpaWlpaWlq3WFhYWFhYV1hYhVpaa1xmZl5eaW9dhva08cKUAAAAAACb4e5ua3dcd1x3
-        XFxcXFxcXFxcWlpaWlpra2tra1z58FtXWFdYV1dYWlpra1xmZl5eaW9vhnHZ9rP2pgAAAAAAAKY0tPO6
-        YmJiYmJiYmJiYoBcXFxcXFxcXGZmZmZi0PBbV1hXWFhXWFpcXGZmXl5eaW9vhmxsbF/z5yimAAAAAAB9
-        iKtuZn5iYmJiYmJiYmJmZmZmZmZmZmZmZmZi0szRW1hYWFdXV1daZmZmXl5paW+GhmxlZWVf1Z/2fQAA
-        AAAAAHC9s+9p/l5eXl5eXmJmXmZmXmZeXl5eXl6AXrbM0VtYWFdXV1hYWmZiXl5paW+GcWxlZV9fX4fz
-        q8J9AAAAAAAAeB2Cf2nYXXx+Xl5eXl5eXl5eXl5eXl5eXmZu6tF6V1dXWFhYWlpcXmlpb4ZxbGxlZV9f
-        X4OHabTepgAAAAAAAAp4KPGC0V5vXl5paWlpaWlpaWlpaWlpaV3zbm62eldXWFhaWmtrXF5pb4ZxbGVl
-        X19fg3Nyh9W0KHAAAAAAAAAAAHB9HfHQb2lvb29vb29vb29vb29vb4Zpf25u9FdXWFhaWmtcZmZeb4Zx
-        bGVlX19fc3NycpLVgt5wAAAAAAAAAAAAjHCM8678hoaGhoaGhoaGhvyGcXFs9sx/bvRbWFpaWmtcZoCA
-        Xm9sbGXZX1+Dc3Jycoek/J/feAAAAAAAAAAAAAAAhPNscXFxcXFxcXFscWxsbGxs/H9uf25gWlpaa2tm
-        ZoBeXmlpZWVfX1+Qc3Jyh5KSv/bxfQAAAAAAAAAAAAAAAMDxbGxsZWVlZWVlZWVlZWVl2faX7qBu+Vpa
-        XFxmZl5eXmlvb2xfX19zcnJyh5KSkr/rHXAAAAAAAAAAAAAAAACU8WlfZWVlZV9lX19lX19fX2Wgzb3u
-        zflcXGZmYl5eaWlvhoZsX4NzcnJyh5KSkr/8oJt2AAAAAAAAAAAAAAAAAfvzc9VfX19fX19fX19f1XP2
-        szWm7uv5XGZmXl5paW+GhvxsZV9zcnKHkpKSkr9ynyhtAAAAAAAAAAAAAAAAAJXBq2WQX1+Dg4ODg4OD
-        X3PVf6CNcDSf0mJmXl5paW+GcXFsZWVfcnJykpKSv7/WfzkBAAAAAAAAAAAAAAAAAAAAAR1/coeDkHNz
-        c3Nzg4dy8+cdAW37gtJeXl5pb2+GcWxlZWVfX4OkpKS/v3L2894BAAAAAAAAAAAAAAAAAAAAAAABNG6D
-        pIdycnJyh4eD8ef2AY0B27P4b2lpb4aGcWxlZV9fX4NyafbW/PY0ObKVAAAAAAAAAAAAAAAAAAAAAAAA
-        jW00gvbWh5Kkktb27LP2bZUAlcDp0G9phoZxbGxlZV9fX3Nzcm4djcKNcHiEAAAAAAAAAAAAAAAAAAAA
-        AAAAAACnASgvgm7P0G6Csy8dAQEAAAB4NIL4rvxxbGVlX19fc3ODpPagbXABfQAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAJMBsigd9vP2NCixbY0AAAAAAbCXoGlsbGVlX19fc3NypNbnHXAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAJWVbXABcKZ4ewAAAAAAAAABHYLPaV9fX19fg3OHpNaf8212AAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAw3g0gm72ZXOHh4eH1vaCL9+xAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB2iTRun27x9vb28W608d2VAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH3iD+6rgoKCgp/uNISB
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIncoQ80NAUP
-        mYmbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHbh
-        3Nya4psAAAAAAAAAAAAAAAAAAAAAAAAAAAD///ADwP//////4AHA///////AAED//////4AAQP//////
-        AAAAgD////8AAAAAD////gAAAAAH///AAAAAAAP//wAAAAAAAf/+AAAAAAAB//wAAAAAAAD/+AAAAAAA
-        AP/4AAAAAAAAf/AAAAAAAAB/8AAAAAAAAH/wAAAAAAAAH/AAAAAAAAAP8AAAAAAAAAfwAAAAAAAAA/AA
-        AAAAAAAB8AAAAAAAAAHwAAAAAAAAAPgAAAAAAAAA/AAAAAAAAAD8AAAAAAAAAP4AAAAAAAAA/4AAAAAA
-        AAD/AAAAAAAAAPwAAAAAAAAB8AAAAAAAAAPwAAAAAAAAA+AAAAAAAAAHwAAAAAAAAA+AAAAAAAAAD4AA
-        AAAAAAA/AAAAAAAAAf8AAAAAAAAA/wAAAAAAAAB/AAAAAAAAAD8AAAAAAAAAHwAAAAAAAAAfgAAAAAAA
-        AA+AAAAAAAAAD8AAAAAAAAAH4AAAAAAAAAfgAAAAAAAAB/gAAAAAAAAH/AAAAAAAAAf/AAAAAAAAD/8A
-        AAAAAAAP/wAAAAAAAA//AAAAAAAAH/8AAAAAAAA//4AAAAAAAH//wAAAAAAA///AABAAAAH//+AAOAAA
-        D///8AB4AAB////8AfwAAH///////AAA///////+AAH///////8AA////////8AH////////8B///ygA
-        AABAAAAAgAAAAAEAIAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACTiZQA7dzdAKCcngWNiooAe3h8Cca+
-        xZzUxsfzj5J8/FBqPP07XSr/OVwq/1JxQv+eqpT98O/v/uDU35BKR0kAW1pZALq3rgbq2doAzMHBjV52
-        Sf8fUQz6JFQO/UdrNv7W1dPlAAYADIF5cwCvrKcBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADez80Ag3mGAOXV
-        2AHQwcUA18fQHcq8wLGJi3D/PV0m+yVSDv4lTgn/JksH/yJLBP8eRwL/GkME/jNdIf2UqYz/z9DP2YuJ
-        iU1yaHUDj4+KAca9vLZbdEb/HlEL/ChUEf04Zij90NPN6dltvBS/oawAv7a1ArCerADKu8YC3dHaAc3B
-        zQK1p7MAqZudAK+hpgCtn6MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAA28zLAJOLlAChmZwA39LaIrSupeRWaDv/Hk4L/R9MB/8oURD/LW4w/jSGTf88kln/OY9U/zZ8
-        Pv8nWBb/EDwA/FN2R//a4Nj/saiodElHRwLHu7vAVm5B/x9SDPwpVRH8NGMl/8/Tzd//r/8A27PGAcvA
-        wAHbw9sA+eP3AP/2/wD/7/8A5tHmAK2aogC8sbUChXp8AVFMSgCkmZwAr6WlAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAANzNywCJf4MBfm9tBrSwpLlJYTD/HE8J+iZQEP83fUH+Q76M/k7c
-        rv9R47X/TuS3/03ktv9N4bT+TNKl/kOkbf8ZTQr8Mlkh/NTh1Pfh2t47w7aynlJpO/8hUg37J1QR/zdl
-        J/vIy8T/rZiePqmbmQC2r6wA4cfiEf/o/zv//P86//P/O+zV7RqwnKULraOmAIJ4eAA4LzABjniJAcW7
-        vACuqKkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAr52mAK+eqACvn6gArpigAv///wG9ta4EoJWVAM/Ew4Jfbkr/G04H+iRS
-        Ev9ApW7+T+S1/03fsP9K16n/S9eo/0rWp/9L16f/Steo/0vbrf9O5Lb+UdWi/x9iJPxQajj+8fHyvbqy
-        q5tGZC3/J1MQ+x5SC/xHbjb+297czLmMoQXFvrxmvrisu5+hjOaLlnv/hpN3/4+efv+qsqHvyMnE2Ovj
-        6IJIQUYkIBsaAJ2MmQDJvr8CpqKiAKiLjgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC4rK4ArJ6iALObqACpjZkDm4mgAMahxAC6sa0A2MbLAK+g
-        pjSJkHf7I1US+iZTEf4+q3D+Uei7/0vUqP9J16f/S9mp/0vZqv9L2ar/S9mq/0vZqv9L2Kn/S9Wl/0fe
-        sP5Z3a//E14c/o6mhv/Mx8D1KVcU/yleGv4cUwr8WYBO//bw9sGwk5i1coFf/zdeJf8hUg3/GkkB/BZH
-        APwXRwD8GkgA/zBbF/9yj2P/0drQ8JaHk3p3YnYtqqOlAKmlpQOhhIgAtKahAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALGjpADBurcAsKWmAKKUmAKwmqQBnoiPAJeP
-        nQDBpMInybe2KdG6vSfbxsqbXXZN/xpbBfo0kVH/UOe4/0rVqf9J2an/S9mq/0vZqv9L2ar/S9mq/0vZ
-        qv9L2av/S9mq/0zZq/9M16X/T+Gz/kHBjP8+eTP+qauY/yZdFf8raiD/G14O/3aRZ/6foY3/LWYc/x9f
-        Df0lXg/8Lmgh/TKHQv43nVv+PqRp/jydX/0thET9F2IS+yxhGv+2ya7/1NDR74V7eTiajZAArqOlAaON
-        ggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAL62tACsnJ8AuaquALKn
-        qQGrmJwAsZmdAL6ps5u/tbios6+o/6molP+oqpT/mpqB/zBlF/4nbBj/S82b/kvbrv9K2Kj/Stip/0vZ
-        qv9K2Kn/S9mq/0vZqv9L2ar/S9mq/0vZqv9K2ar/Stiq/0nVpv5N4bj/NJlT/ltzQf4rciP/KHAf/iNx
-        G/5Odz3/MWsk/SNuFfwrbx7+Mpxa/j/JlP493ab/Qt6r/0TcrP9D3ar/RNyo/kbSnv81omL+E2QP+pq6
-        k//SyNDwhnZ4L5F/hgKpm50CyL7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMLF
-        yQC+s68Ap5qdAbKqrgC1rbIAtaivZLuzqraJmHj/Tn05/zR4KP8ui0D/K51V/zSoaP80qGX/O6pr/0vb
-        rP9H1ab/Sden/0jXqP9J16j/SNeo/0nXqP9J16j/Sdeo/0nXqP9J16j/Sdeo/0nXp/9I1ab/S9yu/z/B
-        iP8vdB//KXkk/yd5If8peCP/K3kl/yh5H/8nfCr/Nbx9/zvZpf810p//Nc6Y/zbMlP85zJf/Ns2V/zXQ
-        lf810Jz/O9mn/jTIjf8aeiX4uMit/9rU1Gzl290AycnDBMS2ugDKw8gAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAADAwsYAwLSwAbSorgC8r7oMxLa6tqGhkP9Efjr/I3cU+ySdT/wzx5D/Odaf/jrX
-        o/861qP/ONek/zrVoP9A1Z//R9em/0fVpf9I1qb/R9al/0jWpv9I1qb/SNam/0jWpv9I1qb/SNam/0jW
-        pv9H1qX/R9Wl/0rXpv9I0KD/JoYr/yqAJP8qgiX/KoEn/yuCJ/8ugCj/McB9/zPUnf8yyY//Ms2Q/zPN
-        kf8zzZP/Ms2S/zPNkv8zzZL/Mc2S/zHLjP820Z3+J8OF/D+ZSfzk5eDXz8XFQ9TFyQC6raoBvbe+AAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADo6O8Aw8bKAMi/uQLW1dgR0cbHwpSbgf8ufST8IYgi+zS8
-        cv861p/+M8+X/jPLkf8yypH/M8uR/zXNkv8zzJL/Nc2V/0LWof9E1KP/RNSi/0TVof9E1KL/RdWi/0XV
-        ov9F1aL/RdWi/0XVov9F1aL/RdWi/0TUof9D1aP/RNOi/y6RNf8qhyf/Kooq/yuLKv8phSH/KK9i/yzR
-        lv8syIn/LMuN/y3Ljf8ty43/LcuN/y3Ljf8sy43/LcuN/yzLjP8ty43/KsmI/zHSl/8Zr2T6oMKY/9fH
-        2MXw5+4B1dLVAcK+xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA6unxAMLDxQHo0dwA0NPYlq2q
-        mf8rgSf4JZEq/i27cv4v0Zr+LseL/zDLjv8vzI//LsyP/y/Mj/8vzZD/L8yP/y/Kj/84z5j/QNSf/z/S
-        nf8/1J3/P9Oe/0DUnv9A1J7/QNSe/0DUnv9A1J7/QNSe/0DTnf8/053/P9Sf/z/QnP8tlDT/K44r/yuQ
-        MP8sjyr/KJU3/yfIif8kyYj/J8mH/yfIh/8nyYj/J8mI/yfJiP8nyYj/J8mI/yfJiP8nyYf/JsmI/yfJ
-        h/8px4n+GcSE/V+8ef3q3uL3urS/Isu8yADSys4BAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOTh
-        5gH7+f4A+cfTItXNz/ROh0T7JJMi/i2oWv4t0JP/J8eM/yzKjP8pyo3/K8qN/yzKjf8syo3/K8mM/yvK
-        jf8ryY3/K8iM/zjSmv870pz/PNCb/zzQnP890Jz/PdCc/z3QnP890Jz/PdCc/z3QnP890Zv/PM+b/z3S
-        nv89zpT/Kpcz/y6TLf8slTL/KpEp/yexX/8jyoz/IsSF/yHGhP8ixYT/IsaF/yLGhf8ixoX/IsaF/yLG
-        hf8ixoX/IsWF/yHGhP8ixYX/IsOE/x/GiP40vHP73t/U/9LL1WzVzNIB0c/QAwAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAADj5+wD/Pf+APb8/4OlqJD/II0j+ymcNP8pwoH/JciK/ybHhP8lxoj/JsiH/ybH
-        iP8mx4j/JseI/yXHiP8lxof/JceI/yTGh/8tyo7/ONGZ/zfOmP83z5j/ONCZ/zjQmf84z5n/ONCZ/zjQ
-        mf840Jn/N8+Y/zfPmP840Zv/NsqO/yyaM/8tmDH/K5kp/yycNP8exIL/H8eA/yLFgf8gxIT/IcWD/yHF
-        hP8hxYT/IcWE/yHFhP8hxYT/IcWE/yDFhP8hxYT/IcWE/yDEgv8fxoX/JL92+tTg1/7y7vJo9O3xAOfp
-        6AX4/fgByNLQAOTf4AAAAAAAAAAAAAAAAAAAAAAA2uXjAN7O3wD05evQZJRc/iObIvwqqkj+IMmN/yLE
-        hP8gxoT/IcaE/yHGhP8ix4T/IseE/yLHhP8hxoT/IsaE/yHGhP8ixoX/I8SF/y3Lj/8zzpX/Ms2U/zPO
-        lf8zzpX/M86V/zPOlf8zzpX/M86V/zPOlf8zzZT/M9CX/zHIh/8qnTP/Kp0y/y+ZKf8fslz/HseH/yDD
-        fv8ew4P/H8OC/x/Egv8fxIL/H8SC/x/Egv8fxIL/H8SC/x/Egv8exIL/H8OC/x7Egv8fxIH/HMSB/iLE
-        f/zo7O/+//D7rPPw7S307/EA/f/9AMjX0wG9zrkA9/f3AAAAAAAAAAAAycjIAejp6wDd5eUx39TT+0CP
-        PvwnoCf+JbFY/x/Hiv8jxIP/IcSC/x/Fgf8gxIL/IMWC/yDFgv8gxYL/IMWC/yDFgv8gxYL/IMWC/x/E
-        gf8jxoX/LcyP/y/Lkf8vy5H/L8uQ/y/Lkf8wzJH/MMyR/zDMkf8vy5H/MMuP/y7Nk/8ux3//KZ8x/y2g
-        Mf8soTf/HcF8/xrDgv8cw4D/G8OA/xvDgP8bw4D/G8OA/xvDgP8bw4D/G8OA/xvDgP8bw4D/G8OA/xvD
-        gP8bw4D/HcOA/xvEgf8gvnf/hrmG/tLg0//78/v97u7woOPg6RXa2twAwcy7Avj4+QDw6M4AAAAAAPn2
-        9gL+/v4A////PNfQzf8wjjL7Jp0q/yS0X/8axob/HsKB/x7Dgf8cxID/HcOB/x3Egf8dxIH/HcSB/x3E
-        gf8dxIH/HcSB/x3Egf8dxIH/HcOA/yXIh/8ry43/KsmL/yrKjP8qyYz/KsqM/yrKjP8qyoz/KcmM/yrJ
-        iv8py5D/KcF6/y6cL/8tmyr/H7Ba/xzFhP8bwX7/GsJ//xvDgP8bw4D/G8OA/xvDgP8bw4D/G8OA/xvD
-        gP8bw4D/G8OA/xvDgP8awn//G8J//xvBfv8bw4H/HL91/h6aKf8nliP8ebh2/OTr5v/28vff7vHtJs3k
-        zgD4+foB9/3gAAAAAAD+/P0BAAAAAP///znY0s3+Koon/CmTKP4krl3/G8aH/xzBf/8awoD/GsJ//xrB
-        f/8awn//GsJ//xrCf/8awn//GsJ//xrCf/8awn//GsJ//xrCfv8cwn//IcaF/yPFhf8jxYT/I8WF/yTG
-        hf8kxoX/JMaF/yPFhf8kxYP/IsiL/yW6b/8tkCf/KZUz/xvCeP8ZxX7/GsF9/xnBf/8awn//GsJ//xrC
-        f/8awn//GsJ//xrCf/8awn//GsJ//xrCf/8awX//GcF+/xrBf/8bwX//HsWC/yjLif8vx4r+JrFg/heM
-        H/42lzr6yODK///8/+Tx/PIo9/byAPn69AQAAAAA4uLiAvP09gD09/Y94tva/zWFL/sliCT/IaJO/xfI
-        hv8dwH//G8F//xvCf/8bwX//G8J//xvCf/8bwn//G8J//xvCf/8bwn//G8J//xvBfv8cwn//HMJ//xzD
-        gP8dxIH/HMOB/x3Egf8dxIL/HcSC/x3Egv8cw4L/HcOA/xvHh/8etmb/LIIi/yWlVP8XyIb/GcB+/xrC
-        fv8bwX//G8J//xvCf/8bwn//G8J//xvCf/8bwn//G8J//xvCf/8bwn//G8J//xvCfv8bwn//HcKB/x/F
-        g/8fxYP/HcWD/x7Ji/8hwHz+II0s/yeHJ/vN487/9/Pz3ZG3kgn37fQFAAAAAMjIyADx8vIAws/LD/jw
-        9uhXik3+HH8c/SeMN/8dxH7/Gb9//xvAe/8av33/G8B8/xvAff8bwH3/G8B9/xvAff8bwH3/G8B9/xu/
-        ff8awHz/HL99/xy+ff8cv33/HMB8/xvAfP8cwHz/HMB9/xzAff8cwH3/HMB8/xu/e/8cxIH/IKte/ySA
-        Jv8gvHf/GcJ+/x2/e/8awH3/GsB9/xvAff8bwH3/G8B9/xvAff8bwH3/G8B9/xvAff8bwH3/G8B9/xvA
-        ff8awH3/G8B9/x3AfP8bv3v/GsB8/xrAfP8Zv3r/G8OB/yS8df4afyD/PY89+fH19P/x9PGI9/H2AAAA
-        AADMzMwAp6aoAQAAAAD+/f++k62I/RZwFfsqeCP+IKle/xu+ff8aunT/HLt2/xu7dv8bu3b/HLx3/xu7
-        dv8cvHf/HLx3/xy8d/8cu3f/G7x3/xy7d/8cu3f/Hbx3/x27dv8eu3b/Hbt2/x67dv8eu3b/Hrt2/x27
-        dv8euXT/GcF+/yOcT/8ikkP/G8N9/x26c/8evHX/G7t3/xy8d/8cvHf/HLx3/xy8d/8cvHf/HLx3/xy8
-        d/8cvHf/HLx3/xy8d/8cvHb/G7x3/xy8dv8cu3b/HLx2/x28dv8du3b/HLx2/xe6c/8awn3/Jahd/wtp
-        B/2Tu5X+////4vj6+AcAAAAA0NDQAPLv8AP18/QA7e3sY+Lh3/8ubif7IHIe/x97Mv4ZunD/Hbhy/x60
-        b/8et3H/Hrdx/x62cf8etnH/Hrdx/x63cf8et3H/Hrdx/x63cf8et3H/Hrdx/x63cf8et3H/Hbdx/x63
-        cf8dt3H/Hbdx/x23cf8ctnH/HbVw/x26dv8emlD/Hapg/xy6dP8etXH/Hbdx/x63cf8et3H/Hrdx/x63
-        cf8et3H/Hrdx/x63cf8et3H/Hrdx/x63cf8et3H/Hrdx/x63cf8et3H/Hrdx/x63cf8et3H/HbZx/x22
-        cf8auHD/HbZu/yK5df4ceSf/On02+/Lz9P/l5+V+AAAAAAAAAADOy8cA5OHfAezr6g/9+/3VpbSg/wlY
-        C/wkaRz/IYE4/yC2bv8ctm7/HbFq/x2ya/8ds2v/HLNr/x2za/8ds2v/HbNr/x2za/8ds2v/HbNr/x2z
-        a/8ds2v/HrNr/x6za/8es2v/HrNr/x6za/8es2v/HbNr/x2ya/8ctGr/Iqpl/xmxa/8ds2v/HbNq/x2z
-        a/8ds2v/HbNr/x2za/8ds2v/HbNr/x2za/8ds2v/HbNr/x2za/8ds2v/HbNr/x2za/8ds2v/HbNr/x2z
-        a/8ds2v/HbNr/x2za/8dsmr/HbFr/x2xav8Zt3P/HpFH/hheDv7L2cz++vj79gAAAAAAAAAA1dPOAP39
-        /AHx8+4A9fj1Ov/9/f19m3j6DFEH/SBdFP8gdjP+Iadg/xy1bf8dsWf/Hq1j/xyuZP8ermb/Hq9m/x6u
-        Zv8drWX/Hq5m/x6uZv8ermb/Hq5m/x6uZv8ermb/Hq5m/x6uZv8ermb/Hq5m/x6uZv8ermb/Ha5l/x+v
-        Z/8ermb/Hq5m/x6uZv8ermb/Hq5m/x6uZv8ermb/Hq5m/x6uZv8ermb/Hq5m/x6uZv8ermb/Hq5m/x6u
-        Zv8ermb/Hq5m/x6uZv8ermb/Hq5m/x6uZv8ermb/Hq5m/x2uZf8drGT/HLNp/yCeVP4RUQr/or6h/v//
-        //8AAAAAAAAAANPPzAD+/v0A2tzYA+bm5gDU1tOH9PLx/42nif8bUxL8EkoF/yBeHf4efzz+IKJb/x+y
-        aP8fq2P/Hqhf/x6pYP8eqmD/Half/x6qYP8eqmD/Hqpg/x6qYP8eqmD/Hqpg/x6qYP8eqmD/Hqpg/x6q
-        YP8eqmD/Hqpg/x6qYP8eqWD/Hqpg/x6qYP8eqmD/Hqpg/x6qYP8eqmD/Hqpg/x6qYP8eqmD/Hqpg/x6q
-        YP8eqmD/Hqpg/x6qYP8eqmD/Hqpg/x6qYP8eqmD/Hqpg/x6qYP8eqmD/Hqpg/x6qYP8dqWD/Hqhf/x2t
-        Y/8jnFX/D0kG/pivlf/+///9AAAAAAAAAAAAAAAA8fDvALu4vQDn6ecC6+/sAN/k4HH48vf4xs/G/1B9
-        UP4RQgj/EkAH/x5SGf8gdDX/H5tU/x+tYP8eqV3/HqRY/x2kWf8fpVv/HqVb/x6lWv8epVr/HqVa/x6m
-        Wv8epVr/HqZa/x6mWv8eplr/HqZa/x6mWv8eplr/HqZa/x6mWv8epVr/HqZa/x6lWv8epVr/HqVa/x6l
-        Wv8fpVv/HaZc/x6mW/8fpVv/HqVa/x+lW/8epVr/HaVa/xylWv8dpVr/H6Za/x6lWv8eplr/HqZa/x6l
-        Wv8eplv/HaVa/x6jWP8dqV7/I5VR/wtAAP+bspn//vr9/wAAAAAAAAAAAAAAALa5uQC6trcAsq+vAu3u
-        7APb2t0A0M7SGdTR1rbi4uX7rLqs/T1jOv4ZQhH/IUEO/xhJEv8bayv/HZVN/yCoWf8gpVX/H59T/x2g
-        Vf8eoVX/H6FV/x+hVf8foVX/H6FV/x+hVv8foVb/H6FW/x+hVv8foVb/H6FW/x+hVv8foVb/H6FV/x+h
-        Vf8foVX/HqFV/x+hVv8eolX/HaJU/x+iVf8goVT/H6FT/x+hVP8goFP/H6FU/x6iVf8goFj/H6JW/x6i
-        Vf8foVb/HqFV/x+hVv8eoVX/H6FV/x6hVf8fn1T/HqdZ/yCDQf4ONwH+uMW3/ePd4eUAAAAArqatAHFo
-        ZwC3uboAvLi3Ari0swCvrKwAwr7DT9HM0ZTY0tXHy8nH+trZ1/63uqv+OlYt/xc/D/8dQRH/HDgM/xlA
-        D/8bYin/Ho5I/x2lVv8foVL/HptO/x+bT/8fnU//H51P/x+dT/8fnVD/H51Q/x+dUP8fnVD/H51Q/x+d
-        UP8fnVD/IJ1Q/x+dUP8fnlD/H55R/x+dT/8fm0z/H5pM/x2ZTP8fm07/HJ1R/xueVP8doFX/G6BU/x2c
-        Uv8emU//HZdO/x2XS/8emUz/H51O/x+eUP8gnlH/H51Q/x6dT/8fnE//HppN/yKkVv4XXiX/J0IZ+tjW
-        1v+ysrF/AAAAAJuQoQBybHEAuLu8AK+xsQCipKQ0x8bHv7+5sv+Uk4P/YW5P/0RQL/8mNQ//FyoG/x0x
-        Df8XMAr/HDEL/xo0Df8dMgr/Gi0G/xgzCP8eVSL/IoRB/x6fTv8fnkr/H5hI/x6XSf8fmEn/H5hK/x+Y
-        Sv8fmEr/H5hJ/x+YSv8gmEr/IZdK/x6YTP8el0r/HpVG/x+VQ/8dmEr/HqNX/x2sZP8dtHD/Hb12/xq/
-        ev8bwHv/HMJ9/xzDfv8ewHz/Ib97/yS6dv8ir2r/IqVf/yCZTv8ekkX/HZVE/x+ZSf8hmUz/HphK/xuY
-        Sf4llUv/BCoA/W1+av/l4OTj4+LiG8bBuAClmq0Al5OZAaWkqwa5tLuLvbWy6W11Vv8hOA/8CSUA+wkx
-        Bf0QShX+Glgh/xtYIf4aVh//GlIb/xhNGf8aRxr/GEQY/xpDF/8aPhP/GDUM/xk2Df8XUyD/HH88/x+T
-        Rf8fk0T/H5NE/x+URf8flEX/H5RF/x+TRP8fk0T/GpRG/yCTRf8gkD7/HpJC/xyeU/8fsWj/HsB4/xzF
-        gv8ZxoX/G8aC/xvFg/8bxIH/GsOA/xnCf/8cw4D/HsaD/yHJhv8kyIv/KcyP/yzOkf8uyYj/Kbt2/yKl
-        Wv8akUT/HY0//xyTQf4goEz/F1Yc/B0yFfvY4Nvr3tLaNvTz8gC1sKIAubSyA87JyQHOxcomqKOU/ztL
-        Jf8HJgD8Ez0O/yRvMv4ljkP/IJZF/yCWRv8flUX/IJZF/yKVRf8ilUX/HZRB/x6SQP8fkT//H44+/yCN
-        PP8diTz/IH41/x6ANf8gkD//IZA//yGRQP8ikUD/IZFA/yGRQP8gkUH/IZJA/yCLO/8fiz7/HaFV/x25
-        cf8cxoH/E8WD/xrDgv8fwoD/HsF+/xnBff8awH3/GsJ+/xvCfv8awX3/G8J//x3Egf8gxoP/JMaI/ynI
-        if8ryoz/LcyQ/zbQl/820Jr/NcSG/yioXv8jlU3/IGIq/gEbAPujq5//1NTSVufg5ADe3tsIvbWwAuLX
-        3gDx7eoAsa+dxzFLIPsKKgL6IlAe/x+MOv4ikj//IIs6/yCJOv8giTr/IIg5/x+JOv8giTr/IIk6/yGK
-        O/8iijv/IYo7/x+LPP8iiz3/IIw8/yGPPv8hjT3/IIs7/yCKOv8gizr/H4w5/x+MPP8eizz/IIY1/yGI
-        Nv8fmlD/Hbdz/xvGg/8cxIT/G8F//xzBff8bwn//G8J//xvDfv8axYX/GcaE/xzFgv8aw4T/GcOE/x3F
-        hP8gxob/IseI/ybIiP8pyov/LMqN/y/KkP8yy5L/NM+X/z3Wpv9D2af+J6dQ/gpECfmOmZD4/fr8h7Wk
-        tADWztIDy8LGAM/OzAXY1dYtz8rHpUJMLv8QHgL8I0wZ/x6MOP4giTr/H4U0/yCGNv8hhjb/IYc2/yGG
-        Nf8hhzX/IYc1/yGHNf8hhjX/IYY1/yGGNf8hhjX/IYY1/yGGNf8hhjX/IIY1/yGHN/8giDf/IoY2/ySD
-        M/8fgC7/IIUy/ySZS/8etW3/HcWC/xbFgv8ewX7/HcF9/xrDf/8bwn//G8J//xvCgP8dv3r/ILJf/ySy
-        W/8ft2T/Hbtp/x28bf8evXH/I8F2/ybDfP8mxIL/LMiK/zHMkP8zzZH+NcyQ/zDIhP4otGX+GZww/D2m
-        P/m13b7//PP599fU0B3y1e4B1dHSAca9wQD//f8A/PT7pZejif8Ycxf5HV8f/x6ANf4fgSn/IHoq/yJ9
-        Kv8igS3/IIIv/x+CMP8ggzH/IYIx/yGCMf8ggjH/H4Ix/x+CMf8fgzH/IIMx/yGDMf8hgzD/IIEu/yCA
-        Lf8ifir/H3wo/x9/Kv8dizn/G6BV/xy5c/8ayIP/GcWF/xvBgP8dwX7/HcKA/xvCf/8bwn//HMJ//x3C
-        f/8dwn//HMJ//x+7bf8oqkj/K5wt/yqYKP8rnC3/KqAw/yieMf8qnjL/LKIz/yGcK/8ZmSn+H54z/iul
-        Pf45pUT8X7Nd/6fSp//u7vD/+ur03eni4FHm4d4L3+LVArSusADPyssA9O7zTejY3edRjkn7Kacp/SW4
-        W/4awoP+IbBo/yChUv8fkD7/IIMz/yJ7Kf8ieST/IXch/yF3Iv8hdyL/Ingj/yJ4I/8ieCT/Incj/yF2
-        Iv8hdyL/Inck/x96KP8fgTD/II9B/xyhVv8atm7/HsR+/x3Ihf8bxIP/HMKA/x7Cf/8hw4H/H8OA/x/E
-        gf8exIH/HsOA/x7DgP8dw4D/HsOA/x3Egf8bxYT/G8WI/x6/ef8krlP/K6A0/yydKv8qnjH/K6Ey/yqe
-        L/9ltWv/mMyb/63Sqf/R3sr/6+vn//Hp7v/r3uba29PWdsfDxBfNyMsAxb7DAN7u3QC1sLEAAAAAAPj3
-        +OC+vLH/K48q/ymfNP8fvHf/G8aB/xrHhf8byYn/HceG/xvBfv8cuHP/Hq9o/x2jXf8dn1H/HplK/yKV
-        SP8glEj/IJVH/yCUSv8fmVL/IKNa/x2sY/8bt2//G8F6/x3GhP8cx4j/GsaG/xvBf/8cwX7/HsOA/x/D
-        f/8exID/HsSA/x7Egf8fxID/H8OA/x/Egf8fxIH/HsSB/x/Egf8exIH/HMJ//xzDfv8ew4H/HcWI/x7B
-        d/8kr1r/LaE2/y6bK/8lnC7/Uq1b/8beyv7/8//9/Ony+9fWzp3Ny8gZyMXEBK2qqQDDvroAlo6ZAs3F
-        ywD07PQAubS1AAAAAAD////eqLCY/iKTI/8opkH+IsWH/yHFhP8lxIP/IsOD/yDEg/8kxYP/IceG/yDJ
-        iP8iyob/HsqH/xzKiP8dy4n/HMqI/xzKiP8cyoj/HMqH/x7Jhv8cyIX/HcaF/x7DhP8bwoD/G8J9/x3D
-        fP8dwX7/HsJ//x7DgP8dwn//HsOB/x7Dgf8fw4D/HsOB/x7Egf8ew4D/HsOA/x7DgP8ew4D/HcOA/xvD
-        f/8cw4D/HcJ//yLDf/8jxIj/JsmN/yrGgf8ps1//KaI6/x6XIP8dliD+abhv/dfg1P377fbl/Pn5b/X2
-        9w38+/wA0tHRA//3/wDQzM4AAAAAAAAAAAAAAAAA/v3+/5usjP8flCP/KqtF/yXKi/8mx4b/JciF/ybI
-        hv8mx4b/JseG/yTHhP8jxoP/I8WD/yPFg/8ixIL/IsWD/yLFgv8jxIP/IsWC/yHFgf8ixYH/IsWD/yLF
-        hP8hxIP/H8OB/x7DgP8ew4D/HsJ//x7DgP8dwn//H8KA/x/Cgv8ewoH/HsOA/x7DgP8exIH/H8OA/x7E
-        gf8dw3//H8SB/x3Df/8cwn//IMKA/yDDgf8lxYP/KseF/yvGif8vyY//Ns2U/zrJif84uWb/MKRA/xqX
-        Hf8pni/+h8WM/+zq6f/s4ubV6OjtGu/q8gDz7fUB5d/hAMXRxQAAAAAAAAAAAP/9//aksJj+H5Ih/y2r
-        Rv4rzJD/LMmL/yzKi/8syoz/K8qM/y3KjP8qyYv/KMmL/yrJi/8pyYv/KMiK/ynJi/8oyIr/KcmL/yjI
-        if8nx4f/KMiI/yfIiP8lxYX/JMSE/yPEgv8jxIL/JMWD/yTEg/8jxYL/JMSD/yXDg/8jxYD/H8N+/x3D
-        gf8fw3//H8OA/x/Egf8fw4D/H8OA/x7EgP8ewoD/IMOB/yXFg/8mxYX/KceH/yzJif8yyI3/N8qP/zvK
-        kP88y5b/PtCh/0LPlP8/vW/+LqM+/xSQGP5KrVD63ujd//js89fl1+YZ7+PrAeTd4ACyyrMAAAAAAAAA
-        AAD//v/lvcGy/yWSJ/8spkD/Lc2N/zDLkP8vzJD/MMyQ/y/Lj/8wzJD/LcuP/y3Lj/8uy4//LcuO/y3L
-        jv8ty47/LMuO/yzKjv8sy47/K8qM/yrJi/8oxof/J8aF/yfGhf8ox4X/KMeF/yjHhf8px4b/KMiF/yjG
-        h/8rx4j/Irdn/x/Cfv8ew4D/HsOA/x7Egf8fw4D/HsSB/x3DgP8ew4D/IMOA/yXFg/8qx4X/LMeI/y7I
-        iv8zyoz/N8qQ/zvLkv8+zZT/QM6V/0fPlf9I0Z3/TNan/1LTn/9CtWP+FZYb/0ClSPrg69//7efprefW
-        5gDh498Ctcy3ALKwsAAAAAAA8fTwlOfb2/g+lD3+J6At/jTEg/4xz5j/Ms2S/zLNlP8yzZP/Ms6U/zLN
-        k/8xzJL/Mc2S/zLOkv8yzpL/Mc2R/zHNkf8xzZH/L8uP/yzJi/8ryIv/LMiJ/yzIiP8syIn/LciJ/y3H
-        iP8tyIn/LsmK/y7IiP8vyo7/L8F3/yOpS/8gxYX/HcN//x/DgP8dw4D/HsOA/x3DgP8bwn//IcSC/ybG
-        hf8qx4f/LsiJ/zDIiv80yo3/OcyP/zrMk/8/zZb/Q86X/0XOmv9I0Z3/TdGe/1HRn/9V1KP/Xtuv/0m7
-        cP4VkRr/Y7Rp+/3v9v/n4ORO8urtAOzo6AN0dXQAAAAAAMvfzgj/9PvUh61//RyVGfw3s2H+N9Og/zXM
-        lf82zpj/N8+Y/zfPmf82zpj/Nc2X/zbOl/81zpb/Nc6W/zbOlv80zpP/McuQ/zHIjf80yY3/NMmN/zLJ
-        jf8xyo7/MsmN/zTJjv81yI3/NcmO/zbKj/82yY3/Ns6Y/zGsTP8jqkX/HMaI/x7Cfv8ew4D/HcJ//x/E
-        gf8ew3//GsF+/x/DgP8pyIn/L8iM/zPKjv82ypD/OMuT/z3NlP9Azpj/RM6a/0fQnP9J0Z3/TdOg/1LU
-        ov9W1KT/Wtal/1vWp/9m27n/P7Ja/xGSGfy52Lb+/vD6zOTU4wbA3rkBbGxrAAAAAAD/+v8A8/Hvd9zb
-        1P8yljH6JKAu/z3Ikf4/1aH/O8+W/zrQmv860Jr/Os+Z/znPmf860Jr/O9Ca/zvQmf84zZX/N8yQ/zbL
-        j/83zJD/OMuP/zfLj/84y5D/N8yQ/zfLkP84y5D/OcuP/zjLkv84y47/OcyV/zXFh/8rmyv/JrBO/xzF
-        hv8fw3//HsOA/x7DgP8ewoD/HcJ//xvBgP8ewoD/KseH/zXKjv83ypH/OsuU/z7Mlf9Czpj/Rc+a/0nQ
-        nP9N0Z7/T9Of/1PUof9Y1aT/XNem/2DZqP9j2Kj/Ztqy/2XVov4dmSb/XLVj/Pju8//Z19Uv5uHjAOHd
-        3QEAAAAA4d7QBMrTrwb/9f/Ussis/xqSG/srqD//RtSc/kHWqP8/0Zv/QNKd/z/Snf8/053/QNOd/z/P
-        mv86zJX/OcuR/z3NlP88zJP/PMyT/zzNlP88zJP/Pc2U/z3NlP89zZT/Pc2U/z3Nk/89zJX/Os6R/0TS
-        m/8uslz/Kpkj/ySyWf8dxoX/H8N//x7DgP8dwn//HcF+/x3CgP8fw4L/IsSD/yjFhf83zI//O82U/z/M
-        lv9Ezpf/SNCa/0rRnP9O0p7/U9Og/1XUov9Z1qT/Xdan/2HYqv9l2az/Z9qv/2rZr/914b3/PrFY/i2b
-        M/rk6OP+9evvc/vw8gD07/ACAAAAAObh2wjn4NwA1tbBNPvt9P+lyKb7HJcg/CGgNv9Fz5f+Stuw/0TW
-        qf9E1qH/QtSe/z7Qmv8/zJf/QM2X/0HPlv9BzZf/Qc2X/0HNmP9Czpj/Qc2Y/0LOmf9Dz5n/Qs6Z/0PP
-        mf9Czpn/Q86X/0HRnP9EyY7/KKE0/y+cKP8isVv/GsWH/x7Cf/8dw4D/HcJ//x7DgP8gxIL/I8WE/yfF
-        hf8oxob/McuO/0HPl/9Fzpj/SNCa/03Snf9P05//VNSh/1fWpP9a1af/Xdep/2LYq/9m2a7/atuw/2zb
-        s/9v27P/eOHC/1nFh/4YmBv5yN7L/vzw+Zf98PsA7ujpAwAAAADe1dcA5+TjAcHBugDh5N9Z9ur0/7/a
-        v/9DqUb7GpUi/Se0WP9C0JT/S9Sh/kLPmv9Dz5r/Rs+b/0fOmv9Hz5v/SNCc/0fPm/9I0Jz/Rs+b/0fQ
-        m/9G0Jv/Rc+b/0bQm/9G0Jz/R9Gc/0XPm/9M1Kb/ObVh/yicLP8snS3/IrJd/xrFhf8cwn7/G8OA/x/C
-        gP8ixIL/J8WE/ynFiP8tx4r/McmL/zTIjf9Cz5j/SdGc/03Rnf9R06D/VdSi/1nVpP9d1qb/X9ep/2TY
-        rP9n2a7/atuw/2/dsv9y3bb/dN23/3ziwv9o0Zz/F5ca+sLcwv//+/+P//f/APPt7gIAAAAA29HTAOXd
-        3ACysrUC7PDrAOzu7Ej/9f/G9e7w/6TSpv9XplD+LqZI/0zTn/9Jz5z/S9Gd/0zRnf9M0J3/TNGd/03R
-        nv9N0Z7/TdGe/03Snv9N0p7/TdKe/03Qnf9N0p7/TdKe/07Snv9O06L/TtCS/yifN/8pnzL/Kpws/yS1
-        Xv8cxIT/HsF+/x/Egf8jw4P/KMWF/yvHiP8uyIv/M8mN/zbLj/83ypD/QM2X/03Sn/9S06D/VtWi/1rV
-        pv9e1qn/Ytir/2TYrf9p2q//bNux/2/dtP9z3rb/dt+5/3jfuv+B5MT/bNSe/xyXHvnI3Mn//vf+lf70
-        /gDx6+wDAAAAAOje3gDu5eQAn5+jAP///wPh5OAA1N7VANDRz3n/9v/V4NPP/UiiXv9O2qX+UdCe/1HT
-        oP9R06D/UdOg/1HToP9R1KH/UdOh/1LUof9S1KH/UdSh/1PUof9U06D/U9Sh/1TUov9U1J3/WNmr/zy3
-        Zf8qmin/KqE2/yucLP8lt2P/HsWF/yLDgP8lxoT/KcaH/yzHif8wyYv/M8qO/zjMj/86zZH/O82T/0DN
-        l/9O0p//WNek/1vXpv9f1qr/Y9it/2far/9p2rH/btu0/3Hctv903rj/eOC7/3vhvP9+4b3/iejJ/2nO
-        lf4imib62Obb/fjr9IH97vkA8eztAgAAAAAAAAAAAAAAAKOiogAAAAAA////Auv24gD5/PoA+/36G9PL
-        w/xIolv/Vd2r/VfUof9W1aP/V9Wj/1jVo/9X1aP/Vtaj/1bVov9X1qP/V9ek/1fXo/9X1qT/V9Wl/1fV
-        pf9X1aX/W9in/1bSoP8roTb/Kp8u/yqiNf8rnS3/JLhu/yTHh/8nxIT/K8eH/y7Jiv8yyYv/NcqN/zjL
-        kP88zZL/P86V/0LOmP9F0Jn/S9Cc/1zYp/9j16v/ZNes/2far/9r27H/b9q1/3Pct/923rn/et+7/3/h
-        vf+C47//guG+/5Lq0/9Mu2z/QqhF+/fv8//r6ek78OvvAPDu7gIAAAAAAAAAAAAAAAAAAAAA///+AAEB
-        AQDv8/QB////Av///yHj1df+S51T/1jcqf5b1af/Wten/1zXp/9c1qj/XNen/17XqP9c1qf/Xteo/1/Y
-        qf9e16j/Xtep/17Xqv9e1qr/Xdal/2Pctv9KuW//IZsj/zuaPf8znDb/KZ4s/yi8cf8nyIv/K8aJ/zDJ
-        jP8zyo//N8uR/znLkv88zJT/Qc6Y/0TPmf9G0Zv/StOd/03Snv9Z16X/Ztqt/2jasf9s27T/cNy2/3Td
-        uP943rr/fOC8/3/hvv+D47//huTD/4jmwv+T6cz+H58w/ZnNmf3/+P/Z2dHYDPLp5QDHxcUAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAys/WAMzQ2gDE190d8Obr91qdVv5P0Zj9Zdqv/mDXq/9i2Kv/Yter/2PY
-        q/9k2Kz/Y9er/2TYrP9k2az/Y9mr/2XYrP9l2K3/Zdit/2bZsf9h1qj/LaM3/yWfK/+uxKr/QphC/yag
-        Kv8svnX/LMmO/zHHjP81yY//OMuS/zvMlP8/zZb/Qs2Z/0bPm/9J0Zz/S9Ke/1DToP9T1KH/WdWk/2fb
-        rv9t27T/ct23/3beuf9537r/feG8/4Hiv/+E5L7/iOXD/4fiwv+e79n+ZMeC/zOhNvru9fL/6ersgfXx
-        9gDs7e4Dy8nJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABZKHgD49vUB9vn4AP/+/7qSsoX9OrVi+nLg
-        vP5l16v/aNmu/2jZrv9n2a3/Z9qu/2jZrv9n2q7/Z9qu/2bZrf9o2q7/adqw/2bZq/9w377/T8B8/hSU
-        GP91xHz9/vT7/FKWS/8inyn+McF8/zLKkf83yY//OsqR/z3MlP9BzZb/Rc+Y/0fPm/9L0Z3/T9Kf/1HS
-        of9W06P/WNak/1zWp/9l2K3/c964/3ffuv974Lz/fuG9/4Pjv/+F48H/h+XB/4rkwv+a7dv+g92w/x+X
-        J/u/5MD/+/X64fP38xDw9PAA6vbtAMzKygAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8e3xAvjz
-        9wDv7e5p4OHZ/zaUN/lk2qT/cdu5/mzZr/9s27P/btuy/27cs/9t3LP/btyz/27bs/9u27P/btuz/2va
-        sP9w3bj/a9mo/iqhNv8xnzj+4fLj//76/v9ynmf/H5so/zfGhP86zJT/O8uR/z7Nk/9Czpn/Rs+b/0nR
-        nP9M0p3/UNOg/1TUov9W1aP/Wtel/1zYp/9h2Kr/Ztes/3bet/974Lv/f+G8/4Pjvv+G5L//ieXB/5Lo
-        0P6f8tr+etel/yqgNvur2qz///7/7/Lz8zr/+f8A/vT9Aej26wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAArbq4ANfT1ADd29wBy9LKF//8/+WXu5L9JJ46/HbivP93373+b9yw/3Hbtv9x3rT/cd21/3Hc
-        t/9y37L/ct6y/3HatP9337//dOC5/j6tVf4TkRj9ms+c/f/+/+339PbPk7KO/hyVIv04xYD+Pc6Z/0DN
-        lf9Ez5j/Rs+b/0rRnf9O0p//UdOg/1XVov9Z1qX/XNao/1/Xqf9i2Kv/Ztmv/2vZsf9u2bT/h+XG/4vp
-        yv+M6cv+kerP/pDpz/6A3rf9U7py+0mrVPnN6sv/////8PX4+zn4+/4A9/79A//z/wDt9e8AAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADp4+YA8vDwA/f29wDo7ehN//3//26tZfkeoTL+ctmt/4Xl
-        yv594b//eOC3/3feuP913Ln/d966/3zjvv995sX/cdms/z6sTv8RkhP/Xrlm+f/////n7edc/f39W7zJ
-        tP4fjhv6OLxv/0TRoP9Fz5f/SdGc/0vRnf9P05//U9Sh/1XVo/9Z16X/Xteo/2LXq/9l2az/Z9mw/2va
-        s/9u2rT/eOG7/1nIh/5hw3//ccyR+2rJhPtiwHX8cb94/7DZr//5/vr/8+vx1MvIxznVz9EA2NbWBPn+
-        /gD99PwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8u7wAPXy8wDr7ekD6OzmAOnu
-        5oH4+Pn/drh3+hqXJP1GuGf/c9ap/oDivf+F5MP/iOXG/4Pgwf9z16f/U75z/iSbL/8Ukhf+abpv+fX3
-        9f/u6+2m8PDwAO/t72Lg2tr/MY8r/C6rR/5I06D/SdGb/07Tnf9Q06D/VNWi/1jXpf9a1qj/Xtiq/2PZ
-        rP9m2q3/atuv/2zcsf9w3LX/ct63/33ivP4hny//qdWq/ujx5f/d7Nv/6/Pn///7//j18fi+0MTPbrmp
-        tQu+rbcAu7OzAgAAAAD5/P4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAD39PQAtLauAPX08wPw7+4D/fv7cv////+x2rL/PaRB/BaXIPwmnzL+L6hC/jCpRv4oozT+GpYe/haR
-        GP05o0D7o9eo/////////v6P9PHzCMC9vQHW29gX+/H49W2kZf4VmB/9RMJ5/lPYqP9T0p7/V9Wj/1rW
-        pf9e16f/Ydir/2TZrP9n2a7/atqy/2/ctP9x3bb/cd6x/4Poyf9PwHn/NaI1/fT79///+/6T////cPPw
-        81Tj4+EezNHNAJWopwDu9/sAlIeDAsG4uAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAA/Pr6ALi6swAAAAAA7/PuAMLfxQDR4tNZ////0vv8+/+84r7/f8OD/12x
-        Xv5Pr1P+WLNc/njDfP+w3bf/8/v1//r1+vbp8upw7vjvAPf/+AD09vMC+fv5APz9/JLR1sj/H5Ej+jGl
-        N/9RzZX+Wdqv/1rVpP9e16n/Y9is/2bZrv9p2rD/bNuy/2/ctf9y3bb/dd21/4Tmx/9w1Kf+EpMb/ZrP
-        n/v/+//v6uvoDLzCrQDd3NsA6ejoAMvQzgGfq64D7/T6AHRpXgC/trYAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADGx8EAAAAAAAAAAADW5doD6u7qAJKU
-        kgbu7O1e8evux/v1++v++f////z////4/P/88/zz9fD2zczFyIeThY0ota+yAMfExgIAAAAA5+vrAOfw
-        7wDS590f//3/9Iq2ivsalB79MqY//1XOjv5n3Lj/Zdqy/2XZr/9n2q7/a9ux/2/csv9z3bf/euK+/4Xm
-        yv9u0Zv+Hpwl/1CpUvj3+Pj/6efohPb19gC/xbsH5+blA+ro6QHU2NYAt8S/ANvg3wAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPv5
-        +QD/9v8A1eXZAOjt6QIAAAAAw8bCAKutqQCrtaoX1dzWNPb69zLe4900srqxH7O3sQCrq6cA/+r/ANrV
-        0gPV1dUAAAAAAAAAAADm5OoD6ObtAOHj6Wf18vT/cK5v9xmZHv4mnjD/Rbxo/mTTov9w3bj/duDA/3nj
-        w/9748P/fuLB/3LYqP5OuWv+FZog/zmgQPnY5tj/8/X1ufDx8gXr6+0CAAAAAOTi4gAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP/2/wD28vYAAwMDAMvKyQK6t7gAvMC7AN/h4AD+/f0A5+fmAMLF
-        wgDDwcEAsaysAwAAAAEA//8A1tHUAAAAAAAAAAAA1M/aAOTi6ALh4+UA4+fokefe6P96qXj9J50s+x+a
-        Jv4ooTD+Oq5N/km3aP9OvG3/Sbho/jmtTf4loSz+Gpob/U+gTfrOz8v/8O3y5ebr6CLs7e4A4uPjAQAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADIxsYAw8HBAMC+
-        vgDi4OAC/fv7Aejm5gLEwsIBy8nJANHPzwAAAAAAAAAAAAAAAAAAAAAAAAAAANHN2ADe39wA8PHtAOzt
-        6wD08+977d3p+Zynmf9OlVH/L5kz/xubI/8amSD/Gpcf/xiaIP8imSb/PpZA/2+cc//Pwcv/5eDiwMXK
-        wijP0csAycrDAeTm5QDq5e4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AADg3eYA3d3cAAAAAADx7+8AuLy1ALe4tDPn4uWu1cPQ7Kypp/6Nn4r+eJ11/3acc/+Cn3/+naOZ/cS2
-        v/Lp3OXV7/LvcNjZ1wDLycoAw8DBAd/e3gDg4eIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAANzc3QAAAAAAAAAAAL+2uAvN0MsAxs3EANjh10zs6Ojf6NTg/NvC
-        z/7WvMr+4cnW++3h6O/0+fGM7vbsDfT28QD///8Cvbq8BcjFxgDc3dwAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA///wA8D//////+ABwP//////
-        wABA//////+AAED//////wAAAIA/////AAAAAA////4AAAAAB///wAAAAAAD//8AAAAAAAH//gAAAAAA
-        Af/8AAAAAAAA//gAAAAAAAD/+AAAAAAAAH/wAAAAAAAAf/AAAAAAAAB/8AAAAAAAAB/wAAAAAAAAD/AA
-        AAAAAAAH8AAAAAAAAAPwAAAAAAAAAfAAAAAAAAAB8AAAAAAAAAD4AAAAAAAAAPwAAAAAAAAA/AAAAAAA
-        AAD+AAAAAAAAAP+AAAAAAAAA/wAAAAAAAAD8AAAAAAAAAfAAAAAAAAAD8AAAAAAAAAPgAAAAAAAAB8AA
-        AAAAAAAPgAAAAAAAAA+AAAAAAAAAPwAAAAAAAAH/AAAAAAAAAP8AAAAAAAAAfwAAAAAAAAA/AAAAAAAA
-        AB8AAAAAAAAAH4AAAAAAAAAPgAAAAAAAAA/AAAAAAAAAB+AAAAAAAAAH4AAAAAAAAAf4AAAAAAAAB/wA
-        AAAAAAAH/wAAAAAAAA//AAAAAAAAD/8AAAAAAAAP/wAAAAAAAB//AAAAAAAAP/+AAAAAAAB//8AAAAAA
-        AP//wAAQAAAB///gADgAAA////AAeAAAf////AH8AAB///////wAAP///////gAB////////AAP/////
-        ///AB/////////Af//8=
-</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/XCoder/FolderInfo/FrmSplitFile.Designer.cs b/XCoder/FolderInfo/FrmSplitFile.Designer.cs
deleted file mode 100644
index 6e67a9e4b3..0000000000
--- a/XCoder/FolderInfo/FrmSplitFile.Designer.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-﻿namespace XCoder.FolderInfo
-{
-    partial class FrmSplitFile
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.components = new System.ComponentModel.Container();
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Text = "FrmSplitFile";
-        }
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/XCoder/FolderInfo/FrmSplitFile.cs b/XCoder/FolderInfo/FrmSplitFile.cs
deleted file mode 100644
index b6d6a35f2d..0000000000
--- a/XCoder/FolderInfo/FrmSplitFile.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace XCoder.FolderInfo
-{
-    public partial class FrmSplitFile : Form
-    {
-        public FrmSplitFile()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/XCoder/FrmMDI.Designer.cs b/XCoder/FrmMDI.Designer.cs
deleted file mode 100644
index c454582537..0000000000
--- a/XCoder/FrmMDI.Designer.cs
+++ /dev/null
@@ -1,200 +0,0 @@
-﻿namespace XCoder
-{
-    partial class FrmMDI
-    {
-        /// <summary>
-        /// 必需的设计器变量。
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// 清理所有正在使用的资源。
-        /// </summary>
-        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows 窗体设计器生成的代码
-
-        /// <summary>
-        /// 设计器支持所需的方法 - 不要
-        /// 使用代码编辑器修改此方法的内容。
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.menuStrip = new System.Windows.Forms.MenuStrip();
-            this.toolsMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.windowsMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.newWindowToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.cascadeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.tileVerticalToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.tileHorizontalToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.closeAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.arrangeIconsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.helpMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.contentsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
-            this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.检查更新ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.menuStrip.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // menuStrip
-            // 
-            this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolsMenu,
-            this.windowsMenu,
-            this.helpMenu});
-            this.menuStrip.Location = new System.Drawing.Point(0, 0);
-            this.menuStrip.MdiWindowListItem = this.windowsMenu;
-            this.menuStrip.Name = "menuStrip";
-            this.menuStrip.Size = new System.Drawing.Size(784, 25);
-            this.menuStrip.TabIndex = 0;
-            this.menuStrip.Text = "MenuStrip";
-            // 
-            // toolsMenu
-            // 
-            this.toolsMenu.Name = "toolsMenu";
-            this.toolsMenu.Size = new System.Drawing.Size(59, 21);
-            this.toolsMenu.Text = "工具(&T)";
-            // 
-            // windowsMenu
-            // 
-            this.windowsMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.newWindowToolStripMenuItem,
-            this.cascadeToolStripMenuItem,
-            this.tileVerticalToolStripMenuItem,
-            this.tileHorizontalToolStripMenuItem,
-            this.closeAllToolStripMenuItem,
-            this.arrangeIconsToolStripMenuItem});
-            this.windowsMenu.Name = "windowsMenu";
-            this.windowsMenu.Size = new System.Drawing.Size(64, 21);
-            this.windowsMenu.Text = "窗口(&W)";
-            // 
-            // newWindowToolStripMenuItem
-            // 
-            this.newWindowToolStripMenuItem.Name = "newWindowToolStripMenuItem";
-            this.newWindowToolStripMenuItem.Size = new System.Drawing.Size(142, 22);
-            this.newWindowToolStripMenuItem.Text = "新建窗口(&N)";
-            this.newWindowToolStripMenuItem.Click += new System.EventHandler(this.ShowNewForm);
-            // 
-            // cascadeToolStripMenuItem
-            // 
-            this.cascadeToolStripMenuItem.Name = "cascadeToolStripMenuItem";
-            this.cascadeToolStripMenuItem.Size = new System.Drawing.Size(142, 22);
-            this.cascadeToolStripMenuItem.Text = "层叠(&C)";
-            this.cascadeToolStripMenuItem.Click += new System.EventHandler(this.CascadeToolStripMenuItem_Click);
-            // 
-            // tileVerticalToolStripMenuItem
-            // 
-            this.tileVerticalToolStripMenuItem.Name = "tileVerticalToolStripMenuItem";
-            this.tileVerticalToolStripMenuItem.Size = new System.Drawing.Size(142, 22);
-            this.tileVerticalToolStripMenuItem.Text = "垂直平铺(&V)";
-            this.tileVerticalToolStripMenuItem.Click += new System.EventHandler(this.TileVerticalToolStripMenuItem_Click);
-            // 
-            // tileHorizontalToolStripMenuItem
-            // 
-            this.tileHorizontalToolStripMenuItem.Name = "tileHorizontalToolStripMenuItem";
-            this.tileHorizontalToolStripMenuItem.Size = new System.Drawing.Size(142, 22);
-            this.tileHorizontalToolStripMenuItem.Text = "水平平铺(&H)";
-            this.tileHorizontalToolStripMenuItem.Click += new System.EventHandler(this.TileHorizontalToolStripMenuItem_Click);
-            // 
-            // closeAllToolStripMenuItem
-            // 
-            this.closeAllToolStripMenuItem.Name = "closeAllToolStripMenuItem";
-            this.closeAllToolStripMenuItem.Size = new System.Drawing.Size(142, 22);
-            this.closeAllToolStripMenuItem.Text = "全部关闭(&L)";
-            this.closeAllToolStripMenuItem.Click += new System.EventHandler(this.CloseAllToolStripMenuItem_Click);
-            // 
-            // arrangeIconsToolStripMenuItem
-            // 
-            this.arrangeIconsToolStripMenuItem.Name = "arrangeIconsToolStripMenuItem";
-            this.arrangeIconsToolStripMenuItem.Size = new System.Drawing.Size(142, 22);
-            this.arrangeIconsToolStripMenuItem.Text = "排列图标(&A)";
-            this.arrangeIconsToolStripMenuItem.Click += new System.EventHandler(this.ArrangeIconsToolStripMenuItem_Click);
-            // 
-            // helpMenu
-            // 
-            this.helpMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.contentsToolStripMenuItem,
-            this.toolStripSeparator8,
-            this.检查更新ToolStripMenuItem,
-            this.aboutToolStripMenuItem});
-            this.helpMenu.Name = "helpMenu";
-            this.helpMenu.Size = new System.Drawing.Size(61, 21);
-            this.helpMenu.Text = "帮助(&H)";
-            // 
-            // contentsToolStripMenuItem
-            // 
-            this.contentsToolStripMenuItem.Name = "contentsToolStripMenuItem";
-            this.contentsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F1)));
-            this.contentsToolStripMenuItem.Size = new System.Drawing.Size(166, 22);
-            this.contentsToolStripMenuItem.Text = "目录(&C)";
-            this.contentsToolStripMenuItem.Visible = false;
-            // 
-            // toolStripSeparator8
-            // 
-            this.toolStripSeparator8.Name = "toolStripSeparator8";
-            this.toolStripSeparator8.Size = new System.Drawing.Size(163, 6);
-            // 
-            // aboutToolStripMenuItem
-            // 
-            this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem";
-            this.aboutToolStripMenuItem.Size = new System.Drawing.Size(166, 22);
-            this.aboutToolStripMenuItem.Text = "关于(&A) ... ...";
-            this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click);
-            // 
-            // 检查更新ToolStripMenuItem
-            // 
-            this.检查更新ToolStripMenuItem.Name = "检查更新ToolStripMenuItem";
-            this.检查更新ToolStripMenuItem.Size = new System.Drawing.Size(166, 22);
-            this.检查更新ToolStripMenuItem.Text = "检查更新";
-            this.检查更新ToolStripMenuItem.Click += new System.EventHandler(this.检查更新ToolStripMenuItem_Click);
-            // 
-            // FrmMDI
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(784, 602);
-            this.Controls.Add(this.menuStrip);
-            this.IsMdiContainer = true;
-            this.MainMenuStrip = this.menuStrip;
-            this.Name = "FrmMDI";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "新生命码神工具";
-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmMDI_FormClosing);
-            this.Shown += new System.EventHandler(this.FrmMDI_Shown);
-            this.menuStrip.ResumeLayout(false);
-            this.menuStrip.PerformLayout();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-        #endregion
-
-
-        private System.Windows.Forms.MenuStrip menuStrip;
-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;
-        private System.Windows.Forms.ToolStripMenuItem aboutToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem tileHorizontalToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem toolsMenu;
-        private System.Windows.Forms.ToolStripMenuItem windowsMenu;
-        private System.Windows.Forms.ToolStripMenuItem newWindowToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem cascadeToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem tileVerticalToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem closeAllToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem arrangeIconsToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem helpMenu;
-        private System.Windows.Forms.ToolStripMenuItem contentsToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem 检查更新ToolStripMenuItem;
-    }
-}
-
-
-
diff --git a/XCoder/FrmMDI.cs b/XCoder/FrmMDI.cs
deleted file mode 100644
index 4839639976..0000000000
--- a/XCoder/FrmMDI.cs
+++ /dev/null
@@ -1,194 +0,0 @@
-﻿using System;
-using System.Linq;
-using System.Diagnostics;
-using System.Reflection;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using NewLife.Reflection;
-using NewLife.Net;
-using System.IO;
-using NewLife.Log;
-using NewLife.Threading;
-
-namespace XCoder
-{
-    public partial class FrmMDI : Form
-    {
-        #region 窗口初始化
-        Task<Type[]> _load;
-
-        public FrmMDI()
-        {
-            _load = Task<Type[]>.Factory.StartNew(() => typeof(IXForm).GetAllSubclasses(true).ToArray());
-
-            InitializeComponent();
-
-            // 动态调节宽度高度，兼容高DPI
-            this.FixDpi();
-
-            Icon = Source.GetIcon();
-        }
-
-        private void FrmMDI_Shown(Object sender, EventArgs e)
-        {
-            var set = XConfig.Current;
-            if (set.Width > 0 || set.Height > 0)
-            {
-                Width = set.Width;
-                Height = set.Height;
-                Top = set.Top;
-                Left = set.Left;
-            }
-
-            var asm = AssemblyX.Create(Assembly.GetExecutingAssembly());
-            if (set.Title.IsNullOrEmpty()) set.Title = asm.Title;
-            Text = String.Format("{2} v{0} {1:HH:mm:ss}", asm.CompileVersion, asm.Compile, set.Title);
-
-            _load.ContinueWith(t => LoadForms(t.Result));
-
-            ThreadPoolX.QueueUserWorkItem(() => CheckUpdate(true));
-        }
-
-        void LoadForms(Type[] ts)
-        {
-            var name = XConfig.Current.LastTool + "";
-            foreach (var item in ts)
-            {
-                if (item.FullName.EqualIgnoreCase(name))
-                {
-                    this.Invoke(() => CreateForm(item.CreateInstance() as Form));
-
-                    break;
-                }
-            }
-
-            this.Invoke(() =>
-            {
-                var root = toolsMenu;
-                foreach (var item in ts)
-                {
-                    var mi = root.DropDownItems.Add(item.GetDisplayName() ?? item.FullName);
-                    mi.Tag = item;
-                    mi.Click += (s, e) =>
-                    {
-                        var tsi = s as ToolStripItem;
-                        var type = tsi.Tag as Type;
-                        CreateForm(type.CreateInstance() as Form);
-                    };
-                }
-            });
-        }
-
-        private void FrmMDI_FormClosing(Object sender, FormClosingEventArgs e)
-        {
-            var set = XConfig.Current;
-            var area = Screen.PrimaryScreen.WorkingArea;
-            if (Left >= 0 && Top >= 0 && Width < area.Width - 60 && Height < area.Height - 60)
-            {
-                set.Width = Width;
-                set.Height = Height;
-                set.Top = Top;
-                set.Left = Left;
-                set.Save();
-            }
-        }
-        #endregion
-
-        #region 应用窗口
-        void CreateForm<TForm>() where TForm : Form, new()
-        {
-            var name = typeof(TForm).FullName;
-            var cfg = XConfig.Current;
-            if (name != cfg.LastTool)
-            {
-                cfg.LastTool = name;
-                cfg.Save();
-            }
-
-            var frm = new TForm();
-            CreateForm(frm);
-        }
-
-        void CreateForm(Form frm)
-        {
-            var name = frm.GetType().FullName;
-            var cfg = XConfig.Current;
-            if (name != cfg.LastTool)
-            {
-                cfg.LastTool = name;
-                cfg.Save();
-            }
-
-            frm.MdiParent = this;
-            frm.WindowState = FormWindowState.Maximized;
-            frm.Show();
-        }
-        #endregion
-
-        #region 菜单控制
-        private void ShowNewForm(Object sender, EventArgs e) { }
-
-        private void CascadeToolStripMenuItem_Click(Object sender, EventArgs e) { LayoutMdi(MdiLayout.Cascade); }
-
-        private void TileVerticalToolStripMenuItem_Click(Object sender, EventArgs e) { LayoutMdi(MdiLayout.TileVertical); }
-
-        private void TileHorizontalToolStripMenuItem_Click(Object sender, EventArgs e) { LayoutMdi(MdiLayout.TileHorizontal); }
-
-        private void ArrangeIconsToolStripMenuItem_Click(Object sender, EventArgs e) { LayoutMdi(MdiLayout.ArrangeIcons); }
-
-        private void CloseAllToolStripMenuItem_Click(Object sender, EventArgs e)
-        {
-            foreach (var childForm in MdiChildren)
-            {
-                childForm.Close();
-            }
-        }
-
-        private void aboutToolStripMenuItem_Click(Object sender, EventArgs e)
-        {
-            Process.Start("http://www.NewLifeX.com");
-        }
-        #endregion
-
-        #region 自动更新
-        private void 检查更新ToolStripMenuItem_Click(Object sender, EventArgs e)
-        {
-            ThreadPoolX.QueueUserWorkItem(() => CheckUpdate(false));
-        }
-
-        private void CheckUpdate(Boolean auto)
-        {
-            if (auto) XTrace.WriteLine("自动更新！");
-
-            Upgrade.DeleteBuckup();
-
-            var cfg = XConfig.Current;
-            if (cfg.LastUpdate.Date < DateTime.Now.Date || !auto)
-            {
-                cfg.LastUpdate = DateTime.Now;
-                cfg.Save();
-
-                var root = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
-                var up = new Upgrade();
-                up.Log = XTrace.Log;
-                up.Name = "XCoder";
-                up.Server = cfg.UpdateServer;
-                up.UpdatePath = root.CombinePath(up.UpdatePath);
-                if (up.Check())
-                {
-                    up.Download();
-                    if (!auto || MessageBox.Show("发现新版本{0}，是否更新？".F(up.Links[0].Time), "自动更新", MessageBoxButtons.YesNo) == DialogResult.Yes)
-                        up.Update();
-                }
-                else if (!auto)
-                {
-                    if (up.Links != null && up.Links.Length > 0)
-                        MessageBox.Show("没有可用更新！最新{0}".F(up.Links[0].Time), "自动更新");
-                    else
-                        MessageBox.Show("没有可用更新！", "自动更新");
-                }
-            }
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/XCoder/FrmMDI.resx b/XCoder/FrmMDI.resx
deleted file mode 100644
index 7d1245ecaa..0000000000
--- a/XCoder/FrmMDI.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>224, 17</value>
-  </metadata>
-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>51</value>
-  </metadata>
-</root>
\ No newline at end of file
diff --git a/XCoder/IXForm.cs b/XCoder/IXForm.cs
deleted file mode 100644
index 71982c4ab0..0000000000
--- a/XCoder/IXForm.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace XCoder
-{
-    public interface IXForm
-    {
-    }
-}
\ No newline at end of file
diff --git a/XCoder/NewModelForm/AddField.Designer.cs b/XCoder/NewModelForm/AddField.Designer.cs
deleted file mode 100644
index 74d716f03d..0000000000
--- a/XCoder/NewModelForm/AddField.Designer.cs
+++ /dev/null
@@ -1,257 +0,0 @@
-﻿namespace XCoder
-{
-    partial class AddField
-    {
-        /// <summary> 
-        /// 必需的设计器变量。
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// 清理所有正在使用的资源。
-        /// </summary>
-        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region 组件设计器生成的代码
-
-        /// <summary> 
-        /// 设计器支持所需的方法 - 不要
-        /// 使用代码编辑器修改此方法的内容。
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.gbInfo = new System.Windows.Forms.GroupBox();
-            this.btnCancle = new System.Windows.Forms.Button();
-            this.btnSave = new System.Windows.Forms.Button();
-            this.txtDataType = new System.Windows.Forms.TextBox();
-            this.txtDescription = new System.Windows.Forms.TextBox();
-            this.label2 = new System.Windows.Forms.Label();
-            this.ckbNullable = new System.Windows.Forms.CheckBox();
-            this.txtLength = new System.Windows.Forms.TextBox();
-            this.ckbPrimarykey = new System.Windows.Forms.CheckBox();
-            this.ckbIdentity = new System.Windows.Forms.CheckBox();
-            this.combRawType = new System.Windows.Forms.ComboBox();
-            this.txtName = new System.Windows.Forms.TextBox();
-            this.label13 = new System.Windows.Forms.Label();
-            this.label10 = new System.Windows.Forms.Label();
-            this.label6 = new System.Windows.Forms.Label();
-            this.label3 = new System.Windows.Forms.Label();
-            this.label1 = new System.Windows.Forms.Label();
-            this.gbInfo.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // gbInfo
-            // 
-            this.gbInfo.Controls.Add(this.btnCancle);
-            this.gbInfo.Controls.Add(this.btnSave);
-            this.gbInfo.Controls.Add(this.txtDataType);
-            this.gbInfo.Controls.Add(this.txtDescription);
-            this.gbInfo.Controls.Add(this.label2);
-            this.gbInfo.Controls.Add(this.ckbNullable);
-            this.gbInfo.Controls.Add(this.txtLength);
-            this.gbInfo.Controls.Add(this.ckbPrimarykey);
-            this.gbInfo.Controls.Add(this.ckbIdentity);
-            this.gbInfo.Controls.Add(this.combRawType);
-            this.gbInfo.Controls.Add(this.txtName);
-            this.gbInfo.Controls.Add(this.label13);
-            this.gbInfo.Controls.Add(this.label10);
-            this.gbInfo.Controls.Add(this.label6);
-            this.gbInfo.Controls.Add(this.label3);
-            this.gbInfo.Controls.Add(this.label1);
-            this.gbInfo.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gbInfo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.gbInfo.Location = new System.Drawing.Point(0, 0);
-            this.gbInfo.Name = "gbInfo";
-            this.gbInfo.Size = new System.Drawing.Size(468, 267);
-            this.gbInfo.TabIndex = 0;
-            this.gbInfo.TabStop = false;
-            // 
-            // btnCancle
-            // 
-            this.btnCancle.Location = new System.Drawing.Point(368, 228);
-            this.btnCancle.Name = "btnCancle";
-            this.btnCancle.Size = new System.Drawing.Size(88, 29);
-            this.btnCancle.TabIndex = 28;
-            this.btnCancle.Text = "取消";
-            this.btnCancle.UseVisualStyleBackColor = true;
-            this.btnCancle.Click += new System.EventHandler(this.btnCancle_Click);
-            // 
-            // btnSave
-            // 
-            this.btnSave.Location = new System.Drawing.Point(277, 228);
-            this.btnSave.Name = "btnSave";
-            this.btnSave.Size = new System.Drawing.Size(85, 29);
-            this.btnSave.TabIndex = 27;
-            this.btnSave.Text = "保存";
-            this.btnSave.UseVisualStyleBackColor = true;
-            this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
-            // 
-            // txtDataType
-            // 
-            this.txtDataType.Enabled = false;
-            this.txtDataType.Location = new System.Drawing.Point(101, 116);
-            this.txtDataType.Name = "txtDataType";
-            this.txtDataType.Size = new System.Drawing.Size(155, 29);
-            this.txtDataType.TabIndex = 26;
-            // 
-            // txtDescription
-            // 
-            this.txtDescription.Location = new System.Drawing.Point(326, 116);
-            this.txtDescription.Name = "txtDescription";
-            this.txtDescription.Size = new System.Drawing.Size(130, 29);
-            this.txtDescription.TabIndex = 25;
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(24, 120);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(74, 21);
-            this.label2.TabIndex = 1;
-            this.label2.Text = "数据类型";
-            // 
-            // ckbNullable
-            // 
-            this.ckbNullable.AutoSize = true;
-            this.ckbNullable.Location = new System.Drawing.Point(253, 197);
-            this.ckbNullable.Name = "ckbNullable";
-            this.ckbNullable.Size = new System.Drawing.Size(109, 25);
-            this.ckbNullable.TabIndex = 21;
-            this.ckbNullable.Text = "是否允许空";
-            this.ckbNullable.UseVisualStyleBackColor = true;
-            // 
-            // txtLength
-            // 
-            this.txtLength.Enabled = false;
-            this.txtLength.Location = new System.Drawing.Point(326, 36);
-            this.txtLength.Name = "txtLength";
-            this.txtLength.Size = new System.Drawing.Size(130, 29);
-            this.txtLength.TabIndex = 19;
-            this.txtLength.TextChanged += new System.EventHandler(this.txtLength_TextChanged);
-            this.txtLength.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtLength_KeyPress);
-            // 
-            // ckbPrimarykey
-            // 
-            this.ckbPrimarykey.AutoSize = true;
-            this.ckbPrimarykey.Location = new System.Drawing.Point(143, 197);
-            this.ckbPrimarykey.Name = "ckbPrimarykey";
-            this.ckbPrimarykey.Size = new System.Drawing.Size(93, 25);
-            this.ckbPrimarykey.TabIndex = 17;
-            this.ckbPrimarykey.Text = "是否主键";
-            this.ckbPrimarykey.UseVisualStyleBackColor = true;
-            // 
-            // ckbIdentity
-            // 
-            this.ckbIdentity.AutoSize = true;
-            this.ckbIdentity.Location = new System.Drawing.Point(28, 197);
-            this.ckbIdentity.Name = "ckbIdentity";
-            this.ckbIdentity.Size = new System.Drawing.Size(109, 25);
-            this.ckbIdentity.TabIndex = 16;
-            this.ckbIdentity.Text = "是否标识列";
-            this.ckbIdentity.UseVisualStyleBackColor = true;
-            // 
-            // combRawType
-            // 
-            this.combRawType.DisplayMember = "Name";
-            this.combRawType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.combRawType.FormattingEnabled = true;
-            this.combRawType.Location = new System.Drawing.Point(101, 78);
-            this.combRawType.Name = "combRawType";
-            this.combRawType.Size = new System.Drawing.Size(155, 29);
-            this.combRawType.TabIndex = 15;
-            this.combRawType.ValueMember = "DataType";
-            this.combRawType.SelectedIndexChanged += new System.EventHandler(this.combRawType_SelectedIndexChanged);
-            // 
-            // txtName
-            // 
-            this.txtName.Location = new System.Drawing.Point(101, 36);
-            this.txtName.Name = "txtName";
-            this.txtName.Size = new System.Drawing.Size(155, 29);
-            this.txtName.TabIndex = 13;
-            // 
-            // label13
-            // 
-            this.label13.AutoSize = true;
-            this.label13.Location = new System.Drawing.Point(281, 120);
-            this.label13.Name = "label13";
-            this.label13.Size = new System.Drawing.Size(42, 21);
-            this.label13.TabIndex = 12;
-            this.label13.Text = "说明";
-            // 
-            // label10
-            // 
-            this.label10.AutoSize = true;
-            this.label10.Location = new System.Drawing.Point(302, 70);
-            this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(0, 21);
-            this.label10.TabIndex = 9;
-            // 
-            // label6
-            // 
-            this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(281, 39);
-            this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(42, 21);
-            this.label6.TabIndex = 5;
-            this.label6.Text = "长度";
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(24, 81);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(74, 21);
-            this.label3.TabIndex = 2;
-            this.label3.Text = "原始类型";
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(24, 39);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(74, 21);
-            this.label1.TabIndex = 0;
-            this.label1.Text = "字段名称";
-            // 
-            // AddField
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.gbInfo);
-            this.Name = "AddField";
-            this.Size = new System.Drawing.Size(468, 267);
-            this.gbInfo.ResumeLayout(false);
-            this.gbInfo.PerformLayout();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.GroupBox gbInfo;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.Label label6;
-        private System.Windows.Forms.Label label10;
-        private System.Windows.Forms.Label label13;
-        private System.Windows.Forms.TextBox txtName;
-        private System.Windows.Forms.ComboBox combRawType;
-        private System.Windows.Forms.CheckBox ckbIdentity;
-        private System.Windows.Forms.CheckBox ckbPrimarykey;
-        private System.Windows.Forms.TextBox txtLength;
-        private System.Windows.Forms.CheckBox ckbNullable;
-        private System.Windows.Forms.TextBox txtDescription;
-        private System.Windows.Forms.TextBox txtDataType;
-        private System.Windows.Forms.Button btnSave;
-        private System.Windows.Forms.Button btnCancle;
-    }
-}
diff --git a/XCoder/NewModelForm/AddField.cs b/XCoder/NewModelForm/AddField.cs
deleted file mode 100644
index 18fa8aef1c..0000000000
--- a/XCoder/NewModelForm/AddField.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-﻿using System;
-using System.Windows.Forms;
-using XCode.DataAccessLayer;
-
-namespace XCoder
-{
-    public partial class AddField : UserControl
-    {
-        public AddField()
-        {
-            InitializeComponent();
-        }
-
-        private IDataColumn DataColumn;
-        //是否添加，默认是添加数据
-        private Boolean IsNew = true;
-
-        public AddField(IDataColumn dc, Boolean isNew)
-        {
-            InitializeComponent();
-            IsNew = isNew;
-
-
-            combRawType.DataSource = PrimitiveType.TypeList;
-            //combRawType.DisplayMember = "Name";
-            //combRawType.ValueMember = "DataType";
-
-            DataColumn = dc;
-
-            //修改的话，直接绑定数据到文本框
-            if (!IsNew) BandText();
-        }
-
-        //绑定数据
-        void BandText()
-        {
-            txtName.Text = DataColumn.Name;
-            //txtDefault.Text = DataColumn.Default;
-            txtDescription.Text = DataColumn.Description;
-            txtLength.Text = DataColumn.Length.ToString();
-            //txtNumOfByte.Text = DataColumn.NumOfByte.ToString();
-            //txtPrecision.Text = DataColumn.Precision.ToString();
-            if (DataColumn.DataType != null)
-            {
-                txtDataType.Text = DataColumn.DataType.Name;
-            }
-            if (DataColumn.RawType.Contains("nvarchar")) combRawType.SelectedIndex = 3;
-            else combRawType.SelectedIndex = PrimitiveType.TypeList.FindIndex(n => n.Name.Contains(DataColumn.RawType));
-
-            combRawType.Text = DataColumn.RawType;
-
-            ckbIdentity.Checked = DataColumn.Identity;
-
-            ckbNullable.Checked = DataColumn.Nullable;
-            ckbPrimarykey.Checked = DataColumn.PrimaryKey;
-        }
-
-        //保存数据
-        void SaveValue()
-        {
-            DataColumn.Name = txtName.Text.Trim();
-            //DataColumn.Default = txtDefault.Text.Trim();
-            DataColumn.Description = txtDescription.Text.Trim();
-            DataColumn.Length = Convert.ToInt32(txtLength.Text.Trim());
-            //DataColumn.NumOfByte = Convert.ToInt32(txtNumOfByte.Text.Trim());
-            //DataColumn.Precision = Convert.ToInt32(txtPrecision.Text.Trim());
-            DataColumn.DataType = Type.GetType(txtDataType.Text.Trim());
-
-            if (combRawType.SelectedIndex != 3)
-            {
-                DataColumn.RawType = combRawType.Text.Trim();
-            }
-            else
-            {
-                DataColumn.RawType = String.Format(combRawType.Text.Trim() + "({0})", DataColumn.Length);
-            }
-
-            DataColumn.Identity = ckbIdentity.Checked;
-            DataColumn.Nullable = ckbNullable.Checked;
-            DataColumn.PrimaryKey = ckbPrimarykey.Checked;
-            DataColumn.ColumnName = DataColumn.Name;
-        }
-
-        public static BaseForm CreateForm(IDataColumn column, Boolean isNew)
-        {
-            var frm = new AddField(column, isNew);
-            frm.Dock = DockStyle.Fill;
-            return WinFormHelper.CreateForm(frm, "编辑字段信息");
-        }
-
-        private void combRawType_SelectedIndexChanged(Object sender, EventArgs e)
-        {
-            if (combRawType.SelectedIndex == 3)
-            {
-                txtLength.Enabled = true;
-                if (!IsNew) txtLength.Text = DataColumn.Length.ToString();
-                else
-                {
-                    txtDataType.Text = PrimitiveType.TypeList[combRawType.SelectedIndex].DataType;
-                    txtLength.Text = PrimitiveType.TypeList[combRawType.SelectedIndex].Length.ToString();
-                    //txtNumOfByte.Text = PrimitiveType.TypeList[combRawType.SelectedIndex].NumOfByte.ToString();
-                    //txtPrecision.Text = PrimitiveType.TypeList[combRawType.SelectedIndex].Precision.ToString();
-                }
-            }
-            else
-            {
-                txtLength.Enabled = false;
-                txtDataType.Text = PrimitiveType.TypeList[combRawType.SelectedIndex].DataType;
-                txtLength.Text = PrimitiveType.TypeList[combRawType.SelectedIndex].Length.ToString();
-                //txtNumOfByte.Text = PrimitiveType.TypeList[combRawType.SelectedIndex].NumOfByte.ToString();
-                //txtPrecision.Text = PrimitiveType.TypeList[combRawType.SelectedIndex].Precision.ToString();
-            }
-        }
-
-        private void btnSave_Click(Object sender, EventArgs e)
-        {
-            SaveValue();
-            ParentForm.DialogResult = DialogResult.OK;
-            ParentForm.Close();
-        }
-
-        private void btnCancle_Click(Object sender, EventArgs e)
-        {
-            ParentForm.DialogResult = DialogResult.Cancel;
-            ParentForm.Close();
-        }
-
-        private void txtLength_TextChanged(Object sender, EventArgs e)
-        {
-            //if (combRawType.SelectedIndex == 3)
-            //{
-            //    txtPrecision.Text = txtLength.Text;
-            //}
-        }
-
-        private void txtLength_KeyPress(Object sender, KeyPressEventArgs e)
-        {
-            WinFormHelper.SetControlOnlyZS(sender, e);
-        }
-    }
-}
\ No newline at end of file
diff --git a/XCoder/NewModelForm/AddField.resx b/XCoder/NewModelForm/AddField.resx
deleted file mode 100644
index 29dcb1b3a3..0000000000
--- a/XCoder/NewModelForm/AddField.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file
diff --git a/XCoder/NewModelForm/AddTable.Designer.cs b/XCoder/NewModelForm/AddTable.Designer.cs
deleted file mode 100644
index c6ba4d8704..0000000000
--- a/XCoder/NewModelForm/AddTable.Designer.cs
+++ /dev/null
@@ -1,258 +0,0 @@
-﻿namespace XCoder
-{
-    partial class AddTable
-    {
-        /// <summary> 
-        /// 必需的设计器变量。
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// 清理所有正在使用的资源。
-        /// </summary>
-        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region 组件设计器生成的代码
-
-        /// <summary> 
-        /// 设计器支持所需的方法 - 不要
-        /// 使用代码编辑器修改此方法的内容。
-        /// </summary>
-        private void InitializeComponent()
-        {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AddTable));
-            this.dgvColumns = new System.Windows.Forms.DataGridView();
-            this.toolAddColumns = new System.Windows.Forms.ToolStripButton();
-            this.toolEidtColumn = new System.Windows.Forms.ToolStripButton();
-            this.toolAddIndex = new System.Windows.Forms.ToolStripButton();
-            this.toolAddRelation = new System.Windows.Forms.ToolStripButton();
-            this.toolStrip1 = new System.Windows.Forms.ToolStrip();
-            this.toolDelete = new System.Windows.Forms.ToolStripButton();
-            this.toolSave = new System.Windows.Forms.ToolStripButton();
-            this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
-            this.gbTable = new System.Windows.Forms.GroupBox();
-            this.combDbType = new System.Windows.Forms.ComboBox();
-            this.txtTableRemark = new System.Windows.Forms.TextBox();
-            this.txtTableName = new System.Windows.Forms.TextBox();
-            this.label3 = new System.Windows.Forms.Label();
-            this.label2 = new System.Windows.Forms.Label();
-            this.label1 = new System.Windows.Forms.Label();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvColumns)).BeginInit();
-            this.toolStrip1.SuspendLayout();
-            this.gbTable.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // dgvColumns
-            // 
-            this.dgvColumns.AllowUserToAddRows = false;
-            this.dgvColumns.AllowUserToDeleteRows = false;
-            this.dgvColumns.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dgvColumns.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.dgvColumns.Location = new System.Drawing.Point(0, 120);
-            this.dgvColumns.Name = "dgvColumns";
-            this.dgvColumns.ReadOnly = true;
-            this.dgvColumns.RowTemplate.Height = 23;
-            this.dgvColumns.Size = new System.Drawing.Size(934, 240);
-            this.dgvColumns.TabIndex = 2;
-            // 
-            // toolAddColumns
-            // 
-            this.toolAddColumns.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
-            this.toolAddColumns.Image = ((System.Drawing.Image)(resources.GetObject("toolAddColumns.Image")));
-            this.toolAddColumns.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.toolAddColumns.Name = "toolAddColumns";
-            this.toolAddColumns.Size = new System.Drawing.Size(76, 22);
-            this.toolAddColumns.Text = "添加字段";
-            this.toolAddColumns.Click += new System.EventHandler(this.toolAddColumns_Click);
-            // 
-            // toolEidtColumn
-            // 
-            this.toolEidtColumn.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
-            this.toolEidtColumn.Image = ((System.Drawing.Image)(resources.GetObject("toolEidtColumn.Image")));
-            this.toolEidtColumn.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.toolEidtColumn.Name = "toolEidtColumn";
-            this.toolEidtColumn.Size = new System.Drawing.Size(108, 22);
-            this.toolEidtColumn.Text = "编辑当前字段";
-            this.toolEidtColumn.Click += new System.EventHandler(this.toolEidtColumn_Click);
-            // 
-            // toolAddIndex
-            // 
-            this.toolAddIndex.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
-            this.toolAddIndex.Image = ((System.Drawing.Image)(resources.GetObject("toolAddIndex.Image")));
-            this.toolAddIndex.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.toolAddIndex.Name = "toolAddIndex";
-            this.toolAddIndex.Size = new System.Drawing.Size(76, 22);
-            this.toolAddIndex.Text = "添加索引";
-            // 
-            // toolAddRelation
-            // 
-            this.toolAddRelation.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
-            this.toolAddRelation.Image = ((System.Drawing.Image)(resources.GetObject("toolAddRelation.Image")));
-            this.toolAddRelation.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.toolAddRelation.Name = "toolAddRelation";
-            this.toolAddRelation.Size = new System.Drawing.Size(76, 22);
-            this.toolAddRelation.Text = "添加关系";
-            // 
-            // toolStrip1
-            // 
-            this.toolStrip1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolAddColumns,
-            this.toolEidtColumn,
-            this.toolDelete,
-            this.toolAddIndex,
-            this.toolAddRelation,
-            this.toolSave,
-            this.toolStripButton1});
-            this.toolStrip1.Location = new System.Drawing.Point(0, 0);
-            this.toolStrip1.Name = "toolStrip1";
-            this.toolStrip1.Size = new System.Drawing.Size(934, 25);
-            this.toolStrip1.TabIndex = 1;
-            this.toolStrip1.Text = "toolStrip1";
-            // 
-            // toolDelete
-            // 
-            this.toolDelete.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
-            this.toolDelete.Image = ((System.Drawing.Image)(resources.GetObject("toolDelete.Image")));
-            this.toolDelete.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.toolDelete.Name = "toolDelete";
-            this.toolDelete.Size = new System.Drawing.Size(76, 22);
-            this.toolDelete.Text = "删除字段";
-            this.toolDelete.Click += new System.EventHandler(this.toolDelete_Click);
-            // 
-            // toolSave
-            // 
-            this.toolSave.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
-            this.toolSave.Image = ((System.Drawing.Image)(resources.GetObject("toolSave.Image")));
-            this.toolSave.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.toolSave.Name = "toolSave";
-            this.toolSave.Size = new System.Drawing.Size(44, 22);
-            this.toolSave.Text = "保存";
-            this.toolSave.Click += new System.EventHandler(this.toolSave_Click);
-            // 
-            // toolStripButton1
-            // 
-            this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
-            this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
-            this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.toolStripButton1.Name = "toolStripButton1";
-            this.toolStripButton1.Size = new System.Drawing.Size(44, 22);
-            this.toolStripButton1.Text = "关闭";
-            this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
-            // 
-            // gbTable
-            // 
-            this.gbTable.Controls.Add(this.combDbType);
-            this.gbTable.Controls.Add(this.txtTableRemark);
-            this.gbTable.Controls.Add(this.txtTableName);
-            this.gbTable.Controls.Add(this.label3);
-            this.gbTable.Controls.Add(this.label2);
-            this.gbTable.Controls.Add(this.label1);
-            this.gbTable.Dock = System.Windows.Forms.DockStyle.Top;
-            this.gbTable.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.gbTable.Location = new System.Drawing.Point(0, 25);
-            this.gbTable.Name = "gbTable";
-            this.gbTable.Size = new System.Drawing.Size(934, 90);
-            this.gbTable.TabIndex = 3;
-            this.gbTable.TabStop = false;
-            this.gbTable.Text = "表基本信息";
-            // 
-            // combDbType
-            // 
-            this.combDbType.DisplayMember = "Name";
-            this.combDbType.FormattingEnabled = true;
-            this.combDbType.Location = new System.Drawing.Point(111, 53);
-            this.combDbType.Name = "combDbType";
-            this.combDbType.Size = new System.Drawing.Size(219, 24);
-            this.combDbType.TabIndex = 5;
-            this.combDbType.ValueMember = "Type";
-            // 
-            // txtTableRemark
-            // 
-            this.txtTableRemark.Location = new System.Drawing.Point(441, 21);
-            this.txtTableRemark.Multiline = true;
-            this.txtTableRemark.Name = "txtTableRemark";
-            this.txtTableRemark.Size = new System.Drawing.Size(487, 23);
-            this.txtTableRemark.TabIndex = 4;
-            // 
-            // txtTableName
-            // 
-            this.txtTableName.Location = new System.Drawing.Point(111, 18);
-            this.txtTableName.Name = "txtTableName";
-            this.txtTableName.Size = new System.Drawing.Size(219, 26);
-            this.txtTableName.TabIndex = 3;
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(25, 58);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(88, 16);
-            this.label3.TabIndex = 2;
-            this.label3.Text = "数据库类型";
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(379, 24);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(56, 16);
-            this.label2.TabIndex = 1;
-            this.label2.Text = "表说明";
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(73, 24);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(40, 16);
-            this.label1.TabIndex = 0;
-            this.label1.Text = "表名";
-            // 
-            // AddTable
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.gbTable);
-            this.Controls.Add(this.dgvColumns);
-            this.Controls.Add(this.toolStrip1);
-            this.Name = "AddTable";
-            this.Size = new System.Drawing.Size(934, 360);
-            ((System.ComponentModel.ISupportInitialize)(this.dgvColumns)).EndInit();
-            this.toolStrip1.ResumeLayout(false);
-            this.toolStrip1.PerformLayout();
-            this.gbTable.ResumeLayout(false);
-            this.gbTable.PerformLayout();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.DataGridView dgvColumns;
-        private System.Windows.Forms.ToolStripButton toolAddColumns;
-        private System.Windows.Forms.ToolStripButton toolEidtColumn;
-        private System.Windows.Forms.ToolStripButton toolAddIndex;
-        private System.Windows.Forms.ToolStripButton toolAddRelation;
-        private System.Windows.Forms.ToolStrip toolStrip1;
-        private System.Windows.Forms.GroupBox gbTable;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.TextBox txtTableRemark;
-        private System.Windows.Forms.TextBox txtTableName;
-        private System.Windows.Forms.ComboBox combDbType;
-        private System.Windows.Forms.ToolStripButton toolSave;
-        private System.Windows.Forms.ToolStripButton toolStripButton1;
-        private System.Windows.Forms.ToolStripButton toolDelete;
-    }
-}
diff --git a/XCoder/NewModelForm/AddTable.cs b/XCoder/NewModelForm/AddTable.cs
deleted file mode 100644
index 28f75997bb..0000000000
--- a/XCoder/NewModelForm/AddTable.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
-
-using XCode;
-using XCode.DataAccessLayer;
-
-namespace XCoder
-{
-    public partial class AddTable : UserControl
-    {
-        private IDataTable CurrentTable;
-
-        private BindingList<IDataColumn> list;
-
-        public AddTable()
-        {
-            InitializeComponent();
-        }
-        public AddTable(IDataTable table)
-        {
-            InitializeComponent();
-            combDbType.DataSource = BindComboxEnumType<DatabaseType>.BindTyps;
-            //combDbType.DisplayMember = "Name";
-            //combDbType.ValueMember = "Type";
-
-            CurrentTable = table;
-            //绑定Table信息到文本框
-            txtTableName.Text = CurrentTable.TableName;
-            txtTableRemark.Text = CurrentTable.Description;
-            combDbType.SelectedValue = CurrentTable.DbType;
-
-            list = new BindingList<IDataColumn>();
-
-            //绑定字段到表格
-            if (CurrentTable.Columns.Count > 0) dgvColumns.DataSource = CurrentTable.Columns;
-
-            BandingDGV();
-        }
-
-        private void BandingDGV()
-        {
-            if (CurrentTable.Columns.Count > 0)
-            {
-                list.Clear();
-                foreach (var item in CurrentTable.Columns)
-                {
-                    list.Add(item);
-                }
-                dgvColumns.DataSource = null;
-                dgvColumns.DataSource = list;
-            }
-            else dgvColumns.DataSource = null;
-        }
-
-        public static BaseForm CreateForm(IDataTable table)
-        {
-            var frm = new AddTable(table);
-            frm.Dock = DockStyle.Fill;
-            return WinFormHelper.CreateForm(frm, "添加表");
-        }
-
-        private void toolAddColumns_Click(Object sender, EventArgs e)
-        {
-            var dc = CurrentTable.CreateColumn();
-            //CurrentTable.Columns.Add(dc);
-            var id = CurrentTable.Columns.Count + 1;
-            dc.ColumnName = "Column" + id;
-            dc.Description = "字段" + id;
-            var dr = AddField.CreateForm(dc, true).ShowDialog();
-            if (dr != DialogResult.Cancel)
-            {
-                CurrentTable.Columns.Add(dc);
-                BandingDGV();
-            }
-        }
-
-        private void toolEidtColumn_Click(Object sender, EventArgs e)
-        {
-
-            var row = dgvColumns.Rows[dgvColumns.CurrentCell.RowIndex];
-            if (row == null) return;
-
-            AddField.CreateForm((IDataColumn)row.DataBoundItem, false).ShowDialog();
-
-            BandingDGV();
-        }
-
-        private void toolStripButton1_Click(Object sender, EventArgs e)
-        {
-            if (MessageBox.Show("是否需要保存数据?", "提示", MessageBoxButtons.YesNo) == DialogResult.Yes)
-            {
-                toolSave_Click(sender, e);
-            }
-            else
-            {
-                ParentForm.Close();
-            }
-        }
-
-        private void toolSave_Click(Object sender, EventArgs e)
-        {
-            CurrentTable.TableName = txtTableName.Text.Trim();
-            CurrentTable.Description = txtTableRemark.Text.Trim();
-            CurrentTable.DbType = (DatabaseType)Enum.Parse(typeof(DatabaseType), combDbType.SelectedValue.ToString());
-
-            BandingDGV();
-        }
-
-        private void toolDelete_Click(Object sender, EventArgs e)
-        {
-            CurrentTable.Columns.RemoveAt(dgvColumns.CurrentCell.RowIndex);
-            BandingDGV();
-        }
-    }
-}
diff --git a/XCoder/NewModelForm/AddTable.resx b/XCoder/NewModelForm/AddTable.resx
deleted file mode 100644
index cecf6266fe..0000000000
--- a/XCoder/NewModelForm/AddTable.resx
+++ /dev/null
@@ -1,229 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="toolAddColumns.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
-        YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
-        0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
-        bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
-        VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
-        c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
-        Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
-        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
-        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
-        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="toolEidtColumn.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
-        YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
-        0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
-        bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
-        VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
-        c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
-        Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
-        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
-        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
-        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="toolAddIndex.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
-        YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
-        0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
-        bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
-        VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
-        c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
-        Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
-        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
-        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
-        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="toolAddRelation.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
-        YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
-        0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
-        bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
-        VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
-        c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
-        Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
-        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
-        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
-        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <data name="toolDelete.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
-        YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
-        0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
-        bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
-        VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
-        c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
-        Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
-        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
-        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
-        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="toolSave.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
-        YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
-        0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
-        bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
-        VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
-        c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
-        Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
-        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
-        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
-        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
-        YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
-        0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
-        bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
-        VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
-        c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
-        Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
-        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
-        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
-        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
-</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/XCoder/NewModelForm/BaseForm.cs b/XCoder/NewModelForm/BaseForm.cs
deleted file mode 100644
index 2e89ca86f7..0000000000
--- a/XCoder/NewModelForm/BaseForm.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
-
-namespace XCoder
-{
-    public partial class BaseForm : Form
-    {
-        public BaseForm()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/XCoder/NewModelForm/BaseForm.designer.cs b/XCoder/NewModelForm/BaseForm.designer.cs
deleted file mode 100644
index 62ed354392..0000000000
--- a/XCoder/NewModelForm/BaseForm.designer.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-﻿namespace XCoder
-{
-    partial class BaseForm
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.SuspendLayout();
-            // 
-            // FormModel
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(532, 317);
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
-            this.Name = "FormModel";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "TestForm";
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion     
-    }
-}
\ No newline at end of file
diff --git a/XCoder/NewModelForm/BaseForm.resx b/XCoder/NewModelForm/BaseForm.resx
deleted file mode 100644
index 29dcb1b3a3..0000000000
--- a/XCoder/NewModelForm/BaseForm.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file
diff --git a/XCoder/NewModelForm/NewModel.Designer.cs b/XCoder/NewModelForm/NewModel.Designer.cs
deleted file mode 100644
index 8ce1a11852..0000000000
--- a/XCoder/NewModelForm/NewModel.Designer.cs
+++ /dev/null
@@ -1,161 +0,0 @@
-﻿namespace XCoder
-{
-    partial class NewModel
-    {
-        /// <summary> 
-        /// 必需的设计器变量。
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// 清理所有正在使用的资源。
-        /// </summary>
-        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region 组件设计器生成的代码
-
-        /// <summary> 
-        /// 设计器支持所需的方法 - 不要
-        /// 使用代码编辑器修改此方法的内容。
-        /// </summary>
-        private void InitializeComponent()
-        {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(NewModel));
-            this.dgvTables = new System.Windows.Forms.DataGridView();
-            this.toolStrip1 = new System.Windows.Forms.ToolStrip();
-            this.toolAddTable = new System.Windows.Forms.ToolStripButton();
-            this.toolEidtTable = new System.Windows.Forms.ToolStripButton();
-            this.toolDeleteTable = new System.Windows.Forms.ToolStripButton();
-            this.toolAddRelation = new System.Windows.Forms.ToolStripButton();
-            this.toolSaveModel = new System.Windows.Forms.ToolStripButton();
-            this.toolClose = new System.Windows.Forms.ToolStripButton();
-            this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvTables)).BeginInit();
-            this.toolStrip1.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // dgvTables
-            // 
-            this.dgvTables.AllowUserToAddRows = false;
-            this.dgvTables.AllowUserToDeleteRows = false;
-            this.dgvTables.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dgvTables.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.dgvTables.Location = new System.Drawing.Point(0, 25);
-            this.dgvTables.Name = "dgvTables";
-            this.dgvTables.ReadOnly = true;
-            this.dgvTables.RowTemplate.Height = 23;
-            this.dgvTables.Size = new System.Drawing.Size(909, 391);
-            this.dgvTables.TabIndex = 4;
-            // 
-            // toolStrip1
-            // 
-            this.toolStrip1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolAddTable,
-            this.toolEidtTable,
-            this.toolDeleteTable,
-            this.toolAddRelation,
-            this.toolSaveModel,
-            this.toolClose});
-            this.toolStrip1.Location = new System.Drawing.Point(0, 0);
-            this.toolStrip1.Name = "toolStrip1";
-            this.toolStrip1.Size = new System.Drawing.Size(909, 25);
-            this.toolStrip1.TabIndex = 3;
-            this.toolStrip1.Text = "toolStrip1";
-            // 
-            // toolAddTable
-            // 
-            this.toolAddTable.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
-            this.toolAddTable.Image = ((System.Drawing.Image)(resources.GetObject("toolAddTable.Image")));
-            this.toolAddTable.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.toolAddTable.Name = "toolAddTable";
-            this.toolAddTable.Size = new System.Drawing.Size(60, 22);
-            this.toolAddTable.Text = "添加表";
-            this.toolAddTable.Click += new System.EventHandler(this.toolAddTable_Click);
-            // 
-            // toolEidtTable
-            // 
-            this.toolEidtTable.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
-            this.toolEidtTable.Image = ((System.Drawing.Image)(resources.GetObject("toolEidtTable.Image")));
-            this.toolEidtTable.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.toolEidtTable.Name = "toolEidtTable";
-            this.toolEidtTable.Size = new System.Drawing.Size(92, 22);
-            this.toolEidtTable.Text = "编辑选中表";
-            this.toolEidtTable.Click += new System.EventHandler(this.toolEidtTable_Click);
-            // 
-            // toolDeleteTable
-            // 
-            this.toolDeleteTable.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
-            this.toolDeleteTable.Image = ((System.Drawing.Image)(resources.GetObject("toolDeleteTable.Image")));
-            this.toolDeleteTable.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.toolDeleteTable.Name = "toolDeleteTable";
-            this.toolDeleteTable.Size = new System.Drawing.Size(60, 22);
-            this.toolDeleteTable.Text = "删除表";
-            this.toolDeleteTable.Click += new System.EventHandler(this.toolDeleteTable_Click);
-            // 
-            // toolAddRelation
-            // 
-            this.toolAddRelation.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
-            this.toolAddRelation.Image = ((System.Drawing.Image)(resources.GetObject("toolAddRelation.Image")));
-            this.toolAddRelation.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.toolAddRelation.Name = "toolAddRelation";
-            this.toolAddRelation.Size = new System.Drawing.Size(76, 22);
-            this.toolAddRelation.Text = "添加关系";
-            // 
-            // toolSaveModel
-            // 
-            this.toolSaveModel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
-            this.toolSaveModel.Image = ((System.Drawing.Image)(resources.GetObject("toolSaveModel.Image")));
-            this.toolSaveModel.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.toolSaveModel.Name = "toolSaveModel";
-            this.toolSaveModel.Size = new System.Drawing.Size(76, 22);
-            this.toolSaveModel.Text = "保存模型";
-            this.toolSaveModel.Click += new System.EventHandler(this.toolStripButton1_Click);
-            // 
-            // toolClose
-            // 
-            this.toolClose.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
-            this.toolClose.Image = ((System.Drawing.Image)(resources.GetObject("toolClose.Image")));
-            this.toolClose.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.toolClose.Name = "toolClose";
-            this.toolClose.Size = new System.Drawing.Size(44, 22);
-            this.toolClose.Text = "关闭";
-            this.toolClose.Click += new System.EventHandler(this.toolClose_Click);
-            // 
-            // NewModel
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.dgvTables);
-            this.Controls.Add(this.toolStrip1);
-            this.Name = "NewModel";
-            this.Size = new System.Drawing.Size(909, 416);
-            ((System.ComponentModel.ISupportInitialize)(this.dgvTables)).EndInit();
-            this.toolStrip1.ResumeLayout(false);
-            this.toolStrip1.PerformLayout();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.DataGridView dgvTables;
-        private System.Windows.Forms.ToolStrip toolStrip1;
-        private System.Windows.Forms.ToolStripButton toolEidtTable;
-        private System.Windows.Forms.ToolStripButton toolDeleteTable;
-        private System.Windows.Forms.ToolStripButton toolAddRelation;
-        private System.Windows.Forms.ToolStripButton toolAddTable;
-        private System.Windows.Forms.ToolStripButton toolSaveModel;
-        private System.Windows.Forms.ToolStripButton toolClose;
-        private System.Windows.Forms.SaveFileDialog saveFileDialog1;
-    }
-}
diff --git a/XCoder/NewModelForm/NewModel.cs b/XCoder/NewModelForm/NewModel.cs
deleted file mode 100644
index f6cef2b5f0..0000000000
--- a/XCoder/NewModelForm/NewModel.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Windows.Forms;
-using NewLife.Model;
-using XCode.DataAccessLayer;
-
-namespace XCoder
-{
-    public partial class NewModel : UserControl
-    {
-        public List<IDataTable> Tables { get; set; }
-
-
-        public NewModel()
-        {
-            InitializeComponent();
-            Tables = new List<IDataTable>();
-        }
-
-        public static BaseForm CreateForm()
-        {
-            var frm = new NewModel();
-            frm.Dock = DockStyle.Fill;
-
-            return WinFormHelper.CreateForm(frm, "添加模型");
-        }
-
-        private void toolAddTable_Click(Object sender, EventArgs e)
-        {
-            //为了触发XCodeService的静态构造函数
-            var temp = ModelResolver.Current;
-            if (temp == null) return;
-
-            var current = ObjectContainer.Current.Resolve<IDataTable>();
-            Tables.Add(current);
-            var id = Tables.Count;
-            current.TableName = "NewTable" + id;
-            current.Description = "新建表" + id;
-            current.DbType = DatabaseType.SqlServer;
-            current.Description = "默认说明";
-
-            AddTable.CreateForm(current).ShowDialog();
-
-            dgvTables.DataSource = null;
-            dgvTables.DataSource = Tables;
-        }
-
-        private void toolEidtTable_Click(Object sender, EventArgs e)
-        {
-            var row = dgvTables.Rows[dgvTables.CurrentCell.RowIndex];
-            if (row == null) return;
-
-            AddTable.CreateForm((IDataTable)row.DataBoundItem).ShowDialog();
-        }
-
-        private void toolClose_Click(Object sender, EventArgs e)
-        {
-            if (MessageBox.Show("是否需要保存?", "提示", MessageBoxButtons.YesNo) == DialogResult.Yes)
-            {
-                toolStripButton1_Click(sender, e);
-            }
-            else
-            {
-                ParentForm.Close();
-            }
-        }
-
-        //保存模型
-        private void toolStripButton1_Click(Object sender, EventArgs e)
-        {
-            if (Tables == null || Tables.Count < 1)
-            {
-                MessageBox.Show(Text, "数据库架构为空！", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-                return;
-            }
-            if (saveFileDialog1.ShowDialog() != DialogResult.OK || String.IsNullOrEmpty(saveFileDialog1.FileName)) return;
-            try
-            {
-                var xml = DAL.Export(Tables);
-                File.WriteAllText(saveFileDialog1.FileName, xml);
-
-                MessageBox.Show("保存模型成功！", "保存模型", MessageBoxButtons.OK);
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.Message, Text, MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-        }
-
-        private void toolDeleteTable_Click(Object sender, EventArgs e)
-        {
-            Tables.RemoveAt(dgvTables.CurrentCell.RowIndex);
-
-            dgvTables.DataSource = null;
-            dgvTables.DataSource = Tables;
-        }
-    }
-}
diff --git a/XCoder/NewModelForm/NewModel.resx b/XCoder/NewModelForm/NewModel.resx
deleted file mode 100644
index 51537342a4..0000000000
--- a/XCoder/NewModelForm/NewModel.resx
+++ /dev/null
@@ -1,217 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="toolAddTable.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIISURBVDhPpZP7S1NxGMbPPxKaXVUkMEq8IpKUCoY/hGgI
-        ymqkDYYXcCjDZOANURSjCNGFQUTsl4GXVMxKk62YU4fXQpaIlygHQxBRH8/zwvyaIAYe+HLgnPN8nue9
-        HA3nvDTq63oW/jm13XOwvPTB3DYFY5MH+bXfcN8ygfTSMSSXfESicQDxBqdYHwH29g9w2tnZ3UcguIvN
-        rR3417exuBJE5N1n/wfwLgXEOc38Bc6xNRHb+/y4nm49G0Bnit2zf9H6bkliE/jKuYxrd6oVgDWfjB+K
-        TWeKMyrGEVfowITvD9re/9ABVQrAhh0HHK+ZselMMaN/mvwtDb+aVqkA7HYIwIj3ysfluPTorJnP6Ezx
-        oHsD1s5ZXEktUwCOioB5f1CEPR9+wTG6iuiserTo8dkwng7HT/R+XUPF8xlcTjErAOdMcW6NW8STiwG8
-        7vej8oUPN/PsEv3t8Ao0TZP3T1u8uJRkUgAuSYHtO97oLxmXd5t9Ho8aPTK+GzntqNfrLm2fFoihwYOI
-        xGIF4KjoGBLzY1OrF9k6OOFxnwDC4wxIMX1G0pMhgVyMNyoA13PAtS7OrJk1PrC69LUdQWxuF6IybHrX
-        LRI7JrtZdoDAo1XmbjMyD+tjSXxGcXRmnYg5ttD9QuxDhN0uUgDOmbvNTpPOJaGAo2K36cyaGZvOFIfd
-        KlSA8/zRh9ABIDUG+1JpAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="toolEidtTable.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIISURBVDhPpZP7S1NxGMbPPxKaXVUkMEq8IpKUCoY/hGgI
-        ymqkDYYXcCjDZOANURSjCNGFQUTsl4GXVMxKk62YU4fXQpaIlygHQxBRH8/zwvyaIAYe+HLgnPN8nue9
-        HA3nvDTq63oW/jm13XOwvPTB3DYFY5MH+bXfcN8ygfTSMSSXfESicQDxBqdYHwH29g9w2tnZ3UcguIvN
-        rR3417exuBJE5N1n/wfwLgXEOc38Bc6xNRHb+/y4nm49G0Bnit2zf9H6bkliE/jKuYxrd6oVgDWfjB+K
-        TWeKMyrGEVfowITvD9re/9ABVQrAhh0HHK+ZselMMaN/mvwtDb+aVqkA7HYIwIj3ysfluPTorJnP6Ezx
-        oHsD1s5ZXEktUwCOioB5f1CEPR9+wTG6iuiserTo8dkwng7HT/R+XUPF8xlcTjErAOdMcW6NW8STiwG8
-        7vej8oUPN/PsEv3t8Ao0TZP3T1u8uJRkUgAuSYHtO97oLxmXd5t9Ho8aPTK+GzntqNfrLm2fFoihwYOI
-        xGIF4KjoGBLzY1OrF9k6OOFxnwDC4wxIMX1G0pMhgVyMNyoA13PAtS7OrJk1PrC69LUdQWxuF6IybHrX
-        LRI7JrtZdoDAo1XmbjMyD+tjSXxGcXRmnYg5ttD9QuxDhN0uUgDOmbvNTpPOJaGAo2K36cyaGZvOFIfd
-        KlSA8/zRh9ABIDUG+1JpAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="toolDeleteTable.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIISURBVDhPpZP7S1NxGMbPPxKaXVUkMEq8IpKUCoY/hGgI
-        ymqkDYYXcCjDZOANURSjCNGFQUTsl4GXVMxKk62YU4fXQpaIlygHQxBRH8/zwvyaIAYe+HLgnPN8nue9
-        HA3nvDTq63oW/jm13XOwvPTB3DYFY5MH+bXfcN8ygfTSMSSXfESicQDxBqdYHwH29g9w2tnZ3UcguIvN
-        rR3417exuBJE5N1n/wfwLgXEOc38Bc6xNRHb+/y4nm49G0Bnit2zf9H6bkliE/jKuYxrd6oVgDWfjB+K
-        TWeKMyrGEVfowITvD9re/9ABVQrAhh0HHK+ZselMMaN/mvwtDb+aVqkA7HYIwIj3ysfluPTorJnP6Ezx
-        oHsD1s5ZXEktUwCOioB5f1CEPR9+wTG6iuiserTo8dkwng7HT/R+XUPF8xlcTjErAOdMcW6NW8STiwG8
-        7vej8oUPN/PsEv3t8Ao0TZP3T1u8uJRkUgAuSYHtO97oLxmXd5t9Ho8aPTK+GzntqNfrLm2fFoihwYOI
-        xGIF4KjoGBLzY1OrF9k6OOFxnwDC4wxIMX1G0pMhgVyMNyoA13PAtS7OrJk1PrC69LUdQWxuF6IybHrX
-        LRI7JrtZdoDAo1XmbjMyD+tjSXxGcXRmnYg5ttD9QuxDhN0uUgDOmbvNTpPOJaGAo2K36cyaGZvOFIfd
-        KlSA8/zRh9ABIDUG+1JpAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="toolAddRelation.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIISURBVDhPpZP7S1NxGMbPPxKaXVUkMEq8IpKUCoY/hGgI
-        ymqkDYYXcCjDZOANURSjCNGFQUTsl4GXVMxKk62YU4fXQpaIlygHQxBRH8/zwvyaIAYe+HLgnPN8nue9
-        HA3nvDTq63oW/jm13XOwvPTB3DYFY5MH+bXfcN8ygfTSMSSXfESicQDxBqdYHwH29g9w2tnZ3UcguIvN
-        rR3417exuBJE5N1n/wfwLgXEOc38Bc6xNRHb+/y4nm49G0Bnit2zf9H6bkliE/jKuYxrd6oVgDWfjB+K
-        TWeKMyrGEVfowITvD9re/9ABVQrAhh0HHK+ZselMMaN/mvwtDb+aVqkA7HYIwIj3ysfluPTorJnP6Ezx
-        oHsD1s5ZXEktUwCOioB5f1CEPR9+wTG6iuiserTo8dkwng7HT/R+XUPF8xlcTjErAOdMcW6NW8STiwG8
-        7vej8oUPN/PsEv3t8Ao0TZP3T1u8uJRkUgAuSYHtO97oLxmXd5t9Ho8aPTK+GzntqNfrLm2fFoihwYOI
-        xGIF4KjoGBLzY1OrF9k6OOFxnwDC4wxIMX1G0pMhgVyMNyoA13PAtS7OrJk1PrC69LUdQWxuF6IybHrX
-        LRI7JrtZdoDAo1XmbjMyD+tjSXxGcXRmnYg5ttD9QuxDhN0uUgDOmbvNTpPOJaGAo2K36cyaGZvOFIfd
-        KlSA8/zRh9ABIDUG+1JpAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="toolSaveModel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIISURBVDhPpZP7S1NxGMbPPxKaXVUkMEq8IpKUCoY/hGgI
-        ymqkDYYXcCjDZOANURSjCNGFQUTsl4GXVMxKk62YU4fXQpaIlygHQxBRH8/zwvyaIAYe+HLgnPN8nue9
-        HA3nvDTq63oW/jm13XOwvPTB3DYFY5MH+bXfcN8ygfTSMSSXfESicQDxBqdYHwH29g9w2tnZ3UcguIvN
-        rR3417exuBJE5N1n/wfwLgXEOc38Bc6xNRHb+/y4nm49G0Bnit2zf9H6bkliE/jKuYxrd6oVgDWfjB+K
-        TWeKMyrGEVfowITvD9re/9ABVQrAhh0HHK+ZselMMaN/mvwtDb+aVqkA7HYIwIj3ysfluPTorJnP6Ezx
-        oHsD1s5ZXEktUwCOioB5f1CEPR9+wTG6iuiserTo8dkwng7HT/R+XUPF8xlcTjErAOdMcW6NW8STiwG8
-        7vej8oUPN/PsEv3t8Ao0TZP3T1u8uJRkUgAuSYHtO97oLxmXd5t9Ho8aPTK+GzntqNfrLm2fFoihwYOI
-        xGIF4KjoGBLzY1OrF9k6OOFxnwDC4wxIMX1G0pMhgVyMNyoA13PAtS7OrJk1PrC69LUdQWxuF6IybHrX
-        LRI7JrtZdoDAo1XmbjMyD+tjSXxGcXRmnYg5ttD9QuxDhN0uUgDOmbvNTpPOJaGAo2K36cyaGZvOFIfd
-        KlSA8/zRh9ABIDUG+1JpAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="toolClose.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIISURBVDhPpZP7S1NxGMbPPxKaXVUkMEq8IpKUCoY/hGgI
-        ymqkDYYXcCjDZOANURSjCNGFQUTsl4GXVMxKk62YU4fXQpaIlygHQxBRH8/zwvyaIAYe+HLgnPN8nue9
-        HA3nvDTq63oW/jm13XOwvPTB3DYFY5MH+bXfcN8ygfTSMSSXfESicQDxBqdYHwH29g9w2tnZ3UcguIvN
-        rR3417exuBJE5N1n/wfwLgXEOc38Bc6xNRHb+/y4nm49G0Bnit2zf9H6bkliE/jKuYxrd6oVgDWfjB+K
-        TWeKMyrGEVfowITvD9re/9ABVQrAhh0HHK+ZselMMaN/mvwtDb+aVqkA7HYIwIj3ysfluPTorJnP6Ezx
-        oHsD1s5ZXEktUwCOioB5f1CEPR9+wTG6iuiserTo8dkwng7HT/R+XUPF8xlcTjErAOdMcW6NW8STiwG8
-        7vej8oUPN/PsEv3t8Ao0TZP3T1u8uJRkUgAuSYHtO97oLxmXd5t9Ho8aPTK+GzntqNfrLm2fFoihwYOI
-        xGIF4KjoGBLzY1OrF9k6OOFxnwDC4wxIMX1G0pMhgVyMNyoA13PAtS7OrJk1PrC69LUdQWxuF6IybHrX
-        LRI7JrtZdoDAo1XmbjMyD+tjSXxGcXRmnYg5ttD9QuxDhN0uUgDOmbvNTpPOJaGAo2K36cyaGZvOFIfd
-        KlSA8/zRh9ABIDUG+1JpAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <metadata name="saveFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>127, 17</value>
-  </metadata>
-</root>
\ No newline at end of file
diff --git a/XCoder/NewModelForm/WinFormHelper.cs b/XCoder/NewModelForm/WinFormHelper.cs
deleted file mode 100644
index ea0cd686fa..0000000000
--- a/XCoder/NewModelForm/WinFormHelper.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Windows.Forms;
-using System.Drawing;
-
-namespace XCoder
-{
-    public class WinFormHelper
-    {
-        #region 获取FormModel窗体，传入一个控件
-        /// <summary>
-        /// 获取控件的窗体，并设置标题
-        /// </summary>
-        /// <param name="cl">控件</param>
-        /// <param name="titleText">标题文本</param>        
-        public static BaseForm CreateForm(Control cl, String titleText = "")
-        {
-            var tf = new BaseForm();
-            tf.Size = new Size(cl.Width + 15, cl.Size.Height + 40);
-            tf.Controls.Add(cl);//将控件添加到窗体中
-            tf.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-            tf.Text = titleText;
-            return tf;
-        }
-        #endregion
-
-        #region 设置控件只能输入数字
-        /// <summary>
-        /// 设置控件只能输入数字
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        public static void SetControlOnlyValue(Object sender, KeyPressEventArgs e)
-        {
-            e.Handled = !(Char.IsNumber(e.KeyChar) || e.KeyChar == (Char)8 || e.KeyChar == '.' || e.KeyChar == '-');
-            if (!e.Handled)
-                (sender as TextBox).Tag = (sender as TextBox).Text;//记录最后一次正确输入
-        }
-        /// <summary>
-        /// 只能输入正数
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        public static void SetControlOnlyZS(Object sender, KeyPressEventArgs e)
-        {
-            e.Handled = !(Char.IsNumber(e.KeyChar) || e.KeyChar == (Char)8 || e.KeyChar == '.');
-            if (!e.Handled)
-                (sender as TextBox).Tag = (sender as TextBox).Text;//记录最后一次正确输入
-        }
-        #endregion
-    }
-
-    /// <summary>用于Combox显示绑定的对象</summary>
-    public class BindComboxEnumType<T>
-    {
-        /// <summary>类型的名字</summary>
-        public String Name { get; set; }
-
-        /// <summary>类型</summary>
-        public T Type { get; set; }
-
-        private static readonly List<BindComboxEnumType<T>> bindTyps;
-
-        static BindComboxEnumType()
-        {
-            bindTyps = new List<BindComboxEnumType<T>>();
-
-            foreach (var name in Enum.GetNames(typeof(T)))
-            {
-                bindTyps.Add(new BindComboxEnumType<T>()
-                {
-                    Name = name,
-                    Type = (T)Enum.Parse(typeof(T), name)
-                });
-            }
-        }
-
-        /// <summary>绑定的类型数据</summary>
-        public static List<BindComboxEnumType<T>> BindTyps
-        {
-            get { return bindTyps; }
-        }
-    }
-
-    /// <summary>暂时支持的数据类型,常规的</summary>
-    public enum SupportDataType
-    {
-        Boolean = 3,
-        DateTime = 6,
-        Double = 8,
-        Int32 = 9,
-        Int64 = 10,
-        SByte = 11,
-        String = 12
-    }
-
-    /// <summary>模型设计所支持的数据类型,每一种类型的很多参数都固定了，所以写了这么个类</summary>
-    public class PrimitiveType
-    {
-        /// <summary>原始类型名称</summary>
-        public String Name { get; set; }
-        /// <summary>类型长度</summary>
-        public Int32 Length { get; set; }
-        ///// <summary>字节数/summary>
-        //public Int32 NumOfByte { get; set; }
-        /// <summary>精度</summary>
-        public Int32 Precision { get; set; }
-        /// <summary>数据类型</summary>
-        public String DataType { get; set; }
-
-        public static List<PrimitiveType> TypeList;
-
-        static PrimitiveType()
-        {
-            TypeList = new List<PrimitiveType>();
-            TypeList.Add(new PrimitiveType() { Name = "bool", Length = 1, DataType = "System.Boolean", Precision = 1 });
-            TypeList.Add(new PrimitiveType() { Name = "int", Length = 10, DataType = "System.Int32", Precision = 10 });
-            TypeList.Add(new PrimitiveType() { Name = "double", Length = 22, DataType = "System.Double", Precision = 22 });
-            TypeList.Add(new PrimitiveType() { Name = "nvarchar", Length = 20, DataType = "System.String", Precision = 20 });
-            TypeList.Add(new PrimitiveType() { Name = "ntext", Length = 65535, DataType = "System.String", Precision = 65535 });
-            TypeList.Add(new PrimitiveType() { Name = "datetime", Length = 20, DataType = "System.DateTime", Precision = 20 });
-        }
-    }
-}
\ No newline at end of file
diff --git a/XCoder/Program.cs b/XCoder/Program.cs
deleted file mode 100644
index 416926d0b4..0000000000
--- a/XCoder/Program.cs
+++ /dev/null
@@ -1,137 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
-using System.Windows.Forms;
-using NewLife;
-using NewLife.Log;
-using NewLife.Net;
-using NewLife.Threading;
-using NewLife.Xml;
-using XCode.DataAccessLayer;
-
-namespace XCoder
-{
-    static class Program
-    {
-        /// <summary>应用程序的主入口点。</summary>
-        [STAThread]
-        static void Main()
-        {
-            XTrace.UseWinForm();
-
-            StringHelper.EnableSpeechTip = XConfig.Current.SpeechTip;
-
-            // 参数启动
-            var args = Environment.GetCommandLineArgs();
-            if (args != null && args.Length > 1)
-            {
-                try
-                {
-                    StartWithParameter(args);
-                }
-                catch (Exception ex)
-                {
-                    XTrace.WriteException(ex);
-                }
-                return;
-            }
-
-            if (!Runtime.Mono) new TimerX(s => Runtime.ReleaseMemory(), null, 60000, 60000) { Async = true };
-
-            if (XConfig.Current.IsNew) "学无先后达者为师，欢迎使用新生命码神工具！".SpeechTip();
-
-            Application.EnableVisualStyles();
-            Application.SetCompatibleTextRenderingDefault(false);
-            Application.Run(new FrmMDI());
-        }
-
-        /// <summary>参数启动</summary>
-        static void StartWithParameter(String[] args)
-        {
-            var dic = new Dictionary<String, String>(StringComparer.OrdinalIgnoreCase);
-            for (var i = 2; i < args.Length - 1; i++)
-            {
-                switch (args[i].ToLower())
-                {
-                    case "-config":
-                    case "-model":
-                    case "-connstr":
-                    case "-provider":
-                    case "-log":
-                        dic.Add(args[i].Substring(1), args[++i].Trim('\"'));
-                        break;
-                    default:
-                        break;
-                }
-            }
-
-            // 转移日志
-            var logfile = "";
-            if (dic.TryGetValue("Log", out logfile) && !logfile.IsNullOrWhiteSpace())
-            {
-#if DEBUG
-                XTrace.WriteLine("准备切换日志到 {0}", logfile);
-#endif
-
-                try
-                {
-                    var log = TextFileLog.CreateFile(logfile);
-                    log.Info("XCoder.exe {0}", String.Join(" ", args));
-                    XTrace.Log = log;
-                }
-                catch (Exception ex) { XTrace.WriteException(ex); }
-            }
-
-            switch (args[1].ToLower())
-            {
-                case "-render":
-                    Render(dic["Model"], dic["Config"]);
-                    return;
-                case "-makemodel":
-                    MakeModel(dic["Model"], dic["ConnStr"], dic["Provider"]);
-                    return;
-                default:
-                    break;
-            }
-        }
-
-        static void Render(String mdl, String cfg)
-        {
-            XTrace.WriteLine("生成代码：模型{0} 配置{1}", mdl, cfg);
-
-            var config = cfg.ToXmlFileEntity<ModelConfig>();
-            XTrace.WriteLine("模版：{0}", config.TemplateName);
-            XTrace.WriteLine("输出：{0}", config.OutputPath);
-
-            var xml = File.ReadAllText(mdl);
-            var tables = DAL.Import(xml);
-
-            var engine = new Engine(config);
-            engine.Tables = tables;
-            foreach (var item in tables)
-            {
-                XTrace.WriteLine("生成：{0}", item);
-                engine.Render(item);
-            }
-
-            // 如果有改变，才重新写入模型文件
-            var xml2 = DAL.Export(tables);
-            if (xml2 != xml) File.WriteAllText(mdl, xml2);
-        }
-
-        static void MakeModel(String mdl, String connstr, String provider)
-        {
-            XTrace.WriteLine("导出模型：ConnStr={0} Provider={1} Model={2}", connstr, provider, mdl);
-
-            var key = "XCoder_Temp";
-            DAL.AddConnStr(key, connstr, null, provider);
-            var list = DAL.Create(key).Tables;
-            var xml = DAL.Export(list);
-
-            var dir = Path.GetDirectoryName(mdl);
-            if (!String.IsNullOrEmpty(dir) && !Directory.Exists(dir)) Directory.CreateDirectory(dir);
-            File.WriteAllText(mdl, xml);
-        }
-    }
-}
\ No newline at end of file
diff --git a/XCoder/Properties/AssemblyInfo.cs b/XCoder/Properties/AssemblyInfo.cs
deleted file mode 100644
index 26b43f7374..0000000000
--- a/XCoder/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-﻿using System.Reflection;
-using System.Runtime.InteropServices;
-
-// 有关程序集的常规信息通过下列属性集
-// 控制。更改这些属性值可修改
-// 与程序集关联的信息。
-[assembly: AssemblyTitle("新生命码神工具")]
-[assembly: AssemblyDescription("基于编译型模版引擎的代码生成器，以及众多开发者工具")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyProduct("XCoder")]
-[assembly: AssemblyCompany("新生命开发团队")]
-[assembly: AssemblyCopyright("©2002-2018 新生命开发团队 http://www.NewLifeX.com")]
-[assembly: AssemblyTrademark("四叶草")]
-[assembly: AssemblyCulture("")]
-
-// 将 ComVisible 设置为 false 使此程序集中的类型
-// 对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型，
-// 则将该类型上的 ComVisible 属性设置为 true。
-[assembly: ComVisible(false)]
-
-// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
-[assembly: Guid("bfff5d5b-dd0d-4464-b7b8-ec3786bc2d7b")]
-
-// 程序集的版本信息由下面四个值组成:
-//
-//      主版本
-//      次版本 
-//      内部版本号
-//      修订号
-//
-[assembly: AssemblyVersion("6.9.*")]
-[assembly: AssemblyFileVersion("6.9.2017.0526")]
-
-/*
- * v6.9.2017.0101   增加消息调试工具，支持调试网络库的消息收发功能
- * 
- * v6.9.2016.0504   增加操作语音提示和语音识别辅助操作
- * 
- * v6.7.2016.0418   异步加载子工具，支持外部FrmMain窗体
- * 
- * v6.6.2016.0205   升级网络调试工具，增加收发数据的日志控制，增加统计信息
- * 
- * v6.5.2015.0701   升级自动更新机制，从网站自动更新
- * 
- * v6.4.2015.0519   改进串口调试工具，显示设备友好名
- * 
- * v6.3.2015.0511   改进网络调试工具，列出网络库的所有网络服务器
- * 
- * v6.2.2014.1225   增加网络调试工具，支持TCP/UDP混合，支持内置基础网络服务协议解析
- * 
- * v6.1.2014.0907   串口工具XCOM以十六进制输出时，可以选择是否自动换行
- * 
- * v6.1.2014.0607   串口工具XCOM，自动检测到串口断开时，断开串口连接，避免内存溢出
- * 
- * v6.0.2014.0514   使用模版文件本身的文件编码来作为输出文件的编码，默认UTF8
- * 
- * v6.0.2014.0419   打开码神工具时，默认打开最后一次打开的工具，由配置据诶的那个而不是由名称决定
- *                  重构串口调试工具，简约风格
- * 
- * v6.0.2014.0410   根据文件名决定XCoder打开哪个工具
- * 
- * v6.0.2013.1211   命令行调用XCoder生成代码支持指定日志文件路径
- * 
- * v6.0.2013.0919   合并数据建模工具、正则测试工具、通讯调试工具、图标水印处理工具
- * 
- * v5.1.2013.0906   更新扩展查询模版，默认的FindByxx/FindAllByxx函数里面，缓存查找采用__.xx名称，而不要用_.xx，后面默认得到字段名，不适合内存查找
- * 
- * v5.1.2013.0307   增强数据模型，生成代码时可使用$(属性名)作为输出路径的一部分，支持IDataTable的属性和扩展属性（主要）
- * 
- * v5.0.2012.1117   增加T4引导模版，用于在实体类项目中通过命令行调用XCoder生成代码
- * 
- * v4.9.2012.1112   数据模型升级，需要更新所有模版
- *                  模版引擎生成太快，不再需要后台生成
- *                  改变模版头编辑的位置
- *                  增加论坛帖子引用
- * 
- * v4.8.2012.0731   升级前备份配置文件，升级后恢复
- * 
- * v4.8.2012.0526   支持自动探测SqlCe数据库
- * 
- * v4.8.2012.0516   采用新的数据模型格式化架构，优化表名及字段名的生成
- * 
- * v4.7.2012.0320   调整拥挤的主界面，删除不需要的元素
- *                  调整自动更新，支持组件和源代码的同步升级
- * 
- * v4.6.2012.0113   代码生成器提供生成建表语句，建库语句，还有直接建库的功能
- * 
- * v4.5.2011.1108   配合实体访问器和CommonEntity，增加第三代管理页面模版
- * 
- * v4.4.2011.1031   增加查询分析器
- * 
- * v4.3.2011.0920   将在线翻译服务替换成s.nnhy.org上的翻译服务
- * 
- * v4.3.2011.0915   增加数据表架构，比如Access，可以从中识别字段是否自增
- * 
- * v4.3.2011.0913   增加是否生成泛型实体类的设置
- * 
- * v4.2.2011.0911   分离架构信息管理和模型管理，允许编辑模型
- * 
- * v4.2.2011.0909   支持内部模版，也支持外部文件模版，支持释放内部模版
- * 
- * v4.2.2011.0908   修正代码生成时更改输出目录后无效的BUG
- *                  完善各个模版
- *                  更改模版存放方式，直接从嵌入资源读取，不再释放
- *                  增加一个设置项Config.BaseClass，允许指定实体类的基类
- *                  增加数据架构管理功能
- * 
- * v4.1.2011.0906   修正生成时不能自动创建输出目录的错误
- *                  数据表选择支持显示中文描述
- * 
- * v4.1.2011.0902   修改自动更新逻辑，先下载，再询问是否更新
- *                  改善自动发现机制，自动发现本地SQLite和Access文件
- *                  增加自动在线翻译功能，调用Bing翻译
- * 
- * v4.0.2011.0829   升级XCode到v8
- *                  增加自动更新功能
- *                  删除代码视图
- *                  集成www.7765.com在线音乐
- * 
- * v3.4.2011.0329   修正自动尝试加载表时的错误
- *                  更新实体模版，以兼容最新版本的XCode v7.5
- * 
- * v3.4.2011.0316   升级模版引擎XTemplate，大大提高模版处理性能
- * 
- * v3.4.2011.0311   XCode升级到最新版本，增加数据库支持
- * 
- * v3.3.2011.0117   增加实体模版和页面模版，改变以前的生成模式（由一个表四次改为两次）
- *                  使用新的控件GridViewExtend和自定义表单EntityForm
- * 
- * v3.2.2010.1014   增加是否使用文件模版头的设置
- *                  更新模版引擎到v1.3，取消对模版的换行优化处理
- *                  增加第二套表单模版
- * 
- * v3.1.2010.1009   增加文件头
- *                  使用新的模版引擎
- * 
- * v3.0.2010.0928   更新模版引擎
- * 
- * v2.4.2010.0128   增加等号支持
- * 
- * v2.3.2009.1013   XCode数据架构升级
- * 
- * v2.2.2009.0714   修正待替换内容（如默认值）含有双引号而待替换标签前后又有双引号时，没有正确处理双引号的问题
- * 
- * v2.1.2009.0623   增加对Oracle的支持
- * 
- * v2.0.2009.0611   增加中文文件名配置，直接生成中文文件名的类
- *                  每次生成表时，重新从数据库取构架信息
- * 
- * v1.9.2009.0519   处理以类名开头的属性名后，再次纠正属性名
- * 
- * v1.8.2009.0330   属性名等于类名时，自动增加后缀0
- *                  属性名等于item时，自动增加后缀0
- *                  属性名以类名开头时，自动去除
- *                  代码查看框随着窗体最大化自动扩展
- *                  修正链接名错误使用当前链接名而不是填写的链接名的错误
- * 
- * v1.7.2009.0321   加载所有表时，按表名排序
- *
-**/
diff --git a/XCoder/Properties/Settings.Designer.cs b/XCoder/Properties/Settings.Designer.cs
deleted file mode 100644
index e9db686fd7..0000000000
--- a/XCoder/Properties/Settings.Designer.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-﻿//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace XCoder.Properties {
-    
-    
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.5.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-        
-        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-        
-        public static Settings Default {
-            get {
-                return defaultInstance;
-            }
-        }
-    }
-}
diff --git a/XCoder/Properties/Settings.settings b/XCoder/Properties/Settings.settings
deleted file mode 100644
index 2bd17f050c..0000000000
--- a/XCoder/Properties/Settings.settings
+++ /dev/null
@@ -1,5 +0,0 @@
-﻿<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
-  <Profiles />
-  <Settings />
-</SettingsFile>
\ No newline at end of file
diff --git a/XCoder/Properties/app.manifest b/XCoder/Properties/app.manifest
deleted file mode 100644
index 97e2ffcd67..0000000000
--- a/XCoder/Properties/app.manifest
+++ /dev/null
@@ -1,73 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-    <security>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <!-- UAC 清单选项
-             如果想要更改 Windows 用户帐户控制级别，请使用
-             以下节点之一替换 requestedExecutionLevel 节点。n
-        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
-        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
-        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
-
-            指定 requestedExecutionLevel 元素将禁用文件和注册表虚拟化。
-            如果你的应用程序需要此虚拟化来实现向后兼容性，则删除此
-            元素。
-        -->
-        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-
-  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-    <application>
-      <!-- 设计此应用程序与其一起工作且已针对此应用程序进行测试的
-           Windows 版本的列表。取消评论适当的元素，Windows 将
-           自动选择最兼容的环境。 -->
-
-      <!-- Windows Vista -->
-      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />
-
-      <!-- Windows 7 -->
-      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />
-
-      <!-- Windows 8 -->
-      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />
-
-      <!-- Windows 8.1 -->
-      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />
-
-      <!-- Windows 10 -->
-      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
-
-    </application>
-  </compatibility>
-
-  <!-- 指示该应用程序可以感知 DPI 且 Windows 在 DPI 较高时将不会对其进行
-       自动缩放。Windows Presentation Foundation (WPF)应用程序自动感知 DPI，无需
-       选择加入。选择加入此设置的 Windows 窗体应用程序(目标设定为 .NET Framework 4.6 )还应
-       在其 app.config 中将 "EnableWindowsFormsHighDpiAutoResizing" 设置设置为 "true"。-->
-  <application xmlns="urn:schemas-microsoft-com:asm.v3">
-    <windowsSettings>
-      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
-    </windowsSettings>
-  </application>
-
-  <!-- 启用 Windows 公共控件和对话框的主题(Windows XP 和更高版本) -->
-  <!--
-  <dependency>
-    <dependentAssembly>
-      <assemblyIdentity
-          type="win32"
-          name="Microsoft.Windows.Common-Controls"
-          version="6.0.0.0"
-          processorArchitecture="*"
-          publicKeyToken="6595b64144ccf1df"
-          language="*"
-        />
-    </dependentAssembly>
-  </dependency>
-  -->
-
-</assembly>
diff --git "a/XCoder/Template/\345\256\236\344\275\223\344\270\232\345\212\241/\344\270\255\346\226\207\345\220\215.Biz.cs" "b/XCoder/Template/\345\256\236\344\275\223\344\270\232\345\212\241/\344\270\255\346\226\207\345\220\215.Biz.cs"
deleted file mode 100644
index e741824f8a..0000000000
--- "a/XCoder/Template/\345\256\236\344\275\223\344\270\232\345\212\241/\344\270\255\346\226\207\345\220\215.Biz.cs"
+++ /dev/null
@@ -1,82 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Text;
-using System.Xml.Serialization;
-using NewLife.Log;
-using NewLife.Web;
-﻿using NewLife.Data;
-using XCode;
-using XCode.Configuration;
-using XCode.Membership;
-
-namespace <#=Config.NameSpace#>
-{<#
-    String tdis=Table.DisplayName;
-    if(!String.IsNullOrEmpty(tdis)) tdis=tdis.Replace("\r\n"," ").Replace("\\", "\\\\").Replace("'", "").Replace("\"", "");
-    String tdes=Table.Description;
-    if(!String.IsNullOrEmpty(tdes)) tdes=tdes.Replace("\r\n"," ").Replace("\\", "\\\\").Replace("'", "").Replace("\"", "");
-    if(String.IsNullOrEmpty(tdis)) tdis=tdes;
-
-    String myClassName = Config.RenderGenEntity ? "TEntity" : Table.Name;
-
-    String baseType = !String.IsNullOrEmpty(Table.BaseType) ? Table.BaseType : Config.BaseClass;
-    if(Config.RenderGenEntity)
-{#>
-    /// <summary><#=tdis#></summary><# if(tdis!=tdes){#>
-    /// <remarks><#=tdes#></remarks><#}#>
-    [ModelCheckMode(ModelCheckModes.CheckTableWhenFirstUse)]
-    public class <#=Table.Name#> : <#=Table.Name#><<#=Table.Name#>> { }
-    <#
-}#>
-    /// <summary><#=tdis#></summary><# if(tdis!=tdes){#>
-    /// <remarks><#=tdes#></remarks><#}#><#
-if(Config.RenderGenEntity){#>
-    public partial class <#=Table.Name#><TEntity> : <#=baseType#><TEntity> where TEntity : <#=Table.Name#><TEntity>, new()<#
-}else{#>
-    public partial class <#=Table.Name#> : <#=baseType#><<#=Table.Name#>><#
-}#>
-    {
-        #region 对象操作
-            <#@include Name="对象操作.xt"#>
-        #endregion
-
-        #region 扩展属性
-        #endregion
-
-        #region 扩展查询
-            <#@include Name="扩展查询.xt"#>
-        #endregion
-
-        #region 高级查询
-        // 以下为自定义高级查询的例子
-
-        /// <summary>查询满足条件的记录集，分页、排序</summary>
-        /// <param name="userid">用户编号</param>
-        /// <param name="start">开始时间</param>
-        /// <param name="end">结束时间</param>
-        /// <param name="key">关键字</param>
-        /// <param name="param">分页排序参数，同时返回满足条件的总记录数</param>
-        /// <returns>实体集</returns>
-        public static IList<<#=myClassName#>> Search(Int32 userid, DateTime start, DateTime end, String key, PageParameter param)
-        {
-            // WhereExpression重载&和|运算符，作为And和Or的替代
-            // SearchWhereByKeys系列方法用于构建针对字符串字段的模糊搜索，第二个参数可指定要搜索的字段
-            var exp = SearchWhereByKeys(key, null, null);
-
-            // 以下仅为演示，Field（继承自FieldItem）重载了==、!=、>、<、>=、<=等运算符
-            //if (userid > 0) exp &= _.OperatorID == userid;
-            //if (isSign != null) exp &= _.IsSign == isSign.Value;
-            //exp &= _.OccurTime.Between(start, end); // 大于等于start，小于end，当start/end大于MinValue时有效
-
-            return FindAll(exp, param);
-        }
-        #endregion
-
-        #region 扩展操作
-        #endregion
-
-        #region 业务
-        #endregion
-    }
-}
\ No newline at end of file
diff --git "a/XCoder/Template/\345\256\236\344\275\223\344\270\232\345\212\241/\345\257\271\350\261\241\346\223\215\344\275\234.xt" "b/XCoder/Template/\345\256\236\344\275\223\344\270\232\345\212\241/\345\257\271\350\261\241\346\223\215\344\275\234.xt"
deleted file mode 100644
index a4a3489956..0000000000
--- "a/XCoder/Template/\345\256\236\344\275\223\344\270\232\345\212\241/\345\257\271\350\261\241\346\223\215\344\275\234.xt"
+++ /dev/null
@@ -1,140 +0,0 @@
-﻿<#if(Config.RenderGenEntity){#>
-        static <#=Table.Name#>()
-        {
-            // 用于引发基类的静态构造函数，所有层次的泛型实体类都应该有一个
-            TEntity entity = new TEntity();
-        }<#
-}#>
-
-        /// <summary>验证数据，通过抛出异常的方式提示验证失败。</summary>
-        /// <param name="isNew"></param>
-        public override void Valid(Boolean isNew)
-        {
-			// 如果没有脏数据，则不需要进行任何处理
-			if (!HasDirty) return;
-
-            // 这里验证参数范围，建议抛出参数异常，指定参数名，前端用户界面可以捕获参数异常并聚焦到对应的参数输入框
-            //if (String.IsNullOrEmpty(Name)) throw new ArgumentNullException(_.Name, _.Name.DisplayName + "无效！");
-            //if (!isNew && ID < 1) throw new ArgumentOutOfRangeException(_.ID, _.ID.DisplayName + "必须大于0！");
-
-            // 建议先调用基类方法，基类方法会对唯一索引的数据进行验证
-            base.Valid(isNew);
-
-            // 在新插入数据或者修改了指定字段时进行唯一性验证，CheckExist内部抛出参数异常
-            //if (isNew || Dirtys[__.Name]) CheckExist(__.Name);
-            <#
-            foreach (IDataColumn dc in Table.Columns)
-            {
-                String name=dc.Name;
-                // 处理时间
-                if(dc.DataType==typeof(DateTime))
-                {
-                    if (name.StartsWith("Add", StringComparison.OrdinalIgnoreCase)
-                    || name.StartsWith("Create", StringComparison.OrdinalIgnoreCase)
-                    || name.StartsWith("New", StringComparison.OrdinalIgnoreCase)
-                    || name.StartsWith("Insert", StringComparison.OrdinalIgnoreCase))
-                    {
-                    #>
-            if (isNew && !Dirtys[__.<#=name#>]) <#=name#> = DateTime.Now;<#
-                    }
-                    else if (name.StartsWith("Update", StringComparison.OrdinalIgnoreCase)
-                    || name.StartsWith("Change", StringComparison.OrdinalIgnoreCase)
-                    || name.StartsWith("Modify", StringComparison.OrdinalIgnoreCase)
-                    || name.StartsWith("up", StringComparison.OrdinalIgnoreCase) // Upload
-                    || name.StartsWith("Save", StringComparison.OrdinalIgnoreCase))
-                    {
-                    #>
-            if (!Dirtys[__.<#=name#>]) <#=name#> = DateTime.Now;<#
-                    }
-                }
-                // 处理IP
-                else if (dc.DataType==typeof(String) 
-                    && (name.Equals("IP", StringComparison.OrdinalIgnoreCase) 
-                    || name.EndsWith("IP", StringComparison.OrdinalIgnoreCase)&&name.Length>2&&name[name.Length-3]>='a'&&name[name.Length-3]<='z'))
-                {
-                    #>
-            if (!Dirtys[__.<#=name#>]) <#=name#> = WebHelper.UserHost;<#
-                }
-                // 处理货币
-                else if (dc.DataType==typeof(Decimal))
-                {
-                    #>
-            // 货币保留6位小数
-            if (Dirtys[__.<#=name#>]) <#=name#> = Math.Round(<#=name#>, 6);<#
-                }
-                else if (dc.DataType==typeof(Int32) 
-                    && (name.Equals("UserID", StringComparison.OrdinalIgnoreCase) 
-                    || name.Equals("OperatorID", StringComparison.OrdinalIgnoreCase)))
-                {
-                    #>
-            // 处理当前已登录用户信息
-            if (!Dirtys[__.<#=name#>] && ManageProvider.Provider.Current != null) <#=name#> = (Int32)ManageProvider.Provider.Current.ID;<#
-                }
-                else if (dc.DataType==typeof(String) 
-                    && (name.Equals("User", StringComparison.OrdinalIgnoreCase) 
-                    || name.Equals("UserName", StringComparison.OrdinalIgnoreCase)
-                    || name.Equals("LastUpdate", StringComparison.OrdinalIgnoreCase)
-                    || name.Equals("LastModify", StringComparison.OrdinalIgnoreCase)
-                    || name.Equals("Operator", StringComparison.OrdinalIgnoreCase)))
-                {
-                    #>
-            // 处理当前已登录用户信息
-            if (!Dirtys[__.<#=name#>] && ManageProvider.Provider.Current != null) <#=name#> = ManageProvider.Provider.Current.Name;<#
-                }
-            }
-            #>
-        }
-
-        ///// <summary>首次连接数据库时初始化数据，仅用于实体类重载，用户不应该调用该方法</summary>
-        //[EditorBrowsable(EditorBrowsableState.Never)]
-        //protected override void InitData()
-        //{
-        //    base.InitData();
-
-        //    // InitData一般用于当数据表没有数据时添加一些默认数据，该实体类的任何第一次数据库操作都会触发该方法，默认异步调用
-        //    // Meta.Count是快速取得表记录数
-        //    if (Meta.Count > 0) return;
-
-        //    // 需要注意的是，如果该方法调用了其它实体类的首次数据库操作，目标实体类的数据初始化将会在同一个线程完成
-        //    if (XTrace.Debug) XTrace.WriteLine("开始初始化{0}[{1}]数据……", typeof(<#=Config.RenderGenEntity?"TEntity":Table.Name#>).Name, Meta.Table.DataTable.DisplayName);
-
-        //    var entity = new <#=Table.Name#>();<#
-        foreach (IDataColumn dc in Table.Columns)
-        {
-            if(dc.Identity)continue;
-
-            if(dc.DataType==typeof(Int32)){#>
-        //    entity.<#=dc.Name#> = 0;<#}
-            else if(dc.DataType==typeof(String)){#>
-        //    entity.<#=dc.Name#> = "abc";<#}
-            else if(dc.DataType==typeof(DateTime)){#>
-        //    entity.<#=dc.Name#> = DateTime.Now;<#}
-            else if(dc.DataType==typeof(Double)){#>
-        //    entity.<#=dc.Name#> = 0;<#}
-            else if(dc.DataType==typeof(Boolean)){#>
-        //    entity.<#=dc.Name#> = true;<#}
-            else if(dc.DataType==typeof(Decimal)){#>
-        //    entity.<#=dc.Name#> = 0;<#}
-            else if(dc.DataType==typeof(Guid)){#>
-        //    entity.<#=dc.Name#> = Guid.NewGuid();<#}
-            else{#>
-        //    entity.<#=dc.Name#> = <#=dc.DataType.CreateInstance()#>;<#}
-        }#>
-        //    entity.Insert();
-
-        //    if (XTrace.Debug) XTrace.WriteLine("完成初始化{0}[{1}]数据！", typeof(<#=Config.RenderGenEntity?"TEntity":Table.Name#>).Name, Meta.Table.DataTable.DisplayName);
-        //}
-
-        ///// <summary>已重载。基类先调用Valid(true)验证数据，然后在事务保护内调用OnInsert</summary>
-        ///// <returns></returns>
-        //public override Int32 Insert()
-        //{
-        //    return base.Insert();
-        //}
-
-        ///// <summary>已重载。在事务保护范围内处理业务，位于Valid之后</summary>
-        ///// <returns></returns>
-        //protected override Int32 OnInsert()
-        //{
-        //    return base.OnInsert();
-        //}
diff --git "a/XCoder/Template/\345\256\236\344\275\223\344\270\232\345\212\241/\346\211\251\345\261\225\345\261\236\346\200\247.xt" "b/XCoder/Template/\345\256\236\344\275\223\344\270\232\345\212\241/\346\211\251\345\261\225\345\261\236\346\200\247.xt"
deleted file mode 100644
index 1febe4fcaf..0000000000
--- "a/XCoder/Template/\345\256\236\344\275\223\344\270\232\345\212\241/\346\211\251\345\261\225\345\261\236\346\200\247.xt"
+++ /dev/null
@@ -1,98 +0,0 @@
-﻿<#
-if(Table.Relations!=null && Table.Relations.Count>0)
-{
-    List<String> tbs=new List<String>();
-    foreach(IDataRelation dr in Table.Relations)
-    {
-        IDataTable rtable = FindTable(dr.RelationTable);
-        if (rtable == null) continue;
-
-        IDataColumn rcolumn = rtable.GetColumn(dr.RelationColumn);
-        if(rcolumn == null) continue;
-
-        IDataColumn field = Table.GetColumn(dr.Column);
-
-        String className = rtable.Name;
-        String keyName=className;
-        if(tbs.Contains(keyName)) continue;
-        tbs.Add(keyName);
-
-        Boolean b=dr.Unique;
-        // 如果是唯一的，应该判断对方的唯一性，如果对方也是唯一，那么就构成一对一
-        if(b&&rtable.Relations!=null)
-        {
-            foreach(IDataRelation dr2 in rtable.Relations)
-            {
-                if(dr2.Column==dr.RelationColumn && dr2.RelationTable==Table.TableName && dr2.RelationColumn==dr.Column)
-                {
-                    if(dr2.Unique) b=false;
-                }
-            }
-        }
-
-        if(!b)
-        {
-#>
-        [NonSerialized]
-        private <#=className#> _<#=keyName#>;
-        /// <summary>该<#=Table.DisplayName#>所对应的<#=rtable.DisplayName#></summary>
-        [XmlIgnore]
-        public <#=className#> <#=keyName#>
-        {
-            get
-            {
-                <#
-                if(field.DataType == typeof(String)){
-                #>if (_<#=keyName#> == null && !String.IsNullOrEmpty(<#=field.Name#>) && !Dirtys.ContainsKey("<#=keyName#>"))<#
-                }else{#>if (_<#=keyName#> == null && <#=field.Name#> > 0 && !Dirtys.ContainsKey("<#=keyName#>"))<#
-                }#>
-                {
-                    _<#=keyName#> = <#=className#>.FindBy<#=rcolumn.Name#>(<#=field.Name#>);
-                    Dirtys["<#=keyName#>"] = true;
-                }
-                return _<#=keyName#>;
-            }
-            set { _<#=keyName#> = value; }
-        }
-<#
-            // 如果对方有名为Name的字符串字段，则加一个扩展属性
-            IDataColumn rname=rtable.GetColumn("Name");
-            if(rname!=null&&rname.DataType==typeof(String)&&Table.GetColumn(keyName+"Name")==null){
-#>
-        /// <summary>该<#=Table.DisplayName#>所对应的<#=rtable.DisplayName#><#=rname.DisplayName#></summary>
-        [XmlIgnore]
-        public String <#=keyName#>Name { get { return <#=keyName#> != null ? <#=keyName#>.Name : String.Empty; } }
-<#
-            }
-        }else
-        {
-            keyName+="s";
-#>
-        [NonSerialized]
-        private EntityList<<#=className#>> _<#=keyName#>;
-        /// <summary>该<#=Table.DisplayName#>所拥有的<#=rtable.DisplayName#>集合</summary>
-        [XmlIgnore]
-        public EntityList<<#=className#>> <#=keyName#>
-        {
-            get
-            {
-                <#
-                if(field.DataType == typeof(String)){
-                #>if (_<#=keyName#> == null && !String.IsNullOrEmpty(<#=field.Name#>) && !Dirtys.ContainsKey("<#=keyName#>"))<#
-                }else{#>if (_<#=keyName#> == null && <#=field.Name#> > 0 && !Dirtys.ContainsKey("<#=keyName#>"))<#
-                }#>
-                {
-                    _<#=keyName#> = <#=className#>.FindAllBy<#=rcolumn.Name#>(<#=field.Name#>);
-                    Dirtys["<#=keyName#>"] = true;
-                }
-                return _<#=keyName#>;
-            }
-            set { _<#=keyName#> = value; }
-        }
-<#
-        }
-    }
-}else{
-// 加一个换行，避免没有扩展的时候生成的代码有问题
-#>
-<#}#>
\ No newline at end of file
diff --git "a/XCoder/Template/\345\256\236\344\275\223\344\270\232\345\212\241/\346\211\251\345\261\225\346\237\245\350\257\242.xt" "b/XCoder/Template/\345\256\236\344\275\223\344\270\232\345\212\241/\346\211\251\345\261\225\346\237\245\350\257\242.xt"
deleted file mode 100644
index 64de702689..0000000000
--- "a/XCoder/Template/\345\256\236\344\275\223\344\270\232\345\212\241/\346\211\251\345\261\225\346\237\245\350\257\242.xt"
+++ /dev/null
@@ -1,82 +0,0 @@
-﻿<#
-// 根据索引，增加多个方法
-if(Table.Indexes!=null&&Table.Indexes.Count>0){
-    foreach (IDataIndex di in Table.Indexes){
-        if(di.Columns==null||di.Columns.Length<1)continue;
-
-        IDataColumn[] columns=Table.GetColumns(di.Columns);
-        if(columns==null||columns.Length<1)continue;
-
-        String returnType=myClassName;
-        String action="Find";
-        String IsAll=String.Empty;
-        if (!di.Unique){
-            returnType=String.Format("IList<{0}>",myClassName);
-            IsAll="All";
-            action="FindAll";
-        }
-        StringBuilder sb1=new StringBuilder();
-        StringBuilder sb2=new StringBuilder();
-        StringBuilder sb3=new StringBuilder();
-        StringBuilder sb4=new StringBuilder();
-        StringBuilder sb5=new StringBuilder();
-        String[] Args=new String[columns.Length];
-
-        for(int i=0;i<columns.Length;i++)
-        {
-            IDataColumn Field=columns[i];
-
-            if(sb1.Length>0) sb1.Append(", ");
-            sb1.Append(Field.DataType.Name+" ");
-            String argName=Field.Name.ToLower();
-            if(argName==Field.Name) argName="__"+Field.Name;
-            sb1.Append(argName);
-            Args[i]=argName;
-   
-            if(sb2.Length>0) sb2.Append(", ");
-            sb2.Append("__."+Field.Name);
-            
-            if(sb3.Length>0) sb3.Append(", ");
-            sb3.Append(argName);
-            
-            if(sb4.Length>0) sb4.Append("And");
-            sb4.Append(Field.Name);
-            
-            if(sb5.Length>0) sb5.Append("、");
-            if(!String.IsNullOrEmpty(Field.Description))
-                sb5.Append(Field.Description);
-            else
-                sb5.Append(Field.Name);
-        }
-#>
-        /// <summary>根据<#=sb5#>查找</summary><#
-        for(int i=0;i<columns.Length;i++)
-        {
-#>
-        /// <param name="<#=Args[i]#>"><#=columns[i].Description#></param><#  
-        }
-#>
-        /// <returns></returns>
-        [DataObjectMethod(DataObjectMethodType.Select, false)]
-        public static <#=returnType#> Find<#=IsAll#>By<#=sb4#>(<#=sb1#>)
-        {<#if(columns.Length>1){#>
-            if (Meta.Count >= 1000)
-                return <#=action#>(new String[] { <#=sb2#> }, new Object[] { <#=sb3#> });
-            else // 实体缓存
-                return Meta.Cache.FindAll(e => <#for(int i=0;i<columns.Length;i++){if(i>0)Write(" && ");#>e.<#=columns[i].Name#> == <#=Args[i]#><#}#>);<#
-        }else{
-            String pname=columns[0].Name;
-    #>
-            if (Meta.Count >= 1000)
-                return <#=action#>(__.<#=pname#>, <#=Args[0]#>);
-            else // 实体缓存
-                return Meta.Cache.Find(e => e.<#=pname#> == <#=Args[0]#>);<#if(di.Unique){#>
-            // 单对象缓存
-            //return Meta.SingleCache[<#=Args[0]#>];<#}}#>
-        }
-<#
-    }
-}else{
-// 加一个换行，避免没有扩展的时候生成的代码有问题
-#>
-<#}#>
\ No newline at end of file
diff --git "a/XCoder/Template/\345\256\236\344\275\223\344\270\232\345\212\241_\347\256\200\345\215\225/\344\270\255\346\226\207\345\220\215.Biz.cs" "b/XCoder/Template/\345\256\236\344\275\223\344\270\232\345\212\241_\347\256\200\345\215\225/\344\270\255\346\226\207\345\220\215.Biz.cs"
deleted file mode 100644
index e3f0fb7db1..0000000000
--- "a/XCoder/Template/\345\256\236\344\275\223\344\270\232\345\212\241_\347\256\200\345\215\225/\344\270\255\346\226\207\345\220\215.Biz.cs"
+++ /dev/null
@@ -1,87 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Text;
-using System.Xml.Serialization;
-using NewLife.Log;
-using XCode;
-using XCode.Configuration;
-
-namespace <#=Config.NameSpace#>
-{<#if(Config.RenderGenEntity){#>
-    /// <summary><#=Table.Description#></summary>
-    [ModelCheckMode(ModelCheckModes.CheckTableWhenFirstUse)]
-    public class <#=Table.Name#> : <#=Table.Name#><<#=Table.Name#>> { }
-    <#
-}#>
-    /// <summary><#=Table.Description#></summary><#
-if(!Config.RenderGenEntity){#>
-    public partial class <#=Table.Name#> : <#=Config.BaseClass#><<#=Table.Name#>><#
-}else{#>
-    public partial class <#=Table.Name#><TEntity> : <#=Config.BaseClass#><TEntity> where TEntity : <#=Table.Name#><TEntity>, new()<#
-}#>
-    {
-        #region 对象操作<#@include Name="对象操作.xt"#>        #endregion
-
-        #region 扩展属性<#@include Name="扩展属性.xt"#>        #endregion
-
-        #region 扩展查询<#@include Name="扩展查询.xt"#>        #endregion
-
-        #region 高级查询
-        // 以下为自定义高级查询的例子
-
-        ///// <summary>
-        ///// 查询满足条件的记录集，分页、排序
-        ///// </summary>
-        ///// <param name="key">关键字</param>
-        ///// <param name="orderClause">排序，不带Order By</param>
-        ///// <param name="startRowIndex">开始行，0表示第一行</param>
-        ///// <param name="maximumRows">最大返回行数，0表示所有行</param>
-        ///// <returns>实体集</returns>
-        //[DataObjectMethod(DataObjectMethodType.Select, true)]
-        //public static EntityList<<#=Config.RenderGenEntity?"TEntity":Table.Name#>> Search(String key, String orderClause, Int32 startRowIndex, Int32 maximumRows)
-        //{
-        //    return FindAll(SearchWhere(key), orderClause, null, startRowIndex, maximumRows);
-        //}
-
-        ///// <summary>
-        ///// 查询满足条件的记录总数，分页和排序无效，带参数是因为ObjectDataSource要求它跟Search统一
-        ///// </summary>
-        ///// <param name="key">关键字</param>
-        ///// <param name="orderClause">排序，不带Order By</param>
-        ///// <param name="startRowIndex">开始行，0表示第一行</param>
-        ///// <param name="maximumRows">最大返回行数，0表示所有行</param>
-        ///// <returns>记录数</returns>
-        //public static Int32 SearchCount(String key, String orderClause, Int32 startRowIndex, Int32 maximumRows)
-        //{
-        //    return FindCount(SearchWhere(key), null, null, 0, 0);
-        //}
-
-        /// <summary>构造搜索条件</summary>
-        /// <param name="key">关键字</param>
-        /// <returns></returns>
-        private static String SearchWhere(String key)
-        {
-            // WhereExpression重载&和|运算符，作为And和Or的替代
-            var exp = new WhereExpression();
-
-            // SearchWhereByKeys系列方法用于构建针对字符串字段的模糊搜索
-            if (!String.IsNullOrEmpty(key)) SearchWhereByKeys(exp.Builder, key);
-
-            // 以下仅为演示，2、3行是同一个意思的不同写法，Field（继承自FieldItem）重载了==、!=、>、<、>=、<=等运算符（第4行）
-            //exp &= _.Name == "testName"
-            //    & !String.IsNullOrEmpty(key) & _.Name == key
-            //    .AndIf(!String.IsNullOrEmpty(key), _.Name == key)
-            //    | _.ID > 0;
-
-            return exp;
-        }
-        #endregion
-
-        #region 扩展操作
-        #endregion
-
-        #region 业务
-        #endregion
-    }
-}
\ No newline at end of file
diff --git "a/XCoder/Template/\345\256\236\344\275\223\344\270\232\345\212\241_\347\256\200\345\215\225/\345\257\271\350\261\241\346\223\215\344\275\234.xt" "b/XCoder/Template/\345\256\236\344\275\223\344\270\232\345\212\241_\347\256\200\345\215\225/\345\257\271\350\261\241\346\223\215\344\275\234.xt"
deleted file mode 100644
index 1373c0ae87..0000000000
--- "a/XCoder/Template/\345\256\236\344\275\223\344\270\232\345\212\241_\347\256\200\345\215\225/\345\257\271\350\261\241\346\223\215\344\275\234.xt"
+++ /dev/null
@@ -1,114 +0,0 @@
-﻿<#if(Config.RenderGenEntity){#>
-        static <#=Table.Name#>()
-        {
-            // 用于引发基类的静态构造函数，所有层次的泛型实体类都应该有一个
-            TEntity entity = new TEntity();
-        }<#
-}#>
-
-        ///// <summary>已重载。基类先调用Valid(true)验证数据，然后在事务保护内调用OnInsert</summary>
-        ///// <returns></returns>
-        //public override Int32 Insert()
-        //{
-        //    return base.Insert();
-        //}
-
-        ///// <summary>已重载。在事务保护范围内处理业务，位于Valid之后</summary>
-        ///// <returns></returns>
-        //protected override Int32 OnInsert()
-        //{
-        //    return base.OnInsert();
-        //}
-
-        ///// <summary>验证数据，通过抛出异常的方式提示验证失败。</summary>
-        ///// <param name="isNew"></param>
-        //public override void Valid(Boolean isNew)
-        //{
-        //    // 这里验证参数范围，建议抛出参数异常，指定参数名，前端用户界面可以捕获参数异常并聚焦到对应的参数输入框
-        //    if (String.IsNullOrEmpty(Name)) throw new ArgumentNullException(_.Name, _.Name.DisplayName + "无效！");
-        //    if (!isNew && ID < 1) throw new ArgumentOutOfRangeException(_.ID, _.ID.DisplayName + "必须大于0！");
-
-        //    // 建议先调用基类方法，基类方法会对唯一索引的数据进行验证
-        //    base.Valid(isNew);
-
-        //    // 在新插入数据或者修改了指定字段时进行唯一性验证，CheckExist内部抛出参数异常
-        //    if (isNew || Dirtys[_.Name]) CheckExist(_.Name);
-        //    if (isNew || Dirtys[_.Name] || Dirtys[_.DbType]) CheckExist(_.Name, _.DbType);
-        //    if ((isNew || Dirtys[_.Name]) && Exist(_.Name)) throw new ArgumentException(_.Name, "值为" + Name + "的" + _.Name.DisplayName + "已存在！");
-        //}
-<#
-if(Table.Relations!=null && Table.Relations.Count>0)
-{
-	// 是否有一对多和一对一的扩展属性，如果有，删除
-	Boolean hasMutil=false;
-	foreach(IDataRelation dr in Table.Relations)
-	{
-		if(!dr.Unique) continue;
-
-		IDataTable rtable = FindTable(dr.RelationTable);
-		if (rtable == null) continue;
-
-		hasMutil=true;
-		break;
-	}
-	if(hasMutil)
-	{
-#>
-        /// <summary>已重载。删除关联数据</summary>
-        /// <returns></returns>
-        protected override int OnDelete()
-        {<#	
-	foreach(IDataRelation dr in Table.Relations)
-	{
-		if(!dr.Unique) continue;
-
-		IDataTable rtable = FindTable(dr.RelationTable);
-		if (rtable == null) continue;
-
-		Boolean b=dr.Unique;
-		// 如果是唯一的，应该判断对方的唯一性，如果对方也是唯一，那么就构成一对一
-		if(b&&rtable.Relations!=null)
-		{
-			foreach(IDataRelation dr2 in rtable.Relations)
-			{
-				if(dr2.Column==dr.RelationColumn && dr2.RelationTable==Table.TableName && dr2.RelationColumn==dr.Column)
-				{
-					if(dr2.Unique) b=false;
-				}
-			}
-		}
-		String proName=rtable.Name;
-		if(b) proName+="s";
-		#>
-			if (<#=proName#> != null) <#=proName#>.Delete();<#
-	}
-#>
-
-            return base.OnDelete();
-        }<#
-	}
-}#>
-
-        ///// <summary>首次连接数据库时初始化数据，仅用于实体类重载，用户不应该调用该方法</summary>
-        //[EditorBrowsable(EditorBrowsableState.Never)]
-        //protected override void InitData()
-        //{
-        //    base.InitData();
-
-        //    // InitData一般用于当数据表没有数据时添加一些默认数据，该实体类的任何第一次数据库操作都会触发该方法，默认异步调用
-        //    // Meta.Count是快速取得表记录数
-        //    if (Meta.Count > 0) return;
-
-        //    // 需要注意的是，如果该方法调用了其它实体类的首次数据库操作，目标实体类的数据初始化将会在同一个线程完成
-        //    if (XTrace.Debug) XTrace.WriteLine("开始初始化{0}<#=Table.DisplayName#>数据……", typeof(<#=Config.RenderGenEntity?"TEntity":Table.Name#>).Name);
-
-        //    var entity = new <#=Table.Name#>();
-        //    entity.Name = "admin";
-        //    entity.Password = DataHelper.Hash("admin");
-        //    entity.DisplayName = "管理员";
-        //    entity.RoleID = 1;
-        //    entity.IsEnable = true;
-        //    entity.Insert();
-
-        //    if (XTrace.Debug) XTrace.WriteLine("完成初始化{0}<#=Table.DisplayName#>数据！", typeof(<#=Config.RenderGenEntity?"TEntity":Table.Name#>).Name);
-        //}
diff --git "a/XCoder/Template/\345\256\236\344\275\223\344\270\232\345\212\241_\347\256\200\345\215\225/\346\211\251\345\261\225\345\261\236\346\200\247.xt" "b/XCoder/Template/\345\256\236\344\275\223\344\270\232\345\212\241_\347\256\200\345\215\225/\346\211\251\345\261\225\345\261\236\346\200\247.xt"
deleted file mode 100644
index 7f8afd2cd0..0000000000
--- "a/XCoder/Template/\345\256\236\344\275\223\344\270\232\345\212\241_\347\256\200\345\215\225/\346\211\251\345\261\225\345\261\236\346\200\247.xt"
+++ /dev/null
@@ -1,95 +0,0 @@
-﻿<#
-if(Table.Relations!=null && Table.Relations.Count>0)
-{
-	foreach(IDataRelation dr in Table.Relations)
-    {
-		IDataTable rtable = FindTable(dr.RelationTable);
-		if (rtable == null) continue;
-
-        IDataColumn rcolumn = rtable.GetColumn(dr.RelationColumn);
-        if(rcolumn == null) continue;
-
-        IDataColumn field = Table.GetColumn(dr.Column);
-
-		String className = rtable.Name;
-        String keyName=className;
-
-		Boolean b=dr.Unique;
-		// 如果是唯一的，应该判断对方的唯一性，如果对方也是唯一，那么就构成一对一
-		if(b&&rtable.Relations!=null)
-		{
-			foreach(IDataRelation dr2 in rtable.Relations)
-			{
-				if(dr2.Column==dr.RelationColumn && dr2.RelationTable==Table.TableName && dr2.RelationColumn==dr.Column)
-				{
-					if(dr2.Unique) b=false;
-				}
-			}
-		}
-
-        if(!b)
-        {
-#>
-        [NonSerialized]
-        private <#=className#> _<#=keyName#>;
-        /// <summary>该<#=Table.DisplayName#>所对应的<#=rtable.DisplayName#></summary>
-        [XmlIgnore]
-        public <#=className#> <#=keyName#>
-        {
-            get
-            {
-                <#
-                if(field.DataType == typeof(String)){
-                #>if (_<#=keyName#> == null && !String.IsNullOrEmpty(<#=field.Name#>) && !Dirtys.ContainsKey("<#=keyName#>"))<#
-                }else{#>if (_<#=keyName#> == null && <#=field.Name#> > 0 && !Dirtys.ContainsKey("<#=keyName#>"))<#
-                }#>
-                {
-                    _<#=keyName#> = <#=className#>.FindBy<#=rcolumn.Name#>(<#=field.Name#>);
-                    Dirtys["<#=keyName#>"] = true;
-                }
-                return _<#=keyName#>;
-            }
-            set { _<#=keyName#> = value; }
-        }
-<#
-			// 如果对方有名为Name的字符串字段，则加一个扩展属性
-			IDataColumn rname=rtable.GetColumn("Name");
-			if(rname!=null&&rname.DataType==typeof(String)){
-#>
-        /// <summary>该<#=Table.DisplayName#>所对应的<#=rtable.DisplayName#><#=rname.DisplayName#></summary>
-        [XmlIgnore]
-        public String <#=keyName#>Name { get { return <#=keyName#> != null ? <#=keyName#>.Name : null; } }
-<#
-			}
-        }else
-        {
-            keyName+="s";
-#>
-        [NonSerialized]
-		private EntityList<<#=className#>> _<#=keyName#>;
-		/// <summary>该<#=Table.DisplayName#>所拥有的<#=rtable.DisplayName#>集合</summary>
-		[XmlIgnore]
-		public EntityList<<#=className#>> <#=keyName#>
-		{
-			get
-			{
-				<#
-                if(field.DataType == typeof(String)){
-                #>if (_<#=keyName#> == null && !String.IsNullOrEmpty(<#=field.Name#>) && !Dirtys.ContainsKey("<#=keyName#>"))<#
-                }else{#>if (_<#=keyName#> == null && <#=field.Name#> > 0 && !Dirtys.ContainsKey("<#=keyName#>"))<#
-                }#>
-                {
-					_<#=keyName#> = <#=className#>.FindAllBy<#=rcolumn.Name#>(<#=field.Name#>);
-					Dirtys["<#=keyName#>"] = true;
-				}
-				return _<#=keyName#>;
-			}
-			set { _<#=keyName#> = value; }
-		}
-<#
-        }
-	}
-}else{
-// 加一个换行，避免没有扩展的时候生成的代码有问题
-#>
-<#}#>
\ No newline at end of file
diff --git "a/XCoder/Template/\345\256\236\344\275\223\344\270\232\345\212\241_\347\256\200\345\215\225/\346\211\251\345\261\225\346\237\245\350\257\242.xt" "b/XCoder/Template/\345\256\236\344\275\223\344\270\232\345\212\241_\347\256\200\345\215\225/\346\211\251\345\261\225\346\237\245\350\257\242.xt"
deleted file mode 100644
index fb11854414..0000000000
--- "a/XCoder/Template/\345\256\236\344\275\223\344\270\232\345\212\241_\347\256\200\345\215\225/\346\211\251\345\261\225\346\237\245\350\257\242.xt"
+++ /dev/null
@@ -1,83 +0,0 @@
-﻿<#
-String myClassName=Config.RenderGenEntity?"TEntity":Table.Name;
-
-// 根据索引，增加多个方法
-if(Table.Indexes!=null&&Table.Indexes.Count>0){
-    foreach (IDataIndex di in Table.Indexes){
-        if(di.Columns==null||di.Columns.Length<1)continue;
-
-        IDataColumn[] columns=Table.GetColumns(di.Columns);
-
-        String returnType=myClassName;
-        String action="Find";
-        String IsAll=String.Empty;
-        if (!di.Unique){
-            returnType=String.Format("EntityList<{0}>",myClassName);
-            IsAll="All";
-            action="FindAll";
-        }
-        StringBuilder sb1=new StringBuilder();
-        StringBuilder sb2=new StringBuilder();
-        StringBuilder sb3=new StringBuilder();
-        StringBuilder sb4=new StringBuilder();
-        StringBuilder sb5=new StringBuilder();
-        String[] Args=new String[columns.Length];
-
-        for(int i=0;i<columns.Length;i++)
-        {
-            IDataColumn Field=columns[i];
-
-            if(sb1.Length>0) sb1.Append(", ");
-            sb1.Append(Field.DataType.Name+" ");
-            String argName=Field.Name.ToLower();
-            if(argName==Field.Name) argName="__"+Field.Name;
-            sb1.Append(argName);
-            Args[i]=argName;
-   
-            if(sb2.Length>0) sb2.Append(", ");
-            sb2.Append("_."+Field.Name);
-            
-            if(sb3.Length>0) sb3.Append(", ");
-            sb3.Append(argName);
-            
-            if(sb4.Length>0) sb4.Append("And");
-            sb4.Append(Field.Name);
-            
-            if(sb5.Length>0) sb5.Append("、");
-            if(!String.IsNullOrEmpty(Field.Description))
-                sb5.Append(Field.Description);
-            else
-                sb5.Append(Field.Name);
-        }
-#>
-        /// <summary>根据<#=sb5#>查找</summary><#
-        for(int i=0;i<columns.Length;i++)
-        {
-#>
-        /// <param name="<#=Args[i]#>"><#=columns[i].Description#></param><#  
-        }
-#>
-        /// <returns></returns>
-        [DataObjectMethod(DataObjectMethodType.Select, false)]
-        public static <#=returnType#> Find<#=IsAll#>By<#=sb4#>(<#=sb1#>)
-        {<#if(columns.Length>1){#>
-            if (Meta.Count >= 1000)
-                return <#=action#>(new String[] { <#=sb2#> }, new Object[] { <#=sb3#> });
-            else // 实体缓存
-                return Meta.Cache.Entities.<#=action#>(e => <#for(int i=0;i<columns.Length;i++){if(i>0)Write(" && ");#>e.<#=columns[i].Name#> == <#=Args[i]#><#}#>);<#
-        }else{
-            String pname=columns[0].Name;
-    #>
-            if (Meta.Count >= 1000)
-                return <#=action#>(_.<#=pname#>, <#=Args[0]#>);
-            else // 实体缓存
-                return Meta.Cache.Entities.<#=action#>(_.<#=pname#>, <#=Args[0]#>);<#if(di.Unique){#>
-            // 单对象缓存
-            //return Meta.SingleCache[<#=Args[0]#>];<#}}#>
-        }
-<#
-    }
-}else{
-// 加一个换行，避免没有扩展的时候生成的代码有问题
-#>
-<#}#>
\ No newline at end of file
diff --git "a/XCoder/Template/\345\256\236\344\275\223\346\225\260\346\215\256/\344\270\255\346\226\207\345\220\215.cs" "b/XCoder/Template/\345\256\236\344\275\223\346\225\260\346\215\256/\344\270\255\346\226\207\345\220\215.cs"
deleted file mode 100644
index 6b7914987e..0000000000
--- "a/XCoder/Template/\345\256\236\344\275\223\346\225\260\346\215\256/\344\270\255\346\226\207\345\220\215.cs"
+++ /dev/null
@@ -1,172 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Xml.Serialization;
-using XCode;
-using XCode.Configuration;
-using XCode.DataAccessLayer;
-
-namespace <#=Config.NameSpace#>
-{<#
-    String tdis=Table.DisplayName;
-    if(!String.IsNullOrEmpty(tdis)) tdis=tdis.Replace("\r\n"," ").Replace("\\", "\\\\").Replace("'", "").Replace("\"", "");
-    String tdes=Table.Description;
-    if(!String.IsNullOrEmpty(tdes)) tdes=tdes.Replace("\r\n"," ").Replace("\\", "\\\\").Replace("'", "").Replace("\"", "");
-    if(String.IsNullOrEmpty(tdis)) tdis=tdes;
-    #>
-    /// <summary><#=tdis#></summary><# if(tdis!=tdes){#>
-    /// <remarks><#=tdes#></remarks><#}#>
-    [Serializable]
-    [DataObject]
-    [Description("<#=tdes#>")]<#
-foreach(IDataIndex di in Table.Indexes){if(di.Columns==null||di.Columns.Length<1)continue;#>
-    [BindIndex("<#=di.Name#>", <#=di.Unique.ToString().ToLower()#>, "<#=String.Join(",", di.Columns)#>")]<#
-}
-#>
-    [BindTable("<#=Table.TableName#>", Description = "<#=tdes#>", ConnName = "<#=Table.ConnName ?? Config.EntityConnName#>", DbType = DatabaseType.<#=Table.DbType#><#if(Table.IsView){#>, IsView = true<#}#>)]<#
-if(Config.RenderGenEntity){#>
-    public partial class <#=Table.Name#><TEntity> : I<#=Table.Name#><#
-}else{#>
-    public partial class <#=Table.Name#> : I<#=Table.Name#><#
-}#>
-    {<#
-if(Table.Columns.Count>0)
-{
-#>
-        #region 属性<#
-    foreach(IDataColumn Field in Table.Columns)
-    {
-        String des=Field.Description;
-        if(!String.IsNullOrEmpty(des)) des=des.Replace("\r\n"," ").Replace("\\", "\\\\").Replace("'", "").Replace("\"", "");
-        String dis = Field.DisplayName;
-        if(!String.IsNullOrEmpty(dis)) dis=dis.Replace("\r\n"," ").Replace("'", " ").Replace("\"", "");
-#>
-        private <#=Field.DataType.Name#> _<#=Field.Name#>;
-        /// <summary><#=des#></summary>
-        [DisplayName("<#=dis#>")]
-        [Description("<#=des#>")]
-        [DataObjectField(<#=Field.PrimaryKey.ToString().ToLower()#>, <#=Field.Identity.ToString().ToLower()#>, <#=Field.Nullable.ToString().ToLower()#>, <#=Field.Length#>)]
-        [BindColumn("<#=Field.ColumnName#>", "<#=des#>", "<#=Field.RawType#>"<#if(Field.Master){#>, Master=<#=Field.Master.ToString().ToLower()#><#}#>)]
-        public virtual <#=Field.DataType==null?"":Field.DataType.Name#> <#=Field.Name#>
-        {
-            get { return _<#=Field.Name#>; }
-            set { if (OnPropertyChanging(__.<#=Field.Name#>, value)) { _<#=Field.Name#> = value; OnPropertyChanged(__.<#=Field.Name#>); } }
-        }
-<#
-    }
-#>        #endregion
-
-        #region 获取/设置 字段值
-        /// <summary>
-        /// 获取/设置 字段值。
-        /// 一个索引，基类使用反射实现。
-        /// 派生实体类可重写该索引，以避免反射带来的性能损耗
-        /// </summary>
-        /// <param name="name">字段名</param>
-        /// <returns></returns>
-        public override Object this[String name]
-        {
-            get
-            {
-                switch (name)
-                {<#
-    foreach(IDataColumn Field in Table.Columns)
-    {
-#>
-                    case __.<#=Field.Name#> : return _<#=Field.Name#>;<#
-    }
-#>
-                    default: return base[name];
-                }
-            }
-            set
-            {
-                switch (name)
-                {<#
-    Type conv=typeof(Convert);
-    foreach(IDataColumn Field in Table.Columns)
-    { 
-        if(conv.GetMethod("To"+Field.DataType.Name, new Type[]{typeof(Object)})!=null){
-#>
-                    case __.<#=Field.Name#> : _<#=Field.Name#> = Convert.To<#=Field.DataType.Name#>(value); break;<#
-        }else{
-#>
-                    case __.<#=Field.Name#> : _<#=Field.Name#> = (<#=Field.DataType.Name#>)value; break;<#
-        }
-    }
-#>
-                    default: base[name] = value; break;
-                }
-            }
-        }
-        #endregion
-<#
-}
-#>
-        #region 字段名
-        /// <summary>取得<#=tdis#>字段信息的快捷方式</summary>
-        public partial class _
-        {<#
-foreach(IDataColumn Field in Table.GetAllColumns(Tables, true))
-{
-    String des=Field.Description;
-    if(!String.IsNullOrEmpty(des)) des=des.Replace("\r\n"," ");
-#>
-            ///<summary><#=des#></summary>
-            public static readonly Field <#=Field.Name#> = FindByName(__.<#=Field.Name#>);
-<#
-}
-#>
-            static Field FindByName(String name) { return Meta.Table.FindByName(name); }
-        }
-
-        /// <summary>取得<#=tdis#>字段名称的快捷方式</summary>
-        partial class __
-        {<#
-foreach(IDataColumn Field in Table.GetAllColumns(Tables, true))
-{
-    String des=Field.Description;
-    if(!String.IsNullOrEmpty(des)) des=des.Replace("\r\n"," ");
-#>
-            ///<summary><#=des#></summary>
-            public const String <#=Field.Name#> = "<#=Field.Name#>";
-<#
-}
-#>
-        }
-        #endregion
-    }
-
-    /// <summary><#=tdis#>接口</summary><# if(tdis!=tdes){#>
-    /// <remarks><#=tdes#></remarks><#}#>
-    public partial interface I<#=Table.Name#><#if(!String.IsNullOrEmpty(Table.BaseType)){#> : I<#=Table.BaseType#><#}#>
-    {<#
-if(Table.Columns.Count>0)
-{
-#>
-        #region 属性<#
-    foreach(IDataColumn Field in Table.Columns)
-    {
-        String des=Field.Description;
-        if(!String.IsNullOrEmpty(des)) des=des.Replace("\r\n"," ");
-#>
-        /// <summary><#=des#></summary>
-        <#=Field.DataType==null?"":Field.DataType.Name#> <#=Field.Name#> { get; set; }
-<#
-    }
-#>        #endregion<#
-    if(String.IsNullOrEmpty(Table.BaseType))
-    {
-#>
-
-        #region 获取/设置 字段值
-        /// <summary>获取/设置 字段值。</summary>
-        /// <param name="name">字段名</param>
-        /// <returns></returns>
-        Object this[String name] { get; set; }
-        #endregion<#
-    }
-}
-#>
-    }
-}
\ No newline at end of file
diff --git "a/XCoder/Template/\346\225\260\346\215\256\345\255\227\345\205\270/\350\277\236\346\216\245\345\220\215\346\225\260\346\215\256\345\255\227\345\205\270.htm" "b/XCoder/Template/\346\225\260\346\215\256\345\255\227\345\205\270/\350\277\236\346\216\245\345\220\215\346\225\260\346\215\256\345\255\227\345\205\270.htm"
deleted file mode 100644
index 2673c6c6a6..0000000000
--- "a/XCoder/Template/\346\225\260\346\215\256\345\255\227\345\205\270/\350\277\236\346\216\245\345\220\215\346\225\260\346\215\256\345\255\227\345\205\270.htm"
+++ /dev/null
@@ -1,49 +0,0 @@
-﻿<style type="text/css">
-<!--
-.caption td {
-    border:1px solid #666666;
-    font-weight:bold;
-    background-color: #CCCCCC;
-}
-.dbtable {
-    border:1px solid #666666;
-}
-.dbbody td {
-    border:1px solid #666666;
-}
--->
-</style>
-由<#=Environment.UserName#>/<#=Environment.MachineName#>生成于：<#=DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")#> <BR />
-<#
-foreach(IDataTable table in Tables){
-#>
-<#=table.Name#>：
-<strong><#=table.DisplayName#> （<#=table.TableName#>）<#if(!String.IsNullOrEmpty(table.BaseType)){#>=> <#=table.BaseType#><#}#></strong> <BR>
-<table border="0" cellspacing="0" class="dbtable">
-  <tr align="center" valign="middle" class="caption">
-    <td width="150">中文名</td>
-    <td width="150">英文名</td>
-    <td width="150">字段名</td>
-    <td width="75">数据类型</td>
-    <td width="50">大小</td>
-    <td width="35">主键</td>
-    <td width="35">唯一</td>
-    <td width="35">必填</td>
-    <td width="150">描述</td>
-  </tr><#
-  foreach(IDataColumn Field in table.GetAllColumns(Tables, true))
-  {
-  #>
-  <tr class="dbbody">
-    <td><#=Field.DisplayName+" "#></td>
-    <td><#=Field.Name#></td>
-    <td><#=Field.ColumnName#></td>
-    <td><#=Field.DataType!=null?Field.DataType.Name:" "#></td>
-    <td><#=Field.Length#></td>
-    <td align="center"><#=Field.PrimaryKey?"是":"&nbsp;"#></td>
-    <td align="center"><#=Field.Identity?"是":(Field.PrimaryKey?"是":"&nbsp;")#></td>
-    <td align="center"><#=Field.Nullable?"&nbsp;":"是"#></td>
-    <td><#=StringHelper.TrimStart(Field.Description, Field.DisplayName, ".", "。")+" "#></td>
-  </tr><#}#>
-</table>
-<#}#>
\ No newline at end of file
diff --git "a/XCoder/Template/\347\272\257\345\261\236\346\200\247/I\344\270\255\346\226\207\345\220\215.cs" "b/XCoder/Template/\347\272\257\345\261\236\346\200\247/I\344\270\255\346\226\207\345\220\215.cs"
deleted file mode 100644
index 18dcb6666c..0000000000
--- "a/XCoder/Template/\347\272\257\345\261\236\346\200\247/I\344\270\255\346\226\207\345\220\215.cs"
+++ /dev/null
@@ -1,29 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-
-namespace <#=Config.NameSpace#>
-{
-	/// <summary><#=Table.Description#>接口</summary>
-	public interface I<#=Table.Name#>
-	{
-		#region 属性
-<#
-		foreach(IDataColumn Field in Table.Columns)
-		{
-#>
-		/// <summary><#=Field.Description#></summary>
-		<#=Field.DataType.Name#> <#=Field.Name#> { get; set; }
-<#
-		}
-#>		
-        #endregion
-
-		#region 获取/设置 字段值
-		/// <summary>获取/设置 字段值。</summary>
-		/// <param name="name">字段名</param>
-		/// <returns></returns>
-		Object this[String name] { get; set; }
-		#endregion
-	}
-}
\ No newline at end of file
diff --git "a/XCoder/Template/\347\272\257\345\261\236\346\200\247/\344\270\255\346\226\207\345\220\215.cs" "b/XCoder/Template/\347\272\257\345\261\236\346\200\247/\344\270\255\346\226\207\345\220\215.cs"
deleted file mode 100644
index f164dc687d..0000000000
--- "a/XCoder/Template/\347\272\257\345\261\236\346\200\247/\344\270\255\346\226\207\345\220\215.cs"
+++ /dev/null
@@ -1,73 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-
-namespace <#=Config.NameSpace#>
-{
-    /// <summary><#=Table.Description#></summary>
-    [Serializable]
-    [DataObject]
-    [Description("<#=(""+Table.Description).Replace("\\", "\\\\")#>")]
-    public partial class <#=Table.Name#>
-    {
-        #region 属性
-<#
-        foreach(IDataColumn Field in Table.Columns)
-        {
-#>
-        private <#=Field.DataType.Name#> _<#=Field.Name#>;
-        /// <summary><#=Field.Description#></summary>
-        [DisplayName("<#=Field.DisplayName#>")]
-        [Description("<#=(""+Field.Description).Replace("\\", "\\\\")#>")]
-        [DataObjectField(<#=Field.PrimaryKey.ToString().ToLower()#>, <#=Field.Identity.ToString().ToLower()#>, <#=Field.Nullable.ToString().ToLower()#>, <#=Field.Length#>)]
-        public <#=Field.DataType.Name#> <#=Field.Name#> { get { return _<#=Field.Name#>; } set { _<#=Field.Name#> = value; } }
-<#
-        }
-#>		
-        #endregion
-
-        #region 获取/设置 字段值
-        /// <summary>
-        /// 获取/设置 字段值。
-        /// 一个索引，基类使用反射实现。
-        /// 派生实体类可重写该索引，以避免反射带来的性能损耗
-        /// </summary>
-        /// <param name="name">字段名</param>
-        /// <returns></returns>
-        public Object this[String name]
-        {
-            get
-            {
-                switch (name)
-                {<#
-        foreach(IDataColumn Field in Table.Columns)
-        {
-#>
-                    case "<#=Field.Name#>" : return _<#=Field.Name#>;<#
-        }
-#>
-                    default: return null;
-                }
-            }
-            set
-            {
-                switch (name)
-                {<#
-    Type conv=typeof(Convert);
-    foreach(IDataColumn Field in Table.Columns)
-    {
-        if(conv.GetMethod("To"+Field.DataType.Name, new Type[]{typeof(Object)})!=null){
-#>
-                    case "<#=Field.Name#>" : _<#=Field.Name#> = Convert.To<#=Field.DataType.Name#>(value); break;<#
-        }else{
-#>
-                    case "<#=Field.Name#>" : _<#=Field.Name#> = (<#=Field.DataType.Name#>)value; break;<#
-        }
-    }
-#>
-                }
-            }
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git "a/XCoder/Template/\351\241\265\351\235\242/\347\261\273\345\220\215.aspx" "b/XCoder/Template/\351\241\265\351\235\242/\347\261\273\345\220\215.aspx"
deleted file mode 100644
index a01eb447cb..0000000000
--- "a/XCoder/Template/\351\241\265\351\235\242/\347\261\273\345\220\215.aspx"
+++ /dev/null
@@ -1,123 +0,0 @@
-﻿<%@ Page Title="<#=Table.DisplayName#>管理" Language="C#" MasterPageFile="~/Admin/ManagerPage.master" AutoEventWireup="true" CodeFile="<#=Table.Name#>.aspx.cs" Inherits="<#=Config.EntityConnName+"_"+Table.Name#>" %>
-
-<asp:Content ID="Content1" runat="server" ContentPlaceHolderID="C">
-    <#
-// 表单页面，普通行行高
-Int32 LineHeight=27;
-// 大文本行行高
-Int32 LineHeight2=90;
-
-// 表单窗口高度，初始值（Toolbar、表单头、提交按钮、运行时）
-Int32 boxHeight = 31+29+29+14;
-
-foreach(IDataColumn Field in Table.Columns){
-    if(Field.PrimaryKey) continue;
-    if(Field.DataType==typeof(String) && (Field.Length>300 || Field.Length<0))
-        boxHeight += LineHeight2;
-    else
-        boxHeight += LineHeight;
-}
-#><div class="toolbar">
-        <XCL:LinkBox ID="lbAdd" runat="server" BoxHeight="<#=boxHeight#>px" BoxWidth="440px" Url="<#=Table.Name#>Form.aspx"
-            IconLeft="~/Admin/images/icons/new.gif" EnableViewState="false"><b>添加<#=Table.DisplayName#></b></XCL:LinkBox>
-        关键字：<asp:TextBox ID="txtKey" runat="server"></asp:TextBox>
-        <asp:Button ID="btnSearch" runat="server" Text="查询" />
-    </div><#
-StringBuilder sbpk=new StringBuilder();
-StringBuilder sbpk2=new StringBuilder();
-Int32 pki=0;
-foreach(IDataColumn Field in Table.Columns){
-    if(Field.PrimaryKey) {
-        if(sbpk.Length>0)sbpk.Append(",");
-        sbpk.Append(Field.Name);
-
-        if(sbpk2.Length>0)sbpk2.Append("&");
-        sbpk2.Append(Field.Name+"={"+pki+++"}");
-    } 
-}
-    #>
-    <asp:GridView ID="gv" runat="server" AutoGenerateColumns="False" DataKeyNames="<#=sbpk#>" DataSourceID="ods" AllowPaging="True" AllowSorting="True" CssClass="m_table" PageSize="20" CellPadding="0" GridLines="None" EnableModelValidation="True">
-        <Columns>
-            <%--<asp:TemplateField>
-                <ItemTemplate>
-                    <asp:CheckBox ID="cb" runat="server" />
-                </ItemTemplate>
-                <HeaderStyle Width="20px" />
-                <ItemStyle HorizontalAlign="Center" />
-            </asp:TemplateField>--%><#
-foreach(IDataColumn Field in Table.Columns){
-    String pname = Field.Name;
-
-    // 查找关系，如果对方有名为Name的字符串字段，则加一个扩展属性
-    IDataRelation dr=XCode.DataAccessLayer.ModelHelper.GetRelation(Table, Field.ColumnName);
-    if(dr!=null&&!dr.Unique){
-        IDataTable rtable=FindTable(dr.RelationTable);
-        if(rtable!=null){
-            IDataColumn rname=rtable.GetColumn("Name");
-            if(rname!=null&&rname.DataType==typeof(String)){#>
-            <%--<asp:BoundField DataField="<#=pname#>" HeaderText="<#=Field.DisplayName#>" SortExpression="<#=pname#>" <# if(Field.PrimaryKey){#>InsertVisible="False" ReadOnly="True" <#}#>>
-                <ItemStyle HorizontalAlign="Center" VerticalAlign="Middle" CssClass="key" />
-            </asp:BoundField>--%>
-            <asp:BoundField DataField="<#=rtable.Name+"Name"#>" HeaderText="<#=Field.DisplayName#>" SortExpression="<#=pname#>" /><#
-                continue;
-            }
-        }
-    }
-
-    if(Field.Identity){#>
-            <asp:BoundField DataField="<#=pname#>" HeaderText="<#=Field.DisplayName#>" SortExpression="<#=pname#>" <# if(Field.PrimaryKey){#>InsertVisible="False" ReadOnly="True" <#}#>>
-                <ItemStyle HorizontalAlign="Center" VerticalAlign="Middle" CssClass="Ikey" />
-            </asp:BoundField><#}
-    else if(Field.DataType == typeof(DateTime)){#>
-            <asp:BoundField DataField="<#=pname#>" HeaderText="<#=Field.DisplayName#>" SortExpression="<#=pname#>" DataFormatString="{0:yyyy-MM-dd HH:mm:ss}" <# if(Field.PrimaryKey){#>InsertVisible="False" ReadOnly="True" <#}#>>
-                <ItemStyle HorizontalAlign="Center" VerticalAlign="Middle" Width="120px" />
-            </asp:BoundField><#}
-    else if(Field.DataType == typeof(Decimal)){#>
-            <asp:BoundField DataField="<#=pname#>" HeaderText="<#=Field.DisplayName#>" SortExpression="<#=pname#>" DataFormatString="{0:c}">
-                <ItemStyle HorizontalAlign="Right" Font-Bold="True" ForeColor="Blue" />
-            </asp:BoundField><#}
-    else if(Type.GetTypeCode(Field.DataType)>=TypeCode.Int16&&Type.GetTypeCode(Field.DataType)<=TypeCode.UInt64){#>
-            <asp:BoundField DataField="<#=pname#>" HeaderText="<#=Field.DisplayName#>" SortExpression="<#=pname#>" DataFormatString="{0:n0}">
-                <ItemStyle HorizontalAlign="Right" Font-Bold="True" />
-            </asp:BoundField><#}
-    else if(Field.DataType == typeof(Boolean)){#>
-            <asp:TemplateField HeaderText="<#=Field.DisplayName#>" SortExpression="<#=pname#>">
-                <ItemTemplate>
-                    <asp:Label ID="<#=pname#>1" runat="server" Text="√" Visible='<%# Eval("<#=pname#>") %>' Font-Bold="True" Font-Size="14pt" ForeColor="Green"></asp:Label>
-                    <asp:Label ID="<#=pname#>2" runat="server" Text="×" Visible='<%# !(Boolean)Eval("<#=pname#>") %>' Font-Bold="True" Font-Size="16pt" ForeColor="Red"></asp:Label>
-                </ItemTemplate>
-                <ItemStyle HorizontalAlign="Center" />
-            </asp:TemplateField><#}
-    // 密码字段和大文本字段不输出
-    else if(!pname.Equals("Password", StringComparison.OrdinalIgnoreCase) && 
-       !pname.Equals("Pass", StringComparison.OrdinalIgnoreCase) && 
-       !pname.Equals("Pwd", StringComparison.OrdinalIgnoreCase) && 
-       Field.Length>0 && Field.Length<300){#>
-            <asp:BoundField DataField="<#=pname#>" HeaderText="<#=Field.DisplayName#>" SortExpression="<#=pname#>" <# if(Field.PrimaryKey){#>InsertVisible="False" ReadOnly="True" <#}#>/><#
-}}#>
-            <XCL:LinkBoxField HeaderText="编辑" DataNavigateUrlFields="<#=sbpk#>" DataNavigateUrlFormatString="<#=Table.Name#>Form.aspx?<#=sbpk2#>" Height="<#=boxHeight#>px" Text="编辑" Width="440px" Title="编辑<#=Table.DisplayName#>">
-                <ItemStyle HorizontalAlign="Center" VerticalAlign="Middle" />
-                <HeaderStyle HorizontalAlign="Center" VerticalAlign="Middle" Width="30px" />
-            </XCL:LinkBoxField>
-            <asp:TemplateField ShowHeader="False" HeaderText="删除">
-                <ItemTemplate>
-                    <asp:LinkButton ID="btnDelete" runat="server" CausesValidation="False" CommandName="Delete" OnClientClick='return confirm("确定删除吗？")' Text="删除"></asp:LinkButton>
-                </ItemTemplate>
-                <HeaderStyle HorizontalAlign="Center" VerticalAlign="Middle" Width="30px" />
-            </asp:TemplateField>
-        </Columns>
-        <EmptyDataTemplate>
-            没有符合条件的数据！
-        </EmptyDataTemplate>
-    </asp:GridView>
-    <asp:ObjectDataSource ID="ods" runat="server" EnablePaging="True" SelectCountMethod="SearchCount" SelectMethod="Search" SortParameterName="orderClause" EnableViewState="false">
-        <SelectParameters>
-            <asp:ControlParameter ControlID="txtKey" Name="key" PropertyName="Text" Type="String" />
-            <asp:Parameter Name="orderClause" Type="String" />
-            <asp:Parameter Name="startRowIndex" Type="Int32" />
-            <asp:Parameter Name="maximumRows" Type="Int32" />
-        </SelectParameters>
-    </asp:ObjectDataSource>
-    <XCL:GridViewExtender ID="gvExt" runat="server">
-    </XCL:GridViewExtender>
-</asp:Content>
\ No newline at end of file
diff --git "a/XCoder/Template/\351\241\265\351\235\242/\347\261\273\345\220\215.aspx.cs" "b/XCoder/Template/\351\241\265\351\235\242/\347\261\273\345\220\215.aspx.cs"
deleted file mode 100644
index c33a47de2e..0000000000
--- "a/XCoder/Template/\351\241\265\351\235\242/\347\261\273\345\220\215.aspx.cs"
+++ /dev/null
@@ -1,13 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using <#=Config.NameSpace#>;
-
-public partial class <#=Config.EntityConnName+"_"+Table.Name#> : MyEntityList<<#=Table.Name#>>
-{
-    protected void Page_Load(object sender, EventArgs e)
-    {
-    }
-}
\ No newline at end of file
diff --git "a/XCoder/Template/\351\241\265\351\235\242/\347\261\273\345\220\215Form.aspx" "b/XCoder/Template/\351\241\265\351\235\242/\347\261\273\345\220\215Form.aspx"
deleted file mode 100644
index c7c5d76407..0000000000
--- "a/XCoder/Template/\351\241\265\351\235\242/\347\261\273\345\220\215Form.aspx"
+++ /dev/null
@@ -1,47 +0,0 @@
-﻿<%@ Page Title="<#=Table.DisplayName#>管理" Language="C#" MasterPageFile="~/Admin/ManagerPage.master" AutoEventWireup="true" CodeFile="<#=Table.Name#>Form.aspx.cs" Inherits="<#=Config.EntityConnName+"_"+Table.Name#>Form"%>
-
-<asp:Content ID="Content1" runat="server" ContentPlaceHolderID="C">
-    <table border="0" class="m_table" cellspacing="1" cellpadding="0" align="Center">
-        <tr>
-            <th colspan="2"><#=Table.DisplayName#></th>
-        </tr>
-        <# 
-        foreach(IDataColumn Field in Table.Columns) { 
-            String pname = Field.Name;
-            if(Field.PrimaryKey) continue;
-            String frmName = "frm" + pname;
-            TypeCode code = Type.GetTypeCode(Field.DataType);
-        #><tr>
-            <td align="right"><#=Field.DisplayName#>：</td>
-            <td><#
-                if(code == TypeCode.String){
-                    if(pname.Equals("Password", StringComparison.OrdinalIgnoreCase) || pname.Equals("Pass", StringComparison.OrdinalIgnoreCase)){
-                #><asp:TextBox ID="<#=frmName#>" runat="server" TextMode="Password"></asp:TextBox><#
-                    }else if(Field.Length>300 || Field.Length<0){
-                #><asp:TextBox ID="<#=frmName#>" runat="server" TextMode="MultiLine" Width="300px" Height="80px"></asp:TextBox><#
-                    }else{
-                #><asp:TextBox ID="<#=frmName#>" runat="server" Width="<#=Field.Length+100#>px"></asp:TextBox><#
-                    }
-                }else if(code == TypeCode.Int32){
-                #><XCL:NumberBox ID="<#=frmName#>" runat="server" Width="80px"></XCL:NumberBox><#
-                }else if(code == TypeCode.Double){
-                #><XCL:RealBox ID="<#=frmName#>" runat="server" Width="80px"></XCL:RealBox><#
-                }else if(code == TypeCode.DateTime){
-                #><XCL:DateTimePicker ID="<#=frmName#>" runat="server"></XCL:DateTimePicker><#
-                }else if(code == TypeCode.Decimal){
-                #><XCL:DecimalBox ID="<#=frmName#>" runat="server" Width="80px"></XCL:DecimalBox><#
-                }else if(code == TypeCode.Boolean){
-                #><asp:CheckBox ID="<#=frmName#>" runat="server" Text="<#=Field.DisplayName#>" /><#}
-            #></td>
-        </tr>
-<#}#>    </table>
-    <table border="0" align="Center" width="100%">
-        <tr>
-            <td align="center">
-                <asp:Button ID="btnSave" runat="server" CausesValidation="True" Text='保存' />
-                &nbsp;<asp:Button ID="btnCopy" runat="server" CausesValidation="True" Text='另存为新<#=Table.DisplayName#>' />
-                &nbsp;<asp:Button ID="btnReturn" runat="server" OnClientClick="parent.Dialog.CloseSelfDialog(frameElement);return false;" Text="返回" />
-            </td>
-        </tr>
-    </table>
-</asp:Content>
\ No newline at end of file
diff --git "a/XCoder/Template/\351\241\265\351\235\242/\347\261\273\345\220\215Form.aspx.cs" "b/XCoder/Template/\351\241\265\351\235\242/\347\261\273\345\220\215Form.aspx.cs"
deleted file mode 100644
index 7afaacf746..0000000000
--- "a/XCoder/Template/\351\241\265\351\235\242/\347\261\273\345\220\215Form.aspx.cs"
+++ /dev/null
@@ -1,15 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using NewLife.Log;
-using NewLife.Web;
-using <#=Config.NameSpace#>;
-
-public partial class <#=Config.EntityConnName+"_"+Table.Name#>Form : MyEntityForm<<#=Table.Name#>>
-{
-    protected void Page_Load(object sender, EventArgs e)
-    {
-    }
-}
\ No newline at end of file
diff --git "a/XCoder/Template/\351\241\265\351\235\242Bootstrap/\347\261\273\345\220\215.aspx" "b/XCoder/Template/\351\241\265\351\235\242Bootstrap/\347\261\273\345\220\215.aspx"
deleted file mode 100644
index 3317950a62..0000000000
--- "a/XCoder/Template/\351\241\265\351\235\242Bootstrap/\347\261\273\345\220\215.aspx"
+++ /dev/null
@@ -1,142 +0,0 @@
-<%@ Page Title="<#=Table.DisplayName#>管理" Language="C#" MasterPageFile="~/MasterPage.master" AutoEventWireup="true" CodeFile="<#=Table.Name#>.aspx.cs" Inherits="<#=Config.EntityConnName+"_"+Table.Name#>" %>
-
-<asp:Content ID="Content1" runat="server" ContentPlaceHolderID="C">
-    <#
-// 表单页面，普通行行高
-Int32 LineHeight=27;
-// 大文本行行高
-Int32 LineHeight2=90;
-
-// 表单窗口高度，初始值（Toolbar、表单头、提交按钮、运行时）
-Int32 boxHeight = 100;
-
-foreach(IDataColumn Field in Table.Columns){
-    if(Field.PrimaryKey) continue;
-    if(Field.DataType==typeof(String) && (Field.Length>300 || Field.Length<0))
-        boxHeight += LineHeight2;
-    else
-        boxHeight += LineHeight;
-}
-#><div class="row-fluid">
-        <Custom:OpenForm BtText="添加<#=Table.DisplayName#>" runat="server" ID="lbAdd" DialogWidth="500px" DialogHeight="<#=boxHeight#>px" Url="<#=Table.Name#>Form.aspx" Title="<#=Table.Name#>"></Custom:OpenForm>
-        关键字：<asp:TextBox ID="txtKey" runat="server"></asp:TextBox>
-        <asp:Button ID="btnSearch" runat="server" class="btn btn-info" Text="查询" />
-    </div><#
-StringBuilder sbpk=new StringBuilder();
-StringBuilder sbpk2=new StringBuilder();
-Int32 pki=0;
-foreach(IDataColumn Field in Table.Columns){
-    if(Field.PrimaryKey) {
-        if(sbpk.Length>0)sbpk.Append(",");
-        sbpk.Append(Field.Name);
-
-        if(sbpk2.Length>0)sbpk2.Append("&");
-        sbpk2.Append(Field.Name+"={"+pki+++"}");
-    } 
-}
-    #><div class="row-fluid">
-        <div class="widget-box">
-        <div class="widget-content nopadding">
-    <asp:GridView ID="gv" runat="server" AutoGenerateColumns="False" DataKeyNames="<#=sbpk#>" DataSourceID="ods" AllowPaging="True" AllowSorting="True" CssClass="table table-bordered table-striped" PageSize="20" CellPadding="0" GridLines="None" EnableModelValidation="True">
-        <Columns>
-            <%--<asp:TemplateField>
-                <ItemTemplate>
-                    <asp:CheckBox ID="cb" runat="server" />
-                </ItemTemplate>
-                <HeaderStyle Width="20px" />
-                <ItemStyle HorizontalAlign="Center" />
-            </asp:TemplateField>--%><#
-foreach(IDataColumn Field in Table.Columns){
-    String pname = Field.Name;
-
-    // 查找关系，如果对方有名为Name的字符串字段，则加一个扩展属性
-    IDataRelation dr=XCode.DataAccessLayer.ModelHelper.GetRelation(Table, Field.ColumnName);
-    if(dr!=null&&!dr.Unique){
-        IDataTable rtable=FindTable(dr.RelationTable);
-        if(rtable!=null){
-            IDataColumn rname=rtable.GetColumn("Name");
-            if(rname!=null&&rname.DataType==typeof(String)){#>
-            <%--<asp:BoundField DataField="<#=pname#>" HeaderText="<#=Field.DisplayName#>" SortExpression="<#=pname#>" <# if(Field.PrimaryKey){#>InsertVisible="False" ReadOnly="True" <#}#>>
-                <ItemStyle HorizontalAlign="Center" VerticalAlign="Middle" CssClass="key" />
-            </asp:BoundField>--%>
-            <asp:BoundField DataField="<#=rtable.Name+"Name"#>" HeaderText="<#=Field.DisplayName#>" SortExpression="<#=pname#>">
-                <HeaderStyle CssClass="widget-title" Font-Size="Small" />
-            </asp:BoundField>
-            <#
-                continue;
-            }
-        }
-    }
-
-    if(Field.Identity){#>
-            <asp:BoundField DataField="<#=pname#>" HeaderText="<#=Field.DisplayName#>" SortExpression="<#=pname#>" <# if(Field.PrimaryKey){#>InsertVisible="False" ReadOnly="True" <#}#>>
-                <ItemStyle HorizontalAlign="Center" VerticalAlign="Middle" CssClass="Ikey" />
-                <HeaderStyle CssClass="widget-title" Font-Size="Small" />
-            </asp:BoundField><#}
-    else if(Field.DataType == typeof(DateTime)){#>
-            <asp:BoundField DataField="<#=pname#>" HeaderText="<#=Field.DisplayName#>" SortExpression="<#=pname#>" DataFormatString="{0:yyyy-MM-dd HH:mm:ss}" <# if(Field.PrimaryKey){#>InsertVisible="False" ReadOnly="True" <#}#>>
-                <ItemStyle HorizontalAlign="Center" VerticalAlign="Middle" Width="120px" />
-                <HeaderStyle CssClass="widget-title" Font-Size="Small" />
-            </asp:BoundField><#}
-    else if(Field.DataType == typeof(Decimal)){#>
-            <asp:BoundField DataField="<#=pname#>" HeaderText="<#=Field.DisplayName#>" SortExpression="<#=pname#>" DataFormatString="{0:c}">
-                <ItemStyle HorizontalAlign="Right" Font-Bold="True" ForeColor="Blue" />
-                <HeaderStyle CssClass="widget-title" Font-Size="Small" />
-            </asp:BoundField><#}
-    else if(Type.GetTypeCode(Field.DataType)>=TypeCode.Int16&&Type.GetTypeCode(Field.DataType)<=TypeCode.UInt64){#>
-            <asp:BoundField DataField="<#=pname#>" HeaderText="<#=Field.DisplayName#>" SortExpression="<#=pname#>" DataFormatString="{0:n0}">
-                <ItemStyle HorizontalAlign="Right" Font-Bold="True" />
-                <HeaderStyle CssClass="widget-title" Font-Size="Small" />
-            </asp:BoundField><#}
-    else if(Field.DataType == typeof(Boolean)){#>
-            <asp:TemplateField HeaderText="<#=Field.DisplayName#>" SortExpression="<#=pname#>">
-                <ItemTemplate>
-                    <asp:Label ID="<#=pname#>1" runat="server" Text="√" Visible='<%# Eval("<#=pname#>") %>' Font-Bold="True" Font-Size="14pt" ForeColor="Green"></asp:Label>
-                    <asp:Label ID="<#=pname#>2" runat="server" Text="×" Visible='<%# !(Boolean)Eval("<#=pname#>") %>' Font-Bold="True" Font-Size="16pt" ForeColor="Red"></asp:Label>
-                </ItemTemplate>
-                <ItemStyle HorizontalAlign="Center" />
-                <HeaderStyle CssClass="widget-title" Font-Size="Small" />
-            </asp:TemplateField><#}
-    // 密码字段和大文本字段不输出
-    else if(!pname.Equals("Password", StringComparison.OrdinalIgnoreCase) && 
-       !pname.Equals("Pass", StringComparison.OrdinalIgnoreCase) && 
-       !pname.Equals("Pwd", StringComparison.OrdinalIgnoreCase) && 
-       Field.Length>0 && Field.Length<300){#>
-            <asp:BoundField DataField="<#=pname#>" HeaderText="<#=Field.DisplayName#>" SortExpression="<#=pname#>" <# if(Field.PrimaryKey){#>InsertVisible="False" ReadOnly="True" <#}#>>
-                <HeaderStyle CssClass="widget-title" Font-Size="Small" />
-            </asp:BoundField><#
-}}#>
-            <asp:TemplateField HeaderText="编辑">
-                            <ItemTemplate>
-                                <Custom:OpenForm BtText="编辑" runat="server" ID="OpenForm1" DialogWidth="500px" DialogHeight="<#=boxHeight#>px"
-                                    Url='<%# "<#=Table.Name#>Form.aspx?ID="+ Eval("ID")%>' Title="<#=Table.Name#>" IsButtonStyle="false">
-                                </Custom:OpenForm>
-                            </ItemTemplate>
-                            <HeaderStyle CssClass="widget-title" Font-Size="Small" Width="30px" />
-                        </asp:TemplateField>
-            <asp:TemplateField ShowHeader="False" HeaderText="删除">
-                <ItemTemplate>
-                    <asp:LinkButton ID="btnDelete" runat="server" CausesValidation="False" CommandName="Delete" OnClientClick='return confirm("确定删除吗？")' Text="删除"></asp:LinkButton>
-                </ItemTemplate>
-                <HeaderStyle CssClass="widget-title" Font-Size="Small" Width="30px" />
-            </asp:TemplateField>
-        </Columns>
-        <EmptyDataTemplate>
-            没有符合条件的数据！
-        </EmptyDataTemplate>
-    </asp:GridView>
-    </div>
-    </div>
-    </div>
-    <asp:ObjectDataSource ID="ods" runat="server" EnablePaging="True" SelectCountMethod="SearchCount" SelectMethod="Search" SortParameterName="orderClause" EnableViewState="false">
-        <SelectParameters>
-            <asp:ControlParameter ControlID="txtKey" Name="key" PropertyName="Text" Type="String" />
-            <asp:Parameter Name="orderClause" Type="String" />
-            <asp:Parameter Name="startRowIndex" Type="Int32" />
-            <asp:Parameter Name="maximumRows" Type="Int32" />
-        </SelectParameters>
-    </asp:ObjectDataSource>
-    <XCL:GridViewExtender ID="gvExt" runat="server">
-    </XCL:GridViewExtender>
-
-</asp:Content>
\ No newline at end of file
diff --git "a/XCoder/Template/\351\241\265\351\235\242Bootstrap/\347\261\273\345\220\215.aspx.cs" "b/XCoder/Template/\351\241\265\351\235\242Bootstrap/\347\261\273\345\220\215.aspx.cs"
deleted file mode 100644
index c33a47de2e..0000000000
--- "a/XCoder/Template/\351\241\265\351\235\242Bootstrap/\347\261\273\345\220\215.aspx.cs"
+++ /dev/null
@@ -1,13 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using <#=Config.NameSpace#>;
-
-public partial class <#=Config.EntityConnName+"_"+Table.Name#> : MyEntityList<<#=Table.Name#>>
-{
-    protected void Page_Load(object sender, EventArgs e)
-    {
-    }
-}
\ No newline at end of file
diff --git "a/XCoder/Template/\351\241\265\351\235\242Bootstrap/\347\261\273\345\220\215Form.aspx" "b/XCoder/Template/\351\241\265\351\235\242Bootstrap/\347\261\273\345\220\215Form.aspx"
deleted file mode 100644
index 08dd6b05f9..0000000000
--- "a/XCoder/Template/\351\241\265\351\235\242Bootstrap/\347\261\273\345\220\215Form.aspx"
+++ /dev/null
@@ -1,49 +0,0 @@
-<%@ Page Title="<#=Table.DisplayName#>管理" Language="C#" MasterPageFile="~/MasterPage.master" AutoEventWireup="true" CodeFile="<#=Table.Name#>Form.aspx.cs" Inherits="<#=Config.EntityConnName+"_"+Table.Name#>Form"%>
-
-<asp:Content ID="Content1" runat="server" ContentPlaceHolderID="C">
-    <div class="row-filuid">
-    <div class="widget-box">
-    <div class="widget-content nopadding">
-        <table class="table table-bordered table-striped">
-            <tr>
-                <th colspan="2"><#=Table.DisplayName#></th>
-            </tr>
-            <# 
-            foreach(IDataColumn Field in Table.Columns) { 
-                String pname = Field.Name;
-                if(Field.PrimaryKey) continue;
-                String frmName = "frm" + pname;
-                TypeCode code = Type.GetTypeCode(Field.DataType);
-            #><tr>
-                <td align="right"><#=Field.DisplayName#>：</td>
-                <td><#
-                    if(code == TypeCode.String){
-                        if(pname.Equals("Password", StringComparison.OrdinalIgnoreCase) || pname.Equals("Pass", StringComparison.OrdinalIgnoreCase)){
-                    #><asp:TextBox ID="<#=frmName#>" runat="server" TextMode="Password"></asp:TextBox><#
-                        }else if(Field.Length>300 || Field.Length<0){
-                    #><asp:TextBox ID="<#=frmName#>" runat="server" TextMode="MultiLine" Width="300px" Height="80px"></asp:TextBox><#
-                        }else{
-                    #><asp:TextBox ID="<#=frmName#>" runat="server" Width="<#=Field.Length+100#>px"></asp:TextBox><#
-                        }
-                    }else if(code == TypeCode.Int32){
-                    #><XCL:NumberBox ID="<#=frmName#>" runat="server" Width="80px"></XCL:NumberBox><#
-                    }else if(code == TypeCode.Double){
-                    #><XCL:RealBox ID="<#=frmName#>" runat="server" Width="80px"></XCL:RealBox><#
-                    }else if(code == TypeCode.DateTime){
-                    #><XCL:DateTimePicker ID="<#=frmName#>" runat="server"></XCL:DateTimePicker><#
-                    }else if(code == TypeCode.Decimal){
-                    #><XCL:DecimalBox ID="<#=frmName#>" runat="server" Width="80px"></XCL:DecimalBox><#
-                    }else if(code == TypeCode.Boolean){
-                    #><asp:CheckBox ID="<#=frmName#>" runat="server" Text="<#=Field.DisplayName#>" /><#}
-                #></td>
-            </tr>
-    <#}#>    </table>
-    </div>
-    </div>
-    </div>
-    <div class="row-filuid">
-                <asp:Button ID="btnSave" runat="server" CausesValidation="True" Text='保存' />
-                &nbsp;<asp:Button ID="btnCopy" runat="server" CausesValidation="True" Text='另存为新<#=Table.DisplayName#>' />
-                &nbsp;<asp:Button ID="btnReturn" runat="server" OnClientClick="parent.Dialog.CloseSelfDialog(frameElement);return false;" Text="返回" />
-       </div>
-</asp:Content>
\ No newline at end of file
diff --git "a/XCoder/Template/\351\241\265\351\235\242Bootstrap/\347\261\273\345\220\215Form.aspx.cs" "b/XCoder/Template/\351\241\265\351\235\242Bootstrap/\347\261\273\345\220\215Form.aspx.cs"
deleted file mode 100644
index 7afaacf746..0000000000
--- "a/XCoder/Template/\351\241\265\351\235\242Bootstrap/\347\261\273\345\220\215Form.aspx.cs"
+++ /dev/null
@@ -1,15 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using NewLife.Log;
-using NewLife.Web;
-using <#=Config.NameSpace#>;
-
-public partial class <#=Config.EntityConnName+"_"+Table.Name#>Form : MyEntityForm<<#=Table.Name#>>
-{
-    protected void Page_Load(object sender, EventArgs e)
-    {
-    }
-}
\ No newline at end of file
diff --git "a/XCoder/Template/\351\241\265\351\235\242ExtAspNet/\347\261\273\345\220\215.aspx" "b/XCoder/Template/\351\241\265\351\235\242ExtAspNet/\347\261\273\345\220\215.aspx"
deleted file mode 100644
index ecb64ba96b..0000000000
--- "a/XCoder/Template/\351\241\265\351\235\242ExtAspNet/\347\261\273\345\220\215.aspx"
+++ /dev/null
@@ -1,122 +0,0 @@
-﻿<%@ Page Language="C#" AutoEventWireup="true" CodeFile="<#=Table.Name#>.aspx.cs" Inherits="<#=Config.EntityConnName+"_"+Table.Name#>" Title="<#=Table.DisplayName#>管理" %>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head id="Head1" runat="server">
-    <link href="../css/main.css" rel="stylesheet" type="text/css" />
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body>
-    <form id="form1" runat="server">
-    <ext:PageManager ID="PageManager1" runat="server" />
-    <#
-// 表单页面，普通行行高
-Int32 LineHeight=27;
-// 大文本行行高
-Int32 LineHeight2=90;
-
-// 表单窗口高度，初始值（Toolbar、表单头、提交按钮、运行时）
-Int32 boxHeight = 31+29+29+14;
-
-foreach(IDataColumn Field in Table.Columns){
-    if(Field.PrimaryKey) continue;
-    if(Field.DataType==typeof(String) && (Field.Length>300 || Field.Length<0))
-        boxHeight += LineHeight2;
-    else
-        boxHeight += LineHeight;
-}
-
-StringBuilder sbpk=new StringBuilder();
-StringBuilder sbpk2=new StringBuilder();
-Int32 pki=0;
-foreach(IDataColumn Field in Table.Columns){
-    if(Field.PrimaryKey) {
-        if(sbpk.Length>0)sbpk.Append(",");
-        sbpk.Append(Field.Name);
-
-        if(sbpk2.Length>0)sbpk2.Append("&");
-        sbpk2.Append(Field.Name+"={"+pki+++"}");
-    } 
-}
-    #>
-    <ext:Panel ID="pnl" runat="server" BodyPadding="5px" EnableLargeHeader="false" EnableBackgroundColor="true"
-        ShowBorder="true" ShowHeader="true" Title="<#=Table.DisplayName#>" Layout="Anchor">
-        <Items>
-            <ext:Grid ID="gv" runat="server" DataSourceID="ods" ShowBorder="true" ShowHeader="false"
-                AutoHeight="true" AllowPaging="true" EnableRowNumber="True" EnableCheckBoxSelect="True"
-                DataKeyNames="<#=sbpk#>" AllowSorting="true">
-                <Toolbars>
-                    <ext:Toolbar ID="gvbar" runat="server">
-                        <Items>
-                            <ext:Button ID="btnNew" Text="新增数据" Icon="Add" EnablePostBack="false" runat="server">
-                            </ext:Button>
-                            <ext:Button ID="btnDelete" Text="删除选中项" Icon="Delete" OnClick="btnDelete_Click" runat="server"
-                                ConfirmText="删除将不可恢复，是否删除？" ConfirmTitle="确认删除">
-                            </ext:Button>
-                            <ext:ToolbarSeparator runat="server" />
-                            <ext:Label runat="server" Text="关键字：" />
-                            <ext:TextBox ID="txtKey" runat="server" Label="关键字" EmptyText="关键字">
-                            </ext:TextBox>
-                            <ext:Button ID="btnSearch" runat="server" Text="查询" />
-                        </Items>
-                    </ext:Toolbar>
-                </Toolbars>
-                <Columns>
-<#
-// 列表页不宜显示过多列
-Int32 fieldMaxCount=10;
-foreach(IDataColumn Field in Table.Columns){
-    String pname = Field.Name;
-    if(fieldMaxCount--<=0) break;
-
-    // 查找关系，如果对方有名为Name的字符串字段，则加一个扩展属性
-    IDataRelation dr=ModelHelper.GetRelation(Table, Field.ColumnName);
-    if(dr!=null&&!dr.Unique){
-        IDataTable rtable=FindTable(dr.RelationTable);
-        if(rtable!=null){
-            IDataColumn rname=rtable.GetColumn("Name");
-            if(rname!=null&&rname.DataType==typeof(String)){#>
-                    <ext:BoundField DataField="<#=rtable.Name+"Name"#>" HeaderText="<#=Field.DisplayName#>" SortField="<#=pname#>" /><#
-                continue;
-            }
-        }
-    }
-
-    if(Field.Identity){#>
-                    <ext:BoundField DataField="<#=pname#>" HeaderText="<#=Field.DisplayName#>" SortField="<#=pname#>" Width="40px" /><#}
-    else if(Field.DataType == typeof(DateTime)){#>
-                    <ext:BoundField DataField="<#=pname#>" HeaderText="<#=Field.DisplayName#>" SortField="<#=pname#>" DataFormatString="{0:yyyy-MM-dd HH:mm:ss}" Width="140px" /><#}
-    else if(Field.DataType == typeof(Decimal)){#>
-                    <ext:BoundField DataField="<#=pname#>" HeaderText="<#=Field.DisplayName#>" SortField="<#=pname#>" DataFormatString="{0:c}" /><#}
-    else if(Type.GetTypeCode(Field.DataType)>=TypeCode.Int16&&Type.GetTypeCode(Field.DataType)<=TypeCode.UInt64){#>
-                    <ext:BoundField DataField="<#=pname#>" HeaderText="<#=Field.DisplayName#>" SortField="<#=pname#>" DataFormatString="{0:n0}" /><#}
-    else if(Field.DataType == typeof(Boolean)){#>
-                    <ext:CheckBoxField DataField="<#=pname#>" HeaderText="<#=Field.DisplayName#>" SortField="<#=pname#>" RenderAsStaticField="true" /><#}
-    // 密码字段和大文本字段不输出
-    else if(!pname.Equals("Password", StringComparison.OrdinalIgnoreCase) && 
-       !pname.Equals("Pass", StringComparison.OrdinalIgnoreCase) && 
-       !pname.Equals("Pwd", StringComparison.OrdinalIgnoreCase) && 
-       Field.Length>0 && Field.Length<300){#>
-                    <ext:BoundField DataField="<#=pname#>" HeaderText="<#=Field.DisplayName#>" SortField="<#=pname#>" /><#
-}}#>
-                    <ext:WindowField WindowID="win" HeaderText="编辑" Icon="TableEdit" ToolTip="编辑" DataIFrameUrlFields="<#=sbpk#>" DataIFrameUrlFormatString="<#=Table.Name#>Form.aspx?<#=sbpk2#>" Width="40px" />
-                    <ext:LinkButtonField CommandName="Delete" HeaderText="删除" Text="删除" ConfirmText="删除将不可恢复，是否删除？"
-                        ConfirmTitle="确认删除" Width="40px" />
-                </Columns>
-            </ext:Grid>
-        </Items>
-    </ext:Panel>
-    <ext:Window ID="win" Title="编辑 - <#=Table.DisplayName#>" Popup="false" EnableIFrame="true" runat="server"
-        CloseAction="HidePostBack" EnableConfirmOnClose="true" IFrameUrl="about:blank"
-        Target="Top" IsModal="True" Width="750px" Height="450px">
-    </ext:Window>
-    <asp:ObjectDataSource ID="ods" runat="server" EnablePaging="True" SelectCountMethod="SearchCount" SelectMethod="Search" SortParameterName="orderClause" EnableViewState="false">
-        <SelectParameters>
-            <asp:ControlParameter ControlID="pnl$gv$gvbar$txtKey" Name="key" PropertyName="Text" Type="String" />
-            <asp:Parameter Name="orderClause" Type="String" />
-            <asp:Parameter Name="startRowIndex" Type="Int32" />
-            <asp:Parameter Name="maximumRows" Type="Int32" />
-        </SelectParameters>
-    </asp:ObjectDataSource>
-    </form>
-</body>
-</html>
\ No newline at end of file
diff --git "a/XCoder/Template/\351\241\265\351\235\242ExtAspNet/\347\261\273\345\220\215.aspx.cs" "b/XCoder/Template/\351\241\265\351\235\242ExtAspNet/\347\261\273\345\220\215.aspx.cs"
deleted file mode 100644
index 31764f84f9..0000000000
--- "a/XCoder/Template/\351\241\265\351\235\242ExtAspNet/\347\261\273\345\220\215.aspx.cs"
+++ /dev/null
@@ -1,23 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using <#=Config.NameSpace#>;
-
-public partial class <#=Config.EntityConnName+"_"+Table.Name#> : MyEntityList<<#=Table.Name#>>
-{
-    protected void Page_Load(object sender, EventArgs e)
-    {
-        if (!IsPostBack)
-        {
-            btnDelete.OnClientClick = gv.GetNoSelectionAlertReference("至少选择一项！");
-            btnNew.OnClientClick = win.GetShowReference("<#=Table.Name#>Form.aspx", "新增 - <#=Table.DisplayName#>");
-        }
-    }
-
-    protected void btnDelete_Click(object sender, EventArgs e)
-    {
-        gv.DeleteSelected();
-    }
-}
\ No newline at end of file
diff --git "a/XCoder/Template/\351\241\265\351\235\242ExtAspNet/\347\261\273\345\220\215Form.aspx" "b/XCoder/Template/\351\241\265\351\235\242ExtAspNet/\347\261\273\345\220\215Form.aspx"
deleted file mode 100644
index f66e4d64b1..0000000000
--- "a/XCoder/Template/\351\241\265\351\235\242ExtAspNet/\347\261\273\345\220\215Form.aspx"
+++ /dev/null
@@ -1,68 +0,0 @@
-﻿<%@ Page Language="C#" AutoEventWireup="true" CodeFile="<#=Table.Name#>Form.aspx.cs" Inherits="<#=Config.EntityConnName+"_"+Table.Name#>Form" Title="<#=Table.DisplayName#>管理"%>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head id="Head1" runat="server">
-    <link href="../css/main.css" rel="stylesheet" type="text/css" />
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body>
-    <form id="form1" runat="server">
-    <ext:PageManager ID="PageManager1" runat="server" />
-    <ext:SimpleForm ID="SimpleForm1" ShowBorder="false" ShowHeader="false" runat="server"
-        BodyPadding="5px" EnableBackgroundColor="true" Title="SimpleForm">
-        <Toolbars>
-            <ext:Toolbar ID="Toolbar1" runat="server">
-                <Items>
-                    <ext:Button ID="btnClose" Icon="SystemClose" EnablePostBack="false" runat="server"
-                        Text="关闭">
-                    </ext:Button>
-                    <ext:ToolbarSeparator runat="server" />
-                    <%--<ext:Button ID="btnSaveContinue" ValidateForms="SimpleForm1" Icon="SystemSaveNew"
-                        OnClick="btnSaveContinue_Click" runat="server" Text="保存并继续">
-                    </ext:Button>--%>
-                    <ext:Button ID="btnSaveClose" ValidateForms="SimpleForm1" Icon="SystemSaveClose"
-                        runat="server" Text="保存后关闭">
-                    </ext:Button>
-                </Items>
-            </ext:Toolbar>
-        </Toolbars>
-        <Items><# 
-        foreach(IDataColumn Field in Table.Columns) { 
-            String pname = Field.Name;
-            if(Field.PrimaryKey) continue;
-
-            String frmName = "frm" + pname;
-            TypeCode code = Type.GetTypeCode(Field.DataType);
-        
-            if(code == TypeCode.String){
-                if(pname.Equals("Password", StringComparison.OrdinalIgnoreCase) || pname.Equals("Pass", StringComparison.OrdinalIgnoreCase)){
-            #>
-            <ext:TextBox ID="<#=frmName#>" Label="<#=Field.DisplayName#>" runat="server" TextMode="Password" Width="<#=Field.Length+100#>px" /><#
-                }else if(Field.Length>300 || Field.Length<0){
-            #>
-            <ext:TextArea ID="<#=frmName#>" Label="<#=Field.DisplayName#>" runat="server" Width="300px" Height="80px" /><#
-                }else{
-            #>
-            <ext:TextBox ID="<#=frmName#>" Label="<#=Field.DisplayName#>" runat="server" Width="<#=Field.Length+100#>px" /><#
-                }
-            }else if(code == TypeCode.Int32){
-            #>
-            <ext:NumberBox ID="<#=frmName#>" Label="<#=Field.DisplayName#>" runat="server" NoDecimal="true" Width="80px" /><#
-            }else if(code == TypeCode.Double){
-            #>
-            <ext:NumberBox ID="<#=frmName#>" Label="<#=Field.DisplayName#>" runat="server" NoDecimal="false" Width="80px" /><#
-            }else if(code == TypeCode.DateTime){
-            #>
-            <ext:DatePicker ID="<#=frmName#>" Label="<#=Field.DisplayName#>" runat="server" Width="150px" /><#
-            }else if(code == TypeCode.Decimal){
-            #>
-            <ext:NumberBox ID="<#=frmName#>" Label="<#=Field.DisplayName#>" runat="server" NoDecimal="false" Width="80px" /><#
-            }else if(code == TypeCode.Boolean){
-            #>
-            <ext:CheckBox ID="<#=frmName#>" Label="<#=Field.DisplayName#>" runat="server" Text="<#=Field.DisplayName#>" /><#}
-        }#>
-        </Items>
-    </ext:SimpleForm>
-    </form>
-</body>
-</html>
\ No newline at end of file
diff --git "a/XCoder/Template/\351\241\265\351\235\242ExtAspNet/\347\261\273\345\220\215Form.aspx.cs" "b/XCoder/Template/\351\241\265\351\235\242ExtAspNet/\347\261\273\345\220\215Form.aspx.cs"
deleted file mode 100644
index 7afaacf746..0000000000
--- "a/XCoder/Template/\351\241\265\351\235\242ExtAspNet/\347\261\273\345\220\215Form.aspx.cs"
+++ /dev/null
@@ -1,15 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using NewLife.Log;
-using NewLife.Web;
-using <#=Config.NameSpace#>;
-
-public partial class <#=Config.EntityConnName+"_"+Table.Name#>Form : MyEntityForm<<#=Table.Name#>>
-{
-    protected void Page_Load(object sender, EventArgs e)
-    {
-    }
-}
\ No newline at end of file
diff --git "a/XCoder/Template/\351\241\265\351\235\242\345\237\272\347\261\273/MyEntityForm.cs" "b/XCoder/Template/\351\241\265\351\235\242\345\237\272\347\261\273/MyEntityForm.cs"
deleted file mode 100644
index c28c8a2ccd..0000000000
--- "a/XCoder/Template/\351\241\265\351\235\242\345\237\272\347\261\273/MyEntityForm.cs"
+++ /dev/null
@@ -1,39 +0,0 @@
-﻿using System;
-using System.Web.UI;
-using NewLife.CommonEntity;
-using XCode;
-
-/// <summary>实体表单页面基类</summary>
-public class MyEntityForm : Page
-{
-    #region 管理页控制器
-    private Type _EntityType;
-    /// <summary>实体类</summary>
-    public virtual Type EntityType { get { return _EntityType; } set { _EntityType = value; } }
-
-    /// <summary>管理页控制器</summary>
-    protected IManagePage Manager;
-
-    /// <summary>表单控制器</summary>
-    protected IEntityForm EntityForm;
-
-    protected override void OnPreInit(EventArgs e)
-    {
-        // 让页面管理器先注册，因为页面管理器要控制权限
-        Manager = ManageProvider.Provider.GetService<IManagePage>().Init(this, EntityType);
-        EntityForm = ManageProvider.Provider.GetService<IEntityForm>().Init(this, EntityType);
-
-        base.OnPreInit(e);
-    }
-    #endregion
-}
-
-/// <summary>实体表单页面基类</summary>
-public class MyEntityForm<TEntity> : MyEntityForm where TEntity : Entity<TEntity>, new()
-{
-    /// <summary>实体类</summary>
-    public override Type EntityType { get { return base.EntityType ?? (base.EntityType = typeof(TEntity)); } set { base.EntityType = value; } }
-
-    /// <summary>实体</summary>
-    public virtual TEntity Entity { get { return EntityForm == null ? null : EntityForm.Entity as TEntity; } set { if (EntityForm != null) EntityForm.Entity = value; } }
-}
\ No newline at end of file
diff --git "a/XCoder/Template/\351\241\265\351\235\242\345\237\272\347\261\273/MyEntityList.cs" "b/XCoder/Template/\351\241\265\351\235\242\345\237\272\347\261\273/MyEntityList.cs"
deleted file mode 100644
index 849a58ecca..0000000000
--- "a/XCoder/Template/\351\241\265\351\235\242\345\237\272\347\261\273/MyEntityList.cs"
+++ /dev/null
@@ -1,71 +0,0 @@
-﻿﻿using System;
-using System.Text;
-using System.Web.UI;
-using NewLife.Collections;
-using NewLife.CommonEntity;
-using NewLife.Web;
-using XCode;
-using XControl;
-
-/// <summary>实体列表页面基类</summary>
-public abstract class MyEntityList : Page
-{
-    #region 管理页控制器
-    private Type _EntityType;
-    /// <summary>实体类</summary>
-    public virtual Type EntityType { get { return _EntityType; } set { _EntityType = value; } }
-
-    /// <summary>管理页控制器</summary>
-    protected IManagePage Manager;
-
-    protected override void OnPreInit(EventArgs e)
-    {
-        Manager = ManageProvider.Provider.GetService<IManagePage>().Init(this, EntityType);
-
-        base.OnPreInit(e);
-    }
-    #endregion
-
-    protected override void OnPreLoad(EventArgs e)
-    {
-        base.OnPreLoad(e);
-
-        AutoAddParamForAdd();
-    }
-
-    /// <summary>自动为添加按钮附加参数，Request中，只要是当前实体成员的参数，否附加上去</summary>
-    void AutoAddParamForAdd()
-    {
-        if (Request.QueryString == null || Request.QueryString.Count < 1) return;
-        if (EntityType == null) return;
-
-        LinkBox lb = ControlHelper.FindControlByField<LinkBox>(Page, "lbAdd");
-        if (lb == null) return;
-
-        StringBuilder sb = new StringBuilder();
-        IEntityOperate op = EntityFactory.CreateOperate(EntityType);
-        HashSet<String> hs = new HashSet<string>(op.FieldNames, StringComparer.OrdinalIgnoreCase);
-        foreach (String item in Request.QueryString.Keys)
-        {
-            // 仅接受实体类成员
-            if (!hs.Contains(item)) continue;
-
-            if (sb.Length > 0) sb.Append("&");
-            sb.AppendFormat("{0}={1}", item, Request.QueryString[item]);
-        }
-        if (sb.Length > 0)
-        {
-            if (!lb.Url.Contains("?"))
-                lb.Url += "?" + sb;
-            else
-                lb.Url += "&" + sb;
-        }
-    }
-}
-
-/// <summary>实体列表页面基类</summary>
-public class MyEntityList<TEntity> : MyEntityList where TEntity : Entity<TEntity>, new()
-{
-    /// <summary>实体类</summary>
-    public override Type EntityType { get { return base.EntityType ?? (base.EntityType = typeof(TEntity)); } set { base.EntityType = value; } }
-}
\ No newline at end of file
diff --git "a/XCoder/Template/\351\241\265\351\235\242\345\237\272\347\261\273/MyEntityUserControl.cs" "b/XCoder/Template/\351\241\265\351\235\242\345\237\272\347\261\273/MyEntityUserControl.cs"
deleted file mode 100644
index 7b8adc28b6..0000000000
--- "a/XCoder/Template/\351\241\265\351\235\242\345\237\272\347\261\273/MyEntityUserControl.cs"
+++ /dev/null
@@ -1,34 +0,0 @@
-﻿using System;
-using System.Web.UI;
-using NewLife.CommonEntity;
-using XCode;
-
-/// <summary>实体用户控件基类</summary>
-public class MyEntityUserControl : UserControl
-{
-    #region 管理页控制器
-    private Type _EntityType;
-    /// <summary>实体类</summary>
-    public virtual Type EntityType { get { return _EntityType; } set { _EntityType = value; } }
-
-    /// <summary>表单控制器</summary>
-    protected IEntityForm EntityForm;
-
-    protected override void OnInit(EventArgs e)
-    {
-        EntityForm = ManageProvider.Provider.GetService<IEntityForm>().Init(this, EntityType);
-
-        base.OnInit(e);
-    }
-    #endregion
-}
-
-/// <summary>实体表单页面基类</summary>
-public class MyEntityUserControl<TEntity> : MyEntityUserControl where TEntity : Entity<TEntity>, new()
-{
-    /// <summary>实体类</summary>
-    public override Type EntityType { get { return base.EntityType ?? (base.EntityType = typeof(TEntity)); } set { base.EntityType = value; } }
-
-    /// <summary>实体</summary>
-    public virtual TEntity Entity { get { return EntityForm == null ? null : EntityForm.Entity as TEntity; } set { if (EntityForm != null) EntityForm.Entity = value; } }
-}
\ No newline at end of file
diff --git "a/XCoder/Template/\351\241\265\351\235\242\345\237\272\347\261\273ExtAspNet/MyEntityForm.cs" "b/XCoder/Template/\351\241\265\351\235\242\345\237\272\347\261\273ExtAspNet/MyEntityForm.cs"
deleted file mode 100644
index c28c8a2ccd..0000000000
--- "a/XCoder/Template/\351\241\265\351\235\242\345\237\272\347\261\273ExtAspNet/MyEntityForm.cs"
+++ /dev/null
@@ -1,39 +0,0 @@
-﻿using System;
-using System.Web.UI;
-using NewLife.CommonEntity;
-using XCode;
-
-/// <summary>实体表单页面基类</summary>
-public class MyEntityForm : Page
-{
-    #region 管理页控制器
-    private Type _EntityType;
-    /// <summary>实体类</summary>
-    public virtual Type EntityType { get { return _EntityType; } set { _EntityType = value; } }
-
-    /// <summary>管理页控制器</summary>
-    protected IManagePage Manager;
-
-    /// <summary>表单控制器</summary>
-    protected IEntityForm EntityForm;
-
-    protected override void OnPreInit(EventArgs e)
-    {
-        // 让页面管理器先注册，因为页面管理器要控制权限
-        Manager = ManageProvider.Provider.GetService<IManagePage>().Init(this, EntityType);
-        EntityForm = ManageProvider.Provider.GetService<IEntityForm>().Init(this, EntityType);
-
-        base.OnPreInit(e);
-    }
-    #endregion
-}
-
-/// <summary>实体表单页面基类</summary>
-public class MyEntityForm<TEntity> : MyEntityForm where TEntity : Entity<TEntity>, new()
-{
-    /// <summary>实体类</summary>
-    public override Type EntityType { get { return base.EntityType ?? (base.EntityType = typeof(TEntity)); } set { base.EntityType = value; } }
-
-    /// <summary>实体</summary>
-    public virtual TEntity Entity { get { return EntityForm == null ? null : EntityForm.Entity as TEntity; } set { if (EntityForm != null) EntityForm.Entity = value; } }
-}
\ No newline at end of file
diff --git "a/XCoder/Template/\351\241\265\351\235\242\345\237\272\347\261\273ExtAspNet/MyEntityList.cs" "b/XCoder/Template/\351\241\265\351\235\242\345\237\272\347\261\273ExtAspNet/MyEntityList.cs"
deleted file mode 100644
index dc7d7cb6c4..0000000000
--- "a/XCoder/Template/\351\241\265\351\235\242\345\237\272\347\261\273ExtAspNet/MyEntityList.cs"
+++ /dev/null
@@ -1,71 +0,0 @@
-﻿﻿using System;
-using System.Text;
-using System.Web.UI;
-using NewLife.Collections;
-using NewLife.CommonEntity;
-using NewLife.Web;
-using XCode;
-using XControl;
-
-/// <summary>实体列表页面基类</summary>
-public abstract class MyEntityList : Page
-{
-    #region 管理页控制器
-    private Type _EntityType;
-    /// <summary>实体类</summary>
-    public virtual Type EntityType { get { return _EntityType; } set { _EntityType = value; } }
-
-    /// <summary>管理页控制器</summary>
-    protected IManagePage Manager;
-
-    protected override void OnPreInit(EventArgs e)
-    {
-        Manager = ManageProvider.Provider.GetService<IManagePage>().Init(this, EntityType);
-
-        base.OnPreInit(e);
-    }
-    #endregion
-
-    protected override void OnPreLoad(EventArgs e)
-    {
-        base.OnPreLoad(e);
-
-        AutoAddParamForAdd();
-    }
-
-    /// <summary>自动为添加按钮附加参数，Request中，只要是当前实体成员的参数，否附加上去</summary>
-    protected virtual void AutoAddParamForAdd()
-    {
-        if (Request.QueryString == null || Request.QueryString.Count < 1) return;
-        if (EntityType == null) return;
-
-        LinkBox lb = ControlHelper.FindControlByField<LinkBox>(Page, "btnNew");
-        if (lb == null) return;
-
-        StringBuilder sb = new StringBuilder();
-        IEntityOperate op = EntityFactory.CreateOperate(EntityType);
-        HashSet<String> hs = new HashSet<string>(op.FieldNames, StringComparer.OrdinalIgnoreCase);
-        foreach (String item in Request.QueryString.Keys)
-        {
-            // 仅接受实体类成员
-            if (!hs.Contains(item)) continue;
-
-            if (sb.Length > 0) sb.Append("&");
-            sb.AppendFormat("{0}={1}", item, Request.QueryString[item]);
-        }
-        if (sb.Length > 0)
-        {
-            if (!lb.Url.Contains("?"))
-                lb.Url += "?" + sb;
-            else
-                lb.Url += "&" + sb;
-        }
-    }
-}
-
-/// <summary>实体列表页面基类</summary>
-public class MyEntityList<TEntity> : MyEntityList where TEntity : Entity<TEntity>, new()
-{
-    /// <summary>实体类</summary>
-    public override Type EntityType { get { return base.EntityType ?? (base.EntityType = typeof(TEntity)); } set { base.EntityType = value; } }
-}
\ No newline at end of file
diff --git "a/XCoder/Template/\351\241\265\351\235\242\345\237\272\347\261\273ExtAspNet/MyEntityUserControl.cs" "b/XCoder/Template/\351\241\265\351\235\242\345\237\272\347\261\273ExtAspNet/MyEntityUserControl.cs"
deleted file mode 100644
index 7b8adc28b6..0000000000
--- "a/XCoder/Template/\351\241\265\351\235\242\345\237\272\347\261\273ExtAspNet/MyEntityUserControl.cs"
+++ /dev/null
@@ -1,34 +0,0 @@
-﻿using System;
-using System.Web.UI;
-using NewLife.CommonEntity;
-using XCode;
-
-/// <summary>实体用户控件基类</summary>
-public class MyEntityUserControl : UserControl
-{
-    #region 管理页控制器
-    private Type _EntityType;
-    /// <summary>实体类</summary>
-    public virtual Type EntityType { get { return _EntityType; } set { _EntityType = value; } }
-
-    /// <summary>表单控制器</summary>
-    protected IEntityForm EntityForm;
-
-    protected override void OnInit(EventArgs e)
-    {
-        EntityForm = ManageProvider.Provider.GetService<IEntityForm>().Init(this, EntityType);
-
-        base.OnInit(e);
-    }
-    #endregion
-}
-
-/// <summary>实体表单页面基类</summary>
-public class MyEntityUserControl<TEntity> : MyEntityUserControl where TEntity : Entity<TEntity>, new()
-{
-    /// <summary>实体类</summary>
-    public override Type EntityType { get { return base.EntityType ?? (base.EntityType = typeof(TEntity)); } set { base.EntityType = value; } }
-
-    /// <summary>实体</summary>
-    public virtual TEntity Entity { get { return EntityForm == null ? null : EntityForm.Entity as TEntity; } set { if (EntityForm != null) EntityForm.Entity = value; } }
-}
\ No newline at end of file
diff --git a/XCoder/Tools/FrmGPS.Designer.cs b/XCoder/Tools/FrmGPS.Designer.cs
deleted file mode 100644
index 2d37bbbd79..0000000000
--- a/XCoder/Tools/FrmGPS.Designer.cs
+++ /dev/null
@@ -1,187 +0,0 @@
-﻿namespace XCoder.Tools
-{
-    partial class FrmGPS
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.groupBox1 = new System.Windows.Forms.GroupBox();
-            this.label3 = new System.Windows.Forms.Label();
-            this.label2 = new System.Windows.Forms.Label();
-            this.txt_latlong = new System.Windows.Forms.TextBox();
-            this.btn_latlong = new System.Windows.Forms.Button();
-            this.txt_16_long = new System.Windows.Forms.TextBox();
-            this.txt_16_lat = new System.Windows.Forms.TextBox();
-            this.txt_long = new System.Windows.Forms.TextBox();
-            this.txt_lat = new System.Windows.Forms.TextBox();
-            this.btn_16_latlong = new System.Windows.Forms.Button();
-            this.txt_16_latlong = new System.Windows.Forms.TextBox();
-            this.label1 = new System.Windows.Forms.Label();
-            this.groupBox1.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // groupBox1
-            // 
-            this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.groupBox1.Controls.Add(this.label3);
-            this.groupBox1.Controls.Add(this.label2);
-            this.groupBox1.Controls.Add(this.txt_latlong);
-            this.groupBox1.Controls.Add(this.btn_latlong);
-            this.groupBox1.Controls.Add(this.txt_16_long);
-            this.groupBox1.Controls.Add(this.txt_16_lat);
-            this.groupBox1.Controls.Add(this.txt_long);
-            this.groupBox1.Controls.Add(this.txt_lat);
-            this.groupBox1.Controls.Add(this.btn_16_latlong);
-            this.groupBox1.Controls.Add(this.txt_16_latlong);
-            this.groupBox1.Controls.Add(this.label1);
-            this.groupBox1.Location = new System.Drawing.Point(12, 12);
-            this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(558, 149);
-            this.groupBox1.TabIndex = 1;
-            this.groupBox1.TabStop = false;
-            this.groupBox1.Text = "GPS HEX转坐标";
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(21, 113);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(53, 12);
-            this.label3.TabIndex = 10;
-            this.label3.Text = "HEX Long";
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(27, 88);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(47, 12);
-            this.label2.TabIndex = 9;
-            this.label2.Text = "HEX Lat";
-            // 
-            // txt_latlong
-            // 
-            this.txt_latlong.Location = new System.Drawing.Point(318, 94);
-            this.txt_latlong.Name = "txt_latlong";
-            this.txt_latlong.Size = new System.Drawing.Size(215, 21);
-            this.txt_latlong.TabIndex = 8;
-            // 
-            // btn_latlong
-            // 
-            this.btn_latlong.Location = new System.Drawing.Point(270, 92);
-            this.btn_latlong.Name = "btn_latlong";
-            this.btn_latlong.Size = new System.Drawing.Size(34, 23);
-            this.btn_latlong.TabIndex = 7;
-            this.btn_latlong.Text = ">>";
-            this.btn_latlong.UseVisualStyleBackColor = true;
-            this.btn_latlong.Click += new System.EventHandler(this.btn_latlong_Click);
-            // 
-            // txt_16_long
-            // 
-            this.txt_16_long.Location = new System.Drawing.Point(77, 110);
-            this.txt_16_long.Name = "txt_16_long";
-            this.txt_16_long.Size = new System.Drawing.Size(177, 21);
-            this.txt_16_long.TabIndex = 6;
-            // 
-            // txt_16_lat
-            // 
-            this.txt_16_lat.Location = new System.Drawing.Point(77, 83);
-            this.txt_16_lat.Name = "txt_16_lat";
-            this.txt_16_lat.Size = new System.Drawing.Size(177, 21);
-            this.txt_16_lat.TabIndex = 5;
-            // 
-            // txt_long
-            // 
-            this.txt_long.Location = new System.Drawing.Point(318, 49);
-            this.txt_long.Name = "txt_long";
-            this.txt_long.Size = new System.Drawing.Size(215, 21);
-            this.txt_long.TabIndex = 4;
-            // 
-            // txt_lat
-            // 
-            this.txt_lat.Location = new System.Drawing.Point(318, 22);
-            this.txt_lat.Name = "txt_lat";
-            this.txt_lat.Size = new System.Drawing.Size(215, 21);
-            this.txt_lat.TabIndex = 3;
-            // 
-            // btn_16_latlong
-            // 
-            this.btn_16_latlong.Location = new System.Drawing.Point(270, 18);
-            this.btn_16_latlong.Name = "btn_16_latlong";
-            this.btn_16_latlong.Size = new System.Drawing.Size(34, 23);
-            this.btn_16_latlong.TabIndex = 2;
-            this.btn_16_latlong.Text = ">>";
-            this.btn_16_latlong.UseVisualStyleBackColor = true;
-            this.btn_16_latlong.Click += new System.EventHandler(this.btn_16_latlong_Click);
-            // 
-            // txt_16_latlong
-            // 
-            this.txt_16_latlong.Location = new System.Drawing.Point(77, 21);
-            this.txt_16_latlong.Name = "txt_16_latlong";
-            this.txt_16_latlong.Size = new System.Drawing.Size(177, 21);
-            this.txt_16_latlong.TabIndex = 1;
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(3, 25);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(71, 12);
-            this.label1.TabIndex = 0;
-            this.label1.Text = "HEX LatLong";
-            // 
-            // FrmGPS
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(582, 172);
-            this.Controls.Add(this.groupBox1);
-            this.Name = "FrmGPS";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "GPS坐标转换";
-            this.groupBox1.ResumeLayout(false);
-            this.groupBox1.PerformLayout();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.GroupBox groupBox1;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.TextBox txt_latlong;
-        private System.Windows.Forms.Button btn_latlong;
-        private System.Windows.Forms.TextBox txt_16_long;
-        private System.Windows.Forms.TextBox txt_16_lat;
-        private System.Windows.Forms.TextBox txt_long;
-        private System.Windows.Forms.TextBox txt_lat;
-        private System.Windows.Forms.Button btn_16_latlong;
-        private System.Windows.Forms.TextBox txt_16_latlong;
-        private System.Windows.Forms.Label label1;
-    }
-}
\ No newline at end of file
diff --git a/XCoder/Tools/FrmGPS.cs b/XCoder/Tools/FrmGPS.cs
deleted file mode 100644
index f3d4fdec99..0000000000
--- a/XCoder/Tools/FrmGPS.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace XCoder.Tools
-{
-    public partial class FrmGPS : Form
-    {
-        public FrmGPS()
-        {
-            InitializeComponent();
-        }
-
-        private void btn_16_latlong_Click(Object sender, EventArgs e)
-        {
-            var temp = txt_16_latlong.Text.Trim();
-            var _lat = temp.Substring(0, 8);
-            var _long = temp.Substring(8);
-
-            SetText(_lat, _long);
-        }
-
-        private void btn_latlong_Click(Object sender, EventArgs e)
-        {
-            var _lat = txt_16_lat.Text.Trim();
-            var _long = txt_16_long.Text.Trim();
-
-            SetText(_lat, _long);
-        }
-
-        private void SetText(String _lat, String _long)
-        {
-            var v_lat = BitConverter.ToSingle(_lat.ToHex(), 0);
-            var v_long = BitConverter.ToSingle(_long.ToHex(), 0);
-
-            txt_lat.Text = v_lat + "";
-            txt_long.Text = v_long + "";
-            txt_latlong.Text = "{0},{1}".F(v_lat, v_long);
-        }
-    }
-}
diff --git a/XCoder/Tools/FrmGPS.resx b/XCoder/Tools/FrmGPS.resx
deleted file mode 100644
index 1af7de150c..0000000000
--- a/XCoder/Tools/FrmGPS.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file
diff --git a/XCoder/Tools/FrmInclude.Designer.cs b/XCoder/Tools/FrmInclude.Designer.cs
deleted file mode 100644
index c2f88a0a1b..0000000000
--- a/XCoder/Tools/FrmInclude.Designer.cs
+++ /dev/null
@@ -1,148 +0,0 @@
-﻿namespace XCoder.Tools
-{
-    partial class FrmInclude
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.label2 = new System.Windows.Forms.Label();
-            this.label1 = new System.Windows.Forms.Label();
-            this.txt_Target = new System.Windows.Forms.TextBox();
-            this.txt_Split = new System.Windows.Forms.TextBox();
-            this.rtb_msg = new System.Windows.Forms.RichTextBox();
-            this.btn_FilePath = new System.Windows.Forms.Button();
-            this.txt_FilePath = new System.Windows.Forms.TextBox();
-            this.btn_ReadFile = new System.Windows.Forms.Button();
-            this.SuspendLayout();
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Font = new System.Drawing.Font("微软雅黑", 7F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.ForeColor = System.Drawing.Color.Red;
-            this.label2.Location = new System.Drawing.Point(20, 61);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(181, 16);
-            this.label2.TabIndex = 16;
-            this.label2.Text = "选择.csproj项目文件,然后点击按钮执行";
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(126, 41);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(35, 16);
-            this.label1.TabIndex = 15;
-            this.label1.Text = "-->";
-            // 
-            // txt_Target
-            // 
-            this.txt_Target.Location = new System.Drawing.Point(174, 39);
-            this.txt_Target.Name = "txt_Target";
-            this.txt_Target.Size = new System.Drawing.Size(100, 21);
-            this.txt_Target.TabIndex = 14;
-            this.txt_Target.Text = ".cs";
-            // 
-            // txt_Split
-            // 
-            this.txt_Split.Location = new System.Drawing.Point(20, 39);
-            this.txt_Split.Name = "txt_Split";
-            this.txt_Split.Size = new System.Drawing.Size(100, 21);
-            this.txt_Split.TabIndex = 13;
-            this.txt_Split.Text = ".Biz.cs";
-            // 
-            // rtb_msg
-            // 
-            this.rtb_msg.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.rtb_msg.Location = new System.Drawing.Point(12, 80);
-            this.rtb_msg.Name = "rtb_msg";
-            this.rtb_msg.Size = new System.Drawing.Size(404, 167);
-            this.rtb_msg.TabIndex = 12;
-            this.rtb_msg.Text = "";
-            // 
-            // btn_FilePath
-            // 
-            this.btn_FilePath.Location = new System.Drawing.Point(280, 12);
-            this.btn_FilePath.Name = "btn_FilePath";
-            this.btn_FilePath.Size = new System.Drawing.Size(33, 23);
-            this.btn_FilePath.TabIndex = 11;
-            this.btn_FilePath.Text = "...";
-            this.btn_FilePath.UseVisualStyleBackColor = true;
-            this.btn_FilePath.Click += new System.EventHandler(this.btn_FilePath_Click);
-            // 
-            // txt_FilePath
-            // 
-            this.txt_FilePath.Location = new System.Drawing.Point(20, 12);
-            this.txt_FilePath.Name = "txt_FilePath";
-            this.txt_FilePath.Size = new System.Drawing.Size(254, 21);
-            this.txt_FilePath.TabIndex = 10;
-            // 
-            // btn_ReadFile
-            // 
-            this.btn_ReadFile.Location = new System.Drawing.Point(336, 10);
-            this.btn_ReadFile.Name = "btn_ReadFile";
-            this.btn_ReadFile.Size = new System.Drawing.Size(75, 23);
-            this.btn_ReadFile.TabIndex = 9;
-            this.btn_ReadFile.Text = "依赖注入";
-            this.btn_ReadFile.UseVisualStyleBackColor = true;
-            this.btn_ReadFile.Click += new System.EventHandler(this.btn_ReadFile_Click);
-            // 
-            // FrmInclude
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(424, 250);
-            this.Controls.Add(this.label2);
-            this.Controls.Add(this.label1);
-            this.Controls.Add(this.txt_Target);
-            this.Controls.Add(this.txt_Split);
-            this.Controls.Add(this.rtb_msg);
-            this.Controls.Add(this.btn_FilePath);
-            this.Controls.Add(this.txt_FilePath);
-            this.Controls.Add(this.btn_ReadFile);
-            this.Name = "FrmInclude";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "xcode  csproj项目文件包含更新";
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.TextBox txt_Target;
-        private System.Windows.Forms.TextBox txt_Split;
-        private System.Windows.Forms.RichTextBox rtb_msg;
-        private System.Windows.Forms.Button btn_FilePath;
-        private System.Windows.Forms.TextBox txt_FilePath;
-        private System.Windows.Forms.Button btn_ReadFile;
-    }
-}
\ No newline at end of file
diff --git a/XCoder/Tools/FrmInclude.cs b/XCoder/Tools/FrmInclude.cs
deleted file mode 100644
index 5b72ced0ef..0000000000
--- a/XCoder/Tools/FrmInclude.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-﻿using System;
-using System.Linq;
-using System.Windows.Forms;
-using System.Xml.Linq;
-
-namespace XCoder.Tools
-{
-    public partial class FrmInclude : Form
-    {
-        public FrmInclude()
-        {
-            InitializeComponent();
-        }
-
-        private void btn_FilePath_Click(Object sender, EventArgs e)
-        {
-            var open = new OpenFileDialog();
-            open.Filter = "项目文件|*.csproj";
-            if (open.ShowDialog() == DialogResult.OK)
-                txt_FilePath.Text = open.FileName;
-        }
-
-        private void btn_ReadFile_Click(Object sender, EventArgs e)
-        {
-            var _split = txt_Split.Text;//比对.csproj中待替换字符串
-            var _target = txt_Target.Text;//替换字符串
-
-            // Load the xml document
-            var xmlDoc = XDocument.Load(txt_FilePath.Text);
-
-            // Get the xml namespace
-            var nameSpace = xmlDoc.Root.Name.Namespace;
-            var elem = xmlDoc.Descendants(nameSpace + "Project")
-                          .Where(t => t.Attribute("ToolsVersion") != null)
-                          .Elements(nameSpace + "ItemGroup")
-                          .Elements(nameSpace + "Compile")
-                          .Where(r => r.Attribute("Include") != null);
-
-            foreach (var item in elem)
-            {
-                if (item.FirstAttribute.Value.Contains(_split))
-                {
-                    var temp = item.FirstAttribute.Value;
-                    var _next = item.Elements(nameSpace + "DependentUpon");
-                    if (_next.Count() == 0)
-                    {
-                        rtb_msg.AppendText(String.Format("{0} {1}{2}", temp, " 准备注入依赖项", "  -->  "));
-                        var _s = temp.Replace(_split, _target).Split('\\');
-                        var _value = _s[_s.Length - 1];
-                        rtb_msg.AppendText(String.Format("{0} {1}{2}", _value, " 依赖项", "  -->  "));
-                        item.SetElementValue(nameSpace + "DependentUpon", _value);
-                        xmlDoc.Save(txt_FilePath.Text);
-                        rtb_msg.AppendText(String.Format("{0} {1}{2}", temp, " 依赖项注入完毕", "\r\n"));
-                    }
-                    else
-                    {
-                        rtb_msg.AppendText(String.Format("{0} {1}{2}", temp, " 已经拥有依赖项", "\r\n"));
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/XCoder/Tools/FrmInclude.resx b/XCoder/Tools/FrmInclude.resx
deleted file mode 100644
index 1af7de150c..0000000000
--- a/XCoder/Tools/FrmInclude.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file
diff --git a/XCoder/Tools/FrmMain.Designer.cs b/XCoder/Tools/FrmMain.Designer.cs
deleted file mode 100644
index 7eaf3442b9..0000000000
--- a/XCoder/Tools/FrmMain.Designer.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-﻿namespace XCoder.Tools
-{
-    partial class FrmMain
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.btn_gps = new System.Windows.Forms.Button();
-            this.btn_Include = new System.Windows.Forms.Button();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.panel2 = new System.Windows.Forms.Panel();
-            this.panel1.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // btn_gps
-            // 
-            this.btn_gps.Location = new System.Drawing.Point(22, 12);
-            this.btn_gps.Name = "btn_gps";
-            this.btn_gps.Size = new System.Drawing.Size(75, 23);
-            this.btn_gps.TabIndex = 1;
-            this.btn_gps.Text = "GPS坐标转换";
-            this.btn_gps.UseVisualStyleBackColor = true;
-            this.btn_gps.Click += new System.EventHandler(this.btn_gps_Click);
-            // 
-            // btn_Include
-            // 
-            this.btn_Include.Location = new System.Drawing.Point(131, 11);
-            this.btn_Include.Name = "btn_Include";
-            this.btn_Include.Size = new System.Drawing.Size(101, 23);
-            this.btn_Include.TabIndex = 2;
-            this.btn_Include.Text = "Xcode实体包含";
-            this.btn_Include.UseVisualStyleBackColor = true;
-            this.btn_Include.Click += new System.EventHandler(this.btn_Include_Click);
-            // 
-            // panel1
-            // 
-            this.panel1.Controls.Add(this.btn_Include);
-            this.panel1.Controls.Add(this.btn_gps);
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.panel1.Location = new System.Drawing.Point(0, 0);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(674, 47);
-            this.panel1.TabIndex = 3;
-            // 
-            // panel2
-            // 
-            this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panel2.Location = new System.Drawing.Point(0, 47);
-            this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(674, 422);
-            this.panel2.TabIndex = 4;
-            // 
-            // FrmMain
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(674, 469);
-            this.Controls.Add(this.panel2);
-            this.Controls.Add(this.panel1);
-            this.Name = "FrmMain";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "小工具";
-            this.Load += new System.EventHandler(this.FrmMain_Load);
-            this.panel1.ResumeLayout(false);
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-        private System.Windows.Forms.Button btn_gps;
-        private System.Windows.Forms.Button btn_Include;
-        private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.Panel panel2;
-    }
-}
\ No newline at end of file
diff --git a/XCoder/Tools/FrmMain.cs b/XCoder/Tools/FrmMain.cs
deleted file mode 100644
index 09ea0380d7..0000000000
--- a/XCoder/Tools/FrmMain.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-﻿using System;
-using System.ComponentModel;
-using System.Windows.Forms;
-using NewLife;
-
-namespace XCoder.Tools
-{
-    [DisplayName("小工具")]
-    public partial class FrmMain : Form, IXForm
-    {
-        public FrmMain()
-        {
-            InitializeComponent();
-
-            // 动态调节宽度高度，兼容高DPI
-            this.FixDpi();
-        }
-
-        private void FrmMain_Load(Object sender, EventArgs e)
-        {
-            var frm = new FrmGPS();
-            ShowForm(frm);
-        }
-        private void btn_Include_Click(Object sender, EventArgs e)
-        {
-#if !NET4
-            var frm = new FrmInclude();
-            ShowForm(frm);
-#endif
-        }
-        private void btn_gps_Click(Object sender, EventArgs e)
-        {
-            var frm = new FrmGPS();
-            ShowForm(frm);
-        }
-        public void ShowForm(Form frm)
-        {
-            frm.TopLevel = false;
-            frm.Dock = DockStyle.Fill;
-            frm.FormBorderStyle = FormBorderStyle.None;
-
-            frm.Parent = this;
-
-            var sps = panel2.Controls;
-            foreach (var item in sps)
-            {
-                try
-                {
-                    var mm = item as Form;
-                    if (mm != null) mm.Close();
-                }
-                catch { }
-                item.TryDispose();
-            }
-            sps.Clear();
-            sps.Add(frm);
-            frm.Show();
-        }
-
-
-    }
-}
diff --git a/XCoder/Tools/FrmMain.resx b/XCoder/Tools/FrmMain.resx
deleted file mode 100644
index 1af7de150c..0000000000
--- a/XCoder/Tools/FrmMain.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file
diff --git a/XCoder/Tools/FrmSecurity.Designer.cs b/XCoder/Tools/FrmSecurity.Designer.cs
deleted file mode 100644
index 8be178ed81..0000000000
--- a/XCoder/Tools/FrmSecurity.Designer.cs
+++ /dev/null
@@ -1,542 +0,0 @@
-﻿namespace XCoder.Tools
-{
-    partial class FrmSecurity
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.gbFunc = new System.Windows.Forms.GroupBox();
-            this.btnHtml2 = new System.Windows.Forms.Button();
-            this.btnHtml = new System.Windows.Forms.Button();
-            this.btnUrl2 = new System.Windows.Forms.Button();
-            this.btnUrl = new System.Windows.Forms.Button();
-            this.btnDSA2 = new System.Windows.Forms.Button();
-            this.btnDSA = new System.Windows.Forms.Button();
-            this.btnRSA2 = new System.Windows.Forms.Button();
-            this.btnRSA = new System.Windows.Forms.Button();
-            this.btnRC42 = new System.Windows.Forms.Button();
-            this.btnRC4 = new System.Windows.Forms.Button();
-            this.btnAES2 = new System.Windows.Forms.Button();
-            this.btnAES = new System.Windows.Forms.Button();
-            this.btnDES2 = new System.Windows.Forms.Button();
-            this.btnDES = new System.Windows.Forms.Button();
-            this.btnCRC2 = new System.Windows.Forms.Button();
-            this.btnCRC = new System.Windows.Forms.Button();
-            this.btnMD52 = new System.Windows.Forms.Button();
-            this.btnMD5 = new System.Windows.Forms.Button();
-            this.btnB642 = new System.Windows.Forms.Button();
-            this.btnB64 = new System.Windows.Forms.Button();
-            this.btnHex2 = new System.Windows.Forms.Button();
-            this.btnHex = new System.Windows.Forms.Button();
-            this.gbSource = new System.Windows.Forms.GroupBox();
-            this.rtSource = new System.Windows.Forms.RichTextBox();
-            this.gbResult = new System.Windows.Forms.GroupBox();
-            this.rtResult = new System.Windows.Forms.RichTextBox();
-            this.gbPass = new System.Windows.Forms.GroupBox();
-            this.rtPass = new System.Windows.Forms.RichTextBox();
-            this.btnExchange = new System.Windows.Forms.Button();
-            this.btnSHA256 = new System.Windows.Forms.Button();
-            this.btnSHA1 = new System.Windows.Forms.Button();
-            this.btnSHA512 = new System.Windows.Forms.Button();
-            this.btnSHA384 = new System.Windows.Forms.Button();
-            this.gbFunc.SuspendLayout();
-            this.gbSource.SuspendLayout();
-            this.gbResult.SuspendLayout();
-            this.gbPass.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // gbFunc
-            // 
-            this.gbFunc.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left)));
-            this.gbFunc.Controls.Add(this.btnSHA512);
-            this.gbFunc.Controls.Add(this.btnSHA384);
-            this.gbFunc.Controls.Add(this.btnSHA256);
-            this.gbFunc.Controls.Add(this.btnSHA1);
-            this.gbFunc.Controls.Add(this.btnHtml2);
-            this.gbFunc.Controls.Add(this.btnHtml);
-            this.gbFunc.Controls.Add(this.btnUrl2);
-            this.gbFunc.Controls.Add(this.btnUrl);
-            this.gbFunc.Controls.Add(this.btnDSA2);
-            this.gbFunc.Controls.Add(this.btnDSA);
-            this.gbFunc.Controls.Add(this.btnRSA2);
-            this.gbFunc.Controls.Add(this.btnRSA);
-            this.gbFunc.Controls.Add(this.btnRC42);
-            this.gbFunc.Controls.Add(this.btnRC4);
-            this.gbFunc.Controls.Add(this.btnAES2);
-            this.gbFunc.Controls.Add(this.btnAES);
-            this.gbFunc.Controls.Add(this.btnDES2);
-            this.gbFunc.Controls.Add(this.btnDES);
-            this.gbFunc.Controls.Add(this.btnCRC2);
-            this.gbFunc.Controls.Add(this.btnCRC);
-            this.gbFunc.Controls.Add(this.btnMD52);
-            this.gbFunc.Controls.Add(this.btnMD5);
-            this.gbFunc.Controls.Add(this.btnB642);
-            this.gbFunc.Controls.Add(this.btnB64);
-            this.gbFunc.Controls.Add(this.btnHex2);
-            this.gbFunc.Controls.Add(this.btnHex);
-            this.gbFunc.Location = new System.Drawing.Point(24, 24);
-            this.gbFunc.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
-            this.gbFunc.Name = "gbFunc";
-            this.gbFunc.Padding = new System.Windows.Forms.Padding(6, 6, 6, 6);
-            this.gbFunc.Size = new System.Drawing.Size(344, 1210);
-            this.gbFunc.TabIndex = 0;
-            this.gbFunc.TabStop = false;
-            this.gbFunc.Text = "加密解密";
-            // 
-            // btnHtml2
-            // 
-            this.btnHtml2.Location = new System.Drawing.Point(174, 880);
-            this.btnHtml2.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
-            this.btnHtml2.Name = "btnHtml2";
-            this.btnHtml2.Size = new System.Drawing.Size(150, 60);
-            this.btnHtml2.TabIndex = 21;
-            this.btnHtml2.Text = "Html解码";
-            this.btnHtml2.UseVisualStyleBackColor = true;
-            this.btnHtml2.Click += new System.EventHandler(this.btnHtml2_Click);
-            // 
-            // btnHtml
-            // 
-            this.btnHtml.Location = new System.Drawing.Point(12, 880);
-            this.btnHtml.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
-            this.btnHtml.Name = "btnHtml";
-            this.btnHtml.Size = new System.Drawing.Size(150, 60);
-            this.btnHtml.TabIndex = 20;
-            this.btnHtml.Text = "Html编码";
-            this.btnHtml.UseVisualStyleBackColor = true;
-            this.btnHtml.Click += new System.EventHandler(this.btnHtml_Click);
-            // 
-            // btnUrl2
-            // 
-            this.btnUrl2.Location = new System.Drawing.Point(174, 810);
-            this.btnUrl2.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
-            this.btnUrl2.Name = "btnUrl2";
-            this.btnUrl2.Size = new System.Drawing.Size(150, 60);
-            this.btnUrl2.TabIndex = 19;
-            this.btnUrl2.Text = "Url解码";
-            this.btnUrl2.UseVisualStyleBackColor = true;
-            this.btnUrl2.Click += new System.EventHandler(this.btnUrl2_Click);
-            // 
-            // btnUrl
-            // 
-            this.btnUrl.Location = new System.Drawing.Point(12, 810);
-            this.btnUrl.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
-            this.btnUrl.Name = "btnUrl";
-            this.btnUrl.Size = new System.Drawing.Size(150, 60);
-            this.btnUrl.TabIndex = 18;
-            this.btnUrl.Text = "Url编码";
-            this.btnUrl.UseVisualStyleBackColor = true;
-            this.btnUrl.Click += new System.EventHandler(this.btnUrl_Click);
-            // 
-            // btnDSA2
-            // 
-            this.btnDSA2.Location = new System.Drawing.Point(174, 740);
-            this.btnDSA2.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
-            this.btnDSA2.Name = "btnDSA2";
-            this.btnDSA2.Size = new System.Drawing.Size(150, 60);
-            this.btnDSA2.TabIndex = 17;
-            this.btnDSA2.Text = "DSA验证";
-            this.btnDSA2.UseVisualStyleBackColor = true;
-            this.btnDSA2.Click += new System.EventHandler(this.btnDSA2_Click);
-            // 
-            // btnDSA
-            // 
-            this.btnDSA.Location = new System.Drawing.Point(12, 740);
-            this.btnDSA.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
-            this.btnDSA.Name = "btnDSA";
-            this.btnDSA.Size = new System.Drawing.Size(150, 60);
-            this.btnDSA.TabIndex = 16;
-            this.btnDSA.Text = "DSA签名";
-            this.btnDSA.UseVisualStyleBackColor = true;
-            this.btnDSA.Click += new System.EventHandler(this.btnDSA_Click);
-            // 
-            // btnRSA2
-            // 
-            this.btnRSA2.Location = new System.Drawing.Point(174, 670);
-            this.btnRSA2.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
-            this.btnRSA2.Name = "btnRSA2";
-            this.btnRSA2.Size = new System.Drawing.Size(150, 60);
-            this.btnRSA2.TabIndex = 15;
-            this.btnRSA2.Text = "RSA解密";
-            this.btnRSA2.UseVisualStyleBackColor = true;
-            this.btnRSA2.Click += new System.EventHandler(this.btnRSA2_Click);
-            // 
-            // btnRSA
-            // 
-            this.btnRSA.Location = new System.Drawing.Point(12, 670);
-            this.btnRSA.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
-            this.btnRSA.Name = "btnRSA";
-            this.btnRSA.Size = new System.Drawing.Size(150, 60);
-            this.btnRSA.TabIndex = 14;
-            this.btnRSA.Text = "RSA加密";
-            this.btnRSA.UseVisualStyleBackColor = true;
-            this.btnRSA.Click += new System.EventHandler(this.btnRSA_Click);
-            // 
-            // btnRC42
-            // 
-            this.btnRC42.Location = new System.Drawing.Point(174, 600);
-            this.btnRC42.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
-            this.btnRC42.Name = "btnRC42";
-            this.btnRC42.Size = new System.Drawing.Size(150, 60);
-            this.btnRC42.TabIndex = 13;
-            this.btnRC42.Text = "RC4解密";
-            this.btnRC42.UseVisualStyleBackColor = true;
-            this.btnRC42.Click += new System.EventHandler(this.btnRC42_Click);
-            // 
-            // btnRC4
-            // 
-            this.btnRC4.Location = new System.Drawing.Point(12, 600);
-            this.btnRC4.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
-            this.btnRC4.Name = "btnRC4";
-            this.btnRC4.Size = new System.Drawing.Size(150, 60);
-            this.btnRC4.TabIndex = 12;
-            this.btnRC4.Text = "RC4加密";
-            this.btnRC4.UseVisualStyleBackColor = true;
-            this.btnRC4.Click += new System.EventHandler(this.btnRC4_Click);
-            // 
-            // btnAES2
-            // 
-            this.btnAES2.Location = new System.Drawing.Point(174, 530);
-            this.btnAES2.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
-            this.btnAES2.Name = "btnAES2";
-            this.btnAES2.Size = new System.Drawing.Size(150, 60);
-            this.btnAES2.TabIndex = 11;
-            this.btnAES2.Text = "AES解密";
-            this.btnAES2.UseVisualStyleBackColor = true;
-            this.btnAES2.Click += new System.EventHandler(this.btnAES2_Click);
-            // 
-            // btnAES
-            // 
-            this.btnAES.Location = new System.Drawing.Point(12, 530);
-            this.btnAES.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
-            this.btnAES.Name = "btnAES";
-            this.btnAES.Size = new System.Drawing.Size(150, 60);
-            this.btnAES.TabIndex = 10;
-            this.btnAES.Text = "AES加密";
-            this.btnAES.UseVisualStyleBackColor = true;
-            this.btnAES.Click += new System.EventHandler(this.btnAES_Click);
-            // 
-            // btnDES2
-            // 
-            this.btnDES2.Location = new System.Drawing.Point(174, 460);
-            this.btnDES2.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
-            this.btnDES2.Name = "btnDES2";
-            this.btnDES2.Size = new System.Drawing.Size(150, 60);
-            this.btnDES2.TabIndex = 9;
-            this.btnDES2.Text = "DES解密";
-            this.btnDES2.UseVisualStyleBackColor = true;
-            this.btnDES2.Click += new System.EventHandler(this.btnDES2_Click);
-            // 
-            // btnDES
-            // 
-            this.btnDES.Location = new System.Drawing.Point(12, 460);
-            this.btnDES.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
-            this.btnDES.Name = "btnDES";
-            this.btnDES.Size = new System.Drawing.Size(150, 60);
-            this.btnDES.TabIndex = 8;
-            this.btnDES.Text = "DES加密";
-            this.btnDES.UseVisualStyleBackColor = true;
-            this.btnDES.Click += new System.EventHandler(this.btnDES_Click);
-            // 
-            // btnCRC2
-            // 
-            this.btnCRC2.Location = new System.Drawing.Point(174, 390);
-            this.btnCRC2.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
-            this.btnCRC2.Name = "btnCRC2";
-            this.btnCRC2.Size = new System.Drawing.Size(150, 60);
-            this.btnCRC2.TabIndex = 7;
-            this.btnCRC2.Text = "CRC_16";
-            this.btnCRC2.UseVisualStyleBackColor = true;
-            this.btnCRC2.Click += new System.EventHandler(this.btnCRC2_Click);
-            // 
-            // btnCRC
-            // 
-            this.btnCRC.Location = new System.Drawing.Point(12, 390);
-            this.btnCRC.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
-            this.btnCRC.Name = "btnCRC";
-            this.btnCRC.Size = new System.Drawing.Size(150, 60);
-            this.btnCRC.TabIndex = 6;
-            this.btnCRC.Text = "CRC_32";
-            this.btnCRC.UseVisualStyleBackColor = true;
-            this.btnCRC.Click += new System.EventHandler(this.btnCRC_Click);
-            // 
-            // btnMD52
-            // 
-            this.btnMD52.Location = new System.Drawing.Point(174, 180);
-            this.btnMD52.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
-            this.btnMD52.Name = "btnMD52";
-            this.btnMD52.Size = new System.Drawing.Size(150, 60);
-            this.btnMD52.TabIndex = 5;
-            this.btnMD52.Text = "MD5_16";
-            this.btnMD52.UseVisualStyleBackColor = true;
-            this.btnMD52.Click += new System.EventHandler(this.btnMD52_Click);
-            // 
-            // btnMD5
-            // 
-            this.btnMD5.Location = new System.Drawing.Point(12, 180);
-            this.btnMD5.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
-            this.btnMD5.Name = "btnMD5";
-            this.btnMD5.Size = new System.Drawing.Size(150, 60);
-            this.btnMD5.TabIndex = 4;
-            this.btnMD5.Text = "MD5_32";
-            this.btnMD5.UseVisualStyleBackColor = true;
-            this.btnMD5.Click += new System.EventHandler(this.btnMD5_Click);
-            // 
-            // btnB642
-            // 
-            this.btnB642.Location = new System.Drawing.Point(174, 110);
-            this.btnB642.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
-            this.btnB642.Name = "btnB642";
-            this.btnB642.Size = new System.Drawing.Size(150, 60);
-            this.btnB642.TabIndex = 3;
-            this.btnB642.Text = "Base64解码";
-            this.btnB642.UseVisualStyleBackColor = true;
-            this.btnB642.Click += new System.EventHandler(this.btnB642_Click);
-            // 
-            // btnB64
-            // 
-            this.btnB64.Location = new System.Drawing.Point(12, 110);
-            this.btnB64.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
-            this.btnB64.Name = "btnB64";
-            this.btnB64.Size = new System.Drawing.Size(150, 60);
-            this.btnB64.TabIndex = 2;
-            this.btnB64.Text = "Base64编码";
-            this.btnB64.UseVisualStyleBackColor = true;
-            this.btnB64.Click += new System.EventHandler(this.btnB64_Click);
-            // 
-            // btnHex2
-            // 
-            this.btnHex2.Location = new System.Drawing.Point(174, 40);
-            this.btnHex2.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
-            this.btnHex2.Name = "btnHex2";
-            this.btnHex2.Size = new System.Drawing.Size(150, 60);
-            this.btnHex2.TabIndex = 1;
-            this.btnHex2.Text = "HEX解码";
-            this.btnHex2.UseVisualStyleBackColor = true;
-            this.btnHex2.Click += new System.EventHandler(this.btnHex2_Click);
-            // 
-            // btnHex
-            // 
-            this.btnHex.Location = new System.Drawing.Point(12, 40);
-            this.btnHex.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
-            this.btnHex.Name = "btnHex";
-            this.btnHex.Size = new System.Drawing.Size(150, 60);
-            this.btnHex.TabIndex = 0;
-            this.btnHex.Text = "HEX编码";
-            this.btnHex.UseVisualStyleBackColor = true;
-            this.btnHex.Click += new System.EventHandler(this.btnHex_Click);
-            // 
-            // gbSource
-            // 
-            this.gbSource.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.gbSource.Controls.Add(this.rtSource);
-            this.gbSource.Location = new System.Drawing.Point(380, 24);
-            this.gbSource.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
-            this.gbSource.Name = "gbSource";
-            this.gbSource.Padding = new System.Windows.Forms.Padding(6, 6, 6, 6);
-            this.gbSource.Size = new System.Drawing.Size(1342, 500);
-            this.gbSource.TabIndex = 3;
-            this.gbSource.TabStop = false;
-            this.gbSource.Text = "原文";
-            // 
-            // rtSource
-            // 
-            this.rtSource.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.rtSource.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.rtSource.Location = new System.Drawing.Point(6, 34);
-            this.rtSource.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
-            this.rtSource.Name = "rtSource";
-            this.rtSource.Size = new System.Drawing.Size(1330, 460);
-            this.rtSource.TabIndex = 2;
-            this.rtSource.Text = "学无先后达者为师";
-            // 
-            // gbResult
-            // 
-            this.gbResult.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.gbResult.Controls.Add(this.rtResult);
-            this.gbResult.Location = new System.Drawing.Point(380, 736);
-            this.gbResult.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
-            this.gbResult.Name = "gbResult";
-            this.gbResult.Padding = new System.Windows.Forms.Padding(6, 6, 6, 6);
-            this.gbResult.Size = new System.Drawing.Size(1342, 500);
-            this.gbResult.TabIndex = 4;
-            this.gbResult.TabStop = false;
-            this.gbResult.Text = "结果";
-            // 
-            // rtResult
-            // 
-            this.rtResult.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.rtResult.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.rtResult.Location = new System.Drawing.Point(6, 34);
-            this.rtResult.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
-            this.rtResult.Name = "rtResult";
-            this.rtResult.Size = new System.Drawing.Size(1330, 460);
-            this.rtResult.TabIndex = 2;
-            this.rtResult.Text = "";
-            // 
-            // gbPass
-            // 
-            this.gbPass.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.gbPass.Controls.Add(this.rtPass);
-            this.gbPass.Location = new System.Drawing.Point(380, 530);
-            this.gbPass.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
-            this.gbPass.Name = "gbPass";
-            this.gbPass.Padding = new System.Windows.Forms.Padding(6, 6, 6, 6);
-            this.gbPass.Size = new System.Drawing.Size(1192, 200);
-            this.gbPass.TabIndex = 5;
-            this.gbPass.TabStop = false;
-            this.gbPass.Text = "密码";
-            // 
-            // rtPass
-            // 
-            this.rtPass.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.rtPass.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.rtPass.Location = new System.Drawing.Point(6, 34);
-            this.rtPass.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
-            this.rtPass.Name = "rtPass";
-            this.rtPass.Size = new System.Drawing.Size(1180, 160);
-            this.rtPass.TabIndex = 2;
-            this.rtPass.Text = "NewLife";
-            // 
-            // btnExchange
-            // 
-            this.btnExchange.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnExchange.Location = new System.Drawing.Point(1578, 612);
-            this.btnExchange.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
-            this.btnExchange.Name = "btnExchange";
-            this.btnExchange.Size = new System.Drawing.Size(138, 68);
-            this.btnExchange.TabIndex = 6;
-            this.btnExchange.Text = "上下互换";
-            this.btnExchange.UseVisualStyleBackColor = true;
-            this.btnExchange.Click += new System.EventHandler(this.btnExchange_Click);
-            // 
-            // btnSHA256
-            // 
-            this.btnSHA256.Location = new System.Drawing.Point(174, 250);
-            this.btnSHA256.Margin = new System.Windows.Forms.Padding(6);
-            this.btnSHA256.Name = "btnSHA256";
-            this.btnSHA256.Size = new System.Drawing.Size(150, 60);
-            this.btnSHA256.TabIndex = 23;
-            this.btnSHA256.Text = "SHA256";
-            this.btnSHA256.UseVisualStyleBackColor = true;
-            this.btnSHA256.Click += new System.EventHandler(this.btnSHA256_Click);
-            // 
-            // btnSHA1
-            // 
-            this.btnSHA1.Location = new System.Drawing.Point(12, 250);
-            this.btnSHA1.Margin = new System.Windows.Forms.Padding(6);
-            this.btnSHA1.Name = "btnSHA1";
-            this.btnSHA1.Size = new System.Drawing.Size(150, 60);
-            this.btnSHA1.TabIndex = 22;
-            this.btnSHA1.Text = "SHA1";
-            this.btnSHA1.UseVisualStyleBackColor = true;
-            this.btnSHA1.Click += new System.EventHandler(this.btnSHA1_Click);
-            // 
-            // btnSHA512
-            // 
-            this.btnSHA512.Location = new System.Drawing.Point(174, 320);
-            this.btnSHA512.Margin = new System.Windows.Forms.Padding(6);
-            this.btnSHA512.Name = "btnSHA512";
-            this.btnSHA512.Size = new System.Drawing.Size(150, 60);
-            this.btnSHA512.TabIndex = 25;
-            this.btnSHA512.Text = "SHA512";
-            this.btnSHA512.UseVisualStyleBackColor = true;
-            this.btnSHA512.Click += new System.EventHandler(this.btnSHA512_Click);
-            // 
-            // btnSHA384
-            // 
-            this.btnSHA384.Location = new System.Drawing.Point(12, 320);
-            this.btnSHA384.Margin = new System.Windows.Forms.Padding(6);
-            this.btnSHA384.Name = "btnSHA384";
-            this.btnSHA384.Size = new System.Drawing.Size(150, 60);
-            this.btnSHA384.TabIndex = 24;
-            this.btnSHA384.Text = "SHA384";
-            this.btnSHA384.UseVisualStyleBackColor = true;
-            this.btnSHA384.Click += new System.EventHandler(this.btnSHA384_Click);
-            // 
-            // FrmSecurity
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1738, 1258);
-            this.Controls.Add(this.btnExchange);
-            this.Controls.Add(this.gbPass);
-            this.Controls.Add(this.gbResult);
-            this.Controls.Add(this.gbSource);
-            this.Controls.Add(this.gbFunc);
-            this.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
-            this.Name = "FrmSecurity";
-            this.Text = "加密解密";
-            this.gbFunc.ResumeLayout(false);
-            this.gbSource.ResumeLayout(false);
-            this.gbResult.ResumeLayout(false);
-            this.gbPass.ResumeLayout(false);
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.GroupBox gbFunc;
-        private System.Windows.Forms.GroupBox gbSource;
-        private System.Windows.Forms.RichTextBox rtSource;
-        private System.Windows.Forms.GroupBox gbResult;
-        private System.Windows.Forms.RichTextBox rtResult;
-        private System.Windows.Forms.Button btnHex2;
-        private System.Windows.Forms.Button btnHex;
-        private System.Windows.Forms.Button btnB642;
-        private System.Windows.Forms.Button btnB64;
-        private System.Windows.Forms.Button btnMD52;
-        private System.Windows.Forms.Button btnMD5;
-        private System.Windows.Forms.Button btnCRC2;
-        private System.Windows.Forms.Button btnCRC;
-        private System.Windows.Forms.Button btnHtml2;
-        private System.Windows.Forms.Button btnHtml;
-        private System.Windows.Forms.Button btnUrl2;
-        private System.Windows.Forms.Button btnUrl;
-        private System.Windows.Forms.Button btnDSA2;
-        private System.Windows.Forms.Button btnDSA;
-        private System.Windows.Forms.Button btnRSA2;
-        private System.Windows.Forms.Button btnRSA;
-        private System.Windows.Forms.Button btnRC42;
-        private System.Windows.Forms.Button btnRC4;
-        private System.Windows.Forms.Button btnAES2;
-        private System.Windows.Forms.Button btnAES;
-        private System.Windows.Forms.Button btnDES2;
-        private System.Windows.Forms.Button btnDES;
-        private System.Windows.Forms.GroupBox gbPass;
-        private System.Windows.Forms.RichTextBox rtPass;
-        private System.Windows.Forms.Button btnExchange;
-        private System.Windows.Forms.Button btnSHA512;
-        private System.Windows.Forms.Button btnSHA384;
-        private System.Windows.Forms.Button btnSHA256;
-        private System.Windows.Forms.Button btnSHA1;
-    }
-}
\ No newline at end of file
diff --git a/XCoder/Tools/FrmSecurity.cs b/XCoder/Tools/FrmSecurity.cs
deleted file mode 100644
index a8b1a95dd2..0000000000
--- a/XCoder/Tools/FrmSecurity.cs
+++ /dev/null
@@ -1,343 +0,0 @@
-﻿using System;
-using System.ComponentModel;
-using System.Linq;
-using System.Security.Cryptography;
-using System.Text;
-using System.Web;
-using System.Windows.Forms;
-using NewLife.Security;
-
-namespace XCoder.Tools
-{
-    [DisplayName("加密解密")]
-    public partial class FrmSecurity : Form, IXForm
-    {
-        public FrmSecurity()
-        {
-            InitializeComponent();
-
-            // 动态调节宽度高度，兼容高DPI
-            this.FixDpi();
-        }
-
-        #region 辅助
-        /// <summary>从字符串中获取字节数组</summary>
-        /// <param name="str"></param>
-        /// <returns></returns>
-        private Byte[] GetBytes(String str)
-        {
-            if (str.IsNullOrEmpty()) return new Byte[0];
-
-            try
-            {
-                return str.ToHex();
-            }
-            catch { }
-
-            try
-            {
-                return str.ToBase64();
-            }
-            catch { }
-
-            return str.GetBytes();
-        }
-
-        /// <summary>从原文中获取字节数组</summary>
-        /// <returns></returns>
-        private Byte[] GetBytes()
-        {
-            var v = rtSource.Text;
-            return GetBytes(v);
-        }
-
-        private void SetResult(params String[] rs)
-        {
-            var sb = new StringBuilder();
-            foreach (var item in rs)
-            {
-                if (sb.Length > 0)
-                {
-                    sb.AppendLine();
-                    sb.AppendLine();
-                }
-                sb.Append(item);
-            }
-            rtResult.Text = sb.ToString();
-        }
-
-        private void SetResult(Byte[] data)
-        {
-            SetResult("/*HEX编码、Base64编码、Url改进Base64编码*/", data.ToHex(), data.ToBase64(), data.ToUrlBase64());
-        }
-
-        private void SetResult2(Byte[] data)
-        {
-            SetResult("/*字符串、HEX编码、Base64编码*/", data.ToStr(), data.ToHex(), data.ToBase64());
-        }
-        #endregion
-
-        private void btnExchange_Click(Object sender, EventArgs e)
-        {
-            var v = rtSource.Text;
-            var v2 = rtResult.Text;
-            // 结果区只要第一行
-            if (!v2.IsNullOrEmpty())
-            {
-                var ss = v2.Split("\n");
-                var n = 0;
-                if (ss.Length > n + 1 && ss[n].StartsWith("/*") && ss[n].EndsWith("*/")) n++;
-                v2 = ss[n];
-            }
-            rtSource.Text = v2;
-            rtResult.Text = v;
-        }
-
-        private void btnHex_Click(Object sender, EventArgs e)
-        {
-            var buf = GetBytes();
-            //rtResult.Text = buf.ToHex(" ", 32);
-            SetResult(buf.ToHex(), buf.ToHex(" ", 32), buf.ToHex("-", 32));
-        }
-
-        private void btnHex2_Click(Object sender, EventArgs e)
-        {
-            var v = rtSource.Text;
-            rtResult.Text = v.ToHex().ToStr();
-        }
-
-        private void btnB64_Click(Object sender, EventArgs e)
-        {
-            var buf = GetBytes();
-            //rtResult.Text = buf.ToBase64();
-            SetResult(buf.ToBase64(), buf.ToUrlBase64());
-        }
-
-        private void btnB642_Click(Object sender, EventArgs e)
-        {
-            var v = rtSource.Text;
-            //rtResult.Text = v.ToBase64().ToStr();
-            var buf = v.ToBase64();
-            //rtResult.Text = buf.ToStr() + Environment.NewLine + buf.ToHex();
-            SetResult(buf.ToStr(), buf.ToHex());
-        }
-
-        private void btnMD5_Click(Object sender, EventArgs e)
-        {
-            var buf = GetBytes();
-            var str = buf.MD5().ToHex();
-            rtResult.Text = str.ToUpper() + Environment.NewLine + str.ToLower();
-        }
-
-        private void btnMD52_Click(Object sender, EventArgs e)
-        {
-            var buf = GetBytes();
-            var str = buf.MD5().ToHex(0, 8);
-            rtResult.Text = str.ToUpper() + Environment.NewLine + str.ToLower();
-        }
-
-        private void btnSHA1_Click(Object sender, EventArgs e)
-        {
-            var buf = GetBytes();
-            var key = GetBytes(rtPass.Text);
-
-            buf = buf.SHA1(key);
-            SetResult(buf);
-        }
-
-        private void btnSHA256_Click(Object sender, EventArgs e)
-        {
-            var buf = GetBytes();
-            var key = GetBytes(rtPass.Text);
-
-            buf = buf.SHA256(key);
-            SetResult(buf);
-        }
-
-        private void btnSHA384_Click(Object sender, EventArgs e)
-        {
-            var buf = GetBytes();
-            var key = GetBytes(rtPass.Text);
-
-            buf = buf.SHA384(key);
-            SetResult(buf);
-        }
-
-        private void btnSHA512_Click(Object sender, EventArgs e)
-        {
-            var buf = GetBytes();
-            var key = GetBytes(rtPass.Text);
-
-            buf = buf.SHA512(key);
-            SetResult(buf);
-        }
-
-        private void btnCRC_Click(Object sender, EventArgs e)
-        {
-            var buf = GetBytes();
-            rtResult.Text = "{0:X8}\r\n{0}".F(buf.Crc());
-        }
-
-        private void btnCRC2_Click(Object sender, EventArgs e)
-        {
-            var buf = GetBytes();
-            rtResult.Text = "{0:X4}\r\n{0}".F(buf.Crc16());
-        }
-
-        private void btnDES_Click(Object sender, EventArgs e)
-        {
-            var buf = GetBytes();
-            var pass = GetBytes(rtPass.Text);
-
-            var des = new DESCryptoServiceProvider();
-            buf = des.Encrypt(buf, pass);
-
-            SetResult(buf);
-        }
-
-        private void btnDES2_Click(Object sender, EventArgs e)
-        {
-            var buf = GetBytes();
-            var pass = GetBytes(rtPass.Text);
-
-            var des = new DESCryptoServiceProvider();
-            buf = des.Descrypt(buf, pass);
-
-            SetResult2(buf);
-        }
-
-        private void btnAES_Click(Object sender, EventArgs e)
-        {
-            var buf = GetBytes();
-            var pass = GetBytes(rtPass.Text);
-
-            var aes = new AesCryptoServiceProvider();
-            buf = aes.Encrypt(buf, pass);
-
-            SetResult(buf);
-        }
-
-        private void btnAES2_Click(Object sender, EventArgs e)
-        {
-            var buf = GetBytes();
-            var pass = GetBytes(rtPass.Text);
-
-            var aes = new AesCryptoServiceProvider();
-            buf = aes.Descrypt(buf, pass);
-
-            SetResult2(buf);
-        }
-
-        private void btnRC4_Click(Object sender, EventArgs e)
-        {
-            var buf = GetBytes();
-            var pass = GetBytes(rtPass.Text);
-            buf = buf.RC4(pass);
-
-            SetResult(buf);
-        }
-
-        private void btnRC42_Click(Object sender, EventArgs e)
-        {
-            var buf = GetBytes();
-            var pass = GetBytes(rtPass.Text);
-            buf = buf.RC4(pass);
-
-            SetResult2(buf);
-        }
-
-        private void btnRSA_Click(Object sender, EventArgs e)
-        {
-            var buf = GetBytes();
-            var key = rtPass.Text;
-
-            if (key.Length < 100)
-            {
-                key = RSAHelper.GenerateKey().First();
-                rtPass.Text = key;
-            }
-
-            buf = RSAHelper.Encrypt(buf, key);
-
-            SetResult(buf);
-        }
-
-        private void btnRSA2_Click(Object sender, EventArgs e)
-        {
-            var buf = GetBytes();
-            var pass = rtPass.Text;
-
-            try
-            {
-                buf = RSAHelper.Decrypt(buf, pass, true);
-            }
-            catch (CryptographicException)
-            {
-                // 换一种填充方式
-                buf = RSAHelper.Decrypt(buf, pass, false);
-            }
-
-            SetResult2(buf);
-        }
-
-        private void btnDSA_Click(Object sender, EventArgs e)
-        {
-            var buf = GetBytes();
-            var key = rtPass.Text;
-
-            if (key.Length < 100)
-            {
-                key = DSAHelper.GenerateKey().First();
-                rtPass.Text = key;
-            }
-
-            buf = DSAHelper.Sign(buf, key);
-
-            SetResult(buf);
-        }
-
-        private void btnDSA2_Click(Object sender, EventArgs e)
-        {
-            var buf = GetBytes();
-            var pass = rtPass.Text;
-
-            var v = rtResult.Text;
-            if (v.Contains("\n\n")) v = v.Substring(null, "\n\n");
-            var sign = GetBytes(v);
-
-            var rs = DSAHelper.Verify(buf, pass, sign);
-            if (rs)
-                MessageBox.Show("验证通过", "DSA数字签名", MessageBoxButtons.OK, MessageBoxIcon.Information);
-            else
-                MessageBox.Show("验证失败", "DSA数字签名", MessageBoxButtons.OK, MessageBoxIcon.Error);
-        }
-
-        private void btnUrl_Click(Object sender, EventArgs e)
-        {
-            var v = rtSource.Text;
-            v = HttpUtility.UrlEncode(v);
-            rtResult.Text = v;
-        }
-
-        private void btnUrl2_Click(Object sender, EventArgs e)
-        {
-            var v = rtSource.Text;
-            v = HttpUtility.UrlDecode(v);
-            rtResult.Text = v;
-        }
-
-        private void btnHtml_Click(Object sender, EventArgs e)
-        {
-            var v = rtSource.Text;
-            v = HttpUtility.HtmlEncode(v);
-            rtResult.Text = v;
-        }
-
-        private void btnHtml2_Click(Object sender, EventArgs e)
-        {
-            var v = rtSource.Text;
-            v = HttpUtility.HtmlDecode(v);
-            rtResult.Text = v;
-        }
-    }
-}
\ No newline at end of file
diff --git a/XCoder/Tools/FrmSecurity.resx b/XCoder/Tools/FrmSecurity.resx
deleted file mode 100644
index 29dcb1b3a3..0000000000
--- a/XCoder/Tools/FrmSecurity.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file
diff --git a/XCoder/UpdateInfo.txt b/XCoder/UpdateInfo.txt
deleted file mode 100644
index 49a7da2a32..0000000000
--- a/XCoder/UpdateInfo.txt
+++ /dev/null
@@ -1,119 +0,0 @@
-﻿v6.9.2017.0101   增加消息调试工具，支持调试网络库的消息收发功能
-
-v6.8.2016.0504   增加操作语音提示和语音识别辅助操作
-
-v6.7.2016.0418   异步加载子工具，支持外部FrmMain窗体
-
-v6.5.2015.0701   升级自动更新机制，从网站自动更新
-
-v6.4.2015.0519   改进串口调试工具，显示设备友好名
-
-v6.3.2015.0511   改进网络调试工具，列出网络库的所有网络服务器
-
-v6.2.2014.1225   增加网络调试工具，支持TCP/UDP混合，支持内置基础网络服务协议解析
-
-v6.1.2014.0907   串口工具XCOM以十六进制输出时，可以选择是否自动换行
-
-v6.0.2014.0514   使用模版文件本身的文件编码来作为输出文件的编码，默认UTF8
-
-v6.0.2014.0419   打开码神工具时，默认打开最后一次打开的工具，由配置据诶的那个而不是由名称决定
-                 重构串口调试工具，简约风格
-
-v6.0.2014.0410   根据文件名决定XCoder打开哪个工具
-
-v6.0.2013.1211   命令行调用XCoder生成代码支持指定日志文件路径
-
-v6.0.2013.0919   合并数据建模工具、正则测试工具、通讯调试工具、图标水印处理工具
-
-v5.1.2013.0906   更新扩展查询模版，默认的FindByxx/FindAllByxx函数里面，缓存查找采用__.xx名称，而不要用_.xx，后面默认得到字段名，不适合内存查找
-
-v5.1.2013.0307   增强数据模型，生成代码时可使用$(属性名)作为输出路径的一部分，支持IDataTable的属性和扩展属性（主要）
-
-v5.0.2012.1117   增加T4引导模版，用于在实体类项目中通过命令行调用XCoder生成代码
-
-v4.9.2012.1112   数据模型升级，需要更新所有模版
-                 模版引擎生成太快，不再需要后台生成
-                 改变模版头编辑的位置
-                 增加论坛帖子引用
-
-v4.8.2012.0731   升级前备份配置文件，升级后恢复
-
-v4.8.2012.0526   支持自动探测SqlCe数据库
-
-v4.8.2012.0516   采用新的数据模型格式化架构，优化表名及字段名的生成
-
-v4.7.2012.0320   调整拥挤的主界面，删除不需要的元素
-                 调整自动更新，支持组件和源代码的同步升级
-
-v4.6.2012.0113   代码生成器提供生成建表语句，建库语句，还有直接建库的功能
-
-v4.5.2011.1108   配合实体访问器和CommonEntity，增加第三代管理页面模版
-
-v4.4.2011.1031   增加查询分析器
-
-v4.3.2011.0915   增加数据表架构，比如Access，可以从中识别字段是否自增
-
-v4.3.2011.0913   增加是否生成泛型实体类的设置
-
-v4.2.2011.0911   分离架构信息管理和模型管理，允许编辑模型
-
-v4.2.2011.0909   支持内部模版，也支持外部文件模版，支持释放内部模版
-
-v4.2.2011.0908   修正代码生成时更改输出目录后无效的BUG
-                 完善各个模版
-                 更改模版存放方式，直接从嵌入资源读取，不再释放
-                 增加一个设置项Config.BaseClass，允许指定实体类的基类
-                 增加数据架构管理功能
-
-v4.1.2011.0902   修改自动更新逻辑，先下载，再询问是否更新
-                 改善自动发现机制，自动发现本地SQLite和Access文件
-                 增加自动在线翻译功能，调用Bing翻译
-
-v4.1.2011.0906   修正生成时不能自动创建输出目录的错误
-                 数据表选择支持显示中文描述
-
-v4.0.2011.0829   升级XCode到v8
-                 增加自动更新功能
-                 删除代码视图
-                 集成www.7765.com在线音乐
-                 增加自动在线翻译功能，调用Bing翻译
-
-v3.4.2011.0329   修正自动尝试加载表时的错误
-                 更新实体模版，以兼容最新版本的XCode v7.5
-
-v3.4.2011.0316   升级模版引擎XTemplate，大大提高模版处理性能
-
-v3.4.2011.0311   XCode升级到最新版本，增加数据库支持
-
-v3.3.2011.0117   增加实体模版和页面模版，改变以前的生成模式（由一个表四次改为两次）
-                 使用新的控件GridViewExtend和自定义表单EntityForm
-
-v3.2.2010.1014   增加是否使用文件模版头的设置
-                 更新模版引擎到v1.3，取消对模版的换行优化处理
-                 增加第二套表单模版
-
-v3.1.2010.1009   增加文件头
-                 使用新的模版引擎
-
-v3.0.2010.0928   更新模版引擎
-
-v2.4.2010.0128   增加等号支持
-
-v2.3.2009.1013   XCode数据架构升级
-
-v2.2.2009.0714   修正待替换内容（如默认值）含有双引号而待替换标签前后又有双引号时，没有正确处理双引号的问题
-
-v2.1.2009.0623   增加对Oracle的支持
-
-v2.0.2009.0611   增加中文文件名配置，直接生成中文文件名的类
-                 每次生成表时，重新从数据库取构架信息
-
-v1.9.2009.0519   处理以类名开头的属性名后，再次纠正属性名
-
-v1.8.2009.0330   属性名等于类名时，自动增加后缀0
-                 属性名等于item时，自动增加后缀0
-                 属性名以类名开头时，自动去除
-                 代码查看框随着窗体最大化自动扩展
-                 修正链接名错误使用当前链接名而不是填写的链接名的错误
-
-v1.7.2009.0321   加载所有表时，按表名排序
\ No newline at end of file
diff --git a/XCoder/Windows/FrmItems.Designer.cs b/XCoder/Windows/FrmItems.Designer.cs
deleted file mode 100644
index edcd1cdec0..0000000000
--- a/XCoder/Windows/FrmItems.Designer.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-﻿namespace XCoder
-{
-    partial class FrmItems
-    {
-        /// <summary>Required designer variable.</summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>Clean up any resources being used.</summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.dataGridView1 = new System.Windows.Forms.DataGridView();
-            this.propertyGrid1 = new System.Windows.Forms.PropertyGrid();
-            this.button1 = new System.Windows.Forms.Button();
-            this.label1 = new System.Windows.Forms.Label();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // dataGridView1
-            // 
-            this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dataGridView1.Location = new System.Drawing.Point(12, 69);
-            this.dataGridView1.Name = "dataGridView1";
-            this.dataGridView1.RowTemplate.Height = 23;
-            this.dataGridView1.Size = new System.Drawing.Size(566, 264);
-            this.dataGridView1.TabIndex = 0;
-            this.dataGridView1.RowEnter += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_RowEnter);
-            // 
-            // propertyGrid1
-            // 
-            this.propertyGrid1.Location = new System.Drawing.Point(584, 12);
-            this.propertyGrid1.Name = "propertyGrid1";
-            this.propertyGrid1.Size = new System.Drawing.Size(195, 321);
-            this.propertyGrid1.TabIndex = 1;
-            // 
-            // button1
-            // 
-            this.button1.Location = new System.Drawing.Point(12, 22);
-            this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(91, 29);
-            this.button1.TabIndex = 2;
-            this.button1.Text = "保存";
-            this.button1.UseVisualStyleBackColor = true;
-            this.button1.Click += new System.EventHandler(this.button1_Click);
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(139, 30);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(221, 12);
-            this.label1.TabIndex = 3;
-            this.label1.Text = "此处仅对XConfig中的Items属性进行编辑";
-            // 
-            // FrmItems
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(791, 345);
-            this.Controls.Add(this.label1);
-            this.Controls.Add(this.button1);
-            this.Controls.Add(this.propertyGrid1);
-            this.Controls.Add(this.dataGridView1);
-            this.Name = "FrmItems";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "扩展属性编辑";
-            this.Load += new System.EventHandler(this.FrmItems_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.DataGridView dataGridView1;
-        private System.Windows.Forms.PropertyGrid propertyGrid1;
-        private System.Windows.Forms.Button button1;
-        private System.Windows.Forms.Label label1;
-    }
-}
\ No newline at end of file
diff --git a/XCoder/Windows/FrmItems.cs b/XCoder/Windows/FrmItems.cs
deleted file mode 100644
index acfdfa79a8..0000000000
--- a/XCoder/Windows/FrmItems.cs
+++ /dev/null
@@ -1,149 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Windows.Forms;
-
-namespace XCoder
-{
-    public partial class FrmItems : Form
-    {
-        #region 属性
-        private Dictionary<String, String> _Dic;
-        /// <summary>数据字典</summary>
-        public Dictionary<String, String> Dic
-        {
-            get { return _Dic; }
-            set { _Dic = value; }
-        }
-
-        private ModelConfig _XConfig;
-        /// <summary>配置信息</summary>
-        public ModelConfig XConfig
-        {
-            get { return _XConfig; }
-            set { _XConfig = value; }
-        }
-
-        #endregion
-
-        #region 初始化
-
-        public FrmItems()
-        {
-            InitializeComponent();
-
-            Icon = Source.GetIcon();
-        }
-
-        /// <summary>初始化界面</summary>
-        /// <param name="dic"></param>
-        /// <returns></returns>
-        public static FrmItems Create(Dictionary<String, String> dic)
-        {
-            var item = new FrmItems();
-
-            if (dic == null) item.CreatDic();
-            else
-                item.Dic = dic;
-
-            return item;
-        }
-
-        /// <summary>初始化界面</summary>
-        /// <param name="xconfig"></param>
-        /// <returns></returns>
-        public static FrmItems Create(ModelConfig xconfig)
-        {
-            var item = new FrmItems();
-
-            if (xconfig == null) throw new Exception("配置信息异常");
-
-            item.XConfig = xconfig;
-
-            if (xconfig.Items == null) item.CreatDic();
-            else
-                item.Dic = xconfig.Items;
-
-            return item;
-        }
-
-        /// <summary>初始化字典</summary>
-        private void CreatDic()
-        {
-            var dic = new Dictionary<String, String>();
-            dic.Add("key", "value");
-            Dic = dic;
-
-        }
-
-        #endregion
-
-        #region 加载
-        //加载
-        void SetDic(Dictionary<String, String> dic)
-        {
-            var columns = dataGridView1.Columns;
-            columns.Add("key", "键");
-            columns.Add("value", "值");
-
-            foreach (var item in dic)
-            {
-                var rows = dataGridView1.Rows;
-                rows.Add(item.Key, item.Value);
-            }
-        }
-
-        //获取当前的DIC
-        void LoadDic()
-        {
-
-        }
-        #endregion
-
-        #region 添加/删除数据
-
-        void AddItems()
-        {
-            var rows = dataGridView1.Rows;
-            var column = dataGridView1.Columns;
-
-            for (var i = 0; i < rows.Count-1; i++)
-            {
-                XConfig.Items.Add(rows[i].Cells[0].Value.ToString(), rows[i].Cells[1].Value.ToString());
-            }
-
-            XConfig.Save();
-
-        }
-
-        void DeleteItems()
-        {
-
-        }
-
-        #endregion
-
-        private void FrmItems_Load(Object sender, EventArgs e)
-        {
-            SetDic(Dic);
-        }
-
-        private void dataGridView1_RowEnter(Object sender, DataGridViewCellEventArgs e)
-        {
-            //if(e.RowIndex<0) return ;
-
-            //DataGridView dgv=sender as DataGridView;
-            //if (dgv == null) return;
-
-            //DataGridViewRow row = dgv.Rows[e.RowIndex];
-            //if (row == null) return;
-
-            //propertyGrid1.SelectedObject = row.Cells;
-        }
-
-        private void button1_Click(Object sender, EventArgs e)
-        {
-            AddItems();
-        }
-
-    }
-}
diff --git a/XCoder/Windows/FrmItems.resx b/XCoder/Windows/FrmItems.resx
deleted file mode 100644
index 5ea0895e32..0000000000
--- a/XCoder/Windows/FrmItems.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file
diff --git a/XCoder/Windows/FrmMain.cs b/XCoder/Windows/FrmMain.cs
deleted file mode 100644
index 3ef5ff0331..0000000000
--- a/XCoder/Windows/FrmMain.cs
+++ /dev/null
@@ -1,825 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Data.Common;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using NewLife.Log;
-using NewLife.Net;
-using NewLife.Reflection;
-using XCode.DataAccessLayer;
-using XTemplate.Templating;
-#if !NET4
-using TaskEx = System.Threading.Tasks.Task;
-#endif
-
-namespace XCoder
-{
-    [DisplayName("数据建模工具")]
-    public partial class FrmMain : Form, IXForm
-    {
-        #region 属性
-        /// <summary>配置</summary>
-        public static ModelConfig Config { get { return ModelConfig.Current; } }
-
-        private Engine _Engine;
-        /// <summary>生成器</summary>
-        Engine Engine
-        {
-            get { return _Engine ?? (_Engine = new Engine(Config)); }
-            set { _Engine = value; }
-        }
-        #endregion
-
-        #region 界面初始化
-        public FrmMain()
-        {
-            InitializeComponent();
-
-            // 动态调节宽度高度，兼容高DPI
-            this.FixDpi();
-
-            Icon = IcoHelper.GetIcon("模型");
-
-            AutoLoadTables(Config.ConnName);
-        }
-
-        private void FrmMain_Shown(Object sender, EventArgs e)
-        {
-            //var asm = AssemblyX.Create(Assembly.GetExecutingAssembly());
-            //Text = String.Format("新生命数据模型工具 v{0} {1:HH:mm:ss}编译", asm.CompileVersion, asm.Compile);
-        }
-
-        private void FrmMain_Load(Object sender, EventArgs e)
-        {
-            LoadConfig();
-
-            try
-            {
-                SetDatabaseList(DAL.ConnStrs.Keys.ToList());
-
-                BindTemplate(cb_Template);
-            }
-            catch (Exception ex)
-            {
-                XTrace.WriteException(ex);
-            }
-
-            LoadConfig();
-
-            Task.Factory.StartNew(AutoDetectDatabase).LogException();
-        }
-
-        private void FrmMain_FormClosing(Object sender, FormClosingEventArgs e)
-        {
-            try
-            {
-                SaveConfig();
-            }
-            catch { }
-        }
-        #endregion
-
-        #region 连接、自动检测数据库、加载表
-        private void bt_Connection_Click(Object sender, EventArgs e)
-        {
-            SaveConfig();
-
-            if (bt_Connection.Text == "连接")
-            {
-                Engine = null;
-                LoadTables();
-
-                gbConnect.Enabled = false;
-                gbTable.Enabled = true;
-                模型ToolStripMenuItem.Visible = true;
-                架构管理SToolStripMenuItem.Visible = true;
-                //btnImport.Enabled = false;
-                btnImport.Text = "导出模型";
-                bt_Connection.Text = "断开";
-                btnRefreshTable.Enabled = true;
-            }
-            else
-            {
-                SetTables(null);
-
-                gbConnect.Enabled = true;
-                gbTable.Enabled = false;
-                模型ToolStripMenuItem.Visible = false;
-                架构管理SToolStripMenuItem.Visible = false;
-                btnImport.Enabled = true;
-                btnImport.Text = "导入模型";
-                bt_Connection.Text = "连接";
-                btnRefreshTable.Enabled = false;
-                Engine = null;
-
-                // 断开的时候再取一次，确保下次能及时得到新的
-                TaskEx.Run(() => DAL.Create(Config.ConnName).Tables);
-            }
-        }
-
-        private void cbConn_SelectionChangeCommitted(Object sender, EventArgs e)
-        {
-            if (!String.IsNullOrEmpty(cbConn.Text)) toolTip1.SetToolTip(cbConn, DAL.Create(cbConn.Text).ConnStr);
-
-            AutoLoadTables(cbConn.Text);
-
-            if (String.IsNullOrEmpty(cb_Template.Text)) cb_Template.Text = cbConn.Text;
-            if (String.IsNullOrEmpty(txt_OutPath.Text)) txt_OutPath.Text = cbConn.Text;
-            if (String.IsNullOrEmpty(txt_NameSpace.Text)) txt_NameSpace.Text = cbConn.Text;
-        }
-
-        void AutoDetectDatabase()
-        {
-            // 加上本机MSSQL
-            var localName = "local_MSSQL";
-            var localstr = "Data Source=.;Initial Catalog=master;Integrated Security=True;";
-            if (!ContainConnStr(localstr)) DAL.AddConnStr(localName, localstr, null, "mssql");
-
-            // 检测本地Access和SQLite
-            Task.Factory.StartNew(DetectFile, TaskCreationOptions.LongRunning).LogException();
-
-            //!!! 必须另外实例化一个列表，否则作为数据源绑定时，会因为是同一个对象而被跳过
-            //var list = new List<String>();
-
-            // 探测连接中的其它库
-            Task.Factory.StartNew(DetectRemote, TaskCreationOptions.LongRunning).LogException();
-        }
-
-        void DetectFile()
-        {
-            var sw = Stopwatch.StartNew();
-
-            var n = 0;
-            var ss = Directory.GetFiles(AppDomain.CurrentDomain.BaseDirectory, "*.*", SearchOption.TopDirectoryOnly);
-            foreach (var item in ss)
-            {
-                var ext = Path.GetExtension(item);
-                //if (ext.EqualIC(".exe")) continue;
-                //if (ext.EqualIC(".dll")) continue;
-                //if (ext.EqualIC(".zip")) continue;
-                //if (ext.EqualIC(".rar")) continue;
-                //if (ext.EqualIC(".txt")) continue;
-                //if (ext.EqualIC(".config")) continue;
-                if (ext.EqualIgnoreCase(".exe", ".dll", ".zip", ".rar", ".txt", ".config")) continue;
-
-                try
-                {
-                    if (DetectFileDb(item)) n++;
-                }
-                catch (Exception ex) { XTrace.WriteException(ex); }
-            }
-
-            sw.Stop();
-            XTrace.WriteLine("自动检测文件{0}个，发现数据库{1}个，耗时：{2}！", ss.Length, n, sw.Elapsed);
-
-            var list = new List<String>();
-            foreach (var item in DAL.ConnStrs)
-            {
-                if (!String.IsNullOrEmpty(item.Value)) list.Add(item.Key);
-            }
-
-            // 远程数据库耗时太长，这里先列出来
-            this.Invoke(SetDatabaseList, list);
-        }
-
-        Boolean DetectFileDb(String item)
-        {
-            var access = "Standard Jet DB";
-            var sqlite = "SQLite";
-
-            using (var fs = new FileStream(item, FileMode.Open, FileAccess.Read, FileShare.Read))
-            {
-                if (fs.Length <= 0) return false;
-
-                var reader = new BinaryReader(fs);
-                var bts = reader.ReadBytes(sqlite.Length);
-                if (bts != null && bts.Length > 0)
-                {
-                    if (bts[0] == 'S' && bts[1] == 'Q' && Encoding.ASCII.GetString(bts) == sqlite)
-                    {
-                        var localstr = String.Format("Data Source={0};", item);
-                        if (!ContainConnStr(localstr)) DAL.AddConnStr("SQLite_" + Path.GetFileNameWithoutExtension(item), localstr, null, "SQLite");
-                        return true;
-                    }
-                    else if (bts.Length > 5 && bts[4] == 'S' && bts[5] == 't')
-                    {
-                        fs.Seek(4, SeekOrigin.Begin);
-                        bts = reader.ReadBytes(access.Length);
-                        if (Encoding.ASCII.GetString(bts) == access)
-                        {
-                            var localstr = String.Format("Provider=Microsoft.Jet.OLEDB.4.0; Data Source={0};Persist Security Info=False", item);
-                            if (!ContainConnStr(localstr)) DAL.AddConnStr("Access_" + Path.GetFileNameWithoutExtension(item), localstr, null, "Access");
-                            return true;
-                        }
-                    }
-                }
-
-                if (fs.Length > 20)
-                {
-                    fs.Seek(16, SeekOrigin.Begin);
-                    var ver = reader.ReadInt32();
-                    if (ver == 0x73616261 ||
-                        ver == 0x002dd714 ||
-                        ver == 0x00357b9d ||
-                        ver == 0x003d0900
-                        )
-                    {
-                        var localstr = String.Format("Data Source={0};", item);
-                        if (!ContainConnStr(localstr)) DAL.AddConnStr("SqlCe_" + Path.GetFileNameWithoutExtension(item), localstr, null, "SqlCe");
-                        return true;
-                    }
-                }
-            }
-
-            return false;
-        }
-
-        void DetectSqlServer(Object state)
-        {
-            var item = (String)state;
-            try
-            {
-                var dal = DAL.Create(item);
-                if (dal.DbType != DatabaseType.SqlServer) return;
-
-                var sw = Stopwatch.StartNew();
-
-                DataTable dt = null;
-
-                // 列出所有数据库
-                //Boolean old = DAL.ShowSQL;
-                //DAL.ShowSQL = false;
-                //try
-                //{
-                if (dal.Db.CreateMetaData().MetaDataCollections.Contains("Databases"))
-                {
-                    dt = dal.Db.CreateSession().GetSchema("Databases", null);
-                }
-                //}
-                //finally { DAL.ShowSQL = old; }
-
-                if (dt == null) return;
-
-                var dbprovider = dal.DbType.ToString();
-                var builder = new DbConnectionStringBuilder();
-                builder.ConnectionString = dal.ConnStr;
-
-                // 统计库名
-                var n = 0;
-                var names = new List<String>();
-                var sysdbnames = new String[] { "master", "tempdb", "model", "msdb" };
-                foreach (DataRow dr in dt.Rows)
-                {
-                    var dbname = dr[0].ToString();
-                    if (Array.IndexOf(sysdbnames, dbname) >= 0) continue;
-
-                    var connName = String.Format("{0}_{1}", item, dbname);
-
-                    builder["Database"] = dbname;
-                    DAL.AddConnStr(connName, builder.ToString(), null, dbprovider);
-                    n++;
-
-                    try
-                    {
-                        var ver = dal.Db.ServerVersion;
-                        names.Add(connName);
-                    }
-                    catch
-                    {
-                        if (DAL.ConnStrs.ContainsKey(connName)) DAL.ConnStrs.Remove(connName);
-                    }
-                }
-
-
-                sw.Stop();
-                XTrace.WriteLine("发现远程数据库{0}个，耗时：{1}！", n, sw.Elapsed);
-
-                if (names != null && names.Count > 0)
-                {
-                    var list = new List<String>();
-                    foreach (var elm in DAL.ConnStrs)
-                    {
-                        if (!String.IsNullOrEmpty(elm.Value)) list.Add(elm.Key);
-                    }
-                    list.AddRange(names);
-
-                    this.Invoke(SetDatabaseList, list);
-                }
-            }
-            catch
-            {
-                //if (item == localName) DAL.ConnStrs.Remove(localName);
-            }
-        }
-
-        void DetectRemote()
-        {
-            var list = new List<String>();
-            foreach (var item in DAL.ConnStrs)
-            {
-                if (!String.IsNullOrEmpty(item.Value)) list.Add(item.Key);
-            }
-
-            var localName = "local_MSSQL";
-            foreach (var item in list)
-            {
-                Task.Factory.StartNew(DetectSqlServer, item);
-            }
-
-            if (DAL.ConnStrs.ContainsKey(localName)) DAL.ConnStrs.Remove(localName);
-            //if (list.Contains(localName)) list.Remove(localName);
-        }
-
-        Boolean ContainConnStr(String connstr)
-        {
-            foreach (var item in DAL.ConnStrs)
-            {
-                if (connstr.EqualIgnoreCase(item.Value)) return true;
-            }
-            return false;
-        }
-
-        void SetDatabaseList(List<String> list)
-        {
-            var str = cbConn.Text;
-
-            cbConn.DataSource = list;
-            //cbConn.DisplayMember = "value";
-
-            if (!String.IsNullOrEmpty(str)) cbConn.Text = str;
-
-            if (!String.IsNullOrEmpty(Config.ConnName))
-            {
-                cbConn.SelectedText = Config.ConnName;
-            }
-
-            if (cbConn.SelectedIndex < 0 && cbConn.Items != null && cbConn.Items.Count > 0) cbConn.SelectedIndex = 0;
-        }
-
-        void LoadTables()
-        {
-            TaskEx.Run(() =>
-            {
-                try
-                {
-                    var list = DAL.Create(Config.ConnName).Tables;
-                    if (!cbIncludeView.Checked) list = list.Where(t => !t.IsView).ToList();
-                    //if (Config.NeedFix) list = Engine.FixTable(list);
-                    Engine.Tables = list;
-                }
-                catch (Exception ex)
-                {
-                    MessageBox.Show(ex.ToString(), Text);
-                    return;
-                }
-
-                this.Invoke(() =>
-                {
-                    SetTables(null);
-                    SetTables(Engine.Tables);
-                });
-            });
-        }
-
-        void SetTables(Object source)
-        {
-            if (source == null)
-            {
-                cbTableList.DataSource = source;
-                cbTableList.Items.Clear();
-                return;
-            }
-            var list = source as List<IDataTable>;
-            if (list[0].DbType == DatabaseType.SqlServer) // 增加对SqlServer 2000的特殊处理  ahuang
-            {
-                //list.Remove(list.Find(delegate(IDataTable p) { return p.Name == "dtproperties"; }));
-                //list.Remove(list.Find(delegate(IDataTable p) { return p.Name == "sysconstraints"; }));
-                //list.Remove(list.Find(delegate(IDataTable p) { return p.Name == "syssegments"; }));
-                //list.RemoveAll(delegate(IDataTable p) { return p.Description.Contains("[0E232FF0-B466-"); });
-                list.RemoveAll(dt => dt.Name == "dtproperties" || dt.Name == "sysconstraints" || dt.Name == "syssegments" || dt.Description.Contains("[0E232FF0-B466-"));
-            }
-
-            // 设置前最好清空，否则多次设置数据源会用第一次绑定控件，然后实际数据是最后一次
-            //cbTableList.DataSource = source;
-            cbTableList.Items.Clear();
-            if (source != null)
-            {
-                // 表名排序
-                var tables = source as List<IDataTable>;
-                if (tables == null)
-                    cbTableList.DataSource = source;
-                else
-                {
-                    tables.Sort((t1, t2) => t1.Name.CompareTo(t2.Name));
-                    cbTableList.DataSource = tables;
-                }
-                ////cbTableList.DisplayMember = "Name";
-                //cbTableList.ValueMember = "Name";
-            }
-            cbTableList.Update();
-        }
-
-        void AutoLoadTables(String name)
-        {
-            if (String.IsNullOrEmpty(name)) return;
-            if (!DAL.ConnStrs.TryGetValue(name, out var connstr) || connstr.IsNullOrWhiteSpace()) return;
-
-            // 异步加载
-            Task.Factory.StartNew(() => { var tables = DAL.Create(name).Tables; }).LogException();
-        }
-
-        private void btnRefreshTable_Click(Object sender, EventArgs e)
-        {
-            LoadTables();
-        }
-        #endregion
-
-        #region 生成
-        Stopwatch sw = new Stopwatch();
-        private void bt_GenTable_Click(Object sender, EventArgs e)
-        {
-            SaveConfig();
-
-            if (cb_Template.SelectedValue == null || cbTableList.SelectedValue == null) return;
-
-            var table = cbTableList.SelectedValue as IDataTable;
-            if (table == null) return;
-
-            sw.Reset();
-            sw.Start();
-
-            try
-            {
-                var ss = Engine.Render(table);
-
-                MessageBox.Show("生成" + table + "成功！", "成功", MessageBoxButtons.OK, MessageBoxIcon.Information);
-            }
-            catch (TemplateException ex)
-            {
-                MessageBox.Show(ex.Message, "模版错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.ToString(), Text, MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-
-            sw.Stop();
-            lb_Status.Text = "生成 " + cbTableList.Text + " 完成！耗时：" + sw.Elapsed;
-        }
-
-        private void bt_GenAll_Click(Object sender, EventArgs e)
-        {
-            SaveConfig();
-
-            if (cb_Template.SelectedValue == null || cbTableList.Items.Count < 1) return;
-
-            var tables = Engine.Tables;
-            if (tables == null || tables.Count < 1) return;
-
-            sw.Reset();
-            sw.Start();
-
-            foreach (var tb in tables)
-            {
-                Engine.Render(tb);
-            }
-
-            sw.Stop();
-            lb_Status.Text = "生成 " + tables.Count + " 个类完成！耗时：" + sw.Elapsed.ToString();
-
-            MessageBox.Show("生成" + tables.Count + " 个类成功！", "成功", MessageBoxButtons.OK, MessageBoxIcon.Information);
-        }
-        #endregion
-
-        #region 加载、保存
-        public void LoadConfig()
-        {
-            cbConn.Text = Config.ConnName;
-            cb_Template.Text = Config.TemplateName;
-            txt_OutPath.Text = Config.OutputPath;
-            txt_NameSpace.Text = Config.NameSpace;
-            txt_ConnName.Text = Config.EntityConnName;
-            txtBaseClass.Text = Config.BaseClass;
-            cbRenderGenEntity.Checked = Config.RenderGenEntity;
-
-            checkBox3.Checked = Config.UseCNFileName;
-            checkBox5.Checked = Config.UseHeadTemplate;
-            //richTextBox2.Text = Config.HeadTemplate;
-            checkBox4.Checked = Config.Debug;
-        }
-
-        public void SaveConfig()
-        {
-            Config.ConnName = cbConn.Text;
-            Config.TemplateName = cb_Template.Text;
-            Config.OutputPath = txt_OutPath.Text;
-            Config.NameSpace = txt_NameSpace.Text;
-            Config.EntityConnName = txt_ConnName.Text;
-            Config.BaseClass = txtBaseClass.Text;
-            Config.RenderGenEntity = cbRenderGenEntity.Checked;
-
-            Config.UseCNFileName = checkBox3.Checked;
-            Config.UseHeadTemplate = checkBox5.Checked;
-            //Config.HeadTemplate = richTextBox2.Text;
-            Config.Debug = checkBox4.Checked;
-
-            Config.Save();
-        }
-        #endregion
-
-        #region 附加信息
-        private void linkLabel1_LinkClicked(Object sender, LinkLabelLinkClickedEventArgs e)
-        {
-            var control = sender as Control;
-            if (control == null) return;
-
-            var url = String.Empty;
-            if (control.Tag != null) url = control.Tag.ToString();
-            if (String.IsNullOrEmpty(url)) url = control.Text;
-            if (String.IsNullOrEmpty(url)) return;
-
-            Process.Start(url);
-        }
-
-        private void label3_Click(Object sender, EventArgs e)
-        {
-            Clipboard.SetData("1600800", null);
-            MessageBox.Show("QQ群号已复制到剪切板！", "提示");
-        }
-        #endregion
-
-        #region 打开输出目录
-        private void btnOpenOutputDir_Click(Object sender, EventArgs e)
-        {
-            var dir = txt_OutPath.Text.GetFullPath();
-            if (!Directory.Exists(dir)) dir = AppDomain.CurrentDomain.BaseDirectory;
-
-            Process.Start("explorer.exe", "\"" + dir + "\"");
-            //Process.Start("explorer.exe", "/root,\"" + dir + "\"");
-            //Process.Start("explorer.exe", "/select," + dir);
-        }
-
-        private void frmItems_Click(Object sender, EventArgs e)
-        {
-            //FrmItems.Create(XConfig.Current.Items).Show();
-
-            FrmItems.Create(ModelConfig.Current).Show();
-        }
-        #endregion
-
-        #region 模版相关
-        public void BindTemplate(ComboBox cb)
-        {
-            var list = new List<String>();
-            foreach (var item in Engine.FileTemplates)
-            {
-                list.Add("[文件]" + item);
-            }
-            foreach (var item in Engine.Templates.Keys)
-            {
-                var ks = item.Split('.');
-                if (ks == null || ks.Length < 1) continue;
-
-                var name = "[内置]" + ks[0];
-                if (!list.Contains(name)) list.Add(name);
-            }
-            cb.Items.Clear();
-            cb.DataSource = list;
-            //cb.DisplayMember = "value";
-            cb.Update();
-        }
-
-        private void btnRelease_Click(Object sender, EventArgs e)
-        {
-            try
-            {
-                Source.ReleaseAllTemplateFiles();
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.ToString());
-            }
-        }
-
-        private void lbEditHeader_LinkClicked(Object sender, LinkLabelLinkClickedEventArgs e)
-        {
-            var frm = FrmText.Create("C#文件头模版", Config.HeadTemplate);
-            frm.ShowDialog();
-            Config.HeadTemplate = frm.Content.Replace("\r\n", "\n").Replace("\r", "\n").Replace("\n", "\r\n");
-            frm.Dispose();
-        }
-        #endregion
-
-        #region 菜单
-        private void 退出XToolStripMenuItem_Click(Object sender, EventArgs e)
-        {
-            //Application.Exit();
-            Close();
-        }
-
-        private void 组件手册ToolStripMenuItem_Click(Object sender, EventArgs e)
-        {
-            var file = "X组件手册.chm";
-            if (!File.Exists(file)) file = Path.Combine(@"C:\X\DLL", file);
-            if (File.Exists(file)) Process.Start(file);
-        }
-
-        private void 表名字段名命名规范ToolStripMenuItem_Click(Object sender, EventArgs e)
-        {
-            FrmText.Create("表名字段名命名规范", Source.GetText("数据库命名规范")).Show();
-        }
-
-        private void 在线帮助文档ToolStripMenuItem_Click(Object sender, EventArgs e)
-        {
-            Process.Start("http://www.NewLifeX.com/showtopic-260.aspx?r=XCoder_v" + AssemblyX.Create(Assembly.GetExecutingAssembly()).Version);
-        }
-
-        private void 关于ToolStripMenuItem1_Click(Object sender, EventArgs e)
-        {
-            FrmText.Create("升级历史", Source.GetText("UpdateInfo")).Show();
-        }
-
-        private void 博客ToolStripMenuItem_Click(Object sender, EventArgs e)
-        {
-            Process.Start("http://nnhy.cnblogs.com");
-        }
-
-        private void qQ群1600800ToolStripMenuItem_Click(Object sender, EventArgs e)
-        {
-            Process.Start("http://www.NewLifeX.com/?r=XCoder_v" + AssemblyX.Create(Assembly.GetExecutingAssembly()).Version);
-        }
-
-        private void oracle客户端运行时检查ToolStripMenuItem1_Click(Object sender, EventArgs e)
-        {
-            Task.Factory.StartNew(CheckOracle);
-        }
-        void CheckOracle()
-        {
-            if (!DAL.ConnStrs.ContainsKey("Oracle")) return;
-
-            try
-            {
-                var list = DAL.Create("Oracle").Tables;
-
-                MessageBox.Show("Oracle客户端运行时检查通过！");
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show("Oracle客户端运行时检查失败！也可能是用户名密码错误！" + ex.ToString());
-            }
-        }
-
-        private void 自动格式化设置ToolStripMenuItem_Click(Object sender, EventArgs e)
-        {
-            //FrmFix.Create(Config).ShowDialog();
-        }
-        #endregion
-
-        #region 模型管理
-        private void 模型管理MToolStripMenuItem_Click(Object sender, EventArgs e)
-        {
-            var tables = Engine.Tables;
-            if (tables == null || tables.Count < 1) return;
-
-            FrmModel.Create(tables).Show();
-        }
-
-        private void 导出模型EToolStripMenuItem_Click(Object sender, EventArgs e)
-        {
-            var tables = Engine.Tables;
-            if (tables == null || tables.Count < 1)
-            {
-                MessageBox.Show(Text, "数据库架构为空！", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-                return;
-            }
-
-            if (!String.IsNullOrEmpty(Config.ConnName))
-            {
-                var file = Config.ConnName + ".xml";
-                String dir = null;
-                if (!String.IsNullOrEmpty(saveFileDialog1.FileName))
-                    dir = Path.GetDirectoryName(saveFileDialog1.FileName);
-                if (String.IsNullOrEmpty(dir)) dir = AppDomain.CurrentDomain.BaseDirectory;
-                //saveFileDialog1.FileName = Path.Combine(dir, file);
-                saveFileDialog1.InitialDirectory = dir;
-                saveFileDialog1.FileName = file;
-            }
-            if (saveFileDialog1.ShowDialog() != DialogResult.OK || String.IsNullOrEmpty(saveFileDialog1.FileName)) return;
-            try
-            {
-                var xml = DAL.Export(tables);
-                File.WriteAllText(saveFileDialog1.FileName, xml);
-
-                MessageBox.Show("导出架构成功！", "导出架构", MessageBoxButtons.OK);
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.Message, Text, MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-        }
-
-        private void 架构管理SToolStripMenuItem_Click(Object sender, EventArgs e)
-        {
-            var connName = "" + cbConn.SelectedValue;
-            if (String.IsNullOrEmpty(connName)) return;
-
-            FrmSchema.Create(DAL.Create(connName).Db).Show();
-        }
-
-        private void sQL查询器QToolStripMenuItem_Click(Object sender, EventArgs e)
-        {
-            var connName = "" + cbConn.SelectedValue;
-            if (String.IsNullOrEmpty(connName)) return;
-
-            FrmQuery.Create(DAL.Create(connName)).Show();
-        }
-
-        private void btnImport_Click(Object sender, EventArgs e)
-        {
-            var btn = sender as Button;
-            if (btn != null && btn.Text == "导出模型")
-            {
-                导出模型EToolStripMenuItem_Click(null, EventArgs.Empty);
-                return;
-            }
-
-            if (openFileDialog1.ShowDialog() != DialogResult.OK || String.IsNullOrEmpty(openFileDialog1.FileName)) return;
-            try
-            {
-                var list = DAL.Import(File.ReadAllText(openFileDialog1.FileName));
-                if (!cbIncludeView.Checked) list = list.Where(t => !t.IsView).ToList();
-                //if (Config.NeedFix) list = Engine.FixTable(list);
-
-                Engine = null;
-                Engine.Tables = list;
-
-                SetTables(list);
-
-                gbTable.Enabled = true;
-                模型ToolStripMenuItem.Visible = true;
-                架构管理SToolStripMenuItem.Visible = false;
-
-                MessageBox.Show("导入架构成功！共" + (list == null ? 0 : list.Count) + "张表！", "导入架构", MessageBoxButtons.OK);
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.Message, Text, MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-        }
-        #endregion
-
-        #region 网页
-        private void webBrowser1_DocumentCompleted(Object sender, WebBrowserDocumentCompletedEventArgs e)
-        {
-            // 网页加载完成后，自动向下滚动一段距离，越过头部
-            webBrowser1.Document.Window.ScrollTo(0, 90);
-        }
-
-        private void webBrowser1_Navigating(Object sender, WebBrowserNavigatingEventArgs e)
-        {
-            if (e.Url != null)
-            {
-                var url = e.Url.ToString();
-                if (!url.IsNullOrWhiteSpace())
-                {
-                    // 精简版替换为完整版
-                    var asm = AssemblyX.Create(Assembly.GetExecutingAssembly());
-                    url = url.Replace("/archiver/", "/");
-                    if (url.Contains("?"))
-                        url += "&r=XCoder_v" + asm.CompileVersion;
-                    else
-                        url += "?r=XCoder_v" + asm.CompileVersion;
-                    Process.Start(url);
-                    e.Cancel = true;
-                }
-            }
-        }
-
-        private void timer1_Tick(Object sender, EventArgs e)
-        {
-            timer1.Enabled = false;
-
-            var asm = AssemblyX.Create(Assembly.GetExecutingAssembly());
-            //webBrowser1.Navigate("http://www.newlifex.com/archiver/showforum-2.aspx", false);
-            webBrowser1.Url = new Uri("http://www.newlifex.com/archiver/showforum-2.aspx?r=XCoder_v" + asm.CompileVersion);
-            webBrowser1.Navigating += webBrowser1_Navigating;
-        }
-        #endregion
-
-        #region 添加模型-@宁波-小董 2013
-        private void 添加模型ToolStripMenuItem_Click(Object sender, EventArgs e)
-        {
-            NewModel.CreateForm().Show();
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/XCoder/Windows/FrmMain.designer.cs b/XCoder/Windows/FrmMain.designer.cs
deleted file mode 100644
index 8501d43fb5..0000000000
--- a/XCoder/Windows/FrmMain.designer.cs
+++ /dev/null
@@ -1,806 +0,0 @@
-﻿namespace XCoder
-{
-	partial class FrmMain
-	{
-		/// <summary>必需的设计器变量。</summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>清理所有正在使用的资源。</summary>
-		/// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Windows 窗体设计器生成的代码
-
-		/// <summary>
-		/// 设计器支持所需的方法 - 不要
-		/// 使用代码编辑器修改此方法的内容。
-		/// </summary>
-		private void InitializeComponent()
-		{
-            this.components = new System.ComponentModel.Container();
-            this.bt_Connection = new System.Windows.Forms.Button();
-            this.gbConnect = new System.Windows.Forms.GroupBox();
-            this.cbConn = new System.Windows.Forms.ComboBox();
-            this.label4 = new System.Windows.Forms.Label();
-            this.gbTable = new System.Windows.Forms.GroupBox();
-            this.cbIncludeView = new System.Windows.Forms.CheckBox();
-            this.btnRefreshTable = new System.Windows.Forms.Button();
-            this.btnRenderAll = new System.Windows.Forms.Button();
-            this.btnRenderTable = new System.Windows.Forms.Button();
-            this.cbTableList = new System.Windows.Forms.ComboBox();
-            this.label5 = new System.Windows.Forms.Label();
-            this.statusStrip1 = new System.Windows.Forms.StatusStrip();
-            this.lb_Status = new System.Windows.Forms.ToolStripStatusLabel();
-            this.gbConfig = new System.Windows.Forms.GroupBox();
-            this.webBrowser1 = new System.Windows.Forms.WebBrowser();
-            this.lbEditHeader = new System.Windows.Forms.LinkLabel();
-            this.frmItems = new System.Windows.Forms.Button();
-            this.cbRenderGenEntity = new System.Windows.Forms.CheckBox();
-            this.btnRelease = new System.Windows.Forms.Button();
-            this.txtBaseClass = new System.Windows.Forms.TextBox();
-            this.label10 = new System.Windows.Forms.Label();
-            this.btnOpenOutputDir = new System.Windows.Forms.Button();
-            this.checkBox5 = new System.Windows.Forms.CheckBox();
-            this.checkBox4 = new System.Windows.Forms.CheckBox();
-            this.checkBox3 = new System.Windows.Forms.CheckBox();
-            this.txt_ConnName = new System.Windows.Forms.TextBox();
-            this.label1 = new System.Windows.Forms.Label();
-            this.txt_NameSpace = new System.Windows.Forms.TextBox();
-            this.label8 = new System.Windows.Forms.Label();
-            this.txt_OutPath = new System.Windows.Forms.TextBox();
-            this.label7 = new System.Windows.Forms.Label();
-            this.label6 = new System.Windows.Forms.Label();
-            this.cb_Template = new System.Windows.Forms.ComboBox();
-            this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
-            this.btnImport = new System.Windows.Forms.Button();
-            this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
-            this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog();
-            this.label11 = new System.Windows.Forms.Label();
-            this.label12 = new System.Windows.Forms.Label();
-            this.menuStrip1 = new System.Windows.Forms.MenuStrip();
-            this.文件ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.自动格式化设置ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.oracle客户端运行时检查ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-            this.退出XToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.模型ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.模型管理MToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.导出模型EToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.架构管理SToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.sQL查询器QToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.添加模型ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.关于ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.组件手册ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.表名字段名命名规范ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.在线帮助文档ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator();
-            this.qQ群1600800ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.qQ群1600800ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-            this.博客ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.关于ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-            this.label9 = new System.Windows.Forms.Label();
-            this.timer1 = new System.Windows.Forms.Timer(this.components);
-            this.gbConnect.SuspendLayout();
-            this.gbTable.SuspendLayout();
-            this.statusStrip1.SuspendLayout();
-            this.gbConfig.SuspendLayout();
-            this.menuStrip1.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // bt_Connection
-            // 
-            this.bt_Connection.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.bt_Connection.ForeColor = System.Drawing.Color.DeepPink;
-            this.bt_Connection.Location = new System.Drawing.Point(295, 41);
-            this.bt_Connection.Name = "bt_Connection";
-            this.bt_Connection.Size = new System.Drawing.Size(52, 23);
-            this.bt_Connection.TabIndex = 6;
-            this.bt_Connection.Text = "连接";
-            this.toolTip1.SetToolTip(this.bt_Connection, "数据库结构带有缓存，如不能获取最新结构，请稍候重试！");
-            this.bt_Connection.UseVisualStyleBackColor = true;
-            this.bt_Connection.Click += new System.EventHandler(this.bt_Connection_Click);
-            // 
-            // gbConnect
-            // 
-            this.gbConnect.Controls.Add(this.cbConn);
-            this.gbConnect.Controls.Add(this.label4);
-            this.gbConnect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.gbConnect.ForeColor = System.Drawing.Color.DeepPink;
-            this.gbConnect.Location = new System.Drawing.Point(3, 30);
-            this.gbConnect.Name = "gbConnect";
-            this.gbConnect.Size = new System.Drawing.Size(286, 38);
-            this.gbConnect.TabIndex = 7;
-            this.gbConnect.TabStop = false;
-            // 
-            // cbConn
-            // 
-            this.cbConn.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cbConn.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cbConn.ForeColor = System.Drawing.Color.DeepPink;
-            this.cbConn.FormattingEnabled = true;
-            this.cbConn.Location = new System.Drawing.Point(58, 11);
-            this.cbConn.Name = "cbConn";
-            this.cbConn.Size = new System.Drawing.Size(220, 27);
-            this.cbConn.TabIndex = 13;
-            this.cbConn.SelectionChangeCommitted += new System.EventHandler(this.cbConn_SelectionChangeCommitted);
-            // 
-            // label4
-            // 
-            this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(11, 17);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(44, 17);
-            this.label4.TabIndex = 12;
-            this.label4.Text = "连接：";
-            // 
-            // gbTable
-            // 
-            this.gbTable.Controls.Add(this.cbIncludeView);
-            this.gbTable.Controls.Add(this.btnRefreshTable);
-            this.gbTable.Controls.Add(this.btnRenderAll);
-            this.gbTable.Controls.Add(this.btnRenderTable);
-            this.gbTable.Controls.Add(this.cbTableList);
-            this.gbTable.Controls.Add(this.label5);
-            this.gbTable.Enabled = false;
-            this.gbTable.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.gbTable.ForeColor = System.Drawing.Color.ForestGreen;
-            this.gbTable.Location = new System.Drawing.Point(2, 71);
-            this.gbTable.Name = "gbTable";
-            this.gbTable.Size = new System.Drawing.Size(725, 49);
-            this.gbTable.TabIndex = 14;
-            this.gbTable.TabStop = false;
-            // 
-            // cbIncludeView
-            // 
-            this.cbIncludeView.AutoSize = true;
-            this.cbIncludeView.Checked = true;
-            this.cbIncludeView.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.cbIncludeView.Location = new System.Drawing.Point(610, 22);
-            this.cbIncludeView.Name = "cbIncludeView";
-            this.cbIncludeView.Size = new System.Drawing.Size(75, 21);
-            this.cbIncludeView.TabIndex = 23;
-            this.cbIncludeView.Text = "包括视图";
-            this.cbIncludeView.UseVisualStyleBackColor = true;
-            // 
-            // btnRefreshTable
-            // 
-            this.btnRefreshTable.ForeColor = System.Drawing.Color.ForestGreen;
-            this.btnRefreshTable.Location = new System.Drawing.Point(517, 19);
-            this.btnRefreshTable.Name = "btnRefreshTable";
-            this.btnRefreshTable.Size = new System.Drawing.Size(80, 23);
-            this.btnRefreshTable.TabIndex = 22;
-            this.btnRefreshTable.Text = "刷新数据表";
-            this.btnRefreshTable.UseVisualStyleBackColor = true;
-            this.btnRefreshTable.Click += new System.EventHandler(this.btnRefreshTable_Click);
-            // 
-            // btnRenderAll
-            // 
-            this.btnRenderAll.ForeColor = System.Drawing.Color.ForestGreen;
-            this.btnRenderAll.Location = new System.Drawing.Point(436, 19);
-            this.btnRenderAll.Name = "btnRenderAll";
-            this.btnRenderAll.Size = new System.Drawing.Size(75, 23);
-            this.btnRenderAll.TabIndex = 21;
-            this.btnRenderAll.Text = "生成所有表";
-            this.btnRenderAll.UseVisualStyleBackColor = true;
-            this.btnRenderAll.Click += new System.EventHandler(this.bt_GenAll_Click);
-            // 
-            // btnRenderTable
-            // 
-            this.btnRenderTable.ForeColor = System.Drawing.Color.ForestGreen;
-            this.btnRenderTable.Location = new System.Drawing.Point(355, 19);
-            this.btnRenderTable.Name = "btnRenderTable";
-            this.btnRenderTable.Size = new System.Drawing.Size(75, 23);
-            this.btnRenderTable.TabIndex = 19;
-            this.btnRenderTable.Text = "生成该表";
-            this.btnRenderTable.UseVisualStyleBackColor = true;
-            this.btnRenderTable.Click += new System.EventHandler(this.bt_GenTable_Click);
-            // 
-            // cbTableList
-            // 
-            this.cbTableList.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.cbTableList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cbTableList.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cbTableList.ForeColor = System.Drawing.Color.ForestGreen;
-            this.cbTableList.Location = new System.Drawing.Point(58, 18);
-            this.cbTableList.Name = "cbTableList";
-            this.cbTableList.Size = new System.Drawing.Size(291, 27);
-            this.cbTableList.TabIndex = 17;
-            // 
-            // label5
-            // 
-            this.label5.AutoSize = true;
-            this.label5.ForeColor = System.Drawing.Color.ForestGreen;
-            this.label5.Location = new System.Drawing.Point(11, 24);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(56, 17);
-            this.label5.TabIndex = 16;
-            this.label5.Text = "数据表：";
-            // 
-            // statusStrip1
-            // 
-            this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.lb_Status});
-            this.statusStrip1.Location = new System.Drawing.Point(0, 322);
-            this.statusStrip1.Name = "statusStrip1";
-            this.statusStrip1.Size = new System.Drawing.Size(730, 22);
-            this.statusStrip1.TabIndex = 23;
-            this.statusStrip1.Text = "statusStrip1";
-            // 
-            // lb_Status
-            // 
-            this.lb_Status.Name = "lb_Status";
-            this.lb_Status.Size = new System.Drawing.Size(715, 17);
-            this.lb_Status.Spring = true;
-            this.lb_Status.Text = "状态";
-            this.lb_Status.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // gbConfig
-            // 
-            this.gbConfig.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.gbConfig.Controls.Add(this.webBrowser1);
-            this.gbConfig.Controls.Add(this.lbEditHeader);
-            this.gbConfig.Controls.Add(this.frmItems);
-            this.gbConfig.Controls.Add(this.cbRenderGenEntity);
-            this.gbConfig.Controls.Add(this.btnRelease);
-            this.gbConfig.Controls.Add(this.txtBaseClass);
-            this.gbConfig.Controls.Add(this.label10);
-            this.gbConfig.Controls.Add(this.btnOpenOutputDir);
-            this.gbConfig.Controls.Add(this.checkBox5);
-            this.gbConfig.Controls.Add(this.checkBox4);
-            this.gbConfig.Controls.Add(this.checkBox3);
-            this.gbConfig.Controls.Add(this.txt_ConnName);
-            this.gbConfig.Controls.Add(this.label1);
-            this.gbConfig.Controls.Add(this.txt_NameSpace);
-            this.gbConfig.Controls.Add(this.label8);
-            this.gbConfig.Controls.Add(this.txt_OutPath);
-            this.gbConfig.Controls.Add(this.label7);
-            this.gbConfig.Controls.Add(this.label6);
-            this.gbConfig.Controls.Add(this.cb_Template);
-            this.gbConfig.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.gbConfig.Location = new System.Drawing.Point(2, 126);
-            this.gbConfig.Name = "gbConfig";
-            this.gbConfig.Size = new System.Drawing.Size(725, 193);
-            this.gbConfig.TabIndex = 26;
-            this.gbConfig.TabStop = false;
-            // 
-            // webBrowser1
-            // 
-            this.webBrowser1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.webBrowser1.Location = new System.Drawing.Point(389, 19);
-            this.webBrowser1.MinimumSize = new System.Drawing.Size(20, 20);
-            this.webBrowser1.Name = "webBrowser1";
-            this.webBrowser1.ScriptErrorsSuppressed = true;
-            this.webBrowser1.Size = new System.Drawing.Size(336, 168);
-            this.webBrowser1.TabIndex = 54;
-            this.webBrowser1.DocumentCompleted += new System.Windows.Forms.WebBrowserDocumentCompletedEventHandler(this.webBrowser1_DocumentCompleted);
-            // 
-            // lbEditHeader
-            // 
-            this.lbEditHeader.AutoSize = true;
-            this.lbEditHeader.ForeColor = System.Drawing.Color.Brown;
-            this.lbEditHeader.Location = new System.Drawing.Point(137, 51);
-            this.lbEditHeader.Name = "lbEditHeader";
-            this.lbEditHeader.Size = new System.Drawing.Size(32, 17);
-            this.lbEditHeader.TabIndex = 53;
-            this.lbEditHeader.TabStop = true;
-            this.lbEditHeader.Text = "编辑";
-            this.lbEditHeader.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lbEditHeader_LinkClicked);
-            // 
-            // frmItems
-            // 
-            this.frmItems.ForeColor = System.Drawing.Color.BlueViolet;
-            this.frmItems.Location = new System.Drawing.Point(16, 162);
-            this.frmItems.Name = "frmItems";
-            this.frmItems.Size = new System.Drawing.Size(251, 23);
-            this.frmItems.TabIndex = 50;
-            this.frmItems.Text = "扩展属性编辑（Config.Items[\"name\"]）";
-            this.toolTip1.SetToolTip(this.frmItems, "模版中通过Config.Items[name]使用。");
-            this.frmItems.UseVisualStyleBackColor = true;
-            this.frmItems.Click += new System.EventHandler(this.frmItems_Click);
-            // 
-            // cbRenderGenEntity
-            // 
-            this.cbRenderGenEntity.AutoSize = true;
-            this.cbRenderGenEntity.ForeColor = System.Drawing.Color.BlueViolet;
-            this.cbRenderGenEntity.Location = new System.Drawing.Point(180, 109);
-            this.cbRenderGenEntity.Name = "cbRenderGenEntity";
-            this.cbRenderGenEntity.Size = new System.Drawing.Size(111, 21);
-            this.cbRenderGenEntity.TabIndex = 49;
-            this.cbRenderGenEntity.Text = "生成泛型实体类";
-            this.cbRenderGenEntity.UseVisualStyleBackColor = true;
-            // 
-            // btnRelease
-            // 
-            this.btnRelease.ForeColor = System.Drawing.Color.Brown;
-            this.btnRelease.Location = new System.Drawing.Point(285, 20);
-            this.btnRelease.Name = "btnRelease";
-            this.btnRelease.Size = new System.Drawing.Size(88, 23);
-            this.btnRelease.TabIndex = 48;
-            this.btnRelease.Text = "释放内置模版";
-            this.toolTip1.SetToolTip(this.btnRelease, "释放内置的模版到Template目录，作为参考供建立模版使用。");
-            this.btnRelease.UseVisualStyleBackColor = true;
-            this.btnRelease.Click += new System.EventHandler(this.btnRelease_Click);
-            // 
-            // txtBaseClass
-            // 
-            this.txtBaseClass.ForeColor = System.Drawing.Color.BlueViolet;
-            this.txtBaseClass.Location = new System.Drawing.Point(73, 107);
-            this.txtBaseClass.Name = "txtBaseClass";
-            this.txtBaseClass.Size = new System.Drawing.Size(97, 23);
-            this.txtBaseClass.TabIndex = 47;
-            this.txtBaseClass.Text = "Entity";
-            // 
-            // label10
-            // 
-            this.label10.AutoSize = true;
-            this.label10.ForeColor = System.Drawing.Color.BlueViolet;
-            this.label10.Location = new System.Drawing.Point(13, 111);
-            this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(68, 17);
-            this.label10.TabIndex = 46;
-            this.label10.Text = "实体基类：";
-            // 
-            // btnOpenOutputDir
-            // 
-            this.btnOpenOutputDir.ForeColor = System.Drawing.Color.BlueViolet;
-            this.btnOpenOutputDir.Location = new System.Drawing.Point(285, 134);
-            this.btnOpenOutputDir.Name = "btnOpenOutputDir";
-            this.btnOpenOutputDir.Size = new System.Drawing.Size(75, 23);
-            this.btnOpenOutputDir.TabIndex = 45;
-            this.btnOpenOutputDir.Text = "打开目录";
-            this.btnOpenOutputDir.UseVisualStyleBackColor = true;
-            this.btnOpenOutputDir.Click += new System.EventHandler(this.btnOpenOutputDir_Click);
-            // 
-            // checkBox5
-            // 
-            this.checkBox5.AutoSize = true;
-            this.checkBox5.ForeColor = System.Drawing.Color.Brown;
-            this.checkBox5.Location = new System.Drawing.Point(13, 49);
-            this.checkBox5.Name = "checkBox5";
-            this.checkBox5.Size = new System.Drawing.Size(126, 21);
-            this.checkBox5.TabIndex = 42;
-            this.checkBox5.Text = "使用.cs文件头模版";
-            this.toolTip1.SetToolTip(this.checkBox5, "出现在每一个cs文件头部");
-            this.checkBox5.UseVisualStyleBackColor = true;
-            // 
-            // checkBox4
-            // 
-            this.checkBox4.AutoSize = true;
-            this.checkBox4.ForeColor = System.Drawing.Color.Brown;
-            this.checkBox4.Location = new System.Drawing.Point(171, 49);
-            this.checkBox4.Name = "checkBox4";
-            this.checkBox4.Size = new System.Drawing.Size(75, 21);
-            this.checkBox4.TabIndex = 27;
-            this.checkBox4.Text = "调试模版";
-            this.toolTip1.SetToolTip(this.checkBox4, "输出模版编译的中间文件");
-            this.checkBox4.UseVisualStyleBackColor = true;
-            // 
-            // checkBox3
-            // 
-            this.checkBox3.AutoSize = true;
-            this.checkBox3.ForeColor = System.Drawing.Color.BlueViolet;
-            this.checkBox3.Location = new System.Drawing.Point(180, 137);
-            this.checkBox3.Name = "checkBox3";
-            this.checkBox3.Size = new System.Drawing.Size(87, 21);
-            this.checkBox3.TabIndex = 39;
-            this.checkBox3.Text = "中文文件名";
-            this.checkBox3.UseVisualStyleBackColor = true;
-            // 
-            // txt_ConnName
-            // 
-            this.txt_ConnName.ForeColor = System.Drawing.Color.BlueViolet;
-            this.txt_ConnName.Location = new System.Drawing.Point(278, 79);
-            this.txt_ConnName.Name = "txt_ConnName";
-            this.txt_ConnName.Size = new System.Drawing.Size(97, 23);
-            this.txt_ConnName.TabIndex = 34;
-            this.txt_ConnName.Text = "default";
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.ForeColor = System.Drawing.Color.BlueViolet;
-            this.label1.Location = new System.Drawing.Point(218, 83);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(56, 17);
-            this.label1.TabIndex = 33;
-            this.label1.Text = "连接名：";
-            // 
-            // txt_NameSpace
-            // 
-            this.txt_NameSpace.ForeColor = System.Drawing.Color.BlueViolet;
-            this.txt_NameSpace.Location = new System.Drawing.Point(73, 79);
-            this.txt_NameSpace.Name = "txt_NameSpace";
-            this.txt_NameSpace.Size = new System.Drawing.Size(134, 23);
-            this.txt_NameSpace.TabIndex = 32;
-            this.txt_NameSpace.Text = "XData";
-            // 
-            // label8
-            // 
-            this.label8.AutoSize = true;
-            this.label8.ForeColor = System.Drawing.Color.BlueViolet;
-            this.label8.Location = new System.Drawing.Point(13, 83);
-            this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(68, 17);
-            this.label8.TabIndex = 31;
-            this.label8.Text = "命名空间：";
-            // 
-            // txt_OutPath
-            // 
-            this.txt_OutPath.ForeColor = System.Drawing.Color.BlueViolet;
-            this.txt_OutPath.Location = new System.Drawing.Point(73, 135);
-            this.txt_OutPath.Name = "txt_OutPath";
-            this.txt_OutPath.Size = new System.Drawing.Size(97, 23);
-            this.txt_OutPath.TabIndex = 29;
-            this.txt_OutPath.Text = "Dist";
-            // 
-            // label7
-            // 
-            this.label7.AutoSize = true;
-            this.label7.ForeColor = System.Drawing.Color.BlueViolet;
-            this.label7.Location = new System.Drawing.Point(13, 139);
-            this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(68, 17);
-            this.label7.TabIndex = 28;
-            this.label7.Text = "输出目录：";
-            // 
-            // label6
-            // 
-            this.label6.AutoSize = true;
-            this.label6.ForeColor = System.Drawing.Color.Brown;
-            this.label6.Location = new System.Drawing.Point(11, 25);
-            this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(44, 17);
-            this.label6.TabIndex = 27;
-            this.label6.Text = "模版：";
-            // 
-            // cb_Template
-            // 
-            this.cb_Template.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cb_Template.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cb_Template.ForeColor = System.Drawing.Color.Brown;
-            this.cb_Template.FormattingEnabled = true;
-            this.cb_Template.Location = new System.Drawing.Point(58, 19);
-            this.cb_Template.Name = "cb_Template";
-            this.cb_Template.Size = new System.Drawing.Size(221, 27);
-            this.cb_Template.TabIndex = 26;
-            this.toolTip1.SetToolTip(this.cb_Template, "*开头的是内置系统模版。");
-            // 
-            // btnImport
-            // 
-            this.btnImport.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnImport.ForeColor = System.Drawing.Color.DeepPink;
-            this.btnImport.Location = new System.Drawing.Point(357, 41);
-            this.btnImport.Name = "btnImport";
-            this.btnImport.Size = new System.Drawing.Size(80, 23);
-            this.btnImport.TabIndex = 30;
-            this.btnImport.Text = "导入模型";
-            this.toolTip1.SetToolTip(this.btnImport, "把数据库架构信息导出到xml文件，或者从xml文件导入");
-            this.btnImport.UseVisualStyleBackColor = true;
-            this.btnImport.Click += new System.EventHandler(this.btnImport_Click);
-            // 
-            // openFileDialog1
-            // 
-            this.openFileDialog1.Filter = "架构文件|*.xml";
-            // 
-            // saveFileDialog1
-            // 
-            this.saveFileDialog1.Filter = "架构文件|*.xml";
-            // 
-            // label11
-            // 
-            this.label11.AutoSize = true;
-            this.label11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label11.ForeColor = System.Drawing.Color.RoyalBlue;
-            this.label11.Location = new System.Drawing.Point(531, 56);
-            this.label11.Name = "label11";
-            this.label11.Size = new System.Drawing.Size(171, 17);
-            this.label11.TabIndex = 33;
-            this.label11.Text = "2，导入模型，得到数据表信息";
-            // 
-            // label12
-            // 
-            this.label12.AutoSize = true;
-            this.label12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label12.ForeColor = System.Drawing.Color.RoyalBlue;
-            this.label12.Location = new System.Drawing.Point(531, 35);
-            this.label12.Name = "label12";
-            this.label12.Size = new System.Drawing.Size(183, 17);
-            this.label12.TabIndex = 34;
-            this.label12.Text = "1，连接数据库，得到数据表信息";
-            // 
-            // menuStrip1
-            // 
-            this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.文件ToolStripMenuItem,
-            this.模型ToolStripMenuItem,
-            this.添加模型ToolStripMenuItem,
-            this.关于ToolStripMenuItem});
-            this.menuStrip1.Location = new System.Drawing.Point(0, 0);
-            this.menuStrip1.Name = "menuStrip1";
-            this.menuStrip1.Size = new System.Drawing.Size(730, 25);
-            this.menuStrip1.TabIndex = 35;
-            this.menuStrip1.Text = "menuStrip1";
-            // 
-            // 文件ToolStripMenuItem
-            // 
-            this.文件ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.自动格式化设置ToolStripMenuItem,
-            this.oracle客户端运行时检查ToolStripMenuItem1,
-            this.退出XToolStripMenuItem});
-            this.文件ToolStripMenuItem.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Bold);
-            this.文件ToolStripMenuItem.Name = "文件ToolStripMenuItem";
-            this.文件ToolStripMenuItem.Size = new System.Drawing.Size(61, 21);
-            this.文件ToolStripMenuItem.Text = "文件(&F)";
-            // 
-            // 自动格式化设置ToolStripMenuItem
-            // 
-            this.自动格式化设置ToolStripMenuItem.Name = "自动格式化设置ToolStripMenuItem";
-            this.自动格式化设置ToolStripMenuItem.Size = new System.Drawing.Size(211, 22);
-            this.自动格式化设置ToolStripMenuItem.Text = "自动格式化设置";
-            this.自动格式化设置ToolStripMenuItem.Click += new System.EventHandler(this.自动格式化设置ToolStripMenuItem_Click);
-            // 
-            // oracle客户端运行时检查ToolStripMenuItem1
-            // 
-            this.oracle客户端运行时检查ToolStripMenuItem1.Name = "oracle客户端运行时检查ToolStripMenuItem1";
-            this.oracle客户端运行时检查ToolStripMenuItem1.Size = new System.Drawing.Size(211, 22);
-            this.oracle客户端运行时检查ToolStripMenuItem1.Text = "Oracle客户端运行时检查";
-            this.oracle客户端运行时检查ToolStripMenuItem1.Click += new System.EventHandler(this.oracle客户端运行时检查ToolStripMenuItem1_Click);
-            // 
-            // 退出XToolStripMenuItem
-            // 
-            this.退出XToolStripMenuItem.Name = "退出XToolStripMenuItem";
-            this.退出XToolStripMenuItem.Size = new System.Drawing.Size(211, 22);
-            this.退出XToolStripMenuItem.Text = "退出(&X)";
-            this.退出XToolStripMenuItem.Click += new System.EventHandler(this.退出XToolStripMenuItem_Click);
-            // 
-            // 模型ToolStripMenuItem
-            // 
-            this.模型ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.模型管理MToolStripMenuItem,
-            this.导出模型EToolStripMenuItem,
-            this.架构管理SToolStripMenuItem,
-            this.sQL查询器QToolStripMenuItem});
-            this.模型ToolStripMenuItem.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Bold);
-            this.模型ToolStripMenuItem.Name = "模型ToolStripMenuItem";
-            this.模型ToolStripMenuItem.Size = new System.Drawing.Size(66, 21);
-            this.模型ToolStripMenuItem.Text = "模型(&M)";
-            this.模型ToolStripMenuItem.Visible = false;
-            // 
-            // 模型管理MToolStripMenuItem
-            // 
-            this.模型管理MToolStripMenuItem.Name = "模型管理MToolStripMenuItem";
-            this.模型管理MToolStripMenuItem.Size = new System.Drawing.Size(156, 22);
-            this.模型管理MToolStripMenuItem.Text = "模型管理(&M)";
-            this.模型管理MToolStripMenuItem.Click += new System.EventHandler(this.模型管理MToolStripMenuItem_Click);
-            // 
-            // 导出模型EToolStripMenuItem
-            // 
-            this.导出模型EToolStripMenuItem.Name = "导出模型EToolStripMenuItem";
-            this.导出模型EToolStripMenuItem.Size = new System.Drawing.Size(156, 22);
-            this.导出模型EToolStripMenuItem.Text = "导出模型(&E)";
-            this.导出模型EToolStripMenuItem.Click += new System.EventHandler(this.导出模型EToolStripMenuItem_Click);
-            // 
-            // 架构管理SToolStripMenuItem
-            // 
-            this.架构管理SToolStripMenuItem.Name = "架构管理SToolStripMenuItem";
-            this.架构管理SToolStripMenuItem.Size = new System.Drawing.Size(156, 22);
-            this.架构管理SToolStripMenuItem.Text = "架构管理(&S)";
-            this.架构管理SToolStripMenuItem.Visible = false;
-            this.架构管理SToolStripMenuItem.Click += new System.EventHandler(this.架构管理SToolStripMenuItem_Click);
-            // 
-            // sQL查询器QToolStripMenuItem
-            // 
-            this.sQL查询器QToolStripMenuItem.Name = "sQL查询器QToolStripMenuItem";
-            this.sQL查询器QToolStripMenuItem.Size = new System.Drawing.Size(156, 22);
-            this.sQL查询器QToolStripMenuItem.Text = "SQL查询器(&Q)";
-            this.sQL查询器QToolStripMenuItem.Click += new System.EventHandler(this.sQL查询器QToolStripMenuItem_Click);
-            // 
-            // 添加模型ToolStripMenuItem
-            // 
-            this.添加模型ToolStripMenuItem.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.添加模型ToolStripMenuItem.Name = "添加模型ToolStripMenuItem";
-            this.添加模型ToolStripMenuItem.Size = new System.Drawing.Size(68, 21);
-            this.添加模型ToolStripMenuItem.Text = "添加模型";
-            this.添加模型ToolStripMenuItem.Click += new System.EventHandler(this.添加模型ToolStripMenuItem_Click);
-            // 
-            // 关于ToolStripMenuItem
-            // 
-            this.关于ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.组件手册ToolStripMenuItem,
-            this.表名字段名命名规范ToolStripMenuItem,
-            this.在线帮助文档ToolStripMenuItem,
-            this.toolStripMenuItem2,
-            this.qQ群1600800ToolStripMenuItem,
-            this.qQ群1600800ToolStripMenuItem1,
-            this.博客ToolStripMenuItem,
-            this.关于ToolStripMenuItem1});
-            this.关于ToolStripMenuItem.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Bold);
-            this.关于ToolStripMenuItem.Name = "关于ToolStripMenuItem";
-            this.关于ToolStripMenuItem.Size = new System.Drawing.Size(64, 21);
-            this.关于ToolStripMenuItem.Text = "帮助(&H)";
-            // 
-            // 组件手册ToolStripMenuItem
-            // 
-            this.组件手册ToolStripMenuItem.Name = "组件手册ToolStripMenuItem";
-            this.组件手册ToolStripMenuItem.Size = new System.Drawing.Size(220, 22);
-            this.组件手册ToolStripMenuItem.Text = "组件手册(&X)";
-            this.组件手册ToolStripMenuItem.Click += new System.EventHandler(this.组件手册ToolStripMenuItem_Click);
-            // 
-            // 表名字段名命名规范ToolStripMenuItem
-            // 
-            this.表名字段名命名规范ToolStripMenuItem.Name = "表名字段名命名规范ToolStripMenuItem";
-            this.表名字段名命名规范ToolStripMenuItem.Size = new System.Drawing.Size(220, 22);
-            this.表名字段名命名规范ToolStripMenuItem.Text = "表名字段名命名规范(&N)";
-            this.表名字段名命名规范ToolStripMenuItem.Click += new System.EventHandler(this.表名字段名命名规范ToolStripMenuItem_Click);
-            // 
-            // 在线帮助文档ToolStripMenuItem
-            // 
-            this.在线帮助文档ToolStripMenuItem.Name = "在线帮助文档ToolStripMenuItem";
-            this.在线帮助文档ToolStripMenuItem.Size = new System.Drawing.Size(220, 22);
-            this.在线帮助文档ToolStripMenuItem.Text = "在线帮助文档";
-            this.在线帮助文档ToolStripMenuItem.Click += new System.EventHandler(this.在线帮助文档ToolStripMenuItem_Click);
-            // 
-            // toolStripMenuItem2
-            // 
-            this.toolStripMenuItem2.Name = "toolStripMenuItem2";
-            this.toolStripMenuItem2.Size = new System.Drawing.Size(217, 6);
-            // 
-            // qQ群1600800ToolStripMenuItem
-            // 
-            this.qQ群1600800ToolStripMenuItem.Name = "qQ群1600800ToolStripMenuItem";
-            this.qQ群1600800ToolStripMenuItem.Size = new System.Drawing.Size(220, 22);
-            this.qQ群1600800ToolStripMenuItem.Text = "论坛www.NewLifeX.com";
-            this.qQ群1600800ToolStripMenuItem.Click += new System.EventHandler(this.qQ群1600800ToolStripMenuItem_Click);
-            // 
-            // qQ群1600800ToolStripMenuItem1
-            // 
-            this.qQ群1600800ToolStripMenuItem1.Name = "qQ群1600800ToolStripMenuItem1";
-            this.qQ群1600800ToolStripMenuItem1.Size = new System.Drawing.Size(220, 22);
-            this.qQ群1600800ToolStripMenuItem1.Text = "QQ群1600800";
-            // 
-            // 博客ToolStripMenuItem
-            // 
-            this.博客ToolStripMenuItem.Name = "博客ToolStripMenuItem";
-            this.博客ToolStripMenuItem.Size = new System.Drawing.Size(220, 22);
-            this.博客ToolStripMenuItem.Text = "博客nnhy.cnblogs.com";
-            this.博客ToolStripMenuItem.Click += new System.EventHandler(this.博客ToolStripMenuItem_Click);
-            // 
-            // 关于ToolStripMenuItem1
-            // 
-            this.关于ToolStripMenuItem1.Name = "关于ToolStripMenuItem1";
-            this.关于ToolStripMenuItem1.Size = new System.Drawing.Size(220, 22);
-            this.关于ToolStripMenuItem1.Text = "关于(&A)";
-            this.关于ToolStripMenuItem1.Click += new System.EventHandler(this.关于ToolStripMenuItem1_Click);
-            // 
-            // label9
-            // 
-            this.label9.AutoSize = true;
-            this.label9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label9.ForeColor = System.Drawing.Color.RoyalBlue;
-            this.label9.Location = new System.Drawing.Point(473, 35);
-            this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(68, 17);
-            this.label9.TabIndex = 32;
-            this.label9.Text = "两种用法：";
-            // 
-            // timer1
-            // 
-            this.timer1.Enabled = true;
-            this.timer1.Interval = 1000;
-            this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
-            // 
-            // FrmMain
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(730, 344);
-            this.Controls.Add(this.label12);
-            this.Controls.Add(this.label11);
-            this.Controls.Add(this.label9);
-            this.Controls.Add(this.btnImport);
-            this.Controls.Add(this.gbConfig);
-            this.Controls.Add(this.statusStrip1);
-            this.Controls.Add(this.menuStrip1);
-            this.Controls.Add(this.gbTable);
-            this.Controls.Add(this.gbConnect);
-            this.Controls.Add(this.bt_Connection);
-            this.MainMenuStrip = this.menuStrip1;
-            this.Name = "FrmMain";
-            this.RightToLeftLayout = true;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "数据模型工具";
-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmMain_FormClosing);
-            this.Load += new System.EventHandler(this.FrmMain_Load);
-            this.Shown += new System.EventHandler(this.FrmMain_Shown);
-            this.gbConnect.ResumeLayout(false);
-            this.gbConnect.PerformLayout();
-            this.gbTable.ResumeLayout(false);
-            this.gbTable.PerformLayout();
-            this.statusStrip1.ResumeLayout(false);
-            this.statusStrip1.PerformLayout();
-            this.gbConfig.ResumeLayout(false);
-            this.gbConfig.PerformLayout();
-            this.menuStrip1.ResumeLayout(false);
-            this.menuStrip1.PerformLayout();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.Button bt_Connection;
-		private System.Windows.Forms.GroupBox gbConnect;
-		private System.Windows.Forms.GroupBox gbTable;
-		private System.Windows.Forms.Button btnRenderTable;
-		private System.Windows.Forms.ComboBox cbTableList;
-        private System.Windows.Forms.Label label5;
-        private System.Windows.Forms.Label label4;
-		private System.Windows.Forms.Button btnRenderAll;
-		private System.Windows.Forms.StatusStrip statusStrip1;
-        private System.Windows.Forms.ToolStripStatusLabel lb_Status;
-        private System.Windows.Forms.GroupBox gbConfig;
-        private System.Windows.Forms.TextBox txt_ConnName;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.TextBox txt_NameSpace;
-        private System.Windows.Forms.Label label8;
-        private System.Windows.Forms.TextBox txt_OutPath;
-        private System.Windows.Forms.Label label7;
-        private System.Windows.Forms.Label label6;
-        private System.Windows.Forms.ComboBox cb_Template;
-        private System.Windows.Forms.ComboBox cbConn;
-        private System.Windows.Forms.CheckBox checkBox3;
-        private System.Windows.Forms.ToolTip toolTip1;
-        private System.Windows.Forms.CheckBox checkBox4;
-        private System.Windows.Forms.CheckBox checkBox5;
-        private System.Windows.Forms.Button btnOpenOutputDir;
-        private System.Windows.Forms.Button btnImport;
-        private System.Windows.Forms.OpenFileDialog openFileDialog1;
-        private System.Windows.Forms.SaveFileDialog saveFileDialog1;
-        private System.Windows.Forms.TextBox txtBaseClass;
-        private System.Windows.Forms.Label label10;
-        private System.Windows.Forms.Button btnRelease;
-        private System.Windows.Forms.Label label11;
-        private System.Windows.Forms.Label label12;
-        private System.Windows.Forms.CheckBox cbRenderGenEntity;
-        private System.Windows.Forms.Button frmItems;
-        private System.Windows.Forms.MenuStrip menuStrip1;
-        private System.Windows.Forms.ToolStripMenuItem 文件ToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem 模型ToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem 关于ToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem 退出XToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem 模型管理MToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem 导出模型EToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem 架构管理SToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem sQL查询器QToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem 表名字段名命名规范ToolStripMenuItem;
-        private System.Windows.Forms.ToolStripSeparator toolStripMenuItem2;
-        private System.Windows.Forms.ToolStripMenuItem 关于ToolStripMenuItem1;
-        private System.Windows.Forms.ToolStripMenuItem 组件手册ToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem qQ群1600800ToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem 博客ToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem oracle客户端运行时检查ToolStripMenuItem1;
-        private System.Windows.Forms.ToolStripMenuItem qQ群1600800ToolStripMenuItem1;
-        private System.Windows.Forms.LinkLabel lbEditHeader;
-        private System.Windows.Forms.WebBrowser webBrowser1;
-        private System.Windows.Forms.ToolStripMenuItem 自动格式化设置ToolStripMenuItem;
-        private System.Windows.Forms.Label label9;
-        private System.Windows.Forms.Button btnRefreshTable;
-        private System.Windows.Forms.CheckBox cbIncludeView;
-        private System.Windows.Forms.ToolStripMenuItem 添加模型ToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem 在线帮助文档ToolStripMenuItem;
-        private System.Windows.Forms.Timer timer1;
-	}
-}
-
diff --git a/XCoder/Windows/FrmMain.resx b/XCoder/Windows/FrmMain.resx
deleted file mode 100644
index 3181d57999..0000000000
--- a/XCoder/Windows/FrmMain.resx
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>228, 17</value>
-  </metadata>
-  <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>107, 17</value>
-  </metadata>
-  <metadata name="openFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>329, 17</value>
-  </metadata>
-  <metadata name="saveFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>477, 17</value>
-  </metadata>
-  <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>621, 17</value>
-  </metadata>
-  <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-</root>
\ No newline at end of file
diff --git a/XCoder/Windows/FrmModel.Designer.cs b/XCoder/Windows/FrmModel.Designer.cs
deleted file mode 100644
index b74028a99d..0000000000
--- a/XCoder/Windows/FrmModel.Designer.cs
+++ /dev/null
@@ -1,263 +0,0 @@
-﻿namespace XCoder
-{
-    partial class FrmModel
-    {
-        /// <summary>Required designer variable.</summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>Clean up any resources being used.</summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.groupBox1 = new System.Windows.Forms.GroupBox();
-            this.btnAddIndex = new System.Windows.Forms.Button();
-            this.btnAddColumn = new System.Windows.Forms.Button();
-            this.btnAddTable = new System.Windows.Forms.Button();
-            this.label1 = new System.Windows.Forms.Label();
-            this.cbTables = new System.Windows.Forms.ComboBox();
-            this.gv = new System.Windows.Forms.DataGridView();
-            this.pgTable = new System.Windows.Forms.PropertyGrid();
-            this.pgColumn = new System.Windows.Forms.PropertyGrid();
-            this.dgvIndex = new System.Windows.Forms.DataGridView();
-            this.btnCreateTableSQL = new System.Windows.Forms.Button();
-            this.label2 = new System.Windows.Forms.Label();
-            this.cbConn = new System.Windows.Forms.ComboBox();
-            this.groupBox2 = new System.Windows.Forms.GroupBox();
-            this.btnCreateDb = new System.Windows.Forms.Button();
-            this.btnCreateDbSQL = new System.Windows.Forms.Button();
-            this.groupBox1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gv)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvIndex)).BeginInit();
-            this.groupBox2.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // groupBox1
-            // 
-            this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.groupBox1.Controls.Add(this.btnAddIndex);
-            this.groupBox1.Controls.Add(this.btnAddColumn);
-            this.groupBox1.Controls.Add(this.btnAddTable);
-            this.groupBox1.Controls.Add(this.label1);
-            this.groupBox1.Controls.Add(this.cbTables);
-            this.groupBox1.Location = new System.Drawing.Point(6, 2);
-            this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(536, 44);
-            this.groupBox1.TabIndex = 2;
-            this.groupBox1.TabStop = false;
-            // 
-            // btnAddIndex
-            // 
-            this.btnAddIndex.Location = new System.Drawing.Point(387, 11);
-            this.btnAddIndex.Name = "btnAddIndex";
-            this.btnAddIndex.Size = new System.Drawing.Size(68, 27);
-            this.btnAddIndex.TabIndex = 4;
-            this.btnAddIndex.Text = "添加索引";
-            this.btnAddIndex.UseVisualStyleBackColor = true;
-            this.btnAddIndex.Click += new System.EventHandler(this.btnAddIndex_Click);
-            // 
-            // btnAddColumn
-            // 
-            this.btnAddColumn.Location = new System.Drawing.Point(313, 11);
-            this.btnAddColumn.Name = "btnAddColumn";
-            this.btnAddColumn.Size = new System.Drawing.Size(68, 27);
-            this.btnAddColumn.TabIndex = 3;
-            this.btnAddColumn.Text = "添加字段";
-            this.btnAddColumn.UseVisualStyleBackColor = true;
-            this.btnAddColumn.Click += new System.EventHandler(this.btnAddColumn_Click);
-            // 
-            // btnAddTable
-            // 
-            this.btnAddTable.Location = new System.Drawing.Point(239, 11);
-            this.btnAddTable.Name = "btnAddTable";
-            this.btnAddTable.Size = new System.Drawing.Size(68, 27);
-            this.btnAddTable.TabIndex = 2;
-            this.btnAddTable.Text = "添加表";
-            this.btnAddTable.UseVisualStyleBackColor = true;
-            this.btnAddTable.Click += new System.EventHandler(this.btnAddTable_Click);
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(10, 18);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(53, 12);
-            this.label1.TabIndex = 1;
-            this.label1.Text = "数据表：";
-            // 
-            // cbTables
-            // 
-            this.cbTables.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cbTables.FormattingEnabled = true;
-            this.cbTables.Location = new System.Drawing.Point(65, 14);
-            this.cbTables.Name = "cbTables";
-            this.cbTables.Size = new System.Drawing.Size(168, 20);
-            this.cbTables.TabIndex = 0;
-            this.cbTables.SelectedIndexChanged += new System.EventHandler(this.cbTables_SelectedIndexChanged);
-            // 
-            // gv
-            // 
-            this.gv.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.gv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.gv.Location = new System.Drawing.Point(194, 52);
-            this.gv.Name = "gv";
-            this.gv.RowTemplate.Height = 23;
-            this.gv.Size = new System.Drawing.Size(629, 286);
-            this.gv.TabIndex = 3;
-            this.gv.RowEnter += new System.Windows.Forms.DataGridViewCellEventHandler(this.gv_RowEnter);
-            // 
-            // pgTable
-            // 
-            this.pgTable.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left)));
-            this.pgTable.Location = new System.Drawing.Point(6, 53);
-            this.pgTable.Name = "pgTable";
-            this.pgTable.PropertySort = System.Windows.Forms.PropertySort.NoSort;
-            this.pgTable.Size = new System.Drawing.Size(182, 412);
-            this.pgTable.TabIndex = 4;
-            // 
-            // pgColumn
-            // 
-            this.pgColumn.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.pgColumn.Location = new System.Drawing.Point(830, 53);
-            this.pgColumn.Name = "pgColumn";
-            this.pgColumn.PropertySort = System.Windows.Forms.PropertySort.NoSort;
-            this.pgColumn.Size = new System.Drawing.Size(182, 412);
-            this.pgColumn.TabIndex = 5;
-            // 
-            // dgvIndex
-            // 
-            this.dgvIndex.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.dgvIndex.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dgvIndex.Location = new System.Drawing.Point(194, 344);
-            this.dgvIndex.Name = "dgvIndex";
-            this.dgvIndex.RowTemplate.Height = 23;
-            this.dgvIndex.Size = new System.Drawing.Size(629, 112);
-            this.dgvIndex.TabIndex = 6;
-            this.dgvIndex.RowEnter += new System.Windows.Forms.DataGridViewCellEventHandler(this.gv_RowEnter);
-            // 
-            // btnCreateTableSQL
-            // 
-            this.btnCreateTableSQL.Location = new System.Drawing.Point(207, 11);
-            this.btnCreateTableSQL.Name = "btnCreateTableSQL";
-            this.btnCreateTableSQL.Size = new System.Drawing.Size(68, 27);
-            this.btnCreateTableSQL.TabIndex = 6;
-            this.btnCreateTableSQL.Text = "建表语句";
-            this.btnCreateTableSQL.UseVisualStyleBackColor = true;
-            this.btnCreateTableSQL.Click += new System.EventHandler(this.btnCreateTableSQL_Click);
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(9, 18);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(41, 12);
-            this.label2.TabIndex = 8;
-            this.label2.Text = "连接：";
-            // 
-            // cbConn
-            // 
-            this.cbConn.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cbConn.FormattingEnabled = true;
-            this.cbConn.Location = new System.Drawing.Point(44, 14);
-            this.cbConn.Name = "cbConn";
-            this.cbConn.Size = new System.Drawing.Size(143, 20);
-            this.cbConn.TabIndex = 7;
-            // 
-            // groupBox2
-            // 
-            this.groupBox2.Controls.Add(this.cbConn);
-            this.groupBox2.Controls.Add(this.btnCreateDb);
-            this.groupBox2.Controls.Add(this.btnCreateDbSQL);
-            this.groupBox2.Controls.Add(this.label2);
-            this.groupBox2.Controls.Add(this.btnCreateTableSQL);
-            this.groupBox2.Location = new System.Drawing.Point(548, 2);
-            this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(464, 44);
-            this.groupBox2.TabIndex = 8;
-            this.groupBox2.TabStop = false;
-            // 
-            // btnCreateDb
-            // 
-            this.btnCreateDb.Location = new System.Drawing.Point(375, 11);
-            this.btnCreateDb.Name = "btnCreateDb";
-            this.btnCreateDb.Size = new System.Drawing.Size(68, 27);
-            this.btnCreateDb.TabIndex = 10;
-            this.btnCreateDb.Text = "建数据库";
-            this.btnCreateDb.UseVisualStyleBackColor = true;
-            this.btnCreateDb.Click += new System.EventHandler(this.btnCreateDb_Click);
-            // 
-            // btnCreateDbSQL
-            // 
-            this.btnCreateDbSQL.Location = new System.Drawing.Point(281, 11);
-            this.btnCreateDbSQL.Name = "btnCreateDbSQL";
-            this.btnCreateDbSQL.Size = new System.Drawing.Size(88, 27);
-            this.btnCreateDbSQL.TabIndex = 9;
-            this.btnCreateDbSQL.Text = "建所有表语句";
-            this.btnCreateDbSQL.UseVisualStyleBackColor = true;
-            this.btnCreateDbSQL.Click += new System.EventHandler(this.btnCreateDbSQL_Click);
-            // 
-            // FrmModel
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1020, 468);
-            this.Controls.Add(this.groupBox2);
-            this.Controls.Add(this.dgvIndex);
-            this.Controls.Add(this.pgColumn);
-            this.Controls.Add(this.pgTable);
-            this.Controls.Add(this.groupBox1);
-            this.Controls.Add(this.gv);
-            this.Name = "FrmModel";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "数据架构管理";
-            this.Load += new System.EventHandler(this.FrmModel_Load);
-            this.groupBox1.ResumeLayout(false);
-            this.groupBox1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gv)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvIndex)).EndInit();
-            this.groupBox2.ResumeLayout(false);
-            this.groupBox2.PerformLayout();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.GroupBox groupBox1;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.ComboBox cbTables;
-        private System.Windows.Forms.DataGridView gv;
-        private System.Windows.Forms.PropertyGrid pgTable;
-        private System.Windows.Forms.PropertyGrid pgColumn;
-        private System.Windows.Forms.DataGridView dgvIndex;
-        private System.Windows.Forms.Button btnAddIndex;
-        private System.Windows.Forms.Button btnAddColumn;
-        private System.Windows.Forms.Button btnAddTable;
-        private System.Windows.Forms.Button btnCreateTableSQL;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.ComboBox cbConn;
-        private System.Windows.Forms.GroupBox groupBox2;
-        private System.Windows.Forms.Button btnCreateDb;
-        private System.Windows.Forms.Button btnCreateDbSQL;
-    }
-}
\ No newline at end of file
diff --git a/XCoder/Windows/FrmModel.cs b/XCoder/Windows/FrmModel.cs
deleted file mode 100644
index 50c278b33d..0000000000
--- a/XCoder/Windows/FrmModel.cs
+++ /dev/null
@@ -1,278 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-using NewLife.Reflection;
-using XCode.DataAccessLayer;
-
-namespace XCoder
-{
-    public partial class FrmModel : Form
-    {
-        #region 属性
-        private List<IDataTable> _Tables;
-        /// <summary>表集合</summary>
-        public List<IDataTable> Tables
-        {
-            get { return _Tables; }
-            set { _Tables = value; }
-        }
-        #endregion
-
-        #region 界面初始化
-        public FrmModel()
-        {
-            InitializeComponent();
-
-            Icon = Source.GetIcon();
-        }
-
-        public static FrmModel Create(List<IDataTable> tables)
-        {
-            if (tables == null || tables.Count < 1) throw new ArgumentNullException("tables");
-
-            var frm = new FrmModel();
-            frm.Tables = tables;
-
-            return frm;
-        }
-
-        private void FrmModel_Load(Object sender, EventArgs e)
-        {
-            SetTables(Tables, 0);
-            SetDbTypes();
-        }
-        #endregion
-
-        #region 选择数据表
-        IDataTable GetSelectedTable()
-        {
-            var cb = cbTables;
-            if (cb == null || cb.SelectedItem == null) return null;
-
-            return cb.SelectedItem as IDataTable;
-        }
-
-        private void cbTables_SelectedIndexChanged(Object sender, EventArgs e)
-        {
-            var table = GetSelectedTable();
-            if (table == null) return;
-
-            pgTable.SelectedObject = table;
-            //gv.DataSource = Tables;
-
-            gv.DataSource = table.Columns;
-            dgvIndex.DataSource = table.Indexes;
-            //dgvRelation.DataSource = table.Relations;
-        }
-
-        private void gv_RowEnter(Object sender, DataGridViewCellEventArgs e)
-        {
-            if (e.RowIndex < 0) return;
-
-            var dgv = sender as DataGridView;
-            if (dgv == null) return;
-
-            var row = dgv.Rows[e.RowIndex];
-            if (row == null) return;
-
-            pgColumn.SelectedObject = row.DataBoundItem;
-        }
-
-        void SetTables(List<IDataTable> tables, Int32 index)
-        {
-            cbTables.Items.Clear();
-            if (Tables != null && tables.Count > 0)
-            {
-                foreach (var item in tables)
-                {
-                    cbTables.Items.Add(item);
-                }
-
-                if (index < 0) index = 0;
-                cbTables.SelectedIndex = index;
-            }
-            cbTables.Update();
-        }
-        #endregion
-
-        #region 添加
-        private void btnAddTable_Click(Object sender, EventArgs e)
-        {
-            if (Tables == null || Tables.Count < 1) return;
-
-            var type = Tables[0].GetType();
-            if (type == null) return;
-
-            var table = type.CreateInstance() as IDataTable;
-            if (table == null) return;
-
-            Tables.Add(table);
-            var id = Tables.Count;
-            table.TableName = "NewTable" + id;
-            table.Description = "新建表" + id;
-
-            SetTables(Tables, Tables.Count - 1);
-        }
-
-        private void btnAddColumn_Click(Object sender, EventArgs e)
-        {
-            var table = GetSelectedTable();
-            if (table == null) return;
-
-            var dc = table.CreateColumn();
-            table.Columns.Add(dc);
-            var id = table.Columns.Count;
-            dc.ColumnName = "Column" + id;
-            dc.Description = "字段" + id;
-
-            gv.DataSource = null;
-            gv.DataSource = table.Columns;
-            pgColumn.SelectedObject = dc;
-        }
-
-        private void btnAddIndex_Click(Object sender, EventArgs e)
-        {
-            var table = GetSelectedTable();
-            if (table == null) return;
-
-            var di = table.CreateIndex();
-            table.Indexes.Add(di);
-
-            dgvIndex.DataSource = null;
-            dgvIndex.DataSource = table.Indexes;
-            pgColumn.SelectedObject = di;
-        }
-
-        //private void btnAddRelation_Click(Object sender, EventArgs e)
-        //{
-        //    IDataTable table = GetSelectedTable();
-        //    if (table == null) return;
-
-        //    IDataRelation dr = table.CreateRelation();
-        //    table.Relations.Add(dr);
-
-        //    dgvRelation.DataSource = null;
-        //    dgvRelation.DataSource = table.Relations;
-        //    pgColumn.SelectedObject = dr;
-        //}
-        #endregion
-
-        #region 建表语句
-        void SetDbTypes()
-        {
-            cbConn.DataSource = DAL.ConnStrs.Keys.ToList();
-            cbConn.Update();
-        }
-
-        private void btnCreateTableSQL_Click(Object sender, EventArgs e)
-        {
-            if (cbConn.SelectedItem == null) return;
-
-            var table = GetSelectedTable();
-            if (table == null) return;
-
-            var dal = DAL.Create("" + cbConn.SelectedItem);
-            if (dal == null) return;
-
-            try
-            {
-                var md = dal.Db.CreateMetaData();
-                var sql = CreateTable(md, table);
-
-                FrmText.Create(table.TableName + "表建表语句", sql).Show();
-            }
-            catch (Exception ex)
-            {
-                FrmText.Create(table.TableName + "表建表语句", "生成建表语句错误！" + Environment.NewLine + ex.ToString()).Show();
-            }
-        }
-
-        static String CreateTable(IMetaData md, IDataTable table)
-        {
-            var sql = md.GetSchemaSQL(DDLSchema.CreateTable, table);
-
-            var sb = new StringBuilder();
-            if (!String.IsNullOrEmpty(sql)) sb.AppendLine(sql + "; ");
-
-            // 加上表注释
-            if (!String.IsNullOrEmpty(table.Description))
-            {
-                sql = md.GetSchemaSQL(DDLSchema.AddTableDescription, table);
-                if (!String.IsNullOrEmpty(sql)) sb.AppendLine(sql + "; ");
-            }
-
-            // 加上字段注释
-            foreach (var item in table.Columns)
-            {
-                if (!String.IsNullOrEmpty(item.Description))
-                {
-                    sql = md.GetSchemaSQL(DDLSchema.AddColumnDescription, item);
-                    if (!String.IsNullOrEmpty(sql)) sb.AppendLine(sql + "; ");
-                }
-            }
-
-            // 加上索引
-            if (table.Indexes != null)
-            {
-                foreach (var item in table.Indexes)
-                {
-                    if (!item.PrimaryKey)
-                    {
-                        sql = md.GetSchemaSQL(DDLSchema.CreateIndex, item);
-                        if (!String.IsNullOrEmpty(sql)) sb.AppendLine(sql + "; ");
-                    }
-                }
-            }
-
-            return sb.ToString();
-        }
-
-        private void btnCreateDbSQL_Click(Object sender, EventArgs e)
-        {
-            if (cbConn.SelectedItem == null) return;
-
-            var dal = DAL.Create("" + cbConn.SelectedItem);
-            if (dal == null) return;
-
-            try
-            {
-                var md = dal.Db.CreateMetaData();
-                var sb = new StringBuilder();
-                foreach (var table in Tables)
-                {
-                    var sql = CreateTable(md, table);
-                    if (!String.IsNullOrEmpty(sql)) sb.AppendLine(sql);
-                }
-
-                FrmText.Create("建表语句", sb.ToString()).Show();
-            }
-            catch (Exception ex)
-            {
-                FrmText.Create("建表语句", "生成建表语句错误！" + Environment.NewLine + ex.ToString()).Show();
-            }
-        }
-
-        private void btnCreateDb_Click(Object sender, EventArgs e)
-        {
-            if (cbConn.SelectedItem == null) return;
-
-            var dal = DAL.Create("" + cbConn.SelectedItem);
-            if (dal == null) return;
-
-            try
-            {
-                var md = dal.Db.CreateMetaData();
-                md.SetTables(Migration.Full, Tables.ToArray());
-
-                MessageBox.Show("成功建立" + Tables.Count + "张数据表！", Text);
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show("建表失败！" + Environment.NewLine + ex.Message, Text);
-            }
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/XCoder/Windows/FrmModel.resx b/XCoder/Windows/FrmModel.resx
deleted file mode 100644
index 29dcb1b3a3..0000000000
--- a/XCoder/Windows/FrmModel.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file
diff --git a/XCoder/Windows/FrmQuery.Designer.cs b/XCoder/Windows/FrmQuery.Designer.cs
deleted file mode 100644
index 76604f69ca..0000000000
--- a/XCoder/Windows/FrmQuery.Designer.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-﻿namespace XCoder
-{
-    partial class FrmQuery
-    {
-        /// <summary>Required designer variable.</summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>Clean up any resources being used.</summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.groupBox1 = new System.Windows.Forms.GroupBox();
-            this.btnExecute = new System.Windows.Forms.Button();
-            this.btnQuery = new System.Windows.Forms.Button();
-            this.txtSQL = new System.Windows.Forms.TextBox();
-            this.gv = new System.Windows.Forms.DataGridView();
-            this.statusStrip1 = new System.Windows.Forms.StatusStrip();
-            this.lbStatus = new System.Windows.Forms.ToolStripStatusLabel();
-            this.groupBox1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gv)).BeginInit();
-            this.statusStrip1.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // groupBox1
-            // 
-            this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.groupBox1.Controls.Add(this.btnExecute);
-            this.groupBox1.Controls.Add(this.btnQuery);
-            this.groupBox1.Controls.Add(this.txtSQL);
-            this.groupBox1.Location = new System.Drawing.Point(6, 2);
-            this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(770, 129);
-            this.groupBox1.TabIndex = 2;
-            this.groupBox1.TabStop = false;
-            // 
-            // btnExecute
-            // 
-            this.btnExecute.Location = new System.Drawing.Point(679, 75);
-            this.btnExecute.Name = "btnExecute";
-            this.btnExecute.Size = new System.Drawing.Size(78, 38);
-            this.btnExecute.TabIndex = 5;
-            this.btnExecute.Text = "执行";
-            this.btnExecute.UseVisualStyleBackColor = true;
-            this.btnExecute.Click += new System.EventHandler(this.btnExecute_Click);
-            // 
-            // btnQuery
-            // 
-            this.btnQuery.Location = new System.Drawing.Point(679, 20);
-            this.btnQuery.Name = "btnQuery";
-            this.btnQuery.Size = new System.Drawing.Size(78, 38);
-            this.btnQuery.TabIndex = 4;
-            this.btnQuery.Text = "查询";
-            this.btnQuery.UseVisualStyleBackColor = true;
-            this.btnQuery.Click += new System.EventHandler(this.btnQuery_Click);
-            // 
-            // txtSQL
-            // 
-            this.txtSQL.Location = new System.Drawing.Point(6, 10);
-            this.txtSQL.Multiline = true;
-            this.txtSQL.Name = "txtSQL";
-            this.txtSQL.Size = new System.Drawing.Size(664, 113);
-            this.txtSQL.TabIndex = 3;
-            // 
-            // gv
-            // 
-            this.gv.AllowUserToAddRows = false;
-            this.gv.AllowUserToDeleteRows = false;
-            this.gv.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.gv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.gv.Location = new System.Drawing.Point(0, 137);
-            this.gv.Name = "gv";
-            this.gv.ReadOnly = true;
-            this.gv.RowTemplate.Height = 23;
-            this.gv.Size = new System.Drawing.Size(784, 271);
-            this.gv.TabIndex = 3;
-            // 
-            // statusStrip1
-            // 
-            this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.lbStatus});
-            this.statusStrip1.Location = new System.Drawing.Point(0, 411);
-            this.statusStrip1.Name = "statusStrip1";
-            this.statusStrip1.Size = new System.Drawing.Size(784, 22);
-            this.statusStrip1.TabIndex = 4;
-            this.statusStrip1.Text = "statusStrip1";
-            // 
-            // lbStatus
-            // 
-            this.lbStatus.Name = "lbStatus";
-            this.lbStatus.Size = new System.Drawing.Size(0, 17);
-            // 
-            // FrmQuery
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(784, 433);
-            this.Controls.Add(this.statusStrip1);
-            this.Controls.Add(this.groupBox1);
-            this.Controls.Add(this.gv);
-            this.Name = "FrmQuery";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "查询分析器";
-            this.Load += new System.EventHandler(this.FrmQuery_Load);
-            this.groupBox1.ResumeLayout(false);
-            this.groupBox1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gv)).EndInit();
-            this.statusStrip1.ResumeLayout(false);
-            this.statusStrip1.PerformLayout();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.GroupBox groupBox1;
-        private System.Windows.Forms.DataGridView gv;
-        private System.Windows.Forms.Button btnExecute;
-        private System.Windows.Forms.Button btnQuery;
-        private System.Windows.Forms.TextBox txtSQL;
-        private System.Windows.Forms.StatusStrip statusStrip1;
-        private System.Windows.Forms.ToolStripStatusLabel lbStatus;
-    }
-}
\ No newline at end of file
diff --git a/XCoder/Windows/FrmQuery.cs b/XCoder/Windows/FrmQuery.cs
deleted file mode 100644
index e92b63cc6d..0000000000
--- a/XCoder/Windows/FrmQuery.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-﻿using System;
-using System.Data;
-using System.Diagnostics;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using NewLife.Threading;
-using XCode.DataAccessLayer;
-
-namespace XCoder
-{
-    public partial class FrmQuery : Form
-    {
-        #region 属性
-        private DAL _Dal;
-        /// <summary>数据层</summary>
-        public DAL Dal { get { return _Dal; } set { _Dal = value; } }
-        #endregion
-
-        #region 初始化界面
-        public FrmQuery()
-        {
-            InitializeComponent();
-
-            Icon = Source.GetIcon();
-        }
-
-        public static FrmQuery Create(DAL db)
-        {
-            if (db == null) throw new ArgumentNullException("db");
-
-            var frm = new FrmQuery();
-            frm.Dal = db;
-
-            return frm;
-        }
-
-        private void FrmQuery_Load(Object sender, EventArgs e)
-        {
-        }
-        #endregion
-
-        private void btnQuery_Click(Object sender, EventArgs e)
-        {
-            var sql = txtSQL.Text;
-            if (sql.IsNullOrWhiteSpace()) return;
-
-            Task.Factory.StartNew(() =>
-            {
-                var sw = Stopwatch.StartNew();
-
-                String msg = null;
-                DataTable dt = null;
-                try
-                {
-                    var ds = Dal.Session.Query(sql);
-                    if (ds != null && ds.Tables != null && ds.Tables.Count > 0) dt = ds.Tables[0];
-
-                    msg = "查询完成！";
-                }
-                catch (Exception ex)
-                {
-                    msg = ex.Message;
-                }
-                finally
-                {
-                    sw.Stop();
-
-                    msg += String.Format(" 耗时{0}", sw.Elapsed);
-                }
-
-                this.Invoke(() => lbStatus.Text = msg);
-                if (dt != null) this.Invoke(() => gv.DataSource = dt);
-            }).LogException();
-        }
-
-        private void btnExecute_Click(Object sender, EventArgs e)
-        {
-            var sql = txtSQL.Text;
-            if (sql.IsNullOrWhiteSpace()) return;
-
-            Task.Factory.StartNew(() =>
-            {
-                var sw = Stopwatch.StartNew();
-
-                String msg = null;
-                try
-                {
-                    var n = Dal.Session.Execute(sql);
-
-                    msg = String.Format("执行完成！共影响{0}行！", n);
-                }
-                catch (Exception ex)
-                {
-                    msg = ex.Message;
-                }
-                finally
-                {
-                    sw.Stop();
-
-                    msg += String.Format(" 耗时{0}", sw.Elapsed);
-                }
-
-                this.Invoke(() => lbStatus.Text = msg);
-            }).LogException();
-        }
-    }
-}
diff --git a/XCoder/Windows/FrmQuery.resx b/XCoder/Windows/FrmQuery.resx
deleted file mode 100644
index ab4284273b..0000000000
--- a/XCoder/Windows/FrmQuery.resx
+++ /dev/null
@@ -1,123 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-</root>
\ No newline at end of file
diff --git a/XCoder/Windows/FrmSchema.Designer.cs b/XCoder/Windows/FrmSchema.Designer.cs
deleted file mode 100644
index da3093a1a7..0000000000
--- a/XCoder/Windows/FrmSchema.Designer.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-﻿namespace XCoder
-{
-    partial class FrmSchema
-    {
-        /// <summary>Required designer variable.</summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>Clean up any resources being used.</summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.groupBox1 = new System.Windows.Forms.GroupBox();
-            this.label1 = new System.Windows.Forms.Label();
-            this.cbTables = new System.Windows.Forms.ComboBox();
-            this.cbSchemas = new System.Windows.Forms.ComboBox();
-            this.label2 = new System.Windows.Forms.Label();
-            this.gv = new System.Windows.Forms.DataGridView();
-            this.groupBox1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gv)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // groupBox1
-            // 
-            this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.groupBox1.Controls.Add(this.label1);
-            this.groupBox1.Controls.Add(this.cbTables);
-            this.groupBox1.Controls.Add(this.cbSchemas);
-            this.groupBox1.Controls.Add(this.label2);
-            this.groupBox1.Location = new System.Drawing.Point(6, 5);
-            this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(770, 44);
-            this.groupBox1.TabIndex = 0;
-            this.groupBox1.TabStop = false;
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(290, 20);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(77, 12);
-            this.label1.TabIndex = 5;
-            this.label1.Text = "数据表架构：";
-            // 
-            // cbTables
-            // 
-            this.cbTables.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cbTables.FormattingEnabled = true;
-            this.cbTables.Location = new System.Drawing.Point(373, 16);
-            this.cbTables.Name = "cbTables";
-            this.cbTables.Size = new System.Drawing.Size(168, 20);
-            this.cbTables.TabIndex = 4;
-            this.cbTables.SelectedIndexChanged += new System.EventHandler(this.cbTables_SelectedIndexChanged);
-            // 
-            // cbSchemas
-            // 
-            this.cbSchemas.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cbSchemas.FormattingEnabled = true;
-            this.cbSchemas.Location = new System.Drawing.Point(81, 16);
-            this.cbSchemas.Name = "cbSchemas";
-            this.cbSchemas.Size = new System.Drawing.Size(179, 20);
-            this.cbSchemas.TabIndex = 3;
-            this.cbSchemas.SelectedIndexChanged += new System.EventHandler(this.cbTables_SelectedIndexChanged);
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(11, 20);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(65, 12);
-            this.label2.TabIndex = 2;
-            this.label2.Text = "数据架构：";
-            // 
-            // gv
-            // 
-            this.gv.AllowUserToAddRows = false;
-            this.gv.AllowUserToDeleteRows = false;
-            this.gv.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.gv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.gv.Location = new System.Drawing.Point(0, 55);
-            this.gv.Name = "gv";
-            this.gv.ReadOnly = true;
-            this.gv.RowTemplate.Height = 23;
-            this.gv.Size = new System.Drawing.Size(784, 378);
-            this.gv.TabIndex = 1;
-            // 
-            // FrmSchema
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(784, 433);
-            this.Controls.Add(this.gv);
-            this.Controls.Add(this.groupBox1);
-            this.Name = "FrmSchema";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "数据库架构信息管理器";
-            this.Load += new System.EventHandler(this.FrmSchema_Load);
-            this.groupBox1.ResumeLayout(false);
-            this.groupBox1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gv)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.GroupBox groupBox1;
-        private System.Windows.Forms.DataGridView gv;
-        private System.Windows.Forms.ComboBox cbSchemas;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.ComboBox cbTables;
-    }
-}
\ No newline at end of file
diff --git a/XCoder/Windows/FrmSchema.cs b/XCoder/Windows/FrmSchema.cs
deleted file mode 100644
index 9d25c14df7..0000000000
--- a/XCoder/Windows/FrmSchema.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-﻿using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using NewLife.Log;
-using XCode.DataAccessLayer;
-
-namespace XCoder
-{
-    public partial class FrmSchema : Form
-    {
-        #region 属性
-        private IDatabase _Db;
-        /// <summary>数据库</summary>
-        public IDatabase Db
-        {
-            get { return _Db; }
-            set { _Db = value; }
-        }
-        #endregion
-
-        #region 初始化界面
-        public FrmSchema()
-        {
-            InitializeComponent();
-
-            Icon = Source.GetIcon();
-        }
-
-        public static FrmSchema Create(IDatabase db)
-        {
-            var frm = new FrmSchema
-            {
-                Db = db ?? throw new ArgumentNullException("db")
-            };
-
-            return frm;
-        }
-
-        private void FrmSchema_Load(Object sender, EventArgs e)
-        {
-            Task.Factory.StartNew(() =>
-            {
-                var tables = Db.CreateMetaData().GetTables();
-                this.Invoke(SetList, cbTables, tables);
-            }).LogException();
-            Task.Factory.StartNew(() =>
-            {
-                var list = Db.CreateMetaData().MetaDataCollections;
-                this.Invoke(SetList, cbSchemas, list);
-            }).LogException();
-        }
-        #endregion
-
-        #region 加载
-        void SetList(ComboBox cb, IEnumerable data)
-        {
-            if (cb == null || data == null) return;
-
-            try
-            {
-                if (!(data is IList))
-                {
-                    var list = new List<Object>();
-                    foreach (var item in data)
-                    {
-                        list.Add(item);
-                    }
-                    data = list;
-                }
-                cb.DataSource = data;
-                //cb.DisplayMember = "value";
-                cb.Update();
-            }
-            catch (Exception ex)
-            {
-                XTrace.WriteException(ex);
-            }
-        }
-        #endregion
-
-        private void cbTables_SelectedIndexChanged(Object sender, EventArgs e)
-        {
-            var cb = sender as ComboBox;
-            if (cb == null) return;
-
-            var obj = cb.SelectedItem;
-            if (obj == null) return;
-
-            try
-            {
-                var ss = Db.CreateSession();
-                if (obj is IDataTable)
-                {
-                    var sql = "select * from " + (obj as IDataTable).TableName;
-                    DataTable dt = null;
-                    try
-                    {
-                        using (var cmd = ss.CreateCommand(sql))
-                        using (var reader = cmd.ExecuteReader(CommandBehavior.KeyInfo | CommandBehavior.SchemaOnly))
-                        {
-                            dt = reader.GetSchemaTable();
-                        }
-                    }
-                    finally
-                    {
-                        ss.AutoClose();
-                    }
-                    obj = dt;
-                }
-                else if (obj is String)
-                {
-                    obj = ss.GetSchema((String)obj, null);
-                }
-                gv.DataSource = obj;
-                gv.Update();
-            }
-            catch (Exception ex)
-            {
-                XTrace.WriteException(ex);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/XCoder/Windows/FrmSchema.resx b/XCoder/Windows/FrmSchema.resx
deleted file mode 100644
index 5ea0895e32..0000000000
--- a/XCoder/Windows/FrmSchema.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file
diff --git a/XCoder/Windows/FrmText.Designer.cs b/XCoder/Windows/FrmText.Designer.cs
deleted file mode 100644
index 8eae5f5b4a..0000000000
--- a/XCoder/Windows/FrmText.Designer.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-﻿namespace XCoder
-{
-    partial class FrmText
-    {
-        /// <summary>Required designer variable.</summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>Clean up any resources being used.</summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmText));
-            this.richTextBox1 = new System.Windows.Forms.RichTextBox();
-            this.SuspendLayout();
-            // 
-            // richTextBox1
-            // 
-            this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.richTextBox1.Location = new System.Drawing.Point(0, 0);
-            this.richTextBox1.Name = "richTextBox1";
-            this.richTextBox1.Size = new System.Drawing.Size(657, 405);
-            this.richTextBox1.TabIndex = 0;
-            this.richTextBox1.Text = "";
-            // 
-            // FrmText
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(657, 405);
-            this.Controls.Add(this.richTextBox1);
-            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.Name = "FrmText";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "FrmText";
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.RichTextBox richTextBox1;
-    }
-}
\ No newline at end of file
diff --git a/XCoder/Windows/FrmText.cs b/XCoder/Windows/FrmText.cs
deleted file mode 100644
index 363bad0f2d..0000000000
--- a/XCoder/Windows/FrmText.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-﻿using System;
-using System.Windows.Forms;
-
-namespace XCoder
-{
-    public partial class FrmText : Form
-    {
-        #region 界面初始化
-        public FrmText()
-        {
-            InitializeComponent();
-
-            Icon = Source.GetIcon();
-        }
-
-        public static FrmText Create(String title, String content)
-        {
-            var frm = new FrmText();
-            if (!String.IsNullOrEmpty(title)) frm.Text = title;
-            frm.Content = content;
-
-            return frm;
-        }
-        #endregion
-
-        /// <summary>内容</summary>
-        public String Content { get { return richTextBox1.Text; } set { richTextBox1.Text = ("" + value).Replace("\t", "    "); } }
-    }
-}
\ No newline at end of file
diff --git a/XCoder/Windows/FrmText.resx b/XCoder/Windows/FrmText.resx
deleted file mode 100644
index 5ea0895e32..0000000000
--- a/XCoder/Windows/FrmText.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file
diff --git a/XCoder/XApi/ApiConfig.cs b/XCoder/XApi/ApiConfig.cs
deleted file mode 100644
index 1a25e9c6d5..0000000000
--- a/XCoder/XApi/ApiConfig.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-﻿using System;
-using System.ComponentModel;
-using System.Linq;
-using NewLife.Xml;
-
-namespace XApi
-{
-    /// <summary>Api配置</summary>
-    [XmlConfigFile("Config\\Api.config")]
-    public class ApiConfig : XmlConfig<ApiConfig>
-    {
-        #region 属性
-        /// <summary>端口</summary>
-        [Description("端口")]
-        public Int32 Port { get; set; } = 777;
-
-        /// <summary>地址</summary>
-        [Description("地址")]
-        public String Address { get; set; } = "";
-
-        /// <summary>模式</summary>
-        [Description("模式")]
-        public String Mode { get; set; } = "服务端";
-
-        /// <summary>发送内容</summary>
-        [Description("发送内容")]
-        public String SendContent { get; set; } = "新生命开发团队，学无先后达者为师";
-
-        /// <summary>发送次数</summary>
-        [Description("发送次数")]
-        public Int32 SendTimes { get; set; } = 1;
-
-        /// <summary>发送间隔。毫秒</summary>
-        [Description("发送间隔。毫秒")]
-        public Int32 SendSleep { get; set; } = 1000;
-
-        /// <summary>发送用户数</summary>
-        [Description("发送用户数")]
-        public Int32 SendUsers { get; set; } = 1;
-
-        /// <summary>显示应用日志</summary>
-        [Description("显示应用日志")]
-        public Boolean ShowLog { get; set; } = true;
-
-        /// <summary>显示编码日志</summary>
-        [Description("显示编码日志")]
-        public Boolean ShowEncoderLog { get; set; } = true;
-
-        /// <summary>显示发送数据</summary>
-        [Description("显示发送数据")]
-        public Boolean ShowSend { get; set; }
-
-        /// <summary>显示接收数据</summary>
-        [Description("显示接收数据")]
-        public Boolean ShowReceive { get; set; }
-
-        /// <summary>显示统计信息</summary>
-        [Description("显示统计信息")]
-        public Boolean ShowStat { get; set; } = true;
-
-        /// <summary>日志着色</summary>
-        [Description("日志着色")]
-        public Boolean ColorLog { get; set; } = true;
-        #endregion
-
-        #region 方法
-        public ApiConfig() { }
-
-        public void AddAddress(String addr)
-        {
-            var addrs = (Address + "").Split(";").Distinct().ToList();
-            addrs.Insert(0, addr);
-            addrs = addrs.Distinct().ToList();
-            while (addrs.Count > 10) addrs.RemoveAt(addrs.Count - 1);
-            Address = addrs.Join(";");
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/XCoder/XApi/FrmMain.cs b/XCoder/XApi/FrmMain.cs
deleted file mode 100644
index 483f9add3c..0000000000
--- a/XCoder/XApi/FrmMain.cs
+++ /dev/null
@@ -1,540 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Drawing;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using NewLife.Data;
-using NewLife.Log;
-using NewLife.Net;
-using NewLife.Reflection;
-using NewLife.Remoting;
-using NewLife.Serialization;
-using NewLife.Threading;
-using NewLife.Windows;
-using XCoder;
-#if !NET4
-using TaskEx = System.Threading.Tasks.Task;
-#endif
-
-namespace XApi
-{
-    [DisplayName("Api调试")]
-    public partial class FrmMain : Form, IXForm
-    {
-        ApiServer _Server;
-        ApiClient _Client;
-
-        /// <summary>业务日志输出</summary>
-        ILog BizLog;
-
-        #region 窗体
-        public FrmMain()
-        {
-            InitializeComponent();
-
-            // 动态调节宽度高度，兼容高DPI
-            this.FixDpi();
-
-            //Font = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
-            Icon = IcoHelper.GetIcon("Api");
-        }
-
-        private void FrmMain_Load(Object sender, EventArgs e)
-        {
-            var log = TextFileLog.Create(null, "Api_{0:yyyy_MM_dd}.log");
-            BizLog = txtReceive.Combine(log);
-            txtReceive.UseWinFormControl();
-
-            txtReceive.SetDefaultStyle(12);
-            txtSend.SetDefaultStyle(12);
-            numMutilSend.SetDefaultStyle(12);
-
-            gbReceive.Tag = gbReceive.Text;
-            gbSend.Tag = gbSend.Text;
-
-            var cfg = ApiConfig.Current;
-            //cbMode.SelectedItem = cbMode.Items[0] + "";
-            cbMode.SelectedItem = cfg.Mode;
-            var flag = (cfg.Mode == "服务端");
-            numPort.Enabled = flag;
-            cbAddr.Enabled = !flag;
-
-            // 加载保存的颜色
-            UIConfig.Apply(txtReceive);
-
-            LoadConfig();
-
-            // 语音识别
-            Task.Factory.StartNew(() =>
-            {
-                var sp = SpeechRecognition.Current;
-                if (!sp.Enable) return;
-
-                sp.Register("打开", () => this.Invoke(Connect))
-                .Register("关闭", () => this.Invoke(Disconnect))
-                .Register("退出", () => Application.Exit())
-                .Register("发送", () => this.Invoke(() => btnSend_Click(null, null)));
-
-                BizLog.Info("语音识别前缀：{0} 可用命令：{1}", sp.Name, sp.GetAllKeys().Join());
-            });
-        }
-        #endregion
-
-        #region 加载/保存 配置
-        void LoadConfig()
-        {
-            var cfg = ApiConfig.Current;
-            mi显示应用日志.Checked = cfg.ShowLog;
-            mi显示编码日志.Checked = cfg.ShowEncoderLog;
-            mi显示发送数据.Checked = cfg.ShowSend;
-            mi显示接收数据.Checked = cfg.ShowReceive;
-            mi显示统计信息.Checked = cfg.ShowStat;
-
-            cbMode.SelectedItem = cfg.Mode;
-            numPort.Value = cfg.Port;
-            // 历史地址列表
-            if (!cfg.Address.IsNullOrEmpty()) cbAddr.DataSource = cfg.Address.Split(";");
-
-            txtSend.Text = cfg.SendContent;
-            numMutilSend.Value = cfg.SendTimes;
-            numSleep.Value = cfg.SendSleep;
-            numThreads.Value = cfg.SendUsers;
-            mi日志着色.Checked = cfg.ColorLog;
-        }
-
-        void SaveConfig()
-        {
-            var cfg = ApiConfig.Current;
-            cfg.ShowLog = mi显示应用日志.Checked;
-            cfg.ShowEncoderLog = mi显示编码日志.Checked;
-            cfg.ShowSend = mi显示发送数据.Checked;
-            cfg.ShowReceive = mi显示接收数据.Checked;
-            cfg.ShowStat = mi显示统计信息.Checked;
-
-            cfg.Mode = cbMode.SelectedItem + "";
-            cfg.Port = (Int32)numPort.Value;
-            cfg.AddAddress(cbAddr.Text);
-
-            cfg.SendContent = txtSend.Text;
-            cfg.SendTimes = (Int32)numMutilSend.Value;
-            cfg.SendSleep = (Int32)numSleep.Value;
-            cfg.SendUsers = (Int32)numThreads.Value;
-            cfg.ColorLog = mi日志着色.Checked;
-
-            cfg.Save();
-        }
-        #endregion
-
-        #region 收发数据
-        void Connect()
-        {
-            _Server = null;
-            _Client = null;
-
-            var port = (Int32)numPort.Value;
-            var uri = new NetUri(cbAddr.Text);
-
-            var cfg = ApiConfig.Current;
-            var log = BizLog;
-
-            switch (cbMode.Text)
-            {
-                case "服务端":
-                    var svr = new ApiServer(port)
-                    {
-                        Log = cfg.ShowLog ? log : Logger.Null,
-                        EncoderLog = cfg.ShowEncoderLog ? log : Logger.Null
-                    };
-
-                    if (cfg.ShowSend || cfg.ShowReceive)
-                    {
-                        var ns = svr.Server as NetServer;
-                        ns.Log = log;
-                        ns.LogSend = cfg.ShowSend;
-                        ns.LogReceive = cfg.ShowReceive;
-                    }
-
-                    svr.Register<MyApiController>();
-                    svr.Start();
-
-                    "正在监听{0}".F(port).SpeechTip();
-
-                    _Server = svr;
-                    break;
-                case "客户端":
-                    var client = new ApiClient(uri + "")
-                    {
-                        Log = cfg.ShowLog ? log : Logger.Null,
-                        EncoderLog = cfg.ShowEncoderLog ? log : Logger.Null
-                    };
-
-                    if (cfg.ShowSend || cfg.ShowReceive)
-                    {
-                        var ct = client.Client;
-                        ct.Log = log;
-                        ct.LogSend = cfg.ShowSend;
-                        ct.LogReceive = cfg.ShowReceive;
-                    }
-
-                    _Client = client;
-                    client.Open();
-                    // 连接成功后拉取Api列表
-                    GetApiAll();
-
-                    "已连接服务器".SpeechTip();
-
-                    break;
-                default:
-                    return;
-            }
-
-            pnlSetting.Enabled = false;
-            btnConnect.Text = "关闭";
-
-            // 添加地址
-            var addr = uri.ToString();
-            var list = cfg.Address.Split(";").ToList();
-            if (!list.Contains(addr))
-            {
-                list.Insert(0, addr);
-                cfg.Address = list.Join(";");
-            }
-
-            cfg.Save();
-
-            _timer = new TimerX(ShowStat, null, 5000, 5000) { Async = true };
-        }
-
-        async void GetApiAll()
-        {
-            var apis = await _Client.InvokeAsync<String[]>("Api/All");
-            if (apis != null) this.Invoke(() =>
-            {
-                cbAction.Items.Clear();
-                foreach (var item in apis)
-                {
-                    cbAction.Items.Add(item);
-                }
-                cbAction.SelectedIndex = 0;
-                cbAction.Visible = true;
-            });
-        }
-
-        void Disconnect()
-        {
-            if (_Client != null)
-            {
-                _Client.Dispose();
-                _Client = null;
-
-                "关闭连接".SpeechTip();
-            }
-            if (_Server != null)
-            {
-                "停止服务".SpeechTip();
-                _Server.Dispose();
-                _Server = null;
-            }
-            if (_timer != null)
-            {
-                _timer.Dispose();
-                _timer = null;
-            }
-
-            pnlSetting.Enabled = true;
-            btnConnect.Text = "打开";
-        }
-
-        TimerX _timer;
-        String _lastStat;
-        void ShowStat(Object state)
-        {
-            if (!ApiConfig.Current.ShowStat) return;
-
-            var msg = "";
-            if (_Client != null)
-                msg = _Client.GetStat();
-            else if (_Server != null)
-                msg = _Server.GetStat();
-
-            if (_Invoke > 0)
-            {
-                var ms = (Double)_Cost / _Invoke / 1000;
-                if (ms > 1)
-                    msg += $" Invoke={_Invoke} {ms:n0}ms";
-                else
-                    msg += $" Invoke={_Invoke} {ms:n3}ms";
-
-                if (_TotalCost > 0) msg += $" Speed={_Invoke * 1000d / _TotalCost:n0}tps";
-            }
-
-            if (!msg.IsNullOrEmpty() && msg != _lastStat)
-            {
-                _lastStat = msg;
-                BizLog.Info(msg);
-            }
-        }
-
-        private void btnConnect_Click(Object sender, EventArgs e)
-        {
-            SaveConfig();
-
-            var btn = sender as Button;
-            if (btn.Text == "打开")
-                Connect();
-            else
-                Disconnect();
-        }
-
-        Int32 _pColor = 0;
-        Int32 BytesOfReceived = 0;
-        Int32 BytesOfSent = 0;
-        Int32 lastReceive = 0;
-        Int32 lastSend = 0;
-        private void timer1_Tick(Object sender, EventArgs e)
-        {
-            //if (!pnlSetting.Enabled)
-            {
-                var rcount = BytesOfReceived;
-                var tcount = BytesOfSent;
-                if (rcount != lastReceive)
-                {
-                    gbReceive.Text = (gbReceive.Tag + "").Replace("0", rcount + "");
-                    lastReceive = rcount;
-                }
-                if (tcount != lastSend)
-                {
-                    gbSend.Text = (gbSend.Tag + "").Replace("0", tcount + "");
-                    lastSend = tcount;
-                }
-
-                var set = ApiConfig.Current;
-                if (set.ColorLog) txtReceive.ColourDefault(_pColor);
-                _pColor = txtReceive.TextLength;
-            }
-        }
-
-        private async void btnSend_Click(Object sender, EventArgs e)
-        {
-            var str = txtSend.Text;
-            if (String.IsNullOrEmpty(str))
-            {
-                MessageBox.Show("发送内容不能为空！", Text);
-                txtSend.Focus();
-                return;
-            }
-
-            // 多次发送
-            var count = (Int32)numMutilSend.Value;
-            var sleep = (Int32)numSleep.Value;
-            var ths = (Int32)numThreads.Value;
-            if (count <= 0) count = 1;
-            if (sleep <= 0) sleep = 1;
-
-            SaveConfig();
-
-            var uri = new NetUri(cbAddr.Text);
-            var cfg = ApiConfig.Current;
-
-            // 处理换行
-            str = str.Replace("\n", "\r\n");
-
-            var act = cbAction.SelectedItem + "";
-            var action = act.Substring(" ", "(");
-            if (action.IsNullOrEmpty()) return;
-
-            var rtype = act.Substring(null, " ").GetTypeEx();
-            if (rtype == null) rtype = typeof(Object);
-            var ps = act.Substring("(", ")").Split(",");
-
-            // 构造消息，二进制优先
-            Object args = null;
-            if (ps.Length == 1 && ps[0].StartsWith("Packet "))
-            {
-                args = new Packet(str.GetBytes());
-            }
-            else
-            {
-                var dic = new JsonParser(str).Decode() as IDictionary<String, Object>;
-                if (dic == null || dic.Count == 0) dic = null;
-                args = dic;
-            }
-
-            if (_Client == null) return;
-
-            _Invoke = 0;
-            _Cost = 0;
-            _TotalCost = 0;
-
-            var ct = _Client.Client;
-            var list = new List<ApiClient> { _Client };
-            for (var i = 0; i < ths - 1; i++)
-            {
-                var client = new ApiClient(uri + "");
-                var ct2 = client.Client;
-                ct2.Log = ct.Log;
-                ct2.LogSend = ct.LogSend;
-                ct2.LogReceive = ct.LogReceive;
-                ct2.StatSend = ct.StatSend;
-                ct2.StatReceive = ct.StatReceive;
-
-                client.StatSend = _Client.StatSend;
-                client.StatReceive = _Client.StatReceive;
-
-                list.Add(client);
-            }
-            //Parallel.ForEach(list, k => OnSend(k, act, args, count));
-            var sw = Stopwatch.StartNew();
-            var ts = list.Select(k => OnSend(k, rtype, action, args, count, sleep)).ToList();
-
-            await TaskEx.WhenAll(ts);
-            sw.Stop();
-            _TotalCost = sw.Elapsed.TotalMilliseconds;
-        }
-
-        Int64 _Invoke;
-        Int64 _Cost;
-        Double _TotalCost;
-        private async Task OnSend(ApiClient client, Type rtype, String act, Object args, Int32 count, Int32 sleep)
-        {
-            client.Open();
-
-            // 间隔1开启同步发送不等待
-            if (sleep == 1)
-            {
-                var sw = Stopwatch.StartNew();
-                for (var i = 0; i < count; i++)
-                {
-                    try
-                    {
-                        Interlocked.Increment(ref _Invoke);
-
-                        client.Invoke(act, args);
-                    }
-                    catch (ApiException ex)
-                    {
-                        BizLog.Info(ex.Message);
-                    }
-                }
-                sw.Stop();
-                Interlocked.Add(ref _Cost, (Int64)(sw.Elapsed.TotalMilliseconds * 1000));
-            }
-            // 间隔2~10多任务异步发送
-            else if (sleep <= 10)
-            {
-                var ts = new List<Task>();
-                for (var i = 0; i < count; i++)
-                {
-                    ts.Add(TaskEx.Run(async () =>
-                    {
-                        try
-                        {
-                            //var sw = Stopwatch.StartNew();
-                            await client.InvokeAsync(rtype, act, args);
-                            //sw.Stop();
-
-                            Interlocked.Increment(ref _Invoke);
-                            //Interlocked.Add(ref _Cost, (Int64)(sw.Elapsed.TotalMilliseconds * 1000));
-                        }
-                        catch (ApiException ex)
-                        {
-                            BizLog.Info(ex.Message);
-                        }
-                    }));
-                }
-
-                await TaskEx.WhenAll(ts);
-            }
-            // 间隔>10单任务异步发送
-            else
-            {
-                for (var i = 0; i < count; i++)
-                {
-                    try
-                    {
-                        var sw = Stopwatch.StartNew();
-                        await client.InvokeAsync(rtype, act, args);
-                        sw.Stop();
-
-                        Interlocked.Increment(ref _Invoke);
-                        Interlocked.Add(ref _Cost, (Int64)(sw.Elapsed.TotalMilliseconds * 1000));
-                    }
-                    catch (ApiException ex)
-                    {
-                        BizLog.Info(ex.Message);
-                    }
-
-                    await TaskEx.Delay(sleep);
-                }
-            }
-        }
-        #endregion
-
-        #region 右键菜单
-        private void mi清空_Click(Object sender, EventArgs e)
-        {
-            txtReceive.Clear();
-            BytesOfReceived = 0;
-        }
-
-        private void mi清空2_Click(Object sender, EventArgs e)
-        {
-            txtSend.Clear();
-            BytesOfSent = 0;
-        }
-
-        private void miCheck_Click(Object sender, EventArgs e)
-        {
-            var mi = sender as ToolStripMenuItem;
-            mi.Checked = !mi.Checked;
-        }
-        #endregion
-
-        private void cbAction_SelectedIndexChanged(Object sender, EventArgs e)
-        {
-            if (!(sender is ComboBox cb)) return;
-
-            var txt = cb.SelectedItem + "";
-            if (txt.IsNullOrEmpty()) return;
-
-            var set = ApiConfig.Current;
-
-            // 截取参数部分
-            var pis = txt.Substring("(", ")").Split(",");
-
-            // 生成参数
-            var ps = new Dictionary<String, Object>();
-            foreach (var item in pis)
-            {
-                var ss = item.Split(" ");
-                Object val = null;
-                switch (ss[0])
-                {
-                    case "String":
-                        val = "";
-                        break;
-                    case "Int32":
-                        val = 0;
-                        break;
-                    default:
-                        break;
-                }
-                ps[ss[1]] = val;
-            }
-
-            txtSend.Text = ps.ToJson();
-        }
-
-        private void cbMode_SelectedIndexChanged(Object sender, EventArgs e)
-        {
-            var mode = cbMode.SelectedItem + "";
-            var flag = mode == "服务端";
-            numPort.Enabled = flag;
-            cbAddr.Enabled = !flag;
-        }
-    }
-}
\ No newline at end of file
diff --git a/XCoder/XApi/FrmMain.designer.cs b/XCoder/XApi/FrmMain.designer.cs
deleted file mode 100644
index d4ae1a6252..0000000000
--- a/XCoder/XApi/FrmMain.designer.cs
+++ /dev/null
@@ -1,534 +0,0 @@
-﻿namespace XApi
-{
-    partial class FrmMain
-    {
-        /// <summary>
-        /// 必需的设计器变量。
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// 清理所有正在使用的资源。
-        /// </summary>
-        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows 窗体设计器生成的代码
-
-        /// <summary>
-        /// 设计器支持所需的方法 - 不要
-        /// 使用代码编辑器修改此方法的内容。
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.components = new System.ComponentModel.Container();
-            this.gbReceive = new System.Windows.Forms.GroupBox();
-            this.txtReceive = new System.Windows.Forms.RichTextBox();
-            this.menuReceive = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-            this.mi日志着色 = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator();
-            this.mi显示应用日志 = new System.Windows.Forms.ToolStripMenuItem();
-            this.mi显示编码日志 = new System.Windows.Forms.ToolStripMenuItem();
-            this.mi显示发送数据 = new System.Windows.Forms.ToolStripMenuItem();
-            this.mi显示接收数据 = new System.Windows.Forms.ToolStripMenuItem();
-            this.mi显示统计信息 = new System.Windows.Forms.ToolStripMenuItem();
-            this.menuSend = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.mi清空2 = new System.Windows.Forms.ToolStripMenuItem();
-            this.btnConnect = new System.Windows.Forms.Button();
-            this.timer1 = new System.Windows.Forms.Timer(this.components);
-            this.fontDialog1 = new System.Windows.Forms.FontDialog();
-            this.colorDialog1 = new System.Windows.Forms.ColorDialog();
-            this.label1 = new System.Windows.Forms.Label();
-            this.lbAddr = new System.Windows.Forms.Label();
-            this.cbMode = new System.Windows.Forms.ComboBox();
-            this.cbAddr = new System.Windows.Forms.ComboBox();
-            this.pnlSetting = new System.Windows.Forms.Panel();
-            this.numPort = new System.Windows.Forms.NumericUpDown();
-            this.label5 = new System.Windows.Forms.Label();
-            this.cbAction = new System.Windows.Forms.ComboBox();
-            this.gbSend = new System.Windows.Forms.GroupBox();
-            this.numThreads = new System.Windows.Forms.NumericUpDown();
-            this.numSleep = new System.Windows.Forms.NumericUpDown();
-            this.txtSend = new System.Windows.Forms.RichTextBox();
-            this.btnSend = new System.Windows.Forms.Button();
-            this.numMutilSend = new System.Windows.Forms.NumericUpDown();
-            this.label2 = new System.Windows.Forms.Label();
-            this.label7 = new System.Windows.Forms.Label();
-            this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
-            this.label3 = new System.Windows.Forms.Label();
-            this.gbReceive.SuspendLayout();
-            this.menuReceive.SuspendLayout();
-            this.menuSend.SuspendLayout();
-            this.pnlSetting.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.numPort)).BeginInit();
-            this.gbSend.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.numThreads)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numSleep)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numMutilSend)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // gbReceive
-            // 
-            this.gbReceive.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.gbReceive.Controls.Add(this.txtReceive);
-            this.gbReceive.Location = new System.Drawing.Point(14, 117);
-            this.gbReceive.Margin = new System.Windows.Forms.Padding(4);
-            this.gbReceive.Name = "gbReceive";
-            this.gbReceive.Padding = new System.Windows.Forms.Padding(4);
-            this.gbReceive.Size = new System.Drawing.Size(978, 298);
-            this.gbReceive.TabIndex = 4;
-            this.gbReceive.TabStop = false;
-            this.gbReceive.Text = "接收区：已接收0字节";
-            // 
-            // txtReceive
-            // 
-            this.txtReceive.ContextMenuStrip = this.menuReceive;
-            this.txtReceive.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.txtReceive.HideSelection = false;
-            this.txtReceive.Location = new System.Drawing.Point(4, 25);
-            this.txtReceive.Margin = new System.Windows.Forms.Padding(4);
-            this.txtReceive.Name = "txtReceive";
-            this.txtReceive.Size = new System.Drawing.Size(970, 269);
-            this.txtReceive.TabIndex = 1;
-            this.txtReceive.Text = "";
-            // 
-            // menuReceive
-            // 
-            this.menuReceive.ImageScalingSize = new System.Drawing.Size(32, 32);
-            this.menuReceive.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolStripMenuItem1,
-            this.mi日志着色,
-            this.toolStripMenuItem3,
-            this.mi显示应用日志,
-            this.mi显示编码日志,
-            this.mi显示发送数据,
-            this.mi显示接收数据,
-            this.mi显示统计信息});
-            this.menuReceive.Name = "menuSend";
-            this.menuReceive.Size = new System.Drawing.Size(189, 206);
-            // 
-            // toolStripMenuItem1
-            // 
-            this.toolStripMenuItem1.Name = "toolStripMenuItem1";
-            this.toolStripMenuItem1.Size = new System.Drawing.Size(188, 28);
-            this.toolStripMenuItem1.Text = "清空";
-            this.toolStripMenuItem1.Click += new System.EventHandler(this.mi清空_Click);
-            // 
-            // mi日志着色
-            // 
-            this.mi日志着色.Name = "mi日志着色";
-            this.mi日志着色.Size = new System.Drawing.Size(188, 28);
-            this.mi日志着色.Text = "日志着色";
-            this.mi日志着色.Click += new System.EventHandler(this.miCheck_Click);
-            // 
-            // toolStripMenuItem3
-            // 
-            this.toolStripMenuItem3.Name = "toolStripMenuItem3";
-            this.toolStripMenuItem3.Size = new System.Drawing.Size(185, 6);
-            // 
-            // mi显示应用日志
-            // 
-            this.mi显示应用日志.Name = "mi显示应用日志";
-            this.mi显示应用日志.Size = new System.Drawing.Size(188, 28);
-            this.mi显示应用日志.Text = "显示应用日志";
-            this.mi显示应用日志.Click += new System.EventHandler(this.miCheck_Click);
-            // 
-            // mi显示编码日志
-            // 
-            this.mi显示编码日志.Name = "mi显示编码日志";
-            this.mi显示编码日志.Size = new System.Drawing.Size(188, 28);
-            this.mi显示编码日志.Text = "显示编码日志";
-            this.mi显示编码日志.Click += new System.EventHandler(this.miCheck_Click);
-            // 
-            // mi显示发送数据
-            // 
-            this.mi显示发送数据.Name = "mi显示发送数据";
-            this.mi显示发送数据.Size = new System.Drawing.Size(188, 28);
-            this.mi显示发送数据.Text = "显示发送数据";
-            this.mi显示发送数据.Click += new System.EventHandler(this.miCheck_Click);
-            // 
-            // mi显示接收数据
-            // 
-            this.mi显示接收数据.Name = "mi显示接收数据";
-            this.mi显示接收数据.Size = new System.Drawing.Size(188, 28);
-            this.mi显示接收数据.Text = "显示接收数据";
-            this.mi显示接收数据.Click += new System.EventHandler(this.miCheck_Click);
-            // 
-            // mi显示统计信息
-            // 
-            this.mi显示统计信息.Name = "mi显示统计信息";
-            this.mi显示统计信息.Size = new System.Drawing.Size(188, 28);
-            this.mi显示统计信息.Text = "显示统计信息";
-            this.mi显示统计信息.Click += new System.EventHandler(this.miCheck_Click);
-            // 
-            // menuSend
-            // 
-            this.menuSend.ImageScalingSize = new System.Drawing.Size(32, 32);
-            this.menuSend.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.mi清空2});
-            this.menuSend.Name = "menuSend";
-            this.menuSend.Size = new System.Drawing.Size(117, 32);
-            // 
-            // mi清空2
-            // 
-            this.mi清空2.Name = "mi清空2";
-            this.mi清空2.Size = new System.Drawing.Size(116, 28);
-            this.mi清空2.Text = "清空";
-            this.mi清空2.Click += new System.EventHandler(this.mi清空2_Click);
-            // 
-            // btnConnect
-            // 
-            this.btnConnect.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnConnect.Location = new System.Drawing.Point(748, 12);
-            this.btnConnect.Margin = new System.Windows.Forms.Padding(4);
-            this.btnConnect.Name = "btnConnect";
-            this.btnConnect.Size = new System.Drawing.Size(100, 44);
-            this.btnConnect.TabIndex = 3;
-            this.btnConnect.Text = "打开";
-            this.btnConnect.UseVisualStyleBackColor = true;
-            this.btnConnect.Click += new System.EventHandler(this.btnConnect_Click);
-            // 
-            // timer1
-            // 
-            this.timer1.Enabled = true;
-            this.timer1.Interval = 300;
-            this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(10, 14);
-            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(62, 18);
-            this.label1.TabIndex = 6;
-            this.label1.Text = "模式：";
-            // 
-            // lbAddr
-            // 
-            this.lbAddr.AutoSize = true;
-            this.lbAddr.Location = new System.Drawing.Point(374, 14);
-            this.lbAddr.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.lbAddr.Name = "lbAddr";
-            this.lbAddr.Size = new System.Drawing.Size(62, 18);
-            this.lbAddr.TabIndex = 7;
-            this.lbAddr.Text = "地址：";
-            // 
-            // cbMode
-            // 
-            this.cbMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cbMode.FormattingEnabled = true;
-            this.cbMode.Items.AddRange(new object[] {
-            "服务端",
-            "客户端"});
-            this.cbMode.Location = new System.Drawing.Point(72, 11);
-            this.cbMode.Margin = new System.Windows.Forms.Padding(4);
-            this.cbMode.Name = "cbMode";
-            this.cbMode.Size = new System.Drawing.Size(138, 26);
-            this.cbMode.TabIndex = 9;
-            this.cbMode.SelectedIndexChanged += new System.EventHandler(this.cbMode_SelectedIndexChanged);
-            // 
-            // cbAddr
-            // 
-            this.cbAddr.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.cbAddr.FormattingEnabled = true;
-            this.cbAddr.Location = new System.Drawing.Point(444, 11);
-            this.cbAddr.Margin = new System.Windows.Forms.Padding(4);
-            this.cbAddr.Name = "cbAddr";
-            this.cbAddr.Size = new System.Drawing.Size(247, 26);
-            this.cbAddr.TabIndex = 10;
-            // 
-            // pnlSetting
-            // 
-            this.pnlSetting.Controls.Add(this.numPort);
-            this.pnlSetting.Controls.Add(this.label5);
-            this.pnlSetting.Controls.Add(this.cbAddr);
-            this.pnlSetting.Controls.Add(this.label1);
-            this.pnlSetting.Controls.Add(this.lbAddr);
-            this.pnlSetting.Controls.Add(this.cbMode);
-            this.pnlSetting.Location = new System.Drawing.Point(14, 12);
-            this.pnlSetting.Margin = new System.Windows.Forms.Padding(4);
-            this.pnlSetting.Name = "pnlSetting";
-            this.pnlSetting.Size = new System.Drawing.Size(708, 46);
-            this.pnlSetting.TabIndex = 13;
-            // 
-            // numPort
-            // 
-            this.numPort.Location = new System.Drawing.Point(270, 10);
-            this.numPort.Margin = new System.Windows.Forms.Padding(4);
-            this.numPort.Maximum = new decimal(new int[] {
-            65535,
-            0,
-            0,
-            0});
-            this.numPort.Minimum = new decimal(new int[] {
-            1,
-            0,
-            0,
-            0});
-            this.numPort.Name = "numPort";
-            this.numPort.Size = new System.Drawing.Size(94, 28);
-            this.numPort.TabIndex = 16;
-            this.numPort.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-            this.numPort.Value = new decimal(new int[] {
-            777,
-            0,
-            0,
-            0});
-            // 
-            // label5
-            // 
-            this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(218, 14);
-            this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(62, 18);
-            this.label5.TabIndex = 17;
-            this.label5.Text = "端口：";
-            // 
-            // cbAction
-            // 
-            this.cbAction.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.cbAction.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cbAction.FormattingEnabled = true;
-            this.cbAction.Location = new System.Drawing.Point(76, 71);
-            this.cbAction.Margin = new System.Windows.Forms.Padding(4);
-            this.cbAction.Name = "cbAction";
-            this.cbAction.Size = new System.Drawing.Size(470, 26);
-            this.cbAction.TabIndex = 12;
-            this.cbAction.Visible = false;
-            this.cbAction.SelectedIndexChanged += new System.EventHandler(this.cbAction_SelectedIndexChanged);
-            // 
-            // gbSend
-            // 
-            this.gbSend.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.gbSend.Controls.Add(this.numThreads);
-            this.gbSend.Controls.Add(this.numSleep);
-            this.gbSend.Controls.Add(this.txtSend);
-            this.gbSend.Controls.Add(this.btnSend);
-            this.gbSend.Controls.Add(this.numMutilSend);
-            this.gbSend.Controls.Add(this.label2);
-            this.gbSend.Controls.Add(this.label7);
-            this.gbSend.Location = new System.Drawing.Point(14, 424);
-            this.gbSend.Margin = new System.Windows.Forms.Padding(4);
-            this.gbSend.Name = "gbSend";
-            this.gbSend.Padding = new System.Windows.Forms.Padding(4);
-            this.gbSend.Size = new System.Drawing.Size(978, 126);
-            this.gbSend.TabIndex = 15;
-            this.gbSend.TabStop = false;
-            this.gbSend.Text = "发送区：已发送0字节";
-            // 
-            // numThreads
-            // 
-            this.numThreads.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.numThreads.Location = new System.Drawing.Point(890, 33);
-            this.numThreads.Margin = new System.Windows.Forms.Padding(4);
-            this.numThreads.Maximum = new decimal(new int[] {
-            100000,
-            0,
-            0,
-            0});
-            this.numThreads.Minimum = new decimal(new int[] {
-            1,
-            0,
-            0,
-            0});
-            this.numThreads.Name = "numThreads";
-            this.numThreads.Size = new System.Drawing.Size(78, 28);
-            this.numThreads.TabIndex = 18;
-            this.numThreads.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-            this.toolTip1.SetToolTip(this.numThreads, "模拟多客户端发送，用于压力测试！");
-            this.numThreads.Value = new decimal(new int[] {
-            1,
-            0,
-            0,
-            0});
-            // 
-            // numSleep
-            // 
-            this.numSleep.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.numSleep.Location = new System.Drawing.Point(776, 81);
-            this.numSleep.Margin = new System.Windows.Forms.Padding(4);
-            this.numSleep.Maximum = new decimal(new int[] {
-            1000000,
-            0,
-            0,
-            0});
-            this.numSleep.Name = "numSleep";
-            this.numSleep.Size = new System.Drawing.Size(109, 28);
-            this.numSleep.TabIndex = 16;
-            this.numSleep.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-            this.numSleep.Value = new decimal(new int[] {
-            1000,
-            0,
-            0,
-            0});
-            // 
-            // txtSend
-            // 
-            this.txtSend.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtSend.ContextMenuStrip = this.menuSend;
-            this.txtSend.HideSelection = false;
-            this.txtSend.Location = new System.Drawing.Point(0, 28);
-            this.txtSend.Margin = new System.Windows.Forms.Padding(4);
-            this.txtSend.Name = "txtSend";
-            this.txtSend.Size = new System.Drawing.Size(721, 86);
-            this.txtSend.TabIndex = 2;
-            this.txtSend.Text = "";
-            // 
-            // btnSend
-            // 
-            this.btnSend.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnSend.Location = new System.Drawing.Point(894, 74);
-            this.btnSend.Margin = new System.Windows.Forms.Padding(4);
-            this.btnSend.Name = "btnSend";
-            this.btnSend.Size = new System.Drawing.Size(75, 45);
-            this.btnSend.TabIndex = 1;
-            this.btnSend.Text = "发送";
-            this.btnSend.UseVisualStyleBackColor = true;
-            this.btnSend.Click += new System.EventHandler(this.btnSend_Click);
-            // 
-            // numMutilSend
-            // 
-            this.numMutilSend.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.numMutilSend.Location = new System.Drawing.Point(776, 33);
-            this.numMutilSend.Margin = new System.Windows.Forms.Padding(4);
-            this.numMutilSend.Maximum = new decimal(new int[] {
-            1000000,
-            0,
-            0,
-            0});
-            this.numMutilSend.Minimum = new decimal(new int[] {
-            1,
-            0,
-            0,
-            0});
-            this.numMutilSend.Name = "numMutilSend";
-            this.numMutilSend.Size = new System.Drawing.Size(109, 28);
-            this.numMutilSend.TabIndex = 14;
-            this.numMutilSend.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-            this.numMutilSend.Value = new decimal(new int[] {
-            1,
-            0,
-            0,
-            0});
-            // 
-            // label2
-            // 
-            this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(729, 87);
-            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(62, 18);
-            this.label2.TabIndex = 17;
-            this.label2.Text = "间隔：";
-            // 
-            // label7
-            // 
-            this.label7.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(729, 39);
-            this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(62, 18);
-            this.label7.TabIndex = 15;
-            this.label7.Text = "次数：";
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(15, 74);
-            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(62, 18);
-            this.label3.TabIndex = 16;
-            this.label3.Text = "服务：";
-            // 
-            // FrmMain
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1000, 568);
-            this.Controls.Add(this.label3);
-            this.Controls.Add(this.cbAction);
-            this.Controls.Add(this.gbSend);
-            this.Controls.Add(this.pnlSetting);
-            this.Controls.Add(this.btnConnect);
-            this.Controls.Add(this.gbReceive);
-            this.Margin = new System.Windows.Forms.Padding(4);
-            this.Name = "FrmMain";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "Api调试";
-            this.Load += new System.EventHandler(this.FrmMain_Load);
-            this.gbReceive.ResumeLayout(false);
-            this.menuReceive.ResumeLayout(false);
-            this.menuSend.ResumeLayout(false);
-            this.pnlSetting.ResumeLayout(false);
-            this.pnlSetting.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.numPort)).EndInit();
-            this.gbSend.ResumeLayout(false);
-            this.gbSend.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.numThreads)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numSleep)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numMutilSend)).EndInit();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.GroupBox gbReceive;
-        private System.Windows.Forms.Button btnConnect;
-        private System.Windows.Forms.Timer timer1;
-        private System.Windows.Forms.ContextMenuStrip menuSend;
-        private System.Windows.Forms.ToolStripMenuItem mi清空2;
-        private System.Windows.Forms.RichTextBox txtReceive;
-        private System.Windows.Forms.FontDialog fontDialog1;
-        private System.Windows.Forms.ColorDialog colorDialog1;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Label lbAddr;
-        private System.Windows.Forms.ComboBox cbMode;
-        private System.Windows.Forms.ComboBox cbAddr;
-        private System.Windows.Forms.Panel pnlSetting;
-        private System.Windows.Forms.ContextMenuStrip menuReceive;
-        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1;
-        private System.Windows.Forms.ToolStripSeparator toolStripMenuItem3;
-        private System.Windows.Forms.GroupBox gbSend;
-        private System.Windows.Forms.NumericUpDown numSleep;
-        private System.Windows.Forms.RichTextBox txtSend;
-        private System.Windows.Forms.Button btnSend;
-        private System.Windows.Forms.NumericUpDown numMutilSend;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.Label label7;
-        private System.Windows.Forms.ToolStripMenuItem mi显示统计信息;
-        private System.Windows.Forms.NumericUpDown numThreads;
-        private System.Windows.Forms.ToolStripMenuItem mi显示应用日志;
-        private System.Windows.Forms.ToolStripMenuItem mi显示编码日志;
-        private System.Windows.Forms.ToolTip toolTip1;
-        private System.Windows.Forms.ComboBox cbAction;
-        private System.Windows.Forms.ToolStripMenuItem mi日志着色;
-        private System.Windows.Forms.NumericUpDown numPort;
-        private System.Windows.Forms.Label label5;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.ToolStripMenuItem mi显示发送数据;
-        private System.Windows.Forms.ToolStripMenuItem mi显示接收数据;
-    }
-}
-
diff --git a/XCoder/XApi/FrmMain.resx b/XCoder/XApi/FrmMain.resx
deleted file mode 100644
index fdafb9b232..0000000000
--- a/XCoder/XApi/FrmMain.resx
+++ /dev/null
@@ -1,141 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="menuReceive.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>104, 13</value>
-  </metadata>
-  <metadata name="menuSend.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>237, 17</value>
-  </metadata>
-  <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="fontDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>352, 17</value>
-  </metadata>
-  <metadata name="colorDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>474, 17</value>
-  </metadata>
-  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>601, 17</value>
-  </metadata>
-  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>601, 17</value>
-  </metadata>
-</root>
\ No newline at end of file
diff --git a/XCoder/XApi/MyApiController.cs b/XCoder/XApi/MyApiController.cs
deleted file mode 100644
index e57d7c96ab..0000000000
--- a/XCoder/XApi/MyApiController.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Text;
-using NewLife.Data;
-using NewLife.Remoting;
-using NewLife.Security;
-
-namespace XApi
-{
-    /// <summary>API控制器</summary>
-    //[AllowAnonymous]
-    public class MyApiController
-    {
-        /// <summary>获取指定种类的环境信息</summary>
-        /// <param name="kind"></param>
-        /// <returns></returns>
-        public String Info(String kind)
-        {
-            switch ((kind + "").ToLower())
-            {
-                case "machine": return Environment.MachineName;
-                case "user": return Environment.UserName;
-                case "ip": return NetHelper.MyIP() + "";
-                case "time": return DateTime.Now.ToFullString();
-                default:
-                    throw new ApiException(505, "不支持类型" + kind);
-            }
-        }
-
-        /// <summary>加密数据</summary>
-        /// <param name="data"></param>
-        /// <returns></returns>
-        public Packet Encrypt(Packet data)
-        {
-            //Log.XTrace.WriteLine("加密数据{0:n0}字节", data.Total);
-
-            var buf = data.ToArray().RC4("NewLife".GetBytes());
-
-            return buf;
-        }
-    }
-}
\ No newline at end of file
diff --git a/XCoder/XCoder.csproj b/XCoder/XCoder.csproj
deleted file mode 100644
index dcee1f2632..0000000000
--- a/XCoder/XCoder.csproj
+++ /dev/null
@@ -1,401 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{3EB3A5F1-F785-4672-A21D-A3117FC12129}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>XCoder</RootNamespace>
-    <AssemblyName>XCoder</AssemblyName>
-    <ApplicationIcon>leaf.ico</ApplicationIcon>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\..\XCoder\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <OutputPath>..\..\XCoder\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <WarningLevel>3</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.configuration" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.EnterpriseServices" />
-    <Reference Include="System.Management" />
-    <Reference Include="System.Messaging" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.XML" />
-    <Reference Include="System.Xml.Linq" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Engine\IcoHelper.cs" />
-    <Compile Include="Engine\ModelConfig.cs" />
-    <Compile Include="FileEncoding\FrmMain.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FileEncoding\FrmMain.Designer.cs">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </Compile>
-    <Compile Include="FolderInfo\FrmMain.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FolderInfo\FrmMain.Designer.cs">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </Compile>
-    <Compile Include="FolderInfo\FrmSplitFile.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FolderInfo\FrmSplitFile.Designer.cs">
-      <DependentUpon>FrmSplitFile.cs</DependentUpon>
-    </Compile>
-    <Compile Include="FrmMDI.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FrmMDI.Designer.cs">
-      <DependentUpon>FrmMDI.cs</DependentUpon>
-    </Compile>
-    <Compile Include="IXForm.cs" />
-    <Compile Include="Tools\FrmSecurity.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Tools\FrmSecurity.Designer.cs">
-      <DependentUpon>FrmSecurity.cs</DependentUpon>
-    </Compile>
-    <Compile Include="XApi\ApiConfig.cs" />
-    <Compile Include="XApi\MyApiController.cs" />
-    <Compile Include="XApi\FrmMain.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="XApi\FrmMain.designer.cs">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </Compile>
-    <Compile Include="XNet\IPPacket.cs" />
-    <Compile Include="XNet\RawSocket.cs" />
-    <Compile Include="XNet\TcpPacket.cs" />
-    <Compile Include="Yun\FrmMap.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Yun\FrmMap.Designer.cs">
-      <DependentUpon>FrmMap.cs</DependentUpon>
-    </Compile>
-    <Compile Include="NewModelForm\AddField.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="NewModelForm\AddField.Designer.cs">
-      <DependentUpon>AddField.cs</DependentUpon>
-    </Compile>
-    <Compile Include="NewModelForm\AddTable.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="NewModelForm\AddTable.Designer.cs">
-      <DependentUpon>AddTable.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Engine\FileSource.cs" />
-    <Compile Include="Engine\XConfig.cs" />
-    <Compile Include="Engine\XCoderBase.cs" />
-    <Compile Include="NewModelForm\NewModel.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="NewModelForm\NewModel.Designer.cs">
-      <DependentUpon>NewModel.cs</DependentUpon>
-    </Compile>
-    <Compile Include="NewModelForm\WinFormHelper.cs" />
-    <Compile Include="Tools\FrmGPS.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Tools\FrmGPS.Designer.cs">
-      <DependentUpon>FrmGPS.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Tools\FrmInclude.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Tools\FrmInclude.Designer.cs">
-      <DependentUpon>FrmInclude.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Tools\FrmMain.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Tools\FrmMain.Designer.cs">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </Compile>
-    <Compile Include="XCom\FrmMain.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="XCom\FrmMain.designer.cs">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Engine\UIConfig.cs" />
-    <Compile Include="XICO\FrmMain.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="XICO\FrmMain.designer.cs">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </Compile>
-    <Compile Include="XICO\IconFile.cs" />
-    <Compile Include="XNet\NetConfig.cs" />
-    <Compile Include="XNet\WorkModes.cs" />
-    <Compile Include="XRegex\FileResource.cs" />
-    <Compile Include="XRegex\FrmMain.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="XRegex\FrmMain.designer.cs">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </Compile>
-    <Compile Include="XNet\FrmMain.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="XNet\FrmMain.designer.cs">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Yun\MapSetting.cs" />
-    <EmbeddedResource Include="FileEncoding\FrmMain.resx">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="FolderInfo\FrmMain.resx">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="FrmMDI.resx">
-      <DependentUpon>FrmMDI.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Tools\FrmSecurity.resx">
-      <DependentUpon>FrmSecurity.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="XApi\FrmMain.resx">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Yun\FrmMap.resx">
-      <DependentUpon>FrmMap.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="NewModelForm\AddField.resx">
-      <DependentUpon>AddField.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="NewModelForm\AddTable.resx">
-      <DependentUpon>AddTable.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="NewModelForm\NewModel.resx">
-      <DependentUpon>NewModel.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Template\页面ExtAspNet\类名.aspx.cs">
-      <DependentUpon>类名.aspx</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Template\页面ExtAspNet\类名Form.aspx.cs">
-      <DependentUpon>类名Form.aspx</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Template\页面基类ExtAspNet\MyEntityForm.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Template\页面基类ExtAspNet\MyEntityList.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Template\页面基类ExtAspNet\MyEntityUserControl.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Template\实体业务\中文名.Biz.cs" />
-    <Compile Include="NewModelForm\BaseForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="NewModelForm\BaseForm.designer.cs">
-      <DependentUpon>BaseForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Windows\FrmItems.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Windows\FrmItems.Designer.cs">
-      <DependentUpon>FrmItems.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Windows\FrmMain.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Windows\FrmMain.designer.cs">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Engine\Engine.cs" />
-    <Compile Include="Windows\FrmModel.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Windows\FrmModel.Designer.cs">
-      <DependentUpon>FrmModel.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Windows\FrmQuery.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Windows\FrmQuery.Designer.cs">
-      <DependentUpon>FrmQuery.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Windows\FrmSchema.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Windows\FrmSchema.Designer.cs">
-      <DependentUpon>FrmSchema.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Windows\FrmText.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Windows\FrmText.Designer.cs">
-      <DependentUpon>FrmText.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>Settings.settings</DependentUpon>
-    </Compile>
-    <EmbeddedResource Include="NewModelForm\BaseForm.resx">
-      <DependentUpon>BaseForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Tools\FrmGPS.resx">
-      <DependentUpon>FrmGPS.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Tools\FrmInclude.resx">
-      <DependentUpon>FrmInclude.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Tools\FrmMain.resx">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Windows\FrmItems.resx">
-      <DependentUpon>FrmItems.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Windows\FrmModel.resx">
-      <DependentUpon>FrmModel.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Windows\FrmQuery.resx">
-      <DependentUpon>FrmQuery.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Windows\FrmSchema.resx">
-      <DependentUpon>FrmSchema.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Windows\FrmText.resx">
-      <DependentUpon>FrmText.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Template\页面\类名.aspx.cs">
-      <DependentUpon>类名.aspx</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Template\页面\类名Form.aspx.cs">
-      <DependentUpon>类名Form.aspx</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Template\页面基类\MyEntityForm.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Template\页面基类\MyEntityList.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Template\页面基类\MyEntityUserControl.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Template\实体数据\中文名.cs" />
-    <EmbeddedResource Include="Template\纯属性\I中文名.cs" />
-    <EmbeddedResource Include="Template\纯属性\中文名.cs" />
-    <EmbeddedResource Include="Windows\FrmMain.resx">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="leaf.ico" />
-    <EmbeddedResource Include="Template\页面\类名.aspx" />
-    <EmbeddedResource Include="Template\页面\类名Form.aspx" />
-    <EmbeddedResource Include="UpdateInfo.txt" />
-    <EmbeddedResource Include="Template\数据字典\连接名数据字典.htm" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="Properties\app.manifest" />
-    <None Include="packages.config" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <EmbeddedResource Include="Template\实体业务\对象操作.xt" />
-    <EmbeddedResource Include="Template\实体业务\扩展查询.xt" />
-    <EmbeddedResource Include="XCoder.tt">
-      <LastGenOutput>XCoder.log</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\NewLife.Core\NewLife.Core.csproj">
-      <Project>{5813C22E-EEB3-4DEE-A45C-BB218041193A}</Project>
-      <Name>NewLife.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\NewLife.Net\NewLife.Net.csproj">
-      <Project>{5a8ef50c-3394-4c1e-99f0-33efe8691cb0}</Project>
-      <Name>NewLife.Net</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\XCode\XCode.csproj">
-      <Project>{B49ABA5A-C5DA-45F4-87F1-B435EC51D710}</Project>
-      <Name>XCode</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\XTemplate\XTemplate.csproj">
-      <Project>{55BA37EE-01A2-438F-A0FB-6B57440BF2F0}</Project>
-      <Name>XTemplate</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Template\页面ExtAspNet\类名.aspx" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Template\页面ExtAspNet\类名Form.aspx" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="XCom\FrmMain.resx">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="XICO\FrmMain.resx">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="XRegex\FrmMain.resx">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="XNet\FrmMain.resx">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="数据库命名规范.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="XICO\leaf.png" />
-    <EmbeddedResource Include="XRegex\Pattern\Html\无嵌套标记.txt" />
-    <EmbeddedResource Include="XRegex\Pattern\SQL查询\嵌套查询.txt" />
-    <EmbeddedResource Include="XRegex\Pattern\SQL查询\简单.txt" />
-    <EmbeddedResource Include="XRegex\Pattern\平衡组\完整示例.txt" />
-    <EmbeddedResource Include="XRegex\Pattern\平衡组\完整示例固化分组.txt" />
-    <EmbeddedResource Include="XRegex\Pattern\平衡组\标准.txt" />
-    <EmbeddedResource Include="XRegex\Pattern\平衡组\标准固化分组.txt" />
-    <EmbeddedResource Include="XRegex\Pattern\网页\最外层嵌套.txt" />
-    <EmbeddedResource Include="XRegex\Sample\SQL查询\MSSQL表结构.txt" />
-    <EmbeddedResource Include="XRegex\Sample\SQL查询\普通嵌套查询.txt" />
-    <EmbeddedResource Include="XRegex\Sample\SQL查询\普通查询.txt" />
-    <EmbeddedResource Include="XRegex\Sample\平衡组\算术表达式.txt" />
-    <EmbeddedResource Include="XRegex\Sample\网页\最外层嵌套.txt" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/XCoder/XCoder.tt b/XCoder/XCoder.tt
deleted file mode 100644
index 09a268e895..0000000000
--- a/XCoder/XCoder.tt
+++ /dev/null
@@ -1,139 +0,0 @@
-﻿<#@ template language="C#" hostSpecific="true" debug="true" #>
-<#@ assembly name="System.Core" #>
-<#@ assembly name="System.Xml" #>
-<#@ import namespace="System" #>
-<#@ import namespace="System.IO" #>
-<#@ import namespace="System.Diagnostics" #>
-<#@ import namespace="System.Collections.Generic" #>
-<#@ import namespace="System.Xml" #>
-<#@ output extension=".log" #>
-<#
-	// 尽管T4模版可以直接调用XCoder内部类库进行代码生成，但是那会导致XCoder文件被锁定，所以采用启动进程来生成的方式！
-
-	var company = "NewLife";
-	var name = "Common";
-	var dir = "$(实体分类)";
-
-	// 自动寻找模型文件，并从中获取公司名和链接名
-	var mdl = GetModelFile(ref company, ref name);
-	if(!File.Exists(mdl)) throw new Exception("未找到模型文件！");
-
-	dir = "Entity";
-	
-	// 取得模版所在目录
-	var mypath = Path.GetDirectoryName(Host.TemplateFile) + "\\";
-	//if(mdl == null) mdl = mypath + company + "." + name + ".xml";	// 数据模型文件
-
-	// 计算数据模型工具XCoder位置
-	var xpath = GetXPath(mypath);
-	
-	var exe = xpath + "XCoder.exe";
-	
-	var cfg = mypath + "set.config";
-	var arg = String.Format("-Render -model \"{0}\" -config \"{1}\" -Log \"{2}\"", mdl, cfg, mypath + "XCoder2.log");
-	WriteLine("路径：" + exe);
-	WriteLine("参数：" + arg);
-
-	var dic = new Dictionary<String, Object>();
-	dic["NameSpace"] = company + "." + name + ".Entity";// 命名空间
-	dic["EntityConnName"] = name;	// 连接名
-	
-	dic["BaseClass"] = "Entity";	// 实体基类
-	dic["RenderGenEntity"] = false;	// 生成泛型实体类
-	dic["Override"] = true;			// 是否覆盖目标文件
-	dic["UseCNFileName"] = true;	// 中文文件名
-	dic["UseHeadTemplate"] = true;	// 使用.cs文件头模版
-	// 文件头模版
-	dic["HeadTemplate"] = "/*\r\n * XCoder v\<#=Version\#>\r\n * 作者：\<#=Environment.UserName + \"/\" + Environment.MachineName\#>\r\n * 时间：\<#=DateTime.Now.ToString(\"yyyy-MM-dd HH:mm:ss\")\#>\r\n * 版权：版权所有 (C) 新生命开发团队 2002~\<#=DateTime.Now.ToString(\"yyyy\")\#>\r\n*/\r\n";
-
-	dic["OutputPath"] = mypath;					// 输出目录
-	dic["TemplateName"] = "[内置]数据字典";		// 模版名
-	Save(cfg, dic);
-	WriteLine("生成：" + dic["TemplateName"]);
-	Process.Start(exe, arg).WaitForExit(3000);
-
-	dic["Override"] = false;					// 是否覆盖目标文件
-	dic["OutputPath"] = mypath + "\\" + dir;	// 输出目录
-	dic["TemplateName"] = "[内置]实体业务";		// 模版名
-	Save(cfg, dic);
-	WriteLine("生成：" + dic["TemplateName"]);
-	Process.Start(exe, arg).WaitForExit(3000);
-
-	dic["Override"] = true;					// 是否覆盖目标文件
-	dic["UseHeadTemplate"] = false;	// 使用.cs文件头模版。实体业务一次生产的，可以要头部，实体数据要头部会导致每次生产都改变文件
-	dic["TemplateName"] = "[内置]实体数据";		// 模版名
-	Save(cfg, dic);
-	WriteLine("生成：" + dic["TemplateName"]);
-	Process.Start(exe, arg).WaitForExit(3000);
-
-	dic["Override"] = false;					// 是否覆盖目标文件
-	dic["OutputPath"] = mypath + "..\\Web\\" + name + "\\$(页面分类)";	// 输出目录
-	dic["UseCNFileName"] = false;				// 中文文件名
-	dic["TemplateName"] = "[内置]页面";			// 模版名
-	//Save(cfg, dic);
-	//WriteLine("生成：" + dic["TemplateName"]);
-	//Process.Start(exe, arg).WaitForExit(3000);
-#>
-<#+
-	String GetXPath(String mypath)
-	{
-		var xpath = @"{XCoderPath}";
-		if(!File.Exists(xpath + "XCoder.exe")) xpath = Path.Combine(mypath, @"..\XCoder\");
-		if(!File.Exists(xpath + "XCoder.exe")) xpath = Path.Combine(mypath, @"..\代码生成\");
-		if(!File.Exists(xpath + "XCoder.exe")) xpath = Path.Combine(mypath, @"..\..\XCoder\");
-		if(!File.Exists(xpath + "XCoder.exe")) xpath = Path.Combine(mypath, @"..\..\代码生成\");
-		if(!File.Exists(xpath + "XCoder.exe")) xpath = @"C:\X\XCoder\";
-		if(!File.Exists(xpath + "XCoder.exe")) xpath = @"C:\X\代码生成\";
-		if(!File.Exists(xpath + "XCoder.exe")) xpath = @"D:\X\XCoder\";
-		if(!File.Exists(xpath + "XCoder.exe")) xpath = @"E:\X\XCoder\";
-		if(!File.Exists(xpath + "XCoder.exe")) xpath = @"F:\X\XCoder\";
-		if(!File.Exists(xpath + "XCoder.exe")) throw new Exception("无法定位数据模型工具XCoder的位置！");
-		xpath = Path.GetFullPath(xpath);
-		
-		return xpath;
-	}
-
-	// 保存字典到Xml文件，其实是变相序列化
-	void Save(String file, Dictionary<String, Object> data)
-	{
-		var doc = new XmlDocument();
-		var root = doc.CreateElement("ModelConfig");
-		doc.AppendChild(root);
-
-		if (data != null && data.Count > 0)
-		{
-			foreach (var item in data)
-			{
-				var elm = doc.CreateElement(item.Key);
-				if (item.Value != null && item.Value.GetType() == typeof(Boolean))
-					elm.InnerText = item.Value.ToString().ToLower();
-				else
-					elm.InnerText = item.Value + "";
-				root.AppendChild(elm);
-			}
-		}
-		
-		File.WriteAllText(file, doc.OuterXml);
-	}
-	
-	// 获取模型文件
-	String GetModelFile(ref String company, ref String name)
-	{
-		// 取得模版所在目录
-		var mypath = Path.GetDirectoryName(Host.TemplateFile) + "\\";
-
-		foreach(var item in Directory.GetFiles(mypath, "*.xml"))
-		{
-			name = Path.GetFileNameWithoutExtension(item);
-			var p = name.LastIndexOf(".");
-			if(p<0) continue;
-
-			company = name.Substring(0, p);
-			name = name.Substring(p+1);
-
-			return Path.GetFullPath(item);
-		}
-
-		return null;
-	}
-#>
\ No newline at end of file
diff --git a/XCoder/XCoder40.csproj b/XCoder/XCoder40.csproj
deleted file mode 100644
index cd2410228e..0000000000
--- a/XCoder/XCoder40.csproj
+++ /dev/null
@@ -1,394 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{3EB3A5F1-F785-4672-A21D-A3117FC12129}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>XCoder</RootNamespace>
-    <AssemblyName>XCoder</AssemblyName>
-    <ApplicationIcon>leaf.ico</ApplicationIcon>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\..\XCoder4\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NET4</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>..\..\XCoder4\</OutputPath>
-    <DefineConstants>TRACE;NET4</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <WarningLevel>3</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup />
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.configuration" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.EnterpriseServices" />
-    <Reference Include="System.Management" />
-    <Reference Include="System.Messaging" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.XML" />
-    <Reference Include="System.Xml.Linq" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Engine\IcoHelper.cs" />
-    <Compile Include="Engine\ModelConfig.cs" />
-    <Compile Include="FileEncoding\FrmMain.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FileEncoding\FrmMain.Designer.cs">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </Compile>
-    <Compile Include="FolderInfo\FrmMain.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FolderInfo\FrmMain.Designer.cs">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </Compile>
-    <Compile Include="FolderInfo\FrmSplitFile.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FolderInfo\FrmSplitFile.Designer.cs">
-      <DependentUpon>FrmSplitFile.cs</DependentUpon>
-    </Compile>
-    <Compile Include="FrmMDI.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FrmMDI.Designer.cs">
-      <DependentUpon>FrmMDI.cs</DependentUpon>
-    </Compile>
-    <Compile Include="IXForm.cs" />
-    <Compile Include="NewModelForm\AddField.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="NewModelForm\AddField.Designer.cs">
-      <DependentUpon>AddField.cs</DependentUpon>
-    </Compile>
-    <Compile Include="NewModelForm\AddTable.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="NewModelForm\AddTable.Designer.cs">
-      <DependentUpon>AddTable.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Engine\FileSource.cs" />
-    <Compile Include="Engine\XConfig.cs" />
-    <Compile Include="Engine\XCoderBase.cs" />
-    <Compile Include="NewModelForm\NewModel.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="NewModelForm\NewModel.Designer.cs">
-      <DependentUpon>NewModel.cs</DependentUpon>
-    </Compile>
-    <Compile Include="NewModelForm\WinFormHelper.cs" />
-    <Compile Include="Tools\FrmGPS.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Tools\FrmGPS.Designer.cs">
-      <DependentUpon>FrmGPS.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Tools\FrmInclude.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Tools\FrmInclude.Designer.cs">
-      <DependentUpon>FrmInclude.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Tools\FrmMain.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Tools\FrmMain.Designer.cs">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Tools\FrmSecurity.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Tools\FrmSecurity.Designer.cs">
-      <DependentUpon>FrmSecurity.cs</DependentUpon>
-    </Compile>
-    <Compile Include="XApi\MyApiController.cs" />
-    <Compile Include="XCom\FrmMain.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="XCom\FrmMain.designer.cs">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Engine\UIConfig.cs" />
-    <Compile Include="XICO\FrmMain.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="XICO\FrmMain.designer.cs">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </Compile>
-    <Compile Include="XICO\IconFile.cs" />
-    <Compile Include="XApi\FrmMain.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="XApi\FrmMain.designer.cs">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </Compile>
-    <Compile Include="XApi\ApiConfig.cs" />
-    <Compile Include="XNet\NetConfig.cs" />
-    <Compile Include="XNet\WorkModes.cs" />
-    <Compile Include="XRegex\FileResource.cs" />
-    <Compile Include="XRegex\FrmMain.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="XRegex\FrmMain.designer.cs">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </Compile>
-    <Compile Include="XNet\FrmMain.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="XNet\FrmMain.designer.cs">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Yun\FrmMap.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Yun\FrmMap.Designer.cs">
-      <DependentUpon>FrmMap.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Yun\MapSetting.cs" />
-    <EmbeddedResource Include="FileEncoding\FrmMain.resx">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="FolderInfo\FrmMain.resx">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="FrmMDI.resx">
-      <DependentUpon>FrmMDI.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="NewModelForm\AddField.resx">
-      <DependentUpon>AddField.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="NewModelForm\AddTable.resx">
-      <DependentUpon>AddTable.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="NewModelForm\NewModel.resx">
-      <DependentUpon>NewModel.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Template\页面ExtAspNet\类名.aspx.cs">
-      <DependentUpon>类名.aspx</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Template\页面ExtAspNet\类名Form.aspx.cs">
-      <DependentUpon>类名Form.aspx</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Template\页面基类ExtAspNet\MyEntityForm.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Template\页面基类ExtAspNet\MyEntityList.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Template\页面基类ExtAspNet\MyEntityUserControl.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Template\实体业务\中文名.Biz.cs" />
-    <Compile Include="NewModelForm\BaseForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="NewModelForm\BaseForm.designer.cs">
-      <DependentUpon>BaseForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Windows\FrmItems.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Windows\FrmItems.Designer.cs">
-      <DependentUpon>FrmItems.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Windows\FrmMain.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Windows\FrmMain.designer.cs">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Engine\Engine.cs" />
-    <Compile Include="Windows\FrmModel.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Windows\FrmModel.Designer.cs">
-      <DependentUpon>FrmModel.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Windows\FrmQuery.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Windows\FrmQuery.Designer.cs">
-      <DependentUpon>FrmQuery.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Windows\FrmSchema.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Windows\FrmSchema.Designer.cs">
-      <DependentUpon>FrmSchema.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Windows\FrmText.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Windows\FrmText.Designer.cs">
-      <DependentUpon>FrmText.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>Settings.settings</DependentUpon>
-    </Compile>
-    <EmbeddedResource Include="NewModelForm\BaseForm.resx">
-      <DependentUpon>BaseForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Tools\FrmGPS.resx">
-      <DependentUpon>FrmGPS.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Tools\FrmInclude.resx">
-      <DependentUpon>FrmInclude.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Tools\FrmMain.resx">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Tools\FrmSecurity.resx">
-      <DependentUpon>FrmSecurity.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Windows\FrmItems.resx">
-      <DependentUpon>FrmItems.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Windows\FrmModel.resx">
-      <DependentUpon>FrmModel.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Windows\FrmQuery.resx">
-      <DependentUpon>FrmQuery.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Windows\FrmSchema.resx">
-      <DependentUpon>FrmSchema.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Windows\FrmText.resx">
-      <DependentUpon>FrmText.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Template\页面\类名.aspx.cs">
-      <DependentUpon>类名.aspx</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Template\页面\类名Form.aspx.cs">
-      <DependentUpon>类名Form.aspx</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Template\页面基类\MyEntityForm.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Template\页面基类\MyEntityList.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Template\页面基类\MyEntityUserControl.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Template\实体数据\中文名.cs" />
-    <EmbeddedResource Include="Template\纯属性\I中文名.cs" />
-    <EmbeddedResource Include="Template\纯属性\中文名.cs" />
-    <EmbeddedResource Include="Windows\FrmMain.resx">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="leaf.ico" />
-    <EmbeddedResource Include="Template\页面\类名.aspx" />
-    <EmbeddedResource Include="Template\页面\类名Form.aspx" />
-    <EmbeddedResource Include="UpdateInfo.txt" />
-    <EmbeddedResource Include="Template\数据字典\连接名数据字典.htm" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="packages.config" />
-    <None Include="Properties\app.manifest" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <EmbeddedResource Include="Template\实体业务\对象操作.xt" />
-    <EmbeddedResource Include="Template\实体业务\扩展查询.xt" />
-    <EmbeddedResource Include="XCoder.tt">
-      <LastGenOutput>XCoder.log</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Template\页面ExtAspNet\类名.aspx" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Template\页面ExtAspNet\类名Form.aspx" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="XCom\FrmMain.resx">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="XICO\FrmMain.resx">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="XApi\FrmMain.resx">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="XRegex\FrmMain.resx">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="XNet\FrmMain.resx">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Yun\FrmMap.resx">
-      <DependentUpon>FrmMap.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="数据库命名规范.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="XICO\leaf.png" />
-    <EmbeddedResource Include="XRegex\Pattern\Html\无嵌套标记.txt" />
-    <EmbeddedResource Include="XRegex\Pattern\SQL查询\嵌套查询.txt" />
-    <EmbeddedResource Include="XRegex\Pattern\SQL查询\简单.txt" />
-    <EmbeddedResource Include="XRegex\Pattern\平衡组\完整示例.txt" />
-    <EmbeddedResource Include="XRegex\Pattern\平衡组\完整示例固化分组.txt" />
-    <EmbeddedResource Include="XRegex\Pattern\平衡组\标准.txt" />
-    <EmbeddedResource Include="XRegex\Pattern\平衡组\标准固化分组.txt" />
-    <EmbeddedResource Include="XRegex\Pattern\网页\最外层嵌套.txt" />
-    <EmbeddedResource Include="XRegex\Sample\SQL查询\MSSQL表结构.txt" />
-    <EmbeddedResource Include="XRegex\Sample\SQL查询\普通嵌套查询.txt" />
-    <EmbeddedResource Include="XRegex\Sample\SQL查询\普通查询.txt" />
-    <EmbeddedResource Include="XRegex\Sample\平衡组\算术表达式.txt" />
-    <EmbeddedResource Include="XRegex\Sample\网页\最外层嵌套.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\NewLife.Core\NewLife.Core40.csproj">
-      <Project>{5813c22e-eeb3-4dee-a45c-bb218041193a}</Project>
-      <Name>NewLife.Core40</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\NewLife.Net\NewLife.Net40.csproj">
-      <Project>{5a8ef50c-3394-4c1e-99f0-33efe8691cb0}</Project>
-      <Name>NewLife.Net40</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\XCode\XCode40.csproj">
-      <Project>{b49aba5a-c5da-45f4-87f1-b435ec51d710}</Project>
-      <Name>XCode40</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\XTemplate\XTemplate40.csproj">
-      <Project>{55ba37ee-01a2-438f-a0fb-6b57440bf2f0}</Project>
-      <Name>XTemplate40</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/XCoder/XCom/FrmMain.cs b/XCoder/XCom/FrmMain.cs
deleted file mode 100644
index 517e1e9636..0000000000
--- a/XCoder/XCom/FrmMain.cs
+++ /dev/null
@@ -1,217 +0,0 @@
-﻿using System;
-using System.ComponentModel;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using NewLife.Log;
-using NewLife.Windows;
-using XCoder;
-
-namespace XCom
-{
-    [DisplayName("串口调试工具")]
-    public partial class FrmMain : Form, IXForm
-    {
-        /// <summary>业务日志输出</summary>
-        ILog BizLog;
-
-        #region 窗体
-        public FrmMain()
-        {
-            InitializeComponent();
-
-            // 动态调节宽度高度，兼容高DPI
-            this.FixDpi();
-
-            Icon = IcoHelper.GetIcon("串口");
-        }
-
-        private void FrmMain_Load(Object sender, EventArgs e)
-        {
-            var log = TextFileLog.Create(null, "Serial_{0:yyyy_MM_dd}.log");
-            BizLog = txtReceive.Combine(log);
-            txtReceive.UseWinFormControl();
-
-            txtReceive.SetDefaultStyle(12);
-            txtSend.SetDefaultStyle(12);
-            numMutilSend.SetDefaultStyle(12);
-
-            gbReceive.Tag = gbReceive.Text;
-            gbSend.Tag = gbSend.Text;
-
-            var menu = spList.Menu;
-            txtReceive.ContextMenuStrip = menu;
-
-            // 添加清空
-            menu.Items.Insert(0, new ToolStripSeparator());
-            var ti = new ToolStripMenuItem("清空");
-            menu.Items.Insert(0, ti);
-            ti.Click += mi清空_Click;
-
-            // 加载保存的颜色
-            UIConfig.Apply(txtReceive);
-
-            ti = new ToolStripMenuItem("日志着色");
-            ti.Name = "日志着色";
-            menu.Items.Insert(2, ti);
-            ti.Click += miCheck_Click;
-            ti.Checked = XConfig.Current.ColorLog;
-        }
-        #endregion
-
-        #region 收发数据
-        void Connect()
-        {
-            spList.Connect();
-            var st = spList.Port;
-            //st.FrameSize = 8;
-            if (st == null) return;
-
-            // 需要考虑UI线程
-            st.Disconnected += (s, e) => this.Invoke(Disconnect);
-
-            // 发现USB2401端口，自动发送设置命令
-            if (st.Description.Contains("USB2401") || st.Description.Contains("USBSER"))
-            {
-                var cmd = "AT+SET=00070000000000";
-                st.Send(cmd.GetBytes());
-                BizLog.Info(cmd);
-                //TextControlLog.WriteLog(txtReceive, cmd);
-            }
-
-            "连接串口{0}".F(st.PortName).SpeechTip();
-
-            btnConnect.Text = "关闭";
-
-            var menu = txtReceive.ContextMenuStrip;
-            var mi = menu.Items.Find("日志着色", false).FirstOrDefault() as ToolStripMenuItem;
-
-            var cfg = XConfig.Current;
-            cfg.ColorLog = mi.Checked;
-            cfg.Save();
-        }
-
-        void Disconnect()
-        {
-            //if (spList.Enabled) return;
-            if (btnConnect.Text == "打开") return;
-
-            var st = spList.Port;
-            if (st != null) st.Disconnected -= (s, e) => this.Invoke(Disconnect);
-            spList.Disconnect();
-
-            "串口已断开".SpeechTip();
-
-            btnConnect.Text = "打开";
-        }
-
-        private void btnConnect_Click(Object sender, EventArgs e)
-        {
-            var btn = sender as Button;
-            if (btn.Text == "打开")
-                Connect();
-            else
-                Disconnect();
-        }
-
-        void OnReceived(Object sender, StringEventArgs e)
-        {
-            var line = e.Value;
-            //TextControlLog.WriteLog(txtReceive, line);
-
-            BizLog?.Info(line);
-        }
-
-        Int32 _pColor = 0;
-        Int32 lastReceive = 0;
-        Int32 lastSend = 0;
-        private void timer1_Tick(Object sender, EventArgs e)
-        {
-            var sp = spList.Port;
-            if (sp != null)
-            {
-                // 检查串口是否已断开，自动关闭已断开的串口，避免内存暴涨
-                if (!spList.Enabled && btnConnect.Text == "打开")
-                {
-                    Disconnect();
-                    return;
-                }
-
-                var rcount = spList.BytesOfReceived;
-                var tcount = spList.BytesOfSent;
-                if (rcount != lastReceive)
-                {
-                    gbReceive.Text = (gbReceive.Tag + "").Replace("0", rcount + "");
-                    lastReceive = rcount;
-                }
-                if (tcount != lastSend)
-                {
-                    gbSend.Text = (gbSend.Tag + "").Replace("0", tcount + "");
-                    lastSend = tcount;
-                }
-
-                var set = XConfig.Current;
-                if (set.ColorLog) txtReceive.ColourDefault(_pColor);
-                _pColor = txtReceive.TextLength;
-            }
-        }
-
-        private void btnSend_Click(Object sender, EventArgs e)
-        {
-            var str = txtSend.Text;
-            if (String.IsNullOrEmpty(str))
-            {
-                MessageBox.Show("发送内容不能为空！", Text);
-                txtSend.Focus();
-                return;
-            }
-
-            // 多次发送
-            var count = (Int32)numMutilSend.Value;
-            var sleep = (Int32)numSleep.Value;
-            if (count <= 0) count = 1;
-            if (sleep <= 0) sleep = 100;
-
-            // 处理换行
-            str = str.Replace("\n", "\r\n");
-
-            if (count == 1)
-            {
-                spList.Send(str);
-                return;
-            }
-
-            Task.Factory.StartNew(() =>
-            {
-                for (var i = 0; i < count; i++)
-                {
-                    spList.Send(str);
-
-                    if (count > 1) Thread.Sleep(sleep);
-                }
-            }).LogException();
-        }
-        #endregion
-
-        #region 右键菜单
-        private void mi清空_Click(Object sender, EventArgs e)
-        {
-            txtReceive.Clear();
-            spList.ClearReceive();
-        }
-
-        private void mi清空2_Click(Object sender, EventArgs e)
-        {
-            txtSend.Clear();
-            spList.ClearSend();
-        }
-
-        private void miCheck_Click(Object sender, EventArgs e)
-        {
-            var mi = sender as ToolStripMenuItem;
-            mi.Checked = !mi.Checked;
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/XCoder/XCom/FrmMain.designer.cs b/XCoder/XCom/FrmMain.designer.cs
deleted file mode 100644
index 9d8e4a1c23..0000000000
--- a/XCoder/XCom/FrmMain.designer.cs
+++ /dev/null
@@ -1,262 +0,0 @@
-﻿namespace XCom
-{
-    partial class FrmMain
-    {
-        /// <summary>
-        /// 必需的设计器变量。
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// 清理所有正在使用的资源。
-        /// </summary>
-        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows 窗体设计器生成的代码
-
-        /// <summary>
-        /// 设计器支持所需的方法 - 不要
-        /// 使用代码编辑器修改此方法的内容。
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.components = new System.ComponentModel.Container();
-            this.numMutilSend = new System.Windows.Forms.NumericUpDown();
-            this.gbReceive = new System.Windows.Forms.GroupBox();
-            this.txtReceive = new System.Windows.Forms.RichTextBox();
-            this.gbSend = new System.Windows.Forms.GroupBox();
-            this.numSleep = new System.Windows.Forms.NumericUpDown();
-            this.txtSend = new System.Windows.Forms.RichTextBox();
-            this.menuSend = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.mi清空2 = new System.Windows.Forms.ToolStripMenuItem();
-            this.btnSend = new System.Windows.Forms.Button();
-            this.label1 = new System.Windows.Forms.Label();
-            this.label7 = new System.Windows.Forms.Label();
-            this.btnConnect = new System.Windows.Forms.Button();
-            this.timer1 = new System.Windows.Forms.Timer(this.components);
-            this.fontDialog1 = new System.Windows.Forms.FontDialog();
-            this.colorDialog1 = new System.Windows.Forms.ColorDialog();
-            this.spList = new NewLife.Windows.SerialPortList();
-            ((System.ComponentModel.ISupportInitialize)(this.numMutilSend)).BeginInit();
-            this.gbReceive.SuspendLayout();
-            this.gbSend.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.numSleep)).BeginInit();
-            this.menuSend.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // numMutilSend
-            // 
-            this.numMutilSend.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.numMutilSend.Location = new System.Drawing.Point(436, 22);
-            this.numMutilSend.Maximum = new decimal(new int[] {
-            10000,
-            0,
-            0,
-            0});
-            this.numMutilSend.Name = "numMutilSend";
-            this.numMutilSend.Size = new System.Drawing.Size(52, 21);
-            this.numMutilSend.TabIndex = 14;
-            this.numMutilSend.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-            this.numMutilSend.Value = new decimal(new int[] {
-            1,
-            0,
-            0,
-            0});
-            // 
-            // gbReceive
-            // 
-            this.gbReceive.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.gbReceive.Controls.Add(this.txtReceive);
-            this.gbReceive.Location = new System.Drawing.Point(9, 43);
-            this.gbReceive.Name = "gbReceive";
-            this.gbReceive.Size = new System.Drawing.Size(550, 241);
-            this.gbReceive.TabIndex = 4;
-            this.gbReceive.TabStop = false;
-            this.gbReceive.Text = "接收区：已接收0字节";
-            // 
-            // txtReceive
-            // 
-            this.txtReceive.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.txtReceive.HideSelection = false;
-            this.txtReceive.Location = new System.Drawing.Point(3, 17);
-            this.txtReceive.Name = "txtReceive";
-            this.txtReceive.Size = new System.Drawing.Size(544, 221);
-            this.txtReceive.TabIndex = 1;
-            this.txtReceive.Text = "";
-            // 
-            // gbSend
-            // 
-            this.gbSend.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.gbSend.Controls.Add(this.numSleep);
-            this.gbSend.Controls.Add(this.txtSend);
-            this.gbSend.Controls.Add(this.btnSend);
-            this.gbSend.Controls.Add(this.numMutilSend);
-            this.gbSend.Controls.Add(this.label1);
-            this.gbSend.Controls.Add(this.label7);
-            this.gbSend.Location = new System.Drawing.Point(9, 290);
-            this.gbSend.Name = "gbSend";
-            this.gbSend.Size = new System.Drawing.Size(550, 84);
-            this.gbSend.TabIndex = 5;
-            this.gbSend.TabStop = false;
-            this.gbSend.Text = "发送区：已发送0字节";
-            // 
-            // numSleep
-            // 
-            this.numSleep.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.numSleep.Location = new System.Drawing.Point(436, 49);
-            this.numSleep.Maximum = new decimal(new int[] {
-            1000000,
-            0,
-            0,
-            0});
-            this.numSleep.Name = "numSleep";
-            this.numSleep.Size = new System.Drawing.Size(52, 21);
-            this.numSleep.TabIndex = 16;
-            this.numSleep.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-            this.numSleep.Value = new decimal(new int[] {
-            1000,
-            0,
-            0,
-            0});
-            // 
-            // txtSend
-            // 
-            this.txtSend.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtSend.ContextMenuStrip = this.menuSend;
-            this.txtSend.HideSelection = false;
-            this.txtSend.Location = new System.Drawing.Point(0, 19);
-            this.txtSend.Name = "txtSend";
-            this.txtSend.Size = new System.Drawing.Size(395, 59);
-            this.txtSend.TabIndex = 2;
-            this.txtSend.Text = "";
-            // 
-            // menuSend
-            // 
-            this.menuSend.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.mi清空2});
-            this.menuSend.Name = "menuSend";
-            this.menuSend.Size = new System.Drawing.Size(101, 26);
-            // 
-            // mi清空2
-            // 
-            this.mi清空2.Name = "mi清空2";
-            this.mi清空2.Size = new System.Drawing.Size(100, 22);
-            this.mi清空2.Text = "清空";
-            this.mi清空2.Click += new System.EventHandler(this.mi清空2_Click);
-            // 
-            // btnSend
-            // 
-            this.btnSend.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnSend.Location = new System.Drawing.Point(494, 18);
-            this.btnSend.Name = "btnSend";
-            this.btnSend.Size = new System.Drawing.Size(50, 61);
-            this.btnSend.TabIndex = 1;
-            this.btnSend.Text = "发送";
-            this.btnSend.UseVisualStyleBackColor = true;
-            this.btnSend.Click += new System.EventHandler(this.btnSend_Click);
-            // 
-            // label1
-            // 
-            this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(401, 53);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(41, 12);
-            this.label1.TabIndex = 17;
-            this.label1.Text = "间隔：";
-            // 
-            // label7
-            // 
-            this.label7.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(401, 26);
-            this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(41, 12);
-            this.label7.TabIndex = 15;
-            this.label7.Text = "次数：";
-            // 
-            // btnConnect
-            // 
-            this.btnConnect.Location = new System.Drawing.Point(501, 8);
-            this.btnConnect.Name = "btnConnect";
-            this.btnConnect.Size = new System.Drawing.Size(67, 29);
-            this.btnConnect.TabIndex = 3;
-            this.btnConnect.Text = "打开";
-            this.btnConnect.UseVisualStyleBackColor = true;
-            this.btnConnect.Click += new System.EventHandler(this.btnConnect_Click);
-            // 
-            // timer1
-            // 
-            this.timer1.Enabled = true;
-            this.timer1.Interval = 300;
-            this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
-            // 
-            // spList
-            // 
-            this.spList.BytesOfReceived = 0;
-            this.spList.BytesOfSent = 0;
-            this.spList.Location = new System.Drawing.Point(12, 8);
-            this.spList.Name = "spList";
-            this.spList.Port = null;
-            this.spList.SelectedPort = "COM1(Serial0)";
-            this.spList.Size = new System.Drawing.Size(415, 29);
-            this.spList.TabIndex = 6;
-            this.spList.ReceivedString += new System.EventHandler<NewLife.Windows.StringEventArgs>(this.OnReceived);
-            // 
-            // FrmMain
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(565, 386);
-            this.Controls.Add(this.spList);
-            this.Controls.Add(this.gbSend);
-            this.Controls.Add(this.btnConnect);
-            this.Controls.Add(this.gbReceive);
-            this.Name = "FrmMain";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "串口调试";
-            this.Load += new System.EventHandler(this.FrmMain_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.numMutilSend)).EndInit();
-            this.gbReceive.ResumeLayout(false);
-            this.gbSend.ResumeLayout(false);
-            this.gbSend.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.numSleep)).EndInit();
-            this.menuSend.ResumeLayout(false);
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.GroupBox gbReceive;
-        private System.Windows.Forms.GroupBox gbSend;
-        private System.Windows.Forms.NumericUpDown numMutilSend;
-        private System.Windows.Forms.Button btnSend;
-        private System.Windows.Forms.Button btnConnect;
-        private System.Windows.Forms.Timer timer1;
-        private System.Windows.Forms.Label label7;
-        private System.Windows.Forms.ContextMenuStrip menuSend;
-        private System.Windows.Forms.ToolStripMenuItem mi清空2;
-        private NewLife.Windows.SerialPortList spList;
-        private System.Windows.Forms.RichTextBox txtReceive;
-        private System.Windows.Forms.RichTextBox txtSend;
-        private System.Windows.Forms.FontDialog fontDialog1;
-        private System.Windows.Forms.ColorDialog colorDialog1;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.NumericUpDown numSleep;
-    }
-}
-
diff --git a/XCoder/XCom/FrmMain.resx b/XCoder/XCom/FrmMain.resx
deleted file mode 100644
index 59267426da..0000000000
--- a/XCoder/XCom/FrmMain.resx
+++ /dev/null
@@ -1,132 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="menuSend.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>237, 17</value>
-  </metadata>
-  <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="fontDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>352, 17</value>
-  </metadata>
-  <metadata name="colorDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>474, 17</value>
-  </metadata>
-</root>
\ No newline at end of file
diff --git a/XCoder/XICO/FrmMain.cs b/XCoder/XICO/FrmMain.cs
deleted file mode 100644
index 7cc7ef9ca2..0000000000
--- a/XCoder/XICO/FrmMain.cs
+++ /dev/null
@@ -1,195 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.IO;
-using System.Text;
-using System.Windows.Forms;
-using NewLife.IO;
-using XCoder;
-
-namespace XICO
-{
-    [DisplayName("图标水印处理工具")]
-    public partial class FrmMain : Form, IXForm
-    {
-        #region 窗口初始化
-        public FrmMain()
-        {
-            InitializeComponent();
-
-            // 动态调节宽度高度，兼容高DPI
-            this.FixDpi();
-
-            //AllowDrop = true;
-            picSrc.AllowDrop = true;
-
-            Icon = IcoHelper.GetIcon("图标");
-        }
-
-        private void FrmMain_Shown(Object sender, EventArgs e)
-        {
-            //sfd.InitialDirectory = AppDomain.CurrentDomain.BaseDirectory;
-
-            var ms = FileSource.GetFileResource(null, "XCoder.XICO.leaf.png");
-            if (ms != null) picSrc.Image = new Bitmap(ms);
-
-            var ft = lbFont.Font;
-            lbFont.Tag = new Font(ft.Name, 96, ft.Style);
-
-            MakeWater();
-        }
-        #endregion
-
-        #region 水印
-        private void label3_Click(Object sender, EventArgs e)
-        {
-            fontDialog1.Font = (Font)lbFont.Tag;
-            if (fontDialog1.ShowDialog() != DialogResult.OK) return;
-
-            var ft = fontDialog1.Font;
-            lbFont.Tag = ft;
-            lbFont.Font = new Font(ft.Name, lbFont.Font.Size, ft.Style);
-
-            MakeWater();
-        }
-
-        private void label4_Click(Object sender, EventArgs e)
-        {
-            colorDialog1.Color = lbFont.ForeColor;
-            if (colorDialog1.ShowDialog() != DialogResult.OK) return;
-
-            lbFont.ForeColor = colorDialog1.Color;
-            label4.ForeColor = colorDialog1.Color;
-
-            MakeWater();
-        }
-
-        private void btnWater_Click(Object sender, EventArgs e)
-        {
-        }
-
-        private void txt_TextChanged(Object sender, EventArgs e)
-        {
-            //var str = txt.Text;
-            //if (String.IsNullOrEmpty(str)) str = "字体样板";
-            //lbFont.Text = str;
-
-            MakeWater();
-        }
-
-        private void numX_ValueChanged(Object sender, EventArgs e)
-        {
-            MakeWater();
-        }
-
-        void MakeWater()
-        {
-            var bmp = MakeWater(true);
-            picDes.Image = bmp;
-            picDes.Refresh();
-        }
-
-        Image MakeWater(Boolean fitSize)
-        {
-            var brush = new SolidBrush(lbFont.ForeColor);
-
-            var bmp = picSrc.Image;
-            if (fitSize && bmp.Width > picDes.Width)
-                bmp = new Bitmap(bmp, picDes.Width, picDes.Height);
-            else
-                bmp = new Bitmap(bmp);
-
-            if (!String.IsNullOrEmpty(txt.Text))
-            {
-                var ft = (Font)lbFont.Tag;
-
-                var g = Graphics.FromImage(bmp);
-                g.DrawString(txt.Text, ft, brush, (Int32)numX.Value, (Int32)numY.Value);
-                g.Dispose();
-            }
-
-            return bmp;
-        }
-
-        private void btnSave_Click(Object sender, EventArgs e)
-        {
-            var bmp = MakeWater(true);
-
-            //sfd.DefaultExt = "png";
-            sfd.Filter = "PNG图片(*.png)|*.png";
-            if (sfd.ShowDialog() == DialogResult.OK)
-            {
-                bmp.Save(sfd.FileName, picSrc.Image.RawFormat);
-            }
-        }
-        #endregion
-
-        #region 图标
-        private void btnMakeICO_Click(Object sender, EventArgs e)
-        {
-            var list = new List<Int32>();
-            foreach (var item in groupBox2.Controls)
-            {
-                var chk = item as CheckBox;
-                if (chk != null && chk.Checked) list.Add(chk.Name.Substring(3).ToInt());
-            }
-            list.Sort();
-
-            if (list.Count < 1)
-            {
-                MessageBox.Show("请选择大小！");
-                return;
-            }
-
-            var bmp = MakeWater(true);
-
-            var ms = new MemoryStream();
-            //IconFile.Convert(bmp, ms, list.ToArray(), new Int32[] { 8, 32 });
-            IconFile.Convert(bmp, ms, list.ToArray(), new Int32[] { 32 });
-
-            //sfd.DefaultExt = "ico";
-            sfd.Filter = "ICO图标(*.ico)|*.ico";
-            if (sfd.ShowDialog() == DialogResult.OK)
-            {
-                File.WriteAllBytes(sfd.FileName, ms.ToArray());
-            }
-        }
-        #endregion
-
-        #region 图片加载
-        private void picSrc_DragDrop(Object sender, DragEventArgs e)
-        {
-            var fs = (String[])e.Data.GetData(DataFormats.FileDrop);
-            if (fs != null && fs.Length > 0)
-            {
-                var fi = fs[0];
-                sfd.FileName = fi;
-
-                // 如果是图标，读取信息
-                if (fi.EndsWithIgnoreCase(".ico"))
-                {
-                    var ico = new IconFile(fi);
-                    //ico.Sort();
-                    var sb = new StringBuilder();
-                    foreach (var item in ico.Items)
-                    {
-                        if (sb.Length > 0) sb.AppendLine();
-                        sb.AppendFormat("{0}*{1}*{2}", item.Width, item.Height, item.BitCount);
-                    }
-                    MessageBox.Show(sb.ToString());
-                }
-                picSrc.Load(fi);
-            }
-        }
-
-        private void picSrc_DragEnter(Object sender, DragEventArgs e)
-        {
-            if (e.Data.GetDataPresent(DataFormats.FileDrop))
-                e.Effect = DragDropEffects.Link;
-            else
-                e.Effect = DragDropEffects.None;
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/XCoder/XICO/FrmMain.designer.cs b/XCoder/XICO/FrmMain.designer.cs
deleted file mode 100644
index 068d06ab91..0000000000
--- a/XCoder/XICO/FrmMain.designer.cs
+++ /dev/null
@@ -1,496 +0,0 @@
-﻿namespace XICO
-{
-    partial class FrmMain
-    {
-        /// <summary>
-        /// 必需的设计器变量。
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// 清理所有正在使用的资源。
-        /// </summary>
-        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows 窗体设计器生成的代码
-
-        /// <summary>
-        /// 设计器支持所需的方法 - 不要
-        /// 使用代码编辑器修改此方法的内容。
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.picSrc = new System.Windows.Forms.PictureBox();
-            this.picDes = new System.Windows.Forms.PictureBox();
-            this.label1 = new System.Windows.Forms.Label();
-            this.label2 = new System.Windows.Forms.Label();
-            this.fontDialog1 = new System.Windows.Forms.FontDialog();
-            this.colorDialog1 = new System.Windows.Forms.ColorDialog();
-            this.txt = new System.Windows.Forms.TextBox();
-            this.lbFont = new System.Windows.Forms.Label();
-            this.btnMakeICO = new System.Windows.Forms.Button();
-            this.label3 = new System.Windows.Forms.Label();
-            this.label4 = new System.Windows.Forms.Label();
-            this.label5 = new System.Windows.Forms.Label();
-            this.numX = new System.Windows.Forms.NumericUpDown();
-            this.numY = new System.Windows.Forms.NumericUpDown();
-            this.label6 = new System.Windows.Forms.Label();
-            this.label7 = new System.Windows.Forms.Label();
-            this.btnSave = new System.Windows.Forms.Button();
-            this.groupBox1 = new System.Windows.Forms.GroupBox();
-            this.groupBox2 = new System.Windows.Forms.GroupBox();
-            this.chk16 = new System.Windows.Forms.CheckBox();
-            this.chk24 = new System.Windows.Forms.CheckBox();
-            this.chk32 = new System.Windows.Forms.CheckBox();
-            this.chk48 = new System.Windows.Forms.CheckBox();
-            this.chk64 = new System.Windows.Forms.CheckBox();
-            this.chk128 = new System.Windows.Forms.CheckBox();
-            this.chk256 = new System.Windows.Forms.CheckBox();
-            this.sfd = new System.Windows.Forms.SaveFileDialog();
-            this.chb96 = new System.Windows.Forms.CheckBox();
-            this.chb512 = new System.Windows.Forms.CheckBox();
-            this.chb768 = new System.Windows.Forms.CheckBox();
-            ((System.ComponentModel.ISupportInitialize)(this.picSrc)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.picDes)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numX)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numY)).BeginInit();
-            this.groupBox1.SuspendLayout();
-            this.groupBox2.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // picSrc
-            // 
-            this.picSrc.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.picSrc.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
-            this.picSrc.Cursor = System.Windows.Forms.Cursors.Default;
-            this.picSrc.Location = new System.Drawing.Point(12, 148);
-            this.picSrc.Name = "picSrc";
-            this.picSrc.Size = new System.Drawing.Size(256, 256);
-            this.picSrc.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
-            this.picSrc.TabIndex = 0;
-            this.picSrc.TabStop = false;
-            this.picSrc.DragDrop += new System.Windows.Forms.DragEventHandler(this.picSrc_DragDrop);
-            this.picSrc.DragEnter += new System.Windows.Forms.DragEventHandler(this.picSrc_DragEnter);
-            // 
-            // picDes
-            // 
-            this.picDes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.picDes.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
-            this.picDes.Location = new System.Drawing.Point(274, 148);
-            this.picDes.Name = "picDes";
-            this.picDes.Size = new System.Drawing.Size(256, 256);
-            this.picDes.TabIndex = 1;
-            this.picDes.TabStop = false;
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(15, 26);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(41, 12);
-            this.label1.TabIndex = 2;
-            this.label1.Text = "文本：";
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(15, 98);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(41, 12);
-            this.label2.TabIndex = 3;
-            this.label2.Text = "字体：";
-            // 
-            // txt
-            // 
-            this.txt.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
-            this.txt.Location = new System.Drawing.Point(57, 22);
-            this.txt.Name = "txt";
-            this.txt.Size = new System.Drawing.Size(106, 21);
-            this.txt.TabIndex = 1;
-            this.txt.Text = "码神";
-            this.txt.TextChanged += new System.EventHandler(this.txt_TextChanged);
-            // 
-            // lbFont
-            // 
-            this.lbFont.AutoSize = true;
-            this.lbFont.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lbFont.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
-            this.lbFont.Location = new System.Drawing.Point(55, 95);
-            this.lbFont.Name = "lbFont";
-            this.lbFont.Size = new System.Drawing.Size(80, 17);
-            this.lbFont.TabIndex = 6;
-            this.lbFont.Text = "点击更改字体";
-            this.lbFont.Click += new System.EventHandler(this.label3_Click);
-            // 
-            // btnMakeICO
-            // 
-            this.btnMakeICO.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnMakeICO.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
-            this.btnMakeICO.Location = new System.Drawing.Point(263, 41);
-            this.btnMakeICO.Name = "btnMakeICO";
-            this.btnMakeICO.Size = new System.Drawing.Size(57, 36);
-            this.btnMakeICO.TabIndex = 8;
-            this.btnMakeICO.Text = "保存";
-            this.btnMakeICO.UseVisualStyleBackColor = true;
-            this.btnMakeICO.Click += new System.EventHandler(this.btnMakeICO_Click);
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(15, 74);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(41, 12);
-            this.label3.TabIndex = 9;
-            this.label3.Text = "颜色：";
-            // 
-            // label4
-            // 
-            this.label4.AutoSize = true;
-            this.label4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
-            this.label4.Location = new System.Drawing.Point(55, 74);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(83, 12);
-            this.label4.TabIndex = 10;
-            this.label4.Text = "点击更改颜色";
-            this.label4.Click += new System.EventHandler(this.label4_Click);
-            // 
-            // label5
-            // 
-            this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(15, 50);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(41, 12);
-            this.label5.TabIndex = 11;
-            this.label5.Text = "位置：";
-            // 
-            // numX
-            // 
-            this.numX.Location = new System.Drawing.Point(76, 46);
-            this.numX.Maximum = new decimal(new int[] {
-            1000,
-            0,
-            0,
-            0});
-            this.numX.Minimum = new decimal(new int[] {
-            1000,
-            0,
-            0,
-            -2147483648});
-            this.numX.Name = "numX";
-            this.numX.Size = new System.Drawing.Size(44, 21);
-            this.numX.TabIndex = 2;
-            this.numX.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-            this.numX.Value = new decimal(new int[] {
-            25,
-            0,
-            0,
-            -2147483648});
-            this.numX.ValueChanged += new System.EventHandler(this.numX_ValueChanged);
-            // 
-            // numY
-            // 
-            this.numY.Location = new System.Drawing.Point(144, 46);
-            this.numY.Maximum = new decimal(new int[] {
-            1000,
-            0,
-            0,
-            0});
-            this.numY.Minimum = new decimal(new int[] {
-            1000,
-            0,
-            0,
-            -2147483648});
-            this.numY.Name = "numY";
-            this.numY.Size = new System.Drawing.Size(44, 21);
-            this.numY.TabIndex = 3;
-            this.numY.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-            this.numY.Value = new decimal(new int[] {
-            100,
-            0,
-            0,
-            0});
-            this.numY.ValueChanged += new System.EventHandler(this.numX_ValueChanged);
-            // 
-            // label6
-            // 
-            this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(55, 50);
-            this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(17, 12);
-            this.label6.TabIndex = 14;
-            this.label6.Text = "X:";
-            // 
-            // label7
-            // 
-            this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(126, 50);
-            this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(17, 12);
-            this.label7.TabIndex = 15;
-            this.label7.Text = "Y:";
-            // 
-            // btnSave
-            // 
-            this.btnSave.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSave.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
-            this.btnSave.Location = new System.Drawing.Point(144, 77);
-            this.btnSave.Name = "btnSave";
-            this.btnSave.Size = new System.Drawing.Size(50, 35);
-            this.btnSave.TabIndex = 16;
-            this.btnSave.Text = "保存";
-            this.btnSave.UseVisualStyleBackColor = true;
-            this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
-            // 
-            // groupBox1
-            // 
-            this.groupBox1.Controls.Add(this.btnSave);
-            this.groupBox1.Controls.Add(this.label1);
-            this.groupBox1.Controls.Add(this.label2);
-            this.groupBox1.Controls.Add(this.label7);
-            this.groupBox1.Controls.Add(this.txt);
-            this.groupBox1.Controls.Add(this.label6);
-            this.groupBox1.Controls.Add(this.lbFont);
-            this.groupBox1.Controls.Add(this.numY);
-            this.groupBox1.Controls.Add(this.numX);
-            this.groupBox1.Controls.Add(this.label3);
-            this.groupBox1.Controls.Add(this.label5);
-            this.groupBox1.Controls.Add(this.label4);
-            this.groupBox1.Location = new System.Drawing.Point(12, 12);
-            this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(197, 123);
-            this.groupBox1.TabIndex = 17;
-            this.groupBox1.TabStop = false;
-            this.groupBox1.Text = "水印";
-            // 
-            // groupBox2
-            // 
-            this.groupBox2.Controls.Add(this.chb768);
-            this.groupBox2.Controls.Add(this.chb512);
-            this.groupBox2.Controls.Add(this.chb96);
-            this.groupBox2.Controls.Add(this.chk16);
-            this.groupBox2.Controls.Add(this.chk24);
-            this.groupBox2.Controls.Add(this.chk32);
-            this.groupBox2.Controls.Add(this.chk48);
-            this.groupBox2.Controls.Add(this.chk64);
-            this.groupBox2.Controls.Add(this.chk128);
-            this.groupBox2.Controls.Add(this.chk256);
-            this.groupBox2.Controls.Add(this.btnMakeICO);
-            this.groupBox2.Location = new System.Drawing.Point(212, 12);
-            this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(329, 120);
-            this.groupBox2.TabIndex = 18;
-            this.groupBox2.TabStop = false;
-            this.groupBox2.Text = "图标";
-            // 
-            // chk16
-            // 
-            this.chk16.AutoSize = true;
-            this.chk16.Checked = true;
-            this.chk16.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.chk16.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.chk16.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
-            this.chk16.Location = new System.Drawing.Point(6, 12);
-            this.chk16.Name = "chk16";
-            this.chk16.Size = new System.Drawing.Size(77, 26);
-            this.chk16.TabIndex = 11;
-            this.chk16.Text = "16*16";
-            this.chk16.UseVisualStyleBackColor = true;
-            // 
-            // chk24
-            // 
-            this.chk24.AutoSize = true;
-            this.chk24.Checked = true;
-            this.chk24.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.chk24.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.chk24.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
-            this.chk24.Location = new System.Drawing.Point(83, 12);
-            this.chk24.Name = "chk24";
-            this.chk24.Size = new System.Drawing.Size(77, 26);
-            this.chk24.TabIndex = 12;
-            this.chk24.Text = "24*24";
-            this.chk24.UseVisualStyleBackColor = true;
-            // 
-            // chk32
-            // 
-            this.chk32.AutoSize = true;
-            this.chk32.Checked = true;
-            this.chk32.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.chk32.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.chk32.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
-            this.chk32.Location = new System.Drawing.Point(160, 12);
-            this.chk32.Name = "chk32";
-            this.chk32.Size = new System.Drawing.Size(77, 26);
-            this.chk32.TabIndex = 13;
-            this.chk32.Text = "32*32";
-            this.chk32.UseVisualStyleBackColor = true;
-            // 
-            // chk48
-            // 
-            this.chk48.AutoSize = true;
-            this.chk48.Checked = true;
-            this.chk48.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.chk48.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.chk48.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
-            this.chk48.Location = new System.Drawing.Point(243, 12);
-            this.chk48.Name = "chk48";
-            this.chk48.Size = new System.Drawing.Size(77, 26);
-            this.chk48.TabIndex = 14;
-            this.chk48.Text = "48*48";
-            this.chk48.UseVisualStyleBackColor = true;
-            // 
-            // chk64
-            // 
-            this.chk64.AutoSize = true;
-            this.chk64.Checked = true;
-            this.chk64.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.chk64.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.chk64.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
-            this.chk64.Location = new System.Drawing.Point(6, 46);
-            this.chk64.Name = "chk64";
-            this.chk64.Size = new System.Drawing.Size(77, 26);
-            this.chk64.TabIndex = 15;
-            this.chk64.Text = "64*64";
-            this.chk64.UseVisualStyleBackColor = true;
-            // 
-            // chk128
-            // 
-            this.chk128.AutoSize = true;
-            this.chk128.Checked = true;
-            this.chk128.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.chk128.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.chk128.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
-            this.chk128.Location = new System.Drawing.Point(160, 46);
-            this.chk128.Name = "chk128";
-            this.chk128.Size = new System.Drawing.Size(97, 26);
-            this.chk128.TabIndex = 17;
-            this.chk128.Text = "128*128";
-            this.chk128.UseVisualStyleBackColor = true;
-            // 
-            // chk256
-            // 
-            this.chk256.AutoSize = true;
-            this.chk256.Checked = true;
-            this.chk256.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.chk256.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.chk256.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
-            this.chk256.Location = new System.Drawing.Point(6, 80);
-            this.chk256.Name = "chk256";
-            this.chk256.Size = new System.Drawing.Size(97, 26);
-            this.chk256.TabIndex = 18;
-            this.chk256.Text = "256*256";
-            this.chk256.UseVisualStyleBackColor = true;
-            // 
-            // sfd
-            // 
-            this.sfd.Filter = "PNG图片(*.png)|*.png|ICO图标(*.ico)|*.ico|所有文件(*.*)|*.*";
-            // 
-            // chb96
-            // 
-            this.chb96.AutoSize = true;
-            this.chb96.Checked = true;
-            this.chb96.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.chb96.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.chb96.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
-            this.chb96.Location = new System.Drawing.Point(83, 46);
-            this.chb96.Name = "chb96";
-            this.chb96.Size = new System.Drawing.Size(77, 26);
-            this.chb96.TabIndex = 16;
-            this.chb96.Text = "96*96";
-            this.chb96.UseVisualStyleBackColor = true;
-            // 
-            // chb512
-            // 
-            this.chb512.AutoSize = true;
-            this.chb512.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.chb512.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
-            this.chb512.Location = new System.Drawing.Point(109, 80);
-            this.chb512.Name = "chb512";
-            this.chb512.Size = new System.Drawing.Size(97, 26);
-            this.chb512.TabIndex = 19;
-            this.chb512.Text = "512*512";
-            this.chb512.UseVisualStyleBackColor = true;
-            // 
-            // chb768
-            // 
-            this.chb768.AutoSize = true;
-            this.chb768.Checked = true;
-            this.chb768.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.chb768.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.chb768.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
-            this.chb768.Location = new System.Drawing.Point(212, 80);
-            this.chb768.Name = "chb768";
-            this.chb768.Size = new System.Drawing.Size(97, 26);
-            this.chb768.TabIndex = 20;
-            this.chb768.Text = "768*768";
-            this.chb768.UseVisualStyleBackColor = true;
-            // 
-            // FrmMain
-            // 
-            this.AllowDrop = true;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(544, 414);
-            this.Controls.Add(this.groupBox2);
-            this.Controls.Add(this.groupBox1);
-            this.Controls.Add(this.picDes);
-            this.Controls.Add(this.picSrc);
-            this.Name = "FrmMain";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "ICO图标水印";
-            this.Shown += new System.EventHandler(this.FrmMain_Shown);
-            ((System.ComponentModel.ISupportInitialize)(this.picSrc)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.picDes)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numX)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numY)).EndInit();
-            this.groupBox1.ResumeLayout(false);
-            this.groupBox1.PerformLayout();
-            this.groupBox2.ResumeLayout(false);
-            this.groupBox2.PerformLayout();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.PictureBox picSrc;
-        private System.Windows.Forms.PictureBox picDes;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.FontDialog fontDialog1;
-        private System.Windows.Forms.ColorDialog colorDialog1;
-        private System.Windows.Forms.TextBox txt;
-        private System.Windows.Forms.Label lbFont;
-        private System.Windows.Forms.Button btnMakeICO;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.Label label4;
-        private System.Windows.Forms.Label label5;
-        private System.Windows.Forms.NumericUpDown numX;
-        private System.Windows.Forms.NumericUpDown numY;
-        private System.Windows.Forms.Label label6;
-        private System.Windows.Forms.Label label7;
-        private System.Windows.Forms.Button btnSave;
-        private System.Windows.Forms.GroupBox groupBox1;
-        private System.Windows.Forms.GroupBox groupBox2;
-        private System.Windows.Forms.CheckBox chk16;
-        private System.Windows.Forms.CheckBox chk24;
-        private System.Windows.Forms.CheckBox chk32;
-        private System.Windows.Forms.CheckBox chk48;
-        private System.Windows.Forms.CheckBox chk64;
-        private System.Windows.Forms.CheckBox chk128;
-        private System.Windows.Forms.CheckBox chk256;
-        private System.Windows.Forms.SaveFileDialog sfd;
-        private System.Windows.Forms.CheckBox chb768;
-        private System.Windows.Forms.CheckBox chb512;
-        private System.Windows.Forms.CheckBox chb96;
-    }
-}
-
diff --git a/XCoder/XICO/FrmMain.resx b/XCoder/XICO/FrmMain.resx
deleted file mode 100644
index a2b358d08b..0000000000
--- a/XCoder/XICO/FrmMain.resx
+++ /dev/null
@@ -1,129 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="fontDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="colorDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>139, 17</value>
-  </metadata>
-  <metadata name="sfd.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>266, 17</value>
-  </metadata>
-</root>
\ No newline at end of file
diff --git a/XCoder/XICO/IconFile.cs b/XCoder/XICO/IconFile.cs
deleted file mode 100644
index a1752c574e..0000000000
--- a/XCoder/XICO/IconFile.cs
+++ /dev/null
@@ -1,573 +0,0 @@
-﻿using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.IO;
-using System.Linq;
-using System.Xml.Serialization;
-
-namespace XICO
-{
-    /// <summary>ICON文件</summary>
-    public class IconFile
-    {
-        #region 属性
-        private UInt16 _Reserved = 0;
-        /// <summary>ICO=1，CUR=2</summary>
-        private UInt16 _Type = 1;
-        private UInt16 _Count = 1;
-        public List<IconItem> Items = new List<IconItem>();
-
-        /// <summary>返回图形数量</summary>
-        public Int32 Count { get { return _Count; } }
-        #endregion
-
-        #region 构造
-        public IconFile() { }
-
-        public IconFile(String file)
-        {
-            Load(file);
-        }
-        #endregion
-
-        #region 基本方法
-        public void Load(String file)
-        {
-            using (var fs = File.OpenRead(file))
-            {
-                Load(fs);
-            }
-        }
-
-        /// <summary>读取</summary>
-        /// <param name="stream"></param>
-        public void Load(Stream stream)
-        {
-            var reader = new BinaryReader(stream);
-            _Reserved = reader.ReadUInt16();
-            _Type = reader.ReadUInt16();
-            _Count = reader.ReadUInt16();
-
-            if (_Type != 1 || _Reserved != 0) return;
-
-            for (var i = 0; i < _Count; i++)
-            {
-                Items.Add(new IconItem(reader));
-            }
-        }
-
-        /// <summary>保存</summary>
-        /// <param name="file"></param>
-        public void Save(String file)
-        {
-            using (var fs = File.Create(file))
-            {
-                Save(fs);
-            }
-        }
-
-        /// <summary>保存ICO</summary>
-        /// <param name="stream"></param>
-        public void Save(Stream stream)
-        {
-            var writer = new BinaryWriter(stream);
-
-            writer.Write(_Reserved);
-            writer.Write(_Type);
-            writer.Write((UInt16)Items.Count);
-
-            foreach (var item in Items)
-            {
-                item.Save(writer);
-            }
-            foreach (var item in Items)
-            {
-                writer.Write(item.Data);
-            }
-        }
-
-        /// <summary>排序</summary>
-        public void Sort()
-        {
-            var list = Items.OrderByDescending(e => e.Width == 0 ? 256 : e.Width).ThenByDescending(e => e.BitCount).ToList();
-            Items.Clear();
-            Items.AddRange(list);
-
-            ResetOffset();
-        }
-
-        /// <summary>根据索引返回图形</summary>
-        /// <param name="index"></param>
-        /// <returns></returns>
-        public Bitmap Get(Int32 index)
-        {
-            var inf = new BitmapInfo(Items[index].Data);
-            return inf.IconBmp;
-        }
-
-        public void AddPng(Image bmp, Int32 size, Int32 bit)
-        {
-            // 缩放图片到目标大小
-            var ico = new Bitmap(bmp, size, size);
-
-            var ms = new MemoryStream();
-            ico.Save(ms, ImageFormat.Png);
-
-            var item = new IconItem();
-            item.Data = ms.ToArray();
-            item.Size = (UInt32)item.Data.Length;
-            item.BitCount = (UInt16)bit;
-
-            if (size >= 256) size = 0;
-            item.Width = (Byte)size;
-            item.Height = (Byte)size;
-
-            Items.Add(item);
-
-            ResetOffset();
-        }
-
-        public void AddBmp(Image bmp, Int32 size, Int32 bit)
-        {
-            // 缩放图片到目标大小
-            var ico = new Bitmap(bmp, size, size);
-
-            var ms = new MemoryStream();
-            ico.Save(ms, ImageFormat.Bmp);
-
-            var item = new IconItem();
-            // bmp要跳过14字节，还要修改高度，png不用
-            ms.Position = 14;
-            item.Data = ms.ReadBytes();
-            item.Size = (UInt32)item.Data.Length;
-            item.BitCount = (UInt16)bit;
-
-            item.Width = (Byte)size;
-            item.Height = (Byte)size;
-
-            //// BMP图形和ICO的高不一样  ICO的高是BMP的2倍
-            //var h = BitConverter.ToInt32(item.Data, 8);
-            //h *= 2;
-            //var buf = BitConverter.GetBytes(h);
-            //Buffer.BlockCopy(buf, 0, item.Data, 8, buf.Length);
-            var h = item.Data.ReadBytes(8, 4).ToInt();
-            h *= 2;
-            item.Data.Write((UInt32)h, 8);
-
-            Items.Add(item);
-
-            ResetOffset();
-        }
-
-        public void RemoveAt(Int32 index)
-        {
-            Items.RemoveAt(index);
-
-            ResetOffset();
-        }
-
-        /// <summary>重新设置数据偏移</summary>
-        void ResetOffset()
-        {
-            _Count = (UInt16)Items.Count;
-
-            var idx = (UInt32)(6 + _Count * 16);
-            foreach (var item in Items)
-            {
-                item.Offset = idx;
-                idx += item.Size;
-            }
-        }
-        #endregion
-
-        #region 静态方法
-        public static void Convert(String srcfile, String desfile, Int32[] sizes, Int32[] bits)
-        {
-            using (var bmp = new Bitmap(srcfile))
-            {
-                var ico = new IconFile();
-                foreach (var bit in bits)
-                {
-                    foreach (var item in sizes)
-                    {
-                        if (bit == 8)
-                            ico.AddBmp(bmp, item, bit);
-                        else
-                            ico.AddPng(bmp, item, bit);
-                    }
-                }
-
-                ico.Save(desfile);
-            }
-        }
-
-        /// <summary>转换源图片到目标ICO文件，指定大小和位深</summary>
-        /// <param name="bmp"></param>
-        /// <param name="des"></param>
-        /// <param name="sizes"></param>
-        /// <param name="bits"></param>
-        public static void Convert(Image bmp, Stream des, Int32[] sizes, Int32[] bits)
-        {
-            var ico = new IconFile();
-            foreach (var bit in bits)
-            {
-                foreach (var item in sizes)
-                {
-                    if (bit == 8)
-                        ico.AddBmp(bmp, item, bit);
-                    else
-                        ico.AddPng(bmp, item, bit);
-                }
-            }
-            ico.Sort();
-
-            ico.Save(des);
-        }
-        #endregion
-
-        public class IconItem
-        {
-            /*
-typedef struct
-{
-    BYTE        bWidth;          // Width, in pixels, of the image
-    BYTE        bHeight;         // Height, in pixels, of the image
-    BYTE        bColorCount;     // Number of colors in image (0 if >=8bpp)
-    BYTE        bReserved;       // Reserved ( must be 0)
-    WORD        wPlanes;         // Color Planes
-    WORD        wBitCount;       // Bits per pixel
-    DWORD       dwBytesInRes;    // How many bytes in this resource?
-    DWORD       dwImageOffset;   // Where in the file is this image?
-} ICONDIRENTRY, *LPICONDIRENTRY;
-             */
-            #region 属性
-            /// <summary>图像宽度，以象素为单位。一个字节</summary>
-            public Byte Width { get; set; } = 16;
-
-            /// <summary>图像高度，以象素为单位。一个字节</summary>
-            public Byte Height { get; set; } = 16;
-
-            /// <summary>图像中的颜色数（如果是>=8bpp的位图则为0）</summary>
-            public Byte ColorCount { get; set; }
-
-            /// <summary>保留字必须是0</summary>
-            public Byte Reserved { get; set; }
-
-            /// <summary>为目标设备说明位面数，其值将总是被设为1</summary>
-            public UInt16 Planes { get; set; } = 1;
-
-            /// <summary>每象素所占位数。</summary>
-            public UInt16 BitCount { get; set; } = 32;      //8
-
-            /// <summary>字节大小。</summary>
-            public UInt32 Size { get; set; }
-
-            /// <summary>起点偏移位置。</summary>
-            public UInt32 Offset { get; set; }
-
-            /// <summary>图形数据</summary>
-            [XmlIgnore]
-            public Byte[] Data { get; set; }
-            #endregion
-
-            #region 构造
-            public IconItem() { }
-
-            public IconItem(BinaryReader reader) { Load(reader); }
-            #endregion
-
-            #region 方法
-            public IconItem Load(BinaryReader reader)
-            {
-                Width = reader.ReadByte();
-                Height = reader.ReadByte();
-                ColorCount = reader.ReadByte();
-                Reserved = reader.ReadByte();
-
-                Planes = reader.ReadUInt16();
-                BitCount = reader.ReadUInt16();
-                Size = reader.ReadUInt32();
-                Offset = reader.ReadUInt32();
-
-                var ms = reader.BaseStream;
-                var p = ms.Position;
-                ms.Position = Offset;
-                Data = reader.ReadBytes((Int32)Size);
-                ms.Position = p;
-
-                return this;
-            }
-
-            public IconItem Save(BinaryWriter writer)
-            {
-                writer.Write(Width);
-                writer.Write(Height);
-                writer.Write(ColorCount);
-                writer.Write(Reserved);
-
-                writer.Write(Planes);
-                writer.Write(BitCount);
-                writer.Write(Size);
-                writer.Write(Offset);
-
-                return this;
-            }
-            #endregion
-        }
-
-        private class BitmapInfo
-        {
-            #region 属性
-            public IList<Color> ColorTable = new List<Color>();
-
-            /// <summary>
-            /// 占4位，位图信息头(Bitmap Info Header)的长度,一般为$28  
-            /// </summary>
-            public UInt32 InfoSize { get; set; } = 40;
-
-            /// <summary>
-            /// 占4位，位图的宽度，以象素为单位
-            /// </summary>
-            public UInt32 Width { get; set; }
-
-            /// <summary>
-            /// 占4位，位图的高度，以象素为单位  
-            /// </summary>
-            public UInt32 Height { get; set; }
-
-            /// <summary>
-            /// 占2位，位图的位面数（注：该值将总是1）  
-            /// </summary>
-            public UInt16 Planes { get; set; } = 1;
-
-            /// <summary>
-            /// 占2位，每个象素的位数，设为32(32Bit位图)  
-            /// </summary>
-            public UInt16 BitCount { get; set; }
-
-            /// <summary>
-            /// 占4位，压缩说明，设为0(不压缩)   
-            /// </summary>
-            public UInt32 Compression { get; set; }
-
-            /// <summary>
-            /// 占4位，用字节数表示的位图数据的大小。该数必须是4的倍数  
-            /// </summary>
-            public UInt32 SizeImage { get; set; }
-
-            /// <summary>
-            ///  占4位，用象素/米表示的水平分辨率 
-            /// </summary>
-            public UInt32 XPelsPerMeter { get; set; }
-
-            /// <summary>
-            /// 占4位，用象素/米表示的垂直分辨率  
-            /// </summary>
-            public UInt32 YPelsPerMeter { get; set; }
-
-            /// <summary>
-            /// 占4位，位图使用的颜色数  
-            /// </summary>
-            public UInt32 ClrUsed { get; set; }
-
-            /// <summary>占4位，指定重要的颜色数(到此处刚好40个字节，$28)</summary>
-            public UInt32 ClrImportant { get; set; }
-
-            /// <summary>图形</summary>
-            public Bitmap IconBmp { get; set; }
-            #endregion
-
-            public BitmapInfo(Byte[] data)
-            {
-                var reader = new BinaryReader(new MemoryStream(data));
-
-                #region 基本数据
-                InfoSize = reader.ReadUInt32();
-                if (InfoSize != 40) return;
-
-                Width = reader.ReadUInt32();
-                Height = reader.ReadUInt32();
-                Planes = reader.ReadUInt16();
-                BitCount = reader.ReadUInt16();
-                Compression = reader.ReadUInt32();
-                SizeImage = reader.ReadUInt32();
-                XPelsPerMeter = reader.ReadUInt32();
-                YPelsPerMeter = reader.ReadUInt32();
-                ClrUsed = reader.ReadUInt32();
-                ClrImportant = reader.ReadUInt32();
-                #endregion
-
-                var count = RgbCount();
-                if (count == -1) return;
-
-                for (var i = 0; i != count; i++)
-                {
-                    var Blue = reader.ReadByte();
-                    var Green = reader.ReadByte();
-                    var Red = reader.ReadByte();
-                    var Reserved = reader.ReadByte();
-                    ColorTable.Add(Color.FromArgb(Reserved, Red, Green, Blue));
-                }
-
-                var size = (Int32)(BitCount * Width) / 8;       // 象素的大小*象素数 /字节数              
-                if ((Double)size < BitCount * Width / 8) size++;       //如果是 宽19*4（16色）/8 =9.5 就+1;
-                if (size < 4) size = 4;
-                var WidthByte = new Byte[size];
-
-                IconBmp = new Bitmap((Int32)Width, (Int32)(Height / 2));
-                for (var i = (Int32)(Height / 2); i != 0; i--)
-                {
-                    //for (Int32 z = 0; z != Size; z++)
-                    //{
-                    //    WidthByte[z] = data[idx + z];
-                    //}
-                    //idx += Size;
-                    WidthByte = reader.ReadBytes(size);
-                    IconSet(IconBmp, i - 1, WidthByte);
-                }
-
-                //取掩码
-                var MaskSize = (Int32)(Width / 8);
-                if ((Double)MaskSize < Width / 8) MaskSize++;       //如果是 宽19*4（16色）/8 =9.5 就+1;
-                if (MaskSize < 4) MaskSize = 4;
-                var MashByte = new Byte[MaskSize];
-                for (var i = (Int32)(Height / 2); i != 0; i--)
-                {
-                    //for (Int32 z = 0; z != MaskSize; z++)
-                    //{
-                    //    MashByte[z] = data[idx + z];
-                    //}
-                    //idx += MaskSize;
-                    MashByte = reader.ReadBytes(MaskSize);
-                    IconMask(IconBmp, i - 1, MashByte);
-                }
-            }
-
-            private Int32 RgbCount()
-            {
-                switch (BitCount)
-                {
-                    case 1:
-                        return 2;
-                    case 4:
-                        return 16;
-                    case 8:
-                        return 256;
-                    case 24:
-                        return 0;
-                    case 32:
-                        return 0;
-                    default:
-                        return -1;
-                }
-            }
-
-            private void IconSet(Bitmap IconImage, Int32 RowIndex, Byte[] ImageByte)
-            {
-                var idx = 0;
-                switch (BitCount)
-                {
-                    case 1:
-                        #region 一次读8位 绘制8个点
-                        for (var i = 0; i != ImageByte.Length; i++)
-                        {
-                            var MyArray = new BitArray(new Byte[] { ImageByte[i] });
-
-                            if (idx >= IconImage.Width) return;
-                            IconImage.SetPixel(idx, RowIndex, ColorTable[GetBitNumb(MyArray[7])]);
-                            idx++;
-                            if (idx >= IconImage.Width) return;
-                            IconImage.SetPixel(idx, RowIndex, ColorTable[GetBitNumb(MyArray[6])]);
-                            idx++;
-                            if (idx >= IconImage.Width) return;
-                            IconImage.SetPixel(idx, RowIndex, ColorTable[GetBitNumb(MyArray[5])]);
-                            idx++;
-                            if (idx >= IconImage.Width) return;
-                            IconImage.SetPixel(idx, RowIndex, ColorTable[GetBitNumb(MyArray[4])]);
-                            idx++;
-                            if (idx >= IconImage.Width) return;
-                            IconImage.SetPixel(idx, RowIndex, ColorTable[GetBitNumb(MyArray[3])]);
-                            idx++;
-                            if (idx >= IconImage.Width) return;
-                            IconImage.SetPixel(idx, RowIndex, ColorTable[GetBitNumb(MyArray[2])]);
-                            idx++;
-                            if (idx >= IconImage.Width) return;
-                            IconImage.SetPixel(idx, RowIndex, ColorTable[GetBitNumb(MyArray[1])]);
-                            idx++;
-                            if (idx >= IconImage.Width) return;
-                            IconImage.SetPixel(idx, RowIndex, ColorTable[GetBitNumb(MyArray[0])]);
-                            idx++;
-                        }
-                        #endregion
-                        break;
-                    case 4:
-                        #region 一次读8位 绘制2个点
-                        for (var i = 0; i != ImageByte.Length; i++)
-                        {
-                            var High = ImageByte[i] >> 4;  //取高4位
-                            var Low = ImageByte[i] - (High << 4); //取低4位
-                            if (idx >= IconImage.Width) return;
-                            IconImage.SetPixel(idx, RowIndex, ColorTable[High]);
-                            idx++;
-                            if (idx >= IconImage.Width) return;
-                            IconImage.SetPixel(idx, RowIndex, ColorTable[Low]);
-                            idx++;
-                        }
-                        #endregion
-                        break;
-                    case 8:
-                        #region 一次读8位 绘制一个点
-                        for (var i = 0; i != ImageByte.Length; i++)
-                        {
-                            if (idx >= IconImage.Width) return;
-                            IconImage.SetPixel(idx, RowIndex, ColorTable[ImageByte[i]]);
-                            idx++;
-                        }
-                        #endregion
-                        break;
-                    case 24:
-                        #region 一次读24位 绘制一个点
-                        for (var i = 0; i != ImageByte.Length / 3; i++)
-                        {
-                            if (i >= IconImage.Width) return;
-                            IconImage.SetPixel(i, RowIndex, Color.FromArgb(ImageByte[idx + 2], ImageByte[idx + 1], ImageByte[idx]));
-                            idx += 3;
-                        }
-                        #endregion
-                        break;
-                    case 32:
-                        #region 一次读32位 绘制一个点
-                        for (var i = 0; i != ImageByte.Length / 4; i++)
-                        {
-                            if (i >= IconImage.Width) return;
-
-                            IconImage.SetPixel(i, RowIndex, Color.FromArgb(ImageByte[idx + 2], ImageByte[idx + 1], ImageByte[idx]));
-                            idx += 4;
-                        }
-                        #endregion
-                        break;
-                    default:
-                        break;
-                }
-            }
-
-            private void IconMask(Bitmap IconImage, Int32 RowIndex, Byte[] MaskByte)
-            {
-                var Set = new BitArray(MaskByte);
-                var idx = 0;
-                for (var i = Set.Count; i != 0; i--)
-                {
-                    if (idx >= IconImage.Width) return;
-
-                    var SetColor = IconImage.GetPixel(idx, RowIndex);
-                    if (!Set[i - 1]) IconImage.SetPixel(idx, RowIndex, Color.FromArgb(255, SetColor.R, SetColor.G, SetColor.B));
-                    idx++;
-                }
-            }
-
-            private Int32 GetBitNumb(Boolean BitArray) { return BitArray ? 1 : 0; }
-        }
-    }
-}
\ No newline at end of file
diff --git a/XCoder/XICO/leaf.png b/XCoder/XICO/leaf.png
deleted file mode 100644
index cb15e89a36..0000000000
Binary files a/XCoder/XICO/leaf.png and /dev/null differ
diff --git a/XCoder/XMessage/FrmMain.cs b/XCoder/XMessage/FrmMain.cs
deleted file mode 100644
index 8f16d87d5d..0000000000
--- a/XCoder/XMessage/FrmMain.cs
+++ /dev/null
@@ -1,439 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using NewLife.Log;
-using NewLife.Messaging;
-using NewLife.Net;
-using NewLife.Reflection;
-using NewLife.Threading;
-using NewLife.Windows;
-using XCoder;
-#if !NET4
-using TaskEx = System.Threading.Tasks.Task;
-#endif
-
-namespace XMessage
-{
-    [DisplayName("消息调试工具")]
-    public partial class FrmMain : Form, IXForm
-    {
-        NetServer _Server;
-        ISocketClient _Client;
-        IPacket _Packet;
-
-        static Task<Type[]> _packets;
-        //static Task<Type[]> _factorys;
-
-        /// <summary>业务日志输出</summary>
-        ILog BizLog;
-
-        #region 窗体
-        static FrmMain()
-        {
-            //_packets = TaskEx.Run(() => typeof(IPacket).GetAllSubclasses(true).ToArray());
-            _packets = TaskEx.Run(() => typeof(IPacketFactory).GetAllSubclasses(true).ToArray());
-        }
-
-        public FrmMain()
-        {
-            InitializeComponent();
-
-            Icon = IcoHelper.GetIcon("消息");
-        }
-
-        private void FrmMain_Load(Object sender, EventArgs e)
-        {
-            var log = TextFileLog.Create(null, "Message_{0:yyyy_MM_dd}.log");
-            BizLog = txtReceive.Combine(log);
-            txtReceive.UseWinFormControl();
-
-            txtReceive.SetDefaultStyle(12);
-            txtSend.SetDefaultStyle(12);
-            numMutilSend.SetDefaultStyle(12);
-
-            gbReceive.Tag = gbReceive.Text;
-            gbSend.Tag = gbSend.Text;
-
-            var cfg = MessageConfig.Current;
-            cbMode.SelectedItem = cbMode.Items[0] + "";
-            if (!cfg.Address.IsNullOrEmpty())
-            {
-                //cbAddr.DropDownStyle = ComboBoxStyle.DropDownList;
-                cbAddr.DataSource = cfg.Address.Split(";");
-            }
-
-            // 加载封包协议
-            foreach (var item in _packets.Result)
-            {
-                cbPacket.Items.Add(item.GetDisplayName() ?? item.Name);
-            }
-            cbPacket.SelectedIndex = 0;
-
-            // 加载保存的颜色
-            UIConfig.Apply(txtReceive);
-
-            LoadConfig();
-
-            // 语音识别
-            Task.Factory.StartNew(() =>
-            {
-                var sp = SpeechRecognition.Current;
-                if (!sp.Enable) return;
-
-                sp.Register("打开", () => this.Invoke(Connect))
-                .Register("关闭", () => this.Invoke(Disconnect))
-                .Register("退出", () => Application.Exit())
-                .Register("发送", () => this.Invoke(() => btnSend_Click(null, null)));
-
-                BizLog.Info("语音识别前缀：{0} 可用命令：{1}", sp.Name, sp.GetAllKeys().Join());
-            });
-        }
-        #endregion
-
-        #region 加载/保存 配置
-        void LoadConfig()
-        {
-            var cfg = MessageConfig.Current;
-            mi显示应用日志.Checked = cfg.ShowLog;
-            mi显示网络日志.Checked = cfg.ShowSocketLog;
-            mi显示接收字符串.Checked = cfg.ShowReceiveString;
-            mi显示发送数据.Checked = cfg.ShowSend;
-            mi显示接收数据.Checked = cfg.ShowReceive;
-            mi显示统计信息.Checked = cfg.ShowStat;
-            miHexSend.Checked = cfg.HexSend;
-
-            txtSend.Text = cfg.SendContent;
-            numMutilSend.Value = cfg.SendTimes;
-            numSleep.Value = cfg.SendSleep;
-            numThreads.Value = cfg.SendUsers;
-            mi日志着色.Checked = cfg.ColorLog;
-        }
-
-        void SaveConfig()
-        {
-            var cfg = MessageConfig.Current;
-            cfg.ShowLog = mi显示应用日志.Checked;
-            cfg.ShowSocketLog = mi显示网络日志.Checked;
-            cfg.ShowReceiveString = mi显示接收字符串.Checked;
-            cfg.ShowSend = mi显示发送数据.Checked;
-            cfg.ShowReceive = mi显示接收数据.Checked;
-            cfg.ShowStat = mi显示统计信息.Checked;
-            cfg.HexSend = miHexSend.Checked;
-
-            cfg.SendContent = txtSend.Text;
-            cfg.SendTimes = (Int32)numMutilSend.Value;
-            cfg.SendSleep = (Int32)numSleep.Value;
-            cfg.SendUsers = (Int32)numThreads.Value;
-            cfg.ColorLog = mi日志着色.Checked;
-
-            cfg.Save();
-        }
-        #endregion
-
-        #region 收发数据
-        void Connect()
-        {
-            _Server = null;
-            _Client = null;
-
-            var uri = new NetUri(cbAddr.Text);
-            // 网络封包
-            var idx = cbPacket.SelectedIndex;
-            var fact = idx < 0 ? null : _packets.Result[idx].CreateInstance() as IPacketFactory;
-            _Packet = fact.Create();
-
-            var cfg = MessageConfig.Current;
-            var log = BizLog;
-
-            switch (cbMode.Text)
-            {
-                case "服务端":
-                    var svr = new NetServer();
-                    svr.Log = cfg.ShowLog ? log : Logger.Null;
-                    svr.SocketLog = cfg.ShowSocketLog ? log : Logger.Null;
-                    svr.Port = uri.Port;
-                    if (uri.IsTcp || uri.IsUdp) svr.ProtocolType = uri.Type;
-                    svr.MessageReceived += OnReceived;
-
-                    svr.LogSend = cfg.ShowSend;
-                    svr.LogReceive = cfg.ShowReceive;
-
-                    // 加大会话超时时间到1天
-                    //svr.SessionTimeout = 24 * 3600;
-
-                    svr.SessionPacket = fact;
-
-                    svr.Start();
-
-                    "正在监听{0}".F(svr.Port).SpeechTip();
-
-                    if (uri.Port == 0) uri.Port = svr.Port;
-                    _Server = svr;
-                    break;
-                case "客户端":
-                    var client = uri.CreateRemote();
-                    client.Log = cfg.ShowLog ? log : Logger.Null;
-                    client.MessageReceived += OnReceived;
-
-                    client.LogSend = cfg.ShowSend;
-                    client.LogReceive = cfg.ShowReceive;
-
-                    client.Packet = _Packet;
-
-                    client.Open();
-
-                    "已连接服务器".SpeechTip();
-
-                    if (uri.Port == 0) uri.Port = client.Port;
-                    _Client = client;
-                    break;
-                default:
-                    return;
-            }
-
-            pnlSetting.Enabled = false;
-            btnConnect.Text = "关闭";
-
-            // 添加地址
-            var addr = uri.ToString();
-            var list = cfg.Address.Split(";").ToList();
-            if (!list.Contains(addr))
-            {
-                list.Insert(0, addr);
-                cfg.Address = list.Join(";");
-            }
-
-            cfg.Save();
-
-            _timer = new TimerX(ShowStat, null, 5000, 5000);
-        }
-
-        void Disconnect()
-        {
-            if (_Client != null)
-            {
-                _Client.Dispose();
-                _Client = null;
-
-                "关闭连接".SpeechTip();
-            }
-            if (_Server != null)
-            {
-                "停止监听{0}".F(_Server.Port).SpeechTip();
-                _Server.Dispose();
-                _Server = null;
-            }
-            if (_timer != null)
-            {
-                _timer.Dispose();
-                _timer = null;
-            }
-
-            pnlSetting.Enabled = true;
-            btnConnect.Text = "打开";
-        }
-
-        TimerX _timer;
-        String _lastStat;
-        void ShowStat(Object state)
-        {
-            if (!MessageConfig.Current.ShowStat) return;
-
-            var msg = "";
-            if (_Client != null)
-                msg = _Client.GetStat();
-            else if (_Server != null)
-                msg = _Server.GetStat();
-
-            if (!msg.IsNullOrEmpty() && msg != _lastStat)
-            {
-                _lastStat = msg;
-                BizLog.Info(msg);
-            }
-        }
-
-        private void btnConnect_Click(Object sender, EventArgs e)
-        {
-            SaveConfig();
-
-            var btn = sender as Button;
-            if (btn.Text == "打开")
-                Connect();
-            else
-                Disconnect();
-        }
-
-        void OnReceived(Object sender, MessageEventArgs e)
-        {
-            var session = sender as ISocketSession;
-            if (session == null)
-            {
-                var ns = sender as INetSession;
-                if (ns == null) return;
-                session = ns.Session;
-            }
-
-            if (MessageConfig.Current.ShowReceiveString)
-            {
-                var line = e.Message.Payload.ToStr();
-                BizLog.Info(line);
-            }
-        }
-
-        Int32 _pColor = 0;
-        Int32 BytesOfReceived = 0;
-        Int32 BytesOfSent = 0;
-        Int32 lastReceive = 0;
-        Int32 lastSend = 0;
-        private void timer1_Tick(Object sender, EventArgs e)
-        {
-            //if (!pnlSetting.Enabled)
-            {
-                var rcount = BytesOfReceived;
-                var tcount = BytesOfSent;
-                if (rcount != lastReceive)
-                {
-                    gbReceive.Text = (gbReceive.Tag + "").Replace("0", rcount + "");
-                    lastReceive = rcount;
-                }
-                if (tcount != lastSend)
-                {
-                    gbSend.Text = (gbSend.Tag + "").Replace("0", tcount + "");
-                    lastSend = tcount;
-                }
-
-                var set = MessageConfig.Current;
-                if (set.ColorLog) txtReceive.ColourDefault(_pColor);
-                _pColor = txtReceive.TextLength;
-            }
-        }
-
-        private void btnSend_Click(Object sender, EventArgs e)
-        {
-            var str = txtSend.Text;
-            if (String.IsNullOrEmpty(str))
-            {
-                MessageBox.Show("发送内容不能为空！", Text);
-                txtSend.Focus();
-                return;
-            }
-
-            // 多次发送
-            var count = (Int32)numMutilSend.Value;
-            var sleep = (Int32)numSleep.Value;
-            var ths = (Int32)numThreads.Value;
-            if (count <= 0) count = 1;
-            if (sleep <= 0) sleep = 1;
-
-            SaveConfig();
-
-            var cfg = MessageConfig.Current;
-
-            // 处理换行
-            str = str.Replace("\n", "\r\n");
-            var buf = cfg.HexSend ? str.ToHex() : str.GetBytes();
-
-            // 构造消息
-            var msg = _Packet.CreateMessage(buf);
-            //buf = msg.ToArray();
-            var pk = msg.ToPacket();
-
-            if (_Client != null)
-            {
-                if (ths <= 1)
-                {
-                    _Client.SendMulti(pk, count, sleep);
-                }
-                else
-                {
-                    Parallel.For(0, ths, n =>
-                    {
-                        var client = _Client.Remote.CreateRemote();
-                        client.StatSend = _Client.StatSend;
-                        client.StatReceive = _Client.StatReceive;
-                        client.SendMulti(pk, count, sleep);
-                    });
-                }
-            }
-            else if (_Server != null)
-            {
-                buf = pk.ToArray();
-                TaskEx.Run(async () =>
-                {
-                    for (var i = 0; i < count; i++)
-                    {
-                        var cs = await _Server.SendAllAsync(buf);
-                        BizLog.Info("已向[{0}]个客户端发送[{1}]数据", cs, buf.Length);
-                        if (sleep > 0) await TaskEx.Delay(sleep);
-                    }
-                });
-            }
-        }
-        #endregion
-
-        #region 右键菜单
-        private void mi清空_Click(Object sender, EventArgs e)
-        {
-            txtReceive.Clear();
-            BytesOfReceived = 0;
-        }
-
-        private void mi清空2_Click(Object sender, EventArgs e)
-        {
-            txtSend.Clear();
-            BytesOfSent = 0;
-        }
-
-        private void mi显示应用日志_Click(Object sender, EventArgs e)
-        {
-            var mi = sender as ToolStripMenuItem;
-            mi.Checked = !mi.Checked;
-        }
-
-        private void mi显示网络日志_Click(Object sender, EventArgs e)
-        {
-            var mi = sender as ToolStripMenuItem;
-            mi.Checked = !mi.Checked;
-        }
-
-        private void mi显示发送数据_Click(Object sender, EventArgs e)
-        {
-            var mi = sender as ToolStripMenuItem;
-            mi.Checked = !mi.Checked;
-        }
-
-        private void mi显示接收数据_Click(Object sender, EventArgs e)
-        {
-            var mi = sender as ToolStripMenuItem;
-            mi.Checked = !mi.Checked;
-        }
-
-        private void mi显示统计信息_Click(Object sender, EventArgs e)
-        {
-            var mi = sender as ToolStripMenuItem;
-            MessageConfig.Current.ShowStat = mi.Checked = !mi.Checked;
-        }
-
-        private void mi显示接收字符串_Click(Object sender, EventArgs e)
-        {
-            var mi = sender as ToolStripMenuItem;
-            MessageConfig.Current.ShowReceiveString = mi.Checked = !mi.Checked;
-        }
-
-        private void miHex发送_Click(Object sender, EventArgs e)
-        {
-            var mi = sender as ToolStripMenuItem;
-            MessageConfig.Current.HexSend = mi.Checked = !mi.Checked;
-        }
-
-        private void miCheck_Click(Object sender, EventArgs e)
-        {
-            var mi = sender as ToolStripMenuItem;
-            mi.Checked = !mi.Checked;
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/XCoder/XMessage/FrmMain.designer.cs b/XCoder/XMessage/FrmMain.designer.cs
deleted file mode 100644
index 7ca9312164..0000000000
--- a/XCoder/XMessage/FrmMain.designer.cs
+++ /dev/null
@@ -1,480 +0,0 @@
-﻿namespace XMessage
-{
-    partial class FrmMain
-    {
-        /// <summary>
-        /// 必需的设计器变量。
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// 清理所有正在使用的资源。
-        /// </summary>
-        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows 窗体设计器生成的代码
-
-        /// <summary>
-        /// 设计器支持所需的方法 - 不要
-        /// 使用代码编辑器修改此方法的内容。
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.components = new System.ComponentModel.Container();
-            this.gbReceive = new System.Windows.Forms.GroupBox();
-            this.txtReceive = new System.Windows.Forms.RichTextBox();
-            this.menuReceive = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator();
-            this.mi显示应用日志 = new System.Windows.Forms.ToolStripMenuItem();
-            this.mi显示网络日志 = new System.Windows.Forms.ToolStripMenuItem();
-            this.mi显示接收字符串 = new System.Windows.Forms.ToolStripMenuItem();
-            this.mi显示发送数据 = new System.Windows.Forms.ToolStripMenuItem();
-            this.mi显示接收数据 = new System.Windows.Forms.ToolStripMenuItem();
-            this.mi显示统计信息 = new System.Windows.Forms.ToolStripMenuItem();
-            this.menuSend = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.miHexSend = new System.Windows.Forms.ToolStripMenuItem();
-            this.mi清空2 = new System.Windows.Forms.ToolStripMenuItem();
-            this.btnConnect = new System.Windows.Forms.Button();
-            this.timer1 = new System.Windows.Forms.Timer(this.components);
-            this.fontDialog1 = new System.Windows.Forms.FontDialog();
-            this.colorDialog1 = new System.Windows.Forms.ColorDialog();
-            this.label1 = new System.Windows.Forms.Label();
-            this.lbAddr = new System.Windows.Forms.Label();
-            this.cbMode = new System.Windows.Forms.ComboBox();
-            this.cbAddr = new System.Windows.Forms.ComboBox();
-            this.pnlSetting = new System.Windows.Forms.Panel();
-            this.cbPacket = new System.Windows.Forms.ComboBox();
-            this.label3 = new System.Windows.Forms.Label();
-            this.gbSend = new System.Windows.Forms.GroupBox();
-            this.numThreads = new System.Windows.Forms.NumericUpDown();
-            this.numSleep = new System.Windows.Forms.NumericUpDown();
-            this.txtSend = new System.Windows.Forms.RichTextBox();
-            this.btnSend = new System.Windows.Forms.Button();
-            this.numMutilSend = new System.Windows.Forms.NumericUpDown();
-            this.label2 = new System.Windows.Forms.Label();
-            this.label7 = new System.Windows.Forms.Label();
-            this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
-            this.mi日志着色 = new System.Windows.Forms.ToolStripMenuItem();
-            this.gbReceive.SuspendLayout();
-            this.menuReceive.SuspendLayout();
-            this.menuSend.SuspendLayout();
-            this.pnlSetting.SuspendLayout();
-            this.gbSend.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.numThreads)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numSleep)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numMutilSend)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // gbReceive
-            // 
-            this.gbReceive.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.gbReceive.Controls.Add(this.txtReceive);
-            this.gbReceive.Location = new System.Drawing.Point(9, 43);
-            this.gbReceive.Name = "gbReceive";
-            this.gbReceive.Size = new System.Drawing.Size(652, 234);
-            this.gbReceive.TabIndex = 4;
-            this.gbReceive.TabStop = false;
-            this.gbReceive.Text = "接收区：已接收0字节";
-            // 
-            // txtReceive
-            // 
-            this.txtReceive.ContextMenuStrip = this.menuReceive;
-            this.txtReceive.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.txtReceive.HideSelection = false;
-            this.txtReceive.Location = new System.Drawing.Point(3, 17);
-            this.txtReceive.Name = "txtReceive";
-            this.txtReceive.Size = new System.Drawing.Size(646, 214);
-            this.txtReceive.TabIndex = 1;
-            this.txtReceive.Text = "";
-            // 
-            // menuReceive
-            // 
-            this.menuReceive.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolStripMenuItem1,
-            this.mi日志着色,
-            this.toolStripMenuItem3,
-            this.mi显示应用日志,
-            this.mi显示网络日志,
-            this.mi显示接收字符串,
-            this.mi显示发送数据,
-            this.mi显示接收数据,
-            this.mi显示统计信息});
-            this.menuReceive.Name = "menuSend";
-            this.menuReceive.Size = new System.Drawing.Size(161, 208);
-            // 
-            // toolStripMenuItem1
-            // 
-            this.toolStripMenuItem1.Name = "toolStripMenuItem1";
-            this.toolStripMenuItem1.Size = new System.Drawing.Size(160, 22);
-            this.toolStripMenuItem1.Text = "清空";
-            this.toolStripMenuItem1.Click += new System.EventHandler(this.mi清空_Click);
-            // 
-            // toolStripMenuItem3
-            // 
-            this.toolStripMenuItem3.Name = "toolStripMenuItem3";
-            this.toolStripMenuItem3.Size = new System.Drawing.Size(157, 6);
-            // 
-            // mi显示应用日志
-            // 
-            this.mi显示应用日志.Name = "mi显示应用日志";
-            this.mi显示应用日志.Size = new System.Drawing.Size(160, 22);
-            this.mi显示应用日志.Text = "显示应用日志";
-            this.mi显示应用日志.Click += new System.EventHandler(this.mi显示应用日志_Click);
-            // 
-            // mi显示网络日志
-            // 
-            this.mi显示网络日志.Name = "mi显示网络日志";
-            this.mi显示网络日志.Size = new System.Drawing.Size(160, 22);
-            this.mi显示网络日志.Text = "显示网络日志";
-            this.mi显示网络日志.Click += new System.EventHandler(this.mi显示网络日志_Click);
-            // 
-            // mi显示接收字符串
-            // 
-            this.mi显示接收字符串.Name = "mi显示接收字符串";
-            this.mi显示接收字符串.Size = new System.Drawing.Size(160, 22);
-            this.mi显示接收字符串.Text = "显示接收字符串";
-            this.mi显示接收字符串.Click += new System.EventHandler(this.mi显示接收字符串_Click);
-            // 
-            // mi显示发送数据
-            // 
-            this.mi显示发送数据.Name = "mi显示发送数据";
-            this.mi显示发送数据.Size = new System.Drawing.Size(160, 22);
-            this.mi显示发送数据.Text = "显示发送数据";
-            this.mi显示发送数据.Click += new System.EventHandler(this.mi显示发送数据_Click);
-            // 
-            // mi显示接收数据
-            // 
-            this.mi显示接收数据.Name = "mi显示接收数据";
-            this.mi显示接收数据.Size = new System.Drawing.Size(160, 22);
-            this.mi显示接收数据.Text = "显示接收数据";
-            this.mi显示接收数据.Click += new System.EventHandler(this.mi显示接收数据_Click);
-            // 
-            // mi显示统计信息
-            // 
-            this.mi显示统计信息.Name = "mi显示统计信息";
-            this.mi显示统计信息.Size = new System.Drawing.Size(160, 22);
-            this.mi显示统计信息.Text = "显示统计信息";
-            this.mi显示统计信息.Click += new System.EventHandler(this.mi显示统计信息_Click);
-            // 
-            // menuSend
-            // 
-            this.menuSend.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.miHexSend,
-            this.mi清空2});
-            this.menuSend.Name = "menuSend";
-            this.menuSend.Size = new System.Drawing.Size(123, 48);
-            // 
-            // miHexSend
-            // 
-            this.miHexSend.Name = "miHexSend";
-            this.miHexSend.Size = new System.Drawing.Size(122, 22);
-            this.miHexSend.Text = "Hex发送";
-            this.miHexSend.Click += new System.EventHandler(this.miHex发送_Click);
-            // 
-            // mi清空2
-            // 
-            this.mi清空2.Name = "mi清空2";
-            this.mi清空2.Size = new System.Drawing.Size(122, 22);
-            this.mi清空2.Text = "清空";
-            this.mi清空2.Click += new System.EventHandler(this.mi清空2_Click);
-            // 
-            // btnConnect
-            // 
-            this.btnConnect.Location = new System.Drawing.Point(587, 9);
-            this.btnConnect.Name = "btnConnect";
-            this.btnConnect.Size = new System.Drawing.Size(67, 29);
-            this.btnConnect.TabIndex = 3;
-            this.btnConnect.Text = "打开";
-            this.btnConnect.UseVisualStyleBackColor = true;
-            this.btnConnect.Click += new System.EventHandler(this.btnConnect_Click);
-            // 
-            // timer1
-            // 
-            this.timer1.Enabled = true;
-            this.timer1.Interval = 300;
-            this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(7, 7);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(41, 12);
-            this.label1.TabIndex = 6;
-            this.label1.Text = "模式：";
-            // 
-            // lbAddr
-            // 
-            this.lbAddr.AutoSize = true;
-            this.lbAddr.Location = new System.Drawing.Point(147, 7);
-            this.lbAddr.Name = "lbAddr";
-            this.lbAddr.Size = new System.Drawing.Size(41, 12);
-            this.lbAddr.TabIndex = 7;
-            this.lbAddr.Text = "地址：";
-            // 
-            // cbMode
-            // 
-            this.cbMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cbMode.FormattingEnabled = true;
-            this.cbMode.Items.AddRange(new object[] {
-            "服务端",
-            "客户端"});
-            this.cbMode.Location = new System.Drawing.Point(48, 3);
-            this.cbMode.Name = "cbMode";
-            this.cbMode.Size = new System.Drawing.Size(93, 20);
-            this.cbMode.TabIndex = 9;
-            // 
-            // cbAddr
-            // 
-            this.cbAddr.FormattingEnabled = true;
-            this.cbAddr.Location = new System.Drawing.Point(184, 3);
-            this.cbAddr.Name = "cbAddr";
-            this.cbAddr.Size = new System.Drawing.Size(149, 20);
-            this.cbAddr.TabIndex = 10;
-            // 
-            // pnlSetting
-            // 
-            this.pnlSetting.Controls.Add(this.cbPacket);
-            this.pnlSetting.Controls.Add(this.label3);
-            this.pnlSetting.Controls.Add(this.cbAddr);
-            this.pnlSetting.Controls.Add(this.label1);
-            this.pnlSetting.Controls.Add(this.lbAddr);
-            this.pnlSetting.Controls.Add(this.cbMode);
-            this.pnlSetting.Location = new System.Drawing.Point(9, 8);
-            this.pnlSetting.Name = "pnlSetting";
-            this.pnlSetting.Size = new System.Drawing.Size(471, 31);
-            this.pnlSetting.TabIndex = 13;
-            // 
-            // cbPacket
-            // 
-            this.cbPacket.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cbPacket.FormattingEnabled = true;
-            this.cbPacket.Location = new System.Drawing.Point(375, 3);
-            this.cbPacket.Name = "cbPacket";
-            this.cbPacket.Size = new System.Drawing.Size(93, 20);
-            this.cbPacket.TabIndex = 12;
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(339, 7);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(41, 12);
-            this.label3.TabIndex = 11;
-            this.label3.Text = "封包：";
-            // 
-            // gbSend
-            // 
-            this.gbSend.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.gbSend.Controls.Add(this.numThreads);
-            this.gbSend.Controls.Add(this.numSleep);
-            this.gbSend.Controls.Add(this.txtSend);
-            this.gbSend.Controls.Add(this.btnSend);
-            this.gbSend.Controls.Add(this.numMutilSend);
-            this.gbSend.Controls.Add(this.label2);
-            this.gbSend.Controls.Add(this.label7);
-            this.gbSend.Location = new System.Drawing.Point(9, 283);
-            this.gbSend.Name = "gbSend";
-            this.gbSend.Size = new System.Drawing.Size(652, 84);
-            this.gbSend.TabIndex = 15;
-            this.gbSend.TabStop = false;
-            this.gbSend.Text = "发送区：已发送0字节";
-            // 
-            // numThreads
-            // 
-            this.numThreads.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.numThreads.Location = new System.Drawing.Point(593, 22);
-            this.numThreads.Maximum = new decimal(new int[] {
-            100000,
-            0,
-            0,
-            0});
-            this.numThreads.Minimum = new decimal(new int[] {
-            1,
-            0,
-            0,
-            0});
-            this.numThreads.Name = "numThreads";
-            this.numThreads.Size = new System.Drawing.Size(52, 21);
-            this.numThreads.TabIndex = 18;
-            this.numThreads.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-            this.toolTip1.SetToolTip(this.numThreads, "模拟多客户端发送，用于压力测试！");
-            this.numThreads.Value = new decimal(new int[] {
-            1,
-            0,
-            0,
-            0});
-            // 
-            // numSleep
-            // 
-            this.numSleep.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.numSleep.Location = new System.Drawing.Point(538, 54);
-            this.numSleep.Maximum = new decimal(new int[] {
-            1000000,
-            0,
-            0,
-            0});
-            this.numSleep.Name = "numSleep";
-            this.numSleep.Size = new System.Drawing.Size(52, 21);
-            this.numSleep.TabIndex = 16;
-            this.numSleep.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-            this.numSleep.Value = new decimal(new int[] {
-            1000,
-            0,
-            0,
-            0});
-            // 
-            // txtSend
-            // 
-            this.txtSend.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtSend.ContextMenuStrip = this.menuSend;
-            this.txtSend.HideSelection = false;
-            this.txtSend.Location = new System.Drawing.Point(0, 19);
-            this.txtSend.Name = "txtSend";
-            this.txtSend.Size = new System.Drawing.Size(497, 59);
-            this.txtSend.TabIndex = 2;
-            this.txtSend.Text = "";
-            // 
-            // btnSend
-            // 
-            this.btnSend.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnSend.Location = new System.Drawing.Point(596, 49);
-            this.btnSend.Name = "btnSend";
-            this.btnSend.Size = new System.Drawing.Size(50, 30);
-            this.btnSend.TabIndex = 1;
-            this.btnSend.Text = "发送";
-            this.btnSend.UseVisualStyleBackColor = true;
-            this.btnSend.Click += new System.EventHandler(this.btnSend_Click);
-            // 
-            // numMutilSend
-            // 
-            this.numMutilSend.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.numMutilSend.Location = new System.Drawing.Point(538, 22);
-            this.numMutilSend.Maximum = new decimal(new int[] {
-            10000,
-            0,
-            0,
-            0});
-            this.numMutilSend.Minimum = new decimal(new int[] {
-            1,
-            0,
-            0,
-            0});
-            this.numMutilSend.Name = "numMutilSend";
-            this.numMutilSend.Size = new System.Drawing.Size(52, 21);
-            this.numMutilSend.TabIndex = 14;
-            this.numMutilSend.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-            this.numMutilSend.Value = new decimal(new int[] {
-            1,
-            0,
-            0,
-            0});
-            // 
-            // label2
-            // 
-            this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(503, 58);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(41, 12);
-            this.label2.TabIndex = 17;
-            this.label2.Text = "间隔：";
-            // 
-            // label7
-            // 
-            this.label7.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(503, 26);
-            this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(41, 12);
-            this.label7.TabIndex = 15;
-            this.label7.Text = "次数：";
-            // 
-            // mi日志着色
-            // 
-            this.mi日志着色.Name = "mi日志着色";
-            this.mi日志着色.Size = new System.Drawing.Size(160, 22);
-            this.mi日志着色.Text = "日志着色";
-            this.mi日志着色.Click += new System.EventHandler(this.miCheck_Click);
-            // 
-            // FrmMain
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(667, 379);
-            this.Controls.Add(this.gbSend);
-            this.Controls.Add(this.pnlSetting);
-            this.Controls.Add(this.btnConnect);
-            this.Controls.Add(this.gbReceive);
-            this.Name = "FrmMain";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "网络调试";
-            this.Load += new System.EventHandler(this.FrmMain_Load);
-            this.gbReceive.ResumeLayout(false);
-            this.menuReceive.ResumeLayout(false);
-            this.menuSend.ResumeLayout(false);
-            this.pnlSetting.ResumeLayout(false);
-            this.pnlSetting.PerformLayout();
-            this.gbSend.ResumeLayout(false);
-            this.gbSend.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.numThreads)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numSleep)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numMutilSend)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.GroupBox gbReceive;
-        private System.Windows.Forms.Button btnConnect;
-        private System.Windows.Forms.Timer timer1;
-        private System.Windows.Forms.ContextMenuStrip menuSend;
-        private System.Windows.Forms.ToolStripMenuItem mi清空2;
-        private System.Windows.Forms.RichTextBox txtReceive;
-        private System.Windows.Forms.FontDialog fontDialog1;
-        private System.Windows.Forms.ColorDialog colorDialog1;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Label lbAddr;
-        private System.Windows.Forms.ComboBox cbMode;
-        private System.Windows.Forms.ComboBox cbAddr;
-        private System.Windows.Forms.Panel pnlSetting;
-        private System.Windows.Forms.ContextMenuStrip menuReceive;
-        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1;
-        private System.Windows.Forms.ToolStripSeparator toolStripMenuItem3;
-        private System.Windows.Forms.GroupBox gbSend;
-        private System.Windows.Forms.NumericUpDown numSleep;
-        private System.Windows.Forms.RichTextBox txtSend;
-        private System.Windows.Forms.Button btnSend;
-        private System.Windows.Forms.NumericUpDown numMutilSend;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.Label label7;
-        private System.Windows.Forms.ToolStripMenuItem mi显示发送数据;
-        private System.Windows.Forms.ToolStripMenuItem mi显示接收数据;
-        private System.Windows.Forms.ToolStripMenuItem mi显示统计信息;
-        private System.Windows.Forms.NumericUpDown numThreads;
-        private System.Windows.Forms.ToolStripMenuItem mi显示接收字符串;
-        private System.Windows.Forms.ToolStripMenuItem mi显示应用日志;
-        private System.Windows.Forms.ToolStripMenuItem mi显示网络日志;
-        private System.Windows.Forms.ToolTip toolTip1;
-        private System.Windows.Forms.ToolStripMenuItem miHexSend;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.ComboBox cbPacket;
-        private System.Windows.Forms.ToolStripMenuItem mi日志着色;
-    }
-}
-
diff --git a/XCoder/XMessage/FrmMain.resx b/XCoder/XMessage/FrmMain.resx
deleted file mode 100644
index 48a6d455e1..0000000000
--- a/XCoder/XMessage/FrmMain.resx
+++ /dev/null
@@ -1,141 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="menuReceive.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>104, 13</value>
-  </metadata>
-  <metadata name="menuSend.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>237, 17</value>
-  </metadata>
-  <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="fontDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>352, 17</value>
-  </metadata>
-  <metadata name="colorDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>474, 17</value>
-  </metadata>
-  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>601, 17</value>
-  </metadata>
-  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>601, 17</value>
-  </metadata>
-</root>
\ No newline at end of file
diff --git a/XCoder/XMessage/MessageConfig.cs b/XCoder/XMessage/MessageConfig.cs
deleted file mode 100644
index f83b1cb8a6..0000000000
--- a/XCoder/XMessage/MessageConfig.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-﻿using System;
-using System.ComponentModel;
-using System.Text;
-using System.Xml.Serialization;
-using NewLife.Xml;
-
-namespace XMessage
-{
-    /// <summary>网络口配置</summary>
-    [XmlConfigFile("Config\\Message.config")]
-    public class MessageConfig : XmlConfig<MessageConfig>
-    {
-        /// <summary>地址</summary>
-        [Description("地址")]
-        public String Address { get; set; } = "";
-
-        /// <summary>文本编码</summary>
-        [XmlIgnore]
-        public Encoding Encoding { get; set; } = Encoding.UTF8;
-
-        /// <summary>编码</summary>
-        [Description("编码 gb2312/us-ascii/utf-8")]
-        public String WebEncoding { get { return Encoding?.WebName; } set { Encoding = Encoding.GetEncoding(value); } }
-
-        /// <summary>十六进制显示</summary>
-        [Description("十六进制显示")]
-        public Boolean HexShow { get; set; }
-
-        /// <summary>十六进制发送</summary>
-        [Description("十六进制发送")]
-        public Boolean HexSend { get; set; }
-
-        /// <summary>发送内容</summary>
-        [Description("发送内容")]
-        public String SendContent { get; set; } = "新生命开发团队，学无先后达者为师";
-
-        /// <summary>发送次数</summary>
-        [Description("发送次数")]
-        public Int32 SendTimes { get; set; } = 1;
-
-        /// <summary>发送间隔。毫秒</summary>
-        [Description("发送间隔。毫秒")]
-        public Int32 SendSleep { get; set; } = 1000;
-
-        /// <summary>发送用户数</summary>
-        [Description("发送用户数")]
-        public Int32 SendUsers { get; set; } = 1;
-
-        /// <summary>显示应用日志</summary>
-        [Description("显示应用日志")]
-        public Boolean ShowLog { get; set; } = true;
-
-        /// <summary>显示网络日志</summary>
-        [Description("显示网络日志")]
-        public Boolean ShowSocketLog { get; set; } = true;
-
-        /// <summary>显示接收字符串</summary>
-        [Description("显示接收字符串")]
-        public Boolean ShowReceiveString { get; set; } = true;
-
-        /// <summary>显示发送数据</summary>
-        [Description("显示发送数据")]
-        public Boolean ShowSend { get; set; } = true;
-
-        /// <summary>显示接收数据</summary>
-        [Description("显示接收数据")]
-        public Boolean ShowReceive { get; set; } = true;
-
-        /// <summary>显示统计信息</summary>
-        [Description("显示统计信息")]
-        public Boolean ShowStat { get; set; } = true;
-
-        /// <summary>日志着色</summary>
-        [Description("日志着色")]
-        public Boolean ColorLog { get; set; } = true;
-
-        public MessageConfig()
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/XCoder/XNet/FrmMain.cs b/XCoder/XNet/FrmMain.cs
deleted file mode 100644
index ff3253467f..0000000000
--- a/XCoder/XNet/FrmMain.cs
+++ /dev/null
@@ -1,581 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Linq;
-using System.Net;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using NewLife;
-using NewLife.Data;
-using NewLife.Log;
-using NewLife.Net;
-using NewLife.Reflection;
-using NewLife.Threading;
-using NewLife.Windows;
-using XCoder;
-#if !NET4
-using TaskEx = System.Threading.Tasks.Task;
-#endif
-
-namespace XNet
-{
-    [DisplayName("网络调试工具")]
-    public partial class FrmMain : Form, IXForm
-    {
-        NetServer _Server;
-        ISocketClient _Client;
-        static Task<Dictionary<String, Type>> _task;
-
-        /// <summary>业务日志输出</summary>
-        ILog BizLog;
-
-        #region 窗体
-        static FrmMain()
-        {
-            _task = Task.Factory.StartNew(() => GetNetServers());
-        }
-
-        public FrmMain()
-        {
-            InitializeComponent();
-
-            // 动态调节宽度高度，兼容高DPI
-            this.FixDpi();
-
-            Icon = IcoHelper.GetIcon("网络");
-        }
-
-        private void FrmMain_Load(Object sender, EventArgs e)
-        {
-            var log = TextFileLog.Create(null, "Net_{0:yyyy_MM_dd}.log");
-            BizLog = txtReceive.Combine(log);
-            txtReceive.UseWinFormControl();
-
-            txtReceive.SetDefaultStyle(12);
-            txtSend.SetDefaultStyle(12);
-            numMutilSend.SetDefaultStyle(12);
-
-            gbReceive.Tag = gbReceive.Text;
-            gbSend.Tag = gbSend.Text;
-
-            _task.ContinueWith(t =>
-            {
-                var dic = EnumHelper.GetDescriptions<WorkModes>();
-                var list = dic.Select(kv => kv.Value).ToList();
-                //var ds = dic.ToDictionary(s => s.Value, s => s.Value);
-                foreach (var item in t.Result)
-                {
-                    list.Add(item.Key);
-                }
-                this.Invoke(() =>
-                {
-                    cbMode.DataSource = list;
-
-                    var cfg = NetConfig.Current;
-                    if (cfg.Mode > 0 && dic.ContainsKey((WorkModes)cfg.Mode))
-                        cbMode.SelectedItem = dic[(WorkModes)cfg.Mode];
-                    else
-                        cbMode.SelectedIndex = 0;
-                });
-            });
-
-            // 加载保存的颜色
-            UIConfig.Apply(txtReceive);
-
-            LoadConfig();
-
-            // 语音识别
-            Task.Factory.StartNew(() =>
-            {
-                var sp = SpeechRecognition.Current;
-                if (!sp.Enable) return;
-
-                sp.Register("打开", () => this.Invoke(Connect))
-                .Register("关闭", () => this.Invoke(Disconnect))
-                .Register("退出", () => Application.Exit())
-                .Register("发送", () => this.Invoke(() => btnSend_Click(null, null)));
-
-                BizLog.Info("语音识别前缀：{0} 可用命令：{1}", sp.Name, sp.GetAllKeys().Join());
-            });
-        }
-        #endregion
-
-        #region 加载/保存 配置
-        void LoadConfig()
-        {
-            var cfg = NetConfig.Current;
-            mi显示应用日志.Checked = cfg.ShowLog;
-            mi显示网络日志.Checked = cfg.ShowSocketLog;
-            mi显示接收字符串.Checked = cfg.ShowReceiveString;
-            mi显示发送数据.Checked = cfg.ShowSend;
-            mi显示接收数据.Checked = cfg.ShowReceive;
-            mi显示统计信息.Checked = cfg.ShowStat;
-            miHexSend.Checked = cfg.HexSend;
-
-            txtSend.Text = cfg.SendContent;
-            numMutilSend.Value = cfg.SendTimes;
-            numSleep.Value = cfg.SendSleep;
-            numThreads.Value = cfg.SendUsers;
-            mi日志着色.Checked = cfg.ColorLog;
-
-            cbLocal.DataSource = GetIPs();
-            if (!cfg.Local.IsNullOrEmpty())
-                cbLocal.SelectedItem = cfg.Local;
-            else
-                cbLocal.SelectedIndex = 0;
-
-            // 历史地址列表
-            if (!cfg.Address.IsNullOrEmpty()) cbRemote.DataSource = cfg.Address.Split(";");
-            if (cfg.Port > 0) numPort.Value = cfg.Port;
-        }
-
-        void SaveConfig()
-        {
-            var cfg = NetConfig.Current;
-            cfg.ShowLog = mi显示应用日志.Checked;
-            cfg.ShowSocketLog = mi显示网络日志.Checked;
-            cfg.ShowReceiveString = mi显示接收字符串.Checked;
-            cfg.ShowSend = mi显示发送数据.Checked;
-            cfg.ShowReceive = mi显示接收数据.Checked;
-            cfg.ShowStat = mi显示统计信息.Checked;
-            cfg.HexSend = miHexSend.Checked;
-
-            cfg.SendContent = txtSend.Text;
-            cfg.SendTimes = (Int32)numMutilSend.Value;
-            cfg.SendSleep = (Int32)numSleep.Value;
-            cfg.SendUsers = (Int32)numThreads.Value;
-            cfg.ColorLog = mi日志着色.Checked;
-
-            cfg.Local = cbLocal.Text;
-            cfg.AddAddress(cbRemote.Text);
-
-            cfg.Port = (Int32)numPort.Value;
-
-            cfg.Save();
-        }
-        #endregion
-
-        #region 收发数据
-        void Connect()
-        {
-            _Server = null;
-            _Client = null;
-
-            var mode = GetMode();
-            var local = cbLocal.Text;
-            var remote = cbRemote.Text;
-            var port = (Int32)numPort.Value;
-
-            var cfg = NetConfig.Current;
-            cfg.Mode = (Byte)mode;
-
-            switch (mode)
-            {
-                case WorkModes.UDP_TCP:
-                    _Server = new NetServer();
-                    break;
-                case WorkModes.UDP_Server:
-                    _Server = new NetServer();
-                    _Server.ProtocolType = NetType.Udp;
-                    break;
-                case WorkModes.TCP_Server:
-                    _Server = new NetServer();
-                    _Server.ProtocolType = NetType.Tcp;
-                    break;
-                case WorkModes.TCP_Client:
-                    _Client = new TcpSession();
-                    break;
-                case WorkModes.UDP_Client:
-                    _Client = new UdpServer();
-                    break;
-                default:
-                    if (mode > 0)
-                    {
-                        var ns = GetServer(cbMode.Text);
-                        if (ns == null) throw new XException("未识别服务[{0}]", mode);
-
-                        _Server = ns.GetType().CreateInstance() as NetServer;
-                    }
-                    break;
-            }
-
-            if (_Client != null)
-            {
-                _Client.Log = cfg.ShowLog ? BizLog : Logger.Null;
-                if (!local.Contains("所有本地")) _Client.Local.Host = local;
-                _Client.Received += OnReceived;
-                _Client.Remote.Port = port;
-                _Client.Remote.Host = remote;
-
-                _Client.LogSend = cfg.ShowSend;
-                _Client.LogReceive = cfg.ShowReceive;
-
-                if (!_Client.Open()) return;
-
-                "已连接服务器".SpeechTip();
-            }
-            else if (_Server != null)
-            {
-                if (_Server == null) _Server = new NetServer();
-                _Server.Log = cfg.ShowLog ? BizLog : Logger.Null;
-                _Server.SocketLog = cfg.ShowSocketLog ? BizLog : Logger.Null;
-                _Server.Port = port;
-                if (!local.Contains("所有本地")) _Server.Local.Host = local;
-                _Server.Received += OnReceived;
-
-                _Server.LogSend = cfg.ShowSend;
-                _Server.LogReceive = cfg.ShowReceive;
-
-                //// 加大会话超时时间到1天
-                //_Server.SessionTimeout = 24 * 3600;
-
-                _Server.Start();
-
-                "正在监听{0}".F(port).SpeechTip();
-            }
-
-            pnlSetting.Enabled = false;
-            btnConnect.Text = "关闭";
-
-            cfg.Save();
-
-            _timer = new TimerX(ShowStat, null, 5000, 5000);
-        }
-
-        void Disconnect()
-        {
-            if (_Client != null)
-            {
-                _Client.Dispose();
-                _Client = null;
-
-                "关闭连接".SpeechTip();
-            }
-            if (_Server != null)
-            {
-                "停止监听{0}".F(_Server.Port).SpeechTip();
-                _Server.Dispose();
-                _Server = null;
-            }
-            if (_timer != null)
-            {
-                _timer.Dispose();
-                _timer = null;
-            }
-
-            pnlSetting.Enabled = true;
-            btnConnect.Text = "打开";
-        }
-
-        TimerX _timer;
-        String _lastStat;
-        void ShowStat(Object state)
-        {
-            if (!NetConfig.Current.ShowStat) return;
-
-            var msg = "";
-            if (_Client != null)
-                msg = _Client.GetStat();
-            else if (_Server != null)
-                msg = _Server.GetStat();
-
-            if (!msg.IsNullOrEmpty() && msg != _lastStat)
-            {
-                _lastStat = msg;
-                BizLog.Info(msg);
-            }
-        }
-
-        private void btnConnect_Click(Object sender, EventArgs e)
-        {
-            SaveConfig();
-
-            var btn = sender as Button;
-            if (btn.Text == "打开")
-                Connect();
-            else
-                Disconnect();
-        }
-
-        void OnReceived(Object sender, ReceivedEventArgs e)
-        {
-            var session = sender as ISocketSession;
-            if (session == null)
-            {
-                var ns = sender as INetSession;
-                if (ns == null) return;
-                session = ns.Session;
-            }
-
-            if (NetConfig.Current.ShowReceiveString)
-            {
-                var line = e.ToStr();
-                //XTrace.WriteLine(line);
-
-                BizLog.Info(line);
-            }
-        }
-
-        Int32 _pColor = 0;
-        Int32 BytesOfReceived = 0;
-        Int32 BytesOfSent = 0;
-        Int32 lastReceive = 0;
-        Int32 lastSend = 0;
-        private void timer1_Tick(Object sender, EventArgs e)
-        {
-            //if (!pnlSetting.Enabled)
-            {
-                var rcount = BytesOfReceived;
-                var tcount = BytesOfSent;
-                if (rcount != lastReceive)
-                {
-                    gbReceive.Text = (gbReceive.Tag + "").Replace("0", rcount + "");
-                    lastReceive = rcount;
-                }
-                if (tcount != lastSend)
-                {
-                    gbSend.Text = (gbSend.Tag + "").Replace("0", tcount + "");
-                    lastSend = tcount;
-                }
-
-                var cfg = NetConfig.Current;
-                if (cfg.ColorLog) txtReceive.ColourDefault(_pColor);
-                _pColor = txtReceive.TextLength;
-            }
-        }
-
-        private void btnSend_Click(Object sender, EventArgs e)
-        {
-            var str = txtSend.Text;
-            if (String.IsNullOrEmpty(str))
-            {
-                MessageBox.Show("发送内容不能为空！", Text);
-                txtSend.Focus();
-                return;
-            }
-
-            // 多次发送
-            var count = (Int32)numMutilSend.Value;
-            var sleep = (Int32)numSleep.Value;
-            var ths = (Int32)numThreads.Value;
-            if (count <= 0) count = 1;
-            if (sleep <= 0) sleep = 1;
-
-            SaveConfig();
-
-            var cfg = NetConfig.Current;
-
-            // 处理换行
-            str = str.Replace("\n", "\r\n");
-            var buf = cfg.HexSend ? str.ToHex() : str.GetBytes();
-            var pk = new Packet(buf);
-
-            if (_Client != null)
-            {
-                if (ths <= 1)
-                {
-                    _Client.SendMulti(pk, count, sleep);
-                }
-                else
-                {
-                    // 多线程测试
-                    //Parallel.For(0, ths, n =>
-                    //{
-                    //    var client = _Client.Remote.CreateRemote();
-                    //    client.StatSend = _Client.StatSend;
-                    //    client.StatReceive = _Client.StatReceive;
-                    //    client.SendMulti(buf, count, sleep);
-                    //});
-                    var any = _Client.Local.Address.IsAny();
-                    var list = new List<ISocketClient>();
-                    for (var i = 0; i < ths; i++)
-                    {
-                        var client = _Client.Remote.CreateRemote();
-                        if (!any) client.Local.EndPoint = new IPEndPoint(_Client.Local.Address, 2000 + i);
-                        client.StatSend = _Client.StatSend;
-                        client.StatReceive = _Client.StatReceive;
-                        //client.SendMulti(buf, count, sleep);
-
-                        list.Add(client);
-                    }
-                    Parallel.For(0, ths, n =>
-                    {
-                        var client = list[n];
-                        client.SendMulti(pk, count, sleep);
-                        //try
-                        //{
-                        //    client.Open();
-                        //}
-                        //catch { }
-                    });
-                }
-            }
-            else if (_Server != null)
-            {
-                TaskEx.Run(async () =>
-                {
-                    BizLog.Info("准备向[{0}]个客户端发送[{1}]次[{2}]的数据", _Server.SessionCount, count, buf.Length);
-                    for (var i = 0; i < count && _Server != null; i++)
-                    {
-                        var sw = Stopwatch.StartNew();
-                        var cs = await _Server.SendAllAsync(buf);
-                        sw.Stop();
-                        BizLog.Info("{3}/{4} 已向[{0}]个客户端发送[{1}]数据 {2:n0}ms", cs, buf.Length, sw.ElapsedMilliseconds, i + 1, count);
-                        if (sleep > 0) await TaskEx.Delay(sleep);
-                    }
-                });
-            }
-        }
-        #endregion
-
-        #region 右键菜单
-        private void mi清空_Click(Object sender, EventArgs e)
-        {
-            txtReceive.Clear();
-            BytesOfReceived = 0;
-        }
-
-        private void mi清空2_Click(Object sender, EventArgs e)
-        {
-            txtSend.Clear();
-            BytesOfSent = 0;
-        }
-
-        private void mi显示应用日志_Click(Object sender, EventArgs e)
-        {
-            var mi = sender as ToolStripMenuItem;
-            mi.Checked = !mi.Checked;
-        }
-
-        private void mi显示网络日志_Click(Object sender, EventArgs e)
-        {
-            var mi = sender as ToolStripMenuItem;
-            mi.Checked = !mi.Checked;
-        }
-
-        private void mi显示发送数据_Click(Object sender, EventArgs e)
-        {
-            var mi = sender as ToolStripMenuItem;
-            mi.Checked = !mi.Checked;
-        }
-
-        private void mi显示接收数据_Click(Object sender, EventArgs e)
-        {
-            var mi = sender as ToolStripMenuItem;
-            mi.Checked = !mi.Checked;
-        }
-
-        private void mi显示统计信息_Click(Object sender, EventArgs e)
-        {
-            var mi = sender as ToolStripMenuItem;
-            NetConfig.Current.ShowStat = mi.Checked = !mi.Checked;
-        }
-
-        private void mi显示接收字符串_Click(Object sender, EventArgs e)
-        {
-            var mi = sender as ToolStripMenuItem;
-            NetConfig.Current.ShowReceiveString = mi.Checked = !mi.Checked;
-        }
-
-        private void miHex发送_Click(Object sender, EventArgs e)
-        {
-            var mi = sender as ToolStripMenuItem;
-            NetConfig.Current.HexSend = mi.Checked = !mi.Checked;
-        }
-
-        private void 查看Tcp参数ToolStripMenuItem_Click(Object sender, EventArgs e)
-        {
-            NetHelper.ShowTcpParameters();
-        }
-
-        private void 设置最大TcpToolStripMenuItem_Click(Object sender, EventArgs e)
-        {
-            NetHelper.SetTcpMax();
-        }
-
-        private void mi日志着色_Click(Object sender, EventArgs e)
-        {
-            var mi = sender as ToolStripMenuItem;
-            mi.Checked = !mi.Checked;
-        }
-        #endregion
-
-        private void cbMode_SelectedIndexChanged(Object sender, EventArgs e)
-        {
-            var mode = GetMode();
-            if (mode == 0) return;
-
-            switch (mode)
-            {
-                case WorkModes.TCP_Client:
-                case WorkModes.UDP_Client:
-                    break;
-                default:
-                case WorkModes.UDP_TCP:
-                case WorkModes.UDP_Server:
-                case WorkModes.TCP_Server:
-                    break;
-                case (WorkModes)0xFF:
-                    // 端口
-                    var ns = GetServer(cbMode.Text);
-                    if (ns != null && ns.Port > 0) numPort.Value = ns.Port;
-
-                    break;
-            }
-        }
-
-        WorkModes GetMode()
-        {
-            var mode = cbMode.Text;
-            if (String.IsNullOrEmpty(mode)) return 0;
-
-            var list = EnumHelper.GetDescriptions<WorkModes>().Where(kv => kv.Value == mode).ToList();
-            if (list.Count == 0) return (WorkModes)0xFF;
-
-            return list[0].Key;
-        }
-
-        static String[] GetIPs()
-        {
-            var list = NetHelper.GetIPs().Select(e => e.ToString()).ToList();
-            list.Insert(0, "所有本地IPv4/IPv6");
-            list.Insert(1, IPAddress.Any.ToString());
-            list.Insert(2, IPAddress.IPv6Any.ToString());
-
-            return list.ToArray();
-        }
-
-        static Dictionary<String, Type> _ns;
-        static Dictionary<String, Type> GetNetServers()
-        {
-            if (_ns != null) return _ns;
-
-            lock (typeof(FrmMain))
-            {
-                if (_ns != null) return _ns;
-
-                var dic = new Dictionary<String, Type>();
-                foreach (var item in typeof(NetServer).GetAllSubclasses(true))
-                {
-                    try
-                    {
-                        var ns = item.CreateInstance() as NetServer;
-                        if (ns != null) dic.Add(item.GetDisplayName() ?? ns.Name, item);
-                    }
-                    catch { }
-                }
-
-                return _ns = dic;
-            }
-        }
-
-        static NetServer GetServer(String name)
-        {
-            Type t = null;
-            if (!GetNetServers().TryGetValue(name, out t)) return null;
-
-            return t.CreateInstance() as NetServer;
-        }
-    }
-}
\ No newline at end of file
diff --git a/XCoder/XNet/FrmMain.designer.cs b/XCoder/XNet/FrmMain.designer.cs
deleted file mode 100644
index 6630d5bbba..0000000000
--- a/XCoder/XNet/FrmMain.designer.cs
+++ /dev/null
@@ -1,535 +0,0 @@
-﻿namespace XNet
-{
-    partial class FrmMain
-    {
-        /// <summary>
-        /// 必需的设计器变量。
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// 清理所有正在使用的资源。
-        /// </summary>
-        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows 窗体设计器生成的代码
-
-        /// <summary>
-        /// 设计器支持所需的方法 - 不要
-        /// 使用代码编辑器修改此方法的内容。
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.components = new System.ComponentModel.Container();
-            this.gbReceive = new System.Windows.Forms.GroupBox();
-            this.txtReceive = new System.Windows.Forms.RichTextBox();
-            this.menuReceive = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator();
-            this.mi显示应用日志 = new System.Windows.Forms.ToolStripMenuItem();
-            this.mi显示网络日志 = new System.Windows.Forms.ToolStripMenuItem();
-            this.mi显示接收字符串 = new System.Windows.Forms.ToolStripMenuItem();
-            this.mi显示发送数据 = new System.Windows.Forms.ToolStripMenuItem();
-            this.mi显示接收数据 = new System.Windows.Forms.ToolStripMenuItem();
-            this.mi显示统计信息 = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator();
-            this.查看Tcp参数ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.设置最大TcpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.menuSend = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.miHexSend = new System.Windows.Forms.ToolStripMenuItem();
-            this.mi清空2 = new System.Windows.Forms.ToolStripMenuItem();
-            this.btnConnect = new System.Windows.Forms.Button();
-            this.timer1 = new System.Windows.Forms.Timer(this.components);
-            this.fontDialog1 = new System.Windows.Forms.FontDialog();
-            this.colorDialog1 = new System.Windows.Forms.ColorDialog();
-            this.label1 = new System.Windows.Forms.Label();
-            this.lbLocal = new System.Windows.Forms.Label();
-            this.cbMode = new System.Windows.Forms.ComboBox();
-            this.cbLocal = new System.Windows.Forms.ComboBox();
-            this.numPort = new System.Windows.Forms.NumericUpDown();
-            this.pnlSetting = new System.Windows.Forms.Panel();
-            this.gbSend = new System.Windows.Forms.GroupBox();
-            this.numThreads = new System.Windows.Forms.NumericUpDown();
-            this.numSleep = new System.Windows.Forms.NumericUpDown();
-            this.txtSend = new System.Windows.Forms.RichTextBox();
-            this.btnSend = new System.Windows.Forms.Button();
-            this.numMutilSend = new System.Windows.Forms.NumericUpDown();
-            this.label2 = new System.Windows.Forms.Label();
-            this.label7 = new System.Windows.Forms.Label();
-            this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
-            this.mi日志着色 = new System.Windows.Forms.ToolStripMenuItem();
-            this.cbRemote = new System.Windows.Forms.ComboBox();
-            this.label4 = new System.Windows.Forms.Label();
-            this.gbReceive.SuspendLayout();
-            this.menuReceive.SuspendLayout();
-            this.menuSend.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.numPort)).BeginInit();
-            this.pnlSetting.SuspendLayout();
-            this.gbSend.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.numThreads)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numSleep)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numMutilSend)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // gbReceive
-            // 
-            this.gbReceive.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.gbReceive.Controls.Add(this.txtReceive);
-            this.gbReceive.Location = new System.Drawing.Point(9, 43);
-            this.gbReceive.Name = "gbReceive";
-            this.gbReceive.Size = new System.Drawing.Size(652, 234);
-            this.gbReceive.TabIndex = 4;
-            this.gbReceive.TabStop = false;
-            this.gbReceive.Text = "接收区：已接收0字节";
-            // 
-            // txtReceive
-            // 
-            this.txtReceive.ContextMenuStrip = this.menuReceive;
-            this.txtReceive.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.txtReceive.HideSelection = false;
-            this.txtReceive.Location = new System.Drawing.Point(3, 17);
-            this.txtReceive.Name = "txtReceive";
-            this.txtReceive.Size = new System.Drawing.Size(646, 214);
-            this.txtReceive.TabIndex = 1;
-            this.txtReceive.Text = "";
-            // 
-            // menuReceive
-            // 
-            this.menuReceive.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolStripMenuItem1,
-            this.mi日志着色,
-            this.toolStripMenuItem3,
-            this.mi显示应用日志,
-            this.mi显示网络日志,
-            this.mi显示接收字符串,
-            this.mi显示发送数据,
-            this.mi显示接收数据,
-            this.mi显示统计信息,
-            this.toolStripMenuItem4,
-            this.查看Tcp参数ToolStripMenuItem,
-            this.设置最大TcpToolStripMenuItem});
-            this.menuReceive.Name = "menuSend";
-            this.menuReceive.Size = new System.Drawing.Size(161, 236);
-            // 
-            // toolStripMenuItem1
-            // 
-            this.toolStripMenuItem1.Name = "toolStripMenuItem1";
-            this.toolStripMenuItem1.Size = new System.Drawing.Size(160, 22);
-            this.toolStripMenuItem1.Text = "清空";
-            this.toolStripMenuItem1.Click += new System.EventHandler(this.mi清空_Click);
-            // 
-            // toolStripMenuItem3
-            // 
-            this.toolStripMenuItem3.Name = "toolStripMenuItem3";
-            this.toolStripMenuItem3.Size = new System.Drawing.Size(157, 6);
-            // 
-            // mi显示应用日志
-            // 
-            this.mi显示应用日志.Name = "mi显示应用日志";
-            this.mi显示应用日志.Size = new System.Drawing.Size(160, 22);
-            this.mi显示应用日志.Text = "显示应用日志";
-            this.mi显示应用日志.Click += new System.EventHandler(this.mi显示应用日志_Click);
-            // 
-            // mi显示网络日志
-            // 
-            this.mi显示网络日志.Name = "mi显示网络日志";
-            this.mi显示网络日志.Size = new System.Drawing.Size(160, 22);
-            this.mi显示网络日志.Text = "显示网络日志";
-            this.mi显示网络日志.Click += new System.EventHandler(this.mi显示网络日志_Click);
-            // 
-            // mi显示接收字符串
-            // 
-            this.mi显示接收字符串.Name = "mi显示接收字符串";
-            this.mi显示接收字符串.Size = new System.Drawing.Size(160, 22);
-            this.mi显示接收字符串.Text = "显示接收字符串";
-            this.mi显示接收字符串.Click += new System.EventHandler(this.mi显示接收字符串_Click);
-            // 
-            // mi显示发送数据
-            // 
-            this.mi显示发送数据.Name = "mi显示发送数据";
-            this.mi显示发送数据.Size = new System.Drawing.Size(160, 22);
-            this.mi显示发送数据.Text = "显示发送数据";
-            this.mi显示发送数据.Click += new System.EventHandler(this.mi显示发送数据_Click);
-            // 
-            // mi显示接收数据
-            // 
-            this.mi显示接收数据.Name = "mi显示接收数据";
-            this.mi显示接收数据.Size = new System.Drawing.Size(160, 22);
-            this.mi显示接收数据.Text = "显示接收数据";
-            this.mi显示接收数据.Click += new System.EventHandler(this.mi显示接收数据_Click);
-            // 
-            // mi显示统计信息
-            // 
-            this.mi显示统计信息.Name = "mi显示统计信息";
-            this.mi显示统计信息.Size = new System.Drawing.Size(160, 22);
-            this.mi显示统计信息.Text = "显示统计信息";
-            this.mi显示统计信息.Click += new System.EventHandler(this.mi显示统计信息_Click);
-            // 
-            // toolStripMenuItem4
-            // 
-            this.toolStripMenuItem4.Name = "toolStripMenuItem4";
-            this.toolStripMenuItem4.Size = new System.Drawing.Size(157, 6);
-            // 
-            // 查看Tcp参数ToolStripMenuItem
-            // 
-            this.查看Tcp参数ToolStripMenuItem.Name = "查看Tcp参数ToolStripMenuItem";
-            this.查看Tcp参数ToolStripMenuItem.Size = new System.Drawing.Size(160, 22);
-            this.查看Tcp参数ToolStripMenuItem.Text = "查看Tcp参数";
-            this.查看Tcp参数ToolStripMenuItem.Click += new System.EventHandler(this.查看Tcp参数ToolStripMenuItem_Click);
-            // 
-            // 设置最大TcpToolStripMenuItem
-            // 
-            this.设置最大TcpToolStripMenuItem.Name = "设置最大TcpToolStripMenuItem";
-            this.设置最大TcpToolStripMenuItem.Size = new System.Drawing.Size(160, 22);
-            this.设置最大TcpToolStripMenuItem.Text = "设置最大Tcp";
-            this.设置最大TcpToolStripMenuItem.Click += new System.EventHandler(this.设置最大TcpToolStripMenuItem_Click);
-            // 
-            // menuSend
-            // 
-            this.menuSend.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.miHexSend,
-            this.mi清空2});
-            this.menuSend.Name = "menuSend";
-            this.menuSend.Size = new System.Drawing.Size(123, 48);
-            // 
-            // miHexSend
-            // 
-            this.miHexSend.Name = "miHexSend";
-            this.miHexSend.Size = new System.Drawing.Size(122, 22);
-            this.miHexSend.Text = "Hex发送";
-            this.miHexSend.Click += new System.EventHandler(this.miHex发送_Click);
-            // 
-            // mi清空2
-            // 
-            this.mi清空2.Name = "mi清空2";
-            this.mi清空2.Size = new System.Drawing.Size(122, 22);
-            this.mi清空2.Text = "清空";
-            this.mi清空2.Click += new System.EventHandler(this.mi清空2_Click);
-            // 
-            // btnConnect
-            // 
-            this.btnConnect.Location = new System.Drawing.Point(587, 9);
-            this.btnConnect.Name = "btnConnect";
-            this.btnConnect.Size = new System.Drawing.Size(67, 29);
-            this.btnConnect.TabIndex = 3;
-            this.btnConnect.Text = "打开";
-            this.btnConnect.UseVisualStyleBackColor = true;
-            this.btnConnect.Click += new System.EventHandler(this.btnConnect_Click);
-            // 
-            // timer1
-            // 
-            this.timer1.Enabled = true;
-            this.timer1.Interval = 300;
-            this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(5, 9);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(29, 12);
-            this.label1.TabIndex = 6;
-            this.label1.Text = "模式";
-            // 
-            // lbLocal
-            // 
-            this.lbLocal.AutoSize = true;
-            this.lbLocal.Location = new System.Drawing.Point(141, 9);
-            this.lbLocal.Name = "lbLocal";
-            this.lbLocal.Size = new System.Drawing.Size(29, 12);
-            this.lbLocal.TabIndex = 7;
-            this.lbLocal.Text = "本地";
-            // 
-            // cbMode
-            // 
-            this.cbMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cbMode.FormattingEnabled = true;
-            this.cbMode.Location = new System.Drawing.Point(41, 5);
-            this.cbMode.Name = "cbMode";
-            this.cbMode.Size = new System.Drawing.Size(93, 20);
-            this.cbMode.TabIndex = 9;
-            this.cbMode.SelectedIndexChanged += new System.EventHandler(this.cbMode_SelectedIndexChanged);
-            // 
-            // cbLocal
-            // 
-            this.cbLocal.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cbLocal.FormattingEnabled = true;
-            this.cbLocal.Location = new System.Drawing.Point(177, 5);
-            this.cbLocal.Name = "cbLocal";
-            this.cbLocal.Size = new System.Drawing.Size(116, 20);
-            this.cbLocal.TabIndex = 10;
-            // 
-            // numPort
-            // 
-            this.numPort.Location = new System.Drawing.Point(512, 5);
-            this.numPort.Maximum = new decimal(new int[] {
-            65535,
-            0,
-            0,
-            0});
-            this.numPort.Minimum = new decimal(new int[] {
-            1,
-            0,
-            0,
-            0});
-            this.numPort.Name = "numPort";
-            this.numPort.Size = new System.Drawing.Size(51, 21);
-            this.numPort.TabIndex = 11;
-            this.numPort.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-            this.toolTip1.SetToolTip(this.numPort, "端口");
-            this.numPort.Value = new decimal(new int[] {
-            8080,
-            0,
-            0,
-            0});
-            // 
-            // pnlSetting
-            // 
-            this.pnlSetting.Controls.Add(this.cbRemote);
-            this.pnlSetting.Controls.Add(this.label4);
-            this.pnlSetting.Controls.Add(this.numPort);
-            this.pnlSetting.Controls.Add(this.cbLocal);
-            this.pnlSetting.Controls.Add(this.label1);
-            this.pnlSetting.Controls.Add(this.lbLocal);
-            this.pnlSetting.Controls.Add(this.cbMode);
-            this.pnlSetting.Location = new System.Drawing.Point(9, 8);
-            this.pnlSetting.Name = "pnlSetting";
-            this.pnlSetting.Size = new System.Drawing.Size(572, 31);
-            this.pnlSetting.TabIndex = 13;
-            // 
-            // gbSend
-            // 
-            this.gbSend.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.gbSend.Controls.Add(this.numThreads);
-            this.gbSend.Controls.Add(this.numSleep);
-            this.gbSend.Controls.Add(this.txtSend);
-            this.gbSend.Controls.Add(this.btnSend);
-            this.gbSend.Controls.Add(this.numMutilSend);
-            this.gbSend.Controls.Add(this.label2);
-            this.gbSend.Controls.Add(this.label7);
-            this.gbSend.Location = new System.Drawing.Point(9, 283);
-            this.gbSend.Name = "gbSend";
-            this.gbSend.Size = new System.Drawing.Size(652, 84);
-            this.gbSend.TabIndex = 15;
-            this.gbSend.TabStop = false;
-            this.gbSend.Text = "发送区：已发送0字节";
-            // 
-            // numThreads
-            // 
-            this.numThreads.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.numThreads.Location = new System.Drawing.Point(593, 22);
-            this.numThreads.Maximum = new decimal(new int[] {
-            100000,
-            0,
-            0,
-            0});
-            this.numThreads.Minimum = new decimal(new int[] {
-            1,
-            0,
-            0,
-            0});
-            this.numThreads.Name = "numThreads";
-            this.numThreads.Size = new System.Drawing.Size(52, 21);
-            this.numThreads.TabIndex = 18;
-            this.numThreads.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-            this.toolTip1.SetToolTip(this.numThreads, "模拟多客户端发送，用于压力测试！");
-            this.numThreads.Value = new decimal(new int[] {
-            1,
-            0,
-            0,
-            0});
-            // 
-            // numSleep
-            // 
-            this.numSleep.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.numSleep.Location = new System.Drawing.Point(538, 54);
-            this.numSleep.Maximum = new decimal(new int[] {
-            1000000,
-            0,
-            0,
-            0});
-            this.numSleep.Name = "numSleep";
-            this.numSleep.Size = new System.Drawing.Size(52, 21);
-            this.numSleep.TabIndex = 16;
-            this.numSleep.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-            this.numSleep.Value = new decimal(new int[] {
-            1000,
-            0,
-            0,
-            0});
-            // 
-            // txtSend
-            // 
-            this.txtSend.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtSend.ContextMenuStrip = this.menuSend;
-            this.txtSend.HideSelection = false;
-            this.txtSend.Location = new System.Drawing.Point(0, 19);
-            this.txtSend.Name = "txtSend";
-            this.txtSend.Size = new System.Drawing.Size(497, 59);
-            this.txtSend.TabIndex = 2;
-            this.txtSend.Text = "";
-            // 
-            // btnSend
-            // 
-            this.btnSend.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnSend.Location = new System.Drawing.Point(596, 49);
-            this.btnSend.Name = "btnSend";
-            this.btnSend.Size = new System.Drawing.Size(50, 30);
-            this.btnSend.TabIndex = 1;
-            this.btnSend.Text = "发送";
-            this.btnSend.UseVisualStyleBackColor = true;
-            this.btnSend.Click += new System.EventHandler(this.btnSend_Click);
-            // 
-            // numMutilSend
-            // 
-            this.numMutilSend.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.numMutilSend.Location = new System.Drawing.Point(538, 22);
-            this.numMutilSend.Maximum = new decimal(new int[] {
-            10000,
-            0,
-            0,
-            0});
-            this.numMutilSend.Minimum = new decimal(new int[] {
-            1,
-            0,
-            0,
-            0});
-            this.numMutilSend.Name = "numMutilSend";
-            this.numMutilSend.Size = new System.Drawing.Size(52, 21);
-            this.numMutilSend.TabIndex = 14;
-            this.numMutilSend.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-            this.numMutilSend.Value = new decimal(new int[] {
-            1,
-            0,
-            0,
-            0});
-            // 
-            // label2
-            // 
-            this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(503, 58);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(41, 12);
-            this.label2.TabIndex = 17;
-            this.label2.Text = "间隔：";
-            // 
-            // label7
-            // 
-            this.label7.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(503, 26);
-            this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(41, 12);
-            this.label7.TabIndex = 15;
-            this.label7.Text = "次数：";
-            // 
-            // mi日志着色
-            // 
-            this.mi日志着色.Name = "mi日志着色";
-            this.mi日志着色.Size = new System.Drawing.Size(160, 22);
-            this.mi日志着色.Text = "日志着色";
-            this.mi日志着色.Click += new System.EventHandler(this.mi日志着色_Click);
-            // 
-            // cbRemote
-            // 
-            this.cbRemote.FormattingEnabled = true;
-            this.cbRemote.Location = new System.Drawing.Point(336, 5);
-            this.cbRemote.Name = "cbRemote";
-            this.cbRemote.Size = new System.Drawing.Size(169, 20);
-            this.cbRemote.TabIndex = 17;
-            // 
-            // label4
-            // 
-            this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(300, 9);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(29, 12);
-            this.label4.TabIndex = 16;
-            this.label4.Text = "远程";
-            // 
-            // FrmMain
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(667, 379);
-            this.Controls.Add(this.gbSend);
-            this.Controls.Add(this.pnlSetting);
-            this.Controls.Add(this.btnConnect);
-            this.Controls.Add(this.gbReceive);
-            this.Name = "FrmMain";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "网络调试";
-            this.Load += new System.EventHandler(this.FrmMain_Load);
-            this.gbReceive.ResumeLayout(false);
-            this.menuReceive.ResumeLayout(false);
-            this.menuSend.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.numPort)).EndInit();
-            this.pnlSetting.ResumeLayout(false);
-            this.pnlSetting.PerformLayout();
-            this.gbSend.ResumeLayout(false);
-            this.gbSend.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.numThreads)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numSleep)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numMutilSend)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.GroupBox gbReceive;
-        private System.Windows.Forms.Button btnConnect;
-        private System.Windows.Forms.Timer timer1;
-        private System.Windows.Forms.ContextMenuStrip menuSend;
-        private System.Windows.Forms.ToolStripMenuItem mi清空2;
-        private System.Windows.Forms.RichTextBox txtReceive;
-        private System.Windows.Forms.FontDialog fontDialog1;
-        private System.Windows.Forms.ColorDialog colorDialog1;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Label lbLocal;
-        private System.Windows.Forms.ComboBox cbMode;
-        private System.Windows.Forms.ComboBox cbLocal;
-        private System.Windows.Forms.NumericUpDown numPort;
-        private System.Windows.Forms.Panel pnlSetting;
-        private System.Windows.Forms.ContextMenuStrip menuReceive;
-        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1;
-        private System.Windows.Forms.ToolStripSeparator toolStripMenuItem3;
-        private System.Windows.Forms.GroupBox gbSend;
-        private System.Windows.Forms.NumericUpDown numSleep;
-        private System.Windows.Forms.RichTextBox txtSend;
-        private System.Windows.Forms.Button btnSend;
-        private System.Windows.Forms.NumericUpDown numMutilSend;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.Label label7;
-        private System.Windows.Forms.ToolStripMenuItem mi显示发送数据;
-        private System.Windows.Forms.ToolStripMenuItem mi显示接收数据;
-        private System.Windows.Forms.ToolStripMenuItem mi显示统计信息;
-        private System.Windows.Forms.NumericUpDown numThreads;
-        private System.Windows.Forms.ToolStripMenuItem mi显示接收字符串;
-        private System.Windows.Forms.ToolStripMenuItem mi显示应用日志;
-        private System.Windows.Forms.ToolStripMenuItem mi显示网络日志;
-        private System.Windows.Forms.ToolTip toolTip1;
-        private System.Windows.Forms.ToolStripMenuItem miHexSend;
-        private System.Windows.Forms.ToolStripSeparator toolStripMenuItem4;
-        private System.Windows.Forms.ToolStripMenuItem 查看Tcp参数ToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem 设置最大TcpToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem mi日志着色;
-        private System.Windows.Forms.ComboBox cbRemote;
-        private System.Windows.Forms.Label label4;
-    }
-}
-
diff --git a/XCoder/XNet/FrmMain.resx b/XCoder/XNet/FrmMain.resx
deleted file mode 100644
index 0ab0a116fb..0000000000
--- a/XCoder/XNet/FrmMain.resx
+++ /dev/null
@@ -1,144 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="menuReceive.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>104, 13</value>
-  </metadata>
-  <metadata name="menuSend.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>237, 17</value>
-  </metadata>
-  <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="fontDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>352, 17</value>
-  </metadata>
-  <metadata name="colorDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>474, 17</value>
-  </metadata>
-  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>601, 17</value>
-  </metadata>
-  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>601, 17</value>
-  </metadata>
-  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>601, 17</value>
-  </metadata>
-</root>
\ No newline at end of file
diff --git a/XCoder/XNet/IPPacket.cs b/XCoder/XNet/IPPacket.cs
deleted file mode 100644
index bf212ed528..0000000000
--- a/XCoder/XNet/IPPacket.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-﻿using System;
-using System.Net;
-using System.Net.Sockets;
-using NewLife.Data;
-
-namespace XCoder.XNet
-{
-    /// <summary>IP包</summary>
-    public class IPPacket
-    {
-        public Byte Version;
-        public Byte Length;
-        public Byte DiffServices;
-        public UInt16 DataLength;
-        public UInt16 Identification;
-        public Byte Flag;
-        public UInt16 Excursion;
-        public Byte TTL;
-        public ProtocolType Protocol;
-        public UInt16 CheckSum;
-        public IPAddress SrcAddr;
-        public IPAddress DestAddr;
-        public Byte[] Option;
-        public Packet Data;
-
-        public IPPacket(Packet pk)
-        {
-            if (pk == null) throw new ArgumentNullException(nameof(pk));
-
-            var data = pk.ReadBytes(0, 20);
-
-            Version = (Byte)((data[0] & 0xF0) >> 4);
-            Length = (Byte)((data[0] & 0x0F) * 4);
-            DiffServices = data[1];
-            DataLength = (UInt16)((data[2] << 8) + data[3]);
-            Identification = (UInt16)((data[4] << 8) + data[5]);
-            Flag = (Byte)(data[6] >> 5);
-            Excursion = (UInt16)(((data[6] & 0x1F) << 8) + data[7]);
-            TTL = data[8];
-            Protocol = (ProtocolType)data[9];
-            CheckSum = (UInt16)((data[10] << 8) + data[11]);
-
-            SrcAddr = new IPAddress(pk.ReadBytes(12, 4));
-            DestAddr = new IPAddress(pk.ReadBytes(16, 4));
-
-            // 可选项
-            if (Length > 20) Option = pk.ReadBytes(20, Length - 20);
-
-            Data = pk.Sub(Length, DataLength);
-        }
-
-        public override String ToString() => $"{SrcAddr} => {DestAddr} [{DataLength}]";
-    }
-}
\ No newline at end of file
diff --git a/XCoder/XNet/MySqlParser.cs b/XCoder/XNet/MySqlParser.cs
deleted file mode 100644
index 768bf776e0..0000000000
--- a/XCoder/XNet/MySqlParser.cs
+++ /dev/null
@@ -1,309 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Net;
-using System.Text;
-using NewLife.Data;
-
-namespace XCoder.XNet
-{
-    #region 分析器
-    abstract class MySqlParser
-    {
-        public Action<MySqlPacket> OnParsedPacket;
-        public Action OnParsedError;
-
-        public DateTime LastTime { get; set; }
-        public IPEndPoint LastSrcEP { get; set; }
-        public IPEndPoint LastDstEP { get; set; }
-
-        public abstract void Parse(Packet pk);
-
-        //The Packet Header
-        //Bytes                 Name
-        // -----                 ----
-        // 3                     Packet Length
-        // 1                     Packet Number
-
-        // Packet Length: The length, in bytes, of the packet
-        //                that follows the Packet Header. There
-        //                may be some special values in the most
-        //                significant byte. The maximum packet 
-        //                length is (2**24 -1),about 16MB.
-
-        // Packet Number: A serial number which can be used to
-        //                ensure that all packets are present
-        //                and in order. The first packet of a
-        //                client query will have Packet Number = 0
-        //                Thus, when a new SQL statement starts, 
-        //                the packet number is re-initialised.
-
-        protected void ReadPacketHeader(Byte[] header, out Int32 packetLength, out Int32 packetNum)
-        {
-            if (header == null || header.Length != 4) throw new ArgumentException();
-
-            packetLength = header[0] + (header[1] << 8) + (header[3] << 16);
-            packetNum = header[3];
-        }
-    }
-
-    class MySqlQueryParser : MySqlParser
-    {
-        private enum ParsingState
-        {
-            Head,
-            Body
-        }
-
-        private ParsingState _state;
-        private MySqlQueryPacket _packet;
-
-        public MySqlQueryParser()
-        {
-            _state = ParsingState.Head;
-            _packet = new MySqlQueryPacket();
-        }
-
-        public override void Parse(Packet pk)
-        {
-            TryParse(pk);
-        }
-
-        private void TryParse(Packet pk)
-        {
-            if (_state == ParsingState.Head)
-            {
-                if (pk.Count >= 4)
-                {
-                    var head = pk.ReadBytes(4);
-                    ReadPacketHeader(head, out _packet.Length, out _packet.Num);
-                    _state = ParsingState.Body;
-                }
-                else
-                    return;
-            }
-
-            if (_state == ParsingState.Body)
-            {
-                if (pk.Count >= _packet.Length)
-                {
-                    var body = _packet.Body = pk.ReadBytes(_packet.Length);
-                    _packet.Command = (DBCmd)body[0];
-                    HandleParseOk();
-                }
-            }
-        }
-
-        private void HandleParseError(String msg)
-        {
-            _state = ParsingState.Head;
-            _packet = new MySqlQueryPacket();
-
-            OnParsedError?.Invoke();
-        }
-
-        private void HandleParseOk()
-        {
-            if (OnParsedPacket != null)
-            {
-                _packet.Time = LastTime;
-                _packet.SrcEP = LastSrcEP;
-                _packet.DstEP = LastDstEP;
-                OnParsedPacket(_packet);
-            }
-            _state = ParsingState.Head;
-            _packet = new MySqlQueryPacket();
-        }
-    }
-    #endregion
-
-    #region 数据包
-    enum PacketType
-    {
-        Query,
-        ResultSet,
-    }
-
-    class MySqlPacket
-    {
-        public DateTime Time { get; set; }
-        public IPEndPoint SrcEP { get; set; }
-        public IPEndPoint DstEP { get; set; }
-
-        public PacketType PacketType { get; set; }
-    }
-    #endregion
-
-    #region 结果包
-    enum ResultSetType
-    {
-        OK,
-        Error,
-        ResultSet,
-    }
-
-    class MySqlResultSetPacket : MySqlPacket
-    {
-        public ResultSetType ResultSetType { get; set; }
-
-        public MySqlResultSetPacket()
-        {
-            PacketType = PacketType.ResultSet;
-        }
-    }
-
-    class MySqlOKResultSet : MySqlResultSetPacket
-    {
-        public Int32 Length;
-        public Int32 Num;
-        public Int32 AffectRow;
-        public Int32 ServerState;
-        public String Message;
-
-        public MySqlOKResultSet()
-        {
-            ResultSetType = ResultSetType.OK;
-        }
-    }
-
-    class MySqlErrorResultSet : MySqlResultSetPacket
-    {
-        public Int32 Length;
-        public Int32 Num;
-        public Int32 ErrorNum;
-        public Int32 SqlState;
-        public String Message;
-
-        public MySqlErrorResultSet()
-        {
-            ResultSetType = ResultSetType.Error;
-        }
-    }
-
-    class MySqlDataResultSet : MySqlResultSetPacket
-    {
-        public ResultSetHeadPacket HeadPacket;
-        public List<ResultSetFieldPacket> FieldPacket;
-        public List<ResultSetRowPacket> RowPacket;
-
-        public MySqlDataResultSet()
-        {
-            ResultSetType = ResultSetType.ResultSet;
-        }
-    }
-
-    public class ResultSetHeadPacket
-    {
-        public Int32 PacketLength;
-        public Int32 PacketNum;
-        public Int32 FieldNum;
-    }
-
-    public class ResultSetFieldPacket
-    {
-        public Int32 PacketLength;
-        public Int32 PacketNum;
-    }
-
-    public class ResultSetRowPacket
-    {
-        public Int32 PacketLength;
-        public Int32 PacketNum;
-    }
-    #endregion
-
-    #region 请求包
-    class MySqlQueryPacket : MySqlPacket
-    {
-        public Int32 Length;
-        public Int32 Num;
-        public Byte[] Body;
-        public DBCmd Command;
-
-        private String _commandArgs;
-        public String CommandArgs
-        {
-            get
-            {
-                if (Command == DBCmd.QUERY && Body != null && Body.Length > 0)
-                {
-                    if (_commandArgs == null)
-                        _commandArgs = Encoding.UTF8.GetString(Body, 1, Body.Length - 1);
-                }
-
-                return _commandArgs;
-            }
-        }
-
-        public MySqlQueryPacket()
-        {
-            PacketType = PacketType.Query;
-        }
-
-        public MySqlCommandArgs ResolveCommand()
-        {
-            var args = new MySqlCommandArgs
-            {
-                CmdType = CommandType.Text
-            };
-
-            var cmd = CommandArgs;
-            if (cmd != null)
-            {
-                if (cmd.Substring(0, 4) == "CALL")
-                {
-                    args.CmdType = CommandType.StoredProcedure;
-
-                    var start = cmd.IndexOf("(");
-                    if (start > 3) args.ResolveQuery = cmd.Substring(3, start - 3);
-                }
-                else
-                {
-                    //todo replace ='xx' to ={}
-                }
-            }
-
-            return args;
-        }
-    }
-
-    class MySqlCommandArgs
-    {
-        public CommandType CmdType { get; set; }
-        public String ResolveQuery { get; set; }
-    }
-
-    enum DBCmd : Byte
-    {
-        SLEEP = 0,
-        QUIT = 1,
-        INIT_DB = 2,
-        QUERY = 3,
-        FIELD_LIST = 4,
-        CREATE_DB = 5,
-        DROP_DB = 6,
-        RELOAD = 7,
-        SHUTDOWN = 8,
-        STATISTICS = 9,
-        PROCESS_INFO = 10,
-        CONNECT = 11,
-        PROCESS_KILL = 12,
-        DEBUG = 13,
-        PING = 14,
-        TIME = 15,
-        DELAYED_INSERT = 16,
-        CHANGE_USER = 17,
-        BINLOG_DUMP = 18,
-        TABLE_DUMP = 19,
-        CONNECT_OUT = 20,
-        REGISTER_SLAVE = 21,
-        PREPARE = 22,
-        EXECUTE = 23,
-        LONG_DATA = 24,
-        CLOSE_STMT = 25,
-        RESET_STMT = 26,
-        SET_OPTION = 27,
-        FETCH = 28
-    }
-    #endregion
-}
\ No newline at end of file
diff --git a/XCoder/XNet/NetConfig.cs b/XCoder/XNet/NetConfig.cs
deleted file mode 100644
index 74145aff6d..0000000000
--- a/XCoder/XNet/NetConfig.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-﻿using System;
-using System.ComponentModel;
-using System.IO.Ports;
-using System.Linq;
-using System.Text;
-using System.Xml.Serialization;
-using NewLife.Xml;
-
-namespace XNet
-{
-    /// <summary>网络口配置</summary>
-    [XmlConfigFile("Config\\Net.config")]
-    public class NetConfig : XmlConfig<NetConfig>
-    {
-        #region 属性
-        /// <summary>模式</summary>
-        [Description("模式")]
-        public Int32 Mode { get; set; } = 1;
-
-        /// <summary>本地地址</summary>
-        [Description("本地地址")]
-        public String Local { get; set; }
-
-        /// <summary>远程地址</summary>
-        [Description("远程地址")]
-        public String Address { get; set; } = "";
-
-        /// <summary>端口</summary>
-        [Description("端口")]
-        public Int32 Port { get; set; }
-
-        /// <summary>文本编码</summary>
-        [XmlIgnore]
-        public Encoding Encoding { get; set; } = Encoding.UTF8;
-
-        /// <summary>编码</summary>
-        [Description("编码 gb2312/us-ascii/utf-8")]
-        public String WebEncoding { get { return Encoding.WebName; } set { Encoding = Encoding.GetEncoding(value); } }
-
-        /// <summary>十六进制显示</summary>
-        [Description("十六进制显示")]
-        public Boolean HexShow { get; set; }
-
-        /// <summary>十六进制发送</summary>
-        [Description("十六进制发送")]
-        public Boolean HexSend { get; set; }
-
-        /// <summary>发送内容</summary>
-        [Description("发送内容")]
-        public String SendContent { get; set; } = "新生命开发团队，学无先后达者为师";
-
-        /// <summary>发送次数</summary>
-        [Description("发送次数")]
-        public Int32 SendTimes { get; set; } = 1;
-
-        /// <summary>发送间隔。毫秒</summary>
-        [Description("发送间隔。毫秒")]
-        public Int32 SendSleep { get; set; } = 1000;
-
-        /// <summary>发送用户数</summary>
-        [Description("发送用户数")]
-        public Int32 SendUsers { get; set; } = 1;
-
-        /// <summary>显示应用日志</summary>
-        [Description("显示应用日志")]
-        public Boolean ShowLog { get; set; } = true;
-
-        /// <summary>显示网络日志</summary>
-        [Description("显示网络日志")]
-        public Boolean ShowSocketLog { get; set; } = true;
-
-        /// <summary>显示接收字符串</summary>
-        [Description("显示接收字符串")]
-        public Boolean ShowReceiveString { get; set; } = true;
-
-        /// <summary>显示发送数据</summary>
-        [Description("显示发送数据")]
-        public Boolean ShowSend { get; set; } = true;
-
-        /// <summary>显示接收数据</summary>
-        [Description("显示接收数据")]
-        public Boolean ShowReceive { get; set; } = true;
-
-        /// <summary>显示统计信息</summary>
-        [Description("显示统计信息")]
-        public Boolean ShowStat { get; set; } = true;
-
-        /// <summary>日志着色</summary>
-        [Description("日志着色")]
-        public Boolean ColorLog { get; set; } = true;
-        #endregion
-
-        #region 方法
-        public NetConfig()
-        {
-        }
-
-        public void AddAddress(String addr)
-        {
-            var addrs = (Address + "").Split(";").Distinct().ToList();
-            addrs.Insert(0, addr);
-            addrs = addrs.Distinct().ToList();
-            while (addrs.Count > 10) addrs.RemoveAt(addrs.Count - 1);
-            Address = addrs.Join(";");
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/XCoder/XNet/RawSocket.cs b/XCoder/XNet/RawSocket.cs
deleted file mode 100644
index b40763a1d0..0000000000
--- a/XCoder/XNet/RawSocket.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-﻿using System;
-using System.Net;
-using System.Net.Sockets;
-using NewLife.Data;
-
-namespace XCoder.XNet
-{
-    /// <summary>原始数据Socket。用于抓包</summary>
-    public class RawSocket
-    {
-        private Socket _socket;
-        private IPAddress _address;
-
-        public Action<TcpPacket> OnTcpReceive;
-
-        public Action<Byte[], Int32> OnReceive;
-
-        public RawSocket(IPAddress address)
-        {
-            _address = address;
-            _socket = new Socket(AddressFamily.InterNetwork, SocketType.Raw, ProtocolType.IP);
-            _socket.Bind(new IPEndPoint(address, 0));
-        }
-
-        public Boolean Capture()
-        {
-            try
-            {
-                _socket.SetSocketOption(SocketOptionLevel.IP, SocketOptionName.HeaderIncluded, 1);
-                var inBytes = new Byte[] { 1, 0, 0, 0 };
-                var outBytes = new Byte[] { 0, 0, 0, 0 };
-                _socket.IOControl(IOControlCode.ReceiveAll, inBytes, outBytes);
-                if (0 != outBytes[0] + outBytes[1] + outBytes[2] + outBytes[3]) return false;
-            }
-            catch (SocketException)
-            {
-                return false;
-            }
-
-            while (_socket != null)
-            {
-                var buffer = new Byte[1500];
-
-                var count = _socket.Receive(buffer, SocketFlags.None);
-                var pk = new Packet(buffer, 0, count);
-
-                OnReceive?.Invoke(buffer, count);
-
-                if (OnTcpReceive != null)
-                {
-                    var ip = new IPPacket(pk);
-                    if (ip.Protocol == ProtocolType.Tcp)
-                    {
-                        var tcp = new TcpPacket(ip);
-                        OnTcpReceive(tcp);
-                    }
-                }
-            }
-
-            return true;
-        }
-
-        public void Stop()
-        {
-            var s = _socket;
-            if (s != null)
-            {
-                _socket = null;
-                s.Shutdown(SocketShutdown.Both);
-                s.Close();
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/XCoder/XNet/TcpPacket.cs b/XCoder/XNet/TcpPacket.cs
deleted file mode 100644
index 645b202d64..0000000000
--- a/XCoder/XNet/TcpPacket.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-﻿using System;
-using System.Net.Sockets;
-using NewLife.Data;
-
-namespace XCoder.XNet
-{
-    /// <summary>Tcp包</summary>
-    public class TcpPacket
-    {
-        public IPPacket IPPacket;
-
-        public UInt16 SrcPort;
-        public UInt16 DestPort;
-        public UInt32 SequenceNo;
-        public UInt32 NextSeqNo;
-        public Byte HeadLength;
-        public Byte Flag;
-        public UInt16 WindowSize;
-        public UInt16 CheckSum;
-        public UInt16 UrgPtr;
-        public Byte[] Option;
-        public Packet Data;
-
-        public TcpPacket(IPPacket packet)
-        {
-            if (packet == null) throw new ArgumentNullException(nameof(packet));
-            if (packet.Protocol != ProtocolType.Tcp) throw new NotSupportedException();
-
-            IPPacket = packet;
-
-            var pk = packet.Data;
-            var data = pk.ReadBytes(0, 20);
-
-            SrcPort = (UInt16)((data[0] << 8) + data[1]);
-            DestPort = (UInt16)((data[2] << 8) + data[3]);
-
-            SequenceNo = ((UInt32)data[7] << 24) + ((UInt32)data[6] << 16) + ((UInt32)data[5] << 8) + data[4];
-            NextSeqNo = ((UInt32)data[11] << 24) + ((UInt32)data[10] << 16) + ((UInt32)data[9] << 8) + data[8];
-
-            HeadLength = (Byte)(((data[12] & 0xF0) >> 4) * 4);
-
-            // 6bit保留位
-            Flag = (Byte)(data[13] & 0x3F);
-            WindowSize = (UInt16)((data[14] << 8) + data[15]);
-            CheckSum = (UInt16)((data[16] << 8) + data[17]);
-            UrgPtr = (UInt16)((data[18] << 8) + data[19]);
-
-            // 可选项
-            if (HeadLength > 20) Option = pk.ReadBytes(20, HeadLength - 20);
-
-            Data = pk.Sub(HeadLength);
-        }
-
-        public override String ToString() => $"{IPPacket?.SrcAddr}:{SrcPort} => {IPPacket.DestAddr}:{DestPort} [{IPPacket.DataLength - HeadLength}]";
-    }
-}
\ No newline at end of file
diff --git a/XCoder/XNet/WorkModes.cs b/XCoder/XNet/WorkModes.cs
deleted file mode 100644
index 7fd5bd5de3..0000000000
--- a/XCoder/XNet/WorkModes.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Text;
-
-namespace XNet
-{
-    /// <summary>工作模式</summary>
-    enum WorkModes
-    {
-        [Description("TCP/UDP混合")]
-        UDP_TCP = 1,
-        [Description("UDP服务端")]
-        UDP_Server,
-        [Description("UDP客户端")]
-        UDP_Client,
-        [Description("TCP服务端")]
-        TCP_Server,
-        [Description("TCP客户端")]
-        TCP_Client,
-
-        //[Description("Echo服务")]
-        //Echo,
-
-        //[Description("Chargen服务")]
-        //Chargen,
-
-        //[Description("Daytime服务")]
-        //Daytime,
-
-        //[Description("Time服务")]
-        //Time
-    }
-}
\ No newline at end of file
diff --git a/XCoder/XRegex/FileResource.cs b/XCoder/XRegex/FileResource.cs
deleted file mode 100644
index 0185998cef..0000000000
--- a/XCoder/XRegex/FileResource.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-﻿using System;
-using System.Drawing;
-using System.IO;
-using System.Reflection;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using NewLife.Threading;
-
-namespace XCoder.XRegex
-{
-    /// <summary>文件资源</summary>
-    public static class FileResource
-    {
-        /// <summary>
-        /// 开始检查模版，模版文件夹不存在时，释放模版
-        /// </summary>
-        public static void CheckTemplate()
-        {
-            Task.Factory.StartNew(() =>
-            {
-                try
-                {
-                    ReleaseTemplateFiles("Pattern");
-                    ReleaseTemplateFiles("Sample");
-                }
-                catch (Exception ex)
-                {
-                    MessageBox.Show(ex.ToString());
-                }
-            });
-        }
-
-        /// <summary>
-        /// 释放模版文件
-        /// </summary>
-        /// <param name="name">名称</param>
-        public static void ReleaseTemplateFiles(String name)
-        {
-            var path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, name);
-            if (Directory.Exists(path)) return;
-
-            var ss = Assembly.GetExecutingAssembly().GetManifestResourceNames();
-            if (ss == null || ss.Length <= 0) return;
-
-            // 取命名空间
-            var prefix = typeof(FileResource).FullName;
-            prefix = prefix.Substring(0, prefix.LastIndexOf("."));
-            prefix += "." + name + ".";
-
-            //找到资源名
-            foreach (var item in ss)
-            {
-                if (item.StartsWith(prefix))
-                {
-                    var fileName = item.Substring(prefix.Length);
-                    fileName = fileName.Replace(".", @"\");
-                    // 最后一个斜杠变回圆点
-                    var cc = fileName.ToCharArray();
-                    cc[fileName.LastIndexOf("\\")] = '.';
-                    fileName = new String(cc);
-                    fileName = Path.Combine(path, fileName);
-
-                    ReleaseFile(item, fileName);
-                }
-            }
-        }
-
-        /// <summary>
-        /// 读取资源，并写入到文件
-        /// </summary>
-        /// <param name="name">名称</param>
-        /// <param name="fileName"></param>
-        static void ReleaseFile(String name, String fileName)
-        {
-            try
-            {
-                var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream(name);
-                if (stream == null) return;
-
-                var buffer = new Byte[stream.Length];
-                var count = stream.Read(buffer, 0, buffer.Length);
-
-                var p = Path.GetDirectoryName(fileName);
-                if (!String.IsNullOrEmpty(p) && !Directory.Exists(p)) Directory.CreateDirectory(p);
-
-                File.WriteAllBytes(fileName, buffer);
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.ToString());
-            }
-        }
-
-        //public static Icon GetIcon()
-        //{
-        //    return new Icon(Assembly.GetExecutingAssembly().GetManifestResourceStream(typeof(FileResource), "leaf.ico"));
-        //}
-    }
-}
\ No newline at end of file
diff --git a/XCoder/XRegex/FrmMain.cs b/XCoder/XRegex/FrmMain.cs
deleted file mode 100644
index bfe589165c..0000000000
--- a/XCoder/XRegex/FrmMain.cs
+++ /dev/null
@@ -1,552 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.IO;
-using System.Reflection;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading;
-using System.Windows.Forms;
-using XCoder;
-using XCoder.XRegex;
-
-namespace NewLife.XRegex
-{
-    [DisplayName("正则表达式工具")]
-    public partial class FrmMain : Form, IXForm
-    {
-        #region 窗体初始化
-        public FrmMain()
-        {
-            InitializeComponent();
-
-            // 动态调节宽度高度，兼容高DPI
-            this.FixDpi();
-
-            Icon = IcoHelper.GetIcon("正则");
-
-            FileResource.CheckTemplate();
-        }
-
-        private void FrmMain_Shown(Object sender, EventArgs e)
-        {
-            //Text += " V" + FileVersion;
-
-            GetOption();
-        }
-
-        private void FrmMain_FormClosing(Object sender, FormClosingEventArgs e)
-        {
-            // 关闭前保存正则和内容
-            Save(txtPattern.Text, "Pattern");
-            Save(txtContent.Text, "Sample");
-        }
-
-        void Save(String content, String name)
-        {
-            if (String.IsNullOrEmpty(content)) return;
-
-            var p = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, name);
-            p = Path.Combine(p, "最近");
-
-            #region 预处理
-            if (Directory.Exists(p))
-            {
-                // 拿出所有文件
-                var files = Directory.GetFiles(p, "*.txt", SearchOption.TopDirectoryOnly);
-                if (files != null && files.Length > 0)
-                {
-                    // 内容比对
-                    var list = new List<String>();
-                    foreach (var item in files)
-                    {
-                        var content2 = File.ReadAllText(item);
-                        if (content2 == content)
-                            File.Delete(item);
-                        else
-                            list.Add(item);
-                    }
-
-                    // 是否超标
-                    if (list.Count >= 10)
-                    {
-                        // 文件排序
-                        list.Sort();
-
-                        // 删除最后的
-                        for (var i = list.Count - 1; i >= 10; i--)
-                        {
-                            File.Delete(list[i]);
-                        }
-                    }
-                }
-            }
-            else
-                Directory.CreateDirectory(p);
-            #endregion
-
-            // 写入
-            var file = String.Format("{0:yyyy-MM-dd_HHmmss}.txt", DateTime.Now);
-            file = Path.Combine(p, file);
-            File.WriteAllText(file, content);
-        }
-        #endregion
-
-        #region 正则匹配
-        private void radioButton1_CheckedChanged(Object sender, EventArgs e)
-        {
-            var rb = sender as RadioButton;
-            if (rb.Checked)
-            {
-                button2.Text = "正则匹配";
-                groupBox3.Text = "匹配结果";
-                splitContainer3.Visible = true;
-                rtReplace.Visible = false;
-                panel1.Visible = false;
-            }
-            else
-            {
-                button2.Text = "正则替换";
-                groupBox3.Text = "替换内容";
-                splitContainer3.Visible = false;
-                rtReplace.Visible = true;
-                panel1.Visible = true;
-            }
-        }
-
-        void GetReg(out String pattern, out RegexOptions options)
-        {
-            pattern = txtPattern.SelectedText;
-            options = RegexOptions.None;
-
-            if (String.IsNullOrEmpty(txtPattern.Text)) return;
-            if (String.IsNullOrEmpty(pattern)) pattern = txtPattern.Text;
-
-            if (chkIgnoreCase.Checked) options |= RegexOptions.IgnoreCase;
-            if (chkMultiline.Checked) options |= RegexOptions.Multiline;
-            if (chkIgnorePatternWhitespace.Checked) options |= RegexOptions.IgnorePatternWhitespace;
-            if (chkSingleline.Checked) options |= RegexOptions.Singleline;
-        }
-
-        Boolean ProcessAsync(Action<Regex> callback, Int32 timeout)
-        {
-            String pattern;
-            RegexOptions options;
-            GetReg(out pattern, out options);
-
-            var isSuccess = false;
-            var e = new AutoResetEvent(false);
-            var thread = new Thread(new ThreadStart(delegate
-            {
-                try
-                {
-                    // 如果正则表达式过于复杂，创建对象时可能需要花很长时间，甚至超时
-                    var reg = new Regex(pattern, options);
-                    callback(reg);
-
-                    isSuccess = true;
-                }
-                catch (ThreadAbortException) { }
-                catch (Exception ex)
-                {
-                    ShowError(ex.Message);
-                }
-                finally
-                {
-                    e.Set();
-                }
-            }));
-
-            lbStatus.Text = "准备开始！";
-            thread.Start();
-            //if (!are.WaitOne(5000))
-            //{
-            //    thread.Abort();
-            //    ShowError("执行正则表达式超时！");
-            //    return;
-            //}
-            var b = false;
-            for (var i = 0; i < timeout / 100; i++)
-            {
-                if (e.WaitOne(100))
-                {
-                    b = true;
-                    break;
-                }
-
-                lbStatus.Text = String.Format("正在处理…… {0:n1}s/{1:n1}s", (Double)i / 10, timeout / 1000);
-            }
-            if (!b)
-            {
-                thread.Abort();
-                ShowError("执行正则表达式超时！");
-            }
-            return isSuccess;
-        }
-
-        private void button2_Click(Object sender, EventArgs e)
-        {
-            if (String.IsNullOrEmpty(txtPattern.Text)) return;
-            var content = txtContent.Text;
-            if (String.IsNullOrEmpty(content)) return;
-
-            // 是否替换
-            var isReplace = !radioButton1.Checked;
-            var replacement = rtReplace.Text;
-            if (isReplace && String.IsNullOrEmpty(replacement)) return;
-
-            Regex r = null;
-            MatchCollection ms = null;
-            var count = 0;
-
-            // 异步执行，防止超时
-            var isSuccess = ProcessAsync(delegate(Regex reg)
-            {
-                r = reg;
-                ms = reg.Matches(content);
-                if (ms != null) count = ms.Count;
-                if (isReplace && count > 0) content = reg.Replace(content, replacement);
-            }, 5000);
-
-            lvMatch.Tag = r;
-            lvMatch.Items.Clear();
-            lvGroup.Items.Clear();
-            lvCapture.Items.Clear();
-
-            if (!isSuccess || count < 1) return;
-
-            lbStatus.Text = String.Format("成功{0} {1} 项！", !isReplace ? "匹配" : "替换", count);
-
-            var i = 1;
-            foreach (Match match in ms)
-            {
-                var item = lvMatch.Items.Add(i.ToString());
-                item.SubItems.Add(match.Value);
-                item.SubItems.Add(String.Format("({0},{1},{2})", txtContent.GetLineFromCharIndex(match.Index), match.Index, match.Length));
-                item.Tag = match;
-                i++;
-            }
-
-            if (isReplace) txtContent.Text = content;
-        }
-
-        private void button5_Click(Object sender, EventArgs e)
-        {
-            if (String.IsNullOrEmpty(txtPattern.Text)) return;
-            var replacement = rtReplace.Text;
-            if (String.IsNullOrEmpty(replacement)) return;
-
-            // 获取文件
-            var files = GetFiles();
-            lbStatus.Text = String.Format("共有符合条件的文件 {0} 个！", files.Length);
-
-            MatchCollection ms = null;
-            var count = 0;
-
-            // 异步执行，防止超时
-            var isSuccess = ProcessAsync(delegate(Regex reg)
-            {
-                foreach (var item in files)
-                {
-                    var content = File.ReadAllText(item);
-                    ms = reg.Matches(content);
-                    if (ms != null) count = ms.Count;
-                    // 有匹配项才替换
-                    if (count > 0)
-                    {
-                        var content2 = reg.Replace(content, replacement);
-                        // 有改变才更新文件
-                        if (content != content2) File.WriteAllText(item, content2);
-                    }
-                }
-            }, 1000 * files.Length);
-
-            if (!isSuccess || count < 1) return;
-
-            lbStatus.Text = String.Format("成功替换 {0} 项！", count);
-
-            txtContent.Text = File.ReadAllText(files[0]);
-        }
-        #endregion
-
-        #region 选择匹配项
-        private void lvMatch_SelectedIndexChanged(Object sender, EventArgs e)
-        {
-            if (lvMatch.SelectedItems == null || lvMatch.SelectedItems.Count < 1) return;
-
-            // 当前选择项
-            var m = lvMatch.SelectedItems[0].Tag as Match;
-            //rtContent.SelectedText = m.Value;
-            txtContent.Select(m.Index, m.Length);
-            txtContent.ScrollToCaret();
-
-            // 分组的选择是否与当前一致
-            var m2 = lvGroup.Tag as Match;
-            if (m2 != null && m2 == m) return;
-
-            lvGroup.Tag = m;
-            lvGroup.Items.Clear();
-            lvCapture.Items.Clear();
-
-            var reg = lvMatch.Tag as Regex;
-            for (var i = 0; i < m.Groups.Count; i++)
-            {
-                var g = m.Groups[i];
-                var item = lvGroup.Items.Add(i.ToString());
-                item.SubItems.Add(reg.GroupNameFromNumber(i));
-                item.SubItems.Add(g.Value);
-                item.SubItems.Add(String.Format("({0},{1},{2})", txtContent.GetLineFromCharIndex(g.Index), g.Index, g.Length));
-                item.Tag = g;
-            }
-        }
-
-        private void lvGroup_SelectedIndexChanged(Object sender, EventArgs e)
-        {
-            if (lvGroup.SelectedItems == null || lvGroup.SelectedItems.Count < 1) return;
-
-            // 当前选择项
-            var g = lvGroup.SelectedItems[0].Tag as Group;
-            //rtContent.SelectedText = g.Value;
-            txtContent.Select(g.Index, g.Length);
-            txtContent.ScrollToCaret();
-
-            // 分组的选择是否与当前一致
-            var g2 = lvCapture.Tag as Group;
-            if (g2 != null && g2 == g) return;
-
-            lvCapture.Tag = g;
-            lvCapture.Items.Clear();
-
-            for (var i = 0; i < g.Captures.Count; i++)
-            {
-                var c = g.Captures[i];
-                var item = lvCapture.Items.Add(i.ToString());
-                item.SubItems.Add(c.Value);
-                item.SubItems.Add(String.Format("({0},{1},{2})", txtContent.GetLineFromCharIndex(c.Index), c.Index, c.Length));
-                item.Tag = g.Captures[i];
-            }
-        }
-
-        private void lvCapture_SelectedIndexChanged(Object sender, EventArgs e)
-        {
-            if (lvCapture.SelectedItems == null || lvCapture.SelectedItems.Count < 1) return;
-
-            // 当前选择项
-            var c = lvCapture.SelectedItems[0].Tag as Capture;
-            txtContent.SelectedText = c.Value;
-            txtContent.Select(c.Index, c.Length);
-            txtContent.ScrollToCaret();
-        }
-        #endregion
-
-        #region 辅助函数
-        void ShowError(String msg)
-        {
-            MessageBox.Show(msg, Text, MessageBoxButtons.OK, MessageBoxIcon.Error);
-        }
-
-        private static String _FileVersion;
-        /// <summary>
-        /// 文件版本
-        /// </summary>
-        public static String FileVersion
-        {
-            get
-            {
-                if (String.IsNullOrEmpty(_FileVersion))
-                {
-                    var asm = Assembly.GetExecutingAssembly();
-                    var av = Attribute.GetCustomAttribute(asm, typeof(AssemblyFileVersionAttribute)) as AssemblyFileVersionAttribute;
-                    if (av != null) _FileVersion = av.Version;
-                    if (String.IsNullOrEmpty(_FileVersion)) _FileVersion = "1.0";
-                }
-                return _FileVersion;
-            }
-        }
-
-        ///// <summary>
-        ///// 找兄弟控件
-        ///// </summary>
-        ///// <typeparam name="T"></typeparam>
-        ///// <param name="src"></param>
-        ///// <returns></returns>
-        //T FindBrotherControl<T>(Control src) where T : Control
-        //{
-
-        //}
-        #endregion
-
-        #region 菜单
-        private void ptMenu_Opening(Object sender, CancelEventArgs e)
-        {
-            for (var i = ptMenu.Items.Count - 1; i >= 1; i--)
-            {
-                ptMenu.Items.RemoveAt(i);
-            }
-            LoadMenuTree(ptMenu.Items, Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Pattern"));
-        }
-
-        private void txtMenu_Opening(Object sender, CancelEventArgs e)
-        {
-            for (var i = txtMenu.Items.Count - 1; i >= 1; i--)
-            {
-                txtMenu.Items.RemoveAt(i);
-            }
-            LoadMenuTree(txtMenu.Items, Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Sample"));
-        }
-
-        /// <summary>
-        /// 加载菜单树
-        /// </summary>
-        /// <param name="items"></param>
-        /// <param name="path"></param>
-        void LoadMenuTree(ToolStripItemCollection items, String path)
-        {
-            // 遍历目录
-            var dirs = Directory.GetDirectories(path, "*", SearchOption.TopDirectoryOnly);
-            if (dirs != null && dirs.Length > 0)
-            {
-                foreach (var item in dirs)
-                {
-                    var name = Path.GetFileName(item);
-                    //var sep = Path.DirectorySeparatorChar + "";
-                    //var p = name.LastIndexOf(sep);
-                    //if (p >= 0) name = name.Substring(p + 1);
-
-                    var menu = new ToolStripMenuItem(name);
-                    menu.Click += MenuItem_Click;
-
-                    LoadMenuTree(menu.DropDownItems, Path.Combine(path, item));
-
-                    // 有子项目才加入菜单
-                    if (menu.DropDownItems.Count > 0) items.Add(menu);
-                }
-            }
-            // 遍历文件
-            var files = Directory.GetFiles(path, "*.txt", SearchOption.TopDirectoryOnly);
-            if (files != null && files.Length > 0)
-            {
-                foreach (var item in files)
-                {
-                    var menu = new ToolStripMenuItem(Path.GetFileNameWithoutExtension(item));
-                    menu.Click += MenuItem_Click;
-                    menu.Tag = Path.Combine(path, item);
-
-                    items.Add(menu);
-                }
-            }
-        }
-
-        private void MenuItem_Click(Object sender, EventArgs e)
-        {
-            var menu = sender as ToolStripMenuItem;
-            if (menu == null) return;
-
-            // 找文件路径
-            var file = (String)menu.Tag;
-            if (String.IsNullOrEmpty(file)) return;
-            if (!File.Exists(file)) return;
-
-            // 找内容区域
-            ToolStripItem item = menu;
-            while (item.OwnerItem != null) item = item.OwnerItem;
-
-            var cms = item.Owner as ContextMenuStrip;
-            if (cms == null) return;
-
-            TextBoxBase rt = null;
-            if (txtPattern.ContextMenuStrip == cms)
-                rt = txtPattern;
-            else if (txtContent.ContextMenuStrip == cms)
-                rt = txtContent;
-
-            if (rt == null) return;
-
-            var content = File.ReadAllText(file);
-            rt.SelectedText = content;
-        }
-        #endregion
-
-        #region 打开目录
-        private void button4_Click(Object sender, EventArgs e)
-        {
-            var btn = sender as Button;
-            GetFolder(btn);
-            if (!String.IsNullOrEmpty(folderBrowserDialog1.SelectedPath)) GetFiles();
-        }
-
-        void GetFolder(Button btn)
-        {
-            var fb = folderBrowserDialog1;
-
-            if (fb.ShowDialog() != DialogResult.OK) return;
-            btn.Tag = fb.SelectedPath;
-            toolTip1.SetToolTip(btn, fb.SelectedPath);
-
-            lbStatus.Text = String.Format("选择目录：{0}", fb.SelectedPath);
-        }
-
-        String[] GetFiles()
-        {
-            // 获取目录，如果没有选择，则打开选择
-            var btn = button4;
-            var path = btn.Tag == null ? null : (String)btn.Tag;
-            if (String.IsNullOrEmpty(path))
-            {
-                GetFolder(btn);
-                path = btn.Tag == null ? null : (String)btn.Tag;
-            }
-            // 如果还是没有目录，退出
-            if (String.IsNullOrEmpty(path) || !Directory.Exists(path)) return null;
-
-            // 获取文件
-            var files = Directory.GetFiles(path, textBox2.Text, SearchOption.AllDirectories);
-            if (files == null || files.Length < 1)
-            {
-                ShowError("没有符合条件的文件！");
-                return null;
-            }
-            lbStatus.Text = String.Format("共有符合条件的文件 {0} 个！", files.Length);
-
-            // 第一个文件内容进入内容窗口
-            try
-            {
-                txtContent.Text = File.ReadAllText(files[0]);
-            }
-            catch { }
-
-            return files;
-        }
-        #endregion
-
-        #region 正则选项
-        private void checkBox1_CheckedChanged(Object sender, EventArgs e)
-        {
-            var chk = sender as CheckBox;
-            if (chk == null) return;
-
-            GetOption();
-        }
-
-        void GetOption()
-        {
-            var sb = new StringBuilder();
-            foreach (var item in chkIgnoreCase.Parent.Controls)
-            {
-                var chk = item as CheckBox;
-                if (chk != null && chk.Checked)
-                {
-                    if (sb.Length > 0) sb.Append(" | ");
-
-                    var name = chk.Name;
-                    if (name.StartsWith("chk")) name = name.Substring(3);
-
-                    sb.AppendFormat("RegexOptions.{0}", name);
-                }
-            }
-
-            txtOption.Text = sb.ToString();
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/XCoder/XRegex/FrmMain.designer.cs b/XCoder/XRegex/FrmMain.designer.cs
deleted file mode 100644
index bff7c510ed..0000000000
--- a/XCoder/XRegex/FrmMain.designer.cs
+++ /dev/null
@@ -1,651 +0,0 @@
-﻿namespace NewLife.XRegex
-{
-    partial class FrmMain
-    {
-        /// <summary>
-        /// 必需的设计器变量。
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// 清理所有正在使用的资源。
-        /// </summary>
-        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows 窗体设计器生成的代码
-
-        /// <summary>
-        /// 设计器支持所需的方法 - 不要
-        /// 使用代码编辑器修改此方法的内容。
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.components = new System.ComponentModel.Container();
-            this.groupBox1 = new System.Windows.Forms.GroupBox();
-            this.txtOption = new System.Windows.Forms.TextBox();
-            this.ptMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.正则ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.chkSingleline = new System.Windows.Forms.CheckBox();
-            this.chkIgnorePatternWhitespace = new System.Windows.Forms.CheckBox();
-            this.chkMultiline = new System.Windows.Forms.CheckBox();
-            this.chkIgnoreCase = new System.Windows.Forms.CheckBox();
-            this.groupBox2 = new System.Windows.Forms.GroupBox();
-            this.txtMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.例子ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.radioButton2 = new System.Windows.Forms.RadioButton();
-            this.radioButton1 = new System.Windows.Forms.RadioButton();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.textBox2 = new System.Windows.Forms.TextBox();
-            this.button4 = new System.Windows.Forms.Button();
-            this.label1 = new System.Windows.Forms.Label();
-            this.button5 = new System.Windows.Forms.Button();
-            this.button2 = new System.Windows.Forms.Button();
-            this.groupBox3 = new System.Windows.Forms.GroupBox();
-            this.splitContainer3 = new System.Windows.Forms.SplitContainer();
-            this.lvMatch = new System.Windows.Forms.ListView();
-            this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.columnHeader8 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.splitContainer4 = new System.Windows.Forms.SplitContainer();
-            this.lvGroup = new System.Windows.Forms.ListView();
-            this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.columnHeader4 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.columnHeader7 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.columnHeader9 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.lvCapture = new System.Windows.Forms.ListView();
-            this.columnHeader5 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.columnHeader6 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.columnHeader10 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.rtReplace = new System.Windows.Forms.RichTextBox();
-            this.statusStrip1 = new System.Windows.Forms.StatusStrip();
-            this.lbStatus = new System.Windows.Forms.ToolStripStatusLabel();
-            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
-            this.splitContainer2 = new System.Windows.Forms.SplitContainer();
-            this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
-            this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
-            this.txtPattern = new System.Windows.Forms.RichTextBox();
-            this.txtContent = new System.Windows.Forms.RichTextBox();
-            this.groupBox1.SuspendLayout();
-            this.ptMenu.SuspendLayout();
-            this.groupBox2.SuspendLayout();
-            this.txtMenu.SuspendLayout();
-            this.panel1.SuspendLayout();
-            this.groupBox3.SuspendLayout();
-            this.splitContainer3.Panel1.SuspendLayout();
-            this.splitContainer3.Panel2.SuspendLayout();
-            this.splitContainer3.SuspendLayout();
-            this.splitContainer4.Panel1.SuspendLayout();
-            this.splitContainer4.Panel2.SuspendLayout();
-            this.splitContainer4.SuspendLayout();
-            this.statusStrip1.SuspendLayout();
-            this.splitContainer1.Panel1.SuspendLayout();
-            this.splitContainer1.Panel2.SuspendLayout();
-            this.splitContainer1.SuspendLayout();
-            this.splitContainer2.Panel1.SuspendLayout();
-            this.splitContainer2.Panel2.SuspendLayout();
-            this.splitContainer2.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // groupBox1
-            // 
-            this.groupBox1.Controls.Add(this.txtPattern);
-            this.groupBox1.Controls.Add(this.txtOption);
-            this.groupBox1.Controls.Add(this.chkSingleline);
-            this.groupBox1.Controls.Add(this.chkIgnorePatternWhitespace);
-            this.groupBox1.Controls.Add(this.chkMultiline);
-            this.groupBox1.Controls.Add(this.chkIgnoreCase);
-            this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.groupBox1.Location = new System.Drawing.Point(0, 0);
-            this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(760, 149);
-            this.groupBox1.TabIndex = 0;
-            this.groupBox1.TabStop = false;
-            this.groupBox1.Text = "正则表达式";
-            // 
-            // txtOption
-            // 
-            this.txtOption.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtOption.Location = new System.Drawing.Point(421, 18);
-            this.txtOption.Name = "txtOption";
-            this.txtOption.ReadOnly = true;
-            this.txtOption.Size = new System.Drawing.Size(333, 21);
-            this.txtOption.TabIndex = 14;
-            // 
-            // ptMenu
-            // 
-            this.ptMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.正则ToolStripMenuItem});
-            this.ptMenu.Name = "ptMenu";
-            this.ptMenu.Size = new System.Drawing.Size(101, 26);
-            this.ptMenu.Opening += new System.ComponentModel.CancelEventHandler(this.ptMenu_Opening);
-            // 
-            // 正则ToolStripMenuItem
-            // 
-            this.正则ToolStripMenuItem.Name = "正则ToolStripMenuItem";
-            this.正则ToolStripMenuItem.Size = new System.Drawing.Size(100, 22);
-            this.正则ToolStripMenuItem.Text = "正则";
-            this.正则ToolStripMenuItem.Click += new System.EventHandler(this.MenuItem_Click);
-            // 
-            // chkSingleline
-            // 
-            this.chkSingleline.AutoSize = true;
-            this.chkSingleline.Checked = true;
-            this.chkSingleline.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.chkSingleline.Location = new System.Drawing.Point(106, 20);
-            this.chkSingleline.Name = "chkSingleline";
-            this.chkSingleline.Size = new System.Drawing.Size(72, 16);
-            this.chkSingleline.TabIndex = 6;
-            this.chkSingleline.Text = "单行模式";
-            this.toolTip1.SetToolTip(this.chkSingleline, "使用单行模式，其中句点 (.)匹配每个字符（而不是与除 \\n 之外的每个字符匹配）。 ");
-            this.chkSingleline.UseVisualStyleBackColor = true;
-            this.chkSingleline.Click += new System.EventHandler(this.checkBox1_CheckedChanged);
-            // 
-            // chkIgnorePatternWhitespace
-            // 
-            this.chkIgnorePatternWhitespace.AutoSize = true;
-            this.chkIgnorePatternWhitespace.Checked = true;
-            this.chkIgnorePatternWhitespace.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.chkIgnorePatternWhitespace.Location = new System.Drawing.Point(280, 20);
-            this.chkIgnorePatternWhitespace.Name = "chkIgnorePatternWhitespace";
-            this.chkIgnorePatternWhitespace.Size = new System.Drawing.Size(120, 16);
-            this.chkIgnorePatternWhitespace.TabIndex = 4;
-            this.chkIgnorePatternWhitespace.Text = "忽略正则中的空白";
-            this.toolTip1.SetToolTip(this.chkIgnorePatternWhitespace, "从模式中排除保留的空白并启用数字符号 ( #) 后的注释。");
-            this.chkIgnorePatternWhitespace.UseVisualStyleBackColor = true;
-            this.chkIgnorePatternWhitespace.Click += new System.EventHandler(this.checkBox1_CheckedChanged);
-            // 
-            // chkMultiline
-            // 
-            this.chkMultiline.AutoSize = true;
-            this.chkMultiline.Checked = true;
-            this.chkMultiline.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.chkMultiline.Location = new System.Drawing.Point(193, 20);
-            this.chkMultiline.Name = "chkMultiline";
-            this.chkMultiline.Size = new System.Drawing.Size(72, 16);
-            this.chkMultiline.TabIndex = 3;
-            this.chkMultiline.Text = "多线模式";
-            this.toolTip1.SetToolTip(this.chkMultiline, "使用多线模式，其中 ^ 和 $ 匹配每行的开头和末尾（不是输入字符串的开头和末尾）。 ");
-            this.chkMultiline.UseVisualStyleBackColor = true;
-            this.chkMultiline.Click += new System.EventHandler(this.checkBox1_CheckedChanged);
-            // 
-            // chkIgnoreCase
-            // 
-            this.chkIgnoreCase.AutoSize = true;
-            this.chkIgnoreCase.Checked = true;
-            this.chkIgnoreCase.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.chkIgnoreCase.Location = new System.Drawing.Point(7, 20);
-            this.chkIgnoreCase.Name = "chkIgnoreCase";
-            this.chkIgnoreCase.Size = new System.Drawing.Size(84, 16);
-            this.chkIgnoreCase.TabIndex = 2;
-            this.chkIgnoreCase.Text = "忽略大小写";
-            this.toolTip1.SetToolTip(this.chkIgnoreCase, "使用不区分大小写的匹配");
-            this.chkIgnoreCase.UseVisualStyleBackColor = true;
-            this.chkIgnoreCase.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged);
-            this.chkIgnoreCase.Click += new System.EventHandler(this.checkBox1_CheckedChanged);
-            // 
-            // groupBox2
-            // 
-            this.groupBox2.Controls.Add(this.txtContent);
-            this.groupBox2.Controls.Add(this.radioButton2);
-            this.groupBox2.Controls.Add(this.radioButton1);
-            this.groupBox2.Controls.Add(this.panel1);
-            this.groupBox2.Controls.Add(this.button2);
-            this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.groupBox2.Location = new System.Drawing.Point(0, 0);
-            this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(760, 191);
-            this.groupBox2.TabIndex = 1;
-            this.groupBox2.TabStop = false;
-            this.groupBox2.Text = "数据源";
-            // 
-            // txtMenu
-            // 
-            this.txtMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.例子ToolStripMenuItem});
-            this.txtMenu.Name = "txtMenu";
-            this.txtMenu.Size = new System.Drawing.Size(101, 26);
-            this.txtMenu.Opening += new System.ComponentModel.CancelEventHandler(this.txtMenu_Opening);
-            // 
-            // 例子ToolStripMenuItem
-            // 
-            this.例子ToolStripMenuItem.Name = "例子ToolStripMenuItem";
-            this.例子ToolStripMenuItem.Size = new System.Drawing.Size(100, 22);
-            this.例子ToolStripMenuItem.Text = "例子";
-            this.例子ToolStripMenuItem.Click += new System.EventHandler(this.MenuItem_Click);
-            // 
-            // radioButton2
-            // 
-            this.radioButton2.AutoSize = true;
-            this.radioButton2.Location = new System.Drawing.Point(63, 16);
-            this.radioButton2.Name = "radioButton2";
-            this.radioButton2.Size = new System.Drawing.Size(47, 16);
-            this.radioButton2.TabIndex = 12;
-            this.radioButton2.TabStop = true;
-            this.radioButton2.Text = "替换";
-            this.radioButton2.UseVisualStyleBackColor = true;
-            // 
-            // radioButton1
-            // 
-            this.radioButton1.AutoSize = true;
-            this.radioButton1.Checked = true;
-            this.radioButton1.Location = new System.Drawing.Point(9, 16);
-            this.radioButton1.Name = "radioButton1";
-            this.radioButton1.Size = new System.Drawing.Size(47, 16);
-            this.radioButton1.TabIndex = 11;
-            this.radioButton1.TabStop = true;
-            this.radioButton1.Text = "匹配";
-            this.radioButton1.UseVisualStyleBackColor = true;
-            this.radioButton1.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged);
-            // 
-            // panel1
-            // 
-            this.panel1.Controls.Add(this.textBox2);
-            this.panel1.Controls.Add(this.button4);
-            this.panel1.Controls.Add(this.label1);
-            this.panel1.Controls.Add(this.button5);
-            this.panel1.Location = new System.Drawing.Point(355, 13);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(284, 28);
-            this.panel1.TabIndex = 10;
-            // 
-            // textBox2
-            // 
-            this.textBox2.Location = new System.Drawing.Point(139, 3);
-            this.textBox2.Name = "textBox2";
-            this.textBox2.Size = new System.Drawing.Size(56, 21);
-            this.textBox2.TabIndex = 5;
-            this.textBox2.Text = "*.*";
-            // 
-            // button4
-            // 
-            this.button4.Location = new System.Drawing.Point(7, 2);
-            this.button4.Name = "button4";
-            this.button4.Size = new System.Drawing.Size(75, 23);
-            this.button4.TabIndex = 4;
-            this.button4.Text = "打开目录";
-            this.button4.UseVisualStyleBackColor = true;
-            this.button4.Click += new System.EventHandler(this.button4_Click);
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(98, 7);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(35, 12);
-            this.label1.TabIndex = 6;
-            this.label1.Text = "过滤:";
-            // 
-            // button5
-            // 
-            this.button5.Location = new System.Drawing.Point(203, 2);
-            this.button5.Name = "button5";
-            this.button5.Size = new System.Drawing.Size(75, 23);
-            this.button5.TabIndex = 7;
-            this.button5.Text = "全部替换";
-            this.button5.UseVisualStyleBackColor = true;
-            this.button5.Click += new System.EventHandler(this.button5_Click);
-            // 
-            // button2
-            // 
-            this.button2.Location = new System.Drawing.Point(132, 13);
-            this.button2.Name = "button2";
-            this.button2.Size = new System.Drawing.Size(75, 23);
-            this.button2.TabIndex = 1;
-            this.button2.Text = "正则匹配";
-            this.toolTip1.SetToolTip(this.button2, "如果正则中选中部分文本，则以选中部分文本作为匹配用正则。");
-            this.button2.UseVisualStyleBackColor = true;
-            this.button2.Click += new System.EventHandler(this.button2_Click);
-            // 
-            // groupBox3
-            // 
-            this.groupBox3.Controls.Add(this.splitContainer3);
-            this.groupBox3.Controls.Add(this.rtReplace);
-            this.groupBox3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.groupBox3.Location = new System.Drawing.Point(0, 0);
-            this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Size = new System.Drawing.Size(760, 169);
-            this.groupBox3.TabIndex = 2;
-            this.groupBox3.TabStop = false;
-            this.groupBox3.Text = "匹配结果(Match|Group|Capture)";
-            // 
-            // splitContainer3
-            // 
-            this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitContainer3.Location = new System.Drawing.Point(3, 17);
-            this.splitContainer3.Name = "splitContainer3";
-            // 
-            // splitContainer3.Panel1
-            // 
-            this.splitContainer3.Panel1.Controls.Add(this.lvMatch);
-            // 
-            // splitContainer3.Panel2
-            // 
-            this.splitContainer3.Panel2.Controls.Add(this.splitContainer4);
-            this.splitContainer3.Size = new System.Drawing.Size(754, 149);
-            this.splitContainer3.SplitterDistance = 221;
-            this.splitContainer3.TabIndex = 0;
-            // 
-            // lvMatch
-            // 
-            this.lvMatch.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
-            this.lvMatch.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
-            this.columnHeader1,
-            this.columnHeader2,
-            this.columnHeader8});
-            this.lvMatch.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.lvMatch.FullRowSelect = true;
-            this.lvMatch.GridLines = true;
-            this.lvMatch.HideSelection = false;
-            this.lvMatch.Location = new System.Drawing.Point(0, 0);
-            this.lvMatch.MultiSelect = false;
-            this.lvMatch.Name = "lvMatch";
-            this.lvMatch.Size = new System.Drawing.Size(221, 149);
-            this.lvMatch.TabIndex = 0;
-            this.lvMatch.UseCompatibleStateImageBehavior = false;
-            this.lvMatch.View = System.Windows.Forms.View.Details;
-            this.lvMatch.SelectedIndexChanged += new System.EventHandler(this.lvMatch_SelectedIndexChanged);
-            // 
-            // columnHeader1
-            // 
-            this.columnHeader1.Text = "顺序";
-            this.columnHeader1.Width = 36;
-            // 
-            // columnHeader2
-            // 
-            this.columnHeader2.Text = "匹配项";
-            this.columnHeader2.Width = 118;
-            // 
-            // columnHeader8
-            // 
-            this.columnHeader8.Text = "位置";
-            // 
-            // splitContainer4
-            // 
-            this.splitContainer4.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitContainer4.Location = new System.Drawing.Point(0, 0);
-            this.splitContainer4.Name = "splitContainer4";
-            // 
-            // splitContainer4.Panel1
-            // 
-            this.splitContainer4.Panel1.Controls.Add(this.lvGroup);
-            // 
-            // splitContainer4.Panel2
-            // 
-            this.splitContainer4.Panel2.Controls.Add(this.lvCapture);
-            this.splitContainer4.Size = new System.Drawing.Size(529, 149);
-            this.splitContainer4.SplitterDistance = 314;
-            this.splitContainer4.TabIndex = 0;
-            // 
-            // lvGroup
-            // 
-            this.lvGroup.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
-            this.lvGroup.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
-            this.columnHeader3,
-            this.columnHeader4,
-            this.columnHeader7,
-            this.columnHeader9});
-            this.lvGroup.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.lvGroup.FullRowSelect = true;
-            this.lvGroup.GridLines = true;
-            this.lvGroup.HideSelection = false;
-            this.lvGroup.Location = new System.Drawing.Point(0, 0);
-            this.lvGroup.MultiSelect = false;
-            this.lvGroup.Name = "lvGroup";
-            this.lvGroup.Size = new System.Drawing.Size(314, 149);
-            this.lvGroup.TabIndex = 0;
-            this.lvGroup.UseCompatibleStateImageBehavior = false;
-            this.lvGroup.View = System.Windows.Forms.View.Details;
-            this.lvGroup.SelectedIndexChanged += new System.EventHandler(this.lvGroup_SelectedIndexChanged);
-            // 
-            // columnHeader3
-            // 
-            this.columnHeader3.Text = "顺序";
-            this.columnHeader3.Width = 36;
-            // 
-            // columnHeader4
-            // 
-            this.columnHeader4.Text = "名称";
-            // 
-            // columnHeader7
-            // 
-            this.columnHeader7.Text = "匹配项";
-            this.columnHeader7.Width = 124;
-            // 
-            // columnHeader9
-            // 
-            this.columnHeader9.Text = "位置";
-            // 
-            // lvCapture
-            // 
-            this.lvCapture.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
-            this.lvCapture.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
-            this.columnHeader5,
-            this.columnHeader6,
-            this.columnHeader10});
-            this.lvCapture.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.lvCapture.FullRowSelect = true;
-            this.lvCapture.GridLines = true;
-            this.lvCapture.HideSelection = false;
-            this.lvCapture.Location = new System.Drawing.Point(0, 0);
-            this.lvCapture.MultiSelect = false;
-            this.lvCapture.Name = "lvCapture";
-            this.lvCapture.Size = new System.Drawing.Size(211, 149);
-            this.lvCapture.TabIndex = 0;
-            this.lvCapture.UseCompatibleStateImageBehavior = false;
-            this.lvCapture.View = System.Windows.Forms.View.Details;
-            this.lvCapture.SelectedIndexChanged += new System.EventHandler(this.lvCapture_SelectedIndexChanged);
-            // 
-            // columnHeader5
-            // 
-            this.columnHeader5.Text = "顺序";
-            this.columnHeader5.Width = 36;
-            // 
-            // columnHeader6
-            // 
-            this.columnHeader6.Text = "匹配项";
-            this.columnHeader6.Width = 109;
-            // 
-            // columnHeader10
-            // 
-            this.columnHeader10.Text = "位置";
-            // 
-            // rtReplace
-            // 
-            this.rtReplace.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
-            this.rtReplace.DetectUrls = false;
-            this.rtReplace.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.rtReplace.Font = new System.Drawing.Font("新宋体", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.rtReplace.HideSelection = false;
-            this.rtReplace.Location = new System.Drawing.Point(3, 17);
-            this.rtReplace.Name = "rtReplace";
-            this.rtReplace.Size = new System.Drawing.Size(754, 149);
-            this.rtReplace.TabIndex = 1;
-            this.rtReplace.Text = "";
-            this.rtReplace.Visible = false;
-            // 
-            // statusStrip1
-            // 
-            this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.lbStatus});
-            this.statusStrip1.Location = new System.Drawing.Point(0, 540);
-            this.statusStrip1.Name = "statusStrip1";
-            this.statusStrip1.Size = new System.Drawing.Size(784, 22);
-            this.statusStrip1.TabIndex = 3;
-            this.statusStrip1.Text = "statusStrip1";
-            // 
-            // lbStatus
-            // 
-            this.lbStatus.Name = "lbStatus";
-            this.lbStatus.Size = new System.Drawing.Size(44, 17);
-            this.lbStatus.Text = "已就绪";
-            // 
-            // splitContainer1
-            // 
-            this.splitContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.splitContainer1.Location = new System.Drawing.Point(12, 12);
-            this.splitContainer1.Name = "splitContainer1";
-            this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;
-            // 
-            // splitContainer1.Panel1
-            // 
-            this.splitContainer1.Panel1.Controls.Add(this.groupBox1);
-            // 
-            // splitContainer1.Panel2
-            // 
-            this.splitContainer1.Panel2.Controls.Add(this.splitContainer2);
-            this.splitContainer1.Size = new System.Drawing.Size(760, 517);
-            this.splitContainer1.SplitterDistance = 149;
-            this.splitContainer1.TabIndex = 4;
-            // 
-            // splitContainer2
-            // 
-            this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitContainer2.Location = new System.Drawing.Point(0, 0);
-            this.splitContainer2.Name = "splitContainer2";
-            this.splitContainer2.Orientation = System.Windows.Forms.Orientation.Horizontal;
-            // 
-            // splitContainer2.Panel1
-            // 
-            this.splitContainer2.Panel1.Controls.Add(this.groupBox2);
-            // 
-            // splitContainer2.Panel2
-            // 
-            this.splitContainer2.Panel2.Controls.Add(this.groupBox3);
-            this.splitContainer2.Size = new System.Drawing.Size(760, 364);
-            this.splitContainer2.SplitterDistance = 191;
-            this.splitContainer2.TabIndex = 0;
-            // 
-            // folderBrowserDialog1
-            // 
-            this.folderBrowserDialog1.ShowNewFolderButton = false;
-            // 
-            // txtPattern
-            // 
-            this.txtPattern.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtPattern.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
-            this.txtPattern.ContextMenuStrip = this.ptMenu;
-            this.txtPattern.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtPattern.HideSelection = false;
-            this.txtPattern.Location = new System.Drawing.Point(6, 45);
-            this.txtPattern.Name = "txtPattern";
-            this.txtPattern.Size = new System.Drawing.Size(748, 94);
-            this.txtPattern.TabIndex = 15;
-            this.txtPattern.Text = "";
-            // 
-            // txtContent
-            // 
-            this.txtContent.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtContent.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
-            this.txtContent.ContextMenuStrip = this.txtMenu;
-            this.txtContent.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtContent.HideSelection = false;
-            this.txtContent.Location = new System.Drawing.Point(6, 43);
-            this.txtContent.Name = "txtContent";
-            this.txtContent.Size = new System.Drawing.Size(748, 143);
-            this.txtContent.TabIndex = 16;
-            this.txtContent.Text = "";
-            // 
-            // FrmMain
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(784, 562);
-            this.Controls.Add(this.splitContainer1);
-            this.Controls.Add(this.statusStrip1);
-            this.Name = "FrmMain";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "正则表达式";
-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmMain_FormClosing);
-            this.Shown += new System.EventHandler(this.FrmMain_Shown);
-            this.groupBox1.ResumeLayout(false);
-            this.groupBox1.PerformLayout();
-            this.ptMenu.ResumeLayout(false);
-            this.groupBox2.ResumeLayout(false);
-            this.groupBox2.PerformLayout();
-            this.txtMenu.ResumeLayout(false);
-            this.panel1.ResumeLayout(false);
-            this.panel1.PerformLayout();
-            this.groupBox3.ResumeLayout(false);
-            this.splitContainer3.Panel1.ResumeLayout(false);
-            this.splitContainer3.Panel2.ResumeLayout(false);
-            this.splitContainer3.ResumeLayout(false);
-            this.splitContainer4.Panel1.ResumeLayout(false);
-            this.splitContainer4.Panel2.ResumeLayout(false);
-            this.splitContainer4.ResumeLayout(false);
-            this.statusStrip1.ResumeLayout(false);
-            this.statusStrip1.PerformLayout();
-            this.splitContainer1.Panel1.ResumeLayout(false);
-            this.splitContainer1.Panel2.ResumeLayout(false);
-            this.splitContainer1.ResumeLayout(false);
-            this.splitContainer2.Panel1.ResumeLayout(false);
-            this.splitContainer2.Panel2.ResumeLayout(false);
-            this.splitContainer2.ResumeLayout(false);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.GroupBox groupBox1;
-        private System.Windows.Forms.GroupBox groupBox2;
-        private System.Windows.Forms.GroupBox groupBox3;
-        private System.Windows.Forms.StatusStrip statusStrip1;
-        private System.Windows.Forms.ToolStripStatusLabel lbStatus;
-        private System.Windows.Forms.SplitContainer splitContainer1;
-        private System.Windows.Forms.SplitContainer splitContainer2;
-        private System.Windows.Forms.CheckBox chkIgnorePatternWhitespace;
-        private System.Windows.Forms.ToolTip toolTip1;
-        private System.Windows.Forms.CheckBox chkMultiline;
-        private System.Windows.Forms.CheckBox chkIgnoreCase;
-        private System.Windows.Forms.SplitContainer splitContainer3;
-        private System.Windows.Forms.ListView lvMatch;
-        private System.Windows.Forms.SplitContainer splitContainer4;
-        private System.Windows.Forms.ListView lvGroup;
-        private System.Windows.Forms.ListView lvCapture;
-        private System.Windows.Forms.ColumnHeader columnHeader1;
-        private System.Windows.Forms.ColumnHeader columnHeader2;
-        private System.Windows.Forms.ColumnHeader columnHeader3;
-        private System.Windows.Forms.ColumnHeader columnHeader4;
-        private System.Windows.Forms.ColumnHeader columnHeader5;
-        private System.Windows.Forms.ColumnHeader columnHeader6;
-        private System.Windows.Forms.ColumnHeader columnHeader7;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.TextBox textBox2;
-        private System.Windows.Forms.Button button4;
-        private System.Windows.Forms.Button button2;
-        private System.Windows.Forms.Button button5;
-        private System.Windows.Forms.ContextMenuStrip ptMenu;
-        private System.Windows.Forms.ContextMenuStrip txtMenu;
-        private System.Windows.Forms.ToolStripMenuItem 正则ToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem 例子ToolStripMenuItem;
-        private System.Windows.Forms.CheckBox chkSingleline;
-        private System.Windows.Forms.ColumnHeader columnHeader8;
-        private System.Windows.Forms.ColumnHeader columnHeader9;
-        private System.Windows.Forms.ColumnHeader columnHeader10;
-        private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1;
-        private System.Windows.Forms.RadioButton radioButton2;
-        private System.Windows.Forms.RadioButton radioButton1;
-        private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.RichTextBox rtReplace;
-        private System.Windows.Forms.TextBox txtOption;
-        private System.Windows.Forms.RichTextBox txtPattern;
-        private System.Windows.Forms.RichTextBox txtContent;
-    }
-}
-
diff --git a/XCoder/XRegex/FrmMain.resx b/XCoder/XRegex/FrmMain.resx
deleted file mode 100644
index 81ec58900b..0000000000
--- a/XCoder/XRegex/FrmMain.resx
+++ /dev/null
@@ -1,135 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="ptMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>239, 17</value>
-  </metadata>
-  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>138, 17</value>
-  </metadata>
-  <metadata name="txtMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>404, 17</value>
-  </metadata>
-  <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="folderBrowserDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>505, 17</value>
-  </metadata>
-</root>
\ No newline at end of file
diff --git "a/XCoder/XRegex/Pattern/Html/\346\227\240\345\265\214\345\245\227\346\240\207\350\256\260.txt" "b/XCoder/XRegex/Pattern/Html/\346\227\240\345\265\214\345\245\227\346\240\207\350\256\260.txt"
deleted file mode 100644
index 83175550bd..0000000000
--- "a/XCoder/XRegex/Pattern/Html/\346\227\240\345\265\214\345\245\227\346\240\207\350\256\260.txt"
+++ /dev/null
@@ -1 +0,0 @@
-﻿<(?<标记>\w+)(?:[^>]*)>(?<内容>[^<]*)</\1>
\ No newline at end of file
diff --git "a/XCoder/XRegex/Pattern/SQL\346\237\245\350\257\242/\345\265\214\345\245\227\346\237\245\350\257\242.txt" "b/XCoder/XRegex/Pattern/SQL\346\237\245\350\257\242/\345\265\214\345\245\227\346\237\245\350\257\242.txt"
deleted file mode 100644
index 4a902977f6..0000000000
--- "a/XCoder/XRegex/Pattern/SQL\346\237\245\350\257\242/\345\265\214\345\245\227\346\237\245\350\257\242.txt"
+++ /dev/null
@@ -1,10 +0,0 @@
-﻿#一个非常简单的SQL查询语句匹配
-(?isx-m)
-^
-\bSelect\s+(?<选择列>(?>[^()]+?|\((?<Open>)|\)(?<-Open>))*?(?(Open)(?!)))
-\s+From\s+(?<数据表>(?>[^()]+?|\((?<Open>)|\)(?<-Open>))*?(?(Open)(?!)))
-(?:\s+Where\s+(?<条件>(?>[^()]+?|\((?<Open>)|\)(?<-Open>))*?(?(Open)(?!))))?
-(?:\s+Group\s+By\s+(?<分组>(?>[^()]+?|\((?<Open>)|\)(?<-Open>))*?(?(Open)(?!))))?
-(?:\s+Having\s+(?<分组条件>(?>[^()]+?|\((?<Open>)|\)(?<-Open>))*?(?(Open)(?!))))?
-(?:\s+Order\s+By\s+(?<排序>(?>[^()]+?|\((?<Open>)|\)(?<-Open>))*?(?(Open)(?!))))?
-$
\ No newline at end of file
diff --git "a/XCoder/XRegex/Pattern/SQL\346\237\245\350\257\242/\347\256\200\345\215\225.txt" "b/XCoder/XRegex/Pattern/SQL\346\237\245\350\257\242/\347\256\200\345\215\225.txt"
deleted file mode 100644
index 6d43e10c8b..0000000000
--- "a/XCoder/XRegex/Pattern/SQL\346\237\245\350\257\242/\347\256\200\345\215\225.txt"
+++ /dev/null
@@ -1,9 +0,0 @@
-﻿#一个非常简单的SQL查询语句匹配
-^
-\bSelect\s+(?<选择列>.*)
-\s+From\s+(?<数据表>.+?)
-(?:\s+Where\s+(?<条件>.+?))?
-(?:\s+Group\s+By\s+(?<分组>.+?))?
-(?:\s+Having\s+(?<分组条件>.+?))?
-(?:\s+Order\s+By\s+(?<排序>.+?))?
-$
\ No newline at end of file
diff --git "a/XCoder/XRegex/Pattern/\345\271\263\350\241\241\347\273\204/\345\256\214\346\225\264\347\244\272\344\276\213.txt" "b/XCoder/XRegex/Pattern/\345\271\263\350\241\241\347\273\204/\345\256\214\346\225\264\347\244\272\344\276\213.txt"
deleted file mode 100644
index 16e0325188..0000000000
--- "a/XCoder/XRegex/Pattern/\345\271\263\350\241\241\347\273\204/\345\256\214\346\225\264\347\244\272\344\276\213.txt"
+++ /dev/null
@@ -1,10 +0,0 @@
-﻿\(                          #普通字符“(”
-    (                     #分组构造，用来限定量词“*”修饰范围
-        [^()]+              #非括弧的其它任意字符
-    |                       #分支结构
-        \(  (?<Open>)       #命名捕获组，遇到开括弧Open计数加1
-    |                       #分支结构
-        \)  (?<-Open>)      #狭义平衡组，遇到闭括弧Open计数减1
-    )*                      #以上子串出现0次或任意多次
-    (?(Open)(?!))           #判断是否还有'OPEN'，有则说明不配对，什么都不匹配
-\)                          #普通闭括弧
\ No newline at end of file
diff --git "a/XCoder/XRegex/Pattern/\345\271\263\350\241\241\347\273\204/\345\256\214\346\225\264\347\244\272\344\276\213\345\233\272\345\214\226\345\210\206\347\273\204.txt" "b/XCoder/XRegex/Pattern/\345\271\263\350\241\241\347\273\204/\345\256\214\346\225\264\347\244\272\344\276\213\345\233\272\345\214\226\345\210\206\347\273\204.txt"
deleted file mode 100644
index 55f508942f..0000000000
--- "a/XCoder/XRegex/Pattern/\345\271\263\350\241\241\347\273\204/\345\256\214\346\225\264\347\244\272\344\276\213\345\233\272\345\214\226\345\210\206\347\273\204.txt"
+++ /dev/null
@@ -1,10 +0,0 @@
-﻿\(                          #普通字符“(”
-    (?>                     #分组构造，用来限定量词“*”修饰范围，>表示固化分组，匹配失败时不回溯，性能较高
-        [^()]+              #非括弧的其它任意字符
-    |                       #分支结构
-        \(  (?<Open>)       #命名捕获组，遇到开括弧Open计数加1
-    |                       #分支结构
-        \)  (?<-Open>)      #狭义平衡组，遇到闭括弧Open计数减1
-    )*                      #以上子串出现0次或任意多次
-    (?(Open)(?!))           #判断是否还有'OPEN'，有则说明不配对，什么都不匹配
-\)                          #普通闭括弧
\ No newline at end of file
diff --git "a/XCoder/XRegex/Pattern/\345\271\263\350\241\241\347\273\204/\346\240\207\345\207\206.txt" "b/XCoder/XRegex/Pattern/\345\271\263\350\241\241\347\273\204/\346\240\207\345\207\206.txt"
deleted file mode 100644
index a9a17a5c07..0000000000
--- "a/XCoder/XRegex/Pattern/\345\271\263\350\241\241\347\273\204/\346\240\207\345\207\206.txt"
+++ /dev/null
@@ -1 +0,0 @@
-﻿(?:[^()]+|\((?<Open>)|\)(?<-Open>))*(?(Open)(?!))
\ No newline at end of file
diff --git "a/XCoder/XRegex/Pattern/\345\271\263\350\241\241\347\273\204/\346\240\207\345\207\206\345\233\272\345\214\226\345\210\206\347\273\204.txt" "b/XCoder/XRegex/Pattern/\345\271\263\350\241\241\347\273\204/\346\240\207\345\207\206\345\233\272\345\214\226\345\210\206\347\273\204.txt"
deleted file mode 100644
index a8e4b7f5fb..0000000000
--- "a/XCoder/XRegex/Pattern/\345\271\263\350\241\241\347\273\204/\346\240\207\345\207\206\345\233\272\345\214\226\345\210\206\347\273\204.txt"
+++ /dev/null
@@ -1 +0,0 @@
-﻿(?>[^()]+|\((?<Open>)|\)(?<-Open>))*(?(Open)(?!))
\ No newline at end of file
diff --git "a/XCoder/XRegex/Pattern/\347\275\221\351\241\265/\346\234\200\345\244\226\345\261\202\345\265\214\345\245\227.txt" "b/XCoder/XRegex/Pattern/\347\275\221\351\241\265/\346\234\200\345\244\226\345\261\202\345\265\214\345\245\227.txt"
deleted file mode 100644
index 8ac333a24d..0000000000
--- "a/XCoder/XRegex/Pattern/\347\275\221\351\241\265/\346\234\200\345\244\226\345\261\202\345\265\214\345\245\227.txt"
+++ /dev/null
@@ -1,11 +0,0 @@
-﻿(?isx)                          #匹配模式，忽略大小写，“.”匹配任意字符
-<div[^>]*>                      #开始标记“<div...>”
-    (?>                         #分组构造，用来限定量词“*”修饰范围
-        <div[^>]*>  (?<Open>)   #命名捕获组，遇到开始标记，入栈，Open计数加1
-    |                           #分支结构
-        </div>  (?<-Open>)      #狭义平衡组，遇到结束标记，出栈，Open计数减1
-    |                           #分支结构
-        (?:(?!</?div\b).)*      #右侧不为开始或结束标记的任意字符
-    )*                          #以上子串出现0次或任意多次
-    (?(Open)(?!))               #判断是否还有'OPEN'，有则说明不配对，什么都不匹配
-</div>                          #结束标记“</div>”
\ No newline at end of file
diff --git "a/XCoder/XRegex/Sample/SQL\346\237\245\350\257\242/MSSQL\350\241\250\347\273\223\346\236\204.txt" "b/XCoder/XRegex/Sample/SQL\346\237\245\350\257\242/MSSQL\350\241\250\347\273\223\346\236\204.txt"
deleted file mode 100644
index 95a2d296e4..0000000000
--- "a/XCoder/XRegex/Sample/SQL\346\237\245\350\257\242/MSSQL\350\241\250\347\273\223\346\236\204.txt"
+++ /dev/null
@@ -1,22 +0,0 @@
-﻿SELECT
-表名=d.name,--case when a.colorder=1 then d.name else '' end,
-字段序号=a.colorder,
-字段名=a.name,
-标识=case when COLUMNPROPERTY( a.id,a.name,'IsIdentity')=1 then '√'else '' end,
-主键=case when exists(SELECT 1 FROM sysobjects where xtype='PK' and name in (
-SELECT name FROM sysindexes WHERE indid in(
-   SELECT indid FROM sysindexkeys WHERE id = a.id AND colid=a.colid
-))) then '√' else '' end,
-类型=b.name,
-占用字节数=a.length,
-长度=COLUMNPROPERTY(a.id,a.name,'PRECISION'),
-小数位数=isnull(COLUMNPROPERTY(a.id,a.name,'Scale'),0),
-允许空=case when a.isnullable=1 then '√'else '' end,
-默认值=isnull(e.text,''),
-字段说明=isnull(g.[value],'')
-FROM syscolumns a
-left join systypes b on a.xtype=b.xusertype
-inner join sysobjects d on a.id=d.id and d.xtype='U' and d.name<>'dtproperties'
-left join syscomments e on a.cdefault=e.id
-left join sysproperties g on a.id=g.id and a.colid=g.smallid
-order by a.id,a.colorder
\ No newline at end of file
diff --git "a/XCoder/XRegex/Sample/SQL\346\237\245\350\257\242/\346\231\256\351\200\232\345\265\214\345\245\227\346\237\245\350\257\242.txt" "b/XCoder/XRegex/Sample/SQL\346\237\245\350\257\242/\346\231\256\351\200\232\345\265\214\345\245\227\346\237\245\350\257\242.txt"
deleted file mode 100644
index 58d25a49bc..0000000000
--- "a/XCoder/XRegex/Sample/SQL\346\237\245\350\257\242/\346\231\256\351\200\232\345\265\214\345\245\227\346\237\245\350\257\242.txt"
+++ /dev/null
@@ -1,6 +0,0 @@
-﻿Select Top 5 CategoryID, Count(*) as ProductCount 
-From (Select * From Product Where IsEnable=1) as XCode_Temp_1
-Where IsDelete=0
-Group By CategoryID
-Having Count(*)>10
-Order By Count(*) Desc
\ No newline at end of file
diff --git "a/XCoder/XRegex/Sample/SQL\346\237\245\350\257\242/\346\231\256\351\200\232\346\237\245\350\257\242.txt" "b/XCoder/XRegex/Sample/SQL\346\237\245\350\257\242/\346\231\256\351\200\232\346\237\245\350\257\242.txt"
deleted file mode 100644
index 48601273e3..0000000000
--- "a/XCoder/XRegex/Sample/SQL\346\237\245\350\257\242/\346\231\256\351\200\232\346\237\245\350\257\242.txt"
+++ /dev/null
@@ -1,6 +0,0 @@
-﻿Select Top 5 CategoryID, Count(*) as ProductCount 
-From Product as XCode_Temp_1
-Where IsDelete=0
-Group By CategoryID
-Having Count(*)>10
-Order By Count(*) Desc
\ No newline at end of file
diff --git "a/XCoder/XRegex/Sample/\345\271\263\350\241\241\347\273\204/\347\256\227\346\234\257\350\241\250\350\276\276\345\274\217.txt" "b/XCoder/XRegex/Sample/\345\271\263\350\241\241\347\273\204/\347\256\227\346\234\257\350\241\250\350\276\276\345\274\217.txt"
deleted file mode 100644
index fdbbbf8ea9..0000000000
--- "a/XCoder/XRegex/Sample/\345\271\263\350\241\241\347\273\204/\347\256\227\346\234\257\350\241\250\350\276\276\345\274\217.txt"
+++ /dev/null
@@ -1 +0,0 @@
-﻿a+(b*(c+d))/e+f-(g/(h-i))*j
\ No newline at end of file
diff --git "a/XCoder/XRegex/Sample/\347\275\221\351\241\265/\346\234\200\345\244\226\345\261\202\345\265\214\345\245\227.txt" "b/XCoder/XRegex/Sample/\347\275\221\351\241\265/\346\234\200\345\244\226\345\261\202\345\265\214\345\245\227.txt"
deleted file mode 100644
index 11529ed970..0000000000
--- "a/XCoder/XRegex/Sample/\347\275\221\351\241\265/\346\234\200\345\244\226\345\261\202\345\265\214\345\245\227.txt"
+++ /dev/null
@@ -1,9 +0,0 @@
-﻿<div id="0">
-    0
-</div>
-<div id="1">
-    1
-    <div id="2">
-        2
-</div>
-</div>
\ No newline at end of file
diff --git a/XCoder/Yun/FrmMap.Designer.cs b/XCoder/Yun/FrmMap.Designer.cs
deleted file mode 100644
index ebb34389e2..0000000000
--- a/XCoder/Yun/FrmMap.Designer.cs
+++ /dev/null
@@ -1,307 +0,0 @@
-﻿namespace XCoder.Yun
-{
-    partial class FrmMap
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.components = new System.ComponentModel.Container();
-            this.lbMethod = new System.Windows.Forms.Label();
-            this.label6 = new System.Windows.Forms.Label();
-            this.cbCoordtype = new System.Windows.Forms.ComboBox();
-            this.cbMethod = new System.Windows.Forms.ComboBox();
-            this.label5 = new System.Windows.Forms.Label();
-            this.label4 = new System.Windows.Forms.Label();
-            this.label2 = new System.Windows.Forms.Label();
-            this.chkFormatAddress = new System.Windows.Forms.CheckBox();
-            this.label1 = new System.Windows.Forms.Label();
-            this.txtAddress = new System.Windows.Forms.TextBox();
-            this.cbMap = new System.Windows.Forms.ComboBox();
-            this.pgResult = new System.Windows.Forms.PropertyGrid();
-            this.colorDialog1 = new System.Windows.Forms.ColorDialog();
-            this.fontDialog1 = new System.Windows.Forms.FontDialog();
-            this.btnInvoke = new System.Windows.Forms.Button();
-            this.txtReceive = new System.Windows.Forms.RichTextBox();
-            this.txtCity = new System.Windows.Forms.TextBox();
-            this.gbReceive = new System.Windows.Forms.GroupBox();
-            this.label3 = new System.Windows.Forms.Label();
-            this.txtLocation = new System.Windows.Forms.TextBox();
-            this.button1 = new System.Windows.Forms.Button();
-            this.label7 = new System.Windows.Forms.Label();
-            this.txtLocation2 = new System.Windows.Forms.TextBox();
-            this.gbReceive.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // gbReceive
-            // 
-            this.gbReceive.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-            | System.Windows.Forms.AnchorStyles.Left)
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.gbReceive.Controls.Add(this.txtReceive);
-            this.gbReceive.Location = new System.Drawing.Point(2, 108);
-            this.gbReceive.Name = "gbReceive";
-            this.gbReceive.Size = new System.Drawing.Size(381, 378);
-            this.gbReceive.TabIndex = 24;
-            this.gbReceive.TabStop = false;
-            // 
-            // lbMethod
-            // 
-            this.lbMethod.AutoSize = true;
-            this.lbMethod.Location = new System.Drawing.Point(490, 16);
-            this.lbMethod.Name = "lbMethod";
-            this.lbMethod.Size = new System.Drawing.Size(53, 12);
-            this.lbMethod.TabIndex = 39;
-            this.lbMethod.Text = "方法签名";
-            // 
-            // label6
-            // 
-            this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(155, 16);
-            this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(53, 12);
-            this.label6.TabIndex = 35;
-            this.label6.Text = "坐标系：";
-            // 
-            // cbCoordtype
-            // 
-            this.cbCoordtype.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cbCoordtype.FormattingEnabled = true;
-            this.cbCoordtype.Location = new System.Drawing.Point(214, 12);
-            this.cbCoordtype.Name = "cbCoordtype";
-            this.cbCoordtype.Size = new System.Drawing.Size(77, 20);
-            this.cbCoordtype.TabIndex = 34;
-            // 
-            // cbMethod
-            // 
-            this.cbMethod.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cbMethod.FormattingEnabled = true;
-            this.cbMethod.Location = new System.Drawing.Point(344, 12);
-            this.cbMethod.Name = "cbMethod";
-            this.cbMethod.Size = new System.Drawing.Size(128, 20);
-            this.cbMethod.TabIndex = 33;
-            // 
-            // label5
-            // 
-            this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(297, 16);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(41, 12);
-            this.label5.TabIndex = 32;
-            this.label5.Text = "接口：";
-            // 
-            // label4
-            // 
-            this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(16, 16);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(41, 12);
-            this.label4.TabIndex = 31;
-            this.label4.Text = "地图：";
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(342, 48);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(41, 12);
-            this.label2.TabIndex = 30;
-            this.label2.Text = "城市：";
-            // 
-            // chkFormatAddress
-            // 
-            this.chkFormatAddress.AutoSize = true;
-            this.chkFormatAddress.Checked = true;
-            this.chkFormatAddress.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.chkFormatAddress.Location = new System.Drawing.Point(482, 46);
-            this.chkFormatAddress.Name = "chkFormatAddress";
-            this.chkFormatAddress.Size = new System.Drawing.Size(84, 16);
-            this.chkFormatAddress.TabIndex = 38;
-            this.chkFormatAddress.Text = "格式化地址";
-            this.chkFormatAddress.UseVisualStyleBackColor = true;
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(16, 48);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(41, 12);
-            this.label1.TabIndex = 29;
-            this.label1.Text = "地址：";
-            // 
-            // txtAddress
-            // 
-            this.txtAddress.Location = new System.Drawing.Point(63, 44);
-            this.txtAddress.Name = "txtAddress";
-            this.txtAddress.Size = new System.Drawing.Size(256, 21);
-            this.txtAddress.TabIndex = 27;
-            this.txtAddress.Text = "陆家嘴银城中路501号";
-            // 
-            // cbMap
-            // 
-            this.cbMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cbMap.FormattingEnabled = true;
-            this.cbMap.Location = new System.Drawing.Point(63, 12);
-            this.cbMap.Name = "cbMap";
-            this.cbMap.Size = new System.Drawing.Size(89, 20);
-            this.cbMap.TabIndex = 26;
-            this.cbMap.SelectedIndexChanged += new System.EventHandler(this.cbMap_SelectedIndexChanged);
-            // 
-            // pgResult
-            // 
-            this.pgResult.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.pgResult.LineColor = System.Drawing.SystemColors.ControlDark;
-            this.pgResult.Location = new System.Drawing.Point(386, 108);
-            this.pgResult.Name = "pgResult";
-            this.pgResult.PropertySort = System.Windows.Forms.PropertySort.NoSort;
-            this.pgResult.Size = new System.Drawing.Size(281, 375);
-            this.pgResult.TabIndex = 25;
-            // 
-            // btnInvoke
-            // 
-            this.btnInvoke.Location = new System.Drawing.Point(559, 8);
-            this.btnInvoke.Name = "btnInvoke";
-            this.btnInvoke.Size = new System.Drawing.Size(67, 29);
-            this.btnInvoke.TabIndex = 23;
-            this.btnInvoke.Text = "调用";
-            this.btnInvoke.UseVisualStyleBackColor = true;
-            this.btnInvoke.Click += new System.EventHandler(this.btnInvoke_Click);
-            // 
-            // txtReceive
-            // 
-            this.txtReceive.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.txtReceive.HideSelection = false;
-            this.txtReceive.Location = new System.Drawing.Point(3, 17);
-            this.txtReceive.Name = "txtReceive";
-            this.txtReceive.Size = new System.Drawing.Size(375, 358);
-            this.txtReceive.TabIndex = 22;
-            this.txtReceive.Text = "";
-            // 
-            // txtCity
-            // 
-            this.txtCity.Location = new System.Drawing.Point(392, 44);
-            this.txtCity.Name = "txtCity";
-            this.txtCity.Size = new System.Drawing.Size(75, 21);
-            this.txtCity.TabIndex = 28;
-            this.txtCity.Text = "上海";
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(18, 77);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(41, 12);
-            this.label3.TabIndex = 36;
-            this.label3.Text = "坐标：";
-            // 
-            // txtLocation
-            // 
-            this.txtLocation.Location = new System.Drawing.Point(63, 73);
-            this.txtLocation.Name = "txtLocation";
-            this.txtLocation.Size = new System.Drawing.Size(211, 21);
-            this.txtLocation.TabIndex = 37;
-            // 
-            // button1
-            // 
-            this.button1.Location = new System.Drawing.Point(0, 0);
-            this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(75, 23);
-            this.button1.TabIndex = 0;
-            // 
-            // label7
-            // 
-            this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(299, 77);
-            this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(65, 12);
-            this.label7.TabIndex = 39;
-            this.label7.Text = "第二坐标：";
-            // 
-            // txtLocation2
-            // 
-            this.txtLocation2.Location = new System.Drawing.Point(370, 73);
-            this.txtLocation2.Name = "txtLocation2";
-            this.txtLocation2.Size = new System.Drawing.Size(211, 21);
-            this.txtLocation2.TabIndex = 40;
-            // 
-            // FrmMap
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(670, 488);
-            this.Controls.Add(this.label7);
-            this.Controls.Add(this.txtLocation2);
-            this.Controls.Add(this.label6);
-            this.Controls.Add(this.cbCoordtype);
-            this.Controls.Add(this.cbMethod);
-            this.Controls.Add(this.label5);
-            this.Controls.Add(this.label4);
-            this.Controls.Add(this.label2);
-            this.Controls.Add(this.label1);
-            this.Controls.Add(this.txtCity);
-            this.Controls.Add(this.txtAddress);
-            this.Controls.Add(this.cbMap);
-            this.Controls.Add(this.pgResult);
-            this.Controls.Add(this.btnInvoke);
-            this.Controls.Add(this.gbReceive);
-            this.Controls.Add(this.label3);
-            this.Controls.Add(this.txtLocation);
-            this.Controls.Add(this.chkFormatAddress);
-            this.Name = "FrmMap";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "地图接口";
-            this.Load += new System.EventHandler(this.FrmMain_Load);
-            this.gbReceive.ResumeLayout(false);
-            this.ResumeLayout(false);
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Label lbMethod;
-        private System.Windows.Forms.Label label6;
-        private System.Windows.Forms.ComboBox cbCoordtype;
-        private System.Windows.Forms.ComboBox cbMethod;
-        private System.Windows.Forms.Label label5;
-        private System.Windows.Forms.Label label4;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.CheckBox chkFormatAddress;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.TextBox txtAddress;
-        private System.Windows.Forms.ComboBox cbMap;
-        private System.Windows.Forms.PropertyGrid pgResult;
-        private System.Windows.Forms.ColorDialog colorDialog1;
-        private System.Windows.Forms.FontDialog fontDialog1;
-        private System.Windows.Forms.Button btnInvoke;
-        private System.Windows.Forms.RichTextBox txtReceive;
-        private System.Windows.Forms.TextBox txtCity;
-        private System.Windows.Forms.GroupBox gbReceive;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.TextBox txtLocation;
-        private System.Windows.Forms.Button button1;
-        private System.Windows.Forms.Label label7;
-        private System.Windows.Forms.TextBox txtLocation2;
-    }
-}
\ No newline at end of file
diff --git a/XCoder/Yun/FrmMap.cs b/XCoder/Yun/FrmMap.cs
deleted file mode 100644
index ed7c8a3533..0000000000
--- a/XCoder/Yun/FrmMap.cs
+++ /dev/null
@@ -1,248 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Reflection;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using NewLife.Data;
-using NewLife.Log;
-using NewLife.Reflection;
-using NewLife.Serialization;
-using NewLife.Yun;
-
-namespace XCoder.Yun
-{
-    [DisplayName("地图接口")]
-    public partial class FrmMap : Form, IXForm
-    {
-        /// <summary>业务日志输出</summary>
-        ILog BizLog;
-
-        //IDictionary<String, Type> Maps = new Dictionary<String, Type>();
-        //IDictionary<String, String> Methods = new Dictionary<String, String>();
-
-        #region 窗体
-        public FrmMap()
-        {
-            InitializeComponent();
-
-            // 动态调节宽度高度，兼容高DPI
-            this.FixDpi();
-
-            Icon = IcoHelper.GetIcon("地图");
-        }
-
-        private void FrmMain_Load(Object sender, EventArgs e)
-        {
-            var log = TextFileLog.Create(null, "Map_{0:yyyy_MM_dd}.log");
-            BizLog = txtReceive.Combine(log);
-            txtReceive.UseWinFormControl();
-
-            txtReceive.SetDefaultStyle(12);
-
-            // 加载保存的颜色
-            UIConfig.Apply(txtReceive);
-
-            LoadConfig();
-
-            var cfg = Setting;
-
-            var cb = cbMap;
-            cb.Items.Clear();
-            cb.DisplayMember = "Name";
-            foreach (var item in typeof(IMap).GetAllSubclasses(true))
-            {
-                //var name = item.GetDisplayName() ?? item.Name;
-                //Maps[name] = item;
-                //cb.Items.Add(name);
-                cb.Items.Add(item);
-
-                if (cfg.Map == item.Name) cb.SelectedItem = item;
-            }
-            //if (cb.Items.Count > 0) cb.SelectedText = cfg.Map;
-        }
-        #endregion
-
-        #region 配置
-        MapSetting Setting;
-
-        void LoadConfig()
-        {
-            var cfg = Setting = MapSetting.Current;
-
-            txtAddress.Text = cfg.Address;
-            txtCity.Text = cfg.City;
-            txtLocation.Text = cfg.Location;
-            txtLocation2.Text = cfg.Location2;
-            chkFormatAddress.Checked = cfg.FormatAddress;
-
-            //cbMap.SelectedValue = cfg.Map;
-            //cbMethod.SelectedValue = cfg.Method;
-            //cbCoordtype.SelectedValue = cfg.Coordtype;
-        }
-
-        void SaveConfig()
-        {
-            var cfg = Setting = MapSetting.Current;
-
-            cfg.Address = txtAddress.Text;
-            cfg.City = txtCity.Text;
-            cfg.Location = txtLocation.Text;
-            cfg.Location2 = txtLocation2.Text;
-            cfg.FormatAddress = chkFormatAddress.Checked;
-
-            cfg.Map = (cbMap.SelectedItem as Type)?.Name;
-            cfg.Method = (cbMethod.SelectedItem as MethodInfo)?.Name;
-            cfg.Coordtype = cbCoordtype.SelectedItem as String;
-
-            cfg.Save();
-        }
-        #endregion
-
-        #region 收发数据
-        private void btnInvoke_Click(Object sender, EventArgs e)
-        {
-            var type = cbMap.SelectedItem as Type;
-            if (type == null) return;
-
-            var method = cbMethod.SelectedItem as MethodInfo;
-            if (method == null) return;
-
-            SaveConfig();
-            var cfg = Setting;
-
-            var map = type.CreateInstance() as NewLife.Yun.Map;
-            map.Log = XTrace.Log;
-            map.CoordType = cfg.Coordtype;
-
-            // 准备参数
-            var addr = txtAddress.Text;
-            var city = txtCity.Text;
-            var point = new GeoPoint(txtLocation.Text);
-            var point2 = new GeoPoint(txtLocation2.Text);
-
-            var mps = method.GetParameters();
-
-            Task.Factory.StartNew(async () =>
-            {
-                Object result = null;
-                //var point = new GeoPoint(cfg.Location);
-                //var point2 = new GeoPoint(cfg.Location2);
-                try
-                {
-                    var im = map as IMap;
-                    if (method.Name == nameof(im.GetGeocoderAsync) && mps.Length == 2)
-                    {
-                        result = await im.GetGeocoderAsync(addr,city);
-                    }
-                    else if (method.Name == nameof(im.GetGeocoderAsync) && mps.Length == 1)
-                    {
-                        result = await im.GetGeocoderAsync(point);
-                    }
-                    else if (method.Name == nameof(im.GetGeoAsync) && mps.Length == 3)
-                    {
-                        result = await im.GetGeoAsync(addr, city, cfg.FormatAddress);
-                    }
-                    else if (method.Name == nameof(im.GetGeoAsync) && mps.Length == 1)
-                    {
-                        result = await im.GetGeoAsync(point);
-                    }
-                    else if (method.Name == nameof(im.GetDistanceAsync))
-                    {
-                        result = await im.GetDistanceAsync(point, point2);
-                    }
-                    else if (map is BaiduMap bd && method.Name == nameof(bd.PlaceSearchAsync))
-                    {
-                        result = await bd.PlaceSearchAsync(addr, null, city, cfg.FormatAddress);
-                    }
-                    else if (map is AMap am && method.Name == nameof(am.GetAreaAsync))
-                    {
-                        result = (await am.GetAreaAsync(city))?.ToArray();
-                    }
-                    else
-                    {
-                        var ps = new Dictionary<String, Object>();
-                        if (mps.Any(k => k.Name.EqualIgnoreCase("address"))) ps["address"] = addr;
-                        if (mps.Any(k => k.Name.EqualIgnoreCase("city"))) ps["city"] = cfg.City;
-
-                        var task = map.InvokeWithParams(method, ps) as Task;
-                        await task;
-
-                        result = task.GetValue("Result");
-                    }
-                }
-                catch (Exception ex)
-                {
-                    ex = ex.GetTrue();
-                    if (ex.GetType() == typeof(Exception))
-                        XTrace.WriteLine(ex.Message);
-                    else
-                        XTrace.WriteException(ex);
-                    return;
-                }
-
-                this.Invoke(() =>
-                {
-                    pgResult.SelectedObject = result;
-
-                    if (result is GeoAddress geo)
-                        txtLocation.Text = geo.Location + "";
-                    else if (result is GeoPoint gp)
-                        txtLocation.Text = gp + "";
-                });
-
-                //XTrace.WriteLine(map.LastUrl);
-
-                var js = new JsonParser(map.LastString).Decode();
-                XTrace.WriteLine(js.ToJson(true));
-            });
-        }
-        #endregion
-
-        private void cbMap_SelectedIndexChanged(Object sender, EventArgs e)
-        {
-            //var name = cbMap.SelectedItem + "";
-            //if (!Maps.TryGetValue(name, out var type)) return;
-            var type = cbMap.SelectedItem as Type;
-            if (type == null) return;
-
-            var cfg = Setting;
-
-            var cb = cbMethod;
-            cb.Items.Clear();
-            //Methods.Clear();
-            cb.DisplayMember = "Name";
-            foreach (var item in type.GetMethods())
-            {
-                if (item.DeclaringType != type) continue;
-
-                //var name = item.Name;
-                //Methods.Add(name, name);
-
-                cb.Items.Add(item);
-                if (cfg.Method == item.Name) cb.SelectedItem = item;
-            }
-            //if (cb.Items.Count > 0) cb.SelectedIndex = 0;
-
-            cb = cbCoordtype;
-            cb.Items.Clear();
-
-            if (type.Name.Contains("Baidu"))
-            {
-                cb.Items.Add("bd09ll");
-                cb.Items.Add("bd09mc");
-            }
-            //else if (name.Contains("高德"))
-            //{
-
-            //}
-
-            cb.Items.Add("gcj02ll");
-            cb.Items.Add("wgs84ll");
-
-            //cb.SelectedIndex = 0;
-            cb.SelectedItem = cfg.Coordtype;
-        }
-    }
-}
\ No newline at end of file
diff --git a/XCoder/Yun/FrmMap.resx b/XCoder/Yun/FrmMap.resx
deleted file mode 100644
index 6335d46f7f..0000000000
--- a/XCoder/Yun/FrmMap.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="colorDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="fontDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>144, 17</value>
-  </metadata>
-</root>
\ No newline at end of file
diff --git a/XCoder/Yun/MapSetting.cs b/XCoder/Yun/MapSetting.cs
deleted file mode 100644
index 78ee6a6502..0000000000
--- a/XCoder/Yun/MapSetting.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using NewLife.Xml;
-
-namespace XCoder.Yun
-{
-    [XmlConfigFile("Config\\Map.config", 15000)]
-    class MapSetting : XmlConfig<MapSetting>
-    {
-        #region 属性
-        /// <summary>接口</summary>
-        [Description("接口")]
-        public String Map { get; set; }
-
-        /// <summary>坐标系</summary>
-        [Description("坐标系")]
-        public String Coordtype { get; set; }
-
-        /// <summary>方法</summary>
-        [Description("方法")]
-        public String Method { get; set; }
-
-        /// <summary>地址</summary>
-        [Description("地址")]
-        public String Address { get; set; } = "陆家嘴银城中路501号";
-
-        /// <summary>城市</summary>
-        [Description("城市")]
-        public String City { get; set; } = "上海";
-
-        /// <summary>坐标</summary>
-        [Description("坐标")]
-        public String Location { get; set; }
-
-        /// <summary>坐标2</summary>
-        [Description("坐标2")]
-        public String Location2 { get; set; }
-
-        /// <summary>格式化地址</summary>
-        [Description("格式化地址")]
-        public Boolean FormatAddress { get; set; } = true;
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/XCoder/leaf.ico b/XCoder/leaf.ico
deleted file mode 100644
index 31fa6dd659..0000000000
Binary files a/XCoder/leaf.ico and /dev/null differ
diff --git a/XCoder/packages.config b/XCoder/packages.config
deleted file mode 100644
index 55225cb928..0000000000
--- a/XCoder/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="UDE.CSharp" version="1.1.0" targetFramework="net40" />
-</packages>
\ No newline at end of file
diff --git "a/XCoder/\345\217\221\345\270\203NuGet.cs" "b/XCoder/\345\217\221\345\270\203NuGet.cs"
deleted file mode 100644
index d8694f4fce..0000000000
--- "a/XCoder/\345\217\221\345\270\203NuGet.cs"
+++ /dev/null
@@ -1 +0,0 @@
-//include=..\发布NuGet.cs
\ No newline at end of file
diff --git "a/XCoder/\346\225\260\346\215\256\345\272\223\345\221\275\345\220\215\350\247\204\350\214\203.txt" "b/XCoder/\346\225\260\346\215\256\345\272\223\345\221\275\345\220\215\350\247\204\350\214\203.txt"
deleted file mode 100644
index 077e7571d9..0000000000
--- "a/XCoder/\346\225\260\346\215\256\345\272\223\345\221\275\345\220\215\350\247\204\350\214\203.txt"
+++ /dev/null
@@ -1,9 +0,0 @@
-﻿1，名称必须使用通俗易懂的英文单词全拼，常用的缩略词（如ID）除外
-2，使用驼峰命名规则，每个单词首字母大写，其它小写
-3，名称必须简洁明了，不要加多余的前缀（如表名前加tbl），字段名也不要加表名前缀。代码生成可选去前缀
-4，不得使用SQL关键字或C#关键字作为表名或字段名。代码生成会自动加后缀
-5，建议使用数据库常用类型，如字符串类型使用nvarchar，大文本使用ntext。便于跨数据库
-6，建议给每张表和每个字段加上说明。生成代码的注释，XCoder也有自动翻译
-7，建议给每张表建立一个自增的ID字段并作为主键，以利于数据分页管理。非MS体系数据库使用单一主键即可
-8，建议主从表中，从表加关联字段（主表名+主表主键名）。XCode会识别为主从关系，生成扩展属性
-9，建议给每张表设置好索引，注意是否唯一。XCode会识别为索引，生成扩展查询，并支持保存数据前的验证
\ No newline at end of file
diff --git a/XTemplate/App.config b/XTemplate/App.config
deleted file mode 100644
index 50915689fb..0000000000
--- a/XTemplate/App.config
+++ /dev/null
@@ -1,22 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <appSettings>
-    <!--模版引擎配置-->
-    <!--是否启用调试，默认不启用-->
-    <add key="XTemplate.Debug" value="true" />
-    <!--模版引用的程序集，多个用逗号或分号隔开-->
-    <add key="XTemplate.References" value="" />
-    <!--模版引用的命名空间，多个用逗号或分号隔开-->
-    <add key="XTemplate.Imports" value="" />
-    <!--模版基类名-->
-    <add key="XTemplate.BaseClassName" value="" />
-  </appSettings>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.2.29.0" newVersion="2.2.29.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
diff --git a/XTemplate/Properties/AssemblyInfo.cs b/XTemplate/Properties/AssemblyInfo.cs
deleted file mode 100644
index ea5f787f23..0000000000
--- a/XTemplate/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-﻿using System;
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// 有关程序集的常规信息通过以下
-// 特性集控制。更改这些特性值可修改
-// 与程序集关联的信息。
-[assembly: AssemblyTitle("新生命模版引擎")]
-[assembly: AssemblyDescription("编译型模版引擎")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyProduct("XTemplate")]
-[assembly: AssemblyCompany("新生命开发团队")]
-[assembly: AssemblyCopyright("©2002-2018 新生命开发团队 http://www.NewLifeX.com")]
-[assembly: AssemblyTrademark("四叶草")]
-[assembly: AssemblyCulture("")]
-
-// 将 ComVisible 设置为 false 使此程序集中的类型
-// 对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型，
-// 则将该类型上的 ComVisible 特性设置为 true。
-[assembly: ComVisible(false)]
-
-// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
-[assembly: Guid("7285c38e-a761-4a76-96e4-c9f89867ab14")]
-
-// 程序集的版本信息由下面四个值组成:
-//
-//      主版本
-//      次版本 
-//      内部版本号
-//      修订号
-//
-// 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
-// 方法是按如下所示使用“*”:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.*")]
-[assembly: AssemblyFileVersion("2.0.2016.0728")]
-
-/*
- * v2.0.2016.0728   模版运行出错时，准确提示错误所在模版位置
- * 
- * v1.9.2013.0901   增加模版运行时调试功能，原有编译时调试
- * 
- * v1.8.2012.0113   修正类名处理的BUG
- * 
- * v1.8.2011.1124   调整模版的编译，不再输出临时文件，改为输出模版生成的代码
- * 
- * v1.8.2011.1120   增加模版执行错误异常TemplateExecutionException，所有Render产生的异常都经过其包装
- *                  修正处理指令的一个错误
- * 
- * v1.7.2011.0904   include指令包含其它模版文件时，如果没有全路径，则采用当前模版的相对路径
- * 
- * v1.6.2011.0831   改善编译错误提示，增加提示错误行及上下行共三行源代码
- * 
- * v1.5.2011.0603   增加var指令，允许指定创建封装自Data的模版变量：<#@var name="pname" type="String"#>，然后<#=pname#>等同于<#=Data["pname"]#>
- *                  template指令，增加name属性，允许指定模版名称
- * 
- * v1.4.2011.0316   Template中原来的静态方法Process改为ProcessFile，另外根据需要增加常用的静态方法ProcessContent
- *                  核心类Template改为私有构造，统一由带缓存的静态Create创建实例，避免分析及编译模版带来的性能损耗
- * 
- * v1.3.2011.0314   修正放置XTemp目录不正确的错误
- * 
- * v1.3.2010.1014   取消模版优化处理，保证模版的输出原汁原味，模版编辑人员更加容易理解
- * 
- * v1.2.2010.1009   重整XTemplate结构，批量处理模版，编译到同一个程序集去。
- * 
- * v1.1.2010.0927   使用C#作为模版语言，支持自定义模版基类，支持模版包含，支持类成员定义，支持编译语法检查
- * 
- * v1.0.2010.0609   创建
- *
-**/
diff --git a/XTemplate/Setting.cs b/XTemplate/Setting.cs
deleted file mode 100644
index 0fa7dbaa6f..0000000000
--- a/XTemplate/Setting.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-﻿using System;
-using System.ComponentModel;
-using NewLife.Xml;
-
-namespace XTemplate
-{
-    /// <summary>XTemplate设置</summary>
-    [DisplayName("XTemplate设置")]
-    [XmlConfigFile(@"Config\XTemplate.config", 15000)]
-    public class Setting : XmlConfig<Setting>
-    {
-        #region 属性
-        /// <summary>是否启用调试。默认不启用</summary>
-        [Description("是否启用调试，默认不启用")]
-        public Boolean Debug { get; set; }
-
-        /// <summary>模版引用的程序集，多个用逗号或分号隔开</summary>
-        [Description("模版引用的程序集，多个用逗号或分号隔开")]
-        public String References { get; set; } = "";
-
-        /// <summary>模版引用的命名空间，多个用逗号或分号隔开</summary>
-        [Description("模版引用的命名空间，多个用逗号或分号隔开")]
-        public String Imports { get; set; } = "";
-
-        /// <summary>模版基类名</summary>
-        [Description("模版基类名")]
-        public String BaseClassName { get; set; } = "";
-        #endregion
-
-        #region 方法
-        /// <summary>实例化设置</summary>
-        public Setting()
-        {
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/XTemplate/Tags/TagTemplate.cs b/XTemplate/Tags/TagTemplate.cs
deleted file mode 100644
index a751bed397..0000000000
--- a/XTemplate/Tags/TagTemplate.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Text.RegularExpressions;
-
-namespace XTemplate.Tags
-{
-    /// <summary>标签模版</summary>
-    public class TagTemplate
-    {
-        static Regex _tag = new Regex(@"", RegexOptions.Compiled);
-
-        /// <summary></summary>
-        /// <param name="str"></param>
-        /// <returns></returns>
-        public String Process(String str)
-        {
-            return str;
-        }
-    }
-}
\ No newline at end of file
diff --git a/XTemplate/Templating/Block.cs b/XTemplate/Templating/Block.cs
deleted file mode 100644
index bcfb527e41..0000000000
--- a/XTemplate/Templating/Block.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-﻿using System;
-
-namespace XTemplate.Templating
-{
-    /// <summary>代码块</summary>
-    internal sealed class Block
-    {
-        #region 构造
-        /// <summary>实例化一个代码块对象</summary>
-        public Block() { }
-
-        /// <summary>实例化一个代码块对象</summary>
-        /// <param name="type">类型</param>
-        /// <param name="text"></param>
-        public Block(BlockType type, String text)
-        {
-            Type = type;
-            Text = text;
-        }
-        #endregion
-
-        #region 行号/列数
-        /// <summary>开始列数</summary>
-        public Int32 StartColumn { get; set; }
-
-        /// <summary>开始行数</summary>
-        public Int32 StartLine { get; set; }
-
-        /// <summary>结束列数</summary>
-        public Int32 EndColumn { get; set; }
-
-        /// <summary>结束行数</summary>
-        public Int32 EndLine { get; set; }
-        #endregion
-
-        #region 基本属性
-        /// <summary>文件名</summary>
-        public String Name { get; set; }
-
-        /// <summary>文本</summary>
-        public String Text { get; set; }
-
-        /// <summary>块类型</summary>
-        public BlockType Type { get; set; }
-        #endregion
-
-        #region 方法
-        /// <summary>已重载。</summary>
-        /// <returns></returns>
-        public override String ToString()
-        {
-            return ToFullString();
-        }
-
-        /// <summary>转为完成字符串</summary>
-        /// <returns></returns>
-        public String ToFullString()
-        {
-            return String.Format("{0} {1}行 {2}列 ({3}) {4}", Name, StartLine, StartColumn, Type, Text);
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/XTemplate/Templating/BlockType.cs b/XTemplate/Templating/BlockType.cs
deleted file mode 100644
index 920f6d2478..0000000000
--- a/XTemplate/Templating/BlockType.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-﻿
-namespace XTemplate.Templating
-{
-    /// <summary>代码块类型</summary>
-    internal enum BlockType
-    {
-        /// <summary>指令</summary>
-        Directive,
-
-        /// <summary>成员</summary>
-        Member,
-
-        /// <summary>模版文本</summary>
-        Text,
-
-        /// <summary>语句</summary>
-        Statement,
-
-        /// <summary>表达式</summary>
-        Expression
-    }
-}
\ No newline at end of file
diff --git a/XTemplate/Templating/Directive.cs b/XTemplate/Templating/Directive.cs
deleted file mode 100644
index 1df4c74019..0000000000
--- a/XTemplate/Templating/Directive.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-
-namespace XTemplate.Templating
-{
-    /// <summary>指令</summary>
-    internal sealed class Directive
-    {
-        /// <summary>实例化一个指令对象</summary>
-        /// <param name="name">名称</param>
-        /// <param name="parameters">参数数组</param>
-        /// <param name="block"></param>
-        public Directive(String name, IDictionary<String, String> parameters, Block block)
-        {
-            Name = name;
-            Parameters = parameters;
-            Block = block;
-        }
-
-        /// <summary>块</summary>
-        public Block Block { get; private set; }
-
-        /// <summary>指令名</summary>
-        public String Name { get; private set; }
-
-        /// <summary>参数集合</summary>
-        public IDictionary<String, String> Parameters { get; private set; }
-
-        /// <summary>读取参数值</summary>
-        /// <param name="name">参数名</param>
-        /// <returns></returns>
-        public String GetParameter(String name)
-        {
-            String value;
-            if (TryGetParameter(name, out value)) return value;
-
-            throw new TemplateException(Block, String.Format("{0}指令缺少{1}参数！", Name, name));
-        }
-
-        /// <summary>尝试读取参数值</summary>
-        /// <param name="name">参数名</param>
-        /// <param name="value">参数值</param>
-        /// <returns></returns>
-        public Boolean TryGetParameter(String name, out String value)
-        {
-            value = null;
-
-            var ps = Parameters;
-            if (ps == null || ps.Count < 1) return false;
-
-            if (ps.TryGetValue(name, out value) || ps.TryGetValue(name.ToLower(), out value)) return true;
-
-            foreach (var item in ps)
-            {
-                if (item.Key.EqualIgnoreCase(name))
-                {
-                    value = item.Value;
-                    return true;
-                }
-            }
-
-            return false;
-        }
-    }
-}
\ No newline at end of file
diff --git a/XTemplate/Templating/EncodingHelper.cs b/XTemplate/Templating/EncodingHelper.cs
deleted file mode 100644
index 908e154835..0000000000
--- a/XTemplate/Templating/EncodingHelper.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-﻿namespace Microsoft.VisualStudio.TextTemplating
-{
-    using System;
-    using System.IO;
-    using System.Text;
-
-    public static class EncodingHelper
-    {
-        public static Encoding GetEncoding(string filePath)
-        {
-            if (filePath == null)
-            {
-                throw new ArgumentNullException("filePath");
-            }
-            Encoding currentEncoding = Encoding.Default;
-            if (!File.Exists(filePath))
-            {
-                return currentEncoding;
-            }
-            try
-            {
-                using (FileStream stream = new FileStream(filePath, FileMode.Open, FileAccess.Read))
-                {
-                    if (stream.Length > 0L)
-                    {
-                        using (StreamReader reader = new StreamReader(stream, true))
-                        {
-                            char[] chArray = new char[1];
-                            reader.Read(chArray, 0, 1);
-                            currentEncoding = reader.CurrentEncoding;
-                            reader.BaseStream.Position = 0L;
-                            if (currentEncoding == Encoding.UTF8)
-                            {
-                                byte[] preamble = currentEncoding.GetPreamble();
-                                if (stream.Length >= preamble.Length)
-                                {
-                                    byte[] buffer = new byte[preamble.Length];
-                                    stream.Read(buffer, 0, buffer.Length);
-                                    for (int i = 0; i < buffer.Length; i++)
-                                    {
-                                        if (buffer[i] != preamble[i])
-                                        {
-                                            currentEncoding = Encoding.Default;
-                                            goto Label_00EF;
-                                        }
-                                    }
-                                }
-                                else
-                                {
-                                    currentEncoding = Encoding.Default;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            catch (Exception exception)
-            {
-                if (Engine.IsCriticalException(exception))
-                {
-                    throw;
-                }
-            }
-        Label_00EF:
-            if (currentEncoding == null)
-            {
-                currentEncoding = Encoding.UTF8;
-            }
-            return currentEncoding;
-        }
-    }
-}
-
diff --git a/XTemplate/Templating/Template.cs b/XTemplate/Templating/Template.cs
deleted file mode 100644
index e2f2500220..0000000000
--- a/XTemplate/Templating/Template.cs
+++ /dev/null
@@ -1,1158 +0,0 @@
-﻿using System;
-using System.CodeDom;
-using System.CodeDom.Compiler;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using Microsoft.CSharp;
-using NewLife;
-using NewLife.Collections;
-using NewLife.Log;
-using NewLife.Reflection;
-
-namespace XTemplate.Templating
-{
-    /// <summary>模版引擎</summary>
-    /// <remarks>
-    /// 模版引擎分为快速用法和增强用法两种，其中增强用法可用于对模版处理的全程进行干预。
-    /// 一个模版引擎实例，可用重复使用以处理多个模版。
-    /// </remarks>
-    /// <example>
-    /// 快速用法（单个模版处理）：
-    /// <code>
-    /// // 以名值字典的方式传入参数，模版内部通过Data["name"]的方式获取，也可以使用GetData&lt;T&gt;(String name)方法
-    /// Dictionary&lt;String, Object&gt; data = new Dictionary&lt;String, Object&gt;();
-    /// data["name"] = "参数测试";
-    /// 
-    /// // 如果有包含模版，则以相对于模版文件的路径加载
-    /// String content = Template.ProcessFile("模版文件.txt", data);
-    /// // 传入内容的用法。如果不指定模版名，则默认使用Class。如果有包含模版，则无法识别。
-    /// // String content = Template.ProcessTemplate("模版名", "模版内容", data);
-    /// </code>
-    /// 中级用法（多模版处理推荐）：
-    /// <code>
-    /// // 多个模版，包括被包含的模版，一起打包成为模版集合。如果有包含模版，则根据模版名来引用
-    /// Dictionary&lt;String, String&gt; templates = new Dictionary&lt;String, String&gt;();
-    /// templates.Add("模版1"， File.ReadAllText("模版文件1.txt"));
-    /// templates.Add("模版2"， File.ReadAllText("模版文件2.txt"));
-    /// templates.Add("模版3"， File.ReadAllText("模版文件3.txt"));
-    /// 
-    /// Dictionary&lt;String, Object&gt; data = new Dictionary&lt;String, Object&gt;();
-    /// data["name"] = "参数测试";
-    /// 
-    /// Template tt = Create(name, template);
-    /// String content = tt.Render("模版1", data);
-    /// </code>
-    /// 高级用法（仅用于需要仔细控制每一步的场合，比如仅编译模版来检查语法）：
-    /// <code>
-    /// Template tt = new Template();
-    /// tt.AddTemplateItem("模版1"， File.ReadAllText("模版文件1.txt"));
-    /// tt.AddTemplateItem("模版2"， File.ReadAllText("模版文件2.txt"));
-    /// tt.AddTemplateItem("模版3"， File.ReadAllText("模版文件3.txt"));
-    /// tt.Process();
-    /// tt.Compile();
-    /// TemplateBase temp = tt.CreateInstance("模版1");
-    /// temp.Data["name"] = "参数测试";
-    /// return temp.Render();
-    /// </code>
-    /// </example>
-    public partial class Template : DisposeBase
-    {
-        #region 属性
-        /// <summary>编译错误集合</summary>
-        public CompilerErrorCollection Errors { get; private set; } = new CompilerErrorCollection();
-
-        /// <summary>模版集合</summary>
-        public List<TemplateItem> Templates { get; private set; } = new List<TemplateItem>();
-
-        /// <summary>程序集引用</summary>
-        public List<String> AssemblyReferences { get; private set; } = new List<String>();
-
-        /// <summary>程序集名称。一旦指定，编译时将会生成持久化的模版程序集文件。</summary>
-        public String AssemblyName { get; set; }
-
-        private Assembly _Assembly;
-        /// <summary>程序集</summary>
-        public Assembly Assembly
-        {
-            get
-            {
-                if (_Assembly == null && !String.IsNullOrEmpty(AssemblyName))
-                {
-                    var file = AssemblyName;
-                    if (!Path.IsPathRooted(file)) file = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, file);
-                    if (!File.Exists(file)) file = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, Path.Combine("Bin", AssemblyName));
-                    if (File.Exists(file)) _Assembly = Assembly.LoadFile(file);
-                }
-                return _Assembly;
-            }
-            private set { _Assembly = value; }
-        }
-
-        private CodeDomProvider _Provider;
-        /// <summary>代码生成提供者</summary>
-        private CodeDomProvider Provider
-        {
-            get { return _Provider ?? (_Provider = new CSharpCodeProvider()); }
-            set
-            {
-                if (_Provider != null && value == null) _Provider.Dispose();
-                _Provider = value;
-            }
-        }
-
-        private String _NameSpace;
-        /// <summary>命名空间</summary>
-        public String NameSpace
-        {
-            get
-            {
-                if (_NameSpace == null)
-                {
-                    if (!String.IsNullOrEmpty(AssemblyName))
-                    {
-                        var name = Path.GetFileNameWithoutExtension(AssemblyName);
-                        _NameSpace = name;
-                    }
-                    else
-                    {
-                        var namespaceName = GetType().Namespace;
-                        namespaceName += "s";
-
-                        _NameSpace = namespaceName;
-                    }
-                }
-                return _NameSpace;
-            }
-            set { _NameSpace = value; }
-        }
-
-        /// <summary>模版引擎状态</summary>
-        public TemplateStatus Status { get; set; }
-        #endregion
-
-        #region 创建
-        private static ConcurrentDictionary<String, Template> cache = new ConcurrentDictionary<String, Template>();
-        /// <summary>根据名称和模版创建模版实例，带缓存，避免重复编译</summary>
-        /// <param name="name">名称</param>
-        /// <param name="templates">模版</param>
-        /// <returns></returns>
-        public static Template Create(String name, params String[] templates)
-        {
-            if (templates == null || templates.Length < 1) throw new ArgumentNullException("templates");
-
-            var dic = new Dictionary<String, String>();
-
-            var prefix = !String.IsNullOrEmpty(name) ? name : "Class";
-
-            if (templates.Length == 1)
-            {
-                dic.Add(prefix, templates[0]);
-            }
-            else
-            {
-                for (var i = 0; i < templates.Length; i++)
-                {
-                    dic.Add(prefix + (i + 1), templates[i]);
-                }
-            }
-
-            return Create(dic);
-        }
-
-        /// <summary>根据名称和模版创建模版实例，带缓存，避免重复编译</summary>
-        /// <param name="templates">模版集合</param>
-        /// <returns></returns>
-        public static Template Create(IDictionary<String, String> templates)
-        {
-            if (templates == null || templates.Count < 1) throw new ArgumentNullException("templates");
-
-            // 计算hash
-            var sb = new StringBuilder();
-            foreach (var item in templates)
-            {
-                sb.Append(Hash(item.Key));
-                sb.Append(Hash(item.Value));
-            }
-
-            var hash = Hash(sb.ToString());
-            return cache.GetOrAdd(hash, k =>
-            {
-                var entity = new Template();
-
-                foreach (var item in templates)
-                {
-                    entity.AddTemplateItem(item.Key, item.Value);
-                }
-
-                //entity.Process();
-                //entity.Compile();
-                return entity;
-            });
-        }
-
-        /// <summary>释放提供者</summary>
-        /// <param name="disposing"></param>
-        protected override void OnDispose(Boolean disposing)
-        {
-            base.OnDispose(disposing);
-
-            try
-            {
-                if (_Provider != null)
-                {
-                    //_Provider.Dispose();
-                    //_Provider = null;
-                    Provider = null;
-                }
-            }
-            catch { }
-        }
-        #endregion
-
-        #region 快速处理
-        /// <summary>通过指定模版文件和传入模版的参数处理模版，返回结果</summary>
-        /// <remarks>
-        /// 该方法是处理模版的快速方法，把分析、编译和运行三步集中在一起。
-        /// 带有缓存，避免重复分析模版。尽量以模版内容为key，防止模版内容改变后没有生效。
-        /// </remarks>
-        /// <example>
-        /// 快速用法：
-        /// <code>
-        /// Dictionary&lt;String, Object&gt; data = new Dictionary&lt;String, Object&gt;();
-        /// data["name"] = "参数测试";
-        /// String content = Template.ProcessFile("模版文件.txt", data);
-        /// </code>
-        /// </example>
-        /// <param name="templateFile">模版文件</param>
-        /// <param name="data">传入模版的参数，模版中可以使用Data[名称]获取</param>
-        /// <returns></returns>
-        public static String ProcessFile(String templateFile, IDictionary<String, Object> data)
-        {
-            // 尽量以模版内容为key，防止模版内容改变后没有生效
-            var template = File.ReadAllText(templateFile);
-
-            return ProcessTemplate(templateFile, template, data);
-        }
-
-        /// <summary>通过指定模版内容和传入模版的参数处理模版，返回结果</summary>
-        /// <example>
-        /// 快速用法：
-        /// <code>
-        /// Dictionary&lt;String, Object&gt; data = new Dictionary&lt;String, Object&gt;();
-        /// data["name"] = "参数测试";
-        /// String content = Template.ProcessTemplate("模版内容", data);
-        /// </code>
-        /// </example>
-        /// <param name="template">模版内容</param>
-        /// <param name="data">模版参数</param>
-        /// <returns></returns>
-        public static String ProcessTemplate(String template, IDictionary<String, Object> data)
-        {
-            return ProcessTemplate(null, template, data);
-        }
-
-        /// <summary>通过指定模版内容和传入模版的参数处理模版，返回结果</summary>
-        /// <param name="name">模版名字</param>
-        /// <param name="template">模版内容</param>
-        /// <param name="data">模版参数</param>
-        /// <returns></returns>
-        public static String ProcessTemplate(String name, String template, IDictionary<String, Object> data)
-        {
-            if (String.IsNullOrEmpty(template)) throw new ArgumentNullException("template");
-
-            var tt = Create(name, template);
-
-            return tt.Render(tt.Templates[0].ClassName, data);
-        }
-        #endregion
-
-        #region 分析模版
-        /// <summary>处理预先写入Templates的模版集合，模版生成类的代码在Sources中返回</summary>
-        public void Process()
-        {
-            if (Templates == null || Templates.Count < 1) throw new InvalidOperationException("在Templates中未找到待处理模版！");
-
-            if (Status >= TemplateStatus.Process) return;
-
-            for (var i = 0; i < Templates.Count; i++)
-            {
-                Process(Templates[i]);
-            }
-
-            Status = TemplateStatus.Process;
-        }
-
-        /// <summary>
-        /// 添加模版项，实际上是添加到Templates集合中。
-        /// 未指定模版名称时，使用模版的散列作为模版名称
-        /// </summary>
-        /// <param name="name">名称</param>
-        /// <param name="content"></param>
-        public void AddTemplateItem(String name, String content)
-        {
-            if (String.IsNullOrEmpty(name) && String.IsNullOrEmpty(content))
-                throw new ArgumentNullException("content", "名称和模版内容不能同时为空！");
-
-            if (Status >= TemplateStatus.Process) throw new InvalidOperationException("模版已分析处理，不能再添加模版！");
-
-            // 未指定模版名称时，使用模版的散列作为模版名称
-            if (String.IsNullOrEmpty(name)) name = Hash(content);
-
-            var item = FindTemplateItem(name);
-            if (item == null)
-            {
-                item = new TemplateItem();
-                Templates.Add(item);
-            }
-            item.Name = name;
-            item.Content = content;
-
-            // 设置类名
-            var cname = Path.GetFileNameWithoutExtension(name);
-            // 如果无扩展的名称跟前面的名称不同，并且无扩展名称跟编码后的类名相同，则设置类型为无扩展名称
-            if (cname != name && cname == GetClassName(cname))
-            {
-                // 如果没有别的模版项用这个类名，这里使用
-                if (!Templates.Any(t => t.ClassName == cname)) item.ClassName = cname;
-            }
-
-            // 设置程序集名，采用最后一级目录名
-            if (String.IsNullOrEmpty(AssemblyName))
-            {
-                var dname = Path.GetDirectoryName(name);
-                if (!String.IsNullOrEmpty(dname))
-                {
-                    dname = Path.GetFileName(dname);
-                    if (!String.IsNullOrEmpty(dname)) AssemblyName = dname;
-                }
-            }
-        }
-
-        /// <summary>查找指定名称的模版</summary>
-        /// <param name="name">名称</param>
-        /// <returns></returns>
-        private TemplateItem FindTemplateItem(String name)
-        {
-            if (Templates == null || Templates.Count < 1) return null;
-
-            foreach (var item in Templates)
-            {
-                if (item.Name.EqualIgnoreCase(name)) return item;
-            }
-
-            // 再根据类名找
-            foreach (var item in Templates)
-            {
-                if (item.ClassName.EqualIgnoreCase(name)) return item;
-            }
-
-            return null;
-        }
-
-        /// <summary>处理指定模版</summary>
-        /// <param name="item">模版项</param>
-        private void Process(TemplateItem item)
-        {
-            // 拆分成块
-            item.Blocks = TemplateParser.Parse(item.Name, item.Content);
-
-            // 处理指令
-            ProcessDirectives(item);
-            //TemplateParser.StripExtraNewlines(item.Blocks);
-
-            if (Imports != null) item.Imports.AddRange(Imports);
-            //if (References != null) context.References.AddRange(References);
-
-            // 生成代码
-            item.Source = ConstructGeneratorCode(item, Debug, NameSpace, Provider);
-        }
-        #endregion
-
-        #region 处理指令
-        /// <summary>处理指令</summary>
-        /// <param name="item"></param>
-        /// <returns>返回指令集合</returns>
-        private void ProcessDirectives(TemplateItem item)
-        {
-            // 使用包含堆栈处理包含，检测循环包含
-            var includeStack = new Stack<String>();
-            includeStack.Push(item.Name);
-
-            var directives = new String[] { "template", "assembly", "import", "include", "var" };
-
-            for (var i = 0; i < item.Blocks.Count; i++)
-            {
-                var block = item.Blocks[i];
-                if (block.Type != BlockType.Directive) continue;
-
-                // 弹出当前块的模版名
-                while (includeStack.Count > 0 && !includeStack.Peek().EqualIgnoreCase(block.Name))
-                {
-                    includeStack.Pop();
-                }
-                var directive = TemplateParser.ParseDirectiveBlock(block);
-                if (directive == null || Array.IndexOf(directives, directive.Name.ToLower()) < 0)
-                    throw new TemplateException(block, String.Format("无法识别的指令：{0}！", block.Text));
-
-                // 包含指令时，返回多个代码块
-                //List<Block> list = ProcessDirective(directive, item);
-                var ti = ProcessDirective(directive, item);
-                if (ti == null) continue;
-                //List<Block> list = TemplateParser.Parse(ti.Name, ti.Content);
-                // 拆分成块
-                if (ti.Blocks == null || ti.Blocks.Count < 1) ti.Blocks = TemplateParser.Parse(ti.Name, ti.Content);
-                if (ti.Blocks == null || ti.Blocks.Count < 1) continue;
-
-                var list = ti.Blocks;
-                var name = ti.Name;
-                if (includeStack.Contains(name)) throw new TemplateException(block, String.Format("循环包含名为[{0}]的模版！", name));
-
-                includeStack.Push(name);
-
-                // 包含模版并入当前模版
-                item.Blocks.InsertRange(i + 1, list);
-            }
-        }
-
-        private TemplateItem ProcessDirective(Directive directive, TemplateItem item)
-        {
-            #region 包含include
-            if (directive.Name.EqualIgnoreCase("include"))
-            {
-                var name = directive.GetParameter("name");
-                // 可能采用了相对路径
-                if (!File.Exists(name)) name = Path.Combine(Path.GetDirectoryName(item.Name), name);
-
-                String content = null;
-                var ti = FindTemplateItem(name);
-                if (ti != null)
-                {
-                    ti.Included = true;
-                    content = ti.Content;
-                }
-                else
-                {
-                    // 尝试读取文件
-                    if (File.Exists(name))
-                    {
-                        ti = new TemplateItem();
-                        ti.Name = name;
-                        ti.Content = File.ReadAllText(name);
-                        Templates.Add(ti);
-
-                        ti.Included = true;
-                        content = ti.Content;
-                    }
-                }
-                // 允许内容为空
-                //if (String.IsNullOrEmpty(content)) throw new TemplateException(directive.Block, String.Format("加载模版[{0}]失败！", name));
-
-                return ti;
-            }
-            #endregion
-
-            if (directive.Name.EqualIgnoreCase("assembly"))
-            {
-                var name = directive.GetParameter("name");
-                if (!AssemblyReferences.Contains(name)) AssemblyReferences.Add(name);
-            }
-            else if (directive.Name.EqualIgnoreCase("import"))
-            {
-                item.Imports.Add(directive.GetParameter("namespace"));
-            }
-            else if (directive.Name.EqualIgnoreCase("template"))
-            {
-                if (item.Processed) throw new TemplateException(directive.Block, "多个模版指令！");
-
-                // 由模版指令指定类名
-                var name = "";
-                if (directive.TryGetParameter("name", out name) && !String.IsNullOrEmpty(name)) item.ClassName = name;
-
-                //item.BaseClassName = directive.GetParameter("inherits");
-                if (directive.TryGetParameter("inherits", out name)) item.BaseClassName = name;
-                item.Processed = true;
-
-            }
-            else if (directive.Name.EqualIgnoreCase("var"))
-            {
-                var name = directive.GetParameter("name");
-                var type = directive.GetParameter("type");
-
-                if (item.Vars.ContainsKey(name)) throw new TemplateException(directive.Block, "模版变量" + name + "已存在！");
-
-                var ptype = type.GetTypeEx();
-                if (ptype == null) throw new TemplateException(directive.Block, "无法找到模版变量类型" + type + "！");
-
-                // 因为TypeX.GetType的强大，模版可能没有引用程序集和命名空间，甚至type位于未装载的程序集中它也会自动装载，所以这里需要加上
-                ImportType(item, ptype);
-                item.Vars.Add(name, ptype);
-            }
-            return null;
-        }
-
-        /// <summary>导入某类型，导入程序集引用及命名空间引用，主要处理泛型</summary>
-        /// <param name="item"></param>
-        /// <param name="type">类型</param>
-        void ImportType(TemplateItem item, Type type)
-        {
-            String name = null;
-            try
-            {
-                name = type.Assembly.Location;
-            }
-            catch { }
-
-            if (!String.IsNullOrEmpty(name) && !AssemblyReferences.Contains(name)) AssemblyReferences.Add(name);
-            name = type.Namespace;
-            if (!item.Imports.Contains(name)) item.Imports.Add(name);
-
-            if (type.IsGenericType && !type.IsGenericTypeDefinition)
-            {
-                foreach (var elm in type.GetGenericArguments())
-                {
-                    if (!elm.IsGenericParameter) ImportType(item, elm);
-                }
-            }
-        }
-        #endregion
-
-        #region 生成代码
-        private static String ConstructGeneratorCode(TemplateItem ti, Boolean lineNumbers, String namespaceName, CodeDomProvider provider)
-        {
-            // 准备类名和命名空间
-            var codeNamespace = new CodeNamespace(namespaceName);
-
-            // 加入引用的命名空间
-            foreach (var str in ti.Imports)
-            {
-                if (!String.IsNullOrEmpty(str)) codeNamespace.Imports.Add(new CodeNamespaceImport(str));
-            }
-            var typeDec = new CodeTypeDeclaration(ti.ClassName);
-            typeDec.IsClass = true;
-            codeNamespace.Types.Add(typeDec);
-
-            // 基类
-            if (!String.IsNullOrEmpty(ti.BaseClassName))
-                typeDec.BaseTypes.Add(new CodeTypeReference(ti.BaseClassName));
-            else if (!String.IsNullOrEmpty(BaseClassName))
-                typeDec.BaseTypes.Add(new CodeTypeReference(BaseClassName));
-            else
-                typeDec.BaseTypes.Add(new CodeTypeReference(typeof(TemplateBase)));
-
-            if (lineNumbers && !String.IsNullOrEmpty(ti.Name)) typeDec.LinePragma = new CodeLinePragma(ti.Name, 1);
-
-            // Render方法
-            CreateRenderMethod(ti.Blocks, lineNumbers, typeDec);
-
-            // 代码生成选项
-            var options = new CodeGeneratorOptions();
-            options.VerbatimOrder = true;
-            options.BlankLinesBetweenMembers = false;
-            options.BracingStyle = "C";
-
-            // 其它类成员代码块
-            var firstMemberFound = false;
-            foreach (var block in ti.Blocks)
-            {
-                firstMemberFound = GenerateMemberForBlock(block, typeDec, lineNumbers, provider, options, firstMemberFound);
-            }
-
-            // 模版变量
-            if (ti.Vars != null && ti.Vars.Count > 0)
-            {
-                // 构建静态构造函数，初始化静态属性Vars
-                CreateCctorMethod(typeDec, ti.Vars);
-
-                //public Int32 VarName
-                //{
-                //    get { return (Int32)GetData("VarName"); }
-                //    set { Data["VarName"] = value; }
-                //}
-                foreach (var v in ti.Vars)
-                {
-                    //var vtype = TypeX.Create(v.Value);
-                    var codeName = v.Value.GetName(true);
-
-                    var sb = new StringBuilder();
-                    sb.AppendLine();
-                    sb.AppendFormat("public {0} {1}", codeName, v.Key);
-                    sb.AppendLine("{");
-                    sb.AppendFormat("    get {{ return GetData<{0}>(\"{1}\"); }}", codeName, v.Key);
-                    sb.AppendLine();
-                    sb.AppendFormat("    set {{ Data[\"{0}\"] = value; }}", v.Key);
-                    sb.AppendLine();
-                    sb.AppendLine("}");
-
-                    typeDec.Members.Add(new CodeSnippetTypeMember(sb.ToString()));
-                }
-            }
-
-            // 输出
-            using (var writer = new StringWriter())
-            {
-                provider.GenerateCodeFromNamespace(codeNamespace, new IndentedTextWriter(writer), options);
-                return writer.ToString();
-            }
-        }
-
-        /// <summary>生成Render方法</summary>
-        /// <param name="blocks"></param>
-        /// <param name="lineNumbers"></param>
-        /// <param name="typeDec"></param>
-        private static void CreateRenderMethod(List<Block> blocks, Boolean lineNumbers, CodeTypeDeclaration typeDec)
-        {
-            var method = new CodeMemberMethod();
-            typeDec.Members.Add(method);
-            method.Name = "Render";
-            method.Attributes = MemberAttributes.Override | MemberAttributes.Public;
-            method.ReturnType = new CodeTypeReference(typeof(String));
-
-            // 生成代码
-            var statementsMain = method.Statements;
-            var firstMemberFound = false;
-            foreach (var block in blocks)
-            {
-                if (block.Type == BlockType.Directive) continue;
-                if (block.Type == BlockType.Member)
-                {
-                    // 遇到类成员代码块，标识取反
-                    firstMemberFound = !firstMemberFound;
-                    continue;
-                }
-                // 只要现在还在类成员代码块区域内，就不做处理
-                if (firstMemberFound) continue;
-
-                if (block.Type == BlockType.Statement)
-                {
-                    // 代码语句，直接拼接
-                    var statement = new CodeSnippetStatement(block.Text);
-                    if (lineNumbers)
-                        AddStatementWithLinePragma(block, statementsMain, statement);
-                    else
-                        statementsMain.Add(statement);
-                }
-                else if (block.Type == BlockType.Text)
-                {
-                    // 模版文本，直接Write
-                    if (!String.IsNullOrEmpty(block.Text))
-                    {
-                        var exp = new CodeMethodInvokeExpression(new CodeThisReferenceExpression(), "Write", new CodeExpression[] { new CodePrimitiveExpression(block.Text) });
-                        //statementsMain.Add(exp);
-                        var statement = new CodeExpressionStatement(exp);
-                        if (lineNumbers)
-                            AddStatementWithLinePragma(block, statementsMain, statement);
-                        else
-                            statementsMain.Add(statement);
-                    }
-                }
-                else
-                {
-                    // 表达式，直接Write
-                    var exp = new CodeMethodInvokeExpression(new CodeThisReferenceExpression(), "Write", new CodeExpression[] { new CodeArgumentReferenceExpression(block.Text.Trim()) });
-                    var statement = new CodeExpressionStatement(exp);
-                    if (lineNumbers)
-                        AddStatementWithLinePragma(block, statementsMain, statement);
-                    else
-                        statementsMain.Add(statement);
-                }
-            }
-
-            statementsMain.Add(new CodeMethodReturnStatement(new CodeMethodInvokeExpression(new CodeMethodReferenceExpression(new CodePropertyReferenceExpression(new CodeThisReferenceExpression(), "Output"), "ToString"), new CodeExpression[0])));
-        }
-
-        private static void CreateCctorMethod(CodeTypeDeclaration typeDec, IDictionary<String, Type> vars)
-        {
-            //CodeTypeConstructor method = new CodeTypeConstructor();
-            var method = new CodeConstructor();
-            typeDec.Members.Add(method);
-            method.Attributes = MemberAttributes.Public;
-
-            // 生成代码
-            var statementsMain = method.Statements;
-            // vars.Add(item, vars[item]);
-            foreach (var item in vars)
-            {
-                var methodRef = new CodeMethodReferenceExpression(new CodePropertyReferenceExpression(null, "Vars"), "Add");
-                statementsMain.Add(new CodeMethodInvokeExpression(methodRef, new CodePrimitiveExpression(item.Key), new CodeTypeOfExpression(item.Value)));
-            }
-        }
-
-        private static void AddStatementWithLinePragma(Block block, CodeStatementCollection statements, CodeStatement statement)
-        {
-            var lineNumber = (block.StartLine > 0) ? block.StartLine : 1;
-
-            if (String.IsNullOrEmpty(block.Name))
-                statements.Add(new CodeSnippetStatement("#line " + lineNumber));
-            else
-                statement.LinePragma = new CodeLinePragma(block.Name, lineNumber);
-            statements.Add(statement);
-            if (String.IsNullOrEmpty(block.Name)) statements.Add(new CodeSnippetStatement("#line default"));
-        }
-
-        /// <summary>生成成员代码块</summary>
-        /// <param name="block"></param>
-        /// <param name="generatorType"></param>
-        /// <param name="lineNumbers"></param>
-        /// <param name="provider"></param>
-        /// <param name="options"></param>
-        /// <param name="firstMemberFound"></param>
-        /// <returns></returns>
-        private static Boolean GenerateMemberForBlock(Block block, CodeTypeDeclaration generatorType, Boolean lineNumbers, CodeDomProvider provider, CodeGeneratorOptions options, Boolean firstMemberFound)
-        {
-            CodeSnippetTypeMember member = null;
-            if (!firstMemberFound)
-            {
-                // 发现第一个<#!后，认为是类成员代码的开始，直到下一个<#!作为结束
-                if (block.Type == BlockType.Member)
-                {
-                    firstMemberFound = true;
-                    if (!String.IsNullOrEmpty(block.Text)) member = new CodeSnippetTypeMember(block.Text);
-                }
-            }
-            else
-            {
-                // 再次遇到<#!，此时，成员代码准备结束
-                if (block.Type == BlockType.Member)
-                {
-                    firstMemberFound = false;
-                    if (!String.IsNullOrEmpty(block.Text)) member = new CodeSnippetTypeMember(block.Text);
-                }
-                else if (block.Type == BlockType.Text)
-                {
-                    var expression = new CodeMethodInvokeExpression(new CodeThisReferenceExpression(), "Write", new CodeExpression[] { new CodePrimitiveExpression(block.Text) });
-                    var statement = new CodeExpressionStatement(expression);
-                    using (var writer = new StringWriter())
-                    {
-                        provider.GenerateCodeFromStatement(statement, writer, options);
-                        member = new CodeSnippetTypeMember(writer.ToString());
-                    }
-                }
-                else if (block.Type == BlockType.Expression)
-                {
-                    var expression = new CodeMethodInvokeExpression(new CodeThisReferenceExpression(), "Write", new CodeExpression[] { new CodeArgumentReferenceExpression(block.Text.Trim()) });
-                    var statement = new CodeExpressionStatement(expression);
-                    using (var writer = new StringWriter())
-                    {
-                        provider.GenerateCodeFromStatement(statement, writer, options);
-                        member = new CodeSnippetTypeMember(writer.ToString());
-                    }
-                }
-                else if (block.Type == BlockType.Statement)
-                {
-                    member = new CodeSnippetTypeMember(block.Text);
-                }
-            }
-            if (member != null)
-            {
-                if (lineNumbers)
-                {
-                    var flag = String.IsNullOrEmpty(block.Name);
-                    var lineNumber = (block.StartLine > 0) ? block.StartLine : 1;
-                    if (flag)
-                        generatorType.Members.Add(new CodeSnippetTypeMember("#line " + lineNumber));
-                    else
-                        member.LinePragma = new CodeLinePragma(block.Name, lineNumber);
-                    generatorType.Members.Add(member);
-                    if (flag) generatorType.Members.Add(new CodeSnippetTypeMember("#line default"));
-                }
-                else
-                    generatorType.Members.Add(member);
-            }
-            return firstMemberFound;
-        }
-        #endregion
-
-        #region 编译模版
-        /// <summary>编译运行</summary>
-        /// <returns></returns>
-        public Assembly Compile()
-        {
-            if (Status >= TemplateStatus.Compile) return Assembly;
-
-            if (Status < TemplateStatus.Process) Process();
-
-            if (References != null) AssemblyReferences.AddRange(References);
-
-            var name = AssemblyName;
-            if (String.IsNullOrEmpty(Path.GetExtension(name))) name += ".dll";
-            var asm = Compile(name, AssemblyReferences, Provider, Errors, this);
-            if (asm != null) Assembly = asm;
-
-            // 释放提供者
-            Provider = null;
-
-            Status = TemplateStatus.Compile;
-
-            return asm;
-        }
-
-        private static Dictionary<String, Assembly> asmCache = new Dictionary<String, Assembly>();
-        private static Assembly Compile(String outputAssembly, IEnumerable<String> references, CodeDomProvider provider, CompilerErrorCollection errors, Template tmp)
-        {
-            //String key = outputAssembly;
-            //if (String.IsNullOrEmpty(key)) key = Hash(String.Join(Environment.NewLine, sources));
-
-            var sb = new StringBuilder();
-            foreach (var item in tmp.Templates)
-            {
-                if (item.Included) continue;
-
-                if (sb.Length > 0) sb.AppendLine();
-                sb.Append(item.Source);
-            }
-            var key = Hash(sb.ToString());
-
-            Assembly assembly = null;
-            if (asmCache.TryGetValue(key, out assembly)) return assembly;
-            lock (asmCache)
-            {
-                if (asmCache.TryGetValue(key, out assembly)) return assembly;
-                foreach (var str in references)
-                {
-                    try
-                    {
-                        if (!String.IsNullOrEmpty(str) && File.Exists(str)) Assembly.LoadFrom(str);
-                    }
-                    catch { }
-                }
-
-                assembly = CompileInternal(outputAssembly, references, provider, errors, tmp);
-                if (assembly != null) asmCache.Add(key, assembly);
-
-                return assembly;
-            }
-        }
-
-        private static Assembly CompileInternal(String outputAssembly, IEnumerable<String> references, CodeDomProvider provider, CompilerErrorCollection Errors, Template tmp)
-        {
-            var options = new CompilerParameters();
-            foreach (var str in references)
-            {
-                options.ReferencedAssemblies.Add(str);
-            }
-            options.WarningLevel = 4;
-
-            CompilerResults results = null;
-            if (Debug)
-            {
-                //var sb = new StringBuilder();
-
-                #region 调试状态，把生成的类文件和最终dll输出到XTemp目录下
-                var tempPath = XTrace.TempPath.GetFullPath().EnsureDirectory(false);
-                //if (!String.IsNullOrEmpty(outputAssembly)) tempPath = Path.Combine(tempPath, Path.GetFileNameWithoutExtension(outputAssembly));
-                if (!String.IsNullOrEmpty(outputAssembly) && !outputAssembly.EqualIgnoreCase(".dll")) tempPath = Path.Combine(tempPath, Path.GetFileNameWithoutExtension(outputAssembly));
-
-                //if (!String.IsNullOrEmpty(tempPath) && !Directory.Exists(tempPath)) Directory.CreateDirectory(tempPath);
-
-                //var srcpath = tempPath.CombinePath("src").EnsureDirectory(false);
-
-                var files = new List<String>();
-                foreach (var item in tmp.Templates)
-                {
-                    // 输出模版内容，为了调试使用
-                    File.WriteAllText(tempPath.CombinePath(item.Name).EnsureDirectory(true), item.Content);
-                    if (item.Included) continue;
-
-                    var name = item.Name.EndsWithIgnoreCase(".cs") ? item.Name : item.ClassName;
-                    // 猜测后缀
-                    var p = name.LastIndexOf("_");
-                    if (p > 0 && name.Length - p <= 5)
-                        name = name.Substring(0, p) + "." + name.Substring(p + 1, name.Length - p - 1);
-                    else if (!name.EndsWithIgnoreCase(".cs"))
-                        name += ".cs";
-
-                    //name = Path.Combine(tempPath, name);
-                    //name = srcpath.CombinePath(name);
-                    // 必须放在同一个目录，编译时会搜索源码所在目录
-                    name = tempPath.CombinePath(Path.GetFileNameWithoutExtension(name) + "_src" + Path.GetExtension(name));
-                    File.WriteAllText(name, item.Source);
-
-                    //sb.AppendLine(item.Source);
-                    files.Add(name);
-                }
-                #endregion
-
-                if (!String.IsNullOrEmpty(outputAssembly) && !outputAssembly.EqualIgnoreCase(".dll"))
-                {
-                    options.TempFiles = new TempFileCollection(tempPath, false);
-                    options.OutputAssembly = Path.Combine(tempPath, outputAssembly);
-                    //options.GenerateInMemory = true;
-                    options.IncludeDebugInformation = true;
-                }
-
-                results = provider.CompileAssemblyFromFile(options, files.ToArray());
-                // 必须从内存字符串编译，否则pdb会定向到最终源代码文件
-                //results = provider.CompileAssemblyFromSource(options, new String[] { sb.ToString() });
-            }
-            else
-            {
-                options.GenerateInMemory = true;
-
-                results = provider.CompileAssemblyFromSource(options, tmp.Templates.Where(e => !e.Included).Select(e => e.Source).ToArray());
-            }
-
-            #region 编译错误处理
-            if (results.Errors.Count > 0)
-            {
-                Errors.AddRange(results.Errors);
-
-                var sb = new StringBuilder();
-                CompilerError err = null;
-                foreach (CompilerError error in results.Errors)
-                {
-                    error.ErrorText = error.ErrorText;
-                    //if (String.IsNullOrEmpty(error.FileName)) error.FileName = inputFile;
-
-                    if (!error.IsWarning)
-                    {
-                        var msg = error.ToString();
-                        if (sb.Length < 1)
-                        {
-                            String code = null;
-                            // 屏蔽因为计算错误行而导致的二次错误
-                            try
-                            {
-                                code = tmp.FindBlockCode(error.FileName, error.Line);
-                            }
-                            catch { }
-                            if (code != null)
-                            {
-                                msg += Environment.NewLine;
-                                msg += code;
-                            }
-                            err = error;
-                        }
-                        else
-                            sb.AppendLine();
-
-                        sb.Append(msg);
-                    }
-                }
-                if (sb.Length > 0)
-                {
-                    var ex = new TemplateException(sb.ToString());
-                    ex.Error = err;
-                    throw ex;
-                }
-            }
-            else
-            {
-                try
-                {
-                    options.TempFiles.Delete();
-                }
-                catch { }
-            }
-            #endregion
-
-            if (!results.Errors.HasErrors)
-            {
-                try
-                {
-                    return results.CompiledAssembly;
-                }
-                catch { }
-            }
-            return null;
-        }
-
-        /// <summary>找到指定文件指定位置上下三行的代码</summary>
-        /// <param name="name">名称</param>
-        /// <param name="lineNumber"></param>
-        /// <returns></returns>
-        String FindBlockCode(String name, Int32 lineNumber)
-        {
-            if (!String.IsNullOrEmpty(name))
-            {
-                // 先根据文件名找
-                foreach (var item in Templates)
-                {
-                    if (item.Name != name) continue;
-
-                    var str = FindBlockCodeInItem(name, lineNumber, item);
-                    if (!String.IsNullOrEmpty(str)) return str;
-                }
-                // 然后，模版里面可能包含有模版
-                foreach (var item in Templates)
-                {
-                    if (item.Name == name) continue;
-
-                    var str = FindBlockCodeInItem(name, lineNumber, item);
-                    if (!String.IsNullOrEmpty(str)) return str;
-                }
-            }
-
-            // 第一个符合行号的模版内容，在找不到对应文件的模版时使用
-            foreach (var item in Templates)
-            {
-                // 找到第一个符合行号的模版内容
-                if (item.Blocks[item.Blocks.Count - 1].StartLine > lineNumber)
-                {
-                    var str = FindBlockCodeInItem(null, lineNumber, item);
-                    if (!String.IsNullOrEmpty(str)) return str;
-                }
-            }
-            return null;
-        }
-
-        static String FindBlockCodeInItem(String name, Int32 lineNumber, TemplateItem item)
-        {
-            var nocmpName = String.IsNullOrEmpty(name);
-            for (var i = 0; i < item.Blocks.Count; i++)
-            {
-                var line = item.Blocks[i].StartLine;
-                if (line >= lineNumber && (nocmpName || item.Blocks[i].Name == name))
-                {
-                    // 错误所在段
-                    var n = i;
-                    if (line > lineNumber)
-                    {
-                        n--;
-                        line = item.Blocks[n].StartLine;
-                    }
-
-                    var code = item.Blocks[n].Text;
-                    var codeLines = code.Split(new String[] { Environment.NewLine }, StringSplitOptions.None);
-
-                    var sb = new StringBuilder();
-                    // 错误行在第一行，需要上一段的最后一行
-                    if (n > 0 && line == lineNumber)
-                    {
-                        var code2 = item.Blocks[n - 1].Text;
-                        var codeLines2 = code2.Split(new String[] { Environment.NewLine }, StringSplitOptions.None);
-                        sb.AppendLine((lineNumber - 1) + ":" + codeLines2[codeLines2.Length - 1]);
-                    }
-                    // 错误行代码段
-                    {
-                        // 错误行不在第一行，需要上一行
-                        if (line < lineNumber) sb.AppendLine((lineNumber - 1) + ":" + codeLines[lineNumber - line - 1]);
-                        // 错误行
-                        sb.AppendLine(lineNumber + ":" + codeLines[lineNumber - line]);
-                        // 错误行不在最后一行，需要下一行
-                        if (line + codeLines.Length > lineNumber) sb.AppendLine((lineNumber + 1) + ":" + codeLines[lineNumber - line + 1]);
-                    }
-                    // 错误行在最后一行以后的，需要下一段的第一行
-                    if (n < item.Blocks.Count - 1 && line + codeLines.Length <= lineNumber)
-                    {
-                        var code2 = item.Blocks[n + 1].Text;
-                        var codeLines2 = code2.Split(new String[] { Environment.NewLine }, StringSplitOptions.None);
-                        sb.AppendLine((lineNumber + 1) + ":" + codeLines2[0]);
-                    }
-                    return sb.ToString();
-                }
-            }
-            return null;
-        }
-        #endregion
-
-        #region 运行生成
-        /// <summary>创建模版实例</summary>
-        /// <param name="className"></param>
-        /// <returns></returns>
-        public TemplateBase CreateInstance(String className)
-        {
-            if (Status < TemplateStatus.Compile) Compile();
-
-            if (Assembly == null) throw new InvalidOperationException("尚未编译模版！");
-
-            if (String.IsNullOrEmpty(className))
-            {
-                var ts = Assembly.GetTypes();
-                if (ts != null && ts.Length > 0)
-                {
-                    // 检查是否只有一个模版类
-                    var n = 0;
-                    foreach (var type in ts)
-                    {
-                        if (!type.As<TemplateBase>()) continue;
-
-                        className = type.FullName;
-                        if (n++ > 1) break;
-                    }
-
-                    //// 干脆用第一个
-                    //if (n == 0) className = ts[0].FullName;
-
-                    // 如果只有一个模版类，则使用该类作为类名
-                    if (n != 1) throw new ArgumentNullException("className", "请指定模版类类名！");
-                }
-            }
-            else
-            {
-                var ti = FindTemplateItem(className);
-                if (ti != null)
-                    className = ti.ClassName;
-                else
-                    className = GetClassName(className);
-            }
-
-            if (!className.Contains(".")) className = NameSpace + "." + className;
-            // 可能存在大小写不匹配等问题，这里需要修正
-            var temp = Assembly.CreateInstance(className, true) as TemplateBase;
-            if (temp == null) throw new Exception(String.Format("没有找到模版类[{0}]！", className));
-
-            temp.Template = this;
-            temp.TemplateItem = FindTemplateItem(className);
-
-            return temp;
-        }
-
-        /// <summary>运行代码</summary>
-        /// <param name="className"></param>
-        /// <param name="data"></param>
-        /// <returns></returns>
-        public String Render(String className, IDictionary<String, Object> data)
-        {
-            // 2012.11.06 尝试共享已加载的程序集
-            AppDomain.CurrentDomain.AssemblyResolve += new ResolveEventHandler(currentDomain_AssemblyResolve);
-
-            var temp = CreateInstance(className);
-            temp.Data = data;
-            temp.Initialize();
-
-            try
-            {
-                return temp.Render();
-            }
-            catch (Exception ex)
-            {
-                throw new TemplateExecutionException("模版执行错误！", ex);
-            }
-            finally
-            {
-                AppDomain.CurrentDomain.AssemblyResolve -= new ResolveEventHandler(currentDomain_AssemblyResolve);
-            }
-        }
-
-        /// <summary>对程序集解析失败的处理函数</summary>
-        /// <param name="sender"></param>
-        /// <param name="args"></param>
-        /// <returns></returns>
-        private static Assembly currentDomain_AssemblyResolve(Object sender, ResolveEventArgs args)
-        {
-            var name = args.Name;
-            if (name.IsNullOrWhiteSpace()) return null;
-            var p = name.IndexOf(',');
-            if (p > 0) name = name.Substring(0, p);
-
-            var asms = AppDomain.CurrentDomain.GetAssemblies();
-            if (asms == null || asms.Length < 1) return null;
-
-            foreach (var item in asms)
-            {
-                try
-                {
-                    if (item.FullName == args.Name) return Assembly.Load(name);
-                }
-                catch { }
-            }
-
-            return null;
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/XTemplate/Templating/Template2.cs b/XTemplate/Templating/Template2.cs
deleted file mode 100644
index 656d7ee5b5..0000000000
--- a/XTemplate/Templating/Template2.cs
+++ /dev/null
@@ -1,202 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Security.Cryptography;
-using System.Text;
-using NewLife.Log;
-
-namespace XTemplate.Templating
-{
-    partial class Template
-    {
-        #region 辅助函数
-        /// <summary>MD5散列</summary>
-        /// <param name="str"></param>
-        /// <returns></returns>
-        protected static String Hash(String str)
-        {
-            if (String.IsNullOrEmpty(str)) return null;
-
-            var md5 = MD5.Create();
-            return BitConverter.ToString(md5.ComputeHash(Encoding.UTF8.GetBytes(str))).Replace("-", null);
-        }
-
-        static String _Filter = @"\/.- $";
-        /// <summary>把名称处理为标准类名</summary>
-        /// <param name="fileName"></param>
-        /// <returns></returns>
-        public static String GetClassName(String fileName)
-        {
-            var name = fileName;
-            //if (name.Contains(".")) name = name.Substring(0, name.LastIndexOf("."));
-            //name = name.Replace(@"\", "_").Replace(@"/", "_").Replace(".", "_").Replace("-", "_");
-            foreach (var item in _Filter)
-            {
-                name = name.Replace(item, '_');
-            }
-            name = name.Replace(Path.VolumeSeparatorChar, '_');
-            name = name.Replace(Path.DirectorySeparatorChar, '_');
-            name = name.Replace(Path.AltDirectorySeparatorChar, '_');
-            name = name.Replace(Path.PathSeparator, '_');
-            return name;
-        }
-
-        /// <summary>已重载。</summary>
-        /// <returns></returns>
-        public override String ToString()
-        {
-            return String.Format("{0} [{1}]", AssemblyName ?? NameSpace, Templates.Count);
-            //return base.ToString();
-        }
-        #endregion
-
-        #region 调试
-        /// <summary>是否调试</summary>
-        public static Boolean Debug { get; set; } = Setting.Current.Debug;
-
-        /// <summary>输出日志</summary>
-        /// <param name="msg"></param>
-        public static void WriteLog(String msg)
-        {
-            XTrace.WriteLine(msg);
-        }
-
-        /// <summary>输出日志</summary>
-        /// <param name="format"></param>
-        /// <param name="args"></param>
-        public static void WriteLog(String format, params Object[] args)
-        {
-            XTrace.WriteLine(format, args);
-        }
-        #endregion
-
-        #region 配置
-        /// <summary>默认基类名称</summary>
-        public static String BaseClassName { get; set; } = Setting.Current.BaseClassName;
-
-        private static List<String> _References;
-        /// <summary>标准程序集引用</summary>
-        public static List<String> References
-        {
-            get
-            {
-                if (_References != null) return _References;
-
-                // 程序集路径
-                var list = new List<String>();
-                // 程序集名称，小写，用于重复判断
-                var names = new List<String>();
-
-                // 加入配置的程序集
-                var ss = Setting.Current.References.Split(",", ";");
-                if (ss != null && ss.Length > 0)
-                {
-                    foreach (var item in ss)
-                    {
-                        list.Add(item);
-
-                        names.Add(item.ToLower());
-                    }
-                }
-
-                // 当前应用程序域所有程序集，虽然加上了很多引用，但是编译时会自动忽略没有实际引用的程序集！
-                var asms = AppDomain.CurrentDomain.GetAssemblies();
-                if (asms == null || asms.Length < 1) return null;
-                foreach (var item in asms)
-                {
-                    try
-                    {
-                        if (String.IsNullOrEmpty(item.Location)) continue;
-
-                        var name = Path.GetFileName(item.Location);
-                        if (!String.IsNullOrEmpty(name)) name = name.ToLower();
-                        if (names.Contains(name)) continue;
-                        names.Add(name);
-                        list.Add(item.Location);
-                    }
-                    catch { }
-                }
-
-                return _References = list;
-            }
-        }
-
-        private static List<String> _Imports;
-        /// <summary>标准命名空间引用</summary>
-        public static List<String> Imports
-        {
-            get
-            {
-                if (_Imports != null) return _Imports;
-
-                // 命名空间
-                var list = new List<String>();
-                // 尽快赋值，避免重入
-                _Imports = list;
-
-                // 加入配置的命名空间
-                var ss = Setting.Current.Imports.Split(",", ";");
-                if (ss != null && ss.Length > 0) list.AddRange(ss);
-
-                // 常用命名空间
-                var names = new String[] { "System", "System.Collections", "System.Collections.Generic", "System.Text" };
-                if (names != null && names.Length > 0)
-                {
-                    foreach (var item in names)
-                    {
-                        if (!list.Contains(item)) list.Add(item);
-                    }
-                }
-
-                // 特别支持
-                var supports = new Dictionary<String, String[]>();
-                supports.Add("System.Web", new String[] { "System.Web" });
-                supports.Add("System.Xml", new String[] { "System.Xml" });
-
-                var asms = AppDomain.CurrentDomain.GetAssemblies();
-                foreach (var item in supports)
-                {
-                    foreach (var asm in asms)
-                    {
-                        if (!asm.FullName.StartsWith(item.Key + ",")) continue;
-
-                        names = item.Value;
-                        if (names != null && names.Length > 0)
-                        {
-                            foreach (var name in names)
-                            {
-                                if (!list.Contains(name)) list.Add(name);
-                            }
-                        }
-                    }
-                }
-
-                // 特别支持，导入它们的所有命名空间
-                var maps = new HashSet<String>();
-                maps.Add("XCode");
-                maps.Add("NewLife.Core");
-                maps.Add("NewLife.CommonEntity");
-
-                foreach (var item in maps)
-                {
-                    foreach (var asm in asms)
-                    {
-                        if (!asm.FullName.StartsWith(item + ",")) continue;
-
-                        // 遍历所有公开类，导入它们的所有命名空间
-                        foreach (var type in asm.GetTypes())
-                        {
-                            var name = type.Namespace;
-                            if (String.IsNullOrEmpty(name)) continue;
-                            //if (!name.StartsWith("XCode") && !name.StartsWith("NewLife")) continue;
-                            if (!list.Contains(name)) list.Add(name);
-                        }
-                    }
-                }
-
-                return _Imports = list;
-            }
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/XTemplate/Templating/TemplateBase.cs b/XTemplate/Templating/TemplateBase.cs
deleted file mode 100644
index 8263ff492e..0000000000
--- a/XTemplate/Templating/TemplateBase.cs
+++ /dev/null
@@ -1,215 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using NewLife;
-using NewLife.Reflection;
-
-namespace XTemplate.Templating
-{
-    /// <summary>模版基类，所有模版继承自该类</summary>
-    /// <remarks>模版的原理其实就是生成一个继承自该类的模版类，并重载Render方法</remarks>
-    [Serializable]
-    public abstract class TemplateBase : DisposeBase
-    {
-        #region 构造和释放
-        ///// <summary>释放</summary>
-        ///// <param name="disposing"></param>
-        //protected override void OnDispose(bool disposing)
-        //{
-        //    base.OnDispose(disposing);
-
-        //    if (Output != null) Output = null;
-        //}
-        #endregion
-
-        #region 缩进
-        /// <summary>当前缩进</summary>
-        public String CurrentIndent { get; private set; } = "";
-
-        /// <summary>缩进长度集合</summary>
-        private List<Int32> indentLengths { get; set; } = new List<Int32>();
-
-        /// <summary>清除缩进</summary>
-        public void ClearIndent()
-        {
-            indentLengths.Clear();
-            CurrentIndent = "";
-        }
-
-        /// <summary>弹出缩进</summary>
-        /// <returns></returns>
-        public String RemoveIndent()
-        {
-            var str = "";
-            if (indentLengths.Count > 0)
-            {
-                var num = indentLengths[indentLengths.Count - 1];
-                indentLengths.RemoveAt(indentLengths.Count - 1);
-                if (num > 0)
-                {
-                    str = CurrentIndent.Substring(CurrentIndent.Length - num);
-                    CurrentIndent = CurrentIndent.Remove(CurrentIndent.Length - num);
-                }
-            }
-            return str;
-        }
-
-        /// <summary>压入缩进</summary>
-        /// <param name="indent"></param>
-        public void AddIndent(String indent)
-        {
-            if (indent == null) throw new ArgumentNullException("indent");
-
-            CurrentIndent = CurrentIndent + indent;
-            indentLengths.Add(indent.Length);
-        }
-        #endregion
-
-        #region 输出
-        private Boolean endsWithNewline;
-        /// <summary>写入文本</summary>
-        /// <param name="str"></param>
-        public void Write(String str)
-        {
-            if (String.IsNullOrEmpty(str)) return;
-
-            if ((Output.Length == 0) || endsWithNewline)
-            {
-                Output.Append(CurrentIndent);
-                endsWithNewline = false;
-            }
-            if (str.EndsWithIgnoreCase(Environment.NewLine)) endsWithNewline = true;
-            if (CurrentIndent.Length == 0)
-            {
-                Output.Append(str);
-            }
-            else
-            {
-                str = str.Replace(Environment.NewLine, Environment.NewLine + CurrentIndent);
-                if (endsWithNewline)
-                    Output.Append(str, 0, str.Length - CurrentIndent.Length);
-                else
-                    Output.Append(str);
-            }
-        }
-
-        /// <summary>写入文本</summary>
-        /// <param name="obj"></param>
-        public void Write(Object obj)
-        {
-            if (obj == null) return;
-
-            Write(obj.ToString());
-        }
-
-        /// <summary>写入文本</summary>
-        /// <param name="format"></param>
-        /// <param name="args"></param>
-        public void Write(String format, params Object[] args)
-        {
-            if (String.IsNullOrEmpty(format)) return;
-
-            if (args != null && args.Length > 0)
-                Write(String.Format(CultureInfo.CurrentCulture, format, args));
-            else
-                Write(format);
-        }
-
-        /// <summary>写入文本</summary>
-        /// <param name="str"></param>
-        public void WriteLine(String str)
-        {
-            Write(str);
-
-            Output.AppendLine();
-            endsWithNewline = true;
-        }
-
-        /// <summary>写入文本</summary>
-        /// <param name="obj"></param>
-        public void WriteLine(Object obj)
-        {
-            if (obj != null) Write(obj.ToString());
-
-            Output.AppendLine();
-            endsWithNewline = true;
-        }
-
-        /// <summary>写入行</summary>
-        /// <param name="format"></param>
-        /// <param name="args"></param>
-        public void WriteLine(String format, params Object[] args)
-        {
-            if (!String.IsNullOrEmpty(format))
-            {
-                if (args != null && args.Length > 0)
-                    Write(String.Format(CultureInfo.CurrentCulture, format, args));
-                else
-                    Write(format);
-            }
-
-            Output.AppendLine();
-            endsWithNewline = true;
-        }
-
-        /// <summary>写入一个换行</summary>
-        public void WriteLine()
-        {
-            Output.AppendLine();
-            endsWithNewline = true;
-        }
-        #endregion
-
-        #region 属性
-        /// <summary>模版引擎实例</summary>
-        public Template Template { get; set; }
-
-        /// <summary>模版项实例</summary>
-        public TemplateItem TemplateItem { get; set; }
-        #endregion
-
-        #region 生成
-        /// <summary>初始化</summary>
-        public virtual void Initialize() { }
-
-        /// <summary>转换文本</summary>
-        /// <returns></returns>
-        public virtual String Render() { return Output.ToString(); }
-
-        /// <summary>输出</summary>
-        protected StringBuilder Output { get; set; } = new StringBuilder();
-        #endregion
-
-        #region 数据属性
-        /// <summary>数据</summary>
-        public IDictionary<String, Object> Data { get; set; } = new Dictionary<String, Object>();
-
-        /// <summary>获取数据，主要处理数据字典中不存在的元素</summary>
-        /// <param name="name">名称</param>
-        /// <returns></returns>
-        protected Object GetData(String name)
-        {
-            Object obj = null;
-            return Data.TryGetValue(name, out obj) ? obj : null;
-        }
-
-        /// <summary>获取数据，主要处理类型转换</summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="name">名称</param>
-        /// <returns></returns>
-        protected T GetData<T>(String name)
-        {
-            var obj = GetData(name);
-            if (obj == null) return default(T);
-
-            return obj.ChangeType<T>();
-        }
-        #endregion
-
-        #region 模版变量
-        /// <summary>模版变量集合</summary>
-        public IDictionary<String, Type> Vars { get; set; } = new Dictionary<String, Type>();
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/XTemplate/Templating/TemplateException.cs b/XTemplate/Templating/TemplateException.cs
deleted file mode 100644
index e81c02e192..0000000000
--- a/XTemplate/Templating/TemplateException.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-﻿using System;
-using System.CodeDom.Compiler;
-using NewLife;
-
-namespace XTemplate.Templating
-{
-    /// <summary>模版异常</summary>
-    public class TemplateException : XException
-    {
-        #region 属性
-        /// <summary>代码块</summary>
-        internal Block Block { get; private set; }
-
-        private CompilerError _Error;
-        /// <summary>编译器错误</summary>
-        public CompilerError Error
-        {
-            get
-            {
-                if (_Error == null && Block != null)
-                {
-                    _Error = new CompilerError(Block.Name, Block.StartLine, Block.StartColumn, null, Message);
-                    _Error.IsWarning = false;
-                }
-                return _Error;
-            }
-            internal set { _Error = value; }
-        }
-        #endregion
-
-        #region 构造
-        /// <summary>实例化一个模版处理异常</summary>
-        /// <param name="message"></param>
-        public TemplateException(String message) : base(message) { }
-
-        /// <summary>实例化一个模版处理异常</summary>
-        /// <param name="block"></param>
-        /// <param name="message"></param>
-        internal TemplateException(Block block, String message)
-            : base(message + block.ToFullString())
-        {
-            Block = block;
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/XTemplate/Templating/TemplateExecuteException.cs b/XTemplate/Templating/TemplateExecuteException.cs
deleted file mode 100644
index 0a85e23430..0000000000
--- a/XTemplate/Templating/TemplateExecuteException.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-﻿using System;
-using System.Runtime.Serialization;
-using NewLife;
-
-namespace XTemplate.Templating
-{
-    /// <summary>模版执行错误异常</summary>
-    public class TemplateExecutionException : XException
-    {
-        #region 构造
-        /// <summary>初始化</summary>
-        public TemplateExecutionException() { }
-
-        /// <summary>初始化</summary>
-        /// <param name="message"></param>
-        public TemplateExecutionException(String message) : base(message) { }
-
-        /// <summary>初始化</summary>
-        /// <param name="format"></param>
-        /// <param name="args"></param>
-        public TemplateExecutionException(String format, params Object[] args) : base(format, args) { }
-
-        /// <summary>初始化</summary>
-        /// <param name="message"></param>
-        /// <param name="innerException"></param>
-        public TemplateExecutionException(String message, Exception innerException) : base(message, innerException) { }
-
-        /// <summary>初始化</summary>
-        /// <param name="innerException"></param>
-        public TemplateExecutionException(Exception innerException) : base((innerException != null ? innerException.Message : null), innerException) { }
-
-        ///// <summary>初始化</summary>
-        ///// <param name="info"></param>
-        ///// <param name="context"></param>
-        //protected TemplateExecutionException(SerializationInfo info, StreamingContext context) : base(info, context) { }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/XTemplate/Templating/TemplateItem.cs b/XTemplate/Templating/TemplateItem.cs
deleted file mode 100644
index 08c27c86d4..0000000000
--- a/XTemplate/Templating/TemplateItem.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-
-namespace XTemplate.Templating
-{
-    /// <summary>模版项。包含模版名和模版内容等基本信息，还包含运行时相关信息。</summary>
-    public class TemplateItem
-    {
-        #region 属性
-        /// <summary>模版名</summary>
-        public String Name { get; set; }
-
-        /// <summary>模版内容</summary>
-        public String Content { get; set; }
-
-        /// <summary>引用命名空间</summary>
-        public List<String> Imports { get; set; } = new List<String>();
-
-        /// <summary>是否已处理过</summary>
-        internal Boolean Processed { get; set; }
-
-        private String _ClassName;
-        /// <summary>类名</summary>
-        public String ClassName
-        {
-            get
-            {
-                if (String.IsNullOrEmpty(_ClassName)) _ClassName = Template.GetClassName(Name);
-                return _ClassName;
-            }
-            set { _ClassName = value; }
-        }
-
-        /// <summary>模版头指令指定的基类名。如果为空表示没有指令指定基类</summary>
-        public String BaseClassName { get; set; }
-
-        /// <summary>模版块集合</summary>
-        internal List<Block> Blocks { get; set; }
-
-        /// <summary>源代码</summary>
-        public String Source { get; set; }
-
-        /// <summary>是否被包含，被包含的模版不生成类</summary>
-        public Boolean Included { get; internal set; }
-
-        /// <summary>模版变量集合</summary>
-        public IDictionary<String, Type> Vars { get; set; } = new Dictionary<String, Type>();
-        #endregion
-
-        #region 方法
-        /// <summary>已重载。</summary>
-        /// <returns></returns>
-        public override String ToString()
-        {
-            return Name;
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/XTemplate/Templating/TemplateParser.cs b/XTemplate/Templating/TemplateParser.cs
deleted file mode 100644
index 5f3d0fec90..0000000000
--- a/XTemplate/Templating/TemplateParser.cs
+++ /dev/null
@@ -1,308 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Text.RegularExpressions;
-
-namespace XTemplate.Templating
-{
-    /// <summary>模版分析器</summary>
-    internal static class TemplateParser
-    {
-        #region 分析模版的正则表达式
-        private static MatchEvaluator escapeReplacingEvaluator;
-        private static Regex templateParsingRegex;
-        private const String ma = @"(?<=([^\\]|^)(\\\\)*)";
-        private const String startTag = @"(?<=([^\\]|^)(\\\\)*)<#";
-        private const String endTag = @"(?<=[^\\](\\\\)*)#>";
-
-        static TemplateParser()
-        {
-            escapeReplacingEvaluator = match =>
-            {
-                if (match.Success && match.Value != null)
-                {
-                    var length = (Int32)Math.Floor((Double)match.Value.Length / 2.0);
-                    return match.Value.Substring(0, length);
-                }
-                return String.Empty;
-            };
-
-            var sb = new StringBuilder();
-            sb.AppendFormat(@"(?<text>^(\\\\)+)(?=<#)|");
-            sb.AppendFormat(@"{0}@(?<directive>.*?){1}|", startTag, endTag);
-            sb.AppendFormat(@"{0}\!(?<member>.*?){1}|", startTag, endTag);
-            sb.AppendFormat(@"{0}=(?<expression>.*?){1}|", startTag, endTag);
-            sb.AppendFormat(@"{0}(?<statement>.*?){1}|", startTag, endTag);
-            sb.AppendFormat(@"(?<text>.+?)(?=((?<=[^\\](\\\\)*)<#))|");
-            sb.AppendFormat("(?<text>.+)(?=$)");
-            //sb.AppendLine(@"(?<text>^(\\\\)+)(?=<\#)|");
-            //sb.AppendLine(@"(?<=([^\\]|^)(\\\\)*)<\#@(?<directive>.*?)(?<=[^\\](\\\\)*)\#>|");
-            //sb.AppendLine(@"(?<=([^\\]|^)(\\\\)*)<\#\!(?<member>.*?)(?<=[^\\](\\\\)*)\#>|");
-            //sb.AppendLine(@"(?<=([^\\]|^)(\\\\)*)<\#=(?<expression>.*?)(?<=[^\\](\\\\)*)\#>|");
-            //sb.AppendLine(@"(?<=([^\\]|^)(\\\\)*)<\#(?<statement>.*?)(?<=[^\\](\\\\)*)\#>|");
-            //sb.AppendLine(@"(?<text>.+?)(?=((?<=[^\\](\\\\)*)<\#))|");
-            //sb.AppendLine("(?<text>.+)(?=$)");
-            templateParsingRegex = new Regex(sb.ToString(), RegexOptions.Singleline | RegexOptions.Compiled | RegexOptions.ExplicitCapture);
-        }
-        #endregion
-
-        #region 分析模版
-        private static Regex unescapedTagFindingRegex = new Regex(@"(^|[^\\])(\\\\)*(<\#|\#>)", RegexOptions.Singleline | RegexOptions.Compiled | RegexOptions.ExplicitCapture);
-        /// <summary>把模版分割成块</summary>
-        /// <param name="name">名称</param>
-        /// <param name="content"></param>
-        /// <returns></returns>
-        public static List<Block> Parse(String name, String content)
-        {
-            //if (content == null) throw new ArgumentNullException("content");
-
-            var blocks = new List<Block>();
-            if (String.IsNullOrEmpty(content)) return blocks;
-
-            foreach (Match match in templateParsingRegex.Matches(content))
-            {
-                var item = new Block();
-                Group group = null;
-                if ((group = match.Groups["text"]).Success)
-                    item.Type = BlockType.Text;
-                else if ((group = match.Groups["directive"]).Success)
-                    item.Type = BlockType.Directive;
-                else if ((group = match.Groups["member"]).Success)
-                    item.Type = BlockType.Member;
-                else if ((group = match.Groups["expression"]).Success)
-                    item.Type = BlockType.Expression;
-                else if ((group = match.Groups["statement"]).Success)
-                    item.Type = BlockType.Statement;
-
-                if (group != null && group.Success)
-                {
-                    item.Text = group.Value;
-                    item.Name = name;
-                    blocks.Add(item);
-                }
-            }
-            InsertPosition(blocks);
-
-            foreach (var block in blocks)
-            {
-                if (unescapedTagFindingRegex.Match(block.Text).Success) throw new TemplateException(block, "不可识别的标记！可能有未编码的字符，比如\\<#。");
-            }
-
-            StripEscapeCharacters(blocks);
-            return blocks;
-        }
-
-        private static Regex newlineFindingRegex = new Regex(Environment.NewLine, RegexOptions.Singleline | RegexOptions.Compiled);
-        /// <summary>插入位置信息</summary>
-        /// <param name="blocks"></param>
-        private static void InsertPosition(List<Block> blocks)
-        {
-            var i = 1;
-            var j = 1;
-            foreach (var block in blocks)
-            {
-                // 类成员以<#!开始，指令以<#@开始，表达式以<#=开始，所以它们的列数加3
-                if (block.Type == BlockType.Member ||
-                    block.Type == BlockType.Directive ||
-                    block.Type == BlockType.Expression)
-                {
-                    j += 3;
-                }
-                else if (block.Type == BlockType.Statement)
-                {
-                    // 代码块以<#开始
-                    j += 2;
-                }
-                block.StartLine = i;
-                block.StartColumn = j;
-
-                // 计算换行
-                var matchs = newlineFindingRegex.Matches(block.Text);
-                i += matchs.Count;
-                if (matchs.Count > 0)
-                {
-                    // 有换行的存在，从新计算列数，以最后一行的最后列数作为整个块的最后列数
-                    j = ((block.Text.Length - matchs[matchs.Count - 1].Index) - Environment.NewLine.Length) + 1;
-                }
-                else
-                {
-                    j += block.Text.Length;
-                }
-                block.EndLine = i;
-                block.EndColumn = j;
-
-                // 非占位符块时，列数加2，因为它们都以#>结尾
-                if (block.Type != BlockType.Text) j += 2;
-            }
-        }
-
-        private static Regex escapeFindingRegex = new Regex(@"\\+(?=<\\#)|\\+(?=\\#>)", RegexOptions.Singleline | RegexOptions.Compiled | RegexOptions.ExplicitCapture);
-        private static Regex eolEscapeFindingRegex = new Regex(@"\\+(?=$)", RegexOptions.Singleline | RegexOptions.Compiled | RegexOptions.ExplicitCapture);
-        /// <summary>对编码的字符进行解码</summary>
-        /// <param name="blocks"></param>
-        private static void StripEscapeCharacters(List<Block> blocks)
-        {
-            for (var i = 0; i < blocks.Count; i++)
-            {
-                var block = blocks[i];
-                block.Text = escapeFindingRegex.Replace(block.Text, escapeReplacingEvaluator);
-                if (i != (blocks.Count - 1))
-                {
-                    block.Text = eolEscapeFindingRegex.Replace(block.Text, escapeReplacingEvaluator);
-                }
-            }
-        }
-
-        ///// <summary>
-        ///// 检查块顺序是否有问题
-        ///// </summary>
-        ///// <param name="blocks"></param>
-        //private static void CheckBlockSequence(List<Block> blocks)
-        //{
-        //    Boolean isMemberFeature = false;
-        //    foreach (Block block in blocks)
-        //    {
-        //        if (!isMemberFeature)
-        //        {
-        //            if (block.Type == BlockType.Member) isMemberFeature = true;
-        //        }
-        //        else if ((block.Type == BlockType.Directive) || (block.Type == BlockType.Statement))
-        //        {
-        //            throw new TemplateException(block, "类成员定义后不可以有指令和语句！");
-        //        }
-        //    }
-        //    if (isMemberFeature)
-        //    {
-        //        Block block2 = blocks[blocks.Count - 1];
-        //        if ((block2.Type != BlockType.Member) && ((block2.Type != BlockType.Text) || !allNewlineRegex.Match(block2.Text).Success))
-        //        {
-        //            throw new TemplateException(block2, "类成员定义后只可以有文本或全是换行的代码语句！");
-        //        }
-        //    }
-        //}
-        #endregion
-
-        #region 分析指令
-        private static Regex directiveEscapeFindingRegex = new Regex("\\\\+(?=\")|\\\\+(?=$)", RegexOptions.Singleline | RegexOptions.Compiled | RegexOptions.ExplicitCapture);
-        private static Regex directiveParsingRegex = new Regex("(?<pname>\\S+?)\\s*=\\s*\"(?<pvalue>.*?)(?<=[^\\\\](\\\\\\\\)*)\"|(?<name>\\S+)", RegexOptions.IgnorePatternWhitespace | RegexOptions.Singleline | RegexOptions.Compiled | RegexOptions.ExplicitCapture);
-        /// <summary>分析指令块</summary>
-        /// <param name="block"></param>
-        /// <returns></returns>
-        public static Directive ParseDirectiveBlock(Block block)
-        {
-            if (block == null) throw new ArgumentNullException("block");
-
-            if (!ValidateDirectiveString(block)) throw new TemplateException(block, "指令格式错误！");
-
-            var matchs = directiveParsingRegex.Matches(block.Text);
-            String directiveName = null;
-            var parameters = new Dictionary<String, String>(StringComparer.OrdinalIgnoreCase);
-            foreach (Match match in matchs)
-            {
-                Group group;
-                if ((group = match.Groups["name"]).Success)
-                {
-                    directiveName = group.Value;
-                }
-                else
-                {
-                    String key = null;
-                    String valueString = null;
-                    if ((group = match.Groups["pname"]).Success) key = group.Value;
-                    if ((group = match.Groups["pvalue"]).Success) valueString = group.Value;
-
-                    if ((key != null) && (valueString != null))
-                    {
-                        if (parameters.ContainsKey(key)) throw new TemplateException(block, String.Format("指令中已存在名为[{0}]的参数！", key));
-
-                        valueString = directiveEscapeFindingRegex.Replace(valueString, escapeReplacingEvaluator);
-                        parameters.Add(key, valueString);
-                    }
-                }
-            }
-            if (directiveName != null) return new Directive(directiveName, parameters, block);
-
-            return null;
-        }
-
-        private static Regex nameValidatingRegex = new Regex(@"^\s*[\w\.]+\s+", RegexOptions.Singleline | RegexOptions.Compiled | RegexOptions.ExplicitCapture);
-        private static Regex paramValueValidatingRegex = new Regex("[\\w\\.]+\\s*=\\s*\"(.*?)(?<=[^\\\\](\\\\\\\\)*)\"\\s*", RegexOptions.Singleline | RegexOptions.Compiled | RegexOptions.ExplicitCapture);
-        /// <summary>验证指令字符串格式是否正确</summary>
-        /// <param name="block"></param>
-        /// <returns></returns>
-        private static Boolean ValidateDirectiveString(Block block)
-        {
-            var match = nameValidatingRegex.Match(block.Text);
-            if (!match.Success) return false;
-
-            var length = match.Length;
-            var matchs = paramValueValidatingRegex.Matches(block.Text);
-            if (matchs.Count == 0) return false;
-
-            foreach (Match match2 in matchs)
-            {
-                if (match2.Index != length) return false;
-
-                length += match2.Length;
-            }
-            if (length != block.Text.Length) return false;
-
-            return true;
-        }
-        #endregion
-
-        #region 优化处理
-        private static Regex allNewlineRegex = new Regex(@"^\s*$", RegexOptions.Singleline | RegexOptions.Compiled);
-        private static Regex newlineAtLineStartRegex = new Regex(@"^[ \t]*((\r\n)|\n)", RegexOptions.Singleline | RegexOptions.Compiled);
-        private static Regex newlineAtLineEndRegex = new Regex(@"(?=(\r\n)|\n)[ \t]*$", RegexOptions.Singleline | RegexOptions.Compiled);
-        /// <summary>删除多余的换行</summary>
-        /// <remarks>
-        /// 本方法的目的是为了让模版的编写更加随意灵活，有以下功能：
-        /// 1，文本后面如果是语句代码段或者类成员代码段，允许忽略代码段前的一个换行和空白符 (?=(\r\n)|\n)[ \t]*$
-        /// 2，文本前面如果是语句代码段或者类成员代码段，允许忽略代码段后面的空白以及一个换行符 ^[ \t]*((\r\n)|\n)
-        /// 3，语句代码段和类成员代码段，允许忽略之间的空白和换行 ^\s*$
-        /// </remarks>
-        /// <param name="blocks"></param>
-        internal static void StripExtraNewlines(List<Block> blocks)
-        {
-            for (var i = 0; i < blocks.Count; i++)
-            {
-                var block = blocks[i];
-                if (block.Type != BlockType.Text) continue;
-
-                if (i > 0)
-                {
-                    var last = blocks[i - 1];
-                    if (last.Type != BlockType.Expression && last.Type != BlockType.Text)
-                    {
-                        // 占位符块，不是第一块，前一块又不是表达式和占位符时，忽略一个换行
-                        block.Text = newlineAtLineStartRegex.Replace(block.Text, String.Empty);
-                    }
-                    if (last.Type == BlockType.Member && (i == blocks.Count - 1 || blocks[i + 1].Type == BlockType.Member))
-                    {
-                        // 占位符块，不是第一块，前一块和后一块都是类结构时，忽略由换行组成的占位符
-                        block.Text = allNewlineRegex.Replace(block.Text, String.Empty);
-                    }
-                }
-                if (i < blocks.Count - 1)
-                {
-                    var next = blocks[i + 1];
-                    if (next.Type != BlockType.Expression && next.Type != BlockType.Text)
-                    {
-                        // 占位符块，不是最后一块，下一块又不是表达式和占位符时，忽略一个换行
-                        block.Text = newlineAtLineEndRegex.Replace(block.Text, String.Empty);
-                    }
-                }
-            }
-            Predicate<Block> match = delegate (Block b)
-            {
-                // 类成员代码块可能需要空的结束符
-                if (b.Type == BlockType.Member) return false;
-                return String.IsNullOrEmpty(b.Text);
-            };
-            // 删除空块
-            blocks.RemoveAll(match);
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/XTemplate/Templating/TemplateStatus.cs b/XTemplate/Templating/TemplateStatus.cs
deleted file mode 100644
index 27be3c0af0..0000000000
--- a/XTemplate/Templating/TemplateStatus.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-﻿
-namespace XTemplate.Templating
-{
-    /// <summary>模版引擎状态</summary>
-    public enum TemplateStatus
-    {
-        /// <summary>准备</summary>
-        Prepare = 0,
-
-        /// <summary>分析处理</summary>
-        Process,
-
-        /// <summary>编译</summary>
-        Compile,
-    }
-}
\ No newline at end of file
diff --git a/XTemplate/Test.xt b/XTemplate/Test.xt
deleted file mode 100644
index 8028820517..0000000000
--- a/XTemplate/Test.xt
+++ /dev/null
@@ -1,15 +0,0 @@
-﻿指令
-<#@template inherits="NewLife.CMX.Templates.Index"#>
-
-包含
-<#@include Name="Header"#>
-
-表达式
-<#= Name #>
-
-语句
-<#if(true){#>
-<#}#>
-
-注释
-<#= Name \\#>
\ No newline at end of file
diff --git a/XTemplate/UpdateInfo.txt b/XTemplate/UpdateInfo.txt
deleted file mode 100644
index 551632deb7..0000000000
--- a/XTemplate/UpdateInfo.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-﻿v1.9.2013.0901   增加模版运行时调试功能，原有编译时调试
-
-v1.8.2012.0113   修正类名处理的BUG
-
-v1.8.2011.1124   调整模版的编译，不再输出临时文件，改为输出模版生成的代码
-
-v1.8.2011.1120   增加模版执行错误异常TemplateExecutionException，所有Render产生的异常都经过其包装
-                 修正处理指令的一个错误
-
-v1.7.2011.0904   include指令包含其它模版文件时，如果没有全路径，则采用当前模版的相对路径
-
-v1.6.2011.0831   改善编译错误提示，增加提示错误行及上下行共三行源代码
-
-v1.5.2011.0603   增加var指令，允许指定创建封装自Data的模版变量：<#@var name="pname" type="String"#>，然后<#=pname#>等同于<#=Data["pname"]#>
-                 template指令，增加name属性，允许指定模版名称
-
-v1.4.2011.0316   Template中原来的静态方法Process改为ProcessFile，另外根据需要增加常用的静态方法ProcessContent
-                 核心类Template改为私有构造，统一由带缓存的静态Create创建实例，避免分析及编译模版带来的性能损耗
-
-v1.3.2011.0314   修正放置XTemp目录不正确的错误
-
-v1.3.2010.1014   取消模版优化处理，保证模版的输出原汁原味，模版编辑人员更加容易理解
-
-v1.2.2010.1009   重整XTemplate结构，批量处理模版，编译到同一个程序集去。
-
-v1.1.2010.0927   使用C#作为模版语言，支持自定义模版基类，支持模版包含，支持类成员定义，支持编译语法检查
-
-v1.0.2010.0609   创建
\ No newline at end of file
diff --git a/XTemplate/XTemplate.csproj b/XTemplate/XTemplate.csproj
deleted file mode 100644
index 92934940f6..0000000000
--- a/XTemplate/XTemplate.csproj
+++ /dev/null
@@ -1,86 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{55BA37EE-01A2-438F-A0FB-6B57440BF2F0}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>XTemplate</RootNamespace>
-    <AssemblyName>XTemplate</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\..\Bin\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile>..\..\Bin\XTemplate.XML</DocumentationFile>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <OutputPath>..\..\Bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>..\..\Bin\XTemplate.XML</DocumentationFile>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.configuration" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Setting.cs" />
-    <Compile Include="Tags\TagTemplate.cs" />
-    <Compile Include="Templating\Directive.cs" />
-    <Compile Include="Templating\Template2.cs">
-      <DependentUpon>Template.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Templating\TemplateException.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Templating\Block.cs" />
-    <Compile Include="Templating\BlockType.cs" />
-    <Compile Include="Templating\Template.cs" />
-    <Compile Include="Templating\TemplateExecuteException.cs" />
-    <Compile Include="Templating\TemplateItem.cs" />
-    <Compile Include="Templating\TemplateParser.cs" />
-    <Compile Include="Templating\TemplateBase.cs" />
-    <Compile Include="Templating\TemplateStatus.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="说明.txt" />
-    <None Include="UpdateInfo.txt" />
-    <Content Include="XTemplate架构.jpg" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\NewLife.Core\NewLife.Core.csproj">
-      <Project>{5813C22E-EEB3-4DEE-A45C-BB218041193A}</Project>
-      <Name>NewLife.Core</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Test.xt" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/XTemplate/XTemplate40.csproj b/XTemplate/XTemplate40.csproj
deleted file mode 100644
index 37937fa4a0..0000000000
--- a/XTemplate/XTemplate40.csproj
+++ /dev/null
@@ -1,85 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{55BA37EE-01A2-438F-A0FB-6B57440BF2F0}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>XTemplate</RootNamespace>
-    <AssemblyName>XTemplate</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\..\Bin4\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NET4</DefineConstants>
-    <DocumentationFile>..\..\Bin4\XTemplate.XML</DocumentationFile>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>..\..\Bin4\</OutputPath>
-    <DefineConstants>TRACE;NET4</DefineConstants>
-    <DocumentationFile>..\..\Bin4\XTemplate.XML</DocumentationFile>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.configuration" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Setting.cs" />
-    <Compile Include="Tags\TagTemplate.cs" />
-    <Compile Include="Templating\Directive.cs" />
-    <Compile Include="Templating\Template2.cs">
-      <DependentUpon>Template.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Templating\TemplateException.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Templating\Block.cs" />
-    <Compile Include="Templating\BlockType.cs" />
-    <Compile Include="Templating\Template.cs" />
-    <Compile Include="Templating\TemplateExecuteException.cs" />
-    <Compile Include="Templating\TemplateItem.cs" />
-    <Compile Include="Templating\TemplateParser.cs" />
-    <Compile Include="Templating\TemplateBase.cs" />
-    <Compile Include="Templating\TemplateStatus.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="说明.txt" />
-    <None Include="App.config" />
-    <None Include="UpdateInfo.txt" />
-    <Content Include="XTemplate架构.jpg" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Test.xt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\NewLife.Core\NewLife.Core40.csproj">
-      <Project>{5813c22e-eeb3-4dee-a45c-bb218041193a}</Project>
-      <Name>NewLife.Core40</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git "a/XTemplate/XTemplate\346\236\266\346\236\204.jpg" "b/XTemplate/XTemplate\346\236\266\346\236\204.jpg"
deleted file mode 100644
index 4d3fd82aab..0000000000
Binary files "a/XTemplate/XTemplate\346\236\266\346\236\204.jpg" and /dev/null differ
diff --git "a/XTemplate/\345\217\221\345\270\203NuGet.cs" "b/XTemplate/\345\217\221\345\270\203NuGet.cs"
deleted file mode 100644
index d8694f4fce..0000000000
--- "a/XTemplate/\345\217\221\345\270\203NuGet.cs"
+++ /dev/null
@@ -1 +0,0 @@
-//include=..\发布NuGet.cs
\ No newline at end of file
diff --git "a/XTemplate/\350\257\264\346\230\216.txt" "b/XTemplate/\350\257\264\346\230\216.txt"
deleted file mode 100644
index 81a3469ad4..0000000000
--- "a/XTemplate/\350\257\264\346\230\216.txt"
+++ /dev/null
@@ -1,45 +0,0 @@
-﻿2013-12-13
-1，T4语法增强，比如<#-表示消去前一个换行，-#>表示消去后一个换行
-
-2011-12-05
-1，考虑模版引擎支持资源，这样子，编译的时候，就可以把某些文件当作资源嵌入到DLL里面
-
-2011-11-19
-1，可以考虑使用xslt来实现标签式模版
-2，不行，用xslt的话，尖括号都得转义，太麻烦了
-
-2011-10-01
-1，考虑在项目里面使用T4，然后调用XTemplate，生成代码。T4只是作为桥梁，为此，XTemplate应该为这个调用提供方便。
-
-2011-09-01 07:25
-1，可以仿照vt那样设计标签
-<vt:set var="data" value="$db.GetData()" />
-<vt:foreach from="$db.GetData()" item="data">.......</vt:foreach>
-为了外部扩展，可以通用解析这样子的标签：
-<x:elm[ name=value]>...</x:elm>
-其中x可以指定，XTemplate默认的标签，可以用x，然后每个系统的标签，比如xcms等
-
-2，VTemplate里面有很好的语句
-<vt:for from="1" to="9" index="i">
-<vt:for from="1" to="$i" index="j">
-<vt:expression var="r" args="$i" args="$j" expression="{0}*{1}" />{$:i}*{$:j}={$:r}&nbsp;&nbsp;&nbsp;&nbsp;
-</vt:for>
-<br />
-</vt:for>
-标签里面可以使用常量和$开头的变量，标签内容可以使用{$:i}之类的变量
-XTemplate如果这样做的话，应该分三次处理：平衡组正则递归匹配标签元素、非标签内容变量元素匹配（如{$:i}）、T4解析
-
-3，VTemplate的标签可以指定id和name
- ElementCollection<Tag> ListCt = this.Document.DocumentElement.GetChildTagsByName("Category");
-这个可以定位到模版里面的某一个标签，这是取模板里所有名为 Category 的标签
-这个设计，显然是仿照浏览器Dom的
-
-4，高级的变量表达式
-{$user.name length="5" bytelength="8"}
-{$user.last format="yyyy-MM-dd HH:mm:ss"}
-
-5，很好的架构，标签可以由订制的标签解析器完成解析
-
-6，XTemplate也应该考虑可以注册函数，允许模版调用外部方法
-
-7，XTemplate应该开放更多的接口
\ No newline at end of file

- 程序集列表(@AppDomain.CurrentDomain.FriendlyName ) -
名称	标题	文件版本	内部版本	编译时间	路径
- @item.Name -	- @item.Title -	- @item.FileVersion -	@item.Version	@item.Compile.ToFullString()	- @{ - var location = String.Empty; - try - { - location = item.Asm.Location; - } - catch { } - } - @location -
- Cache列表(@Cache.Count ) -
名称	类型	数值
@item.Key	@item.Value.GetType().FullName	@item.Value